Clean install: align deletions with NiklasCFW pack script

- Remove entire sd:/atmosphere and sd:/switch (lists simplified)
- Add sd:/SaltySD/patches; drop nyx.ini and config/quickntp to match script
- Delete sd:/switch/tinfoil/db after backup restore via clean_post_restore_dirs_to_delete

Made-with: Cursor

.gitignore

@@ -20,3 +20,6 @@ Thumbs.db
 # Version file is tracked, ignore local edits
 # VERSION
 
+# Vendored TegraExplorer tree
+source/TegraExplorer/
+

Makefile

@@ -31,6 +31,9 @@ OBJS += $(patsubst $(BDKDIR)/%.S, $(BUILDDIR)/$(TARGET)/%.o, \
 		$(patsubst $(BDKDIR)/%.c, $(BUILDDIR)/$(TARGET)/%.o, \
 		$(call rwildcard, $(BDKDIR), *.S *.c)))
 
+# Optional vendored tree under source/TegraExplorer/ is not part of this payload build.
+OBJS := $(filter-out $(BUILDDIR)/$(TARGET)/TegraExplorer/%,$(OBJS))
+
 GFX_INC   := '"../$(SOURCEDIR)/gfx.h"'
 FFCFG_INC := '"../$(SOURCEDIR)/libs/fatfs/ffconf.h"'
 

source/backup.c

@@ -101,3 +101,34 @@ int cleanup_backup(void) {
     }
     return FR_OK;
 }
+
+int backup_horizon_oc_config_for_oc_update(void) {
+    if (!path_exists(HORIZON_OC_CONFIG_PATH))
+        return FR_OK;
+
+    int res = f_mkdir(HORIZON_OC_UPDATE_BACKUP_DIR);
+    if (res != FR_OK && res != FR_EXIST)
+        return res;
+
+    return file_copy(HORIZON_OC_CONFIG_PATH, HORIZON_OC_UPDATE_BACKUP_INI);
+}
+
+int restore_horizon_oc_config_after_oc_update(void) {
+    if (!path_exists(HORIZON_OC_UPDATE_BACKUP_INI))
+        return FR_OK;
+
+    int res = f_mkdir("sd:/config");
+    if (res != FR_OK && res != FR_EXIST)
+        return res;
+    res = f_mkdir("sd:/config/horizon-oc");
+    if (res != FR_OK && res != FR_EXIST)
+        return res;
+
+    return file_copy(HORIZON_OC_UPDATE_BACKUP_INI, HORIZON_OC_CONFIG_PATH);
+}
+
+int cleanup_horizon_oc_update_backup(void) {
+    if (!path_exists(HORIZON_OC_UPDATE_BACKUP_DIR))
+        return FR_OK;
+    return folder_delete(HORIZON_OC_UPDATE_BACKUP_DIR);
+}

source/backup.h

@@ -8,6 +8,12 @@
 
 #define TEMP_BACKUP_PATH "sd:/temp_backup"
 
+/** Live HorizonOC settings (Overclock tool). */
+#define HORIZON_OC_CONFIG_PATH "sd:/config/horizon-oc/config.ini"
+/** Scratch dir during OC-variant update only; removed after successful restore. */
+#define HORIZON_OC_UPDATE_BACKUP_DIR "sd:/.omninx_oc_update"
+#define HORIZON_OC_UPDATE_BACKUP_INI HORIZON_OC_UPDATE_BACKUP_DIR "/config.ini"
+
 // Backup user data (DBI, Tinfoil, prod.keys) before clean install
 int backup_user_data(void);
 
@@ -16,3 +22,10 @@ int restore_user_data(void);
 
 // Clean up temporary backup directory
 int cleanup_backup(void);
+
+// HorizonOC: backup config.ini before OC pack update (update mode only); no-op if missing
+int backup_horizon_oc_config_for_oc_update(void);
+// Restore after file copy; no-op if no backup from this run
+int restore_horizon_oc_config_after_oc_update(void);
+// Delete sd:/.omninx_oc_update after successful restore
+int cleanup_horizon_oc_update_backup(void);

source/deletion_lists_clean.h

