diff --git a/keyboards/aesir/heimdall/keymaps/csteamengine/keymap.c b/keyboards/aesir/heimdall/keymaps/csteamengine/keymap.c
index 327d6bdcb0..94d9ede87a 100644
--- a/keyboards/aesir/heimdall/keymaps/csteamengine/keymap.c
+++ b/keyboards/aesir/heimdall/keymaps/csteamengine/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  SELECT_WORD,   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,  KC_NO,
         QK_BOOT,   KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13, KC_NO,    KC_DEL,      KC_END,      KC_HOME,    KC_NO,
         QK_RBT,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,    KC_BSPC,         KC_PPLS,     KC_PMNS,     KC_PAST,    KC_PSLS,
-        KC_NO,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,   KC_BSLS,         KC_KP_7,     KC_KP_8,     KC_KP_9,    KC_KP_DOT,
+        EE_CLR,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,   KC_BSLS,         KC_KP_7,     KC_KP_8,     KC_KP_9,    KC_KP_DOT,
         KC_NO,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,          KC_KP_4,     KC_KP_5,     KC_KP_6,    KC_UP,
         KC_NO,   KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT,         KC_KP_1,     KC_KP_2,     KC_KP_3,    KC_DOWN,
         KC_NO,   KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RALT, KC_APP,    KC_RCTL,         KC_PENT,     KC_KP_0,     KC_LEFT,    KC_RIGHT
diff --git a/keyboards/aesir/heimdall/keymaps/valhalla/config.h b/keyboards/aesir/heimdall/keymaps/valhalla/config.h
index f871ad8b8b..53905142a5 100644
--- a/keyboards/aesir/heimdall/keymaps/valhalla/config.h
+++ b/keyboards/aesir/heimdall/keymaps/valhalla/config.h
@@ -30,7 +30,9 @@
 #define SELECT_WORD_TIMEOUT 2000 // When idle, clear state after 2 seconds.
 #define RGB_MATRIX_TIMEOUT 900000 // number of milliseconds to wait until rgb automatically turns off
 #define RGB_MATRIX_SLEEP
-#define RGB_MATRIX_DEFAULT_HUE 8
+#define RGB_MATRIX_DEFAULT_HUE 100
 #define RGB_MATRIX_DEFAULT_SAT 255
 #define RGB_MATRIX_DEFAULT_VAL 200
 #define RGBLIGHT_LIMIT_VAL 125
+#define BOOTMAGIC_ROW 0
+#define BOOTMAGIC_COLUMN 1
diff --git a/keyboards/aesir/heimdall/keymaps/valhalla/keymap.c b/keyboards/aesir/heimdall/keymaps/valhalla/keymap.c
index d620e0e4e3..dce7be97b9 100644
--- a/keyboards/aesir/heimdall/keymaps/valhalla/keymap.c
+++ b/keyboards/aesir/heimdall/keymaps/valhalla/keymap.c
@@ -13,8 +13,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  SELECT_WORD,   TO(_BASE),   TO(_FN0),   TO(_FN1),   TO(_FN2),   MO(_FN2),   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,
         QK_BOOT,   KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13, KC_DEL,    KC_NO,      KC_END,      KC_HOME,    KC_NUM,
         QK_RBT,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,    KC_BSPC,         KC_PPLS,     KC_PMNS,     KC_PAST,    KC_PSLS,
-        KC_NO,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,   KC_BSLS,         KC_KP_7,     KC_KP_8,     KC_KP_9,    KC_KP_DOT,
-        KC_NO,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,          KC_KP_4,     KC_KP_5,     KC_KP_6,    KC_UP,
+        EE_CLR,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,   KC_BSLS,         KC_KP_7,     KC_KP_8,     KC_KP_9,    KC_KP_DOT,
+        KC_A,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,          KC_KP_4,     KC_KP_5,     KC_KP_6,    KC_UP,
         RGB_HUI,   KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT,         KC_KP_1,     KC_KP_2,     KC_KP_3,    KC_DOWN,
         RGB_HUD,   KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RALT, KC_APP,    KC_RCTL,         KC_PENT,     KC_KP_0,     KC_LEFT,    KC_RIGHT
     )
diff --git a/users/csteamengine/rules.mk b/users/csteamengine/rules.mk
index 906724d867..9a960b70f9 100644
--- a/users/csteamengine/rules.mk
+++ b/users/csteamengine/rules.mk
@@ -4,6 +4,7 @@ OLED_DRIVER = ssd1306
 OLED_TRANSPORT = i2c
 LTO_ENABLE = yes
 OLED_ENABLE = yes
+BOOTMAGIC_ENABLE = yes
 
 SRC += ./lib/layer_status/layer_status.c
 SRC += ./lib/logo.c