Fix layout macro keys with no matrix position (#20033)

43 files changed, 402 insertions, 508 deletions

diff --git a/keyboards/40percentclub/4x4/4x4.c b/keyboards/40percentclub/4x4/4x4.c
deleted file mode 100644
index 8510b358f5..0000000000
--- a/keyboards/40percentclub/4x4/4x4.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x4.h"
diff --git a/keyboards/40percentclub/4x4/4x4.h b/keyboards/40percentclub/4x4/4x4.h
deleted file mode 100644
index 8cc5a150aa..0000000000
--- a/keyboards/40percentclub/4x4/4x4.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33 \
-) \
-{ \
-    { K00, K01, K02, K03, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K10, K11, K12, K13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K20, K21, K22, K23, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K30, K31, K32, K33, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___} \
-}
-#define LAYOUT_ortho_4x8( \
-    K00, K01, K02, K03, K04, K05, K06, K07, \
-    K10, K11, K12, K13, K14, K15, K16, K17, \
-    K20, K21, K22, K23, K24, K25, K26, K27, \
-    K30, K31, K32, K33, K34, K35, K36, K37\
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K30, K31, K32, K33, K34, K35, K35, K37, ___, ___, ___, ___, ___, ___, ___, ___} \
-}
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, ___, ___, ___, ___}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, ___, ___, ___, ___}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, ___, ___, ___, ___}, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, ___, ___, ___, ___} \
-}
-
-#define LAYOUT_ortho_4x16( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, K0f, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, K1f, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, K0f }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, K1f }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f } \
-}
diff --git a/keyboards/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json
index eb066e591b..389aad3619 100644
--- a/keyboards/40percentclub/4x4/info.json
+++ b/keyboards/40percentclub/4x4/info.json
@@ -19,190 +19,190 @@
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3}
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "matrix": [3, 3]}
             ]
         },
         "LAYOUT_ortho_4x8": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x":4, "y":1, "matrix": [1, 4]},
+                {"x":5, "y":1, "matrix": [1, 5]},
+                {"x":6, "y":1, "matrix": [1, 6]},
+                {"x":7, "y":1, "matrix": [1, 7]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x":4, "y":2, "matrix": [2, 4]},
+                {"x":5, "y":2, "matrix": [2, 5]},
+                {"x":6, "y":2, "matrix": [2, 6]},
+                {"x":7, "y":2, "matrix": [2, 7]},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3}
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "matrix": [3, 3]},
+                {"x":4, "y":3, "matrix": [3, 4]},
+                {"x":5, "y":3, "matrix": [3, 5]},
+                {"x":6, "y":3, "matrix": [3, 6]},
+                {"x":7, "y":3, "matrix": [3, 7]}
             ]
         },
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x":4, "y":1, "matrix": [1, 4]},
+                {"x":5, "y":1, "matrix": [1, 5]},
+                {"x":6, "y":1, "matrix": [1, 6]},
+                {"x":7, "y":1, "matrix": [1, 7]},
+                {"x":8, "y":1, "matrix": [1, 8]},
+                {"x":9, "y":1, "matrix": [1, 9]},
+                {"x":10, "y":1, "matrix": [1, 10]},
+                {"x":11, "y":1, "matrix": [1, 11]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x":4, "y":2, "matrix": [2, 4]},
+                {"x":5, "y":2, "matrix": [2, 5]},
+                {"x":6, "y":2, "matrix": [2, 6]},
+                {"x":7, "y":2, "matrix": [2, 7]},
+                {"x":8, "y":2, "matrix": [2, 8]},
+                {"x":9, "y":2, "matrix": [2, 9]},
+                {"x":10, "y":2, "matrix": [2, 10]},
+                {"x":11, "y":2, "matrix": [2, 11]},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3}
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "matrix": [3, 3]},
+                {"x":4, "y":3, "matrix": [3, 4]},
+                {"x":5, "y":3, "matrix": [3, 5]},
+                {"x":6, "y":3, "matrix": [3, 6]},
+                {"x":7, "y":3, "matrix": [3, 7]},
+                {"x":8, "y":3, "matrix": [3, 8]},
+                {"x":9, "y":3, "matrix": [3, 9]},
+                {"x":10, "y":3, "matrix": [3, 10]},
+                {"x":11, "y":3, "matrix": [3, 11]}
             ]
         },
         "LAYOUT_ortho_4x16": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
+                {"x":12, "y":0, "matrix": [0, 12]},
+                {"x":13, "y":0, "matrix": [0, 13]},
+                {"x":14, "y":0, "matrix": [0, 14]},
+                {"x":15, "y":0, "matrix": [0, 15]},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-                {"x":15, "y":1},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x":4, "y":1, "matrix": [1, 4]},
+                {"x":5, "y":1, "matrix": [1, 5]},
+                {"x":6, "y":1, "matrix": [1, 6]},
+                {"x":7, "y":1, "matrix": [1, 7]},
+                {"x":8, "y":1, "matrix": [1, 8]},
+                {"x":9, "y":1, "matrix": [1, 9]},
+                {"x":10, "y":1, "matrix": [1, 10]},
+                {"x":11, "y":1, "matrix": [1, 11]},
+                {"x":12, "y":1, "matrix": [1, 12]},
+                {"x":13, "y":1, "matrix": [1, 13]},
+                {"x":14, "y":1, "matrix": [1, 14]},
+                {"x":15, "y":1, "matrix": [1, 15]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
-                {"x":15, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x":4, "y":2, "matrix": [2, 4]},
+                {"x":5, "y":2, "matrix": [2, 5]},
+                {"x":6, "y":2, "matrix": [2, 6]},
+                {"x":7, "y":2, "matrix": [2, 7]},
+                {"x":8, "y":2, "matrix": [2, 8]},
+                {"x":9, "y":2, "matrix": [2, 9]},
+                {"x":10, "y":2, "matrix": [2, 10]},
+                {"x":11, "y":2, "matrix": [2, 11]},
+                {"x":12, "y":2, "matrix": [2, 12]},
+                {"x":13, "y":2, "matrix": [2, 13]},
+                {"x":14, "y":2, "matrix": [2, 14]},
+                {"x":15, "y":2, "matrix": [2, 15]},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
-                {"x":15, "y":3}
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "matrix": [3, 3]},
+                {"x":4, "y":3, "matrix": [3, 4]},
+                {"x":5, "y":3, "matrix": [3, 5]},
+                {"x":6, "y":3, "matrix": [3, 6]},
+                {"x":7, "y":3, "matrix": [3, 7]},
+                {"x":8, "y":3, "matrix": [3, 8]},
+                {"x":9, "y":3, "matrix": [3, 9]},
+                {"x":10, "y":3, "matrix": [3, 10]},
+                {"x":11, "y":3, "matrix": [3, 11]},
+                {"x":12, "y":3, "matrix": [3, 12]},
+                {"x":13, "y":3, "matrix": [3, 13]},
+                {"x":14, "y":3, "matrix": [3, 14]},
+                {"x":15, "y":3, "matrix": [3, 15]}
             ]
         }
     }
