diff --git a/.local/bin/remaps b/.local/bin/remaps
new file mode 100755
index 0000000..8925044
--- /dev/null
+++ b/.local/bin/remaps
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+# This script is called by i3 on startup to remap keys.
+# Increase key speed via a rate change
+xset r rate 300 50
+# Map the caps lock key to super...
+setxkbmap -option caps:super
+# But when it is pressed only once, treat it as escape.
+killall xcape 2>/dev/null ; xcape -e 'Super_L=Escape'
+# Map the menu button to right super as well.
+xmodmap -e 'keycode 135 = Super_R'
diff --git a/.xprofile b/.xprofile
index 81ad4f4..08698c7 100644
--- a/.xprofile
+++ b/.xprofile
@@ -3,11 +3,7 @@
 # This file runs when a DM logs you into a graphical session.
 # If you use startx/xinit like a Chad, this file will also be sourced.
 
-# Set Caps to Mod/Escape
-setxkbmap -option caps:swapescape && killall xcape 2>/dev/null ; xcape -e 'Super_L=Escape' &
-# Properties button extra Mod/Escape
-xmodmap -e 'keycode 135 = Super_R' &
-
+remaps &		# run the remaps script, switching caps/esc and more; check it for more info
 setbg &			# set the background with the `setbg` script
 xcompmgr &		# xcompmgr for transparency
 dwmblocks &		# script for updating the status bar