diff --git a/files/files/shared/usr/etc/profile.d/askpass.sh b/files/files/shared/usr/etc/profile.d/askpass.sh
new file mode 100644
index 0000000..4ed66e6
--- /dev/null
+++ b/files/files/shared/usr/etc/profile.d/askpass.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+
+IMAGE_INFO="/usr/share/ublue-os/image-info.json"
+BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
+
+if [[ ${BASE_IMAGE_NAME} == 'bazzite' ]]; then
+  SUDO_ASKPASS='/usr/bin/ksshaskpass'
+elif [[ ${BASE_IMAGE_NAME} == 'bazzite-gnome' ]]; then
+  SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass'
+fi
+export SUDO_ASKPASS
diff --git a/files/files/shared/usr/etc/profile.d/neofetch.fish b/files/files/shared/usr/etc/profile.d/neofetch.fish
new file mode 100644
index 0000000..4af564d
--- /dev/null
+++ b/files/files/shared/usr/etc/profile.d/neofetch.fish
@@ -0,0 +1,5 @@
+#!/usr/bin/fish
+#shellcheck disable=all
+
+# Stomping on this to avoid conflicts with Bazzite alises
+# alias neofetch=fastfetch
diff --git a/files/files/shared/usr/share/fish/vendor_conf.d/neofetch.fish b/files/files/shared/usr/share/fish/vendor_conf.d/neofetch.fish
new file mode 100644
index 0000000..4af564d
--- /dev/null
+++ b/files/files/shared/usr/share/fish/vendor_conf.d/neofetch.fish
@@ -0,0 +1,5 @@
+#!/usr/bin/fish
+#shellcheck disable=all
+
+# Stomping on this to avoid conflicts with Bazzite alises
+# alias neofetch=fastfetch
diff --git a/files/scripts/fetch-install.sh b/files/scripts/fetch-install.sh
index 6ae74ee..8d85c0b 100644
--- a/files/scripts/fetch-install.sh
+++ b/files/scripts/fetch-install.sh
@@ -8,7 +8,7 @@ tar -xzf /tmp/starship.tar.gz -C /tmp
 install -c -m 0755 /tmp/starship /usr/bin
 # shellcheck disable=SC2016
 echo 'eval "$(starship init bash)"' >> /etc/bashrc
-echo 'eval "$(starship init bash)"' >> /etc/zshrc
+echo 'eval "$(starship init zsh)"' >> /etc/zshrc
 
 # Topgrade Install
 pip install --prefix=/usr topgrade
diff --git a/recipes/bazzite-dx.yml b/recipes/bazzite-dx.yml
index 5476333..dc54821 100755
--- a/recipes/bazzite-dx.yml
+++ b/recipes/bazzite-dx.yml
@@ -21,7 +21,15 @@ modules:
 
   - type: files
     files:
-      - ../bluefin/system_files/shared: /
+      - ../bluefin/system_files/shared/usr/bin: /usr/bin
+      - ../bluefin/system_files/shared/usr/etc: /usr/etc
+      - ../bluefin/system_files/shared/usr/libexec: /usr/libexec
+      - ../bluefin/system_files/shared/usr/lib/tmpfiles.d: /usr/lib/tmpfiles.d
+      - ../bluefin/system_files/shared/usr/share/ublue-os/bluefin: /usr/share/ublue-os/bluefin
+      - ../bluefin/system_files/shared/usr/share/ublue-os/bluefin-cli: /usr/share/ublue-os/bluefin-cli
+      - ../bluefin/system_files/shared/usr/share/ublue-os/homebrew: /usr/share/ublue-os/homebrew
+      - ../bluefin/system_files/shared/usr/share/ublue-os/quadlets: /usr/share/ublue-os/quadlets
+      - ../bluefin/system_files/shared/usr/share/ublue-os/ublue-os.jsonc: /usr/share/ublue-os/ublue-os.jsonc
       - ../bluefin/system_files/kinoite/usr/bin: /usr/bin
       - ../bluefin/system_files/kinoite/usr/etc/flatpak: /usr/etc/flatpak
       - ../bluefin/system_files/kinoite/usr/etc/profile.d/ksshaskpass.sh: /usr/etc/profile.d
diff --git a/recipes/bazzite-gnome-dx.yml b/recipes/bazzite-gnome-dx.yml
index 276660c..adfa7da 100755
--- a/recipes/bazzite-gnome-dx.yml
+++ b/recipes/bazzite-gnome-dx.yml
@@ -21,11 +21,17 @@ modules:
 
   - type: files
     files:
-      - ../bluefin/system_files/shared: /
-      - ../bluefin/system_files/silverblue/usr/bin: /usr/bin
+      - ../bluefin/system_files/shared/usr/bin: /usr/bin
+      - ../bluefin/system_files/shared/usr/etc: /usr/etc
+      - ../bluefin/system_files/shared/usr/libexec: /usr/libexec
+      - ../bluefin/system_files/shared/usr/lib/tmpfiles.d: /usr/lib/tmpfiles.d
+      - ../bluefin/system_files/shared/usr/share/ublue-os/bluefin: /usr/share/ublue-os/bluefin
+      - ../bluefin/system_files/shared/usr/share/ublue-os/bluefin-cli: /usr/share/ublue-os/bluefin-cli
+      - ../bluefin/system_files/shared/usr/share/ublue-os/homebrew: /usr/share/ublue-os/homebrew
+      - ../bluefin/system_files/shared/usr/share/ublue-os/quadlets: /usr/share/ublue-os/quadlets
+      - ../bluefin/system_files/shared/usr/share/ublue-os/ublue-os.jsonc: /usr/share/ublue-os/ublue-os.jsonc
       - ../bluefin/system_files/silverblue/usr/etc/flatpak: /usr/etc/flatpak
-      - ../bluefin/system_files/silverblue/usr/etc/profile.d: /usr/etc/profile.d
-      - ../bluefin/system_files/silverblue/usr/share: /usr/share
+      # - ../bluefin/system_files/silverblue/usr/share: /usr/share # Avoid Bluefin branding
       - ../bluefin/system_files/dx: /
       - shared: /
 
@@ -46,8 +52,6 @@ modules:
       - gnome-shell-extension-caffeine
       - gnome-shell-extension-dash-to-dock
       - gnome-shell-extension-gsconnect
-      # - gnome-shell-extension-logo-menu # Already in Bazzite
-      # - gnome-shell-extension-search-light # Canìt find repo for it
       - libgda-sqlite
       - libgda
       - libratbag-ratbagd
@@ -61,6 +65,11 @@ modules:
       - gnome-tour
       - gnome-terminal-nautilus
 
+  - type: gnome-extensions
+    install:
+      - Logo Menu
+      - Search Light
+
 # Install Starhip and activate RPM Fusion repos
   - type: script
     snippets: