diff --git a/.local/bin/tools/remaps b/.local/bin/tools/remaps
index 89250447..f92243e5 100755
--- a/.local/bin/tools/remaps
+++ b/.local/bin/tools/remaps
@@ -2,8 +2,8 @@
 # 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
+# Switch to US international with Caps as Mod/Escape
+setxkbmap -option caps:super -variant altgr-intl
 # 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.