diff --git a/apps/X11/config/Xmodmap b/apps/X11/config/Xmodmap
new file mode 100644
index 0000000..958b555
--- /dev/null
+++ b/apps/X11/config/Xmodmap
@@ -0,0 +1,3 @@
+keycode 194 = eacute
+keycode 195 = egrave
+keycode 196 = agrave
diff --git a/dwm/dwmstartup/startdwm b/dwm/dwmstartup/startdwm
index f304597..c00d52b 100755
--- a/dwm/dwmstartup/startdwm
+++ b/dwm/dwmstartup/startdwm
@@ -11,8 +11,8 @@ done
 
 # TODO move this out of here, this should not be defined like that nor pushed
 xrandr --output HDMI-0 --primary --auto --output DVI-D-0 --auto --right-of HDMI-0 --output DP-0 --auto --left-of HDMI-0
-# setxkbmap fr
-setxkbmap -option caps:swapescape
+setxkbmap -option caps:escape
+xmodmap ~/.config/Xmodmap
 
 xset +fp $XDG_DATA_HOME/fonts
 xset fp rehash