diff --git a/info.beyondallreason.bar.appdata.xml b/info.beyondallreason.bar.metainfo.xml
similarity index 94%
rename from info.beyondallreason.bar.appdata.xml
rename to info.beyondallreason.bar.metainfo.xml
index 4778bf5..985e764 100644
--- a/info.beyondallreason.bar.appdata.xml
+++ b/info.beyondallreason.bar.metainfo.xml
@@ -1,10 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
+<component type="desktop-application">
     <id>info.beyondallreason.bar</id>
     <name>Beyond All Reason</name>
-    <summary>The Total Annihilation Inspired RTS you've been waiting for</summary>
+    <summary>Total Annihilation Inspired RTS</summary>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-2.0-or-later</project_license>
+    <launchable type="desktop-id">info.beyondallreason.bar.desktop</launchable>
+    <content_rating type="oars-1.1">
+        <content_attribute id="violence-cartoon">moderate</content_attribute>
+        <content_attribute id="violence-fantasy">moderate</content_attribute>
+        <content_attribute id="social-chat">intense</content_attribute>
+    </content_rating>
+    <developer id="info.beyondallreason">
+        <name>BAR Team</name>
+    </developer>
+    <url type="homepage">https://www.beyondallreason.info</url>
+    <url type="bugtracker">https://github.com/beyond-all-reason/Beyond-All-Reason/issues</url>
+    <url type="donation">https://www.beyondallreason.info/donate-for-bar</url>
+    <url type="faq">https://www.beyondallreason.info/faq</url>
+    <recommends>
+        <internet>always</internet>
+        <memory>12288</memory>
+    </recommends>
+    <categories>
+        <category>Game</category>
+    </categories>
+    <branding>
+        <color type="primary" scheme_preference="light">#e0e0e0</color>
+        <color type="primary" scheme_preference="dark">#282828</color>
+    </branding>
+    <keywords>
+        <keyword>rts</keyword>
+        <keyword>real-time strategy</keyword>
+    </keywords>
     <description>
         <p>3D Real-Time Strategy Redefined. The Total Annihilation Inspired RTS you've been waiting for.</p>
 
@@ -31,10 +59,6 @@
         <p>400+ Units Unique and with a Purpose:</p>
         <p>Each and every unit in the game has a role to fill. Mix-and-match units to create infinite possible tactics. Experiment with your own combinations and show off the new strategies you develop in battle.</p>
     </description>
-    <developer_name>BAR Team</developer_name>
-    <url type="homepage">https://www.beyondallreason.info</url>
-    <url type="bugtracker">https://github.com/beyond-all-reason/Beyond-All-Reason/issues</url>
-    <url type="donation">https://www.beyondallreason.info/donate-for-bar</url>
     <screenshots>
         <screenshot type="default">
             <image>https://raw.githubusercontent.com/flathub/info.beyondallreason.bar/master/screenshot/screenshot_01.jpg</image>
@@ -278,9 +302,4 @@
             </description>
         </release>
     </releases>
-    <content_rating type="oars-1.1">
-        <content_attribute id="violence-cartoon">moderate</content_attribute>
-        <content_attribute id="violence-fantasy">moderate</content_attribute>
-        <content_attribute id="social-chat">intense</content_attribute>
-    </content_rating>
 </component>
diff --git a/info.beyondallreason.bar.yml b/info.beyondallreason.bar.yml
index 58d553d..b3521a1 100644
--- a/info.beyondallreason.bar.yml
+++ b/info.beyondallreason.bar.yml
@@ -99,7 +99,7 @@ modules:
         install -Dm755 -t /app/bin/ run.sh
         install -Dm644 /app/chobby/dist_cfg/build/icon.png /app/share/icons/hicolor/128x128/apps/info.beyondallreason.bar.png
         install -Dm644 info.beyondallreason.bar.desktop /app/share/applications/info.beyondallreason.bar.desktop
-        install -Dm644 info.beyondallreason.bar.appdata.xml /app/share/metainfo/info.beyondallreason.bar.appdata.xml
+        install -Dm644 info.beyondallreason.bar.metainfo.xml /app/share/metainfo/info.beyondallreason.bar.metainfo.xml
       # Copy addr2line to bin so that engine can execute it to generate stacktrace
       - |
         cp /usr/bin/addr2line /app/bin
@@ -109,6 +109,6 @@ modules:
       - type: file
         path: info.beyondallreason.bar.desktop
       - type: file
-        path: info.beyondallreason.bar.appdata.xml
+        path: info.beyondallreason.bar.metainfo.xml
       - type: file
         path: run.sh