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

6 files changed, 217 insertions, 214 deletions

diff --git a/keyboards/teleport/native/ansi/info.json b/keyboards/teleport/native/ansi/info.json
index 2894d2688c..b817512339 100644
--- a/keyboards/teleport/native/ansi/info.json
+++ b/keyboards/teleport/native/ansi/info.json
@@ -1,6 +1,101 @@
 {
     "usb": {
         "pid": "0x0003"
+    },
+    "community_layouts": ["75_ansi"],
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[1,0], "x":1, "y":0},
+                {"matrix":[0,1], "x":2, "y":0},
+                {"matrix":[1,1], "x":3, "y":0},
+                {"matrix":[0,2], "x":4, "y":0},
+                {"matrix":[1,2], "x":5, "y":0},
+                {"matrix":[0,3], "x":6, "y":0},
+                {"matrix":[1,3], "x":7, "y":0},
+                {"matrix":[0,4], "x":8, "y":0},
+                {"matrix":[1,4], "x":9, "y":0},
+                {"matrix":[0,5], "x":10, "y":0},
+                {"matrix":[1,5], "x":11, "y":0},
+                {"matrix":[0,6], "x":12, "y":0},
+                {"matrix":[1,6], "x":13, "y":0},
+                {"matrix":[0,7], "x":14, "y":0},
+                {"matrix":[1,7], "x":15, "y":0},
+
+                {"matrix":[2,0], "x":0, "y":1},
+                {"matrix":[3,0], "x":1, "y":1},
+                {"matrix":[2,1], "x":2, "y":1},
+                {"matrix":[3,1], "x":3, "y":1},
+                {"matrix":[2,2], "x":4, "y":1},
+                {"matrix":[3,2], "x":5, "y":1},
+                {"matrix":[2,3], "x":6, "y":1},
+                {"matrix":[3,3], "x":7, "y":1},
+                {"matrix":[2,4], "x":8, "y":1},
+                {"matrix":[3,4], "x":9, "y":1},
+                {"matrix":[2,5], "x":10, "y":1},
+                {"matrix":[3,5], "x":11, "y":1},
+                {"matrix":[2,6], "x":12, "y":1},
+                {"matrix":[3,6], "x":13, "y":1, "w":2},
+                {"matrix":[3,7], "x":15, "y":1},
+
+                {"matrix":[4,0], "x":0, "y":2, "w":1.5},
+                {"matrix":[4,1], "x":1.5, "y":2},
+                {"matrix":[5,1], "x":2.5, "y":2},
+                {"matrix":[4,2], "x":3.5, "y":2},
+                {"matrix":[5,2], "x":4.5, "y":2},
+                {"matrix":[4,3], "x":5.5, "y":2},
+                {"matrix":[5,3], "x":6.5, "y":2},
+                {"matrix":[4,4], "x":7.5, "y":2},
+                {"matrix":[5,4], "x":8.5, "y":2},
+                {"matrix":[4,5], "x":9.5, "y":2},
+                {"matrix":[5,5], "x":10.5, "y":2},
+                {"matrix":[4,6], "x":11.5, "y":2},
+                {"matrix":[5,6], "x":12.5, "y":2},
+                {"matrix":[4,7], "x":13.5, "y":2, "w":1.5},
+                {"matrix":[5,7], "x":15, "y":2},
+
+                {"matrix":[6,0], "x":0, "y":3, "w":1.75},
+                {"matrix":[7,0], "x":1.75, "y":3},
+                {"matrix":[6,1], "x":2.75, "y":3},
+                {"matrix":[7,1], "x":3.75, "y":3},
+                {"matrix":[6,2], "x":4.75, "y":3},
+                {"matrix":[7,2], "x":5.75, "y":3},
+                {"matrix":[6,3], "x":6.75, "y":3},
+                {"matrix":[7,3], "x":7.75, "y":3},
+                {"matrix":[6,4], "x":8.75, "y":3},
+                {"matrix":[7,4], "x":9.75, "y":3},
+                {"matrix":[6,5], "x":10.75, "y":3},
+                {"matrix":[7,5], "x":11.75, "y":3},
+                {"matrix":[6,7], "x":12.75, "y":3, "w":2.25},
+                {"matrix":[7,7], "x":15, "y":3},
+
+                {"matrix":[8,0], "x":0, "y":4, "w":1.25},
+                {"matrix":[8,1], "x":2.25, "y":4},
+                {"matrix":[9,1], "x":3.25, "y":4},
+                {"matrix":[8,2], "x":4.25, "y":4},
+                {"matrix":[9,2], "x":5.25, "y":4},
+                {"matrix":[8,3], "x":6.25, "y":4},
+                {"matrix":[9,3], "x":7.25, "y":4},
+                {"matrix":[8,4], "x":8.25, "y":4},
+                {"matrix":[9,4], "x":9.25, "y":4},
+                {"matrix":[8,5], "x":10.25, "y":4},
+                {"matrix":[9,5], "x":11.25, "y":4},
+                {"matrix":[9,6], "x":12.25, "y":4, "w":1.75},
+                {"matrix":[8,7], "x":14, "y":4},
+                {"matrix":[9,7], "x":15, "y":4},
+
+                {"matrix":[10,0], "x":0, "y":5, "w":1.25},
+                {"matrix":[11,0], "x":1.25, "y":5, "w":1.25},
+                {"matrix":[11,1], "x":2.5, "y":5, "w":1.25},
+                {"matrix":[10,1], "x":3.75, "y":5, "w":6.25},
+                {"matrix":[10,5], "x":10, "y":5},
+                {"matrix":[11,5], "x":11, "y":5},
+                {"matrix":[10,6], "x":12, "y":5},
+                {"matrix":[11,6], "x":13, "y":5},
+                {"matrix":[10,7], "x":14, "y":5},
+                {"matrix":[11,7], "x":15, "y":5}
+            ]
+        }
     }
 }
