diff --git a/dotfiles/Xmodmap b/dotfiles/Xmodmap
new file mode 100644
index 00000000..5b7354af
--- /dev/null
+++ b/dotfiles/Xmodmap
@@ -0,0 +1,6 @@
+clear Mod1
+clear Mod2
+keycode 63 = Mode_switch
+keycode 66 = Meta_L
+add Mod1 = Meta_L
+add Mod2 = Mode_switch
\ No newline at end of file
diff --git a/dotfiles/lib/shellrc/aliases.sh b/dotfiles/lib/shellrc/aliases.sh
index 26ca51d3..1a1f270e 100644
--- a/dotfiles/lib/shellrc/aliases.sh
+++ b/dotfiles/lib/shellrc/aliases.sh
@@ -1,4 +1,5 @@
 alias emacs="emacsclient -t"
+alias xemacs="emacsclient -c &"
 alias tmux="tmux -2"
 alias tmux_cb_to_remote_cb='tmux saveb - | linux_nc_paste_to_remote_clipboard'
 alias timestamp='date +%s'
diff --git a/dotfiles/xinitrc b/dotfiles/xinitrc
new file mode 100644
index 00000000..56b40831
--- /dev/null
+++ b/dotfiles/xinitrc
@@ -0,0 +1 @@
+source ~/.zshrc && xmodmap ~/.Xmodmap