Input: console Vol+/- combo only before install; Joy-Con +/- exit removed

- cancel_combo_pressed uses only hardware volume buttons - After installation summary and payload-missing screen: A or Power only Made-with: Cursor
Install: Hekate 8GB after copy (fuse >4GiB), dram_fuse helper, RAM test target
2026-03-31 13:18:06 +02:00 · 2026-03-31 00:05:30 +02:00 · 2026-03-30 20:27:39 +02:00 · 2026-03-30 17:49:52 +02:00 · 2026-03-06 23:46:40 +01:00 · 2026-03-06 22:10:32 +01:00
16 changed files with 1244 additions and 649 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,32 @@
+name: Build
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    container: devkitpro/devkitarm:latest
+
+    steps:
+      - name: Install dependencies
+        run: apt-get update && apt-get install -y nodejs
+
+      - name: Checkout latest code
+        uses: actions/checkout@v5
+        with:
+          clean: true
+
+      - name: Build
+        run: |
+          export DEVKITPRO=/opt/devkitpro
+          export DEVKITARM=/opt/devkitpro/devkitARM
+          make -j4
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: OmniNX-Installer.bin
+          path: output/OmniNX-Installer.bin
--- a/199
+++ b/199
@@ -1,90 +1,109 @@
-rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
-
-ifeq ($(strip $(DEVKITARM)),)
-$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
-endif
-
-include $(DEVKITARM)/base_rules
-
-################################################################################
-
-IPL_LOAD_ADDR := 0x40008000
-VERSION := $(shell cat VERSION)
-
-################################################################################
-
-TARGET := omninx-installer
-OUTPUT_NAME := OmniNX-Installer.bin
-BUILDDIR := build
-OUTPUTDIR := output
-SOURCEDIR := source
-BDKDIR := bdk
-BDKINC := -I./$(BDKDIR)
-VPATH = $(dir ./$(SOURCEDIR)/) $(dir $(wildcard ./$(SOURCEDIR)/*/)) $(dir $(wildcard ./$(SOURCEDIR)/*/*/))
-VPATH += $(dir $(wildcard ./$(BDKDIR)/)) $(dir $(wildcard ./$(BDKDIR)/*/)) $(dir $(wildcard ./$(BDKDIR)/*/*/))
-
-# All source files
-OBJS = $(patsubst $(SOURCEDIR)/%.S, $(BUILDDIR)/$(TARGET)/%.o, \
-		$(patsubst $(SOURCEDIR)/%.c, $(BUILDDIR)/$(TARGET)/%.o, \
-		$(call rwildcard, $(SOURCEDIR), *.S *.c)))
-OBJS += $(patsubst $(BDKDIR)/%.S, $(BUILDDIR)/$(TARGET)/%.o, \
-		$(patsubst $(BDKDIR)/%.c, $(BUILDDIR)/$(TARGET)/%.o, \
-		$(call rwildcard, $(BDKDIR), *.S *.c)))
-
-GFX_INC   := '"../$(SOURCEDIR)/gfx.h"'
-FFCFG_INC := '"../$(SOURCEDIR)/libs/fatfs/ffconf.h"'
-
-################################################################################
-
-CUSTOMDEFINES := -DIPL_LOAD_ADDR=$(IPL_LOAD_ADDR)
-CUSTOMDEFINES += -DGFX_INC=$(GFX_INC) -DFFCFG_INC=$(FFCFG_INC)
-CUSTOMDEFINES += -DVERSION='"$(VERSION)"'
-
-ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
-CFLAGS = $(ARCH) -Os -nostdlib -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-inline -std=gnu11 -Wall -Wno-missing-braces $(CUSTOMDEFINES)
-LDFLAGS = $(ARCH) -nostartfiles -lgcc -Wl,--nmagic,--gc-sections -Xlinker --defsym=IPL_LOAD_ADDR=$(IPL_LOAD_ADDR)
-
-################################################################################
-
-.PHONY: all clean release
-
-all: $(OUTPUTDIR)/$(OUTPUT_NAME)
-	$(eval BIN_SIZE = $(shell wc -c < $(OUTPUTDIR)/$(OUTPUT_NAME)))
-	@echo "Payload size is $(BIN_SIZE) bytes"
-	@echo "Max size is 126296 bytes."
-
-clean:
-	@rm -rf $(BUILDDIR)
-	@rm -rf $(OUTPUTDIR)
-	@rm -rf release
-	@rm -f $(TARGET)-*.zip
-
-$(OUTPUTDIR)/$(OUTPUT_NAME): $(BUILDDIR)/$(TARGET)/$(TARGET).elf
-	@mkdir -p "$(@D)"
-	$(OBJCOPY) -S -O binary $< $(OUTPUTDIR)/$(TARGET).bin
-	@mv $(OUTPUTDIR)/$(TARGET).bin $(OUTPUTDIR)/$(OUTPUT_NAME)
-
-$(BUILDDIR)/$(TARGET)/$(TARGET).elf: $(OBJS)
-	$(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@
-
-$(BUILDDIR)/$(TARGET)/%.o: $(SOURCEDIR)/%.c
-	@mkdir -p "$(@D)"
-	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
-
-$(BUILDDIR)/$(TARGET)/%.o: $(SOURCEDIR)/%.S
-	@mkdir -p "$(@D)"
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BUILDDIR)/$(TARGET)/%.o: $(BDKDIR)/%.c
-	@mkdir -p "$(@D)"
-	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
-
-$(BUILDDIR)/$(TARGET)/%.o: $(BDKDIR)/%.S
-	@mkdir -p "$(@D)"
-	$(CC) $(CFLAGS) -c $< -o $@
-
-release: $(OUTPUTDIR)/$(OUTPUT_NAME)
-	@mkdir -p release/bootloader/payloads
-	@cp $(OUTPUTDIR)/$(OUTPUT_NAME) release/bootloader/payloads/$(OUTPUT_NAME)
-	@cd release && zip -r ../$(TARGET)-$(VERSION).zip bootloader
-	@echo "Release package created: $(TARGET)-$(VERSION).zip"
+rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
+
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+endif
+
+include $(DEVKITARM)/base_rules
+
+################################################################################
+
+IPL_LOAD_ADDR := 0x40008000
+VERSION := $(shell cat VERSION)
+
+################################################################################
+
+TARGET := omninx-installer
+OUTPUT_NAME := OmniNX-Installer.bin
+BUILDDIR := build
+OUTPUTDIR := output
+SOURCEDIR := source
+BDKDIR := bdk
+BDKINC := -I./$(BDKDIR)
+VPATH = $(dir ./$(SOURCEDIR)/) $(dir $(wildcard ./$(SOURCEDIR)/*/)) $(dir $(wildcard ./$(SOURCEDIR)/*/*/))
+VPATH += $(dir $(wildcard ./$(BDKDIR)/)) $(dir $(wildcard ./$(BDKDIR)/*/)) $(dir $(wildcard ./$(BDKDIR)/*/*/))
+
+# All source files
+OBJS = $(patsubst $(SOURCEDIR)/%.S, $(BUILDDIR)/$(TARGET)/%.o, \
+		$(patsubst $(SOURCEDIR)/%.c, $(BUILDDIR)/$(TARGET)/%.o, \
+		$(call rwildcard, $(SOURCEDIR), *.S *.c)))
+OBJS += $(patsubst $(BDKDIR)/%.S, $(BUILDDIR)/$(TARGET)/%.o, \
+		$(patsubst $(BDKDIR)/%.c, $(BUILDDIR)/$(TARGET)/%.o, \
+		$(call rwildcard, $(BDKDIR), *.S *.c)))
+
+GFX_INC   := '"../$(SOURCEDIR)/gfx.h"'
+FFCFG_INC := '"../$(SOURCEDIR)/libs/fatfs/ffconf.h"'
+
+################################################################################
+
+CUSTOMDEFINES := -DIPL_LOAD_ADDR=$(IPL_LOAD_ADDR)
+CUSTOMDEFINES += -DGFX_INC=$(GFX_INC) -DFFCFG_INC=$(FFCFG_INC)
+CUSTOMDEFINES += -DVERSION='"$(VERSION)"'
+
+ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
+CFLAGS = $(ARCH) -Os -nostdlib -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-inline -std=gnu11 -Wall -Wno-missing-braces $(CUSTOMDEFINES)
+LDFLAGS = $(ARCH) -nostartfiles -lgcc -Wl,--nmagic,--gc-sections -Xlinker --defsym=IPL_LOAD_ADDR=$(IPL_LOAD_ADDR)
+
+################################################################################
+
+RAMTEST_BIN := $(OUTPUTDIR)/RAM-Test.bin
+OBJS_RAMTEST := $(filter-out $(BUILDDIR)/$(TARGET)/main.o,$(OBJS)) \
+	$(BUILDDIR)/$(TARGET)/ram_test_main.o
+
+.PHONY: all clean release ram-test
+
+all: $(OUTPUTDIR)/$(OUTPUT_NAME)
+	$(eval BIN_SIZE = $(shell wc -c < $(OUTPUTDIR)/$(OUTPUT_NAME)))
+	@echo "Payload size is $(BIN_SIZE) bytes"
+	@echo "Max size is 126296 bytes."
+
+clean:
+	@rm -rf $(BUILDDIR)
+	@rm -rf $(OUTPUTDIR)
+	@rm -f $(RAMTEST_BIN)
+	@rm -rf release
+	@rm -f $(TARGET)-*.zip
+
+$(OUTPUTDIR)/$(OUTPUT_NAME): $(BUILDDIR)/$(TARGET)/$(TARGET).elf
+	@mkdir -p "$(@D)"
+	$(OBJCOPY) -S -O binary $< $(OUTPUTDIR)/$(TARGET).bin
+	@mv $(OUTPUTDIR)/$(TARGET).bin $(OUTPUTDIR)/$(OUTPUT_NAME)
+
+$(BUILDDIR)/$(TARGET)/$(TARGET).elf: $(OBJS)
+	$(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@
+
+$(BUILDDIR)/$(TARGET)/ram_test_main.o: tools/ram_test_main.c
+	@mkdir -p "$(@D)"
+	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
+
+$(BUILDDIR)/$(TARGET)/ram_test.elf: $(OBJS_RAMTEST)
+	$(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@
+
+$(RAMTEST_BIN): $(BUILDDIR)/$(TARGET)/ram_test.elf
+	@mkdir -p "$(@D)"
+	$(OBJCOPY) -S -O binary $< $@
+	@echo "RAM-Test payload: $(RAMTEST_BIN) ($$(wc -c < $@) bytes)"
+
+ram-test: $(RAMTEST_BIN)
+
+$(BUILDDIR)/$(TARGET)/%.o: $(SOURCEDIR)/%.c
+	@mkdir -p "$(@D)"
+	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
+
+$(BUILDDIR)/$(TARGET)/%.o: $(SOURCEDIR)/%.S
+	@mkdir -p "$(@D)"
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(BUILDDIR)/$(TARGET)/%.o: $(BDKDIR)/%.c
+	@mkdir -p "$(@D)"
+	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
+
+$(BUILDDIR)/$(TARGET)/%.o: $(BDKDIR)/%.S
+	@mkdir -p "$(@D)"
+	$(CC) $(CFLAGS) -c $< -o $@
+
+release: $(OUTPUTDIR)/$(OUTPUT_NAME)
+	@mkdir -p release/bootloader/payloads
+	@cp $(OUTPUTDIR)/$(OUTPUT_NAME) release/bootloader/payloads/$(OUTPUT_NAME)
+	@cd release && zip -r ../$(TARGET)-$(VERSION).zip bootloader
+	@echo "Release package created: $(TARGET)-$(VERSION).zip"
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # OmniNX Installer Payload

+> **To properly use this payload, download the latest OmniNX Release:** [https://git.niklascfw.de/OmniNX/OmniNX/releases](https://git.niklascfw.de/OmniNX/OmniNX/releases)
+
 A minimal payload for installing OmniNX CFW Pack files on Nintendo Switch outside of Horizon OS.

 Based on [TegraExplorer](https://github.com/shchmue/TegraExplorer) and [hekate](https://github.com/CTCaer/hekate) by CTCaer, naehrwert, and shchmue.  
@@ -52,7 +54,11 @@ make clean
 make
 ```

-The built payload will be output to `output/omninx-installer.bin`.
+The built payload will be output to `output/OmniNX-Installer.bin`.
+
+### CI / GitHub Actions
+
+Every push triggers a build. The `.bin` file is produced and attached as a workflow artifact (Actions tab → select run → Artifacts).

 ## Usage

@@ -111,11 +117,11 @@ Use hekate or another bootloader to launch the payload:

 The payload supports three OmniNX variants:

- **Standard** (`1.0.0s`): Full CFW pack
- **Light** (`1.0.0l`): Lightweight CFW pack
- **OC** (`1.0.0oc`): Overclock-enabled CFW pack (includes SaltySD)
+- **Standard** – `sd:/OmniNX Standard/`
+- **Light** – `sd:/OmniNX Light/`
+- **OC** – `sd:/OmniNX OC/`

-The payload automatically detects which variant is present on the SD card and installs accordingly.
+The payload detects the pack variant from the staging directory presence and detects the current installation (variant + version) from `sd:/config/omninx/manifest.ini` (`current_pack` and `version` keys).

 ## Project Structure

--- a/bdk/power/bq24193.c
+++ b/bdk/power/bq24193.c
@@ -164,6 +164,12 @@ void bq24193_enable_charger()
 	i2c_send_byte(I2C_1, BQ24193_I2C_ADDR, BQ24193_PORConfig, reg);
 }

+bool bq24193_charger_connected()
+{
+	u8 status = bq24193_get_reg(BQ24193_Status);
+	return (status & BQ24193_STATUS_PG_MASK) != 0;
+}
+
 void bq24193_fake_battery_removal()
 {
 	// Disable watchdog to keep BATFET disabled.
--- a/bdk/power/bq24193.h
+++ b/bdk/power/bq24193.h
@@ -19,6 +19,8 @@
 #ifndef __BQ24193_H_
 #define __BQ24193_H_

+#include <utils/types.h>
+
 #define BQ24193_I2C_ADDR 0x6B

 // REG 0 masks.
@@ -117,5 +119,6 @@ enum BQ24193_reg_prop {
 int bq24193_get_property(enum BQ24193_reg_prop prop, int *value);
 void bq24193_enable_charger();
 void bq24193_fake_battery_removal();
+bool bq24193_charger_connected();

 #endif /* __BQ24193_H_ */
--- a/source/deletion_lists_update.h
+++ b/source/deletion_lists_update.h
@@ -1,281 +1,280 @@
-/*
- * OmniNX Installer - Deletion Lists for Update Mode
- * Selective deletion when OmniNX is already installed.
- */
-
-#pragma once
-
-// Atmosphere subdirectories to delete
-static const char* atmosphere_dirs_to_delete[] = {
-    "sd:/atmosphere/config",
-    "sd:/atmosphere/crash_reports",
-    "sd:/atmosphere/erpt_reports",
-    "sd:/atmosphere/exefs_patches/CrunchPatch",
-    "sd:/atmosphere/exefs_patches/Crunchyroll Patch 1.10.0",
-    "sd:/atmosphere/exefs_patches/bluetooth_patches",
-    "sd:/atmosphere/exefs_patches/bootlogo",
-    "sd:/atmosphere/exefs_patches/btm_patches",
-    "sd:/atmosphere/exefs_patches/es_patches",
-    "sd:/atmosphere/exefs_patches/hid_patches",
-    "sd:/atmosphere/exefs_patches/logo1",
-    "sd:/atmosphere/exefs_patches/nfim_ctest",
-    "sd:/atmosphere/exefs_patches/nim_ctest",
-    "sd:/atmosphere/exefs_patches/nvnflinger_cmu",
-    "sd:/atmosphere/extrazz",
-    "sd:/atmosphere/fatal_errors",
-    "sd:/atmosphere/fatal_reports",
-    "sd:/atmosphere/flags",
-    "sd:/atmosphere/hbl_html",
-    "sd:/atmosphere/hosts",
-    "sd:/atmosphere/kips",
-    "sd:/atmosphere/kip1",
-    "sd:/atmosphere/kip_patches",
-    "sd:/atmosphere/logs",
-    NULL
-};
-
-// Atmosphere contents directories (title IDs; only under atmosphere/contents/)
-static const char* atmosphere_contents_dirs_to_delete[] = {
-    "sd:/atmosphere/contents/0000000000534C56",
-    "sd:/atmosphere/contents/00FF0000B378D640",
-    "sd:/atmosphere/contents/00FF0000636C6BFF",
-    "sd:/atmosphere/contents/00FF0000A53BB665",
-    "sd:/atmosphere/contents/0100000000000008",
-    "sd:/atmosphere/contents/010000000000000D",
-    "sd:/atmosphere/contents/010000000000002B",
-    "sd:/atmosphere/contents/0100000000000032",
-    "sd:/atmosphere/contents/0100000000000034",
-    "sd:/atmosphere/contents/0100000000000036",
-    "sd:/atmosphere/contents/0100000000000037",
-    "sd:/atmosphere/contents/010000000000003C",
-    "sd:/atmosphere/contents/0100000000000042",
-    "sd:/atmosphere/contents/0100000000000895",
-    "sd:/atmosphere/contents/0100000000000F12",
-    "sd:/atmosphere/contents/0100000000001000",
-    "sd:/atmosphere/contents/0100000000001007",
-    "sd:/atmosphere/contents/0100000000001013",
-    "sd:/atmosphere/contents/010000000000DA7A",
-    "sd:/atmosphere/contents/010000000000bd00",
-    "sd:/atmosphere/contents/01006a800016e000",
-    "sd:/atmosphere/contents/01009D901BC56000",
-    "sd:/atmosphere/contents/0100A3900C3E2000",
-    "sd:/atmosphere/contents/0100F43008C44000",
-    "sd:/atmosphere/contents/050000BADDAD0000",
-    "sd:/atmosphere/contents/4200000000000000",
-    "sd:/atmosphere/contents/420000000000000B",
-    "sd:/atmosphere/contents/420000000000000E",
-    "sd:/atmosphere/contents/4200000000000010",
-    "sd:/atmosphere/contents/4200000000000FFF",
-    "sd:/atmosphere/contents/420000000007E51A",
-    "sd:/atmosphere/contents/420000000007E51B",
-    "sd:/atmosphere/contents/690000000000000D",
-    NULL
-};
-
-// Atmosphere files to delete
-static const char* atmosphere_files_to_delete[] = {
-    "sd:/atmosphere/config/exosphere.ini",
-    "sd:/atmosphere/config/stratosphere.ini",
-    "sd:/atmosphere/hbl.nsp",
-    "sd:/atmosphere/package3",
-    "sd:/atmosphere/reboot_payload.bin",
-    "sd:/atmosphere/stratosphere.romfs",
-    NULL
-};
-
-// Bootloader directories to delete
-static const char* bootloader_dirs_to_delete[] = {
-    "sd:/bootloader/boot",
-    "sd:/bootloader/bootlogo",
-    "sd:/bootloader/ini2",
-    "sd:/bootloader/payloads",
-    "sd:/bootloader/reboot",
-    "sd:/bootloader/res",
-    "sd:/bootloader/sys",
-    NULL
-};
-
-// Bootloader files to delete
-static const char* bootloader_files_to_delete[] = {
-    "sd:/bootloader/ArgonNX.bin",
-    "sd:/bootloader/bootlogo.bmp",
-    "sd:/bootloader/hekate_ipl.ini",
-    "sd:/bootloader/nyx.ini",
-    "sd:/bootloader/patches.ini",
-    "sd:/bootloader/update.bin",
-    "sd:/bootloader/ini/EmuMMC ohne Mods.ini",
-    NULL
-};
-
-// Config directories to delete
-static const char* config_dirs_to_delete[] = {
-    "sd:/config/aio-switch-updater",
-    "sd:/config/blue_pack_updater",
-    "sd:/config/kefir-updater",
-    "sd:/config/nx-hbmenu",
-    "sd:/config/quickntp",
-    "sd:/config/sys-con",
-    "sd:/config/sys-patch",
-    "sd:/config/uberhand",
-    "sd:/config/ultrahand",
-    NULL
-};
-
-// Switch directories to delete
-static const char* switch_dirs_to_delete[] = {
-    "sd:/switch/.overlays",
-    "sd:/switch/.packages",
-    "sd:/switch/90DNS_tester",
-    "sd:/switch/aio-switch-updater",
-    "sd:/switch/amsPLUS-downloader",
-    "sd:/switch/appstore",
-    "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* 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* 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* 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* 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
-};
+/*
+ * OmniNX Installer - Deletion Lists for Update Mode
+ * Selective deletion when OmniNX is already installed.
+ */
+
+#pragma once
+
+// Atmosphere subdirectories to delete
+static const char* atmosphere_dirs_to_delete[] = {
+    "sd:/atmosphere/config",
+    "sd:/atmosphere/crash_reports",
+    "sd:/atmosphere/erpt_reports",
+    "sd:/atmosphere/exefs_patches/CrunchPatch",
+    "sd:/atmosphere/exefs_patches/Crunchyroll Patch 1.10.0",
+    "sd:/atmosphere/exefs_patches/bluetooth_patches",
+    "sd:/atmosphere/exefs_patches/bootlogo",
+    "sd:/atmosphere/exefs_patches/btm_patches",
+    "sd:/atmosphere/exefs_patches/es_patches",
+    "sd:/atmosphere/exefs_patches/hid_patches",
+    "sd:/atmosphere/exefs_patches/logo1",
+    "sd:/atmosphere/exefs_patches/nfim_ctest",
+    "sd:/atmosphere/exefs_patches/nim_ctest",
+    "sd:/atmosphere/exefs_patches/nvnflinger_cmu",
+    "sd:/atmosphere/extrazz",
+    "sd:/atmosphere/fatal_errors",
+    "sd:/atmosphere/fatal_reports",
+    "sd:/atmosphere/flags",
+    "sd:/atmosphere/hbl_html",
+    "sd:/atmosphere/hosts",
+    "sd:/atmosphere/kips",
+    "sd:/atmosphere/kip1",
+    "sd:/atmosphere/kip_patches",
+    "sd:/atmosphere/logs",
+    NULL
+};
+
+// Atmosphere contents directories (title IDs; only under atmosphere/contents/)
+static const char* atmosphere_contents_dirs_to_delete[] = {
+    "sd:/atmosphere/contents/0000000000534C56",
+    "sd:/atmosphere/contents/00FF0000B378D640",
+    "sd:/atmosphere/contents/00FF0000636C6BFF",
+    "sd:/atmosphere/contents/00FF0000A53BB665",
+    "sd:/atmosphere/contents/0100000000000008",
+    "sd:/atmosphere/contents/010000000000000D",
+    "sd:/atmosphere/contents/010000000000002B",
+    "sd:/atmosphere/contents/0100000000000032",
+    "sd:/atmosphere/contents/0100000000000034",
+    "sd:/atmosphere/contents/0100000000000036",
+    "sd:/atmosphere/contents/0100000000000037",
+    "sd:/atmosphere/contents/010000000000003C",
+    "sd:/atmosphere/contents/0100000000000042",
+    "sd:/atmosphere/contents/0100000000000895",
+    "sd:/atmosphere/contents/0100000000000F12",
+    "sd:/atmosphere/contents/0100000000001000",
+    "sd:/atmosphere/contents/0100000000001007",
+    "sd:/atmosphere/contents/0100000000001013",
+    "sd:/atmosphere/contents/010000000000DA7A",
+    "sd:/atmosphere/contents/010000000000bd00",
+    "sd:/atmosphere/contents/01006a800016e000",
+    "sd:/atmosphere/contents/01009D901BC56000",
+    "sd:/atmosphere/contents/0100A3900C3E2000",
+    "sd:/atmosphere/contents/0100F43008C44000",
+    "sd:/atmosphere/contents/050000BADDAD0000",
+    "sd:/atmosphere/contents/4200000000000000",
+    "sd:/atmosphere/contents/420000000000000B",
+    "sd:/atmosphere/contents/420000000000000E",
+    "sd:/atmosphere/contents/4200000000000010",
+    "sd:/atmosphere/contents/4200000000000FFF",
+    "sd:/atmosphere/contents/420000000007E51A",
+    "sd:/atmosphere/contents/420000000007E51B",
+    "sd:/atmosphere/contents/690000000000000D",
+    NULL
+};
+
+// Atmosphere files to delete
+static const char* atmosphere_files_to_delete[] = {
+    "sd:/atmosphere/config/exosphere.ini",
+    "sd:/atmosphere/config/stratosphere.ini",
+    "sd:/atmosphere/hbl.nsp",
+    "sd:/atmosphere/package3",
+    "sd:/atmosphere/reboot_payload.bin",
+    "sd:/atmosphere/stratosphere.romfs",
+    NULL
+};
+
+// Bootloader directories to delete
+static const char* bootloader_dirs_to_delete[] = {
+    "sd:/bootloader/boot",
+    "sd:/bootloader/bootlogo",
+    "sd:/bootloader/ini2",
+    "sd:/bootloader/payloads",
+    "sd:/bootloader/reboot",
+    "sd:/bootloader/res",
+    "sd:/bootloader/sys",
+    NULL
+};
+
+// Bootloader files to delete
+static const char* bootloader_files_to_delete[] = {
+    "sd:/bootloader/ArgonNX.bin",
+    "sd:/bootloader/bootlogo.bmp",
+    "sd:/bootloader/hekate_ipl.ini",
+    "sd:/bootloader/nyx.ini",
+    "sd:/bootloader/patches.ini",
+    "sd:/bootloader/update.bin",
+    "sd:/bootloader/ini/EmuMMC ohne Mods.ini",
+    NULL
+};
+
+// Config directories to delete
+static const char* config_dirs_to_delete[] = {
+    "sd:/config/aio-switch-updater",
+    "sd:/config/blue_pack_updater",
+    "sd:/config/kefir-updater",
+    "sd:/config/nx-hbmenu",
+    "sd:/config/quickntp",
+    "sd:/config/sys-con",
+    "sd:/config/sys-patch",
+    "sd:/config/uberhand",
+    "sd:/config/ultrahand",
+    NULL
+};
+
+// Switch directories to delete
+static const char* switch_dirs_to_delete[] = {
+    "sd:/switch/.packages",
+    "sd:/switch/.overlays",
+    "sd:/switch/90DNS_tester",
+    "sd:/switch/aio-switch-updater",
+    "sd:/switch/amsPLUS-downloader",
+    "sd:/switch/appstore",
+    "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/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* 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/swr-ini-tool/swr-ini-tool.nro",
+    "sd:/switch/SwitchIdent.nro",
+    "sd:/switch/Switch_themes_Installer/NXThemesInstaller.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* 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* 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* 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
+};
--- a/source/dram_fuse.c
+++ b/source/dram_fuse.c
@@ -0,0 +1,46 @@
+/*
+ * DRAM capacity from fuse (SKU), not physical probe.
+ */
+
+#include "dram_fuse.h"
+#include <soc/fuse.h>
+#include <soc/hw_init.h>
+#include <soc/t210.h>
+
+static int mariko_dram_mib(u32 dram_id)
+{
+	switch (dram_id) {
+	case 9:
+	case 13:
+	case 18:
+	case 21:
+	case 23:
+	case 28:
+		return 8192;
+	default:
+		if (dram_id >= 3 && dram_id <= 28)
+			return 4096;
+		return -1;
+	}
+}
+
+static int erista_dram_mib(u32 dram_id)
+{
+	if (dram_id == 4)
+		return 6144;
+	if (dram_id <= 6)
+		return 4096;
+	return -1;
+}
+
+int dram_capacity_mib_from_fuse(void)
+{
+	u32 nid = fuse_read_dramid(false);
+	u32 chip = hw_get_chip_id();
+
+	if (chip == GP_HIDREV_MAJOR_T210)
+		return erista_dram_mib(nid);
+	if (chip == GP_HIDREV_MAJOR_T210B01)
+		return mariko_dram_mib(nid);
+	return -1;
+}
--- a/source/dram_fuse.h
+++ b/source/dram_fuse.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <utils/types.h>
+
+/* DRAM capacity in MiB from fuse DRAM ID + SoC (same table as RAM test payload). */
+int dram_capacity_mib_from_fuse(void);
--- a/source/install.c
+++ b/source/install.c
@@ -3,6 +3,7 @@
 */

 #include "install.h"
+#include "dram_fuse.h"
 #include "fs.h"
 #include "version.h"
 #include "gfx.h"
@@ -113,6 +114,38 @@ void install_combine_path(char *result, size_t size, const char *base, const cha
    }
 }

+/* Copy every regular file at staging root to dst_root; subdirs and volume labels skipped. */
+int install_copy_staging_root_files(const char *staging, const char *dst_root) {
+    DIR dir;
+    FILINFO fno;
+    char src_full[256];
+    char dst_full[256];
+    int res = f_opendir(&dir, staging);
+    if (res != FR_OK)
+        return res;
+
+    while (1) {
+        res = f_readdir(&dir, &fno);
+        if (res != FR_OK || fno.fname[0] == 0)
+            break;
+        if (fno.fname[0] == '.' && (fno.fname[1] == '\0' || (fno.fname[1] == '.' && fno.fname[2] == '\0')))
+            continue;
+        if (fno.fattrib & (AM_DIR | AM_VOL))
+            continue;
+
+        install_combine_path(src_full, sizeof(src_full), staging, fno.fname);
+        install_combine_path(dst_full, sizeof(dst_full), dst_root, fno.fname);
+        res = file_copy(src_full, dst_full);
+        if (res != FR_OK) {
+            f_closedir(&dir);
+            return res;
+        }
+    }
+
+    f_closedir(&dir);
+    return FR_OK;
+}
+
 // Recursive folder copy with progress tracking
 static int folder_copy_progress_recursive(const char *src, const char *dst, int *copied, int total, u32 start_x, u32 start_y, const char *display_name, int *last_percent) {
    DIR dir;
@@ -586,6 +619,50 @@ 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 PAYLOAD_BIN_DST "sd:/payload.bin"
+#define UPDATE_BIN_DST  "sd:/bootloader/update.bin"
+
+static void unlink_ignore_err(const char *path)
+{
+    FILINFO fno;
+    if (f_stat(path, &fno) != FR_OK)
+        return;
+    if (fno.fattrib & AM_RDO)
+        f_chmod(path, fno.fattrib & ~AM_RDO, AM_RDO);
+    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 install_hekate_8gb_post_copy(void)
+{
+    if (!install_path_exists(HEKATE_8GB_SRC))
+        return;
+
+    int mib = dram_capacity_mib_from_fuse();
+    if (mib > 4096) {
+        install_set_color(COLOR_CYAN);
+        gfx_printf("\nMehr als 4 GB RAM erkannt (Fuse). Die 8-GB-Hekate-Variante wird verwendet.\n");
+        gfx_printf("Kopiere nach payload.bin und bootloader/update.bin...\n");
+        install_set_color(COLOR_WHITE);
+
+        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) {
+            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);
+    }
+}
+
 // Main installation function
 int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
    int res;
@@ -605,7 +682,9 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
        install_set_color(COLOR_WHITE);
        res = update_mode_install(pack_variant);
        if (res != FR_OK) return res;
-        
+
+        install_hekate_8gb_post_copy();
+
        install_check_and_clear_screen_if_needed();
        // Remove staging directory (installed pack)
        res = cleanup_staging_directory(pack_variant);
@@ -644,7 +723,9 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
        install_set_color(COLOR_WHITE);
        res = clean_mode_install(pack_variant);
        if (res != FR_OK) return res;
-        
+
+        install_hekate_8gb_post_copy();
+
        install_check_and_clear_screen_if_needed();
        // Remove staging directory (installed pack)
        res = cleanup_staging_directory(pack_variant);
--- a/source/install.h
+++ b/source/install.h
@@ -35,6 +35,7 @@ void install_check_and_clear_screen_if_needed(void);
 bool install_path_exists(const char *path);
 int install_count_directory_items(const char *path);
 void install_combine_path(char *result, size_t size, const char *base, const char *add);
+int install_copy_staging_root_files(const char *staging, const char *dst_root);
 int delete_path_list(const char* paths[], const char* description);
 int delete_path_lists_grouped(const char *folder_display_name, ...);
 int folder_delete_single_with_progress(const char *path, const char *display_name);
--- a/source/install_update.c
+++ b/source/install_update.c
@@ -78,7 +78,6 @@ int update_mode_install(omninx_variant_t variant) {
    int res;
    const char* staging = get_staging_path(variant);
    char src_path[256];
-    char dst_path[256];

    if (!staging) {
        return FR_INVALID_PARAMETER;
@@ -106,6 +105,10 @@ int update_mode_install(omninx_variant_t variant) {
    res = folder_copy_with_progress_v2(src_path, "sd:/", "switch/");
    if (res != FR_OK && res != FR_NO_FILE) return res;

+    s_printf(src_path, "%s/themes", staging);
+    res = folder_copy_with_progress_v2(src_path, "sd:/", "themes/");
+    if (res != FR_OK && res != FR_NO_FILE) return res;
+
    s_printf(src_path, "%s/warmboot_mariko", staging);
    res = folder_copy_with_progress_v2(src_path, "sd:/", "warmboot_mariko/");
    if (res != FR_OK && res != FR_NO_FILE) return res;
@@ -120,29 +123,9 @@ int update_mode_install(omninx_variant_t variant) {
    gfx_printf("  Kopiere Root-Dateien...\n");
    set_color(COLOR_WHITE);

-    s_printf(src_path, "%s/boot.dat", staging);
-    s_printf(dst_path, "sd:/boot.dat");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
-
-    s_printf(src_path, "%s/boot.ini", staging);
-    s_printf(dst_path, "sd:/boot.ini");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
-
-    s_printf(src_path, "%s/exosphere.ini", staging);
-    s_printf(dst_path, "sd:/exosphere.ini");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
-
-    s_printf(src_path, "%s/hbmenu.nro", staging);
-    s_printf(dst_path, "sd:/hbmenu.nro");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
-
-    s_printf(src_path, "%s/loader.bin", staging);
-    s_printf(dst_path, "sd:/loader.bin");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
-
-    s_printf(src_path, "%s/payload.bin", staging);
-    s_printf(dst_path, "sd:/payload.bin");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
+    res = install_copy_staging_root_files(staging, "sd:/");
+    if (res != FR_OK)
+        return res;

    set_color(COLOR_GREEN);
    gfx_printf("  Kopie abgeschlossen!\n");
--- a/source/main.c
+++ b/source/main.c
@@ -18,6 +18,8 @@
 #include <mem/heap.h>
 #include <mem/minerva.h>
 #include <power/max77620.h>
+#include <power/max17050.h>
+#include <power/bq24193.h>
 #include <soc/bpmp.h>
 #include <soc/fuse.h>
 #include <soc/hw_init.h>
@@ -33,6 +35,7 @@
 #include "fs.h"
 #include "version.h"
 #include "install.h"
+#include "screenshot.h"

 // Configuration
 #define PAYLOAD_PATH      "sd:/bootloader/update.bin"
@@ -113,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);
@@ -241,11 +250,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);
        }
        
@@ -262,13 +273,21 @@ void ipl_main(void) {
                break;
            }
            
-            // Check joycon A button
+            // Check joycon A button; Capture = screenshot
            jc_gamepad_rpt_t *jc = joycon_poll();
-            if (jc && jc->a) {
+            if (jc) {
+                if (jc->cap)
+                    take_screenshot();
+                if (jc->a) {
+                    button_pressed = true;
+                    break;
+                }
+            }
+            if (cancel_combo_pressed(btn_state)) {
                button_pressed = true;
                break;
            }
-            
+
            msleep(50); // Small delay to avoid busy-waiting
        }
        
@@ -322,12 +341,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);
@@ -343,6 +364,14 @@ void ipl_main(void) {
            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;
+            }
+            
            // D-pad or Vol+ / Vol- for selection (Vol+ = up, Vol- = down)
            bool cur_up = false, cur_down = false;
            if (jc) {
@@ -367,6 +396,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);
@@ -376,6 +419,139 @@ void ipl_main(void) {
    // Determine installation mode
    install_mode_t mode = current.is_installed ? INSTALL_MODE_UPDATE : INSTALL_MODE_CLEAN;
    
+    // Battery run protection: below 10% requires charger
+    #define BATT_LOW_THRESHOLD 10
+    int batt_raw = 0;
+    int batt_pct = 100;
+    if (max17050_get_property(MAX17050_RepSOC, &batt_raw) == 0) {
+        batt_pct = batt_raw >> 8;  // RepSOC: high byte = percent
+    }
+    while (batt_pct < BATT_LOW_THRESHOLD && !bq24193_charger_connected()) {
+        gfx_clear_grey(0x1B);
+        gfx_con_setpos(0, 0);
+        print_header();
+        set_color(COLOR_RED);
+        gfx_printf("Akkustand zu niedrig! (%d%%)\n\n", batt_pct);
+        gfx_printf("Unter %d%% Akku darf die Installation nur\n", BATT_LOW_THRESHOLD);
+        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 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 (cancel_combo_pressed(pbtn)) {
+                user_cancelled = true;
+                break;
+            }
+            if (max17050_get_property(MAX17050_RepSOC, &batt_raw) == 0) {
+                batt_pct = batt_raw >> 8;
+            }
+            msleep(200);
+        }
+        if (user_cancelled) {
+            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;
+        }
+    }
+    
+    // Charger detected or battery OK - clear the low-battery screen before continuing
+    gfx_clear_grey(0x1B);
+    gfx_con_setpos(0, 0);
+    print_header();
+    
+    // UHS class check: recommend U2 / V30 / A2 for emuMMC (speed and reliability)
+    #define UHS_U2_MIN  2
+    #define UHS_V30_MIN 30
+    #define UHS_A2_MIN  2
+    bool uhs_ok = (sd_storage.ssr.uhs_grade >= UHS_U2_MIN &&
+                   sd_storage.ssr.video_class >= UHS_V30_MIN &&
+                   sd_storage.ssr.app_class >= UHS_A2_MIN);
+    if (!uhs_ok) {
+        jc_init_hw();
+        gfx_clear_grey(0x1B);
+        gfx_con_setpos(0, 0);
+        set_color(COLOR_RED);
+        gfx_printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+        gfx_printf("!!          WARNUNG - SD-KARTEN-KLASSE           !!\n");
+        gfx_printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n");
+        set_color(COLOR_WHITE);
+        gfx_printf("Diese SD-Karte erfuellt NICHT die empfohlenen\n");
+        gfx_printf("Mindestanforderungen (U2 | V30 | A2).\n\n");
+        set_color(COLOR_YELLOW);
+        gfx_printf("Aktuelle Werte: UHS%d | V%d | A%d\n\n",
+            (u32)sd_storage.ssr.uhs_grade,
+            (u32)sd_storage.ssr.video_class,
+            (u32)sd_storage.ssr.app_class);
+        set_color(COLOR_WHITE);
+        gfx_printf("Moegliche Folgen bei schwachen Karten:\n");
+        gfx_printf("  - Langsamere emuMMC / Spiel-Ladezeiten\n");
+        gfx_printf("  - Hoheres Risiko von Korruption oder Abstuerzen\n");
+        gfx_printf("  - Instabilitaet beim Schreiben groesserer Daten\n\n");
+        set_color(COLOR_CYAN);
+        gfx_printf("Empfohlen: U2 | V30 | A2 oder besser.\n");
+        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;
+        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();
+            if (jc) {
+                if (jc->cap)
+                    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;
+        while (!released) {
+            jc_gamepad_rpt_t *jc = joycon_poll();
+            released = (!jc || !jc->a) && !(btn_read() & BTN_POWER);
+            if (!released) msleep(50);
+        }
+        msleep(300);  // Short delay so the next screen is visible before accepting input
+        gfx_clear_grey(0x1B);
+        gfx_con_setpos(0, 0);
+        print_header();
+    }
+    
    // Show information
    set_color(COLOR_CYAN);
    gfx_printf("Installationsmodus: %s\n", mode == INSTALL_MODE_UPDATE ? "Update" : "Saubere Installation");
@@ -400,33 +576,59 @@ void ipl_main(void) {
    gfx_printf("Druecke A-Taste (rechter Joy-Con) oder Power-Taste,\n");
    gfx_printf("um die Installation zu starten...\n");
    set_color(COLOR_WHITE);
+    set_color(COLOR_CYAN);
+    gfx_printf("Vol+ und Vol- (Konsole) gleichzeitig: Abbrechen -> Hekate.\n");
+    set_color(COLOR_WHITE);
    
-    // Wait for either A button or Power button
+    // Wait for A/Power to start, or +/- to cancel
    bool button_pressed = false;
+    bool cancelled = false;
    
    // First, wait for power button to be released if it's currently pressed
    while (btn_read() & BTN_POWER) {
        msleep(50);
    }
    
-    while (!button_pressed) {
-        // Check power button - detect press (transition from not pressed to pressed)
+    while (!button_pressed && !cancelled) {
+        // Check power button
        u8 btn_state = btn_read();
        if (btn_state & BTN_POWER) {
            button_pressed = true;
            break;
        }
        
-        // Check joycon A button
+        // Check joycon buttons; Capture = screenshot
        jc_gamepad_rpt_t *jc = joycon_poll();
-        if (jc && jc->a) {
-            button_pressed = true;
+        if (jc) {
+            if (jc->cap)
+                take_screenshot();
+            if (jc->a) {
+                button_pressed = true;
+                break;
+            }
+        }
+        if (cancel_combo_pressed(btn_state)) {
+            cancelled = true;
            break;
        }
        
        msleep(50); // Small delay to avoid busy-waiting
    }
    
+    if (cancelled) {
+        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;
+    }
+    
    // Clear the prompt and start installation
    gfx_clear_grey(0x1B);
    gfx_con_setpos(0, 0);
@@ -434,14 +636,18 @@ void ipl_main(void) {
    
    // Perform the installation
    set_color(COLOR_YELLOW);
-    gfx_printf("Installation wird gestartet...\n\n");
+    gfx_printf("Installation wird gestartet...\n");
+    set_color(COLOR_WHITE);
+    set_color(COLOR_ORANGE);
+    gfx_printf("Hinweis: Manchmal kann es haengen. Einfach warten.\n\n");
    set_color(COLOR_WHITE);
    
    int result = perform_installation(pack_variant, mode);
    
    // Wait 3 seconds before clearing screen to allow errors to be visible
    msleep(3000);
-    
+    // take_screenshot(); // Take a screenshot of the installation summary
+
    // Clear screen for final summary to ensure it's visible
    gfx_clear_grey(0x1B);
    gfx_con_setpos(0, 0);
@@ -493,11 +699,15 @@ void ipl_main(void) {
            break;
        }
        
-        // Check joycon A button
+        // Check joycon A button; Capture = screenshot
        jc_gamepad_rpt_t *jc = joycon_poll();
-        if (jc && jc->a) {
-            button_pressed = true;
-            break;
+        if (jc) {
+            if (jc->cap)
+                take_screenshot();
+            if (jc->a) {
+                button_pressed = true;
+                break;
+            }
        }
        
        msleep(50); // Small delay to avoid busy-waiting
@@ -535,9 +745,13 @@ void ipl_main(void) {
            }
            
            jc_gamepad_rpt_t *jc = joycon_poll();
-            if (jc && jc->a) {
-                button_pressed = true;
-                break;
+            if (jc) {
+                if (jc->cap)
+                    take_screenshot();
+                if (jc->a) {
+                    button_pressed = true;
+                    break;
+                }
            }
            
            msleep(50);
--- a/source/nx_sd.c
+++ b/source/nx_sd.c
@@ -1,228 +1,233 @@
-/*
- * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <storage/sdmmc_driver.h>
-#include <gfx_utils.h>
-#include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-
-bool sd_mounted = false;
-static u16  sd_errors[3] = { 0 }; // Init and Read/Write errors.
-static u32  sd_mode = SD_UHS_SDR82;
-
-sdmmc_t sd_sdmmc;
-sdmmc_storage_t sd_storage;
-FATFS sd_fs;
-
-void sd_error_count_increment(u8 type)
-{
-	switch (type)
-	{
-	case SD_ERROR_INIT_FAIL:
-		sd_errors[0]++;
-		break;
-	case SD_ERROR_RW_FAIL:
-		sd_errors[1]++;
-		break;
-	case SD_ERROR_RW_RETRY:
-		sd_errors[2]++;
-		break;
-	}
-}
-
-u16 *sd_get_error_count()
-{
-	return sd_errors;
-}
-
-bool sd_get_card_removed()
-{
-	if (!sdmmc_get_sd_inserted())
-		return true;
-
-	return false;
-}
-
-u32 sd_get_mode()
-{
-	return sd_mode;
-}
-
-int sd_init_retry(bool power_cycle)
-{
-	u32 bus_width = SDMMC_BUS_WIDTH_4;
-	u32 type = SDHCI_TIMING_UHS_SDR82;
-
-	// Power cycle SD card.
-	if (power_cycle)
-	{
-		sd_mode--;
-		sdmmc_storage_end(&sd_storage);
-	}
-
-	// Get init parameters.
-	switch (sd_mode)
-	{
-	case SD_INIT_FAIL: // Reset to max.
-		return 0;
-	case SD_1BIT_HS25:
-		bus_width = SDMMC_BUS_WIDTH_1;
-		type = SDHCI_TIMING_SD_HS25;
-		break;
-	case SD_4BIT_HS25:
-		type = SDHCI_TIMING_SD_HS25;
-		break;
-	case SD_UHS_SDR82:
-		type = SDHCI_TIMING_UHS_SDR82;
-		break;
-	default:
-		sd_mode = SD_UHS_SDR82;
-	}
-
-	return sdmmc_storage_init_sd(&sd_storage, &sd_sdmmc, bus_width, type);
-}
-
-bool sd_initialize(bool power_cycle)
-{
-	if (power_cycle)
-		sdmmc_storage_end(&sd_storage);
-
-	int res = !sd_init_retry(false);
-
-	while (true)
-	{
-		if (!res)
-			return true;
-		else if (!sdmmc_get_sd_inserted()) // SD Card is not inserted.
-		{
-			sd_mode = SD_UHS_SDR82;
-			break;
-		}
-		else
-		{
-			sd_errors[SD_ERROR_INIT_FAIL]++;
-
-			if (sd_mode == SD_INIT_FAIL)
-				break;
-			else
-				res = !sd_init_retry(true);
-		}
-	}
-
-	sdmmc_storage_end(&sd_storage);
-
-	return false;
-}
-
-bool is_sd_inited = false;
-
-bool sd_mount()
-{
-	if (sd_mounted)
-		return true;
-
-	int res = !sd_initialize(false);
-	is_sd_inited = !res;
-
-	if (res)
-	{
-		gfx_con.mute = false;
-		EPRINTF("Failed to init SD card.");
-		if (!sdmmc_get_sd_inserted())
-			EPRINTF("Make sure that it is inserted.");
-		else
-			EPRINTF("SD Card Reader is not properly seated!");
-	}
-	else
-	{
-		res = f_mount(&sd_fs, "", 1);
-		if (res == FR_OK)
-		{
-			sd_mounted = true;
-			return true;
-		}
-		else
-		{
-			gfx_con.mute = false;
-			EPRINTFARGS("Failed to mount SD card (FatFS Error %d).\nMake sure that a FAT partition exists..", res);
-		}
-	}
-
-	return false;
-}
-
-static void _sd_deinit()
-{
-	if (sd_mode == SD_INIT_FAIL)
-		sd_mode = SD_UHS_SDR82;
-
-	if (sd_mounted)
-	{
-		f_mount(NULL, "", 1);
-		sdmmc_storage_end(&sd_storage);
-		sd_mounted = false;
-		is_sd_inited = false;
-	}
-}
-
-void sd_unmount() { _sd_deinit(); }
-void sd_end()     { _sd_deinit(); }
-
-void *sd_file_read(const char *path, u32 *fsize)
-{
-	FIL fp;
-	if (f_open(&fp, path, FA_READ) != FR_OK)
-		return NULL;
-
-	u32 size = f_size(&fp);
-	if (fsize)
-		*fsize = size;
-
-	char *buf = malloc(size + 1);
-	buf[size] = '\0';
-
-	if (f_read(&fp, buf, size, NULL) != FR_OK)
-	{
-		free(buf);
-		f_close(&fp);
-
-		return NULL;
-	}
-
-	f_close(&fp);
-
-	return buf;
-}
-
-int sd_save_to_file(void *buf, u32 size, const char *filename)
-{
-	FIL fp;
-	u32 res = 0;
-	res = f_open(&fp, filename, FA_CREATE_ALWAYS | FA_WRITE);
-	if (res)
-	{
-		EPRINTFARGS("Error (%d) creating file\n%s.\n", res, filename);
-		return res;
-	}
-
-	f_write(&fp, buf, size, NULL);
-	f_close(&fp);
-
-	return 0;
-}
+/*
+ * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2019 CTCaer
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <storage/nx_sd.h>
+#include <storage/sdmmc.h>
+#include <storage/sdmmc_driver.h>
+#include <gfx_utils.h>
+#include <libs/fatfs/ff.h>
+#include <mem/heap.h>
+
+bool sd_mounted = false;
+static u16  sd_errors[3] = { 0 }; // Init and Read/Write errors.
+static u32  sd_mode = SD_UHS_SDR82;
+
+sdmmc_t sd_sdmmc;
+sdmmc_storage_t sd_storage;
+FATFS sd_fs;
+
+void sd_error_count_increment(u8 type)
+{
+	switch (type)
+	{
+	case SD_ERROR_INIT_FAIL:
+		sd_errors[0]++;
+		break;
+	case SD_ERROR_RW_FAIL:
+		sd_errors[1]++;
+		break;
+	case SD_ERROR_RW_RETRY:
+		sd_errors[2]++;
+		break;
+	}
+}
+
+u16 *sd_get_error_count()
+{
+	return sd_errors;
+}
+
+bool sd_get_card_removed()
+{
+	if (!sdmmc_get_sd_inserted())
+		return true;
+
+	return false;
+}
+
+u32 sd_get_mode()
+{
+	return sd_mode;
+}
+
+int sd_init_retry(bool power_cycle)
+{
+	u32 bus_width = SDMMC_BUS_WIDTH_4;
+	u32 type = SDHCI_TIMING_UHS_SDR82;
+
+	// Power cycle SD card.
+	if (power_cycle)
+	{
+		sd_mode--;
+		sdmmc_storage_end(&sd_storage);
+	}
+
+	// Get init parameters.
+	switch (sd_mode)
+	{
+	case SD_INIT_FAIL: // Reset to max.
+		return 0;
+	case SD_1BIT_HS25:
+		bus_width = SDMMC_BUS_WIDTH_1;
+		type = SDHCI_TIMING_SD_HS25;
+		break;
+	case SD_4BIT_HS25:
+		type = SDHCI_TIMING_SD_HS25;
+		break;
+	case SD_UHS_SDR82:
+		type = SDHCI_TIMING_UHS_SDR82;
+		break;
+	default:
+		sd_mode = SD_UHS_SDR82;
+	}
+
+	return sdmmc_storage_init_sd(&sd_storage, &sd_sdmmc, bus_width, type);
+}
+
+bool sd_initialize(bool power_cycle)
+{
+	if (power_cycle)
+		sdmmc_storage_end(&sd_storage);
+
+	int res = !sd_init_retry(false);
+
+	while (true)
+	{
+		if (!res)
+			return true;
+		else if (!sdmmc_get_sd_inserted()) // SD Card is not inserted.
+		{
+			sd_mode = SD_UHS_SDR82;
+			break;
+		}
+		else
+		{
+			sd_errors[SD_ERROR_INIT_FAIL]++;
+
+			if (sd_mode == SD_INIT_FAIL)
+				break;
+			else
+				res = !sd_init_retry(true);
+		}
+	}
+
+	sdmmc_storage_end(&sd_storage);
+
+	return false;
+}
+
+bool is_sd_inited = false;
+
+bool sd_mount()
+{
+	if (sd_mounted)
+		return true;
+
+	int res = !sd_initialize(false);
+	is_sd_inited = !res;
+
+	if (res)
+	{
+		gfx_con.mute = false;
+		EPRINTF("Failed to init SD card.");
+		if (!sdmmc_get_sd_inserted())
+			EPRINTF("Make sure that it is inserted.");
+		else
+			EPRINTF("SD Card Reader is not properly seated!");
+	}
+	else
+	{
+		res = f_mount(&sd_fs, "", 1);
+		if (res == FR_OK)
+		{
+			sd_mounted = true;
+			return true;
+		}
+		else
+		{
+			gfx_con.mute = false;
+			EPRINTFARGS("Failed to mount SD card (FatFS Error %d).\nMake sure that a FAT partition exists..", res);
+		}
+	}
+
+	return false;
+}
+
+static void _sd_deinit()
+{
+	if (sd_mode == SD_INIT_FAIL)
+		sd_mode = SD_UHS_SDR82;
+
+	if (sd_mounted)
+	{
+		f_mount(NULL, "", 1);
+		sdmmc_storage_end(&sd_storage);
+		sd_mounted = false;
+		is_sd_inited = false;
+	}
+}
+
+void sd_unmount() { _sd_deinit(); }
+void sd_end()     { _sd_deinit(); }
+
+bool sd_get_card_mounted(void)
+{
+	return sd_mounted;
+}
+
+void *sd_file_read(const char *path, u32 *fsize)
+{
+	FIL fp;
+	if (f_open(&fp, path, FA_READ) != FR_OK)
+		return NULL;
+
+	u32 size = f_size(&fp);
+	if (fsize)
+		*fsize = size;
+
+	char *buf = malloc(size + 1);
+	buf[size] = '\0';
+
+	if (f_read(&fp, buf, size, NULL) != FR_OK)
+	{
+		free(buf);
+		f_close(&fp);
+
+		return NULL;
+	}
+
+	f_close(&fp);
+
+	return buf;
+}
+
+int sd_save_to_file(void *buf, u32 size, const char *filename)
+{
+	FIL fp;
+	u32 res = 0;
+	res = f_open(&fp, filename, FA_CREATE_ALWAYS | FA_WRITE);
+	if (res)
+	{
+		EPRINTFARGS("Error (%d) creating file\n%s.\n", res, filename);
+		return res;
+	}
+
+	f_write(&fp, buf, size, NULL);
+	f_close(&fp);
+
+	return 0;
+}
--- a/source/screenshot.c
+++ b/source/screenshot.c
@@ -0,0 +1,111 @@
+/*
+ * Screenshot support for OmniNX Installer Payload
+ * Based on TegraExplorer (AllgemeinerProblemLoeser) TakeScreenshot implementation.
+ */
+
+#include "screenshot.h"
+#include "gfx.h"
+#include "nx_sd.h"
+#include <libs/fatfs/ff.h>
+#include <mem/heap.h>
+#include <display/di.h>
+#include <utils/util.h>
+#include <utils/sprintf.h>
+#include <rtc/max77620-rtc.h>
+#include <string.h>
+
+/* BMP file header (54 bytes), matching TegraExplorer tools.h */
+typedef struct __attribute__((packed)) _bmp_hdr_t
+{
+	u16 magic;
+	u32 size;
+	u32 rsvd;
+	u32 data_off;
+	u32 hdr_size;
+	u32 width;
+	u32 height;
+	u16 planes;
+	u16 pxl_bits;
+	u32 comp;
+	u32 img_size;
+	u32 res_h;
+	u32 res_v;
+	u64 rsvd2;
+} bmp_hdr_t;
+
+#define BMP_HEADER_SIZE  0x36
+#define FB_SIZE          0x384000   /* 1280 * 720 * 4 */
+#define SCREEN_W         1280
+#define SCREEN_H         720
+
+void take_screenshot(void)
+{
+	static u32 last_timer = 0;
+
+	if (!sd_get_card_mounted())
+		return;
+
+	/* 3-second cooldown (same as TegraExplorer) */
+	u32 now = get_tmr_s();
+	if (last_timer != 0 && now < last_timer + 3)
+		return;
+	last_timer = now;
+
+	const char basepath[] = "sd:/switch/screenshot";
+	char name[48];
+	char path[80];
+	rtc_time_t rtc;
+
+	max77620_rtc_get_time(&rtc);
+	s_printf(name, "omninx_installer_%04d%02d%02d_%02d%02d%02d.bmp",
+		(u32)rtc.year, (u32)rtc.month, (u32)rtc.day,
+		(u32)rtc.hour, (u32)rtc.min, (u32)rtc.sec);
+	s_printf(path, "%s/%s", basepath, name);
+
+	f_mkdir("sd:/switch");
+	f_mkdir(basepath);
+
+	const u32 file_size = BMP_HEADER_SIZE + FB_SIZE;
+	u8 *bitmap = (u8 *)malloc(file_size);
+	u32 *fb_copy = (u32 *)malloc(FB_SIZE);
+	if (!bitmap || !fb_copy) {
+		if (bitmap) free(bitmap);
+		if (fb_copy) free(fb_copy);
+		return;
+	}
+
+	/* Copy framebuffer with same coordinate flip as TegraExplorer (BGR layout) */
+	u32 *fb_ptr = gfx_ctxt.fb;
+	for (int x = SCREEN_W - 1; x >= 0; x--) {
+		for (int y = SCREEN_H - 1; y >= 0; y--)
+			fb_copy[y * SCREEN_W + x] = *fb_ptr++;
+	}
+
+	memcpy(bitmap + BMP_HEADER_SIZE, fb_copy, FB_SIZE);
+
+	bmp_hdr_t *bmp = (bmp_hdr_t *)bitmap;
+	bmp->magic    = 0x4D42;
+	bmp->size     = file_size;
+	bmp->rsvd     = 0;
+	bmp->data_off = BMP_HEADER_SIZE;
+	bmp->hdr_size = 40;
+	bmp->width    = SCREEN_W;
+	bmp->height   = SCREEN_H;
+	bmp->planes   = 1;
+	bmp->pxl_bits = 32;
+	bmp->comp     = 0;
+	bmp->img_size = FB_SIZE;
+	bmp->res_h    = 2834;
+	bmp->res_v    = 2834;
+	bmp->rsvd2    = 0;
+
+	sd_save_to_file(bitmap, file_size, path);
+
+	free(bitmap);
+	free(fb_copy);
+
+	/* Brief backlight flash (same as TegraExplorer) */
+	display_backlight_brightness(255, 1000);
+	msleep(100);
+	display_backlight_brightness(100, 1000);
+}
--- a/source/screenshot.h
+++ b/source/screenshot.h
@@ -0,0 +1,13 @@
+/*
+ * Screenshot support for OmniNX Installer Payload
+ * Based on TegraExplorer (AllgemeinerProblemLoeser) TakeScreenshot implementation.
+ */
+
+#pragma once
+
+#include <utils/types.h>
+
+/* Take a screenshot of the current framebuffer and save as BMP to SD.
+ * Triggered by Capture button (jc->cap). Uses 3-second cooldown.
+ * Saves to sd:/switch/screenshot/omninx_installer_YYYYMMDD_HHMMSS.bmp */
+void take_screenshot(void);
--- a/tools/ram_test_main.c
+++ b/tools/ram_test_main.c
@@ -0,0 +1,70 @@
+/*
+ * Minimal RAM info test payload (fuse DRAM ID + SK table -> MiB).
+ * Build: make ram-test  ->  output/RAM-Test.bin
+ */
+
+#include <display/di.h>
+#include <mem/heap.h>
+#include <mem/minerva.h>
+#include <memory_map.h>
+#include <soc/bpmp.h>
+#include <soc/fuse.h>
+#include <soc/hw_init.h>
+#include <soc/t210.h>
+#include <utils/util.h>
+
+#include "dram_fuse.h"
+#include "gfx.h"
+
+#undef COLOR_CYAN
+#undef COLOR_WHITE
+#define COLOR_CYAN   0xFF00FFFF
+#define COLOR_WHITE  0xFFFFFFFF
+
+/* Required by BDK */
+boot_cfg_t __attribute__((section("._boot_cfg"))) b_cfg;
+volatile nyx_storage_t *nyx_str = (nyx_storage_t *)NYX_STORAGE_ADDR;
+
+extern void pivot_stack(u32 stack_top);
+
+void ipl_main(void)
+{
+	hw_init();
+	pivot_stack(IPL_STACK_TOP);
+	heap_init(IPL_HEAP_START);
+
+	minerva_init();
+	minerva_change_freq(FREQ_800);
+
+	display_init();
+	u32 *fb = display_init_framebuffer_pitch();
+	gfx_init_ctxt(fb, 720, 1280, 720);
+	gfx_con_init();
+	display_backlight_pwm_init();
+	display_backlight_brightness(100, 1000);
+
+	bpmp_clk_rate_set(BPMP_CLK_DEFAULT_BOOST);
+
+	gfx_clear_grey(0x1B);
+	gfx_con_setpos(0, 0);
+	gfx_con_setcol(COLOR_CYAN, gfx_con.fillbg, gfx_con.bgcol);
+	gfx_printf("RAM test payload\n\n");
+	gfx_con_setcol(COLOR_WHITE, gfx_con.fillbg, gfx_con.bgcol);
+
+	u32 raw = fuse_read_dramid(true);
+	u32 nid = fuse_read_dramid(false);
+	u32 chip = hw_get_chip_id();
+	int mib = dram_capacity_mib_from_fuse();
+
+	gfx_printf("SoC:       %s\n", chip == GP_HIDREV_MAJOR_T210B01 ? "Mariko (T210B01)" : "Erista (T210)");
+	gfx_printf("DRAM fuse: raw %d  norm %d\n", raw, nid);
+	if (mib > 0)
+		gfx_printf("Table MiB: %d (fuse SKU, not probe)\n", mib);
+	else
+		gfx_printf("Table MiB: (unknown id for this SoC)\n");
+
+	gfx_printf("\nHang — power off or inject payload.\n");
+
+	while (1)
+		msleep(500);
+}
Author	SHA1	Message	Date
niklascfw	3f6bbc0752	Input: console Vol+/- combo only before install; Joy-Con +/- exit removed All checks were successful Build / Build (push) Successful in 16s Details - cancel_combo_pressed uses only hardware volume buttons - After installation summary and payload-missing screen: A or Power only Made-with: Cursor	2026-03-31 13:18:06 +02:00
niklascfw	d1fc24dae8	Install: Hekate 8GB after copy (fuse >4GiB), dram_fuse helper, RAM test target All checks were successful Build / Build (push) Successful in 14s Details - Add dram_fuse.c/h for shared fuse-to-MiB mapping - After successful update/clean install copy: if hekate_8gb.bin exists and fuse reports more than 4 GiB, copy to sd:/payload.bin and sd:/bootloader/update.bin, then remove source; otherwise remove helper only - Makefile: make ram-test builds output/RAM-Test.bin (tools/ram_test_main.c) Made-with: Cursor	2026-03-31 00:05:30 +02:00
niklascfw	ef104bce41	Update deletions: keep Switchfin, remove swr-ini-tool nro Made-with: Cursor	2026-03-30 20:27:39 +02:00
niklascfw	0015c7e8ac	Install: copy all staging root files via directory iteration All checks were successful Build / Build (push) Successful in 18s Details Made-with: Cursor	2026-03-30 17:49:52 +02:00
niklascfw	6dde73f39e	Install: copy themes/ in stage 2 (update and clean) All checks were successful Build / Build (push) Successful in 11s Details Made-with: Cursor	2026-03-06 23:46:40 +01:00
niklascfw	97e8c3d965	Remove outdated UltraHand comment from deletion_lists_update.h All checks were successful Build / Build (push) Successful in 13s Details Made-with: Cursor	2026-03-06 22:10:32 +01:00
niklascfw	586afc2f56	Revert "Update: preserve UltraHand .offload state (overlays/packages)" This reverts commit `e71fb13bfc`.	2026-03-05 17:24:37 +01:00
niklascfw	f943887b39	Revert "Clean install: use normal switch copy, not .offload-aware" This reverts commit `335ea03b05`.	2026-03-05 17:24:26 +01:00
niklascfw	335ea03b05	Clean install: use normal switch copy, not .offload-aware All checks were successful Build / Build (push) Successful in 14s Details - update_mode_install(variant, offload_aware_switch): true = update (preserve .offload), false = clean - Update path calls with true; clean_mode_install calls with false so switch/ is copied normally on fresh install Made-with: Cursor	2026-03-01 15:15:45 +01:00
niklascfw	b0523ada6c	nx_sd: add sd_get_card_mounted() for screenshot and other callers Made-with: Cursor	2026-03-01 14:44:37 +01:00
niklascfw	9a2307a8ee	Add screenshot capture via Joy-Con Capture button - source/screenshot.c, screenshot.h: take_screenshot() saves framebuffer as BMP - Path: sd:/switch/screenshot/omninx_installer_YYYYMMDD_HHMMSS.bmp (RTC timestamp) - 3s cooldown, backlight flash on capture; TegraExplorer-style BGR flip - main.c: call take_screenshot() when jc->cap in all joycon poll loops Made-with: Cursor	2026-03-01 14:43:58 +01:00
niklascfw	e71fb13bfc	Update: preserve UltraHand .offload state (overlays/packages) All checks were successful Build / Build (push) Successful in 10s Details - Add folder_copy_switch_update_offload_aware() for update-only switch copy - If item exists in .overlays/.offload or .packages/.offload, update in place; else copy to main - Remove sd:/switch/.overlays from update delete list so .offload survives - Fresh install unchanged (no offload logic) Co-authored-by: Cursor <cursoragent@cursor.com>	2026-02-17 21:01:36 +01:00
niklascfw	5bcd3987a2	UHS warning: recommend Samsung EVO Plus, EVO Select, PRO Plus All checks were successful Build / Build (push) Successful in 11s Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-02-17 20:28:15 +01:00
niklascfw	15b7cb1f4c	Add battery run protection: require charger below 10% All checks were successful Build / Build (push) Successful in 10s Details - Add bq24193_charger_connected() for charger detection - Block install when battery < 10% and charger not plugged in - Show clear screen after charger detected before continuing - User can cancel with + and - to return to Hekate Co-authored-by: Cursor <cursoragent@cursor.com>	2026-02-14 15:12:06 +01:00
niklascfw	4b124a9998	Add + and - simultaneously to cancel and return to Hekate before install Co-authored-by: Cursor <cursoragent@cursor.com>	2026-02-14 15:03:58 +01:00
niklascfw	89279e27d5	Updated CI All checks were successful Build / Build (push) Successful in 10s Details	2026-02-13 22:13:29 +01:00
niklascfw	4ae286d21a	Updated CI All checks were successful Build / Build (push) Successful in 11s Details	2026-02-13 22:11:42 +01:00
niklascfw	880a9af105	Updated CI Some checks failed Build / build (push) Failing after 3s Details	2026-02-13 22:09:31 +01:00
niklascfw	7fac0e50bb	Updated CI Some checks failed Build / build (push) Failing after 3s Details	2026-02-13 22:08:40 +01:00
niklascfw	2c32f19262	Removed .packages from Update to be deleted	2026-02-11 17:58:32 +01:00
niklascfw	4effcf513b	Updated Notice	2026-02-11 17:56:31 +01:00
niklascfw	6b04eb5d89	Fixed typo	2026-02-11 17:47:00 +01:00
niklascfw	ed93c32131	Updated Readme - Added notice for proper use of this payload\n- Fixed some explenations	2026-02-11 17:17:37 +01:00
niklascfw	bae5ecebf1	Updated CI All checks were successful Build and Release / build-and-release (push) Successful in 10s Details	2026-02-11 17:11:18 +01:00
niklascfw	ef16df416b	Updated CI All checks were successful Build and Release / build-and-release (push) Successful in 9s Details	2026-02-11 17:09:04 +01:00
niklascfw	f81cd8e381	Updated CI Some checks failed Build and Release / build-and-release (push) Failing after 13s Details	2026-02-11 17:07:40 +01:00
niklascfw	04362c6e0c	Added CI	2026-02-11 17:06:19 +01:00
niklascfw	8457cdd5a6	Keeping UltraHand packages on Update	2026-02-11 17:06:09 +01:00
niklascfw	d1f78968a4	Added wait warning	2026-02-11 16:50:22 +01:00