diff --git a/po/es.po b/po/es.po
index 6cbbd1c..a8a0862 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-10-23 12:28+0000\n"
 "Last-Translator: Racsu <me@racsu.com>\n"
 "Language-Team: Spanish <https://weblate.fyralabs.com/projects/flattool/"
@@ -27,6 +27,7 @@ msgstr "Warehouse"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "Gestione todo lo relacionado con Flatpak"
@@ -67,99 +68,104 @@ msgstr "Encuentre y elimine los datos de usuario sobrantes"
 msgid "Reinstall apps that have leftover data"
 msgstr "Reinstale las aplicaciones que tengan datos sobrantes"
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Flatpaks"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr "Desinstalado correctamente"
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr "No se pueden desinstalar algunas aplicaciones"
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr "¿Desinstalar aplicaciones seleccionadas?"
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr "No será posible usar estas aplicaciones después de la eliminación."
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr "Configuración y datos de la aplicación"
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr "Mantener"
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr ""
 "Permitir restaurar la configuración y el contenido de estas aplicaciones"
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr "Borrar"
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr ""
 "Enviar la configuración y el contenido de estas aplicaciones a la papelera"
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr "Desinstalar"
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr "No se puede desinstalar mientras ya se está desinstalando"
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr "¿Desinstalar {}?"
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr "No será posible usar {} después de la eliminación."
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr "Permitir restaurar la configuración y el contenido de esta aplicación"
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
-msgstr "Enviar la configuración y el contenido de esta aplicación a la papelera"
+msgstr ""
+"Enviar la configuración y el contenido de esta aplicación a la papelera"
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr "Fin de soporte de la app"
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr ""
 "{} ha llegado al final de su vida y no recibirá actualizaciones de seguridad"
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr "Fin del soporte para el tiempo de ejecución"
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
@@ -167,118 +173,124 @@ msgstr ""
 "El tiempo de ejecución de {} ha llegado al final de su vida y no recibirá "
 "actualizaciones de seguridad"
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr "Actualizaciones desactivadas"
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr "{} está restringido y no recibirá actualizaciones"
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr "Ver propiedades"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr "Nombre copiado"
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr "Copiar nombre"
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr "ID copiada"
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr "Copiar ID"
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr "Ref copiada"
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr "Copiar Ref"
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr "Comando de lanzamiento copiado"
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr "Copiar comando de lanzamiento"
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr "Abierto {}"
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr "Abrir"
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr "Desactivar actualizaciones"
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr "Activar actualizaciones"
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr "Abrir carpeta de datos de usuario"
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr "Eliminar datos de usuario"
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Snapshots"
+msgstr "Gestionar los repositorios remotos"
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr "Revertir"
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr "No se ha podido abrir la carpeta"
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr "No se han podido borrar los datos del usuario"
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr "Datos de usuario borrados"
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr "¿Enviar los datos de usuario de {} a la papelera?"
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr "Sus archivos y datos de esta aplicación se enviarán a la papelera."
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr "Borrar datos"
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr "Puede desactivar las actualizaciones para {}"
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr "¿Desactivar actualizaciones para {}?"
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
@@ -286,103 +298,121 @@ msgstr ""
 "Esto restringirá {} asegurando que nunca reciba ninguna función o "
 "actualización de seguridad."
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr "No se puede ejecutar la aplicación"
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr "De acuerdo"
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr "Lista actualizada"
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr "No hay datos de usuario para {}"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr "¿Eliminar los datos de usuario de las aplicaciones seleccionadas?"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr "Sus archivos y datos de estas aplicaciones se enviarán a la papelera."
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr "Copiados los nombres de las aplicaciones seleccionadas"
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr "Copiados los ID de las aplicaciones seleccionadas"
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr "Copiadas las refs de las aplicaciones seleccionadas"
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr "Instalado correctamente"
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr "No se ha podido instalar la aplicación"
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr "¿Instalar {}?"
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr "Instalar"
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr "Usuario"
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr "La aplicación solo estará disponible para usted"
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr "Sistema"
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr "La aplicación estará disponible para todos los usuarios del sistema"
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr "Tipo de archivo no compatible"
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr "Actualizar lista"
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr "Buscar en la lista"
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr "Filtrar lista"
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr "Menú principal"
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "Conmutar modo de selección"
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+#, fuzzy
+#| msgid "Installation"
+msgid "Installing…"
+msgstr "Instalación"
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+#, fuzzy
+#| msgid "Installing… This could take a while"
+msgid "This could take a while."
+msgstr "Instalando… Esto podría tardar un poco"
+
+#: data/ui/window.blp:128
+#, fuzzy
+#| msgid "Uninstall"
+msgid "Uninstalling…"
+msgstr "Desinstalar"
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr "No se han encontrado Flatpaks"
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
@@ -390,55 +420,83 @@ msgstr ""
 "No hay Flatpaks que coincidan con el filtro actual, Warehouse no puede ver "
 "la lista de Flatpaks instaladas o el sistema no tiene Flatpaks instaladas."
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+#, fuzzy
+#| msgid "No Flatpaks Found"
+msgid "No Results Found"
+msgstr "No se han encontrado Flatpaks"
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr "Desinstalar aplicaciones seleccionadas"
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "Enviar a la papelera los datos de las aplicaciones seleccionadas"
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr "Abrir el menú para copiar datos"
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+#, fuzzy
+#| msgid "Trash Selected Apps' User Data?"
+msgid "Snapshot Selected Apps' Data"
+msgstr "¿Eliminar los datos de usuario de las aplicaciones seleccionadas?"
+
+#: data/ui/window.blp:194
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From File…"
 msgstr "Instalar desde archivo"
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:199
+#, fuzzy
+#| msgid "Manage Leftover Data"
+msgid "Manage Leftover Data…"
 msgstr "Gestionar los datos sobrantes"
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:208
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Remotes…"
 msgstr "Gestionar los repositorios remotos"
 
-#: src/window.blp:131
+#: data/ui/window.blp:213
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From The Web…"
+msgstr "Instalar desde archivo"
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr "Atajos del _teclado"
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr "_Acerca de Warehouse"
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr "Copiar nombres"
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr "Copiar IDs"
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr "Copiar refs"
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr "Abrir app"
 
@@ -450,7 +508,7 @@ msgstr "Gestión de aplicaciones"
 msgid "Search"
 msgstr "Buscar"
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr "Establecer filtros"
 
@@ -462,6 +520,18 @@ msgstr "Refrescar"
 msgid "More Functions"
 msgstr "Más funciones"
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr "Gestionar los datos sobrantes"
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr "Gestionar los repositorios remotos"
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr "Instalar desde archivo"
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr "General"
@@ -478,78 +548,84 @@ msgstr "Mostrar atajos"
 msgid "Quit"
 msgstr "Salir"
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr "Propiedades de {}"
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr "Mostrar aplicaciones que usan este tiempo de ejecución"
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr "Copiado {}"
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+#, fuzzy
+#| msgid "Could not manage data"
+msgid "Could not show details"
+msgstr "No se pueden gestionar los datos"
+
+#: src/properties_window.py:54
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "User Data"
+msgstr "Eliminar datos de usuario"
+
+#: src/properties_window.py:73 src/properties_window.py:118
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "No User Data"
+msgstr "Eliminar datos de usuario"
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr "Nombre"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr "Descripción"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr "ID de la aplicación"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr "Versión"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr "Rama"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr "Arquitectura"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr "Origen"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr "Instalación"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr "Ref"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr "Versión en uso"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr "Última versión"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr "Tamaño de instalación"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr "Opciones"
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr "Tiempo de ejecución"
-
-#: src/properties_window.py:153
-msgid "Copy {}"
-msgstr "Copiar {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
+msgstr "Propiedades de {}"
 
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
@@ -567,88 +643,88 @@ msgstr "¿Eliminar {}?"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr "Copiar nombre del repositorio"
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr "Eliminar {}"
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr "No se ha podido añadir {}"
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr "Añadir repositorio Flatpak"
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr "Añadir"
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr "URL"
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr "El repositorio solo estará disponible para usted"
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr "El repositorio estará disponible para todos los usuarios del sistema"
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr "{} añadido con éxito"
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr "¿Añadir {}?"
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 "La tienda de aplicaciones de código abierto y \"paga lo que quieras\" de "
 "elementary"
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr "Repositorio central de aplicaciones Flatpak"
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr "Versiones beta de aplicaciones Flatpak"
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr "Flatpaks empaquetadas por Fedora Linux"
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr ""
 "La última versión beta de las aplicaciones y tiempos de ejecución de GNOME"
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr "Aplicaciones y tiempos de ejecución beta de KDE"
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr ""
 "Repositorio central del SDK de desarrollo y tiempo de ejecución de WebKit"
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr "Agregar repositorio"
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr "No hay repositorios"
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -659,90 +735,86 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr "Repositorios Flatpak"
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr "Elija entre una lista de repositorios populares o añada uno nuevo."
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr "Añadir un archivo repo"
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr "Añadir un repositorio personalizado"
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr "No se pueden instalar algunas aplicaciones"
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr "Instalando… Esto podría tardar un poco"
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr "¿Intentar instalar?"
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 "Warehouse intentará instalar aplicaciones que coincidan con los datos "
 "seleccionados."
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr "{} ancho"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr "¿Eliminar carpetas?"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr "Estas carpetas se enviarán a la papelera."
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr "No se pueden gestionar los datos"
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr "Abrir carpeta de datos"
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr "No hay datos sobrantes"
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr "No hay datos de usuario sobrantes"
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr "Mostrar apps"
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr "Mostrar tiempos de ejecución"
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr "Filtrar apps por repositorios"
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr "Filtrar apps por tiempos de ejecución"
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr "Hash de la confirmación: {}"
 
@@ -750,6 +822,12 @@ msgstr "Hash de la confirmación: {}"
 msgid "Could not downgrade {}"
 msgstr "No se pudo revertir {}"
 
+#: src/downgrade_window.py:108
+#, fuzzy
+#| msgid "Could disable updates for {}"
+msgid "Could not disable updates for {}"
+msgstr "Puede desactivar las actualizaciones para {}"
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr "Revirtiendo…"
@@ -766,11 +844,11 @@ msgstr "Obteniendo versiones…"
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr "Garantizar que nunca se actualizará a una versión más reciente"
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr "Seleccionar una versión"
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
@@ -778,10 +856,14 @@ msgstr ""
 "Esto desinstalará la versión actual e instalará la elegida en su lugar. "
 "Tenga en cuenta que la desinstalación puede causar problemas."
 
-#, fuzzy
-#~| msgid "Could not manage data"
-#~ msgid "Could not trash data"
-#~ msgstr "No se pueden gestionar los datos"
+#~ msgid "Show Apps Using this Runtime"
+#~ msgstr "Mostrar aplicaciones que usan este tiempo de ejecución"
+
+#~ msgid "Runtime"
+#~ msgstr "Tiempo de ejecución"
+
+#~ msgid "Copy {}"
+#~ msgstr "Copiar {}"
 
 #~ msgid "Add a Remote"
 #~ msgstr "Añadir un remoto"
diff --git a/po/fr.po b/po/fr.po
index c0e4496..2591d6a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-11-07 22:01+0000\n"
 "Last-Translator: Maxim Therrien <maxim@acerspyro.ca>\n"
 "Language-Team: French <https://weblate.fyralabs.com/projects/flattool/"
@@ -27,6 +27,7 @@ msgstr "Entrepôt"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "Gérez tout ce qui concerne Flatpak"
@@ -67,101 +68,107 @@ msgstr "Chercher et supprimer les données utilisateur résiduelles"
 msgid "Reinstall apps that have leftover data"
 msgstr "Réinstaller les applications dont des données ont été conservées"
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Flatpaks"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr "Désinstallation achevée"
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr "Certaines applications n’ont pu être désinstallées"
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr "Désinstaller les applications sélectionnées ?"
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr ""
 "Il ne sera plus possible d’utiliser ces applications après leur suppression."
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr "Paramètres et données de l’application"
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr "Conserver"
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr ""
 "Permettre la restauration des paramètres et contenus de ces applications"
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr "Mettre à la corbeille"
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
-msgstr "Envoyer les paramètres et le contenu de ces applications à la corbeille"
+msgstr ""
+"Envoyer les paramètres et le contenu de ces applications à la corbeille"
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr "Désinstaller"
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr ""
 "Impossible de désinstaller l’application lorsqu’elle est en cours "
 "d’utilisation"
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr "Désinstaller {} ?"
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr "Il ne sera plus possible d’utiliser {} après sa désinstallation."
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr ""
 "Permettre la restauration des paramètres et du contenu de cette application"
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
-msgstr "Mettre les paramètres et le contenu de cette application à la corbeille"
+msgstr ""
+"Mettre les paramètres et le contenu de cette application à la corbeille"
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr "Appli EFV"
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr "{} est En Fin de Vie et ne recevra plus de mises à jour de sécurité"
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr "Environnement d’exécution EFV"
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
@@ -169,120 +176,126 @@ msgstr ""
 "L’environnement d’exécution de {} est en fin de vie et ne recevra plus de "
 "mises à jour de sécurité"
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr "Mises à jour désactivées"
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr "{} est masquée et ne sera plus mise à jour"
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr "Voir les propriétés"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr "Nom copié"
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr "Copier le nom"
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr "Identifiant copié"
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr "Copier l’identifiant"
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr "Référentiel copié"
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr "Copier le référentiel"
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr "Commande de lancement copiée"
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr "Copier la commande de lancement"
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr "Copier"
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr "{} ouverte"
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr "Désactiver les mises à jour"
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr "Activer les mises à jour"
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr "Ouvrir le dossier des données utilisateur"
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr "Mettre les données utilisateur à la corbeille"
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Snapshots"
+msgstr "Gérer les dépôts de logiciels"
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr "Rétrograder"
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr "Échec de l’ouverture du dossier"
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr "Échec de la mise à la corbeille des données utilisateur"
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr "Données utilisateur mises à la corbeille"
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr "Mettre les données utilisateur de {} à la corbeille ?"
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 "Vos fichiers et données utilisateur pour cette application seront mis à la "
 "corbeille."
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr "Mettre les données à la corbeille"
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr "Mises à jour désactivables pour {}"
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr "Désactiver les mises à jour pour {} ?"
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
@@ -290,107 +303,125 @@ msgstr ""
 "Ceci masquera {} pour que cette application ne reçoive plus de mises à jour "
 "de sécurité ou de fonctionnalités."
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr "Impossible de lancer l’application"
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr "OK"
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr "Liste actualisée"
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr "Aucune donnée utilisateur pour {}"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr ""
-"Mettre les données utilisateur des applications sélectionnées à la corbeille "
-"?"
+"Mettre les données utilisateur des applications sélectionnées à la "
+"corbeille ?"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr ""
 "Vos fichiers et données utilisateur pour ces applications seront mis à la "
 "corbeille."
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr "Les noms des applications sélectionnées ont été copiés"
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr "Les identifiants des applications sélectionnées ont été copiés"
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr "Référentiels des applications sélectionnées copiés"
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr "Installation réussie"
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr "Impossible d’installer l’application"
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr "Installer {} ?"
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr "Installer"
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr "L’application ne sera disponible que sur votre session"
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr "Système"
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr "L’application sera disponible pour tous les utilisateurs de ce système"
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr "Type de fichier non pris en charge"
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr "Actualiser la liste"
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr "Rechercher dans la liste"
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr "Filtrer la liste"
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr "Menu principal"
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "Basculer en mode sélection"
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+#, fuzzy
+#| msgid "Installation"
+msgid "Installing…"
+msgstr "Installation"
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+#, fuzzy
+#| msgid "Installing… This could take a while"
+msgid "This could take a while."
+msgstr "Installations en cours… Cela peut prendre du temps"
+
+#: data/ui/window.blp:128
+#, fuzzy
+#| msgid "Uninstall"
+msgid "Uninstalling…"
+msgstr "Désinstaller"
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr "Aucun Flatpak trouvé"
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
@@ -399,55 +430,85 @@ msgstr ""
 "peut voir la liste des Flatpaks installés, soit aucun Flatpak n’a été "
 "installé sur ce système."
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+#, fuzzy
+#| msgid "No Flatpaks Found"
+msgid "No Results Found"
+msgstr "Aucun Flatpak trouvé"
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr "Désinstaller les applications sélectionnées"
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "Mettre les données des applications sélectionnées à la corbeille"
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr "Ouvrir le menu de copie"
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+#, fuzzy
+#| msgid "Trash Selected Apps' User Data?"
+msgid "Snapshot Selected Apps' Data"
+msgstr ""
+"Mettre les données utilisateur des applications sélectionnées à la "
+"corbeille ?"
+
+#: data/ui/window.blp:194
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From File…"
 msgstr "Installer à partir d’un fichier"
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:199
+#, fuzzy
+#| msgid "Manage Leftover Data"
+msgid "Manage Leftover Data…"
 msgstr "Gérer les données résiduelles"
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:208
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Remotes…"
 msgstr "Gérer les dépôts de logiciels"
 
