diff --git a/handheld/cachyos-handheld/.SRCINFO b/handheld/cachyos-handheld/.SRCINFO
index dbad9004b..b76704b30 100644
--- a/handheld/cachyos-handheld/.SRCINFO
+++ b/handheld/cachyos-handheld/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cachyos-handheld
 	pkgdesc = CachyOS - Handheld!
 	pkgver = 1.2.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/CachyOS/CachyOS-Handheld
 	install = cachyos-handheld.install
 	arch = any
diff --git a/handheld/cachyos-handheld/PKGBUILD b/handheld/cachyos-handheld/PKGBUILD
index 357c25d36..e0793a2bc 100644
--- a/handheld/cachyos-handheld/PKGBUILD
+++ b/handheld/cachyos-handheld/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=cachyos-handheld
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 arch=('any')
 license=('GPL-3.0-later')
 pkgdesc='CachyOS - Handheld!'
@@ -22,9 +22,8 @@ validpgpkeys=(
 )
 makedepends=('git')
 depends=('gamescope-session-git' 'mangohud' 'jq' 'dmidecode' 'glew' 'glfw' 'glxinfo' 'curl' 'tar'
-         'scx-scheds' 'scx-tools' 'qt5-tools' 'gamescope-session-steam-git' 'jupiter-hw-support'
-         'gamescope' 'lib32-gamescope' 'cachyos-vapor' 'cachyos-alacritty-config'
-         'steam')
+         'scx-scheds' 'scx-tools' 'qt6-tools' 'gamescope-session-steam-git' 'jupiter-hw-support'
+         'gamescope' 'lib32-gamescope' 'cachyos-vapor' 'cachyos-alacritty-config' 'steam')
 
 prepare() {
   patch -Np1 -i "${srcdir}/controller-fix.patch" -d "${srcdir}/CachyOS-Handheld"
diff --git a/handheld/cachyos-handheld/cachyos-handheld.install b/handheld/cachyos-handheld/cachyos-handheld.install
index 87eb35752..e879c295e 100644
--- a/handheld/cachyos-handheld/cachyos-handheld.install
+++ b/handheld/cachyos-handheld/cachyos-handheld.install
@@ -1,20 +1,23 @@
 SERVICES=("bluetooth" "scx_loader")
 
 update_user() {
-  # edit user name for sddm autologin and decky environment variables
+  # Get user name and update it in config files.
   export LANG=C
   if usr=$(id -nu 1000) && [[ ! -z ${usr} ]]; then
-     echo "Setting ${usr} as name for autologin and decky env variables."
+     echo "Setting ${usr} as name for autologin and decky environment variables."
   elif usr=$(id -nu 1001) && [[ ! -z ${usr} ]]; then
-     echo "Setting ${usr} as name for autologin and decky env variables."
+     echo "Setting ${usr} as name for autologin and decky environment variables."
   else
-     echo "No user found: setting 'User=' in /etc/sddm.conf.d/steam-deckify.conf"
+     echo "Get user name failed, setting 'User=' in /etc/sddm.conf.d/steam-deckify.conf"
   fi
-  #Update for autologin
+  # Autologin
   sed -ri "s|^(User=).*|User=${usr}|" /etc/sddm.conf.d/steam-deckify.conf
-  #Update for decky loader
+  # Decky loader
   sed -ri "s|^(DECKY_USER=).*|DECKY_USER=${usr}|" /etc/environment.d/handheld.conf
   sed -ri "s|^(DECKY_USER_HOME=).*|DECK_USER_HOME=/home/${usr}|" /etc/environment.d/handheld.conf
+
+  # Return to Gaming Mode file
+  cp /etc/skel/Desktop/steamos-gamemode.desktop /home/${usr}/Desktop/steamos-gamemode.desktop
 }
 
 scx_lavd_default() {
@@ -29,7 +32,6 @@ EOF
 
 steamos_steam() {
   # Grab the steam bootstrap for first boot
-
   URL="https://steamdeck-packages.steamos.cloud/archlinux-mirror/jupiter-main/os/x86_64/steam-jupiter-stable-1.0.0.79-1.1-x86_64.pkg.tar.zst"
   TMP_PKG="/tmp/package.pkg.tar.zst"
   OUTPUT_FILE="/tmp/bootstraplinux_ubuntu12_32.tar.xz"
@@ -69,10 +71,11 @@ post_install() {
   done
 
   steamos_steam
+
   # Update users sddm config to reflect the changes
   echo "Updating Handheld Configs."
   update_user
-  #echo "If you are installing this without the CachyOS Installation, please update your username in the /etc/sddm.conf.d/*"
+  # echo "If you are installing this without the CachyOS Installation, please update your username in the /etc/sddm.conf.d/*"
 }
 
 pre_upgrade() {