diff --git a/aliases.zsh b/aliases.zsh
index 6cf49a7..3b78953 100644
--- a/aliases.zsh
+++ b/aliases.zsh
@@ -15,15 +15,8 @@ alias gedit=" $EDITOR ~/.gitconfig"
 #alias man="unset PAGER; man"
 alias grep='grep --color=auto'
 
-alias feierabend='sudo shutdown -h now'
 alias sign='gpg --detach-sign --armor'
 alias j=' j'
-alias up=" nmcli con up id"
-alias down=" nmcli con down id"
-
-alias start=" sudo rc.d start"
-alias stop=" sudo rc.d stop"
-alias restart=" sudo rc.d restart"
 
 ##### standard aliases (start with a space to be ignored in history)
 # default ls is untouched, except coloring
diff --git a/linux.zsh b/linux.zsh
index 5ef6097..1876d1c 100644
--- a/linux.zsh
+++ b/linux.zsh
@@ -11,16 +11,36 @@ else
     which dircolors > /dev/null && eval "`dircolors -b`"
 fi
 
+alias up=" nmcli con up id"
+alias down=" nmcli con down id"
+
+LSB_DISTRIBUTOR=`lsb_release -i -s`
+
 # debian and ubuntu specific aliases
 ## autocomplete-able apt-xxx aliases
-alias acs='apt-cache show'
-alias agi='sudo apt-get install'
-alias ag='sudo apt-get'
-alias agu='sudo apt-get update'
-alias agug='sudo apt-get upgrade'
-alias aguu='agu && agug'
-alias agr='sudo apt-get uninstall'
-alias agp='sudo apt-get purge'
-alias aga='sudo apt-get autoremove'
-alias ctl='sudo service '
+if [[ "$LSB_DISTRIBUTOR" == "Ubuntu" ]]; then
+    alias acs='apt-cache show'
+    alias agi='sudo apt-get install'
+    alias ag='sudo apt-get'
+    alias agu='sudo apt-get update'
+    alias agug='sudo apt-get upgrade'
+    alias aguu='agu && agug'
+    alias agr='sudo apt-get uninstall'
+    alias agp='sudo apt-get purge'
+    alias aga='sudo apt-get autoremove'
+    alias ctl='sudo service '
+    alias feierabend='sudo shutdown -h now'
+fi
+
+# arch linux with systemd aliases
+if [[ "$LSB_DISTRIBUTOR" == "archlinux" ]]; then
+    # statements
+    alias ctl='sudo systemctl '
+    alias feierabend='sudo systemctl start shutdown.target'
+    alias start=" sudo systemctl start"
+    alias stop=" sudo systemctl stop"
+    alias status=" sudo systemctl status"
+    alias restart=" sudo systemctl restart"
+    alias reboot="sudo systemctl start reboot.target"
+fi
 
diff --git a/options.zsh b/options.zsh
index 7d5c4da..e41a450 100644
--- a/options.zsh
+++ b/options.zsh
@@ -4,7 +4,7 @@
 # shell options as history size, keyindings, etc
 #
 
-export GREP_OPTIONS='-D skip --binary-files=without-match --ignore-case'
+export GREP_OPTIONS='--binary-files=without-match --ignore-case'
 
 # keybindings Strg+v is your friend :-)
 bindkey "^[[1;5D" .backward-word