-#: src/window.blp:131
+#: data/ui/window.blp:213
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From The Web…"
+msgstr "Installer à partir d’un fichier"
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr "Raccourcis _clavier"
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr "À _propos d’Entrepôt"
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr "Copier les noms"
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr "Copier les identifiants"
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr "Copier les référentiels"
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr "Ouvrir l’application"
 
@@ -459,7 +520,7 @@ msgstr "Gestion des applications"
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr "Utiliser des filtres"
 
@@ -471,6 +532,18 @@ msgstr "Actualiser"
 msgid "More Functions"
 msgstr "Plus de fonctionnalités"
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr "Gérer les données résiduelles"
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr "Gérer les dépôts de logiciels"
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr "Installer à partir d’un fichier"
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr "Général"
@@ -487,78 +560,84 @@ msgstr "Afficher les raccourcis"
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr "Propriétés de {}"
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr "Afficher les applications utilisant cet environnement d’exécution"
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr "{} copié"
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+#, fuzzy
+#| msgid "Could not install app"
+msgid "Could not show details"
+msgstr "L'application n'a pas pu être installée"
+
+#: src/properties_window.py:54
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "User Data"
+msgstr "Mettre les données utilisateur à la corbeille"
+
+#: src/properties_window.py:73 src/properties_window.py:118
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "No User Data"
+msgstr "Mettre les données utilisateur à la corbeille"
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr "Nom"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr "Description"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr "Identifiant de l’application"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr "Version"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr "Branche"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr "Architecture"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr "Origine"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr "Installation"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr "Référentiel"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr "Commit actif"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr "Dernier commit"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr "Taille installée"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr "Options"
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr "Environnement d’exécution"
-
-#: src/properties_window.py:153
-msgid "Copy {}"
-msgstr "Copier {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
+msgstr "Propriétés de {}"
 
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
@@ -578,84 +657,84 @@ msgstr "Supprimer {} ?"
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr "Copier le nom du dépôt"
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr "Supprimer {}"
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr "Impossible d’ajouter {}"
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr "Ajouter un dépôt de logiciels Flatpak"
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr "URL"
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr "Le dépôt ne sera accessible que sur votre session"
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr "Le dépôt sera accessible pour tous les utilisateurs de ce système"
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr "{} a été ajouté avec succès"
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr "Ajouter {} ?"
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr "Le magasin d’applications open-source et à prix libre de elementary"
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr "Répertoire central des applications Flatpak"
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr "Versions bêta des applications Flatpak"
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr "Flatpaks empaquetés par Fedora Linux"
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr "Les dernières applis et environnements d’exécution bêta de GNOME"
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr "Applis et environnements d’exécution bêta de KDE"
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr "Répertoire central des développeurs WebKit et Runtime SDK"
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr "Ajouter un dépôt de logiciels"
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr "Aucun dépôt de logiciels"
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -666,92 +745,88 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr "Répertoires Flatpak"
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr ""
 "Choisissez depuis la liste des dépôts logiciels populaires ou ajoutez-en un "
 "nouveau."
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr "Ajouter un fichier de répertoire"
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr "Ajouter un dépôt personnalisé"
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr "Certaines applications n’ont pu être installées"
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr "Installations en cours… Cela peut prendre du temps"
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr "Essayer d’installer ?"
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 "Entrepôt essayera d’installer les applications correspondant aux données "
 "sélectionnées."
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr "{} wide"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr "Mettre les dossiers à la corbeille ?"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr "Ces dossiers seront mis à la corbeille."
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr "Continuer"
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr "Impossible de gérer les données"
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr "Ouvrir le dossier des données"
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr "Aucune donnée résiduelle"
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr "Plus aucune donnée utilisateur résiduelle"
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr "Afficher les applications"
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr "Afficher les environnements d’exécution"
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr "Filtrer les applications par dépôt"
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr "Filtrer les applications par environnement d’exécution"
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr "Hachage du commit : {}"
 
@@ -759,6 +834,12 @@ msgstr "Hachage du commit : {}"
 msgid "Could not downgrade {}"
 msgstr "Impossible de rétrograder {}"
 
+#: src/downgrade_window.py:108
+#, fuzzy
+#| msgid "Could disable updates for {}"
+msgid "Could not disable updates for {}"
+msgstr "Mises à jour désactivables pour {}"
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr "Rétrogradage…"
@@ -776,11 +857,11 @@ msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 "Assurez vous que {} ne sera jamais mise à jour vers une nouvelle version"
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr "Sélectionnez une version"
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
@@ -788,10 +869,14 @@ msgstr ""
 "Ceci désinstallera la version actuelle et installera celle choisie à la "
 "place. Noter que le rétrogradage peut causer des problèmes."
 
-#, fuzzy
-#~| msgid "Could not install app"
-#~ msgid "Could not trash data"
-#~ msgstr "L'application n'a pas pu être installée"
+#~ msgid "Show Apps Using this Runtime"
+#~ msgstr "Afficher les applications utilisant cet environnement d’exécution"
+
+#~ msgid "Runtime"
+#~ msgstr "Environnement d’exécution"
+
+#~ msgid "Copy {}"
+#~ msgstr "Copier {}"
 
 #, fuzzy
 #~| msgid "Send Selected Apps' Data to the Trash"
diff --git a/po/hu.po b/po/hu.po
index a972141..8bcf8cd 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-10-23 10:42+0000\n"
 "Last-Translator: kramo <login@kramo.hu>\n"
 "Language-Team: Hungarian <https://weblate.fyralabs.com/projects/flattool/"
@@ -27,6 +27,7 @@ msgstr "Raktár"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "Kezeldje a Flatpak-jeit"
@@ -66,98 +67,102 @@ msgstr "Maradék felhasználói adatok törlése"
 msgid "Reinstall apps that have leftover data"
 msgstr "Applikációk újratelepítése, amelyeknek van maradék adatuk"
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Flatpak-ek"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr "Sikeresen eltávolítva"
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr "Pár applikációt nem lehetett eltávolítani"
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr "Eltávolítja a kiválasztott appokat?"
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr "Eltávolítás után nem lehet őket használni."
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr "App beállítások & adatok"
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr "Megtart"
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr ""
 "Engedélyezi az applikációk beállításainak és tartalmának helyreállítását"
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr "Az applikációk beállításainak és tartalmának kukázása"
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr "Mégse"
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr "Eltávolítás"
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr "Nem lehet eltávolítani, ha az eltávolítás már folyamatban van"
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr "Eltávolítja a következőt: {}?"
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr "Nem lesz lehetséges a(z) {} használata az eltávolítás után."
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr ""
 "Engedélyezi az applikáció beállításainak és tartalmának helyreállítását"
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr "Az applikáció beállításainak és tartalmának kukázása"
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr "Az applikáció elavult"
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr "A(z) {} elavult és nem fog többé biztonsági frissítéseket kapni"
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr "Futtatókörnyezet elavult"
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
@@ -165,118 +170,124 @@ msgstr ""
 "A(z) {} futtatókörnyezete elavult és nem fog többé biztonsági frissítéseket "
 "kapni"
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr "Frissítések kikapcsolva"
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr "A(z) {} maszkolva van és nem lesz frissítve"
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr "Tulajdonságok"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr "Név másolva"
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr "Név másolása"
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr "Azonosító másolva"
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr "Azonosító másolása"
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr "Hivatkozás másolva"
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr "Hivatkozás másolása"
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr "Indítási parancs másolva"
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr "Indítási parancs másolása"
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr "Másol"
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr "{} megnyitva"
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr "Megnyitás"
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr "Frissítések kikapcsolása"
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr "Frissítések engedélyezése"
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr "Adatmappa megnyitása"
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr "Felhasználói adatok kukázása"
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Snapshots"
+msgstr "Tárolók kezelése"
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr "Visszafejlesztés"
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr "Nem lehet megnyitni a mappát"
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr "Az adatok kukázása sikertelen"
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr "Felhasználói adatok kukázva"
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr "Kukázza a(z) {} adatait?"
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr "Az adatai a kukába lesznek helyezve."
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr "Adatok kukázása"
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr "A(z) {} frissítéseinek kikapcsolása sikertelen"
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr "Kikapcsolja a(z) {} frissítését?"
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
@@ -284,103 +295,121 @@ msgstr ""
 "Ez maszkolja a(z) {} Flatpak-et, biztosítva, hogy nem fog többé biztonsági "
 "vagy funkciófrissítéseket kapni."
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr "Az applikációt nem lehetett futtatni"
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr "Rendben"
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr "Lista frissítve"
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr "A(z) {} nem tartalmaz felhasználói adatokat"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr "Kukázza a kijelölt applikációk adatait?"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr "Az adatai a kukába lesznek helyezve."
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr "A kiválasztott applikációk neve másolva"
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr "A kiválasztott applikációk azonosítója másolva"
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr "A kiválasztott applikációk hivatkozása másolva"
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr "Sikeresen telepítve"
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr "Az applikáció telepítése sikertelen"
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr "{} telepítése?"
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr "Telepítés"
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr "Felhasználó"
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr "Az applikáció csak önnek lesz elérhető"
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr "Rendszer"
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr "Az applikáció minden felhasználó számára elérhető lesz"
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr "A fájl típus nem támogatott"
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr "Lista frissítése"
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr "Keresés a listában"
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr "Lista szűrése"
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr "Főmenü"
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "Kiválasztási mód váltása"
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+#, fuzzy
+#| msgid "Installation"
+msgid "Installing…"
+msgstr "Telepítés"
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+#, fuzzy
+#| msgid "Installing… This could take a while"
+msgid "This could take a while."
+msgstr "Telepítés… Ez eltarthat egy ideig"
+
+#: data/ui/window.blp:128
+#, fuzzy
+#| msgid "Uninstall"
+msgid "Uninstalling…"
+msgstr "Eltávolítás"
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr "Nem találhatóak Flatpak-ek"
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
@@ -388,55 +417,83 @@ msgstr ""
 "Vagy egy Flatpak sem felel meg a jelenlegi szűrőnek, vagy az applikáció nem "
 "látja a Flatpak-ek listáját, nincs egy Flatpak se telepítve."
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+#, fuzzy
+#| msgid "No Flatpaks Found"
+msgid "No Results Found"
+msgstr "Nem találhatóak Flatpak-ek"
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr "Összes kiválasztása"
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr "Kiválasztott applikációk eltávolítása"
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "Kiválasztott applikációk adatainak kukázása"
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr "Másolás menü megnyitása"
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+#, fuzzy
+#| msgid "Trash Selected Apps' User Data?"
+msgid "Snapshot Selected Apps' Data"
+msgstr "Kukázza a kijelölt applikációk adatait?"
+
+#: data/ui/window.blp:194
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From File…"
 msgstr "Fájlból való telepítés"
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:199
+#, fuzzy
+#| msgid "Manage Leftover Data"
+msgid "Manage Leftover Data…"
 msgstr "Maradék adatok kezelése"
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:208
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Remotes…"
 msgstr "Tárolók kezelése"
 
-#: src/window.blp:131
+#: data/ui/window.blp:213
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From The Web…"
+msgstr "Fájlból való telepítés"
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr "_Billentyűparancsok"
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr "_A Raktárról"
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr "Nevek másolása"
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr "Azonosítók másolása"
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr "Hivatkozások másolása"
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr "Applikáció megnyitása"
 
@@ -448,7 +505,7 @@ msgstr "Applikációkezelés"
 msgid "Search"
 msgstr "Keresés"
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr "Szűrők beállítása"
 
@@ -460,6 +517,18 @@ msgstr "Frissítés"
 msgid "More Functions"
 msgstr "Több funkció"
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr "Maradék adatok kezelése"
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr "Tárolók kezelése"
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr "Fájlból való telepítés"
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr "Általános"
@@ -476,78 +545,84 @@ msgstr "Billentyűparancsok megjelenítése"
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr "{} tulajdonságai"
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr "Applikációk megjelenítése, amelyek ezt a futtatókörnyezetet használják"
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr "{} másolva"
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+#, fuzzy
+#| msgid "Could not trash data"
+msgid "Could not show details"
+msgstr "Az adatok kukázása sikertelen"
+
+#: src/properties_window.py:54
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "User Data"
+msgstr "Felhasználói adatok kukázása"
+
+#: src/properties_window.py:73 src/properties_window.py:118
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "No User Data"
+msgstr "Felhasználói adatok kukázása"
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr "Név"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr "Leírás"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr "Azonosító"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr "Verzió"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr "Ág"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr "Architektúra"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr "Eredet"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr "Telepítés"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr "Hivatkozás"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr "Aktív véglegesítő"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr "Legutóbbi véglegesítő"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr "Telepítés mérete"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr "Beállítások"
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr "Futtatókörnyezet"
-
-#: src/properties_window.py:153
-msgid "Copy {}"
-msgstr "{} másolása"
+#: src/properties_window.py:177
+msgid "{} Properties"
+msgstr "{} tulajdonságai"
 
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
@@ -566,85 +641,85 @@ msgstr "{} eltávolítása?"
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr "Tároló nevének másolása"
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr "{} eltávolítása"
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr "A(z) {} tárolót nem lehetett hozzáadni"
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr "Flatpak tároló hozzáadása"
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr "Hozzáad"
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr "URL"
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr "Csak önnek lesz elérhető a tároló"
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr "Minden felhasználó számára elérhető lesz a tároló"
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr "{} sikeresen hozzáadva"
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr "Hozzáadja a {} tárolót?"
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 "Az elementary nyílt forráskódú, fizessen-amennyit-akar alkalmazásüzlete"
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr "A Flatpak alkalmazások központi tárolója"
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr "Flatpak alkalmazások bétaverziói"
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr "Flatpak-ek a Fedora Linux által csomagolva"
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr "A legutóbbi GNOME alkalmazások és futtatókörnyezetek bétái"
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr "Béta KDE applikációk és futtatókörnyezetek"
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr "A WebKit Developer futtatókörnyezet és SDK központi tárolója"
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr "Tároló hozzáadása"
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr "Nincsenek tárolók"
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -654,90 +729,86 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr "Flatpak tárolók"
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr "Válasszon a népszerű tárolók listájából, vagy adjon hozzá egy újat."
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr "Tároló fájl hozzáadása"
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr "Egyedi tároló hozzáadása"
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr "Pár applikációt nem lehetett telepíteni"
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr "Telepítés… Ez eltarthat egy ideig"
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr "Megpróbálja a telepítést?"
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 "A Raktár megpróbálja telepíteni az applikációkat, amik egyeznek a "
 "kiválasztott adatokkal."
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr "Erre kihat: {}"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr "Kukázza a mappákat?"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr "A mappák a kukába kerülnek."
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr "Folytatás"
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr "Az adatok kezelése sikertelen"
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr "Adatmappa megnyitása"
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr "Nincsenek maradék adatok"
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr "Nincsenek maradék adatok"
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr "Applikációk megjelenítése"
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr "Futtatókörnyezetek megjelenítése"
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr "Applikációk szűrése tároló alapján"
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr "Applikációk szűrése futtatókörnyezet alapján"
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr "Véglegesítő hash: {}"
 
@@ -745,6 +816,12 @@ msgstr "Véglegesítő hash: {}"
 msgid "Could not downgrade {}"
 msgstr "A(z) {} visszafejlesztése sikertelen"
 
