diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h b/keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h
index d66a4d7..1abc64f 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h
@@ -2,13 +2,13 @@
 #include "keymap.h"
 
 #define LAYER_DESKTOP LAYOUT_ergodox(\
-	KC_TRANSPARENT,       LGUI(KC_1),             LGUI(KC_2),            LGUI(KC_3),             LGUI(KC_4),        LGUI(KC_5),     M_RESETWM,\
+	KC_TRANSPARENT,       LGUI(KC_1),             LGUI(KC_2),            LGUI(KC_3),             LGUI(KC_4),        LGUI(KC_5),     TO(LAYER_MAIN_IDX),\
 	KC_NO,                KC_NO,                  LGUI(LCTL(KC_ENTER)),  KC_NO,                  KC_NO,             LGUI(KC_T),     KC_NO,\
 	KC_NO,                LGUI(KC_PLUS),          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,\
 	TO(LAYER_MAIN_IDX),   KC_NO,                  KC_NO,                 KC_NO,                  KC_NO,\
 \
-	                KC_NO,           KC_NO,\
+	                KC_NO,           M_RESETWM,\
 	                                 KC_NO,\
 	LGUI(KC_ENTER), LGUI(KC_BSLASH), KC_NO,\
 \
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/main.h b/keyboards/betalupi_ergodox/keymaps/default/layers/main.h
index b6d980d..3220289 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/main.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/main.h
@@ -2,10 +2,10 @@
 #include "keymap.h"
 
 #define LAYER_MAIN LAYOUT_ergodox(\
-	KC_ESCAPE,              KC_1,                 KC_2,       KC_3,           KC_4,       KC_5,           TG(LAYER_NUMPAD_IDX),\
+	KC_ESCAPE,              KC_1,                 KC_2,       KC_3,           KC_4,       KC_5,           OSL(LAYER_DESKTOP_IDX),\
 	KC_TAB,                 KC_Q,                 KC_W,       KC_E,           KC_R,       KC_T,           KC_LGUI,\
 	KC_DELETE,              KC_A,                 KC_S,       KC_D,           KC_F,       KC_G,\
-	KC_LCTRL,               KC_Z,                 KC_X,       KC_C,           KC_V,       KC_B,           KC_NO,\
+	KC_LCTRL,               KC_Z,                 KC_X,       KC_C,           KC_V,       KC_B,           TO(LAYER_NUMPAD_IDX),\
 	OSL(LAYER_DESKTOP_IDX),  KC_NO,  KC_LALT,    KC_LSHIFT,      MO(LAYER_ARROWS_IDX),\
 \
 	          KC_PSCREEN,   KC_NO,\
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/numpad.h b/keyboards/betalupi_ergodox/keymaps/default/layers/numpad.h
index e31d70b..32634e1 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/numpad.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/numpad.h
@@ -2,10 +2,10 @@
 #include "keymap.h"
 
 #define LAYER_NUMPAD LAYOUT_ergodox(\
-	KC_TRANSPARENT, KC_CIRC,        KC_NO,          KC_HASH,        KC_DLR,         KC_PERC,        KC_TRANSPARENT,\
+	KC_TRANSPARENT, KC_CIRC,        KC_NO,          KC_HASH,        KC_DLR,         KC_PERC,        KC_NO,\
 	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_TRANSPARENT,\
+	KC_TRANSPARENT, KC_MINUS,       KC_1,           KC_2,           KC_3,           KC_DOT,         TO(LAYER_MAIN_IDX),\
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_NO,          KC_NO,\
 \
 	                KC_TRANSPARENT, KC_TRANSPARENT,\