diff --git a/usr/share/ublue-os/firstboot/yafti.yml b/usr/share/ublue-os/firstboot/yafti.yml
index 655e788bd6..c4893483e5 100644
--- a/usr/share/ublue-os/firstboot/yafti.yml
+++ b/usr/share/ublue-os/firstboot/yafti.yml
@@ -8,15 +8,15 @@ screens:
       title: "Welcome to uBlue (Alpha)"
       icon: "/path/to/icon"
       description: |
-        Pick some applications to get started
+        This guided installer will help you get started with your new system.
   can-we-modify-your-flatpaks:
     source: yafti.screen.consent
     values:
-      title: Welcome, Traveler
+      title: Welcome, Traveler!
       condition:
         run: flatpak remotes --system | grep fedora
       description: |
-        WARNING: This will modify your Flatpaks if you are rebasing! If you do not want to do this exit the installer.
+        We have detected the limited, Fedora-provided Flatpak remote on your system, whose applications are usually missing important codecs and other features. This step will therefore remove all basic Fedora Flatpaks from your system! We will instead switch all core Flatpak applications over to the vastly superior, unfiltered Flathub. If you don't want to do this, simply exit this installer.
       actions:
         - run: flatpak remote-delete fedora --force
         - run: flatpak remove --system --noninteractive --all
@@ -24,37 +24,44 @@ screens:
   applications:
     source: yafti.screen.package
     values:
-      title: Application Installation
+      title: Application Installer
       show_terminal: true
       package_manager: yafti.plugin.flatpak
+      package_manager_defaults:
+        user: false
+        system: true
       groups:
-        Core:
-          description: Core Applications
+        Core GNOME Apps:
+          description: Core system applications for the GNOME desktop environment.
           default: true
           packages:
-            - Backup: org.gnome.DejaDup
             - Calculator: org.gnome.Calculator
             - Calendar: org.gnome.Calendar
             - Characters: org.gnome.Characters
+            - Clocks: org.gnome.clocks
             - Connections: org.gnome.Connections
             - Contacts: org.gnome.Contacts
+            - Disk Usage Analyzer: org.gnome.baobab
             - Document Viewer: org.gnome.Evince
             - Extensions Manager: com.mattjakeman.ExtensionManager
-            - Fedora Media Writer: org.fedoraproject.MediaWriter
-            - Mozilla Firefox: org.mozilla.firefox
-            - Flatseal Permissions Manager: com.github.tchx84.Flatseal
+            - Font Viewer: org.gnome.font-viewer
             - Logs: org.gnome.Logs
             - Maps: org.gnome.Maps
             - Nautilus Preview: org.gnome.NautilusPreviewer
+            - Picture Viewer: org.gnome.eog
             - Text Editor: org.gnome.TextEditor
             - Weather: org.gnome.Weather
-            - Disk Usage Analyzer: org.gnome.baobab
-            - Clocks: org.gnome.clocks
-            - Picture Viewer: org.gnome.eog
-            - Font Viewer: org.gnome.font-viewer
+        System Apps:
+          description: System applications for all desktop environments.
+          default: true
+          packages:
+            - Deja Dup Backups: org.gnome.DejaDup
+            - Fedora Media Writer: org.fedoraproject.MediaWriter
+            - Flatseal Permissions Manager: com.github.tchx84.Flatseal
             - Font Downloader: org.gustavoperedo.FontDownloader
+            - Mozilla Firefox: org.mozilla.firefox
         Web Browsers:
-          description: Additional browsers to complement Firefox
+          description: Additional browsers to complement or replace Firefox.
           default: false
           packages:
             - Brave: com.brave.Browser
@@ -67,24 +74,25 @@ screens:
           packages:
             - Bottles: com.usebottles.bottles
             - Discord: com.discordapp.Discord
-            - Games: org.gnome.Games
+            - GNOME Games: org.gnome.Games
             - Heroic Games Launcher: com.heroicgameslauncher.hgl
-            - MangoHUD: org.freedesktop.Platform.VulkanLayer.MangoHud//22.08
             - Steam: com.valvesoftware.Steam
-            - Gamescope for Steam: com.valvesoftware.Steam.Utility.gamescope
+            - Gamescope (Utility): com.valvesoftware.Steam.Utility.gamescope
+            - MangoHUD (Utility): org.freedesktop.Platform.VulkanLayer.MangoHud//22.08
+            - SteamTinkerLaunch (Utility): com.valvesoftware.Steam.Utility.steamtinkerlaunch
             - Proton Updater for Steam: net.davidotek.pupgui2
         Office:
-          description: Bow to Capitalism
+          description: Boost your productivity.
           default: false
           packages:
             - LibreOffice: org.libreoffice.LibreOffice
-            - Obsidian: md.obsidian.Obsidian
             - OnlyOffice: org.onlyoffice.desktopeditors
+            - Obsidian: md.obsidian.Obsidian
             - Slack: com.slack.Slack
             - Standard Notes: org.standardnotes.standardnotes
             - Thunderbird Email: org.mozilla.Thunderbird
         Streaming:
-          description: Stream to the Internet
+          description: Stream to the Internet.
           default: false
           packages:
             - OBS Studio: com.obsproject.Studio