diff --git a/install.sh b/install.sh
index 68ecefc..11cd1b3 100755
--- a/install.sh
+++ b/install.sh
@@ -26,13 +26,9 @@ install -pm644 -Dt /etc/pacman.d/conf.d \
     "$DIR/etc/pacman/60-aurutils-repository.conf" \
     "$DIR/etc/pacman/99-options.conf"
 
-# Remove packages one by one because pacman doesn't handle uninstalled packages
-# gracefully
-packages_to_remove=(
-    gnome-shell-extension-pop-shell-git
-)
-
-for pkg in "${packages_to_remove[@]}"; do
+# Remove packages no longer in use
+to_remove=()
+for pkg in "${to_remove[@]}"; do
     pacman --noconfirm -Rs "$pkg" || true
 done
 
@@ -47,12 +43,10 @@ packages=(
     sudo
     zram-generator # swap on compressed RAM, mostly to support systemd-oomd
     sbctl # Manage secure boot binaries and sign binaries
-    plymouth # Splash screen at boot
     # File systems
     ntfs-3g
     exfatprogs
     btrfs-progs
-    sshfs
     # Hardware tools
     fwupd # Firmware updates
     usbutils # for lsusb
@@ -429,20 +423,22 @@ aur chroot --create
 aur_packages=(
     # AUR helper
     aurutils
+    # Splash screen at boot
+    plymouth
     networkmanager-iwd
     # iwd GUI
     iwgtk
     # Login settings
     gdm-settings
     # Gnome extensions
-    gnome-shell-extension-arch-update # Indicator for system update
+    gnome-shell-extension-arch-update # Indicator for system update    gnome-shell-extension-arch-update # Indicator for system updatess
     gnome-shell-extension-gsconnect # Connect phone and desktop system
     gnome-shell-extension-dash-to-dock # Move the dash out of the overview transforming it in a dock
     gnome-shell-extension-clipboard-history # Searchable history panel of clipboard
     gnome-shell-extension-bluetooth-quick-connect
     gnome-shell-extension-quick-settings-tweaks-git
     gnome-shell-extension-nightthemeswitcher
-    gnome-shell-extension-tiling-assistant
+    gnome-shell-extension-pop-shell-git
     gnome-shell-extension-alphabetical-grid-extension-git # Restore the alphabetical ordering of the app grid
     # Firefox extensions
     firefox-extension-bitwarden
@@ -455,6 +451,7 @@ aur_packages=(
     git-gone
     dnscontrol-bin
     qtscrcpy # Android screen display
+    trayscale # GUI wrapper around tailscale cli client
 )
 
 aur_optdeps=(
diff --git a/run_once_flatpak-applications.sh b/run_once_flatpak-applications.sh
index 5ab6807..2c00608 100644
--- a/run_once_flatpak-applications.sh
+++ b/run_once_flatpak-applications.sh
@@ -4,5 +4,3 @@ set -e
 exec 2> >(while read line; do echo -e "\e[01;31m$line\e[0m"; done)
 
 flatpak install --noninteractive org.gnome.World.PikaBackup
-flatpak install --noninteractive org.gnome.Loupe
-flatpak install --noninteractive dev.deedles.Trayscale
diff --git a/run_once_gnome-extensions.sh b/run_once_gnome-extensions.sh
index 2af081c..be63e31 100644
--- a/run_once_gnome-extensions.sh
+++ b/run_once_gnome-extensions.sh
@@ -6,11 +6,9 @@ exec 2> >(while read line; do echo -e "\e[01;31m$line\e[0m"; done)
 gnome-extensions enable appindicatorsupport@rgcjonas.gmail.com
 gnome-extensions enable gsconnect@andyholmes.github.io
 gnome-extensions enable arch-update@RaphaelRochet
+gnome-extensions enable pop-shell@system76.com
 gnome-extensions enable clipboard-history@alexsaveau.dev
 gnome-extensions enable bluetooth-quick-connect@bjarosze.gmail.com
 gnome-extensions enable quick-settings-tweaks@qwreey
 gnome-extensions enable nightthemeswitcher@romainvigier.fr
 gnome-extensions enable AlphabeticalAppGrid@stuarthayhurst
-gnome-extensions enable tiling-assistant@leleat-on-github
-
-gnome-extensions disable pop-shell@system76.com