+#: src/downgrade_window.py:108
+#, fuzzy
+#| msgid "Could disable updates for {}"
+msgid "Could not disable updates for {}"
+msgstr "A(z) {} frissítéseinek kikapcsolása sikertelen"
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr "Visszafejlesztés…"
@@ -761,11 +838,11 @@ msgstr "Kiadások lekérése…"
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr "Biztosátja, hogy a(z) {} sose lesz frissítve"
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr "Kiadás kiválasztása"
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
@@ -773,8 +850,15 @@ msgstr ""
 "Eltávolítja a jelenlegi kiadást és telepíti a kiválasztottat. A "
 "visszafejlesztés problémákkal járhat."
 
-#~ msgid "Could not trash data"
-#~ msgstr "Az adatok kukázása sikertelen"
+#~ msgid "Show Apps Using this Runtime"
+#~ msgstr ""
+#~ "Applikációk megjelenítése, amelyek ezt a futtatókörnyezetet használják"
+
+#~ msgid "Runtime"
+#~ msgstr "Futtatókörnyezet"
+
+#~ msgid "Copy {}"
+#~ msgstr "{} másolása"
 
 #~ msgid "Add a Remote"
 #~ msgstr "Tároló hozzáadása"
diff --git a/po/it.po b/po/it.po
index 0674d76..ae06757 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-10-28 06:14+0000\n"
 "Last-Translator: albanobattistella <albano_battistella@hotmail.com>\n"
 "Language-Team: Italian <https://weblate.fyralabs.com/projects/flattool/"
@@ -27,6 +27,7 @@ msgstr ""
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr ""
@@ -65,369 +66,405 @@ msgstr ""
 msgid "Reinstall apps that have leftover data"
 msgstr ""
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr ""
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr ""
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr ""
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr ""
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr ""
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr ""
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr ""
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr ""
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr ""
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr ""
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr ""
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr ""
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr ""
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr ""
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr ""
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr ""
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr ""
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr ""
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr ""
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr ""
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr ""
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr ""
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr ""
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr ""
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr ""
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr ""
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr ""
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr ""
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr ""
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr ""
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr ""
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr ""
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr ""
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr ""
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr ""
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr ""
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr ""
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr ""
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+msgid "Manage Snapshots"
+msgstr ""
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr ""
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr ""
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr ""
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr ""
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr ""
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr ""
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr ""
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr ""
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
 msgstr ""
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr ""
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr ""
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr ""
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr ""
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr ""
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr ""
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr ""
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr ""
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr ""
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr ""
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr ""
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr ""
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr ""
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr ""
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr ""
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr ""
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr ""
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr ""
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr ""
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr ""
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr ""
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+msgid "Installing…"
+msgstr ""
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+msgid "This could take a while."
+msgstr ""
+
+#: data/ui/window.blp:128
+msgid "Uninstalling…"
+msgstr ""
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr ""
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
 msgstr ""
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+msgid "No Results Found"
+msgstr ""
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr ""
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr ""
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr ""
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr ""
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+msgid "Snapshot Selected Apps' Data"
 msgstr ""
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:194
+msgid "Install From File…"
 msgstr ""
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:199
+msgid "Manage Leftover Data…"
 msgstr ""
 
-#: src/window.blp:131
+#: data/ui/window.blp:208
+msgid "Manage Remotes…"
+msgstr ""
+
+#: data/ui/window.blp:213
+msgid "Install From The Web…"
+msgstr ""
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr ""
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr ""
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr ""
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr ""
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr ""
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr ""
 
@@ -439,7 +476,7 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr ""
 
@@ -451,6 +488,18 @@ msgstr ""
 msgid "More Functions"
 msgstr ""
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr ""
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr ""
@@ -467,77 +516,77 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr ""
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr ""
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr ""
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+msgid "Could not show details"
+msgstr ""
+
+#: src/properties_window.py:54
+msgid "User Data"
+msgstr ""
+
+#: src/properties_window.py:73 src/properties_window.py:118
+msgid "No User Data"
+msgstr ""
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr ""
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr ""
-
-#: src/properties_window.py:153
-msgid "Copy {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
 msgstr ""
 
 #: src/remotes_window.py:48
@@ -556,84 +605,84 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr ""
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr ""
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr ""
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr ""
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr ""
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr ""
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr ""
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr ""
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr ""
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr ""
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr ""
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr ""
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr ""
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr ""
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -642,88 +691,84 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr ""
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr ""
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr ""
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr ""
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr ""
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr ""
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr ""
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr ""
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr ""
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr ""
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr ""
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr ""
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr ""
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr ""
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr ""
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr ""
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr ""
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr ""
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr ""
 
@@ -731,6 +776,10 @@ msgstr ""
 msgid "Could not downgrade {}"
 msgstr ""
 
+#: src/downgrade_window.py:108
+msgid "Could not disable updates for {}"
+msgstr ""
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr ""
@@ -747,11 +796,11 @@ msgstr ""
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 7b6f096..425af7d 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-10-21 22:37+0000\n"
 "Last-Translator: Runar <runarcn@proton.me>\n"
 "Language-Team: Norwegian Bokmål <https://weblate.fyralabs.com/projects/"
@@ -27,6 +27,7 @@ msgstr "Warehouse"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "Behandle alt Flatpak"
@@ -67,388 +68,428 @@ msgstr "Find og slett gjenværende brukerdata"
 msgid "Reinstall apps that have leftover data"
 msgstr "Re-installer programmene som har gjenværende data"
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Flatpak-er"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr "Avinstallering vellykket"
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr "Klarte ikke å avinstallere noen programmer"
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr "Avinstaller valgte programmer?"
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr "Det vil ikke være mulig å bruke disse programmene etter de er fjernet."
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr "Programinnstillinger & Data"
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr "Behold"
 
-#: src/window.py:167
+#: src/window.py:165
 #, fuzzy
 #| msgid "Allow restoring app settings and content"
 msgid "Allow restoring these apps' settings and content"
 msgstr "Tillat gjenopprettelse av programinnstillinger og innhold"
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 #, fuzzy
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: src/window.py:168
+#: src/window.py:166
 #, fuzzy
 #| msgid "Send app settings and content to the trash"
 msgid "Send these apps' settings and content to the trash"
 msgstr "Slett programinnstillinger og programinnhold"
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr "Avinstaller"
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr "Kan ikke avinstallere mens programmet allerede avinstalleres"
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr "Avinstaller {}?"
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr "Det vil ikke være mulig å bruke {} etter fjerning."
 
-#: src/window.py:240
+#: src/window.py:234
 #, fuzzy
 #| msgid "Allow restoring app settings and content"
 msgid "Allow restoring this app's settings and content"
 msgstr "Tillat gjenopprettelse av programinnstillinger og innhold"
 
-#: src/window.py:241
+#: src/window.py:235
 #, fuzzy
 #| msgid "Send app settings and content to the trash"
 msgid "Send this app's settings and content to the trash"
 msgstr "Slett programinnstillinger og programinnhold"
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr ""
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr ""
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr ""
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr ""
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr ""
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr "Vis Egenskaper"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr "Navnet er kopiert"
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr "Kopier navn"
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr "ID-en er kopiert"
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr "Kopier ID"
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr ""
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr ""
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr ""
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr ""
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr "Kopier"
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr "Åpnet {}"
 
-#: src/window.py:352
+#: src/window.py:334
 #, fuzzy
 #| msgid "Open {}"
 msgid "Open"
 msgstr "Åpne {}"
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr ""
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr ""
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr ""
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 #, fuzzy
 #| msgid "Trashed user data"
 msgid "Trash User Data"
 msgstr "Slettet brukerdata"
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+msgid "Manage Snapshots"
+msgstr ""
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr ""
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr ""
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 #, fuzzy
 #| msgid "Can't trash user data for {}"
 msgid "Could not trash user data"
 msgstr "Kan ikke slette brukerdata for {}"
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr "Slettet brukerdata"
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr ""
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr "Slett Data"
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 #, fuzzy
 #| msgid "No user data for {}"
 msgid "Could disable updates for {}"
 msgstr "Ingen brukerdata funnet for {}"
 
-#: src/window.py:457
+#: src/window.py:472
 #, fuzzy
 #| msgid "No user data for {}"
 msgid "Disable Updates for {}?"
 msgstr "Ingen brukerdata funnet for {}"
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
 msgstr ""
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr ""
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr "OK"
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr ""
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr "Ingen brukerdata funnet for {}"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr "Slett Valgte Programmers Brukerdata?"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr "Dine filer og dataer for disse programmene vil bli slettet."
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr ""
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr ""
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr ""
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr ""
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr ""
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr ""
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr ""
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr ""
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr ""
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr ""
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr ""
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr ""
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr ""
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr ""
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr ""
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr ""
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr ""
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+msgid "Installing…"
+msgstr ""
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+msgid "This could take a while."
+msgstr ""
+
+#: data/ui/window.blp:128
+#, fuzzy
+#| msgid "Uninstall"
+msgid "Uninstalling…"
+msgstr "Avinstaller"
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr ""
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
 msgstr ""
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+msgid "No Results Found"
+msgstr ""
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr ""
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr ""
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr ""
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr ""
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+#, fuzzy
+#| msgid "Trash Selected Apps' User Data?"
+msgid "Snapshot Selected Apps' Data"
+msgstr "Slett Valgte Programmers Brukerdata?"
+
+#: data/ui/window.blp:194
+msgid "Install From File…"
 msgstr ""
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:199
+msgid "Manage Leftover Data…"
 msgstr ""
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:208
+msgid "Manage Remotes…"
 msgstr ""
 
-#: src/window.blp:131
+#: data/ui/window.blp:213
+msgid "Install From The Web…"
+msgstr ""
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr ""
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr ""
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr ""
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr ""
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr ""
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr ""
 
@@ -460,7 +501,7 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr ""
 
@@ -472,6 +513,18 @@ msgstr ""
 msgid "More Functions"
 msgstr ""
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr ""
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr ""
@@ -490,77 +543,83 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr ""
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr ""
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr ""
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+#, fuzzy
+#| msgid "Could not uninstall some apps"
+msgid "Could not show details"
+msgstr "Klarte ikke å avinstallere noen programmer"
+
+#: src/properties_window.py:54
+#, fuzzy
+#| msgid "Trashed user data"
+msgid "User Data"
+msgstr "Slettet brukerdata"
+
+#: src/properties_window.py:73 src/properties_window.py:118
+#, fuzzy
+#| msgid "Trashed user data"
+msgid "No User Data"
+msgstr "Slettet brukerdata"
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr ""
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr ""
-
-#: src/properties_window.py:153
-msgid "Copy {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
 msgstr ""
 
 #: src/remotes_window.py:48
@@ -579,84 +638,84 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr ""
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr ""
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr ""
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr ""
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr ""
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr ""
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr ""
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr ""
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr ""
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr ""
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr ""
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr ""
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr ""
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr ""
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -667,90 +726,86 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr "Flatpak-er"
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr ""
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr ""
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr ""
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 #, fuzzy
 #| msgid "Could not uninstall some apps"
 msgid "Could not install some apps"
 msgstr "Klarte ikke å avinstallere noen programmer"
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr ""
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr ""
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr ""
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr ""
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr ""
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr ""
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr ""
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr ""
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr ""
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr ""
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr ""
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr ""
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr ""
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr ""
 
@@ -758,6 +813,12 @@ msgstr ""
 msgid "Could not downgrade {}"
 msgstr ""
 
+#: src/downgrade_window.py:108
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Could not disable updates for {}"
+msgstr "Ingen brukerdata funnet for {}"
+
 #: src/downgrade_window.py:116
 #, fuzzy
 #| msgid "Downgrade {}"
@@ -776,21 +837,16 @@ msgstr ""
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
 msgstr ""
 
-#, fuzzy
-#~| msgid "Could not uninstall some apps"
-#~ msgid "Could not trash data"
-#~ msgstr "Klarte ikke å avinstallere noen programmer"
-
 #, fuzzy
 #~| msgid "Send app settings and content to the trash"
 #~ msgid "Send {}'s User Data to the trash?"
diff --git a/po/nl.po b/po/nl.po
index a8c46ac..f4f170e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-10-25 09:10+0000\n"
 "Last-Translator: Gert-dev <Gert-dev@users.noreply.weblate.fyralabs.com>\n"
 "Language-Team: Dutch <https://weblate.fyralabs.com/projects/flattool/"
@@ -27,6 +27,7 @@ msgstr "Warehouse"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "Beheer alles rond Flatpak"
@@ -67,88 +68,92 @@ msgstr "Zoek op en gooi overgebleven gebruikersdata in de prullenbak"
 msgid "Reinstall apps that have leftover data"
 msgstr "Herinstalleer applicaties met overgebleven data"
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Flatpaks"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr "Met succes gedeïnstalleerd"
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr "Kon sommige applicaties niet deïnstalleren"
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr "Geselecteerde applicaties deïnstalleren?"
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr ""
 "Het zal niet meer mogelijk zijn deze applicaties te gebruiken na ze te "
 "verwijderen."
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr "Applicatie-instellingen en -data"
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr "Behouden"
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr "Herstellen instellingen en inhoud van deze applicaties toestaan"
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr "In prullenbak gooien"
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr "Werp de instellingen en inhoud van deze applicaties in de prullenbak"
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr "Deïnstalleren"
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr "Deïnstalleren is niet beschikbaar wanneer er al gedeïnstalleerd wordt"
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr "{} deïnstalleren?"
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr "Het zal niet mogelijk zijn om {} te gebruiken na het te verwijderen."
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr "Herstellen instellingen en inhoud van deze applicatie toestaan"
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr "Werp de instellingen en inhoud van deze applicatie in de prullenbak"
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr "App EOL"
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr ""
@@ -156,11 +161,11 @@ msgstr ""
 "beveiligingsupdates zal krijgen"
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr "Runtime EOL"
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
@@ -168,120 +173,126 @@ msgstr ""
 "De runtime van {} is 'end-of-life' wat betekent dat niet meer bijgewerkt zal "
 "worden of beveiligingsupdates zal krijgen"
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr "Updates uitgeschakeld"
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr "{} is gemaskeerd en zal niet bijgewerkt worden"
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr "Eigenschappen weergeven"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr "Naam gekopieerd"
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr "Naam kopiëren"
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr "ID gekopieerd"
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr "ID kopiëren"
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr "Ref gekopieerd"
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr "Ref kopiëren"
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr "Startcommando gekopieerd"
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr "Startcommando kopiëren"
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr "{} geopend"
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr "Openen"
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr "Updates uitschakelen"
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr "Updates inschakelen"
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr "Map met gebruikersdata openen"
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr "Gebruikersdata in prullenbak gooien"
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Snapshots"
+msgstr "Bronnen beheren"
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr "Downgraden"
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr "Kon map niet openen"
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr "Kon gebruikersdata niet in prullenbak gooien"
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr "Gebruikersdata in prullenbak gegooid"
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr "Gebruikersdata van {} in de prullenbak gooien?"
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 "Je bestanden en data van deze applicatie zullen in de prullenbak gegooid "
 "worden."
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr "Data in de prullenbak gooien"
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr "Updates voor {} uitgeschakeld"
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr "Updates voor {} uitschakelen?"
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
@@ -289,105 +300,123 @@ msgstr ""
 "Dit zal {} maskeren waardoor toekomstige versies of beveiligingsupdates "
 "genegeerd worden."
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr "Kon applicatie niet starten"
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr "OK"
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr "Lijst bijgewerkt"
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr "Geen gebruikersdata voor {}"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr "Gebruikersdata van geselecteerde applicatie in prullenbak gooien?"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr ""
 "Je bestanden en data van deze applicaties zullen in de prullenbak gegooid "
 "worden."
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr "Geselecteerde applicatienamen gekopieerd"
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr "Geselecteerde applicatie-IDs gekopieerd"
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr "Geselecteerde applicatie-refs gekopieerd"
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr "Met succes geïnstalleerd"
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr "Kon applicatie niet installeren"
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr "{} installeren?"
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr "Installeren"
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr "Gebruiker"
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr "De applicatie zal enkel voor jou beschikbaar zijn"
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr "Systeem"
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr "De applicatie zal voor elke gebruiker op het systeem beschikbaar zijn"
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr "Bestandstype niet ondersteund"
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr "Lijst vernieuwen"
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr "Lijst doorzoeken"
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr "Lijst filteren"
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr "Hoofdmenu"
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "Selectiemodus omschakelen"
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+#, fuzzy
+#| msgid "Installation"
+msgid "Installing…"
+msgstr "Installatie"
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+#, fuzzy
+#| msgid "Installing… This could take a while"
+msgid "This could take a while."
+msgstr "Bezig met installeren... Dit kan even duren"
+
+#: data/ui/window.blp:128
+#, fuzzy
+#| msgid "Uninstall"
+msgid "Uninstalling…"
+msgstr "Deïnstalleren"
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr "Geen Flatpaks teruggevonden"
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
@@ -395,55 +424,83 @@ msgstr ""
 "Er zijn ofwel geen Flatpaks die voldoen aan de huidige filter, ofwel kan "
 "Warehouse de lijst van geïnstalleerde Flatpaks niet opvragen."
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+#, fuzzy
+#| msgid "No Flatpaks Found"
+msgid "No Results Found"
+msgstr "Geen Flatpaks teruggevonden"
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr "Geselecteerde applicaties deïnstalleren"
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "Data van geselecteerde applicaties in de prullenbak gooien"
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr "Kopieermenu openen"
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+#, fuzzy
+#| msgid "Trash Selected Apps' User Data?"
+msgid "Snapshot Selected Apps' Data"
+msgstr "Gebruikersdata van geselecteerde applicatie in prullenbak gooien?"
+
+#: data/ui/window.blp:194
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From File…"
 msgstr "Uit bestand installeren"
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:199
+#, fuzzy
+#| msgid "Manage Leftover Data"
+msgid "Manage Leftover Data…"
 msgstr "Overgebleven data beheren"
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:208
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Remotes…"
 msgstr "Bronnen beheren"
 
