diff --git a/bootloader/hekate_ipl.ini b/bootloader/hekate_ipl.ini
index 36d88cf..9943939 100644
--- a/bootloader/hekate_ipl.ini
+++ b/bootloader/hekate_ipl.ini
@@ -9,12 +9,8 @@ updater2p=1
 bootprotect=0
 noticker=0
 
-{NiklasCFW- Ein Nintendo Switch CFW Pack}
-{Created by Woody2408 @ https://github.com/Woody-NX}
-{Niklas Discord Server @ https://discord.gg/KBmq9TGA}
 
-{-- Custom Firmwares --}
-[CFW - emuMMC]
+[CFW-EmuMMC]
 fss0=atmosphere/package3
 emummcforce=1
 kip1patch=nosigchk
@@ -23,20 +19,23 @@ logopath=bootloader/bootlogo/bootlogo_cfw.bmp
 icon=bootloader/res/atmosphere.bmp
 usb3force=1
 
-{-------- Payloads -------}
 [Lockpick RCM]
 payload=bootloader/payloads/Lockpick_RCM.bin
 icon=bootloader/res/lockpick.bmp
 
-{-------- Payloads -------}
 [Tegra Explorer]
 payload=bootloader/payloads/TegraExplorer.bin
 icon=bootloader/res/TegraExplorer.bmp
 
-{-------- Stock -------}
 [OFW]
 fss0=atmosphere/package3
 stock=1
 emummc_force_disable=1
 logopath=bootloader/bootlogo/bootlogo_stock.bmp
 icon=bootloader/res/icon_switch.bmp
+
+--------------------------------------------------------------
+
+;{NiklasCFW Ein Nintendo Switch CFW Pack}
+;{Created by Woody2408 @ https://github.com/Woody-NX}
+;{Niklas Discord Server @ https://discord.gg/KBmq9TGA}
\ No newline at end of file
diff --git a/bootloader/ini/Payloads.ini b/bootloader/ini/Payloads.ini
new file mode 100644
index 0000000..1c6f473
--- /dev/null
+++ b/bootloader/ini/Payloads.ini
@@ -0,0 +1,25 @@
+[config]
+autoboot=0
+autoboot_list=0
+bootwait=3
+backlight=100
+autohosoff=2
+autonogc=1
+updater2p=1
+bootprotect=0
+noticker=0
+
+
+[Tegra Explorer]
+payload=bootloader/payloads/TegraExplorer.bin
+icon=bootloader/res/TegraExplorer.bmp
+
+[Lockpick RCM]
+payload=bootloader/payloads/Lockpick_RCM.bin
+icon=bootloader/res/lockpick.bmp
+
+--------------------------------------------------------------
+
+;{NiklasCFW Ein Nintendo Switch CFW Pack}
+;{Created by Woody2408 @ https://github.com/Woody-NX}
+;{Niklas Discord Server @ https://discord.gg/KBmq9TGA}
\ No newline at end of file
diff --git a/bootloader/ini/Stock_CFW.ini b/bootloader/ini/Stock_CFW.ini
new file mode 100644
index 0000000..085369c
--- /dev/null
+++ b/bootloader/ini/Stock_CFW.ini
@@ -0,0 +1,24 @@
+[config]
+autoboot=0
+autoboot_list=0
+bootwait=3
+backlight=100
+autohosoff=2
+autonogc=1
+updater2p=1
+bootprotect=0
+noticker=0
+
+
+[Stock - CFW]
+fss0=atmosphere/package3
+kip1patch=nosigchk
+emummc_force_disable=1
+icon=bootloader/res/Stock-CFW.bmp
+usb3force=1
+
+------------------------------------------------------------
+
+;{NiklasCFW Ein Nintendo Switch CFW Pack}
+;{Created by Woody2408 @ https://github.com/Woody-NX}
+;{Niklas Discord Server @ https://discord.gg/KBmq9TGA}
\ No newline at end of file
diff --git a/bootloader/ini/hekate_ipl.ini b/bootloader/ini/hekate_ipl.ini
index 618d380..94a1bdc 100644
--- a/bootloader/ini/hekate_ipl.ini
+++ b/bootloader/ini/hekate_ipl.ini
@@ -9,30 +9,17 @@ updater2p=1
 bootprotect=0
 noticker=0
 
-{NiklasCFW- Ein Nintendo Switch CFW Pack}
-{Created by Woody2408 @ https://github.com/Woody-NX}
-{Niklas Discord Server @ https://discord.gg/KBmq9TGA}
 
-{-- Stock - CFW --}
-[Stock - CFW]
-fss0=atmosphere/package3
-kip1patch=nosigchk
-emummc_force_disable=1
-icon=bootloader/res/Stock-CFW.bmp
-usb3force=1
-
-{-------- Android-------}
-[Android 14]
+[Android LineageOS]
 l4t=1
 boot_prefixes=switchroot/android/
 id=SWANDR
-logopath=bootloader/res/bootlogos/bootlogo_android.bmp
+logopath=bootloader/bootlogo/bootlogo_android.bmp
 icon=bootloader/res/android_hue.bmp
-r2p_action=self
+r2p_action=bootloader
 ddr200_enable=1
 usb3force=1
 
-{-------- Linux -------}
 [L4T Ubuntu Bionic]
 l4t=1
 boot_prefixes=/switchroot/ubuntu/
@@ -43,7 +30,6 @@ logopath=bootloader/bootlogo/bootlogo_ubuntu.bmp
 icon=bootloader/res/linux_hue.bmp
 usb3force=1
 
-{-------- Linux -------}
 [L4T Ubuntu Jammy]
 l4t=1
 boot_prefixes=/switchroot/ubuntu-jammy/
@@ -53,7 +39,6 @@ logopath=bootloader/bootlogo/bootlogo_ubuntu.bmp
 icon=bootloader/res/icon_ubuntu_hue.bmp
 usb3force=1
 
-{-------- Linux -------}
 [L4T Ubuntu Noble]
 l4t=1
 boot_prefixes=/switchroot/ubuntu-noble/
@@ -63,7 +48,6 @@ logopath=bootloader/bootlogo/bootlogo_ubuntu.bmp
 icon=bootloader/res/Ubuntu-Noble.bmp
 usb3force=1
 
-{-------- Linux -------}
 [L4T Fedora 41]
 l4t=1
 mainline=0
@@ -74,7 +58,6 @@ logopath=bootloader/bootlogo/bootlogo_fedora.bmp
 icon=bootloader/res/icon_fedora_hue.bmp
 usb3force=1
 
-{-------- Lakka -------}
 [Lakka-Switch]
 l4t=1
 boot_prefixes=lakka/boot/
@@ -82,3 +65,9 @@ id=SWR-LAK
 logopath=bootloader/bootlogo/lakka.bmp
 icon=bootloader/res/lakka_hue.bmp
 usb3force=1
+
+------------------------------------------------------------
+
+;{NiklasCFW Ein Nintendo Switch CFW Pack}
+;{Created by Woody2408 @ https://github.com/Woody-NX}
+;{Niklas Discord Server @ https://discord.gg/KBmq9TGA}
\ No newline at end of file
diff --git a/bootloader/nyx.ini b/bootloader/nyx.ini
index de9fbf6..7f91531 100644
--- a/bootloader/nyx.ini
+++ b/bootloader/nyx.ini
@@ -1,8 +1,7 @@
 [config]
 themebg=0
-themecolor=183
+themecolor=184
 entries5col=0
-timeoff=0
 homescreen=0
 verification=1
 umsemmcrw=0
diff --git a/bootloader/patches.ini b/bootloader/patches.ini
index 2fc1b06..ba47ac2 100644
--- a/bootloader/patches.ini
+++ b/bootloader/patches.ini
@@ -1,5 +1,3 @@
-# amsPLUS
-# UTF-8
 # A KIP section is [kip1_name:sha256_hex_8bytes]
 # A patchset is .patch_name=kip_section_dec:offset_hex_0x:length_hex_0x:src_data_hex,dst_data_hex
 # _dec: 1 char decimal | _hex_0x: max u32 prefixed with 0x | _hex: hex array.
diff --git a/bootloader/payloads/TegraExplorer.bin b/bootloader/payloads/TegraExplorer.bin
index 9ccdf99..954a999 100644
Binary files a/bootloader/payloads/TegraExplorer.bin and b/bootloader/payloads/TegraExplorer.bin differ
diff --git a/bootloader/res/arch_hue.bmp b/bootloader/res/arch_hue.bmp
new file mode 100644
index 0000000..293f3f1
Binary files /dev/null and b/bootloader/res/arch_hue.bmp differ