add touch scrolling, fix scrollbar, fix appstore search

- when fireing an action, the action array may change. so the loop should break early as soon as an action is handled.
  this fixes the appstore search when pressing B.
- scrollbar no longer goes oob. fixes #76

currently, scrolling has no acceleration.

assets/romfs/i18n/de.json

@@ -19,7 +19,6 @@
   "Details": "Details",
   "Update": "Update",
   "Remove": "Entfernen",
-  "Restore": "",
   "Download": "Download",
   "Next Page": "Nächste Seite",
   "Prev Page": "Vorherige Seite",
@@ -27,9 +26,6 @@
   "Star": "Favorit",
   "System memory": "System-Speicher",
   "microSD card": "microSD-Karte",
-  "Sd": "",
-  "Image System memory": "",
-  "Image microSD card": "",
   "Yes": "Ja",
   "No": "Nein",
   "Enabled": "Aktiviert",
@@ -58,6 +54,7 @@
   "Asc": "Aufst.",
 
   "Menu Options": "Menü-Optionen",
+  "Header": "Header",
   "Theme": "Theme",
   "Theme Options": "Theme-Optionen",
   "Select Theme": "Theme auswählen",
@@ -117,8 +114,6 @@
   "Create Folder": "Ordner erstellen",
   "Set Folder Name": "Ordnernamen eingeben",
   "View as text (unfinished)": "Als Text anzeigen (Beta)",
-  "Ignore read only": "",
-  "Mount": "",
   "Empty...": "Leer...",
   "Open with DayBreak?": "Mit DayBreak öffnen?",
   "Launch ": "Starten ",
@@ -235,12 +230,6 @@
   "Updated to ": "Aktualisiert auf ",
   "Restart Sphaira?": "Sphaira neustarten?",
   "Failed to download update": "Update-Download fehlgeschlagen",
-  "Restore 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, using sphaira instead": "",
-  "Restored hbmenu, closing sphaira": "",
-  "Restored hbmenu": "",
   "Delete Selected files?": "Ausgewählte Dateien löschen?",
   "Completely remove ": "Vollständig entfernen ",
   "Are you sure you want to delete ": "Wirklich löschen ",

assets/romfs/i18n/en.json

@@ -19,7 +19,6 @@
   "Details": "Details",
   "Update": "Update",
   "Remove": "Remove",
-  "Restore": "Restore",
   "Download": "Download",
   "Next Page": "Next Page",
   "Prev Page": "Prev Page",
@@ -27,9 +26,6 @@
   "Star": "Star",
   "System memory": "System memory",
   "microSD card": "microSD card",
-  "Sd": "Sd",
-  "Image System memory": "Image System memory",
-  "Image microSD card": "Image microSD card",
   "Yes": "Yes",
   "No": "No",
   "Enabled": "Enabled",
@@ -58,6 +54,7 @@
   "Asc": "Asc",
 
   "Menu Options": "Menu Options",
+  "Header": "Header",
   "Theme": "Theme",
   "Theme Options": "Theme Options",
   "Select Theme": "Select Theme",
@@ -117,8 +114,6 @@
   "Create Folder": "Create Folder",
   "Set Folder Name": "Set Folder Name",
   "View as text (unfinished)": "View as text (unfinished)",
-  "Ignore read only": "Ignore read only",
-  "Mount": "Mount",
   "Empty...": "Empty...",
   "Open with DayBreak?": "Open with DayBreak?",
   "Launch ": "Launch ",
@@ -235,12 +230,6 @@
   "Updated to ": "Updated to ",
   "Restart Sphaira?": "Restart Sphaira?",
   "Failed to download update": "Failed to download update",
-  "Restore hbmenu?": "Restore hbmenu?",
-  "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",
   "Delete Selected files?": "Delete Selected files?",
   "Completely remove ": "Completely remove ",
   "Are you sure you want to delete ": "Are you sure you want to delete ",

assets/romfs/i18n/es.json

@@ -19,7 +19,6 @@
   "Details": "Detalles",
   "Update": "Actualizar",
   "Remove": "Borrar",
-  "Restore": "",
   "Download": "Descargar",
   "Next Page": "Página siguiente",
   "Prev Page": "Página anterior",
@@ -27,9 +26,6 @@
   "Star": "Favorito",
   "System memory": "Memoria de sistema",
   "microSD card": "microSD",
-  "Sd": "",
-  "Image System memory": "",
-  "Image microSD card": "",
   "Yes": "Sí",
   "No": "No",
   "Enabled": "Activado",
@@ -58,6 +54,7 @@
   "Asc": "Ascendente",
 
   "Menu Options": "Opciones de menú",
+  "Header": "Encabezado",
   "Theme": "Tema",
   "Theme Options": "Opciones de tema",
   "Select Theme": "Seleccionar tema",
@@ -117,8 +114,6 @@
   "Create Folder": "Crear carpeta",
   "Set Folder Name": "Establecer nombre de carpeta",
   "View as text (unfinished)": "Ver como texto (sin terminar)",
-  "Ignore read only": "",
-  "Mount": "",
   "Empty...": "Vacío...",
   "Open with DayBreak?": "¿Abrir con DayBreak?",
   "Launch ": "Abrir ",
@@ -235,12 +230,6 @@
   "Updated to ": "Actualizado a ",
   "Restart Sphaira?": "¿Reiniciar Sphaira?",
   "Failed to download update": "Fallo al descargar actualización",
-  "Restore 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, using sphaira instead": "",
-  "Restored hbmenu, closing sphaira": "",
-  "Restored hbmenu": "",
   "Delete Selected files?": "¿Eliminar archivos seleccionados?",
   "Completely remove ": "Eliminar completamente",
   "Are you sure you want to delete ": "¿Estás seguro que quieres eliminar? ",

assets/romfs/i18n/fr.json

@@ -19,7 +19,6 @@
   "Details": "Détails",
   "Update": "Mise à jour",
   "Remove": "Supprimer",
-  "Restore": "Restaurer",
   "Download": "Télécharger",
   "Next Page": "Page Suiv.",
   "Prev Page": "Page Préc.",
@@ -27,9 +26,6 @@
   "Star": "Ajouter aux favories",
   "System memory": "Mémoire système",
   "microSD card": "Carte microSD",
-  "Sd": "Sd",
-  "Image System memory": "Image de la mémoire System",
-  "Image microSD card": "Image de la Carte microSD",
   "Yes": "Oui",
   "No": "Non",
   "Enabled": "Activé(e)",
@@ -58,6 +54,7 @@
   "Asc": "Croissant",
 
   "Menu Options": "Options des Menus",
+  "Header": "En-tête",
   "Theme": "Thème",
   "Theme Options": "Options de Thème",
   "Select Theme": "Choisir un Thème",
@@ -117,8 +114,6 @@
   "Create Folder": "Créer un Dossier",
   "Set Folder Name": "Nommer Le Dossier",
   "View as text (unfinished)": "Afficher sous forme de texte (inachevé)",
-  "Ignore read only": "Ignorer lecture seule",
-  "Mount": "Monter",
   "Empty...": "Vide...",
   "Open with DayBreak?": "Ouvrir avec DayBreak?",
   "Launch ": "Lancer ",
@@ -235,12 +230,6 @@
   "Updated to ": "Mis à jour vers ",
   "Restart Sphaira?": "Redémarrer Sphaira?",
   "Failed to download update": "Echec du téléchargement de la mise à jour",
-  "Restore hbmenu?": "Restaurer hbmenu?",
-  "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é",
   "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 ",

assets/romfs/i18n/it.json

