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 9abc8438..08799c1e 100644
--- a/system_files/deck/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/deck/usr/share/ublue-os/firstboot/yafti.yml
@@ -35,7 +35,7 @@ screens:
           description: A plugin loader for the Steam Deck
           default: false
           packages:
-          - Retrieve Decky: just --unstable get-decky
+          - Retrieve Decky: sudo -A just --unstable get-decky
         Chiaki4Deck:
           description: PlayStation Remote Play
           default: false
@@ -62,7 +62,7 @@ screens:
             NOTE: Press the escape key before boot to show the menu
           default: true
           packages:
-          - Hide GRUB: just --unstable hide-grub
+          - Hide GRUB: sudo -A just --unstable hide-grub
         Kernel Arguments:
           description: Sets kernel arguments used in SteamOS
           default: true
@@ -78,7 +78,7 @@ screens:
           description: Nix is a powerful package manager for Linux and other Unix systems that makes package management reliable and reproducible
           default: true
           packages:
-          - Install Nix Package Support: just --unstable install-nix
+          - Install Nix Package Support: sudo -A just --unstable install-nix
         SteamCMD:
           description: Installs SteamCMD
           default: true
@@ -98,7 +98,7 @@ screens:
           description: Disable BTRFS support for SD cards for direct compatibility with SD cards formatted on stock SteamOS (Not recommended).
           default: false
           packages:
-          - Switch SteamOS-BTRFS config to EXT4: just --unstable switch-to-ext4
+          - Switch SteamOS-BTRFS config to EXT4: sudo -A just --unstable switch-to-ext4
         Wallpaper Engine:
           description: Enables Wallpaper Engine
           default: true
diff --git a/system_files/deck/usr/share/ublue-os/just/custom.just b/system_files/deck/usr/share/ublue-os/just/custom.just
index be1c96ac..c7e9eb31 100644
--- a/system_files/deck/usr/share/ublue-os/just/custom.just
+++ b/system_files/deck/usr/share/ublue-os/just/custom.just
@@ -14,9 +14,9 @@ create-steam-shortcuts:
   sed -i 's@Steam (Runtime)@Steam@g' ~/Desktop/steam.desktop
   cp /etc/skel.d/Desktop/Return.desktop ~/Desktop
 
-get-decky: _auth
-  curl -L https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/install_release.sh | sudo -A sh
-  sudo -A chcon -R -t bin_t $HOME/homebrew/services/PluginLoader
+get-decky:
+  curl -L https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/install_release.sh | sh
+  sudo chcon -R -t bin_t $HOME/homebrew/services/PluginLoader
 
 get-emudeck:
   echo 'Retrieving EmuDeck...'
@@ -28,11 +28,11 @@ get-steamcmd:
   tar -xvzf steamcmd.tar.gz -C ~/.steam
   rm /tmp/steamcmd.tar.gz
 
-install-nix: _auth
-  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/installer-scripts/silverblue-nix-installer.sh | sudo -A bash
+install-nix:
+  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/installer-scripts/silverblue-nix-installer.sh | bash
 
-remove-nix: _auth
-  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | sudo -A bash
+remove-nix:
+  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | bash
 
 get-greenlight:
   echo 'Retrieving Greenlight'
@@ -76,7 +76,7 @@ deckswap-off:
     echo 'deckswap is already disabled.'
   fi
 
-resize-deckswap: _auth
+resize-deckswap:
   #!/usr/bin/env bash
   CONFIG='/etc/default/deckswap'
   CURRENT_SIZE=$(cat "${CONFIG}" | sed 's/SWAP_SIZE=//g')
@@ -87,7 +87,7 @@ resize-deckswap: _auth
       NEW_SIZE=1
     fi
     if ((${NEW_SIZE} >= 1 && ${NEW_SIZE} <= 16)); then
-      sudo -A sed -i 's/SWAP_SIZE='${CURRENT_SIZE}'G/SWAP_SIZE='${NEW_SIZE}'G/g' ${CONFIG}
+      sudo sed -i 's/SWAP_SIZE='${CURRENT_SIZE}'G/SWAP_SIZE='${NEW_SIZE}'G/g' ${CONFIG}
       echo 'Current size: '${NEW_SIZE}'G. Please reboot.'
     else
       echo 'Error: Input out of range (1-16). Running again.'
@@ -102,8 +102,8 @@ enable-duperemove:
   systemctl enable --now duperemove-weekly@$(systemd-escape $HOME).timer
   systemctl enable --now duperemove-weekly@$(systemd-escape /run/media/mmcblk0p1).timer
 
