diff --git a/keyboards/ferris/keymaps/tompi/config.h b/keyboards/ferris/keymaps/tompi/config.h
index 7c35bc2052..b4f03c585f 100644
--- a/keyboards/ferris/keymaps/tompi/config.h
+++ b/keyboards/ferris/keymaps/tompi/config.h
@@ -16,6 +16,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
+
+#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
+
 // Set the mouse settings to a comfortable speed/accuracy trade-off,
 // assuming a screen refresh rate of 60 Htz or higher
 // The default is 50. This makes the mouse ~3 times faster and more accurate
@@ -33,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 100
 
 // Pick good defaults for enabling homerow modifiers
-#define TAPPING_TERM 280
+#define TAPPING_TERM 230
 // #define PERMISSIVE_HOLD
 #define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
diff --git a/keyboards/ferris/keymaps/tompi/keymap.json b/keyboards/ferris/keymaps/tompi/keymap.json
index 839a9482ea..128a7fa9d7 100644
--- a/keyboards/ferris/keymaps/tompi/keymap.json
+++ b/keyboards/ferris/keymaps/tompi/keymap.json
@@ -23,7 +23,7 @@
       "LSFT_T(KC_T)",
       "KC_G",
       "KC_M",
-      "LSFT_T(KC_N)",
+      "RSFT_T(KC_N)",
       "LCTL_T(KC_E)",
       "LALT_T(KC_I)",
       "LGUI_T(KC_O)",
@@ -260,4 +260,4 @@
     ]
   ],
   "author": "thomas.haukland@gmail.com"
-}
\ No newline at end of file
+}
diff --git a/keyboards/ferris/sweep/rules.mk b/keyboards/ferris/sweep/rules.mk
index ffc17739f7..9d03e24bbb 100644
--- a/keyboards/ferris/sweep/rules.mk
+++ b/keyboards/ferris/sweep/rules.mk
@@ -19,3 +19,4 @@ UNICODE_ENABLE = yes        # Unicode
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes        # Use shared split_common code
 LAYOUTS = split_3x5_2
+CAPS_WORD_ENABLE = yes