Lucid Velvet Solder Layout Additions and Touch-Up (#21313)

* [refactor] refactor via keymap

- grid-align keycodes
- remove trailing whitespace

* [refactor] refactor default keymap

- grid-align keycodes
- remove trailing whitespace

* [bugfix] fix key sequence error in default keymap

* [enhancement] fix key overlaps in Configurator

* [enhancement] add matrix diagram

* [refactor] rename LAYOUT to LAYOUT_all

* [enhancement] add LAYOUT_tkl_f13_ansi_split_space_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi

* [enhancement] add LAYOUT_tkl_f13_iso_split_space_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso

4 files changed, 677 insertions, 47 deletions

diff --git a/keyboards/lucid/velvet_solder/info.json b/keyboards/lucid/velvet_solder/info.json
index e1469cb813..1cc8e43cdb 100644
--- a/keyboards/lucid/velvet_solder/info.json
+++ b/keyboards/lucid/velvet_solder/info.json
@@ -23,8 +23,11 @@
     },
     "processor": "at90usb646",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
                 {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
@@ -108,7 +111,604 @@
                 {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
                 {"matrix": [4, 12], "label": "Right Shift", "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 13], "label": "Right Shift", "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "label": "Right Shift", "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 5], "x": 6.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 7.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0},
+                {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "@", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "#", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "$", "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "label": "%", "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "label": "^", "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "label": "&", "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "label": "*", "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "label": "(", "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "label": "Back Space", "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "label": "|", "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "label": "SQ", "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "label": "Right Shift", "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0},
+                {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "@", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "#", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "$", "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "label": "%", "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "label": "^", "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "label": "&", "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "label": "*", "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "label": "(", "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "label": "Back Space", "x": 13, "y": 1.25},
+                {"matrix": [3, 14], "label": "Back Space", "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "label": "|", "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "label": "SQ", "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "label": "Right Shift", "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "label": "Right Shift", "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_space_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0},
+                {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "@", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "#", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "$", "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "label": "%", "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "label": "^", "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "label": "&", "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "label": "*", "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "label": "(", "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "label": "Back Space", "x": 13, "y": 1.25},
+                {"matrix": [3, 14], "label": "Back Space", "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "label": "|", "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "label": "SQ", "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "label": "Right Shift", "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "label": "Right Shift", "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 5], "x": 6.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 7.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0},
+                {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "@", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "#", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "$", "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "label": "%", "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "label": "^", "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "label": "&", "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "label": "*", "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "label": "(", "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "label": "Back Space", "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "label": "SQ", "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "label": "~", "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25, "w": 1},
+                {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "label": "Right Shift", "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0},
+                {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "@", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "#", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "$", "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "label": "%", "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "label": "^", "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "label": "&", "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "label": "*", "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "label": "(", "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "label": "Back Space", "x": 13, "y": 1.25},
+                {"matrix": [3, 14], "label": "Back Space", "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "label": "SQ", "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "label": "~", "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25, "w": 1},
+                {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "label": "Right Shift", "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "label": "Right Shift", "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_split_space_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0},
+                {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "@", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "#", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "$", "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "label": "%", "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "label": "^", "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "label": "&", "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "label": "*", "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "label": "(", "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "label": "Back Space", "x": 13, "y": 1.25},
+                {"matrix": [3, 14], "label": "Back Space", "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "label": "SQ", "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "label": "~", "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25, "w": 1},
+                {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "label": "Right Shift", "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "label": "Right Shift", "x": 14, "y": 4.25},
                 {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
 
                 {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
@@ -116,7 +716,7 @@
                 {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.75},
                 {"matrix": [5, 5], "x": 6.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 8], "x": 6.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 8], "x": 7.75, "y": 5.25, "w": 2.25},
                 {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 10], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 11], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
diff --git a/keyboards/lucid/velvet_solder/keymaps/default/keymap.c b/keyboards/lucid/velvet_solder/keymaps/default/keymap.c
index dbe2f58a81..57fa9bf2bc 100644
--- a/keyboards/lucid/velvet_solder/keymaps/default/keymap.c
+++ b/keyboards/lucid/velvet_solder/keymaps/default/keymap.c
@@ -20,22 +20,22 @@ enum layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
-    [_LAYER0] = LAYOUT(
-        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, 
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, 
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, 
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSPC, KC_ENT, 
-        KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+
+    [_LAYER0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
+    [_LAYER1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/lucid/velvet_solder/keymaps/via/keymap.c b/keyboards/lucid/velvet_solder/keymaps/via/keymap.c
index b6d8377e4c..2c7cd72db8 100644
--- a/keyboards/lucid/velvet_solder/keymaps/via/keymap.c
+++ b/keyboards/lucid/velvet_solder/keymaps/via/keymap.c
@@ -23,39 +23,39 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT(
-        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, 
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, 
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, 
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
-        KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    [_LAYER0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
+    [_LAYER1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-    [_LAYER2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS    
+    [_LAYER2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-    [_LAYER3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS    
+    [_LAYER3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/lucid/velvet_solder/matrix_diagram.md b/keyboards/lucid/velvet_solder/matrix_diagram.md
new file mode 100644
index 0000000000..3269c061aa
--- /dev/null
+++ b/keyboards/lucid/velvet_solder/matrix_diagram.md
@@ -0,0 +1,30 @@
+# Matrix Diagram for FJLaboratories Velvet Solder
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3E ││1E │1F │1G │    │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └─┬─────┤
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐2D  │ ISO Enter
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                │3D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │    │4F │
+├────┼───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│50  │51  │52  │54        │55  │58      │59  │5A  │5B  │5D  ││5E │5F │5G │
+└────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│40      │ 2.25u LShift             2.75u RShift │4C        │
+└────────┘                                       └──────────┘
+┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+│50  │51  │52  │55                      │59  │5A  │5B  │5D  │ Standard
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌─────┬───┬─────┬──────────┬─────┬──────────┬─────┬───┬─────┐
+│50   │51 │52   │54        │55   │58        │5A   │5B │5D   │ Tsangan/WKL with Split Spacebar
+└─────┴───┴─────┴──────────┴─────┴──────────┴─────┴───┴─────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50   │51 │52   │55                         │5A   │5B │5D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```