Boardrun Classic & Bizarre layouts (replaces PR 10934) (#10990)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Rossman360 <rmontsinger@gmail.com>
Co-authored-by: Luke <golichowski.to@gmail.com>

19 files changed, 1243 insertions, 0 deletions

diff --git a/keyboards/boardrun/bizarre/bizarre.c b/keyboards/boardrun/bizarre/bizarre.c
new file mode 100644
index 0000000000..10125f57b8
--- /dev/null
+++ b/keyboards/boardrun/bizarre/bizarre.c
@@ -0,0 +1,16 @@
+/*
+ * 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/>.
+ */
+
+#include "bizarre.h"
diff --git a/keyboards/boardrun/bizarre/bizarre.h b/keyboards/boardrun/bizarre/bizarre.h
new file mode 100644
index 0000000000..656ab673b9
--- /dev/null
+++ b/keyboards/boardrun/bizarre/bizarre.h
@@ -0,0 +1,78 @@
+/*
+ * 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/config.h b/keyboards/boardrun/bizarre/config.h
new file mode 100644
index 0000000000..6e08d1f4a7
--- /dev/null
+++ b/keyboards/boardrun/bizarre/config.h
@@ -0,0 +1,83 @@
+/*
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xCDCD
+#define PRODUCT_ID      0x5339
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    shensmobile
+#define PRODUCT         Boardrun Bizarre
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
+#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, B2, B1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+// #define BACKLIGHT_PIN F5
+// #define BACKLIGHT_LEVELS 6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 10
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+// ws2812 options
+#define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
+#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLED_NUM 15 // number of LEDs
+#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
+#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
+#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json
new file mode 100644
index 0000000000..3a10028714
--- /dev/null
+++ b/keyboards/boardrun/bizarre/info.json
@@ -0,0 +1,397 @@
+{
+    "keyboard_name": "Boardrun Bizarre",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/boardrun/bizarre",
+    "maintainer": "QMK Community",
+    "manufacturer": "shensmobile",
+    "width": 21,
+    "height": 5,
+    "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"}
+            ]
+        },
+        "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"}
+            ]
+        },
+        "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"}
+            ]
+        },
+        "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"}
+            ]
+        }
+        
+    }
+
+}
diff --git a/keyboards/boardrun/bizarre/keymaps/default/keymap.c b/keyboards/boardrun/bizarre/keymaps/default/keymap.c
new file mode 100644
index 0000000000..49c2f1a781
--- /dev/null
+++ b/keyboards/boardrun/bizarre/keymaps/default/keymap.c
@@ -0,0 +1,71 @@
+/*
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define _FUNC   MO(_FNBIZARRE)
+
+// Layer shorthand
+enum layer_names {
+    _BIZARRE,
+    _FNBIZARRE,
+};
+
+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 ¦
+    *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
+    */
+    
+    [_BIZARRE] = LAYOUT_all(
+       KC_HOME,    KC_ESC, KC_GRV, KC_1,     KC_2,   KC_3,   KC_4,   KC_5,                       KC_6,   KC_7,   KC_8,   KC_9,     KC_0,   KC_MINS,KC_EQL, KC_BSPC,KC_DEL,
+       KC_END,       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_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_LSFT,  KC_NUBS,KC_Z,           KC_X,   KC_C,   KC_V,   KC_B,   KC_LGUI,    _FUNC,  KC_N,   KC_M,   KC_COMM,KC_DOT,         KC_SLSH,KC_RSFT,      KC_UP,
+                 KC_LCTL,                                KC_LALT,    KC_SPC,             KC_SPC,                                           KC_RCTL,    KC_LEFT,KC_DOWN,KC_RGHT
+    ), 
+    
+    /*Bizarre Function Layer
+    * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
+    * ¦ RESET ¦   ¦       ¦       ¦ F1    ¦ ¦ F2    ¦ F3    ¦ F4    ¦ F5    ¦                   ¦ F6    ¦ F7    ¦ F8    ¦ F9    ¦ ¦ F10   ¦ F11   ¦ F12   ¦ DEL   ¦       ¦
+    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
+    * ¦       ¦     ¦           ¦       ¦   ¦       ¦       ¦       ¦       ¦                   ¦       ¦       ¦ INS   ¦       ¦   ¦ PRINT ¦       ¦       ¦           ¦
+    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
+    *           ¦             ¦       ¦     ¦ SCRLL ¦       ¦       ¦       ¦                   ¦       ¦       ¦       ¦       ¦     ¦       ¦       ¦       ¦         ¦
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
+    *     ¦         ¦       ¦       ¦       ¦       ¦       ¦       ¦ PAUSE ¦ RGUI  ¦   ¦       ¦       ¦ MENU  ¦       ¦       ¦       ¦       ¦             ¦ PGUP  ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦           ¦                           ¦           ¦               ¦   ¦ RALT                ¦                           ¦           ¦ HOME  ¦ PGDN  ¦ END   ¦
+    *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
+    */
+    
+    [_FNBIZARRE] = LAYOUT_all(
+       RESET,     _______,_______,KC_F1,     KC_F2,  KC_F3,  KC_F4,  KC_F5,                      KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10, KC_F11, KC_F12, KC_DEL, _______,
+       _______,      _______,    _______,    _______,_______,RESET,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
+                 _______,      _______,      KC_SLCK,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
+           _______,  _______,_______,        _______,_______,_______,KC_PAUS,KC_RGUI,    _______,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
+                 _______,                                _______,    _______,            KC_RALT,                                          _______,    KC_HOME,KC_PGDN,KC_END
+    )
+};
\ No newline at end of file
diff --git a/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c b/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
new file mode 100644
index 0000000000..c0653be0c8
--- /dev/null
+++ b/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
@@ -0,0 +1,50 @@
+/*
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define _FUNC   MO(_FN)
+#define _LSADEL LSA_T(KC_DEL)
+#define _AGRHOM RALT_T(KC_HOME)
+#define _CTLEND RCTL_T(KC_END)
+#define _CTLALT LCTL(KC_LALT)
+#define _LSNUBS LSFT_T(KC_NUBS)
+#define _MINMIZ LGUI(KC_D)
+
+// Layer shorthand
+enum layer_names {
+    _ZERO,
+    _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [_ZERO] = LAYOUT_ansi(
+       KC_ESC,    KC_BSLS,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_INS,         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_BSPC,
+                 KC_LCTL,      KC_A,         KC_S,   KC_D,   KC_F,   KC_G,                       KC_H,   KC_J,   KC_K,   KC_L,         KC_SCLN,KC_QUOT,  KC_ENT,
+           KC_LSFT,          KC_Z,           KC_X,   KC_C,   KC_V,   KC_B,   _LSADEL,    KC_LGUI,KC_N,   KC_M,   KC_COMM,KC_DOT,         KC_SLSH,KC_RSFT,      KC_UP,
+                 _FUNC,                                  KC_LALT,    KC_SPC,             _AGRHOM,                                          _CTLEND,    KC_LEFT,KC_DOWN,KC_RGHT
+    ), 
+
+    
+    [_FN] = LAYOUT_ansi(
+       _MINMIZ,   _______,_______,   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_CALC,      _______,    _______,    _______,_______,RESET,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
+                 KC_CAPS,      _______,      KC_SLCK,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,
+           _LSNUBS,          _______,        _______,_______,_______,KC_PAUS,_______,    KC_RGUI,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
+                 _______,                                _CTLALT,    KC_DEL,             _______,                                          _______,    _______,KC_PGDN,_______
+    )
+};
diff --git a/keyboards/boardrun/bizarre/keymaps/via/keymap.c b/keyboards/boardrun/bizarre/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d4d2fee9ce
--- /dev/null
+++ b/keyboards/boardrun/bizarre/keymaps/via/keymap.c
@@ -0,0 +1,81 @@
+/*
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+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  ¦   ¦ MO    ¦ N     ¦ M     ¦ ,     ¦ .     ¦       ¦ /     ¦ RSHIFT      ¦ UP    ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦ LCTRL     ¦                           ¦ LALT      ¦ SPACE         ¦   ¦ SPACE               ¦                           ¦ RCTRL     ¦ LEFT  ¦ DOWN  ¦ RIGHT ¦
+    *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
+    */
+    
+    [0] = LAYOUT_all(
+       KC_HOME,    KC_ESC, KC_GRV, KC_1,     KC_2,   KC_3,   KC_4,   KC_5,                       KC_6,   KC_7,   KC_8,   KC_9,     KC_0,   KC_MINS,KC_EQL, KC_BSPC,KC_DEL,
+       KC_END,       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_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_LSFT,  KC_NUBS,KC_Z,           KC_X,   KC_C,   KC_V,   KC_B,   KC_LGUI,    MO(1),  KC_N,   KC_M,   KC_COMM,KC_DOT,         KC_SLSH,KC_RSFT,      KC_UP,
+                 KC_LCTL,                                KC_LALT,    KC_SPC,             KC_SPC,                                           KC_RCTL,    KC_LEFT,KC_DOWN,KC_RGHT
+    ), 
+    
+    /*Bizarre Function Layer
+    * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
+    * ¦ RESET ¦   ¦       ¦       ¦ F1    ¦ ¦ F2    ¦ F3    ¦ F4    ¦ F5    ¦                   ¦ F6    ¦ F7    ¦ F8    ¦ F9    ¦ ¦ F10   ¦ F11   ¦ F12   ¦ DEL   ¦       ¦
+    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
+    * ¦       ¦     ¦           ¦       ¦   ¦       ¦       ¦       ¦       ¦                   ¦       ¦       ¦ INS   ¦       ¦   ¦ PRINT ¦       ¦       ¦           ¦
+    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
+    *           ¦             ¦       ¦     ¦ SCRLL ¦       ¦       ¦       ¦                   ¦       ¦       ¦       ¦       ¦     ¦       ¦       ¦       ¦         ¦
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
+    *     ¦         ¦       ¦       ¦       ¦       ¦       ¦       ¦ PAUSE ¦ RGUI  ¦   ¦       ¦       ¦ MENU  ¦       ¦       ¦       ¦       ¦             ¦ PGUP  ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦           ¦                           ¦           ¦               ¦   ¦ RALT                ¦                           ¦           ¦ HOME  ¦ PGDN  ¦ END   ¦
+    *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
+    */
+    
+    [1] = LAYOUT_all(
+       RESET,     _______,_______,KC_F1,     KC_F2,  KC_F3,  KC_F4,  KC_F5,                      KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10, KC_F11, KC_F12, KC_DEL, _______,
+       _______,      _______,    _______,    _______,_______,RESET,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
+                 _______,      _______,      KC_SLCK,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
+           _______,  _______,_______,        _______,_______,_______,KC_PAUS,KC_RGUI,    _______,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
+                 _______,                                _______,    _______,            KC_RALT,                                          _______,    KC_HOME,KC_PGDN,KC_END
+    ),
+
+    [2] = LAYOUT_all(
+       _______,     _______,_______,_______, _______,_______,_______,_______,                    _______,_______,_______,_______,    _______,_______,_______,_______,_______,
+       _______,      _______,    _______,    _______,_______,_______,_______,                    _______,_______,_______,_______,    _______,_______,_______,_______,
+                 _______,      _______,      _______,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
+           _______,  _______,_______,        _______,_______,_______,_______,_______,    _______,_______,_______,_______,_______,        _______,_______,      _______,
+                 _______,                                _______,    _______,            _______,                                          _______,    _______,_______,_______
+    ),
+
+    [3] = LAYOUT_all(
+       _______,     _______,_______,_______, _______,_______,_______,_______,                    _______,_______,_______,_______,    _______,_______,_______,_______,_______,
+       _______,      _______,    _______,    _______,_______,_______,_______,                    _______,_______,_______,_______,    _______,_______,_______,_______,
+                 _______,      _______,      _______,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
+           _______,  _______,_______,        _______,_______,_______,_______,_______,    _______,_______,_______,_______,_______,        _______,_______,      _______,
+                 _______,                                _______,    _______,            _______,                                          _______,    _______,_______,_______
+    )
+
+
+};
diff --git a/keyboards/boardrun/bizarre/keymaps/via/rules.mk b/keyboards/boardrun/bizarre/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/boardrun/bizarre/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/boardrun/bizarre/readme.md b/keyboards/boardrun/bizarre/readme.md
new file mode 100644
index 0000000000..5c73313d38
--- /dev/null
+++ b/keyboards/boardrun/bizarre/readme.md
@@ -0,0 +1,23 @@
+# Boardrun Bizarre
+
+![Boardrun Bizarre](https://i.imgur.com/usKQUWI.jpg)
+
+The Boardrun is a family of ortholinear keyboards with columnar stagger, inspired by the Alice layout. The Classic is a 60% layout that uses Ergodox keycap sets for compatibility, whereas the Bizarre is a 65% layout that uses standard (staggered) keycap sets in an ortholinear arrangement.
+
+The Boardrun is an evolution of the Boardwalk layout. The Boardwalk proved that the Ergodox keycap set could be adapted to more keyboards that provided a more compact design and layout flexibility. While adaptation was a design goal of the Boardwalk layout, the Boardrun was designed to distill and refine the best aspects of the current state of keyboard layouts, taking into account current trends in staggered design, the Ergodox keycap layout, and the Boardwalk's most popular layouts. To that end, a columnar staggered, ortholinear layout with alpha rotation was settled on, using the "HHKB" layout from the Boardwalk. The result is two layouts that are comfortable, familiar, and have great compatibility with keysets.
+
+-   Keyboard Maintainer: QMK Community
+-   Hardware Supported: Boardrun Bizarre Ortholinear PCB
+-   Hardware Availability: mkultra.click
+
+Make example for this keyboard (after setting up your build environment):
+
+    make boardrun/bizarre:default
+    
+Flashing example for this keyboard:
+
+    make boardrun/bizarre:default:flash
+    
+The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured RESET shortcut (which may vary depending on when the PCB was flashed).
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/boardrun/bizarre/rules.mk b/keyboards/boardrun/bizarre/rules.mk
new file mode 100644
index 0000000000..f841c16c30
--- /dev/null
+++ b/keyboards/boardrun/bizarre/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = no         # Unicode
diff --git a/keyboards/boardrun/classic/classic.c b/keyboards/boardrun/classic/classic.c
new file mode 100644
index 0000000000..49eea39329
--- /dev/null
+++ b/keyboards/boardrun/classic/classic.c
@@ -0,0 +1,16 @@
+/*
+ * 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/>.
+ */
+
+#include "classic.h"
diff --git a/keyboards/boardrun/classic/classic.h b/keyboards/boardrun/classic/classic.h
new file mode 100644
index 0000000000..173c686c74
--- /dev/null
+++ b/keyboards/boardrun/classic/classic.h
@@ -0,0 +1,33 @@
+/*
+ * 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_classic( \
+  k11, k12, k13, k14, k15, k16, k17,          k18, k19, k110, k111, k112, k113, k114, \
+  k21, k22, k23, k24, k25, k26, k27,          k28, k29, k210, k211, k212, k213, k214, \
+  k31, k32, k33, k34, k35, k36, k37,          k38, k39, k310, k311, k312, k313, k314, \
+  k41, k42, k43, k44, k45, k46, k47,          k48, k49, k410, k411, k412, k413, k414, \
+       k52, k53, k54, k55, k56, k57,   k51,   k58, k59, k510, k511, k512, k513       \
+) \
+{ \
+  { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 , KC_NO, KC_NO, KC_NO,}, \
+  { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 , KC_NO, KC_NO, KC_NO,}, \
+  { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 , KC_NO, KC_NO, KC_NO,}, \
+  { k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412, k413, k414 , KC_NO, KC_NO, KC_NO,}, \
+  { k51, k52, k53, k54, k55, k56, k57, k58, k59, k510, k511, k512, k513, KC_NO, KC_NO, KC_NO, KC_NO} \
+}
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
new file mode 100644
index 0000000000..6c814eb373
--- /dev/null
+++ b/keyboards/boardrun/classic/config.h
@@ -0,0 +1,83 @@
+/*
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xCDCD
+#define PRODUCT_ID      0x5338
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    shensmobile
+#define PRODUCT         Boardrun Classic
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
+#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, B2, B1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+// #define BACKLIGHT_PIN F5
+// #define BACKLIGHT_LEVELS 6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 10
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+// ws2812 options
+#define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
+#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLED_NUM 14 // number of LEDs
+#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
+#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
+#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json
new file mode 100644
index 0000000000..a37e6ece92
--- /dev/null
+++ b/keyboards/boardrun/classic/info.json
@@ -0,0 +1,89 @@
+{
+    "keyboard_name": "Boardrun Classic",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/boardrun/classic",
+    "maintainer": "QMK Community",
+    "manufacturer": "shensmobile",
+    "width": 16.5,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_classic": {
+            "layout": [
+                {"y":0, "x":0,   "label":"Esc", "w":1.5},   
+                {"y":0, "x":1.5, "label":"1"},    
+                {"y":0, "x":2.5, "label":"2"},      
+                {"y":0, "x":3.5, "label":"3"}, 
+                {"y":0, "x":4.5, "label":"4"},          
+                {"y":0, "x":5.5, "label":"5"},        
+                {"y":0, "x":6.5, "label":"-"},
+                {"y":0, "x":9,   "label":"="},        
+                {"y":0, "x":10,  "label":"6"},
+                {"y":0, "x":11,  "label":"7"},
+                {"y":0, "x":12,  "label":"8"},
+                {"y":0, "x":13,  "label":"9"},
+                {"y":0, "x":14,  "label":"0"},
+                {"y":0, "x":15,  "label":"Backspace", "w":1.5},
+                
+                {"y":1, "x":0,   "label":"Tab", "w":1.5},
+                {"y":1, "x":1.5, "label":"Q"},    
+                {"y":1, "x":2.5, "label":"W"},      
+                {"y":1, "x":3.5, "label":"E"}, 
+                {"y":1, "x":4.5, "label":"R"},          
+                {"y":1, "x":5.5, "label":"T"},        
+                {"y":1, "x":6.5, "label":"["},
+                {"y":1, "x":9,   "label":"]"},        
+                {"y":1, "x":10,  "label":"Y"},
+                {"y":1, "x":11,  "label":"U"},
+                {"y":1, "x":12,  "label":"I"},
+                {"y":1, "x":13,  "label":"O"},
+                {"y":1, "x":14,  "label":"P"},
+                {"y":1, "x":15,  "label":"\\",    "w":1.5},
+                
+                {"y":2, "x":0,   "label":"LCtrl", "w":1.5},
+                {"y":2, "x":1.5, "label":"A"},    
+                {"y":2, "x":2.5, "label":"S"},      
+                {"y":2, "x":3.5, "label":"D"}, 
+                {"y":2, "x":4.5, "label":"F"},          
+                {"y":2, "x":5.5, "label":"G"},        
+                {"y":2, "x":6.5, "label":"Home"},
+                {"y":2, "x":9,   "label":"PgUp"},        
+                {"y":2, "x":10,  "label":"H"},
+                {"y":2, "x":11,  "label":"J"},
+                {"y":2, "x":12,  "label":"K"},
+                {"y":2, "x":13,  "label":"L"},
+                {"y":2, "x":14,  "label":";"},
+                {"y":2, "x":15,  "label":"'", "w":1.5},
+                
+                {"y":3, "x":0,   "label":"LShift", "w":1.5},
+                {"y":3, "x":1.5, "label":"Z"},    
+                {"y":3, "x":2.5, "label":"X"},      
+                {"y":3, "x":3.5, "label":"C"}, 
+                {"y":3, "x":4.5, "label":"V"},          
+                {"y":3, "x":5.5, "label":"B"},        
+                {"y":3, "x":6.5, "label":"End"},
+                {"y":3, "x":9,   "label":"PgDn"},        
+                {"y":3, "x":10,  "label":"N"},
+                {"y":3, "x":11,  "label":"M"},
+                {"y":3, "x":12,  "label":","},
+                {"y":3, "x":13,  "label":"."},
+                {"y":3, "x":14,  "label":"/"},
+                {"y":3, "x":15,  "label":"RShift / Enter", "w":1.5},
+                
+                {"y":4, "x":1.5, "label":"LGui"},    
+                {"y":4, "x":2.5, "label":"Del"},      
+                {"y":4, "x":3.5, "label":"`"}, 
+                {"y":4, "x":4.5, "label":"LAlt"},          
+                {"y":4, "x":5.5, "label":"Space"},        
+                {"y":4, "x":6.5, "label":"Space"},
+                {"y":4, "x":7.75,"label":"Fn"},
+                {"y":4, "x":9,   "label":"Space / AltGr"},        
+                {"y":4, "x":10,  "label":"Space / AltGr"},
+                {"y":4, "x":11,  "label":"Left"},
+                {"y":4, "x":12,  "label":"Down"},
+                {"y":4, "x":13,  "label":"Up"},
+                {"y":4, "x":14,  "label":"Right"}
+
+            ]
+        }
+    }
+
+}
diff --git a/keyboards/boardrun/classic/keymaps/default/keymap.c b/keyboards/boardrun/classic/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6076999219
--- /dev/null
+++ b/keyboards/boardrun/classic/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+/*
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define _FUNC       MO(_FNCLASSIC)
+#define _SHENT      RSFT_T(KC_ENT)
+#define _LSNUBS     LSFT_T(KC_NUBS)
+#define _AGRSPC     RALT_T(KC_SPC)
+
+
+// Layer shorthand
+enum layer_names {
+    _CLASSIC,
+    _FNCLASSIC,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Base Layer
+     * .--------------------------------------------------------------.        .--------------------------------------------------------------.
+     * | ESC    | 1      | 2      | 3      | 4      | 5      | -      |        | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | TAB    | Q      | W      | E      | R      | T      | [      |        | ]      | Y      | U      | I      | O      | P      | |\     |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | LCTRL  | A      | S      | D      | F      | G      | HOME   |        | PG UP  | H      | J      | K      | L      | ;      | '      |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | LSHIFT | Z      | X      | C      | V      | B      | END    |        | PG DN  | N      | M      | ,      | .      | /      | SH/ENT |
+     * '--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
+     *          | LGUI   | DEL    | ~`     | LALT   | SPACE  |        | FN     | SPACE  |        | LEFT   | DOWN   | UP     | RIGHT  |
+     *          '--------------------------------------------------------------------------------------------------------------------'
+     */
+    [_CLASSIC] = LAYOUT_classic(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,           KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,           KC_RBRC, KC_Y,	   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,           KC_PGUP, KC_H,	   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,            KC_PGDN, KC_N,	   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _SHENT,
+                 KC_LGUI, KC_DEL,  KC_GRV,  KC_LALT, KC_SPC,  KC_SPC,  _FUNC,    _AGRSPC, _AGRSPC, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+    /* Function Layer
+	 * .--------------------------------------------------------------.        .--------------------------------------------------------------.
+     * | RESET  | F1     | F2     | F3     | F4     | F5     | F11    |        | F12    | F6     | F7     | F8     | F9     | F10    | DEL    |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * |        |        | MENU   |        | RESET  |        |        |        |        |        |        | INS    |        | PRT SC |        |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * | CAPSLK |        | SCROLL |        |        |        |        |        |        |        |        |        |        |        | RCTL   |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * | UK \|  |        |        |        |        | PAUSE  |        |        |        |        | MUTE   | VOL DN | VOL UP |        |        |
+     * '--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------+--------+--------+--------'
+     *          | RGUI   |        |        | RALT   |                 |        |                 |        |        |        |        |
+     *          '--------------------------------------------------------------------------------------------------------------------'
+     */
+    [_FNCLASSIC] = LAYOUT_classic(
+        RESET,    KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,           KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+        _______, _______, KC_APP,  _______, RESET,   _______, _______,          _______, _______, _______, KC_INS,  _______, KC_PSCR, _______,
+        KC_CAPS, _______, KC_SLCK, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, KC_RCTL,
+        _LSNUBS, _______, _______, _______, _______, KC_PAUS, _______,          _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+                 KC_RGUI, _______, _______, KC_RALT, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/boardrun/classic/keymaps/via/keymap.c b/keyboards/boardrun/classic/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0b0d953848
--- /dev/null
+++ b/keyboards/boardrun/classic/keymaps/via/keymap.c
@@ -0,0 +1,77 @@
+/*
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Base Layer
+     * .--------------------------------------------------------------.        .--------------------------------------------------------------.
+     * | ESC    | 1      | 2      | 3      | 4      | 5      | -      |        | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | TAB    | Q      | W      | E      | R      | T      | [      |        | ]      | Y      | U      | I      | O      | P      | |\     |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | LCTRL  | A      | S      | D      | F      | G      | HOME   |        | PG UP  | H      | J      | K      | L      | ;      | '      |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | LSHIFT | Z      | X      | C      | V      | B      | END    |        | PG DN  | N      | M      | ,      | .      | /      | ENTER  |
+     * '--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------'
+     *          | LGUI   | DEL    | ~`     | LALT   | SPACE  |        | MO     | SPACE  |        | LEFT   | DOWN   | UP     | RIGHT  |
+     *          '--------------------------------------------------------------------------------------------------------------------'
+     */
+    [0] = LAYOUT_classic(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,           KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,           KC_RBRC, KC_Y,	   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,           KC_PGUP, KC_H,	   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,            KC_PGDN, KC_N,	   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+                 KC_LGUI, KC_DEL,  KC_GRV,  KC_LALT, KC_SPC,  KC_SPC,  MO(1),    KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+    /* Function Layer
+	 * .--------------------------------------------------------------.        .--------------------------------------------------------------.
+     * |        | F1     | F2     | F3     | F4     | F5     |        |        |        | F6     | F7     | F8     | F9     | F10    | F11    |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * |        |        |        |        |        |        |        |        |        |        |        |        |        | PRT SC | F12    |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * |        |        |        |        |        |        |        |        |        |        |        |        |        |        | RESET  |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * |        |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP |        |        |
+     * '--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------+--------+--------+-------'
+     *          |        |        |        |        |                 |        |                 |        |        |        |        |
+     *          '--------------------------------------------------------------------------------------------------------------------'
+     */
+    [1] = LAYOUT_classic(
+        _______,  KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,          _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+        _______, _______, KC_APP,  _______, _______, _______, _______,          _______, _______, _______, _______, _______, KC_PSCR, KC_F12,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    [2] = LAYOUT_classic(
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_classic(
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/boardrun/classic/keymaps/via/rules.mk b/keyboards/boardrun/classic/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/boardrun/classic/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/boardrun/classic/readme.md b/keyboards/boardrun/classic/readme.md
new file mode 100644
index 0000000000..2ed4ff1bd0
--- /dev/null
+++ b/keyboards/boardrun/classic/readme.md
@@ -0,0 +1,23 @@
+# Boardrun Classic
+
+![Boardrun Classic](https://i.imgur.com/Efo0ItKl.jpg)
+
+The Boardrun is a family of ortholinear keyboards with columnar stagger, inspired by the Alice layout. The Classic is a 60% layout that uses Ergodox keycap sets for compatibility, whereas the Bizarre is a 65% layout that uses standard (staggered) keycap sets in an ortholinear arrangement.
+
+The Boardrun is an evolution of the Boardwalk layout. The Boardwalk proved that the Ergodox keycap set could be adapted to more keyboards that provided a more compact design and layout flexibility. While adaptation was a design goal of the Boardwalk layout, the Boardrun was designed to distill and refine the best aspects of the current state of keyboard layouts, taking into account current trends in staggered design, the Ergodox keycap layout, and the Boardwalk's most popular layouts. To that end, a columnar staggered, ortholinear layout with alpha rotation was settled on, using the "HHKB" layout from the Boardwalk. The result is two layouts that are comfortable, familiar, and have great compatibility with keysets.
+
+-   Keyboard Maintainer: QMK Community
+-   Hardware Supported: Boardrun Classic Ortholinear PCB
+-   Hardware Availability: mkultra.click
+
+Make example for this keyboard (after setting up your build environment):
+
+    make boardrun/classic:default
+
+Flashing example for this keyboard:
+    
+    make boardrun/classic:default:flash
+
+The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured RESET shortcut (which may vary depending on when the PCB was flashed).
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/boardrun/classic/rules.mk b/keyboards/boardrun/classic/rules.mk
new file mode 100644
index 0000000000..065bd54034
--- /dev/null
+++ b/keyboards/boardrun/classic/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = no         # Unicode