-#: src/window.blp:131
+#: data/ui/window.blp:213
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From The Web…"
+msgstr "Uit bestand installeren"
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr "_Sneltoetsen"
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr "_Over Warehouse"
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr "Namen kopiëren"
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr "IDs kopiëren"
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr "Refs kopiëren"
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr "Applicatie openen"
 
@@ -455,7 +512,7 @@ msgstr "Applicatiebeheer"
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr "Filters instellen"
 
@@ -467,6 +524,18 @@ msgstr "Vernieuwen"
 msgid "More Functions"
 msgstr "Meer functies"
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr "Overgebleven data beheren"
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr "Bronnen beheren"
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr "Uit bestand installeren"
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr "Algemeen"
@@ -483,78 +552,84 @@ msgstr "Sneltoetsen tonen"
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr "Eigenschappen van {}"
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr "Toon applicaties op deze runtime"
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr "{} gekopieerd"
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+#, fuzzy
+#| msgid "Could not trash user data"
+msgid "Could not show details"
+msgstr "Kon gebruikersdata niet in prullenbak gooien"
+
+#: src/properties_window.py:54
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "User Data"
+msgstr "Gebruikersdata in prullenbak gooien"
+
+#: src/properties_window.py:73 src/properties_window.py:118
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "No User Data"
+msgstr "Gebruikersdata in prullenbak gooien"
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr "Naam"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr "Applicatie-ID"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr "Versie"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr "Tak"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr "Architectuur"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr "Bron"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr "Installatie"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr "Referentie"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr "Actieve commit"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr "Laatste commit"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr "Geïnstalleerde grootte"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr "Opties"
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr "Runtime"
-
-#: src/properties_window.py:153
-msgid "Copy {}"
-msgstr "{} kopiëren"
+#: src/properties_window.py:177
+msgid "{} Properties"
+msgstr "Eigenschappen van {}"
 
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
@@ -572,84 +647,84 @@ msgstr "{} verwijderen?"
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr "Naam bron kopiëren"
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr "{} verwijderen"
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr "Kon {} niet toevoegen"
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr "Flatpak-bron toevoegen"
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr "URL"
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr "De bron zal enkel voor jou beschikbaar zijn"
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr "De bron zal voor elke gebruiker op het systeem beschikbaar zijn"
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr "{} met succes toegevoegd"
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr "{} toevoegen?"
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr "De open source, 'betaal wat je wil', applicatiewinkel van elementary"
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr "Centrale collectie van Flatpak-applicaties"
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr "Bèta-versies van Flatpak-applicaties"
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr "Flatpaks beheerd door Fedora Linux"
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr "De laatste bèta-versies van GNOME-applicaties en -runtimes"
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr "Bèta-versies van KDE-applicaties en -runtimes"
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr "Centrale collectie met de WebKit-ontwikkelaars- en runtime-SDK"
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr "Bron toevoegen"
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr "Geen bronnen"
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr "Warehouse kan de lijst van bronnen niet ophalen of er zijn er nog geen"
@@ -658,90 +733,86 @@ msgstr "Warehouse kan de lijst van bronnen niet ophalen of er zijn er nog geen"
 msgid "Flatpak Repos"
 msgstr "Flatpak-bronnen"
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr "Kies uit een lijst van populaire bronnen of voeg een nieuwe toe."
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr "Collectiebestand toevoegen"
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr "Aangepaste bron toevoegen"
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr "Kon sommige applicaties niet installeren"
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr "Bezig met installeren... Dit kan even duren"
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr "Proberen te installeren?"
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 "Warehouse zal proberen applicaties te installeren die overeenkomen met de "
 "geselecteerde data."
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr "{} breed"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr "Mappen in de prullenbak gooien?"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr "Deze mappen zullen in de prullenbak gegooid worden."
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr "Verdergaan"
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr "Kon data niet beheren"
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr "Datamap openen"
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr "Geen overgebleven data"
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr "Er werd geen overgebleven gebruikersdata teruggevonden"
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr "Applicaties tonen"
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr "Runtimes tonen"
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr "Apps op bron filteren"
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr "Apps op runtime filteren"
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr "Commit-hash: {}"
 
@@ -749,6 +820,12 @@ msgstr "Commit-hash: {}"
 msgid "Could not downgrade {}"
 msgstr "Kon {} niet downgraden"
 
+#: src/downgrade_window.py:108
+#, fuzzy
+#| msgid "Could disable updates for {}"
+msgid "Could not disable updates for {}"
+msgstr "Updates voor {} uitgeschakeld"
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr "Downgraden…"
@@ -765,14 +842,23 @@ msgstr "Uitgaves ophalen…"
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr "Voorkom dat {} ooit bijgewerkt wordt naar een nieuwere versie"
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr "Een versie selecteren"
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
 msgstr ""
 "Dit zal de huidige versie deïnstalleren en vervangen met de gekozen versie. "
 "Merk op dat downgraden problemen kan veroorzaken."
+
+#~ msgid "Show Apps Using this Runtime"
+#~ msgstr "Toon applicaties op deze runtime"
+
+#~ msgid "Runtime"
+#~ msgstr "Runtime"
+
+#~ msgid "Copy {}"
+#~ msgstr "{} kopiëren"
diff --git a/po/oc.po b/po/oc.po
index ca10f0d..9e2f37e 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-10-28 06:14+0000\n"
 "Last-Translator: Mejans <farga@mejans.fr>\n"
 "Language-Team: Occitan <https://weblate.fyralabs.com/projects/flattool/"
@@ -27,6 +27,7 @@ msgstr "Entrepaus"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "Gerir tot çò de Flatpak"
@@ -67,369 +68,411 @@ msgstr ""
 msgid "Reinstall apps that have leftover data"
 msgstr ""
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Flatpaks"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr "Desinstallacion amb succès"
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr ""
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr ""
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr ""
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr "Donadas e paramètres de l'aplicacion"
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr "Gardar"
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr ""
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr "Bordilhièr"
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr ""
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr "Anullar"
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr "Desinstallar"
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr ""
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr "Desinstallar {} ?"
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr ""
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr ""
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr ""
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr ""
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr ""
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr ""
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr ""
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr ""
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr ""
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr ""
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr "Copiar lo nom"
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr ""
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr ""
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr ""
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr ""
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr ""
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr ""
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr ""
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr "Dobrir"
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr ""
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr ""
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr ""
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr ""
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+msgid "Manage Snapshots"
+msgstr ""
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr "Installar una version anteriora"
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr ""
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr ""
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr ""
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr ""
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr ""
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr ""
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr ""
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
 msgstr ""
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr ""
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr "D’ACÒRDI"
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr ""
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr ""
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr ""
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr ""
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr ""
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr ""
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr ""
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr "Installar {} ?"
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr "installar"
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr "Utilizaire"
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr ""
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr "Sistèma"
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr ""
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr ""
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr "Refrescar la lista"
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr ""
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr ""
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr "Menú principal"
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr ""
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+#, fuzzy
+#| msgid "Installation"
+msgid "Installing…"
+msgstr "Installacion"
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+msgid "This could take a while."
+msgstr ""
+
+#: data/ui/window.blp:128
+#, fuzzy
+#| msgid "Uninstall"
+msgid "Uninstalling…"
+msgstr "Desinstallar"
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr "Cap de Flatpak pas trobat"
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
 msgstr ""
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+#, fuzzy
+#| msgid "No Flatpaks Found"
+msgid "No Results Found"
+msgstr "Cap de Flatpak pas trobat"
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr "Tot seleccionar"
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr ""
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr ""
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr ""
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+msgid "Snapshot Selected Apps' Data"
 msgstr ""
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:194
+msgid "Install From File…"
 msgstr ""
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:199
+msgid "Manage Leftover Data…"
 msgstr ""
 
-#: src/window.blp:131
+#: data/ui/window.blp:208
+msgid "Manage Remotes…"
+msgstr ""
+
+#: data/ui/window.blp:213
+msgid "Install From The Web…"
+msgstr ""
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr "_Acorchis de clavièr"
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr "_A prepaus d’Entrepaus"
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr "Copiar los noms"
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr "Copiar los identificants"
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr "Copiar las referéncias"
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr "Dobrir l’aplicacion"
 
@@ -441,7 +484,7 @@ msgstr "Gestion de l’aplicacion"
 msgid "Search"
 msgstr "Recercar"
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr ""
 
@@ -453,6 +496,18 @@ msgstr "Refrescar"
 msgid "More Functions"
 msgstr "Mai de foncions"
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr ""
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr "General"
@@ -469,78 +524,80 @@ msgstr "Afichar los acorchis"
 msgid "Quit"
 msgstr "Quitar"
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr ""
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr ""
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr ""
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+msgid "Could not show details"
+msgstr ""
+
+#: src/properties_window.py:54
+#, fuzzy
+#| msgid "User"
+msgid "User Data"
+msgstr "Utilizaire"
+
+#: src/properties_window.py:73 src/properties_window.py:118
+msgid "No User Data"
+msgstr ""
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr "Nom"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr "Descripcion"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr "Identificant de l’aplicacion"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr "Version"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr "Branca"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr "Arq."
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr "Origina"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr "Installacion"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr "Referéncia"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr "Talha installada"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr "Opcions"
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr "Environament d’execucion"
-
-#: src/properties_window.py:153
-msgid "Copy {}"
-msgstr "Copiar {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
+msgstr ""
 
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
@@ -558,84 +615,84 @@ msgstr ""
 msgid "Remove"
 msgstr "Suprimir"
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr ""
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr ""
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr ""
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr ""
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr "Apondre"
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr "URL"
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr ""
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr ""
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr ""
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr ""
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr ""
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr ""
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr "Apondre un depaus distant"
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr ""
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -644,88 +701,84 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr ""
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr ""
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr ""
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr ""
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr ""
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr ""
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr ""
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr ""
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr "Contunhar"
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr ""
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr ""
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr ""
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr ""
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr "Afichar las aplicacions"
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr "Afichar los environaments d’execucion"
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr ""
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr ""
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr ""
 
@@ -733,6 +786,10 @@ msgstr ""
 msgid "Could not downgrade {}"
 msgstr ""
 
+#: src/downgrade_window.py:108
+msgid "Could not disable updates for {}"
+msgstr ""
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr ""
@@ -749,12 +806,18 @@ msgstr ""
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
 msgstr ""
+
+#~ msgid "Runtime"
+#~ msgstr "Environament d’execucion"
+
+#~ msgid "Copy {}"
+#~ msgstr "Copiar {}"
diff --git a/po/pl.po b/po/pl.po
index 5a6326b..d527c9f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-10-21 09:35+0000\n"
 "Last-Translator: eryn <hericiumvevo@getcryst.al>\n"
 "Language-Team: Polish <https://weblate.fyralabs.com/projects/flattool/"
@@ -30,6 +30,7 @@ msgstr "Warehouse"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "Zarządzaj wszystkim co Flatpakowe"
@@ -70,371 +71,407 @@ msgstr "Znajdź i przenieś do kosza pozostałe dane użytkownika"
 msgid "Reinstall apps that have leftover data"
 msgstr "Zainstaluj ponownie aplikacje których danych pozostały na systemie"
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Flatpaki"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr ""
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr ""
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr ""
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr ""
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr ""
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr ""
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr ""
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr ""
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr ""
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr ""
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr ""
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr ""
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr ""
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr ""
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr ""
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr ""
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr ""
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr ""
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr ""
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr ""
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr ""
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr ""
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr ""
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr ""
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr ""
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr ""
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr ""
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr ""
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr ""
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr ""
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr ""
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr ""
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr ""
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr ""
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr ""
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr ""
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr ""
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+msgid "Manage Snapshots"
+msgstr ""
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr ""
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr ""
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 #, fuzzy
 #| msgid "Find and trash leftover user data"
 msgid "Could not trash user data"
 msgstr "Znajdź i przenieś do kosza pozostałe dane użytkownika"
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr ""
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr ""
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr ""
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr ""
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr ""
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
 msgstr ""
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr ""
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr ""
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr ""
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr ""
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr ""
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr ""
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr ""
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr ""
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr ""
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr ""
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr ""
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr ""
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr ""
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr ""
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr ""
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr ""
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr ""
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr ""
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr ""
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr ""
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr ""
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+msgid "Installing…"
+msgstr ""
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+msgid "This could take a while."
+msgstr ""
+
+#: data/ui/window.blp:128
+msgid "Uninstalling…"
+msgstr ""
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr ""
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
 msgstr ""
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+msgid "No Results Found"
+msgstr ""
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr ""
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr ""
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr ""
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr ""
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+msgid "Snapshot Selected Apps' Data"
 msgstr ""
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:194
+msgid "Install From File…"
 msgstr ""
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:199
+msgid "Manage Leftover Data…"
 msgstr ""
 
-#: src/window.blp:131
+#: data/ui/window.blp:208
+msgid "Manage Remotes…"
+msgstr ""
+
+#: data/ui/window.blp:213
+msgid "Install From The Web…"
+msgstr ""
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr ""
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr ""
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr ""
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr ""
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr ""
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr ""
 
@@ -446,7 +483,7 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr ""
 
@@ -458,6 +495,18 @@ msgstr ""
 msgid "More Functions"
 msgstr ""
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr ""
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr ""
@@ -474,77 +523,79 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr ""
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr ""
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr ""
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+#, fuzzy
+#| msgid "Find and trash leftover user data"
+msgid "Could not show details"
+msgstr "Znajdź i przenieś do kosza pozostałe dane użytkownika"
+
+#: src/properties_window.py:54
+msgid "User Data"
+msgstr ""
+
+#: src/properties_window.py:73 src/properties_window.py:118
+msgid "No User Data"
+msgstr ""
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr ""
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr ""
-
-#: src/properties_window.py:153
-msgid "Copy {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
 msgstr ""
 
 #: src/remotes_window.py:48
@@ -563,84 +614,84 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr ""
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr ""
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr ""
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr ""
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr ""
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr ""
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr ""
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr ""
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr ""
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr ""
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr ""
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr ""
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr ""
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr ""
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -651,88 +702,84 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr "Flatpaki"
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr ""
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr ""
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr ""
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr ""
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr ""
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr ""
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr ""
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr ""
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr ""
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr ""
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr ""
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr ""
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr ""
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr ""
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr ""
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr ""
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr ""
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr ""
 
@@ -740,6 +787,10 @@ msgstr ""
 msgid "Could not downgrade {}"
 msgstr ""
 
