Clueboard 2x1800 Refactor (#3179)

* Readme cleanup

* Refactor: matrices and info.json

* Refactor: keymaps

* Moved xyverz config.h

9 files changed, 390 insertions, 1922 deletions

diff --git a/keyboards/clueboard/2x1800/2x1800.h b/keyboards/clueboard/2x1800/2x1800.h
index 2ce0cd1265..a4e86e8f22 100644
--- a/keyboards/clueboard/2x1800/2x1800.h
+++ b/keyboards/clueboard/2x1800/2x1800.h
@@ -44,7 +44,7 @@
     { kb0, kb1, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO } \
 }
 
-#define LAYOUT_4U_SPACE( \
+#define LAYOUT_4u_space( \
       k00, k01, k02, k03,    k04,   k06, k07, k08, k09,   k0a, k60, k61, k62,   k63, k64, k65, k66,    k67, k68, k69, k6a, \
       k10, k11, k12, k13,   k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75,    k76,   k77, k78, k79, k7a, \
       k20, k21, k22, k23,    k24,  k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85,   k86,  k87, k88, k89, k8a, \
@@ -67,7 +67,7 @@
     { kb0, KC_NO, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO } \
 }
 
-#define LAYOUT_7U_SPACE( \
+#define LAYOUT_7u_space( \
       k00, k01, k02, k03,    k04,   k06, k07, k08, k09,   k0a, k60, k61, k62,   k63, k64, k65, k66,    k67, k68, k69, k6a, \
       k10, k11, k12, k13,   k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75,    k76,   k77, k78, k79, k7a, \
       k20, k21, k22, k23,    k24,  k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85,   k86,  k87, k88, k89, k8a, \
