4 files changed, 7 insertions, 3 deletions

diff --git a/layouts/community/ortho_4x12/buswerks/keymap.c b/layouts/community/ortho_4x12/buswerks/keymap.c
index bea18f8f4..95d9e7019 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 0fa89d6c7..287f4cc2b 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 f33dcc253..e4e590669 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 4489c6e5f..5f9f6e5c1 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