[Keyboard] Move Keebio boards to own folder (#5109)

* Move boards into keebio folder

* Rename keymap

* Update BDN9 files

* Update BFO-9000 files

* Update Chocopad files

* Update Dilly files

* Update Fourier files, collapse rev1 into main

* Update Iris files

* Update Laplace files

* Update Levinson files, fix buswerks keymap

* Update Nyquist files

* Fix keymap issues

* Update Quefrency files

* Update Rorschach files

* Update TF68 files

* Update Viterbi files

* Update Viterbi files

* Update Wavelet files

* Reformat default layout

* Fix up default folder for Iris

* Remove already defined aliases

444 files changed, 604 insertions, 544 deletions

diff --git a/keyboards/bfo9000/keymaps/default/config.h b/keyboards/bfo9000/keymaps/default/config.h
deleted file mode 100644
index 6b31e8d14e..0000000000
--- a/keyboards/bfo9000/keymaps/default/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "config_common.h"
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#endif
diff --git a/keyboards/dilly/keymaps/default/config.h b/keyboards/dilly/keymaps/default/config.h
deleted file mode 100644
index 7fa3bf328e..0000000000
--- a/keyboards/dilly/keymaps/default/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#endif
diff --git a/keyboards/fourier/rev1/rev1.c b/keyboards/fourier/rev1/rev1.c
deleted file mode 100644
index 1e662e7b8d..0000000000
--- a/keyboards/fourier/rev1/rev1.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "fourier.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
diff --git a/keyboards/fourier/rev1/rev1.h b/keyboards/fourier/rev1/rev1.h
deleted file mode 100644
index ac889462b3..0000000000
--- a/keyboards/fourier/rev1/rev1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "fourier.h"
-#include "quantum.h"
-
-#define LAYOUT( \
-	LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
-	LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5,      RB7, \
-	LC1, LC2, LC3, LC4, LC5, LC6, RC1,      RC3, RC4, RC5, RC6, RC7, \
-	LD1, LD2, LD3, LD4, LD5,      RD1,           RD4, RD5, RD6, RD7 \
-	) \
-	{ \
-		{ LA1, LA2, LA3, LA4, LA5, LA6, KC_NO}, \
-		{ LB1, LB2, LB3, LB4, LB5, LB6, KC_NO}, \
-		{ LC1, LC2, LC3, LC4, LC5, LC6, KC_NO}, \
-		{ LD1, LD2, LD3, LD4, LD5, KC_NO, KC_NO}, \
-		{ RA1, RA2, RA3, RA4, RA5, RA6, RA7}, \
-		{ RB1, RB2, RB3, RB4, RB5, KC_NO, RB7}, \
-		{ RC1, KC_NO, RC3, RC4, RC5, RC6, RC7}, \
-		{ RD1, KC_NO, KC_NO, RD4, RD5, RD6, RD7} \
-	}
diff --git a/keyboards/bdn9/bdn9.c b/keyboards/keebio/bdn9/bdn9.c
index 0ff55fd6d4..0ff55fd6d4 100644
--- a/keyboards/bdn9/bdn9.c
+++ b/keyboards/keebio/bdn9/bdn9.c
diff --git a/keyboards/bdn9/bdn9.h b/keyboards/keebio/bdn9/bdn9.h
index 26b0435605..26b0435605 100644
--- a/keyboards/bdn9/bdn9.h
+++ b/keyboards/keebio/bdn9/bdn9.h
diff --git a/keyboards/bdn9/config.h b/keyboards/keebio/bdn9/config.h
index 1d00623752..23b92b6cee 100644
--- a/keyboards/bdn9/config.h
+++ b/keyboards/keebio/bdn9/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 9
 
 /* Keyboard Matrix Assignments */
-#define NO_PIN (~0)
 #define MATRIX_ROW_PINS { NO_PIN }
 #define MATRIX_COL_PINS { D2, D4, F4, D7, B1, B3, E6, B4, B2 }
 
diff --git a/keyboards/bdn9/info.json b/keyboards/keebio/bdn9/info.json
index a985a05e04..a985a05e04 100644
--- a/keyboards/bdn9/info.json
+++ b/keyboards/keebio/bdn9/info.json
diff --git a/keyboards/bdn9/keymaps/default/keymap.c b/keyboards/keebio/bdn9/keymaps/default/keymap.c
index 3bab86ae54..3bab86ae54 100644
--- a/keyboards/bdn9/keymaps/default/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/default/keymap.c
diff --git a/keyboards/bdn9/readme.md b/keyboards/keebio/bdn9/readme.md
index c9d5ed0b35..ddbe7f144b 100644
--- a/keyboards/bdn9/readme.md
+++ b/keyboards/keebio/bdn9/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [Keebio - BDN9](https://keeb.io/products/bdn9-3x3-9-key-m
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bdn9:default
+    make keebio/bdn9:default
 
 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/bdn9/rules.mk b/keyboards/keebio/bdn9/rules.mk
index 3ab8491089..3ab8491089 100644
--- a/keyboards/bdn9/rules.mk
+++ b/keyboards/keebio/bdn9/rules.mk
diff --git a/keyboards/bfo9000/bfo9000.c b/keyboards/keebio/bfo9000/bfo9000.c
index 2ae778e32b..2ae778e32b 100644
--- a/keyboards/bfo9000/bfo9000.c
+++ b/keyboards/keebio/bfo9000/bfo9000.c
diff --git a/keyboards/bfo9000/bfo9000.h b/keyboards/keebio/bfo9000/bfo9000.h
index c3bd2236ce..c3bd2236ce 100644
--- a/keyboards/bfo9000/bfo9000.h
+++ b/keyboards/keebio/bfo9000/bfo9000.h
diff --git a/keyboards/bfo9000/config.h b/keyboards/keebio/bfo9000/config.h
index 8098428d66..5dc2bd4343 100644
--- a/keyboards/bfo9000/config.h
+++ b/keyboards/keebio/bfo9000/config.h
@@ -16,13 +16,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x1169
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    Keebio
@@ -48,7 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B4
-
 #define RGBLED_NUM 20    // Number of LEDs
 
 /*
@@ -68,5 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/bfo9000/i2c.c b/keyboards/keebio/bfo9000/i2c.c
index 084c890c40..084c890c40 100644
--- a/keyboards/bfo9000/i2c.c
+++ b/keyboards/keebio/bfo9000/i2c.c
diff --git a/keyboards/bfo9000/i2c.h b/keyboards/keebio/bfo9000/i2c.h
index c15b6bc506..c15b6bc506 100644
--- a/keyboards/bfo9000/i2c.h
+++ b/keyboards/keebio/bfo9000/i2c.h
diff --git a/keyboards/bfo9000/keymaps/andylikescandy6x18/config.h b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
index be57e385ef..be57e385ef 100644
--- a/keyboards/bfo9000/keymaps/andylikescandy6x18/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
diff --git a/keyboards/bfo9000/keymaps/andylikescandy6x18/keymap.c b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c
index 24208e2a89..0aa1e780a7 100644
--- a/keyboards/bfo9000/keymaps/andylikescandy6x18/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c
@@ -9,11 +9,6 @@
 #define _RAISE 2
 #define _NAVIGATION 3
 
-
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 //Switch Layouts
 #define SWBASE M(_BASE)
 #define SWQWERTY M(_QWERTY)
diff --git a/keyboards/keebio/bfo9000/keymaps/default/config.h b/keyboards/keebio/bfo9000/keymaps/default/config.h
new file mode 100644
index 0000000000..a9ae679110
--- /dev/null
+++ b/keyboards/keebio/bfo9000/keymaps/default/config.h
@@ -0,0 +1,27 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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
+
+// #define USE_I2C
+
+/* Select hand configuration */
+// #define MASTER_RIGHT
+// #define EE_HANDS
diff --git a/keyboards/bfo9000/keymaps/default/keymap.c b/keyboards/keebio/bfo9000/keymaps/default/keymap.c
index 5de5e123e5..956e7b9efa 100644
--- a/keyboards/bfo9000/keymaps/default/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/default/keymap.c
@@ -2,10 +2,6 @@
 
 #define _BASE 0
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_BASE] = LAYOUT( \
diff --git a/keyboards/bfo9000/matrix.c b/keyboards/keebio/bfo9000/matrix.c
index 2ca5f4d87a..2ca5f4d87a 100644
--- a/keyboards/bfo9000/matrix.c
+++ b/keyboards/keebio/bfo9000/matrix.c
diff --git a/keyboards/bfo9000/readme.md b/keyboards/keebio/bfo9000/readme.md
index d2175af236..059f2800a2 100644
--- a/keyboards/bfo9000/readme.md
+++ b/keyboards/keebio/bfo9000/readme.md
@@ -9,10 +9,10 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bfo9000:default
+    make keebio/bfo9000:default
 
 Example of flashing this keyboard:
 
-    make bfo9000:default:avrdude
+    make keebio/bfo9000:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/bfo9000/rules.mk b/keyboards/keebio/bfo9000/rules.mk
index d11f9a54e7..d11f9a54e7 100644
--- a/keyboards/bfo9000/rules.mk
+++ b/keyboards/keebio/bfo9000/rules.mk
diff --git a/keyboards/bfo9000/serial.c b/keyboards/keebio/bfo9000/serial.c
index fea57b6510..fea57b6510 100644
--- a/keyboards/bfo9000/serial.c
+++ b/keyboards/keebio/bfo9000/serial.c
diff --git a/keyboards/bfo9000/serial.h b/keyboards/keebio/bfo9000/serial.h
index 6276194572..6276194572 100644
--- a/keyboards/bfo9000/serial.h
+++ b/keyboards/keebio/bfo9000/serial.h
diff --git a/keyboards/bfo9000/split_util.c b/keyboards/keebio/bfo9000/split_util.c
index 7f200e6c94..7f200e6c94 100644
--- a/keyboards/bfo9000/split_util.c
+++ b/keyboards/keebio/bfo9000/split_util.c
diff --git a/keyboards/bfo9000/split_util.h b/keyboards/keebio/bfo9000/split_util.h
index 595a0659e1..595a0659e1 100644
--- a/keyboards/bfo9000/split_util.h
+++ b/keyboards/keebio/bfo9000/split_util.h
diff --git a/keyboards/chocopad/README.md b/keyboards/keebio/chocopad/README.md
index ae28009c3c..3cdb3b3b9c 100644
--- a/keyboards/chocopad/README.md
+++ b/keyboards/keebio/chocopad/README.md
@@ -9,6 +9,6 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make chocopad:default
+    make keebio/chocopad:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/chocopad/chocopad.c b/keyboards/keebio/chocopad/chocopad.c
index f54753af50..f54753af50 100644
--- a/keyboards/chocopad/chocopad.c
+++ b/keyboards/keebio/chocopad/chocopad.c
diff --git a/keyboards/chocopad/chocopad.h b/keyboards/keebio/chocopad/chocopad.h
index ec73b1465b..d37aefc57e 100644
--- a/keyboards/chocopad/chocopad.h
+++ b/keyboards/keebio/chocopad/chocopad.h
@@ -1,5 +1,4 @@
-#ifndef CHOCOPAD_H
-#define CHOCOPAD_H
+#pragma once
 
 #include "quantum.h"
 
@@ -28,5 +27,3 @@
         KC_##C1, KC_##C2, KC_##C3, KC_##C4, \
         KC_##D1, KC_##D2, KC_##D3, KC_##D4 \
     )
-
-#endif
diff --git a/keyboards/chocopad/config.h b/keyboards/keebio/chocopad/config.h
index 62596a2ed7..fb00ae70ac 100644
--- a/keyboards/chocopad/config.h
+++ b/keyboards/keebio/chocopad/config.h
@@ -4,7 +4,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x1144
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    Keebio
@@ -42,7 +42,6 @@
 #define RGBLIGHT_VAL_STEP 8
 #endif
 #define RGB_DI_PIN D3
-
 #define RGBLED_NUM 4
 
 #endif
diff --git a/keyboards/chocopad/info.json b/keyboards/keebio/chocopad/info.json
index c5a7d42bbc..c5a7d42bbc 100644
--- a/keyboards/chocopad/info.json
+++ b/keyboards/keebio/chocopad/info.json
diff --git a/keyboards/chocopad/keymaps/default/config.h b/keyboards/keebio/chocopad/keymaps/default/config.h
index 7fa3bf328e..7fa3bf328e 100644
--- a/keyboards/chocopad/keymaps/default/config.h
+++ b/keyboards/keebio/chocopad/keymaps/default/config.h
diff --git a/keyboards/chocopad/keymaps/default/keymap.c b/keyboards/keebio/chocopad/keymaps/default/keymap.c
index df22e8b1fb..7b4b752c9c 100644
--- a/keyboards/chocopad/keymaps/default/keymap.c
+++ b/keyboards/keebio/chocopad/keymaps/default/keymap.c
@@ -4,8 +4,6 @@
 #define _FN1 1
 #define _FN2 2
 
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_ortho_4x4(
diff --git a/keyboards/chocopad/keymaps/default/rules.mk b/keyboards/keebio/chocopad/keymaps/default/rules.mk
index a81250cdf6..a81250cdf6 100644
--- a/keyboards/chocopad/keymaps/default/rules.mk
+++ b/keyboards/keebio/chocopad/keymaps/default/rules.mk
diff --git a/keyboards/chocopad/keymaps/khord/config.h b/keyboards/keebio/chocopad/keymaps/khord/config.h
index 7fa3bf328e..7fa3bf328e 100644
--- a/keyboards/chocopad/keymaps/khord/config.h
+++ b/keyboards/keebio/chocopad/keymaps/khord/config.h
diff --git a/keyboards/chocopad/keymaps/khord/keymap.c b/keyboards/keebio/chocopad/keymaps/khord/keymap.c
index ea36c6f640..2c871c4e82 100644
--- a/keyboards/chocopad/keymaps/khord/keymap.c
+++ b/keyboards/keebio/chocopad/keymaps/khord/keymap.c
@@ -35,7 +35,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_BASE] = KC_KEYMAP(
+  [_BASE] = LAYOUT_kc(
   //,----+----+----+----.
       P7 , P8 , P9 ,BSPC,
   //|----+----+----+----|
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----'
   ),
 
-  [_FN1] = KC_KEYMAP(
+  [_FN1] = LAYOUT_kc(
   //,----+----+----+----.
      ESC ,MAC1,MAC2,DEL ,
   //|----+----+----+----|
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----'
   ),
 
-  [_FN2] = KC_KEYMAP(
+  [_FN2] = LAYOUT_kc(
   //,----+----+----+----.
      RST , XX , XX , XX ,
   //|----+----+----+----|
diff --git a/keyboards/chocopad/keymaps/khord/rules.mk b/keyboards/keebio/chocopad/keymaps/khord/rules.mk
index a81250cdf6..a81250cdf6 100644
--- a/keyboards/chocopad/keymaps/khord/rules.mk
+++ b/keyboards/keebio/chocopad/keymaps/khord/rules.mk
diff --git a/keyboards/chocopad/rules.mk b/keyboards/keebio/chocopad/rules.mk
index 39ce38e100..39ce38e100 100644
--- a/keyboards/chocopad/rules.mk
+++ b/keyboards/keebio/chocopad/rules.mk
diff --git a/keyboards/dilly/README.md b/keyboards/keebio/dilly/README.md
index a676313f3e..74139eaeae 100644
--- a/keyboards/dilly/README.md
+++ b/keyboards/keebio/dilly/README.md
@@ -9,6 +9,6 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make dilly:default
+    make keebio/dilly:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/dilly/config.h b/keyboards/keebio/dilly/config.h
index 1489ec3029..1489ec3029 100644
--- a/keyboards/dilly/config.h
+++ b/keyboards/keebio/dilly/config.h
diff --git a/keyboards/dilly/dilly.c b/keyboards/keebio/dilly/dilly.c
index 89affe8509..89affe8509 100644
--- a/keyboards/dilly/dilly.c
+++ b/keyboards/keebio/dilly/dilly.c
diff --git a/keyboards/dilly/dilly.h b/keyboards/keebio/dilly/dilly.h
index c7cc4aa725..c7cc4aa725 100644
--- a/keyboards/dilly/dilly.h
+++ b/keyboards/keebio/dilly/dilly.h
diff --git a/keyboards/dilly/info.json b/keyboards/keebio/dilly/info.json
index 6b67d45b93..6b67d45b93 100644
--- a/keyboards/dilly/info.json
+++ b/keyboards/keebio/dilly/info.json
diff --git a/keyboards/keebio/dilly/keymaps/bakingpy/config.h b/keyboards/keebio/dilly/keymaps/bakingpy/config.h
new file mode 100644
index 0000000000..d141283ea4
--- /dev/null
+++ b/keyboards/keebio/dilly/keymaps/bakingpy/config.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define TAPPING_TERM 150
diff --git a/keyboards/keebio/dilly/keymaps/bakingpy/keymap.c b/keyboards/keebio/dilly/keymaps/bakingpy/keymap.c
new file mode 100644
index 0000000000..7b52d5ff74
--- /dev/null
+++ b/keyboards/keebio/dilly/keymaps/bakingpy/keymap.c
@@ -0,0 +1,106 @@
+#include QMK_KEYBOARD_H
+
+extern keymap_config_t keymap_config;
+
+#define _BASE 0
+#define _FN1 1
+#define _FN2 2
+#define _FN3 3
+#define _FN4 4
+#define _FN5 5
+
+#define KC_ KC_TRNS
+
+// Tap-Hold keys
+#define KC_ASFT MT(MOD_LSFT, KC_A)
+#define KC_F_L3 LT(_FN3, KC_F)
+#define KC_ZCTL MT(MOD_LCTL, KC_Z)
+#define KC_XALT MT(MOD_LALT, KC_X)
+#define KC_CGUI MT(MOD_LGUI, KC_C)
+#define KC_V_L4 LT(_FN4, KC_V)
+#define KC_SPL2 LT(_FN2, KC_SPC)
+#define KC_B_L1 LT(_FN1, KC_B)
+#define KC_N_L5 LT(_FN5, KC_N)
+#define KC_MALT MT(MOD_RALT, KC_M)
+#define KC_BSCT MT(MOD_RCTL, KC_BSPC)
+#define KC_ENTS MT(MOD_RSFT, KC_ENT)
+#define KC_ESCS MT(MOD_RSFT, KC_ESC)
+#define KC_SCNS MT(MOD_RSFT, KC_SCLN)
+
+#define KC_GUIC LGUI(KC_C)
+
+#define KC_RST RESET
+#define KC_BL_S BL_STEP
+#define KC_DBUG DEBUG
+#define KC_RTOG RGB_TOG
+#define KC_RMOD RGB_MOD
+#define KC_RHUI RGB_HUI
+#define KC_RHUD RGB_HUD
+#define KC_RSAI RGB_SAI
+#define KC_RSAD RGB_SAD
+#define KC_RVAI RGB_VAI
+#define KC_RVAD RGB_VAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+      Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  ,
+  //|----+----+----+----+----+----+----+----+----+----|
+     ASFT, S  , D  ,F_L3, G  , H  , J  , K  , L  ,ESCS,
+  //|----+----+----+----+----+----+----+----+----+----|
+     ZCTL,XALT,CGUI,V_L4,SPL2,B_L1,N_L5,MALT,BSCT,ENTS
+  //`----+----+----+----+----+----+----+----+----+----'
+  ),
+
+  [_FN1] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+     EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,
+  //|----+----+----+----+----+----+----+----+----+----|
+      F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,
+  //|----+----+----+----+----+----+----+----+----+----|
+         ,    ,    ,    ,BSPC,    ,    ,    ,    ,
+  //`----+----+----+----+----+----+----+----+----+----'
+  ),
+
+  [_FN2] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+      1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,
+  //|----+----+----+----+----+----+----+----+----+----|
+     F11 ,F12 ,    ,    ,    ,LEFT,DOWN, UP ,RGHT,GRV ,
+  //|----+----+----+----+----+----+----+----+----+----|
+         ,    ,    ,    ,    ,DEL ,    ,    ,    ,
+  //`----+----+----+----+----+----+----+----+----+----'
+  ),
+
+  [_FN3] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+         ,    ,    ,    ,    ,MINS,EQL ,LBRC,RBRC,BSLS,
+  //|----+----+----+----+----+----+----+----+----+----|
+     TAB ,    ,    ,    ,    ,COMM,DOT ,SLSH,SCLN,QUOT,
+  //|----+----+----+----+----+----+----+----+----+----|
+         ,    ,    ,    ,BSPC,    ,LEFT,DOWN, UP ,RGHT
+  //`----+----+----+----+----+----+----+----+----+----'
+  ),
+
+  [_FN4] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+         ,    ,    ,    ,    ,UNDS,PLUS,LCBR,RCBR,PIPE,
+  //|----+----+----+----+----+----+----+----+----+----|
+     TAB ,    ,    ,    ,    , LT , GT ,QUES,COLN,DQUO,
+  //|----+----+----+----+----+----+----+----+----+----|
+         ,    ,GUIC,    ,BSPC,    ,HOME,PGDN,PGUP,END
+  //`----+----+----+----+----+----+----+----+----+----'
+  ),
+
+  [_FN5] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+     RTOG,RMOD,    ,RST ,RHUI,RSAI,RVAI,    ,    ,    ,
+  //|----+----+----+----+----+----+----+----+----+----|
+         ,    ,DBUG,    ,RHUD,RSAD,RVAD,    ,    ,    ,
+  //|----+----+----+----+----+----+----+----+----+----|
+     BL_S,    ,GUIC,    ,    ,    ,    ,    ,    ,
+  //`----+----+----+----+----+----+----+----+----+----'
+  )
+
+};
diff --git a/keyboards/dilly/keymaps/default/rules.mk b/keyboards/keebio/dilly/keymaps/bakingpy/rules.mk
index 1e3cebb145..1e3cebb145 100644
--- a/keyboards/dilly/keymaps/default/rules.mk
+++ b/keyboards/keebio/dilly/keymaps/bakingpy/rules.mk
diff --git a/keyboards/keebio/dilly/keymaps/default/config.h b/keyboards/keebio/dilly/keymaps/default/config.h
new file mode 100644
index 0000000000..6f70f09bee
--- /dev/null
+++ b/keyboards/keebio/dilly/keymaps/default/config.h
@@ -0,0 +1 @@
+#pragma once
diff --git a/keyboards/dilly/keymaps/default/keymap.c b/keyboards/keebio/dilly/keymaps/default/keymap.c
index 03b539e3d8..dc92afbd0d 100644
--- a/keyboards/dilly/keymaps/default/keymap.c
+++ b/keyboards/keebio/dilly/keymaps/default/keymap.c
@@ -9,8 +9,6 @@ extern keymap_config_t keymap_config;
 #define _FN4 4
 #define _FN5 5
 