+#: src/downgrade_window.py:108
+msgid "Could not disable updates for {}"
+msgstr ""
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr ""
@@ -756,11 +807,11 @@ msgstr ""
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e7cf438..a4513e6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -24,6 +24,7 @@ msgstr ""
 msgid "flatpak"
 msgstr ""
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr ""
@@ -62,369 +63,405 @@ msgstr ""
 msgid "Reinstall apps that have leftover data"
 msgstr ""
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr ""
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr ""
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr ""
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr ""
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr ""
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr ""
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr ""
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr ""
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr ""
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr ""
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr ""
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr ""
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr ""
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr ""
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr ""
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr ""
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr ""
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr ""
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr ""
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr ""
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr ""
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr ""
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr ""
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr ""
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr ""
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr ""
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr ""
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr ""
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr ""
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr ""
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr ""
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr ""
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr ""
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr ""
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr ""
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr ""
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr ""
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr ""
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+msgid "Manage Snapshots"
+msgstr ""
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr ""
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr ""
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr ""
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr ""
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr ""
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr ""
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr ""
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr ""
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
 msgstr ""
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr ""
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr ""
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr ""
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr ""
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr ""
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr ""
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr ""
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr ""
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr ""
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr ""
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr ""
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr ""
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr ""
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr ""
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr ""
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr ""
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr ""
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr ""
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr ""
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr ""
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr ""
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+msgid "Installing…"
+msgstr ""
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+msgid "This could take a while."
+msgstr ""
+
+#: data/ui/window.blp:128
+msgid "Uninstalling…"
+msgstr ""
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr ""
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
 msgstr ""
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+msgid "No Results Found"
+msgstr ""
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr ""
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr ""
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr ""
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr ""
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+msgid "Snapshot Selected Apps' Data"
 msgstr ""
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:194
+msgid "Install From File…"
 msgstr ""
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:199
+msgid "Manage Leftover Data…"
 msgstr ""
 
-#: src/window.blp:131
+#: data/ui/window.blp:208
+msgid "Manage Remotes…"
+msgstr ""
+
+#: data/ui/window.blp:213
+msgid "Install From The Web…"
+msgstr ""
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr ""
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr ""
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr ""
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr ""
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr ""
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr ""
 
@@ -436,7 +473,7 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr ""
 
@@ -448,6 +485,18 @@ msgstr ""
 msgid "More Functions"
 msgstr ""
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr ""
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr ""
@@ -464,77 +513,77 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr ""
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr ""
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr ""
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+msgid "Could not show details"
+msgstr ""
+
+#: src/properties_window.py:54
+msgid "User Data"
+msgstr ""
+
+#: src/properties_window.py:73 src/properties_window.py:118
+msgid "No User Data"
+msgstr ""
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr ""
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr ""
-
-#: src/properties_window.py:153
-msgid "Copy {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
 msgstr ""
 
 #: src/remotes_window.py:48
@@ -553,84 +602,84 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr ""
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr ""
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr ""
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr ""
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr ""
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr ""
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr ""
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr ""
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr ""
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr ""
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr ""
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr ""
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr ""
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr ""
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -639,88 +688,84 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr ""
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr ""
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr ""
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr ""
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr ""
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr ""
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr ""
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr ""
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr ""
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr ""
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr ""
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr ""
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr ""
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr ""
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr ""
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr ""
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr ""
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr ""
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr ""
 
@@ -728,6 +773,10 @@ msgstr ""
 msgid "Could not downgrade {}"
 msgstr ""
 
+#: src/downgrade_window.py:108
+msgid "Could not disable updates for {}"
+msgstr ""
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr ""
@@ -744,11 +793,11 @@ msgstr ""
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
diff --git a/po/ru.po b/po/ru.po
index 3ce6e41..07941da 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-10-25 22:31+0000\n"
 "Last-Translator: Сергей Ворон <voron.s.a@gmail.com>\n"
 "Language-Team: Russian <https://weblate.fyralabs.com/projects/flattool/"
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 5.0\n"
 
 #: data/io.github.flattool.Warehouse.desktop.in:3
@@ -28,6 +28,7 @@ msgstr "Warehouse"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "Управляйте всем, что касается Flatpak"
@@ -68,86 +69,90 @@ msgstr "Поиск и очистка оставшихся пользовател
 msgid "Reinstall apps that have leftover data"
 msgstr "Переустановка приложений, в которых остались пользовательские данные"
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Пакеты Flatpak"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr "Успешно удалено"
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr "Не удалось удалить некоторые приложения"
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr "Удалить выбранные приложения?"
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr "После удаления, использовать эти приложения будет невозможно."
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr "Настройки и данные приложения"
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr "Оставить"
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr "Позволяет восстановить настройки и данные этих приложений"
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr "Очистить"
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr "Очистить настройки и данные этих приложений"
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr "Удалить"
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr "Невозможно удалить, если уже идёт удаление"
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr "Удалить {}?"
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr "После удаления, использовать {} будет невозможно."
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr "Позволяет восстановить настройки и контент этого приложения"
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr "Очистить настройки и данные этого приложения"
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr "Cрок поддержки приложения"
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr ""
@@ -155,11 +160,11 @@ msgstr ""
 "никаких обновлений безопасности"
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr "Cрок поддержки среды выполнения"
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
@@ -167,118 +172,124 @@ msgstr ""
 "Срок поддержки среды выполнения {} закончился и она больше не будет получать "
 "никаких обновлений безопасности"
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr "Обновления отключены"
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr "{} скрыт и не будет обновляться"
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr "Просмотр свойств"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr "Имя скопировано"
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr "Копировать имя"
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr "ИД скопирован"
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr "Копировать ИД"
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr "Ссылка скопирована"
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr "Копировать ссылку"
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr "Команда запуска скопирована"
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr "Копировать команду запуска"
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr "Открыто {}"
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr "Открыть"
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr "Отключить обновления"
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr "Включить обновления"
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr "Открыть папку с данными приложения"
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr "Очистить данные приложения"
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Snapshots"
+msgstr "Управление репозиториями"
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr "Понизить версию"
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr "Не удалось открыть папку"
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr "Не удалось очистить данные приложения"
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr "Данные приложения очищены"
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr "Очистить данные приложения {}?"
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr "Ваши файлы и данные этого приложения будут очищены."
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr "Очистить данные"
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr "Можно отключить обновления для {}"
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr "Отключить обновления для {}?"
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
@@ -286,103 +297,121 @@ msgstr ""
 "Это скроет {}, гарантируя, что он никогда не получит никаких обновлений "
 "функций и безопасности."
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr "Не удалось запустить приложение"
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr "ОК"
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr "Список обновлен"
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr "Нет данных для {}"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr "Очистить данные выбранных приложений?"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr "Ваши файлы и данные этих приложений будут очищены."
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr "Выбранное имя приложения скопировано"
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr "Выбранный ИД приложения скопирован"
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr "Выбранная ссылка приложения скопирована"
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr "Успешно установлено"
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr "Не удалось установить приложение"
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr "Установить {}?"
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr "Установить"
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr "Пользователь"
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr "Приложение будет доступно только вам"
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr "Система"
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr "Приложение будет доступно всем пользователям системы"
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr "Тип файла не поддерживается"
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr "Обновить список"
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr "Список поиска"
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr "Список фильтров"
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr "Главное меню"
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "Переключение режима выбора"
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+#, fuzzy
+#| msgid "Installation"
+msgid "Installing…"
+msgstr "Установка"
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+#, fuzzy
+#| msgid "Installing… This could take a while"
+msgid "This could take a while."
+msgstr "Установка… Это может занять некоторое время"
+
+#: data/ui/window.blp:128
+#, fuzzy
+#| msgid "Uninstall"
+msgid "Uninstalling…"
+msgstr "Удалить"
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr "Пакеты Flatpak не найдены"
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
@@ -391,55 +420,83 @@ msgstr ""
 "не видит список установленных пакетов Flatpak, либо в системе не установлены "
 "пакеты Flatpak."
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+#, fuzzy
+#| msgid "No Flatpaks Found"
+msgid "No Results Found"
+msgstr "Пакеты Flatpak не найдены"
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr "Выбрать все"
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr "Удалить выбранные приложения"
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "Очистить данные выбранных приложений"
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr "Открыть меню копирования"
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+#, fuzzy
+#| msgid "Trash Selected Apps' User Data?"
+msgid "Snapshot Selected Apps' Data"
+msgstr "Очистить данные выбранных приложений?"
+
+#: data/ui/window.blp:194
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From File…"
 msgstr "Установить из файла"
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:199
+#, fuzzy
+#| msgid "Manage Leftover Data"
+msgid "Manage Leftover Data…"
 msgstr "Управление данными"
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:208
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Remotes…"
 msgstr "Управление репозиториями"
 
-#: src/window.blp:131
+#: data/ui/window.blp:213
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From The Web…"
+msgstr "Установить из файла"
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr "_Комбинации клавиш"
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr "_О приложении"
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr "Копировать имена"
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr "Копировать ИД"
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr "Копировать ссылки"
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr "Открыть приложение"
 
@@ -451,7 +508,7 @@ msgstr "Управление приложениями"
 msgid "Search"
 msgstr "Поиск"
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr "Установить фильтры"
 
@@ -463,6 +520,18 @@ msgstr "Обновить"
 msgid "More Functions"
 msgstr "Дополнительные функции"
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr "Управление данными"
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr "Управление репозиториями"
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr "Установить из файла"
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr "Общие"
@@ -479,78 +548,84 @@ msgstr "Показать комбинации клавиш"
 msgid "Quit"
 msgstr "Выйти"
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr "Свойства {}"
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr "Показать приложения, использующие эту среду выполнения"
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr "Скопировано {}"
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+#, fuzzy
+#| msgid "Could not trash user data"
+msgid "Could not show details"
+msgstr "Не удалось очистить данные приложения"
+
+#: src/properties_window.py:54
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "User Data"
+msgstr "Очистить данные приложения"
+
+#: src/properties_window.py:73 src/properties_window.py:118
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "No User Data"
+msgstr "Очистить данные приложения"
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr "Имя"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr "Описание"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr "ИД приложения"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr "Версия"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr "Ветка"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr "Архитектура"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr "Источник"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr "Установка"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr "Ссылка"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr "Текущий коммит"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr "Последний коммит"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr "Установленный размер"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr "Опции"
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr "Среда выполнения"
-
-#: src/properties_window.py:153
-msgid "Copy {}"
-msgstr "Копировать {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
+msgstr "Свойства {}"
 
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
@@ -568,86 +643,86 @@ msgstr "Удалить {}?"
 msgid "Remove"
 msgstr "Удалить"
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr "Скопировать имя репозитория"
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr "Удалить {}"
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr "Не удалось добавить {}"
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr "Добавить репозиторий Flatpak"
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr "Добавить"
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr "URL"
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr "Репозиторий будет доступен только вам"
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr "Репозиторий будет доступен всем пользователям системы"
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr "{} успешно добавлен"
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr "Добавить {}?"
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 "Магазин приложений с открытым исходным кодом и оплатой по желанию от "
 "elementary"
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr "Центральный репозиторий приложений Flatpak"
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr "Бета-версии приложений Flatpak"
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr "Flatpak, упакованные Fedora Linux"
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr "Последняя бета-версия приложений и сред выполнения GNOME"
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr "Бета-приложения и среды выполнения KDE"
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr "Центральный репозиторий WebKit Developer and Runtime SDK"
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr "Добавить репозиторий"
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr "Нет репозиториев"
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr "Warehouse не видит список репозиториев или они не добавлены в системе"
@@ -656,89 +731,85 @@ msgstr "Warehouse не видит список репозиториев или 
 msgid "Flatpak Repos"
 msgstr "Репозитории Flatpak"
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr "Выберите из списка популярные репозитории или добавьте новый."
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr "Добавить файл репозитория"
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr "Добавить пользовательский репозиторий"
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr "Не удалось установить некоторые приложения"
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr "Установка… Это может занять некоторое время"
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr "Попытаться установить?"
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 "Warehouse попытается установить приложения, соответствующие выбранным данным."
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr "Тип {}"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr "Очистить папки?"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr "Эти папки будут очищены."
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr "Продолжить"
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr "Не удалось управление данными"
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr "Открыть папку данных"
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr "Нет оставшихся данных"
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr "Нет оставшихся пользовательских данных"
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr "Применить"
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr "Показать приложения"
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr "Показать среды выполнения"
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr "Фильтровать приложения по репозиториям"
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr "Фильтрация приложений по средам выполнения"
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr "Хеш коммита: {}"
 
@@ -746,6 +817,12 @@ msgstr "Хеш коммита: {}"
 msgid "Could not downgrade {}"
 msgstr "Не удалось понизить версию {}"
 
+#: src/downgrade_window.py:108
+#, fuzzy
+#| msgid "Could disable updates for {}"
+msgid "Could not disable updates for {}"
+msgstr "Можно отключить обновления для {}"
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr "Понижение версии…"
@@ -762,14 +839,23 @@ msgstr "Получение релизов…"
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr "Гарантируется, что {} никогда не будет обновлен до более новой версии"
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr "Выбрать релиз"
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
 msgstr ""
 "Это приведет к удалению текущей версии и вместо нее установится выбранная. "
 "Обратите внимание, что понижение версии может вызвать проблемы."
+
+#~ msgid "Show Apps Using this Runtime"
+#~ msgstr "Показать приложения, использующие эту среду выполнения"
+
+#~ msgid "Runtime"
+#~ msgstr "Среда выполнения"
+
+#~ msgid "Copy {}"
+#~ msgstr "Копировать {}"
diff --git a/po/sv.po b/po/sv.po
index 469c4ee..d2da2d1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-11-07 04:13+0000\n"
 "Last-Translator: skøldis <frejaland.47@gmail.com>\n"
 "Language-Team: Swedish <https://weblate.fyralabs.com/projects/flattool/"