@@ -1,35 +1,31 @@
 {
   "[Applet Mode]": "[Modalità applet]",
   "No Internet": "Niente Internet",
-  "Files": "File",
+  "Files": "",
-  "Apps": "App",
+  "Apps": "",
-  "Store": "Store",
+  "Store": "",
   "Menu": "Menu",
   "Options": "Opzioni",
-  "OK": "OK",
+  "OK": "",
   "Back": "Indietro",
-  "Select": "Seleziona",
+  "Select": "",
   "Open": "Apri",
   "Launch": "Lancia",
   "Info": "Informazioni",
   "Install": "Installa",
   "Delete": "Elimina",
-  "Restart": "Riavvia",
+  "Restart": "",
-  "Changelog": "Patch notes",
+  "Changelog": "",
-  "Details": "Dettagli",
+  "Details": "",
-  "Update": "Aggiorna",
+  "Update": "",
-  "Remove": "Rimuovi",
+  "Remove": "",
-  "Restore": "Ripristina",
   "Download": "Download",
   "Next Page": "Pagina successiva",
   "Prev Page": "Pagina precedente",
-  "Unstar": "Rimuovi dai preferiti",
+  "Unstar": "",
-  "Star": "Aggiungi ai preferiti",
+  "Star": "",
-  "System memory": "Memoria di sistema",
+  "System memory": "",
-  "microSD card": "Scheda microSD",
+  "microSD card": "",
-  "Sd": "SD",
-  "Image System memory": "Immagine memoria di sistema",
-  "Image microSD card": "Immagine scheda microSD",
   "Yes": "Sì",
   "No": "No",
   "Enabled": "Abilitato",
@@ -44,12 +40,12 @@
   "Updated": "Aggiornato",
   "Updated (Star)": "",
   "Downloads": "Download",
-  "Size": "Dimensione",
+  "Size": "Misurare",
-  "Size (Star)": "Dimensione (Preferiti)",
+  "Size (Star)": "",
   "Alphabetical": "Alfabetico",
-  "Alphabetical (Star)": "Alfabetico (Preferiti)",
+  "Alphabetical (Star)": "",
-  "Likes": "Mi Piace",
+  "Likes": "",
-  "ID": "ID",
+  "ID": "",
   "Decending": "Decrescente",
   "Descending (down)": "Decrescente",
   "Desc": "Decrescente",
@@ -58,6 +54,7 @@
   "Asc": "Crescente",
 
   "Menu Options": "Opzioni menu",
+  "Header": "Intestazione",
   "Theme": "Tema",
   "Theme Options": "Opzioni tema",
   "Select Theme": "Seleziona tema",
@@ -68,13 +65,13 @@
   "Ftp": "FTP",
   "Mtp": "MTP",
   "Nxlink": "Nxlink",
-  "Nxlink Connected": "Nxlink connesso",
+  "Nxlink Connected": "",
-  "Nxlink Upload": "Nxlink upload",
+  "Nxlink Upload": "",
-  "Nxlink Finished": "Nxlink finito",
+  "Nxlink Finished": "",
-  "Switch-Handheld!": "Switch Portatile",
+  "Switch-Handheld!": "",
-  "Switch-Docked!": "Switch Dock",
+  "Switch-Docked!": "",
   "Language": "Lingua",
-  "Auto": "Auto",
+  "Auto": "",
   "English": "English",
   "Japanese": "日本語",
   "French": "Français",
@@ -92,9 +89,9 @@
   "Misc": "Varie",
   "Misc Options": "Opzioni varie",
   "Web": "Rete",
-  "Install forwarders": "Installa forwarder",
+  "Install forwarders": "",
-  "Install location": "Installa posizione",
+  "Install location": "",
-  "Show install warning": "Mostra avvertimento installazione",
+  "Show install warning": "",
 
   "FileBrowser": "FileBrowser",
   "%zd files": "%zd files",
@@ -105,25 +102,23 @@
   "Hidden Last": "Ultimo nascosto",
   "Cut": "Taglia",
   "Copy": "Copia",
-  "Paste": "Incolla",
+  "Paste": "",
-  "Paste ": "Incolla ",
+  "Paste ": "",
-  " file(s)?": "(i)file?",
+  " file(s)?": "",
   "Rename": "Rinomina",
-  "Set New File Name": "Imposta nuovo nome",
+  "Set New File Name": "",
   "Advanced": "Avanzato",
   "Advanced Options": "Opzioni avanzate",
   "Create File": "Crea file",
-  "Set File Name": "Imposta nome",
+  "Set File Name": "",
   "Create Folder": "Crea cartella",
-  "Set Folder Name": "Imposta nome",
+  "Set Folder Name": "",
   "View as text (unfinished)": "Visualizza come testo (non finito)",
-  "Ignore read only": "Ignora read only",
+  "Empty...": "",
-  "Mount": "Monta",
+  "Open with DayBreak?": "",
-  "Empty...": "Vuoto...",
+  "Launch ": "",
-  "Open with DayBreak?": "Vuoi aprire con Daybreak?",
+  "Launch option for: ": "",
-  "Launch ": "Lancia",
+  "Select launcher for: ": "",
-  "Launch option for: ": "Lancia opzione per",
-  "Select launcher for: ": "Scegli launcher per",
 
   "Homebrew": "Homebrew",
   "Homebrew Options": "Opzioni Homebrew",
@@ -235,12 +230,6 @@
   "Updated to ": "",
   "Restart Sphaira?": "",
   "Failed to download update": "",
-  "Restore 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, using sphaira instead": "",
-  "Restored hbmenu, closing sphaira": "",
-  "Restored hbmenu": "",
   "Delete Selected files?": "",
   "Completely remove ": "",
   "Are you sure you want to delete ": "Sei sicuro di voler eliminare? ",

assets/romfs/i18n/ja.json

@@ -19,7 +19,6 @@
   "Details": "詳細",
   "Update": "アップデート",
   "Remove": "除去",
-  "Restore": "復元",
   "Download": "ダウンロード",
   "Next Page": "次のページ",
   "Prev Page": "前のページ",
@@ -27,9 +26,6 @@
   "Star": "お気に入り",
   "System memory": "システムメモリ",
   "microSD card": "SDメモリーカード",
-  "Sd": "SDメモリーカード",
-  "Image System memory": "システムメモリイメージ",
-  "Image microSD card": "SDイメージ",
   "Yes": "はい",
   "No": "いいえ",
   "Enabled": "",
@@ -58,6 +54,7 @@
   "Asc": "上昇",
 
   "Menu Options": "メニュー設定",
+  "Header": "ヘッダー",
   "Theme": "テーマ",
   "Theme Options": "テーマ設定",
   "Select Theme": "テーマを選ぶ",
@@ -117,8 +114,6 @@
   "Create Folder": "フォルダーの作成",
   "Set Folder Name": "名前を入力",
   "View as text (unfinished)": "テキストとして表示 (未完成)",
-  "Ignore read only": "読み取り専用を無視する",
-  "Mount": "マウント",
   "Empty...": "このフォルダーは空です",
   "Open with DayBreak?": "DayBreakで開きますか?",
   "Launch ": "起動しますか",
@@ -235,12 +230,6 @@
   "Updated to ": "アップデート: ",
   "Restart Sphaira?": "Sphairaを再起動しますか?",
   "Failed to download update": "アップデートのダウンロード失敗",
-  "Restore hbmenu?": "hbmenuに戻しますか?",
-  "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に復元されました",
   "Delete Selected files?": "本当に削除しますか?",
   "Completely remove ": "除去しますか ",
   "Are you sure you want to delete ": "消去してもよろしいですか ",

assets/romfs/i18n/ko.json

@@ -1,5 +1,5 @@
 {
-  "[Applet Mode]": "[ 애플릿 모드 ]",
+  "[Applet Mode]": "[애플릿 모드]",
   "No Internet": "인터넷 연결 없음",
   "Files": "파일 탐색기",
   "Apps": "홈브류",
@@ -19,7 +19,6 @@
   "Details": "상세",
   "Update": "업데이트",
   "Remove": "제거",
-  "Restore": "복원",
   "Download": "다운로드",
   "Next Page": "다음 페이지",
   "Prev Page": "이전 페이지",
@@ -27,9 +26,6 @@
   "Star": "즐겨찾기",
   "System memory": "낸드 저장소",
   "microSD card": "SD 카드",
-  "Sd": "SD 카드",
-  "Image System memory": "낸드 이미지",
-  "Image microSD card": "SD 이미지",
   "Yes": "예",
   "No": "아니요",
   "Enabled": "",
@@ -58,6 +54,7 @@
   "Asc": "오름차순",
 
   "Menu Options": "메뉴",
+  "Header": "헤더",
   "Theme": "테마",
   "Theme Options": "테마 옵션",
   "Select Theme": "테마 선택",
@@ -88,13 +85,13 @@
   "Russian": "Русский",
   "Swedish": "Svenska",
   "Logging": "로깅",
-  "Replace hbmenu on exit": "종료 시 hbmenu 교체",
+  "Replace hbmenu on exit": "hbmenu  sphaira 교체",
   "Misc": "기타",
-  "Misc Options": "기타 옵션",
+  "Misc Options": "기타",
   "Web": "웹 브라우저",
   "Install forwarders": "바로가기 설치",
   "Install location": "설치 위치",
-  "Show install warning": "경고 메시지",
+  "Show install warning": "설치 경고 표시",
 
   "FileBrowser": "파일 탐색기",
   "%zd files": "%zd 개 파일",
@@ -117,8 +114,6 @@
   "Create Folder": "새 폴더",
   "Set Folder Name": "폴더명 입력",
   "View as text (unfinished)": "텍스트로 보기 (미완성)",
-  "Ignore read only": "읽기 전용 설정 무시",
-  "Mount": "마운트",
   "Empty...": "비어있음...",
   "Open with DayBreak?": "DayBreak로 열까요?",
   "Launch ": "실행할까요 ",
@@ -129,7 +124,7 @@
   "Homebrew Options": "홈브류 옵션",
   "Hide Sphaira": "Sphaira 숨기기",
   "Install Forwarder": "바로가기 설치",
-  "WARNING: Installing forwarders will lead to a ban!": "경고: 시스낸드에 바로가기 설치 시, 밴 위험이 있습니다!",
+  "WARNING: Installing forwarders will lead to a ban!": "경고: 시스낸드에서 바로가기 설치시 밴 위험이 있습니다!",
   "Installing Forwarder": "바로가기 설치",
   "Creating Program": "프로그램 생성",
   "Creating Control": "컨트롤 생성",
@@ -208,7 +203,7 @@
 
   "GitHub": "GitHub",
   "Downloading json": "JSON에서 다운로드",
-  "Select asset to download for ": "다운로드 아이템: ",
+  "Select asset to download for ": "다운로드 아이템 선택 ",
 
   "Installing ": "설치 ",
   "Uninstalling ": "설치 제거 ",
@@ -235,12 +230,6 @@
   "Updated to ": "업데이트: ",
   "Restart Sphaira?": "Sphaira를 재시작할까요?",
   "Failed to download update": "업데이트 다운로드 실패함",
-  "Restore hbmenu?": "hbmenu로 교체할까요?",
-  "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로 교체됨",
   "Delete Selected files?": "선택한 파일을 삭제할까요?",
   "Completely remove ": "정말 삭제할까요 ",
   "Are you sure you want to delete ": "정말 삭제할까요 ",

assets/romfs/i18n/nl.json

@@ -19,7 +19,6 @@
   "Details": "",
   "Update": "",
   "Remove": "",
-  "Restore": "",
   "Download": "Downloaden",
   "Next Page": "Volgende pagina",
   "Prev Page": "Vorige pagina",
@@ -27,9 +26,6 @@
   "Star": "",
   "System memory": "",
   "microSD card": "",
-  "Sd": "",
-  "Image System memory": "",
-  "Image microSD card": "",
   "Yes": "Ja",
   "No": "Nee",
   "Enabled": "Ingeschakeld",
@@ -58,6 +54,7 @@
   "Asc": "Oplopend",
 
   "Menu Options": "Menu-opties",
+  "Header": "Koptekst",
   "Theme": "Thema",
   "Theme Options": "Thema Opties",
   "Select Theme": "Selecteer Thema",
@@ -117,8 +114,6 @@
   "Create Folder": "Map maken",
   "Set Folder Name": "",
   "View as text (unfinished)": "Bekijk als tekst (onvoltooid)",
-  "Ignore read only": "",
-  "Mount": "",
   "Empty...": "",
   "Open with DayBreak?": "",
   "Launch ": "",
@@ -235,12 +230,6 @@
   "Updated to ": "",
   "Restart Sphaira?": "",
   "Failed to download update": "",
-  "Restore 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, using sphaira instead": "",
-  "Restored hbmenu, closing sphaira": "",
-  "Restored hbmenu": "",
   "Delete Selected files?": "",
   "Completely remove ": "",
   "Are you sure you want to delete ": "Weet u zeker dat u wilt verwijderen ",

assets/romfs/i18n/pt.json

@@ -15,21 +15,17 @@
   "Install": "Instalar",
   "Delete": "Excluir",
   "Restart": "Reiniciar",
-  "Changelog": "Alterações",
+  "Changelog": "Changelog",
   "Details": "Detalhes",
   "Update": "Atualizar",
   "Remove": "Remover",
-  "Restore": "Restaurar",
+  "Download": "Download",
-  "Download": "Baixar",
   "Next Page": "Próxima página",
   "Prev Page": "Página anterior",
   "Unstar": "Desfavoritar",
   "Star": "Favoritar",
   "System memory": "Memória do console",
   "microSD card": "Cartão microSD",
-  "Sd": "SD",
-  "Image System memory": "Imagem (Memória do console)",
-  "Image microSD card": "Imagem (Cartão microSD)",
   "Yes": "Sim",
   "No": "Não",
   "Enabled": "Habilitado",
@@ -58,6 +54,7 @@
   "Asc": "Asc.",
 
   "Menu Options": "Opções do menu",
+  "Header": "Cabeçalho",
   "Theme": "Tema",
   "Theme Options": "Opções de tema",
   "Select Theme": "Selecionar tema",
@@ -87,7 +84,7 @@
   "Portuguese": "Português",
   "Russian": "Русский",
   "Swedish": "Svenska",
-  "Logging": "Registro de depuração",
+  "Logging": "Logging",
   "Replace hbmenu on exit": "Substituir hbmenu ao sair",
   "Misc": "Diversos",
   "Misc Options": "Opções diversas",
@@ -117,8 +114,6 @@
   "Create Folder": "Criar pasta",
   "Set Folder Name": "Definir novo nome da pasta",
   "View as text (unfinished)": "Ver como texto (inacabado)",
-  "Ignore read only": "Ignorar somente leitura",
-  "Mount": "Montar",
   "Empty...": "Vazio...",
   "Open with DayBreak?": "Abrir com DayBreak?",
   "Launch ": "Iniciar",
@@ -129,7 +124,7 @@
   "Homebrew Options": "Opções do Homebrew",
   "Hide Sphaira": "Esconder Sphaira",
   "Install Forwarder": "Instalar forwarder",
-  "WARNING: Installing forwarders will lead to a ban!": "AVISO: Instalar forwarders pode\nresultar em um banimento!",
+  "WARNING: Installing forwarders will lead to a ban!": "AVISO: Isso pode resultar em um banimento!",
   "Installing Forwarder": "Instalando forwarder",
   "Creating Program": "Criando Program",
   "Creating Control": "Criando Control",
@@ -206,9 +201,9 @@
   "Bad Page": "Página inválida",
   "Download theme?": "Baixar tema?",
 
-  "GitHub": "GitHub",
+  "GitHub": "",
-  "Downloading json": "Baixando JSON",
+  "Downloading json": "",
-  "Select asset to download for ": "Selecione o recurso para baixar em ",
+  "Select asset to download for ": "",
 
   "Installing ": "Instalando ",
   "Uninstalling ": "Desinstalando ",
@@ -222,8 +217,8 @@
   "Copying ": "Copiando ",
   "Trying to load ": "Tentando carregar ",
   "Downloading ": "Baixando ",
-  "Downloaded ": "Baixado",
+  "Downloaded ": "",
-  "Removed ": "Removido",
+  "Removed ": "",
   "Checking MD5": "Checando MD5",
   "Loading...": "Carregando...",
   "Loading": "Carregando",
@@ -235,12 +230,6 @@
   "Updated to ": "Atualizado para ",
   "Restart Sphaira?": "Reiniciar Sphaira?",
   "Failed to download update": "Falha ao baixar a atualização",
-  "Restore hbmenu?": "Restaurar hbmenu?",
-  "Failed to find /switch/hbmenu.nro\nUse the Appstore to re-install hbmenu": "Falha ao buscar /switch/hbmenu.nro\nUse a 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",
   "Delete Selected files?": "Deletar arquivos selecionados?",
   "Completely remove ": "Remover completamente ",
   "Are you sure you want to delete ": "Você tem certeza que quer deletar ",

assets/romfs/i18n/ru.json

@@ -19,7 +19,6 @@
   "Details": "",
   "Update": "",
   "Remove": "",
-  "Restore": "",
   "Download": "Скачать",
   "Next Page": "Следующая страница",
   "Prev Page": "Предыдущая страница",
@@ -27,9 +26,6 @@
   "Star": "",
   "System memory": "",
   "microSD card": "",
-  "Sd": "",
-  "Image System memory": "",
-  "Image microSD card": "",
   "Yes": "Да",
   "No": "Нет",
   "Enabled": "Включено",
@@ -58,6 +54,7 @@
   "Asc": "По возрастанию",
 
   "Menu Options": "Параметры меню",
+  "Header": "Заголовок",
   "Theme": "Тема",
   "Theme Options": "Параметры темы",
   "Select Theme": "Выберите тему",
@@ -117,8 +114,6 @@
   "Create Folder": "Создать папку",
   "Set Folder Name": "",
   "View as text (unfinished)": "Посмотреть как текст (незакончено)",
-  "Ignore read only": "",
-  "Mount": "",
   "Empty...": "",
   "Open with DayBreak?": "",
   "Launch ": "",
@@ -235,12 +230,6 @@
   "Updated to ": "",
   "Restart Sphaira?": "",
   "Failed to download update": "",
-  "Restore 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, using sphaira instead": "",
-  "Restored hbmenu, closing sphaira": "",
-  "Restored hbmenu": "",
   "Delete Selected files?": "",
   "Completely remove ": "",
   "Are you sure you want to delete ": "Вы уверены, что хотите удалить ",

assets/romfs/i18n/se.json

@@ -1,6 +1,6 @@
 {
   "[Applet Mode]": "[Applet-läge]",
-  "No Internet": "Ingen Internetanslutning",
+  "No Internet": "Ingen internetanslutning",
   "Files": "Filer",
   "Apps": "Appar",
   "Store": "Butik",
@@ -14,50 +14,47 @@
   "Info": "Info",
   "Install": "Installera",
   "Delete": "Radera",
-  "Restart": "Starta om",
+  "Restart": "",
   "Changelog": "Ändringslogg",
   "Details": "Detaljer",
   "Update": "Uppdatera",
   "Remove": "Ta bort",
-  "Restore": "Återställ",
   "Download": "Ladda ner",
   "Next Page": "Nästa sida",
   "Prev Page": "Föregående sida",
-  "Unstar": "Avmarkera stjärna",
+  "Unstar": "",
-  "Star": "Markera stjärna",
+  "Star": "",
-  "System memory": "Systemminne",
+  "System memory": "",
-  "microSD card": "microSD-kort",
+  "microSD card": "",
-  "Sd": "Sd",
-  "Image System memory": "Avbild Systemminne",
-  "Image microSD card": "Avbild microSD-kort",
   "Yes": "Ja",
   "No": "Nej",
   "Enabled": "Aktiverad",
-  "Disabled": "Inaktiverad",
+  "Disabled": "Avaktiverad",
   
   "Sort By": "Sortera efter",
   "Sort Options": "Sorteringsalternativ",
-  "Filter": "Filtrera",
+  "Filter": "Filter",
   "Sort": "Sortera",
   "Order": "Ordning",
   "Search": "Sök",
   "Updated": "Uppdaterad",
-  "Updated (Star)": "Uppdaterad (Stjärna)",
+  "Updated (Star)": "",
   "Downloads": "Nedladdningar",
   "Size": "Storlek",
-  "Size (Star)": "Storlek (Stjärna)",
+  "Size (Star)": "",
   "Alphabetical": "Alfabetisk",
-  "Alphabetical (Star)": "Alfabetisk (Stjärna)",
+  "Alphabetical (Star)": "",
   "Likes": "Gillar",
   "ID": "ID",
   "Decending": "Fallande",
   "Descending (down)": "Fallande (nedåt)",
-  "Desc": "Fall",
+  "Desc": "Fallande",
   "Ascending": "Stigande",
   "Ascending (Up)": "Stigande (uppåt)",
-  "Asc": "Stig",
+  "Asc": "Stigande",
   
   "Menu Options": "Menyalternativ",
+  "Header": "Rubrik",
   "Theme": "Tema",
   "Theme Options": "Temaalternativ",
   "Select Theme": "Välj tema",
@@ -69,10 +66,10 @@
   "Mtp": "MTP",
   "Nxlink": "Nxlink",
   "Nxlink Connected": "Nxlink ansluten",
-  "Nxlink Upload": "Nxlink överför",
+  "Nxlink Upload": "Nxlink uppladdning",
   "Nxlink Finished": "Nxlink klar",
-  "Switch-Handheld!": "Switch Handhållen!",
+  "Switch-Handheld!": "",
-  "Switch-Docked!": "Switch Dockad!",
+  "Switch-Docked!": "",
   "Language": "Språk",
   "Auto": "Auto",
   "English": "Engelska",
@@ -92,9 +89,9 @@
   "Misc": "Övrigt",
   "Misc Options": "Övriga alternativ",
   "Web": "Webb",
-  "Install forwarders": "Installera genvägar",
+  "Install forwarders": "",
-  "Install location": "Installationsplats",
+  "Install location": "",
-  "Show install warning": "Visa installationsvarning",
+  "Show install warning": "",
   
   "FileBrowser": "Filbläddrare",
   "%zd files": "%zd filer",
@@ -117,30 +114,28 @@
   "Create Folder": "Skapa mapp",
   "Set Folder Name": "Ange mappnamn",
   "View as text (unfinished)": "Visa som text (ofärdig)",
-  "Ignore read only": "Ignorera skrivskydd",
-  "Mount": "Montera",
   "Empty...": "Tom...",
   "Open with DayBreak?": "Öppna med DayBreak?",
-  "Launch ": "Starta ",
+  "Launch ": "",
   "Launch option for: ": "Startalternativ för: ",
-  "Select launcher for: ": "Välj startprogram för: ",
+  "Select launcher for: ": "",
   
   "Homebrew": "Homebrew",
   "Homebrew Options": "Homebrew-alternativ",
   "Hide Sphaira": "Dölj Sphaira",
-  "Install Forwarder": "Installera genväg",
+  "Install Forwarder": "Installera forwarder",
-  "WARNING: Installing forwarders will lead to a ban!": "VARNING: Att installera genvägar kan leda till avstängning!",
+  "WARNING: Installing forwarders will lead to a ban!": "VARNING: Att installera forwarders leder till en avstängning!",
-  "Installing Forwarder": "Installerar genväg",
+  "Installing Forwarder": "Installerar forwarder",
   "Creating Program": "Skapar program",
   "Creating Control": "Skapar kontroll",
-  "Creating Meta": "Skapar metadata",
+  "Creating Meta": "Skapar meta",
   "Writing Nca": "Skriver Nca",
   "Updating ncm databse": "Uppdaterar ncm-databas",
-  "Pushing application record": "Skickar programpost",
+  "Pushing application record": "Lägger till applikationspost",
   "Installed!": "Installerad!",
-  "Failed to install forwarder": "Misslyckades att installera genväg",
+  "Failed to install forwarder": "Misslyckades med att installera forwarder",
-  "Unstarred ": "Avmarkerad ",
+  "Unstarred ": "",
-  "Starred ": "Markerad ",
+  "Starred ": "",
   
   "AppStore": "AppStore",
   "Filter: %s | Sort: %s | Order: %s": "Filter: %s | Sortering: %s | Ordning: %s",
@@ -156,21 +151,21 @@
   "category: %s": "kategori: %s",
   "extracted: %.2f MiB": "extraherad: %.2f MiB",
   "app_dls: %s": "app_nedladdningar: %s",
-  "More by Author": "Mer av författaren",
+  "More by Author": "Mer från författaren",
   "Leave Feedback": "Lämna feedback",
   
   "Irs": "Irs",
   "Ambient Noise Level: ": "Omgivningsljudnivå: ",
-  "Controller": "Kontroller",
+  "Controller": "Kontroll",
   "Pad ": "Handkontroll ",
   " (Available)": " (Tillgänglig)",
-  " (Unsupported)": " (Ej stödd)",
+  " (Unsupported)": "",
   " (Unconnected)": " (Ej ansluten)",
   "HandHeld": "Handhållen",
   "Rotation": "Rotation",
-  "0 (Sideways)": "0 (Sidan)",
+  "0 (Sideways)": "0 (Sido)",
   "90 (Flat)": "90 (Platt)",
-  "180 (-Sideways)": "180 (-Sidan)",
+  "180 (-Sideways)": "180 (-Sido)",
   "270 (Upside down)": "270 (Upp och ner)",
   "Colour": "Färg",
   "Grey": "Grå",
@@ -180,8 +175,8 @@
   "Blue": "Blå",
   "Light Target": "Ljusmål",
   "All leds": "Alla lysdioder",
-  "Bright group": "Ljus grupp",
+  "Bright group": "Ljusstark grupp",
-  "Dim group": "Dimma grupp",
+  "Dim group": "Dämpad grupp",
   "None": "Ingen",
   "Gain": "Förstärkning",
   "Negative Image": "Negativ bild",
@@ -193,9 +188,9 @@
   "80x60": "80×60",
   "40x30": "40×30",
   "20x15": "20×15",
-  "Trimming Format": "Trimningsformat",
+  "Trimming Format": "Trimformat",
-  "External Light Filter": "Externt ljusfilter",
+  "External Light Filter": "Extern ljusfilter",
-  "Load Default": "Ladda standard",
+  "Load Default": "Ladda standardinställningar",
   
   "Themezer": "Themezer",
   "Themezer Options": "Themezer-alternativ",
@@ -206,9 +201,9 @@
   "Bad Page": "Ogiltig sida",
   "Download theme?": "Ladda ner tema?",
 
-  "GitHub": "GitHub",
+  "GitHub": "",
-  "Downloading json": "Laddar ner JSON",
+  "Downloading json": "",
-  "Select asset to download for ": "Välj tillgång att ladda ner för ",
+  "Select asset to download for ": "",
 
   "Installing ": "Installerar ",
   "Uninstalling ": "Avinstallerar ",
@@ -220,30 +215,24 @@
   "Scanning ": "Skannar ",
   "Creating ": "Skapar ",
   "Copying ": "Kopierar ",
-  "Trying to load ": "Försöker ladda ",
+  "Trying to load ": "",
   "Downloading ": "Laddar ner ",
-  "Downloaded ": "Nedladdad ",
+  "Downloaded ": "",
-  "Removed ": "Borttagen ",
+  "Removed ": "",
   "Checking MD5": "Kontrollerar MD5",
   "Loading...": "Laddar...",
   "Loading": "Laddar",
   "Empty!": "Tomt!",
-  "Not Ready...": "Inte redo...",
+  "Not Ready...": "Ej redo...",
   "Error loading page!": "Fel vid laddning av sida!",
   "Update avaliable: ": "Uppdatering tillgänglig: ",
   "Download update: ": "Ladda ner uppdatering: ",
-  "Updated to ": "Uppdaterad till ",
+  "Updated to ": "",
-  "Restart Sphaira?": "Starta om Sphaira?",
+  "Restart Sphaira?": "",
-  "Failed to download update": "Misslyckades att ladda ner uppdatering",
+  "Failed to download update": "Misslyckades med att ladda ner uppdatering",
-  "Restore hbmenu?": "Återställ hbmenu?",
-  "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.",
   "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.": "Om detta meddelande visas upprepade gånger, vänligen öppna en felanmälan.",
+  "If this message appears repeatedly, please open an issue.": ""
 }

assets/romfs/i18n/vi.json

@@ -1,250 +0,0 @@
-{
-  "[Applet Mode]": "[Applet Mode]",
-  "No Internet": "Không có Internet",
-  "Files": "Tập tin",
-  "Apps": "Ứng dụng",
-  "Store": "Cửa hàng",
-  "Menu": "Menu",
-  "Options": "Tuỳ chọn",
-  "OK": "OK",
-  "Back": "Trở về",
-  "Select": "Chọn",
-  "Open": "Mở",
-  "Launch": "Chạy",
-  "Info": "Thông tin",
-  "Install": "Cài đặt",
-  "Delete": "Xoá",
-  "Restart": "Khởi động lại",
-  "Changelog": "Thay đổi",
-  "Details": "Chi tiết",
-  "Update": "Cập nhật",
-  "Remove": "Gỡ",
-  "Restore": "Khôi phục",
-  "Download": "Tải về",
-  "Next Page": "Trang kế",
-  "Prev Page": "Trang trước",
-  "Unstar": "Xoá yêu thích",
-  "Star": "Yêu thích",
-  "System memory": "Bộ nhớ máy",
-  "microSD card": "Thẻ nhớ",
-  "Sd": "Sd",
-  "Image System memory": "Bộ nhớ hệ thống hình ảnh",
-  "Image microSD card": "Thẻ nhớ hệ thống hình ảnh",
-  "Yes": "Có",
-  "No": "Không",
-  "Enabled": "Bật",
-  "Disabled": "Tắt",
-
-  "Sort By": "Sắp xếp bởi",
-  "Sort Options": "Tuỳ chọn sắp xếp",
-  "Filter": "Lọc",
-  "Sort": "Sắp xếp",
-  "Order": "Thứ tự",
-  "Search": "Tìm kiếm",
-  "Updated": "Updated",
-  "Updated (Star)": "Đã cập nhật (Yêu thích)",
-  "Downloads": "Danh sách tải về",
-  "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)",
-  "Likes": "Thích",
-  "ID": "ID",
-  "Decending": "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",
-
-  "Menu Options": "Menu tuỳ chọn",
-  "Theme": "Theme",
-  "Theme Options": "Theme tuỳ chọn",
-  "Select Theme": "Chọn Theme",
-  "Shuffle": "Trộn",
-  "Music": "Âm nhạc",
-  "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",
-  "Switch-Handheld!": "Switch-Handheld!",
-  "Switch-Docked!": "Switch-Docked!",
-  "Language": "Ngôn ngữ",
-  "Auto": "Tự động",
-  "English": "English",
-  "Vietnamese": "Việt Nam",
-  "Japanese": "日本語",
-  "French": "Français",
-  "German": "Deutsch",
-  "Italian": "Italiano",
-  "Spanish": "Español",
-  "Chinese": "中文",
-  "Korean": "한국어",
-  "Dutch": "Dutch",
-  "Portuguese": "Português",
-  "Russian": "Русский",
-  "Swedish": "Svenska",
-  "Logging": "Logging",
-  "Replace hbmenu on exit": "Thay thế hbmenu khi thoát",
-  "Misc": "Tiện ích",
-  "Misc Options": "Tiện ích mở rộng",
-  "Web": "Web",
-  "Install forwarders": "Cài ra màn hình",
-  "Install location": "Vị trí cài đặt",
-  "Show install warning": "Hiển thị cảnh báo cài đặt",
-
-  "FileBrowser": "Duyệt 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",
-  "Paste": "Dán",
-  "Paste ": "Paste ",
-  " file(s)?": " tập tin(nhiều)?",
-  "Rename": "Đổi tên",
-  "Set New File Name": "Đặt tên mới cho tập tin",
-  "Advanced": "Mở rộng",
-  "Advanced Options": "Tuỳ chọn mở rộng",
-  "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",
-  "View as text (unfinished)": "Xem dạng văn bản (chưa xong)",
-  "Ignore read only": "Bỏ qua chỉ đọc",
-  "Mount": "Gắn",
-  "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: ",
-
-  "Homebrew": "Homebrew",
-  "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",
-  "Installed!": "Đã cài xong!",
-  "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 ",
-
-  "AppStore": "AppStore",
-  "Filter: %s | Sort: %s | Order: %s": "Lọc: %s | Sắp xếp: %s | Thứ tự: %s",
-  "AppStore Options": "Tuỳ chọn AppStore",
-  "All": "Tất cả",
-  "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": "Xem thêm tác giả",
-  "Leave Feedback": "Để lại phản hồi",
-
-  "Irs": "Irs",
-  "Ambient Noise Level: ": "Mức ồn xung quanh: ",
-  "Controller": "Điều khiển",
-  "Pad ": "Pad ",
-  " (Available)": " (Có sẵn)",
-  " (Unsupported)": " (Không hỗ trợ)",
-  " (Unconnected)": " (Không kết nối)",
-  "HandHeld": "Cầm tay",
-  "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",
-  "320x240": "320×240",
-  "160x120": "160×120",
-  "80x60": "80×60",
-  "40x30": "40×30",
-  "20x15": "20×15",
-  "Trimming Format": "Định dạng cắt tỉa",
-  "External Light Filter": "Bộ lộc ánh sáng bên ngoài",
-  "Load Default": "Tải mặc định",
-
-  "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 ",
-
-  "Installing ": "Đang cài đặt ",
-  "Uninstalling ": "Đang gỡ cài đặt ",
-  "Deleting ": "Đang xoá ",
-  "Deleting": "Đang xoá",
-  "Pasting ": "Đang dán ",
-  "Pasting": "Đang dán",
-  "Removing ": "Đang gỡ ",
-  "Scanning ": "Đang quét ",
-  "Creating ": "Đang tạo ",
-  "Copying ": "Đang sao chép ",
-  "Trying to load ": "Đang cố gắn mở  ",
-  "Downloading ": "Đang tải xuống ",
-  "Downloaded ": "Đã tải xong ",
-  "Removed ": "Đã gỡ ",
-  "Checking MD5": "Kiểm tra MD5",
-  "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!",
-  "Update avaliable: ": "Cập nhậc có sẵn: ",
-  "Download update: ": "Tải cập nhật: ",
-  "Updated to ": "Đã cập nhật ",
-  "Restart Sphaira?": "Khởi động lại Sphaira?",
-  "Failed to download update": "Cập nhật thất bại",
-  "Restore hbmenu?": "Khôi phục hbmenu?",
-  "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",
-  "Delete Selected files?": "Xoá những tập tin được chọn?",
-  "Completely remove ": "Đã gỡ thành công ",
-  "Are you sure you want to delete ": "Bạn có muốn xoá ",
-  "Are you sure you wish to cancel?": "Bạn có chắn muốn huỷ không?",
-  "If this message appears repeatedly, please open an issue.": "Nếu thấy tin nhắn này, hãy báo lỗi."
-}

assets/romfs/i18n/zh.json

@@ -14,12 +14,11 @@
   "Info": "信息",
   "Install": "安装",
   "Delete": "删除",
-  "Restart": "重启",
+  "Restart": "",
   "Changelog": "更新日志",
   "Details": "详情",
   "Update": "更新",
   "Remove": "删除",
-  "Restore": "恢复",
   "Download": "下载",
   "Next Page": "下一页",
   "Prev Page": "上一页",
@@ -27,9 +26,6 @@
   "Star": "星标",
   "System memory": "主机内存",
   "microSD card": "SD卡",
-  "Sd": "SD卡",
-  "Image System memory": "主机内存图像",
-  "Image microSD card": "SD卡图像",
   "Yes": "是",
   "No": "否",
   "Enabled": "启用",
@@ -58,6 +54,7 @@
   "Asc": "升序",
 
   "Menu Options": "菜单选项",
+  "Header": "标题",
   "Theme": "主题",
   "Theme Options": "主题选项",
   "Select Theme": "选择主题",
@@ -67,12 +64,12 @@
   "Network Options": "网络选项",
   "Ftp": "FTP",
   "Mtp": "MTP",
-  "Nxlink": "Nxlink插件提交",
+  "Nxlink": "Nxlink",
   "Nxlink Connected": "Nxlink 已连接",
   "Nxlink Upload": "Nxlink 上传中",
   "Nxlink Finished": "Nxlink 已结束",
-  "Switch-Handheld!": "切换至掌机模式！",
+  "Switch-Handheld!": "",
-  "Switch-Docked!": "切换至底座模式！",
+  "Switch-Docked!": "",
   "Language": "语言",
   "Auto": "自动",
   "English": "English",
@@ -89,8 +86,8 @@
   "Swedish": "Svenska",
   "Logging": "日志",
   "Replace hbmenu on exit": "退出后用Sphaira替换hbmenu",
-  "Misc": "拓展",
+  "Misc": "杂项",
-  "Misc Options": "拓展设置",
+  "Misc Options": "杂项设置",
   "Web": "网页浏览器",
   "Install forwarders": "允许安装前端应用",
   "Install location": "安装位置",
@@ -117,13 +114,11 @@
   "Create Folder": "新建文件夹",
   "Set Folder Name": "输入文件夹名",
   "View as text (unfinished)": "以文本形式查看（未完善）",
-  "Ignore read only": "忽略只读",
-  "Mount": "挂载",
   "Empty...": "空...",
   "Open with DayBreak?": "使用DayBreak打开？",
-  "Launch ": "启动 ",
+  "Launch ": "",
   "Launch option for: ": "启动选项：",
-  "Select launcher for: ": "选择启动器用于：",
+  "Select launcher for: ": "",
   
   "Homebrew": "应用列表",
   "Homebrew Options": "应用选项",
@@ -139,8 +134,8 @@
   "Pushing application record": "正在推送应用记录",
   "Installed!": "安装完成！",
   "Failed to install forwarder": "前端应用安装失败",
-  "Unstarred ": "取消星标 ",
+  "Unstarred ": "",
-  "Starred ": "已星标 ",
+  "Starred ": "",
 
   "AppStore": "应用商店",
   "Filter: %s | Sort: %s | Order: %s": "筛选: %s | 排序: %s | 顺序: %s",
@@ -183,7 +178,7 @@
   "Bright group": "亮色组",
   "Dim group": "暗色组",
   "None": "无",
-  "Gain": "曝光",
+  "Gain": "增益",
   "Negative Image": "负片图像",
   "Normal image": "正常图像",
   "Negative image": "负片图像",
@@ -206,9 +201,9 @@
   "Bad Page": "错误的页面",
   "Download theme?": "下载该主题？",
 
-  "GitHub": "GitHub",
+  "GitHub": "",
-  "Downloading json": "正在下载 json",
+  "Downloading json": "",
-  "Select asset to download for ": "选择要下载的资源用于 ",
+  "Select asset to download for ": "",
 
   "Installing ": "正在安装 ",
   "Uninstalling ": "正在卸载 ",
@@ -220,30 +215,24 @@
   "Scanning ": "正在扫描 ",
   "Creating ": "正在创建 ",
   "Copying ": "正在复制 ",
-  "Trying to load ": "尝试加载 ",
+  "Trying to load ": "",
   "Downloading ": "正在下载 ",
-  "Downloaded ": "已下载 ",
+  "Downloaded ": "",
-  "Removed ": "已移除 ",
+  "Removed ": "",
   "Checking MD5": "正在校验 MD5",
   "Loading...": "加载中...",
   "Loading": "加载中",
-  "Empty!": "空空如野！",
+  "Empty!": "空！",
   "Not Ready...": "尚未准备好...",
   "Error loading page!": "页面加载失败！",
   "Update avaliable: ": "有可用更新！",
   "Download update: ": "下载更新：",
-  "Updated to ": "更新至 ",
+  "Updated to ": "",
-  "Restart Sphaira?": "重启 Sphaira？",
+  "Restart Sphaira?": "",
   "Failed to download update": "更新下载失败",
-  "Restore hbmenu?": "恢复 hbmenu？",
-  "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",
   "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.": "如果此消息反复出现，请提交一个 issue。"
+  "If this message appears repeatedly, please open an issue.": ""
 }

assets/romfs/themes/abyss_theme.ini

@@ -1,23 +1,22 @@
 [meta]
 name=Abyss
 author=TotalJustice
-version=1.1.0
+version=1.0.0
-inherit=romfs:/themes/base_black_theme.ini
+; unused currently
+preview=romfs:/theme/preview.jpg
 
 [theme]
-background = 0x0f111a
+background=0x0f111aff
-grid = 0x0f115c30
+grid=0x0f115c30
-popup = 0x0f115c
+selected=0x0f115cff
+selected_overlay=0x529cffff
+text=0xffbc41ff
+text_selected=0x529cffff
 
-line = 0xffbc41
+icon_audio=romfs:/theme/icon_audio.png
-line_seperator = 0xffbc41
+icon_video=romfs:/theme/icon_video.png
-
+icon_image=romfs:/theme/icon_image.png
-text = 0xffbc41
+icon_file=romfs:/theme/icon_file.png
-text_info = 0xd79f36
+icon_folder=romfs:/theme/icon_folder.png
-text_selected = 0x529cff
+icon_zip=romfs:/theme/icon_zip.png
-selected_background = 0x0f115c
+icon_nro=romfs:/theme/icon_nro.png
-
-scrollbar = 0x529cff
-scrollbar_background = ; hide the background
-
-progressbar = 0x3250f0

assets/romfs/themes/base_black_theme.ini

@@ -1,33 +0,0 @@
-[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

assets/romfs/themes/base_white_theme.ini

@@ -1,34 +0,0 @@
-[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

assets/romfs/themes/black_theme.ini

@@ -1,5 +1,23 @@
 [meta]
 name=Black
 author=TotalJustice
-version=1.1.0
+version=1.0.0
-inherit=romfs:/themes/base_black_theme.ini
+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

assets/romfs/themes/oled_black_theme.ini

@@ -1,13 +1,23 @@
 [meta]
 name=OLED Black
-author=TotalJustice/Sanras
+author=iTotalJustice/Sanras
-version=1.1.0
+version=1.0.0
-inherit=romfs:/themes/base_black_theme.ini
+preview=romfs:/theme/preview.jpg
 
 [theme]
-background = 0x000000
+background=0x000000ff
-grid = 0x46464640
+cursor=romfs:/theme/cursor.png
-popup = 0x323232
+cursor_drag=romfs:/theme/cursor_drag.png
-text = 0xfbfbfb
+grid=0x46464640
-text_selected = 0x00ffc8
+selected=0x323232ff
-selected_background = 0x323232
+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

assets/romfs/themes/white_theme.ini

@@ -1,5 +0,0 @@
-[meta]
-name=White
-author=TotalJustice/Yorunokyujitsu
-version=1.0.0
-inherit=romfs:/themes/base_white_theme.ini

sphaira/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.13)
 
-set(sphaira_VERSION 0.6.0)
+set(sphaira_VERSION 0.5.0)
 
 project(sphaira
     VERSION ${sphaira_VERSION}
@@ -57,7 +57,6 @@ add_executable(sphaira
     source/ui/sidebar.cpp
     source/ui/widget.cpp
     source/ui/list.cpp
-    source/ui/bubbles.cpp
 
     source/app.cpp
     source/download.cpp
@@ -96,7 +95,7 @@ FetchContent_Declare(libhaze
 
 FetchContent_Declare(libpulsar
     GIT_REPOSITORY https://github.com/ITotalJustice/switch-libpulsar.git
-    GIT_TAG de656e4
+    GIT_TAG d729be3
 )
 
 FetchContent_Declare(nanovg
@@ -116,7 +115,7 @@ FetchContent_Declare(yyjson
 
 FetchContent_Declare(minIni
     GIT_REPOSITORY https://github.com/ITotalJustice/minIni-nx.git
-    GIT_TAG 11cac8b
+    GIT_TAG 63ec295
 )
 
 set(MININI_LIB_NAME minIni)
@@ -227,6 +226,39 @@ set_target_properties(libhaze PROPERTIES
     COMPILE_OPTIONS "$<$<CONFIG:Debug>:-Os>"
 )
 
+# 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_library(stb INTERFACE)
 target_include_directories(stb INTERFACE ${stb_SOURCE_DIR})
 

sphaira/include/app.hpp

@@ -25,7 +25,6 @@ enum SoundEffect {
     SoundEffect_Startup,
     SoundEffect_Install,
     SoundEffect_Error,
-    SoundEffect_MAX,
 };
 
 enum class LaunchType {
@@ -80,7 +79,6 @@ public:
     static auto GetThemeShuffleEnable() -> bool;
     static auto GetThemeMusicEnable() -> bool;
     static auto GetLanguage() -> long;
-    static auto GetTextScrollSpeed() -> long;
 
     static void SetMtpEnable(bool enable);
     static void SetFtpEnable(bool enable);
@@ -93,7 +91,6 @@ public:
     static void SetThemeShuffleEnable(bool enable);
     static void SetThemeMusicEnable(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;
@@ -107,9 +104,9 @@ 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, ElementType type) -> ElementEntry;
+    auto LoadElement(std::string_view data) -> ElementEntry;
 
-    void LoadTheme(const ThemeMeta& meta);
+    void LoadTheme(const fs::FsPath& path);
     void CloseTheme();
     void ScanThemes(const std::string& path);
     void ScanThemeEntries();
@@ -163,11 +160,9 @@ public:
     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
-    // todo: move this into it's own menu
-    option::OptionLong m_text_scroll_speed{"accessibility", "text_scroll_speed", 1}; // normal
 
     PLSR_BFSAR m_qlaunch_bfsar{};
-    PLSR_PlayerSoundId m_sound_ids[SoundEffect_MAX]{};
+    PLSR_PlayerSoundId m_sound_ids[24]{};
 
 private: // from nanovg decko3d example by adubbz
     static constexpr unsigned NumFramebuffers = 2;

sphaira/include/ui/bubbles.hpp

@@ -1,10 +0,0 @@
-#include "ui/types.hpp"
-#include "ui/object.hpp"
-
-namespace sphaira::ui::bubble {
-
-void Init();
-void Draw(NVGcontext* vg, Theme* theme);
-void Exit();
-
-} // namespace sphaira::ui::bubble

sphaira/include/ui/menus/ghdl.hpp

@@ -68,6 +68,7 @@ private:
 private:
     std::vector<Entry> m_entries;
     s64 m_index{};
+    s64 m_index_offset{};
     std::unique_ptr<List> m_list;
 };
 

sphaira/include/ui/nvg_util.hpp

@@ -5,37 +5,87 @@
 
 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*, const Vec4& v, 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*, const Vec4& v, int texture);
+void drawImageRounded(NVGcontext*, Vec4 v, int texture);
+
+auto getColour(Colour c) -> NVGcolor;
 
 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*, const Vec4& v, 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*, const Vec4& v, 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 drawRectOutline(NVGcontext*, const Theme*, float size, float x, float y, float w, float h);
+void drawRectOutline(NVGcontext*, float size, const NVGcolor& out_col, float x, float y, float w, float h, Colour c);
-void drawRectOutline(NVGcontext*, const Theme*, float size, const Vec4& v);
+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 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*, const Vec2& v, 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*, const Vec2& v, 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 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, const 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, 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 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 drawScrollbar(NVGcontext*, const Theme*, u32 index_off, u32 count, u32 max_per_page);
+void drawScrollbar(NVGcontext* vg, Theme* 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 drawScrollbar(NVGcontext* vg, Theme* theme, float x, float y, float h, u32 index_off, u32 count, u32 max_per_page);
 
-void drawScrollbar2(NVGcontext*, const Theme*, float x, float y, float h, s64 index_off, s64 count, s64 row, s64 page);
+void drawScrollbar2(NVGcontext* vg, Theme* 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 drawScrollbar2(NVGcontext* vg, Theme* theme, s64 index_off, s64 count, s64 row, s64 page);
 
 void updateHighlightAnimation();
 void getHighlightAnimation(float* gradientX, float* gradientY, float* color);

sphaira/include/ui/popup_list.hpp

@@ -36,6 +36,7 @@ private:
     Items m_items;
     Callback m_callback;
     s64 m_index; // index in list array
+    s64 m_index_offset{}; // drawing from array start
 
     std::unique_ptr<List> m_list;
 

sphaira/include/ui/sidebar.hpp

@@ -13,6 +13,7 @@ public:
 
 protected:
     std::string m_title;
+    Vec2 m_offset{};
 };
 
 class SidebarEntryBool final : public SidebarEntryBase {
@@ -57,16 +58,12 @@ public:
     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;
     s64 m_index;
-    s64 m_tick{};
-    float m_text_yoff{};
 };
 
 template <typename T>
@@ -120,6 +117,7 @@ private:
     Side m_side;
     Items m_items;
     s64 m_index{};
+    s64 m_index_offset{};
 
     std::unique_ptr<List> m_list;
 

sphaira/include/ui/types.hpp

@@ -162,55 +162,21 @@ 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,
-    // background colour of a popup.
+    ThemeEntryID_SELECTED,
-    ThemeEntryID_POPUP,
+    ThemeEntryID_SELECTED_OVERLAY,
-    // 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,
@@ -220,18 +186,16 @@ struct ThemeMeta {
     std::string name;
     std::string author;
     std::string version;
-    fs::FsPath inherit;
+    std::string ini_path;
-    fs::FsPath ini_path;
 };
 
 struct Theme {
-    ThemeMeta meta;
+    std::string name;
+    std::string author;
+    std::string version;
+    fs::FsPath path;
     PLSR_BFSTM music;
     ElementEntry elements[ThemeEntryID_MAX];
-
-    auto GetColour(ThemeEntryID id) const {
-        return elements[id].colour;
-    }
 };
 
 // enum class TouchGesture {

sphaira/source/app.cpp

@@ -1,7 +1,6 @@
 #include "ui/menus/main_menu.hpp"
 #include "ui/error_box.hpp"
 #include "ui/option_box.hpp"
-#include "ui/bubbles.hpp"
 
 #include "app.hpp"
 #include "log.hpp"
@@ -34,45 +33,6 @@ extern "C" {
 namespace sphaira {
 namespace {
 
-struct ThemeData {
-    fs::FsPath music_path{"/config/sphaira/themes/default_music.bfstm"};
-    std::string elements[ThemeEntryID_MAX]{};
-};
-
-struct ThemeIdPair {
-    const char* label;
-    ThemeEntryID id;
-    ElementType type{ElementType::None};
-};
-
-constexpr ThemeIdPair THEME_ENTRIES[] = {
-    { "background", ThemeEntryID_BACKGROUND },
-    { "grid", ThemeEntryID_GRID },
-    { "text", ThemeEntryID_TEXT, ElementType::Colour },
-    { "text_info", ThemeEntryID_TEXT_INFO, ElementType::Colour },
-    { "text_selected", ThemeEntryID_TEXT_SELECTED, ElementType::Colour },
-    { "selected_background", ThemeEntryID_SELECTED_BACKGROUND, ElementType::Colour },
-    { "error", ThemeEntryID_ERROR, ElementType::Colour },
-    { "popup", ThemeEntryID_POPUP, ElementType::Colour },
-    { "line", ThemeEntryID_LINE, ElementType::Colour },
-    { "line_separator", ThemeEntryID_LINE_SEPARATOR, ElementType::Colour },
-    { "sidebar", ThemeEntryID_SIDEBAR, ElementType::Colour },
-    { "scrollbar", ThemeEntryID_SCROLLBAR, ElementType::Colour },
-    { "scrollbar_background", ThemeEntryID_SCROLLBAR_BACKGROUND, ElementType::Colour },
-    { "progressbar", ThemeEntryID_PROGRESSBAR, ElementType::Colour },
-    { "progressbar_background", ThemeEntryID_PROGRESSBAR_BACKGROUND, ElementType::Colour },
-    { "highlight_1", ThemeEntryID_HIGHLIGHT_1, ElementType::Colour },
-    { "highlight_2", ThemeEntryID_HIGHLIGHT_2, ElementType::Colour },
-    { "icon_colour", ThemeEntryID_ICON_COLOUR, ElementType::Colour },
-    { "icon_audio", ThemeEntryID_ICON_AUDIO, ElementType::Texture },
-    { "icon_video", ThemeEntryID_ICON_VIDEO, ElementType::Texture },
-    { "icon_image", ThemeEntryID_ICON_IMAGE, ElementType::Texture },
-    { "icon_file", ThemeEntryID_ICON_FILE, ElementType::Texture },
-    { "icon_folder", ThemeEntryID_ICON_FOLDER, ElementType::Texture },
-    { "icon_zip", ThemeEntryID_ICON_ZIP, ElementType::Texture },
-    { "icon_nro", ThemeEntryID_ICON_NRO, ElementType::Texture },
-};
-
 constinit App* g_app{};
 
 void deko3d_error_cb(void* userData, const char* context, DkResult result, const char* message) {
@@ -243,95 +203,6 @@ auto GetNroIcon(const std::vector<u8>& nro_icon) -> std::vector<u8> {
     return nro_icon;
 }
 
-auto LoadThemeMeta(const fs::FsPath& path, ThemeMeta& meta) -> bool {
-    meta = {};
-
-    char buf[FS_MAX_PATH]{};
-    int len{};
-    len = ini_gets("meta", "name", "", buf, sizeof(buf) - 1, path);
-    if (len <= 1) {
-        return false;
-    }
-    meta.name = buf;
-
-    len = ini_gets("meta", "author", "", buf, sizeof(buf) - 1, path);
-    if (len <= 1) {
-        return false;
-    }
-    meta.author = buf;
-
-    len = ini_gets("meta", "version", "", buf, sizeof(buf) - 1, path);
-    if (len <= 1) {
-        return false;
-    }
-    meta.version = buf;
-
-    len = ini_gets("meta", "inherit", "", buf, sizeof(buf) - 1, path);
-    if (len > 1) {
-        meta.inherit = buf;
-    }
-
-    log_write("loaded meta from: %s\n", path.s);
-    meta.ini_path = path;
-    return true;
-}
-
-void LoadThemeInternal(ThemeMeta meta, ThemeData& theme_data, int inherit_level = 0) {
-    constexpr auto inherit_level_max = 5;
-
-    // all themes will inherit from black theme by default.
-    if (meta.inherit.empty() && !inherit_level) {
-        meta.inherit = "romfs:/themes/base_black_theme.ini";
-    }
-
-    // check if the theme inherits from another, if so, load it.
-    // block inheriting from itself.
-    if (inherit_level < inherit_level_max && !meta.inherit.empty() && strcasecmp(meta.inherit, "none") && meta.inherit != meta.ini_path) {
-        log_write("inherit is not empty: %s\n", meta.inherit.s);
-        if (R_SUCCEEDED(romfsInit())) {
-            ThemeMeta inherit_meta;
-            const auto has_meta = LoadThemeMeta(meta.inherit, inherit_meta);
-            romfsExit();
-
-            // base themes do not have a meta
-            if (!has_meta) {
-                inherit_meta.ini_path = meta.inherit;
-            }
-
-            LoadThemeInternal(inherit_meta, theme_data, inherit_level + 1);
-        }
-    }
-
-    static constexpr auto cb = [](const mTCHAR *Section, const mTCHAR *Key, const mTCHAR *Value, void *UserData) -> int {
-        auto theme_data = static_cast<ThemeData*>(UserData);
-
-        if (!std::strcmp(Section, "theme")) {
-            if (!std::strcmp(Key, "music")) {
-                theme_data->music_path = Value;
-            } else {
-                for (auto& e : THEME_ENTRIES) {
-                    if (!std::strcmp(Key, e.label)) {
-                        theme_data->elements[e.id] = Value;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return 1;
-    };
-
-    if (R_SUCCEEDED(romfsInit())) {
-        ON_SCOPE_EXIT(romfsExit());
-
-        if (!ini_browse(cb, &theme_data, meta.ini_path)) {
-            log_write("failed to open ini: %s\n", meta.ini_path.s);
-        } else {
-            log_write("opened ini: %s\n", meta.ini_path);
-        }
-    }
-}
-
 void haze_callback(const HazeCallbackData *data) {
     App::NotifyFlashLed();
     evman::push(*data, false);
@@ -521,7 +392,7 @@ auto App::GetThemeMetaList() -> std::span<ThemeMeta> {
 }
 
 void App::SetTheme(s64 theme_index) {
-    g_app->LoadTheme(g_app->m_theme_meta_entries[theme_index]);
+    g_app->LoadTheme(g_app->m_theme_meta_entries[theme_index].ini_path.c_str());
     g_app->m_theme_index = theme_index;
 }
 
@@ -585,10 +456,6 @@ auto App::GetLanguage() -> long {
     return g_app->m_language.Get();
 }
 
-auto App::GetTextScrollSpeed() -> long {
-    return g_app->m_text_scroll_speed.Get();
-}
-
 void App::SetNxlinkEnable(bool enable) {
     if (App::GetNxlinkEnable() != enable) {
         g_app->m_nxlink_enabled.Set(enable);
@@ -759,22 +626,9 @@ void App::SetLanguage(long index) {
     if (App::GetLanguage() != index) {
         g_app->m_language.Set(index);
         on_i18n_change();
-
-        App::Push(std::make_shared<ui::OptionBox>(
-            "Restart Sphaira?"_i18n,
-            "Back"_i18n, "Restart"_i18n, 1, [](auto op_index){
-                if (op_index && *op_index) {
-                    App::ExitRestart();
-                }
-            }
-        ));
     }
 }
 
-void App::SetTextScrollSpeed(long index) {
-    g_app->m_text_scroll_speed.Set(index);
-}
-
 auto App::Install(OwoConfig& config) -> Result {
     R_TRY(romfsInit());
     ON_SCOPE_EXIT(romfsExit());
@@ -851,48 +705,6 @@ void App::Poll() {
     hidGetTouchScreenStates(&state, 1);
     m_touch_info.is_clicked = false;
 
-// todo: replace old touch code with gestures from below
-#if 0
-    static HidGestureState prev_gestures[17]{};
-    HidGestureState gestures[17]{};
-    const auto gesture_count = hidGetGestureStates(gestures, std::size(gestures));
-    for (int i = (int)gesture_count - 1; i >= 0; i--) {
-        bool found = false;
-        for (int j = 0; j < gesture_count; j++) {
-            if (gestures[i].type == prev_gestures[j].type && gestures[i].sampling_number == prev_gestures[j].sampling_number) {
-                found = true;
-                break;
-            }
-        }
-
-        if (found) {
-            continue;
-        }
-
-        auto gesture = gestures[i];
-        if (gesture_count && gesture.type == HidGestureType_Swipe) {
-            log_write("[SWIPE] got gesture type: %d direction: %d sampling_number: %d context_number: %d\n", gesture.type, gesture.direction, gesture.sampling_number, gesture.context_number);
-        }
-        else if (gesture_count && gesture.type == HidGestureType_Tap) {
-            log_write("[TAP] got gesture type: %d direction: %d sampling_number: %d context_number: %d\n", gesture.type, gesture.direction, gesture.sampling_number, gesture.context_number);
-        }
-        else if (gesture_count && gesture.type == HidGestureType_Press) {
-            log_write("[PRESS] got gesture type: %d direction: %d sampling_number: %d context_number: %d\n", gesture.type, gesture.direction, gesture.sampling_number, gesture.context_number);
-        }
-        else if (gesture_count && gesture.type == HidGestureType_Cancel) {
-            log_write("[CANCEL] got gesture type: %d direction: %d sampling_number: %d context_number: %d\n", gesture.type, gesture.direction, gesture.sampling_number, gesture.context_number);
-        }
-        else if (gesture_count && gesture.type == HidGestureType_Complete) {
-            log_write("[COMPLETE] got gesture type: %d direction: %d sampling_number: %d context_number: %d\n", gesture.type, gesture.direction, gesture.sampling_number, gesture.context_number);
-        }
-        else if (gesture_count && gesture.type == HidGestureType_Pan) {
-            log_write("[PAN] got gesture sampling_number: %d context_number: %d x: %d y: %d dx: %d dy: %d vx: %.2f vy: %.2f count: %d\n", gesture.sampling_number, gesture.context_number, gesture.x, gesture.y, gesture.delta_x, gesture.delta_y, gesture.velocity_x, gesture.velocity_y, gesture.point_count);
-        }
-    }
-
-    memcpy(prev_gestures, gestures, sizeof(gestures));
-#endif
-
     if (state.count == 1 && !m_touch_info.is_touching) {
         m_touch_info.initial = m_touch_info.cur = state.touches[0];
         m_touch_info.is_touching = true;
@@ -985,7 +797,6 @@ void App::Draw() {
     }
 
     m_notif_manager.Draw(vg, &m_theme);
-    ui::bubble::Draw(vg, &m_theme);
 
     nvgResetTransform(vg);
     nvgEndFrame(this->vg);
@@ -1007,13 +818,7 @@ void DrawElement(const Vec4& v, ThemeEntryID id) {
         case ElementType::None: {
         } break;
         case ElementType::Texture: {
-            auto paint = nvgImagePattern(g_app->vg, v.x, v.y, v.w, v.h, 0, e.texture, 1.f);
+            const auto paint = nvgImagePattern(g_app->vg, v.x, v.y, v.w, v.h, 0, e.texture, 1.f);
-            // override the icon colours if set
-            if (id > ThemeEntryID_ICON_COLOUR && id < ThemeEntryID_MAX) {
-                if (g_app->m_theme.elements[ThemeEntryID_ICON_COLOUR].type != ElementType::None) {
-                    paint.innerColor = g_app->m_theme.GetColour(ThemeEntryID_ICON_COLOUR);
-                }
-            }
             ui::gfx::drawRect(g_app->vg, v, paint);
         } break;
         case ElementType::Colour: {
@@ -1038,87 +843,120 @@ auto App::LoadElementColour(std::string_view value) -> ElementEntry {
 
     if (value.starts_with("0x")) {
         value = value.substr(2);
-    } else {
+    } else if (value.starts_with('#')) {
-        return {};
+        value = value.substr(1);
     }
 
-    char* end;
+    const u32 c = std::strtol(value.data(), nullptr, 16);
-    u32 c = std::strtoul(value.data(), &end, 16);
+    if (c) {
-    if (!c && value.data() == end) {
+        entry.colour = nvgRGBA((c >> 24) & 0xFF, (c >> 16) & 0xFF, (c >> 8) & 0xFF, c & 0xFF);
-        return {};
+        entry.type = ElementType::Colour;
     }
 
-    // force alpha bit if not already set.
-    if (value.length() <= 6) {
-        c <<= 8;
-        c |= 0xFF;
-    }
-
-    entry.colour = nvgRGBA((c >> 24) & 0xFF, (c >> 16) & 0xFF, (c >> 8) & 0xFF, c & 0xFF);
-    entry.type = ElementType::Colour;
     return entry;
 }
 
-auto App::LoadElement(std::string_view value, ElementType type) -> ElementEntry {
+auto App::LoadElement(std::string_view value) -> ElementEntry {
     if (value.size() <= 1) {
         return {};
     }
 
-    if (type == ElementType::None || type == ElementType::Colour) {
+    if (auto e = LoadElementImage(value); e.type != ElementType::None) {
-        // most assets are colours, so prioritise this first
+        return e;
-        if (auto e = LoadElementColour(value); e.type != ElementType::None) {
-            return e;
-        }
     }
 
-    if (type == ElementType::None || type == ElementType::Texture) {
+    if (auto e = LoadElementColour(value); e.type != ElementType::None) {
-        if (auto e = LoadElementImage(value); e.type != ElementType::None) {
+        return e;
-            return e;
-        }
     }
 
     return {};
 }
 
 void App::CloseTheme() {
+    m_theme.name.clear();
+    m_theme.author.clear();
+    m_theme.version.clear();
+    m_theme.path.clear();
     if (m_sound_ids[SoundEffect_Music]) {
         plsrPlayerFree(m_sound_ids[SoundEffect_Music]);
         m_sound_ids[SoundEffect_Music] = nullptr;
         plsrBFSTMClose(&m_theme.music);
     }
-
     for (auto& e : m_theme.elements) {
         if (e.type == ElementType::Texture) {
             nvgDeleteImage(vg, e.texture);
         }
+        e.type = ElementType::None;
     }
-
-    m_theme = {};
 }
 
-void App::LoadTheme(const ThemeMeta& meta) {
+void App::LoadTheme(const fs::FsPath& path) {
     // reset theme
     CloseTheme();
+    m_theme.path = path;
 
-    ThemeData theme_data{};
+    const auto cb = [](const mTCHAR *Section, const mTCHAR *Key, const mTCHAR *Value, void *UserData) -> int {
-    LoadThemeInternal(meta, theme_data);
+        auto app = static_cast<App*>(UserData);
-    m_theme.meta = meta;
+        auto& theme = app->m_theme;
+        std::string_view section{Section};
+        std::string_view key{Key};
+        std::string_view value{Value};
+
+        if (section == "meta") {
+            if (key == "name") {
+                theme.name = key;
+            } else if (key == "author") {
+                theme.author = key;
+            } else if (key == "version") {
+                theme.version = key;
+            }
+        } else if (section == "theme") {
+            if (key == "background") {
+                theme.elements[ThemeEntryID_BACKGROUND] = app->LoadElement(value);
+            } else if (key == "music") {
+                if (R_SUCCEEDED(plsrBFSTMOpen(Value, &theme.music))) {
+                    if (R_SUCCEEDED(plsrPlayerLoadStream(&theme.music, &app->m_sound_ids[SoundEffect_Music]))) {
+                        app->PlaySoundEffect(SoundEffect_Music);
+                    }
+                }
+            } else if (key == "grid") {
+                theme.elements[ThemeEntryID_GRID] = app->LoadElement(value);
+            } else if (key == "selected") {
+                theme.elements[ThemeEntryID_SELECTED] = app->LoadElement(value);
+            } else if (key == "selected_overlay") {
+                theme.elements[ThemeEntryID_SELECTED_OVERLAY] = app->LoadElement(value);
+            } else if (key == "text") {
+                theme.elements[ThemeEntryID_TEXT] = app->LoadElementColour(value);
+            } else if (key == "text_selected") {
+                theme.elements[ThemeEntryID_TEXT_SELECTED] = app->LoadElementColour(value);
+            } else if (key == "icon_audio") {
+                theme.elements[ThemeEntryID_ICON_AUDIO] = app->LoadElement(value);
+            } else if (key == "icon_video") {
+                theme.elements[ThemeEntryID_ICON_VIDEO] = app->LoadElement(value);
+            } else if (key == "icon_image") {
+                theme.elements[ThemeEntryID_ICON_IMAGE] = app->LoadElement(value);
+            } else if (key == "icon_file") {
+                theme.elements[ThemeEntryID_ICON_FILE] = app->LoadElement(value);
+            } else if (key == "icon_folder") {
+                theme.elements[ThemeEntryID_ICON_FOLDER] = app->LoadElement(value);
+            } else if (key == "icon_zip") {
+                theme.elements[ThemeEntryID_ICON_ZIP] = app->LoadElement(value);
+            } else if (key == "icon_game") {
+                theme.elements[ThemeEntryID_ICON_GAME] = app->LoadElement(value);
+            } else if (key == "icon_nro") {
+                theme.elements[ThemeEntryID_ICON_NRO] = app->LoadElement(value);
+            }
+        }
+
+        return 1;
+    };
 
     if (R_SUCCEEDED(romfsInit())) {
         ON_SCOPE_EXIT(romfsExit());
-
+        if (!ini_browse(cb, this, path)) {
-        // load all assets / colours.
+            log_write("failed to open ini: %s\n", path);
-        for (auto& e : THEME_ENTRIES) {
+        } else {
-            m_theme.elements[e.id] = LoadElement(theme_data.elements[e.id], e.type);
+            log_write("opened ini: %s\n", path);
-        }
-
-        // load music
-        if (!theme_data.music_path.empty()) {
-            if (R_SUCCEEDED(plsrBFSTMOpen(theme_data.music_path, &m_theme.music))) {
-                if (R_SUCCEEDED(plsrPlayerLoadStream(&m_theme.music, &m_sound_ids[SoundEffect_Music]))) {
-                    PlaySoundEffect(SoundEffect_Music);
-                }
-            }
         }
     }
 }
@@ -1148,10 +986,40 @@ void App::ScanThemes(const std::string& path) {
 
         const auto full_path = path + name;
 
-        ThemeMeta meta{};
+        if (!ini_haskey("meta", "name", full_path.c_str())) {
-        if (LoadThemeMeta(full_path, meta)) {
+            continue;
-            m_theme_meta_entries.emplace_back(meta);
         }
+        if (!ini_haskey("meta", "author", full_path.c_str())) {
+            continue;
+        }
+        if (!ini_haskey("meta", "version", full_path.c_str())) {
+            continue;
+        }
+
+        ThemeMeta meta{};
+
+        char buf[FS_MAX_PATH]{};
+        int len{};
+        len = ini_gets("meta", "name", "", buf, sizeof(buf) - 1, full_path.c_str());
+        if (len <= 1) {
+            continue;
+        }
+        meta.name = buf;
+
+        len = ini_gets("meta", "author", "", buf, sizeof(buf) - 1, full_path.c_str());
+        if (len <= 1) {
+            continue;
+        }
+        meta.author = buf;
+
+        len = ini_gets("meta", "version", "", buf, sizeof(buf) - 1, full_path.c_str());
+        if (len <= 1) {
+            continue;
+        }
+        meta.version = buf;
+
+        meta.ini_path = full_path;
+        m_theme_meta_entries.emplace_back(meta);
     }
 }
 
@@ -1264,7 +1132,6 @@ App::App(const char* argv0) {
         ON_SCOPE_EXIT(romfsUnmount("qlaunch"));
         plsrPlayerInit();
         plsrBFSAROpen("qlaunch:/sound/qlaunch.bfsar", &m_qlaunch_bfsar);
-        ON_SCOPE_EXIT(plsrBFSARClose(&m_qlaunch_bfsar));
 
         plsrPlayerLoadSoundByName(&m_qlaunch_bfsar, "SeGameIconFocus", &m_sound_ids[SoundEffect_Focus]);
         plsrPlayerLoadSoundByName(&m_qlaunch_bfsar, "SeGameIconScroll", &m_sound_ids[SoundEffect_Scroll]);
@@ -1283,29 +1150,16 @@ App::App(const char* argv0) {
     ScanThemeEntries();
 
     fs::FsPath theme_path{};
-    constexpr fs::FsPath default_theme_path{"romfs:/themes/abyss_theme.ini"};
     if (App::GetThemeShuffleEnable() && m_theme_meta_entries.size()) {
         theme_path = m_theme_meta_entries[randomGet64() % m_theme_meta_entries.size()].ini_path;
     } else {
-        ini_gets("config", "theme", default_theme_path, theme_path, sizeof(theme_path), CONFIG_PATH);
+        ini_gets("config", "theme", "romfs:/themes/abyss_theme.ini", theme_path, sizeof(theme_path), CONFIG_PATH);
     }
-
+    LoadTheme(theme_path);
-    // try and load previous theme, default to previous version otherwise.
-    ThemeMeta theme_meta;
-    if (R_SUCCEEDED(romfsInit())) {
-        ON_SCOPE_EXIT(romfsExit());
-        if (!LoadThemeMeta(theme_path, theme_meta)) {
-            log_write("failed to load meta using default\n");
-            theme_path = default_theme_path;
-            LoadThemeMeta(theme_path, theme_meta);
-        }
-    }
-    log_write("loading theme from: %s\n", theme_meta.ini_path.s);
-    LoadTheme(theme_meta);
 
     // find theme index using the path of the theme.ini
     for (u64 i = 0; i < m_theme_meta_entries.size(); i++) {
-        if (m_theme.meta.ini_path == m_theme_meta_entries[i].ini_path) {
+        if (m_theme.path == m_theme_meta_entries[i].ini_path) {
             m_theme_index = i;
             break;
         }
@@ -1314,7 +1168,6 @@ App::App(const char* argv0) {
     appletHook(&m_appletHookCookie, appplet_hook_calback, this);
 
     hidInitializeTouchScreen();
-    hidInitializeGesture();
     padConfigureInput(8, HidNpadStyleSet_NpadStandard);
     // padInitializeDefault(&m_pad);
     padInitializeAny(&m_pad);
@@ -1361,9 +1214,6 @@ App::App(const char* argv0) {
         }
     }
 
-    // soon (tm)
-    // ui::bubble::Init();
-
     App::Push(std::make_shared<ui::menu::main::MainMenu>());
     log_write("finished app constructor\n");
 }
@@ -1387,8 +1237,6 @@ App::~App() {
     i18n::exit();
     curl::Exit();
 
-    ui::bubble::Exit();
-
     // this has to be called before any cleanup to ensure the lifetime of
     // nvg is still active as some widgets may need to free images.
     m_widgets.clear();
@@ -1396,7 +1244,7 @@ App::~App() {
 
     appletUnhook(&m_appletHookCookie);
 
-    ini_puts("config", "theme", m_theme.meta.ini_path, CONFIG_PATH);
+    ini_puts("config", "theme", m_theme.path, CONFIG_PATH);
 
     CloseTheme();
 

sphaira/source/i18n.cpp

@@ -77,7 +77,6 @@ bool init(long index) {
         case 10: setLanguage = SetLanguage_PT; break; // "Portuguese"
         case 11: setLanguage = SetLanguage_RU; break; // "Russian"
         case 12: lang_name = "se"; break; // "Swedish"
-        case 13: lang_name = "vi"; break; // "Vietnamese"
     }
 
     switch (setLanguage) {

sphaira/source/ui/bubbles.cpp

@@ -1,115 +0,0 @@
-#include "ui/types.hpp"
-#include "ui/object.hpp"
-#include "ui/nvg_util.hpp"
-#include "app.hpp"
-
-namespace sphaira::ui::bubble {
-namespace {
-
-constexpr auto MAX_BUBBLES = 20;
-
-struct Bubble {
-    int start_x;
-    int texture;
-    int x,y,w,h;
-    int y_inc;
-    float sway_inc;
-    float sway;
-    bool sway_right_flag;
-};
-
-Bubble bubbles[MAX_BUBBLES]{};
-int g_textures[3];
-bool g_is_init = false;
-
-void setup_bubble(Bubble *bubble) {
-    // setup normal vars.
-    bubble->texture = (randomGet64() % std::size(g_textures));
-    bubble->start_x = randomGet64() % (int)SCREEN_WIDTH;
-    bubble->x = bubble->start_x;
-    bubble->y = (int)SCREEN_HEIGHT - ( randomGet64() % 60 );
-    const int size = (randomGet64() % 50) + 40;
-    bubble->w = size;
-    bubble->h = size;
-    bubble->y_inc = (randomGet64() % 5) + 1;
-    bubble->sway_inc = ((randomGet64() % 6) + 3) / 10;
-    bubble->sway = 0;
-}
-
-void setup_bubbles(void) {
-    for (auto& bubble : bubbles) {
-        setup_bubble(&bubble);
-    }
-}
-
-void update_bubbles(void) {
-    for (auto& bubble : bubbles) {
-        if (bubble.y + bubble.h < 0) {
-            setup_bubble(&bubble);
-        } else {
-            bubble.y -= bubble.y_inc;
-
-            if (bubble.sway_right_flag) {
-                bubble.x = bubble.start_x + (bubble.sway -= bubble.sway_inc);
-                if (bubble.sway <= 0) {
-                    bubble.sway_right_flag = false;
-                }
-            } else {
-                bubble.x = bubble.start_x + (bubble.sway += bubble.sway_inc);
-                if (bubble.sway > 30) {
-                    bubble.sway_right_flag = true;
-                }
-            }
-        }
-    }
-}
-
-} // namespace
-
-void Init() {
-    if (g_is_init) {
-        return;
-    }
-
-    if (R_SUCCEEDED(romfsInit())) {
-        ON_SCOPE_EXIT(romfsExit());
-
-        auto vg = App::GetVg();
-        g_textures[0] = nvgCreateImage(vg, "romfs:/theme/bubble1.png", 0);
-        g_textures[1] = nvgCreateImage(vg, "romfs:/theme/bubble2.png", 0);
-        g_textures[2] = nvgCreateImage(vg, "romfs:/theme/bubble3.png", 0);
-
-        setup_bubbles();
-        g_is_init = true;
-    }
-}
-
-void Draw(NVGcontext* vg, Theme* theme) {
-    if (!g_is_init) {
-        return;
-    }
-
-    update_bubbles();
-
-    for (auto& bubble : bubbles) {
-        gfx::drawImage(vg, bubble.x, bubble.y, bubble.w, bubble.h, g_textures[bubble.texture]);
-    }
-}
-
-void Exit() {
-    if (!g_is_init) {
-        return;
-    }
-
-    auto vg = App::GetVg();
-    for (auto& texture : g_textures) {
-        if (texture) {
-            nvgDeleteImage(vg, texture);
-            texture = 0;
-        }
-    }
-
-    g_is_init = false;
-}
-
-} // namespace sphaira::ui::bubble

sphaira/source/ui/error_box.cpp

@@ -1136,18 +1136,18 @@ auto ErrorBox::Update(Controller* controller, TouchInfo* touch) -> void {
 
 auto ErrorBox::Draw(NVGcontext* vg, Theme* theme) -> void {
     gfx::dimBackground(vg);
-    gfx::drawRect(vg, m_pos, theme->GetColour(ThemeEntryID_POPUP));
+    gfx::drawRect(vg, m_pos, theme->elements[ThemeEntryID_SELECTED].colour);
 
     const Vec4 box = { 455, 470, 365, 65 };
     const auto center_x = m_pos.x + m_pos.w/2;
 
-    gfx::drawTextArgs(vg, center_x, 180, 63, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_ERROR), "\uE140");
+    gfx::drawTextArgs(vg, center_x, 180, 63, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, gfx::Colour::RED, "\uE140");
-    gfx::drawTextArgs(vg, center_x, 270, 25, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "Error code: 0x%X Module: %s Description: %s", m_code, m_module_str.c_str(), m_description_str.c_str());
+    gfx::drawTextArgs(vg, center_x, 270, 25, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, theme->elements[ThemeEntryID_TEXT].colour, "Error code: 0x%X Module: %s Description: %s", m_code, m_module_str.c_str(), m_description_str.c_str());
-    gfx::drawTextArgs(vg, center_x, 325, 23, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "%s", m_message.c_str());
+    gfx::drawTextArgs(vg, center_x, 325, 23, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, theme->elements[ThemeEntryID_TEXT].colour, "%s", m_message.c_str());
-    gfx::drawTextArgs(vg, center_x, 380, 20, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT_INFO), "If this message appears repeatedly, please open an issue."_i18n.c_str());
+    gfx::drawTextArgs(vg, center_x, 380, 20, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, gfx::Colour::SILVER, "If this message appears repeatedly, please open an issue."_i18n.c_str());
-    gfx::drawTextArgs(vg, center_x, 415, 20, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT_INFO), "https://github.com/ITotalJustice/sphaira/issues");
+    gfx::drawTextArgs(vg, center_x, 415, 20, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, gfx::Colour::SILVER, "https://github.com/ITotalJustice/sphaira/issues");
-    gfx::drawRectOutline(vg, theme, 4.f, box);
+    gfx::drawRectOutline(vg, 4.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour, box, theme->elements[ThemeEntryID_SELECTED].colour);
-    gfx::drawTextArgs(vg, center_x, box.y + box.h/2, 23, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT_SELECTED), "OK"_i18n.c_str());
+    gfx::drawTextArgs(vg, center_x, box.y + box.h/2, 23, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, gfx::Colour::WHITE, "OK"_i18n.c_str());
 }
 
 } // namespace sphaira::ui

sphaira/source/ui/menus/appstore.cpp

@@ -271,19 +271,11 @@ void DrawIcon(NVGcontext* vg, const LazyImage& l, const LazyImage& d, float x, f
         rounded_image = false;
         gfx::drawRect(vg, x, y, w, h, nvgRGB(i.first_pixel[0], i.first_pixel[1], i.first_pixel[2]), rounded);
     }
-    if (iw > w || ih > h) {
-        crop = true;
-        nvgSave(vg);
-        nvgIntersectScissor(vg, x, y, w, h);
-    }
     if (rounded_image) {
         gfx::drawImageRounded(vg, ix, iy, iw, ih, i.image);
     } else {
         gfx::drawImage(vg, ix, iy, iw, ih, i.image);
     }
-    if (crop) {
-        nvgRestore(vg);
-    }
 }
 
 void DrawIcon(NVGcontext* vg, const LazyImage& l, const LazyImage& d, Vec4 vec, bool rounded = true, float scale = 1.0) {
@@ -733,13 +725,11 @@ void EntryMenu::Draw(NVGcontext* vg, Theme* theme) {
     constexpr Vec4 line_vec(30, 86, 1220, 646);
     constexpr Vec4 banner_vec(70, line_vec.y + 20, 848.f, 208.f);
     constexpr Vec4 icon_vec(968, line_vec.y + 30, 256, 150);
-    constexpr Vec4 grid_vec(icon_vec.x - 50, line_vec.y + 1, line_vec.w, line_vec.h - line_vec.y - 1);
 
     // nvgSave(vg);
     // nvgScissor(vg, line_vec.x, line_vec.y, line_vec.w - line_vec.x, line_vec.h - line_vec.y); // clip
     // ON_SCOPE_EXIT(nvgRestore(vg));
 
-    gfx::drawRect(vg, grid_vec, theme->GetColour(ThemeEntryID_GRID));
     DrawIcon(vg, m_banner, m_entry.image.image ? m_entry.image : m_default_icon, banner_vec, false);
     DrawIcon(vg, m_entry.image, m_default_icon, icon_vec);
 
@@ -748,19 +738,19 @@ void EntryMenu::Draw(NVGcontext* vg, Theme* theme) {
     const float text_inc_y = 32;
     const float font_size = 20;
 
-    gfx::drawTextArgs(vg, text_start_x, text_start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "version: %s"_i18n.c_str(), m_entry.version.c_str());
+    gfx::drawTextArgs(vg, text_start_x, text_start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->elements[ThemeEntryID_TEXT].colour, "version: %s"_i18n.c_str(), m_entry.version.c_str());
     text_start_y += text_inc_y;
-    gfx::drawTextArgs(vg, text_start_x, text_start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "updated: %s"_i18n.c_str(), m_entry.updated.c_str());
+    gfx::drawTextArgs(vg, text_start_x, text_start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->elements[ThemeEntryID_TEXT].colour, "updated: %s"_i18n.c_str(), m_entry.updated.c_str());
     text_start_y += text_inc_y;
-    gfx::drawTextArgs(vg, text_start_x, text_start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "category: %s"_i18n.c_str(), m_entry.category.c_str());
+    gfx::drawTextArgs(vg, text_start_x, text_start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->elements[ThemeEntryID_TEXT].colour, "category: %s"_i18n.c_str(), m_entry.category.c_str());
     text_start_y += text_inc_y;
-    gfx::drawTextArgs(vg, text_start_x, text_start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "extracted: %.2f MiB"_i18n.c_str(), (double)m_entry.extracted / 1024.0);
+    gfx::drawTextArgs(vg, text_start_x, text_start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->elements[ThemeEntryID_TEXT].colour, "extracted: %.2f MiB"_i18n.c_str(), (double)m_entry.extracted / 1024.0);
     text_start_y += text_inc_y;
-    gfx::drawTextArgs(vg, text_start_x, text_start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "app_dls: %s"_i18n.c_str(), AppDlToStr(m_entry.app_dls).c_str());
+    gfx::drawTextArgs(vg, text_start_x, text_start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->elements[ThemeEntryID_TEXT].colour, "app_dls: %s"_i18n.c_str(), AppDlToStr(m_entry.app_dls).c_str());
     text_start_y += text_inc_y;
 
     // for (const auto& option : m_options) {
-    const auto& text_col = theme->GetColour(ThemeEntryID_TEXT);
+    const auto& text_col = theme->elements[ThemeEntryID_TEXT].colour;
 
     // todo: rewrite this mess and use list
     constexpr float mm = 0;//20;
@@ -776,10 +766,15 @@ void EntryMenu::Draw(NVGcontext* vg, Theme* theme) {
         auto text_id = ThemeEntryID_TEXT;
         if (m_index == i) {
             text_id = ThemeEntryID_TEXT_SELECTED;
-            gfx::drawRectOutline(vg, theme, 4.f, Vec4{x, y, w, h});
+            gfx::drawRectOutline(vg, 4.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour, x, y, w, h, theme->elements[ThemeEntryID_SELECTED].colour);
+        } else {
+            // if (i == m_index_offset) {
+                // gfx::drawRect(vg, x, y, w, 1.f, text_col);
+            // }
+            // gfx::drawRect(vg, x, y + h, w, 1.f, text_col);
         }
 
-        gfx::drawTextArgs(vg, x + w / 2, y + h / 2, 22, NVG_ALIGN_MIDDLE | NVG_ALIGN_CENTER, theme->GetColour(ThemeEntryID_TEXT), option.display_text.c_str());
+        gfx::drawTextArgs(vg, x + w / 2, y + h / 2, 22, NVG_ALIGN_MIDDLE | NVG_ALIGN_CENTER, theme->elements[ThemeEntryID_TEXT].colour, option.display_text.c_str());
         y -= block.h + 18;
     }
 
@@ -1032,12 +1027,12 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
     MenuBase::Draw(vg, theme);
 
     if (m_entries.empty()) {
-        gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT_INFO), "Loading..."_i18n.c_str());
+        gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, gfx::Colour::YELLOW, "Loading..."_i18n.c_str());
         return;
     }
 
     if (m_entries_current.empty()) {
-        gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT_INFO), "Empty!"_i18n.c_str());
+        gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, gfx::Colour::YELLOW, "Empty!"_i18n.c_str());
         return;
     }
 
@@ -1106,7 +1101,7 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
         auto text_id = ThemeEntryID_TEXT;
         if (pos == m_index) {
             text_id = ThemeEntryID_TEXT_SELECTED;
-            gfx::drawRectOutline(vg, theme, 4.f, v);
+            gfx::drawRectOutline(vg, 4.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour, x, y, w, h, theme->elements[ThemeEntryID_SELECTED].colour);
         } else {
             DrawElement(x, y, w, h, ThemeEntryID_GRID);
         }
@@ -1121,9 +1116,9 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
         nvgIntersectScissor(vg, v.x, v.y, w - 30.f, h); // clip
         {
             const float font_size = 18;
-            gfx::drawTextArgs(vg, x + 148, y + 45, font_size, NVG_ALIGN_LEFT, theme->GetColour(text_id), e.title.c_str());
+            gfx::drawTextArgs(vg, x + 148, y + 45, font_size, NVG_ALIGN_LEFT, theme->elements[text_id].colour, e.title.c_str());
-            gfx::drawTextArgs(vg, x + 148, y + 80, font_size, NVG_ALIGN_LEFT, theme->GetColour(text_id), e.author.c_str());
+            gfx::drawTextArgs(vg, x + 148, y + 80, font_size, NVG_ALIGN_LEFT, theme->elements[text_id].colour, e.author.c_str());
-            gfx::drawTextArgs(vg, x + 148, y + 115, font_size, NVG_ALIGN_LEFT, theme->GetColour(text_id), e.version.c_str());
+            gfx::drawTextArgs(vg, x + 148, y + 115, font_size, NVG_ALIGN_LEFT, theme->elements[text_id].colour, e.version.c_str());
         }
         nvgRestore(vg);
 

sphaira/source/ui/menus/filebrowser.cpp

@@ -578,10 +578,10 @@ void Menu::Update(Controller* controller, TouchInfo* touch) {
 void Menu::Draw(NVGcontext* vg, Theme* theme) {
     MenuBase::Draw(vg, theme);
 
-    const auto& text_col = theme->GetColour(ThemeEntryID_TEXT);
+    const auto& text_col = theme->elements[ThemeEntryID_TEXT].colour;
 
     if (m_entries_current.empty()) {
-        gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT_INFO), "Empty..."_i18n.c_str());
+        gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, text_col, "Empty..."_i18n.c_str());
         return;
     }
 
@@ -605,17 +605,19 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
         }
 
         if (e.IsSelected()) {
-            gfx::drawText(vg, Vec2{x - 10.f, y + (h / 2.f) - (24.f / 2)}, 24.f, "\uE14B", nullptr, NVG_ALIGN_RIGHT | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT_SELECTED));
+            // gfx::drawText(vg, x - 60.f, y + (h / 2.f) - (48.f / 2), 48.f, "\uE14B", nullptr, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, gfx::Colour::CYAN);
+            gfx::drawText(vg, x, y + (h / 2.f) - (24.f / 2), 24.f, "\uE14B", nullptr, NVG_ALIGN_RIGHT | NVG_ALIGN_TOP, gfx::Colour::CYAN);
         }
 
         auto text_id = ThemeEntryID_TEXT;
         if (m_index == i) {
             text_id = ThemeEntryID_TEXT_SELECTED;
-            gfx::drawRectOutline(vg, theme, 4.f, v);
+            gfx::drawRectOutline(vg, 4.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour, x, y, w, h, theme->elements[ThemeEntryID_SELECTED].colour);
         } else {
-            if (i != m_entries_current.size() - 1) {
+            if (i == m_index) {
-                gfx::drawRect(vg, Vec4{x, y + h, w, 1.f}, theme->GetColour(ThemeEntryID_LINE_SEPARATOR));
+                gfx::drawRect(vg, x, y, w, 1.f, text_col);
             }
+            gfx::drawRect(vg, x, y + h, w, 1.f, text_col);
         }
 
         if (e.IsDir()) {
@@ -640,12 +642,12 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
 
         nvgSave(vg);
         nvgIntersectScissor(vg, x + text_xoffset+65, y, w-(x+text_xoffset+65+50), h);
-            gfx::drawText(vg, x + text_xoffset+65, y + (h / 2.f), 20.f, e.name, NULL, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE, theme->GetColour(text_id));
+            gfx::drawText(vg, x + text_xoffset+65, y + (h / 2.f), 20.f, e.name, NULL, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE, theme->elements[text_id].colour);
         nvgRestore(vg);
 
         if (e.IsDir()) {
-            gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f) - 3, 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_BOTTOM, theme->GetColour(text_id), "%zd files"_i18n.c_str(), e.file_count);
+            gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f) - 3, 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_BOTTOM, theme->elements[text_id].colour, "%zd files"_i18n.c_str(), e.file_count);
-            gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f) + 3, 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_TOP, theme->GetColour(text_id), "%zd dirs"_i18n.c_str(), e.dir_count);
+            gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f) + 3, 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_TOP, theme->elements[text_id].colour, "%zd dirs"_i18n.c_str(), e.dir_count);
         } else {
             if (!e.time_stamp.is_valid) {
                 const auto path = GetNewPath(e);
@@ -654,11 +656,11 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
             const auto t = (time_t)(e.time_stamp.modified);
             struct tm tm{};
             localtime_r(&t, &tm);
-            gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f) + 3, 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_TOP, theme->GetColour(text_id), "%02u/%02u/%u", tm.tm_mday, tm.tm_mon + 1, tm.tm_year + 1900);
+            gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f) + 3, 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_TOP, theme->elements[text_id].colour, "%02u/%02u/%u", tm.tm_mday, tm.tm_mon + 1, tm.tm_year + 1900);
             if ((double)e.file_size / 1024.0 / 1024.0 <= 0.009) {
-                gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f) - 3, 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_BOTTOM, theme->GetColour(text_id), "%.2f KiB", (double)e.file_size / 1024.0);
+                gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f) - 3, 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_BOTTOM, theme->elements[text_id].colour, "%.2f KiB", (double)e.file_size / 1024.0);
             } else {
-                gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f) - 3, 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_BOTTOM, theme->GetColour(text_id), "%.2f MiB", (double)e.file_size / 1024.0 / 1024.0);
+                gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f) - 3, 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_BOTTOM, theme->elements[text_id].colour, "%.2f MiB", (double)e.file_size / 1024.0 / 1024.0);
             }
         }
     });

sphaira/source/ui/menus/ghdl.cpp

@@ -386,10 +386,10 @@ void Menu::Update(Controller* controller, TouchInfo* touch) {
 void Menu::Draw(NVGcontext* vg, Theme* theme) {
     MenuBase::Draw(vg, theme);
 
-    const auto& text_col = theme->GetColour(ThemeEntryID_TEXT);
+    const auto& text_col = theme->elements[ThemeEntryID_TEXT].colour;
 
     if (m_entries.empty()) {
-        gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT_INFO), "Empty..."_i18n.c_str());
+        gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, text_col, "Empty..."_i18n.c_str());
         return;
     }
 
@@ -402,19 +402,20 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
         auto text_id = ThemeEntryID_TEXT;
         if (m_index == i) {
             text_id = ThemeEntryID_TEXT_SELECTED;
-            gfx::drawRectOutline(vg, theme, 4.f, v);
+            gfx::drawRectOutline(vg, 4.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour, x, y, w, h, theme->elements[ThemeEntryID_SELECTED].colour);
         } else {
-            if (i != m_entries.size() - 1) {
+            if (i == m_index_offset) {
-                gfx::drawRect(vg, x, y + h, w, 1.f, theme->GetColour(ThemeEntryID_LINE_SEPARATOR));
+                gfx::drawRect(vg, x, y, w, 1.f, text_col);
             }
+            gfx::drawRect(vg, x, y + h, w, 1.f, text_col);
         }
 
         nvgSave(vg);
         nvgIntersectScissor(vg, x + text_xoffset, y, w-(x+text_xoffset+50), h);
-            gfx::drawTextArgs(vg, x + text_xoffset, y + (h / 2.f), 20.f, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE, theme->GetColour(text_id), "%s By %s", e.repo.c_str(), e.owner.c_str());
+            gfx::drawTextArgs(vg, x + text_xoffset, y + (h / 2.f), 20.f, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE, theme->elements[text_id].colour, "%s By %s", e.repo.c_str(), e.owner.c_str());
         nvgRestore(vg);
 
-        gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f), 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_MIDDLE, theme->GetColour(text_id), "version: %s", e.tag.c_str());
+        gfx::drawTextArgs(vg, x + w - text_xoffset, y + (h / 2.f), 16.f, NVG_ALIGN_RIGHT | NVG_ALIGN_MIDDLE, theme->elements[text_id].colour, "version: %s", e.tag.c_str());
     });
 }
 
@@ -428,7 +429,11 @@ void Menu::OnFocusGained() {
 void Menu::SetIndex(s64 index) {
     m_index = index;
     if (!m_index) {
-        m_list->SetYoff(0);
+        m_index_offset = 0;
+    }
+
+    if (m_index > m_index_offset && m_index - m_index_offset >= 7) {
+        m_index_offset = m_index - 7;
     }
 
     SetTitleSubHeading(m_entries[m_index].json_path);
@@ -437,6 +442,8 @@ void Menu::SetIndex(s64 index) {
 
 void Menu::Scan() {
     m_entries.clear();
+    m_index = 0;
+    m_index_offset = 0;
 
     // load from romfs first
     if (R_SUCCEEDED(romfsInit())) {

sphaira/source/ui/menus/homebrew.cpp

@@ -196,7 +196,7 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
         auto text_id = ThemeEntryID_TEXT;
         if (pos == m_index) {
             text_id = ThemeEntryID_TEXT_SELECTED;
-            gfx::drawRectOutline(vg, theme, 4.f, v);
+            gfx::drawRectOutline(vg, 4.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour, v, theme->elements[ThemeEntryID_SELECTED].colour);
         } else {
             DrawElement(v, ThemeEntryID_GRID);
         }
@@ -216,9 +216,9 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
             }
 
             const float font_size = 18;
-            gfx::drawTextArgs(vg, x + 148, y + 45, font_size, NVG_ALIGN_LEFT, theme->GetColour(text_id), "%s%s", has_star ? "\u2605 " : "", e.GetName());
+            gfx::drawTextArgs(vg, x + 148, y + 45, font_size, NVG_ALIGN_LEFT, theme->elements[text_id].colour, "%s%s", has_star ? "\u2605 " : "", e.GetName());
-            gfx::drawTextArgs(vg, x + 148, y + 80, font_size, NVG_ALIGN_LEFT, theme->GetColour(text_id), e.GetAuthor());
+            gfx::drawTextArgs(vg, x + 148, y + 80, font_size, NVG_ALIGN_LEFT, theme->elements[text_id].colour, e.GetAuthor());
-            gfx::drawTextArgs(vg, x + 148, y + 115, font_size, NVG_ALIGN_LEFT, theme->GetColour(text_id), e.GetDisplayVersion());
+            gfx::drawTextArgs(vg, x + 148, y + 115, font_size, NVG_ALIGN_LEFT, theme->elements[text_id].colour, e.GetDisplayVersion());
         }
         nvgRestore(vg);
     });
@@ -320,6 +320,11 @@ void Menu::Sort() {
         fs::FsPath star_path;
         for (auto& p : m_entries) {
             p.has_star = fs.FileExists(GenerateStarPath(p.path));
+            if (p.has_star == true) {
+                log_write("found star: %s\n", p.path.s);
+            } else {
+                log_write("no star: %s\n", p.path.s);
+            }
         }
     }
 

sphaira/source/ui/menus/main_menu.cpp

@@ -89,10 +89,6 @@ auto InstallUpdate(ProgressBox* pbox, const std::string url, const std::string v
                 file_path = fs::AppendPath("/", file_path);
             }
 
-            if (std::strstr(file_path, "sphaira.nro")) {
-                file_path = App::GetExePath();
-            }
-
             Result rc;
             if (file_path[strlen(file_path) -1] == '/') {
                 if (R_FAILED(rc = fs.CreateDirectoryRecursively(file_path)) && rc != FsError_PathAlreadyExists) {
@@ -229,7 +225,6 @@ MainMenu::MainMenu() {
             language_items.push_back("Portuguese"_i18n);
             language_items.push_back("Russian"_i18n);
             language_items.push_back("Swedish"_i18n);
-            language_items.push_back("Vietnamese"_i18n);
 
             options->Add(std::make_shared<SidebarEntryCallback>("Theme"_i18n, [this](){
                 SidebarEntryArray::Items theme_items{};
@@ -279,8 +274,11 @@ MainMenu::MainMenu() {
                                 m_update_state = UpdateState::None;
                                 App::Notify("Updated to "_i18n + m_update_version);
                                 App::Push(std::make_shared<OptionBox>(
-                                    "Press OK to restart Sphaira"_i18n, "OK"_i18n, [](auto){
+                                    "Restart Sphaira?"_i18n,
-                                        App::ExitRestart();
+                                    "Back"_i18n, "Restart"_i18n, 1, [this](auto op_index){
+                                        if (op_index && *op_index) {
+                                            App::ExitRestart();
+                                        }
                                     }
                                 ));
                             } else {
@@ -326,11 +324,6 @@ MainMenu::MainMenu() {
                 install_items.push_back("System memory"_i18n);
                 install_items.push_back("microSD card"_i18n);
 
-                SidebarEntryArray::Items text_scroll_speed_items;
-                text_scroll_speed_items.push_back("Slow"_i18n);
-                text_scroll_speed_items.push_back("Normal"_i18n);
-                text_scroll_speed_items.push_back("Fast"_i18n);
-
                 options->Add(std::make_shared<SidebarEntryBool>("Logging"_i18n, App::GetLogEnable(), [this](bool& enable){
                     App::SetLogEnable(enable);
                 }, "Enabled"_i18n, "Disabled"_i18n));
@@ -350,10 +343,6 @@ MainMenu::MainMenu() {
                 options->Add(std::make_shared<SidebarEntryBool>("Show install warning"_i18n, App::GetInstallPrompt(), [this](bool& enable){
                     App::SetInstallPrompt(enable);
                 }, "Enabled"_i18n, "Disabled"_i18n));
-
-                options->Add(std::make_shared<SidebarEntryArray>("Text scroll speed"_i18n, text_scroll_speed_items, [this](s64& index_out){
-                    App::SetTextScrollSpeed(index_out);
-                }, (s64)App::GetTextScrollSpeed()));
             }));
         }})
     );

sphaira/source/ui/menus/menu_base.cpp

@@ -41,7 +41,7 @@ void MenuBase::Draw(NVGcontext* vg, Theme* theme) {
     #define draw(...) \
         gfx::textBounds(vg, 0, 0, bounds, __VA_ARGS__); \
         start_x -= bounds[2] - bounds[0]; \
-        gfx::drawTextArgs(vg, start_x, start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_BOTTOM, theme->GetColour(ThemeEntryID_TEXT), __VA_ARGS__); \
+        gfx::drawTextArgs(vg, start_x, start_y, font_size, NVG_ALIGN_LEFT | NVG_ALIGN_BOTTOM, theme->elements[ThemeEntryID_TEXT].colour, __VA_ARGS__); \
         start_x -= spacing;
 
     // draw("version %s", APP_VERSION);
@@ -58,15 +58,17 @@ void MenuBase::Draw(NVGcontext* vg, Theme* theme) {
 
     #undef draw
 
-    gfx::drawRect(vg, 30.f, 86.f, 1220.f, 1.f, theme->GetColour(ThemeEntryID_LINE));
+    gfx::drawRect(vg, 30.f, 86.f, 1220.f, 1.f, theme->elements[ThemeEntryID_TEXT].colour);
-    gfx::drawRect(vg, 30.f, 646.0f, 1220.f, 1.f, theme->GetColour(ThemeEntryID_LINE));
+    gfx::drawRect(vg, 30.f, 646.0f, 1220.f, 1.f, theme->elements[ThemeEntryID_TEXT].colour);
 
     nvgFontSize(vg, 28);
     gfx::textBounds(vg, 0, 0, bounds, m_title.c_str());
-    gfx::drawTextArgs(vg, 80, start_y, 28.f, NVG_ALIGN_LEFT | NVG_ALIGN_BOTTOM, theme->GetColour(ThemeEntryID_TEXT), m_title.c_str());
+    gfx::drawTextArgs(vg, 80, start_y, 28.f, NVG_ALIGN_LEFT | NVG_ALIGN_BOTTOM, theme->elements[ThemeEntryID_TEXT].colour, m_title.c_str());
-    gfx::drawTextArgs(vg, 80 + (bounds[2] - bounds[0]) + 10, start_y, 16, NVG_ALIGN_LEFT | NVG_ALIGN_BOTTOM, theme->GetColour(ThemeEntryID_TEXT_INFO), m_title_sub_heading.c_str());
+    gfx::drawTextArgs(vg, 80 + (bounds[2] - bounds[0]) + 10, start_y, 16, NVG_ALIGN_LEFT | NVG_ALIGN_BOTTOM, theme->elements[ThemeEntryID_TEXT].colour, m_title_sub_heading.c_str());
 
-    gfx::drawTextArgs(vg, 80, 685.f, 18, NVG_ALIGN_LEFT, theme->GetColour(ThemeEntryID_TEXT), "%s", m_sub_heading.c_str());
+    // gfx::drawTextArgs(vg, 80, 65, 28.f, NVG_ALIGN_LEFT, theme->elements[ThemeEntryID_TEXT].colour, m_title.c_str());
+    // gfx::drawTextArgs(vg, 80, 680.f, 18, NVG_ALIGN_LEFT, theme->elements[ThemeEntryID_TEXT].colour, "%s", m_sub_heading.c_str());
+    gfx::drawTextArgs(vg, 80, 685.f, 18, NVG_ALIGN_LEFT, theme->elements[ThemeEntryID_TEXT].colour, "%s", m_sub_heading.c_str());
 }
 
 void MenuBase::SetTitle(std::string title) {

sphaira/source/ui/menus/themezer.cpp

@@ -542,13 +542,13 @@ Menu::Menu() : MenuBase{"Themezer"_i18n} {
         }})
     );
 
-    const Vec4 v{75, 110, 350, 250};
-    const Vec2 pad{10, 10};
-    m_list = std::make_unique<List>(3, 6, m_pos, v, pad);
-
     m_page_index = 0;
     m_pages.resize(1);
     PackListDownload();
+
+    const Vec4 v{75, 110, 350, 250};
+    const Vec2 pad{10, 10};
+    m_list = std::make_unique<List>(3, 6, m_pos, v, pad);
 }
 
 Menu::~Menu() {
@@ -581,7 +581,7 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
     MenuBase::Draw(vg, theme);
 
     if (m_pages.empty()) {
-        gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT_INFO), "Empty!"_i18n.c_str());
+        gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, gfx::Colour::YELLOW, "Empty!"_i18n.c_str());
         return;
     }
 