-#define _______ KC_TRNS
-
 // Tap-Hold keys
 #define KC_ASFT MT(MOD_LSFT, KC_A)
 #define KC_F_L3 LT(_FN3, KC_F)
diff --git a/keyboards/dilly/keymaps/delmo/rules.mk b/keyboards/keebio/dilly/keymaps/default/rules.mk
index 1e3cebb145..1e3cebb145 100644
--- a/keyboards/dilly/keymaps/delmo/rules.mk
+++ b/keyboards/keebio/dilly/keymaps/default/rules.mk
diff --git a/keyboards/dilly/keymaps/delmo/config.h b/keyboards/keebio/dilly/keymaps/delmo/config.h
index 4d704c17ef..4d704c17ef 100644
--- a/keyboards/dilly/keymaps/delmo/config.h
+++ b/keyboards/keebio/dilly/keymaps/delmo/config.h
diff --git a/keyboards/dilly/keymaps/delmo/keymap.c b/keyboards/keebio/dilly/keymaps/delmo/keymap.c
index d3e8c5daf2..9d6c900ff4 100644
--- a/keyboards/dilly/keymaps/delmo/keymap.c
+++ b/keyboards/keebio/dilly/keymaps/delmo/keymap.c
@@ -10,7 +10,6 @@ extern keymap_config_t keymap_config;
 #define _FN5 5
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 // Tap-Hold keys
 //#define KC_ASFT MT(MOD_LSFT, KC_A)
@@ -103,4 +102,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----+----+----+----+----+----+----'
   )
 
-};
\ No newline at end of file
+};
diff --git a/keyboards/nyquist/keymaps/default/rules.mk b/keyboards/keebio/dilly/keymaps/delmo/rules.mk
index 1e3cebb145..1e3cebb145 100644
--- a/keyboards/nyquist/keymaps/default/rules.mk
+++ b/keyboards/keebio/dilly/keymaps/delmo/rules.mk
diff --git a/keyboards/dilly/keymaps/pletcher/config.h b/keyboards/keebio/dilly/keymaps/pletcher/config.h
index 805bef4188..805bef4188 100644
--- a/keyboards/dilly/keymaps/pletcher/config.h
+++ b/keyboards/keebio/dilly/keymaps/pletcher/config.h
diff --git a/keyboards/dilly/keymaps/pletcher/keymap.c b/keyboards/keebio/dilly/keymaps/pletcher/keymap.c
index 4e7a5c89d2..8bad575d6b 100644
--- a/keyboards/dilly/keymaps/pletcher/keymap.c
+++ b/keyboards/keebio/dilly/keymaps/pletcher/keymap.c
@@ -10,7 +10,6 @@ extern keymap_config_t keymap_config;
 #define _FN5 5
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 // Tap-Hold keys
 #define KC_F_L3 LT(_FN3, KC_F)
diff --git a/keyboards/dilly/keymaps/pletcher/rules.mk b/keyboards/keebio/dilly/keymaps/pletcher/rules.mk
index 9b9dd8341b..9b9dd8341b 100644
--- a/keyboards/dilly/keymaps/pletcher/rules.mk
+++ b/keyboards/keebio/dilly/keymaps/pletcher/rules.mk
diff --git a/keyboards/dilly/rules.mk b/keyboards/keebio/dilly/rules.mk
index 812362567e..812362567e 100644
--- a/keyboards/dilly/rules.mk
+++ b/keyboards/keebio/dilly/rules.mk
diff --git a/keyboards/fourier/rev1/config.h b/keyboards/keebio/fourier/config.h
index 601d843e71..70967a13f6 100644
--- a/keyboards/fourier/rev1/config.h
+++ b/keyboards/keebio/fourier/config.h
@@ -18,6 +18,8 @@ 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       0xCB10
 #define PRODUCT_ID      0x1247
diff --git a/keyboards/fourier/fourier.c b/keyboards/keebio/fourier/fourier.c
index 1bd47f98bc..1bd47f98bc 100644
--- a/keyboards/fourier/fourier.c
+++ b/keyboards/keebio/fourier/fourier.c
diff --git a/keyboards/quefrency/quefrency.h b/keyboards/keebio/fourier/fourier.h
index 7a791230df..7505ad8b3e 100644
--- a/keyboards/quefrency/quefrency.h
+++ b/keyboards/keebio/fourier/fourier.h
@@ -1,12 +1,28 @@
-#ifndef QUEFRENCY_H
-#define QUEFRENCY_H
+#pragma once
 
-#include "quantum.h"
-
-#ifdef KEYBOARD_quefrency_rev1
+#ifdef KEYBOARD_fourier_rev1
     #include "rev1.h"
 #endif
 
+#include "quantum.h"
+
+#define LAYOUT( \
+    LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
+    LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5,      RB7, \
+    LC1, LC2, LC3, LC4, LC5, LC6, RC1,      RC3, RC4, RC5, RC6, RC7, \
+    LD1, LD2, LD3, LD4, LD5,      RD1,           RD4, RD5, RD6, RD7 \
+    ) \
+    { \
+        { LA1, LA2, LA3, LA4, LA5, LA6, KC_NO}, \
+        { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO}, \
+        { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO}, \
+        { LD1, LD2, LD3, LD4, LD5, KC_NO, KC_NO}, \
+        { RA1, RA2, RA3, RA4, RA5, RA6, RA7}, \
+        { RB1, RB2, RB3, RB4, RB5, KC_NO, RB7}, \
+        { RC1, KC_NO, RC3, RC4, RC5, RC6, RC7}, \
+        { RD1, KC_NO, KC_NO, RD4, RD5, RD6, RD7} \
+    }
+
 // Used to create a keymap using only KC_ prefixed keys
 #define LAYOUT_kc( \
     LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
@@ -20,4 +36,3 @@
         KC_##LC1, KC_##LC2, KC_##LC3, KC_##LC4, KC_##LC5, KC_##LC6, KC_##RC1,           KC_##RC3, KC_##RC4, KC_##RC5, KC_##RC6, KC_##RC7, \
         KC_##LD1, KC_##LD2, KC_##LD3, KC_##LD4, KC_##LD5,           KC_##RD1,                     KC_##RD4, KC_##RD5, KC_##RD6, KC_##RD7 \
     )
-#endif
diff --git a/keyboards/fourier/info.json b/keyboards/keebio/fourier/info.json
index b16476c4b9..b16476c4b9 100644
--- a/keyboards/fourier/info.json
+++ b/keyboards/keebio/fourier/info.json
diff --git a/keyboards/fourier/keymaps/default/config.h b/keyboards/keebio/fourier/keymaps/default/config.h
index 18f4c1f7ac..8cea392181 100644
--- a/keyboards/fourier/keymaps/default/config.h
+++ b/keyboards/keebio/fourier/keymaps/default/config.h
@@ -21,5 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* Use I2C or Serial, not both */
-#define USE_SERIAL
 // #define USE_I2C
diff --git a/keyboards/fourier/keymaps/default/keymap.c b/keyboards/keebio/fourier/keymaps/default/keymap.c
index a08f27b7ce..341bc99a7e 100644
--- a/keyboards/fourier/keymaps/default/keymap.c
+++ b/keyboards/keebio/fourier/keymaps/default/keymap.c
@@ -14,15 +14,15 @@ enum custom_keycodes {
 
 #define KC_FN1 MO(_FN1)
 #define KC_FN2 MO(_FN2)
-#define KC_SPFN1 LT(_FN1, KC_SPACE)
-#define KC_BSFN2 LT(_FN2, KC_BSPC)
+#define SPFN1 LT(_FN1, KC_SPACE)
+#define BSFN2 LT(_FN2, KC_BSPC)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,  KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT,          KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,             KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LGUI, KC_FN1,  KC_SPFN1,         KC_BSFN2,                  KC_RGUI, KC_RALT, KC_FN2,  KC_RCTL
+    KC_LCTL, KC_LALT, KC_LGUI, KC_FN1,  SPFN1,            BSFN2,                     KC_RGUI, KC_RALT, KC_FN2,  KC_RCTL
   ),
 
   [_FN1] = LAYOUT(
diff --git a/keyboards/fourier/keymaps/default/rules.mk b/keyboards/keebio/fourier/keymaps/default/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/fourier/keymaps/default/rules.mk
+++ b/keyboards/keebio/fourier/keymaps/default/rules.mk
diff --git a/keyboards/fourier/keymaps/jennetters/config.h b/keyboards/keebio/fourier/keymaps/jennetters/config.h
index 5f99c65ad5..5f99c65ad5 100644
--- a/keyboards/fourier/keymaps/jennetters/config.h
+++ b/keyboards/keebio/fourier/keymaps/jennetters/config.h
diff --git a/keyboards/fourier/keymaps/jennetters/keymap.c b/keyboards/keebio/fourier/keymaps/jennetters/keymap.c
index 5037d3ddf5..a6ec95e1e3 100644
--- a/keyboards/fourier/keymaps/jennetters/keymap.c
+++ b/keyboards/keebio/fourier/keymaps/jennetters/keymap.c
@@ -15,8 +15,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define KC_FN1 MO(_FN1)
 #define KC_FN2 MO(_FN2)
 #define KC_SPFN1 LT(_FN1, KC_SPACE)
@@ -53,7 +51,7 @@ enum {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT( 
+[_BASE] = LAYOUT(
  // ,----+----+----+----+----+----|----+----+----+----+----+----+----.
  // |ESC | Q1 | W2 | E3 | R4 | T5 | Y6 | U7 | I8 | O9 | P0 | -[ | =] |
  // |----`----`----`----`----`----|----`----`----`----`----`----`----|
@@ -63,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // |-------`----`----`----`----`----|----`----`----`----`----`------|
  // | CTL | SYS| ALT | SP    SPACE | SPACE  | FN1 | CTL  | \  | ENT  |
  // `-----+----+-----+----+--------|--------+-----+------+----+------'
- 
+
   TD(ESC_GR), TD(Q_1), TD(W_2), TD(E_3), TD(R_4), TD(T_5), TD(Y_6), TD(U_7), TD(I_8), TD(O_9), TD(P_0),TD(MIN_LB),TD(EQL_RB), \
   KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD(SCL_QUO), KC_BSPC, \
   KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, \
@@ -80,11 +78,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // |-------`----`----`----`----`----|----`----`----`----`----`------|
  // |     |    |     |    |        |        |     |      |    |      |
  // `-----+----+-----+----+--------|--------+-----+------+----+------'
- 
+
    , , UP, , , , , , , , , , , \
    , LEFT, DOWN, RIGHT, , , , , , , QUOT, DEL, \
    , , , , , , , , , , NUBS, , \
-   , , , , , , , , , 
+   , , , , , , , , ,
   ),
 
   [_FN2] = LAYOUT_kc(
@@ -101,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    , , , , , , , , , , , , , \
    , , , , , , , , , , , , \
    , , , , , , , , , , , , \
-   , , , , , , , , ,   
+   , , , , , , , , ,
   )
 
 };
@@ -145,4 +143,4 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 [EQL_RB]  = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_RBRC), //Tap once for =, twice for ]/}
 [SCL_QUO] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_QUOT) //Tap once for ;, '/"
 // Other declarations would go here, separated by commas, if you have them
-};
\ No newline at end of file
+};
diff --git a/keyboards/fourier/keymaps/jennetters/rules.mk b/keyboards/keebio/fourier/keymaps/jennetters/rules.mk
index 1ba2fa8fbe..1ba2fa8fbe 100644
--- a/keyboards/fourier/keymaps/jennetters/rules.mk
+++ b/keyboards/keebio/fourier/keymaps/jennetters/rules.mk
diff --git a/keyboards/fourier/keymaps/maxim/config.h b/keyboards/keebio/fourier/keymaps/maxim/config.h
index fb13b56cdc..fb13b56cdc 100644
--- a/keyboards/fourier/keymaps/maxim/config.h
+++ b/keyboards/keebio/fourier/keymaps/maxim/config.h
diff --git a/keyboards/fourier/keymaps/maxim/keymap.c b/keyboards/keebio/fourier/keymaps/maxim/keymap.c
index 68bd649ecc..68bd649ecc 100644
--- a/keyboards/fourier/keymaps/maxim/keymap.c
+++ b/keyboards/keebio/fourier/keymaps/maxim/keymap.c
diff --git a/keyboards/fourier/keymaps/valgrahf/config.h b/keyboards/keebio/fourier/keymaps/valgrahf/config.h
index 20e49c4219..20e49c4219 100644
--- a/keyboards/fourier/keymaps/valgrahf/config.h
+++ b/keyboards/keebio/fourier/keymaps/valgrahf/config.h
diff --git a/keyboards/fourier/keymaps/valgrahf/keymap.c b/keyboards/keebio/fourier/keymaps/valgrahf/keymap.c
index 4679d165c4..a31c884750 100644
--- a/keyboards/fourier/keymaps/valgrahf/keymap.c
+++ b/keyboards/keebio/fourier/keymaps/valgrahf/keymap.c
@@ -15,8 +15,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define KC_FN1 LT(_FN1, KC_NO)
 #define KC_FN2 LT(_FN2, KC_NO)
 #define KC_SPFN LT(_FN1, KC_SPACE)
diff --git a/keyboards/fourier/keymaps/valgrahf/rules.mk b/keyboards/keebio/fourier/keymaps/valgrahf/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/fourier/keymaps/valgrahf/rules.mk
+++ b/keyboards/keebio/fourier/keymaps/valgrahf/rules.mk
diff --git a/keyboards/fourier/keymaps/xyverz/config.h b/keyboards/keebio/fourier/keymaps/xyverz/config.h
index 9b46a61ccd..9b46a61ccd 100644
--- a/keyboards/fourier/keymaps/xyverz/config.h
+++ b/keyboards/keebio/fourier/keymaps/xyverz/config.h
diff --git a/keyboards/fourier/keymaps/xyverz/keymap.c b/keyboards/keebio/fourier/keymaps/xyverz/keymap.c
index 09aaa97f7d..4e864cdef7 100644
--- a/keyboards/fourier/keymaps/xyverz/keymap.c
+++ b/keyboards/keebio/fourier/keymaps/xyverz/keymap.c
@@ -17,8 +17,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define KC_FN1 MO(_FN1)
 #define KC_FN2 MO(_FN2)
 #define KC_ESFN1 LT(_FN1, KC_ESC)
@@ -46,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|-----`----`----`----`----`----|----`----`----`----`----`--------|
     LSFT   ,SCLN, Q  , J  , K  , X  , B  , M  , W  , V  , Z  , RSFT ,
  //|-------`----`----`----`----`----|----`----`----`----`----`------|
-    LCTL ,LALT,LGUI ,FN2 ,  BSPC  ,   SPC  , FN1 ,RGUI ,RALT , RCTL 
+    LCTL ,LALT,LGUI ,FN2 ,  BSPC  ,   SPC  , FN1 ,RGUI ,RALT , RCTL
  //`-----+----+-----+----+--------|--------+-----+-----+-----+------'
   ),
 
@@ -58,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|-----`----`----`----`----`----|----`----`----`----`----`--------|
     RMOD   ,RHUD,RSAD,RVAD,VOLD,LCBR,RCBR,    ,    ,    , UP ,      ,
  //|-------`----`----`----`----`----|----`----`----`----`----`------|
-    RTOG ,    ,     ,    ,   DEL  ,  INS   ,     ,LEFT ,DOWN , RGHT 
+    RTOG ,    ,     ,    ,   DEL  ,  INS   ,     ,LEFT ,DOWN , RGHT
  //`-----+----+-----+----+--------|--------+-----+-----+-----+------'
   ),
 
@@ -70,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|-----`----`----`----`----`----|----`----`----`----`----`--------|
            ,    ,    ,DEL ,PGDN,END , F7 , F8 , F9 ,F10 ,F11 , F12  ,
  //|-------`----`----`----`----`----|----`----`----`----`----`------|
-         ,    ,     ,    ,  DEL   ,  INS   ,     ,     ,     ,      
+         ,    ,     ,    ,  DEL   ,  INS   ,     ,     ,     ,
  //`-----+----+-----+----+--------|--------+-----+-----+-----+------'
   )
 
diff --git a/keyboards/fourier/readme.md b/keyboards/keebio/fourier/readme.md
index ca29c7aba6..c18d1a7484 100644
--- a/keyboards/fourier/readme.md
+++ b/keyboards/keebio/fourier/readme.md
@@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io/collections/frontpage/products/f
 
 Make example for this keyboard (after setting up your build environment):
 
-    make fourier/rev1:default
+    make keebio/fourier:default
 
 Example of flashing this keyboard:
 
-    make fourier/rev1:default:avrdude
+    make keebio/fourier:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/fourier/rules.mk b/keyboards/keebio/fourier/rules.mk
index 93935e02eb..9512c0f648 100644
--- a/keyboards/fourier/rules.mk
+++ b/keyboards/keebio/fourier/rules.mk
@@ -58,11 +58,8 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
-SUBPROJECT_rev1 = yes
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 SPLIT_KEYBOARD = yes
-
-DEFAULT_FOLDER = fourier/rev1
diff --git a/keyboards/iris/config.h b/keyboards/keebio/iris/config.h
index 863722d7d0..863722d7d0 100644
--- a/keyboards/iris/config.h
+++ b/keyboards/keebio/iris/config.h
diff --git a/keyboards/iris/info.json b/keyboards/keebio/iris/info.json
index f7b017b97a..f7b017b97a 100644
--- a/keyboards/iris/info.json
+++ b/keyboards/keebio/iris/info.json
diff --git a/keyboards/iris/iris.c b/keyboards/keebio/iris/iris.c
index fb28b3a6d6..fb28b3a6d6 100644
--- a/keyboards/iris/iris.c
+++ b/keyboards/keebio/iris/iris.c
diff --git a/keyboards/iris/iris.h b/keyboards/keebio/iris/iris.h
index 4212462c15..ec78efc220 100644
--- a/keyboards/iris/iris.h
+++ b/keyboards/keebio/iris/iris.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#ifdef KEYBOARD_iris_rev1
+#ifdef KEYBOARD_keebio_iris_rev1
     #include "rev1.h"
-#elif KEYBOARD_iris_rev1_led
+#elif KEYBOARD_keebio_iris_rev1_led
     #include "rev1_led.h"
-#elif KEYBOARD_iris_rev2
+#elif KEYBOARD_keebio_iris_rev2
     #include "rev2.h"
 #else
     #include "rev3.h"
diff --git a/keyboards/iris/keymaps/ave-63/config.h b/keyboards/keebio/iris/keymaps/ave-63/config.h
index 381a494b75..381a494b75 100644
--- a/keyboards/iris/keymaps/ave-63/config.h
+++ b/keyboards/keebio/iris/keymaps/ave-63/config.h
diff --git a/keyboards/iris/keymaps/ave-63/keymap.c b/keyboards/keebio/iris/keymaps/ave-63/keymap.c
index 3d393a71c7..3d393a71c7 100644
--- a/keyboards/iris/keymaps/ave-63/keymap.c
+++ b/keyboards/keebio/iris/keymaps/ave-63/keymap.c
diff --git a/keyboards/iris/keymaps/bmoorey/config.h b/keyboards/keebio/iris/keymaps/bmoorey/config.h
index 9f8a9afab8..9f8a9afab8 100644
--- a/keyboards/iris/keymaps/bmoorey/config.h
+++ b/keyboards/keebio/iris/keymaps/bmoorey/config.h
diff --git a/keyboards/iris/keymaps/bmoorey/keymap.c b/keyboards/keebio/iris/keymaps/bmoorey/keymap.c
index 9484ccb3f4..9484ccb3f4 100644
--- a/keyboards/iris/keymaps/bmoorey/keymap.c
+++ b/keyboards/keebio/iris/keymaps/bmoorey/keymap.c
diff --git a/keyboards/iris/keymaps/bmoorey/readme.md b/keyboards/keebio/iris/keymaps/bmoorey/readme.md
index 353f59449b..353f59449b 100644
--- a/keyboards/iris/keymaps/bmoorey/readme.md
+++ b/keyboards/keebio/iris/keymaps/bmoorey/readme.md
diff --git a/keyboards/iris/keymaps/bmoorey/rules.mk b/keyboards/keebio/iris/keymaps/bmoorey/rules.mk
index c9465948e5..c9465948e5 100644
--- a/keyboards/iris/keymaps/bmoorey/rules.mk
+++ b/keyboards/keebio/iris/keymaps/bmoorey/rules.mk
diff --git a/keyboards/iris/keymaps/broswen/config.h b/keyboards/keebio/iris/keymaps/broswen/config.h
index 19c47780db..19c47780db 100644
--- a/keyboards/iris/keymaps/broswen/config.h
+++ b/keyboards/keebio/iris/keymaps/broswen/config.h
diff --git a/keyboards/iris/keymaps/broswen/keymap.c b/keyboards/keebio/iris/keymaps/broswen/keymap.c
index 6d783142e4..a64b03f571 100644
--- a/keyboards/iris/keymaps/broswen/keymap.c
+++ b/keyboards/keebio/iris/keymaps/broswen/keymap.c
@@ -16,7 +16,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
@@ -51,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
          , GRV,BSLS,UNDS, EQL,    ,    ,         ,    ,    ,    ,    ,    ,    ,
   //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    , 
+                           ,    ,    ,             ,    ,
   //                  `----+----+----'        `----+----+----'
   ),
 
diff --git a/keyboards/iris/keymaps/broswen/rules.mk b/keyboards/keebio/iris/keymaps/broswen/rules.mk
index 14fa112898..14fa112898 100644
--- a/keyboards/iris/keymaps/broswen/rules.mk
+++ b/keyboards/keebio/iris/keymaps/broswen/rules.mk
diff --git a/keyboards/iris/keymaps/davidrambo/config.h b/keyboards/keebio/iris/keymaps/davidrambo/config.h
index 2cdff4213b..2cdff4213b 100644
--- a/keyboards/iris/keymaps/davidrambo/config.h
+++ b/keyboards/keebio/iris/keymaps/davidrambo/config.h
diff --git a/keyboards/iris/keymaps/davidrambo/keymap.c b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
index 40f0d01454..40f0d01454 100644
--- a/keyboards/iris/keymaps/davidrambo/keymap.c
+++ b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
diff --git a/keyboards/iris/keymaps/davidrambo/readme.md b/keyboards/keebio/iris/keymaps/davidrambo/readme.md
index 4d21f37c09..4d21f37c09 100644
--- a/keyboards/iris/keymaps/davidrambo/readme.md
+++ b/keyboards/keebio/iris/keymaps/davidrambo/readme.md
diff --git a/keyboards/iris/keymaps/davidrambo/rules.mk b/keyboards/keebio/iris/keymaps/davidrambo/rules.mk
index 1e3473a1af..1e3473a1af 100644
--- a/keyboards/iris/keymaps/davidrambo/rules.mk
+++ b/keyboards/keebio/iris/keymaps/davidrambo/rules.mk
diff --git a/keyboards/iris/keymaps/dbroqua/config.h b/keyboards/keebio/iris/keymaps/dbroqua/config.h
index 130b52c286..130b52c286 100644
--- a/keyboards/iris/keymaps/dbroqua/config.h
+++ b/keyboards/keebio/iris/keymaps/dbroqua/config.h
diff --git a/keyboards/iris/keymaps/dbroqua/keymap.c b/keyboards/keebio/iris/keymaps/dbroqua/keymap.c
index 4cbb8af540..fe19696e1b 100644
--- a/keyboards/iris/keymaps/dbroqua/keymap.c
+++ b/keyboards/keebio/iris/keymaps/dbroqua/keymap.c
@@ -14,7 +14,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
diff --git a/keyboards/iris/keymaps/dbroqua/rules.mk b/keyboards/keebio/iris/keymaps/dbroqua/rules.mk
index 1d2d9e5a9c..1d2d9e5a9c 100644
--- a/keyboards/iris/keymaps/dbroqua/rules.mk
+++ b/keyboards/keebio/iris/keymaps/dbroqua/rules.mk
diff --git a/keyboards/iris/keymaps/default/config.h b/keyboards/keebio/iris/keymaps/default/config.h
index 7986b50416..7986b50416 100644
--- a/keyboards/iris/keymaps/default/config.h
+++ b/keyboards/keebio/iris/keymaps/default/config.h
diff --git a/keyboards/iris/keymaps/default/keymap.c b/keyboards/keebio/iris/keymaps/default/keymap.c
index 4644c3d9b5..4644c3d9b5 100644
--- a/keyboards/iris/keymaps/default/keymap.c
+++ b/keyboards/keebio/iris/keymaps/default/keymap.c
diff --git a/keyboards/iris/keymaps/default/rules.mk b/keyboards/keebio/iris/keymaps/default/rules.mk
index d7463419b4..d7463419b4 100644
--- a/keyboards/iris/keymaps/default/rules.mk
+++ b/keyboards/keebio/iris/keymaps/default/rules.mk
diff --git a/keyboards/iris/keymaps/drashna/config.h b/keyboards/keebio/iris/keymaps/drashna/config.h
index dd247a42a7..dd247a42a7 100644
--- a/keyboards/iris/keymaps/drashna/config.h
+++ b/keyboards/keebio/iris/keymaps/drashna/config.h
diff --git a/keyboards/iris/keymaps/drashna/keymap.c b/keyboards/keebio/iris/keymaps/drashna/keymap.c
index d89656b7ea..d89656b7ea 100644
--- a/keyboards/iris/keymaps/drashna/keymap.c
+++ b/keyboards/keebio/iris/keymaps/drashna/keymap.c
diff --git a/keyboards/iris/keymaps/drashna/rules.mk b/keyboards/keebio/iris/keymaps/drashna/rules.mk
index ccc33c06f3..ccc33c06f3 100644
--- a/keyboards/iris/keymaps/drashna/rules.mk
+++ b/keyboards/keebio/iris/keymaps/drashna/rules.mk
diff --git a/keyboards/iris/keymaps/drashna_old/config.h b/keyboards/keebio/iris/keymaps/drashna_old/config.h
index b985c4dfc1..b985c4dfc1 100644
--- a/keyboards/iris/keymaps/drashna_old/config.h
+++ b/keyboards/keebio/iris/keymaps/drashna_old/config.h
diff --git a/keyboards/iris/keymaps/drashna_old/keymap.c b/keyboards/keebio/iris/keymaps/drashna_old/keymap.c
index ff7bd09c0c..ff7bd09c0c 100644
--- a/keyboards/iris/keymaps/drashna_old/keymap.c
+++ b/keyboards/keebio/iris/keymaps/drashna_old/keymap.c
diff --git a/keyboards/iris/keymaps/drashna_old/rules.mk b/keyboards/keebio/iris/keymaps/drashna_old/rules.mk
index 73f37c6c55..73f37c6c55 100644
--- a/keyboards/iris/keymaps/drashna_old/rules.mk
+++ b/keyboards/keebio/iris/keymaps/drashna_old/rules.mk
diff --git a/keyboards/iris/keymaps/dvp-zjpxshade/config.h b/keyboards/keebio/iris/keymaps/dvp-zjpxshade/config.h
index 72e35c4728..72e35c4728 100644
--- a/keyboards/iris/keymaps/dvp-zjpxshade/config.h
+++ b/keyboards/keebio/iris/keymaps/dvp-zjpxshade/config.h
diff --git a/keyboards/iris/keymaps/dvp-zjpxshade/keymap.c b/keyboards/keebio/iris/keymaps/dvp-zjpxshade/keymap.c
index 48402e964c..12ac00cd78 100644
--- a/keyboards/iris/keymaps/dvp-zjpxshade/keymap.c
+++ b/keyboards/keebio/iris/keymaps/dvp-zjpxshade/keymap.c
@@ -17,7 +17,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
diff --git a/keyboards/iris/keymaps/dvp-zjpxshade/rules.mk b/keyboards/keebio/iris/keymaps/dvp-zjpxshade/rules.mk
index 73142a1680..73142a1680 100644
--- a/keyboards/iris/keymaps/dvp-zjpxshade/rules.mk
+++ b/keyboards/keebio/iris/keymaps/dvp-zjpxshade/rules.mk
diff --git a/keyboards/iris/keymaps/edvorakjp/config.h b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
index 1610c4b124..1610c4b124 100644
--- a/keyboards/iris/keymaps/edvorakjp/config.h
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
diff --git a/keyboards/iris/keymaps/edvorakjp/keymap.c b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
index f5d305f7f4..f5d305f7f4 100644
--- a/keyboards/iris/keymaps/edvorakjp/keymap.c
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
diff --git a/keyboards/iris/keymaps/edvorakjp/readme.md b/keyboards/keebio/iris/keymaps/edvorakjp/readme.md
index dd406523d2..dd406523d2 100644
--- a/keyboards/iris/keymaps/edvorakjp/readme.md
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/readme.md
diff --git a/keyboards/iris/keymaps/edvorakjp/rules.mk b/keyboards/keebio/iris/keymaps/edvorakjp/rules.mk
index 58d244c389..58d244c389 100644
--- a/keyboards/iris/keymaps/edvorakjp/rules.mk
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/rules.mk
diff --git a/keyboards/iris/keymaps/fabian/config.h b/keyboards/keebio/iris/keymaps/fabian/config.h
index faae942a83..faae942a83 100644
--- a/keyboards/iris/keymaps/fabian/config.h
+++ b/keyboards/keebio/iris/keymaps/fabian/config.h
diff --git a/keyboards/iris/keymaps/fabian/keymap.c b/keyboards/keebio/iris/keymaps/fabian/keymap.c
index 383bacfa48..d7d98fdc06 100644
--- a/keyboards/iris/keymaps/fabian/keymap.c
+++ b/keyboards/keebio/iris/keymaps/fabian/keymap.c
@@ -24,7 +24,6 @@ enum custom_keycodes {
 #include "dynamic_macro.h"
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_COLE COLEMAK
 #define KC_LOWR LOWER
diff --git a/keyboards/iris/keymaps/fate/config.h b/keyboards/keebio/iris/keymaps/fate/config.h
index 5f16bffb7b..5f16bffb7b 100644
--- a/keyboards/iris/keymaps/fate/config.h
+++ b/keyboards/keebio/iris/keymaps/fate/config.h
diff --git a/keyboards/iris/keymaps/fate/keymap.c b/keyboards/keebio/iris/keymaps/fate/keymap.c
index ca92b59787..0e21944c79 100644
--- a/keyboards/iris/keymaps/fate/keymap.c
+++ b/keyboards/keebio/iris/keymaps/fate/keymap.c
@@ -17,7 +17,6 @@ enum {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR MO(_LOWER)
 #define KC_RASE MO(_RAISE)
diff --git a/keyboards/iris/keymaps/fate/readme.md b/keyboards/keebio/iris/keymaps/fate/readme.md
index 70f464b0da..70f464b0da 100644
--- a/keyboards/iris/keymaps/fate/readme.md
+++ b/keyboards/keebio/iris/keymaps/fate/readme.md
diff --git a/keyboards/iris/keymaps/fate/rules.mk b/keyboards/keebio/iris/keymaps/fate/rules.mk
index 378a653d90..378a653d90 100644
--- a/keyboards/iris/keymaps/fate/rules.mk
+++ b/keyboards/keebio/iris/keymaps/fate/rules.mk
diff --git a/keyboards/iris/keymaps/gsigler/config.h b/keyboards/keebio/iris/keymaps/gsigler/config.h
index e1793fb1b8..e1793fb1b8 100644
--- a/keyboards/iris/keymaps/gsigler/config.h
+++ b/keyboards/keebio/iris/keymaps/gsigler/config.h
diff --git a/keyboards/iris/keymaps/gsigler/keymap.c b/keyboards/keebio/iris/keymaps/gsigler/keymap.c
index f8753cbdcc..f8753cbdcc 100644
--- a/keyboards/iris/keymaps/gsigler/keymap.c
+++ b/keyboards/keebio/iris/keymaps/gsigler/keymap.c
diff --git a/keyboards/iris/keymaps/gsigler/rules.mk b/keyboards/keebio/iris/keymaps/gsigler/rules.mk
index 0abc28fc59..0abc28fc59 100644
--- a/keyboards/iris/keymaps/gsigler/rules.mk
+++ b/keyboards/keebio/iris/keymaps/gsigler/rules.mk
diff --git a/keyboards/iris/keymaps/hag/config.h b/keyboards/keebio/iris/keymaps/hag/config.h
index c4604af436..c4604af436 100644
--- a/keyboards/iris/keymaps/hag/config.h
+++ b/keyboards/keebio/iris/keymaps/hag/config.h
diff --git a/keyboards/iris/keymaps/hag/keymap.c b/keyboards/keebio/iris/keymaps/hag/keymap.c
index a690f8761a..222b68208f 100644
--- a/keyboards/iris/keymaps/hag/keymap.c
+++ b/keyboards/keebio/iris/keymaps/hag/keymap.c
@@ -36,8 +36,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define KC_XXXX KC_NO
 
 #define KC_Sw2 RALT(KC_2) // Nordic @
 #define KC_Sw3 RALT(KC_3) // Nordic something
diff --git a/keyboards/iris/keymaps/hag/rules.mk b/keyboards/keebio/iris/keymaps/hag/rules.mk
index 73142a1680..73142a1680 100644
--- a/keyboards/iris/keymaps/hag/rules.mk
+++ b/keyboards/keebio/iris/keymaps/hag/rules.mk
diff --git a/keyboards/iris/keymaps/hexwire/config.h b/keyboards/keebio/iris/keymaps/hexwire/config.h
index 53b00d24f5..53b00d24f5 100644
--- a/keyboards/iris/keymaps/hexwire/config.h
+++ b/keyboards/keebio/iris/keymaps/hexwire/config.h
diff --git a/keyboards/iris/keymaps/hexwire/keymap.c b/keyboards/keebio/iris/keymaps/hexwire/keymap.c
index e9ab58bcda..33105c1c86 100644
--- a/keyboards/iris/keymaps/hexwire/keymap.c
+++ b/keyboards/keebio/iris/keymaps/hexwire/keymap.c
@@ -17,7 +17,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
 #define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
diff --git a/keyboards/iris/keymaps/hexwire/rules.mk b/keyboards/keebio/iris/keymaps/hexwire/rules.mk
index 73142a1680..73142a1680 100644
--- a/keyboards/iris/keymaps/hexwire/rules.mk
+++ b/keyboards/keebio/iris/keymaps/hexwire/rules.mk
diff --git a/keyboards/iris/keymaps/impstyle/README.md b/keyboards/keebio/iris/keymaps/impstyle/README.md
index b341f2d868..b341f2d868 100644
--- a/keyboards/iris/keymaps/impstyle/README.md
+++ b/keyboards/keebio/iris/keymaps/impstyle/README.md
diff --git a/keyboards/iris/keymaps/impstyle/config.h b/keyboards/keebio/iris/keymaps/impstyle/config.h
index 6fc14133f8..6fc14133f8 100644
--- a/keyboards/iris/keymaps/impstyle/config.h
+++ b/keyboards/keebio/iris/keymaps/impstyle/config.h
diff --git a/keyboards/iris/keymaps/impstyle/keymap.c b/keyboards/keebio/iris/keymaps/impstyle/keymap.c
index 30b4bf2d92..c1964f5e1a 100644
--- a/keyboards/iris/keymaps/impstyle/keymap.c
+++ b/keyboards/keebio/iris/keymaps/impstyle/keymap.c
@@ -18,7 +18,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 #define KC_LOWR MO(_LOWER) // Lower layer
 #define KC_RASE MO(_RAISE) // Raise layer
 #define KC_TGLW TG(_LOWER) // toggle lower
@@ -47,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_PLUS,         KC_MOUS,KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
                                      KC_LGUI,KC_RASE,KC_SPC ,         KC_ENT ,KC_LOWR,KC_LALT
   ),
-  
+
   // LOWER Layer
    //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
   // TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
@@ -59,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //     ,    ,    ,    ,    ,    ,    ,         ,    , P1 , P2 , P3 ,EQL ,UNDS ,
   //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
   //                       ,    ,DEL ,        BSPC ,    , P0
-  //                  `----+----+----'        `----+----+----' 
+  //                  `----+----+----'        `----+----+----'
 
   [_LOWER] = LAYOUT(
      KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
@@ -108,4 +107,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                        _______,_______,_______,            _______,_______,_______
   ),
 
-};
\ No newline at end of file
+};
diff --git a/keyboards/iris/keymaps/impstyle/rules.mk b/keyboards/keebio/iris/keymaps/impstyle/rules.mk
index ef4a383d31..ef4a383d31 100644
--- a/keyboards/iris/keymaps/impstyle/rules.mk
+++ b/keyboards/keebio/iris/keymaps/impstyle/rules.mk
diff --git a/keyboards/iris/keymaps/jennetters/config.h b/keyboards/keebio/iris/keymaps/jennetters/config.h
index 42f91bd027..42f91bd027 100644
--- a/keyboards/iris/keymaps/jennetters/config.h
+++ b/keyboards/keebio/iris/keymaps/jennetters/config.h
diff --git a/keyboards/iris/keymaps/jennetters/keymap.c b/keyboards/keebio/iris/keymaps/jennetters/keymap.c
index 287dc9712d..c06079c926 100644
--- a/keyboards/iris/keymaps/jennetters/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jennetters/keymap.c
@@ -18,7 +18,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
@@ -45,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //  |----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
   //  | SFT| Z  | X  | C  | V  | B  | SPC|    | SPC| N  | M  | ,  | .  | /  | ENT|
   //  `----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-  //                   \  GUI| ALT| CTL /      \RASE\ CTL | SFT / 
+  //                   \  GUI| ALT| CTL /      \RASE\ CTL | SFT /
   //                    `----+----+----'        `----+----+----'
 
   TD(ESC_GR), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, \
@@ -56,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_LOWER] = LAYOUT_kc(
- 
+
   //  ,----+----+----+----+----+----.              ,----+----+----+----+----+----.
   //  |  ~ | !  | @  | #  | $  | %  |              | ^  | &  | *  | (  | )  | DEL|
   //  |----+----+----+----+----+----|              |----+----+----+----+----+----|
@@ -66,14 +65,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //  |----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
   //  | \  |    |    |    |    | [  | (  |    | )  | ]  |    |    |    | -  |    |
   //  `----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-  //                   \     |    | DEL /      \ DEL\     |     / 
+  //                   \     |    | DEL /      \ DEL\     |     /
   //                    `----+----+----'        `----+----+----'
 
   TILD, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, DEL, \
    , 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, , \
    , , , , , , , , , , ,PIPE, \
   BL_S, , , , , LCBR, LPRN, RPRN, RCBR, , , , MINS, , \
-   , , DEL, DEL, ,  
+   , , DEL, DEL, ,
   ),
 
   [_RAISE] = LAYOUT_kc(
@@ -86,14 +85,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //  |----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
   //  |    |    |    |    |    |    |    |    |    |    |    |    |    | \  |    |
   //  `----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-  //                   \     |    |     /      \    \     |     / 
+  //                   \     |    |     /      \    \     |     /
   //                    `----+----+----'        `----+----+----'
 
    , F1, F2, , , , , , , LBRC, RBRC, EQL, \
    , , UP, , , , YUNO, NOVY, , LCBR, RCBR, DEL, \
    , LEFT, DOWN, RIGHT, , , SHRG, , , , PIPE, , \
    , , , , , , , , , , , , BSLS, , \
-   , , , , , 
+   , , , , ,
   ),
 
   [_ADJUST] = LAYOUT(
@@ -200,8 +199,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed) {
         SEND_STRING("ლ(ಠ_ಠლ)"); // YUNO?!
                 return false;
-      } 
-    */ 
+      }
+    */
   }
   return true;
-}
\ No newline at end of file
+}
diff --git a/keyboards/iris/keymaps/jennetters/readme.md b/keyboards/keebio/iris/keymaps/jennetters/readme.md
index 272a4ed745..272a4ed745 100644
--- a/keyboards/iris/keymaps/jennetters/readme.md
+++ b/keyboards/keebio/iris/keymaps/jennetters/readme.md
diff --git a/keyboards/iris/keymaps/jennetters/rules.mk b/keyboards/keebio/iris/keymaps/jennetters/rules.mk
index 1ba2fa8fbe..1ba2fa8fbe 100644
--- a/keyboards/iris/keymaps/jennetters/rules.mk
+++ b/keyboards/keebio/iris/keymaps/jennetters/rules.mk
diff --git a/keyboards/iris/keymaps/khord/config.h b/keyboards/keebio/iris/keymaps/khord/config.h
index 9b44bca792..9b44bca792 100644
--- a/keyboards/iris/keymaps/khord/config.h
+++ b/keyboards/keebio/iris/keymaps/khord/config.h
diff --git a/keyboards/iris/keymaps/khord/keymap.c b/keyboards/keebio/iris/keymaps/khord/keymap.c
index 379617a8b7..379617a8b7 100644
--- a/keyboards/iris/keymaps/khord/keymap.c
+++ b/keyboards/keebio/iris/keymaps/khord/keymap.c
diff --git a/keyboards/iris/keymaps/khord/rules.mk b/keyboards/keebio/iris/keymaps/khord/rules.mk
index c46edbd128..c46edbd128 100644
--- a/keyboards/iris/keymaps/khord/rules.mk
+++ b/keyboards/keebio/iris/keymaps/khord/rules.mk
diff --git a/keyboards/iris/keymaps/krusli/README.md b/keyboards/keebio/iris/keymaps/krusli/README.md
index fc02aa01cc..fc02aa01cc 100644
--- a/keyboards/iris/keymaps/krusli/README.md
+++ b/keyboards/keebio/iris/keymaps/krusli/README.md
diff --git a/keyboards/iris/keymaps/krusli/config.h b/keyboards/keebio/iris/keymaps/krusli/config.h
index 72e35c4728..72e35c4728 100644
--- a/keyboards/iris/keymaps/krusli/config.h
+++ b/keyboards/keebio/iris/keymaps/krusli/config.h
diff --git a/keyboards/iris/keymaps/krusli/keymap.c b/keyboards/keebio/iris/keymaps/krusli/keymap.c
index 4aa076ab16..095716621d 100644
--- a/keyboards/iris/keymaps/krusli/keymap.c
+++ b/keyboards/keebio/iris/keymaps/krusli/keymap.c
@@ -16,8 +16,6 @@ enum custom_keycodes {
   ADJUST,
 };
 
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
     KC_ESC,   KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_6,      KC_7,       KC_8,       KC_9,       KC_0,       KC_BSLS,
