diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json
index e8a301f56ea..2769d6b7b43 100644
--- a/keyboards/clueboard/60/info.json
+++ b/keyboards/clueboard/60/info.json
@@ -197,20 +197,20 @@
         {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
         {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
         {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-        {"label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2},
-        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
-        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
-        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
-        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
-        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
-        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
-        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
-        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
-        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
-        {"label": ":", "matrix": [2, 11], "x": 10.75, "y": 2},
-        {"label": "@", "matrix": [2, 12], "x": 11.75, "y": 2},
-        {"label": "~", "matrix": [2, 14], "x": 12.75, "y": 2},
-        {"h": 2, "label": "Enter", "matrix": [2, 0], "w": 1.25, "x": 13.75, "y": 1},
+        {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+        {"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, 0], "x": 9.75, "y": 2},
+        {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+        {"label": "@", "matrix": [2, 11], "x": 11.75, "y": 2},
+        {"label": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
+        {"h": 2, "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 1},
         {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
         {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
         {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
@@ -264,20 +264,20 @@
         {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
         {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
         {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-        {"label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2},
-        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
-        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
-        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
-        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
-        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
-        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
-        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
-        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
-        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
-        {"label": ":", "matrix": [2, 11], "x": 10.75, "y": 2},
-        {"label": "@", "matrix": [2, 12], "x": 11.75, "y": 2},
-        {"label": "~", "matrix": [2, 14], "x": 12.75, "y": 2},
-        {"h": 2, "label": "Enter", "matrix": [2, 0], "w": 1.25, "x": 13.75, "y": 1},
+        {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+        {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+        {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+        {"label": "@", "matrix": [2, 11], "x": 11.75, "y": 2},
+        {"label": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
+        {"h": 2, "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 1},
         {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
         {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
         {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
@@ -395,20 +395,20 @@
         {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
         {"label": "´", "matrix": [1, 11], "x": 11.5, "y": 1},
         {"label": "[", "matrix": [1, 12], "x": 12.5, "y": 1},
-        {"label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2},
-        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
-        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
-        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
-        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
-        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
-        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
-        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
-        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
-        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
-        {"label": "Ç", "matrix": [2, 11], "x": 10.75, "y": 2},
-        {"label": "~", "matrix": [2, 12], "x": 11.75, "y": 2},
-        {"label": "]", "matrix": [2, 14], "x": 12.75, "y": 2},
-        {"h": 2, "label": "Enter", "matrix": [2, 0], "w": 1.25, "x": 13.75, "y": 1},
+        {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+        {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+        {"label": "Ç", "matrix": [2, 10], "x": 10.75, "y": 2},
+        {"label": "~", "matrix": [2, 11], "x": 11.75, "y": 2},
+        {"label": "]", "matrix": [2, 12], "x": 12.75, "y": 2},
+        {"h": 2, "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 1},
         {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
         {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
         {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
diff --git a/keyboards/clueboard/60/matrix_diagram.md b/keyboards/clueboard/60/matrix_diagram.md
new file mode 100644
index 00000000000..aa79d1e2d74
--- /dev/null
+++ b/keyboards/clueboard/60/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for Clueboard 60
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0E     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1E   │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐2E  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2E      │   │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E    │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤
+│40  │41  │42  │47                      │4A  │4B  │4C  │4E  │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌────────┐                                       ┌──────┬───┐
+│30      │ 2.25u LShift          1.75u-1u RShift │3C    │3E │
+└────────┘                                       └──────┴───┘
+┌───┬────┐                                       ┌──────────┐
+│30 │31  │ 1u-1.25u LShift          2.75u RShift │3C        │
+└───┴────┘                                       └──────────┘
+┌─────┬────┬─────┬─────────────────────────┬─────┬────┬─────┐
+│40   │41  │42   │47                       │4B   │4C  │4E   │ AEK
+└─────┴────┴─────┴─────────────────────────┴─────┴────┴─────┘
+```