Cable Car Designs Cypher rev6 Layout Additions and Touch-Up (#20518)

* add matrix_diagram.md

* refactor default keymap

- use four-space indent
- grid-align keycodes
- use QMK-native keycode alias for `RGB_MODE_RGBTEST`

* refactor default_iso keymap

- use four-space indent
- grid-align keycodes

* refactor via keymap

- use four-space indent
- grid-align keycodes
- use QMK-native keycode alias for `KC_TRNS`

* info.json: apply friendly formatting

* add maintainer and url keys to info.json

* add LAYOUT_ansi with reference keymap

* add LAYOUT_iso; refactor default_iso keymap

* standardize default and via keymaps

- use `QK_GESC` at top left
- use `KC_DEL` for right half of Split Backspace
- use `KC_NUHS` for Non-US Hash position
- use `KC_NUBS` for Non-Us Backslash position
- use `KC_RGUI` for middle right mod

* add RGB Underglow keycodes to all keymap Function layers

9 files changed, 455 insertions, 155 deletions

diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json
index 288222a918..2096eed000 100644
--- a/keyboards/cablecardesigns/cypher/rev6/info.json
+++ b/keyboards/cablecardesigns/cypher/rev6/info.json
@@ -1,6 +1,8 @@
 {
     "keyboard_name": "Cypher Rev6",
     "manufacturer": "cablecardesigns",
+    "maintainer": "westfoxtrot",
+    "url": "https://github.com/westfoxtrot/Cypher_PCB",
     "usb": {
       "vid": "0x41FF",
       "pid": "0xAA99",
@@ -22,108 +24,303 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "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": [5, 0], "x": 10, "y": 0},
-          {"matrix": [5, 1], "x": 11, "y": 0},
-          {"matrix": [5, 2], "x": 12, "y": 0},
-          {"matrix": [5, 3], "x": 13, "y": 0},
-          {"matrix": [5, 4], "x": 14, "y": 0},
-
-          {"matrix": [5, 5], "x": 15.5, "y": 0},
-          {"matrix": [5, 6], "x": 16.5, "y": 0},
-          {"matrix": [5, 7], "x": 17.5, "y": 0},
-          {"matrix": [5, 8], "x": 18.5, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-          {"matrix": [1, 1], "x": 1.5, "y": 1},
-          {"matrix": [1, 2], "x": 2.5, "y": 1},
-          {"matrix": [1, 3], "x": 3.5, "y": 1},
-          {"matrix": [1, 4], "x": 4.5, "y": 1},
-          {"matrix": [1, 5], "x": 5.5, "y": 1},
-          {"matrix": [1, 6], "x": 6.5, "y": 1},
-          {"matrix": [1, 7], "x": 7.5, "y": 1},
-          {"matrix": [1, 8], "x": 8.5, "y": 1},
-          {"matrix": [1, 9], "x": 9.5, "y": 1},
-          {"matrix": [6, 0], "x": 10.5, "y": 1},
-          {"matrix": [6, 1], "x": 11.5, "y": 1},
-          {"matrix": [6, 2], "x": 12.5, "y": 1},
-          {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5},
-
-          {"matrix": [6, 5], "x": 15.5, "y": 1},
-          {"matrix": [6, 6], "x": 16.5, "y": 1},
-          {"matrix": [6, 7], "x": 17.5, "y": 1},
-          {"matrix": [6, 8], "x": 18.5, "y": 1},
-
-          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-          {"matrix": [2, 1], "x": 1.75, "y": 2},
-          {"matrix": [2, 2], "x": 2.75, "y": 2},
-          {"matrix": [2, 3], "x": 3.75, "y": 2},
-          {"matrix": [2, 4], "x": 4.75, "y": 2},
-          {"matrix": [2, 5], "x": 5.75, "y": 2},
-          {"matrix": [2, 6], "x": 6.75, "y": 2},
-          {"matrix": [2, 7], "x": 7.75, "y": 2},
-          {"matrix": [2, 8], "x": 8.75, "y": 2},
-          {"matrix": [2, 9], "x": 9.75, "y": 2},
-          {"matrix": [7, 0], "x": 10.75, "y": 2},
-          {"matrix": [7, 1], "x": 11.75, "y": 2},
-          {"matrix": [7, 2], "x": 12.75, "y": 2},
-          {"matrix": [7, 3], "x": 13.75, "y": 2, "w": 1.25},
-
-          {"matrix": [7, 5], "x": 15.5, "y": 2},
-          {"matrix": [7, 6], "x": 16.5, "y": 2},
-          {"matrix": [7, 7], "x": 17.5, "y": 2},
-          {"matrix": [7, 8], "x": 18.5, "y": 2},
-
-          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-          {"matrix": [3, 1], "x": 1.25, "y": 3},
-          {"matrix": [3, 2], "x": 2.25, "y": 3},
-          {"matrix": [3, 3], "x": 3.25, "y": 3},
-          {"matrix": [3, 4], "x": 4.25, "y": 3},
-          {"matrix": [3, 5], "x": 5.25, "y": 3},
-          {"matrix": [3, 6], "x": 6.25, "y": 3},
-          {"matrix": [3, 7], "x": 7.25, "y": 3},
-          {"matrix": [3, 8], "x": 8.25, "y": 3},
-          {"matrix": [3, 9], "x": 9.25, "y": 3},
-          {"matrix": [8, 0], "x": 10.25, "y": 3},
-          {"matrix": [8, 1], "x": 11.25, "y": 3},
-          {"matrix": [8, 2], "x": 12.25, "y": 3, "w": 1.75},
-
-          {"matrix": [8, 3], "x": 14.25, "y": 3.25},
-
-          {"matrix": [8, 5], "x": 15.5, "y": 3},
-          {"matrix": [8, 6], "x": 16.5, "y": 3},
-          {"matrix": [8, 7], "x": 17.5, "y": 3},
-          {"matrix": [8, 8], "x": 18.5, "y": 3},
-
-          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-          {"matrix": [4, 1], "x": 1.25, "y": 4},
-          {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-          {"matrix": [4, 4], "x": 3.5, "y": 4, "w": 1.5},
-          {"matrix": [4, 6], "x": 5, "y": 4, "w": 3},
-          {"matrix": [4, 7], "x": 8, "y": 4, "w": 1.5},
-          {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
-          {"matrix": [9, 0], "x": 10.75, "y": 4},
-          {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
-
-          {"matrix": [9, 2], "x": 13.25, "y": 4.25},
-          {"matrix": [9, 3], "x": 14.25, "y": 4.25},
-          {"matrix": [9, 5], "x": 15.25, "y": 4.25},
-
-          {"matrix": [9, 6], "x": 16.5, "y": 4},
-          {"matrix": [9, 7], "x": 17.5, "y": 4},
-          {"matrix": [9, 8], "x": 18.5, "y": 4}
-        ]
-      }
+        "LAYOUT_all": {
+            "layout": [
+                {"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": [5, 0], "x": 10, "y": 0},
+                {"label": "-", "matrix": [5, 1], "x": 11, "y": 0},
+                {"label": "=", "matrix": [5, 2], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [5, 3], "x": 13, "y": 0},
+                {"label": "\u2298", "matrix": [5, 4], "x": 14, "y": 0},
+
+                {"label": "Num Lock", "matrix": [5, 5], "x": 15.5, "y": 0},
+                {"label": "/", "matrix": [5, 6], "x": 16.5, "y": 0},
+                {"label": "*", "matrix": [5, 7], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [5, 8], "x": 18.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [6, 0], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [6, 1], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [6, 2], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "7", "matrix": [6, 5], "x": 15.5, "y": 1},
+                {"label": "8", "matrix": [6, 6], "x": 16.5, "y": 1},
+                {"label": "9", "matrix": [6, 7], "x": 17.5, "y": 1},
+                {"label": "+", "matrix": [6, 8], "x": 18.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [7, 0], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [7, 1], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [7, 2], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 3], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"label": "4", "matrix": [7, 5], "x": 15.5, "y": 2},
+                {"label": "5", "matrix": [7, 6], "x": 16.5, "y": 2},
+                {"label": "6", "matrix": [7, 7], "x": 17.5, "y": 2},
+                {"label": "=", "matrix": [7, 8], "x": 18.5, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [8, 0], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [8, 1], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [8, 2], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [8, 3], "x": 14.25, "y": 3.25},
+
+                {"label": "1", "matrix": [8, 5], "x": 15.5, "y": 3},
+                {"label": "2", "matrix": [8, 6], "x": 16.5, "y": 3},
+                {"label": "3", "matrix": [8, 7], "x": 17.5, "y": 3},
+                {"label": "Enter", "matrix": [8, 8], "x": 18.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 4], "x": 3.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 5, "y": 4, "w": 3},
+                {"label": "Space", "matrix": [4, 7], "x": 8, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 10.75, "y": 4},
+                {"label": "Fn", "matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [9, 2], "x": 13.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [9, 3], "x": 14.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [9, 5], "x": 15.25, "y": 4.25},
+
+                {"label": "0", "matrix": [9, 6], "x": 16.5, "y": 4},
+                {"label": ".", "matrix": [9, 7], "x": 17.5, "y": 4},
+                {"label": "Backspace", "matrix": [9, 8], "x": 18.5, "y": 4}
+            ]
+        },
+
+        "LAYOUT_ansi": {
+            "layout": [
+                {"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": [5, 0], "x": 10, "y": 0},
+                {"label": "-", "matrix": [5, 1], "x": 11, "y": 0},
+                {"label": "=", "matrix": [5, 2], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [5, 3], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Num Lock", "matrix": [5, 5], "x": 15.5, "y": 0},
+                {"label": "/", "matrix": [5, 6], "x": 16.5, "y": 0},
+                {"label": "*", "matrix": [5, 7], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [5, 8], "x": 18.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [6, 0], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [6, 1], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [6, 2], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "7", "matrix": [6, 5], "x": 15.5, "y": 1},
+                {"label": "8", "matrix": [6, 6], "x": 16.5, "y": 1},
+                {"label": "9", "matrix": [6, 7], "x": 17.5, "y": 1},
+                {"label": "+", "matrix": [6, 8], "x": 18.5, "y": 1, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [7, 0], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [7, 1], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "4", "matrix": [7, 5], "x": 15.5, "y": 2},
+                {"label": "5", "matrix": [7, 6], "x": 16.5, "y": 2},
+                {"label": "6", "matrix": [7, 7], "x": 17.5, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"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": [8, 0], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [8, 1], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [8, 2], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [8, 3], "x": 14.25, "y": 3.25},
+
+                {"label": "1", "matrix": [8, 5], "x": 15.5, "y": 3},
+                {"label": "2", "matrix": [8, 6], "x": 16.5, "y": 3},
+                {"label": "3", "matrix": [8, 7], "x": 17.5, "y": 3},
+                {"label": "Enter", "matrix": [8, 8], "x": 18.5, "y": 3, "h": 2},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6},
+                {"label": "Alt", "matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 10.75, "y": 4},
+                {"label": "Ctrl", "matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [9, 2], "x": 13.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [9, 3], "x": 14.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [9, 5], "x": 15.25, "y": 4.25},
+
+                {"label": "0", "matrix": [9, 6], "x": 16.5, "y": 4},
+                {"label": ".", "matrix": [9, 7], "x": 17.5, "y": 4}
+            ]
+        },
+
+        "LAYOUT_iso": {
+            "layout": [
+                {"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": [5, 0], "x": 10, "y": 0},
+                {"label": "-", "matrix": [5, 1], "x": 11, "y": 0},
+                {"label": "=", "matrix": [5, 2], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [5, 3], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Num Lock", "matrix": [5, 5], "x": 15.5, "y": 0},
+                {"label": "/", "matrix": [5, 6], "x": 16.5, "y": 0},
+                {"label": "*", "matrix": [5, 7], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [5, 8], "x": 18.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [6, 0], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [6, 1], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [6, 2], "x": 12.5, "y": 1},
+
+                {"label": "7", "matrix": [6, 5], "x": 15.5, "y": 1},
+                {"label": "8", "matrix": [6, 6], "x": 16.5, "y": 1},
+                {"label": "9", "matrix": [6, 7], "x": 17.5, "y": 1},
+                {"label": "+", "matrix": [6, 8], "x": 18.5, "y": 1, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [7, 0], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [7, 1], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [7, 2], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 3], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "4", "matrix": [7, 5], "x": 15.5, "y": 2},
+                {"label": "5", "matrix": [7, 6], "x": 16.5, "y": 2},
+                {"label": "6", "matrix": [7, 7], "x": 17.5, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [8, 0], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [8, 1], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [8, 2], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [8, 3], "x": 14.25, "y": 3.25},
+
+                {"label": "1", "matrix": [8, 5], "x": 15.5, "y": 3},
+                {"label": "2", "matrix": [8, 6], "x": 16.5, "y": 3},
+                {"label": "3", "matrix": [8, 7], "x": 17.5, "y": 3},
+                {"label": "Enter", "matrix": [8, 8], "x": 18.5, "y": 3, "h": 2},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6},
+                {"label": "Alt", "matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 10.75, "y": 4},
+                {"label": "Ctrl", "matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [9, 2], "x": 13.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [9, 3], "x": 14.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [9, 5], "x": 15.25, "y": 4.25},
+
+                {"label": "0", "matrix": [9, 6], "x": 16.5, "y": 4},
+                {"label": ".", "matrix": [9, 7], "x": 17.5, "y": 4}
+            ]
+        }
     }
-  }
+}
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
index 2481acd52a..6cda88cbe8 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
@@ -43,18 +43,20 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[_MA] = LAYOUT_all( /* Base */
-  KC_ESC, 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_NO, 	 	KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
-  KC_TAB,    RGB_TOG,   RGB_MODE_RGBTEST,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,	    KC_BSLS, 	 	KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-  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_NO,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
-  KC_LSFT,KC_NO ,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-  KC_LCTL, KC_LGUI,KC_LALT,                    KC_SPC,KC_SPC,KC_SPC,        KC_RALT,KC_RALT,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
-
-[_F1] = LAYOUT_all( /* Function Layer */
-  QK_BOOT,   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_DEL , _______,       _______, _______, _______, _______,
-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
-  _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,  _______,  	 	_______, _______, _______, _______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______, 	_______, _______, _______, _______,
-  _______, _______,_______,                    _______,_______,_______,        _______,_______,_______,          _______,_______,_______,    _______, _______, _______),
+    [_MA] = LAYOUT_all( /* Base */
+        QK_GESC, 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_DEL,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_NUHS, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, KC_RGUI, MO(_F1),      KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT, KC_BSPC
+    ),
+
+    [_F1] = LAYOUT_all( /* Function Layer */
+        QK_BOOT, 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_DEL,  _______, _______, _______, _______, _______,
+        _______, BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______,      _______, _______, _______,     _______, _______, _______
+    ),
 
 };
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/config.h b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/config.h
new file mode 100644
index 0000000000..eda93545b4
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/config.h
@@ -0,0 +1,7 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+#define RGBLIGHT_DEFAULT_VAL 0
\ No newline at end of file
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/keymap.c
new file mode 100644
index 0000000000..9ca75c78c7
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/keymap.c
@@ -0,0 +1,62 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _MA,
+    _F1,
+};
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {1, 1, HSV_GREEN}
+);
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {2, 1, HSV_BLUE}
+);
+
+const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_RED}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer,
+    my_numlock_layer,
+    my_layer1_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    rgblight_set_layer_state(1, led_state.num_lock);
+    return true;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(2, layer_state_cmp(state, _F1));
+    return state;
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_MA] = LAYOUT_ansi( /* Base */
+        QK_GESC, 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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_P4,   KC_P5,   KC_P6,
+        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_UP,       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, MO(_F1),      KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT
+    ),
+
+    [_F1] = LAYOUT_ansi( /* Function Layer */
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          _______, _______, _______, _______,
+        _______, BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______,
+        _______,          RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______,      _______, _______, _______,     _______, _______
+    ),
+
+};
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/readme.md b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/readme.md
new file mode 100644
index 0000000000..3b736d1b71
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/readme.md
@@ -0,0 +1 @@
+# The default ANSI keymap for Cypher
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
index a22cc247d6..00f5679701 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
@@ -43,18 +43,20 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[_MA] = LAYOUT_all( /* Base */
-  QK_GESC, 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_DEL, 	 	KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-  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_NO,                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-  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_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
-  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-  KC_LCTL, KC_LGUI,KC_LALT,          KC_NO,KC_SPC,KC_NO,                  KC_RALT,KC_RGUI,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
-
-[_F1] = LAYOUT_all( /* Function Layer */
-  QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,		_______, _______, _______, _______,
-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,_______,                   _______, _______, _______, _______,
-  _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______,  	 	    _______, _______, _______, _______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______,  _______, _______, _______, _______,
-  _______, _______,_______,          _______,_______,_______,                  _______,_______,_______,           _______,_______,_______,	 _______, _______, _______),
+    [_MA] = LAYOUT_iso( /* Base */
+        QK_GESC, 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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_NUHS, KC_ENT,           KC_P4,   KC_P5,   KC_P6,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, MO(_F1),      KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT
+    ),
+
+    [_F1] = LAYOUT_iso( /* Function Layer */
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          _______, _______, _______, _______,
+        _______, BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______,      _______, _______, _______,     _______, _______
+    ),
 
 };
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md
index 81a4a677fd..a6ea34c482 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md
@@ -1 +1 @@
-# The default iso keymap for cypher
+# The default ISO keymap for Cypher
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
index aa276645ae..ad849764d9 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
@@ -40,32 +40,36 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT_all(
-  KC_ESC,  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_DEL, 	     	  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-  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_P7,   KC_P8,   KC_P9,   KC_PPLS,
-  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_NUHS,     KC_ENT,  	          KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
-  KC_LSFT, KC_BSLS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,         KC_RSFT,    KC_UP,    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-  KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,  KC_SPC,  KC_SPC,                 KC_RALT, KC_RALT, MO(1),                   KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
+    [0] = LAYOUT_all(
+        QK_GESC, 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_DEL,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_NUHS, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, KC_RGUI, MO(1),        KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT, KC_BSPC
+    ),
 
-[1] = LAYOUT_all(
-  QK_BOOT,   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_DEL,  KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS,    BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, 	 	      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,  	          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,         KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,KC_TRNS,KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS),
+    [1] = LAYOUT_all(
+        QK_BOOT, 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_DEL,  _______, _______, _______, _______, _______,
+        _______, BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______,      _______, _______, _______,     _______, _______, _______
+    ),
 
-[2] = 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),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______,      _______, _______, _______,     _______, _______, _______
+    ),
 