diff --git a/keyboards/iris/keymaps/krusli/rules.mk b/keyboards/keebio/iris/keymaps/krusli/rules.mk
index b0e37ec2f4..b0e37ec2f4 100644
--- a/keyboards/iris/keymaps/krusli/rules.mk
+++ b/keyboards/keebio/iris/keymaps/krusli/rules.mk
diff --git a/keyboards/iris/keymaps/lewisridden/config.h b/keyboards/keebio/iris/keymaps/lewisridden/config.h
index 6d96b31bd9..6d96b31bd9 100644
--- a/keyboards/iris/keymaps/lewisridden/config.h
+++ b/keyboards/keebio/iris/keymaps/lewisridden/config.h
diff --git a/keyboards/iris/keymaps/lewisridden/keymap.c b/keyboards/keebio/iris/keymaps/lewisridden/keymap.c
index 331c0632ac..e5d12ebd11 100644
--- a/keyboards/iris/keymaps/lewisridden/keymap.c
+++ b/keyboards/keebio/iris/keymaps/lewisridden/keymap.c
@@ -17,7 +17,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
diff --git a/keyboards/iris/keymaps/lewisridden/rules.mk b/keyboards/keebio/iris/keymaps/lewisridden/rules.mk
index 73142a1680..73142a1680 100644
--- a/keyboards/iris/keymaps/lewisridden/rules.mk
+++ b/keyboards/keebio/iris/keymaps/lewisridden/rules.mk
diff --git a/keyboards/iris/keymaps/mtdjr/config.h b/keyboards/keebio/iris/keymaps/mtdjr/config.h
index 93dc4c211d..93dc4c211d 100644
--- a/keyboards/iris/keymaps/mtdjr/config.h
+++ b/keyboards/keebio/iris/keymaps/mtdjr/config.h
diff --git a/keyboards/iris/keymaps/mtdjr/keymap.c b/keyboards/keebio/iris/keymaps/mtdjr/keymap.c
index d6e3ec05e8..d6e3ec05e8 100644
--- a/keyboards/iris/keymaps/mtdjr/keymap.c
+++ b/keyboards/keebio/iris/keymaps/mtdjr/keymap.c
diff --git a/keyboards/iris/keymaps/mtdjr/rules.mk b/keyboards/keebio/iris/keymaps/mtdjr/rules.mk
index 7f8c630d8b..7f8c630d8b 100644
--- a/keyboards/iris/keymaps/mtdjr/rules.mk
+++ b/keyboards/keebio/iris/keymaps/mtdjr/rules.mk
diff --git a/keyboards/iris/keymaps/olligranlund_nordic/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
index 259f2a7424..259f2a7424 100644
--- a/keyboards/iris/keymaps/olligranlund_nordic/config.h
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
diff --git a/keyboards/iris/keymaps/olligranlund_nordic/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
index 65ed6d289b..65ed6d289b 100644
--- a/keyboards/iris/keymaps/olligranlund_nordic/keymap.c
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
diff --git a/keyboards/iris/keymaps/olligranlund_nordic/readme.md b/keyboards/keebio/iris/keymaps/olligranlund_nordic/readme.md
index 72eccde102..72eccde102 100644
--- a/keyboards/iris/keymaps/olligranlund_nordic/readme.md
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/readme.md
diff --git a/keyboards/iris/keymaps/olligranlund_nordic/rules.mk b/keyboards/keebio/iris/keymaps/olligranlund_nordic/rules.mk
index d7463419b4..d7463419b4 100644
--- a/keyboards/iris/keymaps/olligranlund_nordic/rules.mk
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/rules.mk
diff --git a/keyboards/iris/keymaps/omgvee/config.h b/keyboards/keebio/iris/keymaps/omgvee/config.h
index c5899f45f0..c5899f45f0 100644
--- a/keyboards/iris/keymaps/omgvee/config.h
+++ b/keyboards/keebio/iris/keymaps/omgvee/config.h
diff --git a/keyboards/iris/keymaps/omgvee/keymap.c b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
index 6f29ccecd3..6f29ccecd3 100644
--- a/keyboards/iris/keymaps/omgvee/keymap.c
+++ b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
diff --git a/keyboards/iris/keymaps/omgvee/readme.md b/keyboards/keebio/iris/keymaps/omgvee/readme.md
index 275d270fa3..275d270fa3 100644
--- a/keyboards/iris/keymaps/omgvee/readme.md
+++ b/keyboards/keebio/iris/keymaps/omgvee/readme.md
diff --git a/keyboards/iris/keymaps/omgvee/rules.mk b/keyboards/keebio/iris/keymaps/omgvee/rules.mk
index 897c6069c5..897c6069c5 100644
--- a/keyboards/iris/keymaps/omgvee/rules.mk
+++ b/keyboards/keebio/iris/keymaps/omgvee/rules.mk
diff --git a/keyboards/iris/keymaps/rdhaene/config.h b/keyboards/keebio/iris/keymaps/rdhaene/config.h
index 3c4b6cfd27..3c4b6cfd27 100644
--- a/keyboards/iris/keymaps/rdhaene/config.h
+++ b/keyboards/keebio/iris/keymaps/rdhaene/config.h
diff --git a/keyboards/iris/keymaps/rdhaene/keymap.c b/keyboards/keebio/iris/keymaps/rdhaene/keymap.c
index 68b187aafb..7a153346c5 100644
--- a/keyboards/iris/keymaps/rdhaene/keymap.c
+++ b/keyboards/keebio/iris/keymaps/rdhaene/keymap.c
@@ -17,7 +17,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
diff --git a/keyboards/iris/keymaps/rdhaene/rules.mk b/keyboards/keebio/iris/keymaps/rdhaene/rules.mk
index 4bfbfb2ae2..4bfbfb2ae2 100644
--- a/keyboards/iris/keymaps/rdhaene/rules.mk
+++ b/keyboards/keebio/iris/keymaps/rdhaene/rules.mk
diff --git a/keyboards/iris/keymaps/rs/config.h b/keyboards/keebio/iris/keymaps/rs/config.h
index 7c5b5ca433..7c5b5ca433 100644
--- a/keyboards/iris/keymaps/rs/config.h
+++ b/keyboards/keebio/iris/keymaps/rs/config.h
diff --git a/keyboards/iris/keymaps/rs/karabiner.json b/keyboards/keebio/iris/keymaps/rs/karabiner.json
index f5214650ad..f5214650ad 100644
--- a/keyboards/iris/keymaps/rs/karabiner.json
+++ b/keyboards/keebio/iris/keymaps/rs/karabiner.json
diff --git a/keyboards/iris/keymaps/rs/keymap.c b/keyboards/keebio/iris/keymaps/rs/keymap.c
index 43374e59f3..43374e59f3 100644
--- a/keyboards/iris/keymaps/rs/keymap.c
+++ b/keyboards/keebio/iris/keymaps/rs/keymap.c
diff --git a/keyboards/iris/keymaps/rs/readme.md b/keyboards/keebio/iris/keymaps/rs/readme.md
index bdf44121e4..bdf44121e4 100644
--- a/keyboards/iris/keymaps/rs/readme.md
+++ b/keyboards/keebio/iris/keymaps/rs/readme.md
diff --git a/keyboards/iris/keymaps/rs/rules.mk b/keyboards/keebio/iris/keymaps/rs/rules.mk
index bd518d8f27..bd518d8f27 100644
--- a/keyboards/iris/keymaps/rs/rules.mk
+++ b/keyboards/keebio/iris/keymaps/rs/rules.mk
diff --git a/keyboards/iris/keymaps/s1carii/config.h b/keyboards/keebio/iris/keymaps/s1carii/config.h
index 117f825234..117f825234 100644
--- a/keyboards/iris/keymaps/s1carii/config.h
+++ b/keyboards/keebio/iris/keymaps/s1carii/config.h
diff --git a/keyboards/iris/keymaps/s1carii/keymap.c b/keyboards/keebio/iris/keymaps/s1carii/keymap.c
index dd993a9bc6..4655bb1ad9 100644
--- a/keyboards/iris/keymaps/s1carii/keymap.c
+++ b/keyboards/keebio/iris/keymaps/s1carii/keymap.c
@@ -15,7 +15,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
@@ -80,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                            ,    ,    ,             ,    ,
   //                  `----+----+----'        `----+----+----'
   )
-  
+
  /*
     [_DEVLAYER] = LAYOUT_kc(
   //,----+----+----+--+-+----+----.              ,----+----+-+--+----+----+----.
@@ -95,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                            ,    ,    ,             ,    ,
   //                  `----+----+----'        `----+----+----'
   )
-*/ 
+*/
 
 };
 
diff --git a/keyboards/iris/keymaps/s1carii/readme.md b/keyboards/keebio/iris/keymaps/s1carii/readme.md
index 6d94b6c877..6d94b6c877 100644
--- a/keyboards/iris/keymaps/s1carii/readme.md
+++ b/keyboards/keebio/iris/keymaps/s1carii/readme.md
diff --git a/keyboards/iris/keymaps/s1carii/rules.mk b/keyboards/keebio/iris/keymaps/s1carii/rules.mk
index 5cf55d3d79..5cf55d3d79 100644
--- a/keyboards/iris/keymaps/s1carii/rules.mk
+++ b/keyboards/keebio/iris/keymaps/s1carii/rules.mk
diff --git a/keyboards/iris/keymaps/saviof/config.h b/keyboards/keebio/iris/keymaps/saviof/config.h
index eb4c7328eb..eb4c7328eb 100644
--- a/keyboards/iris/keymaps/saviof/config.h
+++ b/keyboards/keebio/iris/keymaps/saviof/config.h
diff --git a/keyboards/iris/keymaps/saviof/keymap.c b/keyboards/keebio/iris/keymaps/saviof/keymap.c
index a63e606821..a63e606821 100644
--- a/keyboards/iris/keymaps/saviof/keymap.c
+++ b/keyboards/keebio/iris/keymaps/saviof/keymap.c
diff --git a/keyboards/iris/keymaps/saviof/rules.mk b/keyboards/keebio/iris/keymaps/saviof/rules.mk
index 0e1023be1a..0e1023be1a 100644
--- a/keyboards/iris/keymaps/saviof/rules.mk
+++ b/keyboards/keebio/iris/keymaps/saviof/rules.mk
diff --git a/keyboards/iris/keymaps/swedish/config.h b/keyboards/keebio/iris/keymaps/swedish/config.h
index 4e3e558613..4e3e558613 100644
--- a/keyboards/iris/keymaps/swedish/config.h
+++ b/keyboards/keebio/iris/keymaps/swedish/config.h
diff --git a/keyboards/iris/keymaps/swedish/keymap.c b/keyboards/keebio/iris/keymaps/swedish/keymap.c
index 015e26aec9..26e28479e8 100644
--- a/keyboards/iris/keymaps/swedish/keymap.c
+++ b/keyboards/keebio/iris/keymaps/swedish/keymap.c
@@ -17,7 +17,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
diff --git a/keyboards/iris/keymaps/swedish/rules.mk b/keyboards/keebio/iris/keymaps/swedish/rules.mk
index 73142a1680..73142a1680 100644
--- a/keyboards/iris/keymaps/swedish/rules.mk
+++ b/keyboards/keebio/iris/keymaps/swedish/rules.mk
diff --git a/keyboards/iris/keymaps/transmogrified/Readme.md b/keyboards/keebio/iris/keymaps/transmogrified/Readme.md
index 96e27411dd..96e27411dd 100644
--- a/keyboards/iris/keymaps/transmogrified/Readme.md
+++ b/keyboards/keebio/iris/keymaps/transmogrified/Readme.md
diff --git a/keyboards/iris/keymaps/transmogrified/config.h b/keyboards/keebio/iris/keymaps/transmogrified/config.h
index 12f2d7d6d8..12f2d7d6d8 100644
--- a/keyboards/iris/keymaps/transmogrified/config.h
+++ b/keyboards/keebio/iris/keymaps/transmogrified/config.h
diff --git a/keyboards/iris/keymaps/transmogrified/keymap.c b/keyboards/keebio/iris/keymaps/transmogrified/keymap.c
index 67545f08e6..67545f08e6 100644
--- a/keyboards/iris/keymaps/transmogrified/keymap.c
+++ b/keyboards/keebio/iris/keymaps/transmogrified/keymap.c
diff --git a/keyboards/iris/keymaps/transmogrified/rules.mk b/keyboards/keebio/iris/keymaps/transmogrified/rules.mk
index 444fa38a93..444fa38a93 100644
--- a/keyboards/iris/keymaps/transmogrified/rules.mk
+++ b/keyboards/keebio/iris/keymaps/transmogrified/rules.mk
diff --git a/keyboards/iris/keymaps/via/config.h b/keyboards/keebio/iris/keymaps/via/config.h
index f2498e5927..f2498e5927 100644
--- a/keyboards/iris/keymaps/via/config.h
+++ b/keyboards/keebio/iris/keymaps/via/config.h
diff --git a/keyboards/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c
index f67b71fc1a..f67b71fc1a 100644
--- a/keyboards/iris/keymaps/via/keymap.c
+++ b/keyboards/keebio/iris/keymaps/via/keymap.c
diff --git a/keyboards/iris/keymaps/via/rules.mk b/keyboards/keebio/iris/keymaps/via/rules.mk
index ca2680325e..ca2680325e 100644
--- a/keyboards/iris/keymaps/via/rules.mk
+++ b/keyboards/keebio/iris/keymaps/via/rules.mk
diff --git a/keyboards/iris/keymaps/vyolle/config.h b/keyboards/keebio/iris/keymaps/vyolle/config.h
index 1adbd65b5a..1adbd65b5a 100644
--- a/keyboards/iris/keymaps/vyolle/config.h
+++ b/keyboards/keebio/iris/keymaps/vyolle/config.h
diff --git a/keyboards/iris/keymaps/vyolle/keymap.c b/keyboards/keebio/iris/keymaps/vyolle/keymap.c
index 33e1718211..33e1718211 100644
--- a/keyboards/iris/keymaps/vyolle/keymap.c
+++ b/keyboards/keebio/iris/keymaps/vyolle/keymap.c
diff --git a/keyboards/iris/keymaps/vyolle/rules.mk b/keyboards/keebio/iris/keymaps/vyolle/rules.mk
index e7cbfb83d8..e7cbfb83d8 100644
--- a/keyboards/iris/keymaps/vyolle/rules.mk
+++ b/keyboards/keebio/iris/keymaps/vyolle/rules.mk
diff --git a/keyboards/iris/keymaps/wanleg/config.h b/keyboards/keebio/iris/keymaps/wanleg/config.h
index 9b90007688..9b90007688 100644
--- a/keyboards/iris/keymaps/wanleg/config.h
+++ b/keyboards/keebio/iris/keymaps/wanleg/config.h
diff --git a/keyboards/iris/keymaps/wanleg/keymap.c b/keyboards/keebio/iris/keymaps/wanleg/keymap.c
index 6f8ff90661..6f8ff90661 100644
--- a/keyboards/iris/keymaps/wanleg/keymap.c
+++ b/keyboards/keebio/iris/keymaps/wanleg/keymap.c
diff --git a/keyboards/iris/keymaps/wanleg/rules.mk b/keyboards/keebio/iris/keymaps/wanleg/rules.mk
index bbb05a5b48..bbb05a5b48 100644
--- a/keyboards/iris/keymaps/wanleg/rules.mk
+++ b/keyboards/keebio/iris/keymaps/wanleg/rules.mk
diff --git a/keyboards/iris/keymaps/xyverz/config.h b/keyboards/keebio/iris/keymaps/xyverz/config.h
index b820a0753d..b820a0753d 100644
--- a/keyboards/iris/keymaps/xyverz/config.h
+++ b/keyboards/keebio/iris/keymaps/xyverz/config.h
diff --git a/keyboards/iris/keymaps/xyverz/keymap.c b/keyboards/keebio/iris/keymaps/xyverz/keymap.c
index 53bf32ac36..53bf32ac36 100644
--- a/keyboards/iris/keymaps/xyverz/keymap.c
+++ b/keyboards/keebio/iris/keymaps/xyverz/keymap.c
diff --git a/keyboards/iris/keymaps/xyverz/rules.mk b/keyboards/keebio/iris/keymaps/xyverz/rules.mk
index d7463419b4..d7463419b4 100644
--- a/keyboards/iris/keymaps/xyverz/rules.mk
+++ b/keyboards/keebio/iris/keymaps/xyverz/rules.mk
diff --git a/keyboards/iris/keymaps/yanfali/config.h b/keyboards/keebio/iris/keymaps/yanfali/config.h
index 81df2e9164..81df2e9164 100644
--- a/keyboards/iris/keymaps/yanfali/config.h
+++ b/keyboards/keebio/iris/keymaps/yanfali/config.h
diff --git a/keyboards/iris/keymaps/yanfali/keymap.c b/keyboards/keebio/iris/keymaps/yanfali/keymap.c
index bae09a62ea..92117bd6de 100644
--- a/keyboards/iris/keymaps/yanfali/keymap.c
+++ b/keyboards/keebio/iris/keymaps/yanfali/keymap.c
@@ -17,7 +17,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
 #define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
diff --git a/keyboards/iris/keymaps/yanfali/readme.md b/keyboards/keebio/iris/keymaps/yanfali/readme.md
index f72e88e51e..f72e88e51e 100644
--- a/keyboards/iris/keymaps/yanfali/readme.md
+++ b/keyboards/keebio/iris/keymaps/yanfali/readme.md
diff --git a/keyboards/iris/keymaps/yanfali/rules.mk b/keyboards/keebio/iris/keymaps/yanfali/rules.mk
index 73142a1680..73142a1680 100644
--- a/keyboards/iris/keymaps/yanfali/rules.mk
+++ b/keyboards/keebio/iris/keymaps/yanfali/rules.mk
diff --git a/keyboards/iris/readme.md b/keyboards/keebio/iris/readme.md
index 0a1eb1e175..6d166e7564 100644
--- a/keyboards/iris/readme.md
+++ b/keyboards/keebio/iris/readme.md
@@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make iris/rev2:default
+    make keebio/iris/rev2:default
 
 Example of flashing this keyboard:
 
-    make iris/rev2:default:avrdude
+    make keebio/iris/rev2:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/newbs_getting_started) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index 13302c60c4..13302c60c4 100644
--- a/keyboards/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
diff --git a/keyboards/iris/rev1/rev1.c b/keyboards/keebio/iris/rev1/rev1.c
index 9694d122df..9694d122df 100644
--- a/keyboards/iris/rev1/rev1.c
+++ b/keyboards/keebio/iris/rev1/rev1.c
diff --git a/keyboards/iris/rev1/rev1.h b/keyboards/keebio/iris/rev1/rev1.h
index da5c9cdc03..da5c9cdc03 100644
--- a/keyboards/iris/rev1/rev1.h
+++ b/keyboards/keebio/iris/rev1/rev1.h
diff --git a/keyboards/iris/rev1/rules.mk b/keyboards/keebio/iris/rev1/rules.mk
index 7b30c0beff..7b30c0beff 100644
--- a/keyboards/iris/rev1/rules.mk
+++ b/keyboards/keebio/iris/rev1/rules.mk
diff --git a/keyboards/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index 5fb8be674e..5fb8be674e 100644
--- a/keyboards/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
diff --git a/keyboards/iris/rev1_led/rev1_led.c b/keyboards/keebio/iris/rev1_led/rev1_led.c
index af5fc9440b..af5fc9440b 100644
--- a/keyboards/iris/rev1_led/rev1_led.c
+++ b/keyboards/keebio/iris/rev1_led/rev1_led.c
diff --git a/keyboards/iris/rev1_led/rev1_led.h b/keyboards/keebio/iris/rev1_led/rev1_led.h
index da5c9cdc03..da5c9cdc03 100644
--- a/keyboards/iris/rev1_led/rev1_led.h
+++ b/keyboards/keebio/iris/rev1_led/rev1_led.h
diff --git a/keyboards/iris/rev1_led/rules.mk b/keyboards/keebio/iris/rev1_led/rules.mk
index 7b30c0beff..7b30c0beff 100644
--- a/keyboards/iris/rev1_led/rules.mk
+++ b/keyboards/keebio/iris/rev1_led/rules.mk
diff --git a/keyboards/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index 235c5710f5..235c5710f5 100644
--- a/keyboards/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
diff --git a/keyboards/iris/rev2/rev2.c b/keyboards/keebio/iris/rev2/rev2.c
index 8575243f0d..8575243f0d 100644
--- a/keyboards/iris/rev2/rev2.c
+++ b/keyboards/keebio/iris/rev2/rev2.c
diff --git a/keyboards/iris/rev2/rev2.h b/keyboards/keebio/iris/rev2/rev2.h
index da5c9cdc03..da5c9cdc03 100644
--- a/keyboards/iris/rev2/rev2.h
+++ b/keyboards/keebio/iris/rev2/rev2.h
diff --git a/keyboards/iris/rev2/rules.mk b/keyboards/keebio/iris/rev2/rules.mk
index d7463419b4..d7463419b4 100644
--- a/keyboards/iris/rev2/rules.mk
+++ b/keyboards/keebio/iris/rev2/rules.mk
diff --git a/keyboards/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index 70e5d6e2a5..70e5d6e2a5 100644
--- a/keyboards/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
diff --git a/keyboards/iris/rev3/rev3.c b/keyboards/keebio/iris/rev3/rev3.c
index 7e49330c1d..7e49330c1d 100644
--- a/keyboards/iris/rev3/rev3.c
+++ b/keyboards/keebio/iris/rev3/rev3.c
diff --git a/keyboards/iris/rev3/rev3.h b/keyboards/keebio/iris/rev3/rev3.h
index da9da84403..da9da84403 100644
--- a/keyboards/iris/rev3/rev3.h
+++ b/keyboards/keebio/iris/rev3/rev3.h
diff --git a/keyboards/iris/rev3/rules.mk b/keyboards/keebio/iris/rev3/rules.mk
index d7e0da9367..d7e0da9367 100644
--- a/keyboards/iris/rev3/rules.mk
+++ b/keyboards/keebio/iris/rev3/rules.mk
diff --git a/keyboards/iris/rules.mk b/keyboards/keebio/iris/rules.mk
index 28ca5a8cb8..9745d5e3c1 100644
--- a/keyboards/iris/rules.mk
+++ b/keyboards/keebio/iris/rules.mk
@@ -38,4 +38,4 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = iris/rev2
+DEFAULT_FOLDER = keebio/iris/rev2
diff --git a/keyboards/laplace/config.h b/keyboards/keebio/laplace/config.h
index 45b89a97ac..cce642526f 100644
--- a/keyboards/laplace/config.h
+++ b/keyboards/keebio/laplace/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -45,5 +44,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define TAPPING_TERM 200
-
-#endif
diff --git a/keyboards/laplace/info.json b/keyboards/keebio/laplace/info.json
index e783a1f496..e783a1f496 100644
--- a/keyboards/laplace/info.json
+++ b/keyboards/keebio/laplace/info.json
diff --git a/keyboards/laplace/keymaps/bakingpy/keymap.c b/keyboards/keebio/laplace/keymaps/bakingpy/keymap.c
index 2cad24fa07..97fb70af5e 100644
--- a/keyboards/laplace/keymaps/bakingpy/keymap.c
+++ b/keyboards/keebio/laplace/keymaps/bakingpy/keymap.c
@@ -5,8 +5,6 @@
 #define _FN2 2
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define KC_FN1 MO(_FN1)
 #define KC_FN2 MO(_FN2)
 #define KC_SPFN1 LT(_FN1, KC_SPACE)
@@ -33,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|-----`----`----`----`----`----`----`----`----`----`----`--------+
     LSFT   , Z  , X  , C  , V  , B  , N  , M  ,COMM,DOT ,SLSH, RSFT ,
  //|-------`----`----`----`----`----`----`----`----`----`----`------+
-    GRV  ,LCTL,LALT ,LGUI, SPFN1  ,  BSFN2 , FN2 ,RALT ,RCTL , FN1  
+    GRV  ,LCTL,LALT ,LGUI, SPFN1  ,  BSFN2 , FN2 ,RALT ,RCTL , FN1
  //`-----+----+-----+----+--------+--------+-----+-----+-----+------'
   ),
 
@@ -45,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|-----`----`----`----`----`----`----`----`----`----`----`--------+
     RMOD   ,RHUD,RSAD,RVAD,VOLD,LCBR,RCBR, 1  , 2  , 3  , UP ,      ,
  //|-------`----`----`----`----`----`----`----`----`----`----`------+
-    RTOG ,    ,     ,    ,        ,  DEL   ,  0  ,LEFT ,DOWN , RGHT 
+    RTOG ,    ,     ,    ,        ,  DEL   ,  0  ,LEFT ,DOWN , RGHT
  //`-----+----+-----+----+--------+--------+-----+-----+-----+------'
   ),
 
@@ -57,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|-----`----`----`----`----`----`----`----`----`----`----`--------+
            ,    ,    ,DEL ,PGDN,END ,    ,    ,    ,    ,    ,      ,
  //|-------`----`----`----`----`----`----`----`----`----`----`------+
