Merge branch 'master' into taamas

7 files changed, 252 insertions, 134 deletions

diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h
index e736e4c8d4..54c83eb469 100644
--- a/keyboards/skergo/config.h
+++ b/keyboards/skergo/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B49
-#define PRODUCT_ID      0x534B
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Keyzio
-#define PRODUCT         SKErgo
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
@@ -32,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B4, B3, B2, B1 }
 #define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C2, C1, C0, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json
index 06bcd31f70..c47a1ac45f 100644
--- a/keyboards/skergo/info.json
+++ b/keyboards/skergo/info.json
@@ -1,84 +1,167 @@
 {
     "keyboard_name": "SKErgo",
+    "manufacturer": "Keyzio",
     "url": "https://keyz.io",
-    "maintainer": "Keyz.io",
+    "maintainer": "kevinzhao-tech",
+    "usb": {
+        "vid": "0x4B49",
+        "pid": "0x534B",
+        "device_version": "0.0.1"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_bs"
+    },
     "layouts": {
-      "LAYOUT": {
-        "layout": [
-           {"label":"Esc", "x":0, "y":0},
-           {"label":"1", "x":1, "y":0},
-           {"label":"2", "x":2, "y":0},
-           {"label":"3", "x":3.75, "y":0},
-           {"label":"4", "x":4.75, "y":0},
-           {"label":"5", "x":5.75, "y":0},
-           {"label":"6", "x":6.75, "y":0},
-           {"label":"7", "x":9.25, "y":0},
-           {"label":"8", "x":10.25, "y":0},
-           {"label":"9", "x":11.25, "y":0},
-           {"label":"0", "x":12.25, "y":0},
-           {"label":"-", "x":13.5, "y":0},
-           {"label":"=", "x":14.5, "y":0},
-           {"label":"~", "x":15.5, "y":0},
-           {"label":"Backspace", "x":16.5, "y":0},
+        "LAYOUT_2u_bs": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0.25},
+                {"label":"1!", "x":1.5, "y":0.25},
+                {"label":"2@", "x":2.5, "y":0.25},
+                {"label":"3#", "x":3.5, "y":0.25},
+                {"label":"4$", "x":4.5, "y":0.25},
+                {"label":"5%", "x":5.5, "y":0.25},
+                {"label":"6^", "x":6.5, "y":0.25},
+                {"label":"7&", "x":8.75, "y":0.25},
+                {"label":"8*", "x":9.75, "y":0.25},
+                {"label":"9(", "x":10.75, "y":0.25},
+                {"label":"0)", "x":11.75, "y":0.25},
+                {"label":"-_", "x":12.75, "y":0.25},
+                {"label":"=+", "x":13.75, "y":0.25},
+                {"label":"Backspace", "x":14.75, "y":0.25, "w":2},
+                {"label":"Page Up", "x":17, "y":0},
 
-           {"label":"Tab", "x":0, "y":1, "w":1.5},
-           {"label":"Q", "x":1.5, "y":1},
-           {"label":"W", "x":3.25, "y":1},
-           {"label":"E", "x":4.25, "y":1},
-           {"label":"R", "x":5.25, "y":1},
-           {"label":"T", "x":6.25, "y":1},
-           {"label":"Y", "x":8.75, "y":1},
-           {"label":"U", "x":9.75, "y":1},
-           {"label":"I", "x":10.75, "y":1},
-           {"label":"O", "x":11.75, "y":1},
-           {"label":"P", "x":12.75, "y":1},
-           {"label":"{", "x":14.25, "y":1},
-           {"label":"}", "x":15.25, "y":1},
-           {"label":"|", "x":16.25, "y":1, "w":1.5},
-           {"label":"Pg Up", "x":18, "y":0},
+                {"label":"Tab", "w":1.5, "x":0.25, "y":1.25},
+                {"label":"Q", "x":1.75, "y":1.25},
+                {"label":"W", "x":2.75, "y":1.25},
+                {"label":"E", "x":3.75, "y":1.25},
+                {"label":"R", "x":4.75, "y":1.25},
+                {"label":"T", "x":5.75, "y":1.25},
+                {"label":"Y", "x":8.4, "y":1.25},
+                {"label":"U", "x":9.4, "y":1.25},
+                {"label":"I", "x":10.4, "y":1.25},
+                {"label":"O", "x":11.4, "y":1.25},
+                {"label":"P", "x":12.4, "y":1.25},
+                {"label":"[{", "x":13.4, "y":1.25},
+                {"label":"]}", "x":14.4, "y":1.25},
+                {"label":"\\|", "w":1.5, "x":15.4, "y":1.25},
+                {"label":"Page Down", "x":17.15, "y":1},
 
-           {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-           {"label":"A", "x":1.75, "y":2},
-           {"label":"S", "x":3.5, "y":2},
-           {"label":"D", "x":4.5, "y":2},
-           {"label":"F", "x":5.5, "y":2},
-           {"label":"G", "x":6.5, "y":2},
-           {"label":"H", "x":9, "y":2},
-           {"label":"J", "x":10, "y":2},
-           {"label":"K", "x":11, "y":2},
-           {"label":"L", "x":12, "y":2},
-           {"label":":", "x":13.5, "y":2},
-           {"label":"\"", "x":14.5, "y":2},
-           {"label":"Enter", "x":15.5, "y":2, "w":2.25},
-           {"label":"Pg Dn", "x":18.25, "y":1},
+                {"label":"Caps Lock", "w":1.75, "x":0.15, "y":2.25},
+                {"label":"A", "x":1.9, "y":2.25},
+                {"label":"S", "x":2.9, "y":2.25},
+                {"label":"D", "x":3.9, "y":2.25},
+                {"label":"F", "x":4.9, "y":2.25},
+                {"label":"G", "x":5.9, "y":2.25},
+                {"label":"H", "x":8.75, "y":2.25},
+                {"label":"J", "x":9.75, "y":2.25},
+                {"label":"K", "x":10.75, "y":2.25},
+                {"label":"L", "x":11.75, "y":2.25},
+                {"label":";:", "x":12.75, "y":2.25},
+                {"label":"'\"", "x":13.75, "y":2.25},
+                {"label":"Enter", "w":2.25, "x":14.75, "y":2.25},
+                {"label":"End", "x":17.25, "y":2},
 
-           {"label":"Shift", "x":0, "y":3, "w":2.25},
-           {"label":"Z", "x":2.25, "y":3},
-           {"label":"X", "x":3.75, "y":3},
-           {"label":"C", "x":4.75, "y":3},
-           {"label":"V", "x":5.75, "y":3},
-           {"label":"B", "x":6.75, "y":3},
-           {"label":"B", "x":8.25, "y":3},
-           {"label":"N", "x":9.25, "y":3},
-           {"label":"M", "x":10.25, "y":3},
-           {"label":"<", "x":11.25, "y":3},
-           {"label":">", "x":12.25, "y":3},
-           {"label":"?", "x":14.25, "y":3},
-           {"label":"Shift", "x":15.25, "y":3, "w":1.75},
-           {"label":"Up", "x":17.25, "y":3},
-           {"label":"End", "x":18.5, "y":2},
+                {"label":"Shift", "w":2.25, "x":0, "y":3.25},
+                {"label":"Z", "x":2.25, "y":3.25},
+                {"label":"X", "x":3.25, "y":3.25},
+                {"label":"C", "x":4.25, "y":3.25},
+                {"label":"V", "x":5.25, "y":3.25},
+                {"label":"B", "x":6.25, "y":3.25},
+                {"label":"B", "x":8.25, "y":3.25},
+                {"label":"N", "x":9.25, "y":3.25},
+                {"label":"M", "x":10.25, "y":3.25},
+                {"label":",<", "x":11.25, "y":3.25},
+                {"label":".>", "x":12.25, "y":3.25},
+                {"label":"/?", "x":13.25, "y":3.25},
+                {"label":"Shift", "w":1.75, "x":14.25, "y":3.25},
+                {"label":"\u2191", "x":16.25, "y":3.5},
 
-           {"label":"L_Ctrl", "x":0, "y":4, "w":1.25},
-           {"label":"L_Alt", "x":3.75, "y":4, "w":1.5},
-           {"label":"L_Space", "x":5.25, "y":4, "w":2},
-           {"label":"Fn", "x":7.25, "y":4},
-           {"label":"R_Space", "x":9, "y":4, "w":2.75},
+                {"label":"Ctrl", "w":1.5, "x":0, "y":4.25},
+                {"label":"Alt", "w":1.5, "x":3.25, "y":4.25},
+                {"label":"Space", "w":2, "x":4.75, "y":4.25},
+                {"label":"GUI", "x":6.75, "y":4.25},
+                {"label":"Space", "w":2.75, "x":8.75, "y":4.25},
+                {"label":"Fn", "w":1.5, "x":11.5, "y":4.25},
+                {"label":"\u2190", "x":15.25, "y":4.5},
+                {"label":"\u2193", "x":16.25, "y":4.5},
+                {"label":"\u2192", "x":17.25, "y":4.5}
+            ]
+        },
+        "LAYOUT_split_bs": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0.25},
+                {"label":"1!", "x":1.5, "y":0.25},
+                {"label":"2@", "x":2.5, "y":0.25},
+                {"label":"3#", "x":3.5, "y":0.25},
+                {"label":"4$", "x":4.5, "y":0.25},
+                {"label":"5%", "x":5.5, "y":0.25},
+                {"label":"6^", "x":6.5, "y":0.25},
+                {"label":"7&", "x":8.75, "y":0.25},
+                {"label":"8*", "x":9.75, "y":0.25},
+                {"label":"9(", "x":10.75, "y":0.25},
+                {"label":"0)", "x":11.75, "y":0.25},
+                {"label":"-_", "x":12.75, "y":0.25},
+                {"label":"=+", "x":13.75, "y":0.25},
+                {"label":"Backspace", "x":14.75, "y":0.25},
+                {"label":"Backspace", "x":15.75, "y":0.25},
+                {"label":"Page Up", "x":17, "y":0},
 
-           {"label":"R_Alt", "x":11.75, "y":4, "w":1.5},
-           {"label":"Left","x":16.25, "y":4},
-           {"label":"Down","x":17.25, "y":4},
-           {"label":"Right","x":18.25, "y":4}
-         ]
+                {"label":"Tab", "w":1.5, "x":0.25, "y":1.25},
+                {"label":"Q", "x":1.75, "y":1.25},
+                {"label":"W", "x":2.75, "y":1.25},
+                {"label":"E", "x":3.75, "y":1.25},
+                {"label":"R", "x":4.75, "y":1.25},
+                {"label":"T", "x":5.75, "y":1.25},
+                {"label":"Y", "x":8.4, "y":1.25},
+                {"label":"U", "x":9.4, "y":1.25},
+                {"label":"I", "x":10.4, "y":1.25},
+                {"label":"O", "x":11.4, "y":1.25},
+                {"label":"P", "x":12.4, "y":1.25},
+                {"label":"[{", "x":13.4, "y":1.25},
+                {"label":"]}", "x":14.4, "y":1.25},
+                {"label":"\\|", "w":1.5, "x":15.4, "y":1.25},
+                {"label":"Page Down", "x":17.15, "y":1},
+
+                {"label":"Caps Lock", "w":1.75, "x":0.15, "y":2.25},
+                {"label":"A", "x":1.9, "y":2.25},
+                {"label":"S", "x":2.9, "y":2.25},
+                {"label":"D", "x":3.9, "y":2.25},
+                {"label":"F", "x":4.9, "y":2.25},
+                {"label":"G", "x":5.9, "y":2.25},
+                {"label":"H", "x":8.75, "y":2.25},
+                {"label":"J", "x":9.75, "y":2.25},
+                {"label":"K", "x":10.75, "y":2.25},
+                {"label":"L", "x":11.75, "y":2.25},
+                {"label":";:", "x":12.75, "y":2.25},
+                {"label":"'\"", "x":13.75, "y":2.25},
+                {"label":"Enter", "w":2.25, "x":14.75, "y":2.25},
+                {"label":"End", "x":17.25, "y":2},
+
+                {"label":"Shift", "w":2.25, "x":0, "y":3.25},
+                {"label":"Z", "x":2.25, "y":3.25},
+                {"label":"X", "x":3.25, "y":3.25},
+                {"label":"C", "x":4.25, "y":3.25},
+                {"label":"V", "x":5.25, "y":3.25},
+                {"label":"B", "x":6.25, "y":3.25},
+                {"label":"B", "x":8.25, "y":3.25},
+                {"label":"N", "x":9.25, "y":3.25},
+                {"label":"M", "x":10.25, "y":3.25},
+                {"label":",<", "x":11.25, "y":3.25},
+                {"label":".>", "x":12.25, "y":3.25},
+                {"label":"/?", "x":13.25, "y":3.25},
+                {"label":"Shift", "w":1.75, "x":14.25, "y":3.25},
+                {"label":"\u2191", "x":16.25, "y":3.5},
+
+                {"label":"Ctrl", "w":1.5, "x":0, "y":4.25},
+                {"label":"Alt", "w":1.5, "x":3.25, "y":4.25},
+                {"label":"Space", "w":2, "x":4.75, "y":4.25},
+                {"label":"GUI", "x":6.75, "y":4.25},
+                {"label":"Space", "w":2.75, "x":8.75, "y":4.25},
+                {"label":"Fn", "w":1.5, "x":11.5, "y":4.25},
+                {"label":"\u2190", "x":15.25, "y":4.5},
+                {"label":"\u2193", "x":16.25, "y":4.5},
+                {"label":"\u2192", "x":17.25, "y":4.5}
+            ]
         }
     }
 }
