diff --git a/profiles/pci/handhelds/profiles.toml b/profiles/pci/handhelds/profiles.toml
index f30c13a..9ff9a5d 100644
--- a/profiles/pci/handhelds/profiles.toml
+++ b/profiles/pci/handhelds/profiles.toml
@@ -4,45 +4,119 @@
 #DEVICEIDS=1435 (oled), 163f (lcd)
 
 #ASUS Rog Ally APU
+#CLASSIDS=0300
+#VENDORIDS=1002
+#DEVICEIDS=
 
 #Lenovo Legion GO APU
+#CLASSIDS=0300
+#VENDORIDS=1002
+#DEVICEIDS=15bf
 
 [steam-decks]
-desc = 'Steam Decks'
+desc = 'Valve Steam Decks'
 nonfree = false
 class_ids = "0300"
 vendor_ids = "1002"
 device_ids = "1435 163f"
-priority = 0
+priority = 1
 packages = 'jupiter-hw-support jupiter-fan-control steamdeck-dsp steam cachyos-handheld'
-conditional_packages = """
-
-"""
+#fbcon=vc:2-6 is not added here because it is added for all devices using calamares.
 post_install = """
-    echo 'Enabling services for Steam Decks.
-    services=('steam-powerbuttond')
-    for service in $services; do
+    echo "Steam Deck chwd installing..."
+    username=$(id -nu 1000)
+    services=("steam-powerbuttond")
+    kernelparams="amd_iommu=off amdgpu.gttsize=8128 spi_amd.speed_dev=1 audit=0 iomem=relaxed amdgpu.ppfeaturemask=0xffffffff"
+    echo "Enabling services..."
+    for service in ${services[@]}; do
         systemctl enable --now "${service}.service"
+    done
+    echo "Adding required kernel parameters..."
+    sed -i 's/LINUX_OPTIONS=[\x22][^\x22]*/& ${kernelparams}' /etc/sdboot-manage.conf
 """
 post_remove = """
-    echo 'Disabling services for Steam Decks'
+    echo "Steam deck chwd removing..."
+    username=$(id -nu 1000)
     services=('steam-powerbuttond')
-    for service in $services; do
+    kernelparams="amd_iommu=off amdgpu.gttsize=8128 spi_amd.speed_dev=1 audit=0 iomem=relaxed amdgpu.ppfeaturemask=0xffffffff"
+    echo "Disabling services..."
+    for service in ${services[@]}; do
         systemctl disable "${service}.service"
+    done
+    echo "Removing kernel parameters..."
+    sed -i 's/${kernelparams}/' /etc/sdboot-manage.conf
 """
 
-[steam-deck-oled]
-desc = 'Steam Deck OLED Specific'
+[rog-ally]
+desc = "ASUS ROG Ally"
 nonfree = false
-class_ids = "0300"
-vendor_ids = "1002"
-device_ids = '1435'
+class_ids= "0300"
+vendor_ids="1002"
+device_ids = ""
 priority = 1
-packages = 'jupiter-hw-support jupiter-fan-control steamdeck-dsp steam cachyos-handheld'
-conditional_packages = """
-
-"""
+packages = "hhd hhd-ui jupiter-hw-support"
 post_install = """
+    echo "ASUS ROG Ally chwd installing..."
+    username=$(id -nu 1000)
+    services=("steam-powerbuttond" "hhd@${username}")
+    maskservices=("jupiter-fan-control" "jupiter-bios-update" "jupiter-controller-update")
+    echo "Enabling services..."
+    for service in ${services[@]}; do
+        systemctl enable --now "${service}.service"
+    done
+    echo "Masking potentially conflicting services"
+    for mask in ${maskservices[@]}; do
+        systemctl mask "${mask}.service"
+    done
 """
 post_remove = """
+    echo "ASUS ROG Ally chwd removing..."
+    username=$(id -nu 1000)
+    services=("steam-powerbuttond" "hhd@${username}")
+    maskservices=("jupiter-fan-control" "jupiter-bios-update" "jupiter-controller-update")
+    echo 'Disabling services...'
+    for service in ${services[@]}; do
+        systemctl disable "${service}.service"
+    done
+    echo "Unmasking potentially conflicting services"
+    for mask in ${maskservices[@]}; do
+        systemctl unmask "${mask}.service"
+    done
 """
+
+[legion-go]
+desc = "Lenovo Legion GO"
+nonfree = false
+class_ids= "0300"
+vendor_ids="1002"
+device_ids = "15bf"
+priority = 1
+packages = "hhd hhd-ui jupiter-hw-support"
+post_install = """
+    echo "Lenovo Legion GO chwd installing..."
+    username=$(id -nu 1000)
+    services=("steam-powerbuttond" "hhd@${username}")
+    maskservices=("jupiter-fan-control" "jupiter-bios-update" "jupiter-controller-update")
+    echo "Enabling services..."
+    for service in ${services[@]}; do
+        systemctl enable --now "${service}.service"
+    done
+    echo "Masking potentially conflicting services"
+    for mask in ${maskservices[@]}; do
+        systemctl mask "${mask}.service"
+    done
+"""
+post_remove = """
+    echo "Lenovo Legion Go chwd removing..."
+    username=$(id -nu 1000)
+    services=("steam-powerbuttond" "hhd@${username}")
+    maskservices=("jupiter-fan-control" "jupiter-bios-update" "jupiter-controller-update")
+    echo 'Disabling services...'
+    for service in ${services[@]}; do
+        systemctl disable "${service}.service"
+    done
+    echo "Unmasking potentially conflicting services"
+    for mask in ${maskservices[@]}; do
+        systemctl unmask "${mask}.service"
+    done
+"""
\ No newline at end of file