-         ,    ,     ,    ,  DEL   ,        ,     ,     ,     ,      
+         ,    ,     ,    ,  DEL   ,        ,     ,     ,     ,
  //`-----+----+-----+----+--------+--------+-----+-----+-----+------'
   )
 };
diff --git a/keyboards/fourier/rev1/rules.mk b/keyboards/keebio/laplace/keymaps/bakingpy/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/fourier/rev1/rules.mk
+++ b/keyboards/keebio/laplace/keymaps/bakingpy/rules.mk
diff --git a/keyboards/laplace/keymaps/default/keymap.c b/keyboards/keebio/laplace/keymaps/default/keymap.c
index 03b7c9b15b..053bfb7ad6 100644
--- a/keyboards/laplace/keymaps/default/keymap.c
+++ b/keyboards/keebio/laplace/keymaps/default/keymap.c
@@ -4,9 +4,6 @@
 #define _FN1 1
 #define _FN2 2
 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 #define FN1 MO(_FN1)
 #define FN2 MO(_FN2)
 #define SP_FN1 LT(_FN1, KC_SPACE)
diff --git a/keyboards/laplace/keymaps/bakingpy/rules.mk b/keyboards/keebio/laplace/keymaps/default/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/laplace/keymaps/bakingpy/rules.mk
+++ b/keyboards/keebio/laplace/keymaps/default/rules.mk
diff --git a/keyboards/laplace/laplace.c b/keyboards/keebio/laplace/laplace.c
index dcf32aee69..dcf32aee69 100644
--- a/keyboards/laplace/laplace.c
+++ b/keyboards/keebio/laplace/laplace.c
diff --git a/keyboards/laplace/laplace.h b/keyboards/keebio/laplace/laplace.h
index 17f928f344..fc0510fe58 100644
--- a/keyboards/laplace/laplace.h
+++ b/keyboards/keebio/laplace/laplace.h
@@ -1,5 +1,4 @@
-#ifndef LAPLACE_H
-#define LAPLACE_H
+#pragma once
 
 #include "quantum.h"
 
@@ -32,4 +31,3 @@
         KC_##C1, KC_##C2, KC_##C3, KC_##C4, KC_##C5, KC_##C6, KC_##C7,          KC_##C9, KC_##C10, KC_##C11, KC_##C12, KC_##C13, \
         KC_##D1, KC_##D2, KC_##D3, KC_##D4, KC_##D5,          KC_##D7,                   KC_##D10, KC_##D11, KC_##D12, KC_##D13 \
     )
-#endif
diff --git a/keyboards/laplace/readme.md b/keyboards/keebio/laplace/readme.md
index 7871992f76..4292483bc8 100644
--- a/keyboards/laplace/readme.md
+++ b/keyboards/keebio/laplace/readme.md
@@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make laplace:default
+    make keebio/laplace:default
 
 Example of flashing this keyboard:
 
-    make laplace:default:avrdude
+    make keebio/laplace:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/laplace/rules.mk b/keyboards/keebio/laplace/rules.mk
index fe22161cb9..fe22161cb9 100644
--- a/keyboards/laplace/rules.mk
+++ b/keyboards/keebio/laplace/rules.mk
diff --git a/keyboards/levinson/config.h b/keyboards/keebio/levinson/config.h
index ca0c79e554..ca0c79e554 100644
--- a/keyboards/levinson/config.h
+++ b/keyboards/keebio/levinson/config.h
diff --git a/keyboards/levinson/info.json b/keyboards/keebio/levinson/info.json
index 2fb8fa9e3e..2fb8fa9e3e 100644
--- a/keyboards/levinson/info.json
+++ b/keyboards/keebio/levinson/info.json
diff --git a/keyboards/levinson/keymaps/atreus/config.h b/keyboards/keebio/levinson/keymaps/atreus/config.h
index a82c15238a..a82c15238a 100644
--- a/keyboards/levinson/keymaps/atreus/config.h
+++ b/keyboards/keebio/levinson/keymaps/atreus/config.h
diff --git a/keyboards/levinson/keymaps/atreus/keymap.c b/keyboards/keebio/levinson/keymaps/atreus/keymap.c
index 61ad04ef74..61ad04ef74 100644
--- a/keyboards/levinson/keymaps/atreus/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/atreus/keymap.c
diff --git a/keyboards/levinson/keymaps/atreus/readme.md b/keyboards/keebio/levinson/keymaps/atreus/readme.md
index 0b548ace17..0b548ace17 100644
--- a/keyboards/levinson/keymaps/atreus/readme.md
+++ b/keyboards/keebio/levinson/keymaps/atreus/readme.md
diff --git a/keyboards/levinson/keymaps/bakingpy2u/config.h b/keyboards/keebio/levinson/keymaps/bakingpy2u/config.h
index 1db6ea433f..1db6ea433f 100644
--- a/keyboards/levinson/keymaps/bakingpy2u/config.h
+++ b/keyboards/keebio/levinson/keymaps/bakingpy2u/config.h
diff --git a/keyboards/levinson/keymaps/bakingpy2u/keymap.c b/keyboards/keebio/levinson/keymaps/bakingpy2u/keymap.c
index 219e3468fb..6a6ab496ab 100644
--- a/keyboards/levinson/keymaps/bakingpy2u/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/bakingpy2u/keymap.c
@@ -23,7 +23,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
 #define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
diff --git a/keyboards/levinson/keymaps/bakingpy2u/rules.mk b/keyboards/keebio/levinson/keymaps/bakingpy2u/rules.mk
index d7463419b4..d7463419b4 100644
--- a/keyboards/levinson/keymaps/bakingpy2u/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/bakingpy2u/rules.mk
diff --git a/keyboards/levinson/keymaps/default/config.h b/keyboards/keebio/levinson/keymaps/default/config.h
index e710d6e4aa..be2d71e8f0 100644
--- a/keyboards/levinson/keymaps/default/config.h
+++ b/keyboards/keebio/levinson/keymaps/default/config.h
@@ -21,13 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
 // #define USE_I2C
 
 /* Select hand configuration */
-
-#define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
diff --git a/keyboards/levinson/keymaps/default/keymap.c b/keyboards/keebio/levinson/keymaps/default/keymap.c
index dac8068a42..abf253380b 100644
--- a/keyboards/levinson/keymaps/default/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/default/keymap.c
@@ -22,10 +22,6 @@ enum custom_keycodes {
   ADJUST,
 };
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Qwerty
diff --git a/keyboards/levinson/keymaps/default/rules.mk b/keyboards/keebio/levinson/keymaps/default/rules.mk
index d7463419b4..d7463419b4 100644
--- a/keyboards/levinson/keymaps/default/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/default/rules.mk
diff --git a/keyboards/levinson/keymaps/drogglbecher/config.h b/keyboards/keebio/levinson/keymaps/drogglbecher/config.h
index ef96ff00b1..ef96ff00b1 100644
--- a/keyboards/levinson/keymaps/drogglbecher/config.h
+++ b/keyboards/keebio/levinson/keymaps/drogglbecher/config.h
diff --git a/keyboards/levinson/keymaps/drogglbecher/keymap.c b/keyboards/keebio/levinson/keymaps/drogglbecher/keymap.c
index b8d2dc5949..b8d2dc5949 100644
--- a/keyboards/levinson/keymaps/drogglbecher/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/drogglbecher/keymap.c
diff --git a/keyboards/levinson/keymaps/drogglbecher/rules.mk b/keyboards/keebio/levinson/keymaps/drogglbecher/rules.mk
index b2a5451c82..b2a5451c82 100644
--- a/keyboards/levinson/keymaps/drogglbecher/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/drogglbecher/rules.mk
diff --git a/keyboards/levinson/keymaps/jyh/config.h b/keyboards/keebio/levinson/keymaps/jyh/config.h
index d3e598bd09..d3e598bd09 100644
--- a/keyboards/levinson/keymaps/jyh/config.h
+++ b/keyboards/keebio/levinson/keymaps/jyh/config.h
diff --git a/keyboards/levinson/keymaps/jyh/keymap.c b/keyboards/keebio/levinson/keymaps/jyh/keymap.c
index d8cfa7e06b..d8cfa7e06b 100644
--- a/keyboards/levinson/keymaps/jyh/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/jyh/keymap.c
diff --git a/keyboards/levinson/keymaps/jyh/readme.md b/keyboards/keebio/levinson/keymaps/jyh/readme.md
index e20424e518..e20424e518 100644
--- a/keyboards/levinson/keymaps/jyh/readme.md
+++ b/keyboards/keebio/levinson/keymaps/jyh/readme.md
diff --git a/keyboards/levinson/keymaps/jyh/rules.mk b/keyboards/keebio/levinson/keymaps/jyh/rules.mk
index 66110cfcc0..66110cfcc0 100644
--- a/keyboards/levinson/keymaps/jyh/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/jyh/rules.mk
diff --git a/keyboards/levinson/keymaps/jyh2/config.h b/keyboards/keebio/levinson/keymaps/jyh2/config.h
index f50674bb88..f50674bb88 100644
--- a/keyboards/levinson/keymaps/jyh2/config.h
+++ b/keyboards/keebio/levinson/keymaps/jyh2/config.h
diff --git a/keyboards/levinson/keymaps/jyh2/keymap.c b/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
index 4b7442928e..4b7442928e 100644
--- a/keyboards/levinson/keymaps/jyh2/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
diff --git a/keyboards/levinson/keymaps/jyh2/readme.md b/keyboards/keebio/levinson/keymaps/jyh2/readme.md
index 45ca956922..45ca956922 100644
--- a/keyboards/levinson/keymaps/jyh2/readme.md
+++ b/keyboards/keebio/levinson/keymaps/jyh2/readme.md
diff --git a/keyboards/levinson/keymaps/jyh2/rules.mk b/keyboards/keebio/levinson/keymaps/jyh2/rules.mk
index fbb3b49d6b..fbb3b49d6b 100644
--- a/keyboards/levinson/keymaps/jyh2/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/jyh2/rules.mk
diff --git a/keyboards/levinson/keymaps/losinggeneration/README.md b/keyboards/keebio/levinson/keymaps/losinggeneration/README.md
index 44c904508a..44c904508a 100644
--- a/keyboards/levinson/keymaps/losinggeneration/README.md
+++ b/keyboards/keebio/levinson/keymaps/losinggeneration/README.md
diff --git a/keyboards/levinson/keymaps/losinggeneration/config.h b/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
index 917c6a98ba..917c6a98ba 100644
--- a/keyboards/levinson/keymaps/losinggeneration/config.h
+++ b/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
diff --git a/keyboards/levinson/keymaps/losinggeneration/keymap.c b/keyboards/keebio/levinson/keymaps/losinggeneration/keymap.c
index aea6aed78c..aea6aed78c 100644
--- a/keyboards/levinson/keymaps/losinggeneration/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/losinggeneration/keymap.c
diff --git a/keyboards/levinson/keymaps/losinggeneration/rules.mk b/keyboards/keebio/levinson/keymaps/losinggeneration/rules.mk
index ee3ea67f7d..ee3ea67f7d 100644
--- a/keyboards/levinson/keymaps/losinggeneration/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/losinggeneration/rules.mk
diff --git a/keyboards/levinson/keymaps/mmacdougall/README.md b/keyboards/keebio/levinson/keymaps/mmacdougall/README.md
index bae8c8a4b8..bae8c8a4b8 100644
--- a/keyboards/levinson/keymaps/mmacdougall/README.md
+++ b/keyboards/keebio/levinson/keymaps/mmacdougall/README.md
diff --git a/keyboards/levinson/keymaps/mmacdougall/config.h b/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
index 63dd5bc88f..63dd5bc88f 100644
--- a/keyboards/levinson/keymaps/mmacdougall/config.h
+++ b/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
diff --git a/keyboards/levinson/keymaps/mmacdougall/keymap.c b/keyboards/keebio/levinson/keymaps/mmacdougall/keymap.c
index dec47a7616..76d9c72998 100644
--- a/keyboards/levinson/keymaps/mmacdougall/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/mmacdougall/keymap.c
@@ -22,10 +22,6 @@ enum custom_keycodes {
   ADJUST,
 };
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Qwerty
diff --git a/keyboards/levinson/keymaps/mmacdougall/rules.mk b/keyboards/keebio/levinson/keymaps/mmacdougall/rules.mk
index d7463419b4..d7463419b4 100644
--- a/keyboards/levinson/keymaps/mmacdougall/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/mmacdougall/rules.mk
diff --git a/keyboards/levinson/keymaps/steno/config.h b/keyboards/keebio/levinson/keymaps/steno/config.h
index 9cbc148e42..9cbc148e42 100644
--- a/keyboards/levinson/keymaps/steno/config.h
+++ b/keyboards/keebio/levinson/keymaps/steno/config.h
diff --git a/keyboards/levinson/keymaps/steno/keymap.c b/keyboards/keebio/levinson/keymaps/steno/keymap.c
index cd7493467a..cd7493467a 100644
--- a/keyboards/levinson/keymaps/steno/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/steno/keymap.c
diff --git a/keyboards/levinson/keymaps/steno/rules.mk b/keyboards/keebio/levinson/keymaps/steno/rules.mk
index 9c31e590ee..9c31e590ee 100644
--- a/keyboards/levinson/keymaps/steno/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/steno/rules.mk
diff --git a/keyboards/levinson/keymaps/treadwell/config.h b/keyboards/keebio/levinson/keymaps/treadwell/config.h
index 69783937b2..69783937b2 100644
--- a/keyboards/levinson/keymaps/treadwell/config.h
+++ b/keyboards/keebio/levinson/keymaps/treadwell/config.h
diff --git a/keyboards/levinson/keymaps/treadwell/keymap.c b/keyboards/keebio/levinson/keymaps/treadwell/keymap.c
index bcc744a6dd..2f0da0f525 100644
--- a/keyboards/levinson/keymaps/treadwell/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/treadwell/keymap.c
@@ -23,7 +23,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_X1 CODE
 #define KC_X2 NUMB
diff --git a/keyboards/levinson/keymaps/treadwell/rules.mk b/keyboards/keebio/levinson/keymaps/treadwell/rules.mk
index 1d2d9e5a9c..1d2d9e5a9c 100644
--- a/keyboards/levinson/keymaps/treadwell/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/treadwell/rules.mk
diff --git a/keyboards/levinson/keymaps/valgrahf/config.h b/keyboards/keebio/levinson/keymaps/valgrahf/config.h
index b7c6b0a7f5..b7c6b0a7f5 100644
--- a/keyboards/levinson/keymaps/valgrahf/config.h
+++ b/keyboards/keebio/levinson/keymaps/valgrahf/config.h
diff --git a/keyboards/levinson/keymaps/valgrahf/keymap.c b/keyboards/keebio/levinson/keymaps/valgrahf/keymap.c
index 7b3df539db..cbe86db373 100644
--- a/keyboards/levinson/keymaps/valgrahf/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/valgrahf/keymap.c
@@ -7,8 +7,6 @@ extern keymap_config_t keymap_config;
 #define _FN2 2
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define KC_FN1 LT(_FN1, KC_NO)
 #define KC_FN2 LT(_FN2, KC_NO)
 #define KC_SPFN LT(_FN1, KC_SPACE)
diff --git a/keyboards/levinson/keymaps/valgrahf/rules.mk b/keyboards/keebio/levinson/keymaps/valgrahf/rules.mk
index 1f54b32c48..1f54b32c48 100644
--- a/keyboards/levinson/keymaps/valgrahf/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/valgrahf/rules.mk
diff --git a/keyboards/levinson/keymaps/xtonhasvim/config.h b/keyboards/keebio/levinson/keymaps/xtonhasvim/config.h
index bcd2220ce0..bcd2220ce0 100644
--- a/keyboards/levinson/keymaps/xtonhasvim/config.h
+++ b/keyboards/keebio/levinson/keymaps/xtonhasvim/config.h
diff --git a/keyboards/levinson/keymaps/xtonhasvim/keymap.c b/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
index b9341ff35a..b9341ff35a 100644
--- a/keyboards/levinson/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
diff --git a/keyboards/levinson/keymaps/xtonhasvim/readme.md b/keyboards/keebio/levinson/keymaps/xtonhasvim/readme.md
index 9ff4ce1f19..9ff4ce1f19 100644
--- a/keyboards/levinson/keymaps/xtonhasvim/readme.md
+++ b/keyboards/keebio/levinson/keymaps/xtonhasvim/readme.md
diff --git a/keyboards/levinson/keymaps/xtonhasvim/rules.mk b/keyboards/keebio/levinson/keymaps/xtonhasvim/rules.mk
index ad5466991c..ad5466991c 100644
--- a/keyboards/levinson/keymaps/xtonhasvim/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/xtonhasvim/rules.mk
diff --git a/keyboards/levinson/levinson.c b/keyboards/keebio/levinson/levinson.c
index 95f3fe9ef8..95f3fe9ef8 100644
--- a/keyboards/levinson/levinson.c
+++ b/keyboards/keebio/levinson/levinson.c
diff --git a/keyboards/levinson/levinson.h b/keyboards/keebio/levinson/levinson.h
index 2106bc0e37..88c2361ad0 100644
--- a/keyboards/levinson/levinson.h
+++ b/keyboards/keebio/levinson/levinson.h
@@ -2,7 +2,7 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_levinson_rev1
+#ifdef KEYBOARD_keebio_levinson_rev1
     #include "rev1.h"
 #else
     #include "rev2.h"
diff --git a/keyboards/levinson/readme.md b/keyboards/keebio/levinson/readme.md
index 8cb4ff1cf7..8cb4ff1cf7 100644
--- a/keyboards/levinson/readme.md
+++ b/keyboards/keebio/levinson/readme.md
diff --git a/keyboards/levinson/rev1/config.h b/keyboards/keebio/levinson/rev1/config.h
index 4d70a6af16..0359796feb 100644
--- a/keyboards/levinson/rev1/config.h
+++ b/keyboards/keebio/levinson/rev1/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_CONFIG_H
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x1146
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    Keebio
diff --git a/keyboards/levinson/rev1/rev1.c b/keyboards/keebio/levinson/rev1/rev1.c
index 573fa787ba..573fa787ba 100644
--- a/keyboards/levinson/rev1/rev1.c
+++ b/keyboards/keebio/levinson/rev1/rev1.c
diff --git a/keyboards/levinson/rev1/rev1.h b/keyboards/keebio/levinson/rev1/rev1.h
index 2120bb0fa9..2120bb0fa9 100644
--- a/keyboards/levinson/rev1/rev1.h
+++ b/keyboards/keebio/levinson/rev1/rev1.h
diff --git a/keyboards/levinson/rev1/rules.mk b/keyboards/keebio/levinson/rev1/rules.mk
index bd518d8f27..bd518d8f27 100644
--- a/keyboards/levinson/rev1/rules.mk
+++ b/keyboards/keebio/levinson/rev1/rules.mk
diff --git a/keyboards/levinson/rev2/config.h b/keyboards/keebio/levinson/rev2/config.h
index 9bf11bee9b..a9fe895866 100644
--- a/keyboards/levinson/rev2/config.h
+++ b/keyboards/keebio/levinson/rev2/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_CONFIG_H
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x1146
 #define DEVICE_VER      0x0200
 #define MANUFACTURER    Keebio
diff --git a/keyboards/levinson/rev2/rev2.c b/keyboards/keebio/levinson/rev2/rev2.c
index 573fa787ba..573fa787ba 100644
--- a/keyboards/levinson/rev2/rev2.c
+++ b/keyboards/keebio/levinson/rev2/rev2.c
diff --git a/keyboards/levinson/rev2/rev2.h b/keyboards/keebio/levinson/rev2/rev2.h
index 2120bb0fa9..2120bb0fa9 100644
--- a/keyboards/levinson/rev2/rev2.h
+++ b/keyboards/keebio/levinson/rev2/rev2.h
diff --git a/keyboards/levinson/rev2/rules.mk b/keyboards/keebio/levinson/rev2/rules.mk
index bd518d8f27..bd518d8f27 100644
--- a/keyboards/levinson/rev2/rules.mk
+++ b/keyboards/keebio/levinson/rev2/rules.mk
diff --git a/keyboards/levinson/rules.mk b/keyboards/keebio/levinson/rules.mk
index 8f1fa130fa..cdaef48890 100644
--- a/keyboards/levinson/rules.mk
+++ b/keyboards/keebio/levinson/rules.mk
@@ -22,7 +22,7 @@ MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
@@ -30,4 +30,4 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 SPLIT_KEYBOARD = yes
 
 LAYOUTS = ortho_4x12
