diff --git a/qmk_keyboards/binarydiv/eepyboard/v1/keymaps/default/keymap.c b/qmk_keyboards/binarydiv/eepyboard/v1/keymaps/default/keymap.c
index 4430fc1..53ed27c 100644
--- a/qmk_keyboards/binarydiv/eepyboard/v1/keymaps/default/keymap.c
+++ b/qmk_keyboards/binarydiv/eepyboard/v1/keymaps/default/keymap.c
@@ -23,12 +23,12 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Base layer
     [L_BASE] = LAYOUT_ortho_6x13(
-        KC_ESC,        KC_F1,        KC_F2,       KC_F3,        KC_F4,   KC_F5,    KC_F6,   KC_F7,        KC_F8,    _______,      _______,      _______,         KC_KB_MUTE,
-        KC_GRAVE,      KC_1,         KC_2,        KC_3,         KC_4,    KC_5,     KC_6,    KC_7,         KC_8,     KC_9,         KC_0,         KC_MINUS,        KC_EQUAL,
-        KC_TAB,        KC_Q,         KC_W,        KC_E,         KC_R,    KC_T,     KC_Y,    KC_U,         KC_I,     KC_O,         KC_P,         KC_LEFT_BRACKET, KC_RIGHT_BRACKET,
-        KC_BACKSPACE,  KC_A,         KC_S,        KC_D,         KC_F,    KC_G,     KC_H,    KC_J,         KC_K,     KC_L,         KC_SEMICOLON, KC_QUOTE,        KC_BACKSLASH,
-        KC_LEFT_SHIFT, KC_BACKSPACE, KC_Z,        KC_X,         KC_C,    KC_V,     KC_B,    KC_N,         KC_M,     KC_COMMA,     KC_DOT,       KC_SLASH,        KC_RIGHT_SHIFT,
-        KC_LEFT_CTRL,  KC_LEFT_ALT,  KC_LEFT_GUI, OSL(L_CODE),  _______, KC_SPACE, _______, KC_BACKSPACE, KC_ENTER, KC_RIGHT_ALT, MO(L_CODE),   MO(L_FN),        KC_RIGHT_CTRL
+        KC_ESC,              KC_F1,        KC_F2,         KC_F3,       KC_F4,    KC_F5,    KC_F6,   KC_F7,        KC_F8,    _______,       _______,      _______,         KC_KB_MUTE,
+        KC_GRAVE,            KC_1,         KC_2,          KC_3,        KC_4,     KC_5,     KC_6,    KC_7,         KC_8,     KC_9,          KC_0,         KC_MINUS,        KC_EQUAL,
+        KC_TAB,              KC_Q,         KC_W,          KC_E,        KC_R,     KC_T,     KC_Y,    KC_U,         KC_I,     KC_O,          KC_P,         KC_LEFT_BRACKET, KC_RIGHT_BRACKET,
+        QK_CAPS_WORD_TOGGLE, KC_A,         KC_S,          KC_D,        KC_F,     KC_G,     KC_H,    KC_J,         KC_K,     KC_L,          KC_SEMICOLON, KC_QUOTE,        KC_BACKSLASH,
+        KC_LEFT_SHIFT,       KC_BACKSPACE, KC_Z,          KC_X,        KC_C,     KC_V,     KC_B,    KC_N,         KC_M,     KC_COMMA,      KC_DOT,       KC_SLASH,        KC_RIGHT_SHIFT,
+        KC_LEFT_CTRL,        KC_LEFT_ALT,  OSM(MOD_LGUI), OSL(L_CODE), KC_ENTER, KC_SPACE, _______, KC_BACKSPACE, KC_ENTER, OSM(MOD_RALT), MO(L_CODE),   MO(L_FN),        KC_RIGHT_CTRL
     ),
 
     // "Hyper" key layer
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // "Fn" key layer
     [L_FN] = LAYOUT_ortho_6x13(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,         RGB_TOG,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, OS_TOGG, _______, RGB_MOD,         RGB_TOG,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD,         RGB_SPI,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_CLEAR_EEPROM, QK_REBOOT,
diff --git a/qmk_keyboards/binarydiv/eepyboard/v1/rules.mk b/qmk_keyboards/binarydiv/eepyboard/v1/rules.mk
index 937faa0..2a1832d 100644
--- a/qmk_keyboards/binarydiv/eepyboard/v1/rules.mk
+++ b/qmk_keyboards/binarydiv/eepyboard/v1/rules.mk
@@ -6,3 +6,5 @@ ENCODER_MAP_ENABLE = yes
 # see https://docs.qmk.fm/flashing#raspberry-pi-rp2040-uf2 (below)
 
 WS2812_DRIVER = vendor
+
+CAPS_WORD_ENABLE = yes