diff --git a/.aliases.debian b/.aliases/command-specific/apt-get
similarity index 100%
rename from .aliases.debian
rename to .aliases/command-specific/apt-get
diff --git a/.aliases/command-specific/fasd b/.aliases/command-specific/fasd
new file mode 100644
index 0000000..1dd590d
--- /dev/null
+++ b/.aliases/command-specific/fasd
@@ -0,0 +1,8 @@
+## fasd
+alias j='fasd_cd -d'
+alias jj='fasd_cd -d -i'
+alias js='fasd_cd -d -i'
+alias fe='f -e "emacsclient"'
+alias fet='f -e "emacsclient -t"'
+alias fec='f -e "emacsclient -c"'
+alias fecn='f -e "emacsclient -c -n"'
\ No newline at end of file
diff --git a/.aliases.arch b/.aliases/command-specific/pacman
similarity index 93%
rename from .aliases.arch
rename to .aliases/command-specific/pacman
index 2c12e0c..63cbf10 100644
--- a/.aliases.arch
+++ b/.aliases/command-specific/pacman
@@ -16,6 +16,4 @@ piro() { #remove orphans
 
 compdef apacman=pacman
 
-alias gup='updateGit.sh'
-
 alias up='pup'
diff --git a/.aliases/command-specific/systemctl b/.aliases/command-specific/systemctl
new file mode 100644
index 0000000..d3c3d34
--- /dev/null
+++ b/.aliases/command-specific/systemctl
@@ -0,0 +1,4 @@
+#-*- mode: sh; -*-
+alias sy="sudo systemctl"
+alias sye="sy enable"
+alias sye="sy disable"
diff --git a/.aliases b/.aliases/general
similarity index 78%
rename from .aliases
rename to .aliases/general
index c46d19b..cd0a6db 100644
--- a/.aliases
+++ b/.aliases/general
@@ -4,15 +4,6 @@
 alias l='ls -1a'
 alias la='ll -a'
 
-## fasd
-alias j='fasd_cd -d'
-alias jj='fasd_cd -d -i'
-alias js='fasd_cd -d -i'
-alias fe='f -e "emacsclient"'
-alias fet='f -e "emacsclient -t"'
-alias fec='f -e "emacsclient -c"'
-alias fecn='f -e "emacsclient -c -n"'
-
 ## Disable Globbing (for some things)
 alias nmap="noglob nmap"
 
diff --git a/.zprezto b/.zprezto
index 1d2c7f3..516d0a1 160000
--- a/.zprezto
+++ b/.zprezto
@@ -1 +1 @@
-Subproject commit 1d2c7f30d436805b25272acf28119f4588dde826
+Subproject commit 516d0a143b8b089ae0e18e21bb2c3ab192066806