-
diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json
index d1fe1b90b4..cc21b22e02 100644
--- a/keyboards/teleport/native/info.json
+++ b/keyboards/teleport/native/info.json
@@ -23,195 +23,6 @@
     "matrix_pins": {
         "cols": [ "A5", "A4", "B12", "B14", "B8", "B3", "B4", "B5" ],
         "rows": [ "C14", "C15", "C13", "A1", "A15", "A14", "A13", "B13", "B15", "A8", "A2", "A3" ]
-    },
-    "layouts": {
-        "LAYOUT_75_iso": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[1,0], "x":1, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[1,1], "x":3, "y":0},
-                {"matrix":[0,2], "x":4, "y":0},
-                {"matrix":[1,2], "x":5, "y":0},
-                {"matrix":[0,3], "x":6, "y":0},
-                {"matrix":[1,3], "x":7, "y":0},
-                {"matrix":[0,4], "x":8, "y":0},
-                {"matrix":[1,4], "x":9, "y":0},
-                {"matrix":[0,5], "x":10, "y":0},
-                {"matrix":[1,5], "x":11, "y":0},
-                {"matrix":[0,6], "x":12, "y":0},
-                {"matrix":[1,6], "x":13, "y":0},
-                {"matrix":[0,7], "x":14, "y":0},
-                {"matrix":[1,7], "x":15, "y":0},
-
-                {"matrix":[2,0], "x":0, "y":1},
-                {"matrix":[3,0], "x":1, "y":1},
-                {"matrix":[2,1], "x":2, "y":1},
-                {"matrix":[3,1], "x":3, "y":1},
-                {"matrix":[2,2], "x":4, "y":1},
-                {"matrix":[3,2], "x":5, "y":1},
-                {"matrix":[2,3], "x":6, "y":1},
-                {"matrix":[3,3], "x":7, "y":1},
-                {"matrix":[2,4], "x":8, "y":1},
-                {"matrix":[3,4], "x":9, "y":1},
-                {"matrix":[2,5], "x":10, "y":1},
-                {"matrix":[3,5], "x":11, "y":1},
-                {"matrix":[2,6], "x":12, "y":1},
-                {"matrix":[3,6], "x":13, "y":1, "w":2},
-                {"matrix":[3,7], "x":15, "y":1},
-                
-                {"matrix":[4,0], "x":0, "y":2, "w":1.5},
-                {"matrix":[4,1], "x":1.5, "y":2},
-                {"matrix":[5,1], "x":2.5, "y":2},
-                {"matrix":[4,2], "x":3.5, "y":2},
-                {"matrix":[5,2], "x":4.5, "y":2},
-                {"matrix":[4,3], "x":5.5, "y":2},
-                {"matrix":[5,3], "x":6.5, "y":2},
-                {"matrix":[4,4], "x":7.5, "y":2},
-                {"matrix":[5,4], "x":8.5, "y":2}, 
-                {"matrix":[4,5], "x":9.5, "y":2}, 
-                {"matrix":[5,5], "x":10.5, "y":2}, 
-                {"matrix":[4,6], "x":11.5, "y":2}, 
-                {"matrix":[5,6], "x":12.5, "y":2}, 
-                {"matrix":[4,7], "x":13.75, "y":2, "w":1.25, "h":2}, 
-                {"matrix":[5,7], "x":15, "y":2},
-
-                {"matrix":[6,0], "x":0, "y":3, "w":1.75}, 
-                {"matrix":[7,0], "x":1.75, "y":3}, 
-                {"matrix":[6,1], "x":2.75, "y":3}, 
-                {"matrix":[7,1], "x":3.75, "y":3}, 
-                {"matrix":[6,2], "x":4.75, "y":3}, 
-                {"matrix":[7,2], "x":5.75, "y":3}, 
-                {"matrix":[6,3], "x":6.75, "y":3}, 
-                {"matrix":[7,3], "x":7.75, "y":3}, 
-                {"matrix":[6,4], "x":8.75, "y":3}, 
-                {"matrix":[7,4], "x":9.75, "y":3}, 
-                {"matrix":[6,5], "x":10.75, "y":3}, 
-                {"matrix":[7,5], "x":11.75, "y":3}, 
-                {"matrix":[6,7], "x":12.75, "y":3}, 
-                {"matrix":[7,7], "x":15, "y":3},
-
-                {"matrix":[8,0], "x":0, "y":4, "w":1.25}, 
-                {"matrix":[9,0], "x":1.25, "y":4}, 
-                {"matrix":[8,1], "x":2.25, "y":4}, 
-                {"matrix":[9,1], "x":3.25, "y":4}, 
-                {"matrix":[8,2], "x":4.25, "y":4}, 
-                {"matrix":[9,2], "x":5.25, "y":4}, 
-                {"matrix":[8,3], "x":6.25, "y":4}, 
-                {"matrix":[9,3], "x":7.25, "y":4}, 
-                {"matrix":[8,4], "x":8.25, "y":4}, 
-                {"matrix":[9,4], "x":9.25, "y":4}, 
-                {"matrix":[8,5], "x":10.25, "y":4}, 
-                {"matrix":[9,5], "x":11.25, "y":4}, 
-                {"matrix":[9,6], "x":12.25, "y":4, "w":1.75}, 
-                {"matrix":[8,7], "x":14, "y":4}, 
-                {"matrix":[9,7], "x":15, "y":4},
-
-                {"matrix":[10,0], "x":0, "y":5, "w":1.25}, 
-                {"matrix":[11,0], "x":1.25, "y":5, "w":1.25}, 
-                {"matrix":[11,1], "x":2.5, "y":5, "w":1.25}, 
-                {"matrix":[10,1], "x":3.75, "y":5, "w":6.25}, 
-                {"matrix":[10,5], "x":10, "y":5}, 
-                {"matrix":[11,5], "x":11, "y":5}, 
-                {"matrix":[10,6], "x":12, "y":5}, 
-                {"matrix":[11,6], "x":13, "y":5}, 
-                {"matrix":[10,7], "x":14, "y":5}, 
-                {"matrix":[11,7], "x":15, "y":5}
-            ]
-        },
-        "LAYOUT_75_ansi": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[1,0], "x":1, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[1,1], "x":3, "y":0},
-                {"matrix":[0,2], "x":4, "y":0},
-                {"matrix":[1,2], "x":5, "y":0},
-                {"matrix":[0,3], "x":6, "y":0},
-                {"matrix":[1,3], "x":7, "y":0},
-                {"matrix":[0,4], "x":8, "y":0},
-                {"matrix":[1,4], "x":9, "y":0},
-                {"matrix":[0,5], "x":10, "y":0},
-                {"matrix":[1,5], "x":11, "y":0},
-                {"matrix":[0,6], "x":12, "y":0},
-                {"matrix":[1,6], "x":13, "y":0},
-                {"matrix":[0,7], "x":14, "y":0},
-                {"matrix":[1,7], "x":15, "y":0},
-
-                {"matrix":[2,0], "x":0, "y":1},
-                {"matrix":[3,0], "x":1, "y":1},
-                {"matrix":[2,1], "x":2, "y":1},
-                {"matrix":[3,1], "x":3, "y":1},
-                {"matrix":[2,2], "x":4, "y":1},
-                {"matrix":[3,2], "x":5, "y":1},
-                {"matrix":[2,3], "x":6, "y":1},
-                {"matrix":[3,3], "x":7, "y":1},
-                {"matrix":[2,4], "x":8, "y":1},
-                {"matrix":[3,4], "x":9, "y":1},
-                {"matrix":[2,5], "x":10, "y":1},
-                {"matrix":[3,5], "x":11, "y":1},
-                {"matrix":[2,6], "x":12, "y":1},
-                {"matrix":[3,6], "x":13, "y":1, "w":2},
-                {"matrix":[3,7], "x":15, "y":1},
-                
-                {"matrix":[4,0], "x":0, "y":2, "w":1.5},
-                {"matrix":[4,1], "x":1.5, "y":2},
-                {"matrix":[5,1], "x":2.5, "y":2},
-                {"matrix":[4,2], "x":3.5, "y":2},
-                {"matrix":[5,2], "x":4.5, "y":2},
-                {"matrix":[4,3], "x":5.5, "y":2},
-                {"matrix":[5,3], "x":6.5, "y":2},
-                {"matrix":[4,4], "x":7.5, "y":2},
-                {"matrix":[5,4], "x":8.5, "y":2}, 
-                {"matrix":[4,5], "x":9.5, "y":2}, 
-                {"matrix":[5,5], "x":10.5, "y":2}, 
-                {"matrix":[4,6], "x":11.5, "y":2}, 
-                {"matrix":[5,6], "x":12.5, "y":2}, 
-                {"matrix":[4,7], "x":13.5, "y":2, "w":1.5}, 
-                {"matrix":[5,7], "x":15, "y":2},
-
-                {"matrix":[6,0], "x":0, "y":3, "w":1.75}, 
-                {"matrix":[7,0], "x":1.75, "y":3}, 
-                {"matrix":[6,1], "x":2.75, "y":3}, 
-                {"matrix":[7,1], "x":3.75, "y":3}, 
-                {"matrix":[6,2], "x":4.75, "y":3}, 
-                {"matrix":[7,2], "x":5.75, "y":3}, 
-                {"matrix":[6,3], "x":6.75, "y":3}, 
-                {"matrix":[7,3], "x":7.75, "y":3}, 
-                {"matrix":[6,4], "x":8.75, "y":3}, 
-                {"matrix":[7,4], "x":9.75, "y":3}, 
-                {"matrix":[6,5], "x":10.75, "y":3}, 
-                {"matrix":[7,5], "x":11.75, "y":3}, 
-                {"matrix":[6,7], "x":12.75, "y":3, "w":2.25}, 
-                {"matrix":[7,7], "x":15, "y":3},
-
-                {"matrix":[8,0], "x":0, "y":4, "w":1.25}, 
-                {"matrix":[8,1], "x":2.25, "y":4}, 
-                {"matrix":[9,1], "x":3.25, "y":4}, 
-                {"matrix":[8,2], "x":4.25, "y":4}, 
-                {"matrix":[9,2], "x":5.25, "y":4}, 
-                {"matrix":[8,3], "x":6.25, "y":4}, 
-                {"matrix":[9,3], "x":7.25, "y":4}, 
-                {"matrix":[8,4], "x":8.25, "y":4}, 
-                {"matrix":[9,4], "x":9.25, "y":4}, 
-                {"matrix":[8,5], "x":10.25, "y":4}, 
-                {"matrix":[9,5], "x":11.25, "y":4}, 
-                {"matrix":[9,6], "x":12.25, "y":4, "w":1.75}, 
-                {"matrix":[8,7], "x":14, "y":4}, 
-                {"matrix":[9,7], "x":15, "y":4},
-
-                {"matrix":[10,0], "x":0, "y":5, "w":1.25}, 
-                {"matrix":[11,0], "x":1.25, "y":5, "w":1.25}, 
-                {"matrix":[11,1], "x":2.5, "y":5, "w":1.25}, 
-                {"matrix":[10,1], "x":3.75, "y":5, "w":6.25}, 
-                {"matrix":[10,5], "x":10, "y":5}, 
-                {"matrix":[11,5], "x":11, "y":5}, 
-                {"matrix":[10,6], "x":12, "y":5}, 
-                {"matrix":[11,6], "x":13, "y":5}, 
-                {"matrix":[10,7], "x":14, "y":5}, 
-                {"matrix":[11,7], "x":15, "y":5}
-            ]
-        }
     }
 }
 