@@ -589,15 +589,15 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
 
     switch (page.m_ready) {
         case PageLoadState::None:
-            gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT_INFO), "Not Ready..."_i18n.c_str());
+            gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, gfx::Colour::YELLOW, "Not Ready..."_i18n.c_str());
             return;
         case PageLoadState::Loading:
-            gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT_INFO), "Loading"_i18n.c_str());
+            gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, gfx::Colour::YELLOW, "Loading"_i18n.c_str());
             return;
         case PageLoadState::Done:
             break;
         case PageLoadState::Error:
-            gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT_INFO), "Error loading page!"_i18n.c_str());
+            gfx::drawTextArgs(vg, SCREEN_WIDTH / 2.f, SCREEN_HEIGHT / 2.f, 36.f, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE, gfx::Colour::YELLOW, "Error loading page!"_i18n.c_str());
             return;
     }
 
@@ -612,7 +612,7 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
         auto text_id = ThemeEntryID_TEXT;
         if (pos == m_index) {
             text_id = ThemeEntryID_TEXT_SELECTED;
-            gfx::drawRectOutline(vg, theme, 4.f, v);
+            gfx::drawRectOutline(vg, 4.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour, x, y, w, h, theme->elements[ThemeEntryID_SELECTED].colour);
         } else {
             DrawElement(x, y, w, h, ThemeEntryID_GRID);
         }
