diff --git a/data/org.kuchelmeister.toolbxtuner.appdata.xml.in b/data/org.kuchelmeister.toolbxtuner.appdata.xml.in
index 29c441b..16b5df1 100644
--- a/data/org.kuchelmeister.toolbxtuner.appdata.xml.in
+++ b/data/org.kuchelmeister.toolbxtuner.appdata.xml.in
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-	<id>org.kuchelmeister.toolbxtuner.desktop</id>
+<component type="desktop-application">
+
+	<id>org.kuchelmeister.toolbxtuner</id>
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>GPL-3.0-or-later</project_license>
   <name>Toolbx Tuner</name>
-  <summary></summary>
+  <summary>Manage and enhance your toolbxes (containertoolboxes)</summary>
 	<description>
-	  <p>No description</p>
+	  <p>An application to manage and enhance your containertoolboxes.</p>
 	</description>
-  <url>https://github.com/13hannes11/toolbx-tuner</url>
+
+  <url type="homepage">https://github.com/13hannes11/toolbx-tuner</url>
+  <url type="bugtracker">hhttps://github.com/13hannes11/toolbx-tuner/issues/</url>
   <update_contact>hannes_AT_kuchelmeister.org</update_contact>
   <developer_name>Hannes Kuchelmeister</developer_name>
+
+  <launchable type="desktop-id">org.kuchelmeister.toolbxtuner.desktop</launchable>
+
 </component>
+
diff --git a/data/org.kuchelmeister.toolbxtuner.desktop.in b/data/org.kuchelmeister.toolbxtuner.desktop.in
index 632d3e6..5abbc1d 100644
--- a/data/org.kuchelmeister.toolbxtuner.desktop.in
+++ b/data/org.kuchelmeister.toolbxtuner.desktop.in
@@ -1,8 +1,12 @@
 [Desktop Entry]
 Name=Toolbx Tuner
+Comment=Manage and enhance your toolbxes (containertoolboxes)
 Exec=toolbx-tuner
-Icon=org.kuchelmeister.toolbxtuner
 Terminal=false
 Type=Application
 Categories=GTK;
-StartupNotify=true
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords=Gnome;GTK;Container;Toolbx;Podman;Toolbox;
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=org.kuchelmeister.toolbxtuner
+StartupNotify=true
\ No newline at end of file
diff --git a/po/POTFILES b/po/POTFILES
index 7ec4ba1..cfc1118 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,3 +1,3 @@
 data/org.kuchelmeister.toolbxtuner.desktop.in
 data/org.kuchelmeister.toolbxtuner.appdata.xml.in
-data/org.kuchelmeister.toolbxtuner.gschema.xml
\ No newline at end of file
+data/org.kuchelmeister.toolbxtuner.gschema.xml