diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/arrows.h b/keyboards/betalupi_ergodox/keymaps/default/layers/arrows.h
index f9b3fd4..8fe1907 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/arrows.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/arrows.h
@@ -2,11 +2,11 @@
 #include "keymap.h"
 
 #define LAYER_ARROWS LAYOUT_ergodox(\
-	KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,\
-	KC_TRANSPARENT, KC_LEFT,        KC_RIGHT,       KC_UP,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
-	KC_TRANSPARENT, LALT(KC_LCTRL), KC_LEFT,        KC_DOWN,        KC_RIGHT,       KC_NO,\
-	KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
+	KC_TRANSPARENT, KC_NO,                KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,\
+	KC_TRANSPARENT, LGUI(LCTL(KC_ENTER)), KC_NO,          KC_UP,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
+	KC_LGUI,        LALT(KC_LCTRL),       KC_LEFT,        KC_DOWN,        KC_RIGHT,       KC_NO,\
+	KC_TRANSPARENT, LGUI(KC_LCTRL),       KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
+	KC_TRANSPARENT, KC_TRANSPARENT,       KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
 \
 					KC_TRANSPARENT, KC_TRANSPARENT,\
 									KC_TRANSPARENT,\
@@ -26,9 +26,9 @@
 
 #define LAYER_ARROWS_LEDS LEDS_ergodox(\
 	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_YELLOW,    LC_YELLOW,    LC_GREEN,     LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_GREEN,     LC_GREEN,     LC_GREEN,     LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
+	LC_YELLOW,    LC_OFF,       LC_GREEN,     LC_OFF,       LC_OFF, \
+	LC_ORANGE,    LC_GREEN,     LC_GREEN,     LC_GREEN,     LC_OFF, \
+	LC_ORANGE,    LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
 	LC_OFF,       LC_OFF,       LC_OFF,       LC_PINK, \
 	\
 	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h b/keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h
index 0c6f517..c07730e 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h
@@ -2,10 +2,10 @@
 #include "keymap.h"
 
 #define LAYER_DESKTOP LAYOUT_ergodox(\
-	KC_TRANSPARENT,       LCTL(LGUI(LSFT(KC_1))), LCTL(LGUI(LSFT(KC_2))),LCTL(LGUI(LSFT(KC_3))), LCTL(LGUI(LSFT(KC_4))), KC_NO,          M_RESETWM,\
-	KC_NO,                KC_NO,                  KC_NO,                 KC_NO,                  LCTL(LGUI(KC_SPACE)),   LGUI(KC_T),     KC_NO,\
-	KC_NO,                KC_NO,                  KC_NO,                 KC_NO,                  LGUI(KC_F),             LGUI(KC_M),\
-	KC_NO,                KC_NO,                  KC_NO,                 LGUI(LSFT(KC_C)),       LGUI(KC_N),             KC_NO,          KC_NO,\
+	KC_TRANSPARENT,       LGUI(KC_1),             LGUI(KC_2),            LGUI(KC_3),             LGUI(KC_4),        LGUI(KC_5),     M_RESETWM,\
+	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,\
@@ -14,8 +14,8 @@
 \
 \
 	M_SHUTDOWN,     KC_NO,               KC_NO,               KC_NO,                 KC_NO,    KC_NO,          KC_NO,\
-	KC_NO,          KC_NO,               KC_NO,               LCTL(LGUI(KC_UP)),     KC_NO,    LGUI(KC_P),     KC_NO,\
-	KC_NO,          LCTL(LGUI(KC_LEFT)), LCTL(LGUI(KC_DOWN)), LCTL(LGUI(KC_RIGHT)),  KC_NO,    KC_NO,\
+	KC_NO,          KC_NO,               KC_NO,               KC_NO,                 KC_NO,    LGUI(KC_P),     KC_NO,\
+	KC_NO,          KC_NO,               KC_NO,               KC_NO,                 KC_NO,    KC_NO,\
 	KC_NO,          KC_NO,               LGUI(KC_H),          LGUI(KC_J),            KC_NO,    KC_NO,          KC_NO,\
 	KC_NO,          KC_NO,               KC_NO,               KC_NO,                 KC_NO,\
 \
@@ -25,15 +25,15 @@
 )
 
 #define LAYER_DESKTOP_LEDS LEDS_ergodox(\
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_CYAN,      LC_CYAN, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_CYAN,      LC_CYAN, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_CYAN,      LC_OFF, \
+	LC_PINK,      LC_PINK,      LC_PINK,      LC_PINK,      LC_PINK, \
+	LC_OFF,       LC_GREEN,      LC_OFF,       LC_OFF,       LC_CYAN, \
+	LC_GREEN,     LC_GREEN,     LC_OFF,       LC_CYAN,      LC_CYAN, \
+	LC_OFF,       LC_OFF,       LC_ORANGE,    LC_CYAN,      LC_CYAN, \
 	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
 	\
 	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_GREEN,     LC_OFF,       LC_ORANGE, \
-	LC_OFF,       LC_GREEN,     LC_GREEN,     LC_GREEN,     LC_OFF, \
-	LC_OFF,       LC_CYAN,      LC_CYAN,      LC_OFF,       LC_OFF, \
+	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_ORANGE, \
+	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
+	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/fkeys.h b/keyboards/betalupi_ergodox/keymaps/default/layers/fkeys.h
index 6e59258..db6abf2 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/fkeys.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/fkeys.h
@@ -3,7 +3,7 @@
 
 #define LAYER_FKEYS LAYOUT_ergodox(\
 	KC_TRANSPARENT, KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