@@ -27,6 +27,7 @@ msgstr "Lagerhus"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "Hantera alla dina Flatpak"
@@ -67,217 +68,227 @@ msgstr "Hitta och förkasta överblivna anvandärdata"
 msgid "Reinstall apps that have leftover data"
 msgstr "Installera om appar som har överbliven data"
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Flatpak"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr "Avinstallation lycakdes"
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr "Kunde inte avinstallera vissa appar"
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr "Avinstallera Utvalda Appar?"
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr ""
 "Efter borttagning kommer det inte att vara möjligt att använda dessa appar."
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr "Appinställningar och Data"
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr "Behåll"
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr "Tillåt återställning av dessa appars inställningar och innehåll"
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr "Trasha"
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr "Skicka dessa appars inställningar och innehåll till papperskorgen"
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr "Avinstallera"
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr "Kan inte avinstallera medan andra appar avinstalleras"
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr "Avinstallera {}?"
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr "Efter borttagning kommer det inte att vara möjligt att använda {}."
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr "Tillåt återställning av denna apps inställningar och innehåll"
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr "Skicka denna apps inställningar och innehåll till papperskorgen"
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr "Uttjänt"
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr "{} är uttjänt och kommer inte att få säkerhetsuppdateringar"
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr "Exekveringsmiljö uttjänt"
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 "{}s exekveringsmiljö är uttjänt och kommer inte att få säkerhetsuppdateringar"
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr "Uppdateringar inaktiverad"
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr "{} är maskad och kommer inte att uppdateras"
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr "Visa egenskaper"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr "Koperiade namn"
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr "Kopiera namn"
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr "Kopierade ID"
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr "Kopiera ID"
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr "Kopierade ref"
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr "Kopiera Ref"
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr "Kopierade körningskommando"
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr "Kopiera körningskommando"
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr "Kopiera"
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr "Öppnade {}"
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr "Öppna"
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr "Inaktivera uppdateringar"
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr "Aktivera uppdateringar"
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr "Öppna mappen för användardata"
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr "Trasha användardata"
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Snapshots"
+msgstr "Hantera fjärrkontroller"
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr "Nedgradera"
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr "Kunde inte öppna mappen"
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr "Kunde inte trasha användardata"
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr "Trashade användardata"
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr "Skicka {}s användardata till papperskorgen?"
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 "Dina filer och användardata för denna app kommer att skickas till "
 "papperskorgen."
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr "Trasha"
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr "Kunde inaktivera uppdateringar för {}"
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr "Inaktivera Uppdateringar för {}?"
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
@@ -285,105 +296,123 @@ msgstr ""
 "Detta kommer att maska {} och säkerställar att det kommer att aldrig få "
 "funktions- eller säkerhetsuppdateringar."
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr "Kunde inte köra appen"
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr "Okej"
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr "Listan laddades om"
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr "Ingen anvandärdata för {}"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr "Trasha Utvalda Appars Användardata?"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr ""
 "Dina filer och användardata för dessa appar kommer att skickas till "
 "papperskorgen."
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr "Kopierade utvalda appars namn"
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr "Kopierade utvalda appars ID:er"
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr "Kopierade utvalda appars ref:ar"
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr "Installation lyckades"
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr "Kunde inte installera app"
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr "Installera {}?"
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr "Installera"
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr "Användare"
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr "Appen kommer att vara tillgänglig till bara dig"
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr "System"
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr "Appen kommer att vara tillgänglig till varje användare på systemet"
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr "Filtyp stöds inte"
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr "Ladda Om Listan"
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr "Söka Genom Listan"
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr "Filtrera Listan"
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr "Huvudmeny"
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "Växla urvalsläge"
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+#, fuzzy
+#| msgid "Installation"
+msgid "Installing…"
+msgstr "Installation"
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+#, fuzzy
+#| msgid "Installing… This could take a while"
+msgid "This could take a while."
+msgstr "Installerar… Detta kan ta ett tag"
+
+#: data/ui/window.blp:128
+#, fuzzy
+#| msgid "Uninstall"
+msgid "Uninstalling…"
+msgstr "Avinstallera"
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr "Inga Flatpak Hittades"
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
@@ -392,55 +421,83 @@ msgstr ""
 "kan inte se listan av installerade Flatpak, eller systemet har inga Flatpak "
 "installerade."
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+#, fuzzy
+#| msgid "No Flatpaks Found"
+msgid "No Results Found"
+msgstr "Inga Flatpak Hittades"
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr "Välj alla"
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr "Avinstallera utvalda appar"
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "Skicka utvalda appars användardata till papperskorgen"
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr "Öppna Kopieringsmeny"
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+#, fuzzy
+#| msgid "Trash Selected Apps' User Data?"
+msgid "Snapshot Selected Apps' Data"
+msgstr "Trasha Utvalda Appars Användardata?"
+
+#: data/ui/window.blp:194
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From File…"
 msgstr "Installera från fil"
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:199
+#, fuzzy
+#| msgid "Manage Leftover Data"
+msgid "Manage Leftover Data…"
 msgstr "Hantera överblivna data"
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:208
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Remotes…"
 msgstr "Hantera fjärrkontroller"
 
-#: src/window.blp:131
+#: data/ui/window.blp:213
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From The Web…"
+msgstr "Installera från fil"
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr "_Tangentbordsgenvägar"
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr "_Om Lagerhus"
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr "Kopiera namn"
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr "Kopiera ID:er"
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr "Kopiera ref:ar"
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr "Öppna app"
 
@@ -452,7 +509,7 @@ msgstr "Apphantering"
 msgid "Search"
 msgstr "Sök"
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr "Ställ in filtrar"
 
@@ -464,6 +521,18 @@ msgstr "Ladda om"
 msgid "More Functions"
 msgstr "Mera funktioner"
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr "Hantera överblivna data"
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr "Hantera fjärrkontroller"
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr "Installera från fil"
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr "Allmänt"
@@ -480,78 +549,84 @@ msgstr "Visa tangentbordsgenvägar"
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr "{} Egenskaper"
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr "Visa appar som använder detta exekveringsmiljö"
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr "Kopierade {}"
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+#, fuzzy
+#| msgid "Could not trash user data"
+msgid "Could not show details"
+msgstr "Kunde inte trasha användardata"
+
+#: src/properties_window.py:54
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "User Data"
+msgstr "Trasha användardata"
+
+#: src/properties_window.py:73 src/properties_window.py:118
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "No User Data"
+msgstr "Trasha användardata"
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr "Namn"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr "App ID"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr "Version"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr "Gren"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr "Ark"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr "Fjärrkontroll"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr "Installation"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr "Ref"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr "Aktiv kommit"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr "Senaste kommit"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr "Installerad storlek"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr "Inställningar"
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr "Exekveringsmiljö"
-
-#: src/properties_window.py:153
-msgid "Copy {}"
-msgstr "Kopiera {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
+msgstr "{} Egenskaper"
 
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
@@ -569,85 +644,86 @@ msgstr "Radera {}?"
 msgid "Remove"
 msgstr "Radera"
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr "Kopiera fjärrkontrollnamn"
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr "Radera {}"
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr "Kunde inte lägga till {}"
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr "Lägg till Flatpak fjärrkontroll"
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr "URL"
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr "Fjärrkontroll kommer att vara tillgänglig till dig"
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr ""
 "Fjärrkontroll kommer att vara tillgänglig till varje användare på systemet"
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr "{} lades till"
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr "Lägg till {}?"
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr "Den öppenkällkod, betala-vad-du-vill appbutik från elementary"
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr "Standardfjärrkontrol för Flatpak"
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr "Beta-versioner av Flatpak appar"
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr "Flatpak från Fedora Linux"
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr "De senaste GNOME beta-appar och -exekveringsmiljö"
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr "KDE beta-appar och -exekveringsmiljö"
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
-msgstr "Fjärrkontrollen för de WebKit Developer- och Runtime-exekveringsmiljöna"
+msgstr ""
+"Fjärrkontrollen för de WebKit Developer- och Runtime-exekveringsmiljöna"
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr "Lägg till fjärrkontroll"
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr "Inga fjärrkontroller"
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -658,92 +734,88 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr "Flatpak Fjärrkontroller"
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr ""
 "Välja från en lista över de mest popuära fjärrkontrollerna eller lägg till "
 "en ny fjärrkontroll."
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr "Lägg till en fjärrkontrollfil"
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr "Lägg till en anpassat fjärrkontroll"
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr "Kunde inte installera vissa appar"
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr "Installerar… Detta kan ta ett tag"
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr "Försök att installera?"
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 "Lagerhus kommer att försöka att installera appar som matcherar de utvalda "
 "datorna."
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr "{} bred"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr "Trasha mappar?"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr "Dessa mappar kommer att skickas till papperskorgen."
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr "Kunde inte hantera data"
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr "Öppna datamapp"
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr "Ingen överbliven data"
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr "Det finns ingen överbliven data"
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr "Tillämpa"
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr "Visa appar"
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr "Visa exekveringsmiljön"
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr "Filtrera appar med fjärrkontroller"
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr "Filtrera appar med exekveringsmiljö"
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr "Commit Hash: {}"
 
@@ -751,6 +823,12 @@ msgstr "Commit Hash: {}"
 msgid "Could not downgrade {}"
 msgstr "Kunde inte nedgradera {}"
 
+#: src/downgrade_window.py:108
+#, fuzzy
+#| msgid "Could disable updates for {}"
+msgid "Could not disable updates for {}"
+msgstr "Kunde inaktivera uppdateringar för {}"
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr "Nedgraderar…"
@@ -767,12 +845,21 @@ msgstr "Hämtar släpp…"
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
 msgstr ""
+
+#~ msgid "Show Apps Using this Runtime"
+#~ msgstr "Visa appar som använder detta exekveringsmiljö"
+
+#~ msgid "Runtime"
+#~ msgstr "Exekveringsmiljö"
+
+#~ msgid "Copy {}"
+#~ msgstr "Kopiera {}"
diff --git a/po/th.po b/po/th.po
index af914db..2f377d9 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-10-23 10:42+0000\n"
 "Last-Translator: Win <winsdominoes2018@gmail.com>\n"
 "Language-Team: Thai <https://weblate.fyralabs.com/projects/flattool/"
@@ -27,6 +27,7 @@ msgstr "Warehouse"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "จัดการทุกอย่าง Flatpak"
@@ -65,315 +66,343 @@ msgstr "หาและทิ้งข้อมูลที่เหลือ"
 msgid "Reinstall apps that have leftover data"
 msgstr "ติดตั้งแอปที่ยังมีข้อมูลเหลือ"
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Flatpaks"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr "การถอนการติดตั้งสำเหร็จแล้ว"
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr "ไม่สามารถถอนการติดตั้งได้บางแอป"
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr "จะถอนการติดตั้งแอปที่เลือกมั้ย?"
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr "ไม่สามารถใช้แอปเหล่านี้ได้หลังจากการลบออก"
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr "การตั้งค่าแอปและข้อมูล"
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr "เก็บไว้"
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr "อนุญาตให้กู้คืนการตั้งค่าแอปและเนื้อหาเหล่านี้"
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr "ทิ้ง"
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr "ส่งการตั้งค่าแอปและเนื้อหาเหล่านี้ไปที่ถังขยะ"
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr "ถอนการติดตั้ง"
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr "ไม่สามารถถอนการติดตั้งในขณะที่ถอนการติดตั้งแล้ว"
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr "ถอนการติดตั้ง {}?"
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr "คุณจะไม่สามารถใช้ {} ได้หลังจากถอนการติดตั้ง"
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr "อนุญาตให้กู้คืนการตั้งค่าชองแอปและเนื้อหานี้"
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr "ส่งการตั้งค่าแอปและเนื้อหาของแอปนี้ไปที่ถังขยะ"
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr "การสิ้นสุดอายุใช้งานของแอป"
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr "{} ได้ถึงการจบอัปเดตและจะไม่ได้รับอัปเดต"
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr "การสิ้นอายุการใช้งานของรันไทม์"
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr "{} นี้ได้ถึงการสิ้นอายุการใช้งานและจะไม่ได้รับอัปเดตในด้านความปลอดภัยอีกต่อไป"
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr "ปิดการอัพเดต"
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr "{} ได้ถูกระยับยั้งอัปเดต"
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr "ดูคุณสมบัติ"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr "คัดลอกชื่อแล้ว"
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr "คัดลอกชื่อ"
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr "คัดลอก ID แล้ว"
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr "คัดลอก ID"
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr "คัดลอก ref แล้ว"
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr "คัดลอก Ref"
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr "คัดลอกคำสั่งเปิดแล้ว"
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr "คัดลอกคำสั่งเปิด"
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr "คัดลอก"
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr "เปิด {} แล้ว"
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr "เปิด"
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr "ระงับการอัพเดท"
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr "เปิดการอัพเดท"
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr "เปิดโฟลเดอร์ข้อมูลผู้ใช้"
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr "ทิ้งข้อมูลขอผู้ใช้"
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Snapshots"
+msgstr "จัดการรีโมต"
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr "ดาวน์เกรด"
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr "ไม่สามารถเปิดโฟลเดอร์ได้"
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr "ไม่สามารถทิ้งข้อมูลผู้ใช้ได้"
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr "ทิ้งข้อมูลแล้ว"
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr "ลบข้อมูลผู้ใช้ของ {} ไปในถังขยะหรือไม่?"
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr "ไฟล์ของคุณและข้อมูลสำหรับแอปนี้จะถูกในไปไว้ในถังขยะ"
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr "ทิ้งข้อมูล"
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr "ปิดการอัพเดทของ {}"
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr "ปิดการอัพเดทของ {} หรือไม่?"
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
 msgstr "แอปนี้จะไม่ได้รับการอัปเดตใดๆ"
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr "ไม่สามารถเปิดแอปได้"
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr "โอเค"
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr "รีเฟรชรายการแล้ว"
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr "ไม่มีข้อมูลของ {}"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr "ทิ้งข้อมูลของแอปที่เลือก?"
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr "โฟลเดอร์ของคุณจะถูกในไปไว้ในถังขยะ"
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr "คัดลอกชื่อแอปที่เลือกแล้ว"
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr "คัดลอก ID แอปที่เลือกแล้ว"
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr "คัดลอก refs แอปที่เลือกแล้ว"
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr "ติดตั้งสำเหร็จ"
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr "ไม่สามารถติดตั้งแอป"
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr "ติดตั้ง {}?"
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr "ติดตั้ง"
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr "ผู้ใช้"
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr "แอปนี้จะใช้ได้สำหรับคุณเท่านั้น"
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr "ระบบ"
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr "แอปจะพร้อมใช้งานสำหรับผู้ใช้ทุกคนในระบบ"
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr "ไม่รองรับประเภทไฟล์"
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr "รีเฟรชรายการแอป"
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr "ค้นหารายการ"
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr "กรองรายการแอป"
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr "เมนูหลัก"
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "สลับโหมดการเลือก"
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+#, fuzzy
+#| msgid "Installation"
+msgid "Installing…"
+msgstr "การติดตั้ง"
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+#, fuzzy
+#| msgid "Installing… This could take a while"
+msgid "This could take a while."
+msgstr "กำลังติดตั้ง... อาจจะใช้เวลาระยะหนึ่ง"
+
+#: data/ui/window.blp:128
+#, fuzzy
+#| msgid "Uninstall"
+msgid "Uninstalling…"
+msgstr "ถอนการติดตั้ง"
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr "ไม่เจอแอป"
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
@@ -381,55 +410,83 @@ msgstr ""
 "ไม่มีแอปที่ตรงกับฟิลเตอร์ของคุณ หรือ แวร์เฮาส์ ไม่สามารถดูรายการแอปที่ติดตั้งไว้ "
 "หรือระบบไม่ได้ติดตั้งแอปใดๆ"
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+#, fuzzy
+#| msgid "No Flatpaks Found"
+msgid "No Results Found"
+msgstr "ไม่เจอแอป"
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr "เลือกทั้งหมด"
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr "ถอนการติดตั้งแอปที่เลือกไว้"
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "ลบแอปที่เลือกไว้ไปที่ถังขยะ"
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr "เปิดเมนูคัดลอก"
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+#, fuzzy
+#| msgid "Trash Selected Apps' User Data?"
+msgid "Snapshot Selected Apps' Data"
+msgstr "ทิ้งข้อมูลของแอปที่เลือก?"
+
+#: data/ui/window.blp:194
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From File…"
 msgstr "ติดตั้งแอปจากไฟล์"
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:199
+#, fuzzy
+#| msgid "Manage Leftover Data"
+msgid "Manage Leftover Data…"
 msgstr "จัดการข้อมูลหลงเหลือ"
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:208
+#, fuzzy
+#| msgid "Manage Remotes"
+msgid "Manage Remotes…"
 msgstr "จัดการรีโมต"
 
-#: src/window.blp:131
+#: data/ui/window.blp:213
+#, fuzzy
+#| msgid "Install From File"
+msgid "Install From The Web…"
+msgstr "ติดตั้งแอปจากไฟล์"
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr "_คีย์ลัด"
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr "_เกี่ยวกับแวร์เฮาส์"
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr "คัดลอกชื่อ"
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr "คัดลอด ID"
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr "คัดลอก Refs"
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr "เปิดแอป"
 
@@ -441,7 +498,7 @@ msgstr "จัดการแอป"
 msgid "Search"
 msgstr "ค้นหา"
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr "เพิ่มตัวกรอง"
 