diff --git a/keyboards/teleport/native/iso/info.json b/keyboards/teleport/native/iso/info.json
index f475ac773e..30b8a1027f 100644
--- a/keyboards/teleport/native/iso/info.json
+++ b/keyboards/teleport/native/iso/info.json
@@ -1,6 +1,103 @@
 {
     "usb": {
         "pid": "0x0002"
+    },
+    "community_layouts": ["75_iso"],
+    "layouts": {
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[1,0], "x":1, "y":0},
+                {"matrix":[0,1], "x":2, "y":0},
+                {"matrix":[1,1], "x":3, "y":0},
+                {"matrix":[0,2], "x":4, "y":0},
+                {"matrix":[1,2], "x":5, "y":0},
+                {"matrix":[0,3], "x":6, "y":0},
+                {"matrix":[1,3], "x":7, "y":0},
+                {"matrix":[0,4], "x":8, "y":0},
+                {"matrix":[1,4], "x":9, "y":0},
+                {"matrix":[0,5], "x":10, "y":0},
+                {"matrix":[1,5], "x":11, "y":0},
+                {"matrix":[0,6], "x":12, "y":0},
+                {"matrix":[1,6], "x":13, "y":0},
+                {"matrix":[0,7], "x":14, "y":0},
+                {"matrix":[1,7], "x":15, "y":0},
+
+                {"matrix":[2,0], "x":0, "y":1},
+                {"matrix":[3,0], "x":1, "y":1},
+                {"matrix":[2,1], "x":2, "y":1},
+                {"matrix":[3,1], "x":3, "y":1},
+                {"matrix":[2,2], "x":4, "y":1},
+                {"matrix":[3,2], "x":5, "y":1},
+                {"matrix":[2,3], "x":6, "y":1},
+                {"matrix":[3,3], "x":7, "y":1},
+                {"matrix":[2,4], "x":8, "y":1},
+                {"matrix":[3,4], "x":9, "y":1},
+                {"matrix":[2,5], "x":10, "y":1},
+                {"matrix":[3,5], "x":11, "y":1},
+                {"matrix":[2,6], "x":12, "y":1},
+                {"matrix":[3,6], "x":13, "y":1, "w":2},
+                {"matrix":[3,7], "x":15, "y":1},
+
+                {"matrix":[4,0], "x":0, "y":2, "w":1.5},
+                {"matrix":[4,1], "x":1.5, "y":2},
+                {"matrix":[5,1], "x":2.5, "y":2},
+                {"matrix":[4,2], "x":3.5, "y":2},
+                {"matrix":[5,2], "x":4.5, "y":2},
+                {"matrix":[4,3], "x":5.5, "y":2},
+                {"matrix":[5,3], "x":6.5, "y":2},
+                {"matrix":[4,4], "x":7.5, "y":2},
+                {"matrix":[5,4], "x":8.5, "y":2},
+                {"matrix":[4,5], "x":9.5, "y":2},
+                {"matrix":[5,5], "x":10.5, "y":2},
+                {"matrix":[4,6], "x":11.5, "y":2},
+                {"matrix":[5,6], "x":12.5, "y":2},
+                {"matrix":[5,7], "x":15, "y":2},
+
+                {"matrix":[6,0], "x":0, "y":3, "w":1.75},
+                {"matrix":[7,0], "x":1.75, "y":3},
+                {"matrix":[6,1], "x":2.75, "y":3},
+                {"matrix":[7,1], "x":3.75, "y":3},
+                {"matrix":[6,2], "x":4.75, "y":3},
+                {"matrix":[7,2], "x":5.75, "y":3},
+                {"matrix":[6,3], "x":6.75, "y":3},
+                {"matrix":[7,3], "x":7.75, "y":3},
+                {"matrix":[6,4], "x":8.75, "y":3},
+                {"matrix":[7,4], "x":9.75, "y":3},
+                {"matrix":[6,5], "x":10.75, "y":3},
+                {"matrix":[7,5], "x":11.75, "y":3},
+                {"matrix":[6,7], "x":12.75, "y":3},
+                {"matrix":[4,7], "x":13.75, "y":2, "w":1.25, "h":2},
+                {"matrix":[7,7], "x":15, "y":3},
+
+                {"matrix":[8,0], "x":0, "y":4, "w":1.25},
+                {"matrix":[9,0], "x":1.25, "y":4},
+                {"matrix":[8,1], "x":2.25, "y":4},
+                {"matrix":[9,1], "x":3.25, "y":4},
+                {"matrix":[8,2], "x":4.25, "y":4},
+                {"matrix":[9,2], "x":5.25, "y":4},
+                {"matrix":[8,3], "x":6.25, "y":4},
+                {"matrix":[9,3], "x":7.25, "y":4},
+                {"matrix":[8,4], "x":8.25, "y":4},
+                {"matrix":[9,4], "x":9.25, "y":4},
+                {"matrix":[8,5], "x":10.25, "y":4},
+                {"matrix":[9,5], "x":11.25, "y":4},
+                {"matrix":[9,6], "x":12.25, "y":4, "w":1.75},
+                {"matrix":[8,7], "x":14, "y":4},
+                {"matrix":[9,7], "x":15, "y":4},
+
+                {"matrix":[10,0], "x":0, "y":5, "w":1.25},
+                {"matrix":[11,0], "x":1.25, "y":5, "w":1.25},
+                {"matrix":[11,1], "x":2.5, "y":5, "w":1.25},
+                {"matrix":[10,1], "x":3.75, "y":5, "w":6.25},
+                {"matrix":[10,5], "x":10, "y":5},
+                {"matrix":[11,5], "x":11, "y":5},
+                {"matrix":[10,6], "x":12, "y":5},
+                {"matrix":[11,6], "x":13, "y":5},
+                {"matrix":[10,7], "x":14, "y":5},
+                {"matrix":[11,7], "x":15, "y":5}
+            ]
+        }
     }
 }
 
