diff --git a/config.h b/config.h
index 3c8d9d0..c339645 100644
--- a/config.h
+++ b/config.h
@@ -14,4 +14,12 @@
 // #undef RGBLIGHT_LIMIT_VAL
 // #endif
 // #define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_LAYERS_RETAIN_VAL
\ No newline at end of file
+#define RGBLIGHT_LAYERS_RETAIN_VAL
+#define FP_STARTUP_ANIMATION_DISABLE
+#define FP_LAYER_LIGHTING_HUE_1 HSV_CYAN
+#define FP_LAYER_LIGHTING_MODE_1 RGBLIGHT_MODE_BREATHING1
+#define FP_LAYER_LIGHTING_HUE_2 FP_HSV_LAVENDER
+#define FP_LAYER_LIGHTING_MODE_2 RGBLIGHT_MODE_BREATHING1
+#define FP_LAYER_LIGHTING_HUE_2 FP_HSV_MELON
+#define FP_LAYER_LIGHTING_MODE_2 RGBLIGHT_MODE_BREATHING1
+#define FP_LAYER_LIGHTING_CAPS_LOCK_MODE RGBLIGHT_MODE_KNIGHT1
\ No newline at end of file
diff --git a/keymap.c b/keymap.c
index 44ccd88..32c15fd 100644
--- a/keymap.c
+++ b/keymap.c
@@ -7,10 +7,10 @@
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
     _BASE,
-    // _GAME,
     _NUMB,
     _NAVI,
     _SYST,
+    // _GAME,
     _COMB
 };
 
@@ -28,11 +28,10 @@ enum layer_names {
 #define C_STBI      FP_SUPER_TAB
 #define C_STBD      S(FP_SUPER_TAB)
 #define C_DSKT      G(KC_TAB)
-// #define C_ACCL      FP_ACCEL_TOG
 #define C_CENT      C(KC_ENTER)
+// #define C_ACCL      FP_ACCEL_TOG
 // #define C_SCRL      LT(0,KC_S)
 // #define C_ZOOM      LT(0,KC_Z)
-// #define C_MTOG      TG(_MOUS)
 
 // Data Grip Shortcuts
 #define D_FMTC      C(A(KC_L))
@@ -86,10 +85,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,     KC_Q,       KC_W,       KC_F,       KC_P,       KC_B,                                               KC_J,       KC_L,       KC_U,       KC_Y,       KC_QUOT,    KC_BSLS,
   C_TABI,     KC_A,       KC_R,       KC_S,       KC_T,       KC_G,                                               KC_M,       KC_N,       KC_E,       KC_I,       KC_O,       C_TABD,
   OSM_CTL,    KC_Z,       KC_X,       KC_C,       KC_D,       KC_V,                                               KC_K,       KC_H,       KC_COMM,    KC_DOT,     KC_SLSH,    C_CENT,
-                                      OSL_NUM,    OSM_SFT,    KC_BSPC,      KC_MS_BTN3, KC_MS_BTN1, KC_MS_BTN2,   KC_ENTER,   KC_SPC,     OSL_NAV,
-              KC_VOLU,                KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2,                                         KC_VOLD,    KC_MUTE,    KC_VOLU,                KC_VOLU,
-  KC_MPRV,    KC_MPLY,    KC_MNXT,                                                                                                                    KC_MPRV,    KC_MPLY,    KC_MNXT,
-              KC_VOLD,                                                                                                                                            KC_VOLD
+                                      MO(_NUMB),  OSM_SFT,    KC_BSPC,      KC_MS_BTN3, KC_MS_BTN1, KC_MS_BTN2,   KC_ENTER,   KC_SPC,     MO(_NAVI),
+              KC_VOLU,                KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2,                                         KC_VOLD,    KC_MUTE,    KC_VOLU,                KC_UP,
+  KC_MPRV,    KC_MPLY,    KC_MNXT,                                                                                                                    KC_LEFT,    _______,    KC_RGHT,
+              KC_VOLD,                                                                                                                                            KC_DOWN
 ),
 
 // [_GAME] = LAYOUT_vulpes_majora(
@@ -124,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_SYST] = LAYOUT_vulpes_majora(
   _______,    RGB_TOG,    RGB_RMOD,   RGB_MOD,    _______,    TO(_BASE),                                          _______,    _______,    _______,    _______,    _______,    TO(_BASE),
-  _______,    RGB_SPI,    RGB_HUI,    RGB_SAI,    RGB_VAI,    _______,                                          _______,    _______,    _______,    _______,    _______,    _______,
+  _______,    RGB_SPI,    RGB_HUI,    RGB_SAI,    RGB_VAI,    _______,                                            _______,    _______,    _______,    _______,    _______,    _______,
   _______,    RGB_SPD,    RGB_HUD,    RGB_SAD,    RGB_VAD,    _______,                                            _______,    _______,    _______,    _______,    QK_BOOT,    _______,
                                       _______,    _______,    _______,      _______,    _______,    _______,      _______,    _______,    _______,    
               _______,                _______,    _______,    _______,                                            _______,    _______,    _______,                _______,