diff --git a/linux/appdata/org.kde.Falkon.appdata.xml b/linux/appdata/org.kde.Falkon.appdata.xml
index 80ca6c2ef..42226d46a 100644
--- a/linux/appdata/org.kde.Falkon.appdata.xml
+++ b/linux/appdata/org.kde.Falkon.appdata.xml
@@ -1,54 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<application>
-  <id type="desktop">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="ast">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="ca">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="ca-valencia">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="de">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="en-GB">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="es">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="fi">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="fr">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="nl">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="pt">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="sk">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="sv">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="uk">org.kde.Falkon.desktop</id>
-  <id type="desktop" xml:lang="x-test">xxorg.kde.Falkon.desktopxx</id>
+<component type="desktop-application">
+  <id>org.kde.Falkon.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
-  <metadata_license xml:lang="ast">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="ca">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="ca-valencia">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="cs">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="de">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="en-GB">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="es">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="fi">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="fr">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="nl">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="pt">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="sk">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="sv">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="uk">CC0-1.0</metadata_license>
-  <metadata_license xml:lang="x-test">xxCC0-1.0xx</metadata_license>
-  <metadata_license xml:lang="zh-CN">CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
-  <project_license xml:lang="ast">GPL-3.0+</project_license>
-  <project_license xml:lang="ca">GPL-3.0+</project_license>
-  <project_license xml:lang="ca-valencia">GPL-3.0+</project_license>
-  <project_license xml:lang="cs">GPL-3.0+</project_license>
-  <project_license xml:lang="de">GPL-3.0+</project_license>
-  <project_license xml:lang="en-GB">GPL-3.0+</project_license>
-  <project_license xml:lang="es">GPL-3.0+</project_license>
-  <project_license xml:lang="fi">GPL-3.0+</project_license>
-  <project_license xml:lang="fr">GPL-3.0+</project_license>
-  <project_license xml:lang="nl">GPL-3.0+</project_license>
-  <project_license xml:lang="pt">GPL-3.0+</project_license>
-  <project_license xml:lang="sk">GPL-3.0+</project_license>
-  <project_license xml:lang="sv">GPL-3.0+</project_license>
-  <project_license xml:lang="uk">GPL-3.0+</project_license>
-  <project_license xml:lang="x-test">xxGPL-3.0+xx</project_license>
-  <project_license xml:lang="zh-CN">GPL-3.0+</project_license>
   <name>Falkon</name>
   <name xml:lang="ast">Falkon</name>
   <name xml:lang="ca">Falkon</name>
@@ -128,136 +82,12 @@
   </description>
   <screenshots>
     <screenshot type="default" width="871" height="568">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="ca">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="ca-valencia">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="en-GB">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="es">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="fi">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="fr">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="nl">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="pt">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="sv">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="uk">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="x-test">xxhttps://www.qupzilla.com/screens/gnome_window.pngxx</screenshot>
-    <screenshot type="default" width="871" height="568" xml:lang="zh-CN">https://www.qupzilla.com/screens/gnome_window.png</screenshot>
-    <screenshot width="948" height="638">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="ast">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="ca">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="ca-valencia">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="cs">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="de">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="en-GB">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="es">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="fi">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="fr">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="nl">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="pt">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="sk">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="sv">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="uk">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="948" height="638" xml:lang="x-test">xxhttps://www.qupzilla.com/screens/kde_window.pngxx</screenshot>
-    <screenshot width="948" height="638" xml:lang="zh-CN">https://www.qupzilla.com/screens/kde_window.png</screenshot>
-    <screenshot width="864" height="567">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="ast">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="ca">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="ca-valencia">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="cs">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="de">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="en-GB">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="es">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="fi">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="fr">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="nl">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="pt">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="sk">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="sv">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="uk">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="864" height="567" xml:lang="x-test">xxhttps://www.qupzilla.com/screens/dial_gnome.pngxx</screenshot>
-    <screenshot width="864" height="567" xml:lang="zh-CN">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
-    <screenshot width="944" height="633">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="ast">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="ca">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="ca-valencia">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="cs">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="de">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="en-GB">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="es">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="fi">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="fr">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="nl">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="pt">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="sk">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="sv">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="uk">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="944" height="633" xml:lang="x-test">xxhttps://www.qupzilla.com/screens/kde_speeddial.pngxx</screenshot>
-    <screenshot width="944" height="633" xml:lang="zh-CN">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
-    <screenshot width="809" height="528">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="ast">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="ca">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="ca-valencia">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="cs">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="de">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="en-GB">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="es">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="fi">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="fr">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="nl">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="pt">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="sk">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="sv">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="uk">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="809" height="528" xml:lang="x-test">xxhttps://www.qupzilla.com/screens/preferences_gnome.pngxx</screenshot>
-    <screenshot width="809" height="528" xml:lang="zh-CN">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
-    <screenshot width="760" height="518">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="ast">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="ca">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="ca-valencia">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="cs">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="de">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="en-GB">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="es">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="fi">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="fr">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="nl">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="pt">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="sk">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="sv">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="uk">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
-    <screenshot width="760" height="518" xml:lang="x-test">xxhttps://www.qupzilla.com/screens/kde_preferences.pngxx</screenshot>
-    <screenshot width="760" height="518" xml:lang="zh-CN">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
+    <screenshot width="955" height="647">https://www.qupzilla.com/screens/kde_window.png</screenshot>
+    <screenshot width="872" height="569">https://www.qupzilla.com/screens/gnome_speeddial.png</screenshot>
+    <screenshot width="955" height="647">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
+    <screenshot width="804" height="598">https://www.qupzilla.com/screens/gnome_preferences.png</screenshot>
+    <screenshot width="791" height="598">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
   </screenshots>
   <url type="homepage">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="ast">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="ca">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="ca-valencia">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="cs">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="de">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="en-GB">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="es">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="fi">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="fr">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="nl">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="pt">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="sk">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="sv">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="uk">https://www.qupzilla.com/</url>
-  <url type="homepage" xml:lang="x-test">xxhttps://www.qupzilla.com/xx</url>
-  <url type="homepage" xml:lang="zh-CN">https://www.qupzilla.com/</url>
-  <updatecontact>nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="ast">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="ca">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="ca-valencia">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="cs">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="de">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="en-GB">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="es">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="fi">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="fr">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="nl">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="pt">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="sk">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="sv">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="uk">nowrep_at_gmail.com</updatecontact>
-  <updatecontact xml:lang="x-test">xxnowrep_at_gmail.comxx</updatecontact>
-  <updatecontact xml:lang="zh-CN">nowrep_at_gmail.com</updatecontact>
-</application>
+  <update_contact>nowrep_at_gmail.com</update_contact>
+</component>