diff --git a/install b/install
index 6c2a2d3..7fed508 100755
--- a/install
+++ b/install
@@ -54,10 +54,12 @@ LINKED_FILES_HOME=(
     ".config/polybar"
     ".config/python"
     ".config/redshift"
+    ".config/sqlite3"
     ".config/streamlink"
     ".config/task"
     ".config/termite"
     ".config/Trolltech.conf"
+    ".config/user-dirs.dirs"
     ".config/vim"
     ".config/vue"
     ".config/wget"
@@ -65,6 +67,8 @@ LINKED_FILES_HOME=(
     ".config/zathura"
     ".config/zsh"
     ".local/bin"
+    ".local/share/applications/vim.desktop"
+    ".local/share/gnupg/gpg-agent.conf"
 )
 
 # Symlinks which will be created
diff --git a/system/.config/custom/env b/system/.config/custom/env
index 2b1dbce..76e7f36 100644
--- a/system/.config/custom/env
+++ b/system/.config/custom/env
@@ -16,6 +16,7 @@
 # XDG Overrides for unsupported programs 
 export HTTPIE_CONFIG_DIR="${XDG_CONFIG_HOME}/httpie"
 export WGETRC="${XDG_CONFIG_HOME}/wget/wgetrc"
+export XAUTHORITY="${HOME}/.Xauthority"
 export VIMINIT=":source ${XDG_CONFIG_HOME}/vim/vimrc"
 export CARGO_HOME="${XDG_DATA_HOME}/cargo"
 export RUSTUP_HOME="${XDG_DATA_HOME}/rustup"
diff --git a/system/.config/git/config b/system/.config/git/config
index 143eafe..0a37df5 100644
--- a/system/.config/git/config
+++ b/system/.config/git/config
@@ -29,7 +29,7 @@
 	a = add --all
 
 	# Create a commit and sign it off
-	c = commit -s -S
+	c = commit -s
 
 	# Push to the master branch of the origin remote
 	p = push --follow-tags
@@ -50,6 +50,9 @@
 [push]
 	default = upstream
 
+[commit]
+	gpgsign = true
+
 [url "git@gitlab.com:severinkaderli/"]
 	insteadOf = gl:
 
diff --git a/system/.config/sqlite3/sqliterc b/system/.config/sqlite3/sqliterc
new file mode 100644
index 0000000..cc36ae8
--- /dev/null
+++ b/system/.config/sqlite3/sqliterc
@@ -0,0 +1,4 @@
+.headers on
+.nullvalue NULL
+.mode column
+pragma foreign_keys = on;
diff --git a/system/.config/user-dirs.dirs b/system/.config/user-dirs.dirs
new file mode 100644
index 0000000..80bbae2
--- /dev/null
+++ b/system/.config/user-dirs.dirs
@@ -0,0 +1,15 @@
+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run.
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+# 
+XDG_DOCUMENTS_DIR="$HOME/Documents"
+XDG_DOWNLOAD_DIR="$HOME/Downloads"
+XDG_MUSIC_DIR="$HOME/Music"
+XDG_PICTURES_DIR="$HOME/Pictures"
+XDG_VIDEOS_DIR="$HOME/Videos"
+XDG_DESKTOP_DIR="$HOME"
+XDG_TEMPLATES_DIR="$HOME"
+XDG_PUBLICSHARE_DIR="$HOME"
diff --git a/system/.local/bin/power b/system/.local/bin/power
index cee64c4..825a2e8 100755
--- a/system/.local/bin/power
+++ b/system/.local/bin/power
@@ -40,11 +40,8 @@ case "${SELECTION}" in
         screenlock
         ;;
     "5")
-        gksudo "cpupower frequency-set -g performance"
-        optirun -b primus nvidia-settings -a '[gpu:0]/GPUPowerMizerMode=2' -c :8 > /dev/null
+        gksu "cpupower frequency-set -g performance"
         ;;
     "6")
-        gksudo "cpupower frequency-set -g powersave"
-        optirun -b primus nvidia-settings -a '[gpu:0]/GPUPowerMizerMode=0' -c :8 > /dev/null
-        ;;
+        gksu "cpupower frequency-set -g powersave"
 esac
diff --git a/system/.local/share/applications/vim.desktop b/system/.local/share/applications/vim.desktop
new file mode 100644
index 0000000..03b651a
--- /dev/null
+++ b/system/.local/share/applications/vim.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Vim
+GenericName=Text Editor
+Comment=Vim in Termite
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Icon=gvim
+Exec=termite -e "vim %f"
+Type=Application
+Terminal=false
+Categories=Development;TextEditor;
+Keywords=Text;Editor;
diff --git a/system/.local/share/gnupg/gpg-agent.conf b/system/.local/share/gnupg/gpg-agent.conf
new file mode 100644
index 0000000..360079f
--- /dev/null
+++ b/system/.local/share/gnupg/gpg-agent.conf
@@ -0,0 +1 @@
+default-cache-ttl 3600