diff --git a/keymaps/default/keymap.c b/keymaps/default/keymap.c
index 2754331..24ce1f9 100644
--- a/keymaps/default/keymap.c
+++ b/keymaps/default/keymap.c
@@ -7,11 +7,8 @@
 // (Must be done BEFORE keymaps)
 enum custom_keycodes {
 	RGB_SLD = EZ_SAFE_RANGE,
-	HSV_136_138_245,
-	HSV_24_210_255,
-	HSV_0_0_255,
-	ST_MACRO_0,
-	ST_MACRO_1,
+	M_SHUTDOWN,
+	M_RESETWM,
 	RU_LAYER,
 	EN_LAYER,
 	M_RU_CTRL,
@@ -169,13 +166,13 @@ void set_lang_long(int lang, bool force) {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 	switch (keycode) {
-		case ST_MACRO_0:
+		case M_RESETWM:
 			if (record->event.pressed) {
 				SEND_STRING(SS_LCTL(SS_LGUI(SS_LSFT(SS_TAP(X_R)))));
 			}
 			break;
 
-		case ST_MACRO_1:
+		case M_SHUTDOWN:
 			if (record->event.pressed) {
 				SEND_STRING(SS_LGUI(SS_TAP(X_P)) SS_DELAY(100) SS_TAP(X_Y)  SS_DELAY(100) SS_TAP(X_ENTER));
 			}
@@ -217,27 +214,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 				rgblight_mode(1);
 			}
 			return false;
-
-		case HSV_136_138_245:
-			if (record->event.pressed) {
-				rgblight_mode(1);
-				rgblight_sethsv(136,138,245);
-			}
-			return false;
-
-		case HSV_24_210_255:
-			if (record->event.pressed) {
-				rgblight_mode(1);
-				rgblight_sethsv(24,210,255);
-			}
-			return false;
-
-		case HSV_0_0_255:
-			if (record->event.pressed) {
-				rgblight_mode(1);
-				rgblight_sethsv(0,0,255);
-			}
-			return false;
 	}
 	return true;
 }
diff --git a/keymaps/default/layers/desktop.h b/keymaps/default/layers/desktop.h
index 43d83a3..0ac565e 100644
--- a/keymaps/default/layers/desktop.h
+++ b/keymaps/default/layers/desktop.h
@@ -2,7 +2,7 @@
 #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,          ST_MACRO_0,\
+	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_TRANSPARENT,         LALT(LCTL(KC_UP)),     KC_NO,                  LCTL(LGUI(KC_SPACE)),   LGUI(KC_T),     KC_NO,\
 	KC_NO,                LALT(LCTL(KC_LEFT)),    LALT(LCTL(KC_DOWN)),   LALT(LCTL(KC_RIGHT)),   LGUI(KC_F),             LGUI(KC_M),\
 	KC_NO,                KC_NO,                  KC_NO,                 LGUI(LSFT(KC_C)),       LGUI(KC_N),             KC_NO,          KC_NO,\
@@ -13,7 +13,7 @@
 	LGUI(KC_ENTER),	LGUI(KC_BSLASH),	KC_NO,\
 \
 \
-	ST_MACRO_1,     KC_NO,               KC_NO,               KC_NO,                 KC_NO,    KC_NO,          KC_NO,\
+	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,               LGUI(KC_H),          LGUI(KC_J),            KC_NO,    KC_NO,          KC_NO,\
diff --git a/keymaps/default/layers/keyboard.h b/keymaps/default/layers/keyboard.h
index facdf00..fa639f0 100644
--- a/keymaps/default/layers/keyboard.h
+++ b/keymaps/default/layers/keyboard.h
@@ -2,24 +2,24 @@
 #include "keymap.h"
 
 #define LAYER_KEYBOARD LAYOUT_ergodox(\
-	KC_TRANSPARENT, HSV_136_138_245,HSV_24_210_255, HSV_0_0_255,    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, RGB_HUI,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, RGB_HUD,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUI,\
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD,\
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
 \
-	RGB_TOG,        KC_TRANSPARENT,\
-	RGB_SPI,\
-	RGB_MOD,        RGB_SLD,        RGB_SPD,\
+				RGB_TOG,	KC_NO,\
+							RGB_SPI,\
+	RGB_MOD,	RGB_SLD,	RGB_SPD,\
 \
 \
-	LED_LEVEL,      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, RESET,\
-	RGB_SAI,        KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-	RGB_SAD,        KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
+	LED_LEVEL,	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET,\
+	RGB_SAI,	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
+				KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
+	RGB_SAD,	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
+				KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
 \
-	KC_NO,          RGB_TOG,\
+	KC_NO,				RGB_TOG,\
 	KC_NO,\
-	TOGGLE_LAYER_COLOR,RGB_VAD,        RGB_VAI\
+	TOGGLE_LAYER_COLOR,	RGB_VAD,	RGB_VAI\
 )
diff --git a/keymaps/default/layers/main.h b/keymaps/default/layers/main.h
index 2c11da2..3c325cc 100644
--- a/keymaps/default/layers/main.h
+++ b/keymaps/default/layers/main.h
@@ -6,7 +6,7 @@
 	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,\
 	M_RU_CTRL,      KC_Z,   KC_X,           KC_C,           KC_V,           KC_B,           KC_TRANSPARENT,\
-	MO(LAYER_DESKTOP_IDX),  OSL(LAYER_FKEYS_IDX),         KC_LALT,        KC_LSHIFT,      MO(LAYER_ARROWS_IDX),\
+	MO(LAYER_DESKTOP_IDX),  OSL(LAYER_FKEYS_IDX),           KC_LALT,        KC_LSHIFT,      MO(LAYER_ARROWS_IDX),\
 \
 					KC_PSCREEN,		LT(LAYER_KEYBOARD_IDX,KC_NO),\
 									TD(TD_WMLAYOUT),\
@@ -19,7 +19,7 @@
 	KC_TRANSPARENT, KC_N,           KC_M,           KC_P,           KC_DOT,         KC_COMMA,       KC_TRANSPARENT,\
 	KC_RIGHT,       KC_TRANSPARENT, KC_TRANSPARENT, OSL(LAYER_FKEYS_IDX),         KC_TRANSPARENT,\
 \
-	LGUI(KC_SPACE),			RU_LAYER,\
+	LGUI(KC_SPACE),			TO(LAYER_RUSSIAN_IDX),\
 	TG(LAYER_COLEMAK_IDX),\
 	KC_DELETE,				KC_RSHIFT,		KC_ENTER\
 )