diff --git a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
index 289706def3..d6340ed743 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
@@ -139,7 +139,7 @@ if [[ ":83E1:" =~ ":$SYS_ID:" ]]; then
   fi
 fi
 
-if /usr/libexec/hardware/hhd-supported-hardware; then
+if /usr/libexec/hardware/simpledeckytdp-supported-hardware; then
   if [[ ! $KARGS =~ "iomem" ]]; then
     echo "Adding needed kargs for ryzenadj"
     NEEDED_KARGS+=("--append-if-missing=iomem=relaxed")
diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index 5e83b744ce..511a3c23b0 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -136,7 +136,7 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegam
     rm -f "$AUTOSTART_FOLDER/autostart/bazzite-handle-legion-go-rotation.desktop"
   fi
 
-  if /usr/libexec/rotation-fix-hardware && [[ $BASE_IMAGE_NAME =~ "kinoite" ]]; then
+  if /usr/libexec/hardware/rotation-fix-hardware && [[ $BASE_IMAGE_NAME =~ "kinoite" ]]; then
     if [[ ! -f "$AUTOSTART_FOLDER/autostart/bazzite-rotation-fix.desktop" ]]; then
       echo 'Adding rotation fix'
       mkdir -p "$AUTOSTART_FOLDER/autostart"
diff --git a/system_files/desktop/shared/usr/libexec/hardware/handycon-supported-hardware b/system_files/desktop/shared/usr/libexec/hardware/handycon-supported-hardware
index 4bcae442cb..286223efba 100755
--- a/system_files/desktop/shared/usr/libexec/hardware/handycon-supported-hardware
+++ b/system_files/desktop/shared/usr/libexec/hardware/handycon-supported-hardware
@@ -1,4 +1,5 @@
 #!/usr/bin/bash
+# Returns true for hardware that is supported by Handycon exclusively.
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
 if [[ ":AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:G1619-04:Win600:" =~ ":$SYS_ID:" ]]; then
 	exit 0
diff --git a/system_files/desktop/shared/usr/libexec/hardware/hhd-supported-hardware b/system_files/desktop/shared/usr/libexec/hardware/hhd-supported-hardware
index e4e31731ed..c46b299f97 100755
--- a/system_files/desktop/shared/usr/libexec/hardware/hhd-supported-hardware
+++ b/system_files/desktop/shared/usr/libexec/hardware/hhd-supported-hardware
@@ -1,4 +1,5 @@
 #!/usr/bin/bash
+# Returns true for hardware that is supported by HHD
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
 if [[ ":ROG Ally RC71L_RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:" =~ ":$SYS_ID:" ]]; then
 	exit 0
diff --git a/system_files/desktop/shared/usr/libexec/hardware/rotation-fix-hardware b/system_files/desktop/shared/usr/libexec/hardware/rotation-fix-hardware
index 15aad21765..696464b36f 100755
--- a/system_files/desktop/shared/usr/libexec/hardware/rotation-fix-hardware
+++ b/system_files/desktop/shared/usr/libexec/hardware/rotation-fix-hardware
@@ -1,4 +1,5 @@
 #!/usr/bin/bash
+# Returns true for hardware that needs a rotation fix in KDE
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
 if [[ ":ROG Ally RC71L_RC71L:83E1:Loki Max:G1618-04:" =~ ":$SYS_ID:" ]]; then
 	exit 0
diff --git a/system_files/desktop/shared/usr/libexec/hardware/simpledeckytdp-supported-hardware b/system_files/desktop/shared/usr/libexec/hardware/simpledeckytdp-supported-hardware
new file mode 100755
index 0000000000..f7a47c8db2
--- /dev/null
+++ b/system_files/desktop/shared/usr/libexec/hardware/simpledeckytdp-supported-hardware
@@ -0,0 +1,8 @@
+#!/usr/bin/bash
+# Returns true for hardware that is supported by SimpleDeckyTDP
+SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+if [[ ":ROG Ally RC71L_RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:" =~ ":$SYS_ID:" ]]; then
+	exit 0
+else
+	exit 1
+fi
diff --git a/system_files/desktop/shared/usr/libexec/hardware/valve-hardware b/system_files/desktop/shared/usr/libexec/hardware/valve-hardware
index 6e8878ec8f..eeb8f73332 100755
--- a/system_files/desktop/shared/usr/libexec/hardware/valve-hardware
+++ b/system_files/desktop/shared/usr/libexec/hardware/valve-hardware
@@ -1,4 +1,5 @@
 #!/usr/bin/bash
+# Returns true for Valve handhelds
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
 if [[ ":Jupiter:Galileo:" =~ ":$SYS_ID:" ]]; then
 	exit 0