diff --git a/X11/Xresources b/X11/Xresources
new file mode 100644
index 0000000..1209504
--- /dev/null
+++ b/X11/Xresources
@@ -0,0 +1,20 @@
+! General styling
+*background: #3d3d3d
+*foreground: #99aa99
+
+! XTerm
+xterm*dynamiccolors:      true
+xterm*utf8:               2
+xterm*geometry:           WINDOWGEOMETRY
+xterm*visualBell:         on
+xterm*highlightSelection: true
+!xterm*background:      lightblack
+!xterm*foreground:      lightblue
+!xterm*colorMode:       on
+!xterm*colorBD:         lightcyan
+!xterm*colorBDMode:     on
+!xterm*colorUL:         white
+!xterm*colorULMode:     on
+!xterm*scrollTtyOutput: false
+!xterm*scrollKey:       true
+!xterm*scrollBar:       true
diff --git a/X11/user-dirs.dirs b/X11/user-dirs.dirs
new file mode 100644
index 0000000..4356ac1
--- /dev/null
+++ b/X11/user-dirs.dirs
@@ -0,0 +1,8 @@
+XDG_DESKTOP_DIR="$HOME/Desktop"
+XDG_DOWNLOAD_DIR="$HOME/Downloads"
+XDG_TEMPLATES_DIR="$HOME/Templates"
+XDG_PUBLICSHARE_DIR="$HOME/Public"
+XDG_DOCUMENTS_DIR="$HOME/Documents"
+XDG_MUSIC_DIR="$HOME/Music"
+XDG_PICTURES_DIR="$HOME/Pictures"
+XDG_VIDEOS_DIR="$HOME/Videos"
diff --git a/xinitrc b/X11/xinitrc
similarity index 83%
rename from xinitrc
rename to X11/xinitrc
index e58d724..bf8a3bd 100644
--- a/xinitrc
+++ b/X11/xinitrc
@@ -19,6 +19,18 @@ fi
 #	 OWN
 # ---------------------------------------------------------------
 
+# Load Main Xresources
+[ -f ~/.Xresources ] && xrdb -merge $HOME/.Xresources
+
+# Load specific Xresources
+XRESD="$HOME/.Xresources.d/"
+for f in "$XRESD*"
+do
+	xrdb -merge "$f"
+done
+
+numlockx on # turn on numlock
+setxkbmap -option caps:escape # caps lock works as escape
 
 
 # Load session
diff --git a/xsession b/X11/xsession
similarity index 100%
rename from xsession
rename to X11/xsession
diff --git a/install.conf.yaml b/install.conf.yaml
index f774b3f..5d1b4c6 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -20,8 +20,10 @@
     ~/.tmux: tmux
     ~/.tmux.conf: tmux/tmux.conf
     ~/.vimrc: vim/vimrc
-    ~/.xinitrc: xinitrc
-    ~/.xsession: xsession
+    ~/.xinitrc: X11/xinitrc
+    ~/.xsession: X11/xsession
+    ~/.Xresources: X11/Xresources
+    ~/.config/user-dirs.dirs: X11/user-dirs.dirs
     ~/.config/awesome: awesome
     ~/.config/redshift.conf: redshift/redshift.conf