diff --git a/README.md b/README.md
index edc17a8..bb12342 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,10 @@ This folder contains my [compton](https://github.com/yshui/compton/releases) con
 ### `.config/cron`
 This folder contains my crontab file.
 
+### `.config/custom`
+This folder contains my configuration files that don't fit in any other
+directory like `dircolors` and `keyleds`.
+
 ### `.config/dconf`
 This folder contains my configurations that are stored in dconf by applications. These are getting loaded on boot in `.bash_profile`.
 
@@ -85,7 +89,11 @@ This folder contains my configuration for
 [vue-cli](https://github.com/vuejs/vue-cli).
 
 ### `.config/wget`
-This folder contains my configuration for [wget](https://www.gnu.org/software/wget/).
+This folder contains my configuration for
+[wget](https://www.gnu.org/software/wget/).
+
+### `.config/X11`
+This folder contains my configuration for the X-Server.
 
 ### `.config/Trolltech.conf`
 This file contains my QT4 configuration.
@@ -103,7 +111,7 @@ This folder contains my custom udev rules. They are moved to
 This file contains my aliases that I use on a regular basis. I also use it to replace some standard commands wiht alternatives, like using `exa` instead of `ls`.
 
 ### `.bash_logout`
-This file contains code that gets executed when the shell is existed.
+This file contains code that gets executed when the shell is exited.
 
 ### `.bash_profile`
 This file contains code that gets executed when a login shell is started.
@@ -111,23 +119,5 @@ This file contains code that gets executed when a login shell is started.
 ### `.bashrc`
 This file contains code that gets executed when a new shell is started.
 
-### `.dircolors`
-This file contains my used color scheme for `ls`.
-
 ### `.env`
-This file contains my used environment variables.
-
-### `.keyleds`
-This file contains the configuration for my keyboard backlight.
-
-### `.xinitrc`
-This file is called when a new x-server is started manually. It loads the contents of `.xsetup` and then starts i3.
-
-### `.xprofile`
-This file is used by some display managers to load my normal `.bash_profile` file and `.xsetup`.
-
-### `.Xresources`
-This file currently contains my color configuration for [Rofi](https://github.com/DaveDavenport/rofi).
-
-### `.xsetup`
-This file contains code that I need on start. That's why it's sourced by both `.xinitrc` and `.xprofile`. This way I only need to write this code once.
\ No newline at end of file
+This file contains my used environment variables.
\ No newline at end of file
diff --git a/install.sh b/install.sh
index d39e136..f5ddd72 100755
--- a/install.sh
+++ b/install.sh
@@ -38,9 +38,11 @@ LINKED_FILES_HOME=(
     ".config/bat"
     ".config/compton"
     ".config/cron"
+    ".config/custom"
     ".config/dconf"
     ".config/dunst"
     ".config/git"
+    ".config/gtk-2.0"
     ".config/gtk-3.0"
     ".config/httpie"
     ".config/i3"
@@ -53,15 +55,8 @@ LINKED_FILES_HOME=(
     ".config/vim"
     ".config/vue"
     ".config/wget"
-    ".dircolors"
+    ".config/X11"
     ".env"
-    ".gtkrc-2.0.mine"
-    ".gtkrc-2.0"
-    ".keyleds"
-    ".xinitrc"
-    ".xprofile"
-    ".Xresources"
-    ".xsetup"
     "bin"
 )
 
diff --git a/system/.bash_profile b/system/.bash_profile
index 8766c0e..e4fd4af 100644
--- a/system/.bash_profile
+++ b/system/.bash_profile
@@ -15,17 +15,17 @@ if [[ -f "${HOME}/.bashrc" ]]; then
     . "${HOME}/.bashrc"
 fi
 
-if [[ -f "${HOME}/.keyleds" ]]; then
-    . "${HOME}/.keyleds"
+if [[ -f "${XDG_CONFIG_HOME}/custom/keyleds" ]]; then
+    . "${XDG_CONFIG_HOME}/custom/keyleds"
 fi
 
 # Restore custom dconf configuration
-dconf load / < "${HOME}/.config/dconf/root.conf"
+dconf load / < "${XDG_CONFIG_HOME}/dconf/root.conf"
 
 # Activate correct crontab file
 crontab "${XDG_CONFIG_HOME}/cron/crontab"
 
 # If we are on tty1 we start the x-server
 if [ "$(tty)" = "/dev/tty1" ]; then
-    startx && exit
+    startx "${XDG_CONFIG_HOME}/X11/xinitrc" && exit
 fi
\ No newline at end of file
diff --git a/system/.bashrc b/system/.bashrc
index 52f0b2a..6c87f89 100644
--- a/system/.bashrc
+++ b/system/.bashrc
@@ -23,8 +23,8 @@ if [ -f "${HOME}/.env" ]; then
 fi
 
 # Enable color support of ls
-if [ -f "${HOME}/.dircolors" ]; then
-    dircolors -b "${HOME}/.dircolors" > /dev/null 2>&1
+if [ -f "${XDG_CONFIG_HOME}/custom/dircolors" ]; then
+    dircolors -b "${XDG_CONFIG_HOME}/custom/dircolors" > /dev/null 2>&1
 fi
 
 # Sourcing alias definitions
diff --git a/system/.xinitrc b/system/.config/X11/xinitrc
similarity index 80%
rename from system/.xinitrc
rename to system/.config/X11/xinitrc
index 5bca6a3..6478603 100644
--- a/system/.xinitrc
+++ b/system/.config/X11/xinitrc
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 
 # SCRIPT NAME:
-# .xinitrc
+# .config/X11/xinitrc
 #
 # AUTHOR:
 # Severin Kaderli <severin.kaderli@gmail.com>
@@ -11,5 +11,5 @@
 #
 # USAGE:
 # This script is executed when you start the x-server.
-. "${HOME}/.xsetup"
+. "${XDG_CONFIG_HOME}/X11/xsetup"
 i3
\ No newline at end of file
diff --git a/system/.Xresources b/system/.config/X11/xresources
similarity index 100%
rename from system/.Xresources
rename to system/.config/X11/xresources
diff --git a/system/.xsetup b/system/.config/X11/xsetup
similarity index 88%
rename from system/.xsetup
rename to system/.config/X11/xsetup
index 7ac915f..c425a10 100644
--- a/system/.xsetup
+++ b/system/.config/X11/xsetup
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 
 # SCRIPT NAME:
-# .xsetup
+# .config/X11/xsetup
 #
 # AUTHOR:
 # Severin Kaderli <severin.kaderli@gmail.com>
@@ -26,7 +26,7 @@ nm-applet &
 redshift &
 
 # Merge .Xresources on boot
-xrdb -merge "${HOME}/.Xresources"
+xrdb -merge "${XDG_CONFIG_HOME}/X11/xresources"
 
 # Start ibus
 #ibus-daemon -drx
diff --git a/system/.dircolors b/system/.config/custom/dircolors
similarity index 100%
rename from system/.dircolors
rename to system/.config/custom/dircolors
diff --git a/system/.keyleds b/system/.config/custom/keyleds
similarity index 100%
rename from system/.keyleds
rename to system/.config/custom/keyleds
diff --git a/system/.env b/system/.env
index b60ae99..54fbf17 100644
--- a/system/.env
+++ b/system/.env
@@ -29,6 +29,8 @@ export PYLINTHOME="${XDG_CACHE_HOME}/pylint"
 export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
 export GTK_RC_FILES="${XDG_CONFIG_HOME}/gtk-1.0/gtkrc"
 export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
+export XINITRC="${XDG_CONFIG_HOME}/X11/xinitrc"
+export XSERVERRC="${XDG_CONFIG_HOME}/X11/xserverrc"
 
 # Bash
 export HISTCONTROL=ignoreboth
diff --git a/system/.xprofile b/system/.xprofile
deleted file mode 100644
index 96a0277..0000000
--- a/system/.xprofile
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# 
-# SCRIPT NAME:
-# .xprofile
-#
-# AUTHOR:
-# Severin Kaderli <severin.kaderli@gmail.com>
-#
-# DESCRIPTION:
-# This is the startup script when LightDM starts. Currently it sources .xsetup
-# and .bash_profile so it's almost the same as if you start the x-server
-# manually.
-#
-# USAGE:
-# This script is executed when LightDM starts.
-. "${HOME}/.xsetup"
-. "${HOME}/.bash_profile"