diff --git a/keyboards/aliceh66/pianoforte/pianoforte.h b/keyboards/aliceh66/pianoforte/pianoforte.h
index 614af44cfe..d6891d8cab 100644
--- a/keyboards/aliceh66/pianoforte/pianoforte.h
+++ b/keyboards/aliceh66/pianoforte/pianoforte.h
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         { K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
         { K080, K081, K082, K083, K084, K085, K086, K087, ____ }, \
         { K090, K091, K092, K093, K094, K095, K096, K097, ____ }, \
-        { K100, K101, ____, ____, ____, ____, K106, K107, K108 }, \
+        { K100, K101, ____, ____, ____, K105, K106, K107, K108 }, \
         { K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
 }
 
diff --git a/keyboards/blaster75/blaster75.h b/keyboards/blaster75/blaster75.h
index b3b6995d30..4bf63f7fa0 100644
--- a/keyboards/blaster75/blaster75.h
+++ b/keyboards/blaster75/blaster75.h
@@ -90,8 +90,8 @@ ANSI Layout :
 ) { \
     { 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, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
     { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \
     { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E }  \
 }
diff --git a/keyboards/bpiphany/pegasushoof/2013/2013.h b/keyboards/bpiphany/pegasushoof/2013/2013.h
index 7454c7c860..d34f0a0382 100644
--- a/keyboards/bpiphany/pegasushoof/2013/2013.h
+++ b/keyboards/bpiphany/pegasushoof/2013/2013.h
@@ -71,5 +71,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         /* 4 */  { KC_NO, KC_NO, KC4,   KC_NO, KE4,   KF4,   KG4,   KH4,   KI4,   KJ4,   KK4,   KL4,   KM4,   KC_NO, KO4,   KP4,   KQ4,   KR4   },\
         /* 5 */  { KC_NO, KC_NO, KC5,   KC_NO, KE5,   KF5,   KG5,   KH5,   KI5,   KJ5,   KK5,   KL5,   KM5,   KN5,   KO5,   KP5,   KC_NO, KC_NO },\
         /* 6 */  { KC_NO, KC_NO, KC6,   KC_NO, KC_NO, KF6,   KG6,   KC_NO, KI6,   KJ6,   KK6,   KL6,   KC_NO, KN6,   KO6,   KC_NO, KQ6,   KC_NO },\
-        /* 7 */  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KF7,   KG7,   KH7,   KI7,   KJ7,   KK7,   KL7,   KK7,   KL7,   KO7,   KP7,   KC_NO, KC_NO } \
+        /* 7 */  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KF7,   KG7,   KH7,   KI7,   KJ7,   KK7,   KL7,   KM7,   KN7,   KO7,   KP7,   KC_NO, KC_NO } \
 }
diff --git a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h b/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h
index 8abf2875a9..bbf1bc5ca8 100644
--- a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h
+++ b/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h
@@ -52,7 +52,7 @@
     k30, k31, k32,                k36,           k39,      k3B, k3C  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, kOC }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k2C }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k3C }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
     { k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, k39, XXX, k3B, k3C }  \
 }
diff --git a/keyboards/checkerboards/quark_plus/quark_plus.h b/keyboards/checkerboards/quark_plus/quark_plus.h
index 4152acbe50..ca98b3957e 100644
--- a/keyboards/checkerboards/quark_plus/quark_plus.h
+++ b/keyboards/checkerboards/quark_plus/quark_plus.h
@@ -47,7 +47,7 @@
     { k30, k31, k32, k33, k34, k35 }, \
     { k40, k41, k42, k43, k44, k45 }, \
     { k50, k51, k52, k53, k54, k55 }, \
-    { k60, k61, k62, XXX, k64, k65 }, \
+    { k60, k61, k62, k63, k64, k65 }, \
     { k70, k71, XXX, k73, k74, k75 } \
 }
 #define LAYOUT_2x225u( \
diff --git a/keyboards/coarse/vinta/vinta.h b/keyboards/coarse/vinta/vinta.h
index 18f51cd434..4041217cab 100644
--- a/keyboards/coarse/vinta/vinta.h
+++ b/keyboards/coarse/vinta/vinta.h
@@ -31,7 +31,7 @@
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, XXX, k2E, k2F }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, XXX, k3E, k3F }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, XXX, k4D, k4E, k4F } \
+    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, k4C, k4D, k4E, k4F } \
 }
 
 #define LAYOUT_65_ansi_blocker( \
diff --git a/keyboards/cozykeys/speedo/v2/v2.h b/keyboards/cozykeys/speedo/v2/v2.h
index 295d6f8faf..ad1bdd2f26 100644
--- a/keyboards/cozykeys/speedo/v2/v2.h
+++ b/keyboards/cozykeys/speedo/v2/v2.h
@@ -21,16 +21,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ___ KC_NO
 
 #define LAYOUT( \
