diff --git a/zsh-david.plugin.zsh b/zsh-david.plugin.zsh
index 656d43d..4c210cf 100644
--- a/zsh-david.plugin.zsh
+++ b/zsh-david.plugin.zsh
@@ -2,19 +2,18 @@
 # It might not be very useful for you.
 
 
-# Options
+#  ****  zsh options  ****
 set -o shwordsplit
 
 
-# Aliases
-alias zz='source ~/.zshrc'
-alias vz='vim ~/.zshrc && source ~/.zshrc'
-#alias vp='vim $ZSH/plugins/david.zsh && source ~/.zshrc'
-#alias vt='vim $ZSH/themes/david.zsh && source ~/.zshrc'
-#alias vs='vim $ZSH/myzsh.sh && source ~/.zshrc'
-#alias vu='cd $ZSH > /dev/null; git pull origin master; cd - > /dev/null; echo $timestamp > $ZSH/lastrun; source ~/.zshrc'
+#  ****  aliases definitions  ****
+alias zz='source $HOME/.zshrc'
+alias vz='vim $HOME/.zshrc && source $HOME/.zshrc'
+alias vp='vim $ZSH_CUSTOM/plugins/zsh-david/zsh-david.plugin.zsh && source $HOME/.zshrc'
+alias vu='upgrade_oh_my_zsh && _upgrade_custom'
 alias vi='vim'
 alias v='vim'
+alias vv='vim $HOME/.vimrc'
 alias serve="python2 -m SimpleHTTPServer"
 alias push="git push origin master"
 alias pull="git pull origin master"
@@ -36,127 +35,123 @@ alias systemctl='sudo systemctl'
 alias se='ls /usr/bin | grep'
 
 
-# Variables
+#  ****  variables  ****
 export EDITOR=vim
 if [[ $LANG = '' ]]; then
-	export LANG=en_US.UTF-8
+  export LANG=en_US.UTF-8
 fi
 
 
-# Functions
+#  ****  function definitions  ****
+
+## RDP client
 rdp()
 {
 
-    if [ -z $1 ]; then
-        echo -e "server: \c"
-        read  server
-    else
-        server=$1
-    fi
+  if [ -z $1 ]; then
+    echo -e "server: \c"
+    read  server
+  else
+    server=$1
+  fi
 
-    echo -e "username [davidadm]: \c"
-    read username
-    if [ -z $username ]; then
-        username="davidadm"
-    fi
+  echo -e "username [davidadm]: \c"
+  read username
+  if [ -z $username ]; then
+    username="davidadm"
+  fi
 
-    echo -e "domain [aec.at]: \c"
-    read domain
-    if [ -z $domain ]; then
-        domain="aec.at"
-    fi
+  echo -e "domain [aec.at]: \c"
+  read domain
+  if [ -z $domain ]; then
+    domain="aec.at"
+  fi
 
-    which rdesktop >/dev/null
+  which rdesktop >/dev/null
+  if [ $? -eq 0 ]; then
+    #rdesktop -u $username -p - -d $domain -g 1366x768 $server -k de
+    rdesktop -K -u $username -p - -d $domain -g workarea $server -k de
+  else
+    which xfreerdp >/dev/null
     if [ $? -eq 0 ]; then
-        #rdesktop -u $username -p - -d $domain -g 1366x768 $server -k de
-        rdesktop -K -u $username -p - -d $domain -g workarea $server -k de
+       #xfreerdp +clipboard /v:$server /u:$username /d:$domain /size:1920x1080
+       xfreerdp /v:$server /u:$username /d:$domain /size:1366x768 -wallpaper:on
     else
-	which xfreerdp >/dev/null
-        if [ $? -eq 0 ]; then
-	    #xfreerdp +clipboard /v:$server /u:$username /d:$domain /size:1920x1080
-            xfreerdp /v:$server /u:$username /d:$domain /size:1366x768 -wallpaper:on
-
-        else
-	    echo "error: no rdp client found"
-	    return 1
-        fi
+       echo "error: no rdp client found"
+       return 1
     fi
-
+  fi
 }
 
+## OS Upgrade for various systems.
 update()
 {
-    #  OS Upgrade function for various systems.
+  systems="ubuntu arch solus raspbian antergos"
+  issue="$(cat /etc/issue)"
+  for item in $systems; do
+    echo $issue | grep -i $item >> /dev/null
+    if [ $? -eq 0 ]; then
+        system=$item
+    fi
+  done
 
-        #checking for system
-        systems="ubuntu arch solus raspbian antergos"
-        issue="$(cat /etc/issue)"
-        for item in $systems; do
-            echo $issue | grep -i $item >> /dev/null
-            if [ $? -eq 0 ]; then
-                system=$item
-            fi
-        done
-
-	#trying to update parsed system
-        case $system in
-            ubuntu|debian|raspbian)
-		echo "Updating Ubuntu/Debian.."
-                sudo apt-get update && sudo apt-get dist-upgrade
-                ;;
-            arch|antergos)
-		echo "Updating Arch Linux.."
-                sudo pacman -Syu
-                ;;
-	    solus)
-		echo "Updating Solus OS.."
-		sudo eopkg update-repo && sudo eopkg upgrade
-		;;
-            ?)
-                echo "error: unknown system."
-		return 1
-                ;;
-        esac
-	if [ $? -ne 0 ]; then
-            echo "error: something went wrong."
-	    return 1
-	fi
+  case $system in
+    ubuntu|debian|raspbian)
+      echo "Updating Ubuntu/Debian.."
+      sudo apt-get update && sudo apt-get dist-upgrade
+      ;;
+    arch|antergos)
+      echo "Updating Arch Linux.."
+      sudo pacman -Syu
+      ;;
+    solus)
+      echo "Updating Solus OS.."
+      sudo eopkg update-repo && sudo eopkg upgrade
+      ;;
+    ?)
+      echo "error: unknown system."
+      return 1
+      ;;
+  esac
+  if [ $? -ne 0 ]; then
+    echo "error: something went wrong."
+    return 1
+  fi
 
 }
 
+## Cross-platform install routine
 install()
 {
+  systems="ubuntu arch"
+  issue="$(cat /etc/issue)"
+  packages=$*
+  for item in $systems; do
+    echo $issue | grep -i $item >> /dev/null
+    if [ $? -eq 0 ]; then
+        system=$item
+    fi
+  done
 
-        #checking for system
-        systems="ubuntu arch"
-        issue="$(cat /etc/issue)"
-        packages=$*
-        for item in $systems; do
-            echo $issue | grep -i $item >> /dev/null
-            if [ $? -eq 0 ]; then
-                system=$item
-            fi
-        done
-
-        case $system in
-            ubuntu)
-                sudo apt-get install -y $packages
-                ;;
-            arch)
-                sudo pacman -Sy --noconfirm $packages
-                ;;
-            ?)
-                echo "unknown system. could not run install."
-                ;;
-        esac
-
+  case $system in
+    ubuntu)
+      sudo apt-get install -y $packages
+      ;;
+    arch)
+      sudo pacman -Sy --noconfirm $packages
+      ;;
+    ?)
+      echo "unknown system. could not run install."
+      ;;
+  esac
 }
 
+## Thinkpad Trackpoint input fix (for for thinkpad x131e/chromebook)
 fixtrackpoint()
 {
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Device Accel Constant Deceleration" 0.75
+  xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
+  xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
+  xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
+  xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5
+  xinput set-prop "TPPS/2 IBM TrackPoint" "Device Accel Constant Deceleration" 0.75
 }