diff --git a/bin/docker-compose-update-recursive b/bin/docker-compose-update-recursive
new file mode 100755
index 0000000..fc85c02
--- /dev/null
+++ b/bin/docker-compose-update-recursive
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+find . -type f -name "docker-compose.y*ml" -exec dirname {} \; | while read dir
+do
+  if [[ "$dir" != *"DEPRECATED"* ]] && [[ "$dir" != *"MIGRATED"* ]] ; then
+      pushd "$dir"
+      docker compose down
+      docker compose pull
+      docker compose up -d
+      popd
+  fi
+done
+
diff --git a/bin/start-wallpaper.sh b/bin/start-wallpaper.sh
index 898fb1a..f9b5e08 100755
--- a/bin/start-wallpaper.sh
+++ b/bin/start-wallpaper.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 # TODO: Dotfiles may be in a different place
-if [ ! -f "$HOME/.dotfiles-dir" ]; then
-    echo "$HOME/.dotfiles-dir not found, please run dotfiles/install.sh to create it"
+if [ ! -f "$HOME/.dotfiles-config" ]; then
+    echo "$HOME/.dotfiles-config not found, please run dotfiles/install.sh to create it"
     exit 1
 fi
-source "$HOME/.dotfiles-dir"
+source "$HOME/.dotfiles-config"
 source "$DOTFILES_DIR/functions.sh"
 
 # XAUTHORITY file may be in /tmp or it may be ~/.XAUTHORITY
diff --git a/config/zsh_functions b/config/zsh_functions
index 62deb6f..da95e5c 100644
--- a/config/zsh_functions
+++ b/config/zsh_functions
@@ -7,6 +7,24 @@ function program_installed {
     return "$return_"
 }
 
+function cd {
+  builtin cd "$@"
+
+  if [[ -z "$VIRTUAL_ENV" ]] ; then
+    # If env folder is found then activate the vitualenv
+      if [[ -d ./venv ]] ; then
+        source ./venv/bin/activate
+      fi
+  else
+    # If no longer within virtualenv, deactivate
+      parentdir="$(dirname "$VIRTUAL_ENV")"
+      if [[ "$PWD"/ != "$parentdir"/* ]] ; then
+        deactivate
+      fi
+  fi
+}
+
+
 function list_processes() {
     # List all processes matching the given process name string
     ps aux | grep $(whoami) | grep -i "$1" | grep -v grep
diff --git a/install.sh b/install.sh
index 89f08df..ffe1ad8 100755
--- a/install.sh
+++ b/install.sh
@@ -324,6 +324,7 @@ function install_main() {
     if program_installed pacman; then
         echo ""
         echo "Installing and updating pacman packages"
+        sudo pacman -Syu
         while IFS= read -r program || [[ -n $program ]]; do
             # Check for comment or whitespace
             if [[ "$program" == '#'* || -z "${program// }" ]]; then
@@ -340,6 +341,7 @@ function install_main() {
         echo ""
         echo "Installing and updating apt packages"
         sudo apt-get update
+        sudo apt-get upgrade
         to_install=()
         while IFS= read -r program || [[ -n $program ]]; do
             # Check for comment or whitespace
@@ -357,6 +359,7 @@ function install_main() {
         echo ""
         echo "Installing and updating brew packages"
         brew update
+        brew upgrade
         to_install=()
         while IFS= read -r program || [[ -n $program ]]; do
             # Check for comment or whitespace
@@ -784,7 +787,11 @@ function install_local() {
 
 function list_options() {
     if program_installed pacman; then
-        echo "[complete] Complete install (dotfiles, pacman, aur, flatpak, gem, pipx, system-configs, samba, local-install)"
+        if program_installed yay; then
+            echo "[complete] Complete install (dotfiles, pacman, aur, flatpak, gem, pipx, system-configs, samba, local-install)"
+        else
+            echo "[complete] Complete install (dotfiles, pacman, flatpak, gem, pipx, system-configs, samba, local-install)"
+        fi
     elif program_installed apt; then
         echo "[complete] Complete install (dotfiles, apt, flatpak, gem, pipx, system-configs, samba, install-local)"
     elif program_installed brew; then
@@ -803,7 +810,9 @@ function list_options() {
     fi
     if program_installed pacman; then
         echo "[programs-main] Install main package manager (pacman) only"
-        echo "[programs-aur] Install AUR programs only"
+        if program_installed yay; then
+            echo "[programs-aur] Install AUR programs only"
+        fi
     elif program_installed apt; then
         echo "[programs-main] Install main package manager (apt) only"
     elif program_installed brew; then
@@ -880,11 +889,13 @@ function run_interactively() {
         install_flatpak
         install_gem
         install_pipx
-        echo ""
-        echo -n "Do you want to upgrade/install from AUR? (y/n) "
-        read response
-        if [[ $response == 'y' ]] || [[ $response == 'Y' ]]; then
-            install_aur
+        if program_installed yay; then
+            echo ""
+            echo -n "Do you want to upgrade/install from AUR? (y/n) "
+            read response
+            if [[ $response == 'y' ]] || [[ $response == 'Y' ]]; then
+                install_aur
+            fi
         fi
         if [ "$#" -eq 0 ]; then
             echo ""