Various keyboard fixes (#23919)

21 files changed, 118 insertions, 126 deletions

diff --git a/keyboards/eason/meow65/info.json b/keyboards/eason/meow65/keyboard.json
index 340a741040..340a741040 100644
--- a/keyboards/eason/meow65/info.json
+++ b/keyboards/eason/meow65/keyboard.json
diff --git a/keyboards/eason/meow65/rules.mk b/keyboards/eason/meow65/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/eason/meow65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/marek128b/ergosplit44/keyboard.json b/keyboards/handwired/marek128b/ergosplit44/keyboard.json
index 8e0c71fc06..f9a88576a7 100644
--- a/keyboards/handwired/marek128b/ergosplit44/keyboard.json
+++ b/keyboards/handwired/marek128b/ergosplit44/keyboard.json
@@ -107,57 +107,57 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"tab", "matrix": [0, 0],"x":0, "y":1.25}, 
-                {"label":"Q", "matrix": [0, 1],"x":1, "y":1.25}, 
-                {"label":"W", "matrix": [0, 2],"x":2, "y":0.75}, 
-                {"label":"E", "matrix": [0, 3],"x":3, "y":0.5}, 
-                {"label":"R", "matrix": [0, 4],"x":4, "y":0.75}, 
-                {"label":"T", "matrix": [0, 5],"x":5, "y":1},    
-                
-                {"label":"Y", "matrix": [0, 6],"x":9.75, "y":1}, 
-                {"label":"U", "matrix": [0, 7],"x":10.75, "y":0.75}, 
-                {"label":"I", "matrix": [0, 8],"x":11.75, "y":0.5}, 
-                {"label":"O", "matrix": [0, 9],"x":12.75, "y":0.75}, 
-                {"label":"P", "matrix": [0, 10],"x":13.75, "y":1.25}, 
-                {"label":"\u00dc", "matrix": [0, 11],"x":14.75, "y":1.25}, 
+                {"matrix": [0, 0],"x": 0, "y": 0.75},
+                {"matrix": [0, 1],"x": 1, "y": 0.75},
+                {"matrix": [0, 2],"x": 2, "y": 0.25},
+                {"matrix": [0, 3],"x": 3, "y": 0},
+                {"matrix": [0, 4],"x": 4, "y": 0.25},
+                {"matrix": [0, 5],"x": 5, "y": 0.5},
 
-                {"label":"back-space", "matrix": [1, 0],"x":0, "y":2.25}, 
-                {"label":"A", "matrix": [1, 1],"x":1, "y":2.25},
-                {"label":"S", "matrix": [1, 2],"x":2, "y":1.75},  
-                {"label":"D", "matrix": [1, 3],"x":3, "y":1.5}, 
-                {"label":"F", "matrix": [1, 4],"x":4, "y":1.75}, 
-                {"label":"G", "matrix": [1, 5],"x":5, "y":2}, 
+                {"matrix": [0, 6],"x": 8, "y": 0.5},
+                {"matrix": [0, 7],"x": 9, "y": 0.25},
+                {"matrix": [0, 8],"x": 10, "y": 0},
+                {"matrix": [0, 9],"x": 11, "y": 0.25},
+                {"matrix": [0, 10],"x": 12, "y": 0.75},
+                {"matrix": [0, 11],"x": 13, "y": 0.75},
 
-                {"label":"H", "matrix": [1, 6],"x":9.75, "y":2}, 
-                {"label":"J", "matrix": [1, 7],"x":10.75, "y":1.75}, 
-                {"label":"K", "matrix": [1, 8],"x":11.75, "y":1.5}, 
-                {"label":"L", "matrix": [1, 9],"x":12.75, "y":1.75}, 
-                {"label":"\u00d6", "matrix": [1, 10],"x":13.75, "y":2.25}, 
-                {"label":"\u00c4", "matrix": [1, 11],"x":14.75, "y":2.25}, 
-                
-                {"label":"shift", "matrix": [2, 0],"x":0, "y":3.25}, 
-                {"label":"Z", "matrix": [2, 1],"x":1, "y":3.25}, 
-                {"label":"X", "matrix": [2, 2],"x":2, "y":2.75}, 
-                {"label":"C", "matrix": [2, 3],"x":3, "y":2.5}, 
-                {"label":"V", "matrix": [2, 4],"x":4, "y":2.75}, 
-                {"label":"B", "matrix": [2, 5],"x":5, "y":3}, 
-            
-                {"label":"N", "matrix": [2, 6],"x":9.75, "y":3}, 
-                {"label":"M", "matrix": [2, 7],"x":10.75, "y":2.75}, 
-                {"label":"<", "matrix": [2, 8],"x":11.75, "y":2.5}, 
-                {"label":":", "matrix": [2, 9],"x":12.75, "y":2.75}, 
-                {"label":"_", "matrix": [2, 10],"x":13.75, "y":3.25}, 
-                {"label":"Shift", "matrix": [2, 11],"x":14.75, "y":3.25}, 
+                {"matrix": [1, 0],"x": 0, "y": 1.75},
+                {"matrix": [1, 1],"x": 1, "y": 1.75},
+                {"matrix": [1, 2],"x": 2, "y": 1.25},
+                {"matrix": [1, 3],"x": 3, "y": 1},
+                {"matrix": [1, 4],"x": 4, "y": 1.25},
+                {"matrix": [1, 5],"x": 5, "y": 1.5},
 
