diff --git a/system_files/deck/usr/share/ublue-os/firstboot/yafti.yml b/system_files/deck/usr/share/ublue-os/firstboot/yafti.yml
index 740142db..52c8f4d2 100644
--- a/system_files/deck/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/deck/usr/share/ublue-os/firstboot/yafti.yml
@@ -55,14 +55,17 @@ screens:
           - Bottles: com.usebottles.bottles
           - Chiaki4Deck (PlayStation Remote Play): just get-chiaki
           - Discord: com.discordapp.Discord
+          - GeForce NOW Electron: io.github.hmlendea.geforcenow-electron
           - Heroic Games Launcher (GOG & Epic): com.heroicgameslauncher.hgl
           - Minecraft (Prism Launcher): org.prismlauncher.PrismLauncher
           - Minecraft Bedrock Launcher: io.mrarm.mcpelauncher
           - Moonlight: com.moonlight_stream.Moonlight
+          - Mumble: info.mumble.Mumble
           - OpenMW: org.openmw.OpenMW
           - Steam Link: com.valvesoftware.SteamLink
           - SuperTux: org.supertuxproject.SuperTux
           - SuperTuxKart: net.supertuxkart.SuperTuxKart
+          - TeamSpeak: com.teamspeak.TeamSpeak
         Emulation:
           description: Play games like it's 1972
           default: false
diff --git a/system_files/desktop/usr/bin/install-corectrl-polkit-rules b/system_files/desktop/usr/bin/install-corectrl-polkit-rules
new file mode 100755
index 00000000..3f46ef44
--- /dev/null
+++ b/system_files/desktop/usr/bin/install-corectrl-polkit-rules
@@ -0,0 +1,12 @@
+#!/bin/bash
+cat > /etc/polkit-1/rules.d/90-corectrl-$(id -g -n).rules << EOF
+polkit.addRule(function(action, subject) {
+    if ((action.id == "org.corectrl.helper.init" ||
+         action.id == "org.corectrl.helperkiller.init") &&
+        subject.local == true &&
+        subject.active == true &&
+        subject.isInGroup("$(id -g -n)")) {
+            return polkit.Result.YES;
+    }
+});
+EOF
\ No newline at end of file
diff --git a/system_files/desktop/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/usr/share/ublue-os/firstboot/yafti.yml
index 9d68f9ef..08a6109c 100644
--- a/system_files/desktop/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/desktop/usr/share/ublue-os/firstboot/yafti.yml
@@ -54,14 +54,17 @@ screens:
           - Bottles: com.usebottles.bottles
           - Chiaki (PlayStation Remote Play): re.chiaki.Chiaki
           - Discord: com.discordapp.Discord
+          - GeForce NOW Electron: io.github.hmlendea.geforcenow-electron
           - Heroic Games Launcher (GOG &amp; Epic): com.heroicgameslauncher.hgl
           - Minecraft (Prism Launcher): org.prismlauncher.PrismLauncher
           - Minecraft Bedrock Launcher: io.mrarm.mcpelauncher
           - Moonlight: com.moonlight_stream.Moonlight
+          - Mumble: info.mumble.Mumble
           - OpenMW: org.openmw.OpenMW
           - Steam Link: com.valvesoftware.SteamLink
           - SuperTux: org.supertuxproject.SuperTux
           - SuperTuxKart: net.supertuxkart.SuperTuxKart
+          - TeamSpeak: com.teamspeak.TeamSpeak
         Emulation:
           description: Play games like it's 1972
           default: false
@@ -119,10 +122,11 @@ screens:
           - Barrier: com.github.debauchee.barrier
           - Bitwarden: com.bitwarden.desktop
           - Calibre: com.calibre_ebook.calibre
+          - CoreCtrl (AMD GPU Overclocking): just install-corectrl
           - Fedora Media Writer: org.fedoraproject.MediaWriter
           - Flatseal Permissions Manager: com.github.tchx84.Flatseal
           - GIMP: org.gimp.GIMP
-          - GreenWithEnvy: com.leinardi.gwe
+          - GreenWithEnvy (Nvidia GPU Overclocking): com.leinardi.gwe
           - KeePassXC: org.keepassxc.KeePassXC
           - qBittorrent: org.qbittorrent.qBittorrent
           - Syncthing: com.github.zocker_160.SyncThingy
diff --git a/system_files/desktop/usr/share/ublue-os/just/custom.just b/system_files/desktop/usr/share/ublue-os/just/custom.just
index c689a271..303fa992 100644
--- a/system_files/desktop/usr/share/ublue-os/just/custom.just
+++ b/system_files/desktop/usr/share/ublue-os/just/custom.just
@@ -9,6 +9,11 @@ install-bazzite-arch:
     yes | distrobox create -i ghcr.io/ublue-os/bazzite-arch -n bazzite-arch
   fi
 
+install-corectrl:
+  rpm-ostree intall corectrl
+  rpm-ostree kargs --append='amdgpu.ppfeaturemask=0xffffffff'
+  /usr/bin/install-corectrl-polkit-rules
+
 get-greenlight:
   echo 'Retrieving Greenlight'
   wget https://github.com/unknownskl/greenlight/releases/download/v2.0.0-beta8/Greenlight-2.0.0-beta8.AppImage -O ~/Desktop/Greenlight.AppImage