+	KC_TRANSPARENT, KC_F11,         KC_F12,         KC_F13,         KC_F14,         KC_F15,         KC_TRANSPARENT,\
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
@@ -13,8 +13,8 @@
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
 \
 \
-	KC_TRANSPARENT, KC_F6,          KC_F7,          KC_F9,          KC_F9,          KC_F10,         KC_TRANSPARENT, \
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \
+	KC_TRANSPARENT, KC_F6,          KC_F7,          KC_F8,          KC_F9,           KC_F10,         KC_TRANSPARENT, \
+	KC_TRANSPARENT, KC_F16,         KC_F17,         KC_F18,         KC_F19,          KC_F20,         KC_TRANSPARENT, \
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \
@@ -26,13 +26,13 @@
 
 #define LAYER_FKEYS_LEDS LEDS_ergodox(\
 	LC_CYAN,      LC_CYAN,      LC_CYAN,      LC_CYAN,      LC_CYAN, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
+	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_OFF, \
 	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
 	\
 	LC_CYAN,      LC_CYAN,      LC_CYAN,      LC_CYAN,      LC_CYAN, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
+	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_OFF, \
 	              LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF  \
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/keyboard.h b/keyboards/betalupi_ergodox/keymaps/default/layers/keyboard.h
index e15d2f6..75145df 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/keyboard.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/keyboard.h
@@ -3,7 +3,7 @@
 
 #define LAYER_KEYBOARD LAYOUT_ergodox(\
 	RGB_TOG,			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,\
+	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,\
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/main.h b/keyboards/betalupi_ergodox/keymaps/default/layers/main.h
index af2f683..d0a78f9 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/main.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/main.h
@@ -20,6 +20,6 @@
 	KC_RIGHT,       KC_TRANSPARENT, KC_TRANSPARENT, TO(LAYER_KEYBOARD_IDX),         KC_TRANSPARENT,\
 \
 	LGUI(KC_SPACE),			TO(LAYER_RUSSIAN_IDX),\
-	TG(LAYER_COLEMAK_IDX),\
+	KC_NO,\
 	KC_DELETE,				KC_RSHIFT,		KC_ENTER\
 )
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/russian.h b/keyboards/betalupi_ergodox/keymaps/default/layers/russian.h
index d70fe1c..b8ceb72 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/russian.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/russian.h
@@ -19,8 +19,8 @@
 	RU_HARD,        RU_EN,          RU_EM,          RU_PE,          RU_YERU,        RU_SHTI,        KC_TRANSPARENT,\
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
 \
-	KC_NO, TO(LAYER_MAIN_IDX),\
-	KC_NO,\
+	KC_TRANSPARENT, TO(LAYER_MAIN_IDX),\
+	KC_TRANSPARENT,\
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT\
 )
 
diff --git a/keyboards/betalupi_ergodox/keymaps/default/tapdance/wmlayout.c b/keyboards/betalupi_ergodox/keymaps/default/tapdance/wmlayout.c
index 3ee87b1..e09ca91 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/tapdance/wmlayout.c
+++ b/keyboards/betalupi_ergodox/keymaps/default/tapdance/wmlayout.c
@@ -11,12 +11,12 @@ static tap dance_state[1];
 // Called on every tap
 void td_wmlayout_dance(qk_tap_dance_state_t *state, void *user_data) {
 	if(state->count == 3) {
-		tap_code16(LGUI(KC_L));
-		tap_code16(LGUI(KC_L));
-		tap_code16(LGUI(KC_L));
+		tap_code16(LGUI(KC_COMMA));
+		tap_code16(LGUI(KC_COMMA));
+		tap_code16(LGUI(KC_COMMA));
 	}
 	if(state->count > 3) {
-		tap_code16(LGUI(KC_L));
+		tap_code16(LGUI(KC_COMMA));
 	}
 }
 
@@ -25,14 +25,14 @@ void td_wmlayout_finished(qk_tap_dance_state_t *state, void *user_data) {
 	dance_state[0].step = dance_step(state);
 	switch (dance_state[0].step) {
 		case SINGLE_TAP:
-			register_code16(LGUI(KC_L));
+			register_code16(LGUI(KC_COMMA));
 			break;
 		case DOUBLE_TAP:
-			register_code16(LGUI(KC_K));
+			register_code16(LGUI(KC_DOT));
 			break;
 		case DOUBLE_SINGLE_TAP:
-			tap_code16(LGUI(KC_L));
-			register_code16(LGUI(KC_L));
+			tap_code16(LGUI(KC_COMMA));
+			register_code16(LGUI(KC_COMMA));
 			break;
 	}
 }
@@ -42,13 +42,13 @@ void td_wmlayout_reset(qk_tap_dance_state_t *state, void *user_data) {
 	wait_ms(10);
 	switch (dance_state[0].step) {
 		case SINGLE_TAP:
-			unregister_code16(LGUI(KC_L));
+			unregister_code16(LGUI(KC_COMMA));
 			break;
 		case DOUBLE_TAP:
-			unregister_code16(LGUI(KC_K));
+			unregister_code16(LGUI(KC_DOT));
 			break;
 		case DOUBLE_SINGLE_TAP:
-			unregister_code16(LGUI(KC_L));
+			unregister_code16(LGUI(KC_COMMA));
 			break;
 	}
 	dance_state[0].step = 0;