@@ -683,8 +683,8 @@ void Menu::Draw(NVGcontext* vg, Theme* theme) {
         nvgSave(vg);
         nvgIntersectScissor(vg, x, y, w - 30.f, h); // clip
         {
-            gfx::drawTextArgs(vg, x + xoff, y + 180 + 20, 18, NVG_ALIGN_LEFT, theme->GetColour(text_id), "%s", e.details.name.c_str());
+            gfx::drawTextArgs(vg, x + xoff, y + 180 + 20, 18, NVG_ALIGN_LEFT, theme->elements[text_id].colour, "%s", e.details.name.c_str());
-            gfx::drawTextArgs(vg, x + xoff, y + 180 + 55, 18, NVG_ALIGN_LEFT, theme->GetColour(text_id), "%s", e.creator.display_name.c_str());
+            gfx::drawTextArgs(vg, x + xoff, y + 180 + 55, 18, NVG_ALIGN_LEFT, theme->elements[text_id].colour, "%s", e.creator.display_name.c_str());
         }
         nvgRestore(vg);
     });

sphaira/source/ui/notification.cpp

@@ -19,9 +19,15 @@ auto NotifEntry::Draw(NVGcontext* vg, Theme* theme, float y) -> bool {
 }
 
 auto NotifEntry::Draw(NVGcontext* vg, Theme* theme) -> void {
-    auto text_col = theme->GetColour(ThemeEntryID_TEXT);
+    auto overlay_col = theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour;
+    auto selected_col = theme->elements[ThemeEntryID_SELECTED].colour;
+    auto text_col = theme->elements[ThemeEntryID_TEXT].colour;
     float font_size = 18.f;
+    // overlay_col.a = 0.2f;
+    // selected_col.a = 0.2f;
+    // text_col.a = 0.2f;
 
+    // auto vg = App::GetVg();
     if (!m_bounds_measured) {
         m_bounds_measured = true;
         m_pos.w = 320.f;
@@ -43,7 +49,7 @@ auto NotifEntry::Draw(NVGcontext* vg, Theme* theme) -> void {
         }
     }
 
-    gfx::drawRectOutline(vg, theme, 4.f, m_pos);
+    gfx::drawRectOutline(vg, 4.f, overlay_col, m_pos, selected_col);
     gfx::drawText(vg, Vec2{m_pos.x + (m_pos.w / 2.f), m_pos.y + (m_pos.h / 2.f)}, font_size, text_col, m_text.c_str(), NVG_ALIGN_MIDDLE | NVG_ALIGN_CENTER);
 }
 

sphaira/source/ui/nvg_util.cpp

@@ -33,41 +33,76 @@ static constexpr std::array buttons = {
     std::pair{Button::R3, "\uE105"},
 };
 
+#define F(a) (a/255.f) // turn range 0-255 to 0.f-1.f range
+constexpr std::array COLOURS = {
+    std::pair<Colour, NVGcolor>{Colour::BLACK, { F(45.f), F(45.f), F(45.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::LIGHT_BLACK, { F(50.f), F(50.f), F(50.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::SILVER, { F(128.f), F(128.f), F(128.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::DARK_GREY, { F(70.f), F(70.f), F(70.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::GREY, { F(77.f), F(77.f), F(77.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::WHITE, { F(251.f), F(251.f), F(251.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::CYAN, { F(0.f), F(255.f), F(200.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::TEAL, { F(143.f), F(253.f), F(252.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::BLUE, { F(36.f), F(141.f), F(199.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::LIGHT_BLUE, { F(26.f), F(188.f), F(252.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::YELLOW, { F(255.f), F(177.f), F(66.f), F(255.f) }},
+    std::pair<Colour, NVGcolor>{Colour::RED, { F(250.f), F(90.f), F(58.f), F(255.f) }}
+};
+#undef F
+
 // NEW ---------------------
-void drawRectIntenal(NVGcontext* vg, const Vec4& v, const NVGcolor& c, bool rounded) {
+inline void drawRectIntenal(NVGcontext* vg, const Vec4& vec, const NVGcolor& c, bool rounded) {
     nvgBeginPath(vg);
     if (rounded) {
-        nvgRoundedRect(vg, v.x, v.y, v.w, v.h, 15);
+        nvgRoundedRect(vg, vec.x, vec.y, vec.w, vec.h, 15);
     } else {
-        nvgRect(vg, v.x, v.y, v.w, v.h);
+        nvgRect(vg, vec.x, vec.y, vec.w, vec.h);
     }
     nvgFillColor(vg, c);
     nvgFill(vg);
 }
 
-void drawRectIntenal(NVGcontext* vg, const Vec4& v, const NVGpaint& p, bool rounded) {
+inline void drawRectIntenal(NVGcontext* vg, const Vec4& vec, const NVGpaint& p, bool rounded) {
     nvgBeginPath(vg);
     if (rounded) {
-        nvgRoundedRect(vg, v.x, v.y, v.w, v.h, 15);
+        nvgRoundedRect(vg, vec.x, vec.y, vec.w, vec.h, 15);
     } else {
-        nvgRect(vg, v.x, v.y, v.w, v.h);
+        nvgRect(vg, vec.x, vec.y, vec.w, vec.h);
     }
     nvgFillPaint(vg, p);
     nvgFill(vg);
 }
 
-void drawRectOutlineInternal(NVGcontext* vg, const Theme* theme, float size, const Vec4& v) {
+inline void drawRectOutlineInternal(NVGcontext* vg, float size, const NVGcolor& out_col, Vec4 vec, const NVGcolor& c) {
     float gradientX, gradientY, color;
     getHighlightAnimation(&gradientX, &gradientY, &color);
 
+#if 1
+    // NVGcolor pulsationColor = nvgRGBAf((color * out_col.r) + (1 - color) * out_col.r,
+    //         (color * out_col.g) + (1 - color) * out_col.g,
+    //         (color * out_col.b) + (1 - color) * out_col.b,
+    //         out_col.a);
+    NVGcolor pulsationColor = nvgRGBAf((color * out_col.r) + (1 - color) * out_col.r,
+            (color * out_col.g) + (1 - color) * out_col.g,
+            (color * out_col.b) + (1 - color) * out_col.b,
+            out_col.a);
+
+    drawRectIntenal(vg, {vec.x-size,vec.y-size,vec.w+(size*2.f),vec.h+(size * 2.f)}, pulsationColor, false);
+    drawRectIntenal(vg, vec, c, false);
+#else
     const auto strokeWidth = 5.0;
-    auto v2 = v;
+    auto v2 = vec;
     v2.x -= strokeWidth / 2.0;
     v2.y -= strokeWidth / 2.0;
     v2.w += strokeWidth;
     v2.h += strokeWidth;
     const auto corner_radius = 0.5;
 
+    // nvgSave(vg);
+    // nvgResetScissor(vg);
+
+    // const auto stroke_width = 5.0f;
+    // const auto shadow_corner_radius = 6.0f;
     const auto shadow_width = 2.0f;
     const auto shadow_offset = 10.0f;
     const auto shadow_feather = 10.0f;
@@ -88,8 +123,8 @@ void drawRectOutlineInternal(NVGcontext* vg, const Theme* theme, float size, con
     nvgFillPaint(vg, shadowPaint);
     nvgFill(vg);
 
-    const auto color1 = theme->GetColour(ThemeEntryID_HIGHLIGHT_1);
+    const auto color1 = nvgRGB(25, 138, 198);
-    const auto color2 = theme->GetColour(ThemeEntryID_HIGHLIGHT_2);
+    const auto color2 = nvgRGB(137, 241, 242);
     const auto borderColor = nvgRGBAf(color2.r, color2.g, color2.b, 0.5);
     const auto transparent = nvgRGBA(0, 0, 0, 0);
 
@@ -125,32 +160,55 @@ void drawRectOutlineInternal(NVGcontext* vg, const Theme* theme, float size, con
     nvgStrokeWidth(vg, strokeWidth);
     nvgRoundedRect(vg, v2.x, v2.y, v2.w, v2.h, corner_radius);
     nvgStroke(vg);
+
+    drawRectIntenal(vg, {vec.x-size,vec.y-size,vec.w+(size*2.f),vec.h+(size * 2.f)}, pulsationColor, false);
+    drawRectIntenal(vg, vec, c, true);
+    nvgBeginPath(vg);
+    nvgRoundedRect(vg, vec.x, vec.y, vec.w, vec.h, corner_radius);
+    nvgFillColor(vg, c);
+    nvgFill(vg);
+
+    // nvgRestore(vg);
+#endif
 }
 
-void drawRectOutlineInternal(NVGcontext* vg, const Theme* theme, float size, const Vec4& v, const NVGcolor& c) {
+inline void drawRectOutlineInternal(NVGcontext* vg, float size, const NVGcolor& out_col, Vec4 vec, const NVGpaint& p) {
-    const auto corner_radius = 0.5;
+    float gradientX, gradientY, color;
-    drawRectOutlineInternal(vg, theme, size, v);
+    getHighlightAnimation(&gradientX, &gradientY, &color);
+
+    NVGcolor pulsationColor = nvgRGBAf((color * out_col.r) + (1 - color) * out_col.r,
+            (color * out_col.g) + (1 - color) * out_col.g,
+            (color * out_col.b) + (1 - color) * out_col.b,
+            out_col.a);
+
+    drawRectIntenal(vg, {vec.x-size,vec.y-size,vec.w+(size*2.f),vec.h+(size * 2.f)}, pulsationColor, false);
+    drawRectIntenal(vg, vec, p, false);
+}
+
+inline void drawTriangleInternal(NVGcontext* vg, float aX, float aY, float bX, float bY, float cX, float cY, const NVGcolor& c) {
     nvgBeginPath(vg);
-    nvgRoundedRect(vg, v.x, v.y, v.w, v.h, corner_radius);
+    nvgMoveTo(vg, aX, aY);
+    nvgLineTo(vg, bX, bY);
+    nvgLineTo(vg, cX, cY);
     nvgFillColor(vg, c);
     nvgFill(vg);
 }
 
-void drawRectOutlineInternal(NVGcontext* vg, const Theme* theme, float size, const Vec4& v, const NVGpaint& p) {
+inline void drawTriangleInternal(NVGcontext* vg, float aX, float aY, float bX, float bY, float cX, float cY, const NVGpaint& p) {
-    const auto corner_radius = 0.5;
-    drawRectOutlineInternal(vg, theme, size, v);
     nvgBeginPath(vg);
-    nvgRoundedRect(vg, v.x, v.y, v.w, v.h, corner_radius);
+    nvgMoveTo(vg, aX, aY);
+    nvgLineTo(vg, bX, bY);
+    nvgLineTo(vg, cX, cY);
     nvgFillPaint(vg, p);
     nvgFill(vg);
 }
 
-void drawTextIntenal(NVGcontext* vg, const Vec2& v, float size, const char* str, const char* end, int align, const NVGcolor& c) {
+inline void drawTextIntenal(NVGcontext* vg, Vec2 vec, float size, const char* str, const char* end, int align, const NVGcolor& c) {
     nvgBeginPath(vg);
     nvgFontSize(vg, size);
     nvgTextAlign(vg, align);
     nvgFillColor(vg, c);
-    nvgText(vg, v.x, v.y, str, end);
+    nvgText(vg, vec.x, vec.y, str, end);
 }
 
 } // namespace
@@ -164,6 +222,15 @@ const char* getButton(const Button want) {
     std::unreachable();
 }
 
+NVGcolor getColour(Colour want) {
+    for (auto& [key, val] : COLOURS) {
+        if (key == want) {
+            return val;
+        }
+    }
+    std::unreachable();
+}
+
 void drawTextArgs(NVGcontext* vg, float x, float y, float size, int align, const NVGcolor& c, const char* str, ...) {
     std::va_list v;
     va_start(v, str);
@@ -173,7 +240,7 @@ void drawTextArgs(NVGcontext* vg, float x, float y, float size, int align, const
     drawText(vg, x, y, size, buffer, nullptr, align, c);
 }
 
-static void drawImageInternal(NVGcontext* vg, const Vec4& v, int texture, int rounded = 0) {
+static void drawImageInternal(NVGcontext* vg, Vec4 v, int texture, int rounded = 0) {
     const auto paint = nvgImagePattern(vg, v.x, v.y, v.w, v.h, 0, texture, 1.f);
     // drawRect(vg, x, y, w, h, paint);
     nvgBeginPath(vg);
@@ -187,7 +254,7 @@ static void drawImageInternal(NVGcontext* vg, const Vec4& v, int texture, int ro
     nvgFill(vg);
 }
 
-void drawImage(NVGcontext* vg, const Vec4& v, int texture) {
+void drawImage(NVGcontext* vg, Vec4 v, int texture) {
     const auto paint = nvgImagePattern(vg, v.x, v.y, v.w, v.h, 0, texture, 1.f);
     drawRect(vg, v, paint, false);
 }
@@ -196,7 +263,7 @@ void drawImage(NVGcontext* vg, float x, float y, float w, float h, int texture)
     drawImage(vg, Vec4(x, y, w, h), texture);
 }
 
-void drawImageRounded(NVGcontext* vg, const Vec4& v, int texture) {
+void drawImageRounded(NVGcontext* vg, Vec4 v, int texture) {
     const auto paint = nvgImagePattern(vg, v.x, v.y, v.w, v.h, 0, texture, 1.f);
     nvgBeginPath(vg);
     nvgRoundedRect(vg, v.x, v.y, v.w, v.h, 15);
@@ -208,7 +275,7 @@ void drawImageRounded(NVGcontext* vg, float x, float y, float w, float h, int te
     drawImageRounded(vg, Vec4(x, y, w, h), texture);
 }
 
-void drawTextBox(NVGcontext* vg, float x, float y, float size, float bound, const NVGcolor& c, const char* str, int align, const char* end) {
+void drawTextBox(NVGcontext* vg, float x, float y, float size, float bound, NVGcolor& c, const char* str, int align, const char* end) {
     nvgBeginPath(vg);
     nvgFontSize(vg, size);
     nvgTextAlign(vg, align);
@@ -216,6 +283,14 @@ void drawTextBox(NVGcontext* vg, float x, float y, float size, float bound, cons
     nvgTextBox(vg, x, y, bound, str, end);
 }
 
+void drawTextBox(NVGcontext* vg, float x, float y, float size, float bound, NVGcolor&& c, const char* str, int align, const char* end) {
+    drawTextBox(vg, x, y, size, bound, c, str, align, end);
+}
+
+void drawTextBox(NVGcontext* vg, float x, float y, float size, float bound, Colour c, const char* str, int align, const char* end) {
+    drawTextBox(vg, x, y, size, bound, getColour(c), str, align, end);
+}
+
 void textBounds(NVGcontext* vg, float x, float y, float *bounds, const char* str, ...) {
     char buf[0x100];
     va_list v;
@@ -228,50 +303,171 @@ void textBounds(NVGcontext* vg, float x, float y, float *bounds, const char* str
 // NEW-----------
 
 void dimBackground(NVGcontext* vg) {
-    drawRectIntenal(vg, {0.f,0.f,SCREEN_WIDTH,SCREEN_HEIGHT}, nvgRGBA(0, 0, 0, 180), false);
+    // drawRectIntenal(vg, {0.f,0.f,1280.f,720.f}, nvgRGBA(30,30,30,180));
+    // drawRectIntenal(vg, {0.f,0.f,1920.f,1080.f}, nvgRGBA(20, 20, 20, 225), false);
+    drawRectIntenal(vg, {0.f,0.f,1920.f,1080.f}, nvgRGBA(0, 0, 0, 230), false);
+}
+
+void drawRect(NVGcontext* vg, float x, float y, float w, float h, Colour c, bool rounded) {
+    drawRectIntenal(vg, {x,y,w,h}, getColour(c), rounded);
+}
+
+void drawRect(NVGcontext* vg, Vec4 vec, Colour c, bool rounded) {
+    drawRectIntenal(vg, vec, getColour(c), rounded);
 }
 
 void drawRect(NVGcontext* vg, float x, float y, float w, float h, const NVGcolor& c, bool rounded) {
     drawRectIntenal(vg, {x,y,w,h}, c, rounded);
 }
 
-void drawRect(NVGcontext* vg, const Vec4& v, const NVGcolor& c, bool rounded) {
+void drawRect(NVGcontext* vg, float x, float y, float w, float h, const NVGcolor&& c, bool rounded) {
-    drawRectIntenal(vg, v, c, rounded);
+    drawRectIntenal(vg, {x,y,w,h}, c, rounded);
+}
+
+void drawRect(NVGcontext* vg, Vec4 vec, const NVGcolor& c, bool rounded) {
+    drawRectIntenal(vg, vec, c, rounded);
+}
+
+void drawRect(NVGcontext* vg, Vec4 vec, const NVGcolor&& c, bool rounded) {
+    drawRectIntenal(vg, vec, c, rounded);
 }
 
 void drawRect(NVGcontext* vg, float x, float y, float w, float h, const NVGpaint& p, bool rounded) {
     drawRectIntenal(vg, {x,y,w,h}, p, rounded);
 }
 
-void drawRect(NVGcontext* vg, const Vec4& v, const NVGpaint& p, bool rounded) {
+void drawRect(NVGcontext* vg, float x, float y, float w, float h, const NVGpaint&& p, bool rounded) {
-    drawRectIntenal(vg, v, p, rounded);
+    drawRectIntenal(vg, {x,y,w,h}, p, rounded);
 }
 
-void drawRectOutline(NVGcontext* vg, const Theme* theme, float size, float x, float y, float w, float h) {
+void drawRect(NVGcontext* vg, Vec4 vec, const NVGpaint& p, bool rounded) {
-    drawRectOutlineInternal(vg, theme, size, {x,y,w,h}, theme->GetColour(ThemeEntryID_SELECTED_BACKGROUND));
+    drawRectIntenal(vg, vec, p, rounded);
 }
 
-void drawRectOutline(NVGcontext* vg, const Theme* theme, float size, const Vec4& v) {
+void drawRect(NVGcontext* vg, Vec4 vec, const NVGpaint&& p, bool rounded) {
-    drawRectOutlineInternal(vg, theme, size, v, theme->GetColour(ThemeEntryID_SELECTED_BACKGROUND));
+    drawRectIntenal(vg, vec, p, rounded);
+}
+
+
+void drawRectOutline(NVGcontext* vg, float size, const NVGcolor& out_col, float x, float y, float w, float h, Colour c) {
+    drawRectOutlineInternal(vg, size, out_col, {x,y,w,h}, getColour(c));
+}
+
+void drawRectOutline(NVGcontext* vg, float size, const NVGcolor& out_col, Vec4 vec, Colour c) {
+    drawRectOutlineInternal(vg, size, out_col, vec, getColour(c));
+}
+
+void drawRectOutline(NVGcontext* vg, float size, const NVGcolor& out_col, float x, float y, float w, float h, const NVGcolor& c) {
+    drawRectOutlineInternal(vg, size, out_col, {x,y,w,h}, c);
+}
+
+void drawRectOutline(NVGcontext* vg, float size, const NVGcolor& out_col, float x, float y, float w, float h, const NVGcolor&& c) {
+    drawRectOutlineInternal(vg, size, out_col, {x,y,w,h}, c);
+}
+
+void drawRectOutline(NVGcontext* vg, float size, const NVGcolor& out_col, Vec4 vec, const NVGcolor& c) {
+    drawRectOutlineInternal(vg, size, out_col, vec, c);
+}
+
+void drawRectOutline(NVGcontext* vg, float size, const NVGcolor& out_col, Vec4 vec, const NVGcolor&& c) {
+    drawRectOutlineInternal(vg, size, out_col, vec, c);
+}
+
+void drawRectOutline(NVGcontext* vg, float size, const NVGcolor& out_col, float x, float y, float w, float h, const NVGpaint& p) {
+    drawRectOutlineInternal(vg, size, out_col, {x,y,w,h}, p);
+}
+
+void drawRectOutline(NVGcontext* vg, float size, const NVGcolor& out_col, float x, float y, float w, float h, const NVGpaint&& p) {
+    drawRectOutlineInternal(vg, size, out_col, {x,y,w,h}, p);
+}
+
+void drawRectOutline(NVGcontext* vg, float size, const NVGcolor& out_col, Vec4 vec, const NVGpaint& p) {
+    drawRectOutlineInternal(vg, size, out_col, vec, p);
+}
+
+void drawRectOutline(NVGcontext* vg, float size, const NVGcolor& out_col, Vec4 vec, const NVGpaint&& p) {
+    drawRectOutlineInternal(vg, size, out_col, vec, p);
+}
+
+
+void drawTriangle(NVGcontext* vg, float aX, float aY, float bX, float bY, float cX, float cY, Colour c) {
+    drawTriangleInternal(vg, aX, aY, bX, bY, cX, cY, getColour(c));
+}
+
+void drawTriangle(NVGcontext* vg, float aX, float aY, float bX, float bY, float cX, float cY, const NVGcolor& c) {
+    drawTriangleInternal(vg, aX, aY, bX, bY, cX, cY, c);
+}
+
+void drawTriangle(NVGcontext* vg, float aX, float aY, float bX, float bY, float cX, float cY, const NVGcolor&& c) {
+    drawTriangleInternal(vg, aX, aY, bX, bY, cX, cY, c);
+}
+
+void drawTriangle(NVGcontext* vg, float aX, float aY, float bX, float bY, float cX, float cY, const NVGpaint& p) {
+    drawTriangleInternal(vg, aX, aY, bX, bY, cX, cY, p);
+}
+
+void drawTriangle(NVGcontext* vg, float aX, float aY, float bX, float bY, float cX, float cY, const NVGpaint&& p) {
+    drawTriangleInternal(vg, aX, aY, bX, bY, cX, cY, p);
+}
+
+void drawText(NVGcontext* vg, float x, float y, float size, const char* str, const char* end, int align, Colour c) {
+    drawTextIntenal(vg, {x,y}, size, str, end, align, getColour(c));
+}
+
+void drawText(NVGcontext* vg, float x, float y, float size, Colour c, const char* str, int align, const char* end) {
+    drawTextIntenal(vg, {x,y}, size, str, end, align, getColour(c));
+}
+
+void drawText(NVGcontext* vg, Vec2 vec, float size, const char* str, const char* end, int align, Colour c) {
+    drawTextIntenal(vg, vec, size, str, end, align, getColour(c));
+}
+
+void drawText(NVGcontext* vg, Vec2 vec, float size, Colour c, const char* str, int align, const char* end) {
+    drawTextIntenal(vg, vec, size, str, end, align, getColour(c));
 }
 
 void drawText(NVGcontext* vg, float x, float y, float size, const char* str, const char* end, int align, const NVGcolor& c) {
     drawTextIntenal(vg, {x,y}, size, str, end, align, c);
 }
 
+void drawText(NVGcontext* vg, float x, float y, float size, const char* str, const char* end, int align, const NVGcolor&& c) {
+    drawTextIntenal(vg, {x,y}, size, str, end, align, c);
+}
+
 void drawText(NVGcontext* vg, float x, float y, float size, const NVGcolor& c, const char* str, int align, const char* end) {
     drawTextIntenal(vg, {x,y}, size, str, end, align, c);
 }
 
-void drawText(NVGcontext* vg, const Vec2& v, float size, const char* str, const char* end, int align, const NVGcolor& c) {
+void drawText(NVGcontext* vg, float x, float y, float size, const NVGcolor&& c, const char* str, int align, const char* end) {
-    drawTextIntenal(vg, v, size, str, end, align, c);
+    drawTextIntenal(vg, {x,y}, size, str, end, align, c);
 }
 
-void drawText(NVGcontext* vg, const Vec2& v, float size, const NVGcolor& c, const char* str, int align, const char* end) {
+void drawText(NVGcontext* vg, Vec2 vec, float size, const char* str, const char* end, int align, const NVGcolor& c) {
-    drawTextIntenal(vg, v, size, str, end, align, c);
+    drawTextIntenal(vg, vec, size, str, end, align, c);
 }
 
-void drawScrollbar(NVGcontext* vg, const Theme* theme, float x, float y, float h, u32 index_off, u32 count, u32 max_per_page) {
+void drawText(NVGcontext* vg, Vec2 vec, float size, const char* str, const char* end, int align, const NVGcolor&& c) {
+    drawTextIntenal(vg, vec, size, str, end, align, c);
+}
+
+void drawText(NVGcontext* vg, Vec2 vec, float size, const NVGcolor& c, const char* str, int align, const char* end) {
+    drawTextIntenal(vg, vec, size, str, end, align, c);
+}
+
+void drawText(NVGcontext* vg, Vec2 vec, float size, const NVGcolor&& c, const char* str, int align, const char* end) {
+    drawTextIntenal(vg, vec, size, str, end, align, c);
+}
+
+void drawTextArgs(NVGcontext* vg, float x, float y, float size, int align, Colour c, const char* str, ...) {
+    std::va_list v;
+    va_start(v, str);
+    char buffer[0x100];
+    std::vsnprintf(buffer, sizeof(buffer), str, v);
+    va_end(v);
+    drawTextIntenal(vg, {x, y}, size, buffer, nullptr, align, getColour(c));
+}
+
+void drawScrollbar(NVGcontext* vg, Theme* theme, float x, float y, float h, u32 index_off, u32 count, u32 max_per_page) {
     const s64 SCROLL = index_off;
     const s64 max_entry_display = max_per_page;
     const s64 entry_total = count;
@@ -282,34 +478,35 @@ void drawScrollbar(NVGcontext* vg, const Theme* theme, float x, float y, float h
     if (entry_total > max_entry_display) {
         const float sb_h = 1.f / (float)entry_total * h;
         const float sb_y = SCROLL;
-        gfx::drawRect(vg, x, y, scc2, h, theme->GetColour(ThemeEntryID_SCROLLBAR_BACKGROUND), false);
+        gfx::drawRect(vg, x, y, scc2, h, theme->elements[ThemeEntryID_GRID].colour, false);
-        gfx::drawRect(vg, x + scw, y + scw + sb_h * sb_y, scc2 - scw * 2, sb_h * float(max_entry_display) - scw * 2, theme->GetColour(ThemeEntryID_SCROLLBAR), false);
+        gfx::drawRect(vg, x + scw, y + scw + sb_h * sb_y, scc2 - scw * 2, sb_h * float(max_entry_display) - scw * 2, theme->elements[ThemeEntryID_TEXT_SELECTED].colour, false);
     }
 }
 
-void drawScrollbar(NVGcontext* vg, const Theme* theme, u32 index_off, u32 count, u32 max_per_page) {
+void drawScrollbar(NVGcontext* vg, Theme* theme, u32 index_off, u32 count, u32 max_per_page) {
+    // drawScrollbar(vg, SCREEN_WIDTH - 50, 100, 500, index_off, count, max_per_page);
     drawScrollbar(vg, theme, SCREEN_WIDTH - 50, 100, SCREEN_HEIGHT-200, index_off, count, max_per_page);
 }
 
-void drawScrollbar2(NVGcontext* vg, const Theme* theme, float x, float y, float h, s64 index_off, s64 count, s64 row, s64 page) {
+void drawScrollbar2(NVGcontext* vg, Theme* theme, float x, float y, float h, s64 index_off, s64 count, s64 row, s64 page) {
     // round up
     if (count % row) {
         count = count + (row - count % row);
     }
 
-    const float scc2 = 6.0;
+    const float scc2 = 8.0;
     const float scw = 2.0;
 
     // only draw scrollbar if needed
     if (count > page) {
         const float sb_h = 1.f / (float)count * h;
         const float sb_y = index_off;
-        gfx::drawRect(vg, x, y, scc2, h, theme->GetColour(ThemeEntryID_SCROLLBAR_BACKGROUND), false);
+        gfx::drawRect(vg, x, y, scc2, h, theme->elements[ThemeEntryID_GRID].colour, false);
-        gfx::drawRect(vg, x + scw, y + scw + sb_h * sb_y, scc2 - scw * 2, sb_h * float(page) - scw * 2, theme->GetColour(ThemeEntryID_SCROLLBAR), false);
+        gfx::drawRect(vg, x + scw, y + scw + sb_h * sb_y, scc2 - scw * 2, sb_h * float(page) - scw * 2, theme->elements[ThemeEntryID_TEXT_SELECTED].colour, false);
     }
 }
 
-void drawScrollbar2(NVGcontext* vg, const Theme* theme, s64 index_off, s64 count, s64 row, s64 page) {
+void drawScrollbar2(NVGcontext* vg, Theme* theme, s64 index_off, s64 count, s64 row, s64 page) {
     drawScrollbar2(vg, theme, SCREEN_WIDTH - 50, 100, SCREEN_HEIGHT-200, index_off, count, row, page);
 }
 

sphaira/source/ui/option_box.cpp

@@ -12,10 +12,10 @@ OptionBoxEntry::OptionBoxEntry(const std::string& text, Vec4 pos)
 
 auto OptionBoxEntry::Draw(NVGcontext* vg, Theme* theme) -> void {
     if (m_selected) {
-        gfx::drawRectOutline(vg, theme, 4.f, m_pos);
+        gfx::drawRectOutline(vg, 4.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour, m_pos, theme->elements[ThemeEntryID_SELECTED].colour);
-        gfx::drawText(vg, m_text_pos, 26.f, theme->GetColour(ThemeEntryID_TEXT_SELECTED), m_text.c_str(), NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE);
+        gfx::drawText(vg, m_text_pos, 26.f, theme->elements[ThemeEntryID_TEXT_SELECTED].colour, m_text.c_str(), NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE);
     } else {
-        gfx::drawText(vg, m_text_pos, 26.f, theme->GetColour(ThemeEntryID_TEXT), m_text.c_str(), NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE);
+        gfx::drawText(vg, m_text_pos, 26.f, theme->elements[ThemeEntryID_TEXT].colour, m_text.c_str(), NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE);
     }
 }
 
@@ -94,14 +94,14 @@ auto OptionBox::Update(Controller* controller, TouchInfo* touch) -> void {
 auto OptionBox::Draw(NVGcontext* vg, Theme* theme) -> void {
     const float padding = 15;
     gfx::dimBackground(vg);
-    gfx::drawRect(vg, m_pos, theme->GetColour(ThemeEntryID_POPUP));
+    gfx::drawRect(vg, m_pos, theme->elements[ThemeEntryID_SELECTED].colour);
 
     nvgSave(vg);
     nvgTextLineHeight(vg, 1.5);
-    gfx::drawTextBox(vg, m_pos.x + padding, m_pos.y + 110.f, 26.f, m_pos.w - padding*2, theme->GetColour(ThemeEntryID_TEXT), m_message.c_str(), NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE);
+    gfx::drawTextBox(vg, m_pos.x + padding, m_pos.y + 110.f, 26.f, m_pos.w - padding*2, theme->elements[ThemeEntryID_TEXT].colour, m_message.c_str(), NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE);
     nvgRestore(vg);
 
-    gfx::drawRect(vg, m_spacer_line, theme->GetColour(ThemeEntryID_LINE_SEPARATOR));
+    gfx::drawRect(vg, m_spacer_line, theme->elements[ThemeEntryID_TEXT].colour);
 
     for (auto&p: m_entries) {
         p.Draw(vg, theme);

sphaira/source/ui/popup_list.cpp

@@ -22,8 +22,8 @@ PopupList::PopupList(std::string title, Items items, std::string& index_ref)
     const auto it = std::find(m_items.cbegin(), m_items.cend(), index_ref);
     if (it != m_items.cend()) {
         m_index = std::distance(m_items.cbegin(), it);
-        if (m_index >= 6) {
+        if (m_index >= 7) {
-            m_list->SetYoff((m_index - 5) * m_list->GetMaxY());
+            m_index_offset = m_index - 6;
         }
     }
 
@@ -50,8 +50,8 @@ PopupList::PopupList(std::string title, Items items, Callback cb, std::string in
     const auto it = std::find(m_items.cbegin(), m_items.cend(), index);
     if (it != m_items.cend()) {
         SetIndex(std::distance(m_items.cbegin(), it));
-        if (m_index >= 6) {
+        if (m_index >= 7) {
-            m_list->SetYoff((m_index - 5) * m_list->GetMaxY());
+            m_index_offset = m_index - 6;
         }
     }
 }
@@ -84,21 +84,20 @@ PopupList::PopupList(std::string title, Items items, Callback cb, s64 index)
     );
 
     m_pos.w = 1280.f;
-    const float a = std::min(370.f, (60.f * static_cast<float>(m_items.size())));
+    const float a = std::min(405.f, (60.f * static_cast<float>(m_items.size())));
     m_pos.h = 80.f + 140.f + a;
     m_pos.y = 720.f - m_pos.h;
     m_line_top = m_pos.y + 70.f;
     m_line_bottom = 720.f - 73.f;
+    if (m_index >= 7) {
+        m_index_offset = m_index - 6;
+    }
 
     Vec4 v{m_block};
     v.y = m_line_top + 1.f + 42.f;
     const Vec4 pos{0, m_line_top, 1280.f, m_line_bottom - m_line_top};
-    m_list = std::make_unique<List>(1, 6, pos, v);
+    m_list = std::make_unique<List>(1, 7, pos, v);
     m_list->SetScrollBarPos(1250, m_line_top + 20, m_line_bottom - m_line_top - 40);
-
-    if (m_index >= 6) {
-        m_list->SetYoff((m_index - 5) * m_list->GetMaxY());
-    }
 }
 
 auto PopupList::Update(Controller* controller, TouchInfo* touch) -> void {
@@ -111,21 +110,21 @@ auto PopupList::Update(Controller* controller, TouchInfo* touch) -> void {
 
 auto PopupList::Draw(NVGcontext* vg, Theme* theme) -> void {
     gfx::dimBackground(vg);
-    gfx::drawRect(vg, m_pos, theme->GetColour(ThemeEntryID_POPUP));
+    gfx::drawRect(vg, m_pos, theme->elements[ThemeEntryID_SELECTED].colour);
-    gfx::drawText(vg, m_pos + m_title_pos, 24.f, theme->GetColour(ThemeEntryID_TEXT), m_title.c_str());
+    gfx::drawText(vg, m_pos + m_title_pos, 24.f, theme->elements[ThemeEntryID_TEXT].colour, m_title.c_str());
-    gfx::drawRect(vg, 30.f, m_line_top, m_line_width, 1.f, theme->GetColour(ThemeEntryID_LINE));
+    gfx::drawRect(vg, 30.f, m_line_top, m_line_width, 1.f, theme->elements[ThemeEntryID_TEXT].colour);
-    gfx::drawRect(vg, 30.f, m_line_bottom, m_line_width, 1.f, theme->GetColour(ThemeEntryID_LINE));
+    gfx::drawRect(vg, 30.f, m_line_bottom, m_line_width, 1.f, theme->elements[ThemeEntryID_TEXT].colour);
 
     m_list->Draw(vg, theme, m_items.size(), [this](auto* vg, auto* theme, auto v, auto i) {
         const auto& [x, y, w, h] = v;
         if (m_index == i) {
-            gfx::drawRectOutline(vg, theme, 4.f, v);
+            gfx::drawRect(vg, x - 4.f, y - 4.f, w + 8.f, h + 8.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour);
-            gfx::drawText(vg, x + m_text_xoffset, y + (h / 2.f), 20.f, m_items[i].c_str(), NULL, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT_SELECTED));
+            gfx::drawRect(vg, x, y, w, h, theme->elements[ThemeEntryID_SELECTED].colour);
+            gfx::drawText(vg, x + m_text_xoffset, y + (h / 2.f), 20.f, m_items[i].c_str(), NULL, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE, theme->elements[ThemeEntryID_TEXT_SELECTED].colour);
         } else {
-            if (i != m_items.size() - 1) {
+            gfx::drawRect(vg, x, y, w, 1.f, theme->elements[ThemeEntryID_TEXT].colour);
-                gfx::drawRect(vg, x, y + h, w, 1.f, theme->GetColour(ThemeEntryID_LINE_SEPARATOR));
+            gfx::drawRect(vg, x, y + h, w, 1.f, theme->elements[ThemeEntryID_TEXT].colour);
-            }
+            gfx::drawText(vg, x + m_text_xoffset, y + (h / 2.f), 20.f, m_items[i].c_str(), NULL, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE, theme->elements[ThemeEntryID_TEXT].colour);
-            gfx::drawText(vg, x + m_text_xoffset, y + (h / 2.f), 20.f, m_items[i].c_str(), NULL, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE, theme->GetColour(ThemeEntryID_TEXT));
         }
     });
 
@@ -144,6 +143,10 @@ auto PopupList::OnFocusLost() noexcept -> void {
 
 void PopupList::SetIndex(s64 index) {
     m_index = index;
+
+    if (m_index > m_index_offset && m_index - m_index_offset >= 6) {
+        m_index_offset = m_index - 6;
+    }
 }
 
 } // namespace sphaira::ui

sphaira/source/ui/progress_box.cpp

@@ -83,7 +83,7 @@ auto ProgressBox::Draw(NVGcontext* vg, Theme* theme) -> void {
     mutexUnlock(&m_mutex);
 
     gfx::dimBackground(vg);
-    gfx::drawRect(vg, m_pos, theme->GetColour(ThemeEntryID_POPUP));
+    gfx::drawRect(vg, m_pos, theme->elements[ThemeEntryID_SELECTED].colour);
 
     // The pop up shape.
     // const Vec4 box = { 255, 145, 770, 430 };
@@ -93,15 +93,19 @@ auto ProgressBox::Draw(NVGcontext* vg, Theme* theme) -> void {
 
     // shapes.
     if (offset && size) {
-        gfx::drawRect(vg, prog_bar, theme->GetColour(ThemeEntryID_PROGRESSBAR_BACKGROUND));
+        gfx::drawRect(vg, prog_bar, gfx::Colour::SILVER);
         const u32 percentage = ((double)offset / (double)size) * 100.0;
-        gfx::drawRect(vg, prog_bar.x, prog_bar.y, ((float)offset / (float)size) * prog_bar.w, prog_bar.h, theme->GetColour(ThemeEntryID_PROGRESSBAR));
+        gfx::drawRect(vg, prog_bar.x, prog_bar.y, ((float)offset / (float)size) * prog_bar.w, prog_bar.h, gfx::Colour::CYAN);
-        gfx::drawTextArgs(vg, prog_bar.x + prog_bar.w + 10, prog_bar.y, 20, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "%u%%", percentage);
+        // gfx::drawTextArgs(vg, prog_bar.x + 85, prog_bar.y + 40, 20, 0, gfx::Colour::WHITE, "%u%%", percentage);
+        gfx::drawTextArgs(vg, prog_bar.x + prog_bar.w + 10, prog_bar.y, 20, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, gfx::Colour::WHITE, "%u%%", percentage);
     }
 
-    gfx::drawTextArgs(vg, center_x, m_pos.y + 60, 25, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), title.c_str());
+    gfx::drawTextArgs(vg, center_x, m_pos.y + 60, 25, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, gfx::Colour::WHITE, title.c_str());
+    // gfx::drawTextArgs(vg, center_x, 260, 20, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, gfx::Colour::SILVER, "Please do not remove the gamecard or");
+    // gfx::drawTextArgs(vg, center_x, 295, 20, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, gfx::Colour::SILVER, "power off the system whilst installing.");
+    // gfx::drawTextArgs(vg, center_x, 360, 20, NVG_ALIGN_CENTER | NVG_ALIGN_TOP, gfx::Colour::WHITE, "%.2f MiB/s", 24.0);
     if (!transfer.empty()) {
-        gfx::drawTextArgs(vg, center_x, prog_bar.y - 15 - 20 * 1.5, 20, NVG_ALIGN_CENTER, theme->GetColour(ThemeEntryID_TEXT), "%s", transfer.c_str());
+        gfx::drawTextArgs(vg, center_x, prog_bar.y - 15 - 20 * 1.5, 20, NVG_ALIGN_CENTER, gfx::Colour::WHITE, "%s", transfer.c_str());
     }
 }
 

sphaira/source/ui/scrollable_text.cpp

@@ -94,15 +94,17 @@ void ScrollableText::Draw(NVGcontext* vg, Theme* theme) {
         const auto sb_h = 1.f / max_index * scrollbar_size;
         const auto in_clip = m_clip_y / m_step - 1;
         const auto sb_y = m_index;
-        gfx::drawRect(vg, banner_vec.w, m_y_off_base, 10, scrollbar_size, theme->GetColour(ThemeEntryID_SCROLLBAR_BACKGROUND));
+        // gfx::drawRect(vg, banner_vec.x+banner_vec.w-20, m_y_off_base, 10, scrollbar_size, theme->elements[ThemeEntryID_GRID].colour);
-        gfx::drawRect(vg, banner_vec.w+2, m_y_off_base + sb_h * sb_y, 10-4, sb_h + (sb_h * in_clip) - 4, theme->GetColour(ThemeEntryID_SCROLLBAR));
+        // gfx::drawRect(vg, banner_vec.x+banner_vec.w-20+2, m_y_off_base + sb_h * sb_y, 10-4, sb_h + (sb_h * in_clip) - 4, theme->elements[ThemeEntryID_TEXT_SELECTED].colour);
+        gfx::drawRect(vg, banner_vec.w, m_y_off_base, 10, scrollbar_size, theme->elements[ThemeEntryID_GRID].colour);
+        gfx::drawRect(vg, banner_vec.w+2, m_y_off_base + sb_h * sb_y, 10-4, sb_h + (sb_h * in_clip) - 4, theme->elements[ThemeEntryID_TEXT_SELECTED].colour);
     }
 
     nvgSave(vg);
-    nvgIntersectScissor(vg, 0, m_y_off_base - m_font_size, 1280, m_clip_y + m_font_size); // clip
+    nvgScissor(vg, 0, m_y_off_base - m_font_size, 1280, m_clip_y + m_font_size); // clip
 
     nvgTextLineHeight(App::GetVg(), 1.7);
-    gfx::drawTextBox(vg, banner_vec.x + 40, m_y_off, m_font_size, m_bounds[2] - m_bounds[0], theme->GetColour(ThemeEntryID_TEXT), m_text.c_str());
+    gfx::drawTextBox(vg, banner_vec.x + 40, m_y_off, m_font_size, m_bounds[2] - m_bounds[0], theme->elements[ThemeEntryID_TEXT].colour, m_text.c_str());
     nvgRestore(vg);
 }
 

sphaira/source/ui/sidebar.cpp

@@ -7,14 +7,6 @@
 namespace sphaira::ui {
 namespace {
 
-auto GetTextScrollSpeed() -> float {
-    switch (App::GetTextScrollSpeed()) {
-        case 0: return 0.5;
-        default: case 1: return 1.0;
-        case 2: return 1.5;
-    }
-}
-
 auto DistanceBetweenY(Vec4 va, Vec4 vb) -> Vec4 {
     return Vec4{
         va.x, va.y,
@@ -32,7 +24,14 @@ SidebarEntryBase::SidebarEntryBase(std::string&& title)
 auto SidebarEntryBase::Draw(NVGcontext* vg, Theme* theme) -> void {
     // draw spacers or highlight box if in focus (selected)
     if (HasFocus()) {
-        gfx::drawRectOutline(vg, theme, 4.f, m_pos);
+        gfx::drawRect(vg, m_pos, nvgRGB(50,50,50));
+        gfx::drawRect(vg, m_pos, nvgRGB(0,0,0));
+        gfx::drawRectOutline(vg, 4.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour, m_pos, theme->elements[ThemeEntryID_SELECTED].colour);
+        // gfx::drawRect(vg, m_pos.x - 4.f, m_pos.y - 4.f, m_pos.w + 8.f, m_pos.h + 8.f, theme->elements[ThemeEntryID_SELECTED_OVERLAY].colour);
+        // gfx::drawRect(vg, m_pos.x, m_pos.y, m_pos.w, m_pos.h, theme->elements[ThemeEntryID_SELECTED].colour);
+    } else {
+        gfx::drawRect(vg, m_pos.x, m_pos.y, m_pos.w, 1.f, nvgRGB(81, 81, 81)); // spacer
+        gfx::drawRect(vg, m_pos.x, m_pos.y + m_pos.h, m_pos.w, 1.f, nvgRGB(81, 81, 81)); // spacer
     }
 }
 
@@ -61,16 +60,16 @@ auto SidebarEntryBool::Draw(NVGcontext* vg, Theme* theme) -> void {
     SidebarEntryBase::Draw(vg, theme);
 
     // if (HasFocus()) {
-    //     gfx::drawText(vg, Vec2{m_pos.x + 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->GetColour(ThemeEntryID_TEXT_SELECTED), m_title.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
+    //     gfx::drawText(vg, Vec2{m_pos.x + 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->elements[ThemeEntryID_TEXT_SELECTED].colour, m_title.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
     // } else {
     // }
 
-    gfx::drawText(vg, Vec2{m_pos.x + 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->GetColour(ThemeEntryID_TEXT), m_title.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
+    gfx::drawText(vg, Vec2{m_pos.x + 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->elements[ThemeEntryID_TEXT].colour, m_title.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
 
     if (m_option == true) {
-        gfx::drawText(vg, Vec2{m_pos.x + m_pos.w - 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->GetColour(ThemeEntryID_TEXT_SELECTED), m_true_str.c_str(), NVG_ALIGN_RIGHT | NVG_ALIGN_MIDDLE);
+        gfx::drawText(vg, Vec2{m_pos.x + m_pos.w - 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->elements[ThemeEntryID_TEXT_SELECTED].colour, m_true_str.c_str(), NVG_ALIGN_RIGHT | NVG_ALIGN_MIDDLE);
     } else { // text info
-        gfx::drawText(vg, Vec2{m_pos.x + m_pos.w - 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->GetColour(ThemeEntryID_TEXT), m_false_str.c_str(), NVG_ALIGN_RIGHT | NVG_ALIGN_MIDDLE);
+        gfx::drawText(vg, Vec2{m_pos.x + m_pos.w - 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->elements[ThemeEntryID_TEXT].colour, m_false_str.c_str(), NVG_ALIGN_RIGHT | NVG_ALIGN_MIDDLE);
     }
 }
 
@@ -91,9 +90,9 @@ auto SidebarEntryCallback::Draw(NVGcontext* vg, Theme* theme) -> void {
     SidebarEntryBase::Draw(vg, theme);
 
     // if (HasFocus()) {
-    //     gfx::drawText(vg, Vec2{m_pos.x + 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->GetColour(ThemeEntryID_TEXT_SELECTED), m_title.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
+    //     gfx::drawText(vg, Vec2{m_pos.x + 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->elements[ThemeEntryID_TEXT_SELECTED].colour, m_title.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
     // } else {
-        gfx::drawText(vg, Vec2{m_pos.x + 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->GetColour(ThemeEntryID_TEXT), m_title.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
+        gfx::drawText(vg, Vec2{m_pos.x + 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->elements[ThemeEntryID_TEXT].colour, m_title.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
     // }
 }
 
@@ -155,59 +154,11 @@ auto SidebarEntryArray::Draw(NVGcontext* vg, Theme* theme) -> void {
     SidebarEntryBase::Draw(vg, theme);
 
     const auto& text_entry = m_items[m_index];
+    // const auto& colour = HasFocus() ? theme->elements[ThemeEntryID_TEXT_SELECTED].colour : theme->elements[ThemeEntryID_TEXT].colour;
+    const auto& colour = theme->elements[ThemeEntryID_TEXT].colour;
 
-    // scrolling text
+    gfx::drawText(vg, Vec2{m_pos.x + 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, colour, m_title.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-    // todo: move below in a flexible class and use it for all text drawing.
+    gfx::drawText(vg, Vec2{m_pos.x + m_pos.w - 15.f, m_pos.y + (m_pos.h / 2.f)}, 20.f, theme->elements[ThemeEntryID_TEXT_SELECTED].colour, text_entry.c_str(), NVG_ALIGN_RIGHT | NVG_ALIGN_MIDDLE);
-    float bounds[4];
-    nvgFontSize(vg, 20);
-    nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-    nvgTextBounds(vg, 0, 0, m_title.c_str(), nullptr, bounds);
-    const float start_x = bounds[2] + 50;
-    const float max_off = m_pos.w - start_x - 15.f;
-
-    auto value_str = m_items[m_index];
-    nvgTextBounds(vg, 0, 0, value_str.c_str(), nullptr, bounds);
-
-    if (HasFocus()) {
-        const auto scroll_amount = GetTextScrollSpeed();
-        if (bounds[2] > max_off) {
-            value_str += "        ";
-            nvgTextBounds(vg, 0, 0, value_str.c_str(), nullptr, bounds);
-
-            if (!m_text_yoff) {
-                m_tick++;
-                if (m_tick >= 90) {
-                    m_tick = 0;
-                    m_text_yoff += scroll_amount;
-                }
-            } else if (bounds[2] > m_text_yoff) {
-                m_text_yoff += std::min(scroll_amount, bounds[2] - m_text_yoff);
-            } else {
-                m_text_yoff = 0;
-            }
-
-            value_str += text_entry;
-        }
-    }
-
-    const Vec2 key_text_pos{m_pos.x + 15.f, m_pos.y + (m_pos.h / 2.f)};
-    gfx::drawText(vg, key_text_pos, 20.f, theme->GetColour(ThemeEntryID_TEXT), m_title.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-
-    nvgSave(vg);
-    const float xpos = m_pos.x + m_pos.w - 15.f - std::min(max_off, bounds[2]);
-    nvgIntersectScissor(vg, xpos, GetY(), max_off, GetH());
-    const Vec2 value_text_pos{xpos - m_text_yoff, m_pos.y + (m_pos.h / 2.f)};
-    gfx::drawText(vg, value_text_pos, 20.f, theme->GetColour(ThemeEntryID_TEXT_SELECTED), value_str.c_str(), NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-    nvgRestore(vg);
-}
-
-auto SidebarEntryArray::OnFocusGained() noexcept -> void {
-    Widget::OnFocusGained();
-}
-
-auto SidebarEntryArray::OnFocusLost() noexcept -> void {
-    Widget::OnFocusLost();
-    m_text_yoff = 0;
 }
 
 Sidebar::Sidebar(std::string title, Side side, Items&& items)
@@ -271,23 +222,18 @@ auto Sidebar::Update(Controller* controller, TouchInfo* touch) -> void {
 }
 
 auto Sidebar::Draw(NVGcontext* vg, Theme* theme) -> void {
-    gfx::drawRect(vg, m_pos, theme->GetColour(ThemeEntryID_SIDEBAR));
+    gfx::drawRect(vg, m_pos, nvgRGBA(0, 0, 0, 220));
-    gfx::drawText(vg, m_title_pos, m_title_size, theme->GetColour(ThemeEntryID_TEXT), m_title.c_str());
+    gfx::drawText(vg, m_title_pos, m_title_size, theme->elements[ThemeEntryID_TEXT].colour, m_title.c_str());
     if (!m_sub.empty()) {
-        gfx::drawTextArgs(vg, m_pos.x + m_pos.w - 30.f, m_title_pos.y + 10.f, 18, NVG_ALIGN_TOP | NVG_ALIGN_RIGHT, theme->GetColour(ThemeEntryID_TEXT), m_sub.c_str());
+        gfx::drawTextArgs(vg, m_pos.x + m_pos.w - 30.f, m_title_pos.y + 10.f, 18, NVG_ALIGN_TOP | NVG_ALIGN_RIGHT, theme->elements[ThemeEntryID_TEXT].colour, m_sub.c_str());
     }
-    gfx::drawRect(vg, m_top_bar, theme->GetColour(ThemeEntryID_LINE));
+    gfx::drawRect(vg, m_top_bar, theme->elements[ThemeEntryID_TEXT].colour);
-    gfx::drawRect(vg, m_bottom_bar, theme->GetColour(ThemeEntryID_LINE));
+    gfx::drawRect(vg, m_bottom_bar, theme->elements[ThemeEntryID_TEXT].colour);
 
     Widget::Draw(vg, theme);
 
     m_list->Draw(vg, theme, m_items.size(), [this](auto* vg, auto* theme, auto v, auto i) {
         const auto& [x, y, w, h] = v;
-
-        if (i != m_items.size() - 1) {
-            gfx::drawRect(vg, x, y + h, w, 1.f, theme->GetColour(ThemeEntryID_LINE_SEPARATOR));
-        }
-
         m_items[i]->SetY(y);
         m_items[i]->Draw(vg, theme);
     });
@@ -320,6 +266,11 @@ void Sidebar::SetIndex(s64 index) {
         m_items[m_index]->OnFocusLost();
         m_index = index;
         m_items[m_index]->OnFocusGained();
+
+        if (m_index > m_index_offset && m_index - m_index_offset >= 5) {
+            m_index_offset = m_index - 5;
+        }
+
         SetupButtons();
     }
 }

sphaira/source/ui/widget.cpp

@@ -10,7 +10,7 @@ auto uiButton::Draw(NVGcontext* vg, Theme* theme) -> void {
     // gfx::drawRect(vg, m_pos, gfx::Colour::RED);
 
     nvgTextAlign(vg, NVG_ALIGN_RIGHT | NVG_ALIGN_TOP);
-    nvgFillColor(vg, theme->GetColour(ThemeEntryID_TEXT));
+    nvgFillColor(vg, theme->elements[ThemeEntryID_TEXT].colour);
     nvgFontSize(vg, 20);
     nvgText(vg, m_hint_pos.x, m_hint_pos.y, m_action.m_hint.c_str(), nullptr);
     nvgFontSize(vg, 26);