-[3] = 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),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______,      _______, _______, _______,     _______, _______, _______
+    ),
 
 };
diff --git a/keyboards/cablecardesigns/cypher/rev6/matrix_diagram.md b/keyboards/cablecardesigns/cypher/rev6/matrix_diagram.md
new file mode 100644
index 0000000000..2472822f23
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/matrix_diagram.md
@@ -0,0 +1,25 @@
+# Matrix Diagram for Cable Car Designs Cypher rev6
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │53     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │50 │51 │52 │53 │54 │ │55 │56 │57 │58 │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤      ┌─────┐   ┌───┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │60 │61 │62 │63   │ │65 │66 │67 │68 │      │     │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┼───┤   ┌──┴┐73  │   │68 │ 2u Numpad Plus
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │70 │71 │73      │ │75 │76 │77 │78 │   │72 │    │   │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤   └───┴────┘   ├───┤
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │80 │81 │82    │┌───┐│85 │86 │87 │88 │    ISO Enter   │   │
+├────┼───┼───┴┬──┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬─┴──┬───┘│83 │└───┼───┼───┼───┤                │88 │ 2u Numpad Enter
+│40  │41 │42  │46                     │49  │90 │91  │┌───┼───┼───┐│96 │97 │98 │                │   │
+└────┴───┴────┴───────────────────────┴────┴───┴────┘│92 │93 │95 │└───┴───┴───┘                └───┘
+                                                     └───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┐
+│40   │42   │46                         │90   │91   │ WKL
+└─────┴─────┴───────────────────────────┴─────┴─────┘
+```