-DEFAULT_FOLDER = levinson/rev2
+DEFAULT_FOLDER = keebio/levinson/rev2
diff --git a/keyboards/nyquist/config.h b/keyboards/keebio/nyquist/config.h
index 863722d7d0..6868dc1354 100644
--- a/keyboards/nyquist/config.h
+++ b/keyboards/keebio/nyquist/config.h
@@ -15,9 +15,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
-
-#endif  // CONFIG_H
diff --git a/keyboards/nyquist/info.json b/keyboards/keebio/nyquist/info.json
index 295864cfc9..295864cfc9 100644
--- a/keyboards/nyquist/info.json
+++ b/keyboards/keebio/nyquist/info.json
diff --git a/keyboards/nyquist/keymaps/DivergeJM/README.md b/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
index 198e3ef887..198e3ef887 100644
--- a/keyboards/nyquist/keymaps/DivergeJM/README.md
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
diff --git a/keyboards/nyquist/keymaps/DivergeJM/config.h b/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
index 776834111d..776834111d 100644
--- a/keyboards/nyquist/keymaps/DivergeJM/config.h
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
diff --git a/keyboards/nyquist/keymaps/DivergeJM/keymap.c b/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
index db80228063..585fa6347e 100644
--- a/keyboards/nyquist/keymaps/DivergeJM/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
@@ -57,10 +57,6 @@ enum {
 #define PIPE M(R_PIPE)
 #define POINT M(R_POINT)
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Colemak
diff --git a/keyboards/nyquist/keymaps/DivergeJM/rules.mk b/keyboards/keebio/nyquist/keymaps/DivergeJM/rules.mk
index 2c26b47ea1..2c26b47ea1 100644
--- a/keyboards/nyquist/keymaps/DivergeJM/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/rules.mk
diff --git a/keyboards/nyquist/keymaps/hexwire/README.md b/keyboards/keebio/nyquist/keymaps/bakingpy/README.md
index 3ce3f6af33..3ce3f6af33 100644
--- a/keyboards/nyquist/keymaps/hexwire/README.md
+++ b/keyboards/keebio/nyquist/keymaps/bakingpy/README.md
diff --git a/keyboards/nyquist/keymaps/hexwire/Underglow Pinouts.md b/keyboards/keebio/nyquist/keymaps/bakingpy/Underglow Pinouts.md
index 9a7633a52f..9a7633a52f 100644
--- a/keyboards/nyquist/keymaps/hexwire/Underglow Pinouts.md
+++ b/keyboards/keebio/nyquist/keymaps/bakingpy/Underglow Pinouts.md
diff --git a/keyboards/nyquist/keymaps/hexwire/config.h b/keyboards/keebio/nyquist/keymaps/bakingpy/config.h
index 4f1901b5dd..eecff3dd51 100644
--- a/keyboards/nyquist/keymaps/hexwire/config.h
+++ b/keyboards/keebio/nyquist/keymaps/bakingpy/config.h
@@ -18,13 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* Use I2C or Serial, not both */
-
-#define USE_SERIAL
 // #define USE_I2C
 
 /* Select hand configuration */
-
-#define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
diff --git a/keyboards/nyquist/keymaps/hexwire/keymap.c b/keyboards/keebio/nyquist/keymaps/bakingpy/keymap.c
index c030cd3b6a..38c13f3baa 100644
--- a/keyboards/nyquist/keymaps/hexwire/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/bakingpy/keymap.c
@@ -23,7 +23,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
 #define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
diff --git a/keyboards/nyquist/keymaps/hexwire/keymap_converter.py b/keyboards/keebio/nyquist/keymaps/bakingpy/keymap_converter.py
index 683f64da45..683f64da45 100755
--- a/keyboards/nyquist/keymaps/hexwire/keymap_converter.py
+++ b/keyboards/keebio/nyquist/keymaps/bakingpy/keymap_converter.py
diff --git a/keyboards/nyquist/keymaps/hexwire/keymap_to_readme.rb b/keyboards/keebio/nyquist/keymaps/bakingpy/keymap_to_readme.rb
index 7285b008a4..7285b008a4 100755
--- a/keyboards/nyquist/keymaps/hexwire/keymap_to_readme.rb
+++ b/keyboards/keebio/nyquist/keymaps/bakingpy/keymap_to_readme.rb
diff --git a/keyboards/nyquist/keymaps/hexwire/rules.mk b/keyboards/keebio/nyquist/keymaps/bakingpy/rules.mk
index a81250cdf6..a81250cdf6 100644
--- a/keyboards/nyquist/keymaps/hexwire/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/bakingpy/rules.mk
diff --git a/keyboards/nyquist/keymaps/bramver/README.md b/keyboards/keebio/nyquist/keymaps/bramver/README.md
index 2768acdf7d..2768acdf7d 100644
--- a/keyboards/nyquist/keymaps/bramver/README.md
+++ b/keyboards/keebio/nyquist/keymaps/bramver/README.md
diff --git a/keyboards/nyquist/keymaps/bramver/config.h b/keyboards/keebio/nyquist/keymaps/bramver/config.h
index c908386e28..c908386e28 100644
--- a/keyboards/nyquist/keymaps/bramver/config.h
+++ b/keyboards/keebio/nyquist/keymaps/bramver/config.h
diff --git a/keyboards/nyquist/keymaps/bramver/keymap.c b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
index f156254679..c671b7798c 100644
--- a/keyboards/nyquist/keymaps/bramver/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
@@ -15,10 +15,6 @@
  */
 #include QMK_KEYBOARD_H
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
diff --git a/keyboards/nyquist/keymaps/bramver/rules.mk b/keyboards/keebio/nyquist/keymaps/bramver/rules.mk
index d211d7b4cf..d211d7b4cf 100644
--- a/keyboards/nyquist/keymaps/bramver/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/bramver/rules.mk
diff --git a/keyboards/nyquist/keymaps/danielhklein/config.h b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
index 09abbccb72..09abbccb72 100644
--- a/keyboards/nyquist/keymaps/danielhklein/config.h
+++ b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
diff --git a/keyboards/nyquist/keymaps/danielhklein/keymap.c b/keyboards/keebio/nyquist/keymaps/danielhklein/keymap.c
index e072527b1e..496b1afa36 100644
--- a/keyboards/nyquist/keymaps/danielhklein/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/danielhklein/keymap.c
@@ -41,10 +41,6 @@ enum custom_keycodes {
 #define BSP_RSE FUNC(1)
 #define ARW FUNC(2)
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 // Underglow setup
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/nyquist/keymaps/danielhklein/rules.mk b/keyboards/keebio/nyquist/keymaps/danielhklein/rules.mk
index 12ad2fec59..12ad2fec59 100644
--- a/keyboards/nyquist/keymaps/danielhklein/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/danielhklein/rules.mk
diff --git a/keyboards/keebio/nyquist/keymaps/default/config.h b/keyboards/keebio/nyquist/keymaps/default/config.h
new file mode 100644
index 0000000000..ef1c4a51ab
--- /dev/null
+++ b/keyboards/keebio/nyquist/keymaps/default/config.h
@@ -0,0 +1,31 @@
+/*
+Copyright 2017 Danny Nguyen <danny@hexwire.com>
+
+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
+
+// #define USE_I2C
+
+/* Select hand configuration */
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+#undef RGBLED_NUM
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 12
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/nyquist/keymaps/default/keymap.c b/keyboards/keebio/nyquist/keymaps/default/keymap.c
index 0e3a1b9ab8..ecaad49bb2 100644
--- a/keyboards/nyquist/keymaps/default/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/default/keymap.c
@@ -22,10 +22,6 @@ enum custom_keycodes {
   ADJUST,
 };
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Qwerty
diff --git a/keyboards/viterbi/keymaps/default/rules.mk b/keyboards/keebio/nyquist/keymaps/default/rules.mk
index 1e3cebb145..1e3cebb145 100644
--- a/keyboards/viterbi/keymaps/default/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/default/rules.mk
diff --git a/keyboards/nyquist/keymaps/jojiichan/config.h b/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
index 39a3df26bf..39a3df26bf 100644
--- a/keyboards/nyquist/keymaps/jojiichan/config.h
+++ b/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
diff --git a/keyboards/nyquist/keymaps/jojiichan/keymap.c b/keyboards/keebio/nyquist/keymaps/jojiichan/keymap.c
index e8f92f37d7..a0d8c46475 100644
--- a/keyboards/nyquist/keymaps/jojiichan/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/jojiichan/keymap.c
@@ -2,11 +2,6 @@
 
 extern keymap_config_t keymap_config;
 
-
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT(
diff --git a/keyboards/nyquist/keymaps/jojiichan/rules.mk b/keyboards/keebio/nyquist/keymaps/jojiichan/rules.mk
index a81250cdf6..a81250cdf6 100644
--- a/keyboards/nyquist/keymaps/jojiichan/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/jojiichan/rules.mk
diff --git a/keyboards/nyquist/keymaps/kim-kim/config.h b/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
index a6246262e5..a6246262e5 100644
--- a/keyboards/nyquist/keymaps/kim-kim/config.h
+++ b/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
diff --git a/keyboards/nyquist/keymaps/kim-kim/keymap.c b/keyboards/keebio/nyquist/keymaps/kim-kim/keymap.c
index 4051f296ee..79e485f003 100644
--- a/keyboards/nyquist/keymaps/kim-kim/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/kim-kim/keymap.c
@@ -10,10 +10,6 @@ extern keymap_config_t keymap_config;
 #define _LW 1
 #define _RS 2
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* SPLIT QWERTY
diff --git a/keyboards/nyquist/keymaps/kim-kim/rules.mk b/keyboards/keebio/nyquist/keymaps/kim-kim/rules.mk
index a81250cdf6..a81250cdf6 100644
--- a/keyboards/nyquist/keymaps/kim-kim/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/kim-kim/rules.mk
diff --git a/keyboards/nyquist/keymaps/losinggeneration/README.md b/keyboards/keebio/nyquist/keymaps/losinggeneration/README.md
index a51b94e407..a51b94e407 100644
--- a/keyboards/nyquist/keymaps/losinggeneration/README.md
+++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/README.md
diff --git a/keyboards/nyquist/keymaps/losinggeneration/config.h b/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h
index 3303794471..3303794471 100644
--- a/keyboards/nyquist/keymaps/losinggeneration/config.h
+++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h
diff --git a/keyboards/nyquist/keymaps/losinggeneration/keymap.c b/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
index 3e2c6edb70..3e2c6edb70 100644
--- a/keyboards/nyquist/keymaps/losinggeneration/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
diff --git a/keyboards/nyquist/keymaps/losinggeneration/rules.mk b/keyboards/keebio/nyquist/keymaps/losinggeneration/rules.mk
index 17ef684830..17ef684830 100644
--- a/keyboards/nyquist/keymaps/losinggeneration/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/rules.mk
diff --git a/keyboards/nyquist/keymaps/default/config.h b/keyboards/keebio/nyquist/keymaps/mtdjr/config.h
index 0fa606f296..0fa606f296 100644
--- a/keyboards/nyquist/keymaps/default/config.h
+++ b/keyboards/keebio/nyquist/keymaps/mtdjr/config.h
diff --git a/keyboards/nyquist/keymaps/mtdjr/keymap.c b/keyboards/keebio/nyquist/keymaps/mtdjr/keymap.c
index 668e7964b5..668e7964b5 100644
--- a/keyboards/nyquist/keymaps/mtdjr/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/mtdjr/keymap.c
diff --git a/keyboards/nyquist/keymaps/mtdjr/rules.mk b/keyboards/keebio/nyquist/keymaps/mtdjr/rules.mk
index d7463419b4..d7463419b4 100644
--- a/keyboards/nyquist/keymaps/mtdjr/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/mtdjr/rules.mk
diff --git a/keyboards/nyquist/keymaps/pitty/README.md b/keyboards/keebio/nyquist/keymaps/pitty/README.md
index af933a6a56..af933a6a56 100644
--- a/keyboards/nyquist/keymaps/pitty/README.md
+++ b/keyboards/keebio/nyquist/keymaps/pitty/README.md
diff --git a/keyboards/nyquist/keymaps/pitty/config.h b/keyboards/keebio/nyquist/keymaps/pitty/config.h
index efc75b22c7..efc75b22c7 100644
--- a/keyboards/nyquist/keymaps/pitty/config.h
+++ b/keyboards/keebio/nyquist/keymaps/pitty/config.h
diff --git a/keyboards/nyquist/keymaps/pitty/keymap.c b/keyboards/keebio/nyquist/keymaps/pitty/keymap.c
index dea317d2ae..4dec42b853 100644
--- a/keyboards/nyquist/keymaps/pitty/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/pitty/keymap.c
@@ -13,11 +13,6 @@ enum custom_macros {
     DRIGHT,
 };
 
-
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Qwerty
diff --git a/keyboards/nyquist/keymaps/pitty/rules.mk b/keyboards/keebio/nyquist/keymaps/pitty/rules.mk
index 53a426157e..53a426157e 100644
--- a/keyboards/nyquist/keymaps/pitty/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/pitty/rules.mk
diff --git a/keyboards/nyquist/keymaps/shovelpaw/config.h b/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
index d0adbfe0c8..d0adbfe0c8 100644
--- a/keyboards/nyquist/keymaps/shovelpaw/config.h
+++ b/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
diff --git a/keyboards/nyquist/keymaps/shovelpaw/keymap.c b/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
index 87e44ff043..87e44ff043 100644
--- a/keyboards/nyquist/keymaps/shovelpaw/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
diff --git a/keyboards/nyquist/keymaps/shovelpaw/rules.mk b/keyboards/keebio/nyquist/keymaps/shovelpaw/rules.mk
index 44ca075c34..44ca075c34 100644
--- a/keyboards/nyquist/keymaps/shovelpaw/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/shovelpaw/rules.mk
diff --git a/keyboards/nyquist/keymaps/skug/config.h b/keyboards/keebio/nyquist/keymaps/skug/config.h
index c366863294..c366863294 100644
--- a/keyboards/nyquist/keymaps/skug/config.h
+++ b/keyboards/keebio/nyquist/keymaps/skug/config.h
diff --git a/keyboards/nyquist/keymaps/skug/keymap.c b/keyboards/keebio/nyquist/keymaps/skug/keymap.c
index fe3229966f..fe3229966f 100644
--- a/keyboards/nyquist/keymaps/skug/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/skug/keymap.c
diff --git a/keyboards/nyquist/keymaps/skug/rules.mk b/keyboards/keebio/nyquist/keymaps/skug/rules.mk
index e0ed6f0c2d..e0ed6f0c2d 100644
--- a/keyboards/nyquist/keymaps/skug/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/skug/rules.mk
diff --git a/keyboards/keebio/nyquist/keymaps/tester/config.h b/keyboards/keebio/nyquist/keymaps/tester/config.h
new file mode 100644
index 0000000000..4f5f10cebc
--- /dev/null
+++ b/keyboards/keebio/nyquist/keymaps/tester/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2017 Danny Nguyen <danny@hexwire.com>
+
+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
+
+#define USE_I2C
diff --git a/keyboards/keebio/nyquist/keymaps/tester/keymap.c b/keyboards/keebio/nyquist/keymaps/tester/keymap.c
new file mode 100644
index 0000000000..f1e1932710
--- /dev/null
+++ b/keyboards/keebio/nyquist/keymaps/tester/keymap.c
@@ -0,0 +1,226 @@
+#include QMK_KEYBOARD_H
+
+extern keymap_config_t keymap_config;
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _QWERTY 0
+#define _COLEMAK 1
+#define _DVORAK 2
+#define _LOWER 3
+#define _RAISE 4
+#define _ADJUST 16
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK,
+  DVORAK,
+  LOWER,
+  RAISE,
+  ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT( \
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+  BL_STEP, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    BL_STEP, KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, \
+  RGB_MOD, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    RGB_MOD, KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
+  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
+),
+
+/* Colemak
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT( \
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL, \
+  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
+  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
+),
+
+/* Dvorak
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DVORAK] = LAYOUT( \
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL, \
+  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
+  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT , \
+  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT( \
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \
+  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT( \
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL, \
+  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
+),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |  Del |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] =  LAYOUT( \
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
+  _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL, \
+  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+)
+
+
+};
+
+#ifdef AUDIO_ENABLE
+float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
+float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
+float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
+#endif
+
+void persistent_default_layer_set(uint16_t default_layer) {
+  eeconfig_update_default_layer(default_layer);
+  default_layer_set(default_layer);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(tone_qwerty);
+        #endif
+        persistent_default_layer_set(1UL<<_QWERTY);
+      }
+      return false;
+      break;
+    case COLEMAK:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(tone_colemak);
+        #endif
+        persistent_default_layer_set(1UL<<_COLEMAK);
+      }
+      return false;
+      break;
+    case DVORAK:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(tone_dvorak);
+        #endif
+        persistent_default_layer_set(1UL<<_DVORAK);
+      }
+      return false;
+      break;
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case ADJUST:
+      if (record->event.pressed) {
+        layer_on(_ADJUST);
+      } else {
+        layer_off(_ADJUST);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
diff --git a/keyboards/viterbi/keymaps/dwallace/rules.mk b/keyboards/keebio/nyquist/keymaps/tester/rules.mk
index 1e3cebb145..1e3cebb145 100644
--- a/keyboards/viterbi/keymaps/dwallace/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/tester/rules.mk
diff --git a/keyboards/nyquist/keymaps/yshrsmz/config.h b/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
index 5cbe3b7010..5cbe3b7010 100644
--- a/keyboards/nyquist/keymaps/yshrsmz/config.h
+++ b/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
diff --git a/keyboards/nyquist/keymaps/yshrsmz/keymap.c b/keyboards/keebio/nyquist/keymaps/yshrsmz/keymap.c
index 78070279d1..d4c2d4ba23 100644
--- a/keyboards/nyquist/keymaps/yshrsmz/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/yshrsmz/keymap.c
@@ -20,10 +20,6 @@ enum custom_keycodes {
   ADJUST,
 };
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Qwerty
diff --git a/keyboards/nyquist/keymaps/yshrsmz/rules.mk b/keyboards/keebio/nyquist/keymaps/yshrsmz/rules.mk
index c9383ab8db..c9383ab8db 100644
--- a/keyboards/nyquist/keymaps/yshrsmz/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/yshrsmz/rules.mk
diff --git a/keyboards/nyquist/nyquist.c b/keyboards/keebio/nyquist/nyquist.c
index 2face09d42..2face09d42 100644
--- a/keyboards/nyquist/nyquist.c
+++ b/keyboards/keebio/nyquist/nyquist.c
diff --git a/keyboards/nyquist/nyquist.h b/keyboards/keebio/nyquist/nyquist.h
index 9a3e996476..7b0ecf5423 100644
--- a/keyboards/nyquist/nyquist.h
+++ b/keyboards/keebio/nyquist/nyquist.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#ifdef KEYBOARD_nyquist_rev1
+#ifdef KEYBOARD_keebio_nyquist_rev1
     #include "rev1.h"
 #endif
-#ifdef KEYBOARD_nyquist_rev2
+#ifdef KEYBOARD_keebio_nyquist_rev2
     #include "rev2.h"
 #endif
-#ifdef KEYBOARD_nyquist_rev3
+#ifdef KEYBOARD_keebio_nyquist_rev3
     #include "rev3.h"
 #endif
 
diff --git a/keyboards/nyquist/readme.md b/keyboards/keebio/nyquist/readme.md
index e3d75b448f..9fa7259d87 100644
--- a/keyboards/nyquist/readme.md
+++ b/keyboards/keebio/nyquist/readme.md
@@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nyquist/rev1:default
+    make keebio/nyquist/rev2:default
 
 Example of flashing this keyboard:
 
-    make nyquist/rev1:default:avrdude
+    make keebio/nyquist/rev2:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/nyquist/rev1/config.h b/keyboards/keebio/nyquist/rev1/config.h
index 98381aca74..98381aca74 100644
--- a/keyboards/nyquist/rev1/config.h
+++ b/keyboards/keebio/nyquist/rev1/config.h
diff --git a/keyboards/nyquist/rev1/rev1.c b/keyboards/keebio/nyquist/rev1/rev1.c
index 5f4cd32f69..5f4cd32f69 100644
--- a/keyboards/nyquist/rev1/rev1.c
+++ b/keyboards/keebio/nyquist/rev1/rev1.c
diff --git a/keyboards/nyquist/rev1/rev1.h b/keyboards/keebio/nyquist/rev1/rev1.h
index 6d3a23383b..6d3a23383b 100644
--- a/keyboards/nyquist/rev1/rev1.h
+++ b/keyboards/keebio/nyquist/rev1/rev1.h
diff --git a/keyboards/nyquist/rev1/rules.mk b/keyboards/keebio/nyquist/rev1/rules.mk
index 7b30c0beff..7b30c0beff 100644
--- a/keyboards/nyquist/rev1/rules.mk
+++ b/keyboards/keebio/nyquist/rev1/rules.mk
diff --git a/keyboards/nyquist/rev2/config.h b/keyboards/keebio/nyquist/rev2/config.h
index 52c50694bf..52c50694bf 100644
--- a/keyboards/nyquist/rev2/config.h
+++ b/keyboards/keebio/nyquist/rev2/config.h
diff --git a/keyboards/nyquist/rev2/rev2.c b/keyboards/keebio/nyquist/rev2/rev2.c
index 9922b8995a..9922b8995a 100644
--- a/keyboards/nyquist/rev2/rev2.c
+++ b/keyboards/keebio/nyquist/rev2/rev2.c
diff --git a/keyboards/nyquist/rev2/rev2.h b/keyboards/keebio/nyquist/rev2/rev2.h
index 6d3a23383b..6d3a23383b 100644
--- a/keyboards/nyquist/rev2/rev2.h
+++ b/keyboards/keebio/nyquist/rev2/rev2.h
diff --git a/keyboards/nyquist/rev2/rules.mk b/keyboards/keebio/nyquist/rev2/rules.mk
index bd518d8f27..bd518d8f27 100644
--- a/keyboards/nyquist/rev2/rules.mk
+++ b/keyboards/keebio/nyquist/rev2/rules.mk
diff --git a/keyboards/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h
index 18b40ecec7..18b40ecec7 100644
--- a/keyboards/nyquist/rev3/config.h
+++ b/keyboards/keebio/nyquist/rev3/config.h
diff --git a/keyboards/nyquist/rev3/rev3.c b/keyboards/keebio/nyquist/rev3/rev3.c
index 34500fb104..34500fb104 100644
--- a/keyboards/nyquist/rev3/rev3.c
+++ b/keyboards/keebio/nyquist/rev3/rev3.c
diff --git a/keyboards/nyquist/rev3/rev3.h b/keyboards/keebio/nyquist/rev3/rev3.h
index 274b83926b..274b83926b 100644
--- a/keyboards/nyquist/rev3/rev3.h
+++ b/keyboards/keebio/nyquist/rev3/rev3.h
diff --git a/keyboards/nyquist/rev3/rules.mk b/keyboards/keebio/nyquist/rev3/rules.mk
index 31077066a3..31077066a3 100644
--- a/keyboards/nyquist/rev3/rules.mk
+++ b/keyboards/keebio/nyquist/rev3/rules.mk
diff --git a/keyboards/nyquist/rules.mk b/keyboards/keebio/nyquist/rules.mk
index 5313b85022..51821a4824 100644
--- a/keyboards/nyquist/rules.mk
+++ b/keyboards/keebio/nyquist/rules.mk
@@ -68,4 +68,4 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 SPLIT_KEYBOARD = yes
 LAYOUTS = ortho_5x12
-DEFAULT_FOLDER = nyquist/rev2
+DEFAULT_FOLDER = keebio/nyquist/rev2
diff --git a/keyboards/fourier/config.h b/keyboards/keebio/quefrency/config.h
index cfb6bf4ffc..cfb6bf4ffc 100644
--- a/keyboards/fourier/config.h
+++ b/keyboards/keebio/quefrency/config.h
diff --git a/keyboards/quefrency/info.json b/keyboards/keebio/quefrency/info.json
index 160e7896bb..160e7896bb 100644
--- a/keyboards/quefrency/info.json
+++ b/keyboards/keebio/quefrency/info.json
diff --git a/keyboards/quefrency/keymaps/bjohnson/config.h b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
index 37c6d6672d..37c6d6672d 100644
--- a/keyboards/quefrency/keymaps/bjohnson/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
diff --git a/keyboards/quefrency/keymaps/bjohnson/keymap.c b/keyboards/keebio/quefrency/keymaps/bjohnson/keymap.c
index 434a0a3058..434a0a3058 100644
--- a/keyboards/quefrency/keymaps/bjohnson/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bjohnson/keymap.c
diff --git a/keyboards/quefrency/keymaps/bjohnson/rules.mk b/keyboards/keebio/quefrency/keymaps/bjohnson/rules.mk
index 70fa711009..70fa711009 100644
--- a/keyboards/quefrency/keymaps/bjohnson/rules.mk
+++ b/keyboards/keebio/quefrency/keymaps/bjohnson/rules.mk
diff --git a/keyboards/quefrency/keymaps/bramver/README.md b/keyboards/keebio/quefrency/keymaps/bramver/README.md
index 76310ed73a..76310ed73a 100644
--- a/keyboards/quefrency/keymaps/bramver/README.md
+++ b/keyboards/keebio/quefrency/keymaps/bramver/README.md
diff --git a/keyboards/quefrency/keymaps/bramver/config.h b/keyboards/keebio/quefrency/keymaps/bramver/config.h
index c908386e28..c908386e28 100644
--- a/keyboards/quefrency/keymaps/bramver/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bramver/config.h
diff --git a/keyboards/quefrency/keymaps/bramver/keymap.c b/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
index 527f5de047..f995f9bfab 100644
--- a/keyboards/quefrency/keymaps/bramver/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
@@ -4,9 +4,6 @@ enum custom_keycodes {
   QWERTY = SAFE_RANGE,
 };
 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 #define _BASE 0
 #define _LMSE 1
 #define _RMSE 2
@@ -100,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , \
     _______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,\
     _______ , _______ , KC_PGDN , KC_PGUP , KC_END  , KC_HOME , _______ , _______ , _______ , _______ , _______ , _______ , _______ , \
-    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______ 
+    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______
   ),
 
   [_RMSE] = LAYOUT(
@@ -108,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______ , _______ , _______ , _______ , _______ , _______ , KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______ , _______ , _______ , \
     _______ , _______ , _______ , _______ , _______ , _______ , KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______ , _______ ,\
     _______ , _______ , _______ , _______ , _______ , _______ , KC_HOME , KC_END  , KC_PGUP , KC_PGDN , _______ , _______ , _______ , \
-    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______ 
+    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______
   ),
 
   [_SYMB] = LAYOUT(
@@ -116,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , \
     _______ , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , _______ , _______ ,\
     _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , \
-    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______ 
+    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______
   ),
 
   [_EMOJ] = LAYOUT(
@@ -124,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______ , X(CLAP) , X(CUM)  , X(BNIS) , X(BUTT) , X(CAR)  , X(FIRE) , X(REDB) , X(MONY) , X(HNDR) , X(SOS)  , _______ , _______ , _______ , \
     _______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) , X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______ , _______ ,\
     _______ , X(TRIU) , X(SCRM) , X(VOMI) , X(DTIV) , X(EXPL) , X(HAIR) , X(DANC) , X(STRN) , X(LEFT) , X(RGHT) , _______ , _______ , \
-    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______ 
+    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______
   ),
 
 };
diff --git a/keyboards/quefrency/keymaps/bramver/rules.mk b/keyboards/keebio/quefrency/keymaps/bramver/rules.mk
index d211d7b4cf..d211d7b4cf 100644
--- a/keyboards/quefrency/keymaps/bramver/rules.mk
+++ b/keyboards/keebio/quefrency/keymaps/bramver/rules.mk
diff --git a/keyboards/quefrency/keymaps/default/config.h b/keyboards/keebio/quefrency/keymaps/default/config.h
index f9efe78c5b..f9efe78c5b 100644
--- a/keyboards/quefrency/keymaps/default/config.h
+++ b/keyboards/keebio/quefrency/keymaps/default/config.h
diff --git a/keyboards/quefrency/keymaps/default/keymap.c b/keyboards/keebio/quefrency/keymaps/default/keymap.c
index 964a997dd9..744a8d32a4 100644
--- a/keyboards/quefrency/keymaps/default/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/default/keymap.c
@@ -13,9 +13,6 @@ enum custom_keycodes {
   QWERTY = SAFE_RANGE,
 };
 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, \
diff --git a/keyboards/laplace/keymaps/default/rules.mk b/keyboards/keebio/quefrency/keymaps/default/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/laplace/keymaps/default/rules.mk
+++ b/keyboards/keebio/quefrency/keymaps/default/rules.mk
diff --git a/keyboards/quefrency/keymaps/default65/config.h b/keyboards/keebio/quefrency/keymaps/default65/config.h
index f9efe78c5b..f9efe78c5b 100644
--- a/keyboards/quefrency/keymaps/default65/config.h
+++ b/keyboards/keebio/quefrency/keymaps/default65/config.h
diff --git a/keyboards/quefrency/keymaps/default65/keymap.c b/keyboards/keebio/quefrency/keymaps/default65/keymap.c
index 4b07949b06..3e77731671 100644
--- a/keyboards/quefrency/keymaps/default65/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/default65/keymap.c
@@ -13,9 +13,6 @@ enum custom_keycodes {
   QWERTY = SAFE_RANGE,
 };
 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_65(
     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME, \
diff --git a/keyboards/quefrency/keymaps/default/rules.mk b/keyboards/keebio/quefrency/keymaps/default65/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/quefrency/keymaps/default/rules.mk
+++ b/keyboards/keebio/quefrency/keymaps/default65/rules.mk
diff --git a/keyboards/quefrency/keymaps/default65macro/config.h b/keyboards/keebio/quefrency/keymaps/default65macro/config.h
index 53bf8fb933..53bf8fb933 100644
--- a/keyboards/quefrency/keymaps/default65macro/config.h
+++ b/keyboards/keebio/quefrency/keymaps/default65macro/config.h
diff --git a/keyboards/quefrency/keymaps/default65macro/keymap.c b/keyboards/keebio/quefrency/keymaps/default65macro/keymap.c
index c7ac46ea5a..4503291d28 100644
--- a/keyboards/quefrency/keymaps/default65macro/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/default65macro/keymap.c
@@ -13,9 +13,6 @@ enum custom_keycodes {
   QWERTY = SAFE_RANGE,
 };
 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_65_with_macro(
     KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME, \
diff --git a/keyboards/quefrency/quefrency.c b/keyboards/keebio/quefrency/quefrency.c
index d713a0ff3a..d713a0ff3a 100644
--- a/keyboards/quefrency/quefrency.c
+++ b/keyboards/keebio/quefrency/quefrency.c
diff --git a/keyboards/fourier/fourier.h b/keyboards/keebio/quefrency/quefrency.h
index 1b4585c821..0c387a6d5d 100644
--- a/keyboards/fourier/fourier.h
+++ b/keyboards/keebio/quefrency/quefrency.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#ifdef KEYBOARD_fourier_rev1
+#include "quantum.h"
+
+#ifdef KEYBOARD_keebio_quefrency_rev1
     #include "rev1.h"
 #endif
 
-#include "quantum.h"
-
 // Used to create a keymap using only KC_ prefixed keys
 #define LAYOUT_kc( \
     LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
diff --git a/keyboards/quefrency/readme.md b/keyboards/keebio/quefrency/readme.md
index 66d033b6b2..3f0e7d98e7 100644
--- a/keyboards/quefrency/readme.md
+++ b/keyboards/keebio/quefrency/readme.md
@@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make quefrency/rev1:default
+    make keebio/quefrency/rev1:default
 
 Example of flashing this keyboard:
 
-    make quefrency/rev1:default:avrdude
+    make keebio/quefrency/rev1:default:avrdude
 
 Handedness detection is already hardwired onto the PCB, so no need to deal with `EE_HANDS` or flashing .eep files.
 
diff --git a/keyboards/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h
index 4b95eea509..4b95eea509 100644
--- a/keyboards/quefrency/rev1/config.h
+++ b/keyboards/keebio/quefrency/rev1/config.h
diff --git a/keyboards/quefrency/rev1/rev1.c b/keyboards/keebio/quefrency/rev1/rev1.c
index a690a7eff7..a690a7eff7 100644
--- a/keyboards/quefrency/rev1/rev1.c
+++ b/keyboards/keebio/quefrency/rev1/rev1.c
diff --git a/keyboards/quefrency/rev1/rev1.h b/keyboards/keebio/quefrency/rev1/rev1.h
index 137aa41c2f..137aa41c2f 100644
--- a/keyboards/quefrency/rev1/rev1.h
+++ b/keyboards/keebio/quefrency/rev1/rev1.h
diff --git a/keyboards/quefrency/keymaps/default65/rules.mk b/keyboards/keebio/quefrency/rev1/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/quefrency/keymaps/default65/rules.mk
+++ b/keyboards/keebio/quefrency/rev1/rules.mk
diff --git a/keyboards/quefrency/rules.mk b/keyboards/keebio/quefrency/rules.mk
index 3ec04fbf1f..c28696c08e 100644
--- a/keyboards/quefrency/rules.mk
+++ b/keyboards/keebio/quefrency/rules.mk
@@ -22,12 +22,10 @@ MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SUBPROJECT_rev1 = yes
-USE_I2C = yes
+RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = quefrency/rev1
+DEFAULT_FOLDER = keebio/quefrency/rev1
diff --git a/keyboards/rorschach/config.h b/keyboards/keebio/rorschach/config.h
index 03fde5399d..769330e399 100644
--- a/keyboards/rorschach/config.h
+++ b/keyboards/keebio/rorschach/config.h
@@ -15,9 +15,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
-
-#endif  // CONFIG_H
diff --git a/keyboards/rorschach/info.json b/keyboards/keebio/rorschach/info.json
index a5856fa592..a5856fa592 100644
--- a/keyboards/rorschach/info.json
+++ b/keyboards/keebio/rorschach/info.json
diff --git a/keyboards/rorschach/keymaps/default/config.h b/keyboards/keebio/rorschach/keymaps/default/config.h
index b6a9436323..da32daebb3 100644
--- a/keyboards/rorschach/keymaps/default/config.h
+++ b/keyboards/keebio/rorschach/keymaps/default/config.h
@@ -17,11 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
 // #define USE_I2C
 
 /* Select hand configuration */
-#define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
diff --git a/keyboards/rorschach/keymaps/default/keymap.c b/keyboards/keebio/rorschach/keymaps/default/keymap.c
index 736d4d353c..736d4d353c 100644
--- a/keyboards/rorschach/keymaps/default/keymap.c
+++ b/keyboards/keebio/rorschach/keymaps/default/keymap.c
diff --git a/keyboards/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
index 2048232c9c..2048232c9c 100644
--- a/keyboards/rorschach/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
diff --git a/keyboards/rorschach/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
index 5d93e2f057..81c163a028 100644
--- a/keyboards/rorschach/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
@@ -28,9 +28,6 @@ enum rorschach_keycodes {
   NKROTG = MAGIC_TOGGLE_NKRO,
 };
 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 //Tap Dance Declarations
 enum {
   ADJ = 0,
@@ -60,7 +57,7 @@ void dance_LAYER_reset(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-[ADJ]    = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer 
+[ADJ]    = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer
 [LBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
 [RBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
 [EQPL]   = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
@@ -86,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/FN|                  |Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
 *  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
 *                                          | Ent/NS|  Bspc |  | Enter |Del/NS2|
-*                                          `---------------'  `---------------'    
+*                                          `---------------'  `---------------'
 */
 [_COLEMAK] = LAYOUT(
   KC_TAB,  KC_Q,   KC_W,    KC_F,    KC_P,   KC_G,                    KC_J,   KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
@@ -95,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_INS,  KC_GRV, KC_LBRC, KC_RBRC, ALTAPP, SPCFN,                   BSPCFN, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
                                              ENTNS, KC_BSPC,  KC_ENT, DELNS
 ),
-  
+
 /* QWERTY
 *  (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
 *  ,-----------------------------------------------.                  ,-----------------------------------------------.
@@ -108,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/FN|                  |Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
 *  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
 *                                          | Ent/NS|  Bspc |  | Enter |Del/NS2|
-*                                          `---------------'  `---------------'    
+*                                          `---------------'  `---------------'
 */
 [_QWERTY] = LAYOUT(
   KC_TAB,  KC_Q,   KC_W,    KC_E,    KC_R,   KC_T,                    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
@@ -130,15 +127,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |       |       |       |       |       |
 *  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
 *                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'    
+*                                          `---------------'  `---------------'
 */
 [_NUMBERS] = LAYOUT(
-  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,                       KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______, 
-  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______, 
+  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,                       KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,
+  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,
   _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ),                   TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
   KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,                    _______,  _______,  _______,  _______, _______, _______,
                                                   _______, _______,  _______, _______
-), 
+),
 
 /* Number/Function Key layer
 *  (Multiple characters: single-tap for first, double-tap for second)
@@ -152,15 +149,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |       |       |       |       |       |
 *  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
 *                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'    
+*                                          `---------------'  `---------------'
 */
 [_NUMBERS2] = LAYOUT(
-  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,                       KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,  KC_F12, 
-  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_F1,    KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6, 
+  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,                       KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,  KC_F12,
+  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_F1,    KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,
   _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ),                   TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
   KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,                    _______,  _______,  _______,  _______, _______, _______,
                                                   _______, _______,  _______, _______
-), 
+),
 
 /* Function layer
 *  ,-----------------------------------------------.                  ,-----------------------------------------------.
@@ -173,23 +170,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *  |       |       |       |       |       |       |                  |       |       |  Prev |  Play |  Next |  Stop |
 *  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
 *                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'    
+*                                          `---------------'  `---------------'
 */
 [_FUNCTION] = LAYOUT(
-  _______, _______,    _______,    KC_UP,      _______,    _______,                    _______, _______, KC_UP,   LCTL(KC_Y), _______, _______, 
+  _______, _______,    _______,    KC_UP,      _______,    _______,                    _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
   _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
   _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                    KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
   _______, _______,    _______,    _______,    _______,    _______,                    _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP,
                                                            _______, _______,  _______, _______
-), 
+),
 
 [_FUNCTION2] = LAYOUT(
-  _______, _______,    _______,    KC_UP,      _______,    _______,                    _______, _______, KC_UP,   LCTL(KC_Y), _______, _______, 
+  _______, _______,    _______,    KC_UP,      _______,    _______,                    _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
   _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
   _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                    KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
   _______, _______,    _______,    _______,    _______,    _______,                    _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP,
                                                            _______, _______,  _______, _______
-), 
+),
 
 /* Numpad layer
 *  (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
@@ -203,11 +200,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |  KP 0 |   =   |  KP . |  KP + |       |
 *  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
 *                                          |       |       |  | KP Ent|       |
-*                                          `---------------'  `---------------'    
+*                                          `---------------'  `---------------'
 */
 [_NUMPAD] = LAYOUT(
-  _______, KC_P6,   KC_P7,    KC_P8,      KC_P9,     KC_P0,                      KC_NLCK, KC_P7, KC_P8,  KC_P9,   KC_PSLS, _______, 
-  _______, KC_P1,   KC_P2,    KC_P3,      KC_P4,     KC_P5,                      KC_TAB,  KC_P4, KC_P5,  KC_P6,   KC_PAST, _______, 
+  _______, KC_P6,   KC_P7,    KC_P8,      KC_P9,     KC_P0,                      KC_NLCK, KC_P7, KC_P8,  KC_P9,   KC_PSLS, _______,
+  _______, KC_P1,   KC_P2,    KC_P3,      KC_P4,     KC_P5,                      KC_TAB,  KC_P4, KC_P5,  KC_P6,   KC_PAST, _______,
   _______, KC_NLCK, KC_PDOT,  TD(PSLPAS), TD(PMNUN), TD(PPLEQ),                  _______, KC_P1, KC_P2,  KC_P3,   KC_PMNS, _______,
   KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),   _______,   _______,                    _______, KC_P0, KC_EQL, KC_PDOT, KC_PPLS, _______,
                                                      _______, _______,  KC_PENT, _______
@@ -225,24 +222,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *  |       |       |       |       |       |       |                  |       |       |       |       |       |       |
 *  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
 *                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'    
+*                                          `---------------'  `---------------'
 */
 [_ADJUST] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, RESET, 
+  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, RESET,
   _______, _______, _______, _______, _______, _______,                    _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
                                                _______, _______,  _______, _______
-), 
+),
 
 [_ADJUST2] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, RESET, 
