diff --git a/varients/light/switch/.packages/RebootNX/config.ini b/varients/light/switch/.packages/RebootNX/config.ini
index 9c718b2..70a8212 100644
--- a/varients/light/switch/.packages/RebootNX/config.ini
+++ b/varients/light/switch/.packages/RebootNX/config.ini
@@ -1,93 +1,105 @@
-[*Boot Optionen]
-footer=
-grouping=default
-mode=default
-system=default
-
-[*Lakka]
-footer=
-
-[Android LineageOS]
-footer=
-
-[Android LineageOS - SD Karte]
-footer=
-
-[Android LineageOS - eMMC]
-footer=
-
-[CrDroid]
-footer=
-
-[CrDroid - SD Karte]
-footer=
-
-[CrDroid - eMMC]
-footer=
-
-[Fedora]
-footer=
-
-[Fedora - SD Karte]
-footer=
-
-[Fedora - eMMC]
-footer=
-
-[Fedora_41]
-footer=
-
-[Hekate]
-footer=
-
-[Hekate UMS]
-footer=
-
-[Herunterfahren]
-footer=
-
-[Lakka]
-footer=
-
-[Lockpick_RCM]
-footer=
-
-[Neustart CFW]
-footer=
-
-[Neustart OFW]
-footer=
-
-[Tegra_Explorer]
-footer=
-
-[Ubuntu_Bionic]
-footer=
-
-[Ubuntu_Bionic - SD Karte]
-footer=
-
-[Ubuntu_Bionic - eMMC]
-footer=
-
-[Ubuntu_Jammy]
-footer=
-
-[Ubuntu_Jammy - SD Karte]
-footer=
-
-[Ubuntu_Jammy - eMMC]
-footer=
-
-[Ubuntu_Noble]
-footer=
-
-[Ubuntu_Noble - SD Karte]
-footer=
-
-[Ubuntu_Noble - eMMC]
-footer=
-
-[gap]
-footer=
-
+[*Boot Optionen]
+footer=
+grouping=default
+mode=default
+system=default
+
+[*Hekate]
+footer=
+
+[*Lakka]
+footer=
+
+[*Reboot]
+footer=
+
+[*SD Boot]
+footer=
+
+[*eMMC Boot]
+footer=
+
+[Android LineageOS]
+footer=
+
+[Android LineageOS - SD Karte]
+footer=
+
+[Android LineageOS - eMMC]
+footer=
+
+[CrDroid]
+footer=
+
+[CrDroid - SD Karte]
+footer=
+
+[CrDroid - eMMC]
+footer=
+
+[Fedora]
+footer=
+
+[Fedora - SD Karte]
+footer=
+
+[Fedora - eMMC]
+footer=
+
+[Fedora_41]
+footer=
+
+[Hekate]
+footer=
+
+[Hekate UMS]
+footer=
+
+[Herunterfahren]
+footer=
+
+[Lakka]
+footer=
+
+[Lockpick_RCM]
+footer=
+
+[Neustart CFW]
+footer=
+
+[Neustart OFW]
+footer=
+
+[Tegra_Explorer]
+footer=
+
+[Ubuntu_Bionic]
+footer=
+
+[Ubuntu_Bionic - SD Karte]
+footer=
+
+[Ubuntu_Bionic - eMMC]
+footer=
+
+[Ubuntu_Jammy]
+footer=
+
+[Ubuntu_Jammy - SD Karte]
+footer=
+
+[Ubuntu_Jammy - eMMC]
+footer=
+
+[Ubuntu_Noble]
+footer=
+
+[Ubuntu_Noble - SD Karte]
+footer=
+
+[Ubuntu_Noble - eMMC]
+footer=
+
+[gap]
+footer=
+
diff --git a/varients/light/switch/.packages/RebootNX/include/hekate.ini b/varients/light/switch/.packages/RebootNX/include/hekate.ini
new file mode 100644
index 0000000..0c2cd29
--- /dev/null
+++ b/varients/light/switch/.packages/RebootNX/include/hekate.ini
@@ -0,0 +1,18 @@
+[Hekate]
+[Hekate]
+reboot HEKATE
+
+[Hekate UMS]
+reboot UMS
+
+[*Payloads]
+[Tegra_Explorer]
+ini_file_source /bootloader/hekate_ipl.ini
+filter config
+reboot boot 'Tegra_Explorer'
+
+[Lockpick_RCM]
+shutdown
+ini_file_source /bootloader/hekate_ipl.ini
+filter config
+reboot boot 'Lockpick_RCM'
\ No newline at end of file
diff --git a/varients/light/switch/.packages/RebootNX/include/reboot.ini b/varients/light/switch/.packages/RebootNX/include/reboot.ini
new file mode 100644
index 0000000..3a77df8
--- /dev/null
+++ b/varients/light/switch/.packages/RebootNX/include/reboot.ini
@@ -0,0 +1,5 @@
+[Neustart CFW]
+reboot boot CFW-EmuMMC
+
+[Neustart OFW]
+reboot boot OFW
\ No newline at end of file
diff --git a/varients/light/switch/.packages/RebootNX/package.ini b/varients/light/switch/.packages/RebootNX/package.ini
index 731ac41..23c61e2 100644
--- a/varients/light/switch/.packages/RebootNX/package.ini
+++ b/varients/light/switch/.packages/RebootNX/package.ini
@@ -2,33 +2,17 @@
 [HorizonOS]
 
 [*Hekate]
-[Hekate]
-reboot HEKATE
-
-[Hekate UMS]
-reboot UMS
+;mode=forwarder
+package_source ./include/hekate.ini
 
 [*Reboot]
-[Neustart CFW]
-reboot boot CFW-EmuMMC
-
-[Neustart OFW]
-reboot boot OFW
+;mode=forwarder
+package_source ./include/reboot.ini
+refresh-to *Reboot
 
 [Herunterfahren]
 shutdown
 
-[*Payloads]
-[Tegra_Explorer]
-ini_file_source /bootloader/hekate_ipl.ini
-filter config
-reboot boot 'Tegra_Explorer'
-
-[Lockpick_RCM]
-shutdown
-ini_file_source /bootloader/hekate_ipl.ini
-filter config
-reboot boot 'Lockpick_RCM'
 
 [Betriebssysteme]
 [*SD Boot]
@@ -38,8 +22,8 @@ package_source ./include/sd.ini
 [*eMMC Boot]
 ;mode=forwarder
 package_source ./include/emmc.ini
+refresh-to *eMMC Boot
 
-[*Lakka]
 [Lakka]
 ini_file_source /bootloader/ini/Lakka_Switch.ini
 filter config