diff --git a/home/.Xresources b/home/.Xresources
deleted file mode 100644
index 4988cbe..0000000
--- a/home/.Xresources
+++ /dev/null
@@ -1,12 +0,0 @@
-! ~/.Xresources
-
-! Setting up commonly changed vars
-#define myfontsize 11
-#define myfont Fira Code
-#define myOpacity 90
-
-! Set up URxvt
-#include ".config/Xresources/urxvt.Xresources"
-
-! Add Nord theme to every terminal emulator respecting Xresources
-#include ".config/Xresources/nord.Xresources"
diff --git a/nvim/.config/nvim/colo.vim b/nvim/.config/nvim/colo.vim
deleted file mode 100644
index cc9ab5a..0000000
--- a/nvim/.config/nvim/colo.vim
+++ /dev/null
@@ -1 +0,0 @@
-colo nord
diff --git a/shell/.config/shell/rc.d/autostartx.sh b/shell/.config/shell/rc.d/autostartx.sh
index f598e0b..6a50795 100644
--- a/shell/.config/shell/rc.d/autostartx.sh
+++ b/shell/.config/shell/rc.d/autostartx.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 if [ ! "$DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then
-  exec startx ~/.xinitrc
+  exec startx "$XDG_CONFIG_HOME"/xresources/xinitrc
 fi
diff --git a/xresources/.config/xresources/Xresources b/xresources/.config/xresources/Xresources
new file mode 100644
index 0000000..cd35b65
--- /dev/null
+++ b/xresources/.config/xresources/Xresources
@@ -0,0 +1,11 @@
+! ~/.Xresources
+
+! Setting up commonly changed vars
+#define myfontsize 11
+#define myfont Iosevka Mono
+#define myOpacity 90
+
+! Font settings
+#include "Xresources.d/fonts"
+
+! Colorscheme
diff --git a/xresources/.config/xresources/Xresources.d/fonts b/xresources/.config/xresources/Xresources.d/fonts
new file mode 100644
index 0000000..58faa41
--- /dev/null
+++ b/xresources/.config/xresources/Xresources.d/fonts
@@ -0,0 +1,7 @@
+Xft.antialias: 1
+Xft.autohint: 0
+Xft.dpi: 92
+Xft.hinting: true
+Xft.hintstyle: hintslight
+Xft.lcdfilter: lcddefault
+Xft.rgba: rgb
diff --git a/xresources/.config/xresources/nord.Xresources b/xresources/.config/xresources/nord.Xresources
deleted file mode 100644
index 3122e26..0000000
--- a/xresources/.config/xresources/nord.Xresources
+++ /dev/null
@@ -1,48 +0,0 @@
-! +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-! title      Nord XResources                                    +
-! project    nord-xresources                                    +
-! version    0.1.0                                              +
-! repository https://github.com/arcticicestudio/nord-xresources +
-! author     Arctic Ice Studio                                  +
-! email      development@arcticicestudio.com                    +
-! copyright  Copyright (C) 2016                                 +
-! +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#define nord0 #2E3440
-#define nord1 #3B4252
-#define nord2 #434C5E
-#define nord3 #4C566A
-#define nord4 #D8DEE9
-#define nord5 #E5E9F0
-#define nord6 #ECEFF4
-#define nord7 #8FBCBB
-#define nord8 #88C0D0
-#define nord9 #81A1C1
-#define nord10 #5E81AC
-#define nord11 #BF616A
-#define nord12 #D08770
-#define nord13 #EBCB8B
-#define nord14 #A3BE8C
-#define nord15 #B48EAD
-
-*.foreground:   nord4
-*.background:   [myOpacity]nord0
-*.cursorColor:  nord4
-*fading: 0
-*fadeColor: nord3
-
-*.color0: nord1
-*.color1: nord11
-*.color2: nord14
-*.color3: nord13
-*.color4: nord9
-*.color5: nord15
-*.color6: nord8
-*.color7: nord5
-*.color8: nord3
-*.color9: nord11
-*.color10: nord14
-*.color11: nord13
-*.color12: nord9
-*.color13: nord15
-*.color14: nord7
-*.color15: nord6
diff --git a/xresources/.config/xresources/urxvt.Xresources b/xresources/.config/xresources/urxvt.Xresources
deleted file mode 100644
index 5ff2d59..0000000
--- a/xresources/.config/xresources/urxvt.Xresources
+++ /dev/null
@@ -1,37 +0,0 @@
-!Font
-URxvt.font: xft:myfont:size=myfontsize,style=medium
-URxvt.boldFont: xft:myfont:size=myfontsize,style=bold
-URxvt.italicFont: xft:myfont:size=myfontsize,style=italic
-URxvt.boldItalicFont: xft:myfont:size=myfontsize,style=bold,italic
-URxvt.letterSpace: -1
-
-!UI
-URxvt.scrollBar: false
-URxvt.borderless: true
-URxvt.saveLines: 20000
-URxvt.dynamicColors: true
-URxvt.fading: 25
-
-!Sane utility defaults
-URxvt.loginShell: true
-URxvt.scrollTtyKeypress: true
-URxvt.scrollTtyOutput: false
-URxvt.scrollWithBuffer: false
-URxvt.skipScroll: true
-
-!Extensions
-!Tabbing disabled by default (TMUX used for tabbed terminals)
-!to enable tabbing comment the bottom line and uncomment the one above.
-!URxvt.perl-ext-common: default,matcher,tabbed
-URxvt.perl-ext-common: default,matcher
-
-! Link Clicking
-URxvt.url-launcher: /usr/bin/xdg-open
-URxvt.matcher.button: 1
-URxvt.matcher.rend.0: Uline Bold fg5
-
-!Tab Styling
-URxvt.tabbed.tabbar-fg: 2
-URxvt.tabbed.tabbar-bg: 0
-URxvt.tabbed.tab-fg: 3
-URxvt.tabbed.tab-bg: 0
diff --git a/home/.xinitrc b/xresources/.config/xresources/xinitrc
similarity index 93%
rename from home/.xinitrc
rename to xresources/.config/xresources/xinitrc
index f2f4a59..97fbf52 100644
--- a/home/.xinitrc
+++ b/xresources/.config/xresources/xinitrc
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
+userresources=$XDG_CONFIG_HOME/xresources/Xresources
+usermodmap=$XDG_CONFIG_HOME/xresources/Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
@@ -37,7 +37,7 @@ fi
 setxkbmap -option ctrl:nocaps
 # sets default to EURkey layout, with possibility to switch to german
 # sets german layout to be default for the only pc I have with a german keyboard
-if [[ $HOST == "marty-desk" ]] || [[ $HOSTNAME == "marty-desk" ]]; then
+if [ "$HOST" = "marty-desk" ] || [ "$HOSTNAME" = "marty-desk" ]; then
   setxkbmap -layout de,eu
 else
   setxkbmap -layout eu,de