diff --git a/assets/romfs/i18n/de.json b/assets/romfs/i18n/de.json
index d6cfcea..9d9fbf5 100644
--- a/assets/romfs/i18n/de.json
+++ b/assets/romfs/i18n/de.json
@@ -1,31 +1,31 @@
 {
   "[Applet Mode]": "[Applet-Modus]",
-  "No Internet": "Kein Internet",
-  "Files": "",
-  "Apps": "",
-  "Store": "",
-  "Menu": "Menu",
+  "No Internet": "Keine Internetverbindung",
+  "Files": "Dateien",
+  "Apps": "Apps",
+  "Store": "Store",
+  "Menu": "Menü",
   "Options": "Optionen",
-  "OK": "",
+  "OK": "OK",
   "Back": "Zurück",
-  "Select": "",
+  "Select": "Auswählen",
   "Open": "Öffnen",
-  "Launch": "Start",
+  "Launch": "Starten",
   "Info": "Info",
   "Install": "Installieren",
   "Delete": "Löschen",
-  "Restart": "",
-  "Changelog": "",
-  "Details": "",
-  "Update": "",
-  "Remove": "",
-  "Download": "Herunterladen",
+  "Restart": "Neustart",
+  "Changelog": "Changelog",
+  "Details": "Details",
+  "Update": "Update",
+  "Remove": "Entfernen",
+  "Download": "Download",
   "Next Page": "Nächste Seite",
   "Prev Page": "Vorherige Seite",
-  "Unstar": "",
-  "Star": "",
-  "System memory": "",
-  "microSD card": "",
+  "Unstar": "Favorit entfernen",
+  "Star": "Favorit",
+  "System memory": "System-Speicher",
+  "microSD card": "microSD-Karte",
   "Yes": "Ja",
   "No": "Nein",
   "Enabled": "Aktiviert",
@@ -35,41 +35,41 @@
   "Sort Options": "Sortieroptionen",
   "Filter": "Filter",
   "Sort": "Sortieren",
-  "Order": "Befehl",
+  "Order": "Reihenfolge",
   "Search": "Suchen",
   "Updated": "Aktualisiert",
-  "Updated (Star)": "",
+  "Updated (Star)": "Aktualisiert (Favoriten)",
   "Downloads": "Downloads",
   "Size": "Größe",
-  "Size (Star)": "",
+  "Size (Star)": "Größe (Favoriten)",
   "Alphabetical": "Alphabetisch",
-  "Alphabetical (Star)": "",
-  "Likes": "",
-  "ID": "",
+  "Alphabetical (Star)": "Alphabetisch (Favoriten)",
+  "Likes": "Likes",
+  "ID": "ID",
   "Decending": "Absteigend",
   "Descending (down)": "Absteigend",
-  "Desc": "Absteigend",
+  "Desc": "Abst.",
   "Ascending": "Aufsteigend",
   "Ascending (Up)": "Aufsteigend",
-  "Asc": "Aufsteigend",
+  "Asc": "Aufst.",
 
-  "Menu Options": "Menüoptionen",
+  "Menu Options": "Menü-Optionen",
   "Header": "Header",
   "Theme": "Theme",
-  "Theme Options": "Themenoptionen",
-  "Select Theme": "Wählen Sie Theme aus",
-  "Shuffle": "Shuffle",
+  "Theme Options": "Theme-Optionen",
+  "Select Theme": "Theme auswählen",
+  "Shuffle": "Zufällig",
   "Music": "Musik",
   "Network": "Netzwerk",
-  "Network Options": "Netzwerkoptionen",
+  "Network Options": "Netzwerk-Optionen",
   "Nxlink": "Nxlink",
-  "Nxlink Connected": "",
-  "Nxlink Upload": "",
-  "Nxlink Finished": "",
-  "Switch-Handheld!": "",
-  "Switch-Docked!": "",
+  "Nxlink Connected": "Nxlink verbunden",
+  "Nxlink Upload": "Nxlink Upload",
+  "Nxlink Finished": "Nxlink abgeschlossen",
+  "Switch-Handheld!": "Switch-Handheld!",
+  "Switch-Docked!": "Switch-Dock-Modus!",
   "Language": "Sprache",
-  "Auto": "",
+  "Auto": "Auto",
   "English": "English",
   "Japanese": "日本語",
   "French": "Français",
@@ -83,148 +83,148 @@
   "Russian": "Русский",
   "Swedish": "Svenska",
   "Logging": "Logging",
-  "Replace hbmenu on exit": "Ersetzen Sie hbmenu beim Beenden",
+  "Replace hbmenu on exit": "hbmenu beim Beenden ersetzen",
   "Misc": "Sonstiges",
-  "Misc Options": "Verschiedene Optionen",
+  "Misc Options": "Weitere Optionen",
   "Web": "Web",
-  "Install forwarders": "",
-  "Install location": "",
-  "Show install warning": "",
+  "Install forwarders": "Forwarder installieren",
+  "Install location": "Installationsort",
+  "Show install warning": "Installationswarnung anzeigen",
 
-  "FileBrowser": "DateiBrowser",
-  "%zd files": "%zd files",
-  "%zd dirs": "%zd dirs",
-  "File Options": "Dateioptionen",
+  "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": "Zuletzt versteckt",
+  "Hidden Last": "Versteckte zuletzt",
   "Cut": "Ausschneiden",
   "Copy": "Kopieren",
-  "Paste": "",
-  "Paste ": "",
-  " file(s)?": "",
+  "Paste": "Einfügen",
+  "Paste ": "Einfügen ",
+  " file(s)?": " Datei(en)?",
   "Rename": "Umbenennen",
-  "Set New File Name": "",
+  "Set New File Name": "Neuen Dateinamen eingeben",
   "Advanced": "Erweitert",
   "Advanced Options": "Erweiterte Optionen",
   "Create File": "Datei erstellen",
-  "Set File Name": "",
+  "Set File Name": "Dateinamen eingeben",
   "Create Folder": "Ordner erstellen",
-  "Set Folder Name": "",
-  "View as text (unfinished)": "Als Text anzeigen (unfertig)",
-  "Empty...": "",
-  "Open with DayBreak?": "",
-  "Launch ": "",
-  "Launch option for: ": "",
-  "Select launcher for: ": "",
+  "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 verstecken",
+  "Hide Sphaira": "Sphaira ausblenden",
   "Install Forwarder": "Forwarder installieren",
-  "WARNING: Installing forwarders will lead to a ban!": "ACHTUNG: Die Installation von Forwardern führt zu einem Ban!",
-  "Installing Forwarder": "",
-  "Creating Program": "",
-  "Creating Control": "",
-  "Creating Meta": "",
-  "Writing Nca": "",
-  "Updating ncm databse": "",
-  "Pushing application record": "",
-  "Installed!": "",
-  "Failed to install forwarder": "",
-  "Unstarred ": "",
-  "Starred ": "",
+  "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": "",
-  "Filter: %s | Sort: %s | Order: %s": "Filter: %s | Sortieren: %s | Befehl: %s",
+  "AppStore": "AppStore",
+  "Filter: %s | Sort: %s | Order: %s": "Filter: %s | Sortierung: %s | Reihenfolge: %s",
   "AppStore Options": "AppStore-Optionen",
   "All": "Alle",
   "Games": "Spiele",
   "Emulators": "Emulatoren",
-  "Tools": "Werkzeuge",
+  "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": "",
-  "Leave Feedback": "",
+  "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",
 
-  "Irs": "Irs",
-  "Ambient Noise Level: ": "",
+  "Irs": "IR-Sensor",
+  "Ambient Noise Level: ": "Umgebungsrauschen: ",
   "Controller": "Controller",
-  "Pad ": "Unterlage ",
+  "Pad ": "Pad ",
   " (Available)": " (Verfügbar)",
-  " (Unsupported)": "",
+  " (Unsupported)": " (Nicht unterstützt)",
   " (Unconnected)": " (Nicht verbunden)",
   "HandHeld": "Handheld",
-  "Rotation": "Drehung",
-  "0 (Sideways)": "0 (Seitwärts)",
-  "90 (Flat)": "90 (flach)",
-  "180 (-Sideways)": "180 (-Seitwärts)",
-  "270 (Upside down)": "270 (verkehrt herum)",
+  "Rotation": "Rotation",
+  "0 (Sideways)": "0° (Seitlich)",
+  "90 (Flat)": "90° (Flach)",
+  "180 (-Sideways)": "180° (-Seitlich)",
+  "270 (Upside down)": "270° (Kopfüber)",
   "Colour": "Farbe",
   "Grey": "Grau",
-  "Ironbow": "Eisenbogen",
+  "Ironbow": "Ironbow",
   "Green": "Grün",
   "Red": "Rot",
   "Blue": "Blau",
-  "Light Target": "Leichtes Ziel",
+  "Light Target": "Lichtziel",
   "All leds": "Alle LEDs",
   "Bright group": "Helle Gruppe",
   "Dim group": "Dunkle Gruppe",
-  "None": "Keiner",
-  "Gain": "Gain",
-  "Negative Image": "Negatives Bild",
-  "Normal image": "Normales Bild",
-  "Negative image": "Negatives Bild",
+  "None": "Keine",
+  "Gain": "Verstärkung",
+  "Negative Image": "Negativ-Bild",
+  "Normal image": "Normal-Bild",
+  "Negative image": "Negativ-Bild",
   "Format": "Format",
   "320x240": "320×240",
   "160x120": "160×120",
   "80x60": "80×60",
   "40x30": "40×30",
   "20x15": "20×15",
-  "Trimming Format": "Zuschneideformat",
-  "External Light Filter": "Externer Lichtfilter",
-  "Load Default": "Standardoptionen laden",
+  "Trimming Format": "Beschnitt-Format",
+  "External Light Filter": "Externes Lichtfilter",
+  "Load Default": "Standard laden",
 
   "Themezer": "Themezer",
-  "Themezer Options": "",
-  "Nsfw": "",
-  "Page": "",
-  "Page %zu / %zu": "Page %zu / %zu",
-  "Enter Page Number": "",
-  "Bad Page": "",
-  "Download theme?": "",
+  "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?",
 
-  "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 ": "Mit dem Löschvorgang fortfahren?",
-  "Are you sure you wish to cancel?": "",
-  "If this message appears repeatedly, please open an issue.": ""
-}
\ No newline at end of file
+  "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!",
+  "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."
+}
diff --git a/assets/romfs/i18n/fr.json b/assets/romfs/i18n/fr.json
index 3af3da1..9bf1881 100644
--- a/assets/romfs/i18n/fr.json
+++ b/assets/romfs/i18n/fr.json
@@ -14,11 +14,7 @@
   "Info": "Info.",
   "Install": "Installer",
   "Delete": "Supprimer",
-<<<<<<< HEAD
   "Restart": "Redémarrer",
-=======
-  "Restart": "",
->>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   "Changelog": "Changelog",
   "Details": "Détails",
   "Update": "Mise à jour",
@@ -29,7 +25,7 @@
   "Unstar": "Retirer des favories",
   "Star": "Ajouter aux favories",
   "System memory": "Mémoire système",
-  "microSD card": "microSD card",
+  "microSD card": "Carte microSD",
   "Yes": "Oui",
   "No": "Non",
   "Enabled": "Activé(e)",
@@ -42,7 +38,6 @@
   "Order": "Ordre",
   "Search": "Recherche",
   "Updated": "Mis à jour",
-<<<<<<< HEAD
   "Updated (Star)": "Mis à jour (Favories)",
   "Downloads": "Téléchargements",
   "Size": "Taille",
@@ -50,15 +45,6 @@
   "Alphabetical": "Alphabétique",
   "Alphabetical (Star)": "Alphabétique (Favories)",
   "Likes": "Likes",
-=======
-  "Updated (Star)": "",
-  "Downloads": "Téléchargements",
-  "Size": "Taille",
-  "Size (Star)": "",
-  "Alphabetical": "Alphabétique",
-  "Alphabetical (Star)": "",
-  "Likes": "Favoris",
->>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   "ID": "ID",
   "Decending": "Décroissant",
   "Descending (down)": "Décroissant",
@@ -80,18 +66,13 @@
   "Nxlink Connected": "Nxlink Connecté",
   "Nxlink Upload": "Nxlink téléversement",
   "Nxlink Finished": "Nxlink terminé",
-<<<<<<< HEAD
   "Switch-Handheld!": "Switch-Portable",
   "Switch-Docked!": "Switch-Dockée",
-=======
-  "Switch-Handheld!": "",
-  "Switch-Docked!": "",
->>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   "Language": "Langue",
   "Auto": "Auto",
   "English": "English",
   "Japanese": "日本語",
-  "French": "Français",
+  "French": "Français", 
   "German": "Deutsch",
   "Italian": "Italiano",
   "Spanish": "Español",
@@ -133,15 +114,9 @@
   "View as text (unfinished)": "Afficher sous forme de texte (inachevé)",
   "Empty...": "Vide...",
   "Open with DayBreak?": "Ouvrir avec DayBreak?",
-<<<<<<< HEAD
   "Launch ": "Lancer ",
   "Launch option for: ": "Option de lancement pour: ",
   "Select launcher for: ": "Sélectionner le lanceur pour: ",
-=======
-  "Launch ": "",
-  "Launch option for: ": "Option de lancement pour: ",
-  "Select launcher for: ": "",
->>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
 
   "Homebrew": "Homebrew",
   "Homebrew Options": "Options Homebrew",
@@ -182,11 +157,7 @@
   "Controller": "Contrôleur",
   "Pad ": "Manette ",
   " (Available)": " (Disponible)",
-<<<<<<< HEAD
   " (Unsupported)": "Non supporté",
-=======
-  " (Unsupported)": "",
->>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   " (Unconnected)": " (Non connectée)",
   "HandHeld": "Portable",
   "Rotation": "Rotation",
@@ -238,11 +209,7 @@
   "Scanning ": "Scan ",
   "Creating ": "Création ",
   "Copying ": "Copie ",
-<<<<<<< HEAD
   "Trying to load ": "Tente de charger ",
-=======
-  "Trying to load ": "",
->>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   "Downloading ": "Téléchargement ",
   "Checking MD5": "Vérification MD5",
   "Loading...": "Chargement...",
@@ -252,21 +219,12 @@
   "Error loading page!": "Erreur du chargement de la page!",
   "Update avaliable: ": "Mise à jour disponible: ",
   "Download update: ": "Télécharger la mise à jour: ",
-<<<<<<< HEAD
   "Updated to ": "Mis à jour vers ",
   "Restart Sphaira?": "Redémarrer Sphaira?",
-=======
-  "Updated to ": "",
-  "Restart Sphaira?": "",
->>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   "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?",
-<<<<<<< HEAD
   "If this message appears repeatedly, please open an issue.": "Si ce message apparait en boucle veuillez ouvrir une issue."
-=======
-  "If this message appears repeatedly, please open an issue.": ""
->>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
-}
\ No newline at end of file
+}