@@ -453,6 +510,18 @@ msgstr "รีเฟรช"
 msgid "More Functions"
 msgstr "ฟังค์ชั่นเพิ่มเติม"
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr "จัดการข้อมูลหลงเหลือ"
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr "จัดการรีโมต"
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr "ติดตั้งแอปจากไฟล์"
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr "ทั่วไป"
@@ -469,78 +538,84 @@ msgstr "แสดงชอร์ตคัท"
 msgid "Quit"
 msgstr "ออก"
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr "เกี่ยวกับ {}"
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr "แสดงแอปที่ใช้รันไทม์นี้"
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr "คัดลอก {} แล้ว"
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+#, fuzzy
+#| msgid "Could not trash data"
+msgid "Could not show details"
+msgstr "ไม่สามารถทิ้งข้อมูลได้"
+
+#: src/properties_window.py:54
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "User Data"
+msgstr "ทิ้งข้อมูลขอผู้ใช้"
+
+#: src/properties_window.py:73 src/properties_window.py:118
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "No User Data"
+msgstr "ทิ้งข้อมูลขอผู้ใช้"
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr "ชื่อ"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr "คำอธิบาย"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr "ไอดีชองแอป"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr "เวอร์ชั่น"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr "บรานช์"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr "Arch"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr "ที่มา"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr "การติดตั้ง"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr "Ref"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr "Commit ที่แอ็กทิฟ"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr "Commit ล่าสุด"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr "ขนาดแอป"
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr "ตัวเลือก"
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr "รันไทม์"
-
-#: src/properties_window.py:153
-msgid "Copy {}"
-msgstr "คัดลอก {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
+msgstr "เกี่ยวกับ {}"
 
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
@@ -558,84 +633,84 @@ msgstr "นำ {} ออก?"
 msgid "Remove"
 msgstr "นำออก"
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr "คัดลอกชื่อรีโมต"
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr "นำ {} ออก"
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr "ไม่สามารถเพิ่ม {}"
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr "เพิ่มรีโมต Flatpak"
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr "เพิ่ม"
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr "URL"
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr "คุณจะสามารถใช้รีโมตได้เท่านั้น"
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr "ผู้ใช้ทุกคนสามารถมองเห็นรีโมตนี้ได้"
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr "{} ได้ถูกเพิ่มแล้ว"
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr "เพิ่ม {}?"
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr "แอปสโตร์ที่ open source และเลือกลงแอปได้"
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr "พื้นที่จัดเก็บ Repository ส่วนกลางของแอป Flatpak"
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr "แอป Flatpak รุ่นเบต้า"
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr "แอปโดย Fedora Linux"
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr "แอปและรันไทม์เบต้าล่าสุดของ GNOME"
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr "แอปและรันไทม์เบต้าของ KDE"
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr "พื้นที่จัดเก็บข้อมูลกลางของ WebKit Developer และ Runtime SDK"
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr "เพิ่มรีโมต"
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr "ไม่มีรีโมต"
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr "แวร์เฮาส์ไม่สามารถค้นหารายการของรีโมตได้ หรือ ระบบไม่มีรีโมตใดๆที่ได้ติดตั้งไว้"
@@ -644,88 +719,84 @@ msgstr "แวร์เฮาส์ไม่สามารถค้นหาร
 msgid "Flatpak Repos"
 msgstr "Repo ของแอป"
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr "เพิ่มรีโมตจากรายการหรือเพิ่มรีโมตของตนเอง"
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr "เพิ่มไฟล์ Repo"
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr "เพิ่มรีโมต"
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr "ไม่สามารถติดตั้งได้บางแอป"
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr "กำลังติดตั้ง... อาจจะใช้เวลาระยะหนึ่ง"
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr "ลงแอปหรือไม่?"
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr "แวร์เฮาส์จะทำการลงแอปตามข้อมูลที่ได้เลือกไว้"
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr "{} กว้าง"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr "โฟลเดอร์ขยะ?"
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr "โฟลเดอร์เหล่านี้จะถูกในไปไว้ในถังขยะ"
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr "ดำเนินการต่อ"
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr "ไม่สามารถจัดการข้อมูลได้"
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr "เปิดโฟลเดอร์ข้อมูล"
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr "ไม่มีข้อมูลเหลืออยู่"
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr "ไม่มีข้อมูลผู้ใช้เหลืออยู่"
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr "เซ็ตการตั้งค่า"
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr "แสดงแอป"
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr "แสดงเวลาการทำงานของแอป"
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr "กรองแอปตามรีโมต"
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr "กรองแอปตามสถานะการทำงาน"
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr "เพิ่มแฮช {}"
 
@@ -733,6 +804,12 @@ msgstr "เพิ่มแฮช {}"
 msgid "Could not downgrade {}"
 msgstr "ไม่สามารถดาวน์เกรด {}"
 
+#: src/downgrade_window.py:108
+#, fuzzy
+#| msgid "Could disable updates for {}"
+msgid "Could not disable updates for {}"
+msgstr "ปิดการอัพเดทของ {}"
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr "กำลังดาวน์เกรด…"
@@ -749,11 +826,11 @@ msgstr "กำลังค้นหารุ่น…"
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr "{} จะไม่ได้รับการอัพเดตเป็นเวอร์ชันที่ใหม่กว่า"
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr "เลือกรุ่นที่ต้องการ"
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
@@ -761,8 +838,14 @@ msgstr ""
 "การดำเนินการนี้จะถอนการติดตั้งเวอร์ชันปัจจุบันและติดตั้งเวอร์ชันที่เลือกแทน "
 "โปรดทราบว่าการดาวน์เกรดอาจทำให้เกิดปัญหาได้"
 
-#~ msgid "Could not trash data"
-#~ msgstr "ไม่สามารถทิ้งข้อมูลได้"
+#~ msgid "Show Apps Using this Runtime"
+#~ msgstr "แสดงแอปที่ใช้รันไทม์นี้"
+
+#~ msgid "Runtime"
+#~ msgstr "รันไทม์"
+
+#~ msgid "Copy {}"
+#~ msgstr "คัดลอก {}"
 
 #~ msgid "Add a Remote"
 #~ msgstr "เพิ่มรีโมต"
diff --git a/po/tr.po b/po/tr.po
index bbe2231..dac8d6f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -24,6 +24,7 @@ msgstr ""
 msgid "flatpak"
 msgstr ""
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr ""
@@ -62,369 +63,405 @@ msgstr ""
 msgid "Reinstall apps that have leftover data"
 msgstr ""
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr ""
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr ""
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr ""
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr ""
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr ""
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr ""
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr ""
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr ""
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr ""
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr ""
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr ""
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr ""
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr ""
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr ""
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr ""
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr ""
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr ""
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr ""
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr ""
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr ""
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr ""
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr ""
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr ""
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr ""
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr ""
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr ""
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr ""
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr ""
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr ""
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr ""
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr ""
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr ""
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr ""
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr ""
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr ""
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr ""
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr ""
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr ""
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+msgid "Manage Snapshots"
+msgstr ""
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr ""
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr ""
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr ""
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr ""
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr ""
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr ""
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr ""
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr ""
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
 msgstr ""
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr ""
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr ""
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr ""
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr ""
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr ""
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr ""
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr ""
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr ""
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr ""
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr ""
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr ""
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr ""
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr ""
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr ""
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr ""
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr ""
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr ""
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr ""
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr ""
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr ""
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr ""
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+msgid "Installing…"
+msgstr ""
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+msgid "This could take a while."
+msgstr ""
+
+#: data/ui/window.blp:128
+msgid "Uninstalling…"
+msgstr ""
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr ""
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
 msgstr ""
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+msgid "No Results Found"
+msgstr ""
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr ""
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr ""
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr ""
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr ""
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+msgid "Snapshot Selected Apps' Data"
 msgstr ""
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:194
+msgid "Install From File…"
 msgstr ""
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:199
+msgid "Manage Leftover Data…"
 msgstr ""
 
-#: src/window.blp:131
+#: data/ui/window.blp:208
+msgid "Manage Remotes…"
+msgstr ""
+
+#: data/ui/window.blp:213
+msgid "Install From The Web…"
+msgstr ""
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr ""
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr ""
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr ""
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr ""
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr ""
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr ""
 
@@ -436,7 +473,7 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr ""
 
@@ -448,6 +485,18 @@ msgstr ""
 msgid "More Functions"
 msgstr ""
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr ""
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr ""
@@ -464,77 +513,77 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr ""
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr ""
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr ""
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+msgid "Could not show details"
+msgstr ""
+
+#: src/properties_window.py:54
+msgid "User Data"
+msgstr ""
+
+#: src/properties_window.py:73 src/properties_window.py:118
+msgid "No User Data"
+msgstr ""
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr ""
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr ""
-
-#: src/properties_window.py:153
-msgid "Copy {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
 msgstr ""
 
 #: src/remotes_window.py:48
@@ -553,84 +602,84 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr ""
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr ""
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr ""
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr ""
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr ""
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr ""
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr ""
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr ""
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr ""
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr ""
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr ""
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr ""
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr ""
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr ""
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -639,88 +688,84 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr ""
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr ""
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr ""
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr ""
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr ""
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr ""
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr ""
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr ""
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr ""
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr ""
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr ""
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr ""
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr ""
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr ""
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr ""
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr ""
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr ""
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr ""
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr ""
 
@@ -728,6 +773,10 @@ msgstr ""
 msgid "Could not downgrade {}"
 msgstr ""
 
+#: src/downgrade_window.py:108
+msgid "Could not disable updates for {}"
+msgstr ""
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr ""
@@ -744,11 +793,11 @@ msgstr ""
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index b3fbd49..f8e1fb6 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 03:36-0400\n"
+"POT-Creation-Date: 2023-11-13 03:57-0500\n"
 "PO-Revision-Date: 2023-10-31 10:22+0000\n"
 "Last-Translator: The Galaxy <galaxy@dmc.chat>\n"
 "Language-Team: Chinese (Simplified) <https://weblate.fyralabs.com/projects/"
@@ -27,6 +27,7 @@ msgstr "Warehouse"
 msgid "flatpak"
 msgstr "flatpak"
 
+#: data/io.github.flattool.Warehouse.desktop.in:11
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:9
 msgid "Manage all things Flatpak"
 msgstr "管理 Flatpak 的所有内容"
@@ -35,7 +36,8 @@ msgstr "管理 Flatpak 的所有内容"
 msgid ""
 "Warehouse is an app that manages installed Flatpaks, their user data, and "
 "Flatpak remotes."
-msgstr "Warehouse 是一个应用程序，用于管理已安装的 Flatpak、他们的用户数据和 Flatpak "
+msgstr ""
+"Warehouse 是一个应用程序，用于管理已安装的 Flatpak、他们的用户数据和 Flatpak "
 "远程。"
 
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:12
@@ -66,369 +68,409 @@ msgstr "查找和回收剩余的用户数据"
 msgid "Reinstall apps that have leftover data"
 msgstr "重新安装有剩余数据的应用"
 
-#: src/main.py:87
+#: src/main.py:103
 msgid "Flatpaks"
 msgstr "Flatpak 应用"
 
-#: src/window.py:103
+#: src/main.py:141
+msgid "Donate"
+msgstr ""
+
+#: src/window.py:106
 msgid "Uninstalled successfully"
 msgstr "卸载成功"
 
-#: src/window.py:105
+#: src/window.py:108
 msgid "Could not uninstall some apps"
 msgstr "无法卸载一些应用"
 
 #. Create Widgets
-#: src/window.py:152
+#: src/window.py:150
 msgid "Uninstall Selected Apps?"
 msgstr "是否卸载选中的应用？"
 
-#: src/window.py:152
+#: src/window.py:150
 msgid "It will not be possible to use these apps after removal."
 msgstr "删除后将无法使用这些应用程序。"
 
-#: src/window.py:165 src/window.py:238
+#: src/window.py:163 src/window.py:232
 msgid "App Settings & Data"
 msgstr "应用设置与数据"
 
-#: src/window.py:167 src/window.py:240
+#: src/window.py:165 src/window.py:234
 msgid "Keep"
 msgstr "保持"
 
-#: src/window.py:167
+#: src/window.py:165
 msgid "Allow restoring these apps' settings and content"
 msgstr "允许恢复这些应用的设置和内容"
 
-#: src/window.py:168 src/window.py:241 src/orphans.blp:70
+#: src/window.py:166 src/window.py:235 data/ui/orphans.blp:123
 msgid "Trash"
 msgstr "回收"
 
-#: src/window.py:168
+#: src/window.py:166
 msgid "Send these apps' settings and content to the trash"
 msgstr "将这些应用的设置和内容发送到回收站"
 
-#: src/window.py:195 src/window.py:259 src/window.py:428 src/window.py:459
-#: src/window.py:553 src/window.py:712 src/properties_window.py:87
-#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
-#: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
-#: src/downgrade.blp:16
+#: src/window.py:193 src/window.py:253 src/window.py:443 src/window.py:474
+#: src/window.py:568 src/window.py:721 src/properties_window.py:126
+#: src/remotes_window.py:59 src/remotes_window.py:141 src/remotes_window.py:288
+#: src/orphans_window.py:102 src/orphans_window.py:156 data/ui/filter.blp:17
+#: data/ui/downgrade.blp:16
 msgid "Cancel"
 msgstr "关闭"
 
-#: src/window.py:196 src/window.py:260 src/window.py:356
+#: src/window.py:194 src/window.py:254 src/window.py:338
 msgid "Uninstall"
 msgstr "卸载"
 
-#: src/window.py:202
+#: src/window.py:200
 msgid "Cannot uninstall while already uninstalling"
 msgstr "当正在卸载时无法卸载"
 
 #. Create Widgets
-#: src/window.py:233
+#: src/window.py:227
 msgid "Uninstall {}?"
 msgstr "是否卸载 {}?"
 
-#: src/window.py:233
+#: src/window.py:227
 msgid "It will not be possible to use {} after removal."
 msgstr "删除后将无法使用 {}。"
 
-#: src/window.py:240
+#: src/window.py:234
 msgid "Allow restoring this app's settings and content"
 msgstr "允许恢复这些应用的设置和内容"
 
-#: src/window.py:241
+#: src/window.py:235
 msgid "Send this app's settings and content to the trash"
 msgstr "将此应用的设置和内容发送到回收站"
 
 #. EOL = End Of Life, meaning the app will not be updated
-#: src/window.py:301
+#: src/window.py:282
 msgid "App EOL"
 msgstr "应用寿命终止"
 
-#: src/window.py:301 src/properties_window.py:26
+#: src/window.py:282 src/properties_window.py:157
 msgid ""
 "{} has reached its End of Life and will not receive any security updates"
 msgstr "{} 寿命已经终结并且不会再收到任何安全更新"
 
 #. EOL = End Of Life, meaning the runtime will not be updated
-#: src/window.py:306
+#: src/window.py:288
 msgid "Runtime EOL"
 msgstr "运行时寿命终结"
 
-#: src/window.py:306 src/properties_window.py:27
+#: src/window.py:288 src/properties_window.py:161
 msgid ""
 "{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr "{} 的运行时寿命已经终结并且不会再收到安全更新"
 
-#: src/window.py:310
+#: src/window.py:292
 msgid "Updates Disabled"
 msgstr "更新已禁用"
 
-#: src/window.py:310 src/properties_window.py:28
+#: src/window.py:292 src/properties_window.py:165
 msgid "{} is masked and will not be updated"
 msgstr "{} 被隐藏并且不会更新"
 
 #. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
-#: src/window.py:315 src/properties_window.py:158
+#: src/window.py:297
 msgid "View Properties"
 msgstr "查看属性"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:336
+#: src/window.py:318
 msgid "Copied name"
 msgstr "复制的名称"
 
-#: src/window.py:337
+#: src/window.py:319
 msgid "Copy Name"
 msgstr "复制名称"
 
-#: src/window.py:339
+#: src/window.py:321
 msgid "Copied ID"
 msgstr "ID 已复制"
 
-#: src/window.py:340
+#: src/window.py:322
 msgid "Copy ID"
 msgstr "复制 ID"
 
-#: src/window.py:342
+#: src/window.py:324
 msgid "Copied ref"
 msgstr "引用已复制"
 
-#: src/window.py:343
+#: src/window.py:325
 msgid "Copy Ref"
 msgstr "复制引用"
 
-#: src/window.py:345
+#: src/window.py:327
 msgid "Copied launch command"
 msgstr "已复制启动命令"
 
-#: src/window.py:346
+#: src/window.py:328
 msgid "Copy Launch Command"
 msgstr "复制启动命令"
 
-#: src/window.py:348 src/window.py:476
+#: src/window.py:330 src/window.py:491
 msgid "Copy"
 msgstr "复制"
 
-#: src/window.py:351
+#: src/window.py:333
 msgid "Opened {}"
 msgstr "已打开 {}"
 
-#: src/window.py:352
+#: src/window.py:334
 msgid "Open"
 msgstr "打开"
 
-#: src/window.py:360 src/window.py:461 src/downgrade.blp:40
+#: src/window.py:342 src/window.py:476 data/ui/downgrade.blp:46
 msgid "Disable Updates"
 msgstr "禁用更新"
 
-#: src/window.py:365 src/properties_window.py:186
+#: src/window.py:347
 msgid "Enable Updates"
 msgstr "启用更新"
 
