Merge remote-tracking branch 'origin/master' into develop

1 files changed, 368 insertions, 348 deletions

diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index a0fb3de1c9..7518a39026 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -1,7 +1,7 @@
 {
   "manufacturer": "Boardsource",
   "keyboard_name": "The Mark65",
-  "maintainer": "waffle87",
+  "maintainer": "daysgobye, boardsource, waffle87",
   "bootloader": "atmel-dfu",
   "diode_direction": "COL2ROW",
   "features": {
@@ -62,369 +62,389 @@
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        { "matrix": [0, 0], "x": 0, "y": 0 },
-        { "matrix": [0, 1], "x": 1, "y": 0 },
-        { "matrix": [0, 2], "x": 2, "y": 0 },
-        { "matrix": [0, 3], "x": 3, "y": 0 },
-        { "matrix": [0, 4], "x": 4, "y": 0 },
-        { "matrix": [0, 5], "x": 5, "y": 0 },
-        { "matrix": [0, 6], "x": 6, "y": 0 },
-        { "matrix": [0, 7], "x": 7, "y": 0 },
-        { "matrix": [0, 8], "x": 8, "y": 0 },
-        { "matrix": [0, 9], "x": 9, "y": 0 },
-        { "matrix": [0, 10], "x": 10, "y": 0 },
-        { "matrix": [0, 11], "x": 11, "y": 0 },
-        { "matrix": [0, 12], "x": 12, "y": 0 },
-        { "matrix": [0, 13], "x": 13, "y": 0 },
-        { "matrix": [0, 14], "x": 14, "y": 0 },
-        { "matrix": [0, 15], "x": 15, "y": 0 },
-        { "matrix": [1, 0], "x": 16, "y": 0 },
-        { "matrix": [1, 2], "x": 17, "y": 0 },
-        { "matrix": [1, 3], "x": 18, "y": 0 },
-        { "matrix": [1, 4], "x": 19, "y": 0 },
-        { "matrix": [1, 5], "x": 20, "y": 0 },
-        { "matrix": [1, 6], "x": 21, "y": 0 },
-        { "matrix": [1, 7], "x": 22, "y": 0 },
-        { "matrix": [1, 8], "x": 23, "y": 0 },
-        { "matrix": [1, 9], "x": 24, "y": 0 },
-        { "matrix": [1, 10], "x": 25, "y": 0 },
-        { "matrix": [1, 11], "x": 26, "y": 0 },
-        { "matrix": [1, 12], "x": 27, "y": 0 },
-        { "matrix": [1, 13], "x": 28, "y": 0 },
-        { "matrix": [1, 14], "x": 29, "y": 0 },
-        { "matrix": [1, 15], "x": 30, "y": 0 },
-        { "matrix": [2, 0], "x": 31, "y": 0 },
-        { "matrix": [2, 2], "x": 32, "y": 0 },
-        { "matrix": [2, 3], "x": 33, "y": 0 },
-        { "matrix": [2, 4], "x": 34, "y": 0 },
-        { "matrix": [2, 5], "x": 35, "y": 0 },
-        { "matrix": [2, 6], "x": 36, "y": 0 },
-        { "matrix": [2, 7], "x": 37, "y": 0 },
-        { "matrix": [2, 8], "x": 38, "y": 0 },
-        { "matrix": [2, 9], "x": 39, "y": 0 },
-        { "matrix": [2, 10], "x": 40, "y": 0 },
-        { "matrix": [2, 11], "x": 41, "y": 0 },
-        { "matrix": [2, 12], "x": 42, "y": 0 },
-        { "matrix": [2, 13], "x": 43, "y": 0 },
-        { "matrix": [2, 15], "x": 44, "y": 0 },
-        { "matrix": [3, 1], "x": 45, "y": 0 },
-        { "matrix": [3, 0], "x": 46, "y": 0 },
-        { "matrix": [3, 2], "x": 47, "y": 0 },
-        { "matrix": [3, 3], "x": 48, "y": 0 },
-        { "matrix": [3, 4], "x": 49, "y": 0 },
-        { "matrix": [3, 5], "x": 50, "y": 0 },
-        { "matrix": [3, 6], "x": 51, "y": 0 },
-        { "matrix": [3, 7], "x": 52, "y": 0 },
-        { "matrix": [3, 8], "x": 53, "y": 0 },
-        { "matrix": [3, 9], "x": 54, "y": 0 },
-        { "matrix": [3, 10], "x": 55, "y": 0 },
-        { "matrix": [3, 11], "x": 56, "y": 0 },
-        { "matrix": [3, 13], "x": 57, "y": 0 },
-        { "matrix": [3, 14], "x": 58, "y": 0 },
-        { "matrix": [4, 0], "x": 59, "y": 0 },
-        { "matrix": [4, 1], "x": 60, "y": 0 },
-        { "matrix": [4, 3], "x": 61, "y": 0 },
-        { "matrix": [4, 4], "x": 62, "y": 0 },
-        { "matrix": [4, 6], "x": 63, "y": 0 },
-        { "matrix": [4, 8], "x": 64, "y": 0 },
-        { "matrix": [4, 10], "x": 65, "y": 0 },
-        { "matrix": [4, 11], "x": 66, "y": 0 },
-        { "matrix": [4, 12], "x": 67, "y": 0 },
-        { "matrix": [4, 13], "x": 68, "y": 0 },
-        { "matrix": [4, 14], "x": 69, "y": 0 },
-        { "matrix": [4, 15], "x": 70, "y": 0 }
+        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label":"2@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label":"3#", "matrix": [0, 3], "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, 10], "x": 10, "y": 0 },
+        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
+        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+        { "label":"Backspace", "matrix": [0, 14], "x": 14, "y": 0 },
+        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+
+        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
+        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
+        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
+        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
+        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
+        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
+        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
+        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
+        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
+        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
+        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
+        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
+        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
+        { "label":"\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5 },
+        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+
+        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
+        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
+        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
+        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
+        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
+        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
+        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
+        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
+        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
+        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
+        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
+        { "label":"'\"", "matrix": [2, 12], "x": 11.75, "y": 2 },
+        { "label":"Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
+        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+
+        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25 },
+        { "label":"\\|", "matrix": [3, 0], "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, 13], "x": 12.25, "y": 3, "w": 1.75 },
+        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+
+        { "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, 3], "x": 2.5, "y": 4, "w": 1.25 },
+        { "label":"Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25 },
+        { "label":"Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25 },
+        { "label":"Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75 },
+        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
+        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
+        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
+        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
+        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
+        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
       ]
     },
     "LAYOUT_ansi": {
       "layout": [
-        { "matrix": [0, 0], "x": 0, "y": 0 },
-        { "matrix": [0, 1], "x": 1, "y": 0 },
-        { "matrix": [0, 2], "x": 2, "y": 0 },
-        { "matrix": [0, 3], "x": 3, "y": 0 },
-        { "matrix": [0, 4], "x": 4, "y": 0 },
-        { "matrix": [0, 5], "x": 5, "y": 0 },
-        { "matrix": [0, 6], "x": 6, "y": 0 },
-        { "matrix": [0, 7], "x": 7, "y": 0 },
-        { "matrix": [0, 8], "x": 8, "y": 0 },
-        { "matrix": [0, 9], "x": 9, "y": 0 },
-        { "matrix": [0, 10], "x": 10, "y": 0 },
-        { "matrix": [0, 11], "x": 11, "y": 0 },
-        { "matrix": [0, 12], "x": 12, "y": 0 },
-        { "matrix": [0, 13], "x": 13, "y": 0 },
-        { "matrix": [0, 15], "x": 14, "y": 0 },
-        { "matrix": [1, 0], "x": 15, "y": 0 },
-        { "matrix": [1, 2], "x": 16, "y": 0 },
-        { "matrix": [1, 3], "x": 17, "y": 0 },
-        { "matrix": [1, 4], "x": 18, "y": 0 },
-        { "matrix": [1, 5], "x": 19, "y": 0 },
-        { "matrix": [1, 6], "x": 20, "y": 0 },
-        { "matrix": [1, 7], "x": 21, "y": 0 },
-        { "matrix": [1, 8], "x": 22, "y": 0 },
-        { "matrix": [1, 9], "x": 23, "y": 0 },
-        { "matrix": [1, 10], "x": 24, "y": 0 },
-        { "matrix": [1, 11], "x": 25, "y": 0 },
-        { "matrix": [1, 12], "x": 26, "y": 0 },
-        { "matrix": [1, 13], "x": 27, "y": 0 },
-        { "matrix": [1, 14], "x": 28, "y": 0 },
-        { "matrix": [1, 15], "x": 29, "y": 0 },
-        { "matrix": [2, 0], "x": 30, "y": 0 },
-        { "matrix": [2, 2], "x": 31, "y": 0 },
-        { "matrix": [2, 3], "x": 32, "y": 0 },
-        { "matrix": [2, 4], "x": 33, "y": 0 },
-        { "matrix": [2, 5], "x": 34, "y": 0 },
-        { "matrix": [2, 6], "x": 35, "y": 0 },
-        { "matrix": [2, 7], "x": 36, "y": 0 },
-        { "matrix": [2, 8], "x": 37, "y": 0 },
-        { "matrix": [2, 9], "x": 38, "y": 0 },
-        { "matrix": [2, 10], "x": 39, "y": 0 },
-        { "matrix": [2, 11], "x": 40, "y": 0 },
-        { "matrix": [2, 12], "x": 41, "y": 0 },
-        { "matrix": [2, 13], "x": 42, "y": 0 },
-        { "matrix": [2, 15], "x": 43, "y": 0 },
-        { "matrix": [3, 1], "x": 44, "y": 0 },
-        { "matrix": [3, 2], "x": 45, "y": 0 },
-        { "matrix": [3, 3], "x": 46, "y": 0 },
-        { "matrix": [3, 4], "x": 47, "y": 0 },
-        { "matrix": [3, 5], "x": 48, "y": 0 },
-        { "matrix": [3, 6], "x": 49, "y": 0 },
-        { "matrix": [3, 7], "x": 50, "y": 0 },
-        { "matrix": [3, 8], "x": 51, "y": 0 },
-        { "matrix": [3, 9], "x": 52, "y": 0 },
-        { "matrix": [3, 10], "x": 53, "y": 0 },
-        { "matrix": [3, 11], "x": 54, "y": 0 },
-        { "matrix": [3, 13], "x": 55, "y": 0 },
-        { "matrix": [3, 14], "x": 56, "y": 0 },
-        { "matrix": [4, 0], "x": 57, "y": 0 },
-        { "matrix": [4, 1], "x": 58, "y": 0 },
-        { "matrix": [4, 3], "x": 59, "y": 0 },
-        { "matrix": [4, 6], "x": 60, "y": 0 },
-        { "matrix": [4, 10], "x": 61, "y": 0 },
-        { "matrix": [4, 11], "x": 62, "y": 0 },
-        { "matrix": [4, 12], "x": 63, "y": 0 },
-        { "matrix": [4, 13], "x": 64, "y": 0 },
-        { "matrix": [4, 14], "x": 65, "y": 0 },
-        { "matrix": [4, 15], "x": 66, "y": 0 }
+        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label":"2@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label":"3#", "matrix": [0, 3], "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, 10], "x": 10, "y": 0 },
+        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
+        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
+        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+
+        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
+        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
+        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
+        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
+        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
+        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
+        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
+        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
+        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
+        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
+        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
+        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
+        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
+        { "label":"\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5 },
+        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+
+        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
+        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
+        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
+        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
+        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
+        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
+        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
+        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
+        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
+        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
+        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
+        { "label":"'\"", "matrix": [2, 12], "x": 11.75, "y": 2 },
+        { "label":"Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
+        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+
+        { "label":"Shift", "matrix": [3, 1], "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 },
+        { "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, 13], "x": 12.25, "y": 3, "w": 1.75 },
+        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+
+        { "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, 3], "x": 2.5, "y": 4, "w": 1.25 },
+        { "label":"Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25 },
+        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
+        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
+        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
+        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
+        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
+        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
       ]
     },
     "LAYOUT_ansi_split_bs_space": {
       "layout": [
-        { "matrix": [0, 0], "x": 0, "y": 0 },
-        { "matrix": [0, 1], "x": 1, "y": 0 },
-        { "matrix": [0, 2], "x": 2, "y": 0 },
-        { "matrix": [0, 3], "x": 3, "y": 0 },
-        { "matrix": [0, 4], "x": 4, "y": 0 },
-        { "matrix": [0, 5], "x": 5, "y": 0 },
-        { "matrix": [0, 6], "x": 6, "y": 0 },
-        { "matrix": [0, 7], "x": 7, "y": 0 },
-        { "matrix": [0, 8], "x": 8, "y": 0 },
-        { "matrix": [0, 9], "x": 9, "y": 0 },
-        { "matrix": [0, 10], "x": 10, "y": 0 },
-        { "matrix": [0, 11], "x": 11, "y": 0 },
-        { "matrix": [0, 12], "x": 12, "y": 0 },
-        { "matrix": [0, 13], "x": 13, "y": 0 },
-        { "matrix": [0, 14], "x": 14, "y": 0 },
-        { "matrix": [0, 15], "x": 15, "y": 0 },
-        { "matrix": [1, 0], "x": 16, "y": 0 },
-        { "matrix": [1, 2], "x": 17, "y": 0 },
-        { "matrix": [1, 3], "x": 18, "y": 0 },
-        { "matrix": [1, 4], "x": 19, "y": 0 },
-        { "matrix": [1, 5], "x": 20, "y": 0 },
-        { "matrix": [1, 6], "x": 21, "y": 0 },
-        { "matrix": [1, 7], "x": 22, "y": 0 },
-        { "matrix": [1, 8], "x": 23, "y": 0 },
-        { "matrix": [1, 9], "x": 24, "y": 0 },
-        { "matrix": [1, 10], "x": 25, "y": 0 },
-        { "matrix": [1, 11], "x": 26, "y": 0 },
-        { "matrix": [1, 12], "x": 27, "y": 0 },
-        { "matrix": [1, 13], "x": 28, "y": 0 },
-        { "matrix": [1, 14], "x": 29, "y": 0 },
-        { "matrix": [1, 15], "x": 30, "y": 0 },
-        { "matrix": [2, 0], "x": 31, "y": 0 },
-        { "matrix": [2, 2], "x": 32, "y": 0 },
-        { "matrix": [2, 3], "x": 33, "y": 0 },
-        { "matrix": [2, 4], "x": 34, "y": 0 },
-        { "matrix": [2, 5], "x": 35, "y": 0 },
-        { "matrix": [2, 6], "x": 36, "y": 0 },
-        { "matrix": [2, 7], "x": 37, "y": 0 },
-        { "matrix": [2, 8], "x": 38, "y": 0 },
-        { "matrix": [2, 9], "x": 39, "y": 0 },
-        { "matrix": [2, 10], "x": 40, "y": 0 },
-        { "matrix": [2, 11], "x": 41, "y": 0 },
-        { "matrix": [2, 12], "x": 42, "y": 0 },
-        { "matrix": [2, 13], "x": 43, "y": 0 },
-        { "matrix": [2, 15], "x": 44, "y": 0 },
-        { "matrix": [3, 1], "x": 45, "y": 0 },
-        { "matrix": [3, 2], "x": 46, "y": 0 },
-        { "matrix": [3, 3], "x": 47, "y": 0 },
-        { "matrix": [3, 4], "x": 48, "y": 0 },
-        { "matrix": [3, 5], "x": 49, "y": 0 },
-        { "matrix": [3, 6], "x": 50, "y": 0 },
-        { "matrix": [3, 7], "x": 51, "y": 0 },
-        { "matrix": [3, 8], "x": 52, "y": 0 },
-        { "matrix": [3, 9], "x": 53, "y": 0 },
-        { "matrix": [3, 10], "x": 54, "y": 0 },
-        { "matrix": [3, 11], "x": 55, "y": 0 },
-        { "matrix": [3, 13], "x": 56, "y": 0 },
-        { "matrix": [3, 14], "x": 57, "y": 0 },
-        { "matrix": [4, 0], "x": 58, "y": 0 },
-        { "matrix": [4, 1], "x": 59, "y": 0 },
-        { "matrix": [4, 3], "x": 60, "y": 0 },
-        { "matrix": [4, 4], "x": 61, "y": 0 },
-        { "matrix": [4, 6], "x": 62, "y": 0 },
-        { "matrix": [4, 8], "x": 63, "y": 0 },
-        { "matrix": [4, 10], "x": 64, "y": 0 },
-        { "matrix": [4, 11], "x": 65, "y": 0 },
-        { "matrix": [4, 12], "x": 66, "y": 0 },
-        { "matrix": [4, 13], "x": 67, "y": 0 },
-        { "matrix": [4, 14], "x": 68, "y": 0 },
-        { "matrix": [4, 15], "x": 69, "y": 0 }
+        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label":"2@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label":"3#", "matrix": [0, 3], "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, 10], "x": 10, "y": 0 },
+        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
+        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+        { "label":"Backspace", "matrix": [0, 14], "x": 14, "y": 0 },
+        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+
+        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
+        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
+        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
+        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
+        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
+        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
+        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
+        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
+        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
+        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
+        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
+        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
+        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
+        { "label":"\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5 },
+        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+
+        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
+        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
+        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
+        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
+        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
+        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
+        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
+        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
+        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
+        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
+        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
+        { "label":"'\"", "matrix": [2, 12], "x": 11.75, "y": 2 },
+        { "label":"Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
+        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+
+        { "label":"Shift", "matrix": [3, 1], "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 },
+        { "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, 13], "x": 12.25, "y": 3, "w": 1.75 },
+        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+
+        { "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, 3], "x": 2.5, "y": 4, "w": 1.25 },
+        { "label":"Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25 },
+        { "label":"Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25 },
+        { "label":"Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75 },
+        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
+        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
+        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
+        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
+        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
+        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
       ]
     },
     "LAYOUT_iso": {
       "layout": [
-        { "matrix": [0, 0], "x": 0, "y": 0 },
-        { "matrix": [0, 1], "x": 1, "y": 0 },
-        { "matrix": [0, 2], "x": 2, "y": 0 },
-        { "matrix": [0, 3], "x": 3, "y": 0 },
-        { "matrix": [0, 4], "x": 4, "y": 0 },
-        { "matrix": [0, 5], "x": 5, "y": 0 },
-        { "matrix": [0, 6], "x": 6, "y": 0 },
-        { "matrix": [0, 7], "x": 7, "y": 0 },
-        { "matrix": [0, 8], "x": 8, "y": 0 },
-        { "matrix": [0, 9], "x": 9, "y": 0 },
-        { "matrix": [0, 10], "x": 10, "y": 0 },
-        { "matrix": [0, 11], "x": 11, "y": 0 },
-        { "matrix": [0, 12], "x": 12, "y": 0 },
-        { "matrix": [0, 13], "x": 13, "y": 0 },
-        { "matrix": [0, 15], "x": 14, "y": 0 },
-        { "matrix": [1, 0], "x": 15, "y": 0 },
-        { "matrix": [1, 2], "x": 16, "y": 0 },
-        { "matrix": [1, 3], "x": 17, "y": 0 },
-        { "matrix": [1, 4], "x": 18, "y": 0 },
-        { "matrix": [1, 5], "x": 19, "y": 0 },
-        { "matrix": [1, 6], "x": 20, "y": 0 },
-        { "matrix": [1, 7], "x": 21, "y": 0 },
-        { "matrix": [1, 8], "x": 22, "y": 0 },
-        { "matrix": [1, 9], "x": 23, "y": 0 },
-        { "matrix": [1, 10], "x": 24, "y": 0 },
-        { "matrix": [1, 11], "x": 25, "y": 0 },
-        { "matrix": [1, 12], "x": 26, "y": 0 },
-        { "matrix": [1, 13], "x": 27, "y": 0 },
-        { "matrix": [1, 15], "x": 28, "y": 0 },
-        { "matrix": [2, 0], "x": 29, "y": 0 },
-        { "matrix": [2, 2], "x": 30, "y": 0 },
-        { "matrix": [2, 3], "x": 31, "y": 0 },
-        { "matrix": [2, 4], "x": 32, "y": 0 },
-        { "matrix": [2, 5], "x": 33, "y": 0 },
-        { "matrix": [2, 6], "x": 34, "y": 0 },
-        { "matrix": [2, 7], "x": 35, "y": 0 },
-        { "matrix": [2, 8], "x": 36, "y": 0 },
-        { "matrix": [2, 9], "x": 37, "y": 0 },
-        { "matrix": [2, 10], "x": 38, "y": 0 },
-        { "matrix": [2, 11], "x": 39, "y": 0 },
-        { "matrix": [2, 12], "x": 40, "y": 0 },
-        { "matrix": [1, 14], "x": 41, "y": 0 },
-        { "matrix": [2, 13], "x": 42, "y": 0 },
-        { "matrix": [2, 15], "x": 43, "y": 0 },
-        { "matrix": [3, 1], "x": 44, "y": 0 },
-        { "matrix": [3, 0], "x": 45, "y": 0 },
-        { "matrix": [3, 2], "x": 46, "y": 0 },
-        { "matrix": [3, 3], "x": 47, "y": 0 },
-        { "matrix": [3, 4], "x": 48, "y": 0 },
-        { "matrix": [3, 5], "x": 49, "y": 0 },
-        { "matrix": [3, 6], "x": 50, "y": 0 },
-        { "matrix": [3, 7], "x": 51, "y": 0 },
-        { "matrix": [3, 8], "x": 52, "y": 0 },
-        { "matrix": [3, 9], "x": 53, "y": 0 },
-        { "matrix": [3, 10], "x": 54, "y": 0 },
-        { "matrix": [3, 11], "x": 55, "y": 0 },
-        { "matrix": [3, 13], "x": 56, "y": 0 },
-        { "matrix": [3, 14], "x": 57, "y": 0 },
-        { "matrix": [4, 0], "x": 58, "y": 0 },
-        { "matrix": [4, 1], "x": 59, "y": 0 },
-        { "matrix": [4, 3], "x": 60, "y": 0 },
-        { "matrix": [4, 6], "x": 61, "y": 0 },
-        { "matrix": [4, 10], "x": 62, "y": 0 },
-        { "matrix": [4, 11], "x": 63, "y": 0 },
-        { "matrix": [4, 12], "x": 64, "y": 0 },
-        { "matrix": [4, 13], "x": 65, "y": 0 },
-        { "matrix": [4, 14], "x": 66, "y": 0 },
-        { "matrix": [4, 15], "x": 67, "y": 0 }
+        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label":"2\"", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label":"3\u00a3", "matrix": [0, 3], "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, 10], "x": 10, "y": 0 },
+        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
+        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
+        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+
+        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
+        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
+        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
+        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
+        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
+        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
+        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
+        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
+        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
+        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
+        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
+        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
+        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
+        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+
+        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
+        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
+        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
+        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
+        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
+        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
+        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
+        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
+        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
+        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
+        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
+        { "label":"'@", "matrix": [2, 12], "x": 11.75, "y": 2 },
+        { "label":"#~", "matrix": [1, 14], "x": 12.75, "y": 2 },
+        { "label":"Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
+        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+
+        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25 },
+        { "label":"\\|", "matrix": [3, 0], "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, 13], "x": 12.25, "y": 3, "w": 1.75 },
+        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+
+        { "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, 3], "x": 2.5, "y": 4, "w": 1.25 },
+        { "label":"Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25 },
+        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
+        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
+        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
+        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
+        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
+        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
       ]
     },
     "LAYOUT_iso_split_bs_space": {
       "layout": [
-        { "matrix": [0, 0], "x": 0, "y": 0 },
-        { "matrix": [0, 1], "x": 1, "y": 0 },
-        { "matrix": [0, 2], "x": 2, "y": 0 },
-        { "matrix": [0, 3], "x": 3, "y": 0 },
-        { "matrix": [0, 4], "x": 4, "y": 0 },
-        { "matrix": [0, 5], "x": 5, "y": 0 },
-        { "matrix": [0, 6], "x": 6, "y": 0 },
-        { "matrix": [0, 7], "x": 7, "y": 0 },
-        { "matrix": [0, 8], "x": 8, "y": 0 },
-        { "matrix": [0, 9], "x": 9, "y": 0 },
-        { "matrix": [0, 10], "x": 10, "y": 0 },
-        { "matrix": [0, 11], "x": 11, "y": 0 },
-        { "matrix": [0, 12], "x": 12, "y": 0 },
-        { "matrix": [0, 13], "x": 13, "y": 0 },
-        { "matrix": [0, 14], "x": 14, "y": 0 },
-        { "matrix": [0, 15], "x": 15, "y": 0 },
-        { "matrix": [1, 0], "x": 16, "y": 0 },
-        { "matrix": [1, 2], "x": 17, "y": 0 },
-        { "matrix": [1, 3], "x": 18, "y": 0 },
-        { "matrix": [1, 4], "x": 19, "y": 0 },
-        { "matrix": [1, 5], "x": 20, "y": 0 },
-        { "matrix": [1, 6], "x": 21, "y": 0 },
-        { "matrix": [1, 7], "x": 22, "y": 0 },
-        { "matrix": [1, 8], "x": 23, "y": 0 },
-        { "matrix": [1, 9], "x": 24, "y": 0 },
-        { "matrix": [1, 10], "x": 25, "y": 0 },
-        { "matrix": [1, 11], "x": 26, "y": 0 },
-        { "matrix": [1, 12], "x": 27, "y": 0 },
-        { "matrix": [1, 13], "x": 28, "y": 0 },
-        { "matrix": [1, 15], "x": 29, "y": 0 },
-        { "matrix": [2, 0], "x": 30, "y": 0 },
-        { "matrix": [2, 2], "x": 31, "y": 0 },
-        { "matrix": [2, 3], "x": 32, "y": 0 },
-        { "matrix": [2, 4], "x": 33, "y": 0 },
-        { "matrix": [2, 5], "x": 34, "y": 0 },
-        { "matrix": [2, 6], "x": 35, "y": 0 },
-        { "matrix": [2, 7], "x": 36, "y": 0 },
-        { "matrix": [2, 8], "x": 37, "y": 0 },
-        { "matrix": [2, 9], "x": 38, "y": 0 },
-        { "matrix": [2, 10], "x": 39, "y": 0 },
-        { "matrix": [2, 11], "x": 40, "y": 0 },
-        { "matrix": [2, 12], "x": 41, "y": 0 },
-        { "matrix": [1, 14], "x": 42, "y": 0 },
-        { "matrix": [2, 13], "x": 43, "y": 0 },
-        { "matrix": [2, 15], "x": 44, "y": 0 },
-        { "matrix": [3, 1], "x": 45, "y": 0 },
-        { "matrix": [3, 0], "x": 46, "y": 0 },
-        { "matrix": [3, 2], "x": 47, "y": 0 },
-        { "matrix": [3, 3], "x": 48, "y": 0 },
-        { "matrix": [3, 4], "x": 49, "y": 0 },
-        { "matrix": [3, 5], "x": 50, "y": 0 },
-        { "matrix": [3, 6], "x": 51, "y": 0 },
-        { "matrix": [3, 7], "x": 52, "y": 0 },
-        { "matrix": [3, 8], "x": 53, "y": 0 },
-        { "matrix": [3, 9], "x": 54, "y": 0 },
-        { "matrix": [3, 10], "x": 55, "y": 0 },
-        { "matrix": [3, 11], "x": 56, "y": 0 },
-        { "matrix": [3, 13], "x": 57, "y": 0 },
-        { "matrix": [3, 14], "x": 58, "y": 0 },
-        { "matrix": [4, 0], "x": 59, "y": 0 },
-        { "matrix": [4, 1], "x": 60, "y": 0 },
-        { "matrix": [4, 3], "x": 61, "y": 0 },
-        { "matrix": [4, 4], "x": 62, "y": 0 },
-        { "matrix": [4, 6], "x": 63, "y": 0 },
-        { "matrix": [4, 8], "x": 64, "y": 0 },
-        { "matrix": [4, 10], "x": 65, "y": 0 },
-        { "matrix": [4, 11], "x": 66, "y": 0 },
-        { "matrix": [4, 12], "x": 67, "y": 0 },
-        { "matrix": [4, 13], "x": 68, "y": 0 },
-        { "matrix": [4, 14], "x": 69, "y": 0 },
-        { "matrix": [4, 15], "x": 70, "y": 0 }
+        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label":"2\"", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label":"3\u00a3", "matrix": [0, 3], "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, 10], "x": 10, "y": 0 },
+        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
+        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+        { "label":"Backspace", "matrix": [0, 14], "x": 14, "y": 0 },
+        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+
+        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
+        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
+        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
+        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
+        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
+        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
+        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
+        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
+        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
+        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
+        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
+        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
+        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
+        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+
+        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
+        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
+        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
+        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
+        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
+        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
+        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
+        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
+        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
+        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
+        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
+        { "label":"'@", "matrix": [2, 12], "x": 11.75, "y": 2 },
+        { "label":"#~", "matrix": [1, 14], "x": 12.75, "y": 2 },
+        { "label":"Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
+        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+
+        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25 },
+        { "label":"\\|", "matrix": [3, 0], "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, 13], "x": 12.25, "y": 3, "w": 1.75 },
+        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+
+        { "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, 3], "x": 2.5, "y": 4, "w": 1.25 },
+        { "label":"Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25 },
+        { "label":"Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25 },
+        { "label":"Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75 },
+        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
+        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
+        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
+        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
+        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
+        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
       ]
     }
   }