diff --git a/.gitignore b/.gitignore
index be3f5a25..dfb41323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,14 +3,23 @@
 .cache
 .dbus
 .fontconfig
+.gimp*
+.lesshst
 .local/share/Trash
-.local/share/Icons
+.local/share/icons
+.local/share/dwb
+.local/share/newsbeuter
+.local/share/mime/*
 .local/share/applications/wine*
 .local/share/webkit
 .mtab.fuseiso
 .mutt.*
+.ssh
 .texlive*
 .wine
+.zcompdump
 .zdirs
 .zshistfile
+personal
 temp
+todo.org
diff --git a/.pkg-arch-aur-edf23ads b/.pkg/arch-aur-edf23ads
similarity index 100%
rename from .pkg-arch-aur-edf23ads
rename to .pkg/arch-aur-edf23ads
diff --git a/.pkg-arch-aur-peteramd b/.pkg/arch-aur-peteramd
similarity index 100%
rename from .pkg-arch-aur-peteramd
rename to .pkg/arch-aur-peteramd
diff --git a/.pkg-arch-expert b/.pkg/arch-expert
similarity index 100%
rename from .pkg-arch-expert
rename to .pkg/arch-expert
diff --git a/.pkg-arch-official-edf23ads b/.pkg/arch-official-edf23ads
similarity index 100%
rename from .pkg-arch-official-edf23ads
rename to .pkg/arch-official-edf23ads
diff --git a/.pkg-arch-official-peteramd b/.pkg/arch-official-peteramd
similarity index 100%
rename from .pkg-arch-official-peteramd
rename to .pkg/arch-official-peteramd
diff --git a/.pkg-arch-public-low b/.pkg/arch-public-low
similarity index 100%
rename from .pkg-arch-public-low
rename to .pkg/arch-public-low
diff --git a/.pkg-freebsd-edf23ads b/.pkg/freebsd-edf23ads
similarity index 100%
rename from .pkg-freebsd-edf23ads
rename to .pkg/freebsd-edf23ads
diff --git a/.pkg-texlive-FreeBSD-edf23ads b/.pkg/texlive-FreeBSD-edf23ads
similarity index 100%
rename from .pkg-texlive-FreeBSD-edf23ads
rename to .pkg/texlive-FreeBSD-edf23ads
diff --git a/.pkg-texlive-Linux-edf23ads b/.pkg/texlive-Linux-edf23ads
similarity index 100%
rename from .pkg-texlive-Linux-edf23ads
rename to .pkg/texlive-Linux-edf23ads
diff --git a/.pkg-texlive-Linux-peteramd b/.pkg/texlive-Linux-peteramd
similarity index 100%
rename from .pkg-texlive-Linux-peteramd
rename to .pkg/texlive-Linux-peteramd
diff --git a/.scripts/pkggen b/.scripts/pkggen
index 425dcec7..bfb095e8 100755
--- a/.scripts/pkggen
+++ b/.scripts/pkggen
@@ -26,11 +26,12 @@
 
 ## Variables
 HOST="$(hostname)"
+PKG_ROOT="$(HOME)/.pkg"
 
 ## Arch Linux
 if [ -e "/usr/bin/pacman" ]; then
-    ARCH_PKG_OFFICIAL="$HOME/.pkg-arch-official-${HOST}"
-	ARCH_PKG_AUR="$HOME/.pkg-arch-aur-${HOST}"
+    ARCH_PKG_OFFICIAL="$PKG_ROOT/arch-official-${HOST}"
+	ARCH_PKG_AUR="$PKG_ROOT/arch-aur-${HOST}"
 
 	PKG_LOCAL='pacman -Qq | sort'
 	PKG_FOREIGN='pacman -Qmq | sort'
@@ -41,7 +42,7 @@ fi
 
 ## FreeBSD
 if [ "$(uname)" = "FreeBSD" ]; then
-    pkg_info | cut -f1 -d' ' >"$HOME/.pkg-freebsd-${HOST}"
+    pkg_info | cut -f1 -d' ' >"$PKG_ROOT/freebsd-${HOST}"
 fi
 
 ## TeXlive
@@ -53,7 +54,7 @@ if type tlmgr >/dev/null 2>&1; then
     TEXLIVE_ALL="$(tlmgr info --only-installed | grep -v 'x86_64\|amd64' | cut -d' ' -f2 | cut -f1 -d':' | sort)"
 
     comm -3 <(echo "$TEXLIVE_BASIC") <(echo "$TEXLIVE_ALL") | sed 's/	//g' | \
-        grep -vi 'collection-basic\|scheme-minimal\|texlive-common\|texlive-docindex\|texlive-en' >"$HOME/.pkg-texlive-$(uname)-${HOST}"
+        grep -vi 'collection-basic\|scheme-minimal\|texlive-common\|texlive-docindex\|texlive-en' >"$PKG_ROOT/texlive-$(uname)-${HOST}"
 fi
 
 ## Cleaning