diff --git a/keyboards/skergo/keymaps/default/keymap.c b/keyboards/skergo/keymaps/default/keymap.c
index 321d6efc4c..f0fb28b36f 100644
--- a/keyboards/skergo/keymaps/default/keymap.c
+++ b/keyboards/skergo/keymaps/default/keymap.c
@@ -17,18 +17,21 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] =	LAYOUT(
-    KC_ESC,  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_GRV,  KC_BSPC,
-    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_PGUP,
-    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_PGDN,
-    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_END,
-    KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC,   KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS
-  ),
-  [1] =	LAYOUT(
-    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, 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
-  )
+
+    [0] = LAYOUT_split_bs(
+        KC_ESC,  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_GRV,  KC_BSPC,    KC_PGUP,
+        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_PGDN,
+        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_END,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,             KC_SPC,                    MO(1),                     KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_split_bs(
+        KC_GRV,  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/skergo/keymaps/via/keymap.c b/keyboards/skergo/keymaps/via/keymap.c
index 8d8859fa95..ddea8d2c70 100644
--- a/keyboards/skergo/keymaps/via/keymap.c
+++ b/keyboards/skergo/keymaps/via/keymap.c
@@ -17,32 +17,37 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] =	LAYOUT(
-    KC_ESC,  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_GRV,  KC_BSPC,
-    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_PGUP,
-    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_PGDN,
-    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_END,
-    KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC,   KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS
-  ),
-  [1] =	LAYOUT(
-    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, 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
-  ),
-  [2] =	LAYOUT(
-    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, 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
-  ),
-  [3] =	LAYOUT(
-    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, 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
-  )
+
+    [0] = LAYOUT_split_bs(
+        KC_ESC,  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_GRV,  KC_BSPC,    KC_PGUP,
+        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_PGDN,
+        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_END,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,             KC_SPC,                    MO(1),                     KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_split_bs(
+        KC_GRV,  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
+    ),
+
+    [2] = LAYOUT_split_bs(
+        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, 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
+    ),
+
+    [3] = LAYOUT_split_bs(
+        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, 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/skergo/keymaps/via/rules.mk b/keyboards/skergo/keymaps/via/rules.mk
index 36b7ba9cbc..1e5b99807c 100644
--- a/keyboards/skergo/keymaps/via/rules.mk
+++ b/keyboards/skergo/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/skergo/readme.md b/keyboards/skergo/readme.md
index ee10a5b7c0..d6ffa4babb 100644
--- a/keyboards/skergo/readme.md
+++ b/keyboards/skergo/readme.md
@@ -12,4 +12,8 @@ Make example for this keyboard (after setting up your build environment):
 
     make skergo:default
 
+Flashing example for this keyboard:
+
+    make skergo: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).
diff --git a/keyboards/skergo/skergo.h b/keyboards/skergo/skergo.h
index fceeaf0ddb..cee1c4c656 100644
--- a/keyboards/skergo/skergo.h
+++ b/keyboards/skergo/skergo.h
@@ -18,16 +18,48 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-	K400,       K402,       K404, K405, K406, K407,       K409,             K412, K413, K414  \
+#define ___ KC_NO
+
+/*                                                                      ┌───┐
+ * ┌───┬───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┬───┬───┐│1E │   ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │       │07 │08 │09 │0A │0B │0C │0D │0E │├───┤   │0E     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤│2E │   └───────┘
+ * │10   │11 │12 │13 │14 │15 │       │16 │17 │18 │19 │1A │1B │1C │1D   │├───┤
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐      └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤│3E │
+ * │20    │21 │22 │23 │24 │25 │       │26 │27 │28 │29 │2A │2B │2C      │└───┘
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐   ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+ * │30      │31 │32 │33 │34 │35 │   │46 │36 │37 │38 │39 │3A │3B    │┌───┐
+ * ├────┬───┴───┼───┴─┬─┴───┴─┬─┴─┐ └─┬─┴───┴───┴┬──┴──┬┴───┴──────┘│3D │
+ * │40  │       │42   │44     │45 │   │47        │49   │        ┌───┼───┼───┐
+ * └────┘       └─────┴───────┴───┘   └──────────┴─────┘        │4C │4D │4E │
+ *                                                              └───┴───┴───┘
+ * - Position K46 (secondary B key) is optional
+ */
+
+#define LAYOUT_2u_bs( \
+	K00, K01, K02, K03, K04, K05, K06,        K07, K08, K09, K0A, K0B, K0C, K0E,   K1E, \
+	K10, K11, K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, \
+	K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B,      K2C,   K3E, \
+	K30, K31, K32, K33, K34, K35,        K46, K36, K37, K38, K39, K3A, K3B, K3D,        \
+	K40,      K42,      K44, K45,        K47,           K49,           K4C, K4D, K4E    \
+) { \
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
+	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
+	{ K40, ___, K42, ___, K44, K45, K46, K47, ___, K49, ___, ___, K4C, K4D, K4E }  \
+}
+
+#define LAYOUT_split_bs( \
+	K00, K01, K02, K03, K04, K05, K06,        K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   K1E, \
+	K10, K11, K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K2E, \
+	K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B,      K2C,        K3E, \
+	K30, K31, K32, K33, K34, K35,        K46, K36, K37, K38, K39, K3A, K3B, K3D,             \
+	K40,      K42,      K44, K45,        K47,           K49,           K4C, K4D, K4E         \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,   K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,   K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,   K210,  K211,  K212, KC_NO,  K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,   K310,  K311, KC_NO,  K313,  K314 }, \
-	{ K400,  KC_NO, K402,  KC_NO, K404,  K405,  K406,  K407, KC_NO,  K409,  KC_NO, KC_NO,  K412,  K413,  K414 }  \
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
+	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
+	{ K40, ___, K42, ___, K44, K45, K46, K47, ___, K49, ___, ___, K4C, K4D, K4E }  \
 }