diff --git a/Containerfile b/Containerfile
index 61c70ad603..6c74674048 100644
--- a/Containerfile
+++ b/Containerfile
@@ -699,6 +699,7 @@ RUN rm -f /etc/profile.d/toolbox.sh && \
     echo "import \"/usr/share/ublue-os/just/86-bazzite-windows.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/90-bazzite-de.just\"" >> /usr/share/ublue-os/justfile && \
     if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
+      systemctl enable usr-share-sddm-themes.mount && \
       mkdir -p "/usr/share/ublue-os/dconfs/desktop-kinoite/" && \
       cp "/usr/share/glib-2.0/schemas/zz0-"*"-bazzite-desktop-kinoite-"*".gschema.override" "/usr/share/ublue-os/dconfs/desktop-kinoite/" && \
       find "/etc/dconf/db/distro.d/" -maxdepth 1 -type f -exec cp {} "/usr/share/ublue-os/dconfs/desktop-kinoite/" \; && \
@@ -757,7 +758,6 @@ RUN rm -f /etc/profile.d/toolbox.sh && \
     systemctl enable ublue-update.timer && \
     systemctl enable incus-workaround.service && \
     systemctl enable bazzite-hardware-setup.service && \
-    systemctl enable usr-share-sddm-themes.mount && \
     systemctl disable tailscaled.service && \
     systemctl enable dev-hugepages1G.mount && \
     systemctl enable bazzite-snapper-setup && \
@@ -910,6 +910,8 @@ RUN /usr/libexec/containerbuild/image-info && \
       find "/etc/dconf/db/distro.d/" -maxdepth 1 -type f -exec cp {} "/usr/share/ublue-os/dconfs/deck-silverblue/" \; && \
       dconf-override-converter to-dconf "/usr/share/ublue-os/dconfs/deck-silverblue/zz0-"*"-bazzite-deck-silverblue-"*".gschema.override" && \
       rm "/usr/share/ublue-os/dconfs/deck-silverblue/zz0-"*"-bazzite-deck-silverblue-"*".gschema.override" \
+    ; else \
+      systemctl disable usr-share-sddm-themes.mount \
     ; fi && \
     mkdir -p /tmp/bazzite-schema-test && \
     find "/usr/share/glib-2.0/schemas/" -type f ! -name "*.gschema.override" -exec cp {} "/tmp/bazzite-schema-test/" \; && \
diff --git a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
index 0eb0d3aabb..21328ae27e 100644
--- a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -23,8 +23,7 @@ screens:
           packages:
           - Retrieve Decky: sudo -A ujust setup-decky install
         EmuDeck:
-          description: |
-            A utility for installing and configuring emulators on the Steam Deck
+          description: A utility for installing and configuring emulators on the Steam Deck
           default: false
           packages:
           - Retrieve EmuDeck: ujust get-emudeck
@@ -44,11 +43,6 @@ screens:
           default: false
           packages:
           - Install scrcpy: ujust install-scrcpy
-        DaVinci Resolve:
-            description: Install/update DaVinci Resolve, a closed-source video editing utility
-            default: false
-            packages:
-            - Install/Update DaVinci Resolve: sudo -A ujust install-resolve
   configure-bazzite:
     source: yafti.screen.package
     values:
@@ -57,30 +51,25 @@ screens:
       package_manager: yafti.plugin.flatpak
       groups:
         Add input group to current user:
-            description: Adds the input group to your current user. Required by certain controller drivers.
-            default: true
-            packages:
+          description: Adds the input group to your current user. Required by certain controller drivers.
+          default: true
+          packages:
           - Set input group: sudo -A ujust add-user-to-input-group
         BIOS &amp; Firmware Updates:
           description: Enables BIOS &amp; Firmware updates for Steam Deck hardware
           default: true
           packages:
           - Enable Updates: sudo -A ujust enable-deck-bios-firmware-updates
+        Visible Password Aestriks:
+          description: Toggles pwfeedback on.
+          default: true
+          packages:
+          - Toggle password feedback: sudo -A ujust toggle-password-feedback enable
         Hide GRUB Menu:
-          description: |
+          description: Hide the GRUB menu on boot
           default: false
           packages:
           - Hide GRUB: sudo -A ujust configure-grub hide
-        Visible Password Aestriks:
-            description: Toggles pwfeedback on.
-            default: true
-            packages:
-            - Install bazzite-cli: ujust bazzite-cli
-        bazzite-cli:
-            description: Bazzite CLI mod for Bluefin style CLI bling.
-            default: false
-            packages:
-            - Install bazzite-cli: ujust bazzite-cli
         Oversteer:
           description: Application to control supported steering wheels
           default: false
diff --git a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup
index 02202f2941..40a4ee8269 100755
--- a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup
+++ b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup
@@ -263,6 +263,12 @@ if (( $(hostname | wc -m) > 20 )); then
   hostnamectl set-hostname bazzite
 fi
 
+# PPD FIX
+# Correct broken config files on some systems
+if -f "/etc/tuned/ppd.conf" && ! grep "\[battery\]" "/etc/tuned/ppd.conf"; then
+  cp -f "/usr/etc/tuned/ppd.conf" "/etc/tuned/ppd.conf"
+fi
+
 # Set default target to graphical, fixes rebase from base image
 if grep -qv "graphical.target" <<< "$(systemctl get-default)"; then
   systemctl set-default graphical.target
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just
index 54c19d0c69..376d54c33e 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just
@@ -3,13 +3,13 @@
 # Install LACT for overclocking & undervolting AMD GPUs
 install-lact:
     #!/usr/bin/bash
-		rpm-ostree kargs --append-if-missing=$(printf 'amdgpu.ppfeaturemask=0x%x\n' "$(($(cat /sys/module/amdgpu/parameters/ppfeaturemask) | 0x4000))")
-		if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
-			rpm-ostree install --apply-live -y lact-libadwaita
-		else
-			rpm-ostree install --apply-live -y lact
-		fi
-		sudo systemctl enable --now lactd
+    rpm-ostree kargs --append-if-missing=$(printf 'amdgpu.ppfeaturemask=0x%x\n' "$(($(cat /sys/module/amdgpu/parameters/ppfeaturemask) | 0x4000))")
+    if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
+        rpm-ostree install --apply-live -y lact-libadwaita
+    else
+        rpm-ostree install --apply-live -y lact
+    fi
+    sudo systemctl enable --now lactd
 
 # Install CoolerControl, a GUI for viewing all your system's sensors and for creating custom fan and pump profiles based on any available temperature sensor28
 install-coolercontrol: