Fix a couple of mismatched info.json layout names (#16164)

* Fix a couple of mismatched info.json layout names

* Fix layouts

* Clean up layouts

2 files changed, 139 insertions, 127 deletions

diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index 5718d70507..5e66ec5a94 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -3,69 +3,73 @@
     "url": "mtbkeys.com",
     "maintainer": "MTBKeys",
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
-                {"label": "Esc"       , "x":  0, "y": 0        },
-                {"label": "!"         , "x":  1, "y": 0        },
-                {"label": "@"         , "x":  2, "y": 0        },
-                {"label": "#"         , "x":  3, "y": 0        },
-                {"label": "$"         , "x":  4, "y": 0        },
-                {"label": "%"         , "x":  5, "y": 0        },
-                {"label": "^"         , "x":  6, "y": 0        },
-                {"label": "&"         , "x":  7, "y": 0        },
-                {"label": "*"         , "x":  8, "y": 0        },
-                {"label": "("         , "x":  9, "y": 0        },
-                {"label": ")"         , "x": 10, "y": 0        },
-                {"label": "_"         , "x": 11, "y": 0        },
-                {"label": "+"         , "x": 12, "y": 0        },
-                {"label": "Back Space", "x": 13, "y": 0, "w": 2},
-                {"label": "Tab", "x":  0  , "y": 1, "w": 1.5},
-                {"label": "Q"  , "x":  1.5, "y": 1          },
-                {"label": "W"  , "x":  2.5, "y": 1          },
-                {"label": "E"  , "x":  3.5, "y": 1          },
-                {"label": "R"  , "x":  4.5, "y": 1          },
-                {"label": "T"  , "x":  5.5, "y": 1          },
-                {"label": "Y"  , "x":  6.5, "y": 1          },
-                {"label": "U"  , "x":  7.5, "y": 1          },
-                {"label": "I"  , "x":  8.5, "y": 1          },
-                {"label": "O"  , "x":  9.5, "y": 1          },
-                {"label": "P"  , "x": 10.5, "y": 1          },
-                {"label": "{"  , "x": 11.5, "y": 1          },
-                {"label": "}"  , "x": 12.5, "y": 1          },
-                {"label": "|"  , "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Caps Lock", "x":  0   , "y": 2, "w": 1.75},
-                {"label": "A"        , "x":  1.75, "y": 2           },
-                {"label": "S"        , "x":  2.75, "y": 2           },
-                {"label": "D"        , "x":  3.75, "y": 2           },
-                {"label": "F"        , "x":  4.75, "y": 2           },
-                {"label": "G"        , "x":  5.75, "y": 2           },
-                {"label": "H"        , "x":  6.75, "y": 2           },
-                {"label": "J"        , "x":  7.75, "y": 2           },
-                {"label": "K"        , "x":  8.75, "y": 2           },
-                {"label": "L"        , "x":  9.75, "y": 2           },
-                {"label": ":"        , "x": 10.75, "y": 2           },
-                {"label": "\""       , "x": 11.75, "y": 2           },
-                {"label": "Enter"    , "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Left Shift" , "x":  0   , "y": 3, "w": 2.25},
-                {"label": "Z"          , "x":  2.25, "y": 3           },
-                {"label": "X"          , "x":  3.25, "y": 3           },
-                {"label": "C"          , "x":  4.25, "y": 3           },
-                {"label": "V"          , "x":  5.25, "y": 3           },
-                {"label": "B"          , "x":  6.25, "y": 3           },
-                {"label": "N"          , "x":  7.25, "y": 3           },
-                {"label": "M"          , "x":  8.25, "y": 3           },
-                {"label": "<"          , "x":  9.25, "y": 3           },
-                {"label": ">"          , "x": 10.25, "y": 3           },
-                {"label": "?"          , "x": 11.25, "y": 3           },
-                {"label": "Right Shift", "x": 12.25, "y": 3, "w": 2.75},
-                {"label": "Left Ctrl" , "x":  0   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x":  1.25, "y": 4, "w": 1.25},
-                {"label": "Left Alt"  , "x":  2.5 , "y": 4, "w": 1.25},
-                {"label": "Space"     , "x":  3.75, "y": 4, "w": 6.25},
-                {"label": "Right Ctrl", "x": 10   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "MO(1)"     , "x": 12.5 , "y": 4, "w": 1.25},
-                {"label": "Right Ctrl", "x": 13.75, "y": 4, "w": 1.25}
+                {"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, "w": 2},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
index e60d3eee2f..7d49be306d 100644
--- a/keyboards/mtbkeys/mtb60/solder/info.json
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -3,72 +3,80 @@
     "url": "mtbkeys.com",
     "maintainer": "MTBKeys",
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
-                {"label": "Esc"       , "x":  0, "y": 0},
-                {"label": "!"         , "x":  1, "y": 0},
-                {"label": "@"         , "x":  2, "y": 0},
-                {"label": "#"         , "x":  3, "y": 0},
-                {"label": "$"         , "x":  4, "y": 0},
-                {"label": "%"         , "x":  5, "y": 0},
-                {"label": "^"         , "x":  6, "y": 0},
-                {"label": "&"         , "x":  7, "y": 0},
-                {"label": "*"         , "x":  8, "y": 0},
-                {"label": "("         , "x":  9, "y": 0},
-                {"label": ")"         , "x": 10, "y": 0},
-                {"label": "_"         , "x": 11, "y": 0},
-                {"label": "+"         , "x": 12, "y": 0},
-                {"label": "Back Space", "x": 13, "y": 0},
-                {"label": "Delete"    , "x": 14, "y": 0},
-                {"label": "Tab", "x":  0  , "y": 1, "w": 1.5},
-                {"label": "Q"  , "x":  1.5, "y": 1          },
-                {"label": "W"  , "x":  2.5, "y": 1          },
-                {"label": "E"  , "x":  3.5, "y": 1          },
-                {"label": "R"  , "x":  4.5, "y": 1          },
-                {"label": "T"  , "x":  5.5, "y": 1          },
-                {"label": "Y"  , "x":  6.5, "y": 1          },
-                {"label": "U"  , "x":  7.5, "y": 1          },
-                {"label": "I"  , "x":  8.5, "y": 1          },
-                {"label": "O"  , "x":  9.5, "y": 1          },
-                {"label": "P"  , "x": 10.5, "y": 1          },
-                {"label": "{"  , "x": 11.5, "y": 1          },
-                {"label": "}"  , "x": 12.5, "y": 1          },
-                {"label": "|"  , "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Caps Lock", "x":  0   , "y": 2, "w": 1.75},
-                {"label": "A"        , "x":  1.75, "y": 2           },
-                {"label": "S"        , "x":  2.75, "y": 2           },
-                {"label": "D"        , "x":  3.75, "y": 2           },
-                {"label": "F"        , "x":  4.75, "y": 2           },
-                {"label": "G"        , "x":  5.75, "y": 2           },
-                {"label": "H"        , "x":  6.75, "y": 2           },
-                {"label": "J"        , "x":  7.75, "y": 2           },
-                {"label": "K"        , "x":  8.75, "y": 2           },
-                {"label": "L"        , "x":  9.75, "y": 2           },
-                {"label": ":"        , "x": 10.75, "y": 2           },
-                {"label": "\""       , "x": 11.75, "y": 2           },
-                {"label": "Enter"    , "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Left Shift" , "x":  0   , "y": 3, "w": 2.25},
-                {"label": "Z"          , "x":  2.25, "y": 3           },
-                {"label": "X"          , "x":  3.25, "y": 3           },
-                {"label": "C"          , "x":  4.25, "y": 3           },
-                {"label": "V"          , "x":  5.25, "y": 3           },
-                {"label": "B"          , "x":  6.25, "y": 3           },
-                {"label": "N"          , "x":  7.25, "y": 3           },
-                {"label": "M"          , "x":  8.25, "y": 3           },
-                {"label": "<"          , "x":  9.25, "y": 3           },
-                {"label": ">"          , "x": 10.25, "y": 3           },
-                {"label": "?"          , "x": 11.25, "y": 3           },
-                {"label": "Right Shift", "x": 12.25, "y": 3, "w": 2.75},
-                {"label": "Left Ctrl" , "x":  0   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x":  1.25, "y": 4, "w": 1.25},
-                {"label": "Left Alt"  , "x":  2.5 , "y": 4, "w": 1.25},
-                {"label": "Space"     , "x":  3.75, "y": 4, "w": 2.25},
-                {"label": "Space"     , "x":  6   , "y": 4, "w": 1.25},
-                {"label": "Space"     , "x":  7.25, "y": 4, "w": 2.75},
-                {"label": "Right Ctrl", "x": 10   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "MO(1)"     , "x": 12.5 , "y": 4, "w": 1.25},
-                {"label": "Right Ctrl", "x": 13.75, "y": 4, "w": 1.25}
+                {"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": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"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": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 2.25},
+                {"x": 6, "y": 4, "w": 1.25},
+                {"x": 7.25, "y": 4, "w": 2.75},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4}
             ]
         }
     }