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

4 files changed, 109 insertions, 115 deletions

diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index 08782d1838..4b35f4492f 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -1,9 +1,9 @@
 {
     "keyboard_name": "sam sg81m",
     "url": "",
-    "maintainer": "qmk",
-    "width": 17,
-    "height": 6,
+    "maintainer": "CMMS-Freather",
+    "width": 18.5,
+    "height": 5.5,
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -21,71 +21,74 @@
                 {"label":"K0B (F0,D5)", "x":11, "y":0},
                 {"label":"K0C (F0,D6)", "x":12, "y":0},
                 {"label":"K0D (F0,D7)", "x":13, "y":0, "w":2},
-                {"label":"K10 (F1,B7)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (F1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (F1,B5)", "x":2.5, "y":1},
-                {"label":"K13 (F1,B4)", "x":3.5, "y":1},
-                {"label":"K14 (F1,C7)", "x":4.5, "y":1},
-                {"label":"K15 (F1,C6)", "x":5.5, "y":1},
-                {"label":"K16 (F1,D0)", "x":6.5, "y":1},
-                {"label":"K17 (F1,D1)", "x":7.5, "y":1},
-                {"label":"K18 (F1,D2)", "x":8.5, "y":1},
-                {"label":"K19 (F1,D3)", "x":9.5, "y":1},
-                {"label":"K1A (F1,D4)", "x":10.5, "y":1},
-                {"label":"K1B (F1,D5)", "x":11.5, "y":1},
-                {"label":"K1C (F1,D6)", "x":12.5, "y":1},
-                {"label":"K1D (F1,D7)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K20 (F4,B7)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F4,B6)", "x":1.75, "y":2},
-                {"label":"K22 (F4,B5)", "x":2.75, "y":2},
-                {"label":"K23 (F4,B4)", "x":3.75, "y":2},
-                {"label":"K24 (F4,C7)", "x":4.75, "y":2},
-                {"label":"K25 (F4,C6)", "x":5.75, "y":2},
-                {"label":"K26 (F4,D0)", "x":6.75, "y":2},
-                {"label":"K27 (F4,D1)", "x":7.75, "y":2},
-                {"label":"K28 (F4,D2)", "x":8.75, "y":2},
-                {"label":"K29 (F4,D3)", "x":9.75, "y":2},
-                {"label":"K2A (F4,D4)", "x":10.75, "y":2},
-                {"label":"K2B (F4,D5)", "x":11.75, "y":2},
-                {"label":"K2C (F4,D6)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2D (F4,D7)", "x":15, "y":2},
-                {"label":"K30 (F5,B7)", "x":0, "y":3, "w":2.25},
-                {"label":"K31 (F5,B6)", "x":2.25, "y":3},
-                {"label":"K32 (F5,B5)", "x":3.25, "y":3},
-                {"label":"K33 (F5,B4)", "x":4.25, "y":3},
-                {"label":"K34 (F5,C7)", "x":5.25, "y":3},
-                {"label":"K35 (F5,C6)", "x":6.25, "y":3},
-                {"label":"K36 (F5,D0)", "x":7.25, "y":3},
-                {"label":"K37 (F5,D1)", "x":8.25, "y":3},
-                {"label":"K38 (F5,D2)", "x":9.25, "y":3},
-                {"label":"K39 (F5,D3)", "x":10.25, "y":3},
-                {"label":"K3A (F5,D4)", "x":11.25, "y":3},
-                {"label":"K3B (F5,D5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3C (F5,D6)", "x":14, "y":3},
-                {"label":"K3D (F5,D7)", "x":15, "y":3},
-                {"label":"K40 (F6,B7)", "x":0, "y":4, "w":1.5},
-                {"label":"K41 (F6,B6)", "x":1.5, "y":4},
-                {"label":"K42 (F6,B5)", "x":2.5, "y":4, "w":1.5},
-                {"label":"K45 (F6,C6)", "x":4, "y":4, "w":7},
-                {"label":"K48 (F6,D2)", "x":11, "y":4},
-                {"label":"K49 (F6,D3)", "x":12, "y":4},
-                {"label":"K4A (F6,D4)", "x":13, "y":4},
-                {"label":"K4B (F6,D5)", "x":14, "y":4},
-                {"label":"K4C (F6,D6)", "x":15, "y":4},
-                {"label":"K4D (F6,D7)", "x":16, "y":4},
-                {"label":"K50 (F7,B7)", "x":0, "y":5},
-                {"label":"K51 (F7,B6)", "x":1, "y":5},
-                {"label":"K52 (F7,B5)", "x":2, "y":5},
-                {"label":"K53 (F7,B4)", "x":3, "y":5},
-                {"label":"K54 (F7,C7)", "x":4, "y":5},
-                {"label":"K55 (F7,C6)", "x":5, "y":5},
-                {"label":"K56 (F7,D0)", "x":6, "y":5},
-                {"label":"K57 (F7,D1)", "x":7, "y":5},
-                {"label":"K58 (F7,D2)", "x":8, "y":5},
-                {"label":"K59 (F7,D3)", "x":9, "y":5},
-                {"label":"K5A (F7,D4)", "x":10, "y":5}
+                {"label":"K2D (F4,D7)", "x":15.5, "y":0},
+                {"label":"K3D (F5,D7)", "x":16.5, "y":0},
+                {"label":"K4D (F6,D7)", "x":17.5, "y":0},
+
+                {"label":"K10 (F1,B7)", "x":0, "y":1.25, "w":1.5},
+                {"label":"K11 (F1,B6)", "x":1.5, "y":1.25},
+                {"label":"K12 (F1,B5)", "x":2.5, "y":1.25},
+                {"label":"K13 (F1,B4)", "x":3.5, "y":1.25},
+                {"label":"K14 (F1,C7)", "x":4.5, "y":1.25},
+                {"label":"K15 (F1,C6)", "x":5.5, "y":1.25},
+                {"label":"K16 (F1,D0)", "x":6.5, "y":1.25},
+                {"label":"K17 (F1,D1)", "x":7.5, "y":1.25},
+                {"label":"K18 (F1,D2)", "x":8.5, "y":1.25},
+                {"label":"K19 (F1,D3)", "x":9.5, "y":1.25},
+                {"label":"K1A (F1,D4)", "x":10.5, "y":1.25},
+                {"label":"K1B (F1,D5)", "x":11.5, "y":1.25},
+                {"label":"K1C (F1,D6)", "x":12.5, "y":1.25},
+                {"label":"K1D (F1,D7)", "x":13.5, "y":1.25, "w":1.5},
+                {"label":"K56 (F7,D0)", "x":15.5, "y":1.25},
+                {"label":"K57 (F7,D1)", "x":16.5, "y":1.25},
+                {"label":"K58 (F7,D2)", "x":17.5, "y":1.25},
+
+                {"label":"K20 (F4,B7)", "x":0, "y":2.25, "w":1.75},
+                {"label":"K21 (F4,B6)", "x":1.75, "y":2.25},
+                {"label":"K22 (F4,B5)", "x":2.75, "y":2.25},
+                {"label":"K23 (F4,B4)", "x":3.75, "y":2.25},
+                {"label":"K24 (F4,C7)", "x":4.75, "y":2.25},
+                {"label":"K25 (F4,C6)", "x":5.75, "y":2.25},
+                {"label":"K26 (F4,D0)", "x":6.75, "y":2.25},
+                {"label":"K27 (F4,D1)", "x":7.75, "y":2.25},
+                {"label":"K28 (F4,D2)", "x":8.75, "y":2.25},
+                {"label":"K29 (F4,D3)", "x":9.75, "y":2.25},
+                {"label":"K2A (F4,D4)", "x":10.75, "y":2.25},
+                {"label":"K2B (F4,D5)", "x":11.75, "y":2.25},
+                {"label":"K2C (F4,D6)", "x":12.75, "y":2.25, "w":2.25},
+                {"label":"K53 (F7,B4)", "x":15.5, "y":2.25},
+                {"label":"K54 (F7,C7)", "x":16.5, "y":2.25},
+                {"label":"K55 (F7,C6)", "x":17.5, "y":2.25},
+
+                {"label":"K30 (F5,B7)", "x":0, "y":3.25, "w":2.25},
+                {"label":"K31 (F5,B6)", "x":2.25, "y":3.25},
+                {"label":"K32 (F5,B5)", "x":3.25, "y":3.25},
+                {"label":"K33 (F5,B4)", "x":4.25, "y":3.25},
+                {"label":"K34 (F5,C7)", "x":5.25, "y":3.25},
+                {"label":"K35 (F5,C6)", "x":6.25, "y":3.25},
+                {"label":"K36 (F5,D0)", "x":7.25, "y":3.25},
+                {"label":"K37 (F5,D1)", "x":8.25, "y":3.25},
+                {"label":"K38 (F5,D2)", "x":9.25, "y":3.25},
+                {"label":"K39 (F5,D3)", "x":10.25, "y":3.25},
+                {"label":"K3A (F5,D4)", "x":11.25, "y":3.25},
+                {"label":"K3B (F5,D5)", "x":12.25, "y":3.25, "w":1.75},
+                {"label":"K3C (F5,D6)", "x":14.25, "y":3.5},
+                {"label":"K50 (F7,B7)", "x":15.5, "y":3.25},
+                {"label":"K51 (F7,B6)", "x":16.5, "y":3.25},
+                {"label":"K52 (F7,B5)", "x":17.5, "y":3.25},
+
+                {"label":"K40 (F6,B7)", "x":0, "y":4.25, "w":1.5},
+                {"label":"K41 (F6,B6)", "x":1.5, "y":4.25},
+                {"label":"K42 (F6,B5)", "x":2.5, "y":4.25, "w":1.5},
+                {"label":"K45 (F6,C6)", "x":4, "y":4.25, "w":7},
+                {"label":"K48 (F6,D2)", "x":11, "y":4.25},
+                {"label":"K49 (F6,D3)", "x":12, "y":4.25},
+                {"label":"K4A (F6,D4)", "x":13.25, "y":4.5},
+                {"label":"K4B (F6,D5)", "x":14.25, "y":4.5},
+                {"label":"K4C (F6,D6)", "x":15.25, "y":4.5},
+                {"label":"K59 (F7,D3)", "x":16.5, "y":4.25},
+                {"label":"K5A (F7,D4)", "x":17.5, "y":4.25}
             ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }
diff --git a/keyboards/sam/sg81m/keymaps/default/keymap.c b/keyboards/sam/sg81m/keymaps/default/keymap.c
index a36ebb2432..5518b9a8aa 100644
--- a/keyboards/sam/sg81m/keymaps/default/keymap.c
+++ b/keyboards/sam/sg81m/keymaps/default/keymap.c
@@ -18,19 +18,17 @@
 
 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_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_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_NLCK,
-        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_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-        KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_DEL
+        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_BSPC,       KC_NLCK, KC_END,  KC_PGDN,
+        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_P7,   KC_P8,   KC_P9,
+        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_P4,   KC_P5,   KC_P6,
+        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_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_DEL
     ),
     [1] = LAYOUT(
-        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,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
+        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, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS
     ),
 };
diff --git a/keyboards/sam/sg81m/keymaps/via/keymap.c b/keyboards/sam/sg81m/keymaps/via/keymap.c
index c032058597..f69d1f4c32 100644
--- a/keyboards/sam/sg81m/keymaps/via/keymap.c
+++ b/keyboards/sam/sg81m/keymaps/via/keymap.c
@@ -17,38 +17,32 @@
 #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_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_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_NLCK,
-          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_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-          KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_DEL
-      ),
-      [1] = LAYOUT(
-          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,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
-      ),
+    [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_BSPC,       KC_NLCK, KC_END,  KC_PGDN,
+        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_P7,   KC_P8,   KC_P9,
+        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_P4,   KC_P5,   KC_P6,
+        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_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_DEL
+    ),
+    [1] = LAYOUT(
+        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, 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_V,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,        KC_TRNS,   KC_TRNS,
-        KC_TRNS,     KC_TRNS, KC_TRNS,                             KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_V,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, 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_V,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,        KC_TRNS,   KC_TRNS,
-        KC_TRNS,     KC_TRNS, KC_TRNS,                             KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_V,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, 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/sam/sg81m/sg81m.h b/keyboards/sam/sg81m/sg81m.h
index 4736aa8ca3..73e69e439c 100644
--- a/keyboards/sam/sg81m/sg81m.h
+++ b/keyboards/sam/sg81m/sg81m.h
@@ -19,12 +19,11 @@
 #include "quantum.h"
 
 #define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,                  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,                \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2D,        \
-    K30,       K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,     K3C, K3D,        \
-    K40,   K41, K42,                  K45,                 K48, K49, K4A, K4B, K4C, K4D,   \
-    K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A                                  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,     K2D, K3D, K4D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K56, K57, K58, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          K53, K54, K55, \
+    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K50, K51, K52, \
+    K40, K41, K42,                K45,                K48, K49,   K4A, K4B, K4C,   K59, K5A  \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \