diff --git a/cosmic-app-list/data/com.system76.CosmicAppList.desktop b/cosmic-app-list/data/com.system76.CosmicAppList.desktop
index 3f3447eb..d3692870 100644
--- a/cosmic-app-list/data/com.system76.CosmicAppList.desktop
+++ b/cosmic-app-list/data/com.system76.CosmicAppList.desktop
@@ -3,8 +3,8 @@ Name=App Tray
 Type=Application
 Exec=cosmic-app-list
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppList
 StartupNotify=true
diff --git a/cosmic-app-list/data/com.system76.CosmicAppList.metainfo.xml b/cosmic-app-list/data/com.system76.CosmicAppList.metainfo.xml
deleted file mode 100644
index 0a379617..00000000
--- a/cosmic-app-list/data/com.system76.CosmicAppList.metainfo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Ashley Wulber 2019 <ashley@system76.com> -->
-<component type="desktop-application">
-  <id>"com.system76.CosmicAppList"</id>
-  <metadata_license>CC0</metadata_license>
-  <project_license>MPL</project_license>
-  <name>Cosmic Dock App List</name>
-  <summary>Applet for Cosmic Panel</summary>
-  <description>
-    <p>A boilerplate template for GTK + Rust. It uses Meson as a build system and has flatpak support by default.</p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://gitlab.gnome.org/bilelmoussaoui/cosmic-app-list/raw/master/data/resources/screenshots/screenshot1.png</image>
-      <caption>Main window</caption>
-    </screenshot>
-  </screenshots>
-  <url type="homepage">https://gitlab.gnome.org/bilelmoussaoui/cosmic-app-list</url>
-  <url type="bugtracker">https://gitlab.gnome.org/bilelmoussaoui/cosmic-app-list/issues</url>
-  <content_rating type="oars-1.0" />
-  <releases>
-    <release version="0.0.1" date="2019-07-11" />
-  </releases>
-  <kudos>
-     <!--
-       GNOME Software kudos:
-       https://gitlab.gnome.org/GNOME/gnome-software/blob/master/doc/kudos.md
-     -->
-     <kudo>ModernToolkit</kudo>
-     <kudo>HiDpiIcon</kudo>
-  </kudos>
-  <developer_name>Ashley Wulber</developer_name>
-  <update_contact>ashley@system76.com</update_contact>
-  <launchable type="desktop-id">"com.System76.CosmicAppList".desktop</launchable>
-</component>
diff --git a/cosmic-applet-audio/data/com.system76.CosmicAppletAudio.desktop b/cosmic-applet-audio/data/com.system76.CosmicAppletAudio.desktop
index ac7c8f40..c0516d4e 100644
--- a/cosmic-applet-audio/data/com.system76.CosmicAppletAudio.desktop
+++ b/cosmic-applet-audio/data/com.system76.CosmicAppletAudio.desktop
@@ -1,12 +1,11 @@
 [Desktop Entry]
 Name=Sound
 Name[ko]=코스믹 오디오 애플릿
-Comment[ko]=코스믹 패널용 애플릿
 Type=Application
 Exec=cosmic-applet-audio
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppletAudio-symbolic
 StartupNotify=true
diff --git a/cosmic-applet-battery/data/com.system76.CosmicAppletBattery.desktop b/cosmic-applet-battery/data/com.system76.CosmicAppletBattery.desktop
index c3d39a97..42c7b43e 100644
--- a/cosmic-applet-battery/data/com.system76.CosmicAppletBattery.desktop
+++ b/cosmic-applet-battery/data/com.system76.CosmicAppletBattery.desktop
@@ -1,12 +1,11 @@
 [Desktop Entry]
-Name=Power and Battery
+Name=Power & Battery
 Name[ko]=코스믹 배터리 애플릿
-Comment[ko]=코스믹 패널용 애플릿
 Type=Application
 Exec=cosmic-applet-battery
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppletBattery-symbolic
 StartupNotify=true
diff --git a/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop b/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop
index 4526ca08..6eedb4ca 100644
--- a/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop
+++ b/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop
@@ -1,11 +1,10 @@
 [Desktop Entry]
 Name=Input Sources
-Comment=Display the current and available input sources
 Type=Application
 Exec=cosmic-applet-input-sources
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppletInputSources-symbolic
 StartupNotify=true
diff --git a/cosmic-applet-minimize/data/com.system76.CosmicAppletMinimize.desktop b/cosmic-applet-minimize/data/com.system76.CosmicAppletMinimize.desktop
index 7cf268d3..599467dd 100644
--- a/cosmic-applet-minimize/data/com.system76.CosmicAppletMinimize.desktop
+++ b/cosmic-applet-minimize/data/com.system76.CosmicAppletMinimize.desktop
@@ -3,8 +3,8 @@ Name=Minimized Windows
 Type=Application
 Exec=cosmic-applet-minimize
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppletMinimize
 StartupNotify=true
diff --git a/cosmic-applet-network/data/com.system76.CosmicAppletNetwork.desktop b/cosmic-applet-network/data/com.system76.CosmicAppletNetwork.desktop
index c449ca6a..39f2fc97 100644
--- a/cosmic-applet-network/data/com.system76.CosmicAppletNetwork.desktop
+++ b/cosmic-applet-network/data/com.system76.CosmicAppletNetwork.desktop
@@ -3,8 +3,8 @@ Name=Network
 Type=Application
 Exec=cosmic-applet-network
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppletNetwork-symbolic
 StartupNotify=true
diff --git a/cosmic-applet-notifications/data/com.system76.CosmicAppletNotifications.desktop b/cosmic-applet-notifications/data/com.system76.CosmicAppletNotifications.desktop
index 06a661b9..713b2a5e 100644
--- a/cosmic-applet-notifications/data/com.system76.CosmicAppletNotifications.desktop
+++ b/cosmic-applet-notifications/data/com.system76.CosmicAppletNotifications.desktop
@@ -3,8 +3,8 @@ Name=Notifications Center
 Type=Application
 Exec=cosmic-applet-notifications
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppletNotifications-symbolic
 NoDisplay=true
diff --git a/cosmic-applet-power/data/com.system76.CosmicAppletPower.desktop b/cosmic-applet-power/data/com.system76.CosmicAppletPower.desktop
index ac7bc136..dcf784d2 100644
--- a/cosmic-applet-power/data/com.system76.CosmicAppletPower.desktop
+++ b/cosmic-applet-power/data/com.system76.CosmicAppletPower.desktop
@@ -3,8 +3,8 @@ Name=User Session
 Type=Application
 Exec=cosmic-applet-power
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppletPower-symbolic
 StartupNotify=true
diff --git a/cosmic-applet-status-area/data/com.system76.CosmicAppletStatusArea.desktop b/cosmic-applet-status-area/data/com.system76.CosmicAppletStatusArea.desktop
index 49fcba36..7ce9bb34 100644
--- a/cosmic-applet-status-area/data/com.system76.CosmicAppletStatusArea.desktop
+++ b/cosmic-applet-status-area/data/com.system76.CosmicAppletStatusArea.desktop
@@ -1,12 +1,11 @@
 [Desktop Entry]
 Name=Notifications Tray
 Name[pt]=Área de estado do applet Cosmic
-Comment[pt]=Applet para o painel Cosmic
 Type=Application
 Exec=cosmic-applet-status-area
 Terminal=false
-Categories=GNOME;GTK;
-Keywords=Gnome;GTK;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppletStatusArea
 StartupNotify=true
diff --git a/cosmic-applet-tiling/data/com.system76.CosmicAppletTiling.desktop b/cosmic-applet-tiling/data/com.system76.CosmicAppletTiling.desktop
index 0d546c5d..f19a0c5e 100644
--- a/cosmic-applet-tiling/data/com.system76.CosmicAppletTiling.desktop
+++ b/cosmic-applet-tiling/data/com.system76.CosmicAppletTiling.desktop
@@ -3,8 +3,8 @@ Name=Tiling
 Type=Application
 Exec=cosmic-applet-tiling
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppletTiling-symbolic
 StartupNotify=true