diff --git a/keyboards/clueboard/2x1800/info.json b/keyboards/clueboard/2x1800/info.json
index 81ff138d93..86fd37ffa5 100644
--- a/keyboards/clueboard/2x1800/info.json
+++ b/keyboards/clueboard/2x1800/info.json
@@ -6,1922 +6,390 @@
   "height": 6.5,
   "layouts": {
     "LAYOUT": {
+      "key_count": 127,
       "layout": [
-        {
-          "label": "Home",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "End",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "PgUp",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "PgDn",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "Esc",
-          "x": 4.75,
-          "y": 0
-        },
-        {
-          "label": "F1",
-          "x": 6.25,
-          "y": 0
-        },
-        {
-          "label": "F2",
-          "x": 7.25,
-          "y": 0
-        },
-        {
-          "label": "F3",
-          "x": 8.25,
-          "y": 0
-        },
-        {
-          "label": "F4",
-          "x": 9.25,
-          "y": 0
-        },
-        {
-          "label": "F5",
-          "x": 10.75,
-          "y": 0
-        },
-        {
-          "label": "F6",
-          "x": 11.75,
-          "y": 0
-        },
-        {
-          "label": "F7",
-          "x": 12.75,
-          "y": 0
-        },
-        {
-          "label": "F8",
-          "x": 13.75,
-          "y": 0
-        },
-        {
-          "label": "F9",
-          "x": 15.25,
-          "y": 0
-        },
-        {
-          "label": "F10",
-          "x": 16.25,
-          "y": 0
-        },
-        {
-          "label": "F11",
-          "x": 17.25,
-          "y": 0
-        },
-        {
-          "label": "F12",
-          "x": 18.25,
-          "y": 0
-        },
-        {
-          "label": "PrtSc",
-          "x": 20,
-          "y": 0
-        },
-        {
-          "label": "Scroll Lock",
-          "x": 21,
-          "y": 0
-        },
-        {
-          "label": "Pause",
-          "x": 22,
-          "y": 0
-        },
-        {
-          "label": "Insert",
-          "x": 23,
-          "y": 0
-        },
-        {
-          "label": "-",
-          "x": 0,
-          "y": 1.25
-        },
-        {
-          "label": "Num Lock",
-          "x": 1,
-          "y": 1.25
-        },
-        {
-          "label": "/",
-          "x": 2,
-          "y": 1.25
-        },
-        {
-          "label": "*",
-          "x": 3,
-          "y": 1.25
-        },
-        {
-          "label": "~",
-          "x": 4.5,
-          "y": 1.25
-        },
-        {
-          "label": "!",
-          "x": 5.5,
-          "y": 1.25
-        },
-        {
-          "label": "@",
-          "x": 6.5,
-          "y": 1.25
-        },
-        {
-          "label": "#",
-          "x": 7.5,
-          "y": 1.25
-        },
-        {
-          "label": "$",
-          "x": 8.5,
-          "y": 1.25
-        },
-        {
-          "label": "%",
-          "x": 9.5,
-          "y": 1.25
-        },
-        {
-          "label": "^",
-          "x": 10.5,
-          "y": 1.25
-        },
-        {
-          "label": "&",
-          "x": 11.5,
-          "y": 1.25
-        },
-        {
-          "label": "*",
-          "x": 12.5,
-          "y": 1.25
-        },
-        {
-          "label": "(",
-          "x": 13.5,
-          "y": 1.25
-        },
-        {
-          "label": ")",
-          "x": 14.5,
-          "y": 1.25
-        },
-        {
-          "label": "_",
-          "x": 15.5,
-          "y": 1.25
-        },
-        {
-          "label": "+",
-          "x": 16.5,
-          "y": 1.25
-        },
-        {
-          "label": "Backspace",
-          "x": 17.5,
-          "y": 1.25,
-          "w": 2
-        },
-        {
-          "label": "Num Lock",
-          "x": 20,
-          "y": 1.25
-        },
-        {
-          "label": "/",
-          "x": 21,
-          "y": 1.25
-        },
-        {
-          "label": "*",
-          "x": 22,
-          "y": 1.25
-        },
-        {
-          "label": "-",
-          "x": 23,
-          "y": 1.25
-        },
-        {
-          "label": "+",
-          "x": 0,
-          "y": 2.25,
-          "h": 2
-        },
-        {
-          "label": "7",
-          "x": 1,
-          "y": 2.25
-        },
-        {
-          "label": "8",
-          "x": 2,
-          "y": 2.25
-        },
-        {
-          "label": "9",
-          "x": 3,
-          "y": 2.25
-        },
-        {
-          "label": "Tab",
-          "x": 4.5,
-          "y": 2.25,
-          "w": 1.5
-        },
-        {
-          "label": "Q",
-          "x": 6,
-          "y": 2.25
-        },
-        {
-          "label": "W",
-          "x": 7,
-          "y": 2.25
-        },
-        {
-          "label": "E",
-          "x": 8,
-          "y": 2.25
-        },
-        {
-          "label": "R",
-          "x": 9,
-          "y": 2.25
-        },
-        {
-          "label": "T",
-          "x": 10,
-          "y": 2.25
-        },
-        {
-          "label": "Y",
-          "x": 11,
-          "y": 2.25
-        },
-        {
-          "label": "U",
-          "x": 12,
-          "y": 2.25
-        },
-        {
-          "label": "I",
-          "x": 13,
-          "y": 2.25
-        },
-        {
-          "label": "O",
-          "x": 14,
-          "y": 2.25
-        },
-        {
-          "label": "P",
-          "x": 15,
-          "y": 2.25
-        },
-        {
-          "label": "{",
-          "x": 16,
-          "y": 2.25
-        },
-        {
-          "label": "}",
-          "x": 17,
-          "y": 2.25
-        },
-        {
-          "label": "|",
-          "x": 18,
-          "y": 2.25,
-          "w": 1.5
-        },
-        {
-          "label": "7",
-          "x": 20,
-          "y": 2.25
-        },
-        {
-          "label": "8",
-          "x": 21,
-          "y": 2.25
-        },
-        {
-          "label": "9",
-          "x": 22,
-          "y": 2.25
-        },
-        {
-          "label": "+",
-          "x": 23,
-          "y": 2.25,
-          "h": 2
-        },
-        {
-          "label": "4",
-          "x": 1,
-          "y": 3.25
-        },
-        {
-          "label": "5",
-          "x": 2,
-          "y": 3.25
-        },
-        {
-          "label": "6",
-          "x": 3,
-          "y": 3.25
-        },
-        {
-          "label": "Caps Lock",
-          "x": 4.5,
-          "y": 3.25,
-          "w": 1.75
-        },
-        {
-          "label": "A",
-          "x": 6.25,
-          "y": 3.25
-        },
-        {
-          "label": "S",
-          "x": 7.25,
-          "y": 3.25
-        },
-        {
-          "label": "D",
-          "x": 8.25,
-          "y": 3.25
-        },
-        {
-          "label": "F",
-          "x": 9.25,
-          "y": 3.25
-        },
-        {
-          "label": "G",
-          "x": 10.25,
-          "y": 3.25
-        },
-        {
-          "label": "H",
-          "x": 11.25,
-          "y": 3.25
-        },
-        {
-          "label": "J",
-          "x": 12.25,
-          "y": 3.25
-        },
-        {
-          "label": "K",
-          "x": 13.25,
-          "y": 3.25
-        },
-        {
-          "label": "L",
-          "x": 14.25,
-          "y": 3.25
-        },
-        {
-          "label": ":",
-          "x": 15.25,
-          "y": 3.25
-        },
-        {
-          "label": "\"",
-          "x": 16.25,
-          "y": 3.25
-        },
-        {
-          "label": "Enter",
-          "x": 17.25,
-          "y": 3.25,
-          "w": 2.25
-        },
-        {
-          "label": "4",
-          "x": 20,
-          "y": 3.25
-        },
-        {
-          "label": "5",
-          "x": 21,
-          "y": 3.25
-        },
-        {
-          "label": "6",
-          "x": 22,
-          "y": 3.25
-        },
-        {
-          "label": "Enter",
-          "x": 0,
-          "y": 4.25,
-          "h": 2
-        },
-        {
-          "label": "1",
-          "x": 1,
-          "y": 4.25
-        },
-        {
-          "label": "2",
-          "x": 2,
-          "y": 4.25
-        },
-        {
-          "label": "3",
-          "x": 3,
-          "y": 4.25
-        },
-        {
-          "label": "\\u2191",
-          "x": 4.25,
-          "y": 4.5
-        },
-        {
-          "label": "Shift",
-          "x": 5.5,
-          "y": 4.25,
-          "w": 1.25
-        },
-        {
-          "label": "Z",
-          "x": 6.75,
-          "y": 4.25
-        },
-        {
-          "label": "X",
-          "x": 7.75,
-          "y": 4.25
-        },
-        {
-          "label": "C",
-          "x": 8.75,
-          "y": 4.25
-        },
-        {
-          "label": "V",
-          "x": 9.75,
-          "y": 4.25
-        },
-        {
-          "label": "B",
-          "x": 10.75,
-          "y": 4.25
-        },
-        {
-          "label": "N",
-          "x": 11.75,
-          "y": 4.25
-        },
-        {
-          "label": "M",
-          "x": 12.75,
-          "y": 4.25
-        },
-        {
-          "label": "<",
-          "x": 13.75,
-          "y": 4.25
-        },
-        {
-          "label": ">",
-          "x": 14.75,
-          "y": 4.25
-        },
-        {
-          "label": "?",
-          "x": 15.75,
-          "y": 4.25
-        },
-        {
-          "label": "Shift",
-          "x": 16.75,
-          "y": 4.25,
-          "w": 1.75
-        },
-        {
-          "label": "\\u2191",
-          "x": 18.75,
-          "y": 4.5
-        },
-        {
-          "label": "1",
-          "x": 20,
-          "y": 4.25
-        },
-        {
-          "label": "2",
-          "x": 21,
-          "y": 4.25
-        },
-        {
-          "label": "3",
-          "x": 22,
-          "y": 4.25
-        },
-        {
-          "label": "Enter",
-          "x": 23,
-          "y": 4.25,
-          "h": 2
-        },
-        {
-          "label": "0",
-          "x": 1,
-          "y": 5.25
-        },
-        {
-          "label": ".",
-          "x": 2,
-          "y": 5.25
-        },
-        {
-          "label": "\\u2190",
-          "x": 3.25,
-          "y": 5.5
-        },
-        {
-          "label": "\\u2193",
-          "x": 4.25,
-          "y": 5.5
-        },
-        {
-          "label": "\\u2192",
-          "x": 5.25,
-          "y": 5.5
-        },
-        {
-          "label": "Ctrl",
-          "x": 6.5,
-          "y": 5.25
-        },
-        {
-          "label": "Win",
-          "x": 7.5,
-          "y": 5.25
-        },
-        {
-          "label": "Alt",
-          "x": 8.5,
-          "y": 5.25
-        },
-        {
-          "label": "7u",
-          "x": 8.5,
-          "y": 5.25,
-          "w": 7
-        },
-        {
-          "label": "1u",
-          "x": 9.5,
-          "y": 5.25
-        },
-        {
-          "label": "4u",
-          "x": 9.5,
-          "y": 5.25,
-          "w": 4
-        },
-        {
-          "label": "1u",
-          "x": 10.5,
-          "y": 5.25
-        },
-        {
-          "label": "1u",
-          "x": 11.5,
-          "y": 5.25
-        },
-        {
-          "label": "1u",
-          "x": 12.5,
-          "y": 5.25
-        },
-        {
-          "label": "Alt",
-          "x": 13.5,
-          "y": 5.25
-        },
-        {
-          "label": "Win",
-          "x": 14.5,
-          "y": 5.25
-        },
-        {
-          "label": "Menu",
-          "x": 15.5,
-          "y": 5.25
-        },
-        {
-          "label": "Ctrl",
-          "x": 16.5,
-          "y": 5.25
-        },
-        {
-          "label": "\\u2190",
-          "x": 17.75,
-          "y": 5.5
-        },
-        {
-          "label": "\\u2193",
-          "x": 18.75,
-          "y": 5.5
-        },
-        {
-          "label": "\\u2192",
-          "x": 19.75,
-          "y": 5.5
-        },
-        {
-          "label": "0",
-          "x": 21,
-          "y": 5.25
-        },
-        {
-          "label": ".",
-          "x": 22,
-          "y": 5.25
-        }
+        {"label":"Home", "x":0, "y":0},
+        {"label":"End", "x":1, "y":0},
+        {"label":"PgUp", "x":2, "y":0},
+        {"label":"PgDn", "x":3, "y":0},
+        {"label":"Esc", "x":4.75, "y":0},
+        {"label":"F1", "x":6.25, "y":0},
+        {"label":"F2", "x":7.25, "y":0},
+        {"label":"F3", "x":8.25, "y":0},
+        {"label":"F4", "x":9.25, "y":0},
+        {"label":"F5", "x":10.75, "y":0},
+        {"label":"F6", "x":11.75, "y":0},
+        {"label":"F7", "x":12.75, "y":0},
+        {"label":"F8", "x":13.75, "y":0},
+        {"label":"F9", "x":15.25, "y":0},
+        {"label":"F10", "x":16.25, "y":0},
+        {"label":"F11", "x":17.25, "y":0},
+        {"label":"F12", "x":18.25, "y":0},
+        {"label":"PrtSc", "x":20, "y":0},
+        {"label":"Scroll Lock", "x":21, "y":0},
+        {"label":"Pause", "x":22, "y":0},
+        {"label":"Insert", "x":23, "y":0},
+        {"label":"-", "x":0, "y":1.25},
+        {"label":"Num Lock", "x":1, "y":1.25},
+        {"label":"/", "x":2, "y":1.25},
+        {"label":"*", "x":3, "y":1.25},
+        {"label":"~", "x":4.5, "y":1.25},
+        {"label":"!", "x":5.5, "y":1.25},
+        {"label":"@", "x":6.5, "y":1.25},
+        {"label":"#", "x":7.5, "y":1.25},
+        {"label":"$", "x":8.5, "y":1.25},
+        {"label":"%", "x":9.5, "y":1.25},
+        {"label":"^", "x":10.5, "y":1.25},
+        {"label":"&", "x":11.5, "y":1.25},
+        {"label":"*", "x":12.5, "y":1.25},
+        {"label":"(", "x":13.5, "y":1.25},
+        {"label":")", "x":14.5, "y":1.25},
+        {"label":"_", "x":15.5, "y":1.25},
+        {"label":"+", "x":16.5, "y":1.25},
+        {"label":"Backspace", "x":17.5, "y":1.25, "w":2},
+        {"label":"Num Lock", "x":20, "y":1.25},
+        {"label":"/", "x":21, "y":1.25},
+        {"label":"*", "x":22, "y":1.25},
+        {"label":"-", "x":23, "y":1.25},
+        {"label":"+", "x":0, "y":2.25, "h":2},
+        {"label":"7", "x":1, "y":2.25},
+        {"label":"8", "x":2, "y":2.25},
+        {"label":"9", "x":3, "y":2.25},
+        {"label":"Tab", "x":4.5, "y":2.25, "w":1.5},
+        {"label":"Q", "x":6, "y":2.25},
+        {"label":"W", "x":7, "y":2.25},
+        {"label":"E", "x":8, "y":2.25},
+        {"label":"R", "x":9, "y":2.25},
+        {"label":"T", "x":10, "y":2.25},
+        {"label":"Y", "x":11, "y":2.25},
+        {"label":"U", "x":12, "y":2.25},
+        {"label":"I", "x":13, "y":2.25},
+        {"label":"O", "x":14, "y":2.25},
+        {"label":"P", "x":15, "y":2.25},
+        {"label":"{", "x":16, "y":2.25},
+        {"label":"}", "x":17, "y":2.25},
+        {"label":"|", "x":18, "y":2.25, "w":1.5},
+        {"label":"7", "x":20, "y":2.25},
+        {"label":"8", "x":21, "y":2.25},
+        {"label":"9", "x":22, "y":2.25},
+        {"label":"+", "x":23, "y":2.25, "h":2},
+        {"label":"4", "x":1, "y":3.25},
+        {"label":"5", "x":2, "y":3.25},
+        {"label":"6", "x":3, "y":3.25},
+        {"label":"Caps Lock", "x":4.5, "y":3.25, "w":1.75},
+        {"label":"A", "x":6.25, "y":3.25},
+        {"label":"S", "x":7.25, "y":3.25},
+        {"label":"D", "x":8.25, "y":3.25},
+        {"label":"F", "x":9.25, "y":3.25},
+        {"label":"G", "x":10.25, "y":3.25},
+        {"label":"H", "x":11.25, "y":3.25},
+        {"label":"J", "x":12.25, "y":3.25},
+        {"label":"K", "x":13.25, "y":3.25},
+        {"label":"L", "x":14.25, "y":3.25},
+        {"label":":", "x":15.25, "y":3.25},
+        {"label":"\"", "x":16.25, "y":3.25},
+        {"label":"Enter", "x":17.25, "y":3.25, "w":2.25},
+        {"label":"4", "x":20, "y":3.25},
+        {"label":"5", "x":21, "y":3.25},
+        {"label":"6", "x":22, "y":3.25},
+        {"label":"Enter", "x":0, "y":4.25, "h":2},
+        {"label":"1", "x":1, "y":4.25},
+        {"label":"2", "x":2, "y":4.25},
+        {"label":"3", "x":3, "y":4.25},
+        {"label":"\\u2191", "x":4.25, "y":4.5},
+        {"label":"Shift", "x":5.5, "y":4.25, "w":1.25},
+        {"label":"Z", "x":6.75, "y":4.25},
+        {"label":"X", "x":7.75, "y":4.25},
+        {"label":"C", "x":8.75, "y":4.25},
+        {"label":"V", "x":9.75, "y":4.25},
+        {"label":"B", "x":10.75, "y":4.25},
+        {"label":"N", "x":11.75, "y":4.25},
+        {"label":"M", "x":12.75, "y":4.25},
+        {"label":"<", "x":13.75, "y":4.25},
+        {"label":">", "x":14.75, "y":4.25},
+        {"label":"?", "x":15.75, "y":4.25},
+        {"label":"Shift", "x":16.75, "y":4.25, "w":1.75},
+        {"label":"\\u2191", "x":18.75, "y":4.5},
+        {"label":"1", "x":20, "y":4.25},
+        {"label":"2", "x":21, "y":4.25},
+        {"label":"3", "x":22, "y":4.25},
+        {"label":"Enter", "x":23, "y":4.25, "h":2},
+        {"label":"0", "x":1, "y":5.25},
+        {"label":".", "x":2, "y":5.25},
+        {"label":"\\u2190", "x":3.25, "y":5.5},
+        {"label":"\\u2193", "x":4.25, "y":5.5},
+        {"label":"\\u2192", "x":5.25, "y":5.5},
+        {"label":"Ctrl", "x":6.5, "y":5.25},
+        {"label":"Win", "x":7.5, "y":5.25},
+        {"label":"Alt", "x":8.5, "y":5.25},
+        {"label":"1u", "x":9.5, "y":5.25},
+        {"label":"1u", "x":10.5, "y":5.25},
+        {"label":"1u", "x":11.5, "y":5.25},
+        {"label":"1u", "x":12.5, "y":5.25},
+        {"label":"Alt", "x":13.5, "y":5.25},
+        {"label":"Win", "x":14.5, "y":5.25},
+        {"label":"Menu", "x":15.5, "y":5.25},
+        {"label":"Ctrl", "x":16.5, "y":5.25},
+        {"label":"\\u2190", "x":17.75, "y":5.5},
+        {"label":"\\u2193", "x":18.75, "y":5.5},
+        {"label":"\\u2192", "x":19.75, "y":5.5},
+        {"label":"0", "x":21, "y":5.25},
+        {"label":".", "x":22, "y":5.25}
       ]
     },
-    "LAYOUT_7U_SPACE": {
+    "LAYOUT_7u_space": {
+      "key_count": 121,
       "layout": [
-        {
-          "label": "k00",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "k01",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "k02",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "k03",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "k04",
-          "x": 4.75,
-          "y": 0
-        },
-        {
-          "label": "k06",
-          "x": 6.25,
-          "y": 0
-        },
-        {
-          "label": "k07",
-          "x": 7.25,
-          "y": 0
-        },
-        {
-          "label": "k08",
-          "x": 8.25,
-          "y": 0
-        },
-        {
-          "label": "k09",
-          "x": 9.25,
-          "y": 0
-        },
-        {
-          "label": "k0a",
-          "x": 10.75,
-          "y": 0
-        },
-        {
-          "label": "k60",
-          "x": 11.75,
-          "y": 0
-        },
-        {
-          "label": "k61",
-          "x": 12.75,
-          "y": 0
-        },
-        {
-          "label": "k62",
-          "x": 13.75,
-          "y": 0
-        },
-        {
-          "label": "k63",
-          "x": 15.25,
-          "y": 0
-        },
-        {
-          "label": "k64",
-          "x": 16.25,
-          "y": 0
-        },
-        {
-          "label": "k65",
-          "x": 17.25,
-          "y": 0
-        },
-        {
-          "label": "k66",
-          "x": 18.25,
-          "y": 0
-        },
-        {
-          "label": "k67",
-          "x": 20,
-          "y": 0
-        },
-        {
-          "label": "k68",
-          "x": 21,
-          "y": 0
-        },
-        {
-          "label": "k69",
-          "x": 22,
-          "y": 0
-        },
-        {
-          "label": "k6a",
-          "x": 23,
-          "y": 0
-        },
-        {
-          "label": "k10",
-          "x": 0,
-          "y": 1.25
-        },
-        {
-          "label": "k11",
-          "x": 1,
-          "y": 1.25
-        },
-        {
-          "label": "k12",
-          "x": 2,
-          "y": 1.25
-        },
-        {
-          "label": "k13",
-          "x": 3,
-          "y": 1.25
-        },
-        {
-          "label": "k14",
-          "x": 4.5,
-          "y": 1.25
-        },
-        {
-          "label": "k15",
-          "x": 5.5,
-          "y": 1.25
-        },
-        {
-          "label": "k16",
-          "x": 6.5,
-          "y": 1.25
-        },
-        {
-          "label": "k17",
-          "x": 7.5,
-          "y": 1.25
-        },
-        {
-          "label": "k18",
-          "x": 8.5,
-          "y": 1.25
-        },
-        {
-          "label": "k19",
-          "x": 9.5,
-          "y": 1.25
-        },
-        {
-          "label": "k0a",
-          "x": 10.5,
-          "y": 1.25
-        },
-        {
-          "label": "k70",
-          "x": 11.5,
-          "y": 1.25
-        },
-        {
-          "label": "k71",
-          "x": 12.5,
-          "y": 1.25
-        },
-        {
-          "label": "k72",
-          "x": 13.5,
-          "y": 1.25
-        },
-        {
-          "label": "k73",
-          "x": 14.5,
-          "y": 1.25
-        },
-        {
-          "label": "k74",
-          "x": 15.5,
-          "y": 1.25
-        },
-        {
-          "label": "k75",
-          "x": 16.5,
-          "y": 1.25
-        },
-        {
-          "label": "k76",
-          "x": 17.5,
-          "y": 1.25,
-          "w": 2
-        },
-        {
-          "label": "k77",
-          "x": 20,
-          "y": 1.25
-        },
-        {
-          "label": "k78",
-          "x": 21,
-          "y": 1.25
-        },
-        {
-          "label": "k79",
-          "x": 22,
-          "y": 1.25
-        },
-        {
-          "label": "k7a",
-          "x": 23,
-          "y": 1.25
-        },
-        {
-          "label": "k20",
-          "x": 0,
-          "y": 2.25,
-          "h": 2
-        },
-        {
-          "label": "k21",
-          "x": 1,
-          "y": 2.25
-        },
-        {
-          "label": "k22",
-          "x": 2,
-          "y": 2.25
-        },
-        {
-          "label": "k23",
-          "x": 3,
-          "y": 2.25
-        },
-        {
-          "label": "k24",
-          "x": 4.5,
-          "y": 2.25,
-          "w": 1.5
-        },
-        {
-          "label": "k25",
-          "x": 6,
-          "y": 2.25
-        },
-        {
-          "label": "k26",
-          "x": 7,
-          "y": 2.25
-        },
-        {
-          "label": "k27",
-          "x": 8,
-          "y": 2.25
-        },
-        {
-          "label": "k28",
-          "x": 9,
-          "y": 2.25
-        },
-        {
-          "label": "k29",
-          "x": 10,
-          "y": 2.25
-        },
-        {
-          "label": "k2a",
-          "x": 11,
-          "y": 2.25
-        },
-        {
-          "label": "k80",
-          "x": 12,
-          "y": 2.25
-        },
-        {
-          "label": "k81",
-          "x": 13,
-          "y": 2.25
-        },
-        {
-          "label": "k82",
-          "x": 14,
-          "y": 2.25
-        },
-        {
-          "label": "k83",
-          "x": 15,
-          "y": 2.25
-        },
-        {
-          "label": "k84",
-          "x": 16,
-          "y": 2.25
-        },
-        {
-          "label": "k85",
-          "x": 17,
-          "y": 2.25
-        },
-        {
-          "label": "k86",
-          "x": 18,
-          "y": 2.25,
-          "w": 1.5
-        },
-        {
-          "label": "k87",
-          "x": 20,
-          "y": 2.25
-        },
-        {
-          "label": "k88",
-          "x": 21,
-          "y": 2.25
-        },
-        {
-          "label": "k89",
-          "x": 22,
-          "y": 2.25
-        },
-        {
-          "label": "k8a",
-          "x": 23,
-          "y": 2.25,
-          "h": 2
-        },
-        {
-          "label": "k31",
-          "x": 1,
-          "y": 3.25
-        },
-        {
-          "label": "k32",
-          "x": 2,
-          "y": 3.25
-        },
-        {
-          "label": "k33",
-          "x": 3,
-          "y": 3.25
-        },
-        {
-          "label": "k34",
-          "x": 4.5,
-          "y": 3.25,
-          "w": 1.75
-        },
-        {
-          "label": "k35",
-          "x": 6.25,
-          "y": 3.25
-        },
-        {
-          "label": "k36",
-          "x": 7.25,
-          "y": 3.25
-        },
-        {
-          "label": "k37",
-          "x": 8.25,
-          "y": 3.25
-        },
-        {
-          "label": "k38",
-          "x": 9.25,
-          "y": 3.25
-        },
-        {
-          "label": "k39",
-          "x": 10.25,
-          "y": 3.25
-        },
-        {
-          "label": "k3a",
-          "x": 11.25,
-          "y": 3.25
-        },
-        {
-          "label": "k90",
-          "x": 12.25,
-          "y": 3.25
-        },
-        {
-          "label": "k91",
-          "x": 13.25,
-          "y": 3.25
-        },
-        {
-          "label": "k92",
-          "x": 14.25,
-          "y": 3.25
-        },
-        {
-          "label": "k93",
-          "x": 15.25,
-          "y": 3.25
-        },
-        {
-          "label": "k94",
-          "x": 16.25,
-          "y": 3.25
-        },
-        {
-          "label": "k95",
-          "x": 17.25,
-          "y": 3.25,
-          "w": 2.25
-        },
-        {
-          "label": "k97",
-          "x": 20,
-          "y": 3.25
-        },
-        {
-          "label": "k98",
-          "x": 21,
-          "y": 3.25
-        },
-        {
-          "label": "k99",
-          "x": 22,
-          "y": 3.25
-        },
-        {
-          "label": "k40",
-          "x": 0,
-          "y": 4.25,
-          "h": 2
-        },
-        {
-          "label": "k41",
-          "x": 1,
-          "y": 4.25
-        },
-        {
-          "label": "k42",
-          "x": 2,
-          "y": 4.25
-        },
-        {
-          "label": "k43",
-          "x": 3,
-          "y": 4.25
-        },
-        {
-          "label": "k45",
-          "x": 5.5,
-          "y": 4.25,
-          "w": 1.25
-        },
-        {
-          "label": "k46",
-          "x": 6.75,
-          "y": 4.25
-        },
-        {
-          "label": "k47",
-          "x": 7.75,
-          "y": 4.25
-        },
-        {
-          "label": "k48",
-          "x": 8.75,
-          "y": 4.25
-        },
-        {
-          "label": "k49",
-          "x": 9.75,
-          "y": 4.25
-        },
-        {
-          "label": "k4a",
-          "x": 10.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka0",
-          "x": 11.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka1",
-          "x": 12.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka2",
-          "x": 13.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka3",
-          "x": 14.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka4",
-          "x": 15.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka5",
-          "x": 16.75,
-          "y": 4.25,
-          "w": 1.75
-        },
-        {
-          "label": "ka7",
-          "x": 20,
-          "y": 4.25
-        },
-        {
-          "label": "ka8",
-          "x": 21,
-          "y": 4.25
-        },
-        {
-          "label": "ka9",
-          "x": 22,
-          "y": 4.25
-        },
-        {
-          "label": "kaa",
-          "x": 23,
-          "y": 4.25,
-          "h": 2
-        },
-        {
-          "label": "k44",
-          "x": 4.25,
-          "y": 4.5
-        },
-        {
-          "label": "k96",
-          "x": 18.75,
-          "y": 4.5
-        },
-        {
-          "label": "k51",
-          "x": 1,
-          "y": 5.25
-        },
-        {
-          "label": "k52",
-          "x": 2,
-          "y": 5.25
-        },
-        {
-          "label": "k56",
-          "x": 6.5,
-          "y": 5.25
-        },
-        {
-          "label": "k57",
-          "x": 7.5,
-          "y": 5.25
-        },
-        {
-          "label": "kb0",
-          "x": 8.5,
-          "y": 5.25,
-          "w": 7
-        },
-        {
-          "label": "kb4",
-          "x": 15.5,
-          "y": 5.25
-        },
-        {
-          "label": "kb5",
-          "x": 16.5,
-          "y": 5.25
-        },
-        {
-          "label": "kb8",
-          "x": 21,
-          "y": 5.25
-        },
-        {
-          "label": "kb9",
-          "x": 22,
-          "y": 5.25
-        },
-        {
-          "label": "k53",
-          "x": 3.25,
-          "y": 5.5
-        },
-        {
-          "label": "k54",
-          "x": 4.25,
-          "y": 5.5
-        },
-        {
-          "label": "k55",
-          "x": 5.25,
-          "y": 5.5
-        },
-        {
-          "label": "ka6",
-          "x": 17.75,
-          "y": 5.5
-        },
-        {
-          "label": "kb6",
-          "x": 18.75,
-          "y": 5.5
-        },
-        {
-          "label": "kb7",
-          "x": 19.75,
-          "y": 5.5
-        }
+        {"label":"k00", "x":0, "y":0},
+        {"label":"k01", "x":1, "y":0},
+        {"label":"k02", "x":2, "y":0},
+        {"label":"k03", "x":3, "y":0},
+        {"label":"k04", "x":4.75, "y":0},
+        {"label":"k06", "x":6.25, "y":0},
+        {"label":"k07", "x":7.25, "y":0},
+        {"label":"k08", "x":8.25, "y":0},
+        {"label":"k09", "x":9.25, "y":0},
+        {"label":"k0a", "x":10.75, "y":0},
+        {"label":"k60", "x":11.75, "y":0},
+        {"label":"k61", "x":12.75, "y":0},
+        {"label":"k62", "x":13.75, "y":0},
+        {"label":"k63", "x":15.25, "y":0},
+        {"label":"k64", "x":16.25, "y":0},
+        {"label":"k65", "x":17.25, "y":0},
+        {"label":"k66", "x":18.25, "y":0},
+        {"label":"k67", "x":20, "y":0},
+        {"label":"k68", "x":21, "y":0},
+        {"label":"k69", "x":22, "y":0},
+        {"label":"k6a", "x":23, "y":0},
+        {"label":"k10", "x":0, "y":1.25},
+        {"label":"k11", "x":1, "y":1.25},
+        {"label":"k12", "x":2, "y":1.25},
+        {"label":"k13", "x":3, "y":1.25},
+        {"label":"k14", "x":4.5, "y":1.25},
+        {"label":"k15", "x":5.5, "y":1.25},
+        {"label":"k16", "x":6.5, "y":1.25},
+        {"label":"k17", "x":7.5, "y":1.25},
+        {"label":"k18", "x":8.5, "y":1.25},
+        {"label":"k19", "x":9.5, "y":1.25},
+        {"label":"k0a", "x":10.5, "y":1.25},
+        {"label":"k70", "x":11.5, "y":1.25},
+        {"label":"k71", "x":12.5, "y":1.25},
+        {"label":"k72", "x":13.5, "y":1.25},
+        {"label":"k73", "x":14.5, "y":1.25},
+        {"label":"k74", "x":15.5, "y":1.25},
+        {"label":"k75", "x":16.5, "y":1.25},
+        {"label":"k76", "x":17.5, "y":1.25, "w":2},
+        {"label":"k77", "x":20, "y":1.25},
+        {"label":"k78", "x":21, "y":1.25},
+        {"label":"k79", "x":22, "y":1.25},
+        {"label":"k7a", "x":23, "y":1.25},
+        {"label":"k20", "x":0, "y":2.25, "h":2},
+        {"label":"k21", "x":1, "y":2.25},
+        {"label":"k22", "x":2, "y":2.25},
+        {"label":"k23", "x":3, "y":2.25},
+        {"label":"k24", "x":4.5, "y":2.25, "w":1.5},
+        {"label":"k25", "x":6, "y":2.25},
+        {"label":"k26", "x":7, "y":2.25},
+        {"label":"k27", "x":8, "y":2.25},
+        {"label":"k28", "x":9, "y":2.25},
+        {"label":"k29", "x":10, "y":2.25},
+        {"label":"k2a", "x":11, "y":2.25},
+        {"label":"k80", "x":12, "y":2.25},
+        {"label":"k81", "x":13, "y":2.25},
+        {"label":"k82", "x":14, "y":2.25},
+        {"label":"k83", "x":15, "y":2.25},
+        {"label":"k84", "x":16, "y":2.25},
+        {"label":"k85", "x":17, "y":2.25},
+        {"label":"k86", "x":18, "y":2.25, "w":1.5},
+        {"label":"k87", "x":20, "y":2.25},
+        {"label":"k88", "x":21, "y":2.25},
+        {"label":"k89", "x":22, "y":2.25},
+        {"label":"k8a", "x":23, "y":2.25, "h":2},
+        {"label":"k31", "x":1, "y":3.25},
+        {"label":"k32", "x":2, "y":3.25},
+        {"label":"k33", "x":3, "y":3.25},
+        {"label":"k34", "x":4.5, "y":3.25, "w":1.75},
+        {"label":"k35", "x":6.25, "y":3.25},
+        {"label":"k36", "x":7.25, "y":3.25},
+        {"label":"k37", "x":8.25, "y":3.25},
+        {"label":"k38", "x":9.25, "y":3.25},
+        {"label":"k39", "x":10.25, "y":3.25},
+        {"label":"k3a", "x":11.25, "y":3.25},
+        {"label":"k90", "x":12.25, "y":3.25},
+        {"label":"k91", "x":13.25, "y":3.25},
+        {"label":"k92", "x":14.25, "y":3.25},
+        {"label":"k93", "x":15.25, "y":3.25},
+        {"label":"k94", "x":16.25, "y":3.25},
+        {"label":"k95", "x":17.25, "y":3.25, "w":2.25},
+        {"label":"k97", "x":20, "y":3.25},
+        {"label":"k98", "x":21, "y":3.25},
+        {"label":"k99", "x":22, "y":3.25},
+        {"label":"k40", "x":0, "y":4.25, "h":2},
+        {"label":"k41", "x":1, "y":4.25},
+        {"label":"k42", "x":2, "y":4.25},
+        {"label":"k43", "x":3, "y":4.25},
+        {"label":"k45", "x":5.5, "y":4.25, "w":1.25},
+        {"label":"k46", "x":6.75, "y":4.25},
+        {"label":"k47", "x":7.75, "y":4.25},
+        {"label":"k48", "x":8.75, "y":4.25},
+        {"label":"k49", "x":9.75, "y":4.25},
+        {"label":"k4a", "x":10.75, "y":4.25},
+        {"label":"ka0", "x":11.75, "y":4.25},
+        {"label":"ka1", "x":12.75, "y":4.25},
+        {"label":"ka2", "x":13.75, "y":4.25},
+        {"label":"ka3", "x":14.75, "y":4.25},
+        {"label":"ka4", "x":15.75, "y":4.25},
+        {"label":"ka5", "x":16.75, "y":4.25, "w":1.75},
+        {"label":"ka7", "x":20, "y":4.25},
+        {"label":"ka8", "x":21, "y":4.25},
+        {"label":"ka9", "x":22, "y":4.25},
+        {"label":"kaa", "x":23, "y":4.25, "h":2},
+        {"label":"k44", "x":4.25, "y":4.5},
+        {"label":"k96", "x":18.75, "y":4.5},
+        {"label":"k51", "x":1, "y":5.25},
+        {"label":"k52", "x":2, "y":5.25},
+        {"label":"k56", "x":6.5, "y":5.25},
+        {"label":"k57", "x":7.5, "y":5.25},
+        {"label":"kb0", "x":8.5, "y":5.25, "w":7},
+        {"label":"kb4", "x":15.5, "y":5.25},
+        {"label":"kb5", "x":16.5, "y":5.25},
+        {"label":"kb8", "x":21, "y":5.25},
+        {"label":"kb9", "x":22, "y":5.25},
+        {"label":"k53", "x":3.25, "y":5.5},
+        {"label":"k54", "x":4.25, "y":5.5},
+        {"label":"k55", "x":5.25, "y":5.5},
+        {"label":"ka6", "x":17.75, "y":5.5},
+        {"label":"kb6", "x":18.75, "y":5.5},
+        {"label":"kb7", "x":19.75, "y":5.5}
       ]
     },
-    "LAYOUT_4U_SPACE": {
+    "LAYOUT_4u_space": {
+      "key_count": 124,
       "layout": [
-        {
-          "label": "k00",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "k01",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "k02",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "k03",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "k04",
-          "x": 4.75,
-          "y": 0
-        },
-        {
-          "label": "k06",
-          "x": 6.25,
-          "y": 0
-        },
-        {
-          "label": "k07",
-          "x": 7.25,
-          "y": 0
-        },
-        {
-          "label": "k08",
-          "x": 8.25,
-          "y": 0
-        },
-        {
-          "label": "k09",
-          "x": 9.25,
-          "y": 0
-        },
-        {
-          "label": "k0a",
-          "x": 10.75,
-          "y": 0
-        },
-        {
-          "label": "k60",
-          "x": 11.75,
-          "y": 0
-        },
-        {
-          "label": "k61",
-          "x": 12.75,
-          "y": 0
-        },
-        {
-          "label": "k62",
-          "x": 13.75,
-          "y": 0
-        },
-        {
-          "label": "k63",
-          "x": 15.25,
-          "y": 0
-        },
-        {
-          "label": "k64",
-          "x": 16.25,
-          "y": 0
-        },
-        {
-          "label": "k65",
-          "x": 17.25,
-          "y": 0
-        },
-        {
-          "label": "k66",
-          "x": 18.25,
-          "y": 0
-        },
-        {
-          "label": "k67",
-          "x": 20,
-          "y": 0
-        },
-        {
-          "label": "k68",
-          "x": 21,
-          "y": 0
-        },
-        {
-          "label": "k69",
-          "x": 22,
-          "y": 0
-        },
-        {
-          "label": "k6a",
-          "x": 23,
-          "y": 0
-        },
-        {
-          "label": "k10",
-          "x": 0,
-          "y": 1.25
-        },
-        {
-          "label": "k11",
-          "x": 1,
-          "y": 1.25
-        },
-        {
-          "label": "k12",
-          "x": 2,
-          "y": 1.25
-        },
-        {
-          "label": "k13",
-          "x": 3,
-          "y": 1.25
-        },
-        {
-          "label": "k14",
-          "x": 4.5,
-          "y": 1.25
-        },
-        {
-          "label": "k15",
-          "x": 5.5,
-          "y": 1.25
-        },
-        {
-          "label": "k16",
-          "x": 6.5,
-          "y": 1.25
-        },
-        {
-          "label": "k17",
-          "x": 7.5,
-          "y": 1.25
-        },
-        {
-          "label": "k18",
-          "x": 8.5,
-          "y": 1.25
-        },
-        {
-          "label": "k19",
-          "x": 9.5,
-          "y": 1.25
-        },
-        {
-          "label": "k0a",
-          "x": 10.5,
-          "y": 1.25
-        },
-        {
-          "label": "k70",
-          "x": 11.5,
-          "y": 1.25
-        },
-        {
-          "label": "k71",
-          "x": 12.5,
-          "y": 1.25
-        },
-        {
-          "label": "k72",
-          "x": 13.5,
-          "y": 1.25
-        },
-        {
-          "label": "k73",
-          "x": 14.5,
-          "y": 1.25
-        },
-        {
-          "label": "k74",
-          "x": 15.5,
-          "y": 1.25
-        },
-        {
-          "label": "k75",
-          "x": 16.5,
-          "y": 1.25
-        },
-        {
-          "label": "k76",
-          "x": 17.5,
-          "y": 1.25,
-          "w": 2
-        },
-        {
-          "label": "k77",
-          "x": 20,
-          "y": 1.25
-        },
-        {
-          "label": "k78",
-          "x": 21,
-          "y": 1.25
-        },
-        {
-          "label": "k79",
-          "x": 22,
-          "y": 1.25
-        },
-        {
-          "label": "k7a",
-          "x": 23,
-          "y": 1.25
-        },
-        {
-          "label": "k20",
-          "x": 0,
-          "y": 2.25,
-          "h": 2
-        },
-        {
-          "label": "k21",
-          "x": 1,
-          "y": 2.25
-        },
-        {
-          "label": "k22",
-          "x": 2,
-          "y": 2.25
-        },
-        {
-          "label": "k23",
-          "x": 3,
-          "y": 2.25
-        },
-        {
-          "label": "k24",
-          "x": 4.5,
-          "y": 2.25,
-          "w": 1.5
-        },
-        {
-          "label": "k25",
-          "x": 6,
-          "y": 2.25
-        },
-        {
-          "label": "k26",
-          "x": 7,
-          "y": 2.25
-        },
-        {
-          "label": "k27",
-          "x": 8,
-          "y": 2.25
-        },
-        {
-          "label": "k28",
-          "x": 9,
-          "y": 2.25
-        },
-        {
-          "label": "k29",
-          "x": 10,
-          "y": 2.25
-        },
-        {
-          "label": "k2a",
-          "x": 11,
-          "y": 2.25
-        },
-        {
-          "label": "k80",
-          "x": 12,
-          "y": 2.25
-        },
-        {
-          "label": "k81",
-          "x": 13,
-          "y": 2.25
-        },
-        {
-          "label": "k82",
-          "x": 14,
-          "y": 2.25
-        },
-        {
-          "label": "k83",
-          "x": 15,
-          "y": 2.25
-        },
-        {
-          "label": "k84",
-          "x": 16,
-          "y": 2.25
-        },
-        {
-          "label": "k85",
-          "x": 17,
-          "y": 2.25
-        },
-        {
-          "label": "k86",
-          "x": 18,
-          "y": 2.25,
-          "w": 1.5
-        },
-        {
-          "label": "k87",
-          "x": 20,
-          "y": 2.25
-        },
-        {
-          "label": "k88",
-          "x": 21,
-          "y": 2.25
-        },
-        {
-          "label": "k89",
-          "x": 22,
-          "y": 2.25
-        },
-        {
-          "label": "k8a",
-          "x": 23,
-          "y": 2.25,
-          "h": 2
-        },
-        {
-          "label": "k31",
-          "x": 1,
-          "y": 3.25
-        },
-        {
-          "label": "k32",
-          "x": 2,
-          "y": 3.25
-        },
-        {
-          "label": "k33",
-          "x": 3,
-          "y": 3.25
-        },
-        {
-          "label": "k34",
-          "x": 4.5,
-          "y": 3.25,
-          "w": 1.75
-        },
-        {
-          "label": "k35",
-          "x": 6.25,
-          "y": 3.25
-        },
-        {
-          "label": "k36",
-          "x": 7.25,
-          "y": 3.25
-        },
-        {
-          "label": "k37",
-          "x": 8.25,
-          "y": 3.25
-        },
-        {
-          "label": "k38",
-          "x": 9.25,
-          "y": 3.25
-        },
-        {
-          "label": "k39",
-          "x": 10.25,
-          "y": 3.25
-        },
-        {
-          "label": "k3a",
-          "x": 11.25,
-          "y": 3.25
-        },
-        {
-          "label": "k90",
-          "x": 12.25,
-          "y": 3.25
-        },
-        {
-          "label": "k91",
-          "x": 13.25,
-          "y": 3.25
-        },
-        {
-          "label": "k92",
-          "x": 14.25,
-          "y": 3.25
-        },
-        {
-          "label": "k93",
-          "x": 15.25,
-          "y": 3.25
-        },
-        {
-          "label": "k94",
-          "x": 16.25,
-          "y": 3.25
-        },
-        {
-          "label": "k95",
-          "x": 17.25,
-          "y": 3.25,
-          "w": 2.25
-        },
-        {
-          "label": "k97",
-          "x": 20,
-          "y": 3.25
-        },
-        {
-          "label": "k98",
-          "x": 21,
-          "y": 3.25
-        },
-        {
-          "label": "k99",
-          "x": 22,
-          "y": 3.25
-        },
-        {
-          "label": "k40",
-          "x": 0,
-          "y": 4.25,
-          "h": 2
-        },
-        {
-          "label": "k41",
-          "x": 1,
-          "y": 4.25
-        },
-        {
-          "label": "k42",
-          "x": 2,
-          "y": 4.25
-        },
-        {
-          "label": "k43",
-          "x": 3,
-          "y": 4.25
-        },
-        {
-          "label": "k45",
-          "x": 5.5,
-          "y": 4.25,
-          "w": 1.25
-        },
-        {
-          "label": "k46",
-          "x": 6.75,
-          "y": 4.25
-        },
-        {
-          "label": "k47",
-          "x": 7.75,
-          "y": 4.25
-        },
-        {
-          "label": "k48",
-          "x": 8.75,
-          "y": 4.25
-        },
-        {
-          "label": "k49",
-          "x": 9.75,
-          "y": 4.25
-        },
-        {
-          "label": "k4a",
-          "x": 10.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka0",
-          "x": 11.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka1",
-          "x": 12.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka2",
-          "x": 13.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka3",
-          "x": 14.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka4",
-          "x": 15.75,
-          "y": 4.25
-        },
-        {
-          "label": "ka5",
-          "x": 16.75,
-          "y": 4.25,
-          "w": 1.75
-        },
-        {
-          "label": "ka7",
-          "x": 20,
-          "y": 4.25
-        },
-        {
-          "label": "ka8",
-          "x": 21,
-          "y": 4.25
-        },
-        {
-          "label": "ka9",
-          "x": 22,
-          "y": 4.25
-        },
-        {
-          "label": "kaa",
-          "x": 23,
-          "y": 4.25,
-          "h": 2
-        },
-        {
-          "label": "k44",
-          "x": 4.25,
-          "y": 4.5
-        },
-        {
-          "label": "k96",
-          "x": 18.75,
-          "y": 4.5
-        },
-        {
-          "label": "k51",
-          "x": 1,
-          "y": 5.25
-        },
-        {
-          "label": "k52",
-          "x": 2,
-          "y": 5.25
-        },
-        {
-          "label": "k56",
-          "x": 6.5,
-          "y": 5.25
-        },
-        {
-          "label": "k57",
-          "x": 7.5,
-          "y": 5.25
-        },
-        {
-          "label": "k58",
-          "x": 8.5,
-          "y": 5.25
-        },
-        {
-          "label": "kb0",
-          "x": 9.5,
-          "y": 5.25,
-          "w": 4
-        },
-        {
-          "label": "kb2",
-          "x": 13.5,
-          "y": 5.25
-        },
-        {
-          "label": "kb3",
-          "x": 14.5,
-          "y": 5.25
-        },
-        {
-          "label": "kb4",
-          "x": 15.5,
-          "y": 5.25
-        },
-        {
-          "label": "kb5",
-          "x": 16.5,
-          "y": 5.25
-        },
-        {
-          "label": "kb8",
-          "x": 21,
-          "y": 5.25
-        },
-        {
-          "label": "kb9",
-          "x": 22,
-          "y": 5.25
-        },
-        {
-          "label": "k53",
-          "x": 3.25,
-          "y": 5.5
-        },
-        {
-          "label": "k54",
-          "x": 4.25,
-          "y": 5.5
-        },
-        {
-          "label": "k55",
-          "x": 5.25,
-          "y": 5.5
-        },
-        {
-          "label": "ka6",
-          "x": 17.75,
-          "y": 5.5
-        },
-        {
-          "label": "kb6",
-          "x": 18.75,
-          "y": 5.5
-        },
-        {
-          "label": "kb7",
-          "x": 19.75,
-          "y": 5.5
-        }
+        {"label":"k00", "x":0, "y":0},
+        {"label":"k01", "x":1, "y":0},
+        {"label":"k02", "x":2, "y":0},
+        {"label":"k03", "x":3, "y":0},
+        {"label":"k04", "x":4.75, "y":0},
+        {"label":"k06", "x":6.25, "y":0},
+        {"label":"k07", "x":7.25, "y":0},
+        {"label":"k08", "x":8.25, "y":0},
+        {"label":"k09", "x":9.25, "y":0},
+        {"label":"k0a", "x":10.75, "y":0},
+        {"label":"k60", "x":11.75, "y":0},
+        {"label":"k61", "x":12.75, "y":0},
+        {"label":"k62", "x":13.75, "y":0},
+        {"label":"k63", "x":15.25, "y":0},
+        {"label":"k64", "x":16.25, "y":0},
+        {"label":"k65", "x":17.25, "y":0},
+        {"label":"k66", "x":18.25, "y":0},
+        {"label":"k67", "x":20, "y":0},
+        {"label":"k68", "x":21, "y":0},
+        {"label":"k69", "x":22, "y":0},
+        {"label":"k6a", "x":23, "y":0},
+        {"label":"k10", "x":0, "y":1.25},
+        {"label":"k11", "x":1, "y":1.25},
+        {"label":"k12", "x":2, "y":1.25},
+        {"label":"k13", "x":3, "y":1.25},
+        {"label":"k14", "x":4.5, "y":1.25},
+        {"label":"k15", "x":5.5, "y":1.25},
+        {"label":"k16", "x":6.5, "y":1.25},
+        {"label":"k17", "x":7.5, "y":1.25},
+        {"label":"k18", "x":8.5, "y":1.25},
+        {"label":"k19", "x":9.5, "y":1.25},
+        {"label":"k0a", "x":10.5, "y":1.25},
+        {"label":"k70", "x":11.5, "y":1.25},
+        {"label":"k71", "x":12.5, "y":1.25},
+        {"label":"k72", "x":13.5, "y":1.25},
+        {"label":"k73", "x":14.5, "y":1.25},
+        {"label":"k74", "x":15.5, "y":1.25},
+        {"label":"k75", "x":16.5, "y":1.25},
+        {"label":"k76", "x":17.5, "y":1.25, "w":2},
+        {"label":"k77", "x":20, "y":1.25},
+        {"label":"k78", "x":21, "y":1.25},
+        {"label":"k79", "x":22, "y":1.25},
+        {"label":"k7a", "x":23, "y":1.25},
+        {"label":"k20", "x":0, "y":2.25, "h":2},
+        {"label":"k21", "x":1, "y":2.25},
+        {"label":"k22", "x":2, "y":2.25},
+        {"label":"k23", "x":3, "y":2.25},
+        {"label":"k24", "x":4.5, "y":2.25, "w":1.5},
+        {"label":"k25", "x":6, "y":2.25},
+        {"label":"k26", "x":7, "y":2.25},
+        {"label":"k27", "x":8, "y":2.25},
+        {"label":"k28", "x":9, "y":2.25},
+        {"label":"k29", "x":10, "y":2.25},
+        {"label":"k2a", "x":11, "y":2.25},
+        {"label":"k80", "x":12, "y":2.25},
+        {"label":"k81", "x":13, "y":2.25},
+        {"label":"k82", "x":14, "y":2.25},
+        {"label":"k83", "x":15, "y":2.25},
+        {"label":"k84", "x":16, "y":2.25},
+        {"label":"k85", "x":17, "y":2.25},
+        {"label":"k86", "x":18, "y":2.25, "w":1.5},
+        {"label":"k87", "x":20, "y":2.25},
+        {"label":"k88", "x":21, "y":2.25},
+        {"label":"k89", "x":22, "y":2.25},
+        {"label":"k8a", "x":23, "y":2.25, "h":2},
+        {"label":"k31", "x":1, "y":3.25},
+        {"label":"k32", "x":2, "y":3.25},
+        {"label":"k33", "x":3, "y":3.25},
+        {"label":"k34", "x":4.5, "y":3.25, "w":1.75},
+        {"label":"k35", "x":6.25, "y":3.25},
+        {"label":"k36", "x":7.25, "y":3.25},
+        {"label":"k37", "x":8.25, "y":3.25},
+        {"label":"k38", "x":9.25, "y":3.25},
+        {"label":"k39", "x":10.25, "y":3.25},
+        {"label":"k3a", "x":11.25, "y":3.25},
+        {"label":"k90", "x":12.25, "y":3.25},
+        {"label":"k91", "x":13.25, "y":3.25},
+        {"label":"k92", "x":14.25, "y":3.25},
+        {"label":"k93", "x":15.25, "y":3.25},
+        {"label":"k94", "x":16.25, "y":3.25},
+        {"label":"k95", "x":17.25, "y":3.25, "w":2.25},
+        {"label":"k97", "x":20, "y":3.25},
+        {"label":"k98", "x":21, "y":3.25},
+        {"label":"k99", "x":22, "y":3.25},
+        {"label":"k40", "x":0, "y":4.25, "h":2},
+        {"label":"k41", "x":1, "y":4.25},
+        {"label":"k42", "x":2, "y":4.25},
+        {"label":"k43", "x":3, "y":4.25},
+        {"label":"k45", "x":5.5, "y":4.25, "w":1.25},
+        {"label":"k46", "x":6.75, "y":4.25},
+        {"label":"k47", "x":7.75, "y":4.25},
+        {"label":"k48", "x":8.75, "y":4.25},
+        {"label":"k49", "x":9.75, "y":4.25},
+        {"label":"k4a", "x":10.75, "y":4.25},
+        {"label":"ka0", "x":11.75, "y":4.25},
+        {"label":"ka1", "x":12.75, "y":4.25},
+        {"label":"ka2", "x":13.75, "y":4.25},
+        {"label":"ka3", "x":14.75, "y":4.25},
+        {"label":"ka4", "x":15.75, "y":4.25},
+        {"label":"ka5", "x":16.75, "y":4.25, "w":1.75},
+        {"label":"ka7", "x":20, "y":4.25},
+        {"label":"ka8", "x":21, "y":4.25},
+        {"label":"ka9", "x":22, "y":4.25},
+        {"label":"kaa", "x":23, "y":4.25, "h":2},
+        {"label":"k44", "x":4.25, "y":4.5},
+        {"label":"k96", "x":18.75, "y":4.5},
+        {"label":"k51", "x":1, "y":5.25},
+        {"label":"k52", "x":2, "y":5.25},
+        {"label":"k56", "x":6.5, "y":5.25},
+        {"label":"k57", "x":7.5, "y":5.25},
+        {"label":"k58", "x":8.5, "y":5.25},
+        {"label":"kb0", "x":9.5, "y":5.25, "w":4},
+        {"label":"kb2", "x":13.5, "y":5.25},
+        {"label":"kb3", "x":14.5, "y":5.25},
+        {"label":"kb4", "x":15.5, "y":5.25},
+        {"label":"kb5", "x":16.5, "y":5.25},
+        {"label":"kb8", "x":21, "y":5.25},
+        {"label":"kb9", "x":22, "y":5.25},
+        {"label":"k53", "x":3.25, "y":5.5},
+        {"label":"k54", "x":4.25, "y":5.5},
+        {"label":"k55", "x":5.25, "y":5.5},
+        {"label":"ka6", "x":17.75, "y":5.5},
+        {"label":"kb6", "x":18.75, "y":5.5},
+        {"label":"kb7", "x":19.75, "y":5.5}
       ]
     }
   }
diff --git a/keyboards/clueboard/2x1800/keymaps/default/keymap.c b/keyboards/clueboard/2x1800/keymaps/default/keymap.c
index f0b7184e0f..2e4b75924d 100644
--- a/keyboards/clueboard/2x1800/keymaps/default/keymap.c
+++ b/keyboards/clueboard/2x1800/keymaps/default/keymap.c
@@ -13,7 +13,7 @@
  * 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 "2x1800.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(
diff --git a/keyboards/clueboard/2x1800/keymaps/default_4u/keymap.c b/keyboards/clueboard/2x1800/keymaps/default_4u/keymap.c
index d12a3fc8f3..c33dfd31e6 100644
--- a/keyboards/clueboard/2x1800/keymaps/default_4u/keymap.c
+++ b/keyboards/clueboard/2x1800/keymaps/default_4u/keymap.c
@@ -13,10 +13,10 @@
  * 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 "2x1800.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_4U_SPACE(
+[0] = LAYOUT_4u_space(
       KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,  \
                                                                                                                                                                                                                       \
       KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
diff --git a/keyboards/clueboard/2x1800/keymaps/default_7u/keymap.c b/keyboards/clueboard/2x1800/keymaps/default_7u/keymap.c
index 74a35c27b5..866369a775 100644
--- a/keyboards/clueboard/2x1800/keymaps/default_7u/keymap.c
+++ b/keyboards/clueboard/2x1800/keymaps/default_7u/keymap.c
@@ -13,10 +13,10 @@
  * 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 "2x1800.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_7U_SPACE(
+[0] = LAYOUT_7u_space(
       KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL,  \
                                                                                                                                                                                                                       \
       KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
diff --git a/keyboards/clueboard/2x1800/keymaps/macroboard/keymap.c b/keyboards/clueboard/2x1800/keymaps/macroboard/keymap.c
index 2d8ef349ed..f69ed801e7 100644
--- a/keyboards/clueboard/2x1800/keymaps/macroboard/keymap.c
+++ b/keyboards/clueboard/2x1800/keymaps/macroboard/keymap.c
@@ -13,7 +13,7 @@
  * 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 "2x1800.h"
+#include QMK_KEYBOARD_H
 
 enum custom_keycodes {
     MACRO01 = SAFE_RANGE,
diff --git a/keyboards/clueboard/2x1800/keymaps/mouseboard_left/keymap.c b/keyboards/clueboard/2x1800/keymaps/mouseboard_left/keymap.c
index d4108a779f..e0c97aadac 100644
--- a/keyboards/clueboard/2x1800/keymaps/mouseboard_left/keymap.c
+++ b/keyboards/clueboard/2x1800/keymaps/mouseboard_left/keymap.c
@@ -13,7 +13,7 @@
  * 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 "2x1800.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(
diff --git a/keyboards/clueboard/2x1800/keymaps/mouseboard_right/keymap.c b/keyboards/clueboard/2x1800/keymaps/mouseboard_right/keymap.c
index ee255e2392..d140f5d74e 100644
--- a/keyboards/clueboard/2x1800/keymaps/mouseboard_right/keymap.c
+++ b/keyboards/clueboard/2x1800/keymaps/mouseboard_right/keymap.c
@@ -13,7 +13,7 @@
  * 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 "2x1800.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(
diff --git a/keyboards/clueboard/2x1800/readme.md b/keyboards/clueboard/2x1800/readme.md
index a820852c1e..cccd8ac15f 100644
--- a/keyboards/clueboard/2x1800/readme.md
+++ b/keyboards/clueboard/2x1800/readme.md
@@ -2,9 +2,9 @@
 
 Clueboard Double 1800 All The Way
 
-* Keyboard Maintainer: [Zach White](https://github.com/skullydazed)
-* Hardware Supported: Clueboard 2x1800 PCB
-* Hardware Availability: 2018 Apr 1 Group Buy
+Keyboard Maintainer: [Zach White](https://github.com/skullydazed)  
+Hardware Supported: Clueboard 2x1800 PCB  
+Hardware Availability: 2018 Apr 1 Group Buy
 
 Make example for this keyboard (after setting up your build environment):