diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt
index 5ed8f16c..59a1a88e 100644
--- a/avogadro/CMakeLists.txt
+++ b/avogadro/CMakeLists.txt
@@ -173,10 +173,10 @@ if(APPLE)
     MACOSX_PACKAGE_LOCATION Resources)
 
 elseif(UNIX)
-  install(FILES "icons/avogadro2.desktop" DESTINATION "${INSTALL_XDG_APPS_DIR}")
-  install(FILES "icons/avogadro2.appdata.xml" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo")
+  install(FILES "icons/org.openchemistry.Avogadro2.desktop" DESTINATION "${INSTALL_XDG_APPS_DIR}")
+  install(FILES "icons/org.openchemistry.Avogadro2.metainfo.xml" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo")
   install(FILES "icons/avogadro.png" DESTINATION "${INSTALL_XDG_ICON_DIR}"
-    RENAME "avogadro2.png")
+    RENAME "org.openchemistry.Avogadro2.png")
 elseif(WIN32)
   list(APPEND avogadro_srcs icons/avogadro.rc)
 endif()
diff --git a/avogadro/icons/avogadro2.appdata.xml b/avogadro/icons/avogadro2.appdata.xml
deleted file mode 100644
index 46e73cde..00000000
--- a/avogadro/icons/avogadro2.appdata.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>avogadro2.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <summary>Advanced molecular editor</summary>
-  <name>Avogadro2</name>
-  <project_license>BSD-3-Clause</project_license>
-  <categories>
-    <category>Education</category>
-    <category>Chemistry</category>
-  </categories>
-  <description>
-    <p>
-     Avogadro is an advanced molecular editor designed for cross-platform use in
-     computational chemistry, molecular modeling, bioinformatics, materials science,
-     and related areas. It offers flexible rendering and a powerful plugin
-     architecture. The code in this repository is a rewrite of Avogadro with source
-     code split across a libraries repository and an application repository. Core
-     features and goals of the Avogadro project:
-
-     * Open source distributed under the liberal 3-clause BSD license
-     * Cross platform with nightly builds on Linux, Mac OS X and Windows
-     * Intuitive interface designed to be useful to whole community
-     * Fast and efficient embracing the latest technologies
-     * Extensible, making extensive use of a plugin architecture
-     * Flexible supporting a range of chemical data formats and packages
-    </p>
-  </description>
-  <url type="homepage">https://two.avogadro.cc/</url>
-  <url type="help">https://discuss.avogadro.cc/</url>
-  <url type="bugtracker">https://github.com/openchemistry/avogadrolibs/issues</url>
-  <url type="translate">https://hosted.weblate.org/engage/avogadro/</url>
-  <url type="donate">https://opencollective.com/open-chemistry</url>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://two.avogadro.cc/_images/benzene-mo.png</image>
-      <caption>Benzene</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://two.avogadro.cc/_images/zeolite.png</image>
-      <caption>Zeolite Crystal</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://two.avogadro.cc/_images/bondcentric.png</image>
-      <caption>Bond-Centric Building</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://two.avogadro.cc/_images/covid-spike.png</image>
-      <caption>COVID Spike Protein</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://two.avogadro.cc/_images/C180.png</image>
-      <caption>Fullerene Symmetry Detection</caption>
-    </screenshot>
-  </screenshots>
-  <update_contact>avogadro-devel_at_lists.sourceforge.net</update_contact>
-</component>
diff --git a/avogadro/icons/avogadro2.desktop b/avogadro/icons/org.openchemistry.Avogadro2.desktop
similarity index 85%
rename from avogadro/icons/avogadro2.desktop
rename to avogadro/icons/org.openchemistry.Avogadro2.desktop
index 33a46df9..b1e37d95 100644
--- a/avogadro/icons/avogadro2.desktop
+++ b/avogadro/icons/org.openchemistry.Avogadro2.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Version=1.0
-Name=Avogadro2
+Name=Avogadro
 Comment=Advanced molecular editor
 Comment[hu]=Fejlett molekuláris szerkesztő
 Exec=avogadro2 %f
-Icon=avogadro2
+Icon=org.openchemistry.Avogadro2
 Terminal=false
 Type=Application
 Categories=Qt;Science;Chemistry;Physics;Education;
diff --git a/avogadro/icons/org.openchemistry.Avogadro2.metainfo.xml b/avogadro/icons/org.openchemistry.Avogadro2.metainfo.xml
new file mode 100644
index 00000000..10392924
--- /dev/null
+++ b/avogadro/icons/org.openchemistry.Avogadro2.metainfo.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>org.openchemistry.Avogadro2</id>
+  <launchable type="desktop-id">org.openchemistry.Avogadro2.desktop</launchable>
+  <name>Avogadro</name>
+  <summary>Free and open source molecular editor</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>BSD-3-Clause</project_license>
+  <categories>
+  <category>Education</category>
+  <category>Chemistry</category>
+  </categories>
+  <description>
+    <p>
+      Avogadro is an advanced molecular editor designed for cross-platform use in computational chemistry,
+      molecular modeling, bioinformatics, materials science, and related areas. It offers flexible 
+      rendering and a powerful plugin architecture. The code in this repository is a rewrite of Avogadro
+      with source code split across a libraries repository and an application repository. Core features 
+      and goals of the Avogadro project:
+    </p>
+    <ul>
+      <li>Open source distributed under the liberal 3-clause BSD license</li>
+      <li>Cross platform with nightly builds on Linux, Mac OS X and Windows</li>
+      <li>Intuitive interface designed to be useful to whole community</li>
+      <li>Fast and efficient embracing the latest technologies</li>
+      <li>Extensible, making extensive use of a plugin architecture</li>
+      <li>Flexible supporting a range of chemical data formats and packages</li>
+    </ul>
+  </description>
+  <url type="homepage">https://two.avogadro.cc/</url>
+  <url type="help">https://two.avogadro.cc/docs</url>
+  <url type="faq">https://discuss.avogadro.cc/</url>
+  <url type="bugtracker">https://github.com/OpenChemistry/avogadrolibs/issues</url>
+  <url type="translate">https://hosted.weblate.org/engage/avogadro/</url>
+  <url type="donation">https://opencollective.com/open-chemistry</url>
+  <developer_name>Open Chemistry team</developer_name>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://two.avogadro.cc/_images/home_screenshot_1.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://two.avogadro.cc/_images/home_splash_1.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://two.avogadro.cc/_images/bondcentric.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://two.avogadro.cc/_images/ferrocene.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://two.avogadro.cc/_images/covid-spike.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://two.avogadro.cc/_images/benzene-mo.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://two.avogadro.cc/_images/zeolite.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://two.avogadro.cc/_images/AuNP.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://two.avogadro.cc/_images/C180.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://two.avogadro.cc/_images/phenol-qtaim.png</image>
+    </screenshot>
+  </screenshots>
+  <content_rating type="oars-1.1"/>
+  <releases>
+    <release version="1.99.0" date="2024-02-10"/>
+    <release version="1.98.1" date="2023-11-02"/>
+    <release version="1.98.0" date="2023-10-27"/>
+    <release version="1.97.0" date="2022-07-21"/>
+    <release version="1.96.0" date="2022-06-02"/>
+    <release version="1.95.1" date="2021-08-27"/>
+    <release version="1.95.0" date="2021-08-20"/>
+    <release version="1.94.0" date="2021-06-03"/>
+  </releases>
+</component>
diff --git a/flatpak/shared-modules b/flatpak/shared-modules
index 1bb53934..a07b11ab 160000
--- a/flatpak/shared-modules
+++ b/flatpak/shared-modules
@@ -1 +1 @@
-Subproject commit 1bb53934f105743f84f923693847185dce613cef
+Subproject commit a07b11abc2155e3c664e1d09e39e98819d4541fa