diff --git a/Containerfile b/Containerfile
index d6467b98..66e7f465 100644
--- a/Containerfile
+++ b/Containerfile
@@ -31,6 +31,7 @@ RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$
     wget https://copr.fedorainfracloud.org/coprs/kylegospo/vk_hdr_layer/repo/fedora-$(rpm -E %fedora)/kylegospo-vk_hdr_layer-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-vk_hdr_layer.repo && \
     wget https://copr.fedorainfracloud.org/coprs/ycollet/audinux/repo/fedora-$(rpm -E %fedora)/ycollet-audinux-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ycollet-audinux.repo && \
     wget https://copr.fedorainfracloud.org/coprs/kylegospo/rom-properties/repo/fedora-$(rpm -E %fedora)/kylegospo-rom-properties-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-rom-properties.repo && \
+    wget https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-$(rpm -E %fedora)/kylegospo-prompt-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
     wget https://pkgs.tailscale.com/stable/fedora/tailscale.repo -O /etc/yum.repos.d/tailscale.repo && \
     sed -i 's@gpgcheck=1@gpgcheck=0@g' /etc/yum.repos.d/tailscale.repo
 
@@ -291,14 +292,20 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         mutter-common \
         gnome-control-center \
         gnome-control-center-filesystem && \
+    rpm-ostree override replace \
+    --experimental \
+    --from repo=copr:copr.fedorainfracloud.org:kylegospo:prompt \
+        vte291 \
+        vte-profile && \
     rpm-ostree install \
+        prompt \
+        nautilus-open-any-terminal \
+        nautilus-gsconnect \
         gnome-shell-extension-tailscale-gnome-qs \
         steamdeck-backgrounds \
         gnome-randr-rust \
         gnome-shell-extension-user-theme \
         gnome-shell-extension-gsconnect \
-        nautilus-gsconnect \
-        nautilus-open-any-terminal \
         gnome-shell-extension-system76-scheduler \
         gnome-shell-extension-compiz-windows-effect \
         gnome-shell-extension-just-perfection \
@@ -361,6 +368,7 @@ RUN /tmp/image-info.sh && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-vk_hdr_layer.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-rom-properties.repo && \
+    sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/tailscale.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/charm.repo && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index 4c13020d..1b15c47e 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -7,7 +7,7 @@ FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO)
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
 
 # SCRIPT VERSION
-USER_SETUP_VER=17
+USER_SETUP_VER=18
 USER_SETUP_VER_FILE="$HOME/.bazzite-configured"
 USER_SETUP_VER_RAN=$(cat $USER_SETUP_VER_FILE)
 USER_SETUP_FEDORA_VER_FILE="$HOME/.bazzite-configured-fedora-version"
@@ -64,10 +64,10 @@ else
   gsettings set org.gnome.nautilus.preferences show-create-link true
 
   echo 'Switching to Prompt in Nautilus'
-  #gsettings set com.github.stunkymonkey.nautilus-open-any-terminal terminal prompt
-  #gsettings set com.github.stunkymonkey.nautilus-open-any-terminal keybindings '<Ctrl><Alt>t'
-  #gsettings set com.github.stunkymonkey.nautilus-open-any-terminal new-tab false
-  #gsettings set com.github.stunkymonkey.nautilus-open-any-terminal flatpak system
+  gsettings set com.github.stunkymonkey.nautilus-open-any-terminal terminal prompt
+  gsettings set com.github.stunkymonkey.nautilus-open-any-terminal keybindings '<Ctrl><Alt>t'
+  gsettings set com.github.stunkymonkey.nautilus-open-any-terminal new-tab false
+  gsettings set com.github.stunkymonkey.nautilus-open-any-terminal flatpak off
 
   echo 'Installing Gradience presets'
   mkdir -p "$HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/"
diff --git a/system_files/desktop/silverblue/usr/bin/xdg-terminal-exec b/system_files/desktop/silverblue/usr/bin/xdg-terminal-exec
index c45af816..2e1ebab7 100755
--- a/system_files/desktop/silverblue/usr/bin/xdg-terminal-exec
+++ b/system_files/desktop/silverblue/usr/bin/xdg-terminal-exec
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
-FLATPAK_LIST=$(/usr/bin/flatpak list --app --columns=application)
-if grep '^org\.gnome\.Prompt$' <<< $FLATPAK_LIST; then
+if command -v /usr/bin/prompt > /dev/null; then
+  /usr/bin/prompt -- "$@"
+elif grep '^org\.gnome\.Prompt$' <<< $(/usr/bin/flatpak list --app --columns=application); then
   /usr/bin/flatpak run org.gnome.Prompt -- "$@"
 else
   /usr/bin/gnome-terminal -- "$@"
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/02-bazzite-global b/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/02-bazzite-global
index fbaa4d5f..8f3856df 100644
--- a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/02-bazzite-global
+++ b/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/02-bazzite-global
@@ -30,3 +30,9 @@ experimental-features=['variable-refresh-rate','scale-monitor-framebuffer']
 allow-updates=false
 download-updates=false
 download-updates-notify=false
+
+[com/github/stunkymonkey/nautilus-open-any-terminal]
+terminal='prompt'
+keybindings=['<Ctrl><Alt>t']
+new-tab=false
+flatpak='off'
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/03-bazzite-dash b/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/03-bazzite-dash
index 9e5e111a..fbd3096c 100644
--- a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/03-bazzite-dash
+++ b/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/03-bazzite-dash
@@ -1,2 +1,2 @@
 [org/gnome/shell] 
-favorite-apps = ['org.mozilla.firefox.desktop', 'steam.desktop', 'net.lutris.Lutris.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop']
+favorite-apps = ['org.mozilla.firefox.desktop', 'steam.desktop', 'net.lutris.Lutris.desktop', 'org.gnome.Software.desktop', 'org.gnome.Prompt.desktop', 'org.gnome.Nautilus.desktop']