bump version for new release 0.10.3 -> 0.11.0

Change NSP padding logic to follow nxdt and nsfw validation (#147 )
add gamecard trim detection. remove duplicate value in error box.
2025-05-27 17:44:48 +01:00 · 2025-05-27 17:05:28 +01:00 · 2025-05-27 15:35:52 +01:00 · 2025-05-27 00:55:26 +01:00 · 2025-05-26 23:18:14 +01:00 · 2025-05-26 22:55:06 +01:00
183 changed files with 23748 additions and 8189 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: ITotalJustice
+patreon: totaljustice
+open_collective: # Replace with a single Open Collective username
+ko_fi: totaljustice
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/workflows/build_presets.yml
+++ b/.github/workflows/build_presets.yml
@@ -1,10 +1,6 @@
 name: build

-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+on: [push, pull_request]

 jobs:
  build:
@@ -12,7 +8,7 @@ jobs:
      fail-fast: false
      matrix:
        os: [ubuntu-latest]
-        preset: [Release, RelWithDebInfo, MinSizeRel, Debug]
+        preset: [MinSizeRel]
    runs-on: ${{ matrix.os }}
    container: devkitpro/devkita64:latest

@@ -24,7 +20,7 @@ jobs:

    - name: Configure CMake
      run: |
-        cmake --preset ${{ matrix.preset }}
+        cmake --preset ${{ matrix.preset }} -DUSE_VFS_GC=0

    - name: Build
      run: cmake --build --preset ${{ matrix.preset }} --parallel 4
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ old_code
 created_ncas
 assets/romfs/shaders
 .vscode/settings.json
+.idea
 info/
 romfs/shaders
 assets/unused
@@ -22,3 +23,5 @@ libs/tweeny

 compile_commands.json
 out
+
+usb_test/
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
-# sphaira
+# Sphaira

-A homebrew menu for the switch.
+A homebrew menu for the Nintendo Switch.

-[See the gbatemp thread for more details / discussion](https://gbatemp.net/threads/sphaira-hbmenu-replacement.664523/).
+[See the GBATemp thread for more details / discussion](https://gbatemp.net/threads/sphaira-hbmenu-replacement.664523/).

-## showcase
+[We have now have a Discord server!](https://discord.gg/8vZBsrprEc). Please use the issues tab to report bugs, as it is much easier for me to track.
+
+## Showcase

 |                          |                          |
 :-------------------------:|:-------------------------:
@@ -13,28 +15,29 @@ A homebrew menu for the switch.
 ![Img](assets/screenshots/2024121522505300-879193CD6A8B96CD00931A628B1187CB.jpg) | ![Img](assets/screenshots/2024121522502300-879193CD6A8B96CD00931A628B1187CB.jpg)
 ![Img](assets/screenshots/2024121523033200-879193CD6A8B96CD00931A628B1187CB.jpg) | ![Img](assets/screenshots/2024121523070300-879193CD6A8B96CD00931A628B1187CB.jpg)

-## bug reports
+## Bug reports

-for any bug reports, please use the issues tab and explain in as much detail as possible!
+For any bug reports, please use the issues tab and explain in as much detail as possible!

-please include:
+Please include:

- CFW type (i assume Atmosphere, but someone out there is still using Rajnx)
- CFW version
- FW version
- The bug itself and how to reproduce it
+- CFW type (i assume Atmosphere, but someone out there is still using Rajnx);
+- CFW version;
+- FW version;
+- The bug itself and how to reproduce it.

-## ftp
+## FTP

-ftp can be enabled via the network menu and listens on port 5000, no username or password is required.
+FTP can be enabled via the network menu. It uses the same config as ftpsrv `/config/ftpsrv/config.ini`. [See here for the full list
+of all configs available](https://github.com/ITotalJustice/ftpsrv/blob/master/assets/config.ini.template).

-## mtp
+## MTP

-mtp can be enabled via the network menu.
+MTP can be enabled via the Network menu.

-## file assoc
+## File association

-sphaira has file assoc support. lets say your app supports loading .png files, then you could write an assoc file, then when using the file browser, clicking on a .png file will launch your app along with the .png file as argv[1]. This was primarly added for rom loading support for emulators / frontends such as retroarch, melonds, mgba etc.
+Sphaira has file association support. Let's say your app supports loading .png files, then you could write an association file, then when using the file browser, clicking on a .png file will launch your app along with the .png file as argv[1]. This was primarly added for rom loading support for emulators / frontends such as RetroArch, MelonDS, mGBA etc.

 ```ini
 [config]
@@ -42,9 +45,43 @@ path=/switch/your_app.nro
 supported_extensions=jpg|png|mp4|mp3
 ```

-the `path` field is optional. if left out, it will use the name of the ini to find the nro. For example, if the ini is called mgba.ini, it will try to find the nro in /switch/mgba.nro and /switch/folder/mgba.nro.
+The `path` field is optional. If left out, it will use the name of the ini to find the nro. For example, if the ini is called mgba.ini, it will try to find the nro in /switch/mgba.nro and /switch/folder/mgba.nro.

-see `assets/romfs/assoc/` for more examples of file assoc entries
+See `assets/romfs/assoc/` for more examples of file assoc entries.
+
+## Installing (applications)
+
+Sphaira can install applications (nsp, xci, nsz, xcz) from various sources (sd card, gamecard, ftp, usb).
+
+For informantion about the install options, [see the wiki](https://github.com/ITotalJustice/sphaira/wiki/Install).
+
+### Usb (install)
+
+The USB protocol is the same as tinfoil, so tools such as [ns-usbloader](https://github.com/developersu/ns-usbloader) and [fluffy](https://github.com/fourminute/Fluffy) should work with sphaira. You may also use the provided python script found [here](tools/usb_install_pc.py).
+
+### Ftp (install)
+
+Once you have connected your ftp client to your switch, you can upload files to install into the `install` folder.
+
+## Building from source
+
+You will first need to install [devkitPro](https://devkitpro.org/wiki/Getting_Started).
+
+Next you will need to install the dependencies:
+```sh
+sudo pacman -S switch-dev deko3d switch-cmake switch-curl switch-glm switch-zlib
+```
+
+Once devkitPro and all dependencies are installed, you can now build sphaira.
+
+```sh
+git clone https://github.com/ITotalJustice/sphaira.git
+cd sphaira
+cmake --preset MinSizeRel
+cmake --build --preset MinSizeRel
+```
+
+The output will be found in `build/MinSizeRel/sphaira.nro`

 ## Credits

@@ -56,7 +93,8 @@ see `assets/romfs/assoc/` for more examples of file assoc entries
 - deko3d-nanovg
 - libpulsar
 - minIni
- gbatemp
+- GBATemp
 - hb-appstore
 - haze
- everyone who has contributed to this project!
+- nxdumptool (for gamecard bin dumping and rsa verify code)
+- Everyone who has contributed to this project!
--- a/assets/embed/icons/GET.png
+++ b/assets/embed/icons/GET.png
--- a/assets/embed/icons/INSTALLED.png
+++ b/assets/embed/icons/INSTALLED.png
--- a/assets/embed/icons/LOCAL.png
+++ b/assets/embed/icons/LOCAL.png
--- a/assets/embed/icons/UPDATE.png
+++ b/assets/embed/icons/UPDATE.png
--- a/assets/embed/icons/default.png
+++ b/assets/embed/icons/default.png
--- a/assets/romfs/assoc/SwitchWave.ini
+++ b/assets/romfs/assoc/SwitchWave.ini
@@ -0,0 +1,2 @@
+[config]
+supported_extensions=mp3|ogg|flac|wav|aac|ac3|aif|asf|mp4|mkv|m3u|m3u8|hls|vob|avi|dv|flv|m2ts|m2v|m4a|mov|mpeg|mpg|mts|swf|ts|vob|wma|wmv|png|jpg|jpeg|bmp|gif
--- a/assets/romfs/assoc/fbneo_libretro_libnx.ini
+++ b/assets/romfs/assoc/fbneo_libretro_libnx.ini
@@ -2,3 +2,4 @@
 path=/retroarch/cores/fbneo_libretro_libnx.nro
 supported_extensions=zip|7z|cue|ccd
 database=FBNeo - Arcade Games
+use_base_name=true
--- a/assets/romfs/assoc/mame2000_libretro_libnx.ini
+++ b/assets/romfs/assoc/mame2000_libretro_libnx.ini
@@ -2,3 +2,4 @@
 path=/retroarch/cores/mame2000_libretro_libnx.nro
 supported_extensions=zip|7z
 database=MAME 2000
+use_base_name=true
--- a/assets/romfs/assoc/mame2003_libretro_libnx.ini
+++ b/assets/romfs/assoc/mame2003_libretro_libnx.ini
@@ -2,3 +2,4 @@
 path=/retroarch/cores/mame2003_libretro_libnx.nro
 supported_extensions=zip
 database=MAME 2003
+use_base_name=true
--- a/assets/romfs/assoc/mame2003_plus_libretro_libnx.ini
+++ b/assets/romfs/assoc/mame2003_plus_libretro_libnx.ini
@@ -2,3 +2,4 @@
 path=/retroarch/cores/mame2003_plus_libretro_libnx.nro
 supported_extensions=zip
 database=MAME 2003-Plus
+use_base_name=true
--- a/assets/romfs/assoc/nxmp.ini
+++ b/assets/romfs/assoc/nxmp.ini
@@ -0,0 +1,2 @@
+[config]
+supported_extensions=mp3|ogg|flac|wav|aac|ac3|aif|asf|mp4|mkv|m3u|m3u8|hls|vob|avi|dv|flv|m2ts|m2v|m4a|mov|mpeg|mpg|mts|swf|ts|vob|wma|wmv|png|jpg|jpeg|bmp|gif
--- a/assets/romfs/assoc/sphaira.ini
+++ b/assets/romfs/assoc/sphaira.ini
@@ -1,2 +0,0 @@
-[config]
-ext=nro
--- a/assets/romfs/assoc/xrick_libretro_libnx.ini
+++ b/assets/romfs/assoc/xrick_libretro_libnx.ini
@@ -2,3 +2,4 @@
 path=/retroarch/cores/xrick_libretro_libnx.nro
 supported_extensions=zip
 database=Rick Dangerous
+use_base_name=true
--- a/assets/romfs/github/ftpsrv.json
+++ b/assets/romfs/github/ftpsrv.json
@@ -0,0 +1,8 @@
+{
+    "url": "https://github.com/ITotalJustice/ftpsrv",
+    "assets": [
+        {
+            "name": "switch"
+        }
+    ]
+}
--- a/assets/romfs/github/sphaira.json
+++ b/assets/romfs/github/sphaira.json
@@ -0,0 +1,3 @@
+{
+    "url": "https://github.com/ITotalJustice/sphaira"
+}
--- a/assets/romfs/github/untitled.json
+++ b/assets/romfs/github/untitled.json
@@ -0,0 +1,3 @@
+{
+    "url": "https://github.com/ITotalJustice/untitled"
+}
--- a/assets/romfs/i18n/de.json
+++ b/assets/romfs/i18n/de.json
@@ -1,75 +1,35 @@
 {
-  "[Applet Mode]": "[Applet-Modus]",
-  "No Internet": "Keine Internetverbindung",
-  "Files": "Dateien",
-  "Apps": "Apps",
-  "Store": "Store",
+  "[Applet Mode]": "   | Applet Modus |",
+  "No Internet": "Kein Internet",
+  "Switch-Handheld!": "Handheld!",
+  "Switch-Docked!": "Angedockt!",
+  "Audio disabled due to suspended game": "Audio deaktivert wegen Spielabbruch",
+  "Are you sure you wish to cancel?": "Bist du sicher dass du abbrechen willst?",
+  "An error occurred": "",
+  "If this message appears repeatedly, please open an issue.": "Bei wiederholtem Auftreten bitte Issue erstellen.",
+
+  "Menu Options": " Menü | Optionen",
  "Menu": "Menü",
-  "Options": "Optionen",
-  "OK": "OK",
-  "Back": "Zurück",
-  "Select": "Auswählen",
-  "Open": "Öffnen",
-  "Launch": "Starten",
-  "Info": "Info",
-  "Install": "Installieren",
-  "Delete": "Löschen",
-  "Restart": "Neustart",
-  "Changelog": "Changelog",
-  "Details": "Details",
-  "Update": "Update",
-  "Remove": "Entfernen",
-  "Download": "Download",
-  "Next Page": "Nächste Seite",
-  "Prev Page": "Vorherige Seite",
-  "Unstar": "Favorit entfernen",
-  "Star": "Favorit",
-  "System memory": "System-Speicher",
-  "microSD card": "microSD-Karte",
-  "Yes": "Ja",
-  "No": "Nein",
-  "Enabled": "Aktiviert",
-  "Disabled": "Deaktiviert",
-
-  "Sort By": "Sortieren nach",
-  "Sort Options": "Sortieroptionen",
-  "Filter": "Filter",
-  "Sort": "Sortieren",
-  "Order": "Reihenfolge",
-  "Search": "Suchen",
-  "Updated": "Aktualisiert",
-  "Updated (Star)": "Aktualisiert (Favoriten)",
-  "Downloads": "Downloads",
-  "Size": "Größe",
-  "Size (Star)": "Größe (Favoriten)",
-  "Alphabetical": "Alphabetisch",
-  "Alphabetical (Star)": "Alphabetisch (Favoriten)",
-  "Likes": "Likes",
-  "ID": "ID",
-  "Decending": "Absteigend",
-  "Descending (down)": "Absteigend",
-  "Desc": "Abst.",
-  "Ascending": "Aufsteigend",
-  "Ascending (Up)": "Aufsteigend",
-  "Asc": "Aufst.",
-
-  "Menu Options": "Menü-Optionen",
-  "Header": "Header",
-  "Theme": "Theme",
-  "Theme Options": "Theme-Optionen",
-  "Select Theme": "Theme auswählen",
-  "Shuffle": "Zufällig",
+  "Theme": "Themes",
+  "Theme Options": " Themes | Optionen",
+  "Select Theme": "Theme wählen",
  "Music": "Musik",
-  "Network": "Netzwerk",
-  "Network Options": "Netzwerk-Optionen",
-  "Nxlink": "Nxlink",
-  "Nxlink Connected": "Nxlink verbunden",
-  "Nxlink Upload": "Nxlink Upload",
-  "Nxlink Finished": "Nxlink abgeschlossen",
-  "Switch-Handheld!": "Switch-Handheld!",
-  "Switch-Docked!": "Switch-Dock-Modus!",
+  "12 Hour Time": "12-Std Zeitformat",
+  "Download Default Music": "",
+  "Failed to download default_music.bfstm, please try again": "",
+  "Overwrite current default music?": "",
+
+  "Network": "Konnektivität",
+  "Network Options": "Konnektivität | Optionen",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
+  "Nxlink": "NXLink",
+  "Nxlink Connected": "NXLink | Verbunden",
+  "Nxlink Upload": "NXLink | wird hochgeladen...",
+  "Nxlink Finished": "NXLink | Hochladen beendet",
+
  "Language": "Sprache",
-  "Auto": "Auto",
+  "Auto": "Systemsprache",
  "English": "English",
  "Japanese": "日本語",
  "French": "Français",
@@ -78,88 +38,106 @@
  "Spanish": "Español",
  "Chinese": "中文",
  "Korean": "한국어",
-  "Dutch": "Dutch",
+  "Dutch": "Nederlands",
  "Portuguese": "Português",
  "Russian": "Русский",
  "Swedish": "Svenska",
-  "Logging": "Logging",
-  "Replace hbmenu on exit": "hbmenu beim Beenden ersetzen",
-  "Misc": "Sonstiges",
-  "Misc Options": "Weitere Optionen",
-  "Web": "Web",
-  "Install forwarders": "Forwarder installieren",
-  "Install location": "Installationsort",
-  "Show install warning": "Installationswarnung anzeigen",
+  "Vietnamese": "tiếng Việt",
+  "Ukrainian": "Українська",

-  "FileBrowser": "Datei-Browser",
-  "%zd files": "%zd Dateien",
-  "%zd dirs": "%zd Ordner",
-  "File Options": "Datei-Optionen",
-  "Show Hidden": "Versteckte anzeigen",
-  "Folders First": "Ordner zuerst",
-  "Hidden Last": "Versteckte zuletzt",
-  "Cut": "Ausschneiden",
-  "Copy": "Kopieren",
-  "Paste": "Einfügen",
-  "Paste ": "Einfügen ",
-  " file(s)?": " Datei(en)?",
-  "Rename": "Umbenennen",
-  "Set New File Name": "Neuen Dateinamen eingeben",
-  "Advanced": "Erweitert",
-  "Advanced Options": "Erweiterte Optionen",
-  "Create File": "Datei erstellen",
-  "Set File Name": "Dateinamen eingeben",
-  "Create Folder": "Ordner erstellen",
-  "Set Folder Name": "Ordnernamen eingeben",
-  "View as text (unfinished)": "Als Text anzeigen (Beta)",
-  "Empty...": "Leer...",
-  "Open with DayBreak?": "Mit DayBreak öffnen?",
-  "Launch ": "Starten ",
-  "Launch option for: ": "Startoption für: ",
-  "Select launcher for: ": "Launcher auswählen für: ",
-
-  "Homebrew": "Homebrew",
-  "Homebrew Options": "Homebrew-Optionen",
-  "Hide Sphaira": "Sphaira ausblenden",
-  "Install Forwarder": "Forwarder installieren",
-  "WARNING: Installing forwarders will lead to a ban!": "WARNUNG: Installation von Forwardern führt zum Ban!",
-  "Installing Forwarder": "Installiere Forwarder",
-  "Creating Program": "Erstelle Programm",
-  "Creating Control": "Erstelle Control",
-  "Creating Meta": "Erstelle Meta",
-  "Writing Nca": "Schreibe NCA",
-  "Updating ncm databse": "Aktualisiere NCM-Datenbank",
-  "Pushing application record": "Übertrage Anwendungsdaten",
-  "Installed!": "Installiert!",
-  "Failed to install forwarder": "Forwarder-Installation fehlgeschlagen",
-  "Unstarred ": "Favorit entfernt ",
-  "Starred ": "Favorit hinzugefügt ",
-
-  "AppStore": "AppStore",
-  "Filter: %s | Sort: %s | Order: %s": "Filter: %s | Sortierung: %s | Reihenfolge: %s",
-  "AppStore Options": "AppStore-Optionen",
-  "All": "Alle",
+  "Misc": "Extras",
+  "Misc Options": " Extras | Optionen",
  "Games": "Spiele",
-  "Emulators": "Emulatoren",
-  "Tools": "Tools",
-  "Themes": "Themes",
-  "Legacy": "Legacy",
-  "version: %s": "Version: %s",
-  "updated: %s": "Aktualisiert: %s",
-  "category: %s": "Kategorie: %s",
-  "extracted: %.2f MiB": "Entpackt: %.2f MiB",
-  "app_dls: %s": "Downloads: %s",
-  "More by Author": "Mehr vom Entwickler",
-  "Leave Feedback": "Feedback geben",
+  "Game Options": "",
+  "Hide forwarders": "",
+  "Launch random game": "",
+  "List meta records": "",
+  "Entries": "",
+  "Failed to list application meta entries": "",
+  "No meta entries found...\n": "",
+  "Updating application record list": "",
+  "Dump": "",
+  "Select content to dump": "",
+  "Dump All": "",
+  "Dump Application": "",
+  "Dump Patch": "",
+  "Dump AddOnContent": "",
+  "Dump DataPatch": "",
+  "Select dump location": "",
+  "microSD card (/dumps/NSP/)": "",
+  "USB transfer (Switch 2 Switch)": "",
+  "/dev/null (Speed Test)": "",
+  "Dumping": "",
+  "Dump successfull!": "",
+  "Dump failed!": "",
+  "Success": "",
+  "Delete successfull!": "",
+  "Delete failed!": "",

+  "Themezer": "Themezer | NX Themes",
+  "Themezer Options": " Themezer | Optionen",
+  "Nsfw": "NSFW",
+  "Page": "Seiten Nr. wählen ",
+  "Page %zu / %zu": " %zu / %zu",
+  "Enter Page Number": "Zu Seite Nr.: ___",
+  "Bad Page": "Seite nicht gefunden",
+  "Download theme?": "Theme herunterladen?",
+
+  "GitHub": "GitHub",
+  "Downloading json": "Lade JSON-File",
+  "Select asset to download for ": "Wähle Asset für den Download von ",
+
+  "FTP Install": "",
+  "FTP Install (EXPERIMENTAL)": "",
+  "Connection Type: WiFi | Strength: ": "",
+  "Connection Type: Ethernet": "",
+  "Connection Type: None": "",
+  "Host:": "",
+  "Port:": "",
+  "Username:": "",
+  "Password:": "",
+  "SSID:": "",
+  "Passphrase:": "",
+  "Failed to install via FTP, press B to exit...": "",
+  "Ftp install success!": "",
+  "Ftp install failed!": "",
+  "USB Install": "",
+  "USB": "",
+  "Connected, waiting for file list...": "",
+  "Connected, starting transfer...": "",
+  "Failed to init usb, press B to exit...": "",
+  "Waiting for connection...": "",
+  "Transferring data...": "",
+  "USB connected, sending file list": "",
+  "Sent file list, waiting for command...": "",
+  "waiting for usb connection...": "",
+  "Disable MTP for usb install": "",
+  "Re-enabled MTP": "",
+  "Installed via usb": "",
+  "Usb install success!": "",
+  "Usb install failed!": "",
+  "Press B to exit...": "",
+  "GameCard Install": "",
+  "GameCard": "",
+  "GC": "",
+  "System memory %.1f GB": "",
+  "microSD card %.1f GB": "",
+  "Nand Install": "",
+  "SD Card Install": "",
+  "Exit": "",
+  "Gc install success!": "",
+  "Gc install failed!": "",
+
+  "IRS (Infrared Joycon Camera)": "",
+  "IRS": "",
  "Irs": "IR-Sensor",
  "Ambient Noise Level: ": "Umgebungsrauschen: ",
  "Controller": "Controller",
  "Pad ": "Pad ",
+  "HandHeld": "Handheld",
  " (Available)": " (Verfügbar)",
  " (Unsupported)": " (Nicht unterstützt)",
  " (Unconnected)": " (Nicht verbunden)",
-  "HandHeld": "Handheld",
  "Rotation": "Rotation",
  "0 (Sideways)": "0° (Seitlich)",
  "90 (Flat)": "90° (Flach)",
@@ -181,50 +159,234 @@
  "Normal image": "Normal-Bild",
  "Negative image": "Negativ-Bild",
  "Format": "Format",
+  "Trimming Format": "Beschnitt-Format",
  "320x240": "320×240",
  "160x120": "160×120",
  "80x60": "80×60",
  "40x30": "40×30",
  "20x15": "20×15",
-  "Trimming Format": "Beschnitt-Format",
  "External Light Filter": "Externes Lichtfilter",
  "Load Default": "Standard laden",

-  "Themezer": "Themezer",
-  "Themezer Options": "Themezer-Optionen",
-  "Nsfw": "NSFW",
-  "Page": "Seite",
-  "Page %zu / %zu": "Seite %zu / %zu",
-  "Enter Page Number": "Seitenzahl eingeben",
-  "Bad Page": "Ungültige Seite",
-  "Download theme?": "Theme herunterladen?",
+  "Advanced": "Erweitert...",
+  "Advanced Options": " Erweitert | Optionen",
+  "Logging": "Protokollieren",
+  "Replace hbmenu on exit": "hbmenu durch sphaira ersetzen",
+  "Restore hbmenu?": "hbmenu wiederherstellen?",
+  "Restore": "Wiederherstellen",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "Die Datei /switch/hbmenu.nro fehlt.\nInstalliere hbmenu über den hb-AppStore.",
+  "Failed to restore hbmenu, please re-download hbmenu": "Fehler, hbmenu nicht wiederhergrstellt!\nInstalliere hbmenu über den hb-AppStore.",
+  "Failed to restore hbmenu, using sphaira instead": "Fehler, hbmenu nicht wiederhergrstellt!\nVerwende weiter sphaira",
+  "Restored hbmenu, closing sphaira": "hbmenu wurde wiederhergestellt, schließe sphaira",
+  "Restored hbmenu": "hbmenu wurde wiederhergestellt",
+  "Restart Sphaira?": "sphaira erneut starten?",
+  "Press OK to restart Sphaira": "Drücke OK um sphaira erneut zustarten",
+  "Text scroll speed": "Laufschrift Tempo",
+  "Slow": "Niedrig",
+  "Normal": "Mittel",
+  "Fast": "Hoch",
+  "Set right-side menu": "",
+  "Install options": "",
+  "Install Options": "",
+  "Enable sysmmc": "",
+  "Enable emummc": "",
+  "Show install warning": "Warnungen anzeigen",
+  "Install location": "Einhängepunkt",
+  "System memory": "NAND Systemspeicher",
+  "microSD card": "SD-Karte",
+  "Boost CPU clock": "",
+  "Allow downgrade": "",
+  "Skip if already installed": "",
+  "Ticket only": "",
+  "Skip base": "",
+  "Skip patch": "",
+  "Skip dlc": "",
+  "Skip data patch": "",
+  "Skip ticket": "",
+  "Skip NCA hash verify": "",
+  "Skip RSA header verify": "",
+  "Skip RSA NPDM verify": "",
+  "Ignore distribution bit": "",
+  "Convert to standard crypto": "",
+  "Lower master key": "",
+  "Lower system version": "",

-  "Installing ": "Installiere ",
-  "Uninstalling ": "Deinstalliere ",
-  "Deleting ": "Lösche ",
-  "Deleting": "Lösche",
-  "Pasting ": "Füge ein ",
-  "Pasting": "Füge ein",
-  "Removing ": "Entferne ",
-  "Scanning ": "Scanne ",
-  "Creating ": "Erstelle ",
-  "Copying ": "Kopiere ",
-  "Trying to load ": "Lade ",
-  "Downloading ": "Lade herunter ",
-  "Checking MD5": "Prüfe MD5",
-  "Loading...": "Lade...",
-  "Loading": "Lade",
-  "Empty!": "Leer!",
-  "Not Ready...": "Nicht bereit...",
-  "Error loading page!": "Fehler beim Laden!",
+  "Homebrew": "hbmenu",
+  "Apps": "hb-Apps",
+  "Homebrew Options": " hbmenu | Optionen",
+  "Hide Sphaira": "Verstecke sphaira",
+  "Install Forwarder": "Forwarder installieren",
+  "WARNING: Installing forwarders will lead to a ban!": "Installiere Forwarder-NSP´s mit VORSICHT.\nEs erhöht das Risiko eines Konsolen-Banns!",
+  "Installing Forwarder": "Installiere Forwarder",
+  "Creating Program": "Erstelle Programm",
+  "Creating Control": "Erstelle Control",
+  "Creating Meta": "Erstelle Meta",
+  "Writing Nca": "Schreibe NCA",
+  "Updating ncm databse": "Aktualisiere NCM-Datenbank",
+  "Pushing application record": "Übertrage Anwendungsdaten",
+  "Failed to install forwarder": "Fehler beim installieren des Forwarders",
+  "Unstarred ": "Favorit entfernt ",
+  "Starred ": "Favorit ",
+  "Failed to remove old forwarder, please manually remove it!": "",
+
+  "AppStore": "hb-AppStore",
+  "Appstore": "",
+  "Store": "hb-Store",
+  "Filter: %s | Sort: %s | Order: %s": "Rubrik: %s | Sort.nach.: %s | Ordnung: %s",
+  "AppStore Options": " hb-AppStore | Optionen",
+  "Info": "Info",
+  "Changelog": "Neuerungen",
+  "Details": "Details",
+  "version: %s": "Version: %s",
+  "updated: %s": "Letztes Update am: %s",
+  "category: %s": "Rubrik: %s",
+  "extracted: %.2f MiB": "Größe: %.2f MiB",
+  "app_dls: %s": "Anzahl Downloads: %s",
+  "More by Author": "Weitere Apps des Entwicklers",
+  "Leave Feedback": "Feedback hinterlassen",
+
+  "FileBrowser": "Datei-Manager",
+  "Files": "Dateien",
+  "%zd files": "%zd Dateien",
+  "%zd dirs": "%zd Ordner",
+  "File Options": "Datei - Ordner | Optionen",
+  "Show Hidden": "Versteckte zeigen",
+  "Folders First": "Ordner zuerst",
+  "Hidden Last": "Versteckte zuletzt",
+  "Cut": "Ausschneiden",
+  "Copy": "Kopieren",
+  "Copying ": "Kopiert wird: ",
+  "Paste": "Einfügen",
+  "Paste ": "Einfügen von: ",
+  " file(s)?": " Datei/en?",
+  "Pasting ": "Eingefügt wird: ",
+  "Pasting": "Eingefügt wurde:",
+  "Rename": "Umbenennen",
+  "Set New File Name": "Neuen Dateinamen festlegen",
+  "Extract zip": "",
+  "Extract Options": "",
+  "Extract here": "",
+  "Extract to root": "",
+  "Are you sure you want to extract to root?": "",
+  "Extract to...": "",
+  "Enter the path to the folder to extract into": "",
+  "Extracting ": "",
+  "Extract success!": "",
+  "Extract failed!": "",
+  "Compress to zip": "",
+  "Compress Options": "",
+  "Compress": "",
+  "Compress to...": "",
+  "Compressing ": "",
+  "Compress success!": "",
+  "Compress failed!": "",
+  "Create File": "Neue Datei",
+  "Set File Name": "Dateiname festlegen",
+  "Create Folder": "Neuer Ordner",
+  "Set Folder Name": "Ordner umbenennen",
+  "Creating ": "Erstellt wird: ",
+  "Upload": "",
+  "Select upload location": "",
+  "No upload locations set!": "",
+  "Uploading": "",
+  "Upload successfull!": "",
+  "Upload failed!": "",
+  "View as text (unfinished)": "Als Text anzeigen",
+  "Ignore read only": "Schreibschutz umgehen?",
+  "Mount": "Einhängen",
+  "Sd": "SD-Karte | Root-Verzeichnis",
+  "Image System memory": "Album | NAND Systemspeicher",
+  "Image microSD card": "Album | SD-Karte",
+  "Empty...": "Keine Daten...",
+  "Open with DayBreak?": "Mit Daybreak öffnen?",
+  "Launch ": "Starte ",
+  "Launch option for: ": "Start Option für: ",
+  "Select launcher for: ": "Wähle Launcher für: ",
+
+  "Sort By": "Sortierung",
+  "Sort Options": " Sortierung | Optionen",
+  "Filter": "Rubrik",
+  "All": "Alles anzeigen",
+  "Emulators": "Emulatoren",
+  "Tools": "Tools",
+  "Themes": "Themes",
+  "Legacy": "Älteres",
+  "Sort": "Sortiert nach",
+  "Size": "Größe",
+  "Size (Star)": "Favorit | Größe",
+  "Alphabetical": "Name",
+  "Alphabetical (Star)": "Favorit | Name",
+  "Updated": "zuletzt aktualisiert",
+  "Updated (Star)": "Favorit | zuletzt aktualisiert",
+  "Downloads": "Downloads",
+  "Likes": "Beliebtheit",
+  "ID": "Theme | Paket ID",
+  "Order": "Anordnung",
+  "Descending": "Absteigend ↓",
+  "Descending (down)": "Absteigend ↓",
+  "Desc": " ↓",
+  "Ascending": "Aufsteigend ↑",
+  "Ascending (Up)": "Aufsteigend ↑",
+  "Asc": " ↑",
+  "Layout": "",
+  "List": "",
+  "Icon": "",
+  "Grid": "",
+  "Search": "Suchen",
+
+  "Options": "Optionen",
+  "OK": "OK",
+  "Back": "Zurück",
+  "Select": "Auswählen",
+  "Open": "Öffne",
+  "Launch": "Starte",
+  "Restart": "Neustart",
+  "Next": "",
+  "Prev": "",
+  "Unstar": "Kein Favorit",
+  "Star": "Favorit",
+  "Yes": "Ja",
+  "No": "Nein",
+  "On": "",
+  "Off": "",
+
+  "Install": "Installieren",
+  "Install Selected files?": "",
+  "Installing ": "Installiert wird: ",
+  "Installed ": "",
+  "Installed!": "Installiert!",
+  "Trying to load ": "Versucht zu laden wird: ",
+  "Checking MD5": "Checke MD5 Prüfsumme",
+
+  "Delete": "Löschen",
+  "Delete Selected files?": "Ausgewähle Dateien löschen?",
+  "Are you sure you want to delete ": "Bist du sicher zu löschen? Bestätige Löschung von: ",
+  "Scanning ": "Gescannt wird: ",
+  "Deleting ": "Gelöscht wird: ",
+  "Deleting": "Gelöscht wurde:",
+  "Remove": "Entfernen",
+  "Completely remove ": "Komplett gelöscht wird: ",
+  "Removing ": "Entfernt wird: ",
+  "Removed ": "Entfernt wurde: ",
+  "Uninstalling ": "Deinstalliert wird: ",
+
+  "Download": "Download",
+  "Downloading ": "Heruntergeladen wird: ",
+  "Downloaded ": "Heruntergeladen wurde: ",
+
+  "Update": "Update",
  "Update avaliable: ": "Update verfügbar: ",
-  "Download update: ": "Update herunterladen: ",
-  "Updated to ": "Aktualisiert auf ",
-  "Restart Sphaira?": "Sphaira neustarten?",
-  "Failed to download update": "Update-Download fehlgeschlagen",
-  "Delete Selected files?": "Ausgewählte Dateien löschen?",
-  "Completely remove ": "Vollständig entfernen ",
-  "Are you sure you want to delete ": "Wirklich löschen ",
-  "Are you sure you wish to cancel?": "Wirklich abbrechen?",
-  "If this message appears repeatedly, please open an issue.": "Bei wiederholtem Auftreten bitte Issue erstellen."
-}
+  "Download update: ": " Herunterladen des Updates: ",
+  "Updated to ": "Aktualisiert auf: ",
+  "Failed to download update": "Herunterladen des Updates fehlgeschlagen!",
+
+  "%zu hours %zu minutes remaining": "",
+  "%zu minutes %zu seconds remaining": "",
+  "%zu seconds remaining": "",
+
+  "Loading...": "Wird geladen...",
+  "Loading": "Wird geladen",
+  "Empty!": "Keine Daten!",
+  "Not Ready...": "Nicht bereit...",
+  "Error loading page!": "Ladefehler!"
+}
--- a/assets/romfs/i18n/en.json
+++ b/assets/romfs/i18n/en.json
@@ -1,73 +1,33 @@
 {
  "[Applet Mode]": "[Applet Mode]",
  "No Internet": "No Internet",
-  "Files": "Files",
-  "Apps": "Apps",
-  "Store": "Store",
-  "Menu": "Menu",
-  "Options": "Options",
-  "OK": "OK",
-  "Back": "Back",
-  "Select": "Select",
-  "Open": "Open",
-  "Launch": "Launch",
-  "Info": "Info",
-  "Install": "Install",
-  "Delete": "Delete",
-  "Restart": "Restart",
-  "Changelog": "Changelog",
-  "Details": "Details",
-  "Update": "Update",
-  "Remove": "Remove",
-  "Download": "Download",
-  "Next Page": "Next Page",
-  "Prev Page": "Prev Page",
-  "Unstar": "Unstar",
-  "Star": "Star",
-  "System memory": "System memory",
-  "microSD card": "microSD card",
-  "Yes": "Yes",
-  "No": "No",
-  "Enabled": "Enabled",
-  "Disabled": "Disabled",
-
-  "Sort By": "Sort By",
-  "Sort Options": "Sort Options",
-  "Filter": "Filter",
-  "Sort": "Sort",
-  "Order": "Order",
-  "Search": "Search",
-  "Updated": "Updated",
-  "Updated (Star)": "Updated (Star)",
-  "Downloads": "Downloads",
-  "Size": "Size",
-  "Size (Star)": "Size (Star)",
-  "Alphabetical": "Alphabetical",
-  "Alphabetical (Star)": "Alphabetical (Star)",
-  "Likes": "Likes",
-  "ID": "ID",
-  "Decending": "Decending",
-  "Descending (down)": "Descending (down)",
-  "Desc": "Desc",
-  "Ascending": "Ascending",
-  "Ascending (Up)": "Ascending (Up)",
-  "Asc": "Asc",
+  "Switch-Handheld!": "Switch-Handheld!",
+  "Switch-Docked!": "Switch-Docked!",
+  "Audio disabled due to suspended game": "Audio disabled due to suspended game",
+  "Are you sure you wish to cancel?": "Are you sure you wish to cancel?",
+  "An error occurred": "An error occurred",
+  "If this message appears repeatedly, please open an issue.": "If this message appears repeatedly, please open an issue.",

  "Menu Options": "Menu Options",
-  "Header": "Header",
+  "Menu": "Menu",
  "Theme": "Theme",
  "Theme Options": "Theme Options",
  "Select Theme": "Select Theme",
-  "Shuffle": "Shuffle",
  "Music": "Music",
+  "12 Hour Time": "12 Hour Time",
+  "Download Default Music": "Download Default Music",
+  "Failed to download default_music.bfstm, please try again": "Failed to download default_music.bfstm, please try again",
+  "Overwrite current default music?": "Overwrite current default music?",
+
  "Network": "Network",
  "Network Options": "Network Options",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
  "Nxlink": "Nxlink",
  "Nxlink Connected": "Nxlink Connected",
  "Nxlink Upload": "Nxlink Upload",
  "Nxlink Finished": "Nxlink Finished",
-  "Switch-Handheld!": "Switch-Handheld!",
-  "Switch-Docked!": "Switch-Docked!",
+
  "Language": "Language",
  "Auto": "Auto",
  "English": "English",
@@ -82,84 +42,102 @@
  "Portuguese": "Português",
  "Russian": "Русский",
  "Swedish": "Svenska",
-  "Logging": "Logging",
-  "Replace hbmenu on exit": "Replace hbmenu on exit",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",
+
  "Misc": "Misc",
  "Misc Options": "Misc Options",
-  "Web": "Web",
-  "Install forwarders": "Install forwarders",
-  "Install location": "Install location",
-  "Show install warning": "Show install warning",
-
-  "FileBrowser": "FileBrowser",
-  "%zd files": "%zd files",
-  "%zd dirs": "%zd dirs",
-  "File Options": "File Options",
-  "Show Hidden": "Show Hidden",
-  "Folders First": "Folders First",
-  "Hidden Last": "Hidden Last",
-  "Cut": "Cut",
-  "Copy": "Copy",
-  "Paste": "Paste",
-  "Paste ": "Paste ",
-  " file(s)?": " file(s)?",
-  "Rename": "Rename",
-  "Set New File Name": "Set New File Name",
-  "Advanced": "Advanced",
-  "Advanced Options": "Advanced Options",
-  "Create File": "Create File",
-  "Set File Name": "Set File Name",
-  "Create Folder": "Create Folder",
-  "Set Folder Name": "Set Folder Name",
-  "View as text (unfinished)": "View as text (unfinished)",
-  "Empty...": "Empty...",
-  "Open with DayBreak?": "Open with DayBreak?",
-  "Launch ": "Launch ",
-  "Launch option for: ": "Launch option for: ",
-  "Select launcher for: ": "Select launcher for: ",
-
-  "Homebrew": "Homebrew",
-  "Homebrew Options": "Homebrew Options",
-  "Hide Sphaira": "Hide Sphaira",
-  "Install Forwarder": "Install Forwarder",
-  "WARNING: Installing forwarders will lead to a ban!": "WARNING: Installing forwarders will lead to a ban!",
-  "Installing Forwarder": "Installing Forwarder",
-  "Creating Program": "Creating Program",
-  "Creating Control": "Creating Control",
-  "Creating Meta": "Creating Meta",
-  "Writing Nca": "Writing Nca",
-  "Updating ncm databse": "Updating ncm databse",
-  "Pushing application record": "Pushing application record",
-  "Installed!": "Installed!",
-  "Failed to install forwarder": "Failed to install forwarder",
-  "Unstarred ": "Unstarred ",
-  "Starred ": "Starred ",
-
-  "AppStore": "AppStore",
-  "Filter: %s | Sort: %s | Order: %s": "Filter: %s | Sort: %s | Order: %s",
-  "AppStore Options": "AppStore Options",
-  "All": "All",
  "Games": "Games",
-  "Emulators": "Emulators",
-  "Tools": "Tools",
-  "Themes": "Themes",
-  "Legacy": "Legacy",
-  "version: %s": "version: %s",
-  "updated: %s": "updated: %s",
-  "category: %s": "category: %s",
-  "extracted: %.2f MiB": "extracted: %.2f MiB",
-  "app_dls: %s": "app_dls: %s",
-  "More by Author": "More by Author",
-  "Leave Feedback": "Leave Feedback",
+  "Game Options": "Game Options",
+  "Hide forwarders": "Hide forwarders",
+  "Launch random game": "Launch random game",
+  "List meta records": "List meta records",
+  "Entries": "Entries",
+  "Failed to list application meta entries": "Failed to list application meta entries",
+  "No meta entries found...\n": "No meta entries found...\n",
+  "Updating application record list": "Updating application record list",
+  "Dump": "Dump",
+  "Select content to dump": "Select content to dump",
+  "Dump All": "Dump All",
+  "Dump Application": "Dump Application",
+  "Dump Patch": "Dump Patch",
+  "Dump AddOnContent": "Dump AddOnContent",
+  "Dump DataPatch": "Dump DataPatch",
+  "Select dump location": "Select dump location",
+  "microSD card (/dumps/NSP/)": "microSD card (/dumps/NSP/)",
+  "USB transfer (Switch 2 Switch)": "USB transfer (Switch 2 Switch)",
+  "/dev/null (Speed Test)": "/dev/null (Speed Test)",
+  "Dumping": "Dumping",
+  "Dump successfull!": "Dump successfull!",
+  "Dump failed!": "Dump failed!",
+  "Success": "Success",
+  "Delete successfull!": "Delete successfull!",
+  "Delete failed!": "Delete failed!",

+  "Themezer": "Themezer",
+  "Themezer Options": "Themezer Options",
+  "Nsfw": "Nsfw",
+  "Page": "Page",
+  "Page %zu / %zu": "Page %zu / %zu",
+  "Enter Page Number": "Enter Page Number",
+  "Bad Page": "Bad Page",
+  "Download theme?": "Download theme?",
+
+  "GitHub": "GitHub",
+  "Downloading json": "Downloading json",
+  "Select asset to download for ": "Select asset to download for ",
+
+  "FTP Install": "FTP Install",
+  "FTP Install (EXPERIMENTAL)": "FTP Install (EXPERIMENTAL)",
+  "Connection Type: WiFi | Strength: ": "Connection Type: WiFi | Strength: ",
+  "Connection Type: Ethernet": "Connection Type: Ethernet",
+  "Connection Type: None": "Connection Type: None",
+  "Host:": "Host:",
+  "Port:": "Port:",
+  "Username:": "Username:",
+  "Password:": "Password:",
+  "SSID:": "SSID:",
+  "Passphrase:": "Passphrase",
+  "Failed to install via FTP, press B to exit...": "Failed to install via FTP, press  to exit...",
+  "Ftp install success!": "Ftp install success!",
+  "Ftp install failed!": "Ftp install failed!",
+  "USB Install": "USB Install",
+  "USB": "USB",
+  "Connected, waiting for file list...": "Connected, waiting for file list...",
+  "Connected, starting transfer...": "Connected, starting transfer...",
+  "Failed to init usb, press B to exit...": "Failed to init usb, press  to exit...",
+  "Waiting for connection...": "Waiting for connection...",
+  "Transferring data...": "Transferring data...",
+  "USB connected, sending file list": "USB connected, sending file list",
+  "Sent file list, waiting for command...": "Sent file list, waiting for command...",
+  "waiting for usb connection...": "waiting for usb connection...",
+  "Disable MTP for usb install": "Disable MTP for usb install",
+  "Re-enabled MTP": "Re-enabled MTP",
+  "Installed via usb": "Installed via usb",
+  "Usb install success!": "Usb install success!",
+  "Usb install failed!": "Usb install failed!",
+  "Press B to exit...": "Press  to exit...",
+  "GameCard Install": "GameCard Install",
+  "GameCard": "GameCard",
+  "GC": "GC",
+  "System memory %.1f GB": "System memory %.1f GB",
+  "microSD card %.1f GB": "microSD card %.1f GB",
+  "Nand Install": "Nand Install",
+  "SD Card Install": "SD Card Install",
+  "Exit": "Exit",
+  "Gc install success!": "Gc install success!",
+  "Gc install failed!": "Gc install failed!",
+
+  "IRS (Infrared Joycon Camera)": "IRS (Infrared Joycon Camera)",
+  "IRS": "IRS",
  "Irs": "Irs",
  "Ambient Noise Level: ": "Ambient Noise Level: ",
  "Controller": "Controller",
  "Pad ": "Pad ",
+  "HandHeld": "HandHeld",
  " (Available)": " (Available)",
  " (Unsupported)": " (Unsupported)",
  " (Unconnected)": " (Unconnected)",
-  "HandHeld": "HandHeld",
  "Rotation": "Rotation",
  "0 (Sideways)": "0 (Sideways)",
  "90 (Flat)": "90 (Flat)",
@@ -181,50 +159,234 @@
  "Normal image": "Normal image",
  "Negative image": "Negative image",
  "Format": "Format",
+  "Trimming Format": "Trimming Format",
  "320x240": "320×240",
  "160x120": "160×120",
  "80x60": "80×60",
  "40x30": "40×30",
  "20x15": "20×15",
-  "Trimming Format": "Trimming Format",
  "External Light Filter": "External Light Filter",
  "Load Default": "Load Default",

-  "Themezer": "Themezer",
-  "Themezer Options": "Themezer Options",
-  "Nsfw": "Nsfw",
-  "Page": "Page",
-  "Page %zu / %zu": "Page %zu / %zu",
-  "Enter Page Number": "Enter Page Number",
-  "Bad Page": "Bad Page",
-  "Download theme?": "Download theme?",
+  "Advanced": "Advanced",
+  "Advanced Options": "Advanced Options",
+  "Logging": "Logging",
+  "Replace hbmenu on exit": "Replace hbmenu on exit",
+  "Restore hbmenu?": "Restore hbmenu?",
+  "Restore": "Restore",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu",
+  "Failed to restore hbmenu, please re-download hbmenu": "Failed to restore hbmenu, please re-download hbmenu",
+  "Failed to restore hbmenu, using sphaira instead": "Failed to restore hbmenu, using sphaira instead",
+  "Restored hbmenu, closing sphaira": "Restored hbmenu, closing sphaira",
+  "Restored hbmenu": "Restored hbmenu",
+  "Restart Sphaira?": "Restart Sphaira?",
+  "Press OK to restart Sphaira": "Press OK to restart Sphaira",
+  "Text scroll speed": "Text scroll speed",
+  "Slow": "Slow",
+  "Normal": "Normal",
+  "Fast": "Fast",
+  "Set right-side menu": "Set right-side menu",
+  "Install options": "Install options",
+  "Install Options": "Install Options",
+  "Enable sysmmc": "Enable sysmmc",
+  "Enable emummc": "Enable emummc",
+  "Show install warning": "Show install warning",
+  "Install location": "Install location",
+  "System memory": "System memory",
+  "microSD card": "microSD card",
+  "Boost CPU clock": "Boost CPU clock",
+  "Allow downgrade": "Allow downgrade",
+  "Skip if already installed": "Skip if already installed",
+  "Ticket only": "Ticket only",
+  "Skip base": "Skip base",
+  "Skip patch": "Skip patch",
+  "Skip dlc": "Skip dlc",
+  "Skip data patch": "Skip data patch",
+  "Skip ticket": "Skip ticket",
+  "Skip NCA hash verify": "Skip NCA hash verify",
+  "Skip RSA header verify": "Skip RSA header verify",
+  "Skip RSA NPDM verify": "Skip RSA NPDM verify",
+  "Ignore distribution bit": "Ignore distribution bit",
+  "Convert to standard crypto": "Convert to standard crypto",
+  "Lower master key": "Lower master key",
+  "Lower system version": "Lower system version",

-  "Installing ": "Installing ",
-  "Uninstalling ": "Uninstalling ",
-  "Deleting ": "Deleting ",
-  "Deleting": "Deleting",
+  "Homebrew": "Homebrew",
+  "Apps": "Apps",
+  "Homebrew Options": "Homebrew Options",
+  "Hide Sphaira": "Hide Sphaira",
+  "Install Forwarder": "Install Forwarder",
+  "WARNING: Installing forwarders will lead to a ban!": "WARNING: Installing forwarders will lead to a ban!",
+  "Installing Forwarder": "Installing Forwarder",
+  "Creating Program": "Creating Program",
+  "Creating Control": "Creating Control",
+  "Creating Meta": "Creating Meta",
+  "Writing Nca": "Writing Nca",
+  "Updating ncm databse": "Updating ncm databse",
+  "Pushing application record": "Pushing application record",
+  "Failed to install forwarder": "Failed to install forwarder",
+  "Unstarred ": "Unstarred ",
+  "Starred ": "Starred ",
+  "Failed to remove old forwarder, please manually remove it!": "Failed to remove old forwarder, please manually remove it!",
+
+  "AppStore": "AppStore",
+  "Appstore": "AppStore",
+  "Store": "Store",
+  "Filter: %s | Sort: %s | Order: %s": "Filter: %s | Sort: %s | Order: %s",
+  "AppStore Options": "AppStore Options",
+  "Info": "Info",
+  "Changelog": "Changelog",
+  "Details": "Details",
+  "version: %s": "version: %s",
+  "updated: %s": "updated: %s",
+  "category: %s": "category: %s",
+  "extracted: %.2f MiB": "extracted: %.2f MiB",
+  "app_dls: %s": "app_dls: %s",
+  "More by Author": "More by Author",
+  "Leave Feedback": "Leave Feedback",
+
+  "FileBrowser": "FileBrowser",
+  "Files": "Files",
+  "%zd files": "%zd files",
+  "%zd dirs": "%zd dirs",
+  "File Options": "File Options",
+  "Show Hidden": "Show Hidden",
+  "Folders First": "Folders First",
+  "Hidden Last": "Hidden Last",
+  "Cut": "Cut",
+  "Copy": "Copy",
+  "Copying ": "Copying ",
+  "Paste": "Paste",
+  "Paste ": "Paste ",
+  " file(s)?": " file(s)?",
  "Pasting ": "Pasting ",
  "Pasting": "Pasting",
-  "Removing ": "Removing ",
-  "Scanning ": "Scanning ",
+  "Rename": "Rename",
+  "Set New File Name": "Set New File Name",
+  "Extract zip": "Extract zip",
+  "Extract Options": "Extract Options",
+  "Extract here": "Extract here",
+  "Extract to root": "Extract to root",
+  "Are you sure you want to extract to root?": "Are you sure you want to extract to root?",
+  "Extract to...": "Extract to...",
+  "Enter the path to the folder to extract into": "Enter the path to the folder to extract into",
+  "Extracting ": "Extracting ",
+  "Extract success!": "Extract success!",
+  "Extract failed!": "Extract failed!",
+  "Compress to zip": "Compress to zip",
+  "Compress Options": "Compress Options",
+  "Compress": "Compress",
+  "Compress to...": "Compress to...",
+  "Compressing ": "Compressing ",
+  "Compress success!": "Compress success!",
+  "Compress failed!": "Compress failed!",
+  "Create File": "Create File",
+  "Set File Name": "Set File Name",
+  "Create Folder": "Create Folder",
+  "Set Folder Name": "Set Folder Name",
  "Creating ": "Creating ",
-  "Copying ": "Copying ",
+  "Upload": "Upload",
+  "Select upload location": "Select upload location",
+  "No upload locations set!": "No upload locations set!",
+  "Uploading": "Uploading",
+  "Upload successfull!": "Upload successfull!",
+  "Upload failed!": "Upload failed!",
+  "View as text (unfinished)": "View as text (unfinished)",
+  "Ignore read only": "Ignore read only",
+  "Mount": "Mount",
+  "Sd": "Sd",
+  "Image System memory": "Image System memory",
+  "Image microSD card": "Image microSD card",
+  "Empty...": "Empty...",
+  "Open with DayBreak?": "Open with DayBreak?",
+  "Launch ": "Launch ",
+  "Launch option for: ": "Launch option for: ",
+  "Select launcher for: ": "Select launcher for: ",
+
+  "Sort By": "Sort By",
+  "Sort Options": "Sort Options",
+  "Filter": "Filter",
+  "All": "All",
+  "Emulators": "Emulators",
+  "Tools": "Tools",
+  "Themes": "Themes",
+  "Legacy": "Legacy",
+  "Sort": "Sort",
+  "Size": "Size",
+  "Size (Star)": "Size (Star)",
+  "Alphabetical": "Alphabetical",
+  "Alphabetical (Star)": "Alphabetical (Star)",
+  "Updated": "Updated",
+  "Updated (Star)": "Updated (Star)",
+  "Downloads": "Downloads",
+  "Likes": "Likes",
+  "ID": "ID",
+  "Order": "Order",
+  "Descending": "Descending",
+  "Descending (down)": "Descending (down)",
+  "Desc": "Desc",
+  "Ascending": "Ascending",
+  "Ascending (Up)": "Ascending (Up)",
+  "Asc": "Asc",
+  "Layout": "Layout",
+  "List": "List",
+  "Icon": "Icon",
+  "Grid": "Grid",
+  "Search": "Search",
+
+  "Options": "Options",
+  "OK": "OK",
+  "Back": "Back",
+  "Select": "Select",
+  "Open": "Open",
+  "Launch": "Launch",
+  "Restart": "Restart",
+  "Next": "Next",
+  "Prev": "Prev",
+  "Unstar": "Unstar",
+  "Star": "Star",
+  "Yes": "Yes",
+  "No": "No",
+  "On": "On",
+  "Off": "Off",
+
+  "Install": "Install",
+  "Install Selected files?": "Install Selected files?",
+  "Installing ": "Installing ",
+  "Installed ": "Installed ",
+  "Installed!": "Installed!",
  "Trying to load ": "Trying to load ",
-  "Downloading ": "Downloading ",
  "Checking MD5": "Checking MD5",
+
+  "Delete": "Delete",
+  "Delete Selected files?": "Delete Selected files?",
+  "Are you sure you want to delete ": "Are you sure you want to delete ",
+  "Scanning ": "Scanning ",
+  "Deleting ": "Deleting ",
+  "Deleting": "Deleting",
+  "Remove": "Remove",
+  "Completely remove ": "Completely remove ",
+  "Removing ": "Removing ",
+  "Removed ": "Removed ",
+  "Uninstalling ": "Uninstalling ",
+
+  "Download": "Download",
+  "Downloading ": "Downloading ",
+  "Downloaded ": "Downloaded ",
+
+  "Update": "Update",
+  "Update avaliable: ": "Update avaliable: ",
+  "Download update: ": "Download update: ",
+  "Updated to ": "Updated to ",
+  "Failed to download update": "Failed to download update",
+
+  "%zu hours %zu minutes remaining": "%zu hours %zu minutes remaining",
+  "%zu minutes %zu seconds remaining": "%zu minutes %zu seconds remaining",
+  "%zu seconds remaining": "%zu seconds remaining",
+
  "Loading...": "Loading...",
  "Loading": "Loading",
  "Empty!": "Empty!",
  "Not Ready...": "Not Ready...",
-  "Error loading page!": "Error loading page!",
-  "Update avaliable: ": "Update avaliable: ",
-  "Download update: ": "Download update: ",
-  "Updated to ": "Updated to ",
-  "Restart Sphaira?": "Restart Sphaira?",
-  "Failed to download update": "Failed to download update",
-  "Delete Selected files?": "Delete Selected files?",
-  "Completely remove ": "Completely remove ",
-  "Are you sure you want to delete ": "Are you sure you want to delete ",
-  "Are you sure you wish to cancel?": "Are you sure you wish to cancel?",
-  "If this message appears repeatedly, please open an issue.": "If this message appears repeatedly, please open an issue."
+  "Error loading page!": "Error loading page!"
 }
--- a/assets/romfs/i18n/es.json
+++ b/assets/romfs/i18n/es.json
@@ -1,73 +1,33 @@
 {
  "[Applet Mode]": "[Modo Applet]",
  "No Internet": "Sin Internet",
-  "Files": "Archivos",
-  "Apps": "Apps",
-  "Store": "Tienda",
+  "Switch-Handheld!": "¡Switch-Modo-Portátil!",
+  "Switch-Docked!": "¡Switch-Modo-TV!",
+  "Audio disabled due to suspended game": "",
+  "Are you sure you wish to cancel?": "¿Estás seguro que deseas cancelar?",
+  "An error occurred": "",
+  "If this message appears repeatedly, please open an issue.": "Si este mensaje aparece repetidamente, por favor abrir un 'issue'.",
+
+  "Menu Options": "Opciones de menú",
  "Menu": "Menú",
-  "Options": "Opciones",
-  "OK": "OK",
-  "Back": "Atrás",
-  "Select": "Seleccionar",
-  "Open": "Abierto",
-  "Launch": "Ejecutar",
-  "Info": "Información",
-  "Install": "Instalar",
-  "Delete": "Borrar",
-  "Restart": "",
-  "Changelog": "Log de Cambios",
-  "Details": "Detalles",
-  "Update": "Actualizar",
-  "Remove": "Borrar",
-  "Download": "Descargar",
-  "Next Page": "Página siguiente",
-  "Prev Page": "Página anterior",
-  "Unstar": "",
-  "Star": "",
-  "System memory": "",
-  "microSD card": "",
-  "Yes": "Sí",
-  "No": "No",
-  "Enabled": "Activado",
-  "Disabled": "Desactivado",
-
-  "Sort By": "Ordenar por",
-  "Sort Options": "Opciones de clasificación",
-  "Filter": "Filtrar",
-  "Sort": "Clasificar",
-  "Order": "Orden",
-  "Search": "Buscar",
-  "Updated": "Actualizado",
-  "Updated (Star)": "Actualizado (Star)",
-  "Downloads": "Descargas",
-  "Size": "Tamaño",
-  "Size (Star)": "Tamaño (Star)",
-  "Alphabetical": "Alfabético",
-  "Alphabetical (Star)": "Alfabético (Star)",
-  "Likes": "Me Gusta",
-  "ID": "ID",
-  "Decending": "Descendente",
-  "Descending (down)": "Descendente (abajo)",
-  "Desc": "Descendente",
-  "Ascending": "Ascendente",
-  "Ascending (Up)": "Ascendente (arriba)",
-  "Asc": "Ascendente",
-
-  "Menu Options": "Opciones de Menú",
-  "Header": "Encabezamiento",
  "Theme": "Tema",
-  "Theme Options": "Opciones de Tema",
-  "Select Theme": "Seleccionar Tema",
-  "Shuffle": "Barajar",
+  "Theme Options": "Opciones de tema",
+  "Select Theme": "Seleccionar tema",
  "Music": "Música",
+  "12 Hour Time": "",
+  "Download Default Music": "",
+  "Failed to download default_music.bfstm, please try again": "",
+  "Overwrite current default music?": "",
+
  "Network": "Red",
-  "Network Options": "Opciones de Red",
-  "Nxlink": "Nxlink",
-  "Nxlink Connected": "Nxlink Conectado",
-  "Nxlink Upload": "Nxlink Subida",
-  "Nxlink Finished": "Nxlink Finalizado",
-  "Switch-Handheld!": "",
-  "Switch-Docked!": "",
+  "Network Options": "Opciones de red",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
+  "Nxlink": "NXlink",
+  "Nxlink Connected": "NXlink conectado",
+  "Nxlink Upload": "NXlink subida",
+  "Nxlink Finished": "NXlink finalizado",
+
  "Language": "Idioma",
  "Auto": "Automático",
  "English": "English",
@@ -82,43 +42,177 @@
  "Portuguese": "Português",
  "Russian": "Русский",
  "Swedish": "Svenska",
-  "Logging": "Explotación florestal",
-  "Replace hbmenu on exit": "Reemplazar hbmenu al salir",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",
+
  "Misc": "Varios",
  "Misc Options": "Opciones varias",
-  "Web": "Web",
-  "Install forwarders": "",
-  "Install location": "",
-  "Show install warning": "",
+  "Games": "Juegos",
+  "Game Options": "",
+  "Hide forwarders": "",
+  "Launch random game": "",
+  "List meta records": "",
+  "Entries": "",
+  "Failed to list application meta entries": "",
+  "No meta entries found...\n": "",
+  "Updating application record list": "",
+  "Dump": "",
+  "Select content to dump": "",
+  "Dump All": "",
+  "Dump Application": "",
+  "Dump Patch": "",
+  "Dump AddOnContent": "",
+  "Dump DataPatch": "",
+  "Select dump location": "",
+  "microSD card (/dumps/NSP/)": "",
+  "USB transfer (Switch 2 Switch)": "",
+  "/dev/null (Speed Test)": "",
+  "Dumping": "",
+  "Dump successfull!": "",
+  "Dump failed!": "",
+  "Success": "",
+  "Delete successfull!": "",
+  "Delete failed!": "",
+
+  "Themezer": "Themezer",
+  "Themezer Options": "Opciones de Themezer",
+  "Nsfw": "NSFW",
+  "Page": "Página",
+  "Page %zu / %zu": "Pág. %zu / %zu",
+  "Enter Page Number": "Ingresar Número de Página",
+  "Bad Page": "Página Errónea",
+  "Download theme?": "¿Descargar Tema?",
+
+  "GitHub": "GitHub",
+  "Downloading json": "Descargando json",
+  "Select asset to download for ": "Seleccionar recurso a descargar para ",
+
+  "FTP Install": "",
+  "FTP Install (EXPERIMENTAL)": "",
+  "Connection Type: WiFi | Strength: ": "",
+  "Connection Type: Ethernet": "",
+  "Connection Type: None": "",
+  "Host:": "",
+  "Port:": "",
+  "Username:": "",
+  "Password:": "",
+  "SSID:": "",
+  "Passphrase:": "",
+  "Failed to install via FTP, press B to exit...": "",
+  "Ftp install success!": "",
+  "Ftp install failed!": "",
+  "USB Install": "",
+  "USB": "",
+  "Connected, waiting for file list...": "",
+  "Connected, starting transfer...": "",
+  "Failed to init usb, press B to exit...": "",
+  "Waiting for connection...": "",
+  "Transferring data...": "",
+  "USB connected, sending file list": "",
+  "Sent file list, waiting for command...": "",
+  "waiting for usb connection...": "",
+  "Disable MTP for usb install": "",
+  "Re-enabled MTP": "",
+  "Installed via usb": "",
+  "Usb install success!": "",
+  "Usb install failed!": "",
+  "Press B to exit...": "",
+  "GameCard Install": "",
+  "GameCard": "",
+  "GC": "",
+  "System memory %.1f GB": "",
+  "microSD card %.1f GB": "",
+  "Nand Install": "",
+  "SD Card Install": "",
+  "Exit": "",
+  "Gc install success!": "",
+  "Gc install failed!": "",
+
+  "IRS (Infrared Joycon Camera)": "",
+  "IRS": "",
+  "Irs": "IRS",
+  "Ambient Noise Level: ": "Nivel de Ruido Ambiente",
+  "Controller": "Control",
+  "Pad ": "GamePad ",
+  "HandHeld": "Portátil",
+  " (Available)": " (Disponible)",
+  " (Unsupported)": "(No Compatible)",
+  " (Unconnected)": " (Desconectado)",
+  "Rotation": "Rotación",
+  "0 (Sideways)": "0° (De lado)",
+  "90 (Flat)": "90° (Plano)",
+  "180 (-Sideways)": "180° (De lado)",
+  "270 (Upside down)": "270° (Al revés)",
+  "Colour": "Color",
+  "Grey": "Gris",
+  "Ironbow": "Paleta térmica",
+  "Green": "Verde",
+  "Red": "Rojo",
+  "Blue": "Azul",
+  "Light Target": "Objetivo de luz",
+  "All leds": "Todos los leds",
+  "Bright group": "Grupo brillo",
+  "Dim group": "Grupo tenue",
+  "None": "Ninguno",
+  "Gain": "Ganancia",
+  "Negative Image": "Imagen negativa",
+  "Normal image": "Imagen normal",
+  "Negative image": "Imagen negativa",
+  "Format": "Formato",
+  "Trimming Format": "Formato de recorte",
+  "320x240": "320×240",
+  "160x120": "160×120",
+  "80x60": "80×60",
+  "40x30": "40×30",
+  "20x15": "20×15",
+  "External Light Filter": "Filtro de luz externa",
+  "Load Default": "Cargar predeterminado",

-  "FileBrowser": "Explorador de Archivos",
-  "%zd files": "%zd files",
-  "%zd dirs": "%zd dirs",
-  "File Options": "Opciones de Tema",
-  "Show Hidden": "Mostrar Oculto",
-  "Folders First": "Carpetas primero",
-  "Hidden Last": "Oculto último",
-  "Cut": "Cortar ",
-  "Copy": "Copiar",
-  "Paste": "Pegar",
-  "Paste ": "Pegar ",
-  " file(s)?": " ¿archivo(s)?",
-  "Rename": "Renombrar",
-  "Set New File Name": "Establecer Nuevo Nombre de Archivo",
  "Advanced": "Avanzado",
-  "Advanced Options": "Opciones Avanzadas",
-  "Create File": "Crear archivo",
-  "Set File Name": "Establecer Nombre de Archivo",
-  "Create Folder": "Crear carpeta",
-  "Set Folder Name": "Establecer Nombre de Carpeta",
-  "View as text (unfinished)": "Ver como texto (sin terminar)",
-  "Empty...": "Vacío...",
-  "Open with DayBreak?": "Abrir con DayBreak",
-  "Launch ": "",
-  "Launch option for: ": "Opción de ejecución para: ",
-  "Select launcher for: ": "",
+  "Advanced Options": "Opciones avanzadas",
+  "Logging": "Registro",
+  "Replace hbmenu on exit": "Reemplazar hbmenu",
+  "Restore hbmenu?": "¿Restaurar hbmenu?",
+  "Restore": "Restaurar",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "Fallo al encontrar /switch/hbmenu.nro\nUsar la Tienda para reinstalar hbmenu",
+  "Failed to restore hbmenu, please re-download hbmenu": "Fallo al restaurar hbmenu, por favor volver a descargar hbmenu",
+  "Failed to restore hbmenu, using sphaira instead": "Fallo al restaurar hbmenu, se usará sphaira",
+  "Restored hbmenu, closing sphaira": "hbmenu restaurado, cerrando sphaira",
+  "Restored hbmenu": "hbmenu restaurado",
+  "Restart Sphaira?": "¿Reiniciar sphaira?",
+  "Press OK to restart Sphaira": "Presiona OK para reiniciar sphaira",
+  "Text scroll speed": "Velocidad de scroll",
+  "Slow": "Lento",
+  "Normal": "Normal",
+  "Fast": "Rápido",
+  "Set right-side menu": "",
+  "Install options": "",
+  "Install Options": "",
+  "Enable sysmmc": "",
+  "Enable emummc": "",
+  "Show install warning": "Precaución de instalación",
+  "Install location": "Dispositivo de instalación",
+  "System memory": "Memoria de sistema",
+  "microSD card": "microSD",
+  "Boost CPU clock": "",
+  "Allow downgrade": "",
+  "Skip if already installed": "",
+  "Ticket only": "",
+  "Skip base": "",
+  "Skip patch": "",
+  "Skip dlc": "",
+  "Skip data patch": "",
+  "Skip ticket": "",
+  "Skip NCA hash verify": "",
+  "Skip RSA header verify": "",
+  "Skip RSA NPDM verify": "",
+  "Ignore distribution bit": "",
+  "Convert to standard crypto": "",
+  "Lower master key": "",
+  "Lower system version": "",

-  "Homebrew": "Honebrew",
+  "Homebrew": "Homebrew",
+  "Apps": "Apps",
  "Homebrew Options": "Opciones de Homebrew",
  "Hide Sphaira": "Ocultar Sphaira",
  "Install Forwarder": "Instalar Forwarder",
@@ -128,103 +222,171 @@
  "Creating Control": "Creando Control",
  "Creating Meta": "Creando Meta",
  "Writing Nca": "Creando NCA",
-  "Updating ncm databse": "Actualizando base de datos ncm ",
-  "Pushing application record": "",
-  "Installed!": "¡Instalado!",
+  "Updating ncm databse": "Actualizando base de datos ncm",
+  "Pushing application record": "Registro de aplicación",
  "Failed to install forwarder": "Fallo al instalar forwarder",
-  "Unstarred ": "",
-  "Starred ": "",
+  "Unstarred ": "Quitar Favorito",
+  "Starred ": "Favorito",
+  "Failed to remove old forwarder, please manually remove it!": "",

-  "AppStore": "AppStore",
+  "AppStore": "Tienda",
+  "Appstore": "",
+  "Store": "Tienda",
  "Filter: %s | Sort: %s | Order: %s": "Filtrar: %s | Clasificar: %s | Orden: %s",
-  "AppStore Options": "Opciones de la AppStore",
-  "All": "Todo",
-  "Games": "Juegos",
-  "Emulators": "Emuladores",
-  "Tools": "Herramientas",
-  "Themes": "Temas",
-  "Legacy": "Legado",
+  "AppStore Options": "Opciones de la Tienda",
+  "Info": "Información",
+  "Changelog": "Log de cambios",
+  "Details": "Detalles",
  "version: %s": "version: %s",
-  "updated: %s": "updated: %s",
-  "category: %s": "category: %s",
-  "extracted: %.2f MiB": "extracted: %.2f MiB",
+  "updated: %s": "actualizado: %s",
+  "category: %s": "categoría: %s",
+  "extracted: %.2f MiB": "extraído: %.2f MiB",
  "app_dls: %s": "app_dls: %s",
  "More by Author": "Mostrar mas del Autor",
  "Leave Feedback": "Dejar Mensaje",

-  "Irs": "IRS",
-  "Ambient Noise Level: ": "Nivel de Ruido",
-  "Controller": "Control",
-  "Pad ": "Almohadilla ",
-  " (Available)": " (Disponible)",
-  " (Unsupported)": "",
-  " (Unconnected)": " (Desconectado)",
-  "HandHeld": "Portátil",
-  "Rotation": "Rotación",
-  "0 (Sideways)": "0 (De Lado)",
-  "90 (Flat)": "90 (Plano)",
-  "180 (-Sideways)": "180 (-De Lado)",
-  "270 (Upside down)": "270 (Al Revés)",
-  "Colour": "Color",
-  "Grey": "Gris",
-  "Ironbow": "Paleta Térmica",
-  "Green": "Verde",
-  "Red": "Rojo",
-  "Blue": "Azul",
-  "Light Target": "Objetivo de Luz",
-  "All leds": "Todos los leds",
-  "Bright group": "Grupo brillante",
-  "Dim group": "Grupo tenue",
-  "None": "Ninguno",
-  "Gain": "Ganancia",
-  "Negative Image": "Imagen Negativa",
-  "Normal image": "Imagen Normal",
-  "Negative image": "Imagen Negativa",
-  "Format": "Formato",
-  "320x240": "320×240",
-  "160x120": "160×120",
-  "80x60": "80×60",
-  "40x30": "40×30",
-  "20x15": "20×15",
-  "Trimming Format": "Formato de Recorte",
-  "External Light Filter": "Filtro de Luz Externa",
-  "Load Default": "Cargar Predeterminado",
-
-  "Themezer": "Themezer",
-  "Themezer Options": "Opciones de Themezer",
-  "Nsfw": "NSFW",
-  "Page": "Página",
-  "Page %zu / %zu": "Page %zu / %zu",
-  "Enter Page Number": "Ingresar Número de Página",
-  "Bad Page": "Página Errónea",
-  "Download theme?": "¿Descargar Tema?",
-
-  "Installing ": "Instalando ",
-  "Uninstalling ": "Desinstalando ",
-  "Deleting ": "Borrando ",
-  "Deleting": "Borrando",
+  "FileBrowser": "Explorador de archivos",
+  "Files": "Archivos",
+  "%zd files": "%zd archivos",
+  "%zd dirs": "%zd carpetas",
+  "File Options": "Opciones de archivo",
+  "Show Hidden": "Mostrar archivos ocultos",
+  "Folders First": "Carpetas primero",
+  "Hidden Last": "Ocultos al final",
+  "Cut": "Cortar",
+  "Copy": "Copiar",
+  "Copying ": "Copiando ",
+  "Paste": "Pegar",
+  "Paste ": "Pegar ",
+  " file(s)?": " ¿archivo(s)?",
  "Pasting ": "Pegando ",
  "Pasting": "Pegando",
-  "Removing ": "Removiendo ",
-  "Scanning ": "Escaneando ",
+  "Rename": "Renombrar",
+  "Set New File Name": "Establecer nuevo nombre de archivo",
+  "Extract zip": "",
+  "Extract Options": "",
+  "Extract here": "",
+  "Extract to root": "",
+  "Are you sure you want to extract to root?": "",
+  "Extract to...": "",
+  "Enter the path to the folder to extract into": "",
+  "Extracting ": "",
+  "Extract success!": "",
+  "Extract failed!": "",
+  "Compress to zip": "",
+  "Compress Options": "",
+  "Compress": "",
+  "Compress to...": "",
+  "Compressing ": "",
+  "Compress success!": "",
+  "Compress failed!": "",
+  "Create File": "Crear archivo",
+  "Set File Name": "Establecer nombre de archivo",
+  "Create Folder": "Crear carpeta",
+  "Set Folder Name": "Establecer nombre de carpeta",
  "Creating ": "Creando ",
-  "Copying ": "Copiando ",
-  "Trying to load ": "",
+  "Upload": "",
+  "Select upload location": "",
+  "No upload locations set!": "",
+  "Uploading": "",
+  "Upload successfull!": "",
+  "Upload failed!": "",
+  "View as text (unfinished)": "Ver como texto (sin terminar)",
+  "Ignore read only": "Ignorar sólo lectura",
+  "Mount": "Montar",
+  "Sd": "SD",
+  "Image System memory": "Imagen memoria interna",
+  "Image microSD card": "Imagen tarjeta microSD",
+  "Empty...": "Vacío...",
+  "Open with DayBreak?": "¿Abrir con DayBreak?",
+  "Launch ": "Abrir ",
+  "Launch option for: ": "Opción de abrir con: ",
+  "Select launcher for: ": "Seleccionar abrir con: ",
+
+  "Sort By": "Ordenar por",
+  "Sort Options": "Opciones de clasificación",
+  "Filter": "Filtrar",
+  "All": "Todo",
+  "Emulators": "Emuladores",
+  "Tools": "Herramientas",
+  "Themes": "Temas",
+  "Legacy": "Legado",
+  "Sort": "Clasificar",
+  "Size": "Tamaño",
+  "Size (Star)": "Tamaño (favorito)",
+  "Alphabetical": "Alfabético",
+  "Alphabetical (Star)": "Alfabético (favorito)",
+  "Updated": "Actualizado",
+  "Updated (Star)": "Actualizado (favorito)",
+  "Downloads": "Descargas",
+  "Likes": "Me Gusta",
+  "ID": "ID",
+  "Order": "Orden",
+  "Descending": "Descendente",
+  "Descending (down)": "Descendente (abajo)",
+  "Desc": "Descendente",
+  "Ascending": "Ascendente",
+  "Ascending (Up)": "Ascendente (arriba)",
+  "Asc": "Ascendente",
+  "Layout": "",
+  "List": "",
+  "Icon": "",
+  "Grid": "",
+  "Search": "Buscar",
+
+  "Options": "Opciones",
+  "OK": "OK",
+  "Back": "Atrás",
+  "Select": "Seleccionar",
+  "Open": "Abrir",
+  "Launch": "Ejecutar",
+  "Restart": "Reiniciar",
+  "Next": "",
+  "Prev": "",
+  "Unstar": "Quitar favorito",
+  "Star": "Favorito",
+  "Yes": "Sí",
+  "No": "No",
+  "On": "",
+  "Off": "",
+
+  "Install": "Instalar",
+  "Install Selected files?": "",
+  "Installing ": "Instalando ",
+  "Installed ": "",
+  "Installed!": "¡Instalado!",
+  "Trying to load ": "Intentando cargar ",
+  "Checking MD5": "Chequeando MD5",
+
+  "Delete": "Borrar",
+  "Delete Selected files?": "¿Eliminar archivos seleccionados?",
+  "Are you sure you want to delete ": "¿Estás seguro que quieres eliminar? ",
+  "Scanning ": "Escaneando ",
+  "Deleting ": "Borrando ",
+  "Deleting": "Borrando",
+  "Remove": "Borrar",
+  "Completely remove ": "Eliminar completamente",
+  "Removing ": "Removiendo ",
+  "Removed ": "Removido ",
+  "Uninstalling ": "Desinstalando ",
+
+  "Download": "Descargar",
  "Downloading ": "Descargando ",
-  "Checking MD5": "Chqueando MD5",
+  "Downloaded ": "Descargado ",
+
+  "Update": "Actualizar",
+  "Update avaliable: ": "Actualización disponible: ",
+  "Download update: ": "Descargar actualización: ",
+  "Updated to ": "Actualizado a ",
+  "Failed to download update": "Fallo al descargar actualización",
+
+  "%zu hours %zu minutes remaining": "",
+  "%zu minutes %zu seconds remaining": "",
+  "%zu seconds remaining": "",
+
  "Loading...": "Cargando...",
  "Loading": "Cargando",
  "Empty!": "¡Vacío!",
-  "Not Ready...": "No Listo Aún...",
-  "Error loading page!": "¡Error cargando la página!",
-  "Update avaliable: ": "Actualización disponible: ",
-  "Download update: ": "Descargar actualización: ",
-  "Updated to ": "",
-  "Restart Sphaira?": "",
-  "Failed to download update": "Fallo al descargar actualización",
-  "Delete Selected files?": "¿Eliminar archivos Seleccionados?",
-  "Completely remove ": "Eliminar completamente",
-  "Are you sure you want to delete ": "¿Estás seguro que quieres eliminar? ",
-  "Are you sure you wish to cancel?": "¿Estás seguro que deseas cancelar?",
-  "If this message appears repeatedly, please open an issue.": ""
+  "Not Ready...": "No listo aún...",
+  "Error loading page!": "¡Error cargando la página!"
 }
--- a/assets/romfs/i18n/fr.json
+++ b/assets/romfs/i18n/fr.json
@@ -1,78 +1,38 @@
 {
  "[Applet Mode]": "[Mode Applet]",
  "No Internet": "Pas d'Internet",
-  "Files": "Fichiers",
-  "Apps": "Applications",
-  "Store": "Magasin",
-  "Menu": "Menu",
-  "Options": "Options",
-  "OK": "OK",
-  "Back": "Retour",
-  "Select": "Sélectionner",
-  "Open": "Ouvrir",
-  "Launch": "Exécuter",
-  "Info": "Info.",
-  "Install": "Installer",
-  "Delete": "Supprimer",
-  "Restart": "Redémarrer",
-  "Changelog": "Changelog",
-  "Details": "Détails",
-  "Update": "Mise à jour",
-  "Remove": "Supprimer",
-  "Download": "Télécharger",
-  "Next Page": "Page Suiv.",
-  "Prev Page": "Page Préc.",
-  "Unstar": "Retirer des favories",
-  "Star": "Ajouter aux favories",
-  "System memory": "Mémoire système",
-  "microSD card": "Carte microSD",
-  "Yes": "Oui",
-  "No": "Non",
-  "Enabled": "Activé(e)",
-  "Disabled": "Désactivé(e)",
-
-  "Sort By": "Tri Par",
-  "Sort Options": "Options de Tri",
-  "Filter": "Filtre",
-  "Sort": "Tri",
-  "Order": "Ordre",
-  "Search": "Recherche",
-  "Updated": "Mis à jour",
-  "Updated (Star)": "Mis à jour (Favories)",
-  "Downloads": "Téléchargements",
-  "Size": "Taille",
-  "Size (Star)": "Taille (Favories)",
-  "Alphabetical": "Alphabétique",
-  "Alphabetical (Star)": "Alphabétique (Favories)",
-  "Likes": "Likes",
-  "ID": "ID",
-  "Decending": "Décroissant",
-  "Descending (down)": "Décroissant",
-  "Desc": "Décroissant",
-  "Ascending": "Croissant",
-  "Ascending (Up)": "Croissant",
-  "Asc": "Croissant",
+  "Switch-Handheld!": "Switch-Portable",
+  "Switch-Docked!": "Switch-Dockée",
+  "Audio disabled due to suspended game": "Audio désactivé à cause d'un jeu suspendu",
+  "Are you sure you wish to cancel?": "Souhaitez-vous vraiment annuler?",
+  "An error occurred": "Une erreur s'est produite",
+  "If this message appears repeatedly, please open an issue.": "Si ce message apparait en boucle veuillez ouvrir une issue.",

  "Menu Options": "Options des Menus",
-  "Header": "En-tête",
+  "Menu": "Menu",
  "Theme": "Thème",
  "Theme Options": "Options de Thème",
  "Select Theme": "Choisir un Thème",
-  "Shuffle": "Aléatoire",
  "Music": "Musique",
+  "12 Hour Time": "Temps sur 12 heures",
+  "Download Default Music": "Télécharger la musique par défaut",
+  "Failed to download default_music.bfstm, please try again": "Echec du téléchargement de default_music.bfstm, veuillez réessayer",
+  "Overwrite current default music?": "Remplacer la musique actuelle par défaut?",
+
  "Network": "Réseau",
  "Network Options": "Options Réseau",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
  "Nxlink": "Nxlink",
  "Nxlink Connected": "Nxlink Connecté",
  "Nxlink Upload": "Nxlink téléversement",
  "Nxlink Finished": "Nxlink terminé",
-  "Switch-Handheld!": "Switch-Portable",
-  "Switch-Docked!": "Switch-Dockée",
+
  "Language": "Langue",
  "Auto": "Auto",
  "English": "English",
  "Japanese": "日本語",
-  "French": "Français", 
+  "French": "Français",
  "German": "Deutsch",
  "Italian": "Italiano",
  "Spanish": "Español",
@@ -82,84 +42,102 @@
  "Portuguese": "Português",
  "Russian": "Русский",
  "Swedish": "Svenska",
-  "Logging": "Journalisation",
-  "Replace hbmenu on exit": "Remplacer hbmenu quand quitté",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",
+
  "Misc": "Divers",
  "Misc Options": "Options Diverses",
-  "Web": "Web",
-  "Install forwarders": "Installer les Forwarders",
-  "Install location": "Emplacement d'installation",
-  "Show install warning": "Afficher l'avertissement d'installation",
-
-  "FileBrowser": "Explorateur de Fichiers",
-  "%zd files": "%zd fichiers",
-  "%zd dirs": "%zd dossiers",
-  "File Options": "Options de Fichier",
-  "Show Hidden": "Afficher Masqués",
-  "Folders First": "Dossiers en Premier",
-  "Hidden Last": "Masqués en Dernier",
-  "Cut": "Couper",
-  "Copy": "Copier",
-  "Paste": "Coller",
-  "Paste ": "Coller ",
-  " file(s)?": " fichier(s)?",
-  "Rename": "Renommer",
-  "Set New File Name": "Nouveau Nom Du Fichier",
-  "Advanced": "Avancé",
-  "Advanced Options": "Options Avancées",
-  "Create File": "Créer un Fichier",
-  "Set File Name": "Nommer Le Fichier",
-  "Create Folder": "Créer un Dossier",
-  "Set Folder Name": "Nommer Le Dossier",
-  "View as text (unfinished)": "Afficher sous forme de texte (inachevé)",
-  "Empty...": "Vide...",
-  "Open with DayBreak?": "Ouvrir avec DayBreak?",
-  "Launch ": "Lancer ",
-  "Launch option for: ": "Option de lancement pour: ",
-  "Select launcher for: ": "Sélectionner le lanceur pour: ",
-
-  "Homebrew": "Homebrew",
-  "Homebrew Options": "Options Homebrew",
-  "Hide Sphaira": "Masquer Sphaira",
-  "Install Forwarder": "Installer le Forwarder",
-  "WARNING: Installing forwarders will lead to a ban!": "ATTENTION: L'installation de forwarders entraînera un ban!",
-  "Installing Forwarder": "Installation Du Forwarder",
-  "Creating Program": "Création de Program",
-  "Creating Control": "Création de Control",
-  "Creating Meta": "Création de Meta",
-  "Writing Nca": "Ecriture NCA",
-  "Updating ncm databse": "Mise à jour de ncm databse",
-  "Pushing application record": "Ajout de l'enregistrement de l'application",
-  "Installed!": "Installé!",
-  "Failed to install forwarder": "Echec de l'installation du forwarder",
-  "Unstarred ": "Retiré des favories ",
-  "Starred ": "Ajouté aux favories ",
-
-  "AppStore": "AppStore",
-  "Filter: %s | Sort: %s | Order: %s": "Filtre: %s | Tri: %s | Ordre: %s",
-  "AppStore Options": "Options de l'AppStore",
-  "All": "Tous",
  "Games": "Jeux",
-  "Emulators": "Émulateurs",
-  "Tools": "Outils",
-  "Themes": "Thèmes",
-  "Legacy": "Legacy",
-  "version: %s": "version: %s",
-  "updated: %s": "Mis à jour: %s",
-  "category: %s": "catégorie: %s",
-  "extracted: %.2f MiB": "Extrait: %.2f MiB",
-  "app_dls: %s": "app_dls: %s",
-  "More by Author": "Plus de cet Auteur",
-  "Leave Feedback": "Laisser un avis",
+  "Game Options": "Options de jeu",
+  "Hide forwarders": "Masquer les forwarders",
+  "Launch random game": "Lancer un jeu au hasard",
+  "List meta records": "Lister les enregistrements meta",
+  "Entries": "Entrées",
+  "Failed to list application meta entries": "Le listage des entrées meta de l'application a échoué",
+  "No meta entries found...\n": "Aucune entrée meta trouvée...\n",
+  "Updating application record list": "Mise à jour de la liste d'enregistrement de l'application",
+  "Dump": "Dumper",
+  "Select content to dump": "Sélectionner un contenu à dumper",
+  "Dump All": "Tout dumper",
+  "Dump Application": "Dumper Application",
+  "Dump Patch": "Dumper mise à jour",
+  "Dump AddOnContent": "Dumper DLCs",
+  "Dump DataPatch": "Dumper patch de données",
+  "Select dump location": "Sélectionner l'emplacement du dump",
+  "microSD card (/dumps/NSP/)": "carte microSD (/dumps/NSP/)",
+  "USB transfer (Switch 2 Switch)": "Transfert USB (Switch à Switch",
+  "/dev/null (Speed Test)": "/dev/null (test de vitesse)",
+  "Dumping": "Dump en cours",
+  "Dump successfull!": "Dump réussi!",
+  "Dump failed!": "Dump échoué!",
+  "Success": "Succès",
+  "Delete successfull!": "Suprression réussie!",
+  "Delete failed!": "Suprression échouée!",

+  "Themezer": "Themezer",
+  "Themezer Options": "Options Themezer",
+  "Nsfw": "Nsfw",
+  "Page": "Page",
+  "Page %zu / %zu": "Page %zu / %zu",
+  "Enter Page Number": "Entrez Un Numéro De Page",
+  "Bad Page": "Page inexistante",
+  "Download theme?": "Télécharger le thème?",
+
+  "GitHub": "GitHub",
+  "Downloading json": "Téléchargement du json",
+  "Select asset to download for ": "Sélectionner l'asset à télécharger pour ",
+
+  "FTP Install": "Installation via FTP",
+  "FTP Install (EXPERIMENTAL)": "Installation via FTP (EXPERIMENTAL)",
+  "Connection Type: WiFi | Strength: ": "Type de connexion: WiFi, force du signal: ",
+  "Connection Type: Ethernet": "Type de connexion: Ethernet",
+  "Connection Type: None": "Type de connexion: Aucune",
+  "Host:": "Hôte:",
+  "Port:": "Port:",
+  "Username:": "Nom d'utilisateur:",
+  "Password:": "Mot de passe:",
+  "SSID:": "SSID:",
+  "Passphrase:": "Mot de passe:",
+  "Failed to install via FTP, press B to exit...": "Installation via FTP échouée, appuyer sur B pour quitter...",
+  "Ftp install success!": "Installation via FTP réussie!",
+  "Ftp install failed!": "Installation via FTP échouée!",
+  "USB Install": "Installation via USB",
+  "USB": "USB",
+  "Connected, waiting for file list...": "Connecté, en attente de la liste des fichiers...",
+  "Connected, starting transfer...": "Connecté, début du transfère...",
+  "Failed to init usb, press B to exit...": "Echec de l'initialisation de l'USB, appuyer sur B pour quitter...",
+  "Waiting for connection...": "En attente de la connexion...",
+  "Transferring data...": "Transfère de données...",
+  "USB connected, sending file list": "USB connecté, envoi de la liste des fichiers",
+  "Sent file list, waiting for command...": "Liste des fichiers envoyée, attente d'une commande...",
+  "waiting for usb connection...": "En attente d'une connexion USB...",
+  "Disable MTP for usb install": "Désactivation du MTP pour l'installation via USB",
+  "Re-enabled MTP": "Réactivation du MTP",
+  "Installed via usb": "Installé via USB",
+  "Usb install success!": "Installation via USB réussie!",
+  "Usb install failed!": "Installation via USB échouée!",
+  "Press B to exit...": "Appuyer sur B pour quitter...",
+  "GameCard Install": "Installation de la cartouche",
+  "GameCard": "Cartouche",
+  "GC": "GC",
+  "System memory %.1f GB": "Mémoire système %.1f GB",
+  "microSD card %.1f GB": "Carte microSD %.1f GB",
+  "Nand Install": "Installer sur la Nand",
+  "SD Card Install": "Installer sur la carte SD",
+  "Exit": "Quitter",
+  "Gc install success!": "Installation de la cartouche réussie!",
+  "Gc install failed!": "Installation de la cartouche échouée!",
+
+  "IRS (Infrared Joycon Camera)": "IRS (infrarouge de la caméra du Joycon",
+  "IRS": "IRS",
  "Irs": "Irs",
  "Ambient Noise Level: ": "Niveau De Bruit Ambiant: ",
  "Controller": "Contrôleur",
  "Pad ": "Manette ",
+  "HandHeld": "Portable",
  " (Available)": " (Disponible)",
  " (Unsupported)": "Non supporté",
  " (Unconnected)": " (Non connectée)",
-  "HandHeld": "Portable",
  "Rotation": "Rotation",
  "0 (Sideways)": "0 (Paysage)",
  "90 (Flat)": "90 (Portrait)",
@@ -177,54 +155,238 @@
  "Dim group": "Groupe sombre",
  "None": "Aucun",
  "Gain": "Gain",
-  "Negative Image": "Négatif",
+  "Negative Image": "Image Négative",
  "Normal image": "Image normale",
-  "Negative image": "Négatif",
+  "Negative image": "Image négative",
  "Format": "Format",
+  "Trimming Format": "Format de Découpe",
  "320x240": "320×240",
  "160x120": "160×120",
  "80x60": "80×60",
  "40x30": "40×30",
  "20x15": "20×15",
-  "Trimming Format": "Format de Découpe",
  "External Light Filter": "Filtre de Lumière Externe",
  "Load Default": "Charger par Défaut",

-  "Themezer": "Themezer",
-  "Themezer Options": "Options Themezer",
-  "Nsfw": "Nsfw",
-  "Page": "Page",
-  "Page %zu / %zu": "Page %zu / %zu",
-  "Enter Page Number": "Entrez Un Numéro De Page",
-  "Bad Page": "Page inexistante",
-  "Download theme?": "Télécharger le thème?",
+  "Advanced": "Avancé",
+  "Advanced Options": "Options Avancées",
+  "Logging": "Journalisation",
+  "Replace hbmenu on exit": "Remplacer hbmenu quand quitté",
+  "Restore hbmenu?": "Restaurer hbmenu?",
+  "Restore": "Restaurer",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "/switch/hbmenu.nro n'a pas été trouvé\nUtiliser l'Appstore pour réinstaller le hbmenu",
+  "Failed to restore hbmenu, please re-download hbmenu": "Echec de la restauration de hbmenu, veuillez le réinstaller",
+  "Failed to restore hbmenu, using sphaira instead": "Echec de la restauration de hbmenu, sphaira sera utilisé à la place",
+  "Restored hbmenu, closing sphaira": "Hbmenu restauré, fermeture de sphaira",
+  "Restored hbmenu": "Hbmenu restauré",
+  "Restart Sphaira?": "Redémarrer Sphaira?",
+  "Press OK to restart Sphaira": "Appuyez sur OK pour redémarrer Sphaira",
+  "Text scroll speed": "Vitesse de défilement du texte",
+  "Slow": "Lent",
+  "Normal": "Normal",
+  "Fast": "Rapide",
+  "Set right-side menu": "Configurer le menu de droite",
+  "Install options": "Options d'installation",
+  "Install Options": "Options d'Installation",
+  "Enable sysmmc": "Activer sur la sysmmc",
+  "Enable emummc": "Activer sur l'emummc",
+  "Show install warning": "Afficher l'avertissement d'installation",
+  "Install location": "Emplacement d'installation",
+  "System memory": "Mémoire système",
+  "microSD card": "Carte microSD",
+  "Boost CPU clock": "Augmenter la vitesse de l'horloge  CPU",
+  "Allow downgrade": "Autoriser le downgrade",
+  "Skip if already installed": "Ignorer si déjà installé",
+  "Ticket only": "Seulement le ticket",
+  "Skip base": "Ignorer base",
+  "Skip patch": "Ignorer mise à jour",
+  "Skip dlc": "Ignorer DLC",
+  "Skip data patch": "Ignorer patch de données",
+  "Skip ticket": "Ignorer ticket",
+  "Skip NCA hash verify": "Ignorer la vérification du hash NCA",
+  "Skip RSA header verify": "Ignorer la vérification de l'entête RSA",
+  "Skip RSA NPDM verify": "Ignorer la vérification RSA NPDM",
+  "Ignore distribution bit": "Ignorer le bit de distribution",
+  "Convert to standard crypto": "Convertir vers la crypto standard",
+  "Lower master key": "Abaisser la master key",
+  "Lower system version": "Abaisser la version du système",

-  "Installing ": "Installation ",
-  "Uninstalling ": "Désinstallation ",
-  "Deleting ": "Suppression ",
-  "Deleting": "Suppression",
-  "Pasting ": "Coller ",
-  "Pasting": "Coller",
-  "Removing ": "Suppression ",
-  "Scanning ": "Scan ",
+  "Homebrew": "Homebrew",
+  "Apps": "Applications",
+  "Homebrew Options": "Options Homebrew",
+  "Hide Sphaira": "Masquer Sphaira",
+  "Install Forwarder": "Installer le Forwarder",
+  "WARNING: Installing forwarders will lead to a ban!": "ATTENTION: L'installation de forwarders entraînera un ban!",
+  "Installing Forwarder": "Installation Du Forwarder",
+  "Creating Program": "Création de Program",
+  "Creating Control": "Création de Control",
+  "Creating Meta": "Création de Meta",
+  "Writing Nca": "Ecriture NCA",
+  "Updating ncm databse": "Mise à jour de ncm databse",
+  "Pushing application record": "Ajout de l'enregistrement de l'application",
+  "Failed to install forwarder": "Echec de l'installation du forwarder",
+  "Unstarred ": "Retiré des favories ",
+  "Starred ": "Ajouté aux favories ",
+  "Failed to remove old forwarder, please manually remove it!": "Supression de l'ancien forwarder échouée, supprimez-le manuellement!",
+
+  "AppStore": "AppStore",
+  "Appstore": "Magasin d'applications",
+  "Store": "Magasin",
+  "Filter: %s | Sort: %s | Order: %s": "Filtre: %s | Tri: %s | Ordre: %s",
+  "AppStore Options": "Options de l'AppStore",
+  "Info": "Info.",
+  "Changelog": "Journal des modifications",
+  "Details": "Détails",
+  "version: %s": "version: %s",
+  "updated: %s": "Mis à jour: %s",
+  "category: %s": "catégorie: %s",
+  "extracted: %.2f MiB": "Extrait: %.2f MiB",
+  "app_dls: %s": "app_dls: %s",
+  "More by Author": "Plus de cet Auteur",
+  "Leave Feedback": "Laisser un avis",
+
+  "FileBrowser": "Explorateur de Fichiers",
+  "Files": "Fichiers",
+  "%zd files": "%zd fichiers",
+  "%zd dirs": "%zd dossiers",
+  "File Options": "Options de Fichier",
+  "Show Hidden": "Afficher Masqués",
+  "Folders First": "Dossiers en Premier",
+  "Hidden Last": "Masqués en Dernier",
+  "Cut": "Couper",
+  "Copy": "Copier",
+  "Copying ": "Copie en cours ",
+  "Paste": "Coller",
+  "Paste ": "Coller ",
+  " file(s)?": " fichier(s)?",
+  "Pasting ": "Collage en cours ",
+  "Pasting": "Collage en cours",
+  "Rename": "Renommer",
+  "Set New File Name": "Nouveau Nom Du Fichier",
+  "Extract zip": "Extraire le zip",
+  "Extract Options": "Options d'extraction",
+  "Extract here": "Extraire ici",
+  "Extract to root": "Extraire à la racine",
+  "Are you sure you want to extract to root?": "Souhaitez-vous vraiment extraire à la racine?",
+  "Extract to...": "Extraire vers...",
+  "Enter the path to the folder to extract into": "Entrer le chemin du répertoire vers lequel extraire",
+  "Extracting ": "Extraction en cours ",
+  "Extract success!": "Extraction réussie!",
+  "Extract failed!": "Extraction échouée!",
+  "Compress to zip": "Compresser en zip",
+  "Compress Options": "Options de compression",
+  "Compress": "Compresser",
+  "Compress to...": "Compresser vers...",
+  "Compressing ": "Compression en cours ",
+  "Compress success!": "Compression réussie!",
+  "Compress failed!": "Compression échouée!",
+  "Create File": "Créer un Fichier",
+  "Set File Name": "Nommer Le Fichier",
+  "Create Folder": "Créer un Dossier",
+  "Set Folder Name": "Nommer Le Dossier",
  "Creating ": "Création ",
-  "Copying ": "Copie ",
+  "Upload": "Upload",
+  "Select upload location": "Sélectionner l'emplacement d'upload",
+  "No upload locations set!": "Aucun emplacement d'upload configuré!",
+  "Uploading": "Upload en cours",
+  "Upload successfull!": "Upload réussi!",
+  "Upload failed!": "Upload échoué!",
+  "View as text (unfinished)": "Afficher sous forme de texte (inachevé)",
+  "Ignore read only": "Ignorer lecture seule",
+  "Mount": "Monter",
+  "Sd": "Sd",
+  "Image System memory": "Image de la mémoire System",
+  "Image microSD card": "Image de la Carte microSD",
+  "Empty...": "Vide...",
+  "Open with DayBreak?": "Ouvrir avec DayBreak?",
+  "Launch ": "Lancer ",
+  "Launch option for: ": "Option de lancement pour: ",
+  "Select launcher for: ": "Sélectionner le lanceur pour: ",
+
+  "Sort By": "Tri Par",
+  "Sort Options": "Options de Tri",
+  "Filter": "Filtre",
+  "All": "Tous",
+  "Emulators": "Émulateurs",
+  "Tools": "Outils",
+  "Themes": "Thèmes",
+  "Legacy": "Legacy",
+  "Sort": "Tri",
+  "Size": "Taille",
+  "Size (Star)": "Taille (Favories)",
+  "Alphabetical": "Alphabétique",
+  "Alphabetical (Star)": "Alphabétique (Favories)",
+  "Updated": "Mis à jour",
+  "Updated (Star)": "Mis à jour (Favories)",
+  "Downloads": "Téléchargements",
+  "Likes": "Likes",
+  "ID": "ID",
+  "Order": "Ordre",
+  "Descending": "Décroissant",
+  "Descending (down)": "Décroissant (vers le bas)",
+  "Desc": "Décroissant",
+  "Ascending": "Croissant",
+  "Ascending (Up)": "Croissant (vers le haut)",
+  "Asc": "Croissant",
+  "Layout": "Type d'affichage",
+  "List": "Liste",
+  "Icon": "Icône",
+  "Grid": "Grille",
+  "Search": "Recherche",
+
+  "Options": "Options",
+  "OK": "OK",
+  "Back": "Retour",
+  "Select": "Sélectionner",
+  "Open": "Ouvrir",
+  "Launch": "Exécuter",
+  "Restart": "Redémarrer",
+  "Next": "Suivant",
+  "Prev": "Précédent",
+  "Unstar": "Retirer des favories",
+  "Star": "Ajouter aux favories",
+  "Yes": "Oui",
+  "No": "Non",
+  "On": "On",
+  "Off": "Off",
+
+  "Install": "Installer",
+  "Install Selected files?": "Installer les fichiers sélectionnés?",
+  "Installing ": "Installation en cours ",
+  "Installed ": "Installé ",
+  "Installed!": "Installé!",
  "Trying to load ": "Tente de charger ",
-  "Downloading ": "Téléchargement ",
  "Checking MD5": "Vérification MD5",
-  "Loading...": "Chargement...",
-  "Loading": "Chargement",
-  "Empty!": "Vide!",
-  "Not Ready...": "Pas prêt",
-  "Error loading page!": "Erreur du chargement de la page!",
+
+  "Delete": "Supprimer",
+  "Delete Selected files?": "Supprimer les fichiers sélectionnés?",
+  "Are you sure you want to delete ": "Êtes-vous sûr de vouloir supprimer ",
+  "Scanning ": "Scan en cours ",
+  "Deleting ": "Suppression en cours ",
+  "Deleting": "Suppression en cours",
+  "Remove": "Supprimer",
+  "Completely remove ": "Supprimer totalement ",
+  "Removing ": "Suppression en cours ",
+  "Removed ": "Supprimé ",
+  "Uninstalling ": "Désinstallation en cours ",
+
+  "Download": "Télécharger",
+  "Downloading ": "Téléchargement en cours ",
+  "Downloaded ": "Téléchargé",
+
+  "Update": "Mise à jour",
  "Update avaliable: ": "Mise à jour disponible: ",
  "Download update: ": "Télécharger la mise à jour: ",
  "Updated to ": "Mis à jour vers ",
-  "Restart Sphaira?": "Redémarrer Sphaira?",
  "Failed to download update": "Echec du téléchargement de la mise à jour",
-  "Delete Selected files?": "Supprimer les fichiers sélectionnés?",
-  "Completely remove ": "Supprimer totalement ",
-  "Are you sure you want to delete ": "Êtes-vous sûr de vouloir supprimer ",
-  "Are you sure you wish to cancel?": "Souhaitez-vous vraiment annuler?",
-  "If this message appears repeatedly, please open an issue.": "Si ce message apparait en boucle veuillez ouvrir une issue."
-}
+
+  "%zu hours %zu minutes remaining": "%zu heures %zu minutes restantes",
+  "%zu minutes %zu seconds remaining": "%zu minutes %zu secondes restantes",
+  "%zu seconds remaining": "%zu secondes restantes",
+
+  "Loading...": "Chargement...",
+  "Loading": "Chargement en cours",
+  "Empty!": "Vide!",
+  "Not Ready...": "Pas prêt",
+  "Error loading page!": "Erreur du chargement de la page!"
+}
--- a/assets/romfs/i18n/it.json
+++ b/assets/romfs/i18n/it.json
@@ -1,75 +1,35 @@
 {
  "[Applet Mode]": "[Modalità applet]",
  "No Internet": "Niente Internet",
-  "Files": "",
-  "Apps": "",
-  "Store": "",
-  "Menu": "Menu",
-  "Options": "Opzioni",
-  "OK": "",
-  "Back": "Indietro",
-  "Select": "",
-  "Open": "Apri",
-  "Launch": "Lancia",
-  "Info": "Informazioni",
-  "Install": "Installa",
-  "Delete": "Elimina",
-  "Restart": "",
-  "Changelog": "",
-  "Details": "",
-  "Update": "",
-  "Remove": "",
-  "Download": "Download",
-  "Next Page": "Pagina successiva",
-  "Prev Page": "Pagina precedente",
-  "Unstar": "",
-  "Star": "",
-  "System memory": "",
-  "microSD card": "",
-  "Yes": "Sì",
-  "No": "No",
-  "Enabled": "Abilitato",
-  "Disabled": "Disabilitato",
-
-  "Sort By": "Ordina per",
-  "Sort Options": "Opzioni filtro",
-  "Filter": "Filtro",
-  "Sort": "Riordina",
-  "Order": "Ordina",
-  "Search": "Ricerca",
-  "Updated": "Aggiornato",
-  "Updated (Star)": "",
-  "Downloads": "Download",
-  "Size": "Misurare",
-  "Size (Star)": "",
-  "Alphabetical": "Alfabetico",
-  "Alphabetical (Star)": "",
-  "Likes": "",
-  "ID": "",
-  "Decending": "Decrescente",
-  "Descending (down)": "Decrescente",
-  "Desc": "Decrescente",
-  "Ascending": "Crescente",
-  "Ascending (Up)": "Crescente",
-  "Asc": "Crescente",
+  "Switch-Handheld!": "Switch Portatile",
+  "Switch-Docked!": "Switch Dock",
+  "Audio disabled due to suspended game": "Audio disabilitato poichè un app è in pausa",
+  "Are you sure you wish to cancel?": "Sei sicuro di voler annullare?",
+  "An error occurred": "",
+  "If this message appears repeatedly, please open an issue.": "Se questo messaggio appare frequentemente, segnala il bug.",

  "Menu Options": "Opzioni menu",
-  "Header": "Intestazione",
+  "Menu": "Menu",
  "Theme": "Tema",
  "Theme Options": "Opzioni tema",
  "Select Theme": "Seleziona tema",
-  "Shuffle": "Mescola",
  "Music": "Musica",
+  "12 Hour Time": "",
+  "Download Default Music": "",
+  "Failed to download default_music.bfstm, please try again": "",
+  "Overwrite current default music?": "",
+
  "Network": "Rete",
  "Network Options": "Opzioni di rete",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
  "Nxlink": "Nxlink",
-  "Nxlink Connected": "",
-  "Nxlink Upload": "",
-  "Nxlink Finished": "",
-  "Switch-Handheld!": "",
-  "Switch-Docked!": "",
+  "Nxlink Connected": "Nxlink connesso",
+  "Nxlink Upload": "Nxlink upload",
+  "Nxlink Finished": "Nxlink finito",
+
  "Language": "Lingua",
-  "Auto": "",
+  "Auto": "Auto",
  "English": "English",
  "Japanese": "日本語",
  "French": "Français",
@@ -82,84 +42,102 @@
  "Portuguese": "Português",
  "Russian": "Русский",
  "Swedish": "Svenska",
-  "Logging": "Logging",
-  "Replace hbmenu on exit": "Sostituisci hbmenu all'uscita",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",
+
  "Misc": "Varie",
  "Misc Options": "Opzioni varie",
-  "Web": "Rete",
-  "Install forwarders": "",
-  "Install location": "",
-  "Show install warning": "",
-
-  "FileBrowser": "FileBrowser",
-  "%zd files": "%zd files",
-  "%zd dirs": "%zd dirs",
-  "File Options": "Opzioni file",
-  "Show Hidden": "Mostra nascosto",
-  "Folders First": "Prima le cartelle",
-  "Hidden Last": "Ultimo nascosto",
-  "Cut": "Taglia",
-  "Copy": "Copia",
-  "Paste": "",
-  "Paste ": "",
-  " file(s)?": "",
-  "Rename": "Rinomina",
-  "Set New File Name": "",
-  "Advanced": "Avanzato",
-  "Advanced Options": "Opzioni avanzate",
-  "Create File": "Crea file",
-  "Set File Name": "",
-  "Create Folder": "Crea cartella",
-  "Set Folder Name": "",
-  "View as text (unfinished)": "Visualizza come testo (non finito)",
-  "Empty...": "",
-  "Open with DayBreak?": "",
-  "Launch ": "",
-  "Launch option for: ": "",
-  "Select launcher for: ": "",
-
-  "Homebrew": "Homebrew",
-  "Homebrew Options": "Opzioni Homebrew",
-  "Hide Sphaira": "Nascondi Sphaira",
-  "Install Forwarder": "Installa forwarder",
-  "WARNING: Installing forwarders will lead to a ban!": "ATTENZIONE: l'installazione di forwarder porterà al ban!",
-  "Installing Forwarder": "",
-  "Creating Program": "",
-  "Creating Control": "",
-  "Creating Meta": "",
-  "Writing Nca": "",
-  "Updating ncm databse": "",
-  "Pushing application record": "",
-  "Installed!": "",
-  "Failed to install forwarder": "",
-  "Unstarred ": "",
-  "Starred ": "",
-
-  "AppStore": "",
-  "Filter: %s | Sort: %s | Order: %s": "Filtro: %s | Riordina: %s | Ordina: %s",
-  "AppStore Options": "Opzioni dell'App Store",
-  "All": "Tutto",
  "Games": "Giochi",
-  "Emulators": "Emulatori",
-  "Tools": "Strumenti",
-  "Themes": "Temi",
-  "Legacy": "Legacy",
-  "version: %s": "version: %s",
-  "updated: %s": "updated: %s",
-  "category: %s": "category: %s",
-  "extracted: %.2f MiB": "extracted: %.2f MiB",
-  "app_dls: %s": "app_dls: %s",
-  "More by Author": "",
-  "Leave Feedback": "",
+  "Game Options": "",
+  "Hide forwarders": "",
+  "Launch random game": "",
+  "List meta records": "",
+  "Entries": "",
+  "Failed to list application meta entries": "",
+  "No meta entries found...\n": "",
+  "Updating application record list": "",
+  "Dump": "",
+  "Select content to dump": "",
+  "Dump All": "",
+  "Dump Application": "",
+  "Dump Patch": "",
+  "Dump AddOnContent": "",
+  "Dump DataPatch": "",
+  "Select dump location": "",
+  "microSD card (/dumps/NSP/)": "",
+  "USB transfer (Switch 2 Switch)": "",
+  "/dev/null (Speed Test)": "",
+  "Dumping": "",
+  "Dump successfull!": "",
+  "Dump failed!": "",
+  "Success": "",
+  "Delete successfull!": "",
+  "Delete failed!": "",

+  "Themezer": "Themezer",
+  "Themezer Options": "Impostazioni Themezer",
+  "Nsfw": "NSFW",
+  "Page": "Pagina",
+  "Page %zu / %zu": "Pagina %zu / %zu",
+  "Enter Page Number": "Inserisci il numero della pagina",
+  "Bad Page": "Pagina invalida",
+  "Download theme?": "Vuoi scaricare il tema?",
+
+  "GitHub": "GitHub",
+  "Downloading json": "Scaricamento json",
+  "Select asset to download for ": "",
+
+  "FTP Install": "",
+  "FTP Install (EXPERIMENTAL)": "",
+  "Connection Type: WiFi | Strength: ": "",
+  "Connection Type: Ethernet": "",
+  "Connection Type: None": "",
+  "Host:": "",
+  "Port:": "",
+  "Username:": "",
+  "Password:": "",
+  "SSID:": "",
+  "Passphrase:": "",
+  "Failed to install via FTP, press B to exit...": "",
+  "Ftp install success!": "",
+  "Ftp install failed!": "",
+  "USB Install": "",
+  "USB": "",
+  "Connected, waiting for file list...": "",
+  "Connected, starting transfer...": "",
+  "Failed to init usb, press B to exit...": "",
+  "Waiting for connection...": "",
+  "Transferring data...": "",
+  "USB connected, sending file list": "",
+  "Sent file list, waiting for command...": "",
+  "waiting for usb connection...": "",
+  "Disable MTP for usb install": "",
+  "Re-enabled MTP": "",
+  "Installed via usb": "",
+  "Usb install success!": "",
+  "Usb install failed!": "",
+  "Press B to exit...": "",
+  "GameCard Install": "",
+  "GameCard": "",
+  "GC": "",
+  "System memory %.1f GB": "",
+  "microSD card %.1f GB": "",
+  "Nand Install": "",
+  "SD Card Install": "",
+  "Exit": "",
+  "Gc install success!": "",
+  "Gc install failed!": "",
+
+  "IRS (Infrared Joycon Camera)": "",
+  "IRS": "",
  "Irs": "Irs",
  "Ambient Noise Level: ": "",
  "Controller": "Controller",
  "Pad ": "Pad ",
+  "HandHeld": "HandHeld",
  " (Available)": " (Disponibile)",
  " (Unsupported)": "",
  " (Unconnected)": " (Non connesso)",
-  "HandHeld": "HandHeld",
  "Rotation": "Rotazione",
  "0 (Sideways)": "0 (Di lato)",
  "90 (Flat)": "90 (Piatto)",
@@ -181,50 +159,234 @@
  "Normal image": "Immagine normale",
  "Negative image": "Immagine negativa",
  "Format": "Formato",
+  "Trimming Format": "Formato di ritaglio",
  "320x240": "320×240",
  "160x120": "160×120",
  "80x60": "80×60",
  "40x30": "40×30",
  "20x15": "20×15",
-  "Trimming Format": "Formato di ritaglio",
  "External Light Filter": "Filtro luce esterno",
  "Load Default": "Carica predefinito",

-  "Themezer": "Themezer",
-  "Themezer Options": "",
-  "Nsfw": "",
-  "Page": "",
-  "Page %zu / %zu": "Page %zu / %zu",
-  "Enter Page Number": "",
-  "Bad Page": "",
-  "Download theme?": "",
+  "Advanced": "Avanzato",
+  "Advanced Options": "Opzioni avanzate",
+  "Logging": "Logging",
+  "Replace hbmenu on exit": "Sostituisci hbmenu all'uscita",
+  "Restore hbmenu?": "Vuoi ripristinare hbmenu?",
+  "Restore": "Ripristina",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "Impossibile trovare /switch/hbmenu.nro\nUsa l'Appstore per reinstallare hbmenu",
+  "Failed to restore hbmenu, please re-download hbmenu": "Impossibile ripristinare hbmenu, per favore riscaricalo",
+  "Failed to restore hbmenu, using sphaira instead": "Impossibile ripristinare hbmenu, uso Sphaira invece",
+  "Restored hbmenu, closing sphaira": "hbmenu ripristinato, chiudo Sphaira",
+  "Restored hbmenu": "hbmenu ripristinato",
+  "Restart Sphaira?": "Vuoi riavviare Sphaira?",
+  "Press OK to restart Sphaira": "Premi OK per riavviare Sphaira",
+  "Text scroll speed": "",
+  "Slow": "",
+  "Normal": "",
+  "Fast": "",
+  "Set right-side menu": "",
+  "Install options": "",
+  "Install Options": "",
+  "Enable sysmmc": "",
+  "Enable emummc": "",
+  "Show install warning": "Mostra avvertimento installazione",
+  "Install location": "Installa posizione",
+  "System memory": "Memoria di sistema",
+  "microSD card": "Scheda microSD",
+  "Boost CPU clock": "",
+  "Allow downgrade": "",
+  "Skip if already installed": "",
+  "Ticket only": "",
+  "Skip base": "",
+  "Skip patch": "",
+  "Skip dlc": "",
+  "Skip data patch": "",
+  "Skip ticket": "",
+  "Skip NCA hash verify": "",
+  "Skip RSA header verify": "",
+  "Skip RSA NPDM verify": "",
+  "Ignore distribution bit": "",
+  "Convert to standard crypto": "",
+  "Lower master key": "",
+  "Lower system version": "",

-  "Installing ": "",
-  "Uninstalling ": "",
-  "Deleting ": "",
-  "Deleting": "",
-  "Pasting ": "",
-  "Pasting": "",
-  "Removing ": "",
-  "Scanning ": "",
-  "Creating ": "",
-  "Copying ": "",
-  "Trying to load ": "",
-  "Downloading ": "",
-  "Checking MD5": "",
-  "Loading...": "",
-  "Loading": "",
-  "Empty!": "",
-  "Not Ready...": "",
-  "Error loading page!": "",
-  "Update avaliable: ": "",
-  "Download update: ": "",
-  "Updated to ": "",
-  "Restart Sphaira?": "",
-  "Failed to download update": "",
-  "Delete Selected files?": "",
-  "Completely remove ": "",
+  "Homebrew": "Homebrew",
+  "Apps": "App",
+  "Homebrew Options": "Opzioni Homebrew",
+  "Hide Sphaira": "Nascondi Sphaira",
+  "Install Forwarder": "Installa forwarder",
+  "WARNING: Installing forwarders will lead to a ban!": "ATTENZIONE: l'installazione di forwarder porterà al ban!",
+  "Installing Forwarder": "",
+  "Creating Program": "",
+  "Creating Control": "",
+  "Creating Meta": "",
+  "Writing Nca": "",
+  "Updating ncm databse": "",
+  "Pushing application record": "",
+  "Failed to install forwarder": "",
+  "Unstarred ": "",
+  "Starred ": "",
+  "Failed to remove old forwarder, please manually remove it!": "",
+
+  "AppStore": "",
+  "Appstore": "",
+  "Store": "Store",
+  "Filter: %s | Sort: %s | Order: %s": "Filtro: %s | Riordina: %s | Ordina: %s",
+  "AppStore Options": "Opzioni dell'App Store",
+  "Info": "Informazioni",
+  "Changelog": "Patch notes",
+  "Details": "Dettagli",
+  "version: %s": "version: %s",
+  "updated: %s": "updated: %s",
+  "category: %s": "category: %s",
+  "extracted: %.2f MiB": "extracted: %.2f MiB",
+  "app_dls: %s": "app_dls: %s",
+  "More by Author": "",
+  "Leave Feedback": "",
+
+  "FileBrowser": "FileBrowser",
+  "Files": "File",
+  "%zd files": "%zd files",
+  "%zd dirs": "%zd dirs",
+  "File Options": "Opzioni file",
+  "Show Hidden": "Mostra nascosto",
+  "Folders First": "Prima le cartelle",
+  "Hidden Last": "Ultimo nascosto",
+  "Cut": "Taglia",
+  "Copy": "Copia",
+  "Copying ": "Copio",
+  "Paste": "Incolla",
+  "Paste ": "Incolla ",
+  " file(s)?": "(i)file?",
+  "Pasting ": "Incollo",
+  "Pasting": "Incollo",
+  "Rename": "Rinomina",
+  "Set New File Name": "Imposta nuovo nome",
+  "Extract zip": "",
+  "Extract Options": "",
+  "Extract here": "",
+  "Extract to root": "",
+  "Are you sure you want to extract to root?": "",
+  "Extract to...": "",
+  "Enter the path to the folder to extract into": "",
+  "Extracting ": "",
+  "Extract success!": "",
+  "Extract failed!": "",
+  "Compress to zip": "",
+  "Compress Options": "",
+  "Compress": "",
+  "Compress to...": "",
+  "Compressing ": "",
+  "Compress success!": "",
+  "Compress failed!": "",
+  "Create File": "Crea file",
+  "Set File Name": "Imposta nome",
+  "Create Folder": "Crea cartella",
+  "Set Folder Name": "Imposta nome",
+  "Creating ": "Creazione",
+  "Upload": "",
+  "Select upload location": "",
+  "No upload locations set!": "",
+  "Uploading": "",
+  "Upload successfull!": "",
+  "Upload failed!": "",
+  "View as text (unfinished)": "Visualizza come testo (non finito)",
+  "Ignore read only": "Ignora read only",
+  "Mount": "Monta",
+  "Sd": "SD",
+  "Image System memory": "Immagine memoria di sistema",
+  "Image microSD card": "Immagine scheda microSD",
+  "Empty...": "Vuoto...",
+  "Open with DayBreak?": "Vuoi aprire con Daybreak?",
+  "Launch ": "Lancia",
+  "Launch option for: ": "Lancia opzione per",
+  "Select launcher for: ": "Scegli launcher per",
+
+  "Sort By": "Ordina per",
+  "Sort Options": "Opzioni filtro",
+  "Filter": "Filtro",
+  "All": "Tutto",
+  "Emulators": "Emulatori",
+  "Tools": "Strumenti",
+  "Themes": "Temi",
+  "Legacy": "Legacy",
+  "Sort": "Riordina",
+  "Size": "Dimensione",
+  "Size (Star)": "Dimensione (Preferiti)",
+  "Alphabetical": "Alfabetico",
+  "Alphabetical (Star)": "Alfabetico (Preferiti)",
+  "Updated": "Aggiornato",
+  "Updated (Star)": "",
+  "Downloads": "Download",
+  "Likes": "Mi Piace",
+  "ID": "ID",
+  "Order": "Ordina",
+  "Descending": "Decrescente",
+  "Descending (down)": "Decrescente",
+  "Desc": "Decrescente",
+  "Ascending": "Crescente",
+  "Ascending (Up)": "Crescente",
+  "Asc": "Crescente",
+  "Layout": "",
+  "List": "",
+  "Icon": "",
+  "Grid": "",
+  "Search": "Ricerca",
+
+  "Options": "Opzioni",
+  "OK": "OK",
+  "Back": "Indietro",
+  "Select": "Seleziona",
+  "Open": "Apri",
+  "Launch": "Lancia",
+  "Restart": "Riavvia",
+  "Next": "",
+  "Prev": "",
+  "Unstar": "Rimuovi dai preferiti",
+  "Star": "Aggiungi ai preferiti",
+  "Yes": "Sì",
+  "No": "No",
+  "On": "",
+  "Off": "",
+
+  "Install": "Installa",
+  "Install Selected files?": "",
+  "Installing ": "Installazione",
+  "Installed ": "",
+  "Installed!": "",
+  "Trying to load ": "Cercando di caricare",
+  "Checking MD5": "Controllo MD5",
+
+  "Delete": "Elimina",
+  "Delete Selected files?": "Vuoi rimuovere i file selezionati?",
  "Are you sure you want to delete ": "Sei sicuro di voler eliminare? ",
-  "Are you sure you wish to cancel?": "",
-  "If this message appears repeatedly, please open an issue.": ""
+  "Scanning ": "Scan",
+  "Deleting ": "Eliminazione",
+  "Deleting": "Eliminazione",
+  "Remove": "Rimuovi",
+  "Completely remove ": "Elimina definitivamente",
+  "Removing ": "Rimozione",
+  "Removed ": "Rimosso",
+  "Uninstalling ": "Disinstallazione",
+
+  "Download": "Download",
+  "Downloading ": "Scaricando",
+  "Downloaded ": "Scaricato",
+
+  "Update": "Aggiorna",
+  "Update avaliable: ": "Aggiornamento disponibile",
+  "Download update: ": "Scarica aggiornamento",
+  "Updated to ": "Aggiornato a",
+  "Failed to download update": "Download aggiornamento fallito",
+
+  "%zu hours %zu minutes remaining": "",
+  "%zu minutes %zu seconds remaining": "",
+  "%zu seconds remaining": "",
+
+  "Loading...": "Caricamento...",
+  "Loading": "Caricamento",
+  "Empty!": "Vuoto!",
+  "Not Ready...": "Non pronto...",
+  "Error loading page!": "Errore nel caricare la pagina!"
 }
--- a/assets/romfs/i18n/ja.json
+++ b/assets/romfs/i18n/ja.json
@@ -1,73 +1,33 @@
 {
  "[Applet Mode]": "［Appletモード］",
  "No Internet": "インターネットなし",
-  "Files": "ファイル",
-  "Apps": "アプリ",
-  "Store": "AppStore",
-  "Menu": "メニュー",
-  "Options": "設定",
-  "OK": "確認",
-  "Back": "戻る",
-  "Select": "選択",
-  "Open": "開く",
-  "Launch": "起動",
-  "Info": "情報",
-  "Install": "インストール",
-  "Delete": "削除",
-  "Restart": "再起動",
-  "Changelog": "リリースノート",
-  "Details": "詳細",
-  "Update": "アップデート",
-  "Remove": "除去",
-  "Download": "ダウンロード",
-  "Next Page": "次のページ",
-  "Prev Page": "前のページ",
-  "Unstar": "お気に入り解除",
-  "Star": "お気に入り",
-  "System memory": "システムメモリ",
-  "microSD card": "SDメモリーカード",
-  "Yes": "はい",
-  "No": "いいえ",
-  "Enabled": "",
-  "Disabled": "",
-
-  "Sort By": "並べ替え",
-  "Sort Options": "並べ替え設定",
-  "Filter": "フィルター",
-  "Sort": "並べ替え",
-  "Order": "順番",
-  "Search": "検索",
-  "Updated": "アップデート順",
-  "Updated (Star)": "アップデート順(お気に入り)",
-  "Downloads": "ダウンロード順",
-  "Size": "ファイルサイズ",
-  "Size (Star)": "ファイルサイズ(お気に入り)",
-  "Alphabetical": "アルファベット順",
-  "Alphabetical (Star)": "アルファベット順(お気に入り)",
-  "Likes": "いいね順",
-  "ID": "デベロッパー順",
-  "Decending": "降順",
-  "Descending (down)": "降順",
-  "Desc": "降順",
-  "Ascending": "上昇",
-  "Ascending (Up)": "上昇",
-  "Asc": "上昇",
+  "Switch-Handheld!": "ハンドヘルド!",
+  "Switch-Docked!": "ドック接続!",
+  "Audio disabled due to suspended game": "ゲームが一時停止状態の場合、オーディオは無効になります",
+  "Are you sure you wish to cancel?": "本当に取り消しますか?",
+  "An error occurred": "不具合のお知らせ",
+  "If this message appears repeatedly, please open an issue.": "このメッセージが繰り返し表示される場合は、問題を開いてください",

  "Menu Options": "メニュー設定",
-  "Header": "ヘッダー",
+  "Menu": "メニュー",
  "Theme": "テーマ",
  "Theme Options": "テーマ設定",
  "Select Theme": "テーマを選ぶ",
-  "Shuffle": "シャッフル",
  "Music": "BGM",
+  "12 Hour Time": "12時間表示",
+  "Download Default Music": "基本BGMダウンロード",
+  "Failed to download default_music.bfstm, please try again": "基本BGMのダウンロードに失敗しました、もう一度お試しください",
+  "Overwrite current default music?": "BGMを書き換えますか?",
+
  "Network": "ネットワーク",
  "Network Options": "ネットワーク設定",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
  "Nxlink": "Nxlink",
  "Nxlink Connected": "Nxlink 接続",
  "Nxlink Upload": "Nxlink アップロード",
  "Nxlink Finished": "Nxlink 終了",
-  "Switch-Handheld!": "ハンドヘルド!",
-  "Switch-Docked!": "ドック接続!",
+
  "Language": "言語",
  "Auto": "自動",
  "English": "English",
@@ -82,84 +42,102 @@
  "Portuguese": "Português",
  "Russian": "Русский",
  "Swedish": "Svenska",
-  "Logging": "ログの取得",
-  "Replace hbmenu on exit": "終了時に hbmenu を置き換える",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",
+
  "Misc": "その他",
  "Misc Options": "その他",
-  "Web": "ウェブブラウザ",
-  "Install forwarders": "Forwarderのインストール機能",
-  "Install location": "インストール経路",
-  "Show install warning": "警告文を示す",
-
-  "FileBrowser": "ファイルブラウザ",
-  "%zd files": "%zd個のファイル",
-  "%zd dirs": "%zd個のフォルダー",
-  "File Options": "ファイル設定",
-  "Show Hidden": "非表示ファイルを表示",
-  "Folders First": "フォルダーを優先",
-  "Hidden Last": "非表示ファイルを劣後",
-  "Cut": "切り取り",
-  "Copy": "コピー",
-  "Paste": "ペースト",
-  "Paste ": " ",
-  " file(s)?": "個のファイルをペーストしますか?",
-  "Rename": "名前の変更",
-  "Set New File Name": "新しい名前を入力",
-  "Advanced": "高度な",
-  "Advanced Options": "高度設定",
-  "Create File": "ファイルの作成",
-  "Set File Name": "名前を入力",
-  "Create Folder": "フォルダーの作成",
-  "Set Folder Name": "名前を入力",
-  "View as text (unfinished)": "テキストとして表示 (未完成)",
-  "Empty...": "このフォルダーは空です",
-  "Open with DayBreak?": "DayBreakで開きますか?",
-  "Launch ": "起動しますか",
-  "Launch option for: ": "起動設定: ",
-  "Select launcher for: ": "起動ランチャーを選ぶ: ",
-
-  "Homebrew": "Homebrew",
-  "Homebrew Options": "Homebrew設定",
-  "Hide Sphaira": "Sphairaを非表示",
-  "Install Forwarder": "Forwarderのインストール",
-  "WARNING: Installing forwarders will lead to a ban!": "警告: ForwarderをインストールするとBANされます。",
-  "Installing Forwarder": "Forwarderのインストール中",
-  "Creating Program": "プログラム作成中",
-  "Creating Control": "コントロール作成中",
-  "Creating Meta": "メター作成中",
-  "Writing Nca": "Nca書き取り中",
-  "Updating ncm databse": "ncmのDBをアップデート中",
-  "Pushing application record": "アプリの記録をプッシュ中",
-  "Installed!": "インストール完了",
-  "Failed to install forwarder": "Forwarderのインストール失敗",
-  "Unstarred ": "お気に入り解除: ",
-  "Starred ": "お気に入りに登録: ",
-
-  "AppStore": "AppStore",
-  "Filter: %s | Sort: %s | Order: %s": "フィルター: %s | 並べ替え: %s | 順番: %s",
-  "AppStore Options": "AppStoreの設定",
-  "All": "全て",
  "Games": "ゲーム",
-  "Emulators": "エミュレータ",
-  "Tools": "ツール",
-  "Themes": "テーマ",
-  "Legacy": "レガシー",
-  "version: %s": "バージョン: %s",
-  "updated: %s": "更新日: %s",
-  "category: %s": "カテゴリー: %s",
-  "extracted: %.2f MiB": "容量: %.2f MiB",
-  "app_dls: %s": "ダウンロード: %s",
-  "More by Author": "ディベロッパーの他のアプリを見る",
-  "Leave Feedback": "意見を残す",
+  "Game Options": "ゲーム設定",
+  "Hide forwarders": "Forwarderを隠す",
+  "Launch random game": "ゲームをランダム起動",
+  "List meta records": "メタレコード一覧",
+  "Entries": "エントリ",
+  "Failed to list application meta entries": "ゲームのメタ一覧を表示できませんでした",
+  "No meta entries found...\n": "メタエントリが見つかりませんでした\n",
+  "Updating application record list": "ゲームのレコードを更新しています",
+  "Dump": "吸出し",
+  "Select content to dump": "吸出すコンテンツを選択",
+  "Dump All": "全て",
+  "Dump Application": "ゲームのみ",
+  "Dump Patch": "ゲームパッチのみ",
+  "Dump AddOnContent": "DLCのみ",
+  "Dump DataPatch": "DLCパッチのみ",
+  "Select dump location": "吸出し位置を選択",
+  "microSD card (/dumps/NSP/)": "SDカード (/dumps/NSP/)",
+  "USB transfer (Switch 2 Switch)": "USB転送 (Switch 2 Switch)",
+  "/dev/null (Speed Test)": "/dev/null (Speed Test)",
+  "Dumping": "吸出し中",
+  "Dump successfull!": "吸出し完了!",
+  "Dump failed!": "吸出し失敗!",
+  "Success": "完了",
+  "Delete successfull!": "削除完了!",
+  "Delete failed!": "削除失敗!",

+  "Themezer": "Themezer",
+  "Themezer Options": "Themezer設定",
+  "Nsfw": "アダルトテーマ",
+  "Page": "ページ",
+  "Page %zu / %zu": "ページ %zu / %zu",
+  "Enter Page Number": "ページの番号を入力",
+  "Bad Page": "ページが見つかりません",
+  "Download theme?": "テーマをインストールしますか?",
+
+  "GitHub": "GitHub",
+  "Downloading json": "JSONからダウンロード",
+  "Select asset to download for ": "ダウンロードアイテムを選択 ",
+
+  "FTP Install": "FTPでインストール",
+  "FTP Install (EXPERIMENTAL)": "FTPでインストール(実験機能)",
+  "Connection Type: WiFi | Strength: ": "接続: WiFi | 強度: ",
+  "Connection Type: Ethernet": "接続: イーサネット",
+  "Connection Type: None": "接続: なし",
+  "Host:": "ホースと:",
+  "Port:": "Port:",
+  "Username:": "ユーザー名:",
+  "Password:": "暗証番号:",
+  "SSID:": "SSID:",
+  "Passphrase:": "WiFi暗証番号:",
+  "Failed to install via FTP, press B to exit...": "FTP経由でインストールできませんでした、を押して終了します",
+  "Ftp install success!": "FTPインストール完了!",
+  "Ftp install failed!": "FTPインストール失敗!",
+  "USB Install": "USBインストール",
+  "USB": "USBインストール",
+  "Connected, waiting for file list...": "接続されました、ファイル リスト待機中",
+  "Connected, starting transfer...": "接続されました、転送開始",
+  "Failed to init usb, press B to exit...": "USB接続できませんでした、を押して終了します",
+  "Waiting for connection...": "接続待機中",
+  "Transferring data...": "データ転送中",
+  "USB connected, sending file list": "接続されました、ファイルリスト送信中",
+  "Sent file list, waiting for command...": "ファイルリストを送信しました、入力待機中",
+  "waiting for usb connection...": "USB接続待機中",
+  "Disable MTP for usb install": "USBインストールのため、MTPを無効にします",
+  "Re-enabled MTP": "MTPに再接続します",
+  "Installed via usb": "USBインストールに成功しました",
+  "Usb install success!": "USBインストール完了!",
+  "Usb install failed!": "USBインストール失敗!",
+  "Press B to exit...": "を押して終了します",
+  "GameCard Install": "ゲームカードインストール",
+  "GameCard": "ゲームカードインストール",
+  "GC": "ゲームカード",
+  "System memory %.1f GB": "本体保存メモリー %.1f GB",
+  "microSD card %.1f GB": "SDカード %.1f GB",
+  "Nand Install": "本体保存メモリーにインストール",
+  "SD Card Install": "SDカードにインストール",
+  "Exit": "もどる",
+  "Gc install success!": "ゲームカードインストール完了!",
+  "Gc install failed!": "ゲームカードインストール失敗!",
+
+  "IRS (Infrared Joycon Camera)": "Joy-Con IRカメラ",
+  "IRS": "Joy-Con IRカメラ",
  "Irs": "Joy-Con IRカメラ",
  "Ambient Noise Level: ": "ノイズレベル: ",
  "Controller": "コントローラー",
  "Pad ": "Joy-Con ",
+  "HandHeld": "ハンドヘルド",
  " (Available)": " (利用可能)",
  " (Unsupported)": " (未対応)",
  " (Unconnected)": " (未接続)",
-  "HandHeld": "ハンドヘルド",
  "Rotation": "回転",
  "0 (Sideways)": "0 (横)",
  "90 (Flat)": "90 (フラット)",
@@ -181,50 +159,234 @@
  "Normal image": "通常画像",
  "Negative image": "ネガティブなイメージ",
  "Format": "解像度",
+  "Trimming Format": "トリミングされた解像度",
  "320x240": "320×240",
  "160x120": "160×120",
  "80x60": "80×60",
  "40x30": "40×30",
  "20x15": "20×15",
-  "Trimming Format": "トリミングされた解像度",
  "External Light Filter": "外光フィルター",
  "Load Default": "基本設定に戻す",

-  "Themezer": "Themezer",
-  "Themezer Options": "Themezer設定",
-  "Nsfw": "アダルトテーマ",
-  "Page": "ページ",
-  "Page %zu / %zu": "ページ %zu / %zu",
-  "Enter Page Number": "ページの番号を入力",
-  "Bad Page": "ページが見つかりません",
-  "Download theme?": "テーマをインストールしますか?",
+  "Advanced": "高度な",
+  "Advanced Options": "高度設定",
+  "Logging": "ログの取得",
+  "Replace hbmenu on exit": "終了時に hbmenu を置き換える",
+  "Restore hbmenu?": "hbmenuに戻しますか?",
+  "Restore": "復元",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "/switch/hbmemu.nroが見つかりません\nAppstoreから再インストールしてください",
+  "Failed to restore hbmenu, please re-download hbmenu": "hbmenuを復元できませんでした、再インストールしてください",
+  "Failed to restore hbmenu, using sphaira instead": "hbmenuを復元できませんでした、sphairaを引き続き使います",
+  "Restored hbmenu, closing sphaira": "hbmenuに復元されました、sphairaを終了します",
+  "Restored hbmenu": "hbmenuに復元されました",
+  "Restart Sphaira?": "Sphairaを再起動しますか?",
+  "Press OK to restart Sphaira": "確認ボタンを押してSphairaを再起動",
+  "Text scroll speed": "流れる文字の速さ",
+  "Slow": "遅い",
+  "Normal": "普通",
+  "Fast": "速い",
+  "Set right-side menu": "右側メニュー設定",
+  "Install options": "インストール設定",
+  "Install Options": "インストール設定",
+  "Enable sysmmc": "SYSNANDを有効化",
+  "Enable emummc": "EMUNANDを有効化",
+  "Show install warning": "警告文を示す",
+  "Install location": "インストール経路",
+  "System memory": "本体保存メモリー",
+  "microSD card": "SDカード",
+  "Boost CPU clock": "CPUクロックをブースト",
+  "Allow downgrade": "ダウングレード許可",
+  "Skip if already installed": "既にインストールされている場合はスキップします",
+  "Ticket only": "チケットのみ設置",
+  "Skip base": "ゲームをスキップ",
+  "Skip patch": "ゲームパッチをスキップ",
+  "Skip dlc": "DLCをスキップ",
+  "Skip data patch": "DLCパッチをスキップ",
+  "Skip ticket": "チケットをスキップ",
+  "Skip NCA hash verify": "NCAハッシュ検証をスキップ",
+  "Skip RSA header verify": "RSAヘッダー検証をスキップ",
+  "Skip RSA NPDM verify": "RSA NPDM検証をスキップ",
+  "Ignore distribution bit": "分散ビットを無視",
+  "Convert to standard crypto": "標準暗号に変換",
+  "Lower master key": "下位マスターキーを許容",
+  "Lower system version": "下位システムバージョンを許容",

-  "Installing ": "インストール中 ",
-  "Uninstalling ": "アンインストール中 ",
-  "Deleting ": "削除中 ",
-  "Deleting": "削除中",
+  "Homebrew": "Homebrew",
+  "Apps": "アプリ",
+  "Homebrew Options": "Homebrew設定",
+  "Hide Sphaira": "Sphairaを非表示",
+  "Install Forwarder": "Forwarderのインストール",
+  "WARNING: Installing forwarders will lead to a ban!": "警告: ForwarderをインストールするとBANされます",
+  "Installing Forwarder": "Forwarderのインストール中",
+  "Creating Program": "プログラム作成中",
+  "Creating Control": "コントロール作成中",
+  "Creating Meta": "メター作成中",
+  "Writing Nca": "Nca書き取り中",
+  "Updating ncm databse": "ncmのDBをアップデート中",
+  "Pushing application record": "アプリの記録をプッシュ中",
+  "Failed to install forwarder": "Forwarderのインストール失敗",
+  "Unstarred ": "お気に入り解除: ",
+  "Starred ": "お気に入りに登録: ",
+  "Failed to remove old forwarder, please manually remove it!": "古いForwarderを削除できませんでした、手動で削除してください!",
+
+  "AppStore": "AppStore",
+  "Appstore": "AppStore",
+  "Store": "AppStore",
+  "Filter: %s | Sort: %s | Order: %s": "フィルター: %s | 並べ替え: %s | 順番: %s",
+  "AppStore Options": "AppStoreの設定",
+  "Info": "情報",
+  "Changelog": "リリースノート",
+  "Details": "詳細",
+  "version: %s": "バージョン: %s",
+  "updated: %s": "更新日: %s",
+  "category: %s": "カテゴリー: %s",
+  "extracted: %.2f MiB": "容量: %.2f MiB",
+  "app_dls: %s": "ダウンロード: %s",
+  "More by Author": "ディベロッパーの他のアプリを見る",
+  "Leave Feedback": "意見を残す",
+
+  "FileBrowser": "ファイルブラウザ",
+  "Files": "ファイル",
+  "%zd files": "%zd個のファイル",
+  "%zd dirs": "%zd個のフォルダー",
+  "File Options": "ファイル設定",
+  "Show Hidden": "非表示ファイルを表示",
+  "Folders First": "フォルダーを優先",
+  "Hidden Last": "非表示ファイルを劣後",
+  "Cut": "切り取り",
+  "Copy": "コピー",
+  "Copying ": "コピー中 ",
+  "Paste": "ペースト",
+  "Paste ": " ",
+  " file(s)?": "個のファイルをペーストしますか?",
  "Pasting ": "ペースト中 ",
  "Pasting": "ペースト中",
-  "Removing ": "除去中 ",
-  "Scanning ": "スキャン中 ",
+  "Rename": "名前の変更",
+  "Set New File Name": "新しい名前を入力",
+  "Extract zip": "ZIPファイルを解凍",
+  "Extract Options": "解凍設定",
+  "Extract here": "ここに解凍",
+  "Extract to root": "最上位ルートに解凍",
+  "Are you sure you want to extract to root?": "最上位ルートに解凍してよろしいですか?",
+  "Extract to...": "指定ルート",
+  "Enter the path to the folder to extract into": "解凍したいルートを指定してください",
+  "Extracting ": "解凍します ",
+  "Extract success!": "解凍完了!",
+  "Extract failed!": "解凍失敗!",
+  "Compress to zip": "ZIPファイルに圧縮",
+  "Compress Options": "圧縮設定",
+  "Compress": "ZIPファイルに圧縮",
+  "Compress to...": "指定ルート",
+  "Compressing ": "圧縮します ",
+  "Compress success!": "圧縮完了!",
+  "Compress failed!": "圧縮失敗!",
+  "Create File": "ファイルの作成",
+  "Set File Name": "名前を入力",
+  "Create Folder": "フォルダーの作成",
+  "Set Folder Name": "名前を入力",
  "Creating ": "作成中 ",
-  "Copying ": "コピー中 ",
+  "Upload": "アップロード",
+  "Select upload location": "アップロードの位置を設定",
+  "No upload locations set!": "アップロードの位置が設定されていません",
+  "Uploading": "アップロード中",
+  "Upload successfull!": "アップロード完了!",
+  "Upload failed!": "アップロード失敗!",
+  "View as text (unfinished)": "テキストとして表示 (未完成)",
+  "Ignore read only": "読み取り専用を無視する",
+  "Mount": "マウント",
+  "Sd": "SDメモリーカード",
+  "Image System memory": "システムメモリイメージ",
+  "Image microSD card": "SDイメージ",
+  "Empty...": "このフォルダーは空です",
+  "Open with DayBreak?": "DayBreakで開きますか?",
+  "Launch ": "起動しますか",
+  "Launch option for: ": "起動設定: ",
+  "Select launcher for: ": "起動ランチャーを選ぶ: ",
+
+  "Sort By": "並べ替え",
+  "Sort Options": "並べ替え設定",
+  "Filter": "フィルター",
+  "All": "全て",
+  "Emulators": "エミュレータ",
+  "Tools": "ツール",
+  "Themes": "テーマ",
+  "Legacy": "レガシー",
+  "Sort": "並べ替え",
+  "Size": "ファイルサイズ",
+  "Size (Star)": "ファイルサイズ(お気に入り)",
+  "Alphabetical": "アルファベット順",
+  "Alphabetical (Star)": "アルファベット順(お気に入り)",
+  "Updated": "アップデート順",
+  "Updated (Star)": "アップデート順(お気に入り)",
+  "Downloads": "ダウンロード順",
+  "Likes": "いいね順",
+  "ID": "デベロッパー順",
+  "Order": "順番",
+  "Descending": "降順",
+  "Descending (down)": "降順",
+  "Desc": "降順",
+  "Ascending": "上昇",
+  "Ascending (Up)": "上昇",
+  "Asc": "上昇",
+  "Layout": "レイアウト",
+  "List": "リスト",
+  "Icon": "アイコン",
+  "Grid": "グリッド",
+  "Search": "検索",
+
+  "Options": "設定",
+  "OK": "確認",
+  "Back": "戻る",
+  "Select": "選択",
+  "Open": "開く",
+  "Launch": "起動",
+  "Restart": "再起動",
+  "Next": "次へ",
+  "Prev": "前へ",
+  "Unstar": "お気に入り解除",
+  "Star": "お気に入り",
+  "Yes": "はい",
+  "No": "いいえ",
+  "On": "オン",
+  "Off": "オフ",
+
+  "Install": "インストール",
+  "Install Selected files?": "選択したファイルをインストールしますか?",
+  "Installing ": "インストール中 ",
+  "Installed ": "インストールしました ",
+  "Installed!": "インストール完了",
  "Trying to load ": "サムネイルを取得中 ",
-  "Downloading ": "ダウンロード中 ",
  "Checking MD5": "MD5を確認中 ",
+
+  "Delete": "削除",
+  "Delete Selected files?": "本当に削除しますか?",
+  "Are you sure you want to delete ": "消去してもよろしいですか ",
+  "Scanning ": "スキャン中 ",
+  "Deleting ": "削除中 ",
+  "Deleting": "削除中",
+  "Remove": "除去",
+  "Completely remove ": "除去しますか ",
+  "Removing ": "除去中 ",
+  "Removed ": "除去完了 ",
+  "Uninstalling ": "アンインストール中 ",
+
+  "Download": "ダウンロード",
+  "Downloading ": "ダウンロード中 ",
+  "Downloaded ": "ダウンロード完了 ",
+
+  "Update": "アップデート",
+  "Update avaliable: ": "アップデート可能: ",
+  "Download update: ": "アップデートをダウンロード: ",
+  "Updated to ": "アップデート: ",
+  "Failed to download update": "アップデートのダウンロード失敗",
+
+  "%zu hours %zu minutes remaining": "残り %zu 時間 %zu 分",
+  "%zu minutes %zu seconds remaining": "残り %zu 分",
+  "%zu seconds remaining": "残り %zu 秒",
+
  "Loading...": "ロード中",
  "Loading": "ロード中",
  "Empty!": "何も見つかりません",
  "Not Ready...": "準備ができていません",
-  "Error loading page!": "ページのロードエラー",
-  "Update avaliable: ": "アップデート可能: ",
-  "Download update: ": "アップデートをダウンロード: ",
-  "Updated to ": "アップデート: ",
-  "Restart Sphaira?": "Sphairaを再起動しますか?",
-  "Failed to download update": "アップデートのダウンロード失敗",
-  "Delete Selected files?": "本当に削除しますか?",
-  "Completely remove ": "除去しますか ",
-  "Are you sure you want to delete ": "消去してもよろしいですか ",
-  "Are you sure you wish to cancel?": "本当に取り消しますか?",
-  "If this message appears repeatedly, please open an issue.": "このメッセージが繰り返し表示される場合は、問題を開いてください。"
+  "Error loading page!": "ページのロードエラー"
 }
--- a/assets/romfs/i18n/ko.json
+++ b/assets/romfs/i18n/ko.json
@@ -1,230 +1,392 @@
-{
-  "[Applet Mode]": "[애플릿 모드]",
-  "No Internet": "네트워크 연결 없음",
-  "Files": "파일 탐색기",
-  "Apps": "홈브류",
-  "Store": "앱스토어",
-  "Menu": "메뉴",
-  "Options": "설정",
-  "OK": "확인",
-  "Back": "뒤로",
-  "Select": "선택",
-  "Open": "열기",
-  "Launch": "실행",
-  "Info": "정보",
-  "Install": "설치",
-  "Delete": "삭제",
-  "Restart": "재시작",
-  "Changelog": "변경 내역",
-  "Details": "상세",
-  "Update": "업데이트",
-  "Remove": "제거",
-  "Download": "다운로드",
-  "Next Page": "다음 페이지",
-  "Prev Page": "이전 페이지",
-  "Unstar": "즐겨찾기 해제",
-  "Star": "즐겨찾기",
-  "System memory": "낸드 저장소",
-  "microSD card": "SD 카드",
-  "Yes": "예",
-  "No": "아니요",
-  "Enabled": "",
-  "Disabled": "",
-
-  "Sort By": "정렬",
-  "Sort Options": "정렬 설정",
-  "Filter": "필터",
-  "Sort": "분류",
-  "Order": "정렬",
-  "Search": "검색",
-  "Updated": "업데이트순",
-  "Updated (Star)": "업데이트순 (즐겨찾기)",
-  "Downloads": "다운로드순",
-  "Size": "크기순",
-  "Size (Star)": "크기순 (즐겨찾기)",
-  "Alphabetical": "알파벳순",
-  "Alphabetical (Star)": "알파벳순 (즐겨찾기)",
-  "Likes": "좋아요순",
-  "ID": "작성자순",
-  "Decending": "내림차순",
-  "Descending (down)": "내림차순",
-  "Desc": "내림차순",
-  "Ascending": "오름차순",
-  "Ascending (Up)": "오름차순",
-  "Asc": "오름차순",
-
-  "Menu Options": "메뉴",
-  "Header": "헤더",
-  "Theme": "테마",
-  "Theme Options": "테마 설정",
-  "Select Theme": "테마 선택",
-  "Shuffle": "셔플",
-  "Music": "BGM",
-  "Network": "네트워크",
-  "Network Options": "네트워크 설정",
-  "Nxlink": "Nxlink",
-  "Nxlink Connected": "Nxlink 연결됨",
-  "Nxlink Upload": "Nxlink 업로드",
-  "Nxlink Finished": "Nxlink 종료됨",
-  "Switch-Handheld!": "휴대모드로 전환되었습니다!",
-  "Switch-Docked!": "독 모드로 전환되었습니다!",
-  "Language": "언어",
-  "Auto": "자동",
-  "English": "English",
-  "Japanese": "日本語",
-  "French": "Français",
-  "German": "Deutsch",
-  "Italian": "Italiano",
-  "Spanish": "Español",
-  "Chinese": "中文",
-  "Korean": "한국어",
-  "Dutch": "Dutch",
-  "Portuguese": "Português",
-  "Russian": "Русский",
-  "Swedish": "Svenska",
-  "Logging": "로깅",
-  "Replace hbmenu on exit": "hbmenu  sphaira 교체",
-  "Misc": "기타",
-  "Misc Options": "기타",
-  "Web": "웹 브라우저",
-  "Install forwarders": "바로가기 설치 기능",
-  "Install location": "설치 경로",
-  "Show install warning": "바로가기 설치 경고문 표시",
-
-  "FileBrowser": "파일 탐색기",
-  "%zd files": "%zd개의 파일",
-  "%zd dirs": "%zd개의 폴더",
-  "File Options": "파일 설정",
-  "Show Hidden": "숨겨진 항목 표시",
-  "Folders First": "폴더 우선 정렬",
-  "Hidden Last": "숨겨진 항목 후순 정렬",
-  "Cut": "잘라내기",
-  "Copy": "복사",
-  "Paste": "붙여넣기",
-  "Paste ": " ",
-  " file(s)?": "개 항목을 붙여넣으시겠습니까?",
-  "Rename": "이름 바꾸기",
-  "Set New File Name": "새 파일명 입력",
-  "Advanced": "고급",
-  "Advanced Options": "고급 설정",
-  "Create File": "파일 생성",
-  "Set File Name": "파일명 입력",
-  "Create Folder": "새 폴더",
-  "Set Folder Name": "폴더명 입력",
-  "View as text (unfinished)": "텍스트로 보기 (미완성)",
-  "Empty...": "비어있습니다...",
-  "Open with DayBreak?": "DayBreak로 여시겠습니까?",
-  "Launch ": "실행하시겠습니까 ",
-  "Launch option for: ": "실행 설정: ",
-  "Select launcher for: ": "실행 런처: ",
-
-  "Homebrew": "홈브류",
-  "Homebrew Options": "홈브류 설정",
-  "Hide Sphaira": "Sphaira 숨기기",
-  "Install Forwarder": "바로가기 설치",
-  "WARNING: Installing forwarders will lead to a ban!": "주의: 시스낸드에서 바로가기 설치시 BAN 위험이 있습니다!",
-  "Installing Forwarder": "바로가기 설치중...",
-  "Creating Program": "프로그램 작성중...",
-  "Creating Control": "컨트롤 작성중...",
-  "Creating Meta": "메타 작성중...",
-  "Writing Nca": "Nca 쓰는중...",
-  "Updating ncm databse": "ncm 데이터베이스 업데이트중...",
-  "Pushing application record": "응용 프로그램 기록 푸시중...",
-  "Installed!": "설치 완료!",
-  "Failed to install forwarder": "바로가기 설치 실패",
-  "Unstarred ": "즐겨찾기 해제: ",
-  "Starred ": "즐겨찾기 적용: ",
-
-  "AppStore": "앱스토어",
-  "Filter: %s | Sort: %s | Order: %s": "필터: %s | 분류: %s | 정렬: %s",
-  "AppStore Options": "앱스토어 설정",
-  "All": "전체",
-  "Games": "게임",
-  "Emulators": "에뮬레이터",
-  "Tools": "도구",
-  "Themes": "테마",
-  "Legacy": "레거시",
-  "version: %s": "버전: %s",
-  "updated: %s": "갱신일: %s",
-  "category: %s": "카테고리: %s",
-  "extracted: %.2f MiB": "용량: %.2f MiB",
-  "app_dls: %s": "다운로드 횟수: %s",
-  "More by Author": "개발자의 다른 앱 더보기",
-  "Leave Feedback": "피드백 남기기",
-
-  "Irs": "Joy-Con IR 카메라",
-  "Ambient Noise Level: ": "노이즈 레벨: ",
-  "Controller": "컨트롤러",
-  "Pad ": "조이콘 ",
-  " (Available)": " (사용 가능)",
-  " (Unsupported)": " (지원 안됨)",
-  " (Unconnected)": " (연결 없음)",
-  "HandHeld": "- 본체 연결",
-  "Rotation": "화면 회전",
-  "0 (Sideways)": "0 (좌회전)",
-  "90 (Flat)": "90 (정방향)",
-  "180 (-Sideways)": "180 (우회전)",
-  "270 (Upside down)": "270 (역전)",
-  "Colour": "컬러 팔레트",
-  "Grey": "그레이",
-  "Ironbow": "아이언보우",
-  "Green": "그린",
-  "Red": "레드",
-  "Blue": "블루",
-  "Light Target": "반사 표적",
-  "All leds": "모든 LED 켜기",
-  "Bright group": "Bright LED 켜기",
-  "Dim group": "Dim LED 켜기",
-  "None": "LED 끄기",
-  "Gain": "대비",
-  "Negative Image": "화상 이미지",
-  "Normal image": "일반",
-  "Negative image": "반전",
-  "Format": "해상도",
-  "320x240": "320×240",
-  "160x120": "160×120",
-  "80x60": "80×60",
-  "40x30": "40×30",
-  "20x15": "20×15",
-  "Trimming Format": "트리밍 해상도",
-  "External Light Filter": "외부 조명 필터",
-  "Load Default": "기본값으로 설정",
-
-  "Themezer": "Themezer",
-  "Themezer Options": "Themezer 설정",
-  "Nsfw": "선정성 테마",
-  "Page": "페이지",
-  "Page %zu / %zu": "페이지 %zu / %zu",
-  "Enter Page Number": "페이지 번호 입력",
-  "Bad Page": "잘못된 페이지",
-  "Download theme?": "테마를 내려받으시겠습니까?",
-
-  "Installing ": "설치중... ",
-  "Uninstalling ": "설치 제거중... ",
-  "Deleting ": "삭제중... ",
-  "Deleting": "삭제중...",
-  "Pasting ": "붙여넣는중... ",
-  "Pasting": "붙여넣는중...",
-  "Removing ": "제거중... ",
-  "Scanning ": "스캔중... ",
-  "Creating ": "작성중... ",
-  "Copying ": "복사중... ",
-  "Trying to load ": "썸네일 받아오는 중... ",
-  "Downloading ": "다운로드중... ",
-  "Checking MD5": "MD5 확인중... ",
-  "Loading...": "로딩중...",
-  "Loading": "로딩중...",
-  "Empty!": "찾을 수 없습니다!",
-  "Not Ready...": "준비되지 않았습니다...",
-  "Error loading page!": "페이지 로딩 오류!",
-  "Update avaliable: ": "업데이트 가능: ",
-  "Download update: ": "업데이트 다운로드: ",
-  "Updated to ": "업데이트: ",
-  "Restart Sphaira?": "Sphaira를 재시작 하시겠습니까?",
-  "Failed to download update": "업데이트 다운로드 실패!",
-  "Delete Selected files?": "정말 삭제하시겠습니까?",
-  "Completely remove ": "제거하시겠습니까 ",
-  "Are you sure you want to delete ": "정말 삭제하시겠습니까 ",
-  "Are you sure you wish to cancel?": "정말 취소하시겠습니까?",
-  "If this message appears repeatedly, please open an issue.": "해당 메시지가 반복해서 나타나는 경우, 이슈를 열어주세요."
+{
+  "[Applet Mode]": "[ 애플릿 모드 ]",
+  "No Internet": "인터넷 연결 없음",
+  "Switch-Handheld!": "휴대모드로 전환됨!",
+  "Switch-Docked!": "독 모드로 전환됨!",
+  "Audio disabled due to suspended game": "게임 실행 중에는 BGM이 비활성화 됩니다",
+  "Are you sure you wish to cancel?": "정말 취소할까요?",
+  "An error occurred": "오류가 발생했습니다!",
+  "If this message appears repeatedly, please open an issue.": "해당 메시지가 반복해서 나타나는 경우, 이슈를 등록하세요.",
+
+  "Menu Options": "메뉴",
+  "Menu": "메뉴",
+  "Theme": "테마",
+  "Theme Options": "테마 옵션",
+  "Select Theme": "테마 선택",
+  "Music": "BGM",
+  "12 Hour Time": "12 시간제",
+  "Download Default Music": "기본 BGM 다운로드",
+  "Failed to download default_music.bfstm, please try again": "BGM 파일 다운로드에 실패했습니다, 다시 시도하세요",
+  "Overwrite current default music?": "BGM 파일을 덮어쓸까요?",
+
+  "Network": "네트워크",
+  "Network Options": "네트워크 옵션",
+  "Ftp": "FTP (무선)",
+  "Mtp": "MTP (유선)",
+  "Nxlink": "Nxlink",
+  "Nxlink Connected": "Nxlink 연결됨",
+  "Nxlink Upload": "Nxlink 업로드",
+  "Nxlink Finished": "Nxlink 종료됨",
+
+  "Language": "언어",
+  "Auto": "자동",
+  "English": "English",
+  "Japanese": "日本語",
+  "French": "Français",
+  "German": "Deutsch",
+  "Italian": "Italiano",
+  "Spanish": "Español",
+  "Chinese": "中文",
+  "Korean": "한국어",
+  "Dutch": "Dutch",
+  "Portuguese": "Português",
+  "Russian": "Русский",
+  "Swedish": "Svenska",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",
+
+  "Misc": "기타",
+  "Misc Options": "기타 옵션",
+  "Games": "게임",
+  "Game Options": "게임 옵션",
+  "Hide forwarders": "바로가기 앱 숨기기",
+  "Launch random game": "게임 랜덤 실행",
+  "List meta records": "메타 기록",
+  "Entries": "목록",
+  "Failed to list application meta entries": "메타 항목 나열에 실패했습니다",
+  "No meta entries found...\n": "메타 항목을 찾을 수 없습니다...\n",
+  "Updating application record list": "앱 기록 업데이트 중",
+  "Dump": "덤프",
+  "Select content to dump": "덤프 옵션",
+  "Dump All": "모든 콘텐츠",
+  "Dump Application": "게임",
+  "Dump Patch": "게임 패치",
+  "Dump AddOnContent": "DLC",
+  "Dump DataPatch": "DLC 패치",
+  "Select dump location": "덤프 위치",
+  "microSD card (/dumps/NSP/)": "SD 카드 (sdmc:/dumps/NSP/)",
+  "USB transfer (Switch 2 Switch)": "USB 전송 (Switch 2 Switch)",
+  "/dev/null (Speed Test)": "/dev/null (Speed Test)",
+  "Dumping": "덤프 중",
+  "Dump successfull!": "덤프 완료!",
+  "Dump failed!": "덤프 실패!",
+  "Success": "완료!",
+  "Delete successfull!": "삭제 완료!",
+  "Delete failed!": "삭제 실패!",
+
+  "Themezer": "Themezer",
+  "Themezer Options": "Themezer 옵션",
+  "Nsfw": "선정성 테마",
+  "Page": "페이지",
+  "Page %zu / %zu": "페이지 %zu / %zu",
+  "Enter Page Number": "페이지 번호 입력",
+  "Bad Page": "잘못된 페이지 입력됨",
+  "Download theme?": "테마를 다운로드할까요?",
+
+  "GitHub": "GitHub",
+  "Downloading json": "JSON에서 다운로드",
+  "Select asset to download for ": "다운로드 아이템: ",
+
+  "FTP Install": "FTP 설치",
+  "FTP Install (EXPERIMENTAL)": "FTP 설치 (실험실 기능)",
+  "Connection Type: WiFi | Strength: ": "상태: WiFi | 신호 세기: ",
+  "Connection Type: Ethernet": "상태: 이더넷",
+  "Connection Type: None": "상태: 연결 없음",
+  "Host:": "호스트:",
+  "Port:": "포트:",
+  "Username:": "사용자명:",
+  "Password:": "비밀번호:",
+  "SSID:": "SSID:",
+  "Passphrase:": "WiFi 암호:",
+  "Failed to install via FTP, press B to exit...": "FTP 설치 실패함, 종료하려면  버튼을 입력하세요...",
+  "Ftp install success!": "FTP 설치 완료!",
+  "Ftp install failed!": "FTP 설치 실패!",
+  "USB Install": "USB 설치",
+  "USB": "USB 설치",
+  "Connected, waiting for file list...": "연결됨, 파일 목록 대기 중...",
+  "Connected, starting transfer...": "연결됨, 전송 시작 중...",
+  "Failed to init usb, press B to exit...": "USB 연결 실패함, 종료하려면  버튼을 입력하세요...",
+  "Waiting for connection...": "연결 대기 중...",
+  "Transferring data...": "데이터 전송 중...",
+  "USB connected, sending file list": "USB 연결됨, 파일 목록 전송 중",
+  "Sent file list, waiting for command...": "파일 목록 전송됨, 입력 대기 중...",
+  "waiting for usb connection...": "USB 연결 대기 중...",
+  "Disable MTP for usb install": "USB 설치를 위해 MTP 비활성화됨",
+  "Re-enabled MTP": "MTP 재활성화됨",
+  "Installed via usb": "USB를 통해 설치됨",
+  "Usb install success!": "USB 설치 완료!",
+  "Usb install failed!": "USB 설치 실패!",
+  "Press B to exit...": " 버튼으로 나가기",
+  "GameCard Install": "카트리지 설치",
+  "GameCard": "카트리지 설치",
+  "GC": "카트리지",
+  "System memory %.1f GB": "본체 저장 메모리  %.1f GB",
+  "microSD card %.1f GB": "SD 카드  %.1f GB",
+  "Nand Install": "본체 저장 메모리에 설치",
+  "SD Card Install": "SD 카드에 설치",
+  "Exit": "나가기",
+  "Gc install success!": "카트리지 설치 완료!",
+  "Gc install failed!": "카트리지 설치 실패!",
+
+  "IRS (Infrared Joycon Camera)": "조이콘 적외선 카메라",
+  "IRS": "조이콘 적외선 카메라",
+  "Irs": "조이콘 적외선 카메라",
+  "Ambient Noise Level: ": "주변 노이즈 레벨: ",
+  "Controller": "컨트롤러",
+  "Pad ": "조이콘 ",
+  "HandHeld": "본체 연결",
+  " (Available)": " (사용 가능)",
+  " (Unsupported)": " (지원 안됨)",
+  " (Unconnected)": " (연결 없음)",
+  "Rotation": "화면 회전",
+  "0 (Sideways)": "반시계방향 90° 회전",
+  "90 (Flat)": "정방향",
+  "180 (-Sideways)": "시계방향 90° 회전",
+  "270 (Upside down)": "상하반전",
+  "Colour": "색상 팔레트",
+  "Grey": "그레이스케일",
+  "Ironbow": "아이언보우",
+  "Green": "그린",
+  "Red": "레드",
+  "Blue": "블루",
+  "Light Target": "반사 표적",
+  "All leds": "모든 LED 켜기",
+  "Bright group": "Bright LED 켜기",
+  "Dim group": "Dim LED 켜기",
+  "None": "LED 끄기",
+  "Gain": "대비",
+  "Negative Image": "화상 이미지",
+  "Normal image": "일반",
+  "Negative image": "반전",
+  "Format": "해상도",
+  "Trimming Format": "트리밍 해상도",
+  "320x240": "320×240",
+  "160x120": "160×120",
+  "80x60": "80×60",
+  "40x30": "40×30",
+  "20x15": "20×15",
+  "External Light Filter": "외부 조명 필터",
+  "Load Default": "기본값으로 설정",
+
+  "Advanced": "고급",
+  "Advanced Options": "고급 옵션",
+  "Logging": "로깅",
+  "Replace hbmenu on exit": "종료 시 hbmenu 교체",
+  "Restore hbmenu?": "hbmenu로 복원할까요?",
+  "Restore": "복원",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "/switch/hbmemu.nro를 찾을 수 없습니다\n앱스토어에서 다시 설치하세요",
+  "Failed to restore hbmenu, please re-download hbmenu": "hbmenu 복원 실패함, hbmenu를 다시 다운로드하세요",
+  "Failed to restore hbmenu, using sphaira instead": "hbmenu 복원 실패함, sphaira를 계속 사용합니다",
+  "Restored hbmenu, closing sphaira": "hbmenu 복원됨, sphaira를 종료합니다",
+  "Restored hbmenu": "hbmenu 복원됨",
+  "Restart Sphaira?": "Sphaira를 재시작할까요?",
+  "Press OK to restart Sphaira": "확인 버튼 입력하여 Sphaira 재시작",
+  "Text scroll speed": "긴 텍스트 표시 속도",
+  "Slow": "천천히",
+  "Normal": "보통",
+  "Fast": "빠르게",
+  "Set right-side menu": "우측 메뉴 설정",
+  "Install options": "설치 옵션",
+  "Install Options": "설치 옵션",
+  "Enable sysmmc": "시스낸드 활성화",
+  "Enable emummc": "에뮤낸드 활성화",
+  "Show install warning": "설치 경고 표시",
+  "Install location": "설치 위치",
+  "System memory": "본체 저장 메모리",
+  "microSD card": "SD 카드",
+  "Boost CPU clock": "CPU 클럭 향상",
+  "Allow downgrade": "다운그레이드 허용",
+  "Skip if already installed": "설치된 항목 건너뛰기",
+  "Ticket only": "티켓만 설치",
+  "Skip base": "게임 건너뛰기",
+  "Skip patch": "게임 패치 건너뛰기",
+  "Skip dlc": "DLC 건너뛰기",
+  "Skip data patch": "DLC 패치 건너뛰기",
+  "Skip ticket": "티켓 건너뛰기",
+  "Skip NCA hash verify": "NCA 해시 확인 건너뛰기",
+  "Skip RSA header verify": "RSA 헤더 확인 건너뛰기",
+  "Skip RSA NPDM verify": "RSA NPDM 확인 건너뛰기",
+  "Ignore distribution bit": "배포 비트 무시",
+  "Convert to standard crypto": "표준 암호화로 변환",
+  "Lower master key": "하위 마스터 키 지원",
+  "Lower system version": "하위 시스템 버전 지원",
+
+  "Homebrew": "홈브류",
+  "Apps": "홈브류",
+  "Homebrew Options": "홈브류 옵션",
+  "Hide Sphaira": "Sphaira 숨기기",
+  "Install Forwarder": "바로가기 설치",
+  "WARNING: Installing forwarders will lead to a ban!": "경고: 시스낸드에 설치 시, 밴 위험이 있습니다!",
+  "Installing Forwarder": "바로가기 설치",
+  "Creating Program": "프로그램 생성",
+  "Creating Control": "컨트롤 생성",
+  "Creating Meta": "메타 생성",
+  "Writing Nca": "Nca 쓰기",
+  "Updating ncm databse": "Ncm 데이터베이스 업데이트",
+  "Pushing application record": "응용 프로그램 기록 푸싱",
+  "Failed to install forwarder": "바로가기 설치 실패함",
+  "Unstarred ": "즐겨찾기 해제: ",
+  "Starred ": "즐겨찾기 등록: ",
+  "Failed to remove old forwarder, please manually remove it!": "바로가기 제거 실패함, 직접 제거해주세요!",
+
+  "AppStore": "앱스토어",
+  "Appstore": "앱스토어",
+  "Store": "앱스토어",
+  "Filter: %s | Sort: %s | Order: %s": "필터: %s | 분류: %s | 정렬: %s",
+  "AppStore Options": "앱스토어 옵션",
+  "Info": "정보",
+  "Changelog": "변경사항",
+  "Details": "상세",
+  "version: %s": "버전: %s",
+  "updated: %s": "업데이트: %s",
+  "category: %s": "카테고리: %s",
+  "extracted: %.2f MiB": "용량: %.2f MiB",
+  "app_dls: %s": "다운로드 횟수: %s",
+  "More by Author": "개발자의 다른 앱 더 보기",
+  "Leave Feedback": "피드백 남기기",
+
+  "FileBrowser": "파일 탐색기",
+  "Files": "파일 탐색기",
+  "%zd files": "%zd 개 파일",
+  "%zd dirs": "%zd 개 폴더",
+  "File Options": "파일 옵션",
+  "Show Hidden": "숨겨진 항목 표시",
+  "Folders First": "폴더 우선 정렬",
+  "Hidden Last": "숨겨진 항목 후순 정렬",
+  "Cut": "잘라내기",
+  "Copy": "복사",
+  "Copying ": "복사 중 ",
+  "Paste": "붙여넣기",
+  "Paste ": " ",
+  " file(s)?": "개 항목을 붙여넣을까요?",
+  "Pasting ": "붙여넣는 중 ",
+  "Pasting": "붙여넣기",
+  "Rename": "이름 바꾸기",
+  "Set New File Name": "새 파일명 입력",
+  "Extract zip": "압축 해제",
+  "Extract Options": "압축 해제 옵션",
+  "Extract here": "여기에 풀기",
+  "Extract to root": "최상위 경로에 풀기",
+  "Are you sure you want to extract to root?": "최상위 경로에 압축 해제할까요?",
+  "Extract to...": "경로 지정",
+  "Enter the path to the folder to extract into": "압축 해제할 경로를 입력하세요",
+  "Extracting ": "압축 해제 중 ",
+  "Extract success!": "압축 해제 완료!",
+  "Extract failed!": "압축 해제 실패!",
+  "Compress to zip": "압축",
+  "Compress Options": "압축 옵션",
+  "Compress": "ZIP 파일로 압축",
+  "Compress to...": "경로 지정",
+  "Compressing ": "압축 중 ",
+  "Compress success!": "압축 완료!",
+  "Compress failed!": "압축 실패!",
+  "Create File": "새 파일",
+  "Set File Name": "파일명 입력",
+  "Create Folder": "새 폴더",
+  "Set Folder Name": "폴더명 입력",
+  "Creating ": "생성 중 ",
+  "Upload": "업로드",
+  "Select upload location": "업로드 위치 선택",
+  "No upload locations set!": "업로드 위치가 설정되지 않았습니다!",
+  "Uploading": "업로드 중 ",
+  "Upload successfull!": "업로드 완료!",
+  "Upload failed!": "업로드 실패!",
+  "View as text (unfinished)": "텍스트로 보기 (미완성)",
+  "Ignore read only": "읽기 전용 설정 무시",
+  "Mount": "마운트",
+  "Sd": "SD 카드",
+  "Image System memory": "시스낸드 앨범",
+  "Image microSD card": "에뮤낸드 앨범",
+  "Empty...": "비어있음...",
+  "Open with DayBreak?": "DayBreak로 열까요?",
+  "Launch ": "실행할까요 ",
+  "Launch option for: ": "실행 옵션: ",
+  "Select launcher for: ": "실행 런처: ",
+
+  "Sort By": "정렬",
+  "Sort Options": "정렬 옵션",
+  "Filter": "필터",
+  "All": "전체",
+  "Emulators": "에뮬레이터",
+  "Tools": "도구",
+  "Themes": "테마",
+  "Legacy": "레거시",
+  "Sort": "분류",
+  "Size": "크기순",
+  "Size (Star)": "크기순 (즐겨찾기)",
+  "Alphabetical": "알파벳순",
+  "Alphabetical (Star)": "알파벳순 (즐겨찾기)",
+  "Updated": "업데이트순",
+  "Updated (Star)": "업데이트순 (즐겨찾기)",
+  "Downloads": "다운로드순",
+  "Likes": "좋아요순",
+  "ID": "ID순",
+  "Order": "정렬",
+  "Descending": "내림차순",
+  "Descending (down)": "내림차순",
+  "Desc": "내림차순",
+  "Ascending": "오름차순",
+  "Ascending (Up)": "오름차순",
+  "Asc": "오름차순",
+  "Layout": "레이아웃",
+  "List": "목록",
+  "Icon": "아이콘",
+  "Grid": "격자",
+  "Search": "검색",
+
+  "Options": "설정",
+  "OK": "확인",
+  "Back": "뒤로",
+  "Select": "선택",
+  "Open": "열기",
+  "Launch": "실행",
+  "Restart": "재시작",
+  "Next": "다음",
+  "Prev": "이전",
+  "Unstar": "즐겨찾기 해제",
+  "Star": "즐겨찾기",
+  "Yes": "예",
+  "No": "아니요",
+  "On": "켬",
+  "Off": "끔",
+
+  "Install": "설치",
+  "Install Selected files?": "선택한 파일을 설치할까요?",
+  "Installing ": "설치 중 ",
+  "Installed ": "설치됨 ",
+  "Installed!": "설치 완료!",
+  "Trying to load ": "정보 취득 중 ",
+  "Checking MD5": "MD5 확인 중",
+
+  "Delete": "삭제",
+  "Delete Selected files?": "선택한 파일을 삭제할까요?",
+  "Are you sure you want to delete ": "정말 삭제할까요 ",
+  "Scanning ": "스캔 중 ",
+  "Deleting ": "삭제 중 ",
+  "Deleting": "삭제 중",
+  "Remove": "제거",
+  "Completely remove ": "정말 삭제할까요 ",
+  "Removing ": "제거 중 ",
+  "Removed ": "제거됨: ",
+  "Uninstalling ": "설치 제거됨: ",
+
+  "Download": "다운로드",
+  "Downloading ": "다운로드 중 ",
+  "Downloaded ": "다운로드 완료: ",
+
+  "Update": "업데이트",
+  "Update avaliable: ": "업데이트 가능: ",
+  "Download update: ": "업데이트 다운로드: ",
+  "Updated to ": "업데이트됨: ",
+  "Failed to download update": "업데이트 다운로드 실패함",
+
+  "%zu hours %zu minutes remaining": "%zu 시간 %zu 분 남음",
+  "%zu minutes %zu seconds remaining": "%zu 분 %zu 초 남음",
+  "%zu seconds remaining": "%zu 초 남음",
+
+  "Loading...": "로딩 중...",
+  "Loading": "로딩 중...",
+  "Empty!": "찾을 수 없습니다!",
+  "Not Ready...": "준비되지 않음...",
+  "Error loading page!": "페이지 로딩 오류!"
 }
--- a/assets/romfs/i18n/nl.json
+++ b/assets/romfs/i18n/nl.json
@@ -1,73 +1,33 @@
 {
  "[Applet Mode]": "[Applet-modus]",
  "No Internet": "Geen internet",
-  "Files": "",
-  "Apps": "",
-  "Store": "",
-  "Menu": "Menu",
-  "Options": "Opties",
-  "OK": "",
-  "Back": "Terug",
-  "Select": "",
-  "Open": "Open",
-  "Launch": "Launch",
-  "Info": "Info",
-  "Install": "Installeren",
-  "Delete": "Verwijderen",
-  "Restart": "",
-  "Changelog": "",
-  "Details": "",
-  "Update": "",
-  "Remove": "",
-  "Download": "Downloaden",
-  "Next Page": "Volgende pagina",
-  "Prev Page": "Vorige pagina",
-  "Unstar": "",
-  "Star": "",
-  "System memory": "",
-  "microSD card": "",
-  "Yes": "Ja",
-  "No": "Nee",
-  "Enabled": "Ingeschakeld",
-  "Disabled": "Gehandicapt",
-
-  "Sort By": "Sorteer op",
-  "Sort Options": "Sorteeropties",
-  "Filter": "Filter",
-  "Sort": "Soort",
-  "Order": "Volgorde",
-  "Search": "Zoekopdracht",
-  "Updated": "Bijgewerkt",
-  "Updated (Star)": "",
-  "Downloads": "Downloads",
-  "Size": "Maat",
-  "Size (Star)": "",
-  "Alphabetical": "Alfabetisch",
-  "Alphabetical (Star)": "",
-  "Likes": "",
-  "ID": "",
-  "Decending": "Aflopend",
-  "Descending (down)": "Aflopend",
-  "Desc": "Aflopend",
-  "Ascending": "Oplopend",
-  "Ascending (Up)": "Oplopend",
-  "Asc": "Oplopend",
+  "Switch-Handheld!": "",
+  "Switch-Docked!": "",
+  "Audio disabled due to suspended game": "",
+  "Are you sure you wish to cancel?": "",
+  "An error occurred": "",
+  "If this message appears repeatedly, please open an issue.": "",

  "Menu Options": "Menu-opties",
-  "Header": "Koptekst",
+  "Menu": "Menu",
  "Theme": "Thema",
  "Theme Options": "Thema Opties",
  "Select Theme": "Selecteer Thema",
-  "Shuffle": "Schudden",
  "Music": "Muziek",
+  "12 Hour Time": "",
+  "Download Default Music": "",
+  "Failed to download default_music.bfstm, please try again": "",
+  "Overwrite current default music?": "",
+
  "Network": "Netwerk",
  "Network Options": "Netwerkopties",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
  "Nxlink": "Nxlink",
  "Nxlink Connected": "",
  "Nxlink Upload": "",
  "Nxlink Finished": "",
-  "Switch-Handheld!": "",
-  "Switch-Docked!": "",
+
  "Language": "Taal",
  "Auto": "",
  "English": "English",
@@ -82,84 +42,102 @@
  "Portuguese": "Português",
  "Russian": "Русский",
  "Swedish": "Svenska",
-  "Logging": "Loggen",
-  "Replace hbmenu on exit": "Vervang hbmenu bij afsluiten",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",
+
  "Misc": "Diversen",
  "Misc Options": "Diverse opties",
-  "Web": "Web",
-  "Install forwarders": "",
-  "Install location": "",
-  "Show install warning": "",
-
-  "FileBrowser": "Bestandsbrowser",
-  "%zd files": "%zd files",
-  "%zd dirs": "%zd dirs",
-  "File Options": "Bestandsopties",
-  "Show Hidden": "Toon verborgen",
-  "Folders First": "Mappen eerst",
-  "Hidden Last": "Verborgen laatste",
-  "Cut": "Snee",
-  "Copy": "Kopiëren",
-  "Paste": "",
-  "Paste ": "",
-  " file(s)?": "",
-  "Rename": "Hernoemen",
-  "Set New File Name": "",
-  "Advanced": "Geavanceerd",
-  "Advanced Options": "Bestand maken",
-  "Create File": "Bestand maken",
-  "Set File Name": "",
-  "Create Folder": "Map maken",
-  "Set Folder Name": "",
-  "View as text (unfinished)": "Bekijk als tekst (onvoltooid)",
-  "Empty...": "",
-  "Open with DayBreak?": "",
-  "Launch ": "",
-  "Launch option for: ": "",
-  "Select launcher for: ": "",
-
-  "Homebrew": "Zelf brouwen",
-  "Homebrew Options": "Homebrew-opties",
-  "Hide Sphaira": "Verberg Sphaira",
-  "Install Forwarder": "Forwarder installeren",
-  "WARNING: Installing forwarders will lead to a ban!": "WAARSCHUWING: Het installeren van forwarders leidt tot een ban!",
-  "Installing Forwarder": "",
-  "Creating Program": "",
-  "Creating Control": "",
-  "Creating Meta": "",
-  "Writing Nca": "",
-  "Updating ncm databse": "",
-  "Pushing application record": "",
-  "Installed!": "",
-  "Failed to install forwarder": "",
-  "Unstarred ": "",
-  "Starred ": "",
-
-  "AppStore": "",
-  "Filter: %s | Sort: %s | Order: %s": "Filter: %s | Soort: %s | Volgorde: %s",
-  "AppStore Options": "AppStore-opties",
-  "All": "Alle",
  "Games": "Spellen",
-  "Emulators": "Emulators",
-  "Tools": "Hulpmiddelen",
-  "Themes": "Thema's",
-  "Legacy": "Nalatenschap",
-  "version: %s": "version: %s",
-  "updated: %s": "updated: %s",
-  "category: %s": "category: %s",
-  "extracted: %.2f MiB": "extracted: %.2f MiB",
-  "app_dls: %s": "app_dls: %s",
-  "More by Author": "",
-  "Leave Feedback": "",
+  "Game Options": "",
+  "Hide forwarders": "",
+  "Launch random game": "",
+  "List meta records": "",
+  "Entries": "",
+  "Failed to list application meta entries": "",
+  "No meta entries found...\n": "",
+  "Updating application record list": "",
+  "Dump": "",
+  "Select content to dump": "",
+  "Dump All": "",
+  "Dump Application": "",
+  "Dump Patch": "",
+  "Dump AddOnContent": "",
+  "Dump DataPatch": "",
+  "Select dump location": "",
+  "microSD card (/dumps/NSP/)": "",
+  "USB transfer (Switch 2 Switch)": "",
+  "/dev/null (Speed Test)": "",
+  "Dumping": "",
+  "Dump successfull!": "",
+  "Dump failed!": "",
+  "Success": "",
+  "Delete successfull!": "",
+  "Delete failed!": "",

+  "Themezer": "Themamaker",
+  "Themezer Options": "",
+  "Nsfw": "",
+  "Page": "",
+  "Page %zu / %zu": "Page %zu / %zu",
+  "Enter Page Number": "",
+  "Bad Page": "",
+  "Download theme?": "",
+
+  "GitHub": "",
+  "Downloading json": "",
+  "Select asset to download for ": "",
+
+  "FTP Install": "",
+  "FTP Install (EXPERIMENTAL)": "",
+  "Connection Type: WiFi | Strength: ": "",
+  "Connection Type: Ethernet": "",
+  "Connection Type: None": "",
+  "Host:": "",
+  "Port:": "",
+  "Username:": "",
+  "Password:": "",
+  "SSID:": "",
+  "Passphrase:": "",
+  "Failed to install via FTP, press B to exit...": "",
+  "Ftp install success!": "",
+  "Ftp install failed!": "",
+  "USB Install": "",
+  "USB": "",
+  "Connected, waiting for file list...": "",
+  "Connected, starting transfer...": "",
+  "Failed to init usb, press B to exit...": "",
+  "Waiting for connection...": "",
+  "Transferring data...": "",
+  "USB connected, sending file list": "",
+  "Sent file list, waiting for command...": "",
+  "waiting for usb connection...": "",
+  "Disable MTP for usb install": "",
+  "Re-enabled MTP": "",
+  "Installed via usb": "",
+  "Usb install success!": "",
+  "Usb install failed!": "",
+  "Press B to exit...": "",
+  "GameCard Install": "",
+  "GameCard": "",
+  "GC": "",
+  "System memory %.1f GB": "",
+  "microSD card %.1f GB": "",
+  "Nand Install": "",
+  "SD Card Install": "",
+  "Exit": "",
+  "Gc install success!": "",
+  "Gc install failed!": "",
+
+  "IRS (Infrared Joycon Camera)": "",
+  "IRS": "",
  "Irs": "Ir",
  "Ambient Noise Level: ": "",
  "Controller": "Controleur",
  "Pad ": "Pad ",
+  "HandHeld": "Handbediende",
  " (Available)": " (Beschikbaar)",
  " (Unsupported)": "",
  " (Unconnected)": " (Niet verbonden)",
-  "HandHeld": "Handbediende",
  "Rotation": "Rotatie",
  "0 (Sideways)": "0 (zijwaarts)",
  "90 (Flat)": "90 (plat)",
@@ -181,50 +159,234 @@
  "Normal image": "Normaal beeld",
  "Negative image": "Negatief beeld",
  "Format": "Formaat",
+  "Trimming Format": "Trimformaat",
  "320x240": "320×240",
  "160x120": "160×120",
  "80x60": "80×60",
  "40x30": "40×30",
  "20x15": "20×15",
-  "Trimming Format": "Trimformaat",
  "External Light Filter": "Extern lichtfilter",
  "Load Default": "Standaard laden",

-  "Themezer": "Themamaker",
-  "Themezer Options": "",
-  "Nsfw": "",
-  "Page": "",
-  "Page %zu / %zu": "Page %zu / %zu",
-  "Enter Page Number": "",
-  "Bad Page": "",
-  "Download theme?": "",
+  "Advanced": "Geavanceerd",
+  "Advanced Options": "Bestand maken",
+  "Logging": "Loggen",
+  "Replace hbmenu on exit": "Vervang hbmenu bij afsluiten",
+  "Restore hbmenu?": "",
+  "Restore": "",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "",
+  "Failed to restore hbmenu, please re-download hbmenu": "",
+  "Failed to restore hbmenu, using sphaira instead": "",
+  "Restored hbmenu, closing sphaira": "",
+  "Restored hbmenu": "",
+  "Restart Sphaira?": "",
+  "Press OK to restart Sphaira": "",
+  "Text scroll speed": "",
+  "Slow": "",
+  "Normal": "",
+  "Fast": "",
+  "Set right-side menu": "",
+  "Install options": "",
+  "Install Options": "",
+  "Enable sysmmc": "",
+  "Enable emummc": "",
+  "Show install warning": "",
+  "Install location": "",
+  "System memory": "",
+  "microSD card": "",
+  "Boost CPU clock": "",
+  "Allow downgrade": "",
+  "Skip if already installed": "",
+  "Ticket only": "",
+  "Skip base": "",
+  "Skip patch": "",
+  "Skip dlc": "",
+  "Skip data patch": "",
+  "Skip ticket": "",
+  "Skip NCA hash verify": "",
+  "Skip RSA header verify": "",
+  "Skip RSA NPDM verify": "",
+  "Ignore distribution bit": "",
+  "Convert to standard crypto": "",
+  "Lower master key": "",
+  "Lower system version": "",

-  "Installing ": "",
-  "Uninstalling ": "",
-  "Deleting ": "",
-  "Deleting": "",
+  "Homebrew": "Zelf brouwen",
+  "Apps": "",
+  "Homebrew Options": "Homebrew-opties",
+  "Hide Sphaira": "Verberg Sphaira",
+  "Install Forwarder": "Forwarder installeren",
+  "WARNING: Installing forwarders will lead to a ban!": "WAARSCHUWING: Het installeren van forwarders leidt tot een ban!",
+  "Installing Forwarder": "",
+  "Creating Program": "",
+  "Creating Control": "",
+  "Creating Meta": "",
+  "Writing Nca": "",
+  "Updating ncm databse": "",
+  "Pushing application record": "",
+  "Failed to install forwarder": "",
+  "Unstarred ": "",
+  "Starred ": "",
+  "Failed to remove old forwarder, please manually remove it!": "",
+
+  "AppStore": "",
+  "Appstore": "",
+  "Store": "",
+  "Filter: %s | Sort: %s | Order: %s": "Filter: %s | Soort: %s | Volgorde: %s",
+  "AppStore Options": "AppStore-opties",
+  "Info": "Info",
+  "Changelog": "",
+  "Details": "",
+  "version: %s": "version: %s",
+  "updated: %s": "updated: %s",
+  "category: %s": "category: %s",
+  "extracted: %.2f MiB": "extracted: %.2f MiB",
+  "app_dls: %s": "app_dls: %s",
+  "More by Author": "",
+  "Leave Feedback": "",
+
+  "FileBrowser": "Bestandsbrowser",
+  "Files": "",
+  "%zd files": "%zd files",
+  "%zd dirs": "%zd dirs",
+  "File Options": "Bestandsopties",
+  "Show Hidden": "Toon verborgen",
+  "Folders First": "Mappen eerst",
+  "Hidden Last": "Verborgen laatste",
+  "Cut": "Snee",
+  "Copy": "Kopiëren",
+  "Copying ": "",
+  "Paste": "",
+  "Paste ": "",
+  " file(s)?": "",
  "Pasting ": "",
  "Pasting": "",
-  "Removing ": "",
-  "Scanning ": "",
+  "Rename": "Hernoemen",
+  "Set New File Name": "",
+  "Extract zip": "",
+  "Extract Options": "",
+  "Extract here": "",
+  "Extract to root": "",
+  "Are you sure you want to extract to root?": "",
+  "Extract to...": "",
+  "Enter the path to the folder to extract into": "",
+  "Extracting ": "",
+  "Extract success!": "",
+  "Extract failed!": "",
+  "Compress to zip": "",
+  "Compress Options": "",
+  "Compress": "",
+  "Compress to...": "",
+  "Compressing ": "",
+  "Compress success!": "",
+  "Compress failed!": "",
+  "Create File": "Bestand maken",
+  "Set File Name": "",
+  "Create Folder": "Map maken",
+  "Set Folder Name": "",
  "Creating ": "",
-  "Copying ": "",
+  "Upload": "",
+  "Select upload location": "",
+  "No upload locations set!": "",
+  "Uploading": "",
+  "Upload successfull!": "",
+  "Upload failed!": "",
+  "View as text (unfinished)": "Bekijk als tekst (onvoltooid)",
+  "Ignore read only": "",
+  "Mount": "",
+  "Sd": "",
+  "Image System memory": "",
+  "Image microSD card": "",
+  "Empty...": "",
+  "Open with DayBreak?": "",
+  "Launch ": "",
+  "Launch option for: ": "",
+  "Select launcher for: ": "",
+
+  "Sort By": "Sorteer op",
+  "Sort Options": "Sorteeropties",
+  "Filter": "Filter",
+  "All": "Alle",
+  "Emulators": "Emulators",
+  "Tools": "Hulpmiddelen",
+  "Themes": "Thema's",
+  "Legacy": "Nalatenschap",
+  "Sort": "Soort",
+  "Size": "Maat",
+  "Size (Star)": "",
+  "Alphabetical": "Alfabetisch",
+  "Alphabetical (Star)": "",
+  "Updated": "Bijgewerkt",
+  "Updated (Star)": "",
+  "Downloads": "Downloads",
+  "Likes": "",
+  "ID": "",
+  "Order": "Volgorde",
+  "Descending": "Aflopend",
+  "Descending (down)": "Aflopend",
+  "Desc": "Aflopend",
+  "Ascending": "Oplopend",
+  "Ascending (Up)": "Oplopend",
+  "Asc": "Oplopend",
+  "Layout": "",
+  "List": "",
+  "Icon": "",
+  "Grid": "",
+  "Search": "Zoekopdracht",
+
+  "Options": "Opties",
+  "OK": "",
+  "Back": "Terug",
+  "Select": "",
+  "Open": "Open",
+  "Launch": "Launch",
+  "Restart": "",
+  "Next": "",
+  "Prev": "",
+  "Unstar": "",
+  "Star": "",
+  "Yes": "Ja",
+  "No": "Nee",
+  "On": "",
+  "Off": "",
+
+  "Install": "Installeren",
+  "Install Selected files?": "",
+  "Installing ": "",
+  "Installed ": "",
+  "Installed!": "",
  "Trying to load ": "",
-  "Downloading ": "",
  "Checking MD5": "",
+
+  "Delete": "Verwijderen",
+  "Delete Selected files?": "",
+  "Are you sure you want to delete ": "Weet u zeker dat u wilt verwijderen ",
+  "Scanning ": "",
+  "Deleting ": "",
+  "Deleting": "",
+  "Remove": "",
+  "Completely remove ": "",
+  "Removing ": "",
+  "Removed ": "",
+  "Uninstalling ": "",
+
+  "Download": "Downloaden",
+  "Downloading ": "",
+  "Downloaded ": "",
+
+  "Update": "",
+  "Update avaliable: ": "",
+  "Download update: ": "",
+  "Updated to ": "",
+  "Failed to download update": "",
+
+  "%zu hours %zu minutes remaining": "",
+  "%zu minutes %zu seconds remaining": "",
+  "%zu seconds remaining": "",
+
  "Loading...": "",
  "Loading": "",
  "Empty!": "",
  "Not Ready...": "",
-  "Error loading page!": "",
-  "Update avaliable: ": "",
-  "Download update: ": "",
-  "Updated to ": "",
-  "Restart Sphaira?": "",
-  "Failed to download update": "",
-  "Delete Selected files?": "",
-  "Completely remove ": "",
-  "Are you sure you want to delete ": "Weet u zeker dat u wilt verwijderen ",
-  "Are you sure you wish to cancel?": "",
-  "If this message appears repeatedly, please open an issue.": ""
+  "Error loading page!": ""
 }
--- a/assets/romfs/i18n/pt.json
+++ b/assets/romfs/i18n/pt.json
@@ -1,75 +1,35 @@
 {
-  "[Applet Mode]": "[Modo Applet]",
-  "No Internet": "Sem Internet",
-  "Files": "",
-  "Apps": "",
-  "Store": "",
-  "Menu": "Menu",
-  "Options": "Opções",
-  "OK": "",
-  "Back": "Voltar",
-  "Select": "",
-  "Open": "Abrir",
-  "Launch": "Iniciar",
-  "Info": "Informações",
-  "Install": "Instalar",
-  "Delete": "Excluir",
-  "Restart": "",
-  "Changelog": "",
-  "Details": "",
-  "Update": "",
-  "Remove": "",
-  "Download": "Download",
-  "Next Page": "Próxima página",
-  "Prev Page": "Página anterior",
-  "Unstar": "",
-  "Star": "",
-  "System memory": "",
-  "microSD card": "",
-  "Yes": "Sim",
-  "No": "Não",
-  "Enabled": "Habilitado",
-  "Disabled": "Desabilitado",
-
-  "Sort By": "Ordenar por",
-  "Sort Options": "Opções de classificação",
-  "Filter": "Filtro",
-  "Sort": "Organizar",
-  "Order": "Ordem",
-  "Search": "Procurar",
-  "Updated": "Atualizado",
-  "Updated (Star)": "",
-  "Downloads": "Downloads",
-  "Size": "Tamanho",
-  "Size (Star)": "",
-  "Alphabetical": "Alfabético",
-  "Alphabetical (Star)": "",
-  "Likes": "",
-  "ID": "",
-  "Decending": "Decrescente",
-  "Descending (down)": "Decrescente",
-  "Desc": "Decrescente",
-  "Ascending": "Ascendente",
-  "Ascending (Up)": "Ascendente",
-  "Asc": "Ascendente",
+  "[Applet Mode]": "[Modo applet]",
+  "No Internet": "Sem internet",
+  "Switch-Handheld!": "Switch-Portátil",
+  "Switch-Docked!": "Switch-Docado",
+  "Audio disabled due to suspended game": "Áudio desativado devido ao software suspenso.",
+  "Are you sure you wish to cancel?": "Você tem certeza que quer cancelar?",
+  "An error occurred": "",
+  "If this message appears repeatedly, please open an issue.": "Se esta mensagem aparecer repetidamente, abra um issue.",

  "Menu Options": "Opções do menu",
-  "Header": "Cabeçalho",
+  "Menu": "Menu",
  "Theme": "Tema",
  "Theme Options": "Opções de tema",
-  "Select Theme": "Selecionar tema",
-  "Shuffle": "Embaralhar",
+  "Select Theme": "Tema atual",
  "Music": "Música",
+  "12 Hour Time": "Relógio de 12 horas",
+  "Download Default Music": "Baixar música padrão",
+  "Failed to download default_music.bfstm, please try again": "",
+  "Overwrite current default music?": "",
+
  "Network": "Rede",
  "Network Options": "Opções de rede",
+  "Ftp": "Servidor FTP",
+  "Mtp": "Escuta MTP",
  "Nxlink": "Nxlink",
-  "Nxlink Connected": "",
-  "Nxlink Upload": "",
-  "Nxlink Finished": "",
-  "Switch-Handheld!": "",
-  "Switch-Docked!": "",
+  "Nxlink Connected": "Nxlink conectado",
+  "Nxlink Upload": "Envio Nxlink",
+  "Nxlink Finished": "Nxlink finalizado",
+
  "Language": "Idioma",
-  "Auto": "",
+  "Auto": "Automático",
  "English": "English",
  "Japanese": "日本語",
  "French": "Français",
@@ -82,96 +42,114 @@
  "Portuguese": "Português",
  "Russian": "Русский",
  "Swedish": "Svenska",
-  "Logging": "Logging",
-  "Replace hbmenu on exit": "Substitua hbmenu ao sair",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",
+
  "Misc": "Diversos",
  "Misc Options": "Opções diversas",
-  "Web": "Rede",
-  "Install forwarders": "",
-  "Install location": "",
-  "Show install warning": "",
+  "Games": "Softwares",
+  "Game Options": "Opções de software",
+  "Hide forwarders": "Ocultar atalhos (forwarders)",
+  "Launch random game": "Iniciar um software aleatório",
+  "List meta records": "Registro de conteúdos",
+  "Entries": "Entradas",
+  "Failed to list application meta entries": "",
+  "No meta entries found...\n": "",
+  "Updating application record list": "",
+  "Dump": "Exportar",
+  "Select content to dump": "Exportação de conteúdo",
+  "Dump All": "Exportar tudo",
+  "Dump Application": "Exportar software base",
+  "Dump Patch": "Exportar atualização",
+  "Dump AddOnContent": "Exportar DLCs",
+  "Dump DataPatch": "Exportar patch de dados",
+  "Select dump location": "Selecione o local de exportação",
+  "microSD card (/dumps/NSP/)": "Cartão microSD (/dump/NSP/)",
+  "USB transfer (Switch 2 Switch)": "Transferência via USB (Switch 2 Switch)",
+  "/dev/null (Speed Test)": "Teste de velocidade (/dev/null)",
+  "Dumping": "Extraindo...",
+  "Dump successfull!": "Extração foi concluída com sucesso.",
+  "Dump failed!": "Extração falhou.",
+  "Success": "",
+  "Delete successfull!": "Exclusão foi concluída com sucesso.",
+  "Delete failed!": "Exclusão falhou",

-  "FileBrowser": "Navegador de arquivos",
-  "%zd files": "%zd files",
-  "%zd dirs": "%zd dirs",
-  "File Options": "Opções de arquivo",
-  "Show Hidden": "Mostrar oculto",
-  "Folders First": "Pastas primeiro",
-  "Hidden Last": "Oculto por último",
-  "Cut": "Cortar",
-  "Copy": "Copiar",
-  "Paste": "",
-  "Paste ": "",
-  " file(s)?": "",
-  "Rename": "Renomear",
-  "Set New File Name": "",
-  "Advanced": "Avançado",
-  "Advanced Options": "Criar arquivo",
-  "Create File": "Criar arquivo",
-  "Set File Name": "",
-  "Create Folder": "Criar pasta",
-  "Set Folder Name": "",
-  "View as text (unfinished)": "Ver como texto (inacabado)",
-  "Empty...": "",
-  "Open with DayBreak?": "",
-  "Launch ": "",
-  "Launch option for: ": "",
-  "Select launcher for: ": "",
+  "Themezer": "Themezer",
+  "Themezer Options": "Opções do Themezer",
+  "Nsfw": "Temas 18+ (NSFW)",
+  "Page": "Ir para página",
+  "Page %zu / %zu": "Página %zu / %zu",
+  "Enter Page Number": "Número da página",
+  "Bad Page": "Página inválida",
+  "Download theme?": "Baixar tema?",

-  "Homebrew": "Homebrew",
-  "Homebrew Options": "Opções do Homebrew",
-  "Hide Sphaira": "Esconder Sphaira",
-  "Install Forwarder": "Instalar forwarder",
-  "WARNING: Installing forwarders will lead to a ban!": "AVISO: Isso pode resultar em um banimento!",
-  "Installing Forwarder": "",
-  "Creating Program": "",
-  "Creating Control": "",
-  "Creating Meta": "",
-  "Writing Nca": "",
-  "Updating ncm databse": "",
-  "Pushing application record": "",
-  "Installed!": "",
-  "Failed to install forwarder": "",
-  "Unstarred ": "",
-  "Starred ": "",
+  "GitHub": "GitHub",
+  "Downloading json": "Baixando JSON",
+  "Select asset to download for ": "Selecione o recurso para baixar de ",

-  "AppStore": "",
-  "Filter: %s | Sort: %s | Order: %s": "Filtro: %s | Organizar: %s | Ordem: %s",
-  "AppStore Options": "Opções da AppStore",
-  "All": "Todos",
-  "Games": "Jogos",
-  "Emulators": "Emuladores",
-  "Tools": "Ferramentas",
-  "Themes": "Temas",
-  "Legacy": "Legado",
-  "version: %s": "version: %s",
-  "updated: %s": "updated: %s",
-  "category: %s": "category: %s",
-  "extracted: %.2f MiB": "extracted: %.2f MiB",
-  "app_dls: %s": "app_dls: %s",
-  "More by Author": "",
-  "Leave Feedback": "",
+  "FTP Install": "Instalação via FTP",
+  "FTP Install (EXPERIMENTAL)": "Instalação via FTP (EXPERIMENTAL)",
+  "Connection Type: WiFi | Strength: ": "Conexão por rede Wi-Fi | Intensidade do sinal: ",
+  "Connection Type: Ethernet": "Conexão por cabo (ethernet)",
+  "Connection Type: None": "Sem conexão",
+  "Host:": "Host:",
+  "Port:": "Porta:",
+  "Username:": "Nome de usuário:",
+  "Password:": "Senha:",
+  "SSID:": "SSID:",
+  "Passphrase:": "Senha:",
+  "Failed to install via FTP, press B to exit...": "Falha ao instalar via FTP,\naperte B para sair.",
+  "Ftp install success!": "Instalação via FTP concluída com sucesso.",
+  "Ftp install failed!": "Instalação via FTP falhou.",
+  "USB Install": "Instalação via USB",
+  "USB": "USB",
+  "Connected, waiting for file list...": "",
+  "Connected, starting transfer...": "",
+  "Failed to init usb, press B to exit...": "Falha ao instalar via USB,\naperte B para sair.",
+  "Waiting for connection...": "Aguardando conexão...",
+  "Transferring data...": "Transferindo dados...",
+  "USB connected, sending file list": "",
+  "Sent file list, waiting for command...": "",
+  "waiting for usb connection...": "",
+  "Disable MTP for usb install": "Escuta MTP desabilitada temporáriamente.",
+  "Re-enabled MTP": "Escuta MTP reabilitada.",
+  "Installed via usb": "Instalado via USB",
+  "Usb install success!": "Instalação via USB concluída com sucesso.",
+  "Usb install failed!": "Instalação via USB falhou.",
+  "Press B to exit...": "Aperte B para sair.",
+  "GameCard Install": "Instalação de cartão de jogo",
+  "GameCard": "Cartão de jogo",
+  "GC": "",
+  "System memory %.1f GB": "",
+  "microSD card %.1f GB": "",
+  "Nand Install": "",
+  "SD Card Install": "",
+  "Exit": "",
+  "Gc install success!": "Instalação de cartão de jogo concluída com sucesso.",
+  "Gc install failed!": "Instalação de cartão de jogo falhou.",

-  "Irs": "Irs",
-  "Ambient Noise Level: ": "",
+  "IRS (Infrared Joycon Camera)": "Câmera de movimento IR",
+  "IRS": "Câmera de movimento IR",
+  "Irs": "Câmera de movimento IR",
+  "Ambient Noise Level: ": "Nível de ruído ambiente: ",
  "Controller": "Controle",
  "Pad ": "Pad ",
-  " (Available)": " (Disponível)",
-  " (Unsupported)": "",
-  " (Unconnected)": " (Desconectado)",
  "HandHeld": "Portátil",
+  " (Available)": " (disponível)",
+  " (Unsupported)": "(não suportado)",
+  " (Unconnected)": " (desconectado)",
  "Rotation": "Rotação",
-  "0 (Sideways)": "0 (Lateralmente)",
+  "0 (Sideways)": "0 (lateralmente)",
  "90 (Flat)": "90 (plano)",
-  "180 (-Sideways)": "180 (-Lateralmente)",
-  "270 (Upside down)": "270 (De cabeça para baixo)",
+  "180 (-Sideways)": "180 (-lateralmente)",
+  "270 (Upside down)": "270 (de cabeça para baixo)",
  "Colour": "Cor",
  "Grey": "Cinza",
-  "Ironbow": "Arco de ferro",
+  "Ironbow": "Ferro",
  "Green": "Verde",
  "Red": "Vermelho",
  "Blue": "Azul",
-  "Light Target": "Alvo leve",
+  "Light Target": "Alvo de luz",
  "All leds": "Todos os LEDs",
  "Bright group": "Grupo claro",
  "Dim group": "Grupo escuro",
@@ -180,51 +158,235 @@
  "Negative Image": "Imagem negativa",
  "Normal image": "Imagem normal",
  "Negative image": "Imagem negativa",
-  "Format": "Formatar",
+  "Format": "Formato",
+  "Trimming Format": "Formato do recorte",
  "320x240": "320×240",
  "160x120": "160×120",
  "80x60": "80×60",
  "40x30": "40×30",
  "20x15": "20×15",
-  "Trimming Format": "Formato de corte",
-  "External Light Filter": "Filtro de luz externo",
-  "Load Default": "Carregar padrão",
+  "External Light Filter": "Filtro de luz externa",
+  "Load Default": "Restaurar padrão",

-  "Themezer": "Themezer",
-  "Themezer Options": "",
-  "Nsfw": "",
-  "Page": "",
-  "Page %zu / %zu": "Page %zu / %zu",
-  "Enter Page Number": "",
-  "Bad Page": "",
-  "Download theme?": "",
+  "Advanced": "Avançado",
+  "Advanced Options": "Opções avançadas",
+  "Logging": "Registro de depuração",
+  "Replace hbmenu on exit": "Substituir hbmenu ao sair",
+  "Restore hbmenu?": "Restaurar hbmenu?",
+  "Restore": "Restaurar",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "Falha ao buscar /switch/hbmenu.nro\nUse a loja (AppStore) para reinstalar o hbmenu.",
+  "Failed to restore hbmenu, please re-download hbmenu": "Falha ao restaurar o hbmenu, baixe o hbmenu novamente.",
+  "Failed to restore hbmenu, using sphaira instead": "Falha ao restaurar hbmenu, usando sphaira.",
+  "Restored hbmenu, closing sphaira": "hbmenu restaurado, fechando sphaira.",
+  "Restored hbmenu": "hbmenu restaurado.",
+  "Restart Sphaira?": "Reiniciar sphaira?",
+  "Press OK to restart Sphaira": "Selecione OK para reiniciar o sphaira.",
+  "Text scroll speed": "Rolagem do texto",
+  "Slow": "Lenta",
+  "Normal": "Normal",
+  "Fast": "Rápida",
+  "Set right-side menu": "Menu do botão R",
+  "Install options": "Opções de instalação",
+  "Install Options": "Opções de instalação",
+  "Enable sysmmc": "Habilitar sysMMC",
+  "Enable emummc": "Habilitar emuMMC",
+  "Show install warning": "Mostrar aviso de instalação",
+  "Install location": "Local de instalação",
+  "System memory": "Memória do console",
+  "microSD card": "Cartão microSD",
+  "Boost CPU clock": "Aumentar clock da CPU",
+  "Allow downgrade": "Permitir downgrade",
+  "Skip if already installed": "Pular se já instalado",
+  "Ticket only": "Instalar apenas ticket",
+  "Skip base": "Pular software base",
+  "Skip patch": "Pular atualizações",
+  "Skip dlc": "Pular DLCs",
+  "Skip data patch": "Pular patch de dados",
+  "Skip ticket": "Pular ticket",
+  "Skip NCA hash verify": "",
+  "Skip RSA header verify": "Pular checagem de header RSA",
+  "Skip RSA NPDM verify": "Pular checagem de NPDM RSA",
+  "Ignore distribution bit": "Ignorar bit de distribuição",
+  "Convert to standard crypto": "Convertr para crypto padrão",
+  "Lower master key": "Reduzir a master key",
+  "Lower system version": "Reduzir versão do sistema",

-  "Installing ": "",
-  "Uninstalling ": "",
-  "Deleting ": "",
-  "Deleting": "",
-  "Pasting ": "",
-  "Pasting": "",
-  "Removing ": "",
-  "Scanning ": "",
-  "Creating ": "",
-  "Copying ": "",
-  "Trying to load ": "",
-  "Downloading ": "",
-  "Checking MD5": "",
-  "Loading...": "",
-  "Loading": "",
-  "Empty!": "",
-  "Not Ready...": "",
-  "Error loading page!": "",
-  "Update avaliable: ": "",
-  "Download update: ": "",
-  "Updated to ": "",
-  "Restart Sphaira?": "",
-  "Failed to download update": "",
-  "Delete Selected files?": "",
-  "Completely remove ": "",
-  "Are you sure you want to delete ": "Excluir ",
-  "Are you sure you wish to cancel?": "",
-  "If this message appears repeatedly, please open an issue.": ""
+  "Homebrew": "Aplicativos",
+  "Apps": "Aplicativos",
+  "Homebrew Options": "Opções de aplicativo",
+  "Hide Sphaira": "Esconder sphaira",
+  "Install Forwarder": "Instalar atalho (forwarder)",
+  "WARNING: Installing forwarders will lead to a ban!": "AVISO: Instalar atalhos pode resultar em um banimento!",
+  "Installing Forwarder": "Instalando forwarder...",
+  "Creating Program": "Criando Program",
+  "Creating Control": "Criando Control",
+  "Creating Meta": "Criando Meta",
+  "Writing Nca": "Escrevendo NCA",
+  "Updating ncm databse": "Atualizando base de dados NCM",
+  "Pushing application record": "Aplicando registro do aplicativo",
+  "Failed to install forwarder": "Falha ao instalar forwarder",
+  "Unstarred ": "Desfavoritado ",
+  "Starred ": "Favoritado ",
+  "Failed to remove old forwarder, please manually remove it!": "",
+
+  "AppStore": "Loja",
+  "Appstore": "Loja",
+  "Store": "Loja",
+  "Filter: %s | Sort: %s | Order: %s": "Filtro: %s | Por: %s | Ordem: %s",
+  "AppStore Options": "Opções da loja",
+  "Info": "Informações",
+  "Changelog": "Alterações",
+  "Details": "Detalhes",
+  "version: %s": "versão: %s",
+  "updated: %s": "atualizado: %s",
+  "category: %s": "categoria: %s",
+  "extracted: %.2f MiB": "tam. extraído: %.2f MiB",
+  "app_dls: %s": "downloads: %s",
+  "More by Author": "Mais deste autor",
+  "Leave Feedback": "Deixar um feedback",
+
+  "FileBrowser": "Arquivos",
+  "Files": "Arquivos",
+  "%zd files": "%zd arquivo(s)",
+  "%zd dirs": "%zd diretório(s)",
+  "File Options": "Opções de arquivo",
+  "Show Hidden": "Mostrar ocultos",
+  "Folders First": "Pastas primeiro",
+  "Hidden Last": "Ocultos por último",
+  "Cut": "Recortar",
+  "Copy": "Copiar",
+  "Copying ": "Copiando ",
+  "Paste": "Colar",
+  "Paste ": "Colar ",
+  " file(s)?": " arquivo(s)?",
+  "Pasting ": "Colando ",
+  "Pasting": "Colando ",
+  "Rename": "Renomear",
+  "Set New File Name": "Defina o nome do novo arquivo",
+  "Extract zip": "",
+  "Extract Options": "",
+  "Extract here": "",
+  "Extract to root": "",
+  "Are you sure you want to extract to root?": "",
+  "Extract to...": "",
+  "Enter the path to the folder to extract into": "",
+  "Extracting ": "",
+  "Extract success!": "",
+  "Extract failed!": "",
+  "Compress to zip": "Comprimir em zip",
+  "Compress Options": "",
+  "Compress": "",
+  "Compress to...": "",
+  "Compressing ": "",
+  "Compress success!": "",
+  "Compress failed!": "",
+  "Create File": "Criar arquivo",
+  "Set File Name": "Defina o nome do arquivo",
+  "Create Folder": "Criar pasta",
+  "Set Folder Name": "Defina o nome da pasta",
+  "Creating ": "Criando ",
+  "Upload": "",
+  "Select upload location": "",
+  "No upload locations set!": "",
+  "Uploading": "",
+  "Upload successfull!": "",
+  "Upload failed!": "",
+  "View as text (unfinished)": "Ver como texto (inacabado)",
+  "Ignore read only": "Ignorar somente leitura",
+  "Mount": "Montar",
+  "Sd": "SD",
+  "Image System memory": "Imagem (memória do console)",
+  "Image microSD card": "Imagem (cartão microSD)",
+  "Empty...": "Vazio",
+  "Open with DayBreak?": "Abrir com DayBreak?",
+  "Launch ": "Iniciar ",
+  "Launch option for: ": "Opções de inicialização para: ",
+  "Select launcher for: ": "Selecionar launcher para: ",
+
+  "Sort By": "Ordernar/Organizar",
+  "Sort Options": "Ordernar/Organizar",
+  "Filter": "Filtro",
+  "All": "Todos",
+  "Emulators": "Emuladores",
+  "Tools": "Ferramentas",
+  "Themes": "Temas",
+  "Legacy": "Legado",
+  "Sort": "Organizar por",
+  "Size": "Tamanho",
+  "Size (Star)": "Tamanho (favoritos)",
+  "Alphabetical": "Ordem alfabética",
+  "Alphabetical (Star)": "Ordem alfabética (favoritos)",
+  "Updated": "Atualizado",
+  "Updated (Star)": "Atualizado (favoritos)",
+  "Downloads": "Nº de downloads",
+  "Likes": "Nº de curtidas",
+  "ID": "ID",
+  "Order": "Ordem",
+  "Descending": "Decrescente",
+  "Descending (down)": "Decrescente (baixo)",
+  "Desc": "Decr.",
+  "Ascending": "Ascendente",
+  "Ascending (Up)": "Ascendente (cima)",
+  "Asc": "Asc.",
+  "Layout": "Exibição",
+  "List": "Lista",
+  "Icon": "Ícones",
+  "Grid": "Grade",
+  "Search": "Buscar",
+
+  "Options": "Opções",
+  "OK": "OK",
+  "Back": "Voltar",
+  "Select": "Selecionar",
+  "Open": "Abrir",
+  "Launch": "Iniciar",
+  "Restart": "Reiniciar",
+  "Next": "Prómixo",
+  "Prev": "Anterior",
+  "Unstar": "Desfavoritar",
+  "Star": "Favoritar",
+  "Yes": "Sim",
+  "No": "Não",
+  "On": "Sim",
+  "Off": "Não",
+
+  "Install": "Instalar",
+  "Install Selected files?": "Instalar os arquivos selecionados?",
+  "Installing ": "Instalando ",
+  "Installed ": "Instalado ",
+  "Installed!": "Instalado!",
+  "Trying to load ": "Tentando carregar ",
+  "Checking MD5": "Checando MD5",
+
+  "Delete": "Excluir",
+  "Delete Selected files?": "Excluir os arquivos selecionados?",
+  "Are you sure you want to delete ": "Você tem certeza que quer excluir ",
+  "Scanning ": "Analisando ",
+  "Deleting ": "Excluindo ",
+  "Deleting": "Excluindo...",
+  "Remove": "Remover",
+  "Completely remove ": "Remover completamente ",
+  "Removing ": "Removendo ",
+  "Removed ": "Removido ",
+  "Uninstalling ": "Desinstalando ",
+
+  "Download": "Baixar",
+  "Downloading ": "Baixando ",
+  "Downloaded ": "Baixado ",
+
+  "Update": "Atualizar",
+  "Update avaliable: ": "Atualização disponível: ",
+  "Download update: ": "Baixar autalização: ",
+  "Updated to ": "Atualizado para ",
+  "Failed to download update": "Falha ao baixar a atualização.",
+
+  "%zu hours %zu minutes remaining": "",
+  "%zu minutes %zu seconds remaining": "",
+  "%zu seconds remaining": "",
+
+  "Loading...": "Carregando...",
+  "Loading": "Carregando",
+  "Empty!": "Vazio",
+  "Not Ready...": "Não está pronto...",
+  "Error loading page!": "Erro ao carregar página."
 }
--- a/assets/romfs/i18n/ru.json
+++ b/assets/romfs/i18n/ru.json
@@ -1,73 +1,33 @@
 {
  "[Applet Mode]": "[Режим апплета]",
  "No Internet": "Нет Интернета",
-  "Files": "",
-  "Apps": "",
-  "Store": "",
-  "Menu": "Меню",
-  "Options": "Параметры темы",
-  "OK": "",
-  "Back": "Назад",
-  "Select": "",
-  "Open": "Открыть",
-  "Launch": "Запуск",
-  "Info": "Информация",
-  "Install": "Установить",
-  "Delete": "Удалить",
-  "Restart": "",
-  "Changelog": "",
-  "Details": "",
-  "Update": "",
-  "Remove": "",
-  "Download": "Скачать",
-  "Next Page": "Следующая страница",
-  "Prev Page": "Предыдущая страница",
-  "Unstar": "",
-  "Star": "",
-  "System memory": "",
-  "microSD card": "",
-  "Yes": "Да",
-  "No": "Нет",
-  "Enabled": "Включено",
-  "Disabled": "Отключено",
-
-  "Sort By": "Сортировать по",
-  "Sort Options": "Параметры сортировки",
-  "Filter": "Фильтр",
-  "Sort": "Сортировать",
-  "Order": "Порядок",
-  "Search": "Поиск",
-  "Updated": "Обновлено",
-  "Updated (Star)": "",
-  "Downloads": "Загрузки",
-  "Size": "Размер",
-  "Size (Star)": "",
-  "Alphabetical": "По наименованию",
-  "Alphabetical (Star)": "",
-  "Likes": "",
-  "ID": "",
-  "Decending": "По убыванию",
-  "Descending (down)": "По убыванию",
-  "Desc": "По убыванию",
-  "Ascending": "По возрастанию",
-  "Ascending (Up)": "По возрастанию",
-  "Asc": "По возрастанию",
+  "Switch-Handheld!": "",
+  "Switch-Docked!": "",
+  "Audio disabled due to suspended game": "",
+  "Are you sure you wish to cancel?": "",
+  "An error occurred": "",
+  "If this message appears repeatedly, please open an issue.": "",

  "Menu Options": "Параметры меню",
-  "Header": "Заголовок",
+  "Menu": "Меню",
  "Theme": "Тема",
  "Theme Options": "Параметры темы",
  "Select Theme": "Выберите тему",
-  "Shuffle": "Перетасовать",
  "Music": "Музыка",
+  "12 Hour Time": "",
+  "Download Default Music": "",
+  "Failed to download default_music.bfstm, please try again": "",
+  "Overwrite current default music?": "",
+
  "Network": "Сеть",
  "Network Options": "Параметры сети",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
  "Nxlink": "Nxlink",
  "Nxlink Connected": "",
  "Nxlink Upload": "",
  "Nxlink Finished": "",
-  "Switch-Handheld!": "",
-  "Switch-Docked!": "",
+
  "Language": "Язык",
  "Auto": "",
  "English": "English",
@@ -82,84 +42,102 @@
  "Portuguese": "Português",
  "Russian": "Русский",
  "Swedish": "Svenska",
-  "Logging": "Журналирование",
-  "Replace hbmenu on exit": "Заменить hbmenu при выходе",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",
+
  "Misc": "Прочее",
  "Misc Options": "Прочие параметры",
-  "Web": "Интернет",
-  "Install forwarders": "",
-  "Install location": "",
-  "Show install warning": "",
-
-  "FileBrowser": "Файловый менеджер",
-  "%zd files": "%zd files",
-  "%zd dirs": "%zd dirs",
-  "File Options": "Параметры файла",
-  "Show Hidden": "Показать скрытые",
-  "Folders First": "Папки в первую очередь",
-  "Hidden Last": "Скрытые в последнюю очередь",
-  "Cut": "Вырезать",
-  "Copy": "Копировать",
-  "Paste": "",
-  "Paste ": "",
-  " file(s)?": "",
-  "Rename": "Переименовать",
-  "Set New File Name": "",
-  "Advanced": "Продвинутые",
-  "Advanced Options": "Расширенные параметры",
-  "Create File": "Создать файл",
-  "Set File Name": "",
-  "Create Folder": "Создать папку",
-  "Set Folder Name": "",
-  "View as text (unfinished)": "Посмотреть как текст (незакончено)",
-  "Empty...": "",
-  "Open with DayBreak?": "",
-  "Launch ": "",
-  "Launch option for: ": "",
-  "Select launcher for: ": "",
-
-  "Homebrew": "Homebrew",
-  "Homebrew Options": "Параметры Homebrew",
-  "Hide Sphaira": "Скрыть Sphaira",
-  "Install Forwarder": "Установить форвардер",
-  "WARNING: Installing forwarders will lead to a ban!": "ВНИМАНИЕ: Установка форвардеров приведет к бану!",
-  "Installing Forwarder": "Установить форвардер",
-  "Creating Program": "",
-  "Creating Control": "",
-  "Creating Meta": "",
-  "Writing Nca": "",
-  "Updating ncm databse": "",
-  "Pushing application record": "",
-  "Installed!": "",
-  "Failed to install forwarder": "",
-  "Unstarred ": "",
-  "Starred ": "",
-
-  "AppStore": "",
-  "Filter: %s | Sort: %s | Order: %s": "Фильтр: %s | Сортировать: %s | Порядок: %s",
-  "AppStore Options": "Параметры магазина приложений",
-  "All": "Все",
  "Games": "Игры",
-  "Emulators": "Эмуляторы",
-  "Tools": "Инструменты",
-  "Themes": "Темы",
-  "Legacy": "Легаси",
-  "version: %s": "version: %s",
-  "updated: %s": "updated: %s",
-  "category: %s": "category: %s",
-  "extracted: %.2f MiB": "extracted: %.2f MiB",
-  "app_dls: %s": "app_dls: %s",
-  "More by Author": "",
-  "Leave Feedback": "",
+  "Game Options": "",
+  "Hide forwarders": "",
+  "Launch random game": "",
+  "List meta records": "",
+  "Entries": "",
+  "Failed to list application meta entries": "",
+  "No meta entries found...\n": "",
+  "Updating application record list": "",
+  "Dump": "",
+  "Select content to dump": "",
+  "Dump All": "",
+  "Dump Application": "",
+  "Dump Patch": "",
+  "Dump AddOnContent": "",
+  "Dump DataPatch": "",
+  "Select dump location": "",
+  "microSD card (/dumps/NSP/)": "",
+  "USB transfer (Switch 2 Switch)": "",
+  "/dev/null (Speed Test)": "",
+  "Dumping": "",
+  "Dump successfull!": "",
+  "Dump failed!": "",
+  "Success": "",
+  "Delete successfull!": "",
+  "Delete failed!": "",

+  "Themezer": "Themezer",
+  "Themezer Options": "",
+  "Nsfw": "",
+  "Page": "",
+  "Page %zu / %zu": "Page %zu / %zu",
+  "Enter Page Number": "",
+  "Bad Page": "",
+  "Download theme?": "",
+
+  "GitHub": "",
+  "Downloading json": "",
+  "Select asset to download for ": "",
+
+  "FTP Install": "",
+  "FTP Install (EXPERIMENTAL)": "",
+  "Connection Type: WiFi | Strength: ": "",
+  "Connection Type: Ethernet": "",
+  "Connection Type: None": "",
+  "Host:": "",
+  "Port:": "",
+  "Username:": "",
+  "Password:": "",
+  "SSID:": "",
+  "Passphrase:": "",
+  "Failed to install via FTP, press B to exit...": "",
+  "Ftp install success!": "",
+  "Ftp install failed!": "",
+  "USB Install": "",
+  "USB": "",
+  "Connected, waiting for file list...": "",
+  "Connected, starting transfer...": "",
+  "Failed to init usb, press B to exit...": "",
+  "Waiting for connection...": "",
+  "Transferring data...": "",
+  "USB connected, sending file list": "",
+  "Sent file list, waiting for command...": "",
+  "waiting for usb connection...": "",
+  "Disable MTP for usb install": "",
+  "Re-enabled MTP": "",
+  "Installed via usb": "",
+  "Usb install success!": "",
+  "Usb install failed!": "",
+  "Press B to exit...": "",
+  "GameCard Install": "",
+  "GameCard": "",
+  "GC": "",
+  "System memory %.1f GB": "",
+  "microSD card %.1f GB": "",
+  "Nand Install": "",
+  "SD Card Install": "",
+  "Exit": "",
+  "Gc install success!": "",
+  "Gc install failed!": "",
+
+  "IRS (Infrared Joycon Camera)": "",
+  "IRS": "",
  "Irs": "Irs",
  "Ambient Noise Level: ": "",
  "Controller": "Контроллер",
  "Pad ": "Pad ",
+  "HandHeld": "Портативный",
  " (Available)": " (Доступно)",
  " (Unsupported)": "",
  " (Unconnected)": " (Не подключено)",
-  "HandHeld": "Портативный",
  "Rotation": "Вращение",
  "0 (Sideways)": "0 (набок)",
  "90 (Flat)": "90 (ровно)",
@@ -181,50 +159,234 @@
  "Normal image": "Обычное изображение",
  "Negative image": "Негативное изображение",
  "Format": "Формат",
+  "Trimming Format": "Формат обрезки",
  "320x240": "320×240",
  "160x120": "160×120",
  "80x60": "80×60",
  "40x30": "40×30",
  "20x15": "20×15",
-  "Trimming Format": "Формат обрезки",
  "External Light Filter": "Внешний светофильтр",
  "Load Default": "Загрузить умолчания",

-  "Themezer": "Themezer",
-  "Themezer Options": "",
-  "Nsfw": "",
-  "Page": "",
-  "Page %zu / %zu": "Page %zu / %zu",
-  "Enter Page Number": "",
-  "Bad Page": "",
-  "Download theme?": "",
+  "Advanced": "Продвинутые",
+  "Advanced Options": "Расширенные параметры",
+  "Logging": "Журналирование",
+  "Replace hbmenu on exit": "Заменить hbmenu при выходе",
+  "Restore hbmenu?": "",
+  "Restore": "",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "",
+  "Failed to restore hbmenu, please re-download hbmenu": "",
+  "Failed to restore hbmenu, using sphaira instead": "",
+  "Restored hbmenu, closing sphaira": "",
+  "Restored hbmenu": "",
+  "Restart Sphaira?": "",
+  "Press OK to restart Sphaira": "",
+  "Text scroll speed": "",
+  "Slow": "",
+  "Normal": "",
+  "Fast": "",
+  "Set right-side menu": "",
+  "Install options": "",
+  "Install Options": "",
+  "Enable sysmmc": "",
+  "Enable emummc": "",
+  "Show install warning": "",
+  "Install location": "",
+  "System memory": "",
+  "microSD card": "",
+  "Boost CPU clock": "",
+  "Allow downgrade": "",
+  "Skip if already installed": "",
+  "Ticket only": "",
+  "Skip base": "",
+  "Skip patch": "",
+  "Skip dlc": "",
+  "Skip data patch": "",
+  "Skip ticket": "",
+  "Skip NCA hash verify": "",
+  "Skip RSA header verify": "",
+  "Skip RSA NPDM verify": "",
+  "Ignore distribution bit": "",
+  "Convert to standard crypto": "",
+  "Lower master key": "",
+  "Lower system version": "",

-  "Installing ": "",
-  "Uninstalling ": "",
-  "Deleting ": "",
-  "Deleting": "",
+  "Homebrew": "Homebrew",
+  "Apps": "",
+  "Homebrew Options": "Параметры Homebrew",
+  "Hide Sphaira": "Скрыть Sphaira",
+  "Install Forwarder": "Установить форвардер",
+  "WARNING: Installing forwarders will lead to a ban!": "ВНИМАНИЕ: Установка форвардеров приведет к бану!",
+  "Installing Forwarder": "Установить форвардер",
+  "Creating Program": "",
+  "Creating Control": "",
+  "Creating Meta": "",
+  "Writing Nca": "",
+  "Updating ncm databse": "",
+  "Pushing application record": "",
+  "Failed to install forwarder": "",
+  "Unstarred ": "",
+  "Starred ": "",
+  "Failed to remove old forwarder, please manually remove it!": "",
+
+  "AppStore": "",
+  "Appstore": "",
+  "Store": "",
+  "Filter: %s | Sort: %s | Order: %s": "Фильтр: %s | Сортировать: %s | Порядок: %s",
+  "AppStore Options": "Параметры магазина приложений",
+  "Info": "Информация",
+  "Changelog": "",
+  "Details": "",
+  "version: %s": "version: %s",
+  "updated: %s": "updated: %s",
+  "category: %s": "category: %s",
+  "extracted: %.2f MiB": "extracted: %.2f MiB",
+  "app_dls: %s": "app_dls: %s",
+  "More by Author": "",
+  "Leave Feedback": "",
+
+  "FileBrowser": "Файловый менеджер",
+  "Files": "",
+  "%zd files": "%zd files",
+  "%zd dirs": "%zd dirs",
+  "File Options": "Параметры файла",
+  "Show Hidden": "Показать скрытые",
+  "Folders First": "Папки в первую очередь",
+  "Hidden Last": "Скрытые в последнюю очередь",
+  "Cut": "Вырезать",
+  "Copy": "Копировать",
+  "Copying ": "",
+  "Paste": "",
+  "Paste ": "",
+  " file(s)?": "",
  "Pasting ": "",
  "Pasting": "",
-  "Removing ": "",
-  "Scanning ": "",
+  "Rename": "Переименовать",
+  "Set New File Name": "",
+  "Extract zip": "",
+  "Extract Options": "",
+  "Extract here": "",
+  "Extract to root": "",
+  "Are you sure you want to extract to root?": "",
+  "Extract to...": "",
+  "Enter the path to the folder to extract into": "",
+  "Extracting ": "",
+  "Extract success!": "",
+  "Extract failed!": "",
+  "Compress to zip": "",
+  "Compress Options": "",
+  "Compress": "",
+  "Compress to...": "",
+  "Compressing ": "",
+  "Compress success!": "",
+  "Compress failed!": "",
+  "Create File": "Создать файл",
+  "Set File Name": "",
+  "Create Folder": "Создать папку",
+  "Set Folder Name": "",
  "Creating ": "",
-  "Copying ": "",
+  "Upload": "",
+  "Select upload location": "",
+  "No upload locations set!": "",
+  "Uploading": "",
+  "Upload successfull!": "",
+  "Upload failed!": "",
+  "View as text (unfinished)": "Посмотреть как текст (незакончено)",
+  "Ignore read only": "",
+  "Mount": "",
+  "Sd": "",
+  "Image System memory": "",
+  "Image microSD card": "",
+  "Empty...": "",
+  "Open with DayBreak?": "",
+  "Launch ": "",
+  "Launch option for: ": "",
+  "Select launcher for: ": "",
+
+  "Sort By": "Сортировать по",
+  "Sort Options": "Параметры сортировки",
+  "Filter": "Фильтр",
+  "All": "Все",
+  "Emulators": "Эмуляторы",
+  "Tools": "Инструменты",
+  "Themes": "Темы",
+  "Legacy": "Легаси",
+  "Sort": "Сортировать",
+  "Size": "Размер",
+  "Size (Star)": "",
+  "Alphabetical": "По наименованию",
+  "Alphabetical (Star)": "",
+  "Updated": "Обновлено",
+  "Updated (Star)": "",
+  "Downloads": "Загрузки",
+  "Likes": "",
+  "ID": "",
+  "Order": "Порядок",
+  "Descending": "По убыванию",
+  "Descending (down)": "По убыванию",
+  "Desc": "По убыванию",
+  "Ascending": "По возрастанию",
+  "Ascending (Up)": "По возрастанию",
+  "Asc": "По возрастанию",
+  "Layout": "",
+  "List": "",
+  "Icon": "",
+  "Grid": "",
+  "Search": "Поиск",
+
+  "Options": "Параметры темы",
+  "OK": "",
+  "Back": "Назад",
+  "Select": "",
+  "Open": "Открыть",
+  "Launch": "Запуск",
+  "Restart": "",
+  "Next": "",
+  "Prev": "",
+  "Unstar": "",
+  "Star": "",
+  "Yes": "Да",
+  "No": "Нет",
+  "On": "",
+  "Off": "",
+
+  "Install": "Установить",
+  "Install Selected files?": "",
+  "Installing ": "",
+  "Installed ": "",
+  "Installed!": "",
  "Trying to load ": "",
-  "Downloading ": "",
  "Checking MD5": "",
+
+  "Delete": "Удалить",
+  "Delete Selected files?": "",
+  "Are you sure you want to delete ": "Вы уверены, что хотите удалить ",
+  "Scanning ": "",
+  "Deleting ": "",
+  "Deleting": "",
+  "Remove": "",
+  "Completely remove ": "",
+  "Removing ": "",
+  "Removed ": "",
+  "Uninstalling ": "",
+
+  "Download": "Скачать",
+  "Downloading ": "",
+  "Downloaded ": "",
+
+  "Update": "",
+  "Update avaliable: ": "",
+  "Download update: ": "",
+  "Updated to ": "",
+  "Failed to download update": "",
+
+  "%zu hours %zu minutes remaining": "",
+  "%zu minutes %zu seconds remaining": "",
+  "%zu seconds remaining": "",
+
  "Loading...": "",
  "Loading": "",
  "Empty!": "",
  "Not Ready...": "",
-  "Error loading page!": "",
-  "Update avaliable: ": "",
-  "Download update: ": "",
-  "Updated to ": "",
-  "Restart Sphaira?": "",
-  "Failed to download update": "",
-  "Delete Selected files?": "",
-  "Completely remove ": "",
-  "Are you sure you want to delete ": "Вы уверены, что хотите удалить ",
-  "Are you sure you wish to cancel?": "",
-  "If this message appears repeatedly, please open an issue.": ""
+  "Error loading page!": ""
 }
--- a/assets/romfs/i18n/se.json
+++ b/assets/romfs/i18n/se.json
@@ -1,73 +1,33 @@
 {
  "[Applet Mode]": "[Applet-läge]",
-  "No Internet": "Ingen internetanslutning",
-  "Files": "Filer",
-  "Apps": "Appar",
-  "Store": "Butik",
-  "Menu": "Meny",
-  "Options": "Alternativ",
-  "OK": "OK",
-  "Back": "Tillbaka",
-  "Select": "Välj",
-  "Open": "Öppna",
-  "Launch": "Starta",
-  "Info": "Info",
-  "Install": "Installera",
-  "Delete": "Radera",
-  "Restart": "",
-  "Changelog": "Ändringslogg",
-  "Details": "Detaljer",
-  "Update": "Uppdatera",
-  "Remove": "Ta bort",
-  "Download": "Ladda ner",
-  "Next Page": "Nästa sida",
-  "Prev Page": "Föregående sida",
-  "Unstar": "",
-  "Star": "",
-  "System memory": "",
-  "microSD card": "",
-  "Yes": "Ja",
-  "No": "Nej",
-  "Enabled": "Aktiverad",
-  "Disabled": "Avaktiverad",
-  
-  "Sort By": "Sortera efter",
-  "Sort Options": "Sorteringsalternativ",
-  "Filter": "Filter",
-  "Sort": "Sortera",
-  "Order": "Ordning",
-  "Search": "Sök",
-  "Updated": "Uppdaterad",
-  "Updated (Star)": "",
-  "Downloads": "Nedladdningar",
-  "Size": "Storlek",
-  "Size (Star)": "",
-  "Alphabetical": "Alfabetisk",
-  "Alphabetical (Star)": "",
-  "Likes": "Gillar",
-  "ID": "ID",
-  "Decending": "Fallande",
-  "Descending (down)": "Fallande (nedåt)",
-  "Desc": "Fallande",
-  "Ascending": "Stigande",
-  "Ascending (Up)": "Stigande (uppåt)",
-  "Asc": "Stigande",
-  
+  "No Internet": "Ingen Internetanslutning",
+  "Switch-Handheld!": "Switch Handhållen!",
+  "Switch-Docked!": "Switch Dockad!",
+  "Audio disabled due to suspended game": "Ljud är avstängt på grund av bakgrundsprogram",
+  "Are you sure you wish to cancel?": "Är du säker på att du vill avbryta?",
+  "An error occurred": "",
+  "If this message appears repeatedly, please open an issue.": "Om detta meddelande visas upprepade gånger, vänligen öppna en felanmälan.",
+
  "Menu Options": "Menyalternativ",
-  "Header": "Rubrik",
+  "Menu": "Meny",
  "Theme": "Tema",
  "Theme Options": "Temaalternativ",
  "Select Theme": "Välj tema",
-  "Shuffle": "Blanda",
  "Music": "Musik",
+  "12 Hour Time": "",
+  "Download Default Music": "",
+  "Failed to download default_music.bfstm, please try again": "",
+  "Overwrite current default music?": "",
+
  "Network": "Nätverk",
  "Network Options": "Nätverksalternativ",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
  "Nxlink": "Nxlink",
  "Nxlink Connected": "Nxlink ansluten",
-  "Nxlink Upload": "Nxlink uppladdning",
+  "Nxlink Upload": "Nxlink överför",
  "Nxlink Finished": "Nxlink klar",
-  "Switch-Handheld!": "",
-  "Switch-Docked!": "",
+
  "Language": "Språk",
  "Auto": "Auto",
  "English": "Engelska",
@@ -82,88 +42,106 @@
  "Portuguese": "Portugisiska",
  "Russian": "Ryska",
  "Swedish": "Svenska",
-  "Logging": "Loggning",
-  "Replace hbmenu on exit": "Ersätt hbmenu vid avslut",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",
+
  "Misc": "Övrigt",
  "Misc Options": "Övriga alternativ",
-  "Web": "Webb",
-  "Install forwarders": "",
-  "Install location": "",
-  "Show install warning": "",
-  
-  "FileBrowser": "Filbläddrare",
-  "%zd files": "%zd filer",
-  "%zd dirs": "%zd kataloger",
-  "File Options": "Filalternativ",
-  "Show Hidden": "Visa dolda",
-  "Folders First": "Mappar först",
-  "Hidden Last": "Dolda sist",
-  "Cut": "Klipp ut",
-  "Copy": "Kopiera",
-  "Paste": "Klistra in",
-  "Paste ": "Klistra in ",
-  " file(s)?": " fil(er)?",
-  "Rename": "Byt namn",
-  "Set New File Name": "Ange nytt filnamn",
-  "Advanced": "Avancerat",
-  "Advanced Options": "Avancerade alternativ",
-  "Create File": "Skapa fil",
-  "Set File Name": "Ange filnamn",
-  "Create Folder": "Skapa mapp",
-  "Set Folder Name": "Ange mappnamn",
-  "View as text (unfinished)": "Visa som text (ofärdig)",
-  "Empty...": "Tom...",
-  "Open with DayBreak?": "Öppna med DayBreak?",
-  "Launch ": "",
-  "Launch option for: ": "Startalternativ för: ",
-  "Select launcher for: ": "",
-  
-  "Homebrew": "Homebrew",
-  "Homebrew Options": "Homebrew-alternativ",
-  "Hide Sphaira": "Dölj Sphaira",
-  "Install Forwarder": "Installera forwarder",
-  "WARNING: Installing forwarders will lead to a ban!": "VARNING: Att installera forwarders leder till en avstängning!",
-  "Installing Forwarder": "Installerar forwarder",
-  "Creating Program": "Skapar program",
-  "Creating Control": "Skapar kontroll",
-  "Creating Meta": "Skapar meta",
-  "Writing Nca": "Skriver Nca",
-  "Updating ncm databse": "Uppdaterar ncm-databas",
-  "Pushing application record": "Lägger till applikationspost",
-  "Installed!": "Installerad!",
-  "Failed to install forwarder": "Misslyckades med att installera forwarder",
-  "Unstarred ": "",
-  "Starred ": "",
-  
-  "AppStore": "AppStore",
-  "Filter: %s | Sort: %s | Order: %s": "Filter: %s | Sortering: %s | Ordning: %s",
-  "AppStore Options": "AppStore-alternativ",
-  "All": "Alla",
  "Games": "Spel",
-  "Emulators": "Emulatorer",
-  "Tools": "Verktyg",
-  "Themes": "Teman",
-  "Legacy": "Legacy",
-  "version: %s": "version: %s",
-  "updated: %s": "uppdaterad: %s",
-  "category: %s": "kategori: %s",
-  "extracted: %.2f MiB": "extraherad: %.2f MiB",
-  "app_dls: %s": "app_nedladdningar: %s",
-  "More by Author": "Mer från författaren",
-  "Leave Feedback": "Lämna feedback",
-  
+  "Game Options": "",
+  "Hide forwarders": "",
+  "Launch random game": "",
+  "List meta records": "",
+  "Entries": "",
+  "Failed to list application meta entries": "",
+  "No meta entries found...\n": "",
+  "Updating application record list": "",
+  "Dump": "",
+  "Select content to dump": "",
+  "Dump All": "",
+  "Dump Application": "",
+  "Dump Patch": "",
+  "Dump AddOnContent": "",
+  "Dump DataPatch": "",
+  "Select dump location": "",
+  "microSD card (/dumps/NSP/)": "",
+  "USB transfer (Switch 2 Switch)": "",
+  "/dev/null (Speed Test)": "",
+  "Dumping": "",
+  "Dump successfull!": "",
+  "Dump failed!": "",
+  "Success": "",
+  "Delete successfull!": "",
+  "Delete failed!": "",
+
+  "Themezer": "Themezer",
+  "Themezer Options": "Themezer-alternativ",
+  "Nsfw": "Nsfw",
+  "Page": "Sida",
+  "Page %zu / %zu": "Sida %zu / %zu",
+  "Enter Page Number": "Ange sidnummer",
+  "Bad Page": "Ogiltig sida",
+  "Download theme?": "Ladda ner tema?",
+
+  "GitHub": "GitHub",
+  "Downloading json": "Laddar ner JSON",
+  "Select asset to download for ": "Välj tillgång att ladda ner för ",
+
+  "FTP Install": "",
+  "FTP Install (EXPERIMENTAL)": "",
+  "Connection Type: WiFi | Strength: ": "",
+  "Connection Type: Ethernet": "",
+  "Connection Type: None": "",
+  "Host:": "",
+  "Port:": "",
+  "Username:": "",
+  "Password:": "",
+  "SSID:": "",
+  "Passphrase:": "",
+  "Failed to install via FTP, press B to exit...": "",
+  "Ftp install success!": "",
+  "Ftp install failed!": "",
+  "USB Install": "",
+  "USB": "",
+  "Connected, waiting for file list...": "",
+  "Connected, starting transfer...": "",
+  "Failed to init usb, press B to exit...": "",
+  "Waiting for connection...": "",
+  "Transferring data...": "",
+  "USB connected, sending file list": "",
+  "Sent file list, waiting for command...": "",
+  "waiting for usb connection...": "",
+  "Disable MTP for usb install": "",
+  "Re-enabled MTP": "",
+  "Installed via usb": "",
+  "Usb install success!": "",
+  "Usb install failed!": "",
+  "Press B to exit...": "",
+  "GameCard Install": "",
+  "GameCard": "",
+  "GC": "",
+  "System memory %.1f GB": "",
+  "microSD card %.1f GB": "",
+  "Nand Install": "",
+  "SD Card Install": "",
+  "Exit": "",
+  "Gc install success!": "",
+  "Gc install failed!": "",
+
+  "IRS (Infrared Joycon Camera)": "",
+  "IRS": "",
  "Irs": "Irs",
  "Ambient Noise Level: ": "Omgivningsljudnivå: ",
-  "Controller": "Kontroll",
+  "Controller": "Kontroller",
  "Pad ": "Handkontroll ",
-  " (Available)": " (Tillgänglig)",
-  " (Unsupported)": "",
-  " (Unconnected)": " (Ej ansluten)",
  "HandHeld": "Handhållen",
+  " (Available)": " (Tillgänglig)",
+  " (Unsupported)": " (Ej stödd)",
+  " (Unconnected)": " (Ej ansluten)",
  "Rotation": "Rotation",
-  "0 (Sideways)": "0 (Sido)",
+  "0 (Sideways)": "0 (Sidan)",
  "90 (Flat)": "90 (Platt)",
-  "180 (-Sideways)": "180 (-Sido)",
+  "180 (-Sideways)": "180 (-Sidan)",
  "270 (Upside down)": "270 (Upp och ner)",
  "Colour": "Färg",
  "Grey": "Grå",
@@ -173,58 +151,242 @@
  "Blue": "Blå",
  "Light Target": "Ljusmål",
  "All leds": "Alla lysdioder",
-  "Bright group": "Ljusstark grupp",
-  "Dim group": "Dämpad grupp",
+  "Bright group": "Ljus grupp",
+  "Dim group": "Dimma grupp",
  "None": "Ingen",
  "Gain": "Förstärkning",
  "Negative Image": "Negativ bild",
  "Normal image": "Normal bild",
  "Negative image": "Negativ bild",
  "Format": "Format",
+  "Trimming Format": "Trimningsformat",
  "320x240": "320×240",
  "160x120": "160×120",
  "80x60": "80×60",
  "40x30": "40×30",
  "20x15": "20×15",
-  "Trimming Format": "Trimformat",
-  "External Light Filter": "Extern ljusfilter",
-  "Load Default": "Ladda standardinställningar",
-  
-  "Themezer": "Themezer",
-  "Themezer Options": "Themezer-alternativ",
-  "Nsfw": "Nsfw",
-  "Page": "Sida",
-  "Page %zu / %zu": "Sida %zu / %zu",
-  "Enter Page Number": "Ange sidnummer",
-  "Bad Page": "Ogiltig sida",
-  "Download theme?": "Ladda ner tema?",
-  
-  "Installing ": "Installerar ",
-  "Uninstalling ": "Avinstallerar ",
-  "Deleting ": "Raderar ",
-  "Deleting": "Raderar",
+  "External Light Filter": "Externt ljusfilter",
+  "Load Default": "Ladda standard",
+
+  "Advanced": "Avancerat",
+  "Advanced Options": "Avancerade alternativ",
+  "Logging": "Loggning",
+  "Replace hbmenu on exit": "Ersätt hbmenu vid avslut",
+  "Restore hbmenu?": "Återställ hbmenu?",
+  "Restore": "Återställ",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "Kunde inte hitta /switch/hbmenu.nro\nInstallera om hbmenu från Appstore ",
+  "Failed to restore hbmenu, please re-download hbmenu": "Misslyckades med att återställa hbmenu, vänligen ladda ner hbmenu igen.",
+  "Failed to restore hbmenu, using sphaira instead": "Misslyckades med att återställa hbmenu, använder istället sphaira.",
+  "Restored hbmenu, closing sphaira": "Återställde hbmenu, stänger sphaira.",
+  "Restored hbmenu": "Återställde hbmenu.",
+  "Restart Sphaira?": "Starta om Sphaira?",
+  "Press OK to restart Sphaira": "",
+  "Text scroll speed": "",
+  "Slow": "",
+  "Normal": "",
+  "Fast": "",
+  "Set right-side menu": "",
+  "Install options": "",
+  "Install Options": "",
+  "Enable sysmmc": "",
+  "Enable emummc": "",
+  "Show install warning": "Visa installationsvarning",
+  "Install location": "Installationsplats",
+  "System memory": "Systemminne",
+  "microSD card": "microSD-kort",
+  "Boost CPU clock": "",
+  "Allow downgrade": "",
+  "Skip if already installed": "",
+  "Ticket only": "",
+  "Skip base": "",
+  "Skip patch": "",
+  "Skip dlc": "",
+  "Skip data patch": "",
+  "Skip ticket": "",
+  "Skip NCA hash verify": "",
+  "Skip RSA header verify": "",
+  "Skip RSA NPDM verify": "",
+  "Ignore distribution bit": "",
+  "Convert to standard crypto": "",
+  "Lower master key": "",
+  "Lower system version": "",
+
+  "Homebrew": "Homebrew",
+  "Apps": "Appar",
+  "Homebrew Options": "Homebrew-alternativ",
+  "Hide Sphaira": "Dölj Sphaira",
+  "Install Forwarder": "Installera genväg",
+  "WARNING: Installing forwarders will lead to a ban!": "VARNING: Att installera genvägar kan leda till avstängning!",
+  "Installing Forwarder": "Installerar genväg",
+  "Creating Program": "Skapar program",
+  "Creating Control": "Skapar kontroll",
+  "Creating Meta": "Skapar metadata",
+  "Writing Nca": "Skriver Nca",
+  "Updating ncm databse": "Uppdaterar ncm-databas",
+  "Pushing application record": "Skickar programpost",
+  "Failed to install forwarder": "Misslyckades att installera genväg",
+  "Unstarred ": "Avmarkerad ",
+  "Starred ": "Markerad ",
+  "Failed to remove old forwarder, please manually remove it!": "",
+
+  "AppStore": "AppStore",
+  "Appstore": "",
+  "Store": "Butik",
+  "Filter: %s | Sort: %s | Order: %s": "Filter: %s | Sortering: %s | Ordning: %s",
+  "AppStore Options": "AppStore-alternativ",
+  "Info": "Info",
+  "Changelog": "Ändringslogg",
+  "Details": "Detaljer",
+  "version: %s": "version: %s",
+  "updated: %s": "uppdaterad: %s",
+  "category: %s": "kategori: %s",
+  "extracted: %.2f MiB": "extraherad: %.2f MiB",
+  "app_dls: %s": "app_nedladdningar: %s",
+  "More by Author": "Mer av författaren",
+  "Leave Feedback": "Lämna feedback",
+
+  "FileBrowser": "Filbläddrare",
+  "Files": "Filer",
+  "%zd files": "%zd filer",
+  "%zd dirs": "%zd kataloger",
+  "File Options": "Filalternativ",
+  "Show Hidden": "Visa dolda",
+  "Folders First": "Mappar först",
+  "Hidden Last": "Dolda sist",
+  "Cut": "Klipp ut",
+  "Copy": "Kopiera",
+  "Copying ": "Kopierar ",
+  "Paste": "Klistra in",
+  "Paste ": "Klistra in ",
+  " file(s)?": " fil(er)?",
  "Pasting ": "Klistrar in ",
  "Pasting": "Klistrar in",
-  "Removing ": "Tar bort ",
-  "Scanning ": "Skannar ",
+  "Rename": "Byt namn",
+  "Set New File Name": "Ange nytt filnamn",
+  "Extract zip": "",
+  "Extract Options": "",
+  "Extract here": "",
+  "Extract to root": "",
+  "Are you sure you want to extract to root?": "",
+  "Extract to...": "",
+  "Enter the path to the folder to extract into": "",
+  "Extracting ": "",
+  "Extract success!": "",
+  "Extract failed!": "",
+  "Compress to zip": "",
+  "Compress Options": "",
+  "Compress": "",
+  "Compress to...": "",
+  "Compressing ": "",
+  "Compress success!": "",
+  "Compress failed!": "",
+  "Create File": "Skapa fil",
+  "Set File Name": "Ange filnamn",
+  "Create Folder": "Skapa mapp",
+  "Set Folder Name": "Ange mappnamn",
  "Creating ": "Skapar ",
-  "Copying ": "Kopierar ",
-  "Trying to load ": "",
-  "Downloading ": "Laddar ner ",
+  "Upload": "",
+  "Select upload location": "",
+  "No upload locations set!": "",
+  "Uploading": "",
+  "Upload successfull!": "",
+  "Upload failed!": "",
+  "View as text (unfinished)": "Visa som text (ofärdig)",
+  "Ignore read only": "Ignorera skrivskydd",
+  "Mount": "Montera",
+  "Sd": "Sd",
+  "Image System memory": "Avbild Systemminne",
+  "Image microSD card": "Avbild microSD-kort",
+  "Empty...": "Tom...",
+  "Open with DayBreak?": "Öppna med DayBreak?",
+  "Launch ": "Starta ",
+  "Launch option for: ": "Startalternativ för: ",
+  "Select launcher for: ": "Välj startprogram för: ",
+
+  "Sort By": "Sortera efter",
+  "Sort Options": "Sorteringsalternativ",
+  "Filter": "Filtrera",
+  "All": "Alla",
+  "Emulators": "Emulatorer",
+  "Tools": "Verktyg",
+  "Themes": "Teman",
+  "Legacy": "Legacy",
+  "Sort": "Sortera",
+  "Size": "Storlek",
+  "Size (Star)": "Storlek (Stjärna)",
+  "Alphabetical": "Alfabetisk",
+  "Alphabetical (Star)": "Alfabetisk (Stjärna)",
+  "Updated": "Uppdaterad",
+  "Updated (Star)": "Uppdaterad (Stjärna)",
+  "Downloads": "Nedladdningar",
+  "Likes": "Gillar",
+  "ID": "ID",
+  "Order": "Ordning",
+  "Descending": "Fallande",
+  "Descending (down)": "Fallande (nedåt)",
+  "Desc": "Fall",
+  "Ascending": "Stigande",
+  "Ascending (Up)": "Stigande (uppåt)",
+  "Asc": "Stig",
+  "Layout": "",
+  "List": "",
+  "Icon": "",
+  "Grid": "",
+  "Search": "Sök",
+
+  "Options": "Alternativ",
+  "OK": "OK",
+  "Back": "Tillbaka",
+  "Select": "Välj",
+  "Open": "Öppna",
+  "Launch": "Starta",
+  "Restart": "Starta om",
+  "Next": "",
+  "Prev": "",
+  "Unstar": "Avmarkera stjärna",
+  "Star": "Markera stjärna",
+  "Yes": "Ja",
+  "No": "Nej",
+  "On": "",
+  "Off": "",
+
+  "Install": "Installera",
+  "Install Selected files?": "",
+  "Installing ": "Installerar ",
+  "Installed ": "",
+  "Installed!": "Installerad!",
+  "Trying to load ": "Försöker ladda ",
  "Checking MD5": "Kontrollerar MD5",
+
+  "Delete": "Radera",
+  "Delete Selected files?": "Radera valda filer?",
+  "Are you sure you want to delete ": "Är du säker på att du vill radera ",
+  "Scanning ": "Skannar ",
+  "Deleting ": "Raderar ",
+  "Deleting": "Raderar",
+  "Remove": "Ta bort",
+  "Completely remove ": "Ta bort helt ",
+  "Removing ": "Tar bort ",
+  "Removed ": "Borttagen ",
+  "Uninstalling ": "Avinstallerar ",
+
+  "Download": "Ladda ner",
+  "Downloading ": "Laddar ner ",
+  "Downloaded ": "Nedladdad ",
+
+  "Update": "Uppdatera",
+  "Update avaliable: ": "Uppdatering tillgänglig: ",
+  "Download update: ": "Ladda ner uppdatering: ",
+  "Updated to ": "Uppdaterad till ",
+  "Failed to download update": "Misslyckades att ladda ner uppdatering",
+
+  "%zu hours %zu minutes remaining": "",
+  "%zu minutes %zu seconds remaining": "",
+  "%zu seconds remaining": "",
+
  "Loading...": "Laddar...",
  "Loading": "Laddar",
  "Empty!": "Tomt!",
-  "Not Ready...": "Ej redo...",
-  "Error loading page!": "Fel vid laddning av sida!",
-  "Update avaliable: ": "Uppdatering tillgänglig: ",
-  "Download update: ": "Ladda ner uppdatering: ",
-  "Updated to ": "",
-  "Restart Sphaira?": "",
-  "Failed to download update": "Misslyckades med att ladda ner uppdatering",
-  "Delete Selected files?": "Radera valda filer?",
-  "Completely remove ": "Ta bort helt ",
-  "Are you sure you want to delete ": "Är du säker på att du vill radera ",
-  "Are you sure you wish to cancel?": "Är du säker på att du vill avbryta?",
-  "If this message appears repeatedly, please open an issue.": ""
+  "Not Ready...": "Inte redo...",
+  "Error loading page!": "Fel vid laddning av sida!"
 }
--- a/assets/romfs/i18n/uk.json
+++ b/assets/romfs/i18n/uk.json
@@ -0,0 +1,392 @@
+{
+  "[Applet Mode]": "[Режим Аплету]",
+  "No Internet": "Без інтернету",
+  "Switch-Handheld!": "Switch - Портатив!",
+  "Switch-Docked!": "Switch - Докований!",
+  "Audio disabled due to suspended game": "Аудіо вимкнено через призупинену програму",
+  "Are you sure you wish to cancel?": "Ви впевнені, що хочете скасувати?",
+  "An error occurred": "",
+  "If this message appears repeatedly, please open an issue.": "Якщо це повідомлення з'являється повторно, будь ласка, повідомте про проблему.",
+
+  "Menu Options": "Опції меню",
+  "Menu": "Меню",
+  "Theme": "Тема",
+  "Theme Options": "Опції теми",
+  "Select Theme": "Вибрати тему",
+  "Music": "Музика",
+  "12 Hour Time": "12-годинний формат часу",
+  "Download Default Music": "Завантажити музику за замовчуванням",
+  "Failed to download default_music.bfstm, please try again": "",
+  "Overwrite current default music?": "",
+
+  "Network": "Мережа",
+  "Network Options": "Опції мережі",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
+  "Nxlink": "Nxlink",
+  "Nxlink Connected": "Nxlink підключено",
+  "Nxlink Upload": "Nxlink | Завантаження",
+  "Nxlink Finished": "Nxlink | Завершено",
+
+  "Language": "Мова",
+  "Auto": "Автоматично",
+  "English": "English",
+  "Japanese": "日本語",
+  "French": "Français",
+  "German": "Deutsch",
+  "Italian": "Italiano",
+  "Spanish": "Español",
+  "Chinese": "中文",
+  "Korean": "한국어",
+  "Dutch": "Nederlands",
+  "Portuguese": "Português",
+  "Russian": "Русский",
+  "Swedish": "Svenska",
+  "Vietnamese": "Tiếng Việt",
+  "Ukrainian": "Українська",
+
+  "Misc": "Різне",
+  "Misc Options": "Опції різного",
+  "Games": "Ігри",
+  "Game Options": "Опції ігор",
+  "Hide forwarders": "Приховати форвардери",
+  "Launch random game": "Запустити випадкову гру",
+  "List meta records": "Список метаданих записів",
+  "Entries": "Записи",
+  "Failed to list application meta entries": "",
+  "No meta entries found...\n": "",
+  "Updating application record list": "",
+  "Dump": "",
+  "Select content to dump": "",
+  "Dump All": "",
+  "Dump Application": "",
+  "Dump Patch": "",
+  "Dump AddOnContent": "",
+  "Dump DataPatch": "",
+  "Select dump location": "",
+  "microSD card (/dumps/NSP/)": "",
+  "USB transfer (Switch 2 Switch)": "",
+  "/dev/null (Speed Test)": "",
+  "Dumping": "",
+  "Dump successfull!": "",
+  "Dump failed!": "",
+  "Success": "",
+  "Delete successfull!": "",
+  "Delete failed!": "",
+
+  "Themezer": "Themezer",
+  "Themezer Options": "Опції Themezer",
+  "Nsfw": "NSFW",
+  "Page": "Сторінка",
+  "Page %zu / %zu": "Сторінка %zu / %zu",
+  "Enter Page Number": "Введіть номер сторінки",
+  "Bad Page": "Неправильна сторінка",
+  "Download theme?": "Завантажити тему?",
+
+  "GitHub": "GitHub",
+  "Downloading json": "Завантаження JSON",
+  "Select asset to download for ": "Виберіть ресурс для завантаження для ",
+
+  "FTP Install": "Встановлення через FTP",
+  "FTP Install (EXPERIMENTAL)": "Встановлення через FTP (ЕКСПЕРИМЕНТАЛЬНО)",
+  "Connection Type: WiFi | Strength: ": "Тип підключення: WiFi | Сила сигналу: ",
+  "Connection Type: Ethernet": "Тип підключення: Ethernet",
+  "Connection Type: None": "Тип підключення: Немає",
+  "Host:": "Хост:",
+  "Port:": "Порт:",
+  "Username:": "Ім'я користувача:",
+  "Password:": "Пароль:",
+  "SSID:": "SSID:",
+  "Passphrase:": "Кодова фраза:",
+  "Failed to install via FTP, press B to exit...": "Не вдалося встановити через FTP, натисніть B для виходу...",
+  "Ftp install success!": "Встановлення через FTP успішно завершено.",
+  "Ftp install failed!": "Встановлення через FTP не вдалося.",
+  "USB Install": "Встановлення через USB",
+  "USB": "USB",
+  "Connected, waiting for file list...": "",
+  "Connected, starting transfer...": "",
+  "Failed to init usb, press B to exit...": "Не вдалося ініціалізувати USB, натисніть B для виходу...",
+  "Waiting for connection...": "Очікування підключення...",
+  "Transferring data...": "Передача даних...",
+  "USB connected, sending file list": "",
+  "Sent file list, waiting for command...": "",
+  "waiting for usb connection...": "",
+  "Disable MTP for usb install": "Вимкнути MTP для встановлення через USB",
+  "Re-enabled MTP": "MTP знову увімкнено",
+  "Installed via usb": "Встановлено через USB",
+  "Usb install success!": "Встановлення через USB успішно завершено.",
+  "Usb install failed!": "Встановлення через USB не вдалося.",
+  "Press B to exit...": "Натисніть B для виходу...",
+  "GameCard Install": "Встановлення з картриджа",
+  "GameCard": "Картридж",
+  "GC": "",
+  "System memory %.1f GB": "",
+  "microSD card %.1f GB": "",
+  "Nand Install": "",
+  "SD Card Install": "",
+  "Exit": "",
+  "Gc install success!": "Встановлення з картриджа успішно завершено.",
+  "Gc install failed!": "Встановлення з картриджа не вдалося.",
+
+  "IRS (Infrared Joycon Camera)": "ІЧ (Інфрачервона камера Joycon)",
+  "IRS": "",
+  "Irs": "ІЧ-сенсор",
+  "Ambient Noise Level: ": "Рівень навколишнього шуму: ",
+  "Controller": "Контролер",
+  "Pad ": "Геймпад ",
+  "HandHeld": "Портативний режим",
+  " (Available)": " (Доступно)",
+  " (Unsupported)": " (Не підтримується)",
+  " (Unconnected)": " (Не підключено)",
+  "Rotation": "Обертання",
+  "0 (Sideways)": "0° (Збоку)",
+  "90 (Flat)": "90° (Плоско)",
+  "180 (-Sideways)": "180° (-Збоку)",
+  "270 (Upside down)": "270° (Догори дном)",
+  "Colour": "Колір",
+  "Grey": "Сірий",
+  "Ironbow": "Ironbow",
+  "Green": "Зелений",
+  "Red": "Червоний",
+  "Blue": "Синій",
+  "Light Target": "Ціль освітлення",
+  "All leds": "Всі світлодіоди",
+  "Bright group": "Яскрава група",
+  "Dim group": "Тьмяна група",
+  "None": "Немає",
+  "Gain": "Підсилення",
+  "Negative Image": "Негативне зображення",
+  "Normal image": "Нормальне зображення",
+  "Negative image": "",
+  "Format": "Формат",
+  "Trimming Format": "Формат обрізки",
+  "320x240": "320×240",
+  "160x120": "160×120",
+  "80x60": "80×60",
+  "40x30": "40×30",
+  "20x15": "20×15",
+  "External Light Filter": "Фільтр зовнішнього освітлення",
+  "Load Default": "Завантажити типові",
+
+  "Advanced": "Додатково",
+  "Advanced Options": "Додаткові опції",
+  "Logging": "Логування",
+  "Replace hbmenu on exit": "Заміна hbmenu при виході",
+  "Restore hbmenu?": "Відновити hbmenu?",
+  "Restore": "Відновити",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "Не вдалося знайти /switch/hbmenu.nro\nВикористовуйте Магазин програм для перевстановлення hbmenu",
+  "Failed to restore hbmenu, please re-download hbmenu": "Не вдалося відновити hbmenu, будь ласка, завантажте hbmenu знову",
+  "Failed to restore hbmenu, using sphaira instead": "Не вдалося відновити hbmenu, замість цього використовується Sphaira",
+  "Restored hbmenu, closing sphaira": "hbmenu відновлено, закриття Sphaira",
+  "Restored hbmenu": "hbmenu відновлено",
+  "Restart Sphaira?": "Перезапустити Sphaira?",
+  "Press OK to restart Sphaira": "Натисніть OK для перезапуску Sphaira",
+  "Text scroll speed": "Швидк. прокрутки",
+  "Slow": "Повільно",
+  "Normal": "Нормально",
+  "Fast": "Швидко",
+  "Set right-side menu": "Праве меню",
+  "Install options": "Опції встановлення",
+  "Install Options": "Опції встановлення",
+  "Enable sysmmc": "",
+  "Enable emummc": "",
+  "Show install warning": "Попередж. при встанов.",
+  "Install location": "Місце встановлення",
+  "System memory": "Пам'ять консолі",
+  "microSD card": "SD-карта",
+  "Boost CPU clock": "Розігнати CPU",
+  "Allow downgrade": "Дозволити відкат",
+  "Skip if already installed": "Пропуск, якщо встановл.",
+  "Ticket only": "Тільки тікет",
+  "Skip base": "Пропустити базу",
+  "Skip patch": "Пропустити патч",
+  "Skip dlc": "Пропустити DLC",
+  "Skip data patch": "Пропустити патч даних",
+  "Skip ticket": "Пропустити тікет",
+  "Skip NCA hash verify": "",
+  "Skip RSA header verify": "Пропуск перевірку заголовка RSA",
+  "Skip RSA NPDM verify": "Пропуск перевірку NPDM RSA",
+  "Ignore distribution bit": "Ігнорувати біт розподілу",
+  "Convert to standard crypto": "Конвертувати у стандартне шифрування",
+  "Lower master key": "Знизити майстер-ключ",
+  "Lower system version": "Знизити версію системи",
+
+  "Homebrew": "Домашні програми",
+  "Apps": "Програми",
+  "Homebrew Options": "Опції домашніх програм",
+  "Hide Sphaira": "Приховати Sphaira",
+  "Install Forwarder": "Встановити форвардер",
+  "WARNING: Installing forwarders will lead to a ban!": "УВАГА: Встановлення форвардерів може призвести до бану!",
+  "Installing Forwarder": "Встановлення форвардера",
+  "Creating Program": "Створення програми",
+  "Creating Control": "Створення контролера",
+  "Creating Meta": "Створення метаданих",
+  "Writing Nca": "Запис NCA",
+  "Updating ncm databse": "Оновлення бази даних NCM",
+  "Pushing application record": "Запис даних програми",
+  "Failed to install forwarder": "Не вдалося встановити форвардер",
+  "Unstarred ": "Знято зірку з ",
+  "Starred ": "Позначено зіркою ",
+  "Failed to remove old forwarder, please manually remove it!": "",
+
+  "AppStore": "Магазин програм",
+  "Appstore": "",
+  "Store": "Магазин",
+  "Filter: %s | Sort: %s | Order: %s": "Фільтр: %s | Сорт.: %s | Порядок: %s",
+  "AppStore Options": "Опції магазину програм",
+  "Info": "Інфо",
+  "Changelog": "Журнал змін",
+  "Details": "Деталі",
+  "version: %s": "версія: %s",
+  "updated: %s": "оновлено: %s",
+  "category: %s": "категорія: %s",
+  "extracted: %.2f MiB": "розмір: %.2f MiB",
+  "app_dls: %s": "завантажень: %s",
+  "More by Author": "Більше від автора",
+  "Leave Feedback": "Залишити відгук",
+
+  "FileBrowser": "Файловий менеджер",
+  "Files": "Файли",
+  "%zd files": "%zd файл(и)",
+  "%zd dirs": "%zd тек(и)",
+  "File Options": "Опції файлів",
+  "Show Hidden": "Показати приховані",
+  "Folders First": "Теки спочатку",
+  "Hidden Last": "Приховані в кінці",
+  "Cut": "Вирізати",
+  "Copy": "Копіювати",
+  "Copying ": "Копіювання ",
+  "Paste": "Вставити",
+  "Paste ": "Вставити: ",
+  " file(s)?": " файл(и)?",
+  "Pasting ": "Вставлення ",
+  "Pasting": "Вставлення",
+  "Rename": "Перейменувати",
+  "Set New File Name": "Введіть нове ім'я файлу",
+  "Extract zip": "",
+  "Extract Options": "",
+  "Extract here": "",
+  "Extract to root": "",
+  "Are you sure you want to extract to root?": "",
+  "Extract to...": "",
+  "Enter the path to the folder to extract into": "",
+  "Extracting ": "",
+  "Extract success!": "",
+  "Extract failed!": "",
+  "Compress to zip": "Стиснути в zip",
+  "Compress Options": "",
+  "Compress": "",
+  "Compress to...": "",
+  "Compressing ": "",
+  "Compress success!": "",
+  "Compress failed!": "",
+  "Create File": "Створити файл",
+  "Set File Name": "Введіть ім'я файлу",
+  "Create Folder": "Створити теку",
+  "Set Folder Name": "Введіть ім'я теки",
+  "Creating ": "Створення ",
+  "Upload": "",
+  "Select upload location": "",
+  "No upload locations set!": "",
+  "Uploading": "",
+  "Upload successfull!": "",
+  "Upload failed!": "",
+  "View as text (unfinished)": "Переглянути як текст (незавершено)",
+  "Ignore read only": "Ігнорувати лише читання",
+  "Mount": "Монтувати",
+  "Sd": "SD-карта",
+  "Image System memory": "Фото | Пам'ять консолі",
+  "Image microSD card": "Фото | SD-карта",
+  "Empty...": "Пусто...",
+  "Open with DayBreak?": "Відкрити за допомогою DayBreak?",
+  "Launch ": "Запустити ",
+  "Launch option for: ": "Опція запуску для: ",
+  "Select launcher for: ": "Виберіть лаунчер для: ",
+
+  "Sort By": "Сортувати за",
+  "Sort Options": "Опції сортування",
+  "Filter": "Фільтр",
+  "All": "Всі",
+  "Emulators": "Емулятори",
+  "Tools": "Інструменти",
+  "Themes": "Теми",
+  "Legacy": "Доступні оновлення",
+  "Sort": "Сортування",
+  "Size": "Розмір",
+  "Size (Star)": "Розмір (Зірка)",
+  "Alphabetical": "За алфавітом",
+  "Alphabetical (Star)": "За алфавітом (Зірка)",
+  "Updated": "Оновлено",
+  "Updated (Star)": "Оновлено (Зірка)",
+  "Downloads": "Завантаження",
+  "Likes": "Вподобання",
+  "ID": "ID",
+  "Order": "Порядок",
+  "Descending": "За спаданням",
+  "Descending (down)": "За спаданням (вниз)",
+  "Desc": "Спад.",
+  "Ascending": "За зростанням",
+  "Ascending (Up)": "За зростанням (вгору)",
+  "Asc": "Зрост.",
+  "Layout": "",
+  "List": "",
+  "Icon": "",
+  "Grid": "",
+  "Search": "Пошук",
+
+  "Options": "Налаштування",
+  "OK": "ОК",
+  "Back": "Назад",
+  "Select": "Вибрати",
+  "Open": "Відкрити",
+  "Launch": "Запустити",
+  "Restart": "Перезапустити",
+  "Next": "Наступний",
+  "Prev": "Попередній",
+  "Unstar": "Прибрати з обраного",
+  "Star": "Позначити зіркою",
+  "Yes": "Так",
+  "No": "Ні",
+  "On": "Увімк.",
+  "Off": "Вимк.",
+
+  "Install": "Встановити",
+  "Install Selected files?": "Встановити вибрані файли?",
+  "Installing ": "Встановлення ",
+  "Installed ": "Встановлено ",
+  "Installed!": "Встановлено!",
+  "Trying to load ": "Спроба завантажити ",
+  "Checking MD5": "Перевірка MD5",
+
+  "Delete": "Видалити",
+  "Delete Selected files?": "Видалити вибрані файли?",
+  "Are you sure you want to delete ": "Ви впевнені, що хочете видалити ",
+  "Scanning ": "Сканування ",
+  "Deleting ": "Видалення ",
+  "Deleting": "Видалення",
+  "Remove": "Видалити",
+  "Completely remove ": "Повністю видалити ",
+  "Removing ": "Видалення ",
+  "Removed ": "Видалено ",
+  "Uninstalling ": "Видалення ",
+
+  "Download": "Завантажити",
+  "Downloading ": "Завантаження ",
+  "Downloaded ": "Завантажено ",
+
+  "Update": "Оновити",
+  "Update avaliable: ": "Доступне оновлення: ",
+  "Download update: ": "Завантажити оновлення: ",
+  "Updated to ": "Оновлено до ",
+  "Failed to download update": "Не вдалося завантажити оновлення",
+
+  "%zu hours %zu minutes remaining": "",
+  "%zu minutes %zu seconds remaining": "",
+  "%zu seconds remaining": "",
+
+  "Loading...": "Завантаження...",
+  "Loading": "Завантаження",
+  "Empty!": "Пусто!",
+  "Not Ready...": "Не готово...",
+  "Error loading page!": "Помилка завантаження сторінки!"
+}
--- a/assets/romfs/i18n/vi.json
+++ b/assets/romfs/i18n/vi.json
@@ -0,0 +1,392 @@
+{
+  "[Applet Mode]": "[Applet Mode]",
+  "No Internet": "Không có Internet",
+  "Switch-Handheld!": "Switch-Handheld!",
+  "Switch-Docked!": "Switch-Docked!",
+  "Audio disabled due to suspended game": "",
+  "Are you sure you wish to cancel?": "Bạn có chắn muốn huỷ không?",
+  "An error occurred": "",
+  "If this message appears repeatedly, please open an issue.": "Nếu thấy tin nhắn này, hãy báo lỗi.",
+
+  "Menu Options": "Menu tuỳ chọn",
+  "Menu": "Menu",
+  "Theme": "Theme",
+  "Theme Options": "Theme tuỳ chọn",
+  "Select Theme": "Chọn Theme",
+  "Music": "Âm nhạc",
+  "12 Hour Time": "",
+  "Download Default Music": "",
+  "Failed to download default_music.bfstm, please try again": "",
+  "Overwrite current default music?": "",
+
+  "Network": "Mạng",
+  "Network Options": "Tuỳ chọn mạng",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
+  "Nxlink": "Nxlink",
+  "Nxlink Connected": "Nxlink Kết Nối",
+  "Nxlink Upload": "Nxlink Đăng Tải",
+  "Nxlink Finished": "Nxlink Hoàn Thành",
+
+  "Language": "Ngôn ngữ",
+  "Auto": "Tự động",
+  "English": "English",
+  "Japanese": "日本語",
+  "French": "Français",
+  "German": "Deutsch",
+  "Italian": "Italiano",
+  "Spanish": "Español",
+  "Chinese": "中文",
+  "Korean": "한국어",
+  "Dutch": "Dutch",
+  "Portuguese": "Português",
+  "Russian": "Русский",
+  "Swedish": "Svenska",
+  "Vietnamese": "Việt Nam",
+  "Ukrainian": "Українська",
+
+  "Misc": "Tiện ích",
+  "Misc Options": "Tiện ích mở rộng",
+  "Games": "Games",
+  "Game Options": "",
+  "Hide forwarders": "",
+  "Launch random game": "",
+  "List meta records": "",
+  "Entries": "",
+  "Failed to list application meta entries": "",
+  "No meta entries found...\n": "",
+  "Updating application record list": "",
+  "Dump": "",
+  "Select content to dump": "",
+  "Dump All": "",
+  "Dump Application": "",
+  "Dump Patch": "",
+  "Dump AddOnContent": "",
+  "Dump DataPatch": "",
+  "Select dump location": "",
+  "microSD card (/dumps/NSP/)": "",
+  "USB transfer (Switch 2 Switch)": "",
+  "/dev/null (Speed Test)": "",
+  "Dumping": "",
+  "Dump successfull!": "",
+  "Dump failed!": "",
+  "Success": "",
+  "Delete successfull!": "",
+  "Delete failed!": "",
+
+  "Themezer": "Themezer",
+  "Themezer Options": "Tuỳ chọn Themezer",
+  "Nsfw": "18+",
+  "Page": "Trang",
+  "Page %zu / %zu": "Trang %zu / %zu",
+  "Enter Page Number": "Nhập số trang",
+  "Bad Page": "Trang không tồn tại",
+  "Download theme?": "Tải theme?",
+
+  "GitHub": "GitHub",
+  "Downloading json": "Đang tải json",
+  "Select asset to download for ": "Chọn nội dung để tải xuống cho ",
+
+  "FTP Install": "",
+  "FTP Install (EXPERIMENTAL)": "",
+  "Connection Type: WiFi | Strength: ": "",
+  "Connection Type: Ethernet": "",
+  "Connection Type: None": "",
+  "Host:": "",
+  "Port:": "",
+  "Username:": "",
+  "Password:": "",
+  "SSID:": "",
+  "Passphrase:": "",
+  "Failed to install via FTP, press B to exit...": "",
+  "Ftp install success!": "",
+  "Ftp install failed!": "",
+  "USB Install": "",
+  "USB": "",
+  "Connected, waiting for file list...": "",
+  "Connected, starting transfer...": "",
+  "Failed to init usb, press B to exit...": "",
+  "Waiting for connection...": "",
+  "Transferring data...": "",
+  "USB connected, sending file list": "",
+  "Sent file list, waiting for command...": "",
+  "waiting for usb connection...": "",
+  "Disable MTP for usb install": "",
+  "Re-enabled MTP": "",
+  "Installed via usb": "",
+  "Usb install success!": "",
+  "Usb install failed!": "",
+  "Press B to exit...": "",
+  "GameCard Install": "",
+  "GameCard": "",
+  "GC": "",
+  "System memory %.1f GB": "",
+  "microSD card %.1f GB": "",
+  "Nand Install": "",
+  "SD Card Install": "",
+  "Exit": "",
+  "Gc install success!": "",
+  "Gc install failed!": "",
+
+  "IRS (Infrared Joycon Camera)": "",
+  "IRS": "",
+  "Irs": "Irs",
+  "Ambient Noise Level: ": "Mức ồn xung quanh: ",
+  "Controller": "Điều khiển",
+  "Pad ": "Pad ",
+  "HandHeld": "Cầm tay",
+  " (Available)": " (Có sẵn)",
+  " (Unsupported)": " (Không hỗ trợ)",
+  " (Unconnected)": " (Không kết nối)",
+  "Rotation": "Xoay",
+  "0 (Sideways)": "0 (Đi ngang)",
+  "90 (Flat)": "90 (Phẳng)",
+  "180 (-Sideways)": "180 (-Đi ngang)",
+  "270 (Upside down)": "270 (Lộn ngược)",
+  "Colour": "Màu sắc",
+  "Grey": "Xám",
+  "Ironbow": "Ironbow",
+  "Green": "Xanh",
+  "Red": "Đỏ",
+  "Blue": "Xanh dương",
+  "Light Target": "Điểm sáng",
+  "All leds": "Tất cả đèn led",
+  "Bright group": "Nhóm sáng",
+  "Dim group": "Nhóm tối",
+  "None": "Không có",
+  "Gain": "Tăng",
+  "Negative Image": "Ảnh âm bản",
+  "Normal image": "Ảnh bình thường",
+  "Negative image": "Ảnh âm bản",
+  "Format": "Định dạng",
+  "Trimming Format": "Định dạng cắt tỉa",
+  "320x240": "320×240",
+  "160x120": "160×120",
+  "80x60": "80×60",
+  "40x30": "40×30",
+  "20x15": "20×15",
+  "External Light Filter": "Bộ lộc ánh sáng bên ngoài",
+  "Load Default": "Tải mặc định",
+
+  "Advanced": "Mở rộng",
+  "Advanced Options": "Tuỳ chọn mở rộng",
+  "Logging": "Logging",
+  "Replace hbmenu on exit": "Thay thế hbmenu khi thoát",
+  "Restore hbmenu?": "Khôi phục hbmenu?",
+  "Restore": "Khôi phục",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "Không tìm thấy /switch/hbmenu.nro\nSử dụng AppStore để cài lại hbmenu",
+  "Failed to restore hbmenu, please re-download hbmenu": "Không thể khôi phục hbmenu, Vui lòng tải lại hbmenu",
+  "Failed to restore hbmenu, using sphaira instead": "Không thể khôi phục hbmenu, thay vào đó sử dụng Sphira",
+  "Restored hbmenu, closing sphaira": "Khôi mục hbmenu thành công, đóng sphaira",
+  "Restored hbmenu": "Đã khôi phục hbmenu",
+  "Restart Sphaira?": "Khởi động lại Sphaira?",
+  "Press OK to restart Sphaira": "",
+  "Text scroll speed": "",
+  "Slow": "",
+  "Normal": "",
+  "Fast": "",
+  "Set right-side menu": "",
+  "Install options": "",
+  "Install Options": "",
+  "Enable sysmmc": "",
+  "Enable emummc": "",
+  "Show install warning": "Hiển thị cảnh báo cài đặt",
+  "Install location": "Vị trí cài đặt",
+  "System memory": "Bộ nhớ máy",
+  "microSD card": "Thẻ nhớ",
+  "Boost CPU clock": "",
+  "Allow downgrade": "",
+  "Skip if already installed": "",
+  "Ticket only": "",
+  "Skip base": "",
+  "Skip patch": "",
+  "Skip dlc": "",
+  "Skip data patch": "",
+  "Skip ticket": "",
+  "Skip NCA hash verify": "",
+  "Skip RSA header verify": "",
+  "Skip RSA NPDM verify": "",
+  "Ignore distribution bit": "",
+  "Convert to standard crypto": "",
+  "Lower master key": "",
+  "Lower system version": "",
+
+  "Homebrew": "Homebrew",
+  "Apps": "Ứng dụng",
+  "Homebrew Options": "Tuỳ chọn Homebrew",
+  "Hide Sphaira": "Ẩn Sphaira",
+  "Install Forwarder": "Cài ra ngoài màn hình",
+  "WARNING: Installing forwarders will lead to a ban!": "CẢNH BÁO: Bạn có chắn muốn cài ra ngoài màn hình!",
+  "Installing Forwarder": "Đang cài đặt ra ngoài màn hình",
+  "Creating Program": "Tạo chương trình",
+  "Creating Control": "Tạo điều khiển",
+  "Creating Meta": "Tạo Meta",
+  "Writing Nca": "Ghi Nca",
+  "Updating ncm databse": "Cập nhật ncm databse",
+  "Pushing application record": "Đẩy ứng dụng",
+  "Failed to install forwarder": "Cài đặt ra ngoài màn hình thất bại",
+  "Unstarred ": "Bỏ yêu thích ",
+  "Starred ": "Đã yêu thích ",
+  "Failed to remove old forwarder, please manually remove it!": "",
+
+  "AppStore": "AppStore",
+  "Appstore": "",
+  "Store": "Cửa hàng",
+  "Filter: %s | Sort: %s | Order: %s": "Lọc: %s | Sắp xếp: %s | Thứ tự: %s",
+  "AppStore Options": "Tuỳ chọn AppStore",
+  "Info": "Thông tin",
+  "Changelog": "Thay đổi",
+  "Details": "Chi tiết",
+  "version: %s": "version: %s",
+  "updated: %s": "updated: %s",
+  "category: %s": "category: %s",
+  "extracted: %.2f MiB": "extracted: %.2f MiB",
+  "app_dls: %s": "app_dls: %s",
+  "More by Author": "Xem thêm tác giả",
+  "Leave Feedback": "Để lại phản hồi",
+
+  "FileBrowser": "Duyệt tập tin",
+  "Files": "Tập tin",
+  "%zd files": "%zd tập tin",
+  "%zd dirs": "%zd thư mục",
+  "File Options": "Tuỳ chọn tập tin",
+  "Show Hidden": "Hiển thị tập tin ẩn",
+  "Folders First": "Thư mục đầu tiên",
+  "Hidden Last": "Ẩn cuối",
+  "Cut": "Cắt",
+  "Copy": "Sao chép",
+  "Copying ": "Đang sao chép ",
+  "Paste": "Dán",
+  "Paste ": "Paste ",
+  " file(s)?": " tập tin(nhiều)?",
+  "Pasting ": "Đang dán ",
+  "Pasting": "Đang dán",
+  "Rename": "Đổi tên",
+  "Set New File Name": "Đặt tên mới cho tập tin",
+  "Extract zip": "",
+  "Extract Options": "",
+  "Extract here": "",
+  "Extract to root": "",
+  "Are you sure you want to extract to root?": "",
+  "Extract to...": "",
+  "Enter the path to the folder to extract into": "",
+  "Extracting ": "",
+  "Extract success!": "",
+  "Extract failed!": "",
+  "Compress to zip": "",
+  "Compress Options": "",
+  "Compress": "",
+  "Compress to...": "",
+  "Compressing ": "",
+  "Compress success!": "",
+  "Compress failed!": "",
+  "Create File": "Tạo tập tin",
+  "Set File Name": "Đặt tên cho tập tin",
+  "Create Folder": "Tạo thư mục",
+  "Set Folder Name": "Đặt tên thư mục",
+  "Creating ": "Đang tạo ",
+  "Upload": "",
+  "Select upload location": "",
+  "No upload locations set!": "",
+  "Uploading": "",
+  "Upload successfull!": "",
+  "Upload failed!": "",
+  "View as text (unfinished)": "Xem dạng văn bản (chưa xong)",
+  "Ignore read only": "Bỏ qua chỉ đọc",
+  "Mount": "Gắn",
+  "Sd": "Sd",
+  "Image System memory": "Bộ nhớ hệ thống hình ảnh",
+  "Image microSD card": "Thẻ nhớ hệ thống hình ảnh",
+  "Empty...": "Rỗng...",
+  "Open with DayBreak?": "Mở với DayBreak?",
+  "Launch ": "Chạy ",
+  "Launch option for: ": "Chạy với tuỳ chọn cho: ",
+  "Select launcher for: ": "Chọn trình chạy cho: ",
+
+  "Sort By": "Sắp xếp bởi",
+  "Sort Options": "Tuỳ chọn sắp xếp",
+  "Filter": "Lọc",
+  "All": "Tất cả",
+  "Emulators": "Emulators",
+  "Tools": "Tools",
+  "Themes": "Themes",
+  "Legacy": "Legacy",
+  "Sort": "Sắp xếp",
+  "Size": "Kích thước",
+  "Size (Star)": "Kích thước (Yêu thích)",
+  "Alphabetical": "A-Z",
+  "Alphabetical (Star)": "A-Z (Yêu thích)",
+  "Updated": "Updated",
+  "Updated (Star)": "Đã cập nhật (Yêu thích)",
+  "Downloads": "Danh sách tải về",
+  "Likes": "Thích",
+  "ID": "ID",
+  "Order": "Thứ tự",
+  "Descending": "Giảm dần",
+  "Descending (down)": "Giảm dần (xuống)",
+  "Desc": "Giảm",
+  "Ascending": "Tăng dần",
+  "Ascending (Up)": "Tăng dần (lên)",
+  "Asc": "Tăng",
+  "Layout": "",
+  "List": "",
+  "Icon": "",
+  "Grid": "",
+  "Search": "Tìm kiếm",
+
+  "Options": "Tuỳ chọn",
+  "OK": "OK",
+  "Back": "Trở về",
+  "Select": "Chọn",
+  "Open": "Mở",
+  "Launch": "Chạy",
+  "Restart": "Khởi động lại",
+  "Next": "",
+  "Prev": "",
+  "Unstar": "Xoá yêu thích",
+  "Star": "Yêu thích",
+  "Yes": "Có",
+  "No": "Không",
+  "On": "",
+  "Off": "",
+
+  "Install": "Cài đặt",
+  "Install Selected files?": "",
+  "Installing ": "Đang cài đặt ",
+  "Installed ": "",
+  "Installed!": "Đã cài xong!",
+  "Trying to load ": "Đang cố gắn mở  ",
+  "Checking MD5": "Kiểm tra MD5",
+
+  "Delete": "Xoá",
+  "Delete Selected files?": "Xoá những tập tin được chọn?",
+  "Are you sure you want to delete ": "Bạn có muốn xoá ",
+  "Scanning ": "Đang quét ",
+  "Deleting ": "Đang xoá ",
+  "Deleting": "Đang xoá",
+  "Remove": "Gỡ",
+  "Completely remove ": "Đã gỡ thành công ",
+  "Removing ": "Đang gỡ ",
+  "Removed ": "Đã gỡ ",
+  "Uninstalling ": "Đang gỡ cài đặt ",
+
+  "Download": "Tải về",
+  "Downloading ": "Đang tải xuống ",
+  "Downloaded ": "Đã tải xong ",
+
+  "Update": "Cập nhật",
+  "Update avaliable: ": "Cập nhậc có sẵn: ",
+  "Download update: ": "Tải cập nhật: ",
+  "Updated to ": "Đã cập nhật ",
+  "Failed to download update": "Cập nhật thất bại",
+
+  "%zu hours %zu minutes remaining": "",
+  "%zu minutes %zu seconds remaining": "",
+  "%zu seconds remaining": "",
+
+  "Loading...": "Đang tải...",
+  "Loading": "Đang tải",
+  "Empty!": "Trống!",
+  "Not Ready...": "Chưa sẵn sàng...",
+  "Error loading page!": "Lỗi tải trang!"
+}
--- a/assets/romfs/i18n/zh.json
+++ b/assets/romfs/i18n/zh.json
@@ -1,73 +1,33 @@
 {
  "[Applet Mode]": "[小程序模式]",
  "No Internet": "网络未连接",
-  "Files": "文件",
-  "Apps": "应用",
-  "Store": "商店",
-  "Menu": "菜单",
-  "Options": "选项",
-  "OK": "确定",
-  "Back": "返回",
-  "Select": "选择",
-  "Open": "打开",
-  "Launch": "启动",
-  "Info": "信息",
-  "Install": "安装",
-  "Delete": "删除",
-  "Restart": "",
-  "Changelog": "更新日志",
-  "Details": "详情",
-  "Update": "更新",
-  "Remove": "删除",
-  "Download": "下载",
-  "Next Page": "下一页",
-  "Prev Page": "上一页",
-  "Unstar": "取消星标",
-  "Star": "星标",
-  "System memory": "主机内存",
-  "microSD card": "SD卡",
-  "Yes": "是",
-  "No": "否",
-  "Enabled": "启用",
-  "Disabled": "禁用",
-
-  "Sort By": "排序方式",
-  "Sort Options": "排序选项",
-  "Filter": "筛选",
-  "Sort": "排序",
-  "Order": "顺序",
-  "Search": "搜索",
-  "Updated": "最近使用",
-  "Updated (Star)": "最近更新（星标优先）",
-  "Downloads": "下载",
-  "Size": "按大小",
-  "Size (Star)": "按大小（星标优先）",
-  "Alphabetical": "按字母顺序",
-  "Alphabetical (Star)": "按字母顺序（星标优先）",
-  "Likes": "点赞量",
-  "ID": "ID",
-  "Decending": "降序",
-  "Descending (down)": "降序",
-  "Desc": "降序",
-  "Ascending": "升序",
-  "Ascending (Up)": "升序",
-  "Asc": "升序",
+  "Switch-Handheld!": "切换至掌机模式！",
+  "Switch-Docked!": "切换至底座模式！",
+  "Audio disabled due to suspended game": "由于游戏暂停，音频已禁用",
+  "Are you sure you wish to cancel?": "您确定要取消吗？",
+  "An error occurred": "",
+  "If this message appears repeatedly, please open an issue.": "若此消息反复出现，请提交问题报告。",

  "Menu Options": "菜单选项",
-  "Header": "标题",
+  "Menu": "菜单",
  "Theme": "主题",
  "Theme Options": "主题选项",
  "Select Theme": "选择主题",
-  "Shuffle": "随机播放",
  "Music": "音乐",
+  "12 Hour Time": "12小时制时间",
+  "Download Default Music": "下载默认音乐",
+  "Failed to download default_music.bfstm, please try again": "",
+  "Overwrite current default music?": "",
+
  "Network": "网络",
  "Network Options": "网络选项",
-  "Nxlink": "Nxlink",
+  "Ftp": "FTP",
+  "Mtp": "MTP",
+  "Nxlink": "Nxlink插件提交",
  "Nxlink Connected": "Nxlink 已连接",
  "Nxlink Upload": "Nxlink 上传中",
  "Nxlink Finished": "Nxlink 已结束",
-  "Switch-Handheld!": "",
-  "Switch-Docked!": "",
+
  "Language": "语言",
  "Auto": "自动",
  "English": "English",
@@ -82,84 +42,102 @@
  "Portuguese": "Português",
  "Russian": "Русский",
  "Swedish": "Svenska",
-  "Logging": "日志",
-  "Replace hbmenu on exit": "退出后用Sphaira替换hbmenu",
-  "Misc": "杂项",
-  "Misc Options": "杂项设置",
-  "Web": "网页浏览器",
-  "Install forwarders": "允许安装前端应用",
-  "Install location": "安装位置",
-  "Show install warning": "显示安装警告",
+  "Vietnamese": "Vietnamese",
+  "Ukrainian": "Українська",

-  "FileBrowser": "文件浏览",
-  "%zd files": "%zd 个文件",
-  "%zd dirs": "%zd 个文件夹",
-  "File Options": "文件选项",
-  "Show Hidden": "显示隐藏项目",
-  "Folders First": "文件夹靠前",
-  "Hidden Last": "隐藏项目置后",
-  "Cut": "剪切",
-  "Copy": "复制",
-  "Paste": "粘贴",
-  "Paste ": "粘贴 ",
-  " file(s)?": "个文件(夹)？",
-  "Rename": "重命名",
-  "Set New File Name": "输入新命名",
-  "Advanced": "高级",
-  "Advanced Options": "高级选项",
-  "Create File": "新建文件",
-  "Set File Name": "输入文件名",
-  "Create Folder": "新建文件夹",
-  "Set Folder Name": "输入文件夹名",
-  "View as text (unfinished)": "以文本形式查看（未完善）",
-  "Empty...": "空...",
-  "Open with DayBreak?": "使用DayBreak打开？",
-  "Launch ": "",
-  "Launch option for: ": "启动选项：",
-  "Select launcher for: ": "",
-  
-  "Homebrew": "应用列表",
-  "Homebrew Options": "应用选项",
-  "Hide Sphaira": "在应用列表中隐藏Sphaira",
-  "Install Forwarder": "安装前端应用",
-  "WARNING: Installing forwarders will lead to a ban!": "警告：安装前端应用可能导致ban机！",
-  "Installing Forwarder": "正在生成前端应用",
-  "Creating Program": "正在创建程序",
-  "Creating Control": "正在创建控制器",
-  "Creating Meta": "正在创建元数据",
-  "Writing Nca": "正在写入Nca",
-  "Updating ncm databse": "正在更新ncm数据库",
-  "Pushing application record": "正在推送应用记录",
-  "Installed!": "安装完成！",
-  "Failed to install forwarder": "前端应用安装失败",
-  "Unstarred ": "",
-  "Starred ": "",
-
-  "AppStore": "应用商店",
-  "Filter: %s | Sort: %s | Order: %s": "筛选: %s | 排序: %s | 顺序: %s",
-  "AppStore Options": "应用商店选项",
-  "All": "全部",
+  "Misc": "拓展",
+  "Misc Options": "拓展设置",
  "Games": "游戏",
-  "Emulators": "模拟器",
-  "Tools": "工具",
-  "Themes": "主题",
-  "Legacy": "可更新",
-  "version: %s": "版本: %s",
-  "updated: %s": "更新时间: %s",
-  "category: %s": "分类: %s",
-  "extracted: %.2f MiB": "应用大小: %.2f MiB",
-  "app_dls: %s": "下载量: %s",
-  "More by Author": "作者更多作品",
-  "Leave Feedback": "留言反馈",
+  "Game Options": "游戏选项",
+  "Hide forwarders": "隐藏前端启动",
+  "Launch random game": "开启随机游戏",
+  "List meta records": "列出元数据记录",
+  "Entries": "条目",
+  "Failed to list application meta entries": "",
+  "No meta entries found...\n": "",
+  "Updating application record list": "",
+  "Dump": "",
+  "Select content to dump": "",
+  "Dump All": "",
+  "Dump Application": "",
+  "Dump Patch": "",
+  "Dump AddOnContent": "",
+  "Dump DataPatch": "",
+  "Select dump location": "",
+  "microSD card (/dumps/NSP/)": "",
+  "USB transfer (Switch 2 Switch)": "",
+  "/dev/null (Speed Test)": "",
+  "Dumping": "",
+  "Dump successfull!": "",
+  "Dump failed!": "",
+  "Success": "",
+  "Delete successfull!": "",
+  "Delete failed!": "",

+  "Themezer": "在线主题",
+  "Themezer Options": "在线主题选项",
+  "Nsfw": "公共场合不宜的主题",
+  "Page": "页面",
+  "Page %zu / %zu": "页面 %zu / %zu",
+  "Enter Page Number": "输入跳转的页码",
+  "Bad Page": "错误的页面",
+  "Download theme?": "下载该主题？",
+
+  "GitHub": "GitHub",
+  "Downloading json": "正在下载 json",
+  "Select asset to download for ": "选择要下载的资源用于 ",
+
+  "FTP Install": "通过 FTP 安装",
+  "FTP Install (EXPERIMENTAL)": "通过 FTP 安装（实验性）",
+  "Connection Type: WiFi | Strength: ": "",
+  "Connection Type: Ethernet": "连接类型：以太网",
+  "Connection Type: None": "连接类型：无",
+  "Host:": "主机：",
+  "Port:": "端口：",
+  "Username:": "用户名：",
+  "Password:": "密码：",
+  "SSID:": "网络名称：",
+  "Passphrase:": "密码：",
+  "Failed to install via FTP, press B to exit...": "通过 FTP 安装失败，按 B 键退出...",
+  "Ftp install success!": "通过 FTP 安装成功。",
+  "Ftp install failed!": "通过 FTP 安装失败。",
+  "USB Install": "通过 USB 安装",
+  "USB": "USB",
+  "Connected, waiting for file list...": "",
+  "Connected, starting transfer...": "",
+  "Failed to init usb, press B to exit...": "USB 初始化失败，按 B 键退出...",
+  "Waiting for connection...": "等待连接中...",
+  "Transferring data...": "正在传输数据...",
+  "USB connected, sending file list": "",
+  "Sent file list, waiting for command...": "",
+  "waiting for usb connection...": "",
+  "Disable MTP for usb install": "暂时禁用 USB 安装的 MTP 功能",
+  "Re-enabled MTP": "重新启用 MTP",
+  "Installed via usb": "通过 USB 安装",
+  "Usb install success!": "通过 USB 安装成功。",
+  "Usb install failed!": "通过 USB 安装失败。",
+  "Press B to exit...": "按 B 键退出...",
+  "GameCard Install": "卡带安装",
+  "GameCard": "卡带",
+  "GC": "",
+  "System memory %.1f GB": "",
+  "microSD card %.1f GB": "",
+  "Nand Install": "",
+  "SD Card Install": "",
+  "Exit": "",
+  "Gc install success!": "游戏安装成功。",
+  "Gc install failed!": "游戏安装失败。",
+
+  "IRS (Infrared Joycon Camera)": "",
+  "IRS": "",
  "Irs": "红外成像",
  "Ambient Noise Level: ": "环境噪声等级：",
  "Controller": "控制器",
  "Pad ": "手柄 ",
-  " (Available)": " （可用的）",
-  " (Unsupported)": "",
-  " (Unconnected)": " （未连接）",
  "HandHeld": "掌机模式",
+  " (Available)": " （可用的）",
+  " (Unsupported)": " (不支持的）",
+  " (Unconnected)": " （未连接）",
  "Rotation": "旋转",
  "0 (Sideways)": "0度",
  "90 (Flat)": "90度",
@@ -176,55 +154,239 @@
  "Bright group": "亮色组",
  "Dim group": "暗色组",
  "None": "无",
-  "Gain": "增益",
+  "Gain": "曝光",
  "Negative Image": "负片图像",
  "Normal image": "正常图像",
  "Negative image": "负片图像",
  "Format": "格式",
+  "Trimming Format": "裁剪格式",
  "320x240": "320×240",
  "160x120": "160×120",
  "80x60": "80×60",
  "40x30": "40×30",
  "20x15": "20×15",
-  "Trimming Format": "裁剪格式",
  "External Light Filter": "外部光滤镜",
  "Load Default": "加载默认值",

-  "Themezer": "在线主题",
-  "Themezer Options": "在线主题选项",
-  "Nsfw": "公共场合不宜的主题",
-  "Page": "页面",
-  "Page %zu / %zu": "页面 %zu / %zu",
-  "Enter Page Number": "输入跳转的页码",
-  "Bad Page": "错误的页面",
-  "Download theme?": "下载该主题？",
+  "Advanced": "高级",
+  "Advanced Options": "高级选项",
+  "Logging": "日志",
+  "Replace hbmenu on exit": "退出后用Sphaira替换hbmenu",
+  "Restore hbmenu?": "恢复 hbmenu？",
+  "Restore": "恢复",
+  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "未能找到 /switch/hbmenu.nro\n请使用应用商店重新安装 hbmenu",
+  "Failed to restore hbmenu, please re-download hbmenu": "恢复 hbmenu 失败，请重新下载 hbmenu",
+  "Failed to restore hbmenu, using sphaira instead": "恢复 hbmenu 失败，改用 Sphaira",
+  "Restored hbmenu, closing sphaira": "已恢复 hbmenu，正在关闭 Sphaira",
+  "Restored hbmenu": "已恢复 hbmenu",
+  "Restart Sphaira?": "重启 Sphaira？",
+  "Press OK to restart Sphaira": "按OK键以重启shphaira菜单",
+  "Text scroll speed": "文本滚动速度",
+  "Slow": "慢",
+  "Normal": "正常",
+  "Fast": "快",
+  "Set right-side menu": "",
+  "Install options": "安装选项",
+  "Install Options": "安装选项",
+  "Enable sysmmc": "",
+  "Enable emummc": "",
+  "Show install warning": "显示安装警告",
+  "Install location": "安装位置",
+  "System memory": "主机内存",
+  "microSD card": "SD卡",
+  "Boost CPU clock": "提升 CPU 频率",
+  "Allow downgrade": "允许降级",
+  "Skip if already installed": "若已安装则跳过",
+  "Ticket only": "仅安装票据",
+  "Skip base": "跳过基础部分",
+  "Skip patch": "跳过补丁",
+  "Skip dlc": "跳过 DLC（可下载内容）",
+  "Skip data patch": "跳过数据补丁",
+  "Skip ticket": "跳过票据",
+  "Skip NCA hash verify": "",
+  "Skip RSA header verify": "跳过 RSA 头部验证",
+  "Skip RSA NPDM verify": "跳过 RSA NPDM 验证",
+  "Ignore distribution bit": "忽略分布位",
+  "Convert to standard crypto": "转换为标准加密方式",
+  "Lower master key": "降低主密钥",
+  "Lower system version": "降低系统版本",

-  "Installing ": "正在安装 ",
-  "Uninstalling ": "正在卸载 ",
-  "Deleting ": "正在删除 ",
-  "Deleting": "正在删除",
+  "Homebrew": "应用列表",
+  "Apps": "应用",
+  "Homebrew Options": "应用选项",
+  "Hide Sphaira": "在应用列表中隐藏Sphaira",
+  "Install Forwarder": "安装前端应用",
+  "WARNING: Installing forwarders will lead to a ban!": "警告：安装前端应用可能导致ban机！",
+  "Installing Forwarder": "正在生成前端应用",
+  "Creating Program": "正在创建程序",
+  "Creating Control": "正在创建控制器",
+  "Creating Meta": "正在创建元数据",
+  "Writing Nca": "正在写入Nca",
+  "Updating ncm databse": "正在更新ncm数据库",
+  "Pushing application record": "正在推送应用记录",
+  "Failed to install forwarder": "前端应用安装失败",
+  "Unstarred ": "取消星标 ",
+  "Starred ": "已星标 ",
+  "Failed to remove old forwarder, please manually remove it!": "",
+
+  "AppStore": "应用商店",
+  "Appstore": "",
+  "Store": "商店",
+  "Filter: %s | Sort: %s | Order: %s": "筛选: %s | 排序: %s | 顺序: %s",
+  "AppStore Options": "应用商店选项",
+  "Info": "信息",
+  "Changelog": "更新日志",
+  "Details": "详情",
+  "version: %s": "版本: %s",
+  "updated: %s": "更新时间: %s",
+  "category: %s": "分类: %s",
+  "extracted: %.2f MiB": "应用大小: %.2f MiB",
+  "app_dls: %s": "下载量: %s",
+  "More by Author": "作者更多作品",
+  "Leave Feedback": "留言反馈",
+
+  "FileBrowser": "文件浏览",
+  "Files": "文件",
+  "%zd files": "%zd 个文件",
+  "%zd dirs": "%zd 个文件夹",
+  "File Options": "文件选项",
+  "Show Hidden": "显示隐藏项目",
+  "Folders First": "文件夹靠前",
+  "Hidden Last": "隐藏项目置后",
+  "Cut": "剪切",
+  "Copy": "复制",
+  "Copying ": "正在复制 ",
+  "Paste": "粘贴",
+  "Paste ": "粘贴 ",
+  " file(s)?": "个文件(夹)？",
  "Pasting ": "正在粘贴 ",
  "Pasting": "正在粘贴",
-  "Removing ": "正在移除 ",
-  "Scanning ": "正在扫描 ",
+  "Rename": "重命名",
+  "Set New File Name": "输入新命名",
+  "Extract zip": "",
+  "Extract Options": "",
+  "Extract here": "",
+  "Extract to root": "",
+  "Are you sure you want to extract to root?": "",
+  "Extract to...": "",
+  "Enter the path to the folder to extract into": "",
+  "Extracting ": "",
+  "Extract success!": "",
+  "Extract failed!": "",
+  "Compress to zip": "压缩到zip",
+  "Compress Options": "",
+  "Compress": "",
+  "Compress to...": "",
+  "Compressing ": "",
+  "Compress success!": "",
+  "Compress failed!": "",
+  "Create File": "新建文件",
+  "Set File Name": "输入文件名",
+  "Create Folder": "新建文件夹",
+  "Set Folder Name": "输入文件夹名",
  "Creating ": "正在创建 ",
-  "Copying ": "正在复制 ",
-  "Trying to load ": "",
-  "Downloading ": "正在下载 ",
+  "Upload": "",
+  "Select upload location": "",
+  "No upload locations set!": "",
+  "Uploading": "",
+  "Upload successfull!": "",
+  "Upload failed!": "",
+  "View as text (unfinished)": "以文本形式查看（未完善）",
+  "Ignore read only": "忽略只读",
+  "Mount": "挂载",
+  "Sd": "SD卡",
+  "Image System memory": "主机内存图像",
+  "Image microSD card": "SD卡图像",
+  "Empty...": "空...",
+  "Open with DayBreak?": "使用DayBreak打开？",
+  "Launch ": "启动 ",
+  "Launch option for: ": "启动选项：",
+  "Select launcher for: ": "选择启动器用于：",
+
+  "Sort By": "排序方式",
+  "Sort Options": "排序选项",
+  "Filter": "筛选",
+  "All": "全部",
+  "Emulators": "模拟器",
+  "Tools": "工具",
+  "Themes": "主题",
+  "Legacy": "可更新",
+  "Sort": "排序",
+  "Size": "按大小",
+  "Size (Star)": "按大小（星标优先）",
+  "Alphabetical": "按字母顺序",
+  "Alphabetical (Star)": "按字母顺序（星标优先）",
+  "Updated": "最近使用",
+  "Updated (Star)": "最近更新（星标优先）",
+  "Downloads": "下载",
+  "Likes": "点赞量",
+  "ID": "ID",
+  "Order": "顺序",
+  "Descending": "降序",
+  "Descending (down)": "降序",
+  "Desc": "降序",
+  "Ascending": "升序",
+  "Ascending (Up)": "升序",
+  "Asc": "升序",
+  "Layout": "",
+  "List": "",
+  "Icon": "",
+  "Grid": "",
+  "Search": "搜索",
+
+  "Options": "选项",
+  "OK": "确定",
+  "Back": "返回",
+  "Select": "选择",
+  "Open": "打开",
+  "Launch": "启动",
+  "Restart": "重启",
+  "Next": "下一项",
+  "Prev": "上一项",
+  "Unstar": "取消星标",
+  "Star": "星标",
+  "Yes": "是",
+  "No": "否",
+  "On": "",
+  "Off": "",
+
+  "Install": "安装",
+  "Install Selected files?": "安装所选文件？",
+  "Installing ": "正在安装 ",
+  "Installed ": "",
+  "Installed!": "安装完成！",
+  "Trying to load ": "尝试加载 ",
  "Checking MD5": "正在校验 MD5",
-  "Loading...": "加载中...",
-  "Loading": "加载中",
-  "Empty!": "空！",
-  "Not Ready...": "尚未准备好...",
-  "Error loading page!": "页面加载失败！",
+
+  "Delete": "删除",
+  "Delete Selected files?": "删除选中的文件？",
+  "Are you sure you want to delete ": "您确定要删除吗 ",
+  "Scanning ": "正在扫描 ",
+  "Deleting ": "正在删除 ",
+  "Deleting": "正在删除",
+  "Remove": "删除",
+  "Completely remove ": "彻底删除 ",
+  "Removing ": "正在移除 ",
+  "Removed ": "已移除 ",
+  "Uninstalling ": "正在卸载 ",
+
+  "Download": "下载",
+  "Downloading ": "正在下载 ",
+  "Downloaded ": "已下载 ",
+
+  "Update": "更新",
  "Update avaliable: ": "有可用更新！",
  "Download update: ": "下载更新：",
-  "Updated to ": "",
-  "Restart Sphaira?": "",
+  "Updated to ": "更新至 ",
  "Failed to download update": "更新下载失败",
-  "Delete Selected files?": "删除选中的文件？",
-  "Completely remove ": "彻底删除 ",
-  "Are you sure you want to delete ": "您确定要删除吗 ",
-  "Are you sure you wish to cancel?": "您确定要取消吗？",
-  "If this message appears repeatedly, please open an issue.": ""
+
+  "%zu hours %zu minutes remaining": "",
+  "%zu minutes %zu seconds remaining": "",
+  "%zu seconds remaining": "",
+
+  "Loading...": "加载中...",
+  "Loading": "加载中",
+  "Empty!": "空空如野！",
+  "Not Ready...": "尚未准备好...",
+  "Error loading page!": "页面加载失败！"
 }
--- a/assets/romfs/theme/icons-sp/icon_SP_audio.png
+++ b/assets/romfs/theme/icons-sp/icon_SP_audio.png
--- a/assets/romfs/theme/icons-sp/icon_SP_file.png
+++ b/assets/romfs/theme/icons-sp/icon_SP_file.png
--- a/assets/romfs/theme/icons-sp/icon_SP_folder.png
+++ b/assets/romfs/theme/icons-sp/icon_SP_folder.png
--- a/assets/romfs/theme/icons-sp/icon_SP_image.png
+++ b/assets/romfs/theme/icons-sp/icon_SP_image.png
--- a/assets/romfs/theme/icons-sp/icon_SP_nro.png
+++ b/assets/romfs/theme/icons-sp/icon_SP_nro.png
--- a/assets/romfs/theme/icons-sp/icon_SP_video.png
+++ b/assets/romfs/theme/icons-sp/icon_SP_video.png
--- a/assets/romfs/theme/icons-sp/icon_SP_zip.png
+++ b/assets/romfs/theme/icons-sp/icon_SP_zip.png
--- a/assets/romfs/themes/abyss_theme.ini
+++ b/assets/romfs/themes/abyss_theme.ini
@@ -1,22 +1,23 @@
 [meta]
 name=Abyss
 author=TotalJustice
-version=1.0.0
-; unused currently
-preview=romfs:/theme/preview.jpg
+version=1.1.0
+inherit=romfs:/themes/base_black_theme.ini

 [theme]
-background=0x0f111aff
-grid=0x0f115c30
-selected=0x0f115cff
-selected_overlay=0x529cffff
-text=0xffbc41ff
-text_selected=0x529cffff
+background = 0x0f111a
+grid = 0x0f115c30
+popup = 0x0f115c

-icon_audio=romfs:/theme/icon_audio.png
-icon_video=romfs:/theme/icon_video.png
-icon_image=romfs:/theme/icon_image.png
-icon_file=romfs:/theme/icon_file.png
-icon_folder=romfs:/theme/icon_folder.png
-icon_zip=romfs:/theme/icon_zip.png
-icon_nro=romfs:/theme/icon_nro.png
+line = 0xffbc41
+line_seperator = 0xffbc41
+
+text = 0xffbc41
+text_info = 0xd79f36
+text_selected = 0x529cff
+selected_background = 0x0f115c
+
+scrollbar = 0x529cff
+scrollbar_background = ; hide the background
+
+progressbar = 0x3250f0
--- a/assets/romfs/themes/base_black_theme.ini
+++ b/assets/romfs/themes/base_black_theme.ini
@@ -0,0 +1,33 @@
+[theme]
+background = 0x2d2d2d
+grid = 0x46464630
+popup = 0x2d2d2d
+error = 0xfa5a3a
+
+line = 0xfbfbfb
+line_separator = 0x707070
+
+text = 0xfbfbfb
+text_info = 0xd1d1d1
+text_selected = 0x00ffc8
+selected_background = 0x212227
+
+sidebar = 0x000000dc
+
+scrollbar = 0x00ffc8
+scrollbar_background = ; hide the background
+; scrollbar_background = 0x464646
+
+progressbar = 0x00ffc8
+progressbar_background = 0x464646
+
+highlight_1 = 0x1989c6
+highlight_2 = 0x89f0f2
+
+icon_audio = romfs:/theme/icon_audio.png
+icon_video = romfs:/theme/icon_video.png
+icon_image = romfs:/theme/icon_image.png
+icon_file = romfs:/theme/icon_file.png
+icon_folder = romfs:/theme/icon_folder.png
+icon_zip = romfs:/theme/icon_zip.png
+icon_nro = romfs:/theme/icon_nro.png
--- a/assets/romfs/themes/base_white_theme.ini
+++ b/assets/romfs/themes/base_white_theme.ini
@@ -0,0 +1,34 @@
+[theme]
+background = 0xebebeb
+grid = 0xf0f0f0
+popup = 0xebebeb
+error = 0xfa5a3a
+
+line = 0x373737
+line_separator = 0x6d787a
+
+text = 0x373737
+text_info = 0x808080
+text_selected = 0x3250f0
+selected_background = 0xfdfdfd
+
+sidebar = 0xe2e2e2f5
+
+scrollbar = 0xB0B0B0
+scrollbar_background = ; hide the background
+; scrollbar_background = 0xababab
+
+progressbar = 0x3250f0
+progressbar_background = 0x808080
+
+highlight_1 = 0x1989c6
+highlight_2 = 0x89f0f2
+
+icon_colour = 0x6d787a
+icon_audio = romfs:/theme/icon_audio.png
+icon_video = romfs:/theme/icon_video.png
+icon_image = romfs:/theme/icon_image.png
+icon_file = romfs:/theme/icon_file.png
+icon_folder = romfs:/theme/icon_folder.png
+icon_zip = romfs:/theme/icon_zip.png
+icon_nro = romfs:/theme/icon_nro.png
--- a/assets/romfs/themes/black_theme.ini
+++ b/assets/romfs/themes/black_theme.ini
@@ -1,23 +1,5 @@
 [meta]
 name=Black
 author=TotalJustice
-version=1.0.0
-preview=romfs:/theme/preview.jpg
-
-[theme]
-background=0x2d2d2dff
-cursor=romfs:/theme/cursor.png
-cursor_drag=romfs:/theme/cursor_drag.png
-grid=0x46464630
-selected=0x464646ff
-selected_overlay=0x00ffc8ff
-text=0xfbfbfbff
-text_selected=0x00ffc8ff
-
-icon_audio=romfs:/theme/icon_audio.png
-icon_video=romfs:/theme/icon_video.png
-icon_image=romfs:/theme/icon_image.png
-icon_file=romfs:/theme/icon_file.png
-icon_folder=romfs:/theme/icon_folder.png
-icon_zip=romfs:/theme/icon_zip.png
-icon_nro=romfs:/theme/icon_nro.png
+version=1.1.0
+inherit=romfs:/themes/base_black_theme.ini
--- a/assets/romfs/themes/black_theme_sp_icons.ini
+++ b/assets/romfs/themes/black_theme_sp_icons.ini
@@ -0,0 +1,15 @@
+[meta]
+name=Black alt-icons-SP
+author=spkatsi
+version=1.0.0
+inherit=romfs:/themes/base_black_theme.ini
+
+[theme]
+icon_audio = romfs:/theme/icons-sp/icon_SP_audio.png
+icon_video = romfs:/theme/icons-sp/icon_SP_video.png
+icon_image = romfs:/theme/icons-sp/icon_SP_image.png
+icon_file = romfs:/theme/icons-sp/icon_SP_file.png
+icon_folder = romfs:/theme/icons-sp/icon_SP_folder.png
+icon_zip = romfs:/theme/icons-sp/icon_SP_zip.png
+icon_nro = romfs:/theme/icons-sp/icon_SP_nro.png
+
--- a/assets/romfs/themes/oled_black_theme.ini
+++ b/assets/romfs/themes/oled_black_theme.ini
@@ -1,23 +1,13 @@
 [meta]
 name=OLED Black
-author=iTotalJustice/Sanras
-version=1.0.0
-preview=romfs:/theme/preview.jpg
+author=TotalJustice/Sanras
+version=1.1.0
+inherit=romfs:/themes/base_black_theme.ini

 [theme]
-background=0x000000ff
-cursor=romfs:/theme/cursor.png
-cursor_drag=romfs:/theme/cursor_drag.png
-grid=0x46464640
-selected=0x323232ff
-selected_overlay=0x00ffc8ff
-text=0xfbfbfbff
-text_selected=0x00ffc8ff
-
-icon_audio=romfs:/theme/icon_audio.png
-icon_video=romfs:/theme/icon_video.png
-icon_image=romfs:/theme/icon_image.png
-icon_file=romfs:/theme/icon_file.png
-icon_folder=romfs:/theme/icon_folder.png
-icon_zip=romfs:/theme/icon_zip.png
-icon_nro=romfs:/theme/icon_nro.png
+background = 0x000000
+grid = 0x46464640
+popup = 0x323232
+text = 0xfbfbfb
+text_selected = 0x00ffc8
+selected_background = 0x323232
--- a/assets/romfs/themes/white_theme.ini
+++ b/assets/romfs/themes/white_theme.ini
@@ -0,0 +1,5 @@
+[meta]
+name=White
+author=TotalJustice/Yorunokyujitsu
+version=1.0.0
+inherit=romfs:/themes/base_white_theme.ini
--- a/hbl/CMakeLists.txt
+++ b/hbl/CMakeLists.txt
@@ -78,11 +78,13 @@ function(nx_create_npdm target config)
    dkp_set_target_file(${outtarget} "${NX_NPDM_OUTPUT}")
 endfunction()

+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/exefs)
+
 nx_create_nso(hbl
-    OUTPUT main
+    OUTPUT exefs/main
 )

 nx_create_npdm(hbl
-    OUTPUT main.npdm
+    OUTPUT exefs/main.npdm
    CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/hbl.json
 )
--- a/sphaira/CMakeLists.txt
+++ b/sphaira/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.13)

-set(sphaira_VERSION 0.5.0)
+set(sphaira_VERSION 0.11.0)

 project(sphaira
    VERSION ${sphaira_VERSION}
@@ -45,39 +45,108 @@ add_executable(sphaira
    source/ui/menus/main_menu.cpp
    source/ui/menus/menu_base.cpp
    source/ui/menus/themezer.cpp
+    source/ui/menus/ghdl.cpp
+    source/ui/menus/usb_menu.cpp
+    source/ui/menus/ftp_menu.cpp
+    source/ui/menus/gc_menu.cpp
+    source/ui/menus/game_menu.cpp
+    source/ui/menus/grid_menu_base.cpp

    source/ui/error_box.cpp
    source/ui/notification.cpp
    source/ui/nvg_util.cpp
    source/ui/option_box.cpp
-    source/ui/option_list.cpp
    source/ui/popup_list.cpp
    source/ui/progress_box.cpp
    source/ui/scrollable_text.cpp
-    source/ui/scrollbar.cpp
    source/ui/sidebar.cpp
    source/ui/widget.cpp
+    source/ui/list.cpp
+    source/ui/scrolling_text.cpp

    source/app.cpp
    source/download.cpp
+    source/dumper.cpp
    source/option.cpp
    source/evman.cpp
    source/fs.cpp
    source/image.cpp
+    source/location.cpp
    source/log.cpp
    source/main.cpp
    source/nro.cpp
    source/nxlink.cpp
    source/owo.cpp
    source/swkbd.cpp
-    source/web.cpp
+    source/hasher.cpp
    source/i18n.cpp
    source/ftpsrv_helper.cpp
+    source/threaded_file_transfer.cpp
+
+    source/usb/base.cpp
+    source/usb/usbds.cpp
+    source/usb/usbhs.cpp
+    source/usb/usb_uploader.cpp
+
+    source/yati/yati.cpp
+    source/yati/container/nsp.cpp
+    source/yati/container/xci.cpp
+    source/yati/source/file.cpp
+    source/yati/source/usb.cpp
+    source/yati/source/stream.cpp
+    source/yati/source/stream_file.cpp
+
+    source/yati/nx/es.cpp
+    source/yati/nx/keys.cpp
+    source/yati/nx/nca.cpp
+    source/yati/nx/ncm.cpp
+    source/yati/nx/ns.cpp
+    source/yati/nx/nxdumptool_rsa.c
 )

 target_compile_definitions(sphaira PRIVATE
    -DAPP_VERSION="${sphaira_VERSION}"
    -DAPP_VERSION_HASH="${sphaira_VERSION_HASH}"
+    -DCURL_NO_OLDIES=1
+)
+
+target_compile_options(sphaira PRIVATE
+    -Wall
+    -Wextra
+
+    # unsure if it's a good idea to enable these by default as
+    # it may cause breakage upon compiler updates.
+    # -Werror
+    # -Wfatal-errors
+
+    # disabled as nx uses s64 for size and offset, however stl uses size_t instead, thus
+    # there being a lot of warnings.
+    -Wno-sign-compare
+    # disabled as many overriden methods don't use the params.
+    -Wno-unused-parameter
+    # pedantic warning, missing fields are set to 0.
+    -Wno-missing-field-initializers
+    # disabled as it warns for strcat 2 paths together, but it will never
+    # overflow due to fs enforcing a max path len anyway.
+    -Wno-format-truncation
+
+    # the below are taken from my gba emulator, they've served me well ;)
+    -Wformat-overflow=2
+    -Wundef
+    -Wmissing-include-dirs
+    -fstrict-aliasing
+    -Wstrict-overflow=2
+    -Walloca
+    -Wduplicated-cond
+    -Wwrite-strings
+    -Wdate-time
+    -Wlogical-op
+    -Wpacked
+    -Wcast-qual
+    -Wcast-align
+    -Wimplicit-fallthrough=5
+    -Wsuggest-final-types
+    -Wuninitialized
 )

 include(FetchContent)
@@ -85,22 +154,24 @@ set(FETCHCONTENT_QUIET FALSE)

 FetchContent_Declare(ftpsrv
    GIT_REPOSITORY https://github.com/ITotalJustice/ftpsrv.git
-    GIT_TAG 8d5a14e
+    # GIT_TAG 1.2.2
+    GIT_TAG f8a30fd
+    SOURCE_SUBDIR NONE
 )

 FetchContent_Declare(libhaze
    GIT_REPOSITORY https://github.com/ITotalJustice/libhaze.git
-    GIT_TAG 3244b9e
+    GIT_TAG 04f1526
 )

 FetchContent_Declare(libpulsar
    GIT_REPOSITORY https://github.com/ITotalJustice/switch-libpulsar.git
-    GIT_TAG d729be3
+    GIT_TAG de656e4
 )

 FetchContent_Declare(nanovg
    GIT_REPOSITORY https://github.com/ITotalJustice/nanovg-deko3d.git
-    GIT_TAG 1902b38
+    GIT_TAG 845c9fc
 )

 FetchContent_Declare(stb
@@ -113,14 +184,37 @@ FetchContent_Declare(yyjson
    GIT_TAG 0.10.0
 )

-FetchContent_Declare(minIni-sphaira
+FetchContent_Declare(minIni
    GIT_REPOSITORY https://github.com/ITotalJustice/minIni-nx.git
-    GIT_TAG 63ec295
+    GIT_TAG 11cac8b
 )

-set(MININI_LIB_NAME minIni-sphaira)
+FetchContent_Declare(zstd
+    GIT_REPOSITORY https://github.com/facebook/zstd.git
+    GIT_TAG v1.5.7
+    SOURCE_SUBDIR build/cmake
+)
+
+FetchContent_Declare(libusbhsfs
+    GIT_REPOSITORY https://github.com/ITotalJustice/libusbhsfs.git
+    GIT_TAG db2bf2a
+)
+
+set(USE_NEW_ZSTD ON)
+
+set(ZSTD_BUILD_STATIC ON)
+set(ZSTD_BUILD_SHARED OFF)
+set(ZSTD_BUILD_COMPRESSION OFF)
+set(ZSTD_BUILD_DECOMPRESSION ON)
+set(ZSTD_BUILD_DICTBUILDER OFF)
+set(ZSTD_LEGACY_SUPPORT OFF)
+set(ZSTD_MULTITHREAD_SUPPORT OFF)
+set(ZSTD_BUILD_PROGRAMS OFF)
+set(ZSTD_BUILD_TESTS OFF)
+
+set(MININI_LIB_NAME minIni)
 set(MININI_USE_STDIO ON)
-set(MININI_USE_NX ON)
+set(MININI_USE_NX OFF)
 set(MININI_USE_FLOAT OFF)

 if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
@@ -135,23 +229,18 @@ set(NANOVG_NO_GIF ON)
 set(NANOVG_NO_HDR ON)
 set(NANOVG_NO_PIC ON)
 set(NANOVG_NO_PNM ON)
-set(NANOVG_STBI_STATIC OFF)
-set(NANOVG_STBTT_STATIC ON)

 set(YYJSON_DISABLE_READER OFF)
-set(YYJSON_DISABLE_WRITER ON)
+set(YYJSON_DISABLE_WRITER OFF)
 set(YYJSON_DISABLE_UTILS ON)
 set(YYJSON_DISABLE_FAST_FP_CONV ON)
 set(YYJSON_DISABLE_NON_STANDARD ON)
 set(YYJSON_DISABLE_UTF8_VALIDATION ON)
 set(YYJSON_DISABLE_UNALIGNED_MEMORY_ACCESS OFF)

-set(FTPSRV_LIB_BUILD TRUE)
-set(FTPSRV_LIB_SOCK_UNISTD TRUE)
-set(FTPSRV_LIB_VFS_CUSTOM ${CMAKE_CURRENT_SOURCE_DIR}/include/ftpsrv_helper.hpp)
-set(FTPSRV_LIB_PATH_SIZE 0x301)
-set(FTPSRV_LIB_SESSIONS 32)
-set(FTPSRV_LIB_BUF_SIZE 1024*64)
+# enable this if you want ntfs and ext4 support, at the cost of a huge final binary size.
+set(USBHSFS_GPL OFF)
+set(USBHSFS_SXOS_DISABLE ON)

 FetchContent_MakeAvailable(
    ftpsrv
@@ -159,68 +248,53 @@ FetchContent_MakeAvailable(
    libpulsar
    nanovg
    stb
-    minIni-sphaira
+    minIni
    yyjson
+    zstd
+    libusbhsfs
 )

-# todo: upstream cmake
-add_library(libhaze
-    ${libhaze_SOURCE_DIR}/source/async_usb_server.cpp
-    ${libhaze_SOURCE_DIR}/source/device_properties.cpp
-    ${libhaze_SOURCE_DIR}/source/event_reactor.cpp
-    ${libhaze_SOURCE_DIR}/source/haze.cpp
-    ${libhaze_SOURCE_DIR}/source/ptp_object_database.cpp
-    ${libhaze_SOURCE_DIR}/source/ptp_object_heap.cpp
-    ${libhaze_SOURCE_DIR}/source/ptp_responder_android_operations.cpp
-    ${libhaze_SOURCE_DIR}/source/ptp_responder_mtp_operations.cpp
-    ${libhaze_SOURCE_DIR}/source/ptp_responder_ptp_operations.cpp
-    ${libhaze_SOURCE_DIR}/source/ptp_responder.cpp
-    ${libhaze_SOURCE_DIR}/source/usb_session.cpp
-)
-target_include_directories(libhaze PUBLIC ${libhaze_SOURCE_DIR}/include)
-set_target_properties(libhaze PROPERTIES
-    C_STANDARD 11
-    C_EXTENSIONS ON
-    CXX_STANDARD 20
-    CXX_EXTENSIONS ON
-    # force optimisations in debug mode as otherwise vapor errors
-    # due to force_inline attribute failing...
-    COMPILE_OPTIONS "$<$<CONFIG:Debug>:-Os>"
+set(FTPSRV_LIB_BUILD TRUE)
+set(FTPSRV_LIB_SOCK_UNISTD TRUE)
+set(FTPSRV_LIB_VFS_CUSTOM ${ftpsrv_SOURCE_DIR}/src/platform/nx/vfs_nx.h)
+set(FTPSRV_LIB_PATH_SIZE 0x301)
+set(FTPSRV_LIB_SESSIONS 32)
+set(FTPSRV_LIB_BUF_SIZE 1024*64)
+
+# workaround until a64 container has latest libnx release.
+if (NOT DEFINED USE_VFS_GC)
+    set(USE_VFS_GC TRUE)
+endif()
+
+set(FTPSRV_LIB_CUSTOM_DEFINES
+    USE_VFS_SAVE=$<BOOL:TRUE>
+    USE_VFS_STORAGE=$<BOOL:TRUE>
+    USE_VFS_GC=$<BOOL:${USE_VFS_GC}>
+    USE_VFS_USBHSFS=$<BOOL:FALSE>
+    VFS_NX_BUFFER_IO=$<BOOL:TRUE>
 )

-# todo: upstream cmake
-add_library(libpulsar
-    ${libpulsar_SOURCE_DIR}/src/archive/archive_file.c
-    ${libpulsar_SOURCE_DIR}/src/archive/archive.c
-    ${libpulsar_SOURCE_DIR}/src/bfgrp/bfgrp_location.c
-    ${libpulsar_SOURCE_DIR}/src/bfgrp/bfgrp.c
-    ${libpulsar_SOURCE_DIR}/src/bfsar/bfsar_file.c
-    ${libpulsar_SOURCE_DIR}/src/bfsar/bfsar_group.c
-    ${libpulsar_SOURCE_DIR}/src/bfsar/bfsar_sound.c
-    ${libpulsar_SOURCE_DIR}/src/bfsar/bfsar_string.c
-    ${libpulsar_SOURCE_DIR}/src/bfsar/bfsar_wave_archive.c
-    ${libpulsar_SOURCE_DIR}/src/bfsar/bfsar.c
-    ${libpulsar_SOURCE_DIR}/src/bfstm/bfstm_channel.c
-    ${libpulsar_SOURCE_DIR}/src/bfstm/bfstm_info.c
-    ${libpulsar_SOURCE_DIR}/src/bfstm/bfstm.c
-    ${libpulsar_SOURCE_DIR}/src/bfwar/bfwar_file.c
-    ${libpulsar_SOURCE_DIR}/src/bfwar/bfwar.c
-    ${libpulsar_SOURCE_DIR}/src/bfwav/bfwav_info.c
-    ${libpulsar_SOURCE_DIR}/src/bfwav/bfwav.c
-    ${libpulsar_SOURCE_DIR}/src/bfwsd/bfwsd_sound_data.c
-    ${libpulsar_SOURCE_DIR}/src/bfwsd/bfwsd_wave_id.c
-    ${libpulsar_SOURCE_DIR}/src/bfwsd/bfwsd.c
-    ${libpulsar_SOURCE_DIR}/src/player/player_load_formats.c
-    ${libpulsar_SOURCE_DIR}/src/player/player_load_lookup.c
-    ${libpulsar_SOURCE_DIR}/src/player/player_load.c
-    ${libpulsar_SOURCE_DIR}/src/player/player.c
-)
-target_include_directories(libpulsar PUBLIC ${libpulsar_SOURCE_DIR}/include)
-set_target_properties(libpulsar PROPERTIES
-    C_STANDARD 11
-    C_EXTENSIONS ON
+add_subdirectory(${ftpsrv_SOURCE_DIR} binary_dir)
+
+add_library(ftpsrv_helper
+    ${ftpsrv_SOURCE_DIR}/src/platform/nx/vfs_nx.c
+    ${ftpsrv_SOURCE_DIR}/src/platform/nx/vfs/vfs_nx_none.c
+    ${ftpsrv_SOURCE_DIR}/src/platform/nx/vfs/vfs_nx_root.c
+    ${ftpsrv_SOURCE_DIR}/src/platform/nx/vfs/vfs_nx_fs.c
+    ${ftpsrv_SOURCE_DIR}/src/platform/nx/vfs/vfs_nx_save.c
+    ${ftpsrv_SOURCE_DIR}/src/platform/nx/vfs/vfs_nx_storage.c
+    ${ftpsrv_SOURCE_DIR}/src/platform/nx/utils.c
 )

+target_link_libraries(ftpsrv_helper PUBLIC ftpsrv)
+target_include_directories(ftpsrv_helper PUBLIC ${ftpsrv_SOURCE_DIR}/src/platform)
+
+if (USE_VFS_GC)
+    target_sources(ftpsrv_helper PRIVATE
+        ${ftpsrv_SOURCE_DIR}/src/platform/nx/vfs/vfs_nx_gc.c
+    )
+endif()
+
 add_library(stb INTERFACE)
 target_include_directories(stb INTERFACE ${stb_SOURCE_DIR})

@@ -232,21 +306,27 @@ find_package(CURL REQUIRED)
 find_path(mbedtls_inc mbedtls REQUIRED)
 find_library(mbedcrypto_lib mbedcrypto REQUIRED)

+if (NOT USE_NEW_ZSTD)
+    find_path(zstd_inc zstd.h REQUIRED)
+    find_library(zstd_lib zstd REQUIRED)
+endif()
+
 set_target_properties(sphaira PROPERTIES
-    C_STANDARD 11
+    C_STANDARD 23
    C_EXTENSIONS ON
-    CXX_STANDARD 23
+    CXX_STANDARD 26
    CXX_EXTENSIONS ON
 )

 target_link_libraries(sphaira PRIVATE
-    ftpsrv
+    ftpsrv_helper
    libhaze
    libpulsar
-    minIni-sphaira
+    minIni
    nanovg
    stb
    yyjson
+    libusbhsfs

    ${minizip_lib}
    ZLIB::ZLIB
@@ -254,6 +334,15 @@ target_link_libraries(sphaira PRIVATE
    ${mbedcrypto_lib}
 )

+if (USE_NEW_ZSTD)
+    message(STATUS "USING UPSTREAM ZSTD")
+    target_link_libraries(sphaira PRIVATE libzstd_static)
+else()
+    message(STATUS "USING LOCAL ZSTD")
+    target_link_libraries(sphaira PRIVATE ${zstd_lib})
+    target_include_directories(sphaira PRIVATE ${zstd_inc})
+endif()
+
 target_include_directories(sphaira PRIVATE
    include
    ${minizip_inc}
@@ -266,12 +355,13 @@ file(COPY ${CMAKE_SOURCE_DIR}/assets/romfs DESTINATION ${CMAKE_CURRENT_BINARY_DI
 # create assets target
 dkp_add_asset_target(sphaira_romfs ${CMAKE_CURRENT_BINARY_DIR}/romfs)

-# add hbl exefs to romfs, used for forwarders
-dkp_install_assets(sphaira_romfs
-    DESTINATION exefs
-    TARGETS
-        hbl_nso
-        hbl_npdm
+# wait until hbl is built first as we need the exefs to embed
+add_dependencies(sphaira hbl_nso hbl_npdm)
+
+# set the embed path for assets and hbl
+target_compile_options(sphaira PRIVATE
+    --embed-dir=${CMAKE_SOURCE_DIR}/assets/embed
+    --embed-dir=${CMAKE_BINARY_DIR}/hbl
 )

 # add nanovg shaders to romfs
@@ -288,7 +378,7 @@ nx_generate_nacp(
    OUTPUT sphaira.nacp
    NAME ${CMAKE_PROJECT_NAME}
    AUTHOR TotalJustice
-    VERSION ${CMAKE_PROJECT_VERSION}
+    VERSION ${sphaira_VERSION}
 )

 # create nro
--- a/sphaira/include/app.hpp
+++ b/sphaira/include/app.hpp
@@ -8,6 +8,7 @@
 #include "owo.hpp"
 #include "option.hpp"
 #include "fs.hpp"
+#include "log.hpp"

 #include <switch.h>
 #include <vector>
@@ -25,6 +26,7 @@ enum SoundEffect {
    SoundEffect_Startup,
    SoundEffect_Install,
    SoundEffect_Error,
+    SoundEffect_MAX,
 };

 enum class LaunchType {
@@ -33,7 +35,9 @@ enum class LaunchType {
    Forwader_Sphaira,
 };

+// todo: why is this global???
 void DrawElement(float x, float y, float w, float h, ThemeEntryID id);
+void DrawElement(const Vec4&, ThemeEntryID id);

 class App {
 public:
@@ -41,10 +45,14 @@ public:
    ~App();
    void Loop();

+    static App* GetApp();
+
    static void Exit();
    static void ExitRestart();
    static auto GetVg() -> NVGcontext*;
    static void Push(std::shared_ptr<ui::Widget>);
+    // pops all widgets above a menu
+    static void PopToMenu();

    // this is thread safe
    static void Notify(std::string text, ui::NotifEntry::Side side = ui::NotifEntry::Side::RIGHT);
@@ -53,9 +61,15 @@ public:
    static void NotifyClear(ui::NotifEntry::Side side = ui::NotifEntry::Side::RIGHT);
    static void NotifyFlashLed();

+    // if R_FAILED(rc), pushes error box. returns rc passed in.
+    static Result PushErrorBox(Result rc, const std::string& message);
+
    static auto GetThemeMetaList() -> std::span<ThemeMeta>;
-    static void SetTheme(u64 theme_index);
-    static auto GetThemeIndex() -> u64;
+    static void SetTheme(s64 theme_index);
+    static auto GetThemeIndex() -> s64;
+
+    static auto GetDefaultImage() -> int;
+    static auto GetDefaultImageData() -> std::span<const u8>;

    // returns argv[0]
    static auto GetExePath() -> fs::FsPath;
@@ -65,32 +79,49 @@ public:
    static auto GetMtpEnable() -> bool;
    static auto GetFtpEnable() -> bool;
    static auto GetNxlinkEnable() -> bool;
+    static auto GetHddEnable() -> bool;
+    static auto GetWriteProtect() -> bool;
    static auto GetLogEnable() -> bool;
    static auto GetReplaceHbmenuEnable() -> bool;
    static auto GetInstallEnable() -> bool;
+    static auto GetInstallSysmmcEnable() -> bool;
+    static auto GetInstallEmummcEnable() -> bool;
    static auto GetInstallSdEnable() -> bool;
    static auto GetInstallPrompt() -> bool;
-    static auto GetThemeShuffleEnable() -> bool;
    static auto GetThemeMusicEnable() -> bool;
+    static auto Get12HourTimeEnable() -> bool;
    static auto GetLanguage() -> long;
+    static auto GetTextScrollSpeed() -> long;

    static void SetMtpEnable(bool enable);
    static void SetFtpEnable(bool enable);
    static void SetNxlinkEnable(bool enable);
+    static void SetHddEnable(bool enable);
+    static void SetWriteProtect(bool enable);
    static void SetLogEnable(bool enable);
    static void SetReplaceHbmenuEnable(bool enable);
-    static void SetInstallEnable(bool enable);
+    static void SetInstallSysmmcEnable(bool enable);
+    static void SetInstallEmummcEnable(bool enable);
    static void SetInstallSdEnable(bool enable);
    static void SetInstallPrompt(bool enable);
-    static void SetThemeShuffleEnable(bool enable);
    static void SetThemeMusicEnable(bool enable);
+    static void Set12HourTimeEnable(bool enable);
    static void SetLanguage(long index);
+    static void SetTextScrollSpeed(long index);

    static auto Install(OwoConfig& config) -> Result;
    static auto Install(ui::ProgressBox* pbox, OwoConfig& config) -> Result;

    static void PlaySoundEffect(SoundEffect effect);

+    static void DisplayThemeOptions(bool left_side = true);
+    // todo:
+    static void DisplayNetworkOptions(bool left_side = true);
+    static void DisplayMiscOptions(bool left_side = true);
+    static void DisplayAdvancedOptions(bool left_side = true);
+    static void DisplayInstallOptions(bool left_side = true);
+    static void DisplayDumpOptions(bool left_side = true);
+
    void Draw();
    void Update();
    void Poll();
@@ -98,27 +129,81 @@ public:
    // void DrawElement(float x, float y, float w, float h, ui::ThemeEntryID id);
    auto LoadElementImage(std::string_view value) -> ElementEntry;
    auto LoadElementColour(std::string_view value) -> ElementEntry;
-    auto LoadElement(std::string_view data) -> ElementEntry;
+    auto LoadElement(std::string_view data, ElementType type) -> ElementEntry;

-    void LoadTheme(const fs::FsPath& path);
+    void LoadTheme(const ThemeMeta& meta);
    void CloseTheme();
    void ScanThemes(const std::string& path);
    void ScanThemeEntries();

+    // helper that converts 1.2.3 to a u32 used for comparisons.
+    static auto GetVersionFromString(const char* str) -> u32;
+    static auto IsVersionNewer(const char* current, const char* new_version) -> u32;
+
    static auto IsApplication() -> bool {
        const auto type = appletGetAppletType();
        return type == AppletType_Application || type == AppletType_SystemApplication;
    }

+    static auto IsApplet() -> bool {
+        return !IsApplication();
+    }
+
+    // returns true if launched in applet mode with a title suspended in the background.
+    static auto IsAppletWithSuspendedApp() -> bool {
+        R_UNLESS(IsApplet(), false);
+        R_TRY_RESULT(pmdmntInitialize(), false);
+        ON_SCOPE_EXIT(pmdmntExit());
+
+        u64 pid;
+        return R_SUCCEEDED(pmdmntGetApplicationProcessId(&pid));
+    }
+
+    static auto IsEmunand() -> bool {
+        alignas(0x1000) struct EmummcPaths {
+            char unk[0x80];
+            char nintendo[0x80];
+        } paths{};
+
+        SecmonArgs args{};
+        args.X[0] = 0xF0000404; /* smcAmsGetEmunandConfig */
+        args.X[1] = 0; /* EXO_EMUMMC_MMC_NAND*/
+        args.X[2] = (u64)&paths; /* out path */
+        svcCallSecureMonitor(&args);
+
+        return (paths.unk[0] != '\0') || (paths.nintendo[0] != '\0');
+    }
+
+    static void SetAutoSleepDisabled(bool enable) {
+        static Mutex mutex{};
+        static int ref_count{};
+
+        mutexLock(&mutex);
+        ON_SCOPE_EXIT(mutexUnlock(&mutex));
+
+        if (enable) {
+            appletSetAutoSleepDisabled(true);
+            ref_count++;
+        } else {
+            if (ref_count) {
+                ref_count--;
+            }
+
+            if (!ref_count) {
+                appletSetAutoSleepDisabled(false);
+            }
+        }
+    }
+
 // private:
    static constexpr inline auto CONFIG_PATH = "/config/sphaira/config.ini";
    static constexpr inline auto PLAYLOG_PATH = "/config/sphaira/playlog.ini";
    static constexpr inline auto INI_SECTION = "config";
+    static constexpr inline auto DEFAULT_THEME_PATH = "romfs:/themes/abyss_theme.ini";

    fs::FsPath m_app_path;
    u64 m_start_timestamp{};
-    u64 m_prev_timestamp{};
-    fs::FsPath m_prev_last_launch{};
+    int m_default_image{};

    bool m_is_launched_via_sphaira_forwader{};

@@ -138,24 +223,59 @@ public:

    Theme m_theme{};
    fs::FsPath theme_path{};
-    std::size_t m_theme_index{};
+    s64 m_theme_index{};

    bool m_quit{};

+    // network
    option::OptionBool m_nxlink_enabled{INI_SECTION, "nxlink_enabled", true};
    option::OptionBool m_mtp_enabled{INI_SECTION, "mtp_enabled", false};
    option::OptionBool m_ftp_enabled{INI_SECTION, "ftp_enabled", false};
+    option::OptionBool m_hdd_enabled{INI_SECTION, "hdd_enabled", true};
+    option::OptionBool m_hdd_write_protect{INI_SECTION, "hdd_write_protect", false};
+
    option::OptionBool m_log_enabled{INI_SECTION, "log_enabled", false};
    option::OptionBool m_replace_hbmenu{INI_SECTION, "replace_hbmenu", false};
-    option::OptionBool m_install{INI_SECTION, "install", false};
+    option::OptionString m_theme_path{INI_SECTION, "theme", DEFAULT_THEME_PATH};
+    option::OptionBool m_theme_music{INI_SECTION, "theme_music", true};
+    option::OptionBool m_12hour_time{INI_SECTION, "12hour_time", false};
+    option::OptionLong m_language{INI_SECTION, "language", 0}; // auto
+    option::OptionString m_left_menu{INI_SECTION, "left_side_menu", "FileBrowser"};
+    option::OptionString m_right_menu{INI_SECTION, "right_side_menu", "Appstore"};
+    option::OptionBool m_progress_boost_mode{INI_SECTION, "progress_boost_mode", true};
+
+    // install options
+    option::OptionBool m_install_sysmmc{INI_SECTION, "install_sysmmc", false};
+    option::OptionBool m_install_emummc{INI_SECTION, "install_emummc", false};
    option::OptionBool m_install_sd{INI_SECTION, "install_sd", true};
    option::OptionLong m_install_prompt{INI_SECTION, "install_prompt", true};
-    option::OptionBool m_theme_shuffle{INI_SECTION, "theme_shuffle", false};
-    option::OptionBool m_theme_music{INI_SECTION, "theme_music", true};
-    option::OptionLong m_language{INI_SECTION, "language", 0}; // auto
+    option::OptionBool m_allow_downgrade{INI_SECTION, "allow_downgrade", false};
+    option::OptionBool m_skip_if_already_installed{INI_SECTION, "skip_if_already_installed", true};
+    option::OptionBool m_ticket_only{INI_SECTION, "ticket_only", false};
+    option::OptionBool m_skip_base{INI_SECTION, "skip_base", false};
+    option::OptionBool m_skip_patch{INI_SECTION, "skip_patch", false};
+    option::OptionBool m_skip_addon{INI_SECTION, "skip_addon", false};
+    option::OptionBool m_skip_data_patch{INI_SECTION, "skip_data_patch", false};
+    option::OptionBool m_skip_ticket{INI_SECTION, "skip_ticket", false};
+    option::OptionBool m_skip_nca_hash_verify{INI_SECTION, "skip_nca_hash_verify", false};
+    option::OptionBool m_skip_rsa_header_fixed_key_verify{INI_SECTION, "skip_rsa_header_fixed_key_verify", false};
+    option::OptionBool m_skip_rsa_npdm_fixed_key_verify{INI_SECTION, "skip_rsa_npdm_fixed_key_verify", false};
+    option::OptionBool m_ignore_distribution_bit{INI_SECTION, "ignore_distribution_bit", false};
+    option::OptionBool m_convert_to_standard_crypto{INI_SECTION, "convert_to_standard_crypto", false};
+    option::OptionBool m_lower_master_key{INI_SECTION, "lower_master_key", false};
+    option::OptionBool m_lower_system_version{INI_SECTION, "lower_system_version", false};

-    PLSR_BFSAR m_qlaunch_bfsar{};
-    PLSR_PlayerSoundId m_sound_ids[24]{};
+    // dump options
+    option::OptionBool m_dump_app_folder{"dump", "app_folder", true};
+    option::OptionBool m_dump_append_folder_with_xci{"dump", "append_folder_with_xci", true};
+    option::OptionBool m_dump_trim_xci{"dump", "trim_xci", false};
+    option::OptionBool m_dump_label_trim_xci{"dump", "label_trim_xci", false};
+    option::OptionBool m_dump_usb_transfer_stream{"dump", "usb_transfer_stream", true};
+
+    // todo: move this into it's own menu
+    option::OptionLong m_text_scroll_speed{"accessibility", "text_scroll_speed", 1}; // normal
+
+    PLSR_PlayerSoundId m_sound_ids[SoundEffect_MAX]{};

 private: // from nanovg decko3d example by adubbz
    static constexpr unsigned NumFramebuffers = 2;
--- a/sphaira/include/download.hpp
+++ b/sphaira/include/download.hpp
@@ -1,41 +1,357 @@
 #pragma once

+#include "fs.hpp"
 #include <vector>
 #include <string>
 #include <functional>
+#include <unordered_map>
+#include <algorithm>
+#include <stop_token>
 #include <switch.h>

-namespace sphaira {
+namespace sphaira::curl {

-using DownloadCallback = std::function<void(std::vector<u8>& data, bool success)>;
-using ProgressCallback = std::function<bool(u32 dltotal, u32 dlnow, u32 ultotal, u32 ulnow)>;
+enum {
+    Flag_None = 0,

-enum class DownloadPriority {
+    // requests to download send etag in the header.
+    // the received etag is then saved on success.
+    // this api is only available on downloading to file.
+    Flag_Cache = 1 << 0,
+
+    // sets CURLOPT_NOBODY.
+    Flag_NoBody = 1 << 1,
+};
+
+enum class Priority {
    Normal, // gets pushed to the back of the queue
    High, // gets pushed to the front of the queue
 };

-struct DownloadEventData {
-    DownloadCallback callback;
-    std::vector<u8> data;
-    bool result;
+struct Api;
+struct ApiResult;
+
+using Path = fs::FsPath;
+using OnComplete = std::function<void(ApiResult& result)>;
+using OnProgress = std::function<bool(s64 dltotal, s64 dlnow, s64 ultotal, s64 ulnow)>;
+using OnUploadCallback = std::function<size_t(void *ptr, size_t size)>;
+using OnUploadSeek = std::function<bool(s64 offset)>;
+using StopToken = std::stop_token;
+
+struct Url {
+    Url() = default;
+    Url(const std::string& str) : m_str{str} {}
+    std::string m_str;
 };

-auto DownloadInit() -> bool;
-void DownloadExit();
+struct Fields {
+    Fields() = default;
+    Fields(const std::string& str) : m_str{str} {}
+    std::string m_str;
+};
+
+struct Header {
+    Header() = default;
+    Header(std::initializer_list<std::pair<const std::string, std::string>> p) : m_map{p} {}
+    std::unordered_map<std::string, std::string> m_map;
+
+    auto Find(const std::string& key) const {
+        return std::find_if(m_map.cbegin(), m_map.cend(), [&key](auto& e) {
+            return !strcasecmp(key.c_str(), e.first.c_str());
+        });
+    }
+};
+
+struct Flags {
+    Flags() = default;
+    Flags(u32 flags) : m_flags{flags} {}
+    u32 m_flags{Flag_None};
+};
+
+struct Port {
+    Port() = default;
+    Port(u16 port) : m_port{port} {}
+    u16 m_port{};
+};
+
+struct CustomRequest {
+    CustomRequest() = default;
+    CustomRequest(const std::string& str) : m_str{str} {}
+    std::string m_str;
+};
+
+struct UserPass {
+    UserPass() = default;
+    UserPass(const std::string& user) : m_user{user} {}
+    UserPass(const std::string& user, const std::string& pass) : m_user{user}, m_pass{pass} {}
+    std::string m_user;
+    std::string m_pass;
+};
+
+struct UploadInfo {
+    UploadInfo() = default;
+    UploadInfo(const std::string& name) : m_name{name} {}
+    UploadInfo(const std::string& name, s64 size, OnUploadCallback cb) : m_name{name}, m_size{size}, m_callback{cb} {}
+    UploadInfo(const std::string& name, const std::vector<u8>& data) : m_name{name}, m_data{data} {}
+    std::string m_name{};
+    std::vector<u8> m_data{};
+    s64 m_size{};
+    OnUploadCallback m_callback{};
+};
+
+struct Bearer {
+    Bearer() = default;
+    Bearer(const std::string& str) : m_str{str} {}
+    std::string m_str;
+};
+
+struct PubKey {
+    PubKey() = default;
+    PubKey(const std::string& str) : m_str{str} {}
+    std::string m_str;
+};
+
+struct PrivKey {
+    PrivKey() = default;
+    PrivKey(const std::string& str) : m_str{str} {}
+    std::string m_str;
+};
+
+struct ApiResult {
+    bool success;
+    long code;
+    Header header; // returned headers in request
+    std::vector<u8> data; // empty if downloaded a file
+    fs::FsPath path; // empty if downloaded memory
+};
+
+struct DownloadEventData {
+    OnComplete callback;
+    ApiResult result;
+    StopToken stoken;
+};
+
+// helper that generates the api using an location.
+#define CURL_LOCATION_TO_API(loc) \
+    curl::Url{loc.url}, \
+    curl::UserPass{loc.user, loc.pass}, \
+    curl::Bearer{loc.bearer}, \
+    curl::PubKey{loc.pub_key}, \
+    curl::PrivKey{loc.priv_key}, \
+    curl::Port(loc.port)
+
+auto Init() -> bool;
+void Exit();

 // sync functions
-auto DownloadMemory(const std::string& url, const std::string& post, ProgressCallback pcallback = nullptr) -> std::vector<u8>;
-auto DownloadFile(const std::string& url, const std::string& out, const std::string& post, ProgressCallback pcallback = nullptr) -> bool;
+auto ToMemory(const Api& e) -> ApiResult;
+auto ToFile(const Api& e) -> ApiResult;
+auto FromMemory(const Api& e) -> ApiResult;
+auto FromFile(const Api& e) -> ApiResult;
+
 // async functions
-// starts the downloads in a new thread, pushes an event when complete
-// then, the callback will be called on the main thread.
-// auto DownloadMemoryAsync(const std::string& url, DownloadCallback callback, DownloadPriority prio = DownloadPriority::Normal) -> bool;
-// auto DownloadFileAsync(const std::string& url, const std::string& out, DownloadCallback callback, DownloadPriority prio = DownloadPriority::Normal) -> bool;
+auto ToMemoryAsync(const Api& e) -> bool;
+auto ToFileAsync(const Api& e) -> bool;
+auto FromMemoryAsync(const Api& e) -> bool;
+auto FromFileAsync(const Api& e) -> bool;

-auto DownloadMemoryAsync(const std::string& url, const std::string& post, DownloadCallback callback, ProgressCallback pcallback = nullptr, DownloadPriority prio = DownloadPriority::Normal) -> bool;
-auto DownloadFileAsync(const std::string& url, const std::string& out, const std::string& post, DownloadCallback callback, ProgressCallback pcallback = nullptr, DownloadPriority prio = DownloadPriority::Normal) -> bool;
+// uses curl to convert string to their %XX
+auto EscapeString(const std::string& str) -> std::string;

-void DownloadClearCache(const std::string& url);
+struct Api {
+    Api() = default;

-} // namespace sphaira
+    template <typename... Ts>
+    Api(Ts&&... ts) {
+        Api::set_option(std::forward<Ts>(ts)...);
+    }
+
+    template <typename... Ts>
+    auto To(Ts&&... ts) {
+        if constexpr(std::disjunction_v<std::is_same<Path, Ts>...>) {
+            return ToFile(std::forward<Ts>(ts)...);
+        } else {
+            return ToMemory(std::forward<Ts>(ts)...);
+        }
+    }
+
+    template <typename... Ts>
+    auto From(Ts&&... ts) {
+        if constexpr(std::disjunction_v<std::is_same<Path, Ts>...>) {
+            return FromFile(std::forward<Ts>(ts)...);
+        } else {
+            return FromMemory(std::forward<Ts>(ts)...);
+        }
+    }
+
+    template <typename... Ts>
+    auto ToAsync(Ts&&... ts) {
+        if constexpr(std::disjunction_v<std::is_same<Path, Ts>...>) {
+            return ToFileAsync(std::forward<Ts>(ts)...);
+        } else {
+            return ToMemoryAsync(std::forward<Ts>(ts)...);
+        }
+    }
+
+    template <typename... Ts>
+    auto FromAsync(Ts&&... ts) {
+        if constexpr(std::disjunction_v<std::is_same<Path, Ts>...>) {
+            return FromFileAsync(std::forward<Ts>(ts)...);
+        } else {
+            return FromMemoryAsync(std::forward<Ts>(ts)...);
+        }
+    }
+
+    template <typename... Ts>
+    auto ToMemory(Ts&&... ts) {
+        static_assert(std::disjunction_v<std::is_same<Url, Ts>...>, "Url must be specified");
+        static_assert(!std::disjunction_v<std::is_same<Path, Ts>...>, "Path must not valid for memory");
+        static_assert(!std::disjunction_v<std::is_same<OnComplete, Ts>...>, "OnComplete must not be specified");
+        Api::set_option(std::forward<Ts>(ts)...);
+        return curl::ToMemory(*this);
+    }
+
+    template <typename... Ts>
+    auto FromMemory(Ts&&... ts) {
+        static_assert(std::disjunction_v<std::is_same<Url, Ts>...>, "Url must be specified");
+        static_assert(std::disjunction_v<std::is_same<UploadInfo, Ts>...>, "UploadInfo must be specified");
+        static_assert(!std::disjunction_v<std::is_same<Path, Ts>...>, "Path must not valid for memory");
+        static_assert(!std::disjunction_v<std::is_same<OnComplete, Ts>...>, "OnComplete must not be specified");
+        Api::set_option(std::forward<Ts>(ts)...);
+        return curl::FromMemory(*this);
+    }
+
+    template <typename... Ts>
+    auto ToFile(Ts&&... ts) {
+        static_assert(std::disjunction_v<std::is_same<Url, Ts>...>, "Url must be specified");
+        static_assert(std::disjunction_v<std::is_same<Path, Ts>...>, "Path must be specified");
+        static_assert(!std::disjunction_v<std::is_same<OnComplete, Ts>...>, "OnComplete must not be specified");
+        Api::set_option(std::forward<Ts>(ts)...);
+        return curl::ToFile(*this);
+    }
+
+    template <typename... Ts>
+    auto FromFile(Ts&&... ts) {
+        static_assert(std::disjunction_v<std::is_same<Url, Ts>...>, "Url must be specified");
+        static_assert(std::disjunction_v<std::is_same<Path, Ts>...>, "Path must be specified");
+        static_assert(std::disjunction_v<std::is_same<UploadInfo, Ts>...>, "UploadInfo must be specified");
+        static_assert(!std::disjunction_v<std::is_same<OnComplete, Ts>...>, "OnComplete must not be specified");
+        Api::set_option(std::forward<Ts>(ts)...);
+        return curl::FromFile(*this);
+    }
+
+    template <typename... Ts>
+    auto ToMemoryAsync(Ts&&... ts) {
+        static_assert(std::disjunction_v<std::is_same<Url, Ts>...>, "Url must be specified");
+        static_assert(std::disjunction_v<std::is_same<OnComplete, Ts>...>, "OnComplete must be specified");
+        static_assert(!std::disjunction_v<std::is_same<Path, Ts>...>, "Path must not valid for memory");
+        static_assert(std::disjunction_v<std::is_same<StopToken, Ts>...>, "StopToken must be specified");
+        Api::set_option(std::forward<Ts>(ts)...);
+        return curl::ToMemoryAsync(*this);
+    }
+
+    template <typename... Ts>
+    auto FromMemoryAsync(Ts&&... ts) {
+        static_assert(std::disjunction_v<std::is_same<Url, Ts>...>, "Url must be specified");
+        static_assert(std::disjunction_v<std::is_same<UploadInfo, Ts>...>, "UploadInfo must be specified");
+        static_assert(std::disjunction_v<std::is_same<OnComplete, Ts>...>, "OnComplete must be specified");
+        static_assert(!std::disjunction_v<std::is_same<Path, Ts>...>, "Path must not valid for memory");
+        static_assert(std::disjunction_v<std::is_same<StopToken, Ts>...>, "StopToken must be specified");
+        Api::set_option(std::forward<Ts>(ts)...);
+        return curl::FromMemoryAsync(*this);
+    }
+
+    template <typename... Ts>
+    auto ToFileAsync(Ts&&... ts) {
+        static_assert(std::disjunction_v<std::is_same<Url, Ts>...>, "Url must be specified");
+        static_assert(std::disjunction_v<std::is_same<Path, Ts>...>, "Path must be specified");
+        static_assert(std::disjunction_v<std::is_same<OnComplete, Ts>...>, "OnComplete must be specified");
+        static_assert(std::disjunction_v<std::is_same<StopToken, Ts>...>, "StopToken must be specified");
+        Api::set_option(std::forward<Ts>(ts)...);
+        return curl::ToFileAsync(*this);
+    }
+
+    template <typename... Ts>
+    auto FromFileAsync(Ts&&... ts) {
+        static_assert(std::disjunction_v<std::is_same<Url, Ts>...>, "Url must be specified");
+        static_assert(std::disjunction_v<std::is_same<Path, Ts>...>, "Path must be specified");
+        static_assert(std::disjunction_v<std::is_same<UploadInfo, Ts>...>, "UploadInfo must be specified");
+        static_assert(std::disjunction_v<std::is_same<OnComplete, Ts>...>, "OnComplete must be specified");
+        static_assert(std::disjunction_v<std::is_same<StopToken, Ts>...>, "StopToken must be specified");
+        Api::set_option(std::forward<Ts>(ts)...);
+        return curl::FromFileAsync(*this);
+    }
+
+    void SetUpload(bool enable) { m_is_upload = enable; }
+
+    auto IsUpload() const { return m_is_upload; }
+    auto& GetUrl() const { return m_url.m_str; }
+    auto& GetFields() const { return m_fields.m_str; }
+    auto& GetHeader() const { return m_header; }
+    auto& GetFlags() const { return m_flags.m_flags; }
+    auto& GetPath() const { return m_path; }
+    auto& GetPort() const { return m_port.m_port; }
+    auto& GetCustomRequest() const { return m_custom_request.m_str; }
+    auto& GetUserPass() const { return m_userpass; }
+    auto& GetBearer() const { return m_bearer.m_str; }
+    auto& GetPubKey() const { return m_pub_key.m_str; }
+    auto& GetPrivKey() const { return m_priv_key.m_str; }
+    auto& GetUploadInfo() const { return m_info; }
+    auto& GetOnComplete() const { return m_on_complete; }
+    auto& GetOnProgress() const { return m_on_progress; }
+    auto& GetOnUploadSeek() const { return m_on_upload_seek; }
+    auto& GetPriority() const { return m_prio; }
+    auto& GetToken() const { return m_stoken; }
+
+    void SetOption(Url&& v) { m_url = v; }
+    void SetOption(Fields&& v) { m_fields = v; }
+    void SetOption(Header&& v) { m_header = v; }
+    void SetOption(Flags&& v) { m_flags = v; }
+    void SetOption(Path&& v) { m_path = v; }
+    void SetOption(Port&& v) { m_port = v; }
+    void SetOption(CustomRequest&& v) { m_custom_request = v; }
+    void SetOption(UserPass&& v) { m_userpass = v; }
+    void SetOption(Bearer&& v) { m_bearer = v; }
+    void SetOption(PubKey&& v) { m_pub_key = v; }
+    void SetOption(PrivKey&& v) { m_priv_key = v; }
+    void SetOption(UploadInfo&& v) { m_info = v; }
+    void SetOption(OnComplete&& v) { m_on_complete = v; }
+    void SetOption(OnProgress&& v) { m_on_progress = v; }
+    void SetOption(OnUploadSeek&& v) { m_on_upload_seek = v; }
+    void SetOption(Priority&& v) { m_prio = v; }
+    void SetOption(StopToken&& v) { m_stoken = v; }
+
+    template <typename T>
+    void set_option(T&& t) {
+        SetOption(std::forward<T>(t));
+    }
+
+    template <typename T, typename... Ts>
+    void set_option(T&& t, Ts&&... ts) {
+        set_option(std::forward<T>(t));
+        set_option(std::forward<Ts>(ts)...);
+    }
+
+private:
+    Url m_url{};
+    Fields m_fields{};
+    Header m_header{};
+    Flags m_flags{};
+    Path m_path{};
+    Port m_port{};
+    CustomRequest m_custom_request{};
+    UserPass m_userpass{};
+    Bearer m_bearer{};
+    PubKey m_pub_key{};
+    PrivKey m_priv_key{};
+    UploadInfo m_info{};
+    OnComplete m_on_complete{};
+    OnProgress m_on_progress{};
+    OnUploadSeek m_on_upload_seek{};
+    Priority m_prio{Priority::High};
+    std::stop_source m_stop_source{};
+    StopToken m_stoken{m_stop_source.get_token()};
+    bool m_is_upload{};
+};
+
+} // namespace sphaira::curl
--- a/sphaira/include/dumper.hpp
+++ b/sphaira/include/dumper.hpp
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "fs.hpp"
+#include <switch.h>
+#include <vector>
+#include <memory>
+#include <functional>
+
+namespace sphaira::dump {
+
+enum DumpLocationType {
+    // dump using native fs.
+    DumpLocationType_SdCard,
+    // dump to usb using tinfoil protocol.
+    DumpLocationType_UsbS2S,
+    // speed test, only reads the data, doesn't write anything.
+    DumpLocationType_DevNull,
+    // dump to stdio, ideal for custom mount points using devoptab, such as hdd.
+    DumpLocationType_Stdio,
+    // dump to custom locations found in locations.ini.
+    DumpLocationType_Network,
+};
+
+enum DumpLocationFlag {
+    DumpLocationFlag_SdCard = 1 << DumpLocationType_SdCard,
+    DumpLocationFlag_UsbS2S = 1 << DumpLocationType_UsbS2S,
+    DumpLocationFlag_DevNull = 1 << DumpLocationType_DevNull,
+    DumpLocationFlag_Stdio = 1 << DumpLocationType_Stdio,
+    DumpLocationFlag_Network = 1 << DumpLocationType_Network,
+    DumpLocationFlag_All = DumpLocationFlag_SdCard | DumpLocationFlag_UsbS2S | DumpLocationFlag_DevNull | DumpLocationFlag_Stdio | DumpLocationFlag_Network,
+};
+
+struct BaseSource {
+    virtual ~BaseSource() = default;
+    virtual Result Read(const std::string& path, void* buf, s64 off, s64 size, u64* bytes_read) = 0;
+    virtual auto GetName(const std::string& path) const -> std::string = 0;
+    virtual auto GetSize(const std::string& path) const -> s64 = 0;
+    virtual auto GetIcon(const std::string& path) const -> int { return 0; }
+};
+
+// called after dump has finished.
+using OnExit = std::function<void(Result rc)>;
+
+void Dump(std::shared_ptr<BaseSource> source, const std::vector<fs::FsPath>& paths, OnExit on_exit = [](Result){}, u32 location_flags = DumpLocationFlag_All);
+
+} // namespace sphaira::dump
--- a/sphaira/include/evman.hpp
+++ b/sphaira/include/evman.hpp
@@ -26,7 +26,7 @@ using EventData = std::variant<
    ExitEventData,
    HazeCallbackData,
    NxlinkCallbackData,
-    DownloadEventData
+    curl::DownloadEventData
 >;

 // returns number of events
--- a/sphaira/include/fs.hpp
+++ b/sphaira/include/fs.hpp
@@ -1,6 +1,7 @@
 #pragma once

 #include <switch.h>
+#include <dirent.h>
 #include <cstring>
 #include <vector>
 #include <string>
@@ -169,41 +170,95 @@ static_assert(FsPath::TestFrom(std::string_view{"abc"}));
 static_assert(FsPath::TestFrom(std::string{"abc"}));
 static_assert(FsPath::TestFrom(FsPath{"abc"}));

+// fwd
+struct Fs;
+
+struct File {
+    ~File();
+
+    Result Read(s64 off, void* buf, u64 read_size, u32 option, u64* bytes_read);
+    Result Write(s64 off, const void* buf, u64 write_size, u32 option);
+    Result SetSize(s64 sz);
+    Result GetSize(s64* out);
+    void Close();
+
+    fs::Fs* m_fs{};
+    FsFile m_native{};
+    std::FILE* m_stdio{};
+    s64 m_stdio_off{};
+    // sadly, fatfs doesn't support fstat, so we have to manually
+    // stat the file to get it's size.
+    FsPath m_path{};
+};
+
+struct Dir {
+    ~Dir();
+
+    Result GetEntryCount(s64* out);
+    Result ReadAll(std::vector<FsDirectoryEntry>& buf);
+    void Close();
+
+    fs::Fs* m_fs{};
+    FsDir m_native{};
+    DIR* m_stdio{};
+    u32 m_mode{};
+};
+
 FsPath AppendPath(const fs::FsPath& root_path, const fs::FsPath& file_path);

-Result CreateFile(FsFileSystem* fs, const FsPath& path, u64 size = 0, u32 option = 0, bool ignore_read_only = false);
-Result CreateDirectory(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = false);
-Result CreateDirectoryRecursively(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = false);
-Result CreateDirectoryRecursivelyWithPath(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = false);
-Result DeleteFile(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = false);
-Result DeleteDirectory(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = false);
-Result DeleteDirectoryRecursively(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = false);
-Result RenameFile(FsFileSystem* fs, const FsPath& src, const FsPath& dst, bool ignore_read_only = false);
-Result RenameDirectory(FsFileSystem* fs, const FsPath& src, const FsPath& dst, bool ignore_read_only = false);
+Result CreateFile(FsFileSystem* fs, const FsPath& path, u64 size = 0, u32 option = 0, bool ignore_read_only = true);
+Result CreateDirectory(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = true);
+Result CreateDirectoryRecursively(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = true);
+Result CreateDirectoryRecursivelyWithPath(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = true);
+Result DeleteFile(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = true);
+Result DeleteDirectory(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = true);
+Result DeleteDirectoryRecursively(FsFileSystem* fs, const FsPath& path, bool ignore_read_only = true);
+Result RenameFile(FsFileSystem* fs, const FsPath& src, const FsPath& dst, bool ignore_read_only = true);
+Result RenameDirectory(FsFileSystem* fs, const FsPath& src, const FsPath& dst, bool ignore_read_only = true);
 Result GetEntryType(FsFileSystem* fs, const FsPath& path, FsDirEntryType* out);
 Result GetFileTimeStampRaw(FsFileSystem* fs, const FsPath& path, FsTimeStampRaw *out);
+Result SetTimestamp(FsFileSystem* fs, const FsPath& path, const FsTimeStampRaw* ts);
 bool FileExists(FsFileSystem* fs, const FsPath& path);
 bool DirExists(FsFileSystem* fs, const FsPath& path);
 Result read_entire_file(FsFileSystem* fs, const FsPath& path, std::vector<u8>& out);
-Result write_entire_file(FsFileSystem* fs, const FsPath& path, const std::vector<u8>& in, bool ignore_read_only = false);
-Result copy_entire_file(FsFileSystem* fs, const FsPath& dst, const FsPath& src, bool ignore_read_only = false);
+Result write_entire_file(FsFileSystem* fs, const FsPath& path, const std::vector<u8>& in, bool ignore_read_only = true);
+Result copy_entire_file(FsFileSystem* fs, const FsPath& dst, const FsPath& src, bool ignore_read_only = true);

-Result CreateFile(const FsPath& path, u64 size = 0, u32 option = 0, bool ignore_read_only = false);
-Result CreateDirectory(const FsPath& path, bool ignore_read_only = false);
-Result CreateDirectoryRecursively(const FsPath& path, bool ignore_read_only = false);
-Result CreateDirectoryRecursivelyWithPath(const FsPath& path, bool ignore_read_only = false);
-Result DeleteFile(const FsPath& path, bool ignore_read_only = false);
-Result DeleteDirectory(const FsPath& path, bool ignore_read_only = false);
-Result DeleteDirectoryRecursively(const FsPath& path, bool ignore_read_only = false);
-Result RenameFile(const FsPath& src, const FsPath& dst, bool ignore_read_only = false);
-Result RenameDirectory(const FsPath& src, const FsPath& dst, bool ignore_read_only = false);
+Result CreateFile(const FsPath& path, u64 size = 0, u32 option = 0, bool ignore_read_only = true);
+Result CreateDirectory(const FsPath& path, bool ignore_read_only = true);
+Result CreateDirectoryRecursively(const FsPath& path, bool ignore_read_only = true);
+Result CreateDirectoryRecursivelyWithPath(const FsPath& path, bool ignore_read_only = true);
+Result DeleteFile(const FsPath& path, bool ignore_read_only = true);
+Result DeleteDirectory(const FsPath& path, bool ignore_read_only = true);
+Result DeleteDirectoryRecursively(const FsPath& path, bool ignore_read_only = true);
+Result RenameFile(const FsPath& src, const FsPath& dst, bool ignore_read_only = true);
+Result RenameDirectory(const FsPath& src, const FsPath& dst, bool ignore_read_only = true);
 Result GetEntryType(const FsPath& path, FsDirEntryType* out);
 Result GetFileTimeStampRaw(const FsPath& path, FsTimeStampRaw *out);
+Result SetTimestamp(const FsPath& path, const FsTimeStampRaw* ts);
 bool FileExists(const FsPath& path);
 bool DirExists(const FsPath& path);
 Result read_entire_file(const FsPath& path, std::vector<u8>& out);
-Result write_entire_file(const FsPath& path, const std::vector<u8>& in, bool ignore_read_only = false);
-Result copy_entire_file(const FsPath& dst, const FsPath& src, bool ignore_read_only = false);
+Result write_entire_file(const FsPath& path, const std::vector<u8>& in, bool ignore_read_only = true);
+Result copy_entire_file(const FsPath& dst, const FsPath& src, bool ignore_read_only = true);
+
+Result OpenFile(fs::Fs* fs, const fs::FsPath& path, u32 mode, File* f);
+Result OpenDirectory(fs::Fs* fs, const fs::FsPath& path, u32 mode, Dir* d);
+
+// opens dir, fetches count for all entries.
+// NOTE: this function will be slow on non-native fs, due to multiple
+// readdir() functions being needed!
+Result DirGetEntryCount(fs::Fs* fs, const fs::FsPath& path, s64* count, u32 mode);
+// same as the above, but fetches file and folder count in a single pass
+// this is faster when using native, and *much* faster for stdio.
+Result DirGetEntryCount(fs::Fs* fs, const fs::FsPath& path, s64* file_count, s64* dir_count, u32 mode = FsDirOpenMode_ReadDirs|FsDirOpenMode_ReadFiles);
+
+// optimised for stdio calls as stat returns size and timestamp in a single call.
+// whereas for native, this is 2 function calls.
+// however if you need both, you will need 2 calls for native anyway,
+// but can avoid the second (expensive) stat call.
+Result FileGetSizeAndTimestamp(fs::Fs* fs, const FsPath& path, FsTimeStampRaw* ts, s64* size);
+Result IsDirEmpty(fs::Fs* m_fs, const fs::FsPath& path, bool* out);

 struct Fs {
    static constexpr inline u32 FsModule = 505;
@@ -222,51 +277,86 @@ struct Fs {
    static constexpr inline Result ResultUnknownStdioError = MAKERESULT(FsModule, 13);
    static constexpr inline Result ResultReadOnly = MAKERESULT(FsModule, 14);

-    virtual Result CreateFile(const FsPath& path, u64 size = 0, u32 option = 0, bool ignore_read_only = false) = 0;
-    virtual Result CreateDirectory(const FsPath& path, bool ignore_read_only = false) = 0;
-    virtual Result CreateDirectoryRecursively(const FsPath& path, bool ignore_read_only = false) = 0;
-    virtual Result CreateDirectoryRecursivelyWithPath(const FsPath& path, bool ignore_read_only = false) = 0;
-    virtual Result DeleteFile(const FsPath& path, bool ignore_read_only = false) = 0;
-    virtual Result DeleteDirectory(const FsPath& path, bool ignore_read_only = false) = 0;
-    virtual Result DeleteDirectoryRecursively(const FsPath& path, bool ignore_read_only = false) = 0;
-    virtual Result RenameFile(const FsPath& src, const FsPath& dst, bool ignore_read_only = false) = 0;
-    virtual Result RenameDirectory(const FsPath& src, const FsPath& dst, bool ignore_read_only = false) = 0;
+    Fs(bool ignore_read_only = true) : m_ignore_read_only{ignore_read_only} {}
+    virtual ~Fs() = default;
+
+    virtual Result CreateFile(const FsPath& path, u64 size = 0, u32 option = 0) = 0;
+    virtual Result CreateDirectory(const FsPath& path) = 0;
+    virtual Result CreateDirectoryRecursively(const FsPath& path) = 0;
+    virtual Result CreateDirectoryRecursivelyWithPath(const FsPath& path) = 0;
+    virtual Result DeleteFile(const FsPath& path) = 0;
+    virtual Result DeleteDirectory(const FsPath& path) = 0;
+    virtual Result DeleteDirectoryRecursively(const FsPath& path) = 0;
+    virtual Result RenameFile(const FsPath& src, const FsPath& dst) = 0;
+    virtual Result RenameDirectory(const FsPath& src, const FsPath& dst) = 0;
    virtual Result GetEntryType(const FsPath& path, FsDirEntryType* out) = 0;
    virtual Result GetFileTimeStampRaw(const FsPath& path, FsTimeStampRaw *out) = 0;
+    virtual Result SetTimestamp(const FsPath& path, const FsTimeStampRaw* ts) = 0;
    virtual bool FileExists(const FsPath& path) = 0;
    virtual bool DirExists(const FsPath& path) = 0;
+    virtual bool IsNative() const = 0;
+    virtual FsPath Root() const { return "/"; }
    virtual Result read_entire_file(const FsPath& path, std::vector<u8>& out) = 0;
-    virtual Result write_entire_file(const FsPath& path, const std::vector<u8>& in, bool ignore_read_only = false) = 0;
-    virtual Result copy_entire_file(const FsPath& dst, const FsPath& src, bool ignore_read_only = false) = 0;
+    virtual Result write_entire_file(const FsPath& path, const std::vector<u8>& in) = 0;
+    virtual Result copy_entire_file(const FsPath& dst, const FsPath& src) = 0;
+
+    Result OpenFile(const fs::FsPath& path, u32 mode, File* f) {
+        return fs::OpenFile(this, path, mode, f);
+    }
+    Result OpenDirectory(const fs::FsPath& path, u32 mode, Dir* d) {
+        return fs::OpenDirectory(this, path, mode, d);
+    }
+    Result DirGetEntryCount(const fs::FsPath& path, s64* count, u32 mode) {
+        return fs::DirGetEntryCount(this, path, count, mode);
+    }
+    Result DirGetEntryCount(const fs::FsPath& path, s64* file_count, s64* dir_count, u32 mode = FsDirOpenMode_ReadDirs|FsDirOpenMode_ReadFiles) {
+        return fs::DirGetEntryCount(this, path, file_count, dir_count, mode);
+    }
+    Result FileGetSizeAndTimestamp(const FsPath& path, FsTimeStampRaw* ts, s64* size) {
+        return fs::FileGetSizeAndTimestamp(this, path, ts, size);
+    }
+    Result IsDirEmpty(const fs::FsPath& path, bool* out) {
+        return fs::IsDirEmpty(this, path, out);
+    }
+
+    void SetIgnoreReadOnly(bool enable) {
+        m_ignore_read_only = enable;
+    }
+
+protected:
+    bool m_ignore_read_only;
 };

 struct FsStdio : Fs {
-    Result CreateFile(const FsPath& path, u64 size = 0, u32 option = 0, bool ignore_read_only = false) override {
-        return fs::CreateFile(path, size, option, ignore_read_only);
+    FsStdio(bool ignore_read_only = true, const FsPath& root = "/") : Fs{ignore_read_only}, m_root{root} {}
+    virtual ~FsStdio() = default;
+
+    Result CreateFile(const FsPath& path, u64 size = 0, u32 option = 0) override {
+        return fs::CreateFile(path, size, option, m_ignore_read_only);
    }
-    Result CreateDirectory(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::CreateDirectory(path, ignore_read_only);
+    Result CreateDirectory(const FsPath& path) override {
+        return fs::CreateDirectory(path, m_ignore_read_only);
    }
-    Result CreateDirectoryRecursively(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::CreateDirectoryRecursively(path, ignore_read_only);
+    Result CreateDirectoryRecursively(const FsPath& path) override {
+        return fs::CreateDirectoryRecursively(path, m_ignore_read_only);
    }
-    Result CreateDirectoryRecursivelyWithPath(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::CreateDirectoryRecursivelyWithPath(path, ignore_read_only);
+    Result CreateDirectoryRecursivelyWithPath(const FsPath& path) override {
+        return fs::CreateDirectoryRecursivelyWithPath(path, m_ignore_read_only);
    }
-    Result DeleteFile(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::DeleteFile(path, ignore_read_only);
+    Result DeleteFile(const FsPath& path) override {
+        return fs::DeleteFile(path, m_ignore_read_only);
    }
-    Result DeleteDirectory(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::DeleteDirectory(path, ignore_read_only);
+    Result DeleteDirectory(const FsPath& path) override {
+        return fs::DeleteDirectory(path, m_ignore_read_only);
    }
-    Result DeleteDirectoryRecursively(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::DeleteDirectoryRecursively(path, ignore_read_only);
+    Result DeleteDirectoryRecursively(const FsPath& path) override {
+        return fs::DeleteDirectoryRecursively(path, m_ignore_read_only);
    }
-    Result RenameFile(const FsPath& src, const FsPath& dst, bool ignore_read_only = false) override {
-        return fs::RenameFile(src, dst, ignore_read_only);
+    Result RenameFile(const FsPath& src, const FsPath& dst) override {
+        return fs::RenameFile(src, dst, m_ignore_read_only);
    }
-    Result RenameDirectory(const FsPath& src, const FsPath& dst, bool ignore_read_only = false) override {
-        return fs::RenameDirectory(src, dst, ignore_read_only);
+    Result RenameDirectory(const FsPath& src, const FsPath& dst) override {
+        return fs::RenameDirectory(src, dst, m_ignore_read_only);
    }
    Result GetEntryType(const FsPath& path, FsDirEntryType* out) override {
        return fs::GetEntryType(path, out);
@@ -274,26 +364,37 @@ struct FsStdio : Fs {
    Result GetFileTimeStampRaw(const FsPath& path, FsTimeStampRaw *out) override {
        return fs::GetFileTimeStampRaw(path, out);
    }
+    Result SetTimestamp(const FsPath& path, const FsTimeStampRaw *ts) override {
+        return fs::SetTimestamp(path, ts);
+    }
    bool FileExists(const FsPath& path) override {
        return fs::FileExists(path);
    }
    bool DirExists(const FsPath& path) override {
        return fs::DirExists(path);
    }
+    bool IsNative() const override {
+        return false;
+    }
+    FsPath Root() const override {
+        return m_root;
+    }
    Result read_entire_file(const FsPath& path, std::vector<u8>& out) override {
        return fs::read_entire_file(path, out);
    }
-    Result write_entire_file(const FsPath& path, const std::vector<u8>& in, bool ignore_read_only = false) override {
-        return fs::write_entire_file(path, in, ignore_read_only);
+    Result write_entire_file(const FsPath& path, const std::vector<u8>& in) override {
+        return fs::write_entire_file(path, in, m_ignore_read_only);
    }
-    Result copy_entire_file(const FsPath& dst, const FsPath& src, bool ignore_read_only = false) override {
-        return fs::copy_entire_file(dst, src, ignore_read_only);
+    Result copy_entire_file(const FsPath& dst, const FsPath& src) override {
+        return fs::copy_entire_file(dst, src, m_ignore_read_only);
    }
+
+    const FsPath m_root;
 };

 struct FsNative : Fs {
-    FsNative() = default;
-    FsNative(FsFileSystem* fs, bool own) : m_fs{*fs}, m_own{own} {}
+    explicit FsNative(bool ignore_read_only = true) : Fs{ignore_read_only} {}
+    explicit FsNative(FsFileSystem* fs, bool own, bool ignore_read_only = true) : Fs{ignore_read_only}, m_fs{*fs}, m_own{own} {}

    virtual ~FsNative() {
        if (m_own) {
@@ -313,39 +414,35 @@ struct FsNative : Fs {
        return fsFsGetTotalSpace(&m_fs, path, out);
    }

-    Result OpenFile(const FsPath& path, u32 mode, FsFile *out) {
-        return fsFsOpenFile(&m_fs, path, mode, out);
-    }
+    // Result OpenDirectory(const FsPath& path, u32 mode, FsDir *out) {
+    //     return fsFsOpenDirectory(&m_fs, path, mode, out);
+    // }

-    Result OpenDirectory(const FsPath& path, u32 mode, FsDir *out) {
-        return fsFsOpenDirectory(&m_fs, path, mode, out);
-    }
+    // void DirClose(FsDir *d) {
+    //     fsDirClose(d);
+    // }

-    void DirClose(FsDir *d) {
-        fsDirClose(d);
-    }
+    // Result DirGetEntryCount(FsDir *d, s64* out) {
+    //     return fsDirGetEntryCount(d, out);
+    // }

-    Result DirGetEntryCount(FsDir *d, s64* out) {
-        return fsDirGetEntryCount(d, out);
-    }
+    // Result DirGetEntryCount(const FsPath& path, u32 mode, s64* out) {
+    //     FsDir d;
+    //     R_TRY(OpenDirectory(path, mode, &d));
+    //     ON_SCOPE_EXIT(DirClose(&d));
+    //     return DirGetEntryCount(&d, out);
+    // }

-    Result DirGetEntryCount(const FsPath& path, u32 mode, s64* out) {
-        FsDir d;
-        R_TRY(OpenDirectory(path, mode, &d));
-        ON_SCOPE_EXIT(DirClose(&d));
-        return DirGetEntryCount(&d, out);
-    }
+    // Result DirRead(FsDir *d, s64 *total_entries, size_t max_entries, FsDirectoryEntry *buf) {
+    //     return fsDirRead(d, total_entries, max_entries, buf);
+    // }

-    Result DirRead(FsDir *d, s64 *total_entries, size_t max_entries, FsDirectoryEntry *buf) {
-        return fsDirRead(d, total_entries, max_entries, buf);
-    }
-
-    Result DirRead(const FsPath& path, u32 mode, s64 *total_entries, size_t max_entries, FsDirectoryEntry *buf) {
-        FsDir d;
-        R_TRY(OpenDirectory(path, mode, &d));
-        ON_SCOPE_EXIT(DirClose(&d));
-        return DirRead(&d, total_entries, max_entries, buf);
-    }
+    // Result DirRead(const FsPath& path, u32 mode, s64 *total_entries, size_t max_entries, FsDirectoryEntry *buf) {
+    //     FsDir d;
+    //     R_TRY(OpenDirectory(path, mode, &d));
+    //     ON_SCOPE_EXIT(DirClose(&d));
+    //     return DirRead(&d, total_entries, max_entries, buf);
+    // }

    virtual bool IsFsActive() {
        return serviceIsActive(&m_fs.s);
@@ -355,32 +452,32 @@ struct FsNative : Fs {
        return m_open_result;
    }

-    Result CreateFile(const FsPath& path, u64 size = 0, u32 option = 0, bool ignore_read_only = false) override {
-        return fs::CreateFile(&m_fs, path, size, option, ignore_read_only);
+    Result CreateFile(const FsPath& path, u64 size = 0, u32 option = 0) override {
+        return fs::CreateFile(&m_fs, path, size, option, m_ignore_read_only);
    }
-    Result CreateDirectory(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::CreateDirectory(&m_fs, path, ignore_read_only);
+    Result CreateDirectory(const FsPath& path) override {
+        return fs::CreateDirectory(&m_fs, path, m_ignore_read_only);
    }
-    Result CreateDirectoryRecursively(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::CreateDirectoryRecursively(&m_fs, path, ignore_read_only);
+    Result CreateDirectoryRecursively(const FsPath& path) override {
+        return fs::CreateDirectoryRecursively(&m_fs, path, m_ignore_read_only);
    }
-    Result CreateDirectoryRecursivelyWithPath(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::CreateDirectoryRecursivelyWithPath(&m_fs, path, ignore_read_only);
+    Result CreateDirectoryRecursivelyWithPath(const FsPath& path) override {
+        return fs::CreateDirectoryRecursivelyWithPath(&m_fs, path, m_ignore_read_only);
    }
-    Result DeleteFile(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::DeleteFile(&m_fs, path, ignore_read_only);
+    Result DeleteFile(const FsPath& path) override {
+        return fs::DeleteFile(&m_fs, path, m_ignore_read_only);
    }
-    Result DeleteDirectory(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::DeleteDirectory(&m_fs, path, ignore_read_only);
+    Result DeleteDirectory(const FsPath& path) override {
+        return fs::DeleteDirectory(&m_fs, path, m_ignore_read_only);
    }
-    Result DeleteDirectoryRecursively(const FsPath& path, bool ignore_read_only = false) override {
-        return fs::DeleteDirectoryRecursively(&m_fs, path, ignore_read_only);
+    Result DeleteDirectoryRecursively(const FsPath& path) override {
+        return fs::DeleteDirectoryRecursively(&m_fs, path, m_ignore_read_only);
    }
-    Result RenameFile(const FsPath& src, const FsPath& dst, bool ignore_read_only = false) override {
-        return fs::RenameFile(&m_fs, src, dst, ignore_read_only);
+    Result RenameFile(const FsPath& src, const FsPath& dst) override {
+        return fs::RenameFile(&m_fs, src, dst, m_ignore_read_only);
    }
-    Result RenameDirectory(const FsPath& src, const FsPath& dst, bool ignore_read_only = false) override {
-        return fs::RenameDirectory(&m_fs, src, dst, ignore_read_only);
+    Result RenameDirectory(const FsPath& src, const FsPath& dst) override {
+        return fs::RenameDirectory(&m_fs, src, dst, m_ignore_read_only);
    }
    Result GetEntryType(const FsPath& path, FsDirEntryType* out) override {
        return fs::GetEntryType(&m_fs, path, out);
@@ -388,20 +485,26 @@ struct FsNative : Fs {
    Result GetFileTimeStampRaw(const FsPath& path, FsTimeStampRaw *out) override {
        return fs::GetFileTimeStampRaw(&m_fs, path, out);
    }
+    Result SetTimestamp(const FsPath& path, const FsTimeStampRaw *ts) override {
+        return fs::SetTimestamp(&m_fs, path, ts);
+    }
    bool FileExists(const FsPath& path) override {
        return fs::FileExists(&m_fs, path);
    }
    bool DirExists(const FsPath& path) override {
        return fs::DirExists(&m_fs, path);
    }
+    bool IsNative() const override {
+        return true;
+    }
    Result read_entire_file(const FsPath& path, std::vector<u8>& out) override {
        return fs::read_entire_file(&m_fs, path, out);
    }
-    Result write_entire_file(const FsPath& path, const std::vector<u8>& in, bool ignore_read_only = false) override {
-        return fs::write_entire_file(&m_fs, path, in, ignore_read_only);
+    Result write_entire_file(const FsPath& path, const std::vector<u8>& in) override {
+        return fs::write_entire_file(&m_fs, path, in, m_ignore_read_only);
    }
-    Result copy_entire_file(const FsPath& dst, const FsPath& src, bool ignore_read_only = false) override {
-        return fs::copy_entire_file(&m_fs, dst, src, ignore_read_only);
+    Result copy_entire_file(const FsPath& dst, const FsPath& src) override {
+        return fs::copy_entire_file(&m_fs, dst, src, m_ignore_read_only);
    }

    FsFileSystem m_fs{};
@@ -417,43 +520,34 @@ struct FsNativeSd final : FsNative {
 };
 #else
 struct FsNativeSd final : FsNative {
-    FsNativeSd() : FsNative{fsdevGetDeviceFileSystem("sdmc:"), false} {
+    FsNativeSd(bool ignore_read_only = true) : FsNative{fsdevGetDeviceFileSystem("sdmc:"), false, ignore_read_only} {
        m_open_result = 0;
    }
 };
 #endif

 struct FsNativeBis final : FsNative {
-    FsNativeBis(FsBisPartitionId id, const FsPath& string) {
+    FsNativeBis(FsBisPartitionId id, const FsPath& string, bool ignore_read_only = true) : FsNative{ignore_read_only} {
        m_open_result = fsOpenBisFileSystem(&m_fs, id, string);
    }
 };

 struct FsNativeImage final : FsNative {
-    FsNativeImage(FsImageDirectoryId id) {
+    FsNativeImage(FsImageDirectoryId id, bool ignore_read_only = true) : FsNative{ignore_read_only} {
        m_open_result = fsOpenImageDirectoryFileSystem(&m_fs, id);
    }
 };

 struct FsNativeContentStorage final : FsNative {
-    FsNativeContentStorage(FsContentStorageId id) {
+    FsNativeContentStorage(FsContentStorageId id, bool ignore_read_only = true) : FsNative{ignore_read_only} {
        m_open_result = fsOpenContentStorageFileSystem(&m_fs, id);
    }
 };

-// auto file_exists(const FsPath& path) -> bool;
-// auto create_file(const FsPath& path, u64 size = 0) -> Result;
-// auto delete_file(const FsPath& path) -> Result;
-// auto create_directory(const FsPath& path) -> Result;
-// auto create_directory_recursively(const FsPath& path) -> Result;
-// auto delete_directory(const FsPath& path) -> Result;
-// auto delete_directory_recursively(const FsPath& path) -> Result;
-// auto rename_file(const FsPath& src, const FsPath& dst) -> Result;
-// auto rename_directory(const FsPath& src, const FsPath& dst) -> Result;
-
-// auto read_entire_file(const FsPath& path, std::vector<u8>& out) -> Result;
-// auto write_entire_file(const FsPath& path, const std::vector<u8>& in) -> Result;
-// // single threaded one shot copy, only use for very small files!
-// auto copy_entire_file(const FsPath& dst, const FsPath& src) -> Result;
+struct FsNativeGameCard final : FsNative {
+    FsNativeGameCard(const FsGameCardHandle* handle, FsGameCardPartition partition, bool ignore_read_only = true) : FsNative{ignore_read_only} {
+        m_open_result = fsOpenGameCardFileSystem(&m_fs, handle, partition);
+    }
+};

 } // namespace fs
--- a/sphaira/include/ftpsrv_helper.hpp
+++ b/sphaira/include/ftpsrv_helper.hpp
@@ -1,33 +1,22 @@
 #pragma once

-#include <switch.h>
-
-struct FtpVfsFile {
-    FsFile fd;
-    s64 off;
-    s64 buf_off;
-    s64 buf_size;
-    bool is_write;
-    bool is_valid;
-    u8 buf[1024 * 1024 * 1];
-};
-
-struct FtpVfsDir {
-    FsDir dir;
-    bool is_valid;
-};
-
-struct FtpVfsDirEntry {
-    FsDirectoryEntry buf;
-};
-
-#ifdef __cplusplus
+#include <functional>

 namespace sphaira::ftpsrv {

 bool Init();
 void Exit();

-} // namespace sphaira::ftpsrv
+using OnInstallStart = std::function<bool(void* user, const char* path)>;
+using OnInstallWrite = std::function<bool(void* user, const void* buf, size_t size)>;
+using OnInstallClose = std::function<void(void* user)>;

-#endif // __cplusplus
+void InitInstallMode(void* user, OnInstallStart on_start, OnInstallWrite on_write, OnInstallClose on_close);
+void DisableInstallMode();
+
+unsigned GetPort();
+bool IsAnon();
+const char* GetUser();
+const char* GetPass();
+
+} // namespace sphaira::ftpsrv
--- a/sphaira/include/hasher.hpp
+++ b/sphaira/include/hasher.hpp
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "fs.hpp"
+#include "ui/progress_box.hpp"
+#include <string>
+#include <memory>
+#include <switch.h>
+
+namespace sphaira::hash {
+
+enum class Type {
+    Crc32,
+    Md5,
+    Sha1,
+    Sha256,
+};
+
+struct BaseSource {
+    virtual ~BaseSource() = default;
+    virtual Result Size(s64* out) = 0;
+    virtual Result Read(void* buf, s64 off, s64 size, u64* bytes_read) = 0;
+};
+
+auto GetTypeStr(Type type) -> const char*;
+
+// returns the hash string.
+Result Hash(ui::ProgressBox* pbox, Type type, std::shared_ptr<BaseSource> source, std::string& out);
+Result Hash(ui::ProgressBox* pbox, Type type, fs::Fs* fs, const fs::FsPath& path, std::string& out);
+
+} // namespace sphaira::hash
--- a/sphaira/include/i18n.hpp
+++ b/sphaira/include/i18n.hpp
@@ -1,18 +1,19 @@
 #pragma once

 #include <string>
+#include <string_view>

 namespace sphaira::i18n {

 bool init(long index);
 void exit();

-std::string get(const char* str);
+std::string get(std::string_view str);

 } // namespace sphaira::i18n

 inline namespace literals {

-std::string operator"" _i18n(const char* str, size_t len);
+std::string operator""_i18n(const char* str, size_t len);

 } // namespace literals
--- a/sphaira/include/location.hpp
+++ b/sphaira/include/location.hpp
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include <switch.h>
+
+namespace sphaira::location {
+
+struct Entry {
+    std::string name{};
+    std::string url{};
+    std::string user{};
+    std::string pass{};
+    std::string bearer{};
+    std::string pub_key{};
+    std::string priv_key{};
+    u16 port{};
+};
+using Entries = std::vector<Entry>;
+
+auto Load() -> Entries;
+void Add(const Entry& e);
+
+// helper for hdd devices.
+// this doesn't really belong in this header, however
+// locations likely will be renamed to something more generic soon.
+struct StdioEntry {
+    // mount point (ums0:)
+    std::string mount{};
+    // ums0: (USB Flash Disk)
+    std::string name{};
+    // set if read-only.
+    bool write_protect;
+};
+
+using StdioEntries = std::vector<StdioEntry>;
+
+// set write=true to filter out write protected devices.
+auto GetStdio(bool write) -> StdioEntries;
+
+} // namespace sphaira::location
--- a/sphaira/include/log.hpp
+++ b/sphaira/include/log.hpp
@@ -1,21 +1,33 @@
 #pragma once

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define sphaira_USE_LOG 1

+#include <stdarg.h>
+
 #if sphaira_USE_LOG
-auto log_file_init() -> bool;
-auto log_nxlink_init() -> bool;
+bool log_file_init();
+bool log_nxlink_init();
 void log_file_exit();
 void log_nxlink_exit();
 void log_write(const char* s, ...) __attribute__ ((format (printf, 1, 2)));
+void log_write_arg(const char* s, va_list* v);
 #else
-inline auto log_file_init() -> bool {
+inline bool log_file_init() {
    return true;
 }
-inline auto log_nxlink_init() -> bool {
+inline bool log_nxlink_init() {
    return true;
 }
 #define log_file_exit()
 #define log_nxlink_exit()
 #define log_write(...)
+#define log_write_arg(...)
+#endif
+
+#ifdef __cplusplus
+}
 #endif
--- a/sphaira/include/nro.hpp
+++ b/sphaira/include/nro.hpp
@@ -11,15 +11,18 @@ namespace sphaira {

 struct Hbini {
    u64 timestamp{}; // timestamp of last launch
-    u32 launch_count{}; //
+};
+
+struct MiniNacp {
+    NacpLanguageEntry lang;
+    char display_version[0x10];
 };

 struct NroEntry {
    fs::FsPath path{};
    s64 size{};
-    NacpStruct nacp{};
+    MiniNacp nacp{};

-    std::vector<u8> icon{};
    u64 icon_size{};
    u64 icon_offset{};

@@ -32,11 +35,11 @@ struct NroEntry {
    std::optional<bool> has_star{std::nullopt};

    auto GetName() const -> const char* {
-        return nacp.lang[0].name;
+        return nacp.lang.name;
    }

    auto GetAuthor() const -> const char* {
-        return nacp.lang[0].author;
+        return nacp.lang.author;
    }

    auto GetDisplayVersion() const -> const char* {
@@ -76,4 +79,10 @@ auto nro_add_arg_file(std::string arg) -> std::string;
 // strips sdmc:
 auto nro_normalise_path(const std::string& p) -> std::string;

+// helpers to find nro entry, will be made methods soon once i convert vector into a struct.
+auto nro_find(std::span<const NroEntry> array, std::string_view name, std::string_view author, const fs::FsPath& path) -> std::optional<NroEntry>;
+auto nro_find_name(std::span<const NroEntry> array, std::string_view name) -> std::optional<NroEntry>;
+auto nro_find_author(std::span<const NroEntry> array, std::string_view author) -> std::optional<NroEntry>;
+auto nro_find_path(std::span<const NroEntry> array, const fs::FsPath& path) -> std::optional<NroEntry>;
+
 } // namespace sphaira
--- a/sphaira/include/option.hpp
+++ b/sphaira/include/option.hpp
@@ -14,8 +14,17 @@ struct OptionBase {
    {}

    auto Get() -> T;
+    auto GetOr(const char* name) -> T;
    void Set(T value);

+    // returns true if loaded.
+    auto LoadFrom(const char* section, const char* name, const char* value) -> bool;
+    // same as above, but only checks the name.
+    auto LoadFrom(const char* name, const char* value) -> bool;
+
+private:
+    auto GetInternal(const char* name) -> T;
+
 private:
    const std::string m_section;
    const std::string m_name;
--- a/sphaira/include/owo.hpp
+++ b/sphaira/include/owo.hpp
@@ -4,7 +4,6 @@
 #include <string>
 #include <vector>
 #include "ui/progress_box.hpp"
-// #include <optional>

 namespace sphaira {

@@ -15,12 +14,9 @@ struct OwoConfig {
    std::string author{};
    NacpStruct nacp;
    std::vector<u8> icon;
-    std::vector<u8> main;
-    std::vector<u8> npdm;
    std::vector<u8> logo;
    std::vector<u8> gif;

-    // std::optional<u64> tid;
    std::vector<u8> program_nca{};
 };

--- a/sphaira/include/threaded_file_transfer.hpp
+++ b/sphaira/include/threaded_file_transfer.hpp
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "ui/progress_box.hpp"
+#include <functional>
+#include <switch.h>
+
+namespace sphaira::thread {
+
+using ReadCallback = std::function<Result(void* data, s64 off, s64 size, u64* bytes_read)>;
+using WriteCallback = std::function<Result(const void* data, s64 off, s64 size)>;
+
+// used for pull api
+using PullCallback = std::function<Result(void* data, s64 size, u64* bytes_read)>;
+using StartThreadCallback = std::function<Result(void)>;
+
+// called when threads are started.
+// call pull() to receive data.
+using StartCallback = std::function<Result(PullCallback pull)>;
+
+// same as above, but the callee must call start() in order to start threads.
+// this is for convenience as there may be race conditions otherwise, such as the read thread
+// trying to read from the pull callback before it is set.
+using StartCallback2 = std::function<Result(StartThreadCallback start, PullCallback pull)>;
+
+// reads data from rfunc into wfunc.
+Result Transfer(ui::ProgressBox* pbox, s64 size, ReadCallback rfunc, WriteCallback wfunc);
+
+// reads data from rfunc, pull data from provided pull() callback.
+Result TransferPull(ui::ProgressBox* pbox, s64 size, ReadCallback rfunc, StartCallback sfunc);
+Result TransferPull(ui::ProgressBox* pbox, s64 size, ReadCallback rfunc, StartCallback2 sfunc);
+
+} // namespace sphaira::thread
--- a/sphaira/include/ui/error_box.hpp
+++ b/sphaira/include/ui/error_box.hpp
@@ -8,16 +8,14 @@ namespace sphaira::ui {
 class ErrorBox final : public Widget {
 public:
    ErrorBox(Result code, const std::string& message);
+    ErrorBox(const std::string& message);

    auto Update(Controller* controller, TouchInfo* touch) -> void override;
-    auto OnLayoutChange() -> void override;
    auto Draw(NVGcontext* vg, Theme* theme) -> void override;

 private:
-    Result m_code;
-    std::string m_message;
-    std::string m_module_str;
-    std::string m_description_str;
+    std::optional<Result> m_code{};
+    std::string m_message{};
 };

 } // namespace sphaira::ui
--- a/sphaira/include/ui/list.hpp
+++ b/sphaira/include/ui/list.hpp
@@ -0,0 +1,99 @@
+#pragma once
+
+#include "ui/object.hpp"
+
+namespace sphaira::ui {
+
+struct List final : Object {
+    enum class Layout {
+        HOME,
+        GRID,
+    };
+
+    using Callback = std::function<void(NVGcontext* vg, Theme* theme, Vec4 v, s64 index)>;
+    using TouchCallback = std::function<void(bool touch, s64 index)>;
+
+    List(s64 row, s64 page, const Vec4& pos, const Vec4& v, const Vec2& pad = {});
+
+    void OnUpdate(Controller* controller, TouchInfo* touch, s64 index, s64 count, TouchCallback callback);
+
+    void Draw(NVGcontext* vg, Theme* theme, s64 count, Callback callback) const;
+
+    auto SetScrollBarPos(float x, float y, float h) {
+        m_scrollbar.x = x;
+        m_scrollbar.y = y;
+        m_scrollbar.h = h;
+    }
+
+    auto ScrollDown(s64& index, s64 step, s64 count) -> bool;
+    auto ScrollUp(s64& index, s64 step, s64 count) -> bool;
+
+    auto GetYoff() const {
+        return m_yoff;
+    }
+
+    void SetYoff(float y = 0) {
+        m_yoff = y;
+    }
+
+    auto GetMaxY() const {
+        return m_v.h + m_pad.y;
+    }
+
+    auto GetMaxX() const {
+        return m_v.w + m_pad.x;
+    }
+
+    auto GetLayout() const {
+        return m_layout;
+    }
+
+    void SetLayout(Layout layout) {
+        m_layout = layout;
+    }
+
+    auto GetRow() const {
+        return m_row;
+    }
+
+    auto GetPage() const {
+        return m_page;
+    }
+
+    auto SetPageJump(bool enable) {
+        m_page_jump = enable;
+    }
+
+    auto GetPageJump() const {
+        return m_page_jump;
+    }
+
+private:
+    auto Draw(NVGcontext* vg, Theme* theme) -> void override {}
+    auto ClampX(float x, s64 count) const -> float;
+    auto ClampY(float y, s64 count) const -> float;
+
+    void OnUpdateHome(Controller* controller, TouchInfo* touch, s64 index, s64 count, TouchCallback callback);
+    void OnUpdateGrid(Controller* controller, TouchInfo* touch, s64 index, s64 count, TouchCallback callback);
+    void DrawHome(NVGcontext* vg, Theme* theme, s64 count, Callback callback) const;
+    void DrawGrid(NVGcontext* vg, Theme* theme, s64 count, Callback callback) const;
+
+private:
+    const s64 m_row;
+    const s64 m_page;
+
+    Vec4 m_v{};
+    Vec2 m_pad{};
+
+    Vec4 m_scrollbar{};
+
+    // current y offset.
+    float m_yoff{};
+    // in progress y offset, used when scrolling.
+    float m_y_prog{};
+
+    Layout m_layout{Layout::GRID};
+    bool m_page_jump{true};
+};
+
+} // namespace sphaira::ui
--- a/sphaira/include/ui/menus/appstore.hpp
+++ b/sphaira/include/ui/menus/appstore.hpp
@@ -1,9 +1,11 @@
 #pragma once

-#include "ui/menus/menu_base.hpp"
+#include "ui/menus/grid_menu_base.hpp"
 #include "ui/scrollable_text.hpp"
-#include "nro.hpp"
+#include "ui/scrolling_text.hpp"
+#include "ui/list.hpp"
 #include "fs.hpp"
+#include "option.hpp"
 #include <span>

 namespace sphaira::ui::menu::appstore {
@@ -27,6 +29,8 @@ struct LazyImage {
    ~LazyImage();
    int image{};
    int w{}, h{};
+    bool tried_cache{};
+    bool cached{};
    ImageDownloadState state{ImageDownloadState::None};
    u8 first_pixel[4]{};
 };
@@ -39,26 +43,26 @@ enum class EntryStatus {
 };

 struct Entry {
-    std::string category; // todo: lable
-    std::string binary; // optional, only valid for .nro
-    std::string updated; // date of update
-    std::string name;
-    std::string license; // optional
-    std::string title; // same as name but with spaces
-    std::string url; // url of repo (optional?)
-    std::string description;
-    std::string author;
-    std::string changelog; // optional
-    u64 screens; // number of screenshots
-    u64 extracted; // extracted size in KiB
-    std::string version;
-    u64 filesize; // compressed size in KiB
-    std::string details;
-    u64 app_dls;
-    std::string md5; // md5 of the zip
+    std::string category{}; // todo: lable
+    std::string binary{}; // optional, only valid for .nro
+    std::string updated{}; // date of update
+    std::string name{};
+    std::string license{}; // optional
+    std::string title{}; // same as name but with spaces
+    std::string url{}; // url of repo (optional?)
+    std::string description{};
+    std::string author{};
+    std::string changelog{}; // optional
+    u64 screens{}; // number of screenshots
+    u64 extracted{}; // extracted size in KiB
+    std::string version{};
+    u64 filesize{}; // compressed size in KiB
+    std::string details{};
+    u64 app_dls{};
+    std::string md5{}; // md5 of the zip

-    LazyImage image;
-    u32 updated_num;
+    LazyImage image{};
+    u32 updated_num{};
    EntryStatus status{EntryStatus::Get};
 };

@@ -70,12 +74,13 @@ struct EntryMenu final : MenuBase {
    EntryMenu(Entry& entry, const LazyImage& default_icon, Menu& menu);
    ~EntryMenu();

+    auto GetShortTitle() const -> const char* override { return "Entry"; };
    void Update(Controller* controller, TouchInfo* touch) override;
    void Draw(NVGcontext* vg, Theme* theme) override;
    // void OnFocusGained() override;

    void ShowChangelogAction();
-    void SetIndex(std::size_t index);
+    void SetIndex(s64 index);

    void UpdateOptions();

@@ -95,14 +100,14 @@ private:
    const LazyImage& m_default_icon;
    Menu& m_menu;

-    std::size_t m_index{}; // where i am in the array
-    std::vector<Option> m_options;
-    LazyImage m_banner;
-    std::vector<LazyImage> m_screens;
+    s64 m_index{}; // where i am in the array
+    std::vector<Option> m_options{};
+    LazyImage m_banner{};
+    std::unique_ptr<List> m_list{};

-    std::shared_ptr<ScrollableText> m_details;
-    std::shared_ptr<ScrollableText> m_changelog;
-    std::shared_ptr<ScrollableText> m_detail_changelog;
+    std::shared_ptr<ScrollableText> m_details{};
+    std::shared_ptr<ScrollableText> m_changelog{};
+    std::shared_ptr<ScrollableText> m_detail_changelog{};

    bool m_show_changlog{};
 };
@@ -127,60 +132,29 @@ enum SortType {
 };

 enum OrderType {
-    OrderType_Decending,
+    OrderType_Descending,
    OrderType_Ascending,
 };

-struct FeedbackEntry {
-    u32 id;
-    u64 time;
-    std::string package; // name of package
-    std::string content; // the feedback message that was sent
-    std::string reply; // the reply, "" if no reply yet :)
-};
+using LayoutType = grid::LayoutType;

-struct FeedbackMenu final : MenuBase {
-    FeedbackMenu(const std::vector<Entry>& package_entries, LazyImage& default_image);
-    ~FeedbackMenu();
-
-    void Update(Controller* controller, TouchInfo* touch) override;
-    void Draw(NVGcontext* vg, Theme* theme) override;
-    void OnFocusGained() override;
-
-    void SetIndex(std::size_t index);
-    void ScanHomebrew();
-    void Sort();
-
-private:
-    const std::vector<Entry>& m_package_entries;
-    LazyImage& m_default_image;
-    std::vector<FeedbackEntry> m_entries;
-    std::size_t m_start{};
-    std::size_t m_index{}; // where i am in the array
-    ImageDownloadState m_repo_download_state{ImageDownloadState::None};
-};
-
-struct Menu final : MenuBase {
-    Menu(const std::vector<NroEntry>& nro_entries);
+struct Menu final : grid::Menu {
+    Menu(u32 flags);
    ~Menu();

+    auto GetShortTitle() const -> const char* override { return "Store"; };
    void Update(Controller* controller, TouchInfo* touch) override;
    void Draw(NVGcontext* vg, Theme* theme) override;
    void OnFocusGained() override;

-    void SetIndex(std::size_t index);
-    void ScanHomebrew();
-    void Sort();
-
-    void SetFilter(Filter filter);
-    void SetSort(SortType sort);
-    void SetOrder(OrderType order);
-
-    void SetSearch(const std::string& term);
    void SetAuthor();

+    auto GetEntry(s64 i) -> Entry& {
+        return m_entries[m_entries_current[i]];
+    }
+
    auto GetEntry() -> Entry& {
-        return m_entries[m_entries_current[m_index]];
+        return GetEntry(m_index);
    }

    auto SetDirty() {
@@ -188,30 +162,41 @@ struct Menu final : MenuBase {
    }

 private:
-    const std::vector<NroEntry>& m_nro_entries;
-    std::vector<Entry> m_entries;
-    std::vector<EntryMini> m_entries_index[Filter_MAX];
-    std::vector<EntryMini> m_entries_index_author;
-    std::vector<EntryMini> m_entries_index_search;
-    std::span<EntryMini> m_entries_current;
+    void SetIndex(s64 index);
+    void ScanHomebrew();
+    void Sort();
+    void SortAndFindLastFile();
+    void SetFilter();
+    void SetSearch(const std::string& term);
+    void OnLayoutChange();

-    Filter m_filter{Filter::Filter_All};
-    SortType m_sort{SortType::SortType_Updated};
-    OrderType m_order{OrderType::OrderType_Decending};
+private:
+    static constexpr inline const char* INI_SECTION = "appstore";

-    std::size_t m_start{};
-    std::size_t m_index{}; // where i am in the array
-    LazyImage m_default_image;
-    LazyImage m_update;
-    LazyImage m_get;
-    LazyImage m_local;
-    LazyImage m_installed;
+    std::vector<Entry> m_entries{};
+    std::vector<EntryMini> m_entries_index[Filter_MAX]{};
+    std::vector<EntryMini> m_entries_index_author{};
+    std::vector<EntryMini> m_entries_index_search{};
+    std::span<EntryMini> m_entries_current{};
+
+    option::OptionLong m_filter{INI_SECTION, "filter", Filter::Filter_All};
+    option::OptionLong m_sort{INI_SECTION, "sort", SortType::SortType_Updated};
+    option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Descending};
+    option::OptionLong m_layout{INI_SECTION, "layout", LayoutType::LayoutType_GridDetail};
+
+    s64 m_index{}; // where i am in the array
+    LazyImage m_default_image{};
+    LazyImage m_update{};
+    LazyImage m_get{};
+    LazyImage m_local{};
+    LazyImage m_installed{};
    ImageDownloadState m_repo_download_state{ImageDownloadState::None};
+    std::unique_ptr<List> m_list{};

-    std::string m_search_term;
-    std::string m_author_term;
-    u64 m_entry_search_jump_back{};
-    u64 m_entry_author_jump_back{};
+    std::string m_search_term{};
+    std::string m_author_term{};
+    s64 m_entry_search_jump_back{};
+    s64 m_entry_author_jump_back{};
    bool m_is_search{};
    bool m_is_author{};
    bool m_dirty{}; // if set, does a sort
--- a/sphaira/include/ui/menus/file_viewer.hpp
+++ b/sphaira/include/ui/menus/file_viewer.hpp
@@ -8,23 +8,23 @@ namespace sphaira::ui::menu::fileview {

 struct Menu final : MenuBase {
    Menu(const fs::FsPath& path);
-    ~Menu();

+    auto GetShortTitle() const -> const char* override { return "File"; };
    void Update(Controller* controller, TouchInfo* touch) override;
    void Draw(NVGcontext* vg, Theme* theme) override;
    void OnFocusGained() override;

 private:
    const fs::FsPath m_path;
-    fs::FsNativeSd m_fs;
-    FsFile m_file;
+    fs::FsNativeSd m_fs{};
+    fs::File m_file{};
    s64 m_file_size{};
    s64 m_file_offset{};

-    std::unique_ptr<ScrollableText> m_scroll_text;
+    std::unique_ptr<ScrollableText> m_scroll_text{};

-    std::size_t m_start{};
-    std::size_t m_index{}; // where i am in the array
+    s64 m_start{};
+    s64 m_index{}; // where i am in the array
 };

 } // namespace sphaira::ui::menu::fileview
--- a/sphaira/include/ui/menus/filebrowser.hpp
+++ b/sphaira/include/ui/menus/filebrowser.hpp
@@ -1,14 +1,31 @@
 #pragma once

 #include "ui/menus/menu_base.hpp"
-#include "nro.hpp"
+#include "ui/scrolling_text.hpp"
+#include "ui/list.hpp"
 #include "fs.hpp"
 #include "option.hpp"
+#include "hasher.hpp"
 // #include <optional>
 #include <span>

 namespace sphaira::ui::menu::filebrowser {

+enum FsEntryFlag {
+    FsEntryFlag_None,
+    // write protected.
+    FsEntryFlag_ReadOnly = 1 << 0,
+    // supports file assoc.
+    FsEntryFlag_Assoc = 1 << 1,
+};
+
+enum class FsType {
+    Sd,
+    ImageNand,
+    ImageSd,
+    Stdio,
+};
+
 enum class SelectedType {
    None,
    Copy,
@@ -16,16 +33,40 @@ enum class SelectedType {
    Delete,
 };

+enum class ViewSide {
+    Left,
+    Right,
+};
+
 enum SortType {
    SortType_Size,
    SortType_Alphabetical,
 };

 enum OrderType {
-    OrderType_Decending,
+    OrderType_Descending,
    OrderType_Ascending,
 };

+struct FsEntry {
+    fs::FsPath name{};
+    fs::FsPath root{};
+    FsType type{};
+    u32 flags{FsEntryFlag_None};
+
+    auto IsReadOnly() const -> bool {
+        return flags & FsEntryFlag_ReadOnly;
+    }
+
+    auto IsAssoc() const -> bool {
+        return flags & FsEntryFlag_Assoc;
+    }
+
+    auto IsSame(const FsEntry& e) const {
+        return root == e.root && type == e.type;
+    }
+};
+
 // roughly 1kib in size per entry
 struct FileEntry : FsDirectoryEntry {
    std::string extension{}; // if any
@@ -79,20 +120,48 @@ struct FileEntry : FsDirectoryEntry {

 struct FileAssocEntry {
    fs::FsPath path{}; // ini name
-    std::string name; // ini name
-    std::vector<std::string> ext; // list of ext
-    std::vector<std::string> database; // list of systems
-};
-struct LastFile {
-    fs::FsPath name;
-    u64 index;
-    u64 offset;
-    u64 entries_count;
+    std::string name{}; // ini name
+    std::vector<std::string> ext{}; // list of ext
+    std::vector<std::string> database{}; // list of systems
+    bool use_base_name{}; // if set, uses base name (rom.zip) otherwise uses internal name (rom.gba)
+
+    auto IsExtension(std::string_view extension, std::string_view internal_extension) const -> bool {
+        for (const auto& assoc_ext : ext) {
+            if (extension.length() == assoc_ext.length() && !strncasecmp(assoc_ext.data(), extension.data(), assoc_ext.length())) {
+                return true;
+            }
+            if (internal_extension.length() == assoc_ext.length() && !strncasecmp(assoc_ext.data(), internal_extension.data(), assoc_ext.length())) {
+                return true;
+            }
+        }
+        return false;
+    }
 };

-struct Menu final : MenuBase {
-    Menu(const std::vector<NroEntry>& nro_entries);
-    ~Menu();
+struct LastFile {
+    fs::FsPath name{};
+    s64 index{};
+    float offset{};
+    s64 entries_count{};
+};
+
+struct FsDirCollection {
+    fs::FsPath path{};
+    fs::FsPath parent_name{};
+    std::vector<FsDirectoryEntry> files{};
+    std::vector<FsDirectoryEntry> dirs{};
+};
+
+using FsDirCollections = std::vector<FsDirCollection>;
+
+struct Menu;
+
+struct FsView final : Widget {
+    friend class Menu;
+
+    FsView(Menu* menu, ViewSide side);
+    FsView(Menu* menu, const fs::FsPath& path, const FsEntry& entry, ViewSide side);
+    ~FsView();

    void Update(Controller* controller, TouchInfo* touch) override;
    void Draw(NVGcontext* vg, Theme* theme) override;
@@ -102,20 +171,32 @@ struct Menu final : MenuBase {
        return fs::AppendPath(root_path, file_path);
    }

-private:
-    void SetIndex(std::size_t index);
-    void InstallForwarder();
-    auto Scan(const fs::FsPath& new_path, bool is_walk_up = false) -> Result;
+    auto GetFs() {
+        return m_fs.get();
+    }

-    void LoadAssocEntriesPath(const fs::FsPath& path);
-    void LoadAssocEntries();
-    auto FindFileAssocFor() -> std::vector<FileAssocEntry>;
+    auto& GetFsEntry() const {
+        return m_fs_entry;
+    }
+
+    void SetSide(ViewSide side);
+
+private:
+    void SetIndex(s64 index);
+    void InstallForwarder();
+
+    void InstallFiles();
+    void UnzipFiles(fs::FsPath folder);
+    void ZipFiles(fs::FsPath zip_path);
+    void UploadFiles();
+
+    auto Scan(const fs::FsPath& new_path, bool is_walk_up = false) -> Result;

    auto GetNewPath(const FileEntry& entry) const -> fs::FsPath {
        return GetNewPath(m_path, entry.name);
    }

-    auto GetNewPath(u64 index) const -> fs::FsPath {
+    auto GetNewPath(s64 index) const -> fs::FsPath {
        return GetNewPath(m_path, GetEntry(index).name);
    }

@@ -124,61 +205,21 @@ private:
    }

    auto GetSelectedEntries() const -> std::vector<FileEntry> {
-        if (!m_selected_count) {
-            return {};
-        }
-
        std::vector<FileEntry> out;

-        for (auto&e : m_entries) {
-            if (e.IsSelected()) {
-                out.emplace_back(e);
+        if (!m_selected_count) {
+            out.emplace_back(GetEntry());
+        } else {
+            for (auto&e : m_entries) {
+                if (e.IsSelected()) {
+                    out.emplace_back(e);
+                }
            }
        }

        return out;
    }

-    void AddSelectedEntries(SelectedType type) {
-        auto entries = GetSelectedEntries();
-        if (entries.empty()) {
-            // log_write("%s with no selected files\n", __PRETTY_FUNCTION__);
-            return;
-        }
-
-        m_selected_type = type;
-        m_selected_files = entries;
-        m_selected_path = m_path;
-    }
-
-    void AddCurrentFileToSelection(SelectedType type) {
-        m_selected_files.emplace_back(GetEntry());
-        m_selected_count++;
-        m_selected_type = type;
-        m_selected_path = m_path;
-    }
-
-    void ResetSelection() {
-        m_selected_files.clear();
-        m_selected_count = 0;
-        m_selected_type = SelectedType::None;
-        m_selected_path = {};
-    }
-
-    auto HasTypeInSelectedEntries(FsDirEntryType type) const -> bool {
-        if (!m_selected_count) {
-            return GetEntry().type == type;
-        } else {
-            for (auto&p : m_selected_files) {
-                if (p.type == type) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-
    auto GetEntry(u32 index) -> FileEntry& {
        return m_entries[m_entries_current[index]];
    }
@@ -195,57 +236,180 @@ private:
        return GetEntry(m_index);
    }

+    auto IsSd() const -> bool {
+        return m_fs_entry.type == FsType::Sd;
+    }
+
    void Sort();
    void SortAndFindLastFile();
    void SetIndexFromLastFile(const LastFile& last_file);
-    void UpdateSubheading();

    void OnDeleteCallback();
    void OnPasteCallback();
    void OnRenameCallback();
+    auto CheckIfUpdateFolder() -> Result;
+
+    static auto get_collection(fs::Fs* fs, const fs::FsPath& path, const fs::FsPath& parent_name, FsDirCollection& out, bool inc_file, bool inc_dir, bool inc_size) -> Result;
+    static auto get_collections(fs::Fs* fs, const fs::FsPath& path, const fs::FsPath& parent_name, FsDirCollections& out, bool inc_size = false) -> Result;
+
+    auto get_collection(const fs::FsPath& path, const fs::FsPath& parent_name, FsDirCollection& out, bool inc_file, bool inc_dir, bool inc_size) -> Result;
+    auto get_collections(const fs::FsPath& path, const fs::FsPath& parent_name, FsDirCollections& out, bool inc_size = false) -> Result;
+
+    void SetFs(const fs::FsPath& new_path, const FsEntry& new_entry);
+
+    auto GetNative() -> fs::FsNative* {
+        return (fs::FsNative*)m_fs.get();
+    }
+
+    void DisplayHash(hash::Type type);
+
+    void DisplayOptions();
+    void DisplayAdvancedOptions();

 private:
-    static constexpr inline const char* INI_SECTION = "filebrowser";
+    Menu* m_menu{};
+    ViewSide m_side{};

-    const std::vector<NroEntry>& m_nro_entries;
-    fs::FsPath m_path;
-    std::vector<FileEntry> m_entries;
-    std::vector<u32> m_entries_index; // files not including hidden
-    std::vector<u32> m_entries_index_hidden; // includes hidden files
-    std::vector<u32> m_entries_index_search; // files found via search
-    std::span<u32> m_entries_current;
+    std::unique_ptr<fs::Fs> m_fs{};
+    FsEntry m_fs_entry{};
+    fs::FsPath m_path{};
+    std::vector<FileEntry> m_entries{};
+    std::vector<u32> m_entries_index{}; // files not including hidden
+    std::vector<u32> m_entries_index_hidden{}; // includes hidden files
+    std::vector<u32> m_entries_index_search{}; // files found via search
+    std::span<u32> m_entries_current{};

-    // search options
-    // show files [X]
-    // show folders [X]
-    // recursive (slow) [ ]
-
-    std::vector<FileAssocEntry> m_assoc_entries;
-    std::vector<FileEntry> m_selected_files;
+    std::unique_ptr<List> m_list{};
+    std::optional<fs::FsPath> m_daybreak_path{};

    // this keeps track of the highlighted file before opening a folder
    // if the user presses B to go back to the previous dir
    // this vector is popped, then, that entry is checked if it still exists
    // if it does, the index becomes that file.
-    std::vector<LastFile> m_previous_highlighted_file;
-    fs::FsPath m_selected_path;
-    std::size_t m_index{};
-    std::size_t m_index_offset{};
-    std::size_t m_selected_count{};
-    SelectedType m_selected_type{SelectedType::None};
+    std::vector<LastFile> m_previous_highlighted_file{};
+    s64 m_index{};
+    s64 m_selected_count{};
+    ScrollingText m_scroll_name{};

-    option::OptionLong m_sort{INI_SECTION, "sort", SortType::SortType_Alphabetical};
-    option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Decending};
-    option::OptionBool m_show_hidden{INI_SECTION, "show_hidden", false};
-    option::OptionBool m_folders_first{INI_SECTION, "folders_first", true};
-    option::OptionBool m_hidden_last{INI_SECTION, "hidden_last", false};
-
-    option::OptionBool m_search_show_files{INI_SECTION, "search_show_files", true};
-    option::OptionBool m_search_show_folders{INI_SECTION, "search_show_folders", true};
-    option::OptionBool m_search_recursive{INI_SECTION, "search_recursive", false};
-
-    bool m_loaded_assoc_entries{};
    bool m_is_update_folder{};
 };

+// contains all selected files for a command, such as copy, delete, cut etc.
+struct SelectedStash {
+    void Add(std::shared_ptr<FsView> view, SelectedType type, const std::vector<FileEntry>& files, const fs::FsPath& path) {
+        if (files.empty()) {
+            Reset();
+        } else {
+            m_view = view;
+            m_type = type;
+            m_files = files;
+            m_path = path;
+        }
+    }
+
+    auto SameFs(FsView* view) -> bool {
+        if (m_view && view->GetFsEntry().IsSame(m_view->GetFsEntry())) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    auto Type() const -> SelectedType {
+        return m_type;
+    }
+
+    auto Empty() const -> bool {
+        return m_files.empty();
+    }
+
+    void Reset() {
+        m_view = {};
+        m_type = {};
+        m_files = {};
+        m_path = {};
+    }
+
+// private:
+    std::shared_ptr<FsView> m_view{};
+    std::vector<FileEntry> m_files{};
+    fs::FsPath m_path{};
+    SelectedType m_type{SelectedType::None};
+};
+
+struct Menu final : MenuBase {
+    friend class FsView;
+
+    Menu(u32 flags);
+    ~Menu();
+
+    auto GetShortTitle() const -> const char* override { return "Files"; };
+    void Update(Controller* controller, TouchInfo* touch) override;
+    void Draw(NVGcontext* vg, Theme* theme) override;
+    void OnFocusGained() override;
+
+    static auto GetNewPath(const fs::FsPath& root_path, const fs::FsPath& file_path) -> fs::FsPath {
+        return fs::AppendPath(root_path, file_path);
+    }
+
+private:
+    auto IsSplitScreen() const {
+        return m_split_screen;
+    }
+
+    void SetSplitScreen(bool enable);
+
+    void RefreshViews();
+
+    void LoadAssocEntriesPath(const fs::FsPath& path);
+    void LoadAssocEntries();
+    auto FindFileAssocFor() -> std::vector<FileAssocEntry>;
+
+    void AddSelectedEntries(SelectedType type) {
+        auto entries = view->GetSelectedEntries();
+        if (entries.empty()) {
+            return;
+        }
+
+        m_selected.Add(view, type, entries, view->m_path);
+    }
+
+    void ResetSelection() {
+        m_selected.Reset();
+    }
+
+    void UpdateSubheading();
+
+    void PromptIfShouldExit();
+
+private:
+    static constexpr inline const char* INI_SECTION = "filebrowser";
+
+    std::shared_ptr<FsView> view{};
+    std::shared_ptr<FsView> view_left{};
+    std::shared_ptr<FsView> view_right{};
+
+    std::vector<FileAssocEntry> m_assoc_entries{};
+    SelectedStash m_selected{};
+
+    // this keeps track of the highlighted file before opening a folder
+    // if the user presses B to go back to the previous dir
+    // this vector is popped, then, that entry is checked if it still exists
+    // if it does, the index becomes that file.
+    std::vector<LastFile> m_previous_highlighted_file{};
+    s64 m_index{};
+    s64 m_selected_count{};
+
+    option::OptionLong m_sort{INI_SECTION, "sort", SortType::SortType_Alphabetical};
+    option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Descending};
+    option::OptionBool m_show_hidden{INI_SECTION, "show_hidden", false};
+    option::OptionBool m_folders_first{INI_SECTION, "folders_first", true};
+    option::OptionBool m_hidden_last{INI_SECTION, "hidden_last", false};
+    option::OptionBool m_ignore_read_only{INI_SECTION, "ignore_read_only", false};
+
+    bool m_loaded_assoc_entries{};
+    bool m_is_update_folder{};
+    bool m_split_screen{};
+};
+
 } // namespace sphaira::ui::menu::filebrowser
--- a/sphaira/include/ui/menus/ftp_menu.hpp
+++ b/sphaira/include/ui/menus/ftp_menu.hpp
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "ui/menus/menu_base.hpp"
+#include "yati/source/stream.hpp"
+
+namespace sphaira::ui::menu::ftp {
+
+enum class State {
+    // not connected.
+    None,
+    // just connected, starts the transfer.
+    Connected,
+    // set whilst transfer is in progress.
+    Progress,
+    // set when the transfer is finished.
+    Done,
+    // failed to connect.
+    Failed,
+};
+
+struct StreamFtp final : yati::source::Stream {
+    StreamFtp(const fs::FsPath& path, std::stop_token token);
+
+    Result ReadChunk(void* buf, s64 size, u64* bytes_read) override;
+    bool Push(const void* buf, s64 size);
+    void Disable();
+
+// private:
+    fs::FsPath m_path{};
+    std::stop_token m_token{};
+    std::vector<u8> m_buffer{};
+    Mutex m_mutex{};
+    bool m_active{};
+    // bool m_push_exit{};
+};
+
+struct Menu final : MenuBase {
+    Menu(u32 flags);
+    ~Menu();
+
+    auto GetShortTitle() const -> const char* override { return "FTP"; };
+    void Update(Controller* controller, TouchInfo* touch) override;
+    void Draw(NVGcontext* vg, Theme* theme) override;
+    void OnFocusGained() override;
+
+// this should be private
+// private:
+    std::shared_ptr<StreamFtp> m_source{};
+    Thread m_thread{};
+    Mutex m_mutex{};
+    // the below are shared across threads, lock with the above mutex!
+    State m_state{State::None};
+
+    const char* m_user{};
+    const char* m_pass{};
+    unsigned m_port{};
+    bool m_anon{};
+    bool m_was_ftp_enabled{};
+};
+
+} // namespace sphaira::ui::menu::ftp
--- a/sphaira/include/ui/menus/game_menu.hpp
+++ b/sphaira/include/ui/menus/game_menu.hpp
@@ -0,0 +1,153 @@
+#pragma once
+
+#include "ui/menus/grid_menu_base.hpp"
+#include "ui/list.hpp"
+#include "fs.hpp"
+#include "option.hpp"
+#include <memory>
+#include <vector>
+
+namespace sphaira::ui::menu::game {
+
+enum class NacpLoadStatus {
+    // not yet attempted to be loaded.
+    None,
+    // started loading.
+    Progress,
+    // loaded, ready to parse.
+    Loaded,
+    // failed to load, do not attempt to load again!
+    Error,
+};
+
+struct Entry {
+    u64 app_id{};
+    char display_version[0x10]{};
+    NacpLanguageEntry lang{};
+    int image{};
+    bool selected{};
+
+    std::shared_ptr<NsApplicationControlData> control{};
+    u64 control_size{};
+    NacpLoadStatus status{NacpLoadStatus::None};
+
+    auto GetName() const -> const char* {
+        return lang.name;
+    }
+
+    auto GetAuthor() const -> const char* {
+        return lang.author;
+    }
+
+    auto GetDisplayVersion() const -> const char* {
+        return display_version;
+    }
+};
+
+struct ThreadResultData {
+    u64 id{};
+    std::shared_ptr<NsApplicationControlData> control{};
+    u64 control_size{};
+    char display_version[0x10]{};
+    NacpLanguageEntry lang{};
+    NacpLoadStatus status{NacpLoadStatus::None};
+};
+
+struct ThreadData {
+    ThreadData();
+
+    auto IsRunning() const -> bool;
+    void Run();
+    void Close();
+    void Push(u64 id);
+    void Push(std::span<const Entry> entries);
+    void Pop(std::vector<ThreadResultData>& out);
+
+private:
+    UEvent m_uevent{};
+    Mutex m_mutex_id{};
+    Mutex m_mutex_result{};
+
+    // app_ids pushed to the queue, signal uevent when pushed.
+    std::vector<u64> m_ids{};
+    // control data pushed to the queue.
+    std::vector<ThreadResultData> m_result{};
+
+    std::atomic_bool m_running{};
+};
+
+enum SortType {
+    SortType_Updated,
+};
+
+enum OrderType {
+    OrderType_Descending,
+    OrderType_Ascending,
+};
+
+using LayoutType = grid::LayoutType;
+
+struct Menu final : grid::Menu {
+    Menu(u32 flags);
+    ~Menu();
+
+    auto GetShortTitle() const -> const char* override { return "Games"; };
+    void Update(Controller* controller, TouchInfo* touch) override;
+    void Draw(NVGcontext* vg, Theme* theme) override;
+    void OnFocusGained() override;
+
+private:
+    void SetIndex(s64 index);
+    void ScanHomebrew();
+    void Sort();
+    void SortAndFindLastFile(bool scan);
+    void FreeEntries();
+    void OnLayoutChange();
+
+    auto GetSelectedEntries() const {
+        std::vector<Entry> out;
+        for (auto& e : m_entries) {
+            if (e.selected) {
+                out.emplace_back(e);
+            }
+        }
+
+        if (!m_entries.empty() && out.empty()) {
+            out.emplace_back(m_entries[m_index]);
+        }
+
+        return out;
+    }
+
+    void ClearSelection() {
+        for (auto& e : m_entries) {
+            e.selected = false;
+        }
+
+        m_selected_count = 0;
+    }
+
+    void DeleteGames();
+    void DumpGames(u32 flags);
+
+private:
+    static constexpr inline const char* INI_SECTION = "games";
+    static constexpr inline const char* INI_SECTION_DUMP = "dump";
+
+    std::vector<Entry> m_entries{};
+    s64 m_index{}; // where i am in the array
+    s64 m_selected_count{};
+    std::unique_ptr<List> m_list{};
+    bool m_is_reversed{};
+    bool m_dirty{};
+
+    ThreadData m_thread_data{};
+    Thread m_thread{};
+
+    option::OptionLong m_sort{INI_SECTION, "sort", SortType::SortType_Updated};
+    option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Descending};
+    option::OptionLong m_layout{INI_SECTION, "layout", LayoutType::LayoutType_GridDetail};
+    option::OptionBool m_hide_forwarders{INI_SECTION, "hide_forwarders", false};
+};
+
+} // namespace sphaira::ui::menu::game
--- a/sphaira/include/ui/menus/gc_menu.hpp
+++ b/sphaira/include/ui/menus/gc_menu.hpp
@@ -0,0 +1,245 @@
+#pragma once
+
+#include "ui/menus/menu_base.hpp"
+#include "yati/container/base.hpp"
+#include "yati/source/base.hpp"
+#include "ui/list.hpp"
+#include <span>
+#include <memory>
+
+namespace sphaira::ui::menu::gc {
+
+typedef enum {
+    FsGameCardPartitionRaw_None   = -1,
+    FsGameCardPartitionRaw_Normal = 0,
+    FsGameCardPartitionRaw_Secure = 1,
+} FsGameCardPartitionRaw;
+
+////////////////////////////////////////////////
+// The below structs are taken from nxdumptool./
+////////////////////////////////////////////////
+
+/// Located at offset 0x7000 in the gamecard image.
+typedef struct {
+    u8 signature[0x100];        ///< RSA-2048-PKCS#1 v1.5 with SHA-256 signature over the rest of the data.
+    u32 magic;                  ///< "CERT".
+    u32 version;
+    u8 kek_index;
+    u8 reserved[0x7];
+    u8 t1_card_device_id[0x10];
+    u8 iv[0x10];
+    u8 hw_key[0x10];            ///< Encrypted.
+    u8 data[0xC0];              ///< Encrypted.
+} FsGameCardCertificate;
+
+static_assert(sizeof(FsGameCardCertificate) == 0x200);
+
+typedef struct {
+    u8 maker_code;      ///< FsCardId1MakerCode.
+    u8 memory_capacity; ///< Matches GameCardRomSize.
+    u8 reserved;        ///< Known values: 0x00, 0x01, 0x02, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0C, 0x0D, 0x0E, 0x80.
+    u8 memory_type;     ///< FsCardId1MemoryType.
+} FsCardId1;
+
+static_assert(sizeof(FsCardId1) == 0x4);
+
+typedef struct {
+    u8 card_security_number;    ///< FsCardId2CardSecurityNumber.
+    u8 card_type;               ///< FsCardId2CardType.
+    u8 reserved[0x2];           ///< Usually filled with zeroes.
+} FsCardId2;
+
+static_assert(sizeof(FsCardId2) == 0x4);
+
+typedef struct {
+    u8 reserved[0x4];   ///< Usually filled with zeroes.
+} FsCardId3;
+
+static_assert(sizeof(FsCardId3) == 0x4);
+
+/// Returned by fsDeviceOperatorGetGameCardIdSet.
+typedef struct {
+    FsCardId1 id1;  ///< Specifies maker code, memory capacity and memory type.
+    FsCardId2 id2;  ///< Specifies card security number and card type.
+    FsCardId3 id3;  ///< Always zero (so far).
+} FsGameCardIdSet;
+
+/// Encrypted using AES-128-ECB with the common titlekek generator key (stored in the .rodata segment from the Lotus firmware).
+typedef struct {
+    union {
+        u8 value[0x10];
+        struct {
+            u8 package_id[0x8]; ///< Matches package_id from GameCardHeader.
+            u8 reserved[0x8];   ///< Just zeroes.
+        };
+    };
+} GameCardKeySource;
+
+static_assert(sizeof(GameCardKeySource) == 0x10);
+
+/// Plaintext area. Dumped from FS program memory.
+typedef struct {
+    GameCardKeySource key_source;
+    u8 encrypted_titlekey[0x10];    ///< Encrypted using AES-128-CCM with the decrypted key_source and the nonce from this section.
+    u8 mac[0x10];                   ///< Used to verify the validity of the decrypted titlekey.
+    u8 nonce[0xC];                  ///< Used as the IV to decrypt encrypted_titlekey using AES-128-CCM.
+    u8 reserved[0x1C4];
+} GameCardInitialData;
+
+static_assert(sizeof(GameCardInitialData) == 0x200);
+
+typedef struct {
+    u8 maker_code;              ///< GameCardUidMakerCode.
+    u8 version;                 ///< TODO: determine whether this matches GameCardVersion or not.
+    u8 card_type;               ///< GameCardUidCardType.
+    u8 unique_data[0x9];
+    u32 random;
+    u8 platform_flag;
+    u8 reserved[0xB];
+    FsCardId1 card_id_1_mirror; ///< This field mirrors bit 5 of FsCardId1MemoryType.
+    u8 mac[0x20];
+} GameCardUid;
+
+static_assert(sizeof(GameCardUid) == 0x40);
+
+/// Plaintext area. Dumped from FS program memory.
+/// Overall structure may change with each new LAFW version.
+typedef struct {
+    u32 asic_security_mode; ///< Determines how the Lotus ASIC initialised the gamecard security mode. Usually 0xFFFFFFF9.
+    u32 asic_status;        ///< Bitmask of the internal gamecard interface status. Usually 0x20000000.
+    FsCardId1 card_id1;
+    FsCardId2 card_id2;
+    GameCardUid card_uid;
+    u8 reserved[0x190];
+    u8 mac[0x20];           ///< Changes with each gamecard (re)insertion.
+} GameCardSpecificData;
+
+static_assert(sizeof(GameCardSpecificData) == 0x200);
+
+/// Plaintext area. Dumped from FS program memory.
+/// This struct is returned by Lotus command "ChangeToSecureMode" (0xF). This means it is only available *after* the gamecard secure area has been mounted.
+/// A copy of the gamecard header without the RSA-2048 signature and a plaintext GameCardInfo precedes this struct in FS program memory.
+typedef struct {
+    GameCardSpecificData specific_data;
+    FsGameCardCertificate certificate;
+    u8 reserved[0x200];
+    GameCardInitialData initial_data;
+} GameCardSecurityInformation;
+
+static_assert(sizeof(GameCardSecurityInformation) == 0x800);
+
+///////////////////
+// nxdumptool fin./
+///////////////////
+
+struct GcCollection : yati::container::CollectionEntry {
+    GcCollection(const char* _name, s64 _size, u8 _type, u8 _id_offset) {
+        name = _name;
+        size = _size;
+        type = _type;
+        id_offset = _id_offset;
+    }
+
+    // NcmContentType
+    u8 type{};
+    u8 id_offset{};
+};
+
+using GcCollections = std::vector<GcCollection>;
+
+struct ApplicationEntry {
+    u64 app_id{};
+    u32 version{};
+    u8 key_gen{};
+    std::unique_ptr<NsApplicationControlData> control{};
+    u64 control_size{};
+    NacpLanguageEntry lang_entry{};
+
+    std::vector<GcCollections> application{};
+    std::vector<GcCollections> patch{};
+    std::vector<GcCollections> add_on{};
+    std::vector<GcCollections> data_patch{};
+    yati::container::Collections tickets{};
+
+    auto GetSize() const -> s64;
+    auto GetSize(const std::vector<GcCollections>& entries) const -> s64;
+};
+
+struct Menu final : MenuBase {
+    Menu(u32 flags);
+    ~Menu();
+
+    auto GetShortTitle() const -> const char* override { return "GC"; };
+    void Update(Controller* controller, TouchInfo* touch) override;
+    void Draw(NVGcontext* vg, Theme* theme) override;
+    void OnFocusGained() override;
+
+    Result GcStorageRead(void* buf, s64 off, s64 size);
+
+private:
+    Result GcPoll(bool* inserted);
+    Result GcOnEvent(bool force = false);
+
+    // GameCard FS api.
+    Result GcMount();
+    void GcUnmount();
+
+    // GameCard Storage api
+    Result GcMountStorage();
+    void GcUmountStorage();
+    Result GcMountPartition(FsGameCardPartitionRaw partition);
+    void GcUnmountPartition();
+    Result GcStorageReadInternal(void* buf, s64 off, s64 size, u64* bytes_read);
+
+    // taken from nxdumptool.
+    Result GcGetSecurityInfo(GameCardSecurityInformation& out);
+
+    Result LoadControlData(ApplicationEntry& e);
+    Result UpdateStorageSize();
+    void FreeImage();
+    void OnChangeIndex(s64 new_index);
+    Result DumpGames(u32 flags);
+
+private:
+    FsDeviceOperator m_dev_op{};
+    FsGameCardHandle m_handle{};
+    std::unique_ptr<fs::FsNativeGameCard> m_fs{};
+    FsEventNotifier m_event_notifier{};
+    Event m_event{};
+
+    std::vector<ApplicationEntry> m_entries{};
+    std::unique_ptr<List> m_list{};
+    s64 m_entry_index{};
+    s64 m_option_index{};
+
+    s64 m_size_free_sd{};
+    s64 m_size_total_sd{};
+    s64 m_size_free_nand{};
+    s64 m_size_total_nand{};
+    int m_icon{};
+    bool m_mounted{};
+
+    FsStorage m_storage{};
+    // size of normal partition.
+    s64 m_parition_normal_size{};
+    // size of secure partition.
+    s64 m_parition_secure_size{};
+    // used size reported in the xci header.
+    s64 m_storage_trimmed_size{};
+    // total size of m_parition_normal_size + m_parition_secure_size.
+    s64 m_storage_total_size{};
+    // reported size via rom_size in the xci header.
+    s64 m_storage_full_size{};
+    // found in xci header.
+    u64 m_package_id{};
+    // found in xci header.
+    u8 m_initial_data_hash[SHA256_HASH_SIZE]{};
+    // currently mounted storage partiton.
+    FsGameCardPartitionRaw m_partition{FsGameCardPartitionRaw_None};
+    bool m_storage_mounted{};
+
+    // set when the gc should be re-mounted, cleared when handled.
+    bool m_dirty{};
+};
+
+} // namespace sphaira::ui::menu::gc
--- a/sphaira/include/ui/menus/ghdl.hpp
+++ b/sphaira/include/ui/menus/ghdl.hpp
@@ -0,0 +1,75 @@
+#pragma once
+
+#include "ui/menus/menu_base.hpp"
+#include "ui/list.hpp"
+#include "fs.hpp"
+#include "option.hpp"
+#include <vector>
+#include <string>
+
+namespace sphaira::ui::menu::gh {
+
+struct AssetEntry {
+    std::string name{};
+    std::string path{};
+    std::string pre_install_message{};
+    std::string post_install_message{};
+};
+
+struct Entry {
+    fs::FsPath json_path{};
+    std::string url{};
+    std::string owner{};
+    std::string repo{};
+    std::string tag{};
+    std::string pre_install_message{};
+    std::string post_install_message{};
+    std::vector<AssetEntry> assets{};
+};
+
+struct GhApiAsset {
+    std::string name{};
+    std::string content_type{};
+    u64 size{};
+    u64 download_count{};
+    std::string browser_download_url{};
+};
+
+struct GhApiEntry {
+    std::string tag_name{};
+    std::string name{};
+    std::vector<GhApiAsset> assets{};
+};
+
+struct Menu final : MenuBase {
+    Menu(u32 flags);
+    ~Menu();
+
+    auto GetShortTitle() const -> const char* override { return "GitHub"; };
+    void Update(Controller* controller, TouchInfo* touch) override;
+    void Draw(NVGcontext* vg, Theme* theme) override;
+    void OnFocusGained() override;
+
+private:
+    void SetIndex(s64 index);
+    void Scan();
+    void LoadEntriesFromPath(const fs::FsPath& path);
+
+    auto GetEntry() -> Entry& {
+        return m_entries[m_index];
+    }
+
+    auto GetEntry() const -> const Entry& {
+        return m_entries[m_index];
+    }
+
+    void Sort();
+    void UpdateSubheading();
+
+private:
+    std::vector<Entry> m_entries{};
+    s64 m_index{};
+    std::unique_ptr<List> m_list{};
+};
+
+} // namespace sphaira::ui::menu::gh
--- a/sphaira/include/ui/menus/grid_menu_base.hpp
+++ b/sphaira/include/ui/menus/grid_menu_base.hpp
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "ui/menus/menu_base.hpp"
+#include "ui/scrolling_text.hpp"
+#include "ui/list.hpp"
+#include <string>
+#include <memory>
+
+namespace sphaira::ui::menu::grid {
+
+enum LayoutType {
+    LayoutType_List,
+    LayoutType_Grid,
+    LayoutType_GridDetail,
+};
+
+struct Menu : MenuBase {
+    using MenuBase::MenuBase;
+
+protected:
+    void OnLayoutChange(std::unique_ptr<List>& list, int layout);
+    void DrawEntry(NVGcontext* vg, Theme* theme, int layout, const Vec4& v, bool selected, int image, const char* name, const char* author, const char* version);
+    // same as above but doesn't draw image and returns image dimension.
+    Vec4 DrawEntryNoImage(NVGcontext* vg, Theme* theme, int layout, const Vec4& v, bool selected, const char* name, const char* author, const char* version);
+
+private:
+    Vec4 DrawEntry(NVGcontext* vg, Theme* theme, bool draw_image, int layout, const Vec4& v, bool selected, int image, const char* name, const char* author, const char* version);
+
+private:
+    ScrollingText m_scroll_name{};
+    ScrollingText m_scroll_author{};
+    ScrollingText m_scroll_version{};
+};
+
+} // namespace sphaira::ui::menu::grid
--- a/sphaira/include/ui/menus/homebrew.hpp
+++ b/sphaira/include/ui/menus/homebrew.hpp
@@ -1,6 +1,7 @@
 #pragma once

-#include "ui/menus/menu_base.hpp"
+#include "ui/menus/grid_menu_base.hpp"
+#include "ui/list.hpp"
 #include "nro.hpp"
 #include "fs.hpp"
 #include "option.hpp"
@@ -17,44 +18,53 @@ enum SortType {
 };

 enum OrderType {
-    OrderType_Decending,
+    OrderType_Descending,
    OrderType_Ascending,
 };

-struct Menu final : MenuBase {
+using LayoutType = grid::LayoutType;
+
+auto GetNroEntries() -> std::span<const NroEntry>;
+
+struct Menu final : grid::Menu {
    Menu();
    ~Menu();

+    auto GetShortTitle() const -> const char* override { return "Apps"; };
    void Update(Controller* controller, TouchInfo* touch) override;
    void Draw(NVGcontext* vg, Theme* theme) override;
    void OnFocusGained() override;

-    void SetIndex(std::size_t index);
-    void InstallHomebrew();
-    void ScanHomebrew();
-    void Sort();
-    void SortAndFindLastFile();
-
    auto GetHomebrewList() const -> const std::vector<NroEntry>& {
        return m_entries;
    }

+    static Result InstallHomebrew(const fs::FsPath& path, const std::vector<u8>& icon);
+    static Result InstallHomebrewFromPath(const fs::FsPath& path);
+
+private:
+    void SetIndex(s64 index);
+    void InstallHomebrew();
+    void ScanHomebrew();
+    void Sort();
+    void SortAndFindLastFile();
+    void FreeEntries();
+    void OnLayoutChange();
+
    auto IsStarEnabled() -> bool {
        return m_sort.Get() >= SortType_UpdatedStar;
    }

-    static Result InstallHomebrew(const fs::FsPath& path, const NacpStruct& nacp, const std::vector<u8>& icon);
-    static Result InstallHomebrewFromPath(const fs::FsPath& path);
-
 private:
    static constexpr inline const char* INI_SECTION = "homebrew";

-    std::vector<NroEntry> m_entries;
-    std::size_t m_start{};
-    std::size_t m_index{}; // where i am in the array
+    std::vector<NroEntry> m_entries{};
+    s64 m_index{}; // where i am in the array
+    std::unique_ptr<List> m_list{};

    option::OptionLong m_sort{INI_SECTION, "sort", SortType::SortType_AlphabeticalStar};
-    option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Decending};
+    option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Descending};
+    option::OptionLong m_layout{INI_SECTION, "layout", LayoutType::LayoutType_GridDetail};
    option::OptionBool m_hide_sphaira{INI_SECTION, "hide_sphaira", false};
 };

--- a/sphaira/include/ui/menus/irs_menu.hpp
+++ b/sphaira/include/ui/menus/irs_menu.hpp
@@ -27,19 +27,22 @@ struct Entry {
 };

 struct Menu final : MenuBase {
-    Menu();
+    Menu(u32 flags);
    ~Menu();

+    auto GetShortTitle() const -> const char* override { return "IRS"; };
    void Update(Controller* controller, TouchInfo* touch) override;
    void Draw(NVGcontext* vg, Theme* theme) override;
    void OnFocusGained() override;

+private:
    void PollCameraStatus(bool statup = false);
    void LoadDefaultConfig();
    void UpdateConfig(const IrsImageTransferProcessorExConfig* config);
    void ResetImage();
    void UpdateImage();
    void updateColourArray();
+    auto GetEntryName(s64 i) -> std::string;

 private:
    Result m_init_rc{};
@@ -61,7 +64,7 @@ private:
    Rotation m_rotation{Rotation_90};
    Colour m_colour{Colour_Grey};
    int m_image{};
-    std::size_t m_index{};
+    s64 m_index{};
 };

 } // namespace sphaira::ui::menu::irs
--- a/sphaira/include/ui/menus/main_menu.hpp
+++ b/sphaira/include/ui/menus/main_menu.hpp
@@ -1,9 +1,8 @@
 #pragma once

 #include "ui/widget.hpp"
-#include "ui/menus/homebrew.hpp"
-#include "ui/menus/filebrowser.hpp"
-#include "ui/menus/appstore.hpp"
+#include "ui/menus/menu_base.hpp"
+#include <span>

 namespace sphaira::ui::menu::main {

@@ -18,6 +17,32 @@ enum class UpdateState {
    Error,
 };

+using MiscMenuFunction = std::function<std::shared_ptr<ui::menu::MenuBase>(u32 flags)>;
+
+enum MiscMenuFlag : u8 {
+    // can be set as the rightside menu.
+    MiscMenuFlag_Shortcut = 1 << 0,
+    // needs install option to be enabled.
+    MiscMenuFlag_Install = 1 << 1,
+};
+
+struct MiscMenuEntry {
+    const char* name;
+    const char* title;
+    MiscMenuFunction func;
+    u8 flag;
+
+    auto IsShortcut() const -> bool {
+        return flag & MiscMenuFlag_Shortcut;
+    }
+
+    auto IsInstall() const -> bool {
+        return flag & MiscMenuFlag_Install;
+    }
+};
+
+auto GetMiscMenuEntries() -> std::span<const MiscMenuEntry>;
+
 // this holds 2 menus and allows for switching between them
 struct MainMenu final : Widget {
    MainMenu();
@@ -28,15 +53,18 @@ struct MainMenu final : Widget {
    void OnFocusGained() override;
    void OnFocusLost() override;

-private:
-    void OnLRPress(std::shared_ptr<MenuBase> menu, Button b);
-    void AddOnLPress();
-    void AddOnRPress();
+    auto IsMenu() const -> bool override {
+        return true;
+    }

 private:
-    std::shared_ptr<homebrew::Menu> m_homebrew_menu{};
-    std::shared_ptr<filebrowser::Menu> m_filebrowser_menu{};
-    std::shared_ptr<appstore::Menu> m_app_store_menu{};
+    void OnLRPress(std::shared_ptr<MenuBase> menu, Button b);
+    void AddOnLRPress();
+
+private:
+    std::shared_ptr<MenuBase> m_centre_menu{};
+    std::shared_ptr<MenuBase> m_left_menu{};
+    std::shared_ptr<MenuBase> m_right_menu{};
    std::shared_ptr<MenuBase> m_current_menu{};

    std::string m_update_url{};
--- a/sphaira/include/ui/menus/menu_base.hpp
+++ b/sphaira/include/ui/menus/menu_base.hpp
@@ -1,26 +1,61 @@
 #pragma once

 #include "ui/widget.hpp"
-#include "nro.hpp"
+#include "ui/scrolling_text.hpp"
 #include <string>

 namespace sphaira::ui::menu {

+enum MenuFlag {
+    MenuFlag_None = 0,
+    MenuFlag_Tab = 1 << 1,
+};
+
+struct PolledData {
+    struct tm tm{};
+    u32 battery_percetange{};
+    PsmChargerType charger_type{};
+    NifmInternetConnectionType type{};
+    NifmInternetConnectionStatus status{};
+    u32 strength{};
+    u32 ip{};
+};
+
 struct MenuBase : Widget {
-    MenuBase(std::string title);
+    MenuBase(const std::string& title, u32 flags);
    virtual ~MenuBase();

+    virtual auto GetShortTitle() const -> const char* = 0;
    virtual void Update(Controller* controller, TouchInfo* touch);
    virtual void Draw(NVGcontext* vg, Theme* theme);
+
+    auto IsMenu() const -> bool override {
+        return true;
+    }
+
    void SetTitle(std::string title);
    void SetTitleSubHeading(std::string sub_heading);
    void SetSubHeading(std::string sub_heading);

+    auto GetTitle() const {
+        return m_title;
+    }
+
+    auto IsTab() const -> bool {
+        return m_flags & MenuFlag_Tab;
+    }
+
+    static auto GetPolledData(bool force_refresh = false) -> PolledData;
+
 private:
-    std::string m_title;
-    std::string m_title_sub_heading;
-    std::string m_sub_heading;
-    AppletType m_applet_type;
+    std::string m_title{};
+    std::string m_title_sub_heading{};
+    std::string m_sub_heading{};
+
+    ScrollingText m_scroll_title_sub_heading{};
+    ScrollingText m_scroll_sub_heading{};
+
+    u32 m_flags{};
 };

 } // namespace sphaira::ui::menu
--- a/sphaira/include/ui/menus/themezer.hpp
+++ b/sphaira/include/ui/menus/themezer.hpp
@@ -2,6 +2,8 @@

 #include "ui/menus/menu_base.hpp"
 #include "ui/scrollable_text.hpp"
+#include "ui/scrolling_text.hpp"
+#include "ui/list.hpp"
 #include "option.hpp"
 #include <span>

@@ -15,28 +17,14 @@ enum class ImageDownloadState {
 };

 struct LazyImage {
-    LazyImage() = default;
    ~LazyImage();
    int image{};
    int w{}, h{};
+    bool tried_cache{};
+    bool cached{};
    ImageDownloadState state{ImageDownloadState::None};
-    u8 first_pixel[4]{};
 };

-// "mutation setLike($type: String!, $id: String!, $value: Boolean!) {\n setLike(type: $type, id: $id, value: $value)\n}\n"
-
-// https://api.themezer.net/?query=query($nsfw:Boolean,$target:String,$page:Int,$limit:Int,$sort:String,$order:String,$query:String){themeList(nsfw:$nsfw,target:$target,page:$page,limit:$limit,sort:$sort,order:$order,query:$query){id,creator{id,display_name},details{name,description},last_updated,dl_count,like_count,target,preview{original,thumb}}}&variables={"nsfw":false,"target":null,"page":1,"limit":10,"sort":"updated","order":"desc","query":null}
-// https://api.themezer.net/?query=query($nsfw:Boolean,$page:Int,$limit:Int,$sort:String,$order:String,$query:String){packList(nsfw:$nsfw,page:$page,limit:$limit,sort:$sort,order:$order,query:$query){id,creator{id,display_name},details{name,description},last_updated,dl_count,like_count,themes{id,creator{display_name},details{name,description},last_updated,dl_count,like_count,target,preview{original,thumb}}}}&variables={"nsfw":false,"page":1,"limit":10,"sort":"updated","order":"desc","query":null}
-// https://api.themezer.net/?query=query($id:String!){pack(id:$id){id,creator{display_name},details{name,description},last_updated,categories,dl_count,like_count,themes{id,details{name},layout{id,details{name}},categories,target,preview{original,thumb},last_updated,dl_count,like_count}}}&variables={"id":"16d"}
-
-// https://api.themezer.net/?query=query{nxinstaller(id:"t9a6"){themes{filename,url,mimetype}}}
-// https://api.themezer.net/?query=query{downloadTheme(id:"t9a6"){filename,url,mimetype}}
-// https://api.themezer.net/?query=query{downloadPack(id:"t9a6"){filename,url,mimetype}}
-
-// {"data":{"setLike":true}}
-// https://api.themezer.net/?query=mutation{setLike(type:"packs",id:"5",value:true){data{setLike}}}
-// https://api.themezer.net/?query=mutation($type:String!,$id:String!,$value:Boolean!){setLike(type:$type,id:$id,value:$value){data{setLike}}}&variables={"type":"packs","id":"5","value":true}
-
 enum MenuState {
    MenuState_Normal,
    MenuState_Search,
@@ -56,73 +44,49 @@ enum class PageLoadState {
 };

 struct Creator {
-    std::string id;
-    std::string display_name;
+    std::string id{};
+    std::string display_name{};
 };

 struct Details {
-    std::string name;
-    std::string description;
+    std::string name{};
 };

 struct Preview {
-    std::string original;
-    std::string thumb;
-    LazyImage lazy_image;
+    std::string thumb{};
+    LazyImage lazy_image{};
 };

 struct DownloadPack {
-    std::string filename;
-    std::string url;
-    std::string mimetype;
+    std::string filename{};
+    std::string url{};
+    std::string mimetype{};
 };

 using DownloadTheme = DownloadPack;

 struct ThemeEntry {
-    std::string id;
-    Creator creator;
-    Details details;
-    std::string last_updated;
-    u64 dl_count;
-    u64 like_count;
-    std::vector<std::string> categories;
-    std::string target;
-    Preview preview;
+    std::string id{};
+    Preview preview{};
 };

-// struct Pack {
-//     std::string id;
-//     Creator creator;
-//     Details details;
-//     std::string last_updated;
-//     std::vector<std::string> categories;
-//     u64 dl_count;
-//     u64 like_count;
-//     std::vector<ThemeEntry> themes;
-// };
-
 struct PackListEntry {
-    std::string id;
-    Creator creator;
-    Details details;
-    std::string last_updated;
-    std::vector<std::string> categories;
-    u64 dl_count;
-    u64 like_count;
-    std::vector<ThemeEntry> themes;
+    std::string id{};
+    Creator creator{};
+    Details details{};
+    std::vector<ThemeEntry> themes{};
 };

 struct Pagination {
-    u64 page;
-    u64 limit;
-    u64 page_count;
-    u64 item_count;
+    u64 page{};
+    u64 limit{};
+    u64 page_count{};
+    u64 item_count{};
 };

 struct PackList {
-    std::vector<PackListEntry> packList;
-    Pagination pagination;
+    std::vector<PackListEntry> packList{};
+    Pagination pagination{};
 };

 struct Config {
@@ -131,10 +95,10 @@ struct Config {
    u32 sort_index{};
    u32 order_index{};
    // search query, if empty, its not used
-    std::string query;
+    std::string query{};
    // this is actually an array of creator ids, but we don't support that feature
    // if empty, its not used
-    std::string creator;
+    std::string creator{};
    // defaults
    u32 page{1};
    u32 limit{18};
@@ -160,26 +124,27 @@ struct Config {
 struct Menu; // fwd

 struct PageEntry {
-    std::vector<PackListEntry> m_packList;
+    std::vector<PackListEntry> m_packList{};
    Pagination m_pagination{};
    PageLoadState m_ready{PageLoadState::None};
 };

 struct Menu final : MenuBase {
-    Menu();
+    Menu(u32 flags);
    ~Menu();

+    auto GetShortTitle() const -> const char* override { return "Themezer"; };
    void Update(Controller* controller, TouchInfo* touch) override;
    void Draw(NVGcontext* vg, Theme* theme) override;
    void OnFocusGained() override;

-    void SetIndex(std::size_t index) {
+    void SetIndex(s64 index) {
        m_index = index;
+        if (!m_index) {
+            m_list->SetYoff(0);
+        }
    }

-    // void SetSearch(const std::string& term);
-    // void SetAuthor();
-
    void InvalidateAllPages();
    void PackListDownload();
    void OnPackListDownload();
@@ -188,14 +153,17 @@ private:
    static constexpr inline const char* INI_SECTION = "themezer";
    static constexpr inline u32 MAX_ON_PAGE = 16; // same as website

-    std::vector<PageEntry> m_pages;
-    std::size_t m_page_index{};
-    std::size_t m_page_index_max{1};
+    std::vector<PageEntry> m_pages{};
+    s64 m_page_index{};
+    s64 m_page_index_max{1};

    std::string m_search{};

-    std::size_t m_start{};
-    std::size_t m_index{}; // where i am in the array
+    s64 m_index{}; // where i am in the array
+    std::unique_ptr<List> m_list{};
+
+    ScrollingText m_scroll_name{};
+    ScrollingText m_scroll_author{};

    // options
    option::OptionLong m_sort{INI_SECTION, "sort", 0};
--- a/sphaira/include/ui/menus/usb_menu.hpp
+++ b/sphaira/include/ui/menus/usb_menu.hpp
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "ui/menus/menu_base.hpp"
+#include "yati/source/usb.hpp"
+
+namespace sphaira::ui::menu::usb {
+
+enum class State {
+    // not connected.
+    None,
+    // just connected, waiting for file list.
+    Connected_WaitForFileList,
+    // just connected, starts the transfer.
+    Connected_StartingTransfer,
+    // set whilst transfer is in progress.
+    Progress,
+    // set when the transfer is finished.
+    Done,
+    // failed to connect.
+    Failed,
+};
+
+struct Menu final : MenuBase {
+    Menu(u32 flags);
+    ~Menu();
+
+    auto GetShortTitle() const -> const char* override { return "USB"; };
+    void Update(Controller* controller, TouchInfo* touch) override;
+    void Draw(NVGcontext* vg, Theme* theme) override;
+    void OnFocusGained() override;
+
+// this should be private
+// private:
+    std::shared_ptr<yati::source::Usb> m_usb_source{};
+    bool m_was_mtp_enabled{};
+
+    Thread m_thread{};
+    Mutex m_mutex{};
+    // the below are shared across threads, lock with the above mutex!
+    State m_state{State::None};
+    std::vector<std::string> m_names{};
+    bool m_usb_has_connection{};
+};
+
+} // namespace sphaira::ui::menu::usb
--- a/sphaira/include/ui/notification.hpp
+++ b/sphaira/include/ui/notification.hpp
@@ -19,13 +19,12 @@ public:
    auto IsDone() const noexcept { return m_count == 0; }

 private:
-    void OnLayoutChange() override;
    void Draw(NVGcontext* vg, Theme* theme) override;

 private:
-    std::string m_text;
+    std::string m_text{};
    std::size_t m_count{180}; // count down to zero
-    Side m_side;
+    Side m_side{};
    bool m_bounds_measured{};
 };

@@ -34,7 +33,6 @@ public:
    NotifMananger() = default;
    ~NotifMananger() = default;

-    void OnLayoutChange() override;
    void Draw(NVGcontext* vg, Theme* theme) override;

    void Push(const NotifEntry& entry);
@@ -49,8 +47,8 @@ private:
    void Draw(NVGcontext* vg, Theme* theme, Entries& entries);

 private:
-    Entries m_entries_left;
-    Entries m_entries_right;
+    Entries m_entries_left{};
+    Entries m_entries_right{};
    Mutex m_mutex{};
 };

--- a/sphaira/include/ui/nvg_util.hpp
+++ b/sphaira/include/ui/nvg_util.hpp
@@ -1,90 +1,45 @@
 #pragma once

 #include "nanovg.h"
-#include "ui/widget.hpp"
+#include "ui/types.hpp"
+#include "ui/scrolling_text.hpp"

 namespace sphaira::ui::gfx {

-enum class Colour {
-    BLACK,
-    LIGHT_BLACK,
-    SILVER,
-    DARK_GREY,
-    GREY,
-    WHITE,
-    CYAN,
-    TEAL,
-    BLUE,
-    LIGHT_BLUE,
-    YELLOW,
-    RED,
-};
-
-void drawImage(NVGcontext*, float x, float y, float w, float h, int texture);
-void drawImage(NVGcontext*, Vec4 v, int texture);
-void drawImageRounded(NVGcontext*, float x, float y, float w, float h, int texture);
-void drawImageRounded(NVGcontext*, Vec4 v, int texture);
-
-auto getColour(Colour c) -> NVGcolor;
+void drawImage(NVGcontext*, float x, float y, float w, float h, int texture, float rounded = 0.F);
+void drawImage(NVGcontext*, const Vec4& v, int texture, float rounded = 0.F);

 void dimBackground(NVGcontext*);

-void drawRect(NVGcontext*, float x, float y, float w, float h, Colour c, bool rounded = false);
-void drawRect(NVGcontext*, Vec4 vec, Colour c, bool rounded = false);
-void drawRect(NVGcontext*, float x, float y, float w, float h, const NVGcolor& c, bool rounded = false);
-void drawRect(NVGcontext*, float x, float y, float w, float h, const NVGcolor&& c, bool rounded = false);
-void drawRect(NVGcontext*, Vec4 vec, const NVGcolor& c, bool rounded = false);
-void drawRect(NVGcontext*, Vec4 vec, const NVGcolor&& c, bool rounded = false);
-void drawRect(NVGcontext*, float x, float y, float w, float h, const NVGpaint& p, bool rounded = false);
-void drawRect(NVGcontext*, float x, float y, float w, float h, const NVGpaint&& p, bool rounded = false);
-void drawRect(NVGcontext*, Vec4 vec, const NVGpaint& p, bool rounded = false);
-void drawRect(NVGcontext*, Vec4 vec, const NVGpaint&& p, bool rounded = false);
+void drawRect(NVGcontext*, float x, float y, float w, float h, const NVGcolor& c, float rounding = 0.F);
+void drawRect(NVGcontext*, const Vec4& v, const NVGcolor& c, float rounding = 0.F);
+void drawRect(NVGcontext*, float x, float y, float w, float h, const NVGpaint& p, float rounding = 0.F);
+void drawRect(NVGcontext*, const Vec4& v, const NVGpaint& p, float rounding = 0.F);

-void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, float x, float y, float w, float h, Colour c);
-void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, Vec4 vec, Colour c);
-void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, float x, float y, float w, float h, const NVGcolor& c);
-void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, float x, float y, float w, float h, const NVGcolor&& c);
-void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, Vec4 vec, const NVGcolor& c);
-void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, Vec4 vec, const NVGcolor&& c);
-void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, float x, float y, float w, float h, const NVGpaint& p);
-void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, float x, float y, float w, float h, const NVGpaint&& p);
-void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, Vec4 vec, const NVGpaint& p);
-void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, Vec4 vec, const NVGpaint&& p);
+void drawRectOutline(NVGcontext*, const Theme*, float size, float x, float y, float w, float h);
+void drawRectOutline(NVGcontext*, const Theme*, float size, const Vec4& v);

-void drawTriangle(NVGcontext*, float aX, float aY, float bX, float bY, float cX, float cY, Colour c);
 void drawTriangle(NVGcontext*, float aX, float aY, float bX, float bY, float cX, float cY, const NVGcolor& c);
-void drawTriangle(NVGcontext*, float aX, float aY, float bX, float bY, float cX, float cY, const NVGcolor&& c);
 void drawTriangle(NVGcontext*, float aX, float aY, float bX, float bY, float cX, float cY, const NVGpaint& p);
-void drawTriangle(NVGcontext*, float aX, float aY, float bX, float bY, float cX, float cY, const NVGpaint&& p);

-void drawText(NVGcontext*, float x, float y, float size, const char* str, const char* end, int align, Colour c);
-void drawText(NVGcontext*, float x, float y, float size, Colour c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);
-void drawText(NVGcontext*, Vec2 vec, float size, const char* str, const char* end, int align, Colour c);
-void drawText(NVGcontext*, Vec2 vec, float size, Colour c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);
 void drawText(NVGcontext*, float x, float y, float size, const char* str, const char* end, int align, const NVGcolor& c);
-void drawText(NVGcontext*, float x, float y, float size, const char* str, const char* end, int align, const NVGcolor&& c);
 void drawText(NVGcontext*, float x, float y, float size, const NVGcolor& c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);
-void drawText(NVGcontext*, float x, float y, float size, const NVGcolor&& c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);
-void drawText(NVGcontext*, Vec2 vec, float size, const char* str, const char* end, int align, const NVGcolor& c);
-void drawText(NVGcontext*, Vec2 vec, float size, const char* str, const char* end, int align, const NVGcolor&& c);
-void drawText(NVGcontext*, Vec2 vec, float size, const NVGcolor& c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);
-void drawText(NVGcontext*, Vec2 vec, float size, const NVGcolor&& c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);
-void drawTextArgs(NVGcontext*, float x, float y, float size, int align, Colour c, const char* str, ...) __attribute__ ((format (printf, 7, 8)));
+void drawText(NVGcontext*, const Vec2& v, float size, const char* str, const char* end, int align, const NVGcolor& c);
+void drawText(NVGcontext*, const Vec2& v, float size, const NVGcolor& c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);
 void drawTextArgs(NVGcontext*, float x, float y, float size, int align, const NVGcolor& c, const char* str, ...) __attribute__ ((format (printf, 7, 8)));

-void drawTextBox(NVGcontext*, float x, float y, float size, float bound, NVGcolor& c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);
-void drawTextBox(NVGcontext*, float x, float y, float size, float bound, NVGcolor&& c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);
-void drawTextBox(NVGcontext*, float x, float y, float size, float bound, Colour c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);
+void drawTextBox(NVGcontext*, float x, float y, float size, float bound, const NVGcolor& c, const char* str, int align = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, const char* end = nullptr);

 void textBounds(NVGcontext*, float x, float y, float *bounds, const char* str, ...) __attribute__ ((format (printf, 5, 6)));
-// void textBounds(NVGcontext*, float *bounds, const char* str, ...) __attribute__ ((format (printf, 5, 6)));
-// void textBounds(NVGcontext*, float *bounds, const char* str);

 auto getButton(Button button) -> const char*;
-void drawButton(NVGcontext* vg, float x, float y, float size, Button button);
-void drawButtons(NVGcontext* vg, const Widget::Actions& actions, const NVGcolor& c, float start_x = 1220.f);
+void drawScrollbar(NVGcontext*, const Theme*, u32 index_off, u32 count, u32 max_per_page);
+void drawScrollbar(NVGcontext*, const Theme*, float x, float y, float h, u32 index_off, u32 count, u32 max_per_page);

-void drawDimBackground(NVGcontext* vg);
+void drawScrollbar2(NVGcontext*, const Theme*, float x, float y, float h, s64 index_off, s64 count, s64 row, s64 page);
+void drawScrollbar2(NVGcontext*, const Theme*, s64 index_off, s64 count, s64 row, s64 page);
+
+void drawAppLable(NVGcontext* vg, const Theme*, ScrollingText& st, float x, float y, float w, const char* name);

 void updateHighlightAnimation();
 void getHighlightAnimation(float* gradientX, float* gradientY, float* color);
--- a/sphaira/include/ui/object.hpp
+++ b/sphaira/include/ui/object.hpp
@@ -1,16 +1,17 @@
 #pragma once

 #include "types.hpp"
+#include <stop_token>

 namespace sphaira::ui {

 class Object {
 public:
    Object() = default;
-    virtual ~Object() = default;
+    virtual ~Object() {
+        m_stop_source.request_stop();
+    }

-    // virtual auto OnLayoutChange() -> void = 0;
-    virtual auto OnLayoutChange() -> void {};
    virtual auto Draw(NVGcontext* vg, Theme* theme) -> void = 0;

    auto GetPos() const noexcept {
@@ -73,8 +74,14 @@ public:
        m_hidden = value;
    }

+    auto GetToken() const {
+        return m_stop_source.get_token();
+    }
+
 protected:
    Vec4 m_pos{};
+    // used for lifetime management across threads.
+    std::stop_source m_stop_source{};
    bool m_hidden{false};
 };

--- a/sphaira/include/ui/option_box.hpp
+++ b/sphaira/include/ui/option_box.hpp
@@ -12,14 +12,13 @@ public:
    OptionBoxEntry(const std::string& text, Vec4 pos);

    auto Update(Controller* controller, TouchInfo* touch) -> void override {}
-    auto OnLayoutChange() -> void override {}
    auto Draw(NVGcontext* vg, Theme* theme) -> void override;

    auto Selected(bool enable) -> void;
 private:

 private:
-    std::string m_text;
+    std::string m_text{};
    Vec2 m_text_pos{};
    bool m_selected{false};
 };
@@ -28,32 +27,33 @@ private:
 // todo: support upto 4 options.
 class OptionBox final : public Widget {
 public:
-    using Callback = std::function<void(std::optional<std::size_t> index)>;
+    using Callback = std::function<void(std::optional<s64> index)>;
    using Option = std::string;
    using Options = std::vector<Option>;

 public:
-    OptionBox(const std::string& message, const Option& a, Callback cb); // confirm
-    OptionBox(const std::string& message, const Option& a, const Option& b, Callback cb); // yesno
-    OptionBox(const std::string& message, const Option& a, const Option& b, std::size_t index, Callback cb); // yesno
-    OptionBox(const std::string& message, const Option& a, const Option& b, const Option& c, Callback cb); // tri
-    OptionBox(const std::string& message, const Option& a, const Option& b, const Option& c, std::size_t index, Callback cb); // tri
+    OptionBox(const std::string& message, const Option& a, Callback cb = [](auto){}, int image = 0); // confirm
+    OptionBox(const std::string& message, const Option& a, const Option& b, Callback cb, int image = 0); // yesno
+    OptionBox(const std::string& message, const Option& a, const Option& b, s64 index, Callback cb, int image = 0); // yesno

    auto Update(Controller* controller, TouchInfo* touch) -> void override;
-    auto OnLayoutChange() -> void override;
    auto Draw(NVGcontext* vg, Theme* theme) -> void override;
+    auto OnFocusGained() noexcept -> void override;
+    auto OnFocusLost() noexcept -> void override;

 private:
-    auto Setup(std::size_t index) -> void; // common setup values
+    auto Setup(s64 index) -> void; // common setup values
+    void SetIndex(s64 index);

 private:
-    std::string m_message;
-    Callback m_callback;
+    std::string m_message{};
+    Callback m_callback{};
+    int m_image{};

    Vec4 m_spacer_line{};

-    std::size_t m_index{};
-    std::vector<OptionBoxEntry> m_entries;
+    s64 m_index{};
+    std::vector<OptionBoxEntry> m_entries{};
 };

 } // namespace sphaira::ui
--- a/sphaira/include/ui/option_list.hpp
+++ b/sphaira/include/ui/option_list.hpp
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "ui/widget.hpp"
-#include <optional>
-
-namespace sphaira::ui {
-
-class OptionList final : public Widget {
-public:
-    using Options = std::vector<std::pair<std::string, std::function<void()>>>;
-
-public:
-    OptionList(Options _options);
-
-    auto Update(Controller* controller, TouchInfo* touch) -> void override;
-    auto OnLayoutChange() -> void override;
-    auto Draw(NVGcontext* vg, Theme* theme) -> void override;
-
-protected:
-    Options m_options;
-    std::size_t m_index{};
-
-private:
-
-};
-
-} // namespace sphaira::ui
--- a/sphaira/include/ui/popup_list.hpp
+++ b/sphaira/include/ui/popup_list.hpp
@@ -1,7 +1,8 @@
 #pragma once

 #include "ui/widget.hpp"
-#include "ui/scrollbar.hpp"
+#include "ui/scrolling_text.hpp"
+#include "ui/list.hpp"
 #include <optional>

 namespace sphaira::ui {
@@ -9,18 +10,22 @@ namespace sphaira::ui {
 class PopupList final : public Widget {
 public:
    using Items = std::vector<std::string>;
-    using Callback = std::function<void(std::optional<std::size_t>)>;
+    using Callback = std::function<void(std::optional<s64>)>;

 public:
-    explicit PopupList(std::string title, Items items, Callback cb, std::size_t index = 0);
+    explicit PopupList(std::string title, Items items, Callback cb, s64 index = 0);
    PopupList(std::string title, Items items, Callback cb, std::string index);
-    PopupList(std::string title, Items items, std::string& index_str_ref, std::size_t& index);
+    PopupList(std::string title, Items items, std::string& index_str_ref, s64& index);
    PopupList(std::string title, Items items, std::string& index_ref);
-    PopupList(std::string title, Items items, std::size_t& index_ref);
+    PopupList(std::string title, Items items, s64& index_ref);

    auto Update(Controller* controller, TouchInfo* touch) -> void override;
-    auto OnLayoutChange() -> void override;
    auto Draw(NVGcontext* vg, Theme* theme) -> void override;
+    auto OnFocusGained() noexcept -> void override;
+    auto OnFocusLost() noexcept -> void override;
+
+private:
+    void SetIndex(s64 index);

 private:
    static constexpr Vec2 m_title_pos{70.f, 28.f};
@@ -28,20 +33,18 @@ private:
    static constexpr float m_text_xoffset{15.f};
    static constexpr float m_line_width{1220.f};

-    std::string m_title;
-    Items m_items;
-    Callback m_callback;
-    std::size_t m_index; // index in list array
-    std::size_t m_index_offset{}; // drawing from array start
+    std::string m_title{};
+    Items m_items{};
+    Callback m_callback{};
+    s64 m_index{}; // index in list array
+    s64 m_starting_index{};

-    // std::size_t& index_ref;
-    // std::string& index_str_ref;
+    std::unique_ptr<List> m_list{};
+    ScrollingText m_scroll_text{};

-    float m_selected_y{};
    float m_yoff{};
    float m_line_top{};
    float m_line_bottom{};
-    ScrollBar m_scrollbar;
 };

 } // namespace sphaira::ui
--- a/sphaira/include/ui/progress_box.hpp
+++ b/sphaira/include/ui/progress_box.hpp
@@ -1,53 +1,104 @@
 #pragma once

-#include "widget.hpp"
+#include "ui/widget.hpp"
+#include "ui/scrolling_text.hpp"
 #include "fs.hpp"
 #include <functional>
+#include <span>

 namespace sphaira::ui {

 struct ProgressBox;
-using ProgressBoxCallback = std::function<bool(ProgressBox*)>;
-using ProgressBoxDoneCallback = std::function<void(bool success)>;
+using ProgressBoxCallback = std::function<Result(ProgressBox*)>;
+using ProgressBoxDoneCallback = std::function<void(Result rc)>;

 struct ProgressBox final : Widget {
    ProgressBox(
+        int image,
+        const std::string& action,
        const std::string& title,
-        ProgressBoxCallback callback, ProgressBoxDoneCallback done = [](bool success){},
-        int cpuid = 1, int prio = 0x2C, int stack_size = 1024*1024
+        ProgressBoxCallback callback, ProgressBoxDoneCallback done = [](Result rc){},
+        int cpuid = 1, int prio = 0x2C, int stack_size = 1024*128
    );
    ~ProgressBox();

    auto Update(Controller* controller, TouchInfo* touch) -> void override;
    auto Draw(NVGcontext* vg, Theme* theme) -> void override;

+    auto SetTitle(const std::string& title) -> ProgressBox&;
    auto NewTransfer(const std::string& transfer) -> ProgressBox&;
-    auto UpdateTransfer(u64 offset, u64 size) -> ProgressBox&;
+    auto UpdateTransfer(s64 offset, s64 size) -> ProgressBox&;
+    // not const in order to avoid copy by using std::swap
+    auto SetImage(int image) -> ProgressBox&;
+    auto SetImageData(std::vector<u8>& data) -> ProgressBox&;
+    auto SetImageDataConst(std::span<const u8> data) -> ProgressBox&;
+
    void RequestExit();
    auto ShouldExit() -> bool;
+    auto ShouldExitResult() -> Result;

    // helper functions
+    auto CopyFile(fs::Fs* fs_src, fs::Fs* fs_dst, const fs::FsPath& src, const fs::FsPath& dst) -> Result;
+    auto CopyFile(fs::Fs* fs, const fs::FsPath& src, const fs::FsPath& dst) -> Result;
    auto CopyFile(const fs::FsPath& src, const fs::FsPath& dst) -> Result;
    void Yield();

+    auto GetCpuId() const {
+        return m_cpuid;
+    }
+
+    auto OnDownloadProgressCallback() {
+        return [this](s64 dltotal, s64 dlnow, s64 ultotal, s64 ulnow){
+            if (this->ShouldExit()) {
+                return false;
+            }
+
+            if (dltotal) {
+                this->UpdateTransfer(dlnow, dltotal);
+            } else {
+                this->UpdateTransfer(ulnow, ultotal);
+            }
+
+            return true;
+        };
+    }
+
+private:
+    void FreeImage();
+
 public:
    struct ThreadData {
-        ProgressBox* pbox;
-        ProgressBoxCallback callback;
-        bool result;
+        ProgressBox* pbox{};
+        ProgressBoxCallback callback{};
+        Result result{};
    };

 private:
    Mutex m_mutex{};
    Thread m_thread{};
    ThreadData m_thread_data{};
-
    ProgressBoxDoneCallback m_done{};
+
+    // shared data start.
+    std::string m_action{};
    std::string m_title{};
    std::string m_transfer{};
-    u64 m_size{};
-    u64 m_offset{};
-    bool m_exit_requested{};
+    s64 m_size{};
+    s64 m_offset{};
+    s64 m_last_offset{};
+    s64 m_speed{};
+    TimeStamp m_timestamp{};
+    std::vector<u8> m_image_data{};
+    int m_image_pending{};
+    bool m_is_image_pending{};
+    // shared data end.
+
+    ScrollingText m_scroll_title{};
+    ScrollingText m_scroll_transfer{};
+
+    int m_cpuid{};
+    int m_image{};
+    bool m_own_image{};
 };

 // this is a helper function that does many things.
--- a/sphaira/include/ui/scrollable_text.hpp
+++ b/sphaira/include/ui/scrollable_text.hpp
@@ -14,15 +14,15 @@ struct ScrollableText final : Widget {
    // float m_y_off = m_y_off_base;
    // static constexpr float m_clip_y = 250.0F;

+    static constexpr inline float m_step = 30;
+    const float m_font_size;
    const float m_y_off_base;
-    float m_y_off;
    const float m_clip_y;
    const float m_end_w;
-    static constexpr float m_step = 30;

-    int m_index = 0;
-    const float m_font_size;
-    float m_bounds[4];
+    float m_y_off{};
+    int m_index{};
+    float m_bounds[4]{};
 };

 } // namespace sphaira::ui
--- a/sphaira/include/ui/scrollbar.hpp
+++ b/sphaira/include/ui/scrollbar.hpp
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "ui/widget.hpp"
-
-namespace sphaira::ui {
-
-class ScrollBar final : public Widget {
-public:
-    enum class Direction { DOWN, UP };
-
-public:
-    ScrollBar() = default;
-    ScrollBar(Vec4 bounds, float entry_height, std::size_t entries);
-
-    auto Update(Controller* controller, TouchInfo* touch) -> void override {}
-    auto OnLayoutChange() -> void override;
-    auto Draw(NVGcontext* vg, Theme* theme) -> void override;
-
-    auto Setup(Vec4 bounds, float entry_height, std::size_t entries) -> void;
-    auto Move(Direction direction) -> void;
-
-private:
-    auto Setup() -> void;
-
-private:
-    Vec4 m_bounds{};
-    std::size_t m_entries{};
-    std::size_t m_index{};
-    float m_entry_height{};
-    float m_step_size{};
-    bool m_should_draw{false};
-};
-
-} // namespace sphaira::ui
--- a/sphaira/include/ui/scrolling_text.hpp
+++ b/sphaira/include/ui/scrolling_text.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "ui/widget.hpp"
+#include <string>
+
+namespace sphaira::ui {
+
+struct ScrollingText final {
+public:
+    void Draw(NVGcontext*, bool focus, float x, float y, float w, float size, int align, const NVGcolor& colour, const std::string& text_entry);
+    void DrawArgs(NVGcontext*, bool focus, float x, float y, float w, float size, int align, const NVGcolor& colour, const char* s, ...) __attribute__ ((format (printf, 10, 11)));
+    void Reset(const std::string& text_entry = "");
+
+private:
+    std::string m_str;
+    s64 m_tick;
+    float m_text_xoff;
+};
+
+} // namespace sphaira::ui
--- a/sphaira/include/ui/sidebar.hpp
+++ b/sphaira/include/ui/sidebar.hpp
@@ -1,6 +1,7 @@
 #pragma once

 #include "ui/widget.hpp"
+#include "ui/list.hpp"
 #include <memory>

 namespace sphaira::ui {
@@ -9,11 +10,9 @@ class SidebarEntryBase : public Widget {
 public:
    SidebarEntryBase(std::string&& title);
    virtual auto Draw(NVGcontext* vg, Theme* theme) -> void override;
-    virtual auto OnLayoutChange() -> void override {}

 protected:
    std::string m_title;
-    Vec2 m_offset{};
 };

 class SidebarEntryBool final : public SidebarEntryBase {
@@ -24,9 +23,9 @@ public:
    SidebarEntryBool(std::string title, bool option, Callback cb, std::string true_str = "On", std::string false_str = "Off");
    SidebarEntryBool(std::string title, bool& option, std::string true_str = "On", std::string false_str = "Off");

+private:
    auto Draw(NVGcontext* vg, Theme* theme) -> void override;

-private:
    bool m_option;
    Callback m_callback;
    std::string m_true_str;
@@ -50,20 +49,24 @@ class SidebarEntryArray final : public SidebarEntryBase {
 public:
    using Items = std::vector<std::string>;
    using ListCallback = std::function<void()>;
-    using Callback = std::function<void(std::size_t& index)>;
+    using Callback = std::function<void(s64& index)>;

 public:
-    explicit SidebarEntryArray(std::string title, Items items, Callback cb, std::size_t index = 0);
+    explicit SidebarEntryArray(std::string title, Items items, Callback cb, s64 index = 0);
    SidebarEntryArray(std::string title, Items items, Callback cb, std::string index);
    SidebarEntryArray(std::string title, Items items, std::string& index);

    auto Draw(NVGcontext* vg, Theme* theme) -> void override;
+    auto OnFocusGained() noexcept -> void override;
+    auto OnFocusLost() noexcept -> void override;

 private:
    Items m_items;
    ListCallback m_list_callback;
    Callback m_callback;
-    std::size_t m_index;
+    s64 m_index;
+    s64 m_tick{};
+    float m_text_yoff{};
 };

 template <typename T>
@@ -101,33 +104,30 @@ public:
    Sidebar(std::string title, std::string sub, Side side);

    auto Update(Controller* controller, TouchInfo* touch) -> void override;
-    auto OnLayoutChange() -> void override {}
    auto Draw(NVGcontext* vg, Theme* theme) -> void override;
    auto OnFocusGained() noexcept -> void override;
    auto OnFocusLost() noexcept -> void override;

    void Add(std::shared_ptr<SidebarEntryBase> entry);
-    void AddSpacer();
-    void AddHeader(std::string name);

 private:
-    void SetIndex(std::size_t index);
+    void SetIndex(s64 index);
+    void SetupButtons();

 private:
    std::string m_title;
    std::string m_sub;
    Side m_side;
    Items m_items;
-    std::size_t m_index{};
-    std::size_t m_index_offset{};
+    s64 m_index{};
+
+    std::unique_ptr<List> m_list;

    Vec4 m_top_bar{};
    Vec4 m_bottom_bar{};
    Vec2 m_title_pos{};
    Vec4 m_base_pos{};

-    float m_selected_y{};
-
    static constexpr float m_title_size{28.f};
    // static constexpr Vec2 box_size{380.f, 70.f};
    static constexpr Vec2 m_box_size{400.f, 70.f};
--- a/sphaira/include/ui/types.hpp
+++ b/sphaira/include/ui/types.hpp
@@ -14,7 +14,7 @@ namespace sphaira {
 #define SCREEN_WIDTH 1280.f
 #define SCREEN_HEIGHT 720.f

-struct [[nodiscard]] Vec2 {
+struct Vec2 {
    constexpr Vec2() = default;
    constexpr Vec2(float _x, float _y) : x{_x}, y{_y} {}

@@ -53,7 +53,7 @@ struct [[nodiscard]] Vec2 {
    float x{}, y{};
 };

-struct [[nodiscard]] Vec4 {
+struct Vec4 {
    constexpr Vec4() = default;
    constexpr Vec4(float _x, float _y, float _w, float _h) : x{_x}, y{_y}, w{_w}, h{_h} {}
    constexpr Vec4(Vec2 vec0, Vec2 vec1) : x{vec0.x}, y{vec0.y}, w{vec1.x}, h{vec1.y} {}
@@ -114,15 +114,34 @@ struct [[nodiscard]] Vec4 {

 struct TimeStamp {
    TimeStamp() {
+        Update();
+    }
+
+    void Update() {
        start = armGetSystemTick();
    }

-    auto GetNs() -> u64 {
+    auto GetNs() const -> u64 {
        const auto end_ticks = armGetSystemTick();
        return armTicksToNs(end_ticks) - armTicksToNs(start);
    }

-    auto GetSeconds() -> double {
+    auto GetMs() const -> u64 {
+        const auto ns = GetNs();
+        return ns/1000/1000;
+    }
+
+    auto GetSeconds() const -> u64 {
+        const auto ns = GetNs();
+        return ns/1000/1000/1000;
+    }
+
+    auto GetMsD() const -> double {
+        const double ns = GetNs();
+        return ns/1000.0/1000.0;
+    }
+
+    auto GetSecondsD() const -> double {
        const double ns = GetNs();
        return ns/1000.0/1000.0/1000.0;
    }
@@ -143,21 +162,55 @@ struct ElementEntry {
 };

 enum ThemeEntryID {
+    // colour of the background, can be an image.
    ThemeEntryID_BACKGROUND,
-
+    // colour of the grid background (homebrew, appstore), can be an image.
    ThemeEntryID_GRID,
-    ThemeEntryID_SELECTED,
-    ThemeEntryID_SELECTED_OVERLAY,
-    ThemeEntryID_TEXT,
-    ThemeEntryID_TEXT_SELECTED,
+    // background colour of a popup.
+    ThemeEntryID_POPUP,
+    // colour of the error text / button.
+    ThemeEntryID_ERROR,

+    // colour of all text.
+    ThemeEntryID_TEXT,
+    // colour of text info and subheaders.
+    ThemeEntryID_TEXT_INFO,
+    // colour of selected item text.
+    ThemeEntryID_TEXT_SELECTED,
+    // background colour of a selected item, can be an image (not recommended).
+    ThemeEntryID_SELECTED_BACKGROUND,
+
+    // colour of line separators in a list.
+    ThemeEntryID_LINE,
+    ThemeEntryID_LINE_SEPARATOR,
+
+    // colour of the sidebar backrgound.
+    ThemeEntryID_SIDEBAR,
+
+    // colour of the scrollbar (full portion).
+    ThemeEntryID_SCROLLBAR,
+    // colour of the scrollbar background (empty portion).
+    ThemeEntryID_SCROLLBAR_BACKGROUND,
+
+    // colour of the progressbar (full portion).
+    ThemeEntryID_PROGRESSBAR,
+    // colour of the progressbar background (empty portion).
+    ThemeEntryID_PROGRESSBAR_BACKGROUND,
+
+    // the colours of the pulsing effect, from 1 -> 2.
+    ThemeEntryID_HIGHLIGHT_1,
+    ThemeEntryID_HIGHLIGHT_2,
+
+    // changes the colours of the internal icons used below.
+    ThemeEntryID_ICON_COLOUR,
+
+    // images used in the filebrowser.
    ThemeEntryID_ICON_AUDIO,
    ThemeEntryID_ICON_VIDEO,
    ThemeEntryID_ICON_IMAGE,
    ThemeEntryID_ICON_FILE,
    ThemeEntryID_ICON_FOLDER,
    ThemeEntryID_ICON_ZIP,
-    ThemeEntryID_ICON_GAME,
    ThemeEntryID_ICON_NRO,

    ThemeEntryID_MAX,
@@ -167,49 +220,42 @@ struct ThemeMeta {
    std::string name;
    std::string author;
    std::string version;
-    std::string ini_path;
+    fs::FsPath inherit;
+    fs::FsPath ini_path;
 };

 struct Theme {
-    std::string name;
-    std::string author;
-    std::string version;
-    fs::FsPath path;
-    PLSR_BFSTM music;
+    ThemeMeta meta;
    ElementEntry elements[ThemeEntryID_MAX];

-    // NVGcolor background; // bg
-    // NVGcolor lines; // grid lines
-    // NVGcolor spacer; // lines in popup box
-    // NVGcolor text; // text colour
-    // NVGcolor text_info; // description text
-    NVGcolor selected; // selected colours
-    // NVGcolor overlay; // popup overlay colour
-
-    // void DrawElement(float x, float y, float w, float h, ThemeEntryID id);
+    auto GetColour(ThemeEntryID id) const {
+        return elements[id].colour;
+    }
 };

-enum class TouchState {
-    Start, // set when touch has started
-    Touching, // set when touch is held longer than 1 frame
-    Stop, // set after touch is released
-    None, // set when there is no touch
-};
+// enum class TouchGesture {
+//     None,
+//     Tap,
+//     Scroll,
+// };

 struct TouchInfo {
-    s32 initial_x;
-    s32 initial_y;
+    HidTouchState initial;
+    HidTouchState cur;

-    s32 cur_x;
-    s32 cur_y;
+    auto in_range(const Vec4& v) const -> bool {
+        return cur.x >= v.x && cur.x <= v.x + v.w && cur.y >= v.y && cur.y <= v.y + v.h;
+    }

-    s32 prev_x;
-    s32 prev_y;
-
-    u32 finger_id;
+    auto in_range(s32 x, s32 y, s32 w, s32 h) const -> bool {
+        return in_range(Vec4(x, y, w, h));
+    }

    bool is_touching;
    bool is_tap;
+    bool is_scroll;
+    bool is_clicked;
+    bool is_end;
 };

 enum class Button : u64 {
@@ -253,6 +299,7 @@ enum class Button : u64 {
    UP = static_cast<u64>(HidNpadButton_AnyUp),
    DOWN = static_cast<u64>(HidNpadButton_AnyDown),

+    NONE = 0,
    ANY_BUTTON = A | B | X | Y | L | R | L2 | R2 | L3 | R3 | START | SELECT,
    ANY_HORIZONTAL = LEFT | RIGHT,
    ANY_VERTICAL = UP | DOWN,
@@ -276,37 +323,36 @@ inline ActionType operator|(ActionType a, ActionType b) {
 }

 struct Action final {
+    using CallbackEmpty = std::function<void()>;
+    using CallbackWithBool = std::function<void(bool)>;
    using Callback = std::variant<
-        std::function<void()>,
-        std::function<void(bool)>
+        CallbackEmpty,
+        CallbackWithBool
    >;

-    Action(Callback cb) : m_type{ActionType::DOWN}, m_hint{""}, m_callback{cb}, m_hidden{true} {}
-    Action(std::string hint, Callback cb) : m_type{ActionType::DOWN}, m_hint{hint}, m_callback{cb} {}
-    Action(u8 type, Callback cb) : m_type{type}, m_hint{""}, m_callback{cb}, m_hidden{true} {}
-    Action(u8 type, std::string hint, Callback cb) : m_type{type}, m_hint{hint}, m_callback{cb} {}
+    Action(Callback cb) : Action{ActionType::DOWN, "", cb} {}
+    Action(std::string hint, Callback cb) : Action{ActionType::DOWN, hint, cb} {}
+    Action(u8 type, Callback cb) : Action{type, "", cb} {}
+    Action(u8 type, std::string hint, Callback cb) : m_type{type}, m_callback{cb}, m_hint{hint} {}

-    auto IsHidden() const noexcept { return m_hidden; }
+    auto IsHidden() const noexcept { return m_hint.empty(); }

    auto Invoke(bool down) const {
-        // todo: make this a visit
-        switch (m_callback.index()) {
-            case 0:
-                std::get<0>(m_callback)();
-                break;
-            case 1:
-                std::get<1>(m_callback)(down);
-                break;
-        }
-        // std::visit([down, this](auto& cb){
-        //     cb(down);
-        // }), m_callback;
+        std::visit([down](auto&& arg){
+            using T = std::decay_t<decltype(arg)>;
+            if constexpr(std::is_same_v<T, CallbackEmpty>) {
+                arg();
+            } else if constexpr(std::is_same_v<T, CallbackWithBool>) {
+                arg(down);
+            } else {
+                static_assert(false, "non-exhaustive visitor!");
+            }
+        }, m_callback);
    }

-    u8 m_type;
-    std::string m_hint; // todo: make optional
-    Callback m_callback;
-    bool m_hidden{false}; // replace this optional text
+    u8 m_type{};
+    Callback m_callback{};
+    std::string m_hint{};
 };

 struct Controller {
@@ -340,7 +386,7 @@ struct Controller {
        m_kup = 0;
    }

-    void UpdateButtonHeld(HidNpadButton buttons) {
+    void UpdateButtonHeld(u64 buttons) {
        if (m_kdown & buttons) {
            m_step = 50;
            m_counter = 0;
@@ -348,7 +394,7 @@ struct Controller {
            m_counter += m_step;

            if (m_counter >= m_MAX) {
-                m_kdown |= buttons;
+                m_kdown |= m_kheld & buttons;
                m_counter = 0;
                m_step = std::min(m_step + 50, m_MAX_STEP);
            }
--- a/sphaira/include/ui/widget.hpp
+++ b/sphaira/include/ui/widget.hpp
@@ -8,7 +8,20 @@

 namespace sphaira::ui {

+struct uiButton final : Object {
+    uiButton(Button button, Action action) : m_button{button}, m_action{action} {}
+    auto Draw(NVGcontext* vg, Theme* theme) -> void override;
+
+    Button m_button;
+    Action m_action;
+    Vec4 m_button_pos{};
+    Vec4 m_hint_pos{};
+};
+
 struct Widget : public Object {
+    using Actions = std::map<Button, Action>;
+    using uiButtons = std::vector<uiButton>;
+
    virtual ~Widget() = default;

    virtual void Update(Controller* controller, TouchInfo* touch);
@@ -26,6 +39,10 @@ struct Widget : public Object {
        return m_focus;
    }

+    virtual auto IsMenu() const -> bool {
+        return false;
+    }
+
    auto HasAction(Button button) const -> bool;
    void SetAction(Button button, Action action);
    void SetActions(std::same_as<std::pair<Button, Action>> auto ...args) {
@@ -45,6 +62,8 @@ struct Widget : public Object {
        m_actions.clear();
    }

+    auto FireAction(Button button, u8 type = ActionType::DOWN) -> bool;
+
    void SetPop(bool pop = true) {
        m_pop = pop;
    }
@@ -53,9 +72,14 @@ struct Widget : public Object {
        return m_pop;
    }

-    using Actions = std::map<Button, Action>;
-    // using Actions = std::unordered_map<Button, Action>;
-    Actions m_actions;
+    auto SetUiButtonPos(Vec2 pos) {
+        m_button_pos = pos;
+    }
+
+    auto GetUiButtons() const -> uiButtons;
+
+    Actions m_actions{};
+    Vec2 m_button_pos{1220, 675};
    bool m_focus{false};
    bool m_pop{false};
 };
--- a/sphaira/include/usb/base.hpp
+++ b/sphaira/include/usb/base.hpp
@@ -0,0 +1,102 @@
+#pragma once
+
+#include <vector>
+#include <string>
+#include <new>
+#include <switch.h>
+
+namespace sphaira::usb {
+
+struct Base {
+    enum { USBModule = 523 };
+
+    enum : Result {
+        Result_Cancelled = MAKERESULT(USBModule, 100),
+    };
+
+    Base(u64 transfer_timeout);
+    virtual ~Base();
+
+    // sets up usb.
+    virtual Result Init() = 0;
+
+    // returns 0 if usb is connected to a device.
+    virtual Result IsUsbConnected(u64 timeout) = 0;
+
+    // transfers a chunk of data, check out_size_transferred for how much was transferred.
+    Result TransferPacketImpl(bool read, void *page, u32 remaining, u32 size, u32 *out_size_transferred, u64 timeout);
+    Result TransferPacketImpl(bool read, void *page, u32 remaining, u32 size, u32 *out_size_transferred) {
+        return TransferPacketImpl(read, page, remaining, size, out_size_transferred, m_transfer_timeout);
+    }
+
+    // transfers all data.
+    Result TransferAll(bool read, void *data, u32 size, u64 timeout);
+    Result TransferAll(bool read, void *data, u32 size) {
+        return TransferAll(read, data, size, m_transfer_timeout);
+    }
+
+    // returns the cancel event.
+    auto GetCancelEvent() {
+        return &m_uevent;
+    }
+
+    // cancels an in progress transfer.
+    void Cancel() {
+        ueventSignal(GetCancelEvent());
+    }
+
+    auto& GetTransferBuffer() {
+        return m_aligned;
+    }
+
+    auto GetTransferTimeout() const {
+        return m_transfer_timeout;
+    }
+
+public:
+    // custom allocator for std::vector that respects alignment.
+    // https://en.cppreference.com/w/cpp/named_req/Allocator
+    template <typename T, std::size_t Align>
+    struct CustomVectorAllocator {
+    public:
+        // https://en.cppreference.com/w/cpp/memory/new/operator_new
+        auto allocate(std::size_t n) -> T* {
+            n = (n + (Align - 1)) &~ (Align - 1);
+            return new(align) T[n];
+        }
+
+        // https://en.cppreference.com/w/cpp/memory/new/operator_delete
+        auto deallocate(T* p, std::size_t n) noexcept -> void {
+            // ::operator delete[] (p, n, align);
+            ::operator delete[] (p, align);
+        }
+
+    private:
+        static constexpr inline std::align_val_t align{Align};
+    };
+
+    template <typename T>
+    struct PageAllocator : CustomVectorAllocator<T, 0x1000> {
+        using value_type = T; // used by std::vector
+    };
+
+    using PageAlignedVector = std::vector<u8, PageAllocator<u8>>;
+
+protected:
+    enum UsbSessionEndpoint {
+        UsbSessionEndpoint_In = 0,
+        UsbSessionEndpoint_Out = 1,
+    };
+
+    virtual Event *GetCompletionEvent(UsbSessionEndpoint ep) = 0;
+    virtual Result WaitTransferCompletion(UsbSessionEndpoint ep, u64 timeout) = 0;
+    virtual Result TransferAsync(UsbSessionEndpoint ep, void *buffer, u32 remaining, u32 size, u32 *out_xfer_id) = 0;
+    virtual Result GetTransferResult(UsbSessionEndpoint ep, u32 xfer_id, u32 *out_requested_size, u32 *out_transferred_size) = 0;
+
+private:
+    u64 m_transfer_timeout{};
+    UEvent m_uevent{};
+    PageAlignedVector m_aligned{};
+};
+
+} // namespace sphaira::usb
--- a/sphaira/include/usb/tinfoil.hpp
+++ b/sphaira/include/usb/tinfoil.hpp
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <switch.h>
+
+namespace sphaira::usb::tinfoil {
+
+enum Magic : u32 {
+    Magic_List0 = 0x304C5554, // TUL0 (Tinfoil Usb List 0)
+    Magic_Command0 = 0x30435554, // TUC0 (Tinfoil USB Command 0)
+};
+
+enum USBCmdType : u8 {
+    REQUEST = 0,
+    RESPONSE = 1
+};
+
+enum USBCmdId : u32 {
+    EXIT = 0,
+    FILE_RANGE = 1
+};
+
+// extension flags for sphaira.
+enum USBFlag : u8 {
+    USBFlag_NONE = 0,
+    // stream install, does not allow for random access.
+    // allows the upload to be multi threaded., do not modify!
+    // the order of the file list must be kept as-is.
+    USBFlag_STREAM = 1 << 0,
+};
+
+struct TUSHeader {
+    u32 magic; // TUL0 (Tinfoil Usb List 0)
+    u32 nspListSize;
+    u8 flags;
+    u8 padding[0x7];
+};
+
+struct NX_PACKED USBCmdHeader {
+    u32 magic; // TUC0 (Tinfoil USB Command 0)
+    USBCmdType type;
+    u8 padding[0x3];
+    u32 cmdId;
+    u64 dataSize;
+    u8 reserved[0xC];
+};
+
+struct FileRangeCmdHeader {
+    u64 size;
+    u64 offset;
+    u64 nspNameLen;
+    u64 padding;
+};
+
+static_assert(sizeof(TUSHeader) == 0x10, "TUSHeader must be 0x10!");
+static_assert(sizeof(USBCmdHeader) == 0x20, "USBCmdHeader must be 0x20!");
+
+} // namespace sphaira::usb::tinfoil
--- a/sphaira/include/usb/usb_uploader.hpp
+++ b/sphaira/include/usb/usb_uploader.hpp
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "usb/usbhs.hpp"
+
+#include <string>
+#include <memory>
+#include <span>
+#include <switch.h>
+
+namespace sphaira::usb::upload {
+
+struct Usb {
+    enum { USBModule = 523 };
+
+    enum : Result {
+        Result_BadMagic = MAKERESULT(USBModule, 0),
+        Result_Exit = MAKERESULT(USBModule, 1),
+        Result_BadCount = MAKERESULT(USBModule, 2),
+        Result_BadTransferSize = MAKERESULT(USBModule, 3),
+        Result_BadTotalSize = MAKERESULT(USBModule, 4),
+        Result_BadCommand = MAKERESULT(USBModule, 4),
+    };
+
+    Usb(u64 transfer_timeout);
+    virtual ~Usb();
+
+    virtual Result Read(const std::string& path, void* buf, s64 off, s64 size, u64* bytes_read) = 0;
+
+    Result IsUsbConnected(u64 timeout) {
+        return m_usb->IsUsbConnected(timeout);
+    }
+
+    // waits for connection and then sends file list.
+    Result WaitForConnection(u64 timeout, u8 flags, std::span<const std::string> names);
+
+    // polls for command, executes transfer if possible.
+    // will return Result_Exit if exit command is recieved.
+    Result PollCommands();
+
+private:
+    Result FileRangeCmd(u64 data_size);
+
+private:
+    std::unique_ptr<usb::UsbHs> m_usb;
+};
+
+} // namespace sphaira::usb::upload
--- a/sphaira/include/usb/usbds.hpp
+++ b/sphaira/include/usb/usbds.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "base.hpp"
+
+namespace sphaira::usb {
+
+// Device Host
+struct UsbDs final : Base {
+    using Base::Base;
+    ~UsbDs();
+
+    Result Init() override;
+    Result IsUsbConnected(u64 timeout) override;
+    Result GetSpeed(UsbDeviceSpeed* out, u16* max_packet_size);
+
+private:
+    Result WaitUntilConfigured(u64 timeout);
+    Event *GetCompletionEvent(UsbSessionEndpoint ep) override;
+    Result WaitTransferCompletion(UsbSessionEndpoint ep, u64 timeout) override;
+    Result TransferAsync(UsbSessionEndpoint ep, void *buffer, u32 remaining, u32 size, u32 *out_urb_id) override;
+    Result GetTransferResult(UsbSessionEndpoint ep, u32 urb_id, u32 *out_requested_size, u32 *out_transferred_size) override;
+
+private:
+    UsbDsInterface* m_interface{};
+    UsbDsEndpoint* m_endpoints[2]{};
+    u16 m_max_packet_size{};
+};
+
+} // namespace sphaira::usb
--- a/sphaira/include/usb/usbhs.hpp
+++ b/sphaira/include/usb/usbhs.hpp
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "base.hpp"
+
+namespace sphaira::usb {
+
+struct UsbHs final : Base {
+    UsbHs(u8 index, const UsbHsInterfaceFilter& filter, u64 transfer_timeout);
+    ~UsbHs();
+
+    Result Init() override;
+    Result IsUsbConnected(u64 timeout) override;
+
+private:
+    Event *GetCompletionEvent(UsbSessionEndpoint ep) override;
+    Result WaitTransferCompletion(UsbSessionEndpoint ep, u64 timeout) override;
+    Result TransferAsync(UsbSessionEndpoint ep, void *buffer, u32 remaining, u32 size, u32 *out_xfer_id) override;
+    Result GetTransferResult(UsbSessionEndpoint ep, u32 xfer_id, u32 *out_requested_size, u32 *out_transferred_size) override;
+
+    Result Connect();
+    void Close();
+
+private:
+    u8 m_index{};
+    UsbHsInterfaceFilter m_filter{};
+    UsbHsInterface m_interface{};
+    UsbHsClientIfSession m_s{};
+    UsbHsClientEpSession m_endpoints[2]{};
+    Event m_event{};
+    bool m_connected{};
+};
+
+} // namespace sphaira::usb
--- a/sphaira/include/web.hpp
+++ b/sphaira/include/web.hpp
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <switch.h>
-#include <string>
-
-namespace sphaira {
-
-// if show_error = true, it will display popup error box on
-// faliure. set this to false if you want to handle errors
-// from the caller.
-auto WebShow(const std::string& url, bool show_error = true) -> Result;
-
-} // namespace sphaira
--- a/sphaira/include/yati/container/base.hpp
+++ b/sphaira/include/yati/container/base.hpp
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "yati/source/base.hpp"
+#include <vector>
+#include <string>
+#include <memory>
+#include <switch.h>
+
+namespace sphaira::yati::container {
+
+enum class CollectionType {
+    CollectionType_NCA,
+    CollectionType_NCZ,
+    CollectionType_TIK,
+    CollectionType_CERT,
+};
+
+struct CollectionEntry {
+    // collection name within file.
+    std::string name{};
+    // collection offset within file.
+    s64 offset{};
+    // collection size within file, may be compressed size.
+    s64 size{};
+};
+
+using Collections = std::vector<CollectionEntry>;
+
+struct Base {
+    using Source = source::Base;
+
+    Base(std::shared_ptr<Source> source) : m_source{source} { }
+    virtual ~Base() = default;
+    virtual Result GetCollections(Collections& out) = 0;
+    auto GetSource() const {
+        return m_source;
+    }
+
+protected:
+    std::shared_ptr<Source> m_source;
+};
+
+} // namespace sphaira::yati::container
--- a/Show More
+++ b/Show More