@@ -1,295 +1,133 @@
-/*
+/*
- * OmniNX Installer - Deletion Lists for Clean Install Mode
+ * OmniNX Installer - Deletion Lists for Clean Install Mode
- * Selective deletion when no OmniNX install was found.
+ * Deletion policy aligned with NiklasCFW pack clean install (TegraExplorer script):
- * Only listed paths are removed; does not wipe whole card or user configs.
+ * full sd:/atmosphere, bootloader/config subsets, sd:/switch, root + misc, then
- */
+ * post-restore paths (e.g. tinfoil db). Backup/restore of DBI, Tinfoil, prod.keys
-
+ * is implemented in backup.c, not here.
-#pragma once
+ */
-
+
-// Atmosphere subdirectories to delete
+#pragma once
-static const char* clean_atmosphere_dirs_to_delete[] = {
+
-    "sd:/atmosphere/config",
+// Entire atmosphere/ tree (NiklasCFW: deldir("sd:/atmosphere"))
-    "sd:/atmosphere/crash_reports",
+static const char* clean_atmosphere_dirs_to_delete[] = {
-    "sd:/atmosphere/erpt_reports",
+    "sd:/atmosphere",
-    "sd:/atmosphere/exefs_patches/CrunchPatch",
+    NULL
-    "sd:/atmosphere/exefs_patches/Crunchyroll Patch 1.10.0",
+};
-    "sd:/atmosphere/exefs_patches/bluetooth_patches",
+
-    "sd:/atmosphere/exefs_patches/bootlogo",
+static const char* clean_atmosphere_contents_dirs_to_delete[] = {
-    "sd:/atmosphere/exefs_patches/btm_patches",
+    NULL
-    "sd:/atmosphere/exefs_patches/es_patches",
+};
-    "sd:/atmosphere/exefs_patches/hid_patches",
+
-    "sd:/atmosphere/exefs_patches/logo1",
+static const char* clean_atmosphere_files_to_delete[] = {
-    "sd:/atmosphere/exefs_patches/nfim_ctest",
+    NULL
-    "sd:/atmosphere/exefs_patches/nim_ctest",
+};
-    "sd:/atmosphere/exefs_patches/nvnflinger_cmu",
+
-    "sd:/atmosphere/extrazz",
+// Bootloader directories to delete
-    "sd:/atmosphere/fatal_errors",
+static const char* clean_bootloader_dirs_to_delete[] = {
-    "sd:/atmosphere/fatal_reports",
+    "sd:/bootloader/boot",
-    "sd:/atmosphere/flags",
+    "sd:/bootloader/bootlogo",
-    "sd:/atmosphere/hbl_html",
+    "sd:/bootloader/ini2",
-    "sd:/atmosphere/hosts",
+    "sd:/bootloader/payloads",
-    "sd:/atmosphere/kips",
+    "sd:/bootloader/reboot",
-    "sd:/atmosphere/kip1",
+    "sd:/bootloader/res",
-    "sd:/atmosphere/kip_patches",
+    "sd:/bootloader/sys",
-    "sd:/atmosphere/logs",
+    NULL
-    NULL
+};
-};
+
-
+// Bootloader files to delete
-// Atmosphere contents directories (title IDs; only under atmosphere/contents/)
+static const char* clean_bootloader_files_to_delete[] = {
-static const char* clean_atmosphere_contents_dirs_to_delete[] = {
+    "sd:/bootloader/ArgonNX.bin",
-    "sd:/atmosphere/contents/0000000000534C56",
+    "sd:/bootloader/bootlogo.bmp",
-    "sd:/atmosphere/contents/00FF0000B378D640",
+    "sd:/bootloader/hekate_ipl.ini",
-    "sd:/atmosphere/contents/00FF0000636C6BFF",
+    "sd:/bootloader/patches.ini",
-    "sd:/atmosphere/contents/00FF0000A53BB665",
+    "sd:/bootloader/update.bin",
-    "sd:/atmosphere/contents/0100000000000008",
+    "sd:/bootloader/ini/EmuMMC ohne Mods.ini",
-    "sd:/atmosphere/contents/010000000000000D",
+    NULL
-    "sd:/atmosphere/contents/010000000000002B",
+};
-    "sd:/atmosphere/contents/0100000000000032",
+
-    "sd:/atmosphere/contents/0100000000000034",
+// Config directories to delete
-    "sd:/atmosphere/contents/0100000000000036",
+static const char* clean_config_dirs_to_delete[] = {
-    "sd:/atmosphere/contents/0100000000000037",
+    "sd:/config/aio-switch-updater",
-    "sd:/atmosphere/contents/010000000000003C",
+    "sd:/config/blue_pack_updater",
-    "sd:/atmosphere/contents/0100000000000042",
+    "sd:/config/kefir-updater",
-    "sd:/atmosphere/contents/0100000000000895",
+    "sd:/config/nx-hbmenu",
-    "sd:/atmosphere/contents/0100000000000F12",
+    "sd:/config/sys-con",
-    "sd:/atmosphere/contents/0100000000001000",
+    "sd:/config/sys-patch",
-    "sd:/atmosphere/contents/0100000000001007",
+    "sd:/config/uberhand",
-    "sd:/atmosphere/contents/0100000000001013",
+    "sd:/config/ultrahand",
-    "sd:/atmosphere/contents/010000000000DA7A",
+    NULL
-    "sd:/atmosphere/contents/010000000000bd00",
+};
-    "sd:/atmosphere/contents/01006a800016e000",
+
-    "sd:/atmosphere/contents/01009D901BC56000",
+// Entire switch/ tree (clean install recreates sd:/switch after wipe)
-    "sd:/atmosphere/contents/0100A3900C3E2000",
+static const char* clean_switch_dirs_to_delete[] = {
-    "sd:/atmosphere/contents/0100F43008C44000",
+    "sd:/switch",
-    "sd:/atmosphere/contents/050000BADDAD0000",
+    NULL
-    "sd:/atmosphere/contents/4200000000000000",
+};
-    "sd:/atmosphere/contents/420000000000000B",
+
-    "sd:/atmosphere/contents/420000000000000E",
+static const char* clean_switch_files_to_delete[] = {
-    "sd:/atmosphere/contents/4200000000000010",
+    NULL
-    "sd:/atmosphere/contents/4200000000000FFF",
+};
-    "sd:/atmosphere/contents/420000000007E51A",
+
-    "sd:/atmosphere/contents/420000000007E51B",
+// Root CFW files to delete
-    "sd:/atmosphere/contents/690000000000000D",
+static const char* clean_root_files_to_delete[] = {
-    NULL
+    "sd:/boot.dat",
-};
+    "sd:/boot.ini",
-
+    "sd:/exosphere.bin",
-// Atmosphere files to delete
+    "sd:/exosphere.ini",
-static const char* clean_atmosphere_files_to_delete[] = {
+    "sd:/hbmenu.nro",
-    "sd:/atmosphere/config/exosphere.ini",
+    "sd:/install.bat",
-    "sd:/atmosphere/config/stratosphere.ini",
+    "sd:/license",
-    "sd:/atmosphere/hbl.nsp",
+    "sd:/loader.bin",
-    "sd:/atmosphere/package3",
+    "sd:/mc-mitm.log",
-    "sd:/atmosphere/reboot_payload.bin",
+    "sd:/payload.bin",
-    "sd:/atmosphere/stratosphere.romfs",
+    "sd:/update.bin",
-    NULL
+    "sd:/version",
-};
+    NULL
-
+};
-// Bootloader directories to delete
+
-static const char* clean_bootloader_dirs_to_delete[] = {
+// Miscellaneous directories to delete
-    "sd:/bootloader/boot",
+static const char* clean_misc_dirs_to_delete[] = {
-    "sd:/bootloader/bootlogo",
+    "sd:/argon",
-    "sd:/bootloader/ini2",
+    "sd:/games",
-    "sd:/bootloader/payloads",
+    "sd:/NSPs (Tools)",
-    "sd:/bootloader/reboot",
+    "sd:/Patched Apps",
-    "sd:/bootloader/res",
+    "sd:/SaltySD/flags",
-    "sd:/bootloader/sys",
+    "sd:/SaltySD/patches",
-    NULL
+    "sd:/scripts",
-};
+    "sd:/TegraExplorer",
-
+    "sd:/themes/systemData",
-// Bootloader files to delete
+    "sd:/tools",
-static const char* clean_bootloader_files_to_delete[] = {
+    "sd:/warmboot_mariko",
-    "sd:/bootloader/ArgonNX.bin",
+    NULL
-    "sd:/bootloader/bootlogo.bmp",
+};
-    "sd:/bootloader/hekate_ipl.ini",
+
-    "sd:/bootloader/nyx.ini",
+// Miscellaneous files to delete
-    "sd:/bootloader/patches.ini",
+static const char* clean_misc_files_to_delete[] = {
-    "sd:/bootloader/update.bin",
+    "sd:/fusee-primary.bin",
-    "sd:/bootloader/ini/EmuMMC ohne Mods.ini",
+    "sd:/fusee.bin",
-    NULL
+    "sd:/SaltySD/exceptions.txt",
-};
+    "sd:/SaltySD/saltysd_bootstrap.elf",
-
+    "sd:/SaltySD/saltysd_bootstrap32_3k.elf",
-// Config directories to delete
+    "sd:/SaltySD/saltysd_bootstrap32_5k.elf",
-static const char* clean_config_dirs_to_delete[] = {
+    "sd:/SaltySD/saltysd_core.elf",
-    "sd:/config/aio-switch-updater",
+    "sd:/SaltySD/saltysd_core32.elf",
-    "sd:/config/blue_pack_updater",
+    NULL
-    "sd:/config/kefir-updater",
+};
-    "sd:/config/nx-hbmenu",
+
-    "sd:/config/quickntp",
+// After DBI/Tinfoil/prod.keys restore (NiklasCFW: deldir("sd:/switch/tinfoil/db"))
-    "sd:/config/sys-con",
+static const char* clean_post_restore_dirs_to_delete[] = {
-    "sd:/config/sys-patch",
+    "sd:/switch/tinfoil/db",
-    "sd:/config/uberhand",
+    NULL
-    "sd:/config/ultrahand",
+};
-    NULL
+
-};
+// Old version marker files to delete (clean install only)
-
+static const char* old_version_files_to_delete[] = {
-// Switch directories to delete
+    "sd:/1.4.0-pre",
-static const char* clean_switch_dirs_to_delete[] = {
+    "sd:/1.4.0-pre-c",
-    "sd:/switch/.overlays",
+    "sd:/1.4.0-pre-d",
-    "sd:/switch/.packages",
+    "sd:/1.4.1",
-    "sd:/switch/90DNS_tester",
+    "sd:/1.5.0",
-    "sd:/switch/aio-switch-updater",
+    "sd:/1.6.0",
-    "sd:/switch/amsPLUS-downloader",
+    "sd:/1.6.1",
-    "sd:/switch/appstore",
+    NULL
-    "sd:/switch/AtmoXL-Titel-Installer",
+};
-    "sd:/switch/breeze",
-    "sd:/switch/checkpoint",
-    "sd:/switch/cheats-updater",
-    "sd:/switch/chiaki",
-    "sd:/switch/ChoiDujourNX",
-    "sd:/switch/crash_ams",
-    "sd:/switch/Daybreak",
-    "sd:/switch/DNS_mitm Tester",
-    "sd:/switch/EdiZon",
-    "sd:/switch/Fizeau",
-    "sd:/switch/FTPD",
-    "sd:/switch/fw-downloader",
-    "sd:/switch/gamecard_installer",
-    "sd:/switch/Goldleaf",
-    "sd:/switch/haze",
-    "sd:/switch/JKSV",
-    "sd:/switch/kefir-updater",
-    "sd:/switch/ldnmitm_config",
-    "sd:/switch/Linkalho",
-    "sd:/switch/Moonlight-Switch",
-    "sd:/switch/Neumann",
-    "sd:/switch/NX-Activity-Log",
-    "sd:/switch/NX-Save-Sync",
-    "sd:/switch/NX-Shell",
-    "sd:/switch/NX-Update-Checker ",
-    "sd:/switch/NXGallery",
-    "sd:/switch/NXRemoteLauncher",
-    "sd:/switch/NXThemesInstaller",
-    "sd:/switch/nxdumptool",
-    "sd:/switch/nxmtp",
-    "sd:/switch/Payload_launcher",
-    "sd:/switch/Reboot",
-    "sd:/switch/reboot_to_argonNX",
-    "sd:/switch/reboot_to_hekate",
-    "sd:/switch/Shutdown_System",
-    "sd:/switch/SimpleModDownloader",
-    "sd:/switch/SimpleModManager",
-    "sd:/switch/sphaira",
-    "sd:/switch/studious-pancake",
-    "sd:/switch/Switch-Time",
-    "sd:/switch/SwitchIdent",
-    "sd:/switch/Switch_themes_Installer",
-    "sd:/switch/Switchfin",
-    "sd:/switch/Sys-Clk Manager",
-    "sd:/switch/Sys-Con",
-    "sd:/switch/sys-clk-manager",
-    "sd:/switch/themezer-nx",
-    "sd:/switch/themezernx",
-    "sd:/switch/tinwoo",
-    NULL
-};
-
-// Switch files (NRO) to delete
-static const char* clean_switch_files_to_delete[] = {
-    "sd:/switch/90DNS_tester/90DNS_tester.nro",
-    "sd:/switch/breeze.nro",
-    "sd:/switch/cheats-updater.nro",
-    "sd:/switch/chiaki.nro",
-    "sd:/switch/ChoiDujourNX.nro",
-    "sd:/switch/daybreak.nro",
-    "sd:/switch/DBI.nro",
-    "sd:/switch/DBI/DBI.nro",
-    "sd:/switch/DBI/DBI_810_DE.nro",
-    "sd:/switch/DBI/DBI_810_EN.nro",
-    "sd:/switch/DBI/DBI_845_DE.nro",
-    "sd:/switch/DBI/DBI_845_EN.nro",
-    "sd:/switch/DBI/DBI_849_DE.nro",
-    "sd:/switch/DBI/DBI_849_EN.nro",
-    "sd:/switch/DBI_810_DE/DBI_810.nro",
-    "sd:/switch/DBI_810_DE/DBI_810_DE.nro",
-    "sd:/switch/DBI_810_EN/DBI_810_EN.nro",
-    "sd:/switch/DBI_RU/DBI_RU.nro",
-    "sd:/switch/DBI/DBI_EN.nro",
-    "sd:/switch/DBI_DE/DBI_DE.nro",
-    "sd:/switch/DNS_mitm Tester.nro",
-    "sd:/switch/EdiZon.nro",
-    "sd:/switch/Fizeau.nro",
-    "sd:/switch/Goldleaf.nro",
-    "sd:/switch/haze.nro",
-    "sd:/switch/JKSV.nro",
-    "sd:/switch/ldnmitm_config.nro",
-    "sd:/switch/linkalho.nro",
-    "sd:/switch/Moonlight-Switch.nro",
-    "sd:/switch/Neumann.nro",
-    "sd:/switch/NX-Shell.nro",
-    "sd:/switch/NXGallery.nro",
-    "sd:/switch/NXThemesInstaller.nro",
-    "sd:/switch/nxdumptool.nro",
-    "sd:/switch/nxtc.bin",
-    "sd:/switch/reboot_to_payload.nro",
-    "sd:/switch/SimpleModDownloader.nro",
-    "sd:/switch/SimpleModManager.nro",
-    "sd:/switch/sphaira.nro",
-    "sd:/switch/SwitchIdent.nro",
-    "sd:/switch/Switch_themes_Installer/NXThemesInstaller.nro",
-    "sd:/switch/Switchfin.nro",
-    "sd:/switch/Sys-Clk Manager/sys-clk-manager.nro",
-    "sd:/switch/Sys-Con.nro",
-    "sd:/switch/sys-clk-manager.nro",
-    "sd:/switch/tinfoil.nro",
-    "sd:/switch/tinfoil/tinfoil.nro",
-    "sd:/switch/tinwoo.nro",
-    "sd:/switch/tinwoo/tinwoo.nro",
-    NULL
-};
-
-// Root CFW files to delete
-static const char* clean_root_files_to_delete[] = {
-    "sd:/boot.dat",
-    "sd:/boot.ini",
-    "sd:/exosphere.bin",
-    "sd:/exosphere.ini",
-    "sd:/hbmenu.nro",
-    "sd:/install.bat",
-    "sd:/license",
-    "sd:/loader.bin",
-    "sd:/mc-mitm.log",
-    "sd:/payload.bin",
-    "sd:/update.bin",
-    "sd:/version",
-    NULL
-};
-
-// Miscellaneous directories to delete
-static const char* clean_misc_dirs_to_delete[] = {
-    "sd:/argon",
-    "sd:/games",
-    "sd:/NSPs (Tools)",
-    "sd:/Patched Apps",
-    "sd:/SaltySD/flags",
-    "sd:/scripts",
-    "sd:/switch/tinfoil/db",
-    "sd:/tools",
-    "sd:/warmboot_mariko",
-    NULL
-};
-
-// Miscellaneous files to delete
-static const char* clean_misc_files_to_delete[] = {
-    "sd:/fusee-primary.bin",
-    "sd:/fusee.bin",
-    "sd:/SaltySD/exceptions.txt",
-    "sd:/SaltySD/saltysd_bootstrap.elf",
-    "sd:/SaltySD/saltysd_bootstrap32_3k.elf",
-    "sd:/SaltySD/saltysd_bootstrap32_5k.elf",
-    "sd:/SaltySD/saltysd_core.elf",
-    "sd:/SaltySD/saltysd_core32.elf",
-    NULL
-};
-
-// Old version marker files to delete (clean install only)
-static const char* old_version_files_to_delete[] = {
-    "sd:/1.0.0l",
-    "sd:/1.0.0s",
-    "sd:/1.0.0oc",
-    "sd:/1.4.0-pre",
-    "sd:/1.4.0-pre-c",
-    "sd:/1.4.0-pre-d",
-    "sd:/1.4.1",
-    "sd:/1.5.0",
-    NULL
-};