-#: src/window.py:379 src/properties_window.py:133 src/orphans_window.py:217
+#: src/window.py:361 src/orphans_window.py:213
 msgid "Open User Data Folder"
 msgstr "打开用户数据文件夹"
 
-#: src/window.py:384 src/properties_window.py:138
+#: src/window.py:366
 msgid "Trash User Data"
 msgstr "回收用户数据"
 
-#: src/window.py:391 src/downgrade.blp:21
+#: src/window.py:374
+msgid "Manage Snapshots"
+msgstr ""
+
+#: src/window.py:378 data/ui/downgrade.blp:22
 msgid "Downgrade"
 msgstr "降级"
 
-#: src/window.py:412 src/properties_window.py:98 src/orphans_window.py:171
+#: src/window.py:427 src/properties_window.py:42 src/orphans_window.py:165
 msgid "Could not open folder"
 msgstr "无法打开目录"
 
-#: src/window.py:420 src/window.py:545 src/properties_window.py:81
+#: src/window.py:435 src/window.py:560 src/properties_window.py:123
 msgid "Could not trash user data"
 msgstr "无法回收用户数据"
 
-#: src/window.py:424 src/window.py:547 src/properties_window.py:77
+#: src/window.py:439 src/window.py:562 src/properties_window.py:117
 msgid "Trashed user data"
 msgstr "用户数据已回收"
 
-#: src/window.py:426 src/properties_window.py:84
+#: src/window.py:441 src/properties_window.py:125
 msgid "Send {}'s User Data to the Trash?"
 msgstr "发送 {} 的用户数据到回收站？"
 
-#: src/window.py:427 src/properties_window.py:85
+#: src/window.py:442
 msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 
-#: src/window.py:430 src/window.py:554 src/properties_window.py:88
+#: src/window.py:445 src/window.py:569 src/properties_window.py:128
 msgid "Trash Data"
 msgstr ""
 
-#: src/window.py:442 src/downgrade_window.py:108
+#: src/window.py:457
 msgid "Could disable updates for {}"
 msgstr ""
 
-#: src/window.py:457
+#: src/window.py:472
 msgid "Disable Updates for {}?"
 msgstr ""
 
-#: src/window.py:458
+#: src/window.py:473
 msgid ""
 "This will mask {} ensuring it will never recieve any feature or security "
 "updates."
 msgstr ""
 
-#: src/window.py:475
+#: src/window.py:490
 msgid "Could not Run App"
 msgstr ""
 
-#: src/window.py:481
+#: src/window.py:496
 msgid "OK"
 msgstr ""
 
-#: src/window.py:499
+#: src/window.py:514
 msgid "List refreshed"
 msgstr ""
 
-#: src/window.py:542
+#: src/window.py:557
 msgid "No user data for {}"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Trash Selected Apps' User Data?"
 msgstr ""
 
-#: src/window.py:551
+#: src/window.py:566
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr ""
 
-#: src/window.py:605
+#: src/window.py:620
 msgid "Copied selected app names"
 msgstr ""
 
-#: src/window.py:613
+#: src/window.py:628
 msgid "Copied selected app IDs"
 msgstr ""
 
-#: src/window.py:621
+#: src/window.py:636
 msgid "Copied selected app refs"
 msgstr ""
 
-#: src/window.py:682 src/orphans_window.py:76
+#: src/window.py:696 src/orphans_window.py:71
 msgid "Installed successfully"
 msgstr ""
 
-#: src/window.py:685
+#: src/window.py:698
 msgid "Could not install app"
 msgstr ""
 
-#: src/window.py:710
+#: src/window.py:719
 msgid "Install {}?"
 msgstr ""
 
-#: src/window.py:713 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:722 src/orphans_window.py:103 data/ui/orphans.blp:129
 msgid "Install"
 msgstr ""
 
-#: src/window.py:720 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:729 src/remotes_window.py:215 src/remotes_window.py:299
 msgid "User"
 msgstr ""
 
-#: src/window.py:720
+#: src/window.py:729
 msgid "The app will be available to only you"
 msgstr ""
 
-#: src/window.py:721 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:730 src/remotes_window.py:221 src/remotes_window.py:300
 msgid "System"
 msgstr ""
 
-#: src/window.py:721
+#: src/window.py:730
 msgid "The app will be available to every user on the system"
 msgstr ""
 
-#: src/window.py:750
+#: src/window.py:759
 msgid "File type not supported"
 msgstr ""
 
-#: src/window.blp:12
+#: data/ui/window.blp:11
 msgid "Refresh List"
 msgstr ""
 
-#: src/window.blp:18 src/orphans.blp:14
+#: data/ui/window.blp:17 data/ui/orphans.blp:14
 msgid "Search List"
 msgstr ""
 
-#: src/window.blp:24
+#: data/ui/window.blp:23
 msgid "Filter List"
 msgstr ""
 
-#: src/window.blp:30
+#: data/ui/window.blp:29
 msgid "Main Menu"
 msgstr ""
 
-#: src/window.blp:37 src/gtk/help-overlay.blp:29
+#: data/ui/window.blp:36 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr ""
 
-#: src/window.blp:75
+#: data/ui/window.blp:97 data/ui/orphans.blp:81
+msgid "Installing…"
+msgstr ""
+
+#: data/ui/window.blp:106 data/ui/window.blp:133 data/ui/orphans.blp:90
+msgid "This could take a while."
+msgstr ""
+
+#: data/ui/window.blp:128
+#, fuzzy
+#| msgid "Uninstall"
+msgid "Uninstalling…"
+msgstr "卸载"
+
+#: data/ui/window.blp:140
 msgid "No Flatpaks Found"
 msgstr ""
 
-#: src/window.blp:76
+#: data/ui/window.blp:141
 msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
 msgstr ""
 
-#: src/window.blp:85 src/orphans.blp:66
+#: data/ui/window.blp:146 data/ui/orphans.blp:107
+msgid "No Results Found"
+msgstr ""
+
+#: data/ui/window.blp:147 data/ui/orphans.blp:108
+msgid "Try a different search term"
+msgstr ""
+
+#: data/ui/window.blp:159 data/ui/orphans.blp:118
 msgid "Select All"
 msgstr ""
 
-#: src/window.blp:90
+#: data/ui/window.blp:165
 msgid "Uninstall Selected Apps"
 msgstr ""
 
-#: src/window.blp:95
+#: data/ui/window.blp:171
 msgid "Send Selected Apps' Data to the Trash"
 msgstr ""
 
-#: src/window.blp:100
+#: data/ui/window.blp:177
 msgid "Open Copy Menu"
 msgstr ""
 
-#: src/window.blp:111 src/gtk/help-overlay.blp:47
-msgid "Install From File"
+#: data/ui/window.blp:184
+#, fuzzy
+#| msgid "Uninstall Selected Apps?"
+msgid "Snapshot Selected Apps' Data"
+msgstr "是否卸载选中的应用？"
+
+#: data/ui/window.blp:194
+msgid "Install From File…"
 msgstr ""
 
-#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
-msgid "Manage Leftover Data"
+#: data/ui/window.blp:199
+msgid "Manage Leftover Data…"
 msgstr ""
 
-#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
-msgid "Manage Remotes"
+#: data/ui/window.blp:208
+msgid "Manage Remotes…"
 msgstr ""
 
-#: src/window.blp:131
+#: data/ui/window.blp:213
+msgid "Install From The Web…"
+msgstr ""
+
+#: data/ui/window.blp:218
 msgid "_Keyboard Shortcuts"
 msgstr ""
 
-#: src/window.blp:136
+#: data/ui/window.blp:223
 msgid "_About Warehouse"
 msgstr ""
 
-#: src/window.blp:145
+#: data/ui/window.blp:232
 msgid "Copy Names"
 msgstr ""
 
-#: src/window.blp:150
+#: data/ui/window.blp:237
 msgid "Copy IDs"
 msgstr ""
 
-#: src/window.blp:155
+#: data/ui/window.blp:242
 msgid "Copy Refs"
 msgstr ""
 
-#: src/window.blp:164
+#: data/ui/window.blp:251
 msgid "Open app"
 msgstr ""
 
@@ -440,7 +482,7 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+#: src/gtk/help-overlay.blp:19 data/ui/filter.blp:7
 msgid "Set Filters"
 msgstr ""
 
@@ -452,6 +494,18 @@ msgstr ""
 msgid "More Functions"
 msgstr ""
 
+#: src/gtk/help-overlay.blp:37 src/orphans_window.py:27
+msgid "Manage Leftover Data"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:42 src/remotes_window.py:352
+msgid "Manage Remotes"
+msgstr ""
+
+#: src/gtk/help-overlay.blp:47
+msgid "Install From File"
+msgstr ""
+
 #: src/gtk/help-overlay.blp:52
 msgid "General"
 msgstr ""
@@ -468,77 +522,83 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/properties_window.py:14
-msgid "{} Properties"
-msgstr ""
-
-#: src/properties_window.py:60
-msgid "Show Apps Using this Runtime"
-msgstr ""
-
-#: src/properties_window.py:102 src/remotes_window.py:72
+#: src/properties_window.py:36 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr ""
 
-#: src/properties_window.py:145 src/remotes_window.py:197
-#: src/remotes_window.py:294
+#: src/properties_window.py:48
+#, fuzzy
+#| msgid "Could not trash user data"
+msgid "Could not show details"
+msgstr "无法回收用户数据"
+
+#: src/properties_window.py:54
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "User Data"
+msgstr "回收用户数据"
+
+#: src/properties_window.py:73 src/properties_window.py:118
+#, fuzzy
+#| msgid "Trash User Data"
+msgid "No User Data"
+msgstr "回收用户数据"
+
+#: src/properties_window.py:83 src/remotes_window.py:200
+#: src/remotes_window.py:297
 msgid "Name"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Description"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "App ID"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Version"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:83
 msgid "Branch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Arch"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Origin"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Installation"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Ref"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:84
 msgid "Active Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Latest Commit"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Installed Size"
 msgstr ""
 
-#: src/properties_window.py:145
+#: src/properties_window.py:85
 msgid "Options"
 msgstr ""
 
-#: src/properties_window.py:145
-msgid "Runtime"
-msgstr ""
-
-#: src/properties_window.py:153
-msgid "Copy {}"
+#: src/properties_window.py:177
+msgid "{} Properties"
 msgstr ""
 
 #: src/remotes_window.py:48
@@ -557,84 +617,84 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: src/remotes_window.py:92
+#: src/remotes_window.py:93
 msgid "Copy remote name"
 msgstr ""
 
-#: src/remotes_window.py:95
+#: src/remotes_window.py:96
 msgid "Remove {}"
 msgstr ""
 
-#: src/remotes_window.py:110 src/remotes_window.py:243
+#: src/remotes_window.py:113 src/remotes_window.py:246
 msgid "Could not add {}"
 msgstr ""
 
-#: src/remotes_window.py:136
+#: src/remotes_window.py:139
 msgid "Add Flatpak Remote"
 msgstr ""
 
-#: src/remotes_window.py:139 src/remotes_window.py:286
+#: src/remotes_window.py:142 src/remotes_window.py:289
 msgid "Add"
 msgstr ""
 
-#: src/remotes_window.py:201
+#: src/remotes_window.py:204
 msgid "URL"
 msgstr ""
 
-#: src/remotes_window.py:212 src/remotes_window.py:296
+#: src/remotes_window.py:215 src/remotes_window.py:299
 msgid "Remote will be available to only you"
 msgstr ""
 
-#: src/remotes_window.py:218 src/remotes_window.py:297
+#: src/remotes_window.py:221 src/remotes_window.py:300
 msgid "Remote will be available to every user on the system"
 msgstr ""
 
-#: src/remotes_window.py:241
+#: src/remotes_window.py:244
 msgid "{} successfully added"
 msgstr ""
 
-#: src/remotes_window.py:283
+#: src/remotes_window.py:286
 msgid "Add {}?"
 msgstr ""
 
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
-#: src/remotes_window.py:322
+#: src/remotes_window.py:325
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 
-#: src/remotes_window.py:323
+#: src/remotes_window.py:326
 msgid "Central repository of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:324
+#: src/remotes_window.py:327
 msgid "Beta builds of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:325
+#: src/remotes_window.py:328
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr ""
 
-#: src/remotes_window.py:326
+#: src/remotes_window.py:329
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:327
+#: src/remotes_window.py:330
 msgid "Beta KDE Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:328
+#: src/remotes_window.py:331
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr ""
 
-#: src/remotes.blp:13 src/popular_remotes.blp:18
+#: data/ui/remotes.blp:13 data/ui/popular_remotes.blp:18
 msgid "Add Remote"
 msgstr ""
 
-#: src/remotes.blp:45
+#: data/ui/remotes.blp:56
 msgid "No Remotes"
 msgstr ""
 
-#: src/remotes.blp:46
+#: data/ui/remotes.blp:57
 msgid ""
 "Warehouse cannot see the list of remotes or the system has no remotes added"
 msgstr ""
@@ -643,88 +703,84 @@ msgstr ""
 msgid "Flatpak Repos"
 msgstr ""
 
-#: src/popular_remotes.blp:19
+#: data/ui/popular_remotes.blp:19
 msgid "Choose from a list of popular remotes or add a new one."
 msgstr ""
 
-#: src/popular_remotes.blp:36
+#: data/ui/popular_remotes.blp:45
 msgid "Add a Repo File"
 msgstr ""
 
-#: src/popular_remotes.blp:40
+#: data/ui/popular_remotes.blp:50
 msgid "Add a Custom Remote"
 msgstr ""
 
-#: src/orphans_window.py:78
+#: src/orphans_window.py:73
 msgid "Could not install some apps"
 msgstr ""
 
-#: src/orphans_window.py:81
-msgid "Installing… This could take a while"
-msgstr ""
-
 #. Make window unable to close
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Attempt to Install?"
 msgstr ""
 
-#: src/orphans_window.py:106
+#: src/orphans_window.py:100
 msgid "Warehouse will attempt to install apps matching the selected data."
 msgstr ""
 
-#: src/orphans_window.py:123
+#: src/orphans_window.py:117
 msgid "{} wide"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "Trash folders?"
 msgstr ""
 
-#: src/orphans_window.py:159
+#: src/orphans_window.py:153
 msgid "These folders will be sent to the trash."
 msgstr ""
 
-#: src/orphans_window.py:163
+#: src/orphans_window.py:157
 msgid "Continue"
 msgstr ""
 
-#: src/orphans_window.py:187
+#: src/orphans_window.py:181
 msgid "Could not manage data"
 msgstr ""
 
-#: src/orphans.blp:19
+#: data/ui/orphans.blp:20
 msgid "Open Data Folder"
 msgstr ""
 
-#: src/orphans.blp:57
+#: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr ""
 
-#: src/orphans.blp:58
+#: data/ui/orphans.blp:102
 msgid "There is no leftover user data"
 msgstr ""
 
-#: src/filter.blp:21
+#: data/ui/filter.blp:22
 msgid "Apply"
 msgstr ""
 
-#: src/filter.blp:46
+#: data/ui/filter.blp:54
 msgid "Show Apps"
 msgstr ""
 
-#: src/filter.blp:55
+#: data/ui/filter.blp:64
 msgid "Show Runtimes"
 msgstr ""
 
-#: src/filter.blp:65
+#: data/ui/filter.blp:75
 msgid "Filter Apps by Remotes"
 msgstr ""
 
-#: src/filter.blp:69
+#: data/ui/filter.blp:80
 msgid "Filter Apps by Runtime"
 msgstr ""
 
-#: src/downgrade_window.py:76
+#: src/downgrade_window.py:78
 msgid "Commit Hash: {}"
 msgstr ""
 
@@ -732,6 +788,12 @@ msgstr ""
 msgid "Could not downgrade {}"
 msgstr ""
 
+#: src/downgrade_window.py:108
+#, fuzzy
+#| msgid "Could not open folder"
+msgid "Could not disable updates for {}"
+msgstr "无法打开目录"
+
 #: src/downgrade_window.py:116
 msgid "Downgrading…"
 msgstr ""
@@ -748,11 +810,11 @@ msgstr ""
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:46
+#: data/ui/downgrade.blp:52
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:47
+#: data/ui/downgrade.blp:53
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."