diff --git a/.config/xorg/Xresources b/.config/xorg/Xresources
index 0bf3873..9e6682a 100644
--- a/.config/xorg/Xresources
+++ b/.config/xorg/Xresources
@@ -65,6 +65,10 @@ URxvt.matcher.rend.0: Uline Bold fg5
 URxvt.keysym.Shift-Control-C: eval:selection_to_clipboard
 URxvt.keysym.Shift-Control-V: eval:paste_clipboard
 
+! Scroll 1 line
+URxvt.keysym.Shift-Up: command:\033]720;1\007
+URxvt.keysym.Shift-Down: command:\033]721;1\007
+
 ! Disable Ctrl+Shift feature
 URxvt.iso14755: false
 URxvt.iso14755_52: false
diff --git a/.config/xorg/xinitrc b/.config/xorg/xinitrc
index 9225835..4ff9824 100644
--- a/.config/xorg/xinitrc
+++ b/.config/xorg/xinitrc
@@ -19,10 +19,7 @@ xset -dpms
 # Clear all mappings
 setxkbmap -option ''
 
-# Make CapsLock behave like Ctrl
-setxkbmap -option ctrl:nocaps
-
-# Make short-pressed Ctrl behave like Escape
-xcape -e 'Control_L=Escape'
+# Swap capslock with escape
+setxkbmap -option caps:swapescape
 
 exec i3