diff --git a/Containerfile b/Containerfile
index ac9e25b7291..685d9eca13b 100644
--- a/Containerfile
+++ b/Containerfile
@@ -59,7 +59,7 @@ COPY packages.json /tmp/packages.json
 COPY build.sh /tmp/build.sh
 
 RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo
-RUN wget https://terra.fyralabs.com/terra.repo -O /etc/yum.repos.d/terra.repo
+RUN wget https://copr.fedorainfracloud.org/coprs/bobslept/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/bobslept-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/bobslept-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo
 
 # Handle packages via packages.json
 RUN /tmp/build.sh
@@ -96,7 +96,7 @@ RUN systemctl disable pmlogger.service
 RUN /tmp/workarounds.sh
 
 # Clean up repos, everything is on the image so we don't need them
-RUN rm -f /etc/yum.repos.d/terra.repo
+RUN rm -f /etc/yum.repos.d/bobslept-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo
 RUN rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo
 RUN rm -f /etc/yum.repos.d/vscode.repo
 RUN rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo
diff --git a/usr/etc/yafti.yml b/usr/etc/yafti.yml
index 74f21c1a3cb..898c46eb4fe 100644
--- a/usr/etc/yafti.yml
+++ b/usr/etc/yafti.yml
@@ -23,18 +23,17 @@ screens:
         - run: flatpak remote-delete fedora --force
         - run: flatpak remove --system --noninteractive --all
         - run: flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
-  applications:
+  install-required-packages:
     source: yafti.screen.package
     values:
-      title: Application Installation
-      show_terminal: true
+      title: Install required packages
       package_manager: yafti.plugin.flatpak
+      show-terminal: true
       groups:
         Core:
           description: Core Applications
           default: true
           packages:
-          - Backup: org.gnome.DejaDup
           - Blackbox Terminal: com.raggesilver.BlackBox
           - Calculator: org.gnome.Calculator
           - Calendar: org.gnome.Calendar
@@ -50,35 +49,41 @@ screens:
           - Logs: org.gnome.Logs
           - Maps: org.gnome.Maps
           - Nautilus Preview: org.gnome.NautilusPreviewer
-          - PinApp Menu Editor: io.github.fabrialberio.pinapp
-          - Syncthing: com.github.zocker_160.SyncThingy
           - 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
-          - Font Downloader: org.gustavoperedo.FontDownloader
-        Web Browsers:
-          description: Additional browsers to complement Firefox
+  applications:
+    source: yafti.screen.package
+    values:
+      title: Application Installation
+      show_terminal: true
+      package_manager: yafti.plugin.flatpak
+      groups:
+        Admin Tools:
+          description: Helper Utilities for Administration
           default: false
           packages:
-          - Brave: com.brave.Browser
-          - Google Chrome: com.google.Chrome
-          - Microsoft Edge: com.microsoft.Edge
-          - Opera: com.opera.Opera
+          - Cockpit Client: org.cockpit_project.CockpitClient
+        Communication:
+          default: false
+          description: Tools to communicate and collaborate
+          packages:
+          - Discord: com.discordapp.Discord
+          - Slack: com.slack.Slack
         Gaming:
           description: "Rock and Stone!"
           default: false
           packages:
           - Bottles: com.usebottles.bottles
-          - Discord: com.discordapp.Discord
           - Heroic Games Launcher: com.heroicgameslauncher.hgl
           - Lutris: net.lutris.Lutris
           - MangoHUD: org.freedesktop.Platform.VulkanLayer.MangoHud//22.08
           - Steam: com.valvesoftware.Steam
           - Gamescope for Steam: org.freedesktop.Platform.VulkanLayer.gamescope
-          - Proton Updater for Steam: net.davidotek.pupgui2
+          - Proton Updater (GTK) for Steam: com.vysp3r.ProtonPlus
         Office:
           description: Bow to Capitalism
           default: false
@@ -87,9 +92,16 @@ screens:
           - LibreOffice: org.libreoffice.LibreOffice
           - Obsidian: md.obsidian.Obsidian
           - OnlyOffice: org.onlyoffice.desktopeditors
-          - Slack: com.slack.Slack
           - Standard Notes: org.standardnotes.standardnotes
           - Thunderbird Email: org.mozilla.Thunderbird
+        Other Web Browsers:
+          description: Additional browsers to complement Firefox
+          default: false
+          packages:
+          - Brave: com.brave.Browser
+          - Google Chrome: com.google.Chrome
+          - Microsoft Edge: com.microsoft.Edge
+          - Opera: com.opera.Opera
         Streaming:
           description: Stream to the Internet
           default: false
@@ -99,7 +111,14 @@ screens:
           - Gstreamer for OBS: com.obsproject.Studio.Plugin.Gstreamer
           - Gstreamer VAAPI for OBS: com.obsproject.Studio.Plugin.GStreamerVaapi
           - Boatswain for Streamdeck: com.feaneron.Boatswain
-          
+        Utilities:
+          description: Useful Utilities
+          default: true
+          packages:
+          - Font Downloader: org.gustavoperedo.FontDownloader
+          - PinApp Menu Editor: io.github.fabrialberio.pinapp
+          - Backup: org.gnome.DejaDup
+          - Syncthing: com.github.zocker_160.SyncThingy
   final-screen:
     source: yafti.screen.title
     values:
@@ -110,6 +129,8 @@ screens:
             run: /usr/bin/gnome-software
         - "Website":
             run: /usr/bin/xdg-open https://ublue.it
+        - "Discussions and Announcements":
+            run: /usr/bin/xdg-open https://github.com/orgs/ublue-os/discussions/categories/bluefin
         - "Join the Discord Community":
             run: /usr/bin/xdg-open https://discord.gg/XjG48C7VHx 
       description: |