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

4 files changed, 489 insertions, 43 deletions

diff --git a/keyboards/smithrune/iron165r2/info.json b/keyboards/smithrune/iron165r2/info.json
index 0d42363728..4d093a3350 100644
--- a/keyboards/smithrune/iron165r2/info.json
+++ b/keyboards/smithrune/iron165r2/info.json
@@ -2,10 +2,390 @@
     "keyboard_name": "Iron165R2",
     "manufacturer": "SmithRune",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "Gondolindrim",
     "usb": {
         "vid": "0x8384",
         "pid": "0x1652",
         "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0},
+                {"label":"0,14", "x":14, "y":0},
+                {"label":"4,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"2,13", "x":13.75, "y":2, "w":1.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":13, "y":4},
+                {"label":"4,12", "x":14, "y":4},
+                {"label":"4,13", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_cb_blocker": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,13", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":13, "y":4},
+                {"label":"4,12", "x":14, "y":4},
+                {"label":"4,13", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+                {"label":"4,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,13", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":13, "y":4},
+                {"label":"4,12", "x":14, "y":4},
+                {"label":"4,13", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso_cb_blocker": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":13, "y":4},
+                {"label":"4,12", "x":14, "y":4},
+                {"label":"4,13", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+                {"label":"4,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":13, "y":4},
+                {"label":"4,12", "x":14, "y":4},
+                {"label":"4,13", "x":15, "y":4}
+            ]
+        }
     }
 }
diff --git a/keyboards/smithrune/iron165r2/iron165r2.h b/keyboards/smithrune/iron165r2/iron165r2.h
index 3bc816d454..8bb349d874 100644
--- a/keyboards/smithrune/iron165r2/iron165r2.h
+++ b/keyboards/smithrune/iron165r2/iron165r2.h
@@ -19,21 +19,31 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │    │0D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ *              │40  │41  │42  │46                      │49  │4A  │ │4B │4C │4D │
+ *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ *              │40   │41 │42   │46                         │4A   │ Tsangan
+ *              └─────┴───┴─────┴───────────────────────────┴─────┘
  *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the Keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+ * Position K4E exists on the PCB, but is physically unavailable with the Iron165R2 case.
  */
 
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E , \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E , \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E , \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E , \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E )\
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A,           K4B, K4C, K4D )\
 {\
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
@@ -41,3 +51,59 @@
     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
     { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
 }
+
+#define LAYOUT_65_ansi_cb_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
+) {\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, ___ }  \
+}
+
+#define LAYOUT_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
+) {\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
+
+#define LAYOUT_65_iso_cb_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
+) {\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, ___ }  \
+}
+
+#define LAYOUT_65_iso_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
+) {\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
diff --git a/keyboards/smithrune/iron165r2/keymaps/default/keymap.c b/keyboards/smithrune/iron165r2/keymaps/default/keymap.c
index ff29126638..901a0486e9 100644
--- a/keyboards/smithrune/iron165r2/keymaps/default/keymap.c
+++ b/keyboards/smithrune/iron165r2/keymaps/default/keymap.c
@@ -16,32 +16,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT( /* Base */
-    KC_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_BSPC,
-    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_PGUP,
-    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_ENTER,KC_PGDN,
-    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_END,
-    KC_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                    KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN,  KC_RGHT, KC_DEL
+[0] = LAYOUT_all( /* Base */
+    KC_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_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_PGUP,
+    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_PGDN,
+    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_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT
 ),
-[1] = LAYOUT(
-    QK_BOOT, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, 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(
+[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, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[3] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+[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
 ),
 };
diff --git a/keyboards/smithrune/iron165r2/keymaps/via/keymap.c b/keyboards/smithrune/iron165r2/keymaps/via/keymap.c
index ff29126638..901a0486e9 100644
--- a/keyboards/smithrune/iron165r2/keymaps/via/keymap.c
+++ b/keyboards/smithrune/iron165r2/keymaps/via/keymap.c
@@ -16,32 +16,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT( /* Base */
-    KC_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_BSPC,
-    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_PGUP,
-    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_ENTER,KC_PGDN,
-    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_END,
-    KC_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                    KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN,  KC_RGHT, KC_DEL
+[0] = LAYOUT_all( /* Base */
+    KC_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_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_PGUP,
+    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_PGDN,
+    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_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT
 ),
-[1] = LAYOUT(
-    QK_BOOT, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, 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(
+[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, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[3] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+[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
 ),
 };