source/deletion_lists_update.h

@@ -80,6 +80,8 @@ static const char* atmosphere_files_to_delete[] = {
     "sd:/atmosphere/package3",
     "sd:/atmosphere/reboot_payload.bin",
     "sd:/atmosphere/stratosphere.romfs",
+    "sd:/atmosphere/kips/loader.kip",
+    "sd:/atmosphere/kips/hoc.kip",
     NULL
 };
 
@@ -261,6 +263,7 @@ static const char* misc_dirs_to_delete[] = {
     "sd:/SaltySD/flags",
     "sd:/scripts",
     "sd:/switch/tinfoil/db",
+    "sd:/themes/systemData",
     "sd:/tools",
     "sd:/warmboot_mariko",
     NULL

source/install.c

@@ -3,14 +3,21 @@
  */
 
 #include "install.h"
-#include "dram_fuse.h"
+#include "backup.h"
 #include "fs.h"
+#include "screenshot.h"
 #include "version.h"
 #include "gfx.h"
 #include <libs/fatfs/ff.h>
+#include <input/joycon.h>
+#include <mem/heap.h>
 #include <stdarg.h>
 #include <string.h>
+#include <utils/btn.h>
+#include <utils/ini.h>
+#include <utils/list.h>
 #include <utils/sprintf.h>
+#include <utils/util.h>
 
 #define GROUPED_DELETE_MAX_ENTRIES 512
 
@@ -33,10 +40,25 @@
 #define COLOR_ORANGE  0xFF00A5FF
 #define COLOR_RED     0xFFFF0000
 
+static inline bool cancel_combo_pressed(u8 btn)
+{
+    return (btn & (BTN_VOL_UP | BTN_VOL_DOWN)) == (BTN_VOL_UP | BTN_VOL_DOWN);
+}
+
 void install_set_color(u32 color) {
     gfx_con_setcol(color, gfx_con.fillbg, gfx_con.bgcol);
 }
 
+/* Same top bar as main.c print_header() (without full screen clear). */
+static void install_print_main_header(void)
+{
+    install_set_color(COLOR_CYAN);
+    gfx_printf("===================================\n");
+    gfx_printf("  OmniNX Installer Payload v%s\n", VERSION);
+    gfx_printf("===================================\n\n");
+    install_set_color(COLOR_WHITE);
+}
+
 // Check if we need to clear screen (when getting close to bottom)
 void install_check_and_clear_screen_if_needed(void) {
     // In the gfx system:
@@ -51,13 +73,7 @@ void install_check_and_clear_screen_if_needed(void) {
         // Clear screen and reset position
         gfx_clear_grey(0x1B);
         gfx_con_setpos(0, 0);
-        
+        install_print_main_header();
-        // Reprint same header as initial launch
-        install_set_color(COLOR_CYAN);
-        gfx_printf("===================================\n");
-        gfx_printf("  OmniNX Installer Payload v%s\n", VERSION);
-        gfx_printf("===================================\n\n");
-        install_set_color(COLOR_WHITE);
     }
 }
 
@@ -619,9 +635,12 @@ int delete_path_list(const char* paths[], const char* description) {
     return (failed == 0) ? FR_OK : FR_DISK_ERR;
 }
 
-#define HEKATE_8GB_SRC  "sd:/bootloader/hekate_8gb.bin"
+#define HEKATE_8GB_SRC   "sd:/bootloader/hekate_8gb.bin"
-#define PAYLOAD_BIN_DST "sd:/payload.bin"
+#define PAYLOAD_BIN_DST  "sd:/payload.bin"
-#define UPDATE_BIN_DST  "sd:/bootloader/update.bin"
+#define UPDATE_BIN_DST   "sd:/bootloader/update.bin"
+#define RAM_CONFIG_PATH  "sd:/config/omninx/ram_config.ini"
+
+enum { RAM_READ_OK = 0, RAM_READ_NEED_MENU = 1 };
 
 static void unlink_ignore_err(const char *path)
 {
@@ -633,31 +652,217 @@ static void unlink_ignore_err(const char *path)
     f_unlink(path);
 }
 
-/* After pack copy: if >4 GiB fuse RAM, install 8GB Hekate to payload.bin + bootloader/update.bin; always remove hekate_8gb.bin when done or if not used. */
+static void ram_config_ensure_parent_dirs(void)
+{
+    f_mkdir("sd:/config");
+    f_mkdir("sd:/config/omninx");
+}
+
+static int ram_config_write(bool use_8gb)
+{
+    ram_config_ensure_parent_dirs();
+    FIL f;
+    if (f_open(&f, RAM_CONFIG_PATH, FA_WRITE | FA_CREATE_ALWAYS) != FR_OK)
+        return FR_DISK_ERR;
+
+    static const char sec[] = "[Ram]\n";
+    static const char line0[] = "8gb=0\n";
+    static const char line1[] = "8gb=1\n";
+    UINT bw;
+    f_write(&f, sec, sizeof(sec) - 1, &bw);
+    f_write(&f, use_8gb ? line1 : line0, sizeof(line0) - 1, &bw);
+    f_close(&f);
+    return FR_OK;
+}
+
+static void ram_config_free_sections(link_t *sections)
+{
+    LIST_FOREACH_ENTRY(ini_sec_t, sec, sections, link) {
+        LIST_FOREACH_ENTRY(ini_kv_t, kv, &sec->kvs, link) {
+            if (kv->key) free(kv->key);
+            if (kv->val) free(kv->val);
+        }
+        if (sec->name) free(sec->name);
+    }
+}
+
+/* Valid [Ram] 8gb=0|1 → silent; missing file or invalid → menu. */
+static int read_ram_config_silent(const char *path, bool *use_8gb)
+{
+    if (!install_path_exists(path))
+        return RAM_READ_NEED_MENU;
+
+    link_t sections;
+    list_init(&sections);
+
+    if (ini_parse(&sections, (char *)path, false) != 1) {
+        ram_config_free_sections(&sections);
+        return RAM_READ_NEED_MENU;
+    }
+
+    bool found = false;
+    bool eight = false;
+    LIST_FOREACH_ENTRY(ini_sec_t, sec, &sections, link) {
+        if (sec->name && !strcmp(sec->name, "Ram")) {
+            LIST_FOREACH_ENTRY(ini_kv_t, kv, &sec->kvs, link) {
+                if (kv->key && kv->val && !strcmp(kv->key, "8gb")) {
+                    if (!strcmp(kv->val, "0")) {
+                        found = true;
+                        eight = false;
+                    } else if (!strcmp(kv->val, "1")) {
+                        found = true;
+                        eight = true;
+                    }
+                    break;
+                }
+            }
+            break;
+        }
+    }
+
+    ram_config_free_sections(&sections);
+
+    if (!found)
+        return RAM_READ_NEED_MENU;
+    *use_8gb = eight;
+    return RAM_READ_OK;
+}
+
+/* Same navigation as main.c multi-variant menu; returns false if user aborts (payload/reboot). */
+static bool install_ram_config_menu(bool *use_8gb)
+{
+    jc_init_hw();
+    while (btn_read() & BTN_POWER)
+        msleep(50);
+
+    int selected = 0;
+    int prev_selected = 0;
+    bool confirmed = false;
+    const int n = 2;
+    const char *labels[2] = {
+        "4GB Konsole (Standard)",
+        "8GB Konsole",
+    };
+
+    gfx_clear_grey(0x1B);
+    gfx_con_setpos(0, 0);
+    install_print_main_header();
+
+    install_set_color(COLOR_YELLOW);
+    gfx_printf("Hekate Payload Auswahl:\n\n");
+    install_set_color(COLOR_WHITE);
+    gfx_printf("Wenn du einen 8GB RAM-Umbau hast, waehle 8GB Konsole aus.\n");
+    gfx_printf("Alle anderen waehlen 4GB Konsole aus.\n\n");
+    install_set_color(COLOR_RED);
+    gfx_printf("Warnung: Solltest du keinen RAM-Umbau haben, waehle auf keinen\n");
+    gfx_printf("Fall 8GB aus, da du sonst Boot Probleme bekommst!!!\n\n");
+    install_set_color(COLOR_WHITE);
+
+    u32 menu_x, menu_y;
+    gfx_con_getpos(&menu_x, &menu_y);
+    for (int i = 0; i < n; i++) {
+        if (i == selected) {
+            install_set_color(COLOR_GREEN);
+            gfx_printf("  > %s\n", labels[i]);
+            install_set_color(COLOR_WHITE);
+        } else {
+            gfx_printf("    %s\n", labels[i]);
+        }
+    }
+    gfx_printf("\n");
+    install_set_color(COLOR_CYAN);
+    gfx_printf("D-Pad / Vol+/-: Auswahl  |  A oder Power: Bestaetigen\n");
+    gfx_printf("Vol+ und Vol- gleichzeitig: Abbrechen (Hekate)\n");
+    install_set_color(COLOR_WHITE);
+
+    bool prev_up = false, prev_down = false;
+    bool menu_aborted = false;
+
+    while (!confirmed && !menu_aborted) {
+        if (selected != prev_selected) {
+            gfx_con_setpos(menu_x, menu_y + (u32)prev_selected * 16);
+            install_set_color(COLOR_WHITE);
+            gfx_printf("    %s\n", labels[prev_selected]);
+            gfx_con_setpos(menu_x, menu_y + (u32)selected * 16);
+            install_set_color(COLOR_GREEN);
+            gfx_printf("  > %s\n", labels[selected]);
+            install_set_color(COLOR_WHITE);
+            prev_selected = selected;
+        }
+
+        jc_gamepad_rpt_t *jc = joycon_poll();
+        u8 btn = btn_read();
+
+        if (jc && jc->cap)
+            take_screenshot();
+
+        if (cancel_combo_pressed(btn)) {
+            menu_aborted = true;
+            break;
+        }
+
+        bool cur_up = false, cur_down = false;
+        if (jc) {
+            cur_up = (jc->up != 0) && !jc->down;
+            cur_down = (jc->down != 0) && !jc->up;
+        }
+        if (btn & BTN_VOL_UP)
+            cur_up = true;
+        if (btn & BTN_VOL_DOWN)
+            cur_down = true;
+
+        if (cur_up && !prev_up)
+            selected = (selected - 1 + n) % n;
+        else if (cur_down && !prev_down)
+            selected = (selected + 1) % n;
+        else if (jc && jc->a)
+            confirmed = true;
+
+        prev_up = cur_up;
+        prev_down = cur_down;
+
+        if (btn & BTN_POWER)
+            confirmed = true;
+
+        msleep(50);
+    }
+
+    if (menu_aborted) {
+        gfx_printf("\n");
+        install_set_color(COLOR_YELLOW);
+        gfx_printf("Abgebrochen. Starte Hekate...\n");
+        install_set_color(COLOR_WHITE);
+        msleep(500);
+        installer_launch_hekate_payload();
+        return false;
+    }
+
+    *use_8gb = (selected == 1);
+    ram_config_write(*use_8gb);
+
+    gfx_clear_grey(0x1B);
+    gfx_con_setpos(0, 0);
+    install_print_main_header();
+    return true;
+}
+
+/* After pack copy: use ram_config.ini [Ram] 8gb=0|1 if present; else menu, write file, then apply. No fuse autodetect. */
 static void install_hekate_8gb_post_copy(void)
 {
     if (!install_path_exists(HEKATE_8GB_SRC))
         return;
 
-    int mib = dram_capacity_mib_from_fuse();
+    bool use_8gb;
-    if (mib > 4096) {
+    if (read_ram_config_silent(RAM_CONFIG_PATH, &use_8gb) != RAM_READ_OK) {
-        install_set_color(COLOR_CYAN);
+        if (!install_ram_config_menu(&use_8gb))
-        gfx_printf("\nMehr als 4 GB RAM erkannt (Fuse). Die 8-GB-Hekate-Variante wird verwendet.\n");
+            return;
-        gfx_printf("Kopiere nach payload.bin und bootloader/update.bin...\n");
+    }
-        install_set_color(COLOR_WHITE);
 
+    if (use_8gb) {
         int r1 = file_copy(HEKATE_8GB_SRC, PAYLOAD_BIN_DST);
         int r2 = file_copy(HEKATE_8GB_SRC, UPDATE_BIN_DST);
-        if (r1 == FR_OK && r2 == FR_OK) {
+        if (r1 == FR_OK && r2 == FR_OK)
-            install_set_color(COLOR_GREEN);
-            gfx_printf("  [OK] Hekate 8 GB installiert.\n");
-            install_set_color(COLOR_WHITE);
             unlink_ignore_err(HEKATE_8GB_SRC);
-        } else {
-            install_set_color(COLOR_ORANGE);
-            gfx_printf("  [WARN] Kopie fehlgeschlagen (payload: %d, update: %d). hekate_8gb.bin bleibt.\n", r1, r2);
-            install_set_color(COLOR_WHITE);
-        }
     } else {
         unlink_ignore_err(HEKATE_8GB_SRC);
     }
@@ -668,6 +873,21 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
     int res;
     
     if (mode == INSTALL_MODE_UPDATE) {
+        if (pack_variant == VARIANT_OC) {
+            bool had_horizon_cfg = install_path_exists(HORIZON_OC_CONFIG_PATH);
+            install_set_color(COLOR_YELLOW);
+            gfx_printf("HorizonOC: Sichere config.ini...\n");
+            install_set_color(COLOR_WHITE);
+            res = backup_horizon_oc_config_for_oc_update();
+            if (res != FR_OK)
+                return res;
+            if (had_horizon_cfg) {
+                install_set_color(COLOR_GREEN);
+                gfx_printf("  [OK] Bestehende config.ini gesichert.\n");
+                install_set_color(COLOR_WHITE);
+            }
+        }
+
         // Update mode: selective cleanup then install
         install_set_color(COLOR_YELLOW);
         gfx_printf("Schritt 1: Bereinigung...\n");
@@ -685,6 +905,26 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
 
         install_hekate_8gb_post_copy();
 
+        if (pack_variant == VARIANT_OC) {
+            bool had_horizon_bak = install_path_exists(HORIZON_OC_UPDATE_BACKUP_INI);
+            install_check_and_clear_screen_if_needed();
+            install_set_color(COLOR_YELLOW);
+            gfx_printf("HorizonOC: Stelle config.ini wieder her...\n");
+            install_set_color(COLOR_WHITE);
+            res = restore_horizon_oc_config_after_oc_update();
+            if (res != FR_OK)
+                return res;
+            install_set_color(COLOR_GREEN);
+            if (had_horizon_bak)
+                gfx_printf("  [OK] Deine HorizonOC-Einstellungen wurden wiederhergestellt.\n");
+            else
+                gfx_printf("  [OK] Keine fruehere config.ini — Standard aus dem Paket bleibt.\n");
+            install_set_color(COLOR_WHITE);
+            res = cleanup_horizon_oc_update_backup();
+            if (res != FR_OK)
+                return res;
+        }
+
         install_check_and_clear_screen_if_needed();
         // Remove staging directory (installed pack)
         res = cleanup_staging_directory(pack_variant);

source/install.h

@@ -13,6 +13,9 @@ typedef enum {
     INSTALL_MODE_CLEAN     // No OmniNX - selective deletion from clean list
 } install_mode_t;
 
+// If a sub-menu aborts to Hekate / update.bin (does not return if launch succeeds)
+void installer_launch_hekate_payload(void);
+
 // Main installation function
 int perform_installation(omninx_variant_t pack_variant, install_mode_t mode);
 

source/install_clean.c

@@ -102,6 +102,7 @@ int clean_mode_restore(void) {
         set_color(COLOR_GREEN);
         gfx_printf("  [OK] Wiederherstellung abgeschlossen\n");
         set_color(COLOR_WHITE);
+        delete_path_list(clean_post_restore_dirs_to_delete, "switch/ (nach Restore)");
     }
     cleanup_backup();
     return res;

source/main.c

@@ -116,6 +116,12 @@ static void print_header(void) {
     set_color(COLOR_WHITE);
 }
 
+/* Console Vol+ and Vol- together (exit / cancel where documented) */
+static inline bool cancel_combo_pressed(u8 btn)
+{
+    return (btn & (BTN_VOL_UP | BTN_VOL_DOWN)) == (BTN_VOL_UP | BTN_VOL_DOWN);
+}
+
 
 void reloc_patcher(u32 payload_dst, u32 payload_src, u32 payload_size) {
     memcpy((u8 *)payload_src, (u8 *)IPL_LOAD_ADDR, PATCHED_RELOC_SZ);
@@ -183,6 +189,12 @@ static int file_exists(const char *path) {
     return (f_stat(path, &fno) == FR_OK);
 }
 
+void installer_launch_hekate_payload(void) {
+    if (file_exists(PAYLOAD_PATH))
+        launch_payload(PAYLOAD_PATH);
+    power_set_state(POWER_OFF_REBOOT);
+}
+
 extern void pivot_stack(u32 stack_top);
 
 void ipl_main(void) {
@@ -244,11 +256,13 @@ void ipl_main(void) {
             set_color(COLOR_GREEN);
             gfx_printf("Druecke A-Taste (rechter Joy-Con) oder Power-Taste,\n");
             gfx_printf("um Hekate zu starten...\n");
+            gfx_printf("Oder Vol+ und Vol- (Konsole) gleichzeitig.\n");
             set_color(COLOR_WHITE);
         } else {
             set_color(COLOR_GREEN);
             gfx_printf("Druecke A-Taste (rechter Joy-Con) oder Power-Taste,\n");
             gfx_printf("um den Neustart zu starten...\n");
+            gfx_printf("Oder Vol+ und Vol- (Konsole) gleichzeitig.\n");
             set_color(COLOR_WHITE);
         }
         
@@ -275,7 +289,11 @@ void ipl_main(void) {
                     break;
                 }
             }
-            
+            if (cancel_combo_pressed(btn_state)) {
+                button_pressed = true;
+                break;
+            }
+
             msleep(50); // Small delay to avoid busy-waiting
         }
         
@@ -329,12 +347,14 @@ void ipl_main(void) {
         gfx_printf("\n");
         set_color(COLOR_CYAN);
         gfx_printf("D-Pad / Vol+/-: Auswahl  |  A oder Power: Bestaetigen\n");
+        gfx_printf("Vol+ und Vol- gleichzeitig: Abbrechen (Hekate)\n");
         set_color(COLOR_WHITE);
         
         // Edge detection: only move on press (not while held)
         bool prev_up = false, prev_down = false;
+        bool menu_aborted = false;
         
-        while (!confirmed) {
+        while (!confirmed && !menu_aborted) {
             // On selection change: redraw only the two affected lines (no full clear)
             if (selected != prev_selected) {
                 gfx_con_setpos(menu_x, menu_variant_start_y + (u32)prev_selected * 16);
@@ -352,6 +372,11 @@ void ipl_main(void) {
             
             if (jc && jc->cap)
                 take_screenshot();
+
+            if (cancel_combo_pressed(btn)) {
+                menu_aborted = true;
+                break;
+            }
             
             // D-pad or Vol+ / Vol- for selection (Vol+ = up, Vol- = down)
             bool cur_up = false, cur_down = false;
@@ -377,6 +402,20 @@ void ipl_main(void) {
             
             msleep(50);
         }
+
+        if (menu_aborted) {
+            gfx_printf("\n");
+            set_color(COLOR_YELLOW);
+            gfx_printf("Abgebrochen. Starte Hekate...\n");
+            set_color(COLOR_WHITE);
+            msleep(500);
+            if (file_exists(PAYLOAD_PATH)) {
+                launch_payload(PAYLOAD_PATH);
+            } else {
+                power_set_state(POWER_OFF_REBOOT);
+            }
+            return;
+        }
         
         pack_variant = variants_present[selected];
         gfx_clear_grey(0x1B);
@@ -403,20 +442,21 @@ void ipl_main(void) {
         gfx_printf("mit angeschlossenem Ladegeraet durchgefuehrt werden.\n\n");
         set_color(COLOR_YELLOW);
         gfx_printf("Stecke das Ladegeraet an und warte...\n");
-        gfx_printf("Oder druecke + und - zum Abbrechen.\n");
+        gfx_printf("Oder Vol+ und Vol- (Konsole) zum Abbrechen.\n");
         set_color(COLOR_WHITE);
         jc_init_hw();
         while (btn_read() & BTN_POWER) { msleep(50); }
         bool user_cancelled = false;
         while (batt_pct < BATT_LOW_THRESHOLD && !bq24193_charger_connected() && !user_cancelled) {
+            u8 pbtn = btn_read();
             jc_gamepad_rpt_t *jc = joycon_poll();
             if (jc) {
                 if (jc->cap)
                     take_screenshot();
-                if (jc->plus && jc->minus) {
+            }
-                    user_cancelled = true;
+            if (cancel_combo_pressed(pbtn)) {
-                    break;
+                user_cancelled = true;
-                }
+                break;
             }
             if (max17050_get_property(MAX17050_RepSOC, &batt_raw) == 0) {
                 batt_pct = batt_raw >> 8;
@@ -473,10 +513,13 @@ void ipl_main(void) {
         gfx_printf("Empfohlene Karten: Samsung EVO Plus, EVO Select und PRO Plus.\n\n");
         set_color(COLOR_GREEN);
         gfx_printf("Druecke A (oder Power), um trotzdem fortzufahren.\n");
+        set_color(COLOR_CYAN);
+        gfx_printf("Vol+ und Vol- (Konsole) gleichzeitig: Abbrechen -> Hekate.\n");
         set_color(COLOR_WHITE);
         while (btn_read() & BTN_POWER) { msleep(50); }
         bool acknowledged = false;
-        while (!acknowledged) {
+        bool uhs_aborted = false;
+        while (!acknowledged && !uhs_aborted) {
             u8 btn_state = btn_read();
             if (btn_state & BTN_POWER) acknowledged = true;
             jc_gamepad_rpt_t *jc = joycon_poll();
@@ -485,8 +528,22 @@ void ipl_main(void) {
                     take_screenshot();
                 if (jc->a) acknowledged = true;
             }
+            if (cancel_combo_pressed(btn_state)) {
+                uhs_aborted = true;
+                break;
+            }
             msleep(50);
         }
+        if (uhs_aborted) {
+            gfx_printf("\nAbgebrochen. Starte Hekate...\n");
+            msleep(500);
+            if (file_exists(PAYLOAD_PATH)) {
+                launch_payload(PAYLOAD_PATH);
+            } else {
+                power_set_state(POWER_OFF_REBOOT);
+            }
+            return;
+        }
         // Wait for A and Power to be released so the same press doesn't start the install
         while (btn_read() & BTN_POWER) { msleep(50); }
         bool released = false;
@@ -526,7 +583,7 @@ void ipl_main(void) {
     gfx_printf("um die Installation zu starten...\n");
     set_color(COLOR_WHITE);
     set_color(COLOR_CYAN);
-    gfx_printf("Druecke + und - gleichzeitig zum Abbrechen (zurueck zu Hekate).\n");
+    gfx_printf("Vol+ und Vol- (Konsole) gleichzeitig: Abbrechen -> Hekate.\n");
     set_color(COLOR_WHITE);
     
     // Wait for A/Power to start, or +/- to cancel
@@ -555,11 +612,10 @@ void ipl_main(void) {
                 button_pressed = true;
                 break;
             }
-            // + and - simultaneously = cancel, return to hekate
+        }
-            if (jc->plus && jc->minus) {
+        if (cancel_combo_pressed(btn_state)) {
-                cancelled = true;
+            cancelled = true;
-                break;
+            break;
-            }
         }
         
         msleep(50); // Small delay to avoid busy-waiting