summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--keyboards/geistmaschine/geist/info.json440
-rw-r--r--keyboards/geistmaschine/geist/keymaps/ansi/keymap.c6
-rw-r--r--keyboards/geistmaschine/geist/keymaps/default/keymap.c6
-rw-r--r--keyboards/geistmaschine/geist/keymaps/iso/keymap.c6
-rw-r--r--keyboards/geistmaschine/geist/keymaps/via/keymap.c8
-rw-r--r--keyboards/geistmaschine/geist/matrix_diagram.md30
6 files changed, 265 insertions, 231 deletions
diff --git a/keyboards/geistmaschine/geist/info.json b/keyboards/geistmaschine/geist/info.json
index 77a9a937e5..571740b716 100644
--- a/keyboards/geistmaschine/geist/info.json
+++ b/keyboards/geistmaschine/geist/info.json
@@ -29,242 +29,246 @@
             {"pin_a": "B0", "pin_b": "B7", "resolution": 2}
         ]
     },
-    "community_layouts": ["65_ansi", "65_iso"],
+    "layout_aliases": {
+        "LAYOUT_65_all": "LAYOUT_all",
+        "LAYOUT_65_ansi": "LAYOUT_ansi_blocker",
+        "LAYOUT_65_iso": "LAYOUT_iso_blocker"
+    },
     "layouts": {
-        "LAYOUT_65_all": {
+        "LAYOUT_all": {
             "layout": [
-              {"x": 0, "y": 0, "matrix": [9, 1]},
-              {"x": 1.25, "y": 0, "matrix": [0, 0]},
-              {"x": 2.25, "y": 0, "matrix": [1, 0]},
-              {"x": 3.25, "y": 0, "matrix": [0, 1]},
-              {"x": 4.25, "y": 0, "matrix": [1, 1]},
-              {"x": 5.25, "y": 0, "matrix": [0, 2]},
-              {"x": 6.25, "y": 0, "matrix": [1, 2]},
-              {"x": 7.25, "y": 0, "matrix": [0, 3]},
-              {"x": 8.25, "y": 0, "matrix": [1, 3]},
-              {"x": 9.25, "y": 0, "matrix": [0, 4]},
-              {"x": 10.25, "y": 0, "matrix": [1, 4]},
-              {"x": 11.25, "y": 0, "matrix": [0, 5]},
-              {"x": 12.25, "y": 0, "matrix": [1, 5]},
-              {"x": 13.25, "y": 0, "matrix": [0, 6]},
-              {"x": 14.25, "y": 0, "matrix": [1, 6]},
-              {"x": 15.25, "y": 0, "matrix": [0, 7]},
-              {"x": 16.25, "y": 0, "matrix": [1, 7]},
+                {"matrix": [9, 1], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [1, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [1, 1], "x": 4.25, "y": 0},
+                {"matrix": [0, 2], "x": 5.25, "y": 0},
+                {"matrix": [1, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 3], "x": 7.25, "y": 0},
+                {"matrix": [1, 3], "x": 8.25, "y": 0},
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [1, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [1, 5], "x": 12.25, "y": 0},
+                {"matrix": [0, 6], "x": 13.25, "y": 0},
+                {"matrix": [1, 6], "x": 14.25, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
 
-              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
-              {"x": 2.75, "y": 1, "matrix": [3, 0]},
-              {"x": 3.75, "y": 1, "matrix": [2, 1]},
-              {"x": 4.75, "y": 1, "matrix": [3, 1]},
-              {"x": 5.75, "y": 1, "matrix": [2, 2]},
-              {"x": 6.75, "y": 1, "matrix": [3, 2]},
-              {"x": 7.75, "y": 1, "matrix": [2, 3]},
-              {"x": 8.75, "y": 1, "matrix": [3, 3]},
-              {"x": 9.75, "y": 1, "matrix": [2, 4]},
-              {"x": 10.75, "y": 1, "matrix": [3, 4]},
-              {"x": 11.75, "y": 1, "matrix": [2, 5]},
-              {"x": 12.75, "y": 1, "matrix": [3, 5]},
-              {"x": 13.75, "y": 1, "matrix": [2, 6]},
-              {"x": 14.75, "y": 1, "w": 1.5, "matrix": [3, 6]},
-              {"x": 16.25, "y": 1, "matrix": [3, 7]},
+                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 2.75, "y": 1},
+                {"matrix": [2, 1], "x": 3.75, "y": 1},
+                {"matrix": [3, 1], "x": 4.75, "y": 1},
+                {"matrix": [2, 2], "x": 5.75, "y": 1},
+                {"matrix": [3, 2], "x": 6.75, "y": 1},
+                {"matrix": [2, 3], "x": 7.75, "y": 1},
+                {"matrix": [3, 3], "x": 8.75, "y": 1},
+                {"matrix": [2, 4], "x": 9.75, "y": 1},
+                {"matrix": [3, 4], "x": 10.75, "y": 1},
+                {"matrix": [2, 5], "x": 11.75, "y": 1},
+                {"matrix": [3, 5], "x": 12.75, "y": 1},
+                {"matrix": [2, 6], "x": 13.75, "y": 1},
+                {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1},
 
-              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
-              {"x": 3, "y": 2, "matrix": [5, 0]},
-              {"x": 4, "y": 2, "matrix": [4, 1]},
-              {"x": 5, "y": 2, "matrix": [5, 1]},
-              {"x": 6, "y": 2, "matrix": [4, 2]},
-              {"x": 7, "y": 2, "matrix": [5, 2]},
-              {"x": 8, "y": 2, "matrix": [4, 3]},
-              {"x": 9, "y": 2, "matrix": [5, 3]},
-              {"x": 10, "y": 2, "matrix": [4, 4]},
-              {"x": 11, "y": 2, "matrix": [5, 4]},
-              {"x": 12, "y": 2, "matrix": [4, 5]},
-              {"x": 13, "y": 2, "matrix": [5, 5]},
-              {"x": 14, "y": 2, "matrix": [4, 6]},
-              {"x": 14, "y": 2, "w": 2.25, "matrix": [5, 6]},
-              {"x": 15, "y": 1, "w": 1.25, "h": 2, "matrix": [4, 7]},
-              {"x": 16.25, "y": 2, "matrix": [5, 7]},
+                {"matrix": [4, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 3, "y": 2},
+                {"matrix": [4, 1], "x": 4, "y": 2},
+                {"matrix": [5, 1], "x": 5, "y": 2},
+                {"matrix": [4, 2], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [4, 3], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [4, 4], "x": 10, "y": 2},
+                {"matrix": [5, 4], "x": 11, "y": 2},
+                {"matrix": [4, 5], "x": 12, "y": 2},
+                {"matrix": [5, 5], "x": 13, "y": 2},
+                {"matrix": [4, 6], "x": 18, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [4, 7], "x": 19, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [5, 7], "x": 16.25, "y": 2},
 
-              {"x": 1.25, "y": 3, "w": 1.25, "matrix": [6, 0]},
-              {"x": 2.5, "y": 3, "matrix": [7, 0]},
-              {"x": 3.5, "y": 3, "matrix": [6, 1]},
-              {"x": 4.5, "y": 3, "matrix": [7, 1]},
-              {"x": 5.5, "y": 3, "matrix": [6, 2]},
-              {"x": 6.5, "y": 3, "matrix": [7, 2]},
-              {"x": 7.5, "y": 3, "matrix": [6, 3]},
-              {"x": 8.5, "y": 3, "matrix": [7, 3]},
-              {"x": 9.5, "y": 3, "matrix": [6, 4]},
-              {"x": 10.5, "y": 3, "matrix": [7, 4]},
-              {"x": 11.5, "y": 3, "matrix": [6, 5]},
-              {"x": 12.5, "y": 3, "matrix": [7, 5]},
-              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
-              {"x": 15.25, "y": 3, "matrix": [6, 7]},
-              {"x": 16.25, "y": 3, "matrix": [7, 7]},
+                {"matrix": [6, 0], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 3},
+                {"matrix": [6, 1], "x": 3.5, "y": 3},
+                {"matrix": [7, 1], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 15.25, "y": 3},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
 
-              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
-              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
-              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
-              {"x": 5, "y": 4, "w": 2.25, "matrix": [8, 2]},
-              {"x": 7.25, "y": 4, "w": 1.25, "matrix": [8, 3]},
-              {"x": 8.5, "y": 4, "w": 2.75, "matrix": [8, 4]},
-              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
-              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
-              {"x": 14.25, "y": 4, "matrix": [9, 6]},
-              {"x": 15.25, "y": 4, "matrix": [8, 7]},
-              {"x": 16.25, "y": 4, "matrix": [9, 7]}
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 8.5, "y": 4, "w": 2.75},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi": {
+        "LAYOUT_ansi_blocker": {
             "layout": [
-              {"x": 0, "y": 0, "matrix": [9, 1]},
-              {"x": 1.25, "y": 0, "matrix": [0, 0]},
-              {"x": 2.25, "y": 0, "matrix": [1, 0]},
-              {"x": 3.25, "y": 0, "matrix": [0, 1]},
-              {"x": 4.25, "y": 0, "matrix": [1, 1]},
-              {"x": 5.25, "y": 0, "matrix": [0, 2]},
-              {"x": 6.25, "y": 0, "matrix": [1, 2]},
-              {"x": 7.25, "y": 0, "matrix": [0, 3]},
-              {"x": 8.25, "y": 0, "matrix": [1, 3]},
-              {"x": 9.25, "y": 0, "matrix": [0, 4]},
-              {"x": 10.25, "y": 0, "matrix": [1, 4]},
-              {"x": 11.25, "y": 0, "matrix": [0, 5]},
-              {"x": 12.25, "y": 0, "matrix": [1, 5]},
-              {"x": 13.25, "y": 0, "matrix": [0, 6]},
-              {"x": 14.25, "y": 0, "w": 2, "matrix": [0, 7]},
-              {"x": 16.25, "y": 0, "matrix": [1, 7]},
+                {"matrix": [9, 1], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [1, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [1, 1], "x": 4.25, "y": 0},
+                {"matrix": [0, 2], "x": 5.25, "y": 0},
+                {"matrix": [1, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 3], "x": 7.25, "y": 0},
+                {"matrix": [1, 3], "x": 8.25, "y": 0},
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [1, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [1, 5], "x": 12.25, "y": 0},
+                {"matrix": [0, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0, "w": 2},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
 
-              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
-              {"x": 2.75, "y": 1, "matrix": [3, 0]},
-              {"x": 3.75, "y": 1, "matrix": [2, 1]},
-              {"x": 4.75, "y": 1, "matrix": [3, 1]},
-              {"x": 5.75, "y": 1, "matrix": [2, 2]},
-              {"x": 6.75, "y": 1, "matrix": [3, 2]},
-              {"x": 7.75, "y": 1, "matrix": [2, 3]},
-              {"x": 8.75, "y": 1, "matrix": [3, 3]},
-              {"x": 9.75, "y": 1, "matrix": [2, 4]},
-              {"x": 10.75, "y": 1, "matrix": [3, 4]},
-              {"x": 11.75, "y": 1, "matrix": [2, 5]},
-              {"x": 12.75, "y": 1, "matrix": [3, 5]},
-              {"x": 13.75, "y": 1, "matrix": [2, 6]},
-              {"x": 14.75, "y": 1, "w": 1.5, "matrix": [3, 6]},
-              {"x": 16.25, "y": 1, "matrix": [3, 7]},
+                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 2.75, "y": 1},
+                {"matrix": [2, 1], "x": 3.75, "y": 1},
+                {"matrix": [3, 1], "x": 4.75, "y": 1},
+                {"matrix": [2, 2], "x": 5.75, "y": 1},
+                {"matrix": [3, 2], "x": 6.75, "y": 1},
+                {"matrix": [2, 3], "x": 7.75, "y": 1},
+                {"matrix": [3, 3], "x": 8.75, "y": 1},
+                {"matrix": [2, 4], "x": 9.75, "y": 1},
+                {"matrix": [3, 4], "x": 10.75, "y": 1},
+                {"matrix": [2, 5], "x": 11.75, "y": 1},
+                {"matrix": [3, 5], "x": 12.75, "y": 1},
+                {"matrix": [2, 6], "x": 13.75, "y": 1},
+                {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1},
 
-              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
-              {"x": 3, "y": 2, "matrix": [5, 0]},
-              {"x": 4, "y": 2, "matrix": [4, 1]},
-              {"x": 5, "y": 2, "matrix": [5, 1]},
-              {"x": 6, "y": 2, "matrix": [4, 2]},
-              {"x": 7, "y": 2, "matrix": [5, 2]},
-              {"x": 8, "y": 2, "matrix": [4, 3]},
-              {"x": 9, "y": 2, "matrix": [5, 3]},
-              {"x": 10, "y": 2, "matrix": [4, 4]},
-              {"x": 11, "y": 2, "matrix": [5, 4]},
-              {"x": 12, "y": 2, "matrix": [4, 5]},
-              {"x": 13, "y": 2, "matrix": [5, 5]},
-              {"x": 14, "y": 2, "w": 2.25, "matrix": [5, 6]},
-              {"x": 16.25, "y": 2, "matrix": [5, 7]},
+                {"matrix": [4, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 3, "y": 2},
+                {"matrix": [4, 1], "x": 4, "y": 2},
+                {"matrix": [5, 1], "x": 5, "y": 2},
+                {"matrix": [4, 2], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [4, 3], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [4, 4], "x": 10, "y": 2},
+                {"matrix": [5, 4], "x": 11, "y": 2},
+                {"matrix": [4, 5], "x": 12, "y": 2},
+                {"matrix": [5, 5], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2},
 
-              {"x": 1.25, "y": 3, "w": 2.25, "matrix": [6, 0]},
-              {"x": 3.5, "y": 3, "matrix": [6, 1]},
-              {"x": 4.5, "y": 3, "matrix": [7, 1]},
-              {"x": 5.5, "y": 3, "matrix": [6, 2]},
-              {"x": 6.5, "y": 3, "matrix": [7, 2]},
-              {"x": 7.5, "y": 3, "matrix": [6, 3]},
-              {"x": 8.5, "y": 3, "matrix": [7, 3]},
-              {"x": 9.5, "y": 3, "matrix": [6, 4]},
-              {"x": 10.5, "y": 3, "matrix": [7, 4]},
-              {"x": 11.5, "y": 3, "matrix": [6, 5]},
-              {"x": 12.5, "y": 3, "matrix": [7, 5]},
-              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
-              {"x": 15.25, "y": 3, "matrix": [6, 7]},
-              {"x": 16.25, "y": 3, "matrix": [7, 7]},
+                {"matrix": [6, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 3.5, "y": 3},
+                {"matrix": [7, 1], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 15.25, "y": 3},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
 
-              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
-              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
-              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
-              {"x": 5, "y": 4, "w": 6.25, "matrix": [8, 3]},
-              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
-              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
-              {"x": 14.25, "y": 4, "matrix": [9, 6]},
-              {"x": 15.25, "y": 4, "matrix": [8, 7]},
-              {"x": 16.25, "y": 4, "matrix": [9, 7]}
-          ]
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4}
+            ]
         },
-        "LAYOUT_65_iso": {
-          "layout": [
-              {"x": 0, "y": 0, "matrix": [9, 1]},
-              {"x": 1.25, "y": 0, "matrix": [0, 0]},
-              {"x": 2.25, "y": 0, "matrix": [1, 0]},
-              {"x": 3.25, "y": 0, "matrix": [0, 1]},
-              {"x": 4.25, "y": 0, "matrix": [1, 1]},
-              {"x": 5.25, "y": 0, "matrix": [0, 2]},
-              {"x": 6.25, "y": 0, "matrix": [1, 2]},
-              {"x": 7.25, "y": 0, "matrix": [0, 3]},
-              {"x": 8.25, "y": 0, "matrix": [1, 3]},
-              {"x": 9.25, "y": 0, "matrix": [0, 4]},
-              {"x": 10.25, "y": 0, "matrix": [1, 4]},
-              {"x": 11.25, "y": 0, "matrix": [0, 5]},
-              {"x": 12.25, "y": 0, "matrix": [1, 5]},
-              {"x": 13.25, "y": 0, "matrix": [0, 6]},
-              {"x": 14.25, "y": 0, "w": 2, "matrix": [0, 7]},
-              {"x": 16.25, "y": 0, "matrix": [1, 7]},
+        "LAYOUT_iso_blocker": {
+            "layout": [
+                {"matrix": [9, 1], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [1, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [1, 1], "x": 4.25, "y": 0},
+                {"matrix": [0, 2], "x": 5.25, "y": 0},
+                {"matrix": [1, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 3], "x": 7.25, "y": 0},
+                {"matrix": [1, 3], "x": 8.25, "y": 0},
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [1, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [1, 5], "x": 12.25, "y": 0},
+                {"matrix": [0, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0, "w": 2},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
 
-              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
-              {"x": 2.75, "y": 1, "matrix": [3, 0]},
-              {"x": 3.75, "y": 1, "matrix": [2, 1]},
-              {"x": 4.75, "y": 1, "matrix": [3, 1]},
-              {"x": 5.75, "y": 1, "matrix": [2, 2]},
-              {"x": 6.75, "y": 1, "matrix": [3, 2]},
-              {"x": 7.75, "y": 1, "matrix": [2, 3]},
-              {"x": 8.75, "y": 1, "matrix": [3, 3]},
-              {"x": 9.75, "y": 1, "matrix": [2, 4]},
-              {"x": 10.75, "y": 1, "matrix": [3, 4]},
-              {"x": 11.75, "y": 1, "matrix": [2, 5]},
-              {"x": 12.75, "y": 1, "matrix": [3, 5]},
-              {"x": 13.75, "y": 1, "matrix": [2, 6]},
-              {"x": 16.25, "y": 1, "matrix": [3, 7]},
+                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 2.75, "y": 1},
+                {"matrix": [2, 1], "x": 3.75, "y": 1},
+                {"matrix": [3, 1], "x": 4.75, "y": 1},
+                {"matrix": [2, 2], "x": 5.75, "y": 1},
+                {"matrix": [3, 2], "x": 6.75, "y": 1},
+                {"matrix": [2, 3], "x": 7.75, "y": 1},
+                {"matrix": [3, 3], "x": 8.75, "y": 1},
+                {"matrix": [2, 4], "x": 9.75, "y": 1},
+                {"matrix": [3, 4], "x": 10.75, "y": 1},
+                {"matrix": [2, 5], "x": 11.75, "y": 1},
+                {"matrix": [3, 5], "x": 12.75, "y": 1},
+                {"matrix": [2, 6], "x": 13.75, "y": 1},
+                {"matrix": [3, 7], "x": 16.25, "y": 1},
 
-              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
-              {"x": 3, "y": 2, "matrix": [5, 0]},
-              {"x": 4, "y": 2, "matrix": [4, 1]},
-              {"x": 5, "y": 2, "matrix": [5, 1]},
-              {"x": 6, "y": 2, "matrix": [4, 2]},
-              {"x": 7, "y": 2, "matrix": [5, 2]},
-              {"x": 8, "y": 2, "matrix": [4, 3]},
-              {"x": 9, "y": 2, "matrix": [5, 3]},
-              {"x": 10, "y": 2, "matrix": [4, 4]},
-              {"x": 11, "y": 2, "matrix": [5, 4]},
-              {"x": 12, "y": 2, "matrix": [4, 5]},
-              {"x": 13, "y": 2, "matrix": [5, 5]},
-              {"x": 14, "y": 2, "matrix": [4, 6]},
-              {"x": 15, "y": 1, "w": 1.25, "h": 2, "matrix": [4, 7]},
-              {"x": 16.25, "y": 2, "matrix": [5, 7]},
+                {"matrix": [4, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 3, "y": 2},
+                {"matrix": [4, 1], "x": 4, "y": 2},
+                {"matrix": [5, 1], "x": 5, "y": 2},
+                {"matrix": [4, 2], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [4, 3], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [4, 4], "x": 10, "y": 2},
+                {"matrix": [5, 4], "x": 11, "y": 2},
+                {"matrix": [4, 5], "x": 12, "y": 2},
+                {"matrix": [5, 5], "x": 13, "y": 2},
+                {"matrix": [4, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [5, 7], "x": 16.25, "y": 2},
 
-              {"x": 1.25, "y": 3, "w": 1.25, "matrix": [6, 0]},
-              {"x": 2.5, "y": 3, "matrix": [7, 0]},
-              {"x": 3.5, "y": 3, "matrix": [6, 1]},
-              {"x": 4.5, "y": 3, "matrix": [7, 1]},
-              {"x": 5.5, "y": 3, "matrix": [6, 2]},
-              {"x": 6.5, "y": 3, "matrix": [7, 2]},
-              {"x": 7.5, "y": 3, "matrix": [6, 3]},
-              {"x": 8.5, "y": 3, "matrix": [7, 3]},
-              {"x": 9.5, "y": 3, "matrix": [6, 4]},
-              {"x": 10.5, "y": 3, "matrix": [7, 4]},
-              {"x": 11.5, "y": 3, "matrix": [6, 5]},
-              {"x": 12.5, "y": 3, "matrix": [7, 5]},
-              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
-              {"x": 15.25, "y": 3, "matrix": [6, 7]},
-              {"x": 16.25, "y": 3, "matrix": [7, 7]},
+                {"matrix": [6, 0], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 3},
+                {"matrix": [6, 1], "x": 3.5, "y": 3},
+                {"matrix": [7, 1], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 15.25, "y": 3},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
 
-              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
-              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
-              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
-              {"x": 5, "y": 4, "w": 6.25, "matrix": [8, 3]},
-              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
-              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
-              {"x": 14.25, "y": 4, "matrix": [9, 6]},
-              {"x": 15.25, "y": 4, "matrix": [8, 7]},
-              {"x": 16.25, "y": 4, "matrix": [9, 7]}
-          ]
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c b/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c
index 88dea9b776..cebb8fb073 100644
--- a/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c
+++ b/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c
@@ -30,21 +30,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *       │Ctrl│GUI │Alt │                        │Alt │GUI │ │ ← │ ↓ │ → │
      *       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-    [0] = LAYOUT_65_ansi(
+    [0] = LAYOUT_ansi_blocker(
         LT(2, KC_MUTE), 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_DEL,
                         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_HOME,
                         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_PGUP,
                         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_PGDN,
                         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT_65_ansi(
+    [1] = LAYOUT_ansi_blocker(
         KC_MPLY,        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_DEL,  KC_INS,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME,
                         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
                         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [2] = LAYOUT_65_ansi(
+    [2] = LAYOUT_ansi_blocker(
         KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
                         KC_TRNS, KC_TRNS, 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/geistmaschine/geist/keymaps/default/keymap.c b/keyboards/geistmaschine/geist/keymaps/default/keymap.c
index 6401a0cbf8..6d96c572ba 100644
--- a/keyboards/geistmaschine/geist/keymaps/default/keymap.c
+++ b/keyboards/geistmaschine/geist/keymaps/default/keymap.c
@@ -18,21 +18,21 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_65_all(
+    [0] = LAYOUT_all(
         LT(2, KC_MUTE), 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_TRNS, KC_DEL,
                         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_HOME,
                         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_ENT,  KC_PGUP,
                         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_PGDN,
                         KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT_65_all(
+    [1] = LAYOUT_all(
         KC_MPLY,        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_DEL,  KC_TRNS, KC_INS,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PSCR,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_END,
                         KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          MO(2),   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
     ),
-    [2] = LAYOUT_65_all(
+    [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,
diff --git a/keyboards/geistmaschine/geist/keymaps/iso/keymap.c b/keyboards/geistmaschine/geist/keymaps/iso/keymap.c
index f1cc032c97..658e4ec984 100644
--- a/keyboards/geistmaschine/geist/keymaps/iso/keymap.c
+++ b/keyboards/geistmaschine/geist/keymaps/iso/keymap.c
@@ -30,21 +30,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *       │Ctrl│GUI │Alt │                        │Alt │GUI │ │ ← │ ↓ │ → │
      *       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-    [0] = LAYOUT_65_iso(
+    [0] = LAYOUT_iso_blocker(
         LT(2, KC_MUTE), 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_DEL,
                         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_HOME,
                         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_PGUP,
                         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_PGDN,
                         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT_65_iso(
+    [1] = LAYOUT_iso_blocker(
         KC_MPLY,        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_DEL,  KC_INS,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PSCR,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
                         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [2] = LAYOUT_65_iso(
+    [2] = LAYOUT_iso_blocker(
         KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
                         KC_TRNS, KC_TRNS, KC_TRNS, 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/geistmaschine/geist/keymaps/via/keymap.c b/keyboards/geistmaschine/geist/keymaps/via/keymap.c
index 2814b8001a..068f500fb0 100644
--- a/keyboards/geistmaschine/geist/keymaps/via/keymap.c
+++ b/keyboards/geistmaschine/geist/keymaps/via/keymap.c
@@ -18,28 +18,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_65_all(
+    [0] = LAYOUT_all(
         LT(2, KC_MUTE), 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_TRNS, KC_DEL,
                         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_HOME,
                         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_ENT,  KC_PGUP,
                         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_PGDN,
                         KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT_65_all(
+    [1] = LAYOUT_all(
         KC_MPLY,        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_DEL,  KC_TRNS, KC_INS,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PSCR,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_END,
                         KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          MO(2),   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
     ),
-    [2] = LAYOUT_65_all(
+    [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
     ),
-    [3] = LAYOUT_65_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,
diff --git a/keyboards/geistmaschine/geist/matrix_diagram.md b/keyboards/geistmaschine/geist/matrix_diagram.md
new file mode 100644
index 0000000000..9c0da5e183
--- /dev/null
+++ b/keyboards/geistmaschine/geist/matrix_diagram.md
@@ -0,0 +1,30 @@
+# Matrix Diagram for Geistmaschine Geist
+
+```
+┌───┐
+│91 │
+└───┘
+     ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+     │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │16 │07 │17 │    │07     │ 2u Backspace
+     ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+     │20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36   │37 │      │     │
+     ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐47  │ ISO Enter
+     │40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │56      │57 │   │46 │    │
+     ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+     │60  │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66    │67 │77 │
+     ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     │80  │90  │81  │82      │83  │84        │85  │95  │ │96 │87 │97 │
+     └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
+     ┌────────┐
+     │60      │ 2.25u LShift
+     └────────┘
+     ┌────┬────┬────┬────────────────────────┬────┬────┐
+     │80  │90  │81  │83                      │85  │95  │ Blocker
+     └────┴────┴────┴────────────────────────┴────┴────┘
+     ┌─────┬───┬─────┬───────────────────────────┬─────┐
+     │80   │90 │81   │83                         │95   │ Blocker Tsangan
+     └─────┴───┴─────┴───────────────────────────┴─────┘
+     ┌─────┬───┬─────┬───────────┬───────────┬────┬────┐
+     │80   │90 │81   │82         │84         │85  │95  │ 2x 3u Spacebars
+     └─────┴───┴─────┴───────────┴───────────┴────┴────┘
+```