-    k01, k02, k03, k04, k05, k06,           k07, k08, k09, k10, k11, k12, \
-    k13, k14, k15, k16, k17, k18,    k19,   k20, k21, k22, k23, k24, k25, \
-    k26, k27, k28, k29, k30, k31,    k32,   k33, k34, k35, k36, k37, k38, \
-    k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, \
-    k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 \
-) \
-{ \
-    { k01, k01, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
-    { k13, k15, k15, k16, k17, k18, k19, ___, k20, k21, k22, k23, k24, k25 }, \
-    { k26, k28, k28, k29, k30, k31, ___, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52 }, \
-    { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
+    k00, k01, k02, k03, k04, k05,           k08, k09, k0A, k0B, k0C, k0D, \
+    k10, k11, k12, k13, k14, k15,    k16,   k18, k19, k1A, k1B, k1C, k1D, \
+    k20, k21, k22, k23, k24, k25,    k27,   k28, k29, k2A, k2B, k2C, k2D, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D \
+) { \
+    { k00, k01, k02, k03, k04, k05, ___, ___, k08, k09, k0A, k0B, k0C, k0D }, \
+    { k10, k11, k12, k13, k14, k15, k16, ___, k18, k19, k1A, k1B, k1C, k1D }, \
+    { k20, k21, k22, k23, k24, k25, ___, k27, k28, k29, k2A, k2B, k2C, k2D }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \
 }
diff --git a/keyboards/duck/tcv3/tcv3.h b/keyboards/duck/tcv3/tcv3.h
index 8e40e94aec..33792d4e6a 100644
--- a/keyboards/duck/tcv3/tcv3.h
+++ b/keyboards/duck/tcv3/tcv3.h
@@ -24,7 +24,7 @@
     K10, K11,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,   K1H, K1I, \
     K20, K21,   K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,      K2G,   K2H, K2I, \
     K30, K31,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      K3G,   K3H, K3I, \
-    K40, K41,   K42, k43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, K4G,  K4H,       \
+    K40, K41,   K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, K4G,  K4H,       \
     K50, K51,   K52, K53, K54,                          K5A,      K5C,      K5E, K5F,  K5G, K5H, K5I   \
 ) { \
   { K00, K01,   K02, XXX, K04, K05, K06, K07, XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, XXX, K0I, K0J }, \
diff --git a/keyboards/exclusive/e65/e65.h b/keyboards/exclusive/e65/e65.h
index 281b52c76e..5800060a3f 100644
--- a/keyboards/exclusive/e65/e65.h
+++ b/keyboards/exclusive/e65/e65.h
@@ -129,7 +129,7 @@
         { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
         { K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
         { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-        { K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
+        { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
         { K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  KC_NO, K413,  K414,  K415 }  \
 }
 
diff --git a/keyboards/eyeohdesigns/sprh/sprh.h b/keyboards/eyeohdesigns/sprh/sprh.h
index 5a367131c5..0b895529d2 100644
--- a/keyboards/eyeohdesigns/sprh/sprh.h
+++ b/keyboards/eyeohdesigns/sprh/sprh.h
@@ -103,11 +103,11 @@
         k40, k41, k42, k44, k45, k46, k48, k49, k4b, k4c, k4d\
 ) \
 { \
-    {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},\
-    {KC_NO, k31, k32, k33, k34,   k35,   k36, k37,   k38, k39, k3a,   k3b, k3c, k3d},\
-    {k40,   k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
+    {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},\
+    {KC_NO, k31, k32, k33, k34, k35, k36, k37,   k38, k39, k3a,   k3b, k3c, k3d},\
+    {k40,   k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
 }
 #define LAYOUT_bd5( \
         k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d,\
diff --git a/keyboards/fjlabs/peaker/peaker.h b/keyboards/fjlabs/peaker/peaker.h
index a1f53a87d6..189ac59635 100644
--- a/keyboards/fjlabs/peaker/peaker.h
+++ b/keyboards/fjlabs/peaker/peaker.h
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     K40, K41, K42,           K45,                K49, K4A, K4B,      K4D, K4E, K4F, K4G  \
 ) { \
     { K00, K01,   K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K21,   K1D,   K1E,   K1F,   K1G   }, \
+    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
     { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C,   K2D,   KC_NO, KC_NO, KC_NO }, \
     { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   K3D,   KC_NO, K3F,   KC_NO }, \
     { K40, K41,   K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   KC_NO, K4D,   K4E,   K4F,   K4G   } \
diff --git a/keyboards/foxlab/time80/time80.h b/keyboards/foxlab/time80/time80.h
index f451b32f01..54ac3fb9d7 100644
--- a/keyboards/foxlab/time80/time80.h
+++ b/keyboards/foxlab/time80/time80.h
@@ -34,11 +34,11 @@
    k40, k4D, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4E,                     k4C,      \
    k50,      k51, k52,                k54,                k58, k59, k5A, k5B,           k5E, k5C, k57  \
 ) { \
-  { k00,   KC_NO, k02, k03,   k04, k05,   KC_NO, k07, k08, k09,   k0A,   k0B,   k0C, KC_NO, 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, KC_NO, k2E }, \
-  { k30,   k31,   k32, k33,   k34, k35,   k36,   k37, k38, k39,   k3A,   k3B,   k3C, KC_NO, k3E }, \
-  { k40,   k41,   k42, k43,   k44, k45,   k46,   k47, k48, k49,   k4A,   k4B,   k4C, k4D,   k4E }, \
-  { k50,   k51,   k52, KC_NO, k54, KC_NO, KC_NO, k57, k58, k59,   k5A,   k5B,   k5C, KC_NO, k5E }, \
-  { KC_NO, k61,   k62, KC_NO, k64, k65,   k66,   k67, k68, KC_NO, KC_NO, KC_NO, k6C, KC_NO, k6E } \
+  { k00,   k01, k02, k03,   k04, k05,   KC_NO, k07, k08, k09,   k0A,   k0B,   k0C, KC_NO, 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, KC_NO, k2E }, \
+  { k30,   k31, k32, k33,   k34, k35,   k36,   k37, k38, k39,   k3A,   k3B,   k3C, KC_NO, k3E }, \
+  { k40,   k41, k42, k43,   k44, k45,   k46,   k47, k48, k49,   k4A,   k4B,   k4C, k4D,   k4E }, \
+  { k50,   k51, k52, KC_NO, k54, KC_NO, KC_NO, k57, k58, k59,   k5A,   k5B,   k5C, KC_NO, k5E }, \
+  { KC_NO, k61, k62, KC_NO, k64, k65,   k66,   k67, k68, KC_NO, KC_NO, KC_NO, k6C, KC_NO, k6E } \
 }
diff --git a/keyboards/generic_panda/panda65_01/panda65_01.h b/keyboards/generic_panda/panda65_01/panda65_01.h
index ced6e9b196..0a4de225ab 100644
--- a/keyboards/generic_panda/panda65_01/panda65_01.h
+++ b/keyboards/generic_panda/panda65_01/panda65_01.h
@@ -47,7 +47,7 @@
     k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,             k314, k315, \
     k400,       k402,                   k406,                         k411,       k413, k414, k415  \
 ) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014  k015 },  \
+    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014,  k015 },  \
     { k100,  KC_NO, k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k115 }, \
     { k200,  KC_NO, k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  k212,  KC_NO, k215 }, \
     { k300,  KC_NO, KC_NO, k301,  k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k314,  k315 }, \
diff --git a/keyboards/handwired/ortho5x13/ortho5x13.h b/keyboards/handwired/ortho5x13/ortho5x13.h
index bd34925a9a..e946bea9c1 100644
--- a/keyboards/handwired/ortho5x13/ortho5x13.h
+++ b/keyboards/handwired/ortho5x13/ortho5x13.h
@@ -13,6 +13,6 @@
   { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
   { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c }, \
   { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c }, \
-  { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b, k3c }, \
+  { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
   { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c } \
 }
diff --git a/keyboards/handwired/qc60/proto/proto.h b/keyboards/handwired/qc60/proto/proto.h
index 7e7755d0e2..1ab9a235ae 100644
--- a/keyboards/handwired/qc60/proto/proto.h
+++ b/keyboards/handwired/qc60/proto/proto.h
@@ -49,7 +49,7 @@
     {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
     {L30, L31, L32, L33, L34, L35, L36, XXX}, \
     {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
-    {R07, XXX, R05, R04, R03, R02, R01, R00}, \
+    {R07, R06, R05, R04, R03, R02, R01, R00}, \
     {R17, R16, R15, R14, R13, R12, R11, R10}, \
     {R27, R26, R25, R24, R23, R22, R21, XXX}, \
     {R37, R36, R35, R34, R33, R32, R31, XXX}, \
diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h b/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
index 1ab4c00abc..a451e1273a 100644
--- a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
+++ b/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ) \
  { \
     { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, XXX }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
     { K20, K21, K22, K23, K24, K25, K26, K27 }, \
     { K30, K31, K32, K33, K34, K35, K36, XXX }, \
     { K40, K41, K42, K43, K44, K45, K46, K47 }, \
diff --git a/keyboards/hotdox/hotdox.h b/keyboards/hotdox/hotdox.h
index 348ec6b291..3db092d3bd 100644
--- a/keyboards/hotdox/hotdox.h
+++ b/keyboards/hotdox/hotdox.h
@@ -134,7 +134,7 @@ void ergodox_blink_all_leds(void);
     { k10,   k11, k12, k13, k14, k15, k16,      k17,   k18, k19, k1A, k1B, k1C, k1D    }, \
     { k20,   k21, k22, k23, k24, k25, KC_NO,    KC_NO, k28, k29, k2A, k2B, k2C, k2D    }, \
     { k30,   k31, k32, k33, k34, k35, k36,      k37,   k38, k39, k3A, k3B, k3C, k3D    }, \
-    { k40,   k41, k42, k43, k44, k45, k45,      k47,   k48, k49, k4A, k4B, k4C, k4D    }, \
+    { k40,   k41, k42, k43, k44, k45, k46,      k47,   k48, k49, k4A, k4B, k4C, k4D    }, \
     { KC_NO, k51, k52, k53, k54, k55, k56,      k57,   k58, k59, k5A, k5B, k5C, KC_NO  }  \
    }
 
diff --git a/keyboards/jones/v03/v03.h b/keyboards/jones/v03/v03.h
index 6584f6cbc2..38f894c5dd 100644
--- a/keyboards/jones/v03/v03.h
+++ b/keyboards/jones/v03/v03.h
@@ -43,14 +43,14 @@ FULL 11x11 ROUND-ROBIN MATRIX for Reference
  */
 #define LAYOUT_all( \
     k17, k27, k37, k47, k57, k67, k76, k86, k96, ka6, kb6, k81, k91, ka1, kb1, \
-    k18,   k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, K92,    ka2, kb2, \
+    k18,   k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, k92,    ka2, kb2, \
     k19,   k39, k49, k59, k69, k79, k89, k98, ka8, kb8, k83, k93,    ka3, kb3, \
     k1a,      k3a, k4a, k5a, k6a, k7a, k8a, k9a, ka9, kb9, k84, k94, ka4, kb4, \
     k1b, k2b, k3b, k4b,      k6b,      k8b,      k9b, kab, k85, k95, ka5, kb5  \
 ) \
 { \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k81,   k91,   ka1,   kb1 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82,   KC_NO, ka2,   kb2 }, \
+    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82,   k92,   ka2,   kb2 }, \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k83,   k93,   ka3,   kb3 }, \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k84,   k94,   ka4,   kb4 }, \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k85,   k95,   ka5,   kb5 }, \
diff --git a/keyboards/kabedon/kabedon78s/kabedon78s.h b/keyboards/kabedon/kabedon78s/kabedon78s.h
index 72752920b7..64709a9bf4 100644
--- a/keyboards/kabedon/kabedon78s/kabedon78s.h
+++ b/keyboards/kabedon/kabedon78s/kabedon78s.h
@@ -10,7 +10,7 @@
         KE06,   KE00, KE01, KE02, KE03, KE04, KE05,         KE07, KE08, KE09, KE10, KE11, KE12, KE13,         KE14, KE15, KE16, KE17, \
         KF06,   KF00, KF01, KF02, KF03,    KF04,               KF08,    KF09, KF10, KF11, KF12, KF13,            KF14,   KF16        \
 ) { \
-  { KA00, KA01, KA02, KA03, KA04, KA05,KC_NO, KA07, KA08, KA09, KA10, KA11, KA12, KB13, KA14, KA15, KA16, KA17}, \
+  { KA00, KA01, KA02, KA03, KA04, KA05,KC_NO, KA07, KA08, KA09, KA10, KA11, KA12, KA13, KA14, KA15, KA16, KA17}, \
   { KB00, KB01, KB02, KB03, KB04, KB05, KB06, KB07, KB08, KB09, KB10, KB11, KB12, KB13, KB14, KB15, KB16, KB17}, \
   { KC00, KC01, KC02, KC03, KC04, KC05, KC06, KC07, KC08, KC09, KC10, KC11, KC12, KC13, KC14, KC15, KC16, KC17}, \
   { KD00, KD01, KD02, KD03, KD04, KD05, KD06, KD07, KD08, KD09, KD10, KD11, KD12, KD13, KD14, KD15, KD16,KC_NO}, \
diff --git a/keyboards/kapcave/gskt00/gskt00.h b/keyboards/kapcave/gskt00/gskt00.h
index d0ac51acd7..120e021ce3 100755
--- a/keyboards/kapcave/gskt00/gskt00.h
+++ b/keyboards/kapcave/gskt00/gskt00.h
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     k30, k40, k50,           k60,                     k00, k10,      k20 \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
     { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \
     { k30, k31, k32, k33, k34, k35, k36, k37 }, \
     { k40, k41, k42, k43, k44, k45, k46, k47 }, \
diff --git a/keyboards/keebio/sinc/rev1/rev1.h b/keyboards/keebio/sinc/rev1/rev1.h
index cf692f960d..b8c9f7a14f 100644
--- a/keyboards/keebio/sinc/rev1/rev1.h
+++ b/keyboards/keebio/sinc/rev1/rev1.h
@@ -3,6 +3,8 @@
 #include "sinc.h"
 #include "quantum.h"
 
+#define XXX KC_NO
+
 #define LAYOUT_75( \
   LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
   LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
@@ -12,18 +14,18 @@
   LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
   ) \
   { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80( \
@@ -35,18 +37,18 @@
   LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
   ) \
   { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
     { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
     { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_75_with_macro( \
@@ -59,17 +61,17 @@
   ) \
   { \
     { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { LD1, LD2, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80_with_macro( \
@@ -82,17 +84,17 @@
   ) \
   { \
     { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { LD1, LD2, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
     { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
     { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_75_iso( \
@@ -104,18 +106,18 @@
   LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
   ) \
   { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80_iso( \
@@ -127,18 +129,18 @@
   LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
   ) \
   { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
     { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, RB9 }, \
     { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_75_iso_with_macro( \
@@ -151,17 +153,17 @@
   ) \
   { \
     { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
     { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80_iso_with_macro( \
@@ -174,17 +176,17 @@
   ) \
   { \
     { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
     { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
     { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, RB9 }, \
     { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_all( \
@@ -197,15 +199,15 @@
   ) \
   { \
     { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
     { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
     { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
     { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
     { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
diff --git a/keyboards/linworks/fave87/fave87.h b/keyboards/linworks/fave87/fave87.h
index 7c3490f457..fa86337081 100644
--- a/keyboards/linworks/fave87/fave87.h
+++ b/keyboards/linworks/fave87/fave87.h
@@ -72,14 +72,14 @@
 ) { \
   { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
   { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
+  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028  }, \
   { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
   { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
   { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058  }, \
   { K060,  K061,  K062,  K063,  K064,  K065,  KC_NO, KC_NO, KC_NO }, \
   { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
   { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { KC_NO, K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
+  { KC_NO, K091,  K092,  K093,  K094,  K095,  K096,  KC_NO, KC_NO }, \
   { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
   { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
 }
@@ -116,14 +116,14 @@
 ) { \
   { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
   { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
+  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028  }, \
   { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
   { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
   { K050,  K051,  K052,  K053,  K054,  K055,  KC_NO, K057,  K058  }, \
   { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
   { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
   { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { K090,  K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
+  { K090,  K091,  K092,  K093,  K094,  K095,  K096, KC_NO, KC_NO }, \
   { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
   { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
 }
diff --git a/keyboards/lz/erghost/erghost.h b/keyboards/lz/erghost/erghost.h
index 5f5244340c..9ea2f716f5 100644
--- a/keyboards/lz/erghost/erghost.h
+++ b/keyboards/lz/erghost/erghost.h
@@ -62,6 +62,6 @@
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C, KC_NO,   K2E,   K2F,   K2G   }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, KC_NO,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
     { K50,   K51,   K52,   KC_NO, K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
 }
diff --git a/keyboards/mechlovin/foundation/foundation.h b/keyboards/mechlovin/foundation/foundation.h
index 0444817bbf..717e9f3b16 100644
--- a/keyboards/mechlovin/foundation/foundation.h
+++ b/keyboards/mechlovin/foundation/foundation.h
@@ -27,7 +27,7 @@
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,     K0G,   K0H }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,     K1G,   K1H }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   KC_NO, KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO,   K3G, KC_NO }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   KC_NO,   K3G, KC_NO }, \
     { K40,   K41,   K42,   K43, KC_NO, KC_NO, KC_NO,   K47, KC_NO, KC_NO, KC_NO,   K4B,   K4C,   K4D,   K4E,   K4F,     K4G,   K4H }, \
 }
 
diff --git a/keyboards/mechlovin/tmkl/tmkl.h b/keyboards/mechlovin/tmkl/tmkl.h
index d31f61012a..3d30e61d89 100644
--- a/keyboards/mechlovin/tmkl/tmkl.h
+++ b/keyboards/mechlovin/tmkl/tmkl.h
@@ -30,6 +30,6 @@
     { 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,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   KC_NO, K4B,   K4C,   K4D   }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D   }, \
     { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D   }, \
 }
diff --git a/keyboards/meletrix/zoom87/zoom87.h b/keyboards/meletrix/zoom87/zoom87.h
index 03b94bfc40..87000be8b7 100644
--- a/keyboards/meletrix/zoom87/zoom87.h
+++ b/keyboards/meletrix/zoom87/zoom87.h
@@ -214,5 +214,5 @@
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
     { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   K56,   K55,   KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
 }
diff --git a/keyboards/merge/uma/uma.h b/keyboards/merge/uma/uma.h
index b7fb9a5d61..3e2b5fa264 100644
--- a/keyboards/merge/uma/uma.h
+++ b/keyboards/merge/uma/uma.h
@@ -126,7 +126,7 @@
     { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
     { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
     { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
     { R00, R01, R02, R03, R04, R05, R06, R07 }, \
     { R10, R11, R12, R13, R14, R15, R16, R17 }, \
     { R20, R21, R22, R23, R24, R25, R26, R27 }, \
@@ -145,7 +145,7 @@
     { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
     { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
     { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
     { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
     { R10, R11, R12, R13, R14, R15, R16, R17 }, \
     { R20, R21, R22, R23, R24, R25, R26, R27 }, \
@@ -164,7 +164,7 @@
     { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
     { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
     { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
     { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
     { R10, R11, R12, R13, R14, R15, R16, R17 }, \
     { R20, R21, R22, R23, R24, R25, R26, R27 }, \
@@ -183,7 +183,7 @@
     { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
     { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
     { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
     { R00, R01, R02, R03, R04, R05, R06, R07 }, \
     { R10, R11, R12, R13, R14, R15, R16, R17 }, \
     { R20, R21, R22, R23, R24, R25, R26, R27 }, \
diff --git a/keyboards/mokey/ginkgo65/ginkgo65.h b/keyboards/mokey/ginkgo65/ginkgo65.h
index 1594e5c793..5aa3d3aa61 100644
--- a/keyboards/mokey/ginkgo65/ginkgo65.h
+++ b/keyboards/mokey/ginkgo65/ginkgo65.h
@@ -212,5 +212,5 @@
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E, XXX }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
-    { k40, k41, k42, K43, k44, XXX, K46, XXX, XXX, XXX, k4A, XXX, k4C, k4D, k4E, XXX }, \
+    { k40, k41, k42, K43, k44, XXX, K46, XXX, XXX, K49, k4A, XXX, k4C, k4D, k4E, XXX }, \
 }
diff --git a/keyboards/nixkeyboards/day_off/day_off.c b/keyboards/nixkeyboards/day_off/day_off.c
deleted file mode 100644
index 2694682f09..0000000000
--- a/keyboards/nixkeyboards/day_off/day_off.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Nix Keyboards
- *
- * 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 "day_off.h"
diff --git a/keyboards/nixkeyboards/day_off/day_off.h b/keyboards/nixkeyboards/day_off/day_off.h
deleted file mode 100644
index f890b837e6..0000000000
--- a/keyboards/nixkeyboards/day_off/day_off.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Nix Keyboards
- *
- * 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(K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,\
-               K011, K012, K013, K014, 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, K213, K214, K300, K301, K302, K303, K304, K305, K306, \
-               K307, K308, K309, K310, K311, K312, K313, K314, K400, K401, \
-               K402, K403, K405, K407, K408, K410, K411, K412, K413, K414) \
-    {   {KC_NO, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
-        {KC_NO, 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, K213, K214}, \
-        {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314}, \
-        {K400, K401, K402, K403, KC_NO, K405, KC_NO, K407, K408, KC_NO, K410, K411, K412, K413, KC_NO} \
-    }
diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/info.json
index 989033c6b4..3bb6933b4c 100644
--- a/keyboards/nixkeyboards/day_off/info.json
+++ b/keyboards/nixkeyboards/day_off/info.json
@@ -26,76 +26,76 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"~", "x":1.5, "y":0},
-                {"label":"!", "x":2.5, "y":0},
-                {"label":"@", "x":3.5, "y":0},
-                {"label":"#", "x":4.5, "y":0},
-                {"label":"$", "x":5.5, "y":0},
-                {"label":"%", "x":6.5, "y":0},
-                {"label":"^", "x":7.5, "y":0},
-                {"label":"&", "x":8.5, "y":0},
-                {"label":"*", "x":9.5, "y":0},
-                {"label":"(", "x":10.5, "y":0},
-                {"label":")", "x":11.5, "y":0},
-                {"label":"_", "x":12.5, "y":0},
-                {"label":"+", "x":13.5, "y":0},
-                {"label":"Bksp", "x":14.5, "y":0},
-                {"label":"Del", "x":15.5, "y":0},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":8, "y":1},
-                {"label":"U", "x":9, "y":1},
-                {"label":"I", "x":10, "y":1},
-                {"label":"O", "x":11, "y":1},
-                {"label":"P", "x":12, "y":1},
-                {"label":"{", "x":13, "y":1},
-                {"label":"}", "x":14, "y":1},
-                {"label":"|", "x":15, "y":1, "w":1.5},
-                {"label":"M1", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
-                {"label":"A", "x":3.25, "y":2},
-                {"label":"S", "x":4.25, "y":2},
-                {"label":"D", "x":5.25, "y":2},
-                {"label":"F", "x":6.25, "y":2},
-                {"label":"G", "x":7.25, "y":2},
-                {"label":"H", "x":8.25, "y":2},
-                {"label":"J", "x":9.25, "y":2},
-                {"label":"K", "x":10.25, "y":2},
-                {"label":"L", "x":11.25, "y":2},
-                {"label":":", "x":12.25, "y":2},
-                {"label":"\"", "x":13.25, "y":2},
-                {"label":"Enter", "x":14.25, "y":2, "w":2.25},
-                {"label":"M2", "x":0, "y":3},
-                {"label":"", "x":1.5, "y":3, "w":1.25},
-                {"label":"Shift", "x":2.75, "y":3},
-                {"label":"Z", "x":3.75, "y":3},
-                {"label":"X", "x":4.75, "y":3},
-                {"label":"C", "x":5.75, "y":3},
-                {"label":"V", "x":6.75, "y":3},
-                {"label":"B", "x":7.75, "y":3},
-                {"label":"N", "x":8.75, "y":3},
-                {"label":"M", "x":9.75, "y":3},
-                {"label":"<", "x":10.75, "y":3},
-                {"label":">", "x":11.75, "y":3},
-                {"label":"?", "x":12.75, "y":3},
-                {"label":"Shift", "x":13.75, "y":3, "w":1.75},
-                {"label":"", "x":15.5, "y":3},
-                {"label":"M3", "x":0, "y":4},
-                {"label":"Ctrl", "x":1.5, "y":4, "w":1.25},
-                {"label":"Win", "x":2.75, "y":4, "w":1.25},
-                {"label":"Alt", "x":4, "y":4, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4, "w":6.25},
-                {"label":"Space", "x":5.25, "y":4, "w":2.25},
-                {"label":"Mod", "x":7.5, "y":4, "w":1.25},
-                {"label":"Space", "x":8.75, "y":4, "w":2.25},
-                {"label":"Alt", "x":11.5, "y":4, "w":1.25},
-                {"label":"Win", "x":12.75, "y":4, "w":1.25},
-                {"label":"Menu", "x":14, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}
+                {"label":"~", "x":1.5, "y":0, "matrix":[0, 1]},
+                {"label":"!", "x":2.5, "y":0, "matrix":[0, 2]},
+                {"label":"@", "x":3.5, "y":0, "matrix":[0, 3]},
+                {"label":"#", "x":4.5, "y":0, "matrix":[0, 4]},
+                {"label":"$", "x":5.5, "y":0, "matrix":[0, 5]},
+                {"label":"%", "x":6.5, "y":0, "matrix":[0, 6]},
+                {"label":"^", "x":7.5, "y":0, "matrix":[0, 7]},
+                {"label":"&", "x":8.5, "y":0, "matrix":[0, 8]},
+                {"label":"*", "x":9.5, "y":0, "matrix":[0, 9]},
+                {"label":"(", "x":10.5, "y":0, "matrix":[0, 10]},
+                {"label":")", "x":11.5, "y":0, "matrix":[0, 11]},
+                {"label":"_", "x":12.5, "y":0, "matrix":[0, 12]},
+                {"label":"+", "x":13.5, "y":0, "matrix":[0, 13]},
+                {"label":"Bksp", "x":14.5, "y":0, "matrix":[0, 14]},
+                {"label":"Del", "x":15.5, "y":0, "matrix":[1, 1]},
+                {"label":"Tab", "x":1.5, "y":1, "w":1.5, "matrix":[1, 2]},
+                {"label":"Q", "x":3, "y":1, "matrix":[1, 3]},
+                {"label":"W", "x":4, "y":1, "matrix":[1, 4]},
+                {"label":"E", "x":5, "y":1, "matrix":[1, 5]},
+                {"label":"R", "x":6, "y":1, "matrix":[1, 6]},
+                {"label":"T", "x":7, "y":1, "matrix":[1, 7]},
+                {"label":"Y", "x":8, "y":1, "matrix":[1, 8]},
+                {"label":"U", "x":9, "y":1, "matrix":[1, 9]},
+                {"label":"I", "x":10, "y":1, "matrix":[1, 10]},
+                {"label":"O", "x":11, "y":1, "matrix":[1, 11]},
+                {"label":"P", "x":12, "y":1, "matrix":[1, 12]},
+                {"label":"{", "x":13, "y":1, "matrix":[1, 13]},
+                {"label":"}", "x":14, "y":1, "matrix":[1, 14]},
+                {"label":"|", "x":15, "y":1, "w":1.5, "matrix":[2, 0]},
+                {"label":"M1", "x":0, "y":2, "matrix":[2, 1]},
+                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75, "matrix":[2, 2]},
+                {"label":"A", "x":3.25, "y":2, "matrix":[2, 3]},
+                {"label":"S", "x":4.25, "y":2, "matrix":[2, 4]},
+                {"label":"D", "x":5.25, "y":2, "matrix":[2, 5]},
+                {"label":"F", "x":6.25, "y":2, "matrix":[2, 6]},
+                {"label":"G", "x":7.25, "y":2, "matrix":[2, 7]},
+                {"label":"H", "x":8.25, "y":2, "matrix":[2, 8]},
+                {"label":"J", "x":9.25, "y":2, "matrix":[2, 9]},
+                {"label":"K", "x":10.25, "y":2, "matrix":[2, 10]},
+                {"label":"L", "x":11.25, "y":2, "matrix":[2, 11]},
+                {"label":":", "x":12.25, "y":2, "matrix":[2, 12]},
+                {"label":"\"", "x":13.25, "y":2, "matrix":[2, 13]},
+                {"label":"Enter", "x":14.25, "y":2, "w":2.25, "matrix":[2, 14]},
+                {"label":"M2", "x":0, "y":3, "matrix":[3, 0]},
+                {"label":"", "x":1.5, "y":3, "w":1.25, "matrix":[3, 1]},
+                {"label":"Shift", "x":2.75, "y":3, "matrix":[3, 2]},
+                {"label":"Z", "x":3.75, "y":3, "matrix":[3, 3]},
+                {"label":"X", "x":4.75, "y":3, "matrix":[3, 4]},
+                {"label":"C", "x":5.75, "y":3, "matrix":[3, 5]},
+                {"label":"V", "x":6.75, "y":3, "matrix":[3, 6]},
+                {"label":"B", "x":7.75, "y":3, "matrix":[3, 7]},
+                {"label":"N", "x":8.75, "y":3, "matrix":[3, 8]},
+                {"label":"M", "x":9.75, "y":3, "matrix":[3, 9]},
+                {"label":"<", "x":10.75, "y":3, "matrix":[3, 10]},
+                {"label":">", "x":11.75, "y":3, "matrix":[3, 11]},
+                {"label":"?", "x":12.75, "y":3, "matrix":[3, 12]},
+                {"label":"Shift", "x":13.75, "y":3, "w":1.75, "matrix":[3, 13]},
+                {"label":"", "x":15.5, "y":3, "matrix":[3, 14]},
+                {"label":"M3", "x":0, "y":4, "matrix":[4, 0]},
+                {"label":"Ctrl", "x":1.5, "y":4, "w":1.25, "matrix":[4, 1]},
+                {"label":"Win", "x":2.75, "y":4, "w":1.25, "matrix":[4, 2]},
+                {"label":"Alt", "x":4, "y":4, "w":1.25, "matrix":[4, 3]},
+                {"label":"Space", "x":5.25, "y":4, "w":6.25, "matrix":[4, 5]},
+                {"label":"Space", "x":5.25, "y":4, "w":2.25, "matrix":[4, 7]},
+                {"label":"Mod", "x":7.5, "y":4, "w":1.25, "matrix":[4, 8]},
+                {"label":"Space", "x":8.75, "y":4, "w":2.25, "matrix":[4, 10]},
+                {"label":"Alt", "x":11.5, "y":4, "w":1.25, "matrix":[4, 11]},
+                {"label":"Win", "x":12.75, "y":4, "w":1.25, "matrix":[4, 12]},
+                {"label":"Menu", "x":14, "y":4, "w":1.25, "matrix":[4, 13]},
+                {"label":"Ctrl", "x":15.25, "y":4, "w":1.25, "matrix":[4, 14]}
             ]
         }
     }
diff --git a/keyboards/owlab/jelly_epoch/soldered/soldered.h b/keyboards/owlab/jelly_epoch/soldered/soldered.h
index e69e258027..9b5951a525 100644
--- a/keyboards/owlab/jelly_epoch/soldered/soldered.h
+++ b/keyboards/owlab/jelly_epoch/soldered/soldered.h
@@ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____}, \
         { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313}, \
         { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413}, \
-        { K500, K501, K502, ____, K504, ____, K506, K507, K508, K509, K510, K511, K512, K513}  \
+        { K500, K501, K502, ____, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513}  \
 }
 
 #define LAYOUT_75_iso( \
diff --git a/keyboards/phoenix/phoenix.h b/keyboards/phoenix/phoenix.h
index bd8e4a30ab..3657ef05f0 100644
--- a/keyboards/phoenix/phoenix.h
+++ b/keyboards/phoenix/phoenix.h
@@ -69,26 +69,26 @@ inline void led3_off(void) { led_pin_off(6); };
 #define LAYOUT_ergodox_pretty(                                           \
     L00,L01,L02,L03,L04,L05,L06,           R00,R01,R02,R03,R04,R05,R06,  \
     L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \
-    L20,L21,L22,L23,L24,L25,                   R21,R22,R23,R24,R25,R26,  \
+    L20,L21,L22,L23,L24,L25,                   R20,R21,R22,R23,R24,R25,  \
     L30,L31,L32,L33,L34,L35,L36,           R30,R31,R32,R33,R34,R35,R36,  \
-    L40,L41,L42,L43,L44,                           R42,R43,R44,R45,R46,  \
-                            L55,L56,   R50,R51,                          \
-                                L54,   R52,                              \
-                        L53,L52,L51,   R55,R54,R53 )                     \
+    L40,L41,L42,L43,L44,                           R40,R41,R42,R43,R44,  \
+                            L53,L54,   R54,R53,                          \
+                                L55,   R55,                              \
+                        L50,L51,L52,   R52,R51,R50 )                     \
                                           \
    /* matrix positions */                 \
     {                                     \
-    { L00, L10, L02, L03, L04, L05, L06 },\
+    { L00, L01, L02, L03, L04, L05, L06 },\
     { L10, L11, L12, L13, L14, L15, L16 },\
-    { L20, L21, L22, L23, L24, L25 },     \
+    { L20, L21, L22, L23, L24, L25, KC_NO },\
     { L30, L31, L32, L33, L34, L35, L36 },\
-    { L40, L41, L42, L43, L44 },          \
-    { L53, L52, L51, L55, L56, L54 },     \
+    { L40, L41, L42, L43, L44, KC_NO, KC_NO },\
+    { L50, L51, L52, L53, L54, L55, KC_NO },\
                                           \
     { R00, R01, R02, R03, R04, R05, R06 },\
     { R10, R11, R12, R13, R14, R15, R16 },\
-    { R20, R21, R22, R23, R24, R25 },     \
+    { R20, R21, R22, R23, R24, R25, KC_NO },\
     { R30, R31, R32, R33, R34, R35, R36 },\
-    { R40, R41, R42, R43, R44 },          \
-    { R53, R54, R55, R51, R50, R52 },     \
+    { R40, R41, R42, R43, R44, KC_NO, KC_NO },\
+    { R50, R51, R52, R53, R54, R55, KC_NO }\
     }
diff --git a/keyboards/plywrks/lune/lune.h b/keyboards/plywrks/lune/lune.h
index 444f855123..46fd71c775 100644
--- a/keyboards/plywrks/lune/lune.h
+++ b/keyboards/plywrks/lune/lune.h
@@ -42,6 +42,6 @@
     { k40, k41, k42, k43, k44, k45, k46, ___ }, \
     { k50, k51, k52, ___, k54, k55, k56, k57 }, \
     { ___, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, ___, k74, k75, k75, k77 }, \
+    { k70, k71, k72, ___, k74, k75, k76, k77 }, \
     { k80, k81, k82, k83, k84, k85, ___, k87 }, \
 }
diff --git a/keyboards/projectkb/signature87/signature87.h b/keyboards/projectkb/signature87/signature87.h
index b97570ef95..48d7d2f40d 100644
--- a/keyboards/projectkb/signature87/signature87.h
+++ b/keyboards/projectkb/signature87/signature87.h
@@ -71,7 +71,7 @@
 }
 
 #define LAYOUT_wkl_ansi( \
-  K00,      K11, K01, K12, K02, K13, K03, K14, K04,      K15, K06, K16, k07,   K17, K08, K18, \
+  K00,      K11, K01, K12, K02, K13, K03, K14, K04,      K15, K06, K16, K07,   K17, K08, K18, \
   K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,   K37, K28, K38, \
   K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K57,   K47, K58, K48, \
   K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,           K66,                  \
diff --git a/keyboards/rmi_kb/squishy65/squishy65.h b/keyboards/rmi_kb/squishy65/squishy65.h
index 25480c8748..270153a1b1 100644
--- a/keyboards/rmi_kb/squishy65/squishy65.h
+++ b/keyboards/rmi_kb/squishy65/squishy65.h
@@ -35,7 +35,7 @@
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \
     { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \
-    { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \
 }
 
 // ISO
@@ -52,7 +52,7 @@
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \
-    { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \
 }
 
 // Exposed
@@ -69,5 +69,5 @@
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \
-    { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, XXX, k4e, k4f }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, XXX, k4e, k4f }, \
 }
diff --git a/keyboards/rmi_kb/wete/v1/v1.h b/keyboards/rmi_kb/wete/v1/v1.h
index 55bb035b8b..24250e8fb0 100644
--- a/keyboards/rmi_kb/wete/v1/v1.h
+++ b/keyboards/rmi_kb/wete/v1/v1.h
@@ -188,7 +188,7 @@
          k51,    k52,     k54,  k55,  k56, k57,       k5a,     k5b, k5c, k5d,  k5e,  k5f,  k5h, k5i, k5j \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \
     { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \
     { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \
@@ -213,7 +213,7 @@
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \
     { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \
-    { k50, XXX, k52, XXX, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \
+    { k50, k51, k52, k53, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \
 }
 
 //////////////////////////////// EXPOSED ////////////////////////////////
diff --git a/keyboards/rmi_kb/wete/v2/v2.h b/keyboards/rmi_kb/wete/v2/v2.h
index 75c9430c02..0a8ceed571 100644
--- a/keyboards/rmi_kb/wete/v2/v2.h
+++ b/keyboards/rmi_kb/wete/v2/v2.h
@@ -46,7 +46,7 @@ void adjust_leds(void);
     { k70, ___, k72, k73, k74, k75, k76, k77, k78, k79 }, \
     { k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \
     { k90, k91, ___, k93, k94, k95, k96, k97, k98, k99 }, \
-    { ka0, ___, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
+    { ka0, ka1, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
     { ___, ___, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \
     { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
 }
@@ -74,7 +74,7 @@ void adjust_leds(void);
     { k70, ___, k72, k73, k74, k75, k76, k77, k78, k79 }, \
     { k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \
     { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99 }, \
-    { ka0, ___, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
+    { ka0, ka1, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
     { ___, ___, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \
     { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
 }
@@ -96,7 +96,7 @@ void adjust_leds(void);
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, ___, k08, k09 }, \
     { k10, k11, k12, k13, ___, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
     { k30 ,k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
     { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
     { k50, k51, k52, k53, k54, k55, k56, k57, ___, k59 }, \
diff --git a/keyboards/xiudi/xd87/xd87.h b/keyboards/xiudi/xd87/xd87.h
index 2d700d7ba4..af6adea5bb 100644
--- a/keyboards/xiudi/xd87/xd87.h
+++ b/keyboards/xiudi/xd87/xd87.h
@@ -31,7 +31,7 @@
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX, XXX }, \
     { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \
     { k50, k51, k52, XXX, XXX, k55, XXX, XXX, k58, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
 }
diff --git a/keyboards/ymdk/melody96/melody96.h b/keyboards/ymdk/melody96/melody96.h
index 3d3bc6070c..8edbca1135 100644
--- a/keyboards/ymdk/melody96/melody96.h
+++ b/keyboards/ymdk/melody96/melody96.h
@@ -118,7 +118,7 @@
     { XXX, k71, k72, k73, k74, k75, k76, k77, k78 }, \
     { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
     { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
-    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
+    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8 }, \
     { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
 }