Merge remote-tracking branch 'origin/master' into develop

17 files changed, 935 insertions, 0 deletions

diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h
new file mode 100644
index 0000000000..e20369fde0
--- /dev/null
+++ b/keyboards/drewkeys/iskar/config.h
@@ -0,0 +1,56 @@
+/*
+Copyright 2021 Drewkeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xDE43
+#define PRODUCT_ID   0x1284
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Drewkeys
+#define PRODUCT      Iskar
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+ //                       0   1   2   3   4   5   6   7   8   9   10  11  12  13  14  15
+#define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 }
+#define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/info.json
new file mode 100644
index 0000000000..0505fece10
--- /dev/null
+++ b/keyboards/drewkeys/iskar/info.json
@@ -0,0 +1,383 @@
+{
+    "keyboard_name": "Iskar",
+    "url": "https://bitmapstudio.xyz/collections/iskar",
+    "maintainer": "Drewkeys",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Esc 0,0", "x": 0, "y": 0},
+                {"label": "1 0,1", "x": 1, "y": 0},
+                {"label": "2 0,2", "x": 2, "y": 0},
+                {"label": "3 0,3", "x": 3, "y": 0},
+                {"label": "4 0,4", "x": 4, "y": 0},
+                {"label": "5 0,5", "x": 5, "y": 0},
+                {"label": "6 0,6", "x": 6, "y": 0},
+                {"label": "7 0,7", "x": 7, "y": 0},
+                {"label": "8 0,8", "x": 8, "y": 0},
+                {"label": "9 0,9", "x": 9, "y": 0},
+                {"label": "0 0,10", "x": 10, "y": 0},
+                {"label": "- 0,11", "x": 11, "y": 0},
+                {"label": "= 0,12", "x": 12, "y": 0},
+                {"label": "bsp extra 0,13", "x": 13, "y": 0},
+                {"label": "bsp 0,14", "x": 14, "y": 0},
+                {"label": "del 0,15", "x": 15, "y": 0},
+
+                {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
+                {"label": "q 1,2", "x": 1.5, "y": 1},
+                {"label": "w 1,3", "x": 2.5, "y": 1},
+                {"label": "e 1,4", "x": 3.5, "y": 1},
+                {"label": "r 1,5", "x": 4.5, "y": 1},
+                {"label": "t 1,6", "x": 5.5, "y": 1},
+                {"label": "y 1,7", "x": 6.5, "y": 1},
+                {"label": "u 1,8", "x": 7.5, "y": 1},
+                {"label": "i 1,9", "x": 8.5, "y": 1},
+                {"label": "o 1,10", "x": 9.5, "y": 1},
+                {"label": "p 1,11", "x": 10.5, "y": 1},
+                {"label": "[ 1,12", "x": 11.5, "y": 1},
+                {"label": "] 1,13", "x": 12.5, "y": 1},
+                {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "home 1,15", "x": 15, "y": 1},
+
+                {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
+                {"label": "a 2,2", "x": 1.75, "y": 2},
+                {"label": "s 2,3", "x": 2.75, "y": 2},
+                {"label": "d 2,4", "x": 3.75, "y": 2},
+                {"label": "f 2,5", "x": 4.75, "y": 2},
+                {"label": "g 2,6", "x": 5.75, "y": 2},
+                {"label": "h 2,7", "x": 6.75, "y": 2},
+                {"label": "j 2,8", "x": 7.75, "y": 2},
+                {"label": "k 2,9", "x": 8.75, "y": 2},
+                {"label": "l 2,10", "x": 9.75, "y": 2},
+                {"label": "; 2,11", "x": 10.75, "y": 2},
+                {"label": "' 2,12", "x": 11.75, "y": 2},
+                {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "pg up 2,15", "x": 15, "y": 2},
+
+                {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
+                {"label": "z 3,2", "x": 2.25, "y": 3},
+                {"label": "x 3,3", "x": 3.25, "y": 3},
+                {"label": "c 3,4", "x": 4.25, "y": 3},
+                {"label": "v 3,5", "x": 5.25, "y": 3},
+                {"label": "b 3,6", "x": 6.25, "y": 3},
+                {"label": "n 3,7", "x": 7.25, "y": 3},
+                {"label": "m 3,8", "x": 8.25, "y": 3},
+                {"label": ", 3,9", "x": 9.25, "y": 3},
+                {"label": ". 3,10", "x": 10.25, "y": 3},
+                {"label": "/ 3,11", "x": 11.25, "y": 3},
+                {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
+                {"label": "up 3,14", "x": 14, "y": 3},
+                {"label": "pg dn 3,15", "x": 15, "y": 3},
+
+                {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
+                {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
+                {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "left 4,13", "x": 13, "y": 4},
+                {"label": "down 4,14", "x": 14, "y": 4},
+                {"label": "right 4,15", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+              {"label": "Esc 0,0", "x": 0, "y": 0},
+              {"label": "1 0,1", "x": 1, "y": 0},
+              {"label": "2 0,2", "x": 2, "y": 0},
+              {"label": "3 0,3", "x": 3, "y": 0},
+              {"label": "4 0,4", "x": 4, "y": 0},
+              {"label": "5 0,5", "x": 5, "y": 0},
+              {"label": "6 0,6", "x": 6, "y": 0},
+              {"label": "7 0,7", "x": 7, "y": 0},
+              {"label": "8 0,8", "x": 8, "y": 0},
+              {"label": "9 0,9", "x": 9, "y": 0},
+              {"label": "0 0,10", "x": 10, "y": 0},
+              {"label": "- 0,11", "x": 11, "y": 0},
+              {"label": "= 0,12", "x": 12, "y": 0},
+              {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2},
+              {"label": "del 0,15", "x": 15, "y": 0},
+
+              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
+              {"label": "q 1,2", "x": 1.5, "y": 1},
+              {"label": "w 1,3", "x": 2.5, "y": 1},
+              {"label": "e 1,4", "x": 3.5, "y": 1},
+              {"label": "r 1,5", "x": 4.5, "y": 1},
+              {"label": "t 1,6", "x": 5.5, "y": 1},
+              {"label": "y 1,7", "x": 6.5, "y": 1},
+              {"label": "u 1,8", "x": 7.5, "y": 1},
+              {"label": "i 1,9", "x": 8.5, "y": 1},
+              {"label": "o 1,10", "x": 9.5, "y": 1},
+              {"label": "p 1,11", "x": 10.5, "y": 1},
+              {"label": "[ 1,12", "x": 11.5, "y": 1},
+              {"label": "] 1,13", "x": 12.5, "y": 1},
+              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
+              {"label": "home 1,15", "x": 15, "y": 1},
+
+              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
+              {"label": "a 2,2", "x": 1.75, "y": 2},
+              {"label": "s 2,3", "x": 2.75, "y": 2},
+              {"label": "d 2,4", "x": 3.75, "y": 2},
+              {"label": "f 2,5", "x": 4.75, "y": 2},
+              {"label": "g 2,6", "x": 5.75, "y": 2},
+              {"label": "h 2,7", "x": 6.75, "y": 2},
+              {"label": "j 2,8", "x": 7.75, "y": 2},
+              {"label": "k 2,9", "x": 8.75, "y": 2},
+              {"label": "l 2,10", "x": 9.75, "y": 2},
+              {"label": "; 2,11", "x": 10.75, "y": 2},
+              {"label": "' 2,12", "x": 11.75, "y": 2},
+              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
+              {"label": "pg up 2,15", "x": 15, "y": 2},
+
+              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
+              {"label": "z 3,2", "x": 2.25, "y": 3},
+              {"label": "x 3,3", "x": 3.25, "y": 3},
+              {"label": "c 3,4", "x": 4.25, "y": 3},
+              {"label": "v 3,5", "x": 5.25, "y": 3},
+              {"label": "b 3,6", "x": 6.25, "y": 3},
+              {"label": "n 3,7", "x": 7.25, "y": 3},
+              {"label": "m 3,8", "x": 8.25, "y": 3},
+              {"label": ", 3,9", "x": 9.25, "y": 3},
+              {"label": ". 3,10", "x": 10.25, "y": 3},
+              {"label": "/ 3,11", "x": 11.25, "y": 3},
+              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
+              {"label": "up 3,14", "x": 14, "y": 3},
+              {"label": "pg dn 3,15", "x": 15, "y": 3},
+
+              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
+              {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
+              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
+              {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
+              {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
+              {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
+              {"label": "left 4,13", "x": 13, "y": 4},
+              {"label": "down 4,14", "x": 14, "y": 4},
+              {"label": "right 4,15", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_split_bs": {
+            "layout": [
+              {"label": "Esc 0,0", "x": 0, "y": 0},
+              {"label": "1 0,1", "x": 1, "y": 0},
+              {"label": "2 0,2", "x": 2, "y": 0},
+              {"label": "3 0,3", "x": 3, "y": 0},
+              {"label": "4 0,4", "x": 4, "y": 0},
+              {"label": "5 0,5", "x": 5, "y": 0},
+              {"label": "6 0,6", "x": 6, "y": 0},
+              {"label": "7 0,7", "x": 7, "y": 0},
+              {"label": "8 0,8", "x": 8, "y": 0},
+              {"label": "9 0,9", "x": 9, "y": 0},
+              {"label": "0 0,10", "x": 10, "y": 0},
+              {"label": "- 0,11", "x": 11, "y": 0},
+              {"label": "= 0,12", "x": 12, "y": 0},
+              {"label": "bsp extra 0,13", "x": 13, "y": 0},
+              {"label": "bsp 0,14", "x": 14, "y": 0},
+              {"label": "del 0,15", "x": 15, "y": 0},
+
+              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
+              {"label": "q 1,2", "x": 1.5, "y": 1},
+              {"label": "w 1,3", "x": 2.5, "y": 1},
+              {"label": "e 1,4", "x": 3.5, "y": 1},
+              {"label": "r 1,5", "x": 4.5, "y": 1},
+              {"label": "t 1,6", "x": 5.5, "y": 1},
+              {"label": "y 1,7", "x": 6.5, "y": 1},
+              {"label": "u 1,8", "x": 7.5, "y": 1},
+              {"label": "i 1,9", "x": 8.5, "y": 1},
+              {"label": "o 1,10", "x": 9.5, "y": 1},
+              {"label": "p 1,11", "x": 10.5, "y": 1},
+              {"label": "[ 1,12", "x": 11.5, "y": 1},
+              {"label": "] 1,13", "x": 12.5, "y": 1},
+              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
+              {"label": "home 1,15", "x": 15, "y": 1},
+
+              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
+              {"label": "a 2,2", "x": 1.75, "y": 2},
+              {"label": "s 2,3", "x": 2.75, "y": 2},
+              {"label": "d 2,4", "x": 3.75, "y": 2},
+              {"label": "f 2,5", "x": 4.75, "y": 2},
+              {"label": "g 2,6", "x": 5.75, "y": 2},
+              {"label": "h 2,7", "x": 6.75, "y": 2},
+              {"label": "j 2,8", "x": 7.75, "y": 2},
+              {"label": "k 2,9", "x": 8.75, "y": 2},
+              {"label": "l 2,10", "x": 9.75, "y": 2},
+              {"label": "; 2,11", "x": 10.75, "y": 2},
+              {"label": "' 2,12", "x": 11.75, "y": 2},
+              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
+              {"label": "pg up 2,15", "x": 15, "y": 2},
+
+              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
+              {"label": "z 3,2", "x": 2.25, "y": 3},
+              {"label": "x 3,3", "x": 3.25, "y": 3},
+              {"label": "c 3,4", "x": 4.25, "y": 3},
+              {"label": "v 3,5", "x": 5.25, "y": 3},
+              {"label": "b 3,6", "x": 6.25, "y": 3},
+              {"label": "n 3,7", "x": 7.25, "y": 3},
+              {"label": "m 3,8", "x": 8.25, "y": 3},
+              {"label": ", 3,9", "x": 9.25, "y": 3},
+              {"label": ". 3,10", "x": 10.25, "y": 3},
+              {"label": "/ 3,11", "x": 11.25, "y": 3},
+              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
+              {"label": "up 3,14", "x": 14, "y": 3},
+              {"label": "pg dn 3,15", "x": 15, "y": 3},
+
+              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
+              {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
+              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
+              {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
+              {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
+              {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
+              {"label": "left 4,13", "x": 13, "y": 4},
+              {"label": "down 4,14", "x": 14, "y": 4},
+              {"label": "right 4,15", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_tsangan": {
+            "layout": [
+              {"label": "Esc 0,0", "x": 0, "y": 0},
+              {"label": "1 0,1", "x": 1, "y": 0},
+              {"label": "2 0,2", "x": 2, "y": 0},
+              {"label": "3 0,3", "x": 3, "y": 0},
+              {"label": "4 0,4", "x": 4, "y": 0},
+              {"label": "5 0,5", "x": 5, "y": 0},
+              {"label": "6 0,6", "x": 6, "y": 0},
+              {"label": "7 0,7", "x": 7, "y": 0},
+              {"label": "8 0,8", "x": 8, "y": 0},
+              {"label": "9 0,9", "x": 9, "y": 0},
+              {"label": "0 0,10", "x": 10, "y": 0},
+              {"label": "- 0,11", "x": 11, "y": 0},
+              {"label": "= 0,12", "x": 12, "y": 0},
+              {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2},
+              {"label": "del 0,15", "x": 15, "y": 0},
+
+              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
+              {"label": "q 1,2", "x": 1.5, "y": 1},
+              {"label": "w 1,3", "x": 2.5, "y": 1},
+              {"label": "e 1,4", "x": 3.5, "y": 1},
+              {"label": "r 1,5", "x": 4.5, "y": 1},
+              {"label": "t 1,6", "x": 5.5, "y": 1},
+              {"label": "y 1,7", "x": 6.5, "y": 1},
+              {"label": "u 1,8", "x": 7.5, "y": 1},
+              {"label": "i 1,9", "x": 8.5, "y": 1},
+              {"label": "o 1,10", "x": 9.5, "y": 1},
+              {"label": "p 1,11", "x": 10.5, "y": 1},
+              {"label": "[ 1,12", "x": 11.5, "y": 1},
+              {"label": "] 1,13", "x": 12.5, "y": 1},
+              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
+              {"label": "home 1,15", "x": 15, "y": 1},
+
+              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
+              {"label": "a 2,2", "x": 1.75, "y": 2},
+              {"label": "s 2,3", "x": 2.75, "y": 2},
+              {"label": "d 2,4", "x": 3.75, "y": 2},
+              {"label": "f 2,5", "x": 4.75, "y": 2},
+              {"label": "g 2,6", "x": 5.75, "y": 2},
+              {"label": "h 2,7", "x": 6.75, "y": 2},
+              {"label": "j 2,8", "x": 7.75, "y": 2},
+              {"label": "k 2,9", "x": 8.75, "y": 2},
+              {"label": "l 2,10", "x": 9.75, "y": 2},
+              {"label": "; 2,11", "x": 10.75, "y": 2},
+              {"label": "' 2,12", "x": 11.75, "y": 2},
+              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
+              {"label": "pg up 2,15", "x": 15, "y": 2},
+
+              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
+              {"label": "z 3,2", "x": 2.25, "y": 3},
+              {"label": "x 3,3", "x": 3.25, "y": 3},
+              {"label": "c 3,4", "x": 4.25, "y": 3},
+              {"label": "v 3,5", "x": 5.25, "y": 3},
+              {"label": "b 3,6", "x": 6.25, "y": 3},
+              {"label": "n 3,7", "x": 7.25, "y": 3},
+              {"label": "m 3,8", "x": 8.25, "y": 3},
+              {"label": ", 3,9", "x": 9.25, "y": 3},
+              {"label": ". 3,10", "x": 10.25, "y": 3},
+              {"label": "/ 3,11", "x": 11.25, "y": 3},
+              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
+              {"label": "up 3,14", "x": 14, "y": 3},
+              {"label": "pg dn 3,15", "x": 15, "y": 3},
+
+              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5},
+              {"label": "win 4,1", "x": 1.5, "y": 4},
+              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5},
+              {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7},
+              {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5},
+              {"label": "left 4,13", "x": 13, "y": 4},
+              {"label": "down 4,14", "x": 14, "y": 4},
+              {"label": "right 4,15", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_tsangan_split_bs": {
+            "layout": [
+              {"label": "Esc 0,0", "x": 0, "y": 0},
+              {"label": "1 0,1", "x": 1, "y": 0},
+              {"label": "2 0,2", "x": 2, "y": 0},
+              {"label": "3 0,3", "x": 3, "y": 0},
+              {"label": "4 0,4", "x": 4, "y": 0},
+              {"label": "5 0,5", "x": 5, "y": 0},
+              {"label": "6 0,6", "x": 6, "y": 0},
+              {"label": "7 0,7", "x": 7, "y": 0},
+              {"label": "8 0,8", "x": 8, "y": 0},
+              {"label": "9 0,9", "x": 9, "y": 0},
+              {"label": "0 0,10", "x": 10, "y": 0},
+              {"label": "- 0,11", "x": 11, "y": 0},
+              {"label": "= 0,12", "x": 12, "y": 0},
+              {"label": "bsp extra 0,13", "x": 13, "y": 0},
+              {"label": "bsp 0,14", "x": 14, "y": 0},
+              {"label": "del 0,15", "x": 15, "y": 0},
+
+              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
+              {"label": "q 1,2", "x": 1.5, "y": 1},
+              {"label": "w 1,3", "x": 2.5, "y": 1},
+              {"label": "e 1,4", "x": 3.5, "y": 1},
+              {"label": "r 1,5", "x": 4.5, "y": 1},
+              {"label": "t 1,6", "x": 5.5, "y": 1},
+              {"label": "y 1,7", "x": 6.5, "y": 1},
+              {"label": "u 1,8", "x": 7.5, "y": 1},
+              {"label": "i 1,9", "x": 8.5, "y": 1},
+              {"label": "o 1,10", "x": 9.5, "y": 1},
+              {"label": "p 1,11", "x": 10.5, "y": 1},
+              {"label": "[ 1,12", "x": 11.5, "y": 1},
+              {"label": "] 1,13", "x": 12.5, "y": 1},
+              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
+              {"label": "home 1,15", "x": 15, "y": 1},
+
+              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
+              {"label": "a 2,2", "x": 1.75, "y": 2},
+              {"label": "s 2,3", "x": 2.75, "y": 2},
+              {"label": "d 2,4", "x": 3.75, "y": 2},
+              {"label": "f 2,5", "x": 4.75, "y": 2},
+              {"label": "g 2,6", "x": 5.75, "y": 2},
+              {"label": "h 2,7", "x": 6.75, "y": 2},
+              {"label": "j 2,8", "x": 7.75, "y": 2},
+              {"label": "k 2,9", "x": 8.75, "y": 2},
+              {"label": "l 2,10", "x": 9.75, "y": 2},
+              {"label": "; 2,11", "x": 10.75, "y": 2},
+              {"label": "' 2,12", "x": 11.75, "y": 2},
+              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
+              {"label": "pg up 2,15", "x": 15, "y": 2},
+
+              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
+              {"label": "z 3,2", "x": 2.25, "y": 3},
+              {"label": "x 3,3", "x": 3.25, "y": 3},
+              {"label": "c 3,4", "x": 4.25, "y": 3},
+              {"label": "v 3,5", "x": 5.25, "y": 3},
+              {"label": "b 3,6", "x": 6.25, "y": 3},
+              {"label": "n 3,7", "x": 7.25, "y": 3},
+              {"label": "m 3,8", "x": 8.25, "y": 3},
+              {"label": ", 3,9", "x": 9.25, "y": 3},
+              {"label": ". 3,10", "x": 10.25, "y": 3},
+              {"label": "/ 3,11", "x": 11.25, "y": 3},
+              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
+              {"label": "up 3,14", "x": 14, "y": 3},
+              {"label": "pg dn 3,15", "x": 15, "y": 3},
+
+              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5},
+              {"label": "win 4,1", "x": 1.5, "y": 4},
+              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5},
+              {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7},
+              {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5},
+              {"label": "left 4,13", "x": 13, "y": 4},
+              {"label": "down 4,14", "x": 14, "y": 4},
+              {"label": "right 4,15", "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/drewkeys/iskar/iskar.c b/keyboards/drewkeys/iskar/iskar.c
new file mode 100644
index 0000000000..32ea7aa2e4
--- /dev/null
+++ b/keyboards/drewkeys/iskar/iskar.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Drewkeys
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "iskar.h"
diff --git a/keyboards/drewkeys/iskar/iskar.h b/keyboards/drewkeys/iskar/iskar.h
new file mode 100644
index 0000000000..0ad2601d33
--- /dev/null
+++ b/keyboards/drewkeys/iskar/iskar.h
@@ -0,0 +1,155 @@
+/* Copyright 2021 Drewkeys
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+// Corresponding changes to the layout names and/or definitions must also be made to info.json
+
+/* Standard arrangement / LAYOUT
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
+ * │40  │41  │43  │        46              │4a  │4b  │▓│4d │4e │4f │
+ * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
+*/
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
+    k40, k41, k42,                k46,                k4A, k4B,      k4D, k4E,   k4F     \
+) { \
+    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
+    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
+    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
+    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
+    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
+}
+
+/* Standard arrangement / 65 ANSI
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │0f │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
+ * │40  │41  │43  │        46              │4a  │4b  │ │4d │4e │4f │
+ * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
+*/
+#define LAYOUT_65_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,        k0E, k0F,    \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k1E, k1F,    \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,   k3E, k3F,    \
+    k40, k41, k42,                k46,                k4A, k4B,      k4D,   k4E, k4F     \
+) { \
+    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   KC_NO, k0E, k0F }, \
+    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
+    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
+    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
+    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
+}
+
+/* Standard arrangement / 65 ANSI SPLIT
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
+ * │40  │41  │43  │        46              │4a  │4b  │ │4d │4e │4f │
+ * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
+*/
+#define LAYOUT_65_ansi_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
+    k40, k41, k42,                k46,                k4A, k4B,      k4D, k4E,   k4F     \
+) { \
+    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
+    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
+    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
+    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
+    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
+}
+
+/* Standard arrangement / 65 TSANGAN
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │0f │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
+ * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤
+ * │40   │41 │43  │        46                   │4b  │ │4d │4e │4f │
+ * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘
+*/
+#define LAYOUT_65_tsangan( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E,  k0F,     \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
+    k40, k41, k42,                k46,                     k4B,      k4D, k4E,   k4F     \
+) { \
+    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   KC_NO, k0E, k0F }, \
+    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
+    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
+    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
+    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E, k4F }  \
+}
+
+/* Standard arrangement / 65 TSANGAN SPLIT
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
+ * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤
+ * │40   │41 │43  │        46                   │4b  │ │4d │4e │4f │
+ * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘
+*/
+#define LAYOUT_65_tsangan_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
+    k40, k41, k42,                k46,                     k4B,      k4D, k4E,   k4F     \
+) { \
+    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
+    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
+    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
+    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
+    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E,   k4F }  \
+}
diff --git a/keyboards/drewkeys/iskar/keymaps/default/keymap.c b/keyboards/drewkeys/iskar/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d97403dfd5
--- /dev/null
+++ b/keyboards/drewkeys/iskar/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 Drewkeys
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT(
+        QK_GESC,    KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,     KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
+        KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,             KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_INS,
+        KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,             KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+          KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,                    KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTRL, KC_LGUI, KC_LALT,        KC_SPC,                    MO(1), KC_RCTRL,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    LAYOUT(
+        KC_GRAVE,    KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9,   KC_F10,     KC_F11,  KC_F12,   KC_TRNS,   KC_TRNS,  KC_TRNS,
+        KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,                    KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/drewkeys/iskar/keymaps/default/readme.md b/keyboards/drewkeys/iskar/keymaps/default/readme.md
new file mode 100644
index 0000000000..d7cffe7242
--- /dev/null
+++ b/keyboards/drewkeys/iskar/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for iskar -- ansi and split back space
diff --git a/keyboards/drewkeys/iskar/readme.md b/keyboards/drewkeys/iskar/readme.md
new file mode 100644
index 0000000000..152ec5e47e
--- /dev/null
+++ b/keyboards/drewkeys/iskar/readme.md
@@ -0,0 +1,24 @@
+# Iskar
+
+![Iskar](https://i.imgur.com/qBh0gA2.png)
+
+![Layouts supported](https://i.imgur.com/SB2G7mL.png)
+Note: No split backspace for hotswap vers.
+
+65% PCB for Bitmap studio's Iskar
+
+* Keyboard Maintainer: [Drewkeys](https://github.com/drewpyun)
+* Hardware Supported: Made specifically for Iskar, 65% hotswap supported
+* Hardware Availability: https://bitmapstudio.xyz/collections/iskar
+
+Make example for this keyboard (after setting up your build environment):
+
+    make drewkkeys/iskar:default
+
+Flashing example for this keyboard:
+
+    make drewkeys/iskar:default:flash
+
+Resetting Board: Press the button on the PCB next to the logo to soft reset the board to reflash (bootloader mode).
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/drewkeys/iskar/rules.mk b/keyboards/drewkeys/iskar/rules.mk
new file mode 100644
index 0000000000..9591f732c4
--- /dev/null
+++ b/keyboards/drewkeys/iskar/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
diff --git a/keyboards/winkeys/mini_winni/config.h b/keyboards/winkeys/mini_winni/config.h
new file mode 100644
index 0000000000..821f5cdc76
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/config.h
@@ -0,0 +1,68 @@
+
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x574B
+#define PRODUCT_ID      0x7770
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    WinKeys
+#define PRODUCT         Mini Winni
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 4
+
+/* key matrix pins */
+#define DIRECT_PINS { { F4, F5, B4, D7 }, { F6, F7, B6, B5 } }
+#define UNUSED_PINS
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define RGB_DI_PIN E6
+#define RGBLED_NUM 4
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/info.json
new file mode 100644
index 0000000000..2545073551
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/info.json
@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Mini Winni",
+    "maintainer": "Matthew Dias",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]
+        }
+    }
+}
diff --git a/keyboards/winkeys/mini_winni/keymaps/default/keymap.c b/keyboards/winkeys/mini_winni/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5613ca4d89
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_F1,  KC_F2,  KC_F3,  KC_F4,  
+		KC_F5,  KC_F6,  KC_F7,  KC_F8
+	),
+
+	[1] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	)
+
+};
\ No newline at end of file
diff --git a/keyboards/winkeys/mini_winni/keymaps/via/keymap.c b/keyboards/winkeys/mini_winni/keymaps/via/keymap.c
new file mode 100644
index 0000000000..5613ca4d89
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_F1,  KC_F2,  KC_F3,  KC_F4,  
+		KC_F5,  KC_F6,  KC_F7,  KC_F8
+	),
+
+	[1] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	)
+
+};
\ No newline at end of file
diff --git a/keyboards/winkeys/mini_winni/keymaps/via/rules.mk b/keyboards/winkeys/mini_winni/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/winkeys/mini_winni/mini_winni.c b/keyboards/winkeys/mini_winni/mini_winni.c
new file mode 100644
index 0000000000..35c75c4ad7
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/mini_winni.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "mini_winni.h"
diff --git a/keyboards/winkeys/mini_winni/mini_winni.h b/keyboards/winkeys/mini_winni/mini_winni.h
new file mode 100644
index 0000000000..4d4374761d
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/mini_winni.h
@@ -0,0 +1,27 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+#define LAYOUT_all( \
+	K00, K01, K02, K03, \
+	K10, K11, K12, K13  \
+) { \
+	{ K00, K01, K02, K03 }, \
+	{ K10, K11, K12, K13 }  \
+}
diff --git a/keyboards/winkeys/mini_winni/readme.md b/keyboards/winkeys/mini_winni/readme.md
new file mode 100644
index 0000000000..e7c43995c0
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/readme.md
@@ -0,0 +1,22 @@
+# Mini Winni
+
+A 2x4 Macropad by WinKeys
+
+-   Keyboard Maintainer: [matthewdias](https://github.com/matthewdias)
+-   Hardware Supported: mini winni PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make winkeys/mini_winni:default
+
+Flashing example for this keyboard:
+
+    make winkeys/mini_winni:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader:
+
+-   **Physical reset button**: Briefly press the button on the back of the PCB (or short the reset/ground pads, should a tactile button not be installed)
diff --git a/keyboards/winkeys/mini_winni/rules.mk b/keyboards/winkeys/mini_winni/rules.mk
new file mode 100644
index 0000000000..7b7949afcb
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no	        # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output