diff --git a/cosmic-applet-time/data/com.system76.CosmicAppletTime.desktop b/cosmic-applet-time/data/com.system76.CosmicAppletTime.desktop
index 3ff31004..8f572e19 100644
--- a/cosmic-applet-time/data/com.system76.CosmicAppletTime.desktop
+++ b/cosmic-applet-time/data/com.system76.CosmicAppletTime.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=Date, Time, and Calendar
+Name=Date, Time & Calendar
 Type=Application
 Exec=cosmic-applet-time
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicAppletTime-symbolic
 NoDisplay=true
diff --git a/cosmic-applet-workspaces/data/com.system76.CosmicAppletWorkspaces.desktop b/cosmic-applet-workspaces/data/com.system76.CosmicAppletWorkspaces.desktop
index 0ade7224..8261cabb 100644
--- a/cosmic-applet-workspaces/data/com.system76.CosmicAppletWorkspaces.desktop
+++ b/cosmic-applet-workspaces/data/com.system76.CosmicAppletWorkspaces.desktop
@@ -3,8 +3,8 @@ Name=Numbered Workspaces
 Type=Application
 Exec=cosmic-applet-workspaces
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 Icon=com.system76.CosmicAppletWorkspaces-symbolic
 StartupNotify=true
 NoDisplay=true
diff --git a/cosmic-panel-app-button/data/com.system76.CosmicPanelAppButton.desktop b/cosmic-panel-app-button/data/com.system76.CosmicPanelAppButton.desktop
index 3b001aa6..c063dbf1 100644
--- a/cosmic-panel-app-button/data/com.system76.CosmicPanelAppButton.desktop
+++ b/cosmic-panel-app-button/data/com.system76.CosmicPanelAppButton.desktop
@@ -5,17 +5,11 @@ Name[ja]=Cosmicパネルのアップライブラリーボタン
 Name[ko]=코스믹 패널 앱 라이브러리 단추
 Name[pt]=Botão da biblioteca de aplicações do painel Cosmic
 Name[ru]=Кнопка библиотеки приложений на панели Cosmic
-Comment=Applet for Cosmic Panel
-Comment[es]=Applet para el panel Cosmic
-Comment[ja]=Cosmicパネルのアプレット
-Comment[ko]=코스믹 패널용 애플릿
-Comment[pt]=Applet para o painel Cosmic
-Comment[ru]=Апплет для панели Cosmic
 Type=Application
 Exec=cosmic-panel-button com.system76.CosmicAppLibrary
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicPanelAppButton
 StartupNotify=true
diff --git a/cosmic-panel-launcher-button/data/com.system76.CosmicPanelLauncherButton.desktop b/cosmic-panel-launcher-button/data/com.system76.CosmicPanelLauncherButton.desktop
index 1544030f..7a054fbe 100644
--- a/cosmic-panel-launcher-button/data/com.system76.CosmicPanelLauncherButton.desktop
+++ b/cosmic-panel-launcher-button/data/com.system76.CosmicPanelLauncherButton.desktop
@@ -3,8 +3,8 @@ Name=Launcher Button
 Type=Application
 Exec=cosmic-panel-button com.system76.CosmicLauncher
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicPanelLauncherButton
 StartupNotify=true
diff --git a/cosmic-panel-workspaces-button/data/com.system76.CosmicPanelWorkspacesButton.desktop b/cosmic-panel-workspaces-button/data/com.system76.CosmicPanelWorkspacesButton.desktop
index 10ccc53e..b29cdaef 100644
--- a/cosmic-panel-workspaces-button/data/com.system76.CosmicPanelWorkspacesButton.desktop
+++ b/cosmic-panel-workspaces-button/data/com.system76.CosmicPanelWorkspacesButton.desktop
@@ -1,12 +1,11 @@
 [Desktop Entry]
 Name=Workspaces Button
 Name[pt]=Botão de áreas de trabalho do painel Cosmic
-Comment[pt]=Applet para o painel Cosmic
 Type=Application
 Exec=cosmic-panel-button com.system76.CosmicWorkspaces
 Terminal=false
-Categories=Cosmic;Iced;
-Keywords=Cosmic;Iced;
+Categories=COSMIC;Iced;
+Keywords=COSMIC;Iced;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=com.system76.CosmicPanelWorkspacesButton
 StartupNotify=true