+  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, RESET,
   _______, _______, _______, _______, _______, _______,                    _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
                                                _______, _______,  _______, _______
 )
- 
+
 };
 
 uint32_t layer_state_set_user(uint32_t state) {
@@ -286,4 +283,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
   }
   return true;
-}
\ No newline at end of file
+}
diff --git a/keyboards/rorschach/keymaps/insertsnideremarks/rules.mk b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk
index b9e39c0539..b9e39c0539 100644
--- a/keyboards/rorschach/keymaps/insertsnideremarks/rules.mk
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk
diff --git a/keyboards/rorschach/readme.md b/keyboards/keebio/rorschach/readme.md
index 8858b72144..1a623a5353 100644
--- a/keyboards/rorschach/readme.md
+++ b/keyboards/keebio/rorschach/readme.md
@@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make rorschach/rev1:default
+    make keebio/rorschach/rev1:default
 
 Example of flashing this keyboard:
 
-    make rorschach/rev1:default:avrdude
+    make keebio/rorschach/rev1:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h
index 0ec9cdb31e..13402544f8 100644
--- a/keyboards/rorschach/rev1/config.h
+++ b/keyboards/keebio/rorschach/rev1/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_CONFIG_H
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x1246
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    Keebio
diff --git a/keyboards/rorschach/rev1/rev1.c b/keyboards/keebio/rorschach/rev1/rev1.c
index cd7f935ca5..cd7f935ca5 100644
--- a/keyboards/rorschach/rev1/rev1.c
+++ b/keyboards/keebio/rorschach/rev1/rev1.c
diff --git a/keyboards/rorschach/rev1/rev1.h b/keyboards/keebio/rorschach/rev1/rev1.h
index 583f0efc44..583f0efc44 100644
--- a/keyboards/rorschach/rev1/rev1.h
+++ b/keyboards/keebio/rorschach/rev1/rev1.h
diff --git a/keyboards/rorschach/rev1/rules.mk b/keyboards/keebio/rorschach/rev1/rules.mk
index bd518d8f27..bd518d8f27 100644
--- a/keyboards/rorschach/rev1/rules.mk
+++ b/keyboards/keebio/rorschach/rev1/rules.mk
diff --git a/keyboards/rorschach/rorschach.c b/keyboards/keebio/rorschach/rorschach.c
index 49e2917890..49e2917890 100644
--- a/keyboards/rorschach/rorschach.c
+++ b/keyboards/keebio/rorschach/rorschach.c
diff --git a/keyboards/rorschach/rorschach.h b/keyboards/keebio/rorschach/rorschach.h
index 5c320b6a12..45e64587f4 100644
--- a/keyboards/rorschach/rorschach.h
+++ b/keyboards/keebio/rorschach/rorschach.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef KEYBOARD_rorschach_rev1
+#ifdef KEYBOARD_keebio_rorschach_rev1
     #include "rev1.h"
 #endif
 
diff --git a/keyboards/rorschach/rules.mk b/keyboards/keebio/rorschach/rules.mk
index 3201253487..b500740522 100644
--- a/keyboards/rorschach/rules.mk
+++ b/keyboards/keebio/rorschach/rules.mk
@@ -17,10 +17,10 @@ MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = rorschach/rev1
+DEFAULT_FOLDER = keebio/rorschach/rev1
diff --git a/keyboards/tragicforce68/README.md b/keyboards/keebio/tragicforce68/README.md
index 7cca1b5055..c3ea92d7ad 100644
--- a/keyboards/tragicforce68/README.md
+++ b/keyboards/keebio/tragicforce68/README.md
@@ -9,10 +9,10 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make tragicforce68:default
+    make keebio/tragicforce68:default
 
 Example of flashing this keyboard:
 
-    make tragicforce68:default:avrdude
+    make keebio/tragicforce68:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/tragicforce68/config.h b/keyboards/keebio/tragicforce68/config.h
index 2a7f3de0f2..b415b5d714 100644
--- a/keyboards/tragicforce68/config.h
+++ b/keyboards/keebio/tragicforce68/config.h
@@ -15,13 +15,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x0510
 #define DEVICE_VER      0x0101
 #define MANUFACTURER    Keebio
@@ -60,5 +59,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#endif
diff --git a/keyboards/tragicforce68/info.json b/keyboards/keebio/tragicforce68/info.json
index 550040a3a1..550040a3a1 100644
--- a/keyboards/tragicforce68/info.json
+++ b/keyboards/keebio/tragicforce68/info.json
diff --git a/keyboards/tragicforce68/keymaps/buswerks/keymap.c b/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
index d74c0186d6..d74c0186d6 100644
--- a/keyboards/tragicforce68/keymaps/buswerks/keymap.c
+++ b/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
diff --git a/keyboards/tragicforce68/keymaps/default/keymap.c b/keyboards/keebio/tragicforce68/keymaps/default/keymap.c
index 69255e080b..69255e080b 100644
--- a/keyboards/tragicforce68/keymaps/default/keymap.c
+++ b/keyboards/keebio/tragicforce68/keymaps/default/keymap.c
diff --git a/keyboards/tragicforce68/rules.mk b/keyboards/keebio/tragicforce68/rules.mk
index a652f1fac6..a652f1fac6 100644
--- a/keyboards/tragicforce68/rules.mk
+++ b/keyboards/keebio/tragicforce68/rules.mk
diff --git a/keyboards/tragicforce68/tragicforce68.c b/keyboards/keebio/tragicforce68/tragicforce68.c
index 327197d254..327197d254 100644
--- a/keyboards/tragicforce68/tragicforce68.c
+++ b/keyboards/keebio/tragicforce68/tragicforce68.c
diff --git a/keyboards/tragicforce68/tragicforce68.h b/keyboards/keebio/tragicforce68/tragicforce68.h
index a63ce50a5e..a63ce50a5e 100644
--- a/keyboards/tragicforce68/tragicforce68.h
+++ b/keyboards/keebio/tragicforce68/tragicforce68.h
diff --git a/keyboards/viterbi/config.h b/keyboards/keebio/viterbi/config.h
index 27a7d9e1a5..b628c83c85 100644
--- a/keyboards/viterbi/config.h
+++ b/keyboards/keebio/viterbi/config.h
@@ -15,9 +15,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
-
-#endif  // CONFIG_H
diff --git a/keyboards/viterbi/keymaps/hexwire/README.md b/keyboards/keebio/viterbi/keymaps/bakingpy/README.md
index 3ce3f6af33..3ce3f6af33 100644
--- a/keyboards/viterbi/keymaps/hexwire/README.md
+++ b/keyboards/keebio/viterbi/keymaps/bakingpy/README.md
diff --git a/keyboards/nyquist/keymaps/mtdjr/config.h b/keyboards/keebio/viterbi/keymaps/bakingpy/config.h
index 0fa606f296..7d01468e8d 100644
--- a/keyboards/nyquist/keymaps/mtdjr/config.h
+++ b/keyboards/keebio/viterbi/keymaps/bakingpy/config.h
@@ -17,17 +17,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
 // #define USE_I2C
 
 /* Select hand configuration */
