diff --git a/install b/install
index a81c692..daaaef2 100755
--- a/install
+++ b/install
@@ -26,7 +26,7 @@ DIRECTORIES=(
     ".local/log"
     "Build"
     "Downloads"
-    "Keys"
+    ".local/keys"
     "Music"
     "Pictures"
     "Projects"
@@ -53,6 +53,7 @@ LINKED_FILES_HOME=(
     ".config/gtk-2.0"
     ".config/gtk-3.0"
     ".config/httpie"
+    ".config/maven"
     ".config/i3"
     ".config/mpv"
     ".config/newsboat"
@@ -99,6 +100,7 @@ ADD_GROUPS=(
 # Array of systemd services which should be enabled
 SYSTEMD_SERVICES=(
     "cronie"
+    "docker"
     "NetworkManager"
     "org.cups.cupsd"
     "suspend"
diff --git a/system/.config/autokey/autokey.json~ b/system/.config/autokey/autokey.json~
deleted file mode 100644
index 3e2458b..0000000
--- a/system/.config/autokey/autokey.json~
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "version": "0.95.7",
-    "userCodeDir": null,
-    "settings": {
-        "isFirstRun": true,
-        "serviceRunning": true,
-        "menuTakesFocus": false,
-        "showTrayIcon": true,
-        "sortByUsageCount": true,
-        "promptToSave": false,
-        "enableQT4Workaround": false,
-        "interfaceType": "XRecord",
-        "undoUsingBackspace": true,
-        "windowDefaultSize": [
-            924,
-            962
-        ],
-        "hPanePosition": 233,
-        "columnWidths": [
-            150,
-            50,
-            100
-        ],
-        "showToolbar": true,
-        "notificationIcon": "autokey-status",
-        "workAroundApps": ".*VirtualBox.*|krdc.Krdc",
-        "triggerItemByInitial": false,
-        "scriptGlobals": {}
-    },
-    "folders": [],
-    "toggleServiceHotkey": {
-        "enabled": false,
-        "modifiers": [
-            "<shift>",
-            "<super>"
-        ],
-        "hotKey": "k"
-    },
-    "configHotkey": {
-        "enabled": false,
-        "modifiers": [
-            "<super>"
-        ],
-        "hotKey": "k"
-    }
-}
\ No newline at end of file
diff --git a/system/.config/custom/aliases b/system/.config/custom/aliases
index d563bf0..6d0db3d 100644
--- a/system/.config/custom/aliases
+++ b/system/.config/custom/aliases
@@ -38,17 +38,13 @@ alias doc="cd ~/Documents"
 # Alias for opening my code editor
 alias e="code"
 
-# Alias for wget to use XDG directories
+# Alias for some commands to use xdg directories
 alias wget='wget --hsts-file="${XDG_CACHE_HOME}/wget-hsts"'
-
-# Alias for svn to use XDG directories
 alias svn='svn --config-dir "${XDG_CONFIG_HOME}/subversion"'
-
-# Alias for gpg2 to use XDG directories
 alias gpg2='gpg2 --homedir "${XDG_DATA_HOME}/gnupg"'
-
-# Alias for sqlite3 to use XDG directories
 alias sqlite3='sqlite3 -init "${XDG_CONFIG_HOME}/sqlite3/sqliterc"'
+alias mvn='mvn -gs "${XDG_CONFIG_HOME}/maven/settings.xml"'
+alias nvidia-settings='nvidia-settings --config="${XDG_CONFIG_HOME}/nvidia/settings"'
 
 alias t='task todo'
 alias ta='task add'
diff --git a/system/.config/custom/env b/system/.config/custom/env
index edd943c..42e311a 100644
--- a/system/.config/custom/env
+++ b/system/.config/custom/env
@@ -53,6 +53,9 @@ export WINEPREFIX="${XDG_DATA_HOME}/wine/prefixes/default"
 export SQLITE_HISTORY="${XDG_DATA_HOME}/sqlite_history"
 export TASKDATA="${HOME}/Tasks"
 export TASKRC="${XDG_CONFIG_HOME}/task/taskrc"
+export PARALLEL_HOME="$XDG_CONFIG_HOME/parallel"
+export CCACHE_CONFIGPATH="${XDG_CONFIG_HOME}/ccache.config"
+export CCACHE_DIR="${XDG_CACHE_HOME}/ccache"
 
 # Python
 mkdir -p "${XDG_DATA_HOME}/python"
diff --git a/system/.config/maven/settings.xml b/system/.config/maven/settings.xml
new file mode 100644
index 0000000..40b7631
--- /dev/null
+++ b/system/.config/maven/settings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <localRepository>${env.XDG_CACHE_HOME}/maven/repository</localRepository>
+</settings>
\ No newline at end of file
diff --git a/system/.config/task/taskrc b/system/.config/task/taskrc
index 39c1616..3d1ae9b 100644
--- a/system/.config/task/taskrc
+++ b/system/.config/task/taskrc
@@ -31,9 +31,9 @@ color.due.today=
 dateformat=Y-M-D H:N
 
 # Synchronization
-taskd.certificate=/home/severin/Keys/taskwarrior/private.certificate.pem
-taskd.key=/home/severin/Keys/taskwarrior/private.key.pem
-taskd.ca=/home/severin/Keys/taskwarrior/ca.cert.pem
+taskd.certificate=/home/severin/.local/keys/taskwarrior/private.certificate.pem
+taskd.key=/home/severin/.local/keys/taskwarrior/private.key.pem
+taskd.ca=/home/severin/.local/keys/taskwarrior/ca.cert.pem
 taskd.server=taskwarrior.inthe.am:53589
 taskd.credentials=inthe_am/severin.kaderli/0a28cfd9-a503-4518-8e62-25eef00f6e00
 taskd.trust=ignore hostname
\ No newline at end of file