-switch-to-ext4: _auth
-  sudo -A sed -i 's@STEAMOS_BTRFS_SDCARD_FORMAT_FS="btrfs"@STEAMOS_BTRFS_SDCARD_FORMAT_FS="ext4"@g' /etc/default/steamos-btrfs
+switch-to-ext4:
+  sudo sed -i 's@STEAMOS_BTRFS_SDCARD_FORMAT_FS="btrfs"@STEAMOS_BTRFS_SDCARD_FORMAT_FS="ext4"@g' /etc/default/steamos-btrfs
 
 zram-on:
   #!/usr/bin/env bash
@@ -125,7 +125,7 @@ zram-off:
     echo 'ZRAM is already disabled.'
   fi
 
-resize-zram: _auth
+resize-zram:
   #!/usr/bin/env bash
   CONFIG='/etc/systemd/zram-generator.conf'
   CURRENT_SIZE=$(cat "${CONFIG}" | sed 's/zram-size=//g')
@@ -136,7 +136,7 @@ resize-zram: _auth
       NEW_SIZE=1024
     fi
     if ((${NEW_SIZE} >= 512 && ${NEW_SIZE} <= 4096)); then
-      sudo -A sed -i 's/zram-size='${CURRENT_SIZE}'/zram-size='${NEW_SIZE}'/g' ${CONFIG}
+      sudo sed -i 's/zram-size='${CURRENT_SIZE}'/zram-size='${NEW_SIZE}'/g' ${CONFIG}
       echo 'Current size: '${NEW_SIZE}'. Please reboot.'
     else
       echo 'Error: Input out of range (512-4096). Running again.'
@@ -147,27 +147,24 @@ resize-zram: _auth
     just resize-zram
   fi
 
-hide-grub: _auth
+hide-grub:
   #!/usr/bin/env bash  
-  sudo -A sed -i 's/GRUB_TIMEOUT=5/GRUB_TIMEOUT=0/g' /etc/default/grub
-  echo 'GRUB_TIMEOUT_STYLE=hidden' | sudo -A tee -a /etc/default/grub 1>/dev/null
-  echo 'GRUB_HIDDEN_TIMEOUT=1' | sudo -A tee -a /etc/default/grub 1>/dev/null
+  sudo sed -i 's/GRUB_TIMEOUT=5/GRUB_TIMEOUT=0/g' /etc/default/grub
+  echo 'GRUB_TIMEOUT_STYLE=hidden' | sudo tee -a /etc/default/grub 1>/dev/null
+  echo 'GRUB_HIDDEN_TIMEOUT=1' | sudo tee -a /etc/default/grub 1>/dev/null
   if [ -f '/boot/efi/EFI/fedora/grub.cfg' ]; then
-    sudo -A grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
+    sudo grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
   else
-    sudo -A grub2-mkconfig -o /boot/grub2/grub.cfg
+    sudo grub2-mkconfig -o /boot/grub2/grub.cfg
   fi
 
-unhide-grub: _auth
+unhide-grub:
   #!/usr/bin/env bash
-  sudo -A sed -i '/GRUB_HIDDEN_TIMEOUT=1/d' /etc/default/grub
-  sudo -A sed -i '/GRUB_TIMEOUT_STYLE=hidden/d' /etc/default/grub
-  sudo -A sed -i 's/GRUB_TIMEOUT=0/GRUB_TIMEOUT=5/g' /etc/default/grub
+  sudo sed -i '/GRUB_HIDDEN_TIMEOUT=1/d' /etc/default/grub
+  sudo sed -i '/GRUB_TIMEOUT_STYLE=hidden/d' /etc/default/grub
+  sudo sed -i 's/GRUB_TIMEOUT=0/GRUB_TIMEOUT=5/g' /etc/default/grub
   if [ -f '/boot/efi/EFI/fedora/grub.cfg' ]; then
-    sudo -A grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
+    sudo grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
   else
-    sudo -A grub2-mkconfig -o /boot/grub2/grub.cfg
+    sudo grub2-mkconfig -o /boot/grub2/grub.cfg
   fi
-
-_auth:
-  export SUDO_ASKPASS='/usr/bin/ksshaskpass'
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 87d2c2ad..08feb236 100644
--- a/system_files/desktop/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/desktop/usr/share/ublue-os/firstboot/yafti.yml
@@ -50,7 +50,7 @@ screens:
             NOTE: Press the escape key before boot to show the menu
           default: true
           packages:
-          - Hide GRUB: just --unstable hide-grub
+          - Hide GRUB: sudo -A just --unstable hide-grub
         Memory Tuning:
           description: Adjust ZRAM configuration
           default: false
@@ -60,7 +60,7 @@ screens:
           description: Nix is a powerful package manager for Linux and other Unix systems that makes package management reliable and reproducible
           default: true
           packages:
-          - Install Nix Package Support: just --unstable install-nix
+          - Install Nix Package Support: sudo -A just --unstable install-nix
         Start Steam in Big Picture Mode:
           description: For HTPCs, start Steam in Big Picture Mode automatically at login.
           default: false
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 4391ea26..c0d7ff5a 100644
--- a/system_files/desktop/usr/share/ublue-os/just/custom.just
+++ b/system_files/desktop/usr/share/ublue-os/just/custom.just
@@ -17,11 +17,11 @@ install-corectrl:
   rpm-ostree install corectrl
   rpm-ostree kargs --append="amdgpu.ppfeaturemask=0xffffffff"
 
-install-nix: _auth
-  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/installer-scripts/silverblue-nix-installer.sh | sudo -A bash
+install-nix:
+  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/installer-scripts/silverblue-nix-installer.sh | sudo bash
 
-remove-nix: _auth
-  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | sudo -A bash
+remove-nix:
+  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | sudo bash
 
 enable-big-picture:
   systemctl enable --now plasma-autologin
@@ -66,7 +66,7 @@ zram-off:
     echo 'ZRAM is already disabled.'
   fi
 
-resize-zram: _auth
+resize-zram:
   #!/usr/bin/env bash
   CONFIG='/etc/systemd/zram-generator.conf'
   CURRENT_SIZE=$(cat "${CONFIG}" | sed 's/zram-size=//g')
@@ -77,7 +77,7 @@ resize-zram: _auth
       NEW_SIZE=1024
     fi
     if ((${NEW_SIZE} >= 512 && ${NEW_SIZE} <= 4096)); then
-      sudo -A sed -i 's/zram-size='${CURRENT_SIZE}'/zram-size='${NEW_SIZE}'/g' ${CONFIG}
+      sudo sed -i 's/zram-size='${CURRENT_SIZE}'/zram-size='${NEW_SIZE}'/g' ${CONFIG}
       echo 'Current size: '${NEW_SIZE}'. Please reboot.'
     else
       echo 'Error: Input out of range (512-4096). Running again.'
@@ -88,27 +88,24 @@ resize-zram: _auth
     just resize-zram
   fi
 
-hide-grub: _auth
+hide-grub:
   #!/usr/bin/env bash
-  sudo -A sed -i 's/GRUB_TIMEOUT=5/GRUB_TIMEOUT=0/g' /etc/default/grub
-  echo 'GRUB_TIMEOUT_STYLE=hidden' | sudo -A tee -a /etc/default/grub 1>/dev/null
-  echo 'GRUB_HIDDEN_TIMEOUT=1' | sudo -A tee -a /etc/default/grub 1>/dev/null
+  sudo sed -i 's/GRUB_TIMEOUT=5/GRUB_TIMEOUT=0/g' /etc/default/grub
+  echo 'GRUB_TIMEOUT_STYLE=hidden' | sudo tee -a /etc/default/grub 1>/dev/null
+  echo 'GRUB_HIDDEN_TIMEOUT=1' | sudo tee -a /etc/default/grub 1>/dev/null
   if [ -f '/boot/efi/EFI/fedora/grub.cfg' ]; then
-    sudo -A grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
+    sudo grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
   else
-    sudo -A grub2-mkconfig -o /boot/grub2/grub.cfg
+    sudo grub2-mkconfig -o /boot/grub2/grub.cfg
   fi
 
-unhide-grub: _auth
+unhide-grub:
   #!/usr/bin/env bash
-  sudo -A sed -i '/GRUB_HIDDEN_TIMEOUT=1/d' /etc/default/grub
-  sudo -A sed -i '/GRUB_TIMEOUT_STYLE=hidden/d' /etc/default/grub
-  sudo -A sed -i 's/GRUB_TIMEOUT=0/GRUB_TIMEOUT=5/g' /etc/default/grub
+  sudo sed -i '/GRUB_HIDDEN_TIMEOUT=1/d' /etc/default/grub
+  sudo sed -i '/GRUB_TIMEOUT_STYLE=hidden/d' /etc/default/grub
+  sudo sed -i 's/GRUB_TIMEOUT=0/GRUB_TIMEOUT=5/g' /etc/default/grub
   if [ -f '/boot/efi/EFI/fedora/grub.cfg' ]; then
-    sudo -A grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
+    sudo grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
   else
-    sudo -A grub2-mkconfig -o /boot/grub2/grub.cfg
+    sudo grub2-mkconfig -o /boot/grub2/grub.cfg
   fi
-
-_auth:
-  export SUDO_ASKPASS='/usr/bin/ksshaskpass'