-
-#define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
+#define TAPPING_TERM 150
+
 #undef RGBLED_NUM
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 12
diff --git a/keyboards/viterbi/keymaps/hexwire/keymap.c b/keyboards/keebio/viterbi/keymaps/bakingpy/keymap.c
index 2050c03793..f0122bef05 100644
--- a/keyboards/viterbi/keymaps/hexwire/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/bakingpy/keymap.c
@@ -1,6 +1,4 @@
-#include "viterbi.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
@@ -25,7 +23,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
 #define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
diff --git a/keyboards/viterbi/keymaps/fido/rules.mk b/keyboards/keebio/viterbi/keymaps/bakingpy/rules.mk
index 1e3cebb145..1e3cebb145 100644
--- a/keyboards/viterbi/keymaps/fido/rules.mk
+++ b/keyboards/keebio/viterbi/keymaps/bakingpy/rules.mk
diff --git a/keyboards/viterbi/keymaps/default/config.h b/keyboards/keebio/viterbi/keymaps/default/config.h
index a841066f4d..a841066f4d 100644
--- a/keyboards/viterbi/keymaps/default/config.h
+++ b/keyboards/keebio/viterbi/keymaps/default/config.h
diff --git a/keyboards/viterbi/keymaps/default/keymap.c b/keyboards/keebio/viterbi/keymaps/default/keymap.c
index 3db912f6ae..c4ae0a5987 100644
--- a/keyboards/viterbi/keymaps/default/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/default/keymap.c
@@ -18,13 +18,6 @@ enum custom_keycodes {
   ADJUST,
 };
 
-// Fillers to make layering more clear
-#define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-#define KC_AJST ADJUST
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -41,18 +34,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Pg Dn|Adjust| Ctrl | Alt  | GUI  |Lower |Space |      |Space |Raise | Left | Down |  Up  | Right|   \  |
  * `------------------------------------------------'      `------------------------------------------------'
  */
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-     INS, GRV , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC,DEL ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     MINS,TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,LBRC,RBRC,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     EQL, ESC , A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,ENT ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     PGUP,LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,HOME,END ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     PGDN,AJST,LCTL,LALT,LGUI,LOWR,SPC ,     SPC ,RASE,LEFT,DOWN, UP ,RGHT,BSLS
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
+  [_QWERTY] = LAYOUT_ortho_5x14(
+    KC_INS,  KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSPC, KC_DEL ,
+    KC_MINS, 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_EQL,  KC_ESC , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,     KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT ,
+    KC_PGUP, KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,     KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_HOME, KC_END ,
+    KC_PGDN, ADJUST , KC_LCTL, KC_LALT, KC_LGUI, LOWER  , KC_SPC ,     KC_SPC , RAISE  , KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, KC_BSLS
   ),
 
 /* Lower
@@ -68,18 +55,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |      |
  * `------------------------------------------------'      `------------------------------------------------'
  */
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-         ,TILD, F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     UNDS,    ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,LCBR,RCBR,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     PLUS,    , F1 , F2 , F3 , F4 , F5 ,      F6 ,UNDS,PLUS,LCBR,RCBR,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    , F7 , F8 , F9 ,F10 ,F11 ,     F12 ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,MNXT,VOLD,VOLU,MPLY,MUTE
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
+  [_LOWER] = LAYOUT_ortho_5x14(
+    _______, KC_TILD, 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_UNDS, _______, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR,
+    KC_PLUS, _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,     KC_F6  , KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, _______,
+    _______, _______, KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,     KC_F12 , _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______,     _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, KC_MUTE
   ),
 
 /* Raise
@@ -95,47 +76,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |      |
  * `------------------------------------------------'      `------------------------------------------------'
  */
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-         ,TILD, F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     UNDS,    , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,LCBR,RCBR,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     PLUS,    , F1 , F2 , F3 , F4 , F5 ,      F6 ,MINS,EQL ,LBRC,RBRC,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    , F7 , F8 , F9 ,F10 ,F11 ,     F12 ,NUHS,NUBS,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,MNXT,VOLD,VOLU,MPLY,MUTE
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
+  [_RAISE] = LAYOUT_ortho_5x14(
+    _______, KC_TILD, 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_UNDS, _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_LCBR, KC_RCBR,
+    KC_PLUS, _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,     KC_F6  , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, _______, _______,
+    _______, _______, KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,     KC_F12 , KC_NUHS, KC_NUBS, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______,     _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, KC_MUTE
   ),
 
-  [_ADJUST] = LAYOUT(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, \
-    _______, _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL,  _______, \
-    _______, _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+  [_ADJUST] = LAYOUT_ortho_5x14(
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+    _______, _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL,  _______,
+    _______, _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,     AG_SWAP, QWERTY,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______
   )
 
 };
 
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case QWERTY:
       if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
+        set_single_persistent_default_layer(_QWERTY);
       }
       return false;
       break;
diff --git a/keyboards/viterbi/keymaps/hexwire/rules.mk b/keyboards/keebio/viterbi/keymaps/default/rules.mk
index 1e3cebb145..1e3cebb145 100644
--- a/keyboards/viterbi/keymaps/hexwire/rules.mk
+++ b/keyboards/keebio/viterbi/keymaps/default/rules.mk
diff --git a/keyboards/viterbi/keymaps/drashna/config.h b/keyboards/keebio/viterbi/keymaps/drashna/config.h
index 6eb871a50f..6eb871a50f 100644
--- a/keyboards/viterbi/keymaps/drashna/config.h
+++ b/keyboards/keebio/viterbi/keymaps/drashna/config.h
diff --git a/keyboards/viterbi/keymaps/drashna/keymap.c b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
index 9ca14961be..12f7fe25ea 100644
--- a/keyboards/viterbi/keymaps/drashna/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
@@ -8,11 +8,6 @@ extern keymap_config_t keymap_config;
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
 
-
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 #define LMACRO   OSL(_MACROS)
 #define DIABLO   TG(_DIABLO)
 #define GAMEPAD  TG(_GAMEPAD)
diff --git a/keyboards/viterbi/keymaps/drashna/rules.mk b/keyboards/keebio/viterbi/keymaps/drashna/rules.mk
index ec3befc0b7..ec3befc0b7 100644
--- a/keyboards/viterbi/keymaps/drashna/rules.mk
+++ b/keyboards/keebio/viterbi/keymaps/drashna/rules.mk
diff --git a/keyboards/viterbi/keymaps/drashna_old/config.h b/keyboards/keebio/viterbi/keymaps/drashna_old/config.h
index ddf9d1a40f..ddf9d1a40f 100644
--- a/keyboards/viterbi/keymaps/drashna_old/config.h
+++ b/keyboards/keebio/viterbi/keymaps/drashna_old/config.h
diff --git a/keyboards/viterbi/keymaps/drashna_old/keymap.c b/keyboards/keebio/viterbi/keymaps/drashna_old/keymap.c
index 2d361da9a3..2d361da9a3 100644
--- a/keyboards/viterbi/keymaps/drashna_old/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/drashna_old/keymap.c
diff --git a/keyboards/viterbi/keymaps/drashna_old/rules.mk b/keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk
index 14ac6a6b3c..14ac6a6b3c 100644
--- a/keyboards/viterbi/keymaps/drashna_old/rules.mk
+++ b/keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk
diff --git a/keyboards/viterbi/keymaps/dwallace/config.h b/keyboards/keebio/viterbi/keymaps/dwallace/config.h
index 585b41dbcf..585b41dbcf 100644
--- a/keyboards/viterbi/keymaps/dwallace/config.h
+++ b/keyboards/keebio/viterbi/keymaps/dwallace/config.h
diff --git a/keyboards/viterbi/keymaps/dwallace/keymap.c b/keyboards/keebio/viterbi/keymaps/dwallace/keymap.c
index 2410244828..5a797cb0bd 100644
--- a/keyboards/viterbi/keymaps/dwallace/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/dwallace/keymap.c
@@ -23,7 +23,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_SWIN LGUI(KC_TILD)   // Switch between windows
 #define KC_SAPP LGUI(KC_TAB)    // Switch between applications
diff --git a/keyboards/viterbi/keymaps/mike808/rules.mk b/keyboards/keebio/viterbi/keymaps/dwallace/rules.mk
index 1e3cebb145..1e3cebb145 100644
--- a/keyboards/viterbi/keymaps/mike808/rules.mk
+++ b/keyboards/keebio/viterbi/keymaps/dwallace/rules.mk
diff --git a/keyboards/viterbi/keymaps/fido/config.h b/keyboards/keebio/viterbi/keymaps/fido/config.h
index 5cb1083652..5cb1083652 100644
--- a/keyboards/viterbi/keymaps/fido/config.h
+++ b/keyboards/keebio/viterbi/keymaps/fido/config.h
diff --git a/keyboards/viterbi/keymaps/fido/keymap.c b/keyboards/keebio/viterbi/keymaps/fido/keymap.c
index b8ef460082..cd6c8d087f 100644
--- a/keyboards/viterbi/keymaps/fido/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/fido/keymap.c
@@ -11,7 +11,6 @@ extern keymap_config_t keymap_config;
 #define _FN 1
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_FN1 MO(_FN)
 #define KC_WD_L LCTL(KC_LEFT)
diff --git a/keyboards/keebio/viterbi/keymaps/fido/rules.mk b/keyboards/keebio/viterbi/keymaps/fido/rules.mk
new file mode 100644
index 0000000000..1e3cebb145
--- /dev/null
+++ b/keyboards/keebio/viterbi/keymaps/fido/rules.mk
@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes
diff --git a/keyboards/viterbi/keymaps/mike808/config.h b/keyboards/keebio/viterbi/keymaps/mike808/config.h
index bfca915f24..bfca915f24 100644
--- a/keyboards/viterbi/keymaps/mike808/config.h
+++ b/keyboards/keebio/viterbi/keymaps/mike808/config.h
diff --git a/keyboards/viterbi/keymaps/mike808/keymap.c b/keyboards/keebio/viterbi/keymaps/mike808/keymap.c
index c7e48b135c..e1dc91d2b2 100644
--- a/keyboards/viterbi/keymaps/mike808/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/mike808/keymap.c
@@ -11,7 +11,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_DVOR DVORAK
 #define KC_QWER QWERTY
@@ -84,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
          ,    ,PERC,CIRC,LBRC,RBRC,TILD,     AMPR, P1 , P2 , P3 ,SLSH,    ,    ,
   //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,PDOT, P0 ,EQL ,    ,    
+         ,    ,    ,    ,    ,    ,    ,         ,    ,PDOT, P0 ,EQL ,    ,
   //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
   ),
 
@@ -98,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
          ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
   //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,BTN1,BTN2,    ,         ,    ,    ,    ,    ,    ,    
+         ,    ,    ,    ,BTN1,BTN2,    ,         ,    ,    ,    ,    ,    ,
   //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
   )
 };
diff --git a/keyboards/keebio/viterbi/keymaps/mike808/rules.mk b/keyboards/keebio/viterbi/keymaps/mike808/rules.mk
new file mode 100644
index 0000000000..1e3cebb145
--- /dev/null
+++ b/keyboards/keebio/viterbi/keymaps/mike808/rules.mk
@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes
diff --git a/keyboards/viterbi/readme.md b/keyboards/keebio/viterbi/readme.md
index 9aad7896b7..2e475100b6 100644
--- a/keyboards/viterbi/readme.md
+++ b/keyboards/keebio/viterbi/readme.md
@@ -9,12 +9,12 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make viterbi/rev1:default
+    make keebio/viterbi/rev1:default
 
 
 Example of flashing this keyboard:
 
-    make viterbi/rev1:default:avrdude
+    make keebio/viterbi/rev1:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/viterbi/rev1/config.h b/keyboards/keebio/viterbi/rev1/config.h
index 3b5e8fe665..e6fc13abda 100644
--- a/keyboards/viterbi/rev1/config.h
+++ b/keyboards/keebio/viterbi/rev1/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef REV1_CONFIG_H
-#define REV1_CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -52,5 +51,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 14
-
-#endif
diff --git a/keyboards/viterbi/rev2/rev2.c b/keyboards/keebio/viterbi/rev1/rev1.c
index 509e42dc51..509e42dc51 100644
--- a/keyboards/viterbi/rev2/rev2.c
+++ b/keyboards/keebio/viterbi/rev1/rev1.c
diff --git a/keyboards/viterbi/rev1/rev1.h b/keyboards/keebio/viterbi/rev1/rev1.h
index 9c03e495a9..f31373f02e 100644
--- a/keyboards/viterbi/rev1/rev1.h
+++ b/keyboards/keebio/viterbi/rev1/rev1.h
@@ -1,9 +1,6 @@
-#ifndef REV1_H
-#define REV1_H
+#pragma once
 
-#include "../viterbi.h"
-
-//void promicro_bootloader_jmp(bool program);
+#include "viterbi.h"
 #include "quantum.h"
 
 
@@ -64,5 +61,3 @@
 #endif
 
 #define LAYOUT_ortho_5x14 LAYOUT
-
-#endif
diff --git a/keyboards/viterbi/rev1/rules.mk b/keyboards/keebio/viterbi/rev1/rules.mk
index 2bf03237c0..2bf03237c0 100644
--- a/keyboards/viterbi/rev1/rules.mk
+++ b/keyboards/keebio/viterbi/rev1/rules.mk
diff --git a/keyboards/viterbi/rev2/config.h b/keyboards/keebio/viterbi/rev2/config.h
index 01a0bfa047..b2970610e2 100644
--- a/keyboards/viterbi/rev2/config.h
+++ b/keyboards/keebio/viterbi/rev2/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x1157
diff --git a/keyboards/viterbi/viterbi.c b/keyboards/keebio/viterbi/rev2/rev2.c
index 509e42dc51..509e42dc51 100644
--- a/keyboards/viterbi/viterbi.c
+++ b/keyboards/keebio/viterbi/rev2/rev2.c
diff --git a/keyboards/viterbi/rev2/rev2.h b/keyboards/keebio/viterbi/rev2/rev2.h
index 599e6415a3..599e6415a3 100644
--- a/keyboards/viterbi/rev2/rev2.h
+++ b/keyboards/keebio/viterbi/rev2/rev2.h
diff --git a/keyboards/viterbi/rev2/rules.mk b/keyboards/keebio/viterbi/rev2/rules.mk
index f95e7ae6a4..f95e7ae6a4 100644
--- a/keyboards/viterbi/rev2/rules.mk
+++ b/keyboards/keebio/viterbi/rev2/rules.mk
diff --git a/keyboards/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk
index 1aa4314f49..811f57fdbc 100644
--- a/keyboards/viterbi/rules.mk
+++ b/keyboards/keebio/viterbi/rules.mk
@@ -28,5 +28,5 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = viterbi/rev2
+DEFAULT_FOLDER = keebio/viterbi/rev2
 LAYOUTS = ortho_5x14
diff --git a/keyboards/keebio/viterbi/viterbi.c b/keyboards/keebio/viterbi/viterbi.c
new file mode 100644
index 0000000000..509e42dc51
--- /dev/null
+++ b/keyboards/keebio/viterbi/viterbi.c
@@ -0,0 +1 @@
+#include "viterbi.h"
diff --git a/keyboards/viterbi/viterbi.h b/keyboards/keebio/viterbi/viterbi.h
index b19f33154b..186892d57a 100644
--- a/keyboards/viterbi/viterbi.h
+++ b/keyboards/keebio/viterbi/viterbi.h
@@ -2,9 +2,9 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_viterbi_rev1
+#ifdef KEYBOARD_keebio_viterbi_rev1
     #include "rev1.h"
-#elif KEYBOARD_viterbi_rev2
+#elif KEYBOARD_keebio_viterbi_rev2
     #include "rev2.h"
 #endif
 
diff --git a/keyboards/wavelet/config.h b/keyboards/keebio/wavelet/config.h
index eed2b7944d..5610bba17b 100644
--- a/keyboards/wavelet/config.h
+++ b/keyboards/keebio/wavelet/config.h
@@ -17,8 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -48,11 +47,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /* Backlight LEDs */
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 7
-
-#endif
diff --git a/keyboards/wavelet/info.json b/keyboards/keebio/wavelet/info.json
index a71058b95a..a71058b95a 100644
--- a/keyboards/wavelet/info.json
+++ b/keyboards/keebio/wavelet/info.json
diff --git a/keyboards/wavelet/keymaps/default/keymap.c b/keyboards/keebio/wavelet/keymaps/default/keymap.c
index dac8068a42..abf253380b 100644
--- a/keyboards/wavelet/keymaps/default/keymap.c
+++ b/keyboards/keebio/wavelet/keymaps/default/keymap.c
@@ -22,10 +22,6 @@ enum custom_keycodes {
   ADJUST,
 };
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Qwerty
diff --git a/keyboards/wavelet/keymaps/default/rules.mk b/keyboards/keebio/wavelet/keymaps/default/rules.mk
index d7463419b4..d7463419b4 100644
--- a/keyboards/wavelet/keymaps/default/rules.mk
+++ b/keyboards/keebio/wavelet/keymaps/default/rules.mk
diff --git a/keyboards/wavelet/readme.md b/keyboards/keebio/wavelet/readme.md
index 90c5ac8089..a107289bb4 100644
--- a/keyboards/wavelet/readme.md
+++ b/keyboards/keebio/wavelet/readme.md
@@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wavelet:default
+    make keebio/wavelet:default
 
 Example of flashing this keyboard:
 
-    make wavelet:default:avrdude
+    make keebio/wavelet:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/wavelet/rules.mk b/keyboards/keebio/wavelet/rules.mk
index cfff50a41d..cfff50a41d 100644
--- a/keyboards/wavelet/rules.mk
+++ b/keyboards/keebio/wavelet/rules.mk
diff --git a/keyboards/wavelet/wavelet.c b/keyboards/keebio/wavelet/wavelet.c
index 2bc9c65a52..2bc9c65a52 100644
--- a/keyboards/wavelet/wavelet.c
+++ b/keyboards/keebio/wavelet/wavelet.c
diff --git a/keyboards/wavelet/wavelet.h b/keyboards/keebio/wavelet/wavelet.h
index 69a87a70cd..69a87a70cd 100644
--- a/keyboards/wavelet/wavelet.h
+++ b/keyboards/keebio/wavelet/wavelet.h
diff --git a/keyboards/quefrency/config.h b/keyboards/quefrency/config.h
deleted file mode 100644
index 8f0524f972..0000000000
--- a/keyboards/quefrency/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config_common.h"
-
-#ifdef SUBPROJECT_rev1
-    #include "rev1/config.h"
-#endif
-
-#endif
diff --git a/keyboards/quefrency/rev1/rules.mk b/keyboards/quefrency/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/quefrency/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/viterbi/keymaps/hexwire/config.h b/keyboards/viterbi/keymaps/hexwire/config.h
deleted file mode 100644
index 7acf84510e..0000000000
--- a/keyboards/viterbi/keymaps/hexwire/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.com>
-
-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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define TAPPING_TERM 150
-
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#endif
diff --git a/keyboards/viterbi/rev1/rev1.c b/keyboards/viterbi/rev1/rev1.c
deleted file mode 100644
index 5848375331..0000000000
--- a/keyboards/viterbi/rev1/rev1.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "viterbi.h"
-
-
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-
-	matrix_init_user();
-};
diff --git a/layouts/community/ortho_4x12/buswerks/keymap.c b/layouts/community/ortho_4x12/buswerks/keymap.c
index bea18f8f48..95d9e7019a 100644
--- a/layouts/community/ortho_4x12/buswerks/keymap.c
+++ b/layouts/community/ortho_4x12/buswerks/keymap.c
@@ -78,10 +78,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_TAB , KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC, \
             ESC_CMD, KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_H   , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT, \
             KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_ENT, \
-            xxxxxxx, KC_LCTL, KC_LGUI, KC_LALT, LOWER  , KC_SPC , KC_SPC , RSE_ENT, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT \
+            XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT, LOWER  , KC_SPC , KC_SPC , RSE_ENT, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT \
             ),
 
-    [_ADJUST] = LAYOUT_planck_grid(
+    [_ADJUST] = LAYOUT_ortho_4x12(
             _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
             _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  GAME,    _______,
             _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h
index 0fa89d6c7b..287f4cc2b7 100644
--- a/layouts/community/ortho_4x12/xyverz/config.h
+++ b/layouts/community/ortho_4x12/xyverz/config.h
@@ -11,7 +11,7 @@
 #if defined(KEYBOARD_planck_rev5)
   #define RGBLED_NUM 10
   #define RGB_DI_PIN D1
-#elif defined(KEYBOARD_levinson_rev2)
+#elif defined(KEYBOARD_keebio_levinson_rev2)
   #define RGBLED_NUM 12
 #elif defined(KEYBOARD_lets_split_rev2)
   #define RGBLED_NUM 8
diff --git a/layouts/community/ortho_5x12/rs/keymap.c b/layouts/community/ortho_5x12/rs/keymap.c
index f33dcc2536..e4e590669f 100644
--- a/layouts/community/ortho_5x12/rs/keymap.c
+++ b/layouts/community/ortho_5x12/rs/keymap.c
@@ -16,6 +16,7 @@ enum layers {
 #define KC_BRDN KC_SLCK
 
 // Used to create a keymap using only KC_ prefixed keys
+#ifndef LAYOUT_kc
 #define LAYOUT_kc( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
@@ -30,6 +31,7 @@ enum layers {
 		KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b, \
 		KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45, KC_##k46, KC_##k47, KC_##k48, KC_##k49, KC_##k4a, KC_##k4b \
 	)
+#endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
diff --git a/layouts/community/ortho_5x12/xyverz/config.h b/layouts/community/ortho_5x12/xyverz/config.h
index 4489c6e5f5..5f9f6e5c11 100644
--- a/layouts/community/ortho_5x12/xyverz/config.h
+++ b/layouts/community/ortho_5x12/xyverz/config.h
@@ -6,7 +6,9 @@
 #define BACKLIGHT_LEVELS 8
 
 /* ws2812 RGB LED */
+#ifndef RGBLIGHT_ENABLE
 #undef RGB_DI_PIN
+#endif
 #if defined(KEYBOARD_preonic_rev2)
   #define RGB_DI_PIN B3
   #undef RGBLED_NUM