diff --git a/.env b/.env
index 887dc4b7..04a44ed4 100644
--- a/.env
+++ b/.env
@@ -1,17 +1,29 @@
 # Public environment settings
 #
-# Example: can be shell compatible stuff like export, alias etc. or just
+# Example: Can be shell compatible stuff like export, alias etc. or just
 # define variables like FOO=BAR
 #
 # You should put private stuff to .penv. It is handled the same way as this
-# file but will be ignored by .gitignore.
+# file but will be ignored by .gitignore. In .penv stored vars are overwriting
+# vars from here.
 #
 
 # History settings
+HISTFILE=~/.zsh_history
 HISTSIZE=100000
 SAVEHIST=100000
-HISTFILE=~/.zsh_history
 
-# Extend the $PATH to $HOME/bin and more.
+# Extend the $PATH to $HOME/bin and more. I do this in .penv now, but this will
+# remain for documentation reasons.
 #export PATH=$HOME/bin:$HOME/.local/bin/:$HOME/.gem/ruby/3.4.0/bin:$HOME/.android/sdk/platform-tools:$HOME/.cargo/bin:$PATH
 
+# Export the $EDITOR and $TERMINAL
+export BROWSER=/usr/bin/firefox
+export EDITOR=/usr/bin/vim
+export SU=/bin/su
+export TERMINAL='/usr/bin/uxterm -bg black -fg grey -sb -leftbar -si -bc -cr orange -fa "Source Code Pro" -fs 14'
+
+# Fix to make JAVA applications behave more friendly in awesome. Still many JAVA
+# apps suck in awesome. PyCharm works perfect, Arduino does not!
+export _JAVA_AWT_WM_NONREPARENTING=1
+
diff --git a/.zsh/exports.sh b/.zsh/exports.sh
deleted file mode 100644
index db13912e..00000000
--- a/.zsh/exports.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-# Java Stuff
-#export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
-
-# Android / Kivy Development Stuff
-export ANDROID_HOME=$HOME/android/sdk
-export ANDROIDSDK="$HOME/android/sdk"
-export ANDROID_SDK_ROOT="$HOME/android/sdk"
-#export ANDROIDNDK="/opt/android-ndk"
-#export ANDROIDAPI="27"
-#export ANDROIDNDKVER="r16b"
-export CHROME_EXECUTABLE=/usr/bin/google-chrome-stable
-
-# Export the $EDITOR and $TERMINAL
-export BROWSER=/usr/bin/firefox
-export EDITOR=/usr/bin/vim
-export TERMINAL='/usr/bin/uxterm -bg black -fg grey -sb -leftbar -si -bc -cr orange -fa "Source Code Pro" -fs 14'
-
-# Fix to make JAVA applications behave more friendly in awesome. Still many JAVA apps
-# suck in awesome. PyCharm works perfect, Arduino does not!
-export _JAVA_AWT_WM_NONREPARENTING=1
-
-export XDG_RUNTIME_DIR=/run/user/1000
-
diff --git a/.zsh/functions.d/aliases.sh b/.zsh/functions.d/aliases.sh
index 07d14c4f..62fe943a 100644
--- a/.zsh/functions.d/aliases.sh
+++ b/.zsh/functions.d/aliases.sh
@@ -22,10 +22,11 @@ alias lla='ls -la --color'
 alias llh='ls -lh --color'
 alias llah='ls -lah --color'
 
-alias su='us'
-
 alias n='nnn -diUxe'
 
+alias ssh='s'
+alias su='us'
+
 alias vi=vim
 
 alias xterm=$TERMINAL
diff --git a/.zsh/functions.d/us.sh b/.zsh/functions.d/us.sh
index a33841ff..fb901600 100644
--- a/.zsh/functions.d/us.sh
+++ b/.zsh/functions.d/us.sh
@@ -14,12 +14,12 @@ us() {
     tmux rename-window "su(${target_user})"
 
     # Use "command su" to bypass the function if it exists
-    command su "$@"
+    command "$SU" "$@"
 
     # Restore original window name after exit
     tmux rename-window "$original_name"
   else
-    command su "$@"
+    command "$SU" "$@"
   fi
 }
 
diff --git a/.zshrc b/.zshrc
index 686c23d7..f900791c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -5,9 +5,6 @@ source ~/.env
 # This file is not in the Git repository!
 source ~/.penv
 
-# Do some exports!
-source ~/.zsh/exports.sh
-
 # Load Oh-my-Zsh.
 source ~/.zsh/oh-my-zsh.sh