diff --git a/keyboards/tkc1800/info.json b/keyboards/tkc1800/info.json
index 9520a20b4..e5ef201bc 100644
--- a/keyboards/tkc1800/info.json
+++ b/keyboards/tkc1800/info.json
@@ -9,8 +9,549 @@
   "width": 19.5,
   "height": 7,
   "layouts": {
-      "LAYOUT": {
-          "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.2, "y":0}, {"label":"F2", "x":2.2, "y":0}, {"label":"F3", "x":3.2, "y":0}, {"label":"F4", "x":4.2, "y":0}, {"label":"F5", "x":5.4, "y":0}, {"label":"F6", "x":6.4, "y":0}, {"label":"F7", "x":7.4, "y":0}, {"label":"F8", "x":8.4, "y":0}, {"label":"F9", "x":9.6, "y":0}, {"label":"F10", "x":10.6, "y":0}, {"label":"F11", "x":11.6, "y":0}, {"label":"F12", "x":12.5, "y":0}, {"label":"Insert", "x":15.5, "y":0}, {"label":"Home", "x":16.5, "y":0}, {"label":"Pg Up", "x":17.5, "y":0}, {"label":"Prt Sc", "x":18.5, "y":0}, {"label":"Delete", "x":15.5, "y":1}, {"label":"End", "x":16.5, "y":1}, {"label":"Pg Dn", "x":17.5, "y":1}, {"label":"Scroll Lock", "x":18.5, "y":1}, {"label":"~", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"@", "x":2, "y":2}, {"label":"#", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"^", "x":6, "y":2}, {"label":"&", "x":7, "y":2}, {"label":"*", "x":8, "y":2}, {"label":"(", "x":9, "y":2}, {"label":")", "x":10, "y":2}, {"label":"_", "x":11, "y":2}, {"label":"+", "x":12, "y":2}, {"label":"Backspace", "x":13, "y":2}, {"x":14, "y":2}, {"label":"Num Lock", "x":15.5, "y":2}, {"label":"/", "x":16.5, "y":2}, {"label":"*", "x":17.5, "y":2}, {"label":"-", "x":18.5, "y":2}, {"label":"Tab", "x":0, "y":3, "w":1.5}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Y", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"{", "x":11.5, "y":3}, {"label":"}", "x":12.5, "y":3}, {"label":"|", "x":13.5, "y":3, "w":1.5}, {"label":"7", "x":15.5, "y":3}, {"label":"8", "x":16.5, "y":3}, {"label":"9", "x":17.5, "y":3}, {"label":"+", "x":18.5, "y":3}, {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":":", "x":10.75, "y":4}, {"label":"\"", "x":11.75, "y":4}, {"x":12.75, "y":4}, {"label":"Enter", "x":13.75, "y":4, "w":1.25}, {"label":"4", "x":15.5, "y":4}, {"label":"5", "x":16.5, "y":4}, {"label":"6", "x":17.5, "y":4}, {"x":18.5, "y":4}, {"label":"Shift", "x":0, "y":5, "w":2.25}, {"label":"Z", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":"<", "x":9.25, "y":5}, {"label":">", "x":10.25, "y":5}, {"label":"?", "x":11.25, "y":5}, {"label":"Shift", "x":12.25, "y":5}, {"x":13.25, "y":5}, {"label":"\u2191", "x":14.25, "y":5}, {"label":"1", "x":15.5, "y":5}, {"label":"2", "x":16.5, "y":5}, {"label":"3", "x":17.5, "y":5}, {"label":"Enter", "x":18.5, "y":5}, {"label":"Ctrl", "x":0, "y":6, "w":1.25}, {"label":"Win", "x":1.25, "y":6, "w":1.25}, {"label":"Alt", "x":2.5, "y":6, "w":1.25}, {"x":3.75, "y":6, "w":6.25}, {"label":"Alt", "x":10, "y":6}, {"label":"Win", "x":11, "y":6}, {"label":"Fn", "x":12, "y":6}, {"label":"\u2190", "x":13.25, "y":6}, {"label":"\u2193", "x":14.25, "y":6}, {"label":"\u2192", "x":15.25, "y":6}, {"label":"0", "x":16.5, "y":6}, {"label":".", "x":17.5, "y":6}, {"x":18.5, "y":6}]
-      }
+    "LAYOUT": {
+      "key_count": 107,
+      "layout": [
+        {
+          "label": "Esc",
+          "x": 0,
+          "y": 0
+        },
+        {
+          "label": "F1",
+          "x": 1.25,
+          "y": 0
+        },
+        {
+          "label": "F2",
+          "x": 2.25,
+          "y": 0
+        },
+        {
+          "label": "F3",
+          "x": 3.25,
+          "y": 0
+        },
+        {
+          "label": "F4",
+          "x": 4.25,
+          "y": 0
+        },
+        {
+          "label": "F5",
+          "x": 5.5,
+          "y": 0
+        },
+        {
+          "label": "F6",
+          "x": 6.5,
+          "y": 0
+        },
+        {
+          "label": "F7",
+          "x": 7.5,
+          "y": 0
+        },
+        {
+          "label": "F8",
+          "x": 8.5,
+          "y": 0
+        },
+        {
+          "label": "F9",
+          "x": 9.75,
+          "y": 0
+        },
+        {
+          "label": "F10",
+          "x": 10.75,
+          "y": 0
+        },
+        {
+          "label": "F11",
+          "x": 11.75,
+          "y": 0
+        },
+        {
+          "label": "F12",
+          "x": 12.75,
+          "y": 0
+        },
+        {
+          "label": "Insert",
+          "x": 15.5,
+          "y": 0
+        },
+        {
+          "label": "Home",
+          "x": 16.5,
+          "y": 0
+        },
+        {
+          "label": "Pg Up",
+          "x": 17.5,
+          "y": 0
+        },
+        {
+          "label": "Prt Sc",
+          "x": 18.5,
+          "y": 0
+        },
+        {
+          "label": "Delete",
+          "x": 15.5,
+          "y": 1
+        },
+        {
+          "label": "End",
+          "x": 16.5,
+          "y": 1
+        },
+        {
+          "label": "Pg Dn",
+          "x": 17.5,
+          "y": 1
+        },
+        {
+          "label": "Scroll Lock",
+          "x": 18.5,
+          "y": 1
+        },
+        {
+          "label": "~",
+          "x": 0,
+          "y": 2
+        },
+        {
+          "label": "!",
+          "x": 1,
+          "y": 2
+        },
+        {
+          "label": "@",
+          "x": 2,
+          "y": 2
+        },
+        {
+          "label": "#",
+          "x": 3,
+          "y": 2
+        },
+        {
+          "label": "$",
+          "x": 4,
+          "y": 2
+        },
+        {
+          "label": "%",
+          "x": 5,
+          "y": 2
+        },
+        {
+          "label": "^",
+          "x": 6,
+          "y": 2
+        },
+        {
+          "label": "&",
+          "x": 7,
+          "y": 2
+        },
+        {
+          "label": "*",
+          "x": 8,
+          "y": 2
+        },
+        {
+          "label": "(",
+          "x": 9,
+          "y": 2
+        },
+        {
+          "label": ")",
+          "x": 10,
+          "y": 2
+        },
+        {
+          "label": "_",
+          "x": 11,
+          "y": 2
+        },
+        {
+          "label": "+",
+          "x": 12,
+          "y": 2
+        },
+        {
+          "label": "Backspace",
+          "x": 13,
+          "y": 2
+        },
+        {
+          "x": 14,
+          "y": 2
+        },
+        {
+          "label": "Num Lock",
+          "x": 15.5,
+          "y": 2
+        },
+        {
+          "label": "/",
+          "x": 16.5,
+          "y": 2
+        },
+        {
+          "label": "*",
+          "x": 17.5,
+          "y": 2
+        },
+        {
+          "label": "-",
+          "x": 18.5,
+          "y": 2
+        },
+        {
+          "label": "Tab",
+          "x": 0,
+          "y": 3,
+          "w": 1.5
+        },
+        {
+          "label": "Q",
+          "x": 1.5,
+          "y": 3
+        },
+        {
+          "label": "W",
+          "x": 2.5,
+          "y": 3
+        },
+        {
+          "label": "E",
+          "x": 3.5,
+          "y": 3
+        },
+        {
+          "label": "R",
+          "x": 4.5,
+          "y": 3
+        },
+        {
+          "label": "T",
+          "x": 5.5,
+          "y": 3
+        },
+        {
+          "label": "Y",
+          "x": 6.5,
+          "y": 3
+        },
+        {
+          "label": "U",
+          "x": 7.5,
+          "y": 3
+        },
+        {
+          "label": "I",
+          "x": 8.5,
+          "y": 3
+        },
+        {
+          "label": "O",
+          "x": 9.5,
+          "y": 3
+        },
+        {
+          "label": "P",
+          "x": 10.5,
+          "y": 3
+        },
+        {
+          "label": "{",
+          "x": 11.5,
+          "y": 3
+        },
+        {
+          "label": "}",
+          "x": 12.5,
+          "y": 3
+        },
+        {
+          "label": "|",
+          "x": 13.5,
+          "y": 3,
+          "w": 1.5
+        },
+        {
+          "label": "7",
+          "x": 15.5,
+          "y": 3
+        },
+        {
+          "label": "8",
+          "x": 16.5,
+          "y": 3
+        },
+        {
+          "label": "9",
+          "x": 17.5,
+          "y": 3
+        },
+        {
+          "label": "+",
+          "x": 18.5,
+          "y": 3
+        },
+        {
+          "label": "Caps Lock",
+          "x": 0,
+          "y": 4,
+          "w": 1.75
+        },
+        {
+          "label": "A",
+          "x": 1.75,
+          "y": 4
+        },
+        {
+          "label": "S",
+          "x": 2.75,
+          "y": 4
+        },
+        {
+          "label": "D",
+          "x": 3.75,
+          "y": 4
+        },
+        {
+          "label": "F",
+          "x": 4.75,
+          "y": 4
+        },
+        {
+          "label": "G",
+          "x": 5.75,
+          "y": 4
+        },
+        {
+          "label": "H",
+          "x": 6.75,
+          "y": 4
+        },
+        {
+          "label": "J",
+          "x": 7.75,
+          "y": 4
+        },
+        {
+          "label": "K",
+          "x": 8.75,
+          "y": 4
+        },
+        {
+          "label": "L",
+          "x": 9.75,
+          "y": 4
+        },
+        {
+          "label": ":",
+          "x": 10.75,
+          "y": 4
+        },
+        {
+          "label": "\"",
+          "x": 11.75,
+          "y": 4
+        },
+        {
+          "x": 12.75,
+          "y": 4
+        },
+        {
+          "label": "Enter",
+          "x": 13.75,
+          "y": 4,
+          "w": 1.25
+        },
+        {
+          "label": "4",
+          "x": 15.5,
+          "y": 4
+        },
+        {
+          "label": "5",
+          "x": 16.5,
+          "y": 4
+        },
+        {
+          "label": "6",
+          "x": 17.5,
+          "y": 4
+        },
+        {
+          "x": 18.5,
+          "y": 4
+        },
+        {
+          "x": 0,
+          "y": 5
+        },
+        {
+          "label": "Shift",
+          "x": 1,
+          "y": 5,
+          "w": 1.25
+        },
+        {
+          "label": "Z",
+          "x": 2.25,
+          "y": 5
+        },
+        {
+          "label": "X",
+          "x": 3.25,
+          "y": 5
+        },
+        {
+          "label": "C",
+          "x": 4.25,
+          "y": 5
+        },
+        {
+          "label": "V",
+          "x": 5.25,
+          "y": 5
+        },
+        {
+          "label": "B",
+          "x": 6.25,
+          "y": 5
+        },
+        {
+          "label": "N",
+          "x": 7.25,
+          "y": 5
+        },
+        {
+          "label": "M",
+          "x": 8.25,
+          "y": 5
+        },
+        {
+          "label": "<",
+          "x": 9.25,
+          "y": 5
+        },
+        {
+          "label": ">",
+          "x": 10.25,
+          "y": 5
+        },
+        {
+          "label": "?",
+          "x": 11.25,
+          "y": 5
+        },
+        {
+          "label": "Shift",
+          "x": 12.25,
+          "y": 5,
+          "w": 1.75
+        },
+        {
+          "label": "\\u2191",
+          "x": 14.25,
+          "y": 5
+        },
+        {
+          "label": "1",
+          "x": 15.5,
+          "y": 5
+        },
+        {
+          "label": "2",
+          "x": 16.5,
+          "y": 5
+        },
+        {
+          "label": "3",
+          "x": 17.5,
+          "y": 5
+        },
+        {
+          "label": "Enter",
+          "x": 18.5,
+          "y": 5
+        },
+        {
+          "label": "Ctrl",
+          "x": 0,
+          "y": 6,
+          "w": 1.25
+        },
+        {
+          "label": "Win",
+          "x": 1.25,
+          "y": 6,
+          "w": 1.25
+        },
+        {
+          "label": "Alt",
+          "x": 2.5,
+          "y": 6,
+          "w": 1.25
+        },
+        {
+          "x": 3.75,
+          "y": 6,
+          "w": 6.25
+        },
+        {
+          "label": "Alt",
+          "x": 10,
+          "y": 6
+        },
+        {
+          "label": "Win",
+          "x": 11,
+          "y": 6
+        },
+        {
+          "label": "Fn",
+          "x": 12,
+          "y": 6
+        },
+        {
+          "label": "\\u2190",
+          "x": 13.25,
+          "y": 6
+        },
+        {
+          "label": "\\u2193",
+          "x": 14.25,
+          "y": 6
+        },
+        {
+          "label": "\\u2192",
+          "x": 15.25,
+          "y": 6
+        },
+        {
+          "label": "0",
+          "x": 16.5,
+          "y": 6
+        },
+        {
+          "label": ".",
+          "x": 17.5,
+          "y": 6
+        },
+        {
+          "x": 18.5,
+          "y": 6
+        }
+      ]
+    }
   }
 }