diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/desktop.h b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/desktop.h
index 2f73e85..36e33c5 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/desktop.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/desktop.h
@@ -9,7 +9,7 @@
 
 #ifdef BETA_LAYER_KEYS
     #define BETA_LAYER_CONTEXT_DATA LAYOUT_ergodox(\
-        KC_TRANSPARENT,       LGUI(KC_1),             LGUI(KC_2),            LGUI(KC_3),             LGUI(KC_4),        LGUI(KC_5),     TO(LAYER_MAIN),\
+        TO(LAYER_MAIN),       LGUI(KC_1),             LGUI(KC_2),            LGUI(KC_3),             LGUI(KC_4),        LGUI(KC_5),     KC_NO,\
         KC_NO,                KC_NO,                  LGUI(LCTL(KC_ENTER)),  KC_NO,                  KC_NO,             LGUI(KC_T),     KC_NO,\
         KC_NO,                LGUI(KC_EQL),           LGUI(KC_MINUS),        KC_NO,                  LGUI(KC_F),        LGUI(KC_G),\
         KC_NO,                KC_NO,                  KC_NO,                 LGUI(LSFT(KC_C)),       LGUI(KC_N),        LGUI(KC_M),     KC_NO,\
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/fkeys.h b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/fkeys.h
index 5a3c5e4..3de5a68 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/fkeys.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/fkeys.h
@@ -9,11 +9,11 @@
 
 #ifdef BETA_LAYER_KEYS
     #define BETA_LAYER_CONTEXT_DATA LAYOUT_ergodox(\
-        KC_TRNS,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_NO,\
-        KC_TRNS,  KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_NO,\
-        KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,\
-        KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_TRNS,\
-        KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,\
+        TO(LAYER_MAIN),  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_NO,\
+        KC_TRNS,         KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_NO,\
+        KC_TRNS,         KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,\
+        KC_TRNS,         KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_TRNS,\
+        KC_TRNS,         KC_NO,  KC_NO,  KC_NO,  KC_NO,\
     \
                  KC_TRNS, KC_TRNS,\
                           KC_TRNS,\
@@ -46,7 +46,7 @@
         LC_CYAN,        LC_CYAN,      LC_CYAN,      LC_CYAN,      LC_CYAN, \
         LC_CYAN,        LC_CYAN,      LC_CYAN,      LC_CYAN,      LC_CYAN, \
         LC_OFF,         LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-        LC_OFF,         LC_OFF,       LC_OFF,       LC_OFF,       LC_CYAN, \
+        LC_OFF,         LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
                         LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF  \
     )
 
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/keyboard.h b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/keyboard.h
index 7dfd074..877ed8c 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/keyboard.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/keyboard.h
@@ -9,24 +9,24 @@
 
 #ifdef BETA_LAYER_KEYS
     #define BETA_LAYER_CONTEXT_DATA LAYOUT_ergodox(\
-        RGB_TOG,            RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO,\
+        TO(LAYER_MAIN),     RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO,\
         TOGGLE_LAYER_COLOR, RGB_SAD, RGB_SAI, KC_NO, KC_NO, KC_NO, RGB_HUI,\
         KC_NO,              RGB_VAD, RGB_VAI, KC_NO, KC_NO, KC_NO,\
         KC_NO,              RGB_SPD, RGB_SPI, KC_NO, KC_NO, KC_NO, RGB_HUD,\
         KC_NO,              KC_NO,   KC_NO,   KC_NO, RGB_MOD,\
     \
-                KC_NO,  KC_NO,\
-                        KC_NO,\
-        KC_NO,  KC_NO,  KC_NO,\
+                RGB_TOG, KC_NO,\
+                         KC_NO,\
+        KC_NO,  KC_NO,   KC_NO,\
     \
     \
-        KC_NO,  LIGHT_HUD,  LIGHT_HUI, KC_NO, KC_NO,            KC_NO,  LIGHT_TOG,\
+        KC_NO,  LIGHT_HUD,  LIGHT_HUI, KC_NO, KC_NO,            KC_NO,  KC_NO,\
         KC_NO,  LIGHT_SAD,  LIGHT_SAI, KC_NO, KC_NO,            KC_NO,  KC_NO,\
                 LIGHT_VAD,  LIGHT_VAI, KC_NO, KC_NO,            KC_NO,  KC_NO,\
         KC_NO,  LIGHT_SPD,  LIGHT_SPI, KC_NO, KC_NO,            KC_NO,  KC_NO,\
                             LIGHT_MOD, KC_NO, TO(LAYER_MAIN),   KC_NO,  KC_NO,\
     \
-        KC_NO,  RGB_TOG,\
+        KC_NO,  LIGHT_TOG,\
         KC_NO,\
         QK_BOOTLOADER,  KC_NO,  KC_NO\
     )
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/numpad.h b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/numpad.h
index 74547a5..499500a 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/numpad.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/numpad.h
@@ -9,7 +9,7 @@
 
 #ifdef BETA_LAYER_KEYS
     #define BETA_LAYER_CONTEXT_DATA LAYOUT_ergodox(\
-        KC_TRANSPARENT, KC_CIRC,        KC_NO,          KC_HASH,        KC_DLR,         KC_PERC,        TO(LAYER_MAIN),\
+        TO(LAYER_MAIN), KC_CIRC,        KC_NO,          KC_HASH,        KC_DLR,         KC_PERC,        TO(LAYER_MAIN),\
         KC_TRANSPARENT, KC_NO,          KC_7,           KC_8,           KC_9,           KC_ASTR,        KC_SLASH,\
         KC_TRANSPARENT, KC_PLUS,        KC_4,           KC_5,           KC_6,           KC_0,\
         KC_TRANSPARENT, KC_MINUS,       KC_1,           KC_2,           KC_3,           KC_DOT,         KC_NO,\