-                {"label":"L2", "matrix": [3, 2],"x":-3.5, "y":4.5}, 
-                {"label":"Alt", "matrix": [3, 3],"x":-2.25, "y":7.25},
-                {"label":"Strg", "matrix": [3, 4],"x":-1.0, "y":7.25}, 
-                {"label":"Space", "matrix": [3, 5],"x":0, "y":7}, 
+                {"matrix": [1, 6],"x": 8, "y": 1.5},
+                {"matrix": [1, 7],"x": 9, "y": 1.25},
+                {"matrix": [1, 8],"x": 10, "y": 1},
+                {"matrix": [1, 9],"x": 11, "y": 1.25},
+                {"matrix": [1, 10],"x": 12, "y": 1.75},
+                {"matrix": [1, 11],"x": 13, "y": 1.75},
 
-                {"label":"Space", "matrix": [3, 6],"x":-1.0, "y":8.5}, 
-                {"label":"Strg", "matrix": [3, 7],"x":0, "y":8.75}, 
-                {"label":"AltGr", "matrix": [3, 8],"x":1.25, "y":8.75},
-                {"label":"L1", "matrix": [3, 9],"x":2.5, "y":5.75}
+                {"matrix": [2, 0],"x": 0, "y": 2.75},
+                {"matrix": [2, 1],"x": 1, "y": 2.75},
+                {"matrix": [2, 2],"x": 2, "y": 2.25},
+                {"matrix": [2, 3],"x": 3, "y": 2},
+                {"matrix": [2, 4],"x": 4, "y": 2.25},
+                {"matrix": [2, 5],"x": 5, "y": 2.5},
+
+                {"matrix": [2, 6],"x": 8, "y": 2.5},
+                {"matrix": [2, 7],"x": 9, "y": 2.25},
+                {"matrix": [2, 8],"x": 10, "y": 2},
+                {"matrix": [2, 9],"x": 11, "y": 2.25},
+                {"matrix": [2, 10],"x": 12, "y": 2.75},
+                {"matrix": [2, 11],"x": 13, "y": 2.75},
+
+                {"matrix": [3, 2],"x": 2.5, "y": 4},
+                {"matrix": [3, 3],"x": 3.5, "y": 4},
+                {"matrix": [3, 4],"x": 4.5, "y": 4},
+                {"matrix": [3, 5],"x": 5.5, "y": 4},
+
+                {"matrix": [3, 6],"x": 7.5, "y": 4},
+                {"matrix": [3, 7],"x": 8.5, "y": 4},
+                {"matrix": [3, 8],"x": 9.5, "y": 4},
+                {"matrix": [3, 9],"x": 10.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/keyboard.json
index 5e9fd2dcd8..5e9fd2dcd8 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/keyboard.json
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/keyboard.json
index b61db7df86..b61db7df86 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/keyboard.json
diff --git a/keyboards/keebio/irispad/rev8/info.json b/keyboards/keebio/irispad/rev8/keyboard.json
index 9845ebc9fd..9845ebc9fd 100644
--- a/keyboards/keebio/irispad/rev8/info.json
+++ b/keyboards/keebio/irispad/rev8/keyboard.json
diff --git a/keyboards/meetlab/kalice/keyboard.json b/keyboards/meetlab/kalice/keyboard.json
index 5cb46eb9cf..5e53fe4904 100644
--- a/keyboards/meetlab/kalice/keyboard.json
+++ b/keyboards/meetlab/kalice/keyboard.json
@@ -44,77 +44,77 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x": 0.45, "y": 0},
-                {"matrix": [0, 1], "x": 1.75, "y": 0},
-                {"matrix": [0, 2], "x": 2.75, "y": 0},
-                {"matrix": [0, 3], "x": 3.75, "y": 0},
-                {"matrix": [0, 4], "x": 4.75, "y": 0},
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 13.75, "y": 0},
-                {"matrix": [0, 14], "x": 14.75, "y": 0, "w": 2},
-                {"matrix": [0, 15], "x": 16.75, "y": 0},
-                {"matrix": [1, 0], "x": 0.3, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"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, "w": 1.5},
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [2, 0], "x": 0.15, "y": 2},
-                {"matrix": [2, 1], "x": 1.4, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.15, "y": 2},
-                {"matrix": [2, 3], "x": 4.15, "y": 2},
-                {"matrix": [2, 4], "x": 5.15, "y": 2},
-                {"matrix": [2, 5], "x": 6.15, "y": 2},
-                {"matrix": [2, 6], "x": 7.15, "y": 2},
-                {"matrix": [2, 7], "x": 8.15, "y": 2},
-                {"matrix": [2, 8], "x": 9.15, "y": 2},
-                {"matrix": [2, 9], "x": 10.15, "y": 2},
-                {"matrix": [2, 10], "x": 11.15, "y": 2},
-                {"matrix": [2, 11], "x": 12.15, "y": 2},
-                {"matrix": [2, 12], "x": 13.15, "y": 2},
-                {"matrix": [2, 13], "x": 14.15, "y": 2, "w": 2.25},
-                {"matrix": [2, 15], "x": 16.4, "y": 2},
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-                {"matrix": [3, 7], "x": 8.5, "y": 3},
-                {"matrix": [3, 8], "x": 9.5, "y": 3},
-                {"matrix": [3, 9], "x": 10.5, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3},
-                {"matrix": [3, 12], "x": 13.5, "y": 3},
-                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 16.25, "y": 3},
-                {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 3.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 10], "x": 7.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 11], "x": 10.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4},
-                {"matrix": [4, 14], "x": 16.25, "y": 4},
-                {"matrix": [4, 15], "x": 17.25, "y": 4}
+                {"matrix": [0, 0], "x": 0.3, "y": 0},
+                {"matrix": [0, 1], "x": 1.6, "y": 0},
+                {"matrix": [0, 2], "x": 2.6, "y": 0},
+                {"matrix": [0, 3], "x": 3.6, "y": 0},
+                {"matrix": [0, 4], "x": 4.6, "y": 0},
+                {"matrix": [0, 5], "x": 5.6, "y": 0},
+                {"matrix": [0, 6], "x": 6.6, "y": 0},
+                {"matrix": [0, 7], "x": 7.6, "y": 0},
+                {"matrix": [0, 8], "x": 8.6, "y": 0},
+                {"matrix": [0, 9], "x": 9.6, "y": 0},
+                {"matrix": [0, 10], "x": 10.6, "y": 0},
+                {"matrix": [0, 11], "x": 11.6, "y": 0},
+                {"matrix": [0, 12], "x": 12.6, "y": 0},
+                {"matrix": [0, 13], "x": 13.6, "y": 0},
+                {"matrix": [0, 14], "x": 14.6, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16.6, "y": 0},
+                {"matrix": [1, 0], "x": 0.15, "y": 1},
+                {"matrix": [1, 1], "x": 1.35, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.85, "y": 1},
+                {"matrix": [1, 3], "x": 3.85, "y": 1},
+                {"matrix": [1, 4], "x": 4.85, "y": 1},
+                {"matrix": [1, 5], "x": 5.85, "y": 1},
+                {"matrix": [1, 6], "x": 6.85, "y": 1},
+                {"matrix": [1, 7], "x": 7.85, "y": 1},
+                {"matrix": [1, 8], "x": 8.85, "y": 1},
+                {"matrix": [1, 9], "x": 9.85, "y": 1},
+                {"matrix": [1, 10], "x": 10.85, "y": 1},
+                {"matrix": [1, 11], "x": 11.85, "y": 1},
+                {"matrix": [1, 12], "x": 12.85, "y": 1},
+                {"matrix": [1, 13], "x": 13.85, "y": 1},
+                {"matrix": [1, 14], "x": 14.85, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 16.35, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"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, "w": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2},
+                {"matrix": [3, 1], "x": 1.1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.35, "y": 3},
+                {"matrix": [3, 3], "x": 4.35, "y": 3},
+                {"matrix": [3, 4], "x": 5.35, "y": 3},
+                {"matrix": [3, 5], "x": 6.35, "y": 3},
+                {"matrix": [3, 6], "x": 7.35, "y": 3},
+                {"matrix": [3, 7], "x": 8.35, "y": 3},
+                {"matrix": [3, 8], "x": 9.35, "y": 3},
+                {"matrix": [3, 9], "x": 10.35, "y": 3},
+                {"matrix": [3, 10], "x": 11.35, "y": 3},
+                {"matrix": [3, 11], "x": 12.35, "y": 3},
+                {"matrix": [3, 12], "x": 13.35, "y": 3},
+                {"matrix": [3, 13], "x": 14.35, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 16.1, "y": 3},
+                {"matrix": [4, 0], "x": 1.1, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.35, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.6, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 5.1, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 7.35, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 10.1, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13.85, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 15.1, "y": 4},
+                {"matrix": [4, 14], "x": 16.1, "y": 4},
+                {"matrix": [4, 15], "x": 17.1, "y": 4}
             ]
         }
     }
