diff --git a/keyboards/ferris/keymaps/tompi/config.h b/keyboards/ferris/keymaps/tompi/config.h
index 7c35bc20520..e63c5e5f184 100644
--- a/keyboards/ferris/keymaps/tompi/config.h
+++ b/keyboards/ferris/keymaps/tompi/config.h
@@ -33,9 +33,8 @@ 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
 //#define RETRO_TAPPING
 
@@ -47,4 +46,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
 #endif
 
-#define UNICODE_SELECTED_MODES UC_MAC
+
+ #define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
diff --git a/keyboards/ferris/keymaps/tompi/keymap.json b/keyboards/ferris/keymaps/tompi/keymap.json
index 839a9482eac..8dcabc997ba 100644
--- a/keyboards/ferris/keymaps/tompi/keymap.json
+++ b/keyboards/ferris/keymaps/tompi/keymap.json
@@ -52,7 +52,7 @@
       "KC_NO",
       "KC_NO",
       "KC_NO",
-      "KC_NO",
+      "QK_RBT",
       "KC_MS_L",
       "KC_BTN2",
       "KC_BTN1",
@@ -103,10 +103,10 @@
       "KC_END",
       "KC_DOWN",
       "KC_PGDN",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
+       "KC_BTN1",
+       "KC_BTN2",
+       "KC_BTN3",
+       "KC_BTN4",
       "KC_NO",
       "KC_NO",
       "KC_TRNS",
@@ -119,12 +119,12 @@
       "KC_NO",
       "KC_NO",
       "KC_NO",
-      "KC_NO",
+      "KC_WH_U",
       "KC_AT",
       "KC_UNDS",
       "KC_PIPE",
       "KC_QUOT",
-      "KC_ESC",
+      "KC_PERC",
       "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
@@ -135,11 +135,11 @@
       "KC_EXLM",
       "KC_DQUO",
       "KC_DLR",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
+       "KC_BTN4",
+       "KC_BTN3",
+       "KC_BTN2",
+       "KC_BTN1",
+      "KC_WH_D",
       "KC_TILD",
       "KC_QUOT",
       "KC_BSLS",
@@ -187,7 +187,7 @@
       "KC_NO"
     ],
     [
-      "KC_NO",
+      "QK_RBT",
       "KC_NO",
       "KC_NO",
       "KC_NO",
@@ -255,9 +255,9 @@
       "KC_PEQL",
       "KC_NO",
       "KC_NO",
-      "KC_0",
-      "KC_COMM"
+      "KC_COMM",
+      "KC_0"
     ]
   ],
   "author": "thomas.haukland@gmail.com"
-}
\ No newline at end of file
+}