diff --git a/keyboards/wilba_tech/wt60_d/info.json b/keyboards/wilba_tech/wt60_d/info.json
index bf4da3c22d79..84ef6838714a 100644
--- a/keyboards/wilba_tech/wt60_d/info.json
+++ b/keyboards/wilba_tech/wt60_d/info.json
@@ -24,25 +24,35 @@
         "pid": "0x060D",
         "vid": "0x6582"
     },
-    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_tsangan_hhkb"],
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan",
+        "60_tsangan_hhkb"
+    ],
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 3], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 12], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
@@ -53,10 +63,11 @@
                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
@@ -66,10 +77,11 @@
                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
                 {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                 {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
                 {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
@@ -77,38 +89,40 @@
                 {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                 {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                 {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 3], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4},
-                {"label": "GUI", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4}
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_ansi_split_bs_rshift": {
             "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 3], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 12], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 10], "x": 12, "y": 0},
                 {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
                 {"label": "Del", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
@@ -119,10 +133,11 @@
                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
@@ -132,10 +147,11 @@
                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
                 {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                 {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
                 {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
@@ -143,38 +159,40 @@
                 {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                 {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                 {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
                 {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 3], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4},
-                {"label": "GUI", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4}
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_ansi_tsangan": {
             "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 3], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 12], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
@@ -185,10 +203,11 @@
                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
@@ -198,10 +217,11 @@
                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
                 {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                 {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
                 {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
@@ -209,37 +229,39 @@
                 {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                 {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                 {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                 {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 3], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
                 {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4}
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_60_hhkb": {
             "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 3], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 12], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 10], "x": 12, "y": 0},
                 {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
                 {"label": "Del", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
@@ -250,10 +272,11 @@
                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Control", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Control", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
@@ -263,10 +286,11 @@
                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
                 {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                 {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
                 {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
@@ -274,35 +298,37 @@
                 {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                 {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                 {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
                 {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
                 {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 3], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
                 {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                {"label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 3], "x": 1, "y": 0},
-                {"label": "\"", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "\u00a3", "matrix": [0, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 12], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
@@ -313,9 +339,10 @@
                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
@@ -325,12 +352,13 @@
                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "@", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
-                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
                 {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                 {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
                 {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
@@ -338,38 +366,40 @@
                 {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                 {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                 {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 3], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4},
-                {"label": "GUI", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4}
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_iso_split_bs_rshift": {
             "layout": [
-                {"label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 3], "x": 1, "y": 0},
-                {"label": "\"", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "\u00a3", "matrix": [0, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 12], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 10], "x": 12, "y": 0},
                 {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
                 {"label": "Del", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
@@ -380,9 +410,10 @@
                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
@@ -392,12 +423,13 @@
                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "@", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
-                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
                 {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                 {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
                 {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
@@ -405,38 +437,110 @@
                 {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                 {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                 {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
                 {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 3], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4},
-                {"label": "GUI", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4}
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_iso_tsangan": {
             "layout": [
-                {"label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 3], "x": 1, "y": 0},
-                {"label": "\"", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "\u00a3", "matrix": [0, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 12], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Del", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
@@ -447,9 +551,10 @@
                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
@@ -459,12 +564,13 @@
                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "@", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
-                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
                 {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                 {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
                 {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
@@ -472,37 +578,40 @@
                 {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                 {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                 {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                 {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 3], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
                 {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4}
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 3], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 12], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 10], "x": 12, "y": 0},
                 {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
                 {"label": "Del", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
@@ -513,10 +622,11 @@
                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
@@ -526,10 +636,11 @@
                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
                 {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                 {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
                 {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
@@ -537,38 +648,40 @@
                 {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                 {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                 {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
                 {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                 {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 3], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
                 {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4}
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 3], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 12], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 10], "x": 12, "y": 0},
                 {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
                 {"label": "Del", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
@@ -579,10 +692,11 @@
                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
@@ -592,10 +706,11 @@
                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
                 {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
                 {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                 {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
@@ -604,19 +719,20 @@
                 {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                 {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                 {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
                 {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 3], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4},
-                {"label": "GUI", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4}
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/wilba_tech/wt60_d/matrix_diagram.md b/keyboards/wilba_tech/wt60_d/matrix_diagram.md
new file mode 100644
index 000000000000..6713c396ed19
--- /dev/null
+++ b/keyboards/wilba_tech/wt60_d/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for wilba.tech WT60-D
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │03 │02 │01 │04 │05 │06 │07 │08 │09 │0C │0B │0A │0D │2D │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐1D  │
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │   │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │    ISO Enter
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+│40  │41  │42  │43                      │4A  │4B  │4C  │4D  │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │43                         │4B   │4C │4D   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/wilba_tech/wt60_d/readme.md b/keyboards/wilba_tech/wt60_d/readme.md
index 354adff3906d..100b0964f2da 100644
--- a/keyboards/wilba_tech/wt60_d/readme.md
+++ b/keyboards/wilba_tech/wt60_d/readme.md
@@ -6,12 +6,12 @@ WT60-D is a keyboard PCB supporting 60% layout. [More info at wilba.tech](https:
 
 First produced as WT60-D MEKANISK for Mekanisk.
 
-Keyboard Maintainer: [Wilba6582](https://github.com/Wilba6582)  
-Hardware Supported: wilba.tech WT60-D  
-Hardware Availability: Custom keyboard group buys
+* Keyboard Maintainer: [Wilba](https://github.com/Wilba)
+* Hardware Supported: wilba.tech WT60-D
+* Hardware Availability: Custom keyboard group buys
 
 Make example for this keyboard (after setting up your build environment):
 
     make wilba_tech/wt60_d:default
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).