diff --git a/keyboards/teleport/native/iso/keymaps/default/keymap.c b/keyboards/teleport/native/iso/keymaps/default/keymap.c
index b77e7fa61d..c1ed3cd4f4 100644
--- a/keyboards/teleport/native/iso/keymaps/default/keymap.c
+++ b/keyboards/teleport/native/iso/keymaps/default/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [BASE] = LAYOUT_75_iso(    /* keymap for layer 0 */
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_F13, KC_PSCR,   KC_DEL,
         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_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,      KC_ENT,      KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,                   KC_HOME,
+        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_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,      KC_ENT,      KC_HOME,
         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, MO(_FN1),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
@@ -35,17 +35,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [GAME] = LAYOUT_75_iso(    /* keymap for layer 1 - GAME disables WIN key and has RGB layer indicators */
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_NO,   KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
+
     [_FN1] = LAYOUT_75_iso(    /* keymap for layer 2 */
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     RGB_RMOD,
-        RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     RGB_MOD,
-        KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_MOD,
+        KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, TG(GAME),KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
@@ -95,4 +95,4 @@ layer_state_t layer_state_set_user(layer_state_t state) {
         rgb_matrix_set_color(WIN_LED_INDEX, rgb_mat.r, rgb_mat.g, rgb_mat.b);
     }
     return state;
-}
\ No newline at end of file
+}
diff --git a/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c b/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c
index d451d528e6..3be8eec3dd 100644
--- a/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c
+++ b/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c
@@ -99,8 +99,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [BASE] = LAYOUT_75_iso(    /* keymap for layer 0 */
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_F13, KC_PSCR,   KC_DEL,
         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_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,      KC_ENT,      KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,                   KC_HOME,
+        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_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,      KC_ENT,      KC_HOME,
         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, MO(_FN1),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
@@ -108,17 +108,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [GAME] = LAYOUT_75_iso(    /* keymap for layer 1 - GAME disables WIN key and has RGB layer indicators */
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_NO,   KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
+
     [PERF] = LAYOUT_75_iso(    /* keymap for layer 2 - PERF has a static LED display to increase matrix scan rates */
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_NO,   KC_TRNS,                            KC_TRNS,                            KC_TRNS, MO(_FN2),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
@@ -126,8 +126,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN1] = LAYOUT_75_iso(    /* keymap for layer 3 */
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_M_P, RGB_M_2, RGB_M_3, RGB_M_4, RGB_M_5, RGB_M_6, RGB_M_7, RGB_M_8, RGB_M_9, RGB_M_0, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, TG(GAME),KC_TRNS,                            TO(PERF),                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
@@ -135,8 +135,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN2] = LAYOUT_75_iso(    /* keymap for layer 4 */
         KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG_NO,KC_NO, KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        RGB_TOG_NO,KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        RGB_TOG_NO,KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS,   KC_NO,   KC_TRNS,                            TG(PERF),                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
@@ -196,4 +196,4 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     rgb_matrix_set_color(WIN_LED_INDEX, rgb_mat.r, rgb_mat.g, rgb_mat.b);
   }
   return state;
-}
\ No newline at end of file
+}
diff --git a/keyboards/teleport/native/iso/keymaps/via/keymap.c b/keyboards/teleport/native/iso/keymaps/via/keymap.c
index b77e7fa61d..c1ed3cd4f4 100644
--- a/keyboards/teleport/native/iso/keymaps/via/keymap.c
+++ b/keyboards/teleport/native/iso/keymaps/via/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [BASE] = LAYOUT_75_iso(    /* keymap for layer 0 */
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_F13, KC_PSCR,   KC_DEL,
         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_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,      KC_ENT,      KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,                   KC_HOME,
+        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_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,      KC_ENT,      KC_HOME,
         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, MO(_FN1),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
@@ -35,17 +35,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [GAME] = LAYOUT_75_iso(    /* keymap for layer 1 - GAME disables WIN key and has RGB layer indicators */
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_NO,   KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
+
     [_FN1] = LAYOUT_75_iso(    /* keymap for layer 2 */
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     RGB_RMOD,
-        RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     RGB_MOD,
-        KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_MOD,
+        KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, TG(GAME),KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
@@ -95,4 +95,4 @@ layer_state_t layer_state_set_user(layer_state_t state) {
         rgb_matrix_set_color(WIN_LED_INDEX, rgb_mat.r, rgb_mat.g, rgb_mat.b);
     }
     return state;
-}
\ No newline at end of file
+}