diff --git a/keyboards/moky/moky67/info.json b/keyboards/moky/moky67/keyboard.json
index 8737790b69..8737790b69 100644
--- a/keyboards/moky/moky67/info.json
+++ b/keyboards/moky/moky67/keyboard.json
diff --git a/keyboards/moky/moky67/rules.mk b/keyboards/moky/moky67/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/moky/moky67/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/projectd/75/iso/info.json b/keyboards/projectd/75/iso/keyboard.json
index d861500031..d861500031 100644
--- a/keyboards/projectd/75/iso/info.json
+++ b/keyboards/projectd/75/iso/keyboard.json
diff --git a/keyboards/projectd/75/iso/rules.mk b/keyboards/projectd/75/iso/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/projectd/75/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/rot13labs/h4ckb0ard/info.json b/keyboards/rot13labs/h4ckb0ard/keyboard.json
index 0ffe5be40d..0ffe5be40d 100644
--- a/keyboards/rot13labs/h4ckb0ard/info.json
+++ b/keyboards/rot13labs/h4ckb0ard/keyboard.json
diff --git a/keyboards/rot13labs/h4ckb0ard/rules.mk b/keyboards/rot13labs/h4ckb0ard/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/rot13labs/h4ckb0ard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/sleepy_craft_studios/sleepy_keeb/info.json b/keyboards/sleepy_craft_studios/sleepy_keeb/keyboard.json
index 635a780ed4..635a780ed4 100644
--- a/keyboards/sleepy_craft_studios/sleepy_keeb/info.json
+++ b/keyboards/sleepy_craft_studios/sleepy_keeb/keyboard.json
diff --git a/keyboards/sleepy_craft_studios/sleepy_keeb/rules.mk b/keyboards/sleepy_craft_studios/sleepy_keeb/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/sleepy_craft_studios/sleepy_keeb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/smart68/info.json b/keyboards/smart68/keyboard.json
index f97c347ed5..f97c347ed5 100644
--- a/keyboards/smart68/info.json
+++ b/keyboards/smart68/keyboard.json
diff --git a/keyboards/smart68/rules.mk b/keyboards/smart68/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/smart68/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/vertex/cycle7/info.json b/keyboards/vertex/cycle7/keyboard.json
index d9b2f30168..d9b2f30168 100644
--- a/keyboards/vertex/cycle7/info.json
+++ b/keyboards/vertex/cycle7/keyboard.json
diff --git a/keyboards/vertex/cycle7/rules.mk b/keyboards/vertex/cycle7/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/vertex/cycle7/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/viktus/tx_roundup_pad/info.json b/keyboards/viktus/tx_roundup_pad/keyboard.json
index c4b013bb0e..c4b013bb0e 100644
--- a/keyboards/viktus/tx_roundup_pad/info.json
+++ b/keyboards/viktus/tx_roundup_pad/keyboard.json
diff --git a/keyboards/viktus/tx_roundup_pad/rules.mk b/keyboards/viktus/tx_roundup_pad/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/viktus/tx_roundup_pad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank