Move split space/backspace layouts to data driven (#20356)

3 files changed, 335 insertions, 467 deletions

diff --git a/keyboards/boardrun/bizarre/bizarre.h b/keyboards/boardrun/bizarre/bizarre.h
deleted file mode 100644
index 656ab673b9..0000000000
--- a/keyboards/boardrun/bizarre/bizarre.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115, k116, \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313, k314, k315,      \
-         k41, k42, k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,      k413,    k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12, k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, k116,  k117 }, \
-  { k21,   k22, k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
-  { KC_NO, k32, k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  k314,  k315, KC_NO, KC_NO }, \
-  { k41,   k42, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
-  { KC_NO, k52, KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516,  KC_NO } \
-}
-
-#define LAYOUT_ansi( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115,   \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313,     k315,      \
-         k41,      k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12,   k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, KC_NO,  k117 }, \
-  { k21,   k22,   k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
-  { KC_NO, k32,   k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  KC_NO, k315, KC_NO, KC_NO }, \
-  { k41,   KC_NO, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
-  { KC_NO, k52,   KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516, KC_NO } \
-}
-
-#define LAYOUT_split_bs( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115, k116,   \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313,     k315,      \
-         k41,      k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12,   k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, k116,  k117 }, \
-  { k21,   k22,   k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
-  { KC_NO, k32,   k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  KC_NO, k315, KC_NO, KC_NO }, \
-  { k41,   KC_NO, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
-  { KC_NO, k52,   KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516, KC_NO } \
-}
-
-#define LAYOUT_iso( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114,   k115,    \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,          \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313, k314, k315,    \
-         k41, k42, k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12, k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115,  KC_NO,  k117 }, \
-  { k21,   k22, k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  KC_NO, KC_NO, KC_NO }, \
-  { KC_NO, k32, k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  k314,  k315,  KC_NO, KC_NO }, \
-  { k41,   k42, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415,  KC_NO, KC_NO }, \
-  { KC_NO, k52, KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515,  k516,  KC_NO } \
-}
diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json
index b7add4033e..8c6253965b 100644
--- a/keyboards/boardrun/bizarre/info.json
+++ b/keyboards/boardrun/bizarre/info.json
@@ -22,390 +22,336 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"Backspace"},
-                {"y":0, "x":19.5, "label":"Bksp (Split)"},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                {"y":1, "x":18.75,"label":"\\| (ANSI)", "w":1.5},
-                
-                
-                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"#~ (ISO)"},
-                {"y":2, "x":19,   "label":"Enter (ANSI or ISO)", "w":1.25},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":1.25},
-                {"y":3, "x":1.75, "label":"\\| (ISO)"},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0},
+                {"matrix": [0, 15], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+                {"matrix": [1, 14], "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 13], "x": 18, "y": 2},
+                {"matrix": [2, 14], "x": 19, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"Backspace", "w":2},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                {"y":1, "x":18.75,"label":"\\", "w":1.5},
-                
-                
-                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"Enter", "w":2.25},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":2.25},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+                {"matrix": [1, 14], "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 14], "x": 18, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"\\"},
-                {"y":0, "x":19.5, "label":"Del"},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                {"y":1, "x":18.75,"label":"Backspace", "w":1.5},
-                
-                
-                {"y":2, "x":1.25, "label":"Control", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"Enter", "w":2.25},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":2.25},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0},
+                {"matrix": [0, 15], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+                {"matrix": [1, 14], "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 14], "x": 18, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"Backspace", "w":2},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                
-                
-                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"#"},
-                {"y":1, "x":19,   "label":"Enter", "w":1.25, "h":2},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":1.25},
-                {"y":3, "x":1.75, "label":"\\"},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 13], "x": 18, "y": 2},
+                {"matrix": [2, 14], "x": 19, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         }
-        
     }
-
 }
diff --git a/keyboards/boardrun/bizarre/keymaps/default/keymap.c b/keyboards/boardrun/bizarre/keymaps/default/keymap.c
index f27c7a2c30..91a1ab1084 100644
--- a/keyboards/boardrun/bizarre/keymaps/default/keymap.c
+++ b/keyboards/boardrun/bizarre/keymaps/default/keymap.c
@@ -27,15 +27,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /*Bizarre Base Layer (defaults for "any" layout)
     * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
-    * ¦ HOME  ¦   ¦ ESC   ¦ `~    ¦ 1     ¦ ¦ 2     ¦ 3     ¦ 4     ¦ 5     ¦                   ¦ 6     ¦ 7     ¦ 8     ¦ 9     ¦ ¦ 0     ¦ -     ¦ =     ¦ BKSP  ¦ DEL   ¦
-    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
-    * ¦ END   ¦     ¦ TAB       ¦ Q     ¦   ¦ W     ¦ E     ¦ R     ¦ T     ¦                   ¦ Y     ¦ U     ¦ I     ¦ O     ¦   ¦ P     ¦ [     ¦ ]     ¦ \ ANSI    ¦
-    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
-    *           ¦ CAPS        ¦ A     ¦     ¦ S     ¦ D     ¦ F     ¦ G     ¦                   ¦ H     ¦ J     ¦ K     ¦ L     ¦     ¦ ;     ¦ '     ¦ # ISO ¦ ENTER   ¦
-    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
-    *     ¦ LSHIFT  ¦ \ ISO ¦ Z     ¦       ¦ X     ¦ C     ¦ V     ¦ B     ¦ LGUI  ¦   ¦ FN    ¦ N     ¦ M     ¦ ,     ¦ .     ¦       ¦ /     ¦ RSHIFT      ¦ UP    ¦
-    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
-    *           ¦ LCTRL     ¦                           ¦ LALT      ¦ SPACE         ¦   ¦ SPACE               ¦                           ¦ RCTRL     ¦ LEFT  ¦ DOWN  ¦ RIGHT ¦
+    * ¦ HOME  ¦   ¦ ESC   ¦ `~    ¦ 1     ¦ ¦ 2     ¦ 3     ¦ 4     ¦ 5     ¦                   ¦ 6     ¦ 7     ¦ 8     ¦ 9     ¦ ¦ 0     ¦ -     ¦ =     ¦ BKSP  ¦ DEL   ¦
+    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
+    * ¦ END   ¦     ¦ TAB       ¦ Q     ¦   ¦ W     ¦ E     ¦ R     ¦ T     ¦                   ¦ Y     ¦ U     ¦ I     ¦ O     ¦   ¦ P     ¦ [     ¦ ]     ¦ \ ANSI    ¦
+    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
+    *           ¦ CAPS        ¦ A     ¦     ¦ S     ¦ D     ¦ F     ¦ G     ¦                   ¦ H     ¦ J     ¦ K     ¦ L     ¦     ¦ ;     ¦ '     ¦ # ISO ¦ ENTER   ¦
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
+    *     ¦ LSHIFT  ¦ \ ISO ¦ Z     ¦       ¦ X     ¦ C     ¦ V     ¦ B     ¦ LGUI  ¦   ¦ FN    ¦ N     ¦ M     ¦ ,     ¦ .     ¦       ¦ /     ¦ RSHIFT      ¦ UP    ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦ LCTRL     ¦                           ¦ LALT      ¦ SPACE         ¦   ¦ SPACE               ¦                           ¦ RCTRL     ¦ LEFT  ¦ DOWN  ¦ RIGHT ¦
     *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
     */
     
@@ -49,15 +49,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     /*Bizarre Function Layer
     * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
-    * ¦ QK_BOOT ¦   ¦       ¦       ¦ F1    ¦ ¦ F2    ¦ F3    ¦ F4    ¦ F5    ¦                   ¦ F6    ¦ F7    ¦ F8    ¦ F9    ¦ ¦ F10   ¦ F11   ¦ F12   ¦ DEL   ¦       ¦
-    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
-    * ¦       ¦     ¦           ¦       ¦   ¦       ¦       ¦       ¦       ¦                   ¦       ¦       ¦ INS   ¦       ¦   ¦ PRINT ¦       ¦       ¦           ¦
-    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
-    *           ¦             ¦       ¦     ¦ SCRLL ¦       ¦       ¦       ¦                   ¦       ¦       ¦       ¦       ¦     ¦       ¦       ¦       ¦         ¦
-    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
-    *     ¦         ¦       ¦       ¦       ¦       ¦       ¦       ¦ PAUSE ¦ RGUI  ¦   ¦       ¦       ¦ MENU  ¦       ¦       ¦       ¦       ¦             ¦ PGUP  ¦
-    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
-    *           ¦           ¦                           ¦           ¦               ¦   ¦ RALT                ¦                           ¦           ¦ HOME  ¦ PGDN  ¦ END   ¦
+    * ¦ QK_BOOT ¦   ¦       ¦       ¦ F1    ¦ ¦ F2    ¦ F3    ¦ F4    ¦ F5    ¦                   ¦ F6    ¦ F7    ¦ F8    ¦ F9    ¦ ¦ F10   ¦ F11   ¦ F12   ¦ DEL   ¦       ¦
+    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
+    * ¦       ¦     ¦           ¦       ¦   ¦       ¦       ¦       ¦       ¦                   ¦       ¦       ¦ INS   ¦       ¦   ¦ PRINT ¦       ¦       ¦           ¦
+    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
+    *           ¦             ¦       ¦     ¦ SCRLL ¦       ¦       ¦       ¦                   ¦       ¦       ¦       ¦       ¦     ¦       ¦       ¦       ¦         ¦
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
+    *     ¦         ¦       ¦       ¦       ¦       ¦       ¦       ¦ PAUSE ¦ RGUI  ¦   ¦       ¦       ¦ MENU  ¦       ¦       ¦       ¦       ¦             ¦ PGUP  ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦           ¦                           ¦           ¦               ¦   ¦ RALT                ¦                           ¦           ¦ HOME  ¦ PGDN  ¦ END   ¦
     *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
     */