diff --git a/VERSION b/VERSION
index f90b1afc0..0bee604df 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.2
+2.3.3
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index f1771c714..70c7cb4fd 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+**2.3.3**
+* Add More Blocks To Expanded Creative Inventory
+* Add AppStream Metadata
+
 **2.3.2**
 * Simplify Launch Sequence
 * Add More Blocks To Expanded Creative Inventory
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 734670138..f1779fb9e 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -12,13 +12,20 @@ if(BUILD_NATIVE_COMPONENTS)
     # Install
     install(TARGETS launcher DESTINATION "${MCPI_INSTALL_DIR}")
     install_symlink("../${MCPI_INSTALL_DIR}/launcher" "bin/${MCPI_VARIANT_NAME}")
+    set(ICON_PATH "data/com.thebrokenrail.MCPIReborn.png")
+    set(ICON_TARGET_PATH "share/icons/hicolor/scalable/apps")
     if(NOT MCPI_SERVER_MODE)
-        install(DIRECTORY "client-data/" DESTINATION ".")
-    else()
-        set(ICON_PATH "share/icons/hicolor/scalable/apps")
+        install(DIRECTORY "data/client/" DESTINATION ".")
         install(
-            FILES "client-data/${ICON_PATH}/com.thebrokenrail.MCPIReborn.png"
-            DESTINATION "${ICON_PATH}"
+            FILES "${ICON_PATH}"
+            DESTINATION "${ICON_TARGET_PATH}"
+            RENAME "com.thebrokenrail.MCPIRebornClient.png"
+        )
+    else()
+        install(DIRECTORY "data/server/" DESTINATION ".")
+        install(
+            FILES "${ICON_PATH}"
+            DESTINATION "${ICON_TARGET_PATH}"
             RENAME "com.thebrokenrail.MCPIRebornServer.png"
         )
     endif()
diff --git a/launcher/client-data/lib/minecraft-pi-reborn-client/available-feature-flags b/launcher/data/client/lib/minecraft-pi-reborn-client/available-feature-flags
similarity index 100%
rename from launcher/client-data/lib/minecraft-pi-reborn-client/available-feature-flags
rename to launcher/data/client/lib/minecraft-pi-reborn-client/available-feature-flags
diff --git a/launcher/client-data/share/applications/com.thebrokenrail.MCPIReborn.desktop b/launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop
similarity index 62%
rename from launcher/client-data/share/applications/com.thebrokenrail.MCPIReborn.desktop
rename to launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop
index c05013118..3ad70d114 100755
--- a/launcher/client-data/share/applications/com.thebrokenrail.MCPIReborn.desktop
+++ b/launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=Minecraft: Pi Edition: Reborn
+Name=Minecraft: Pi Edition: Reborn (Client)
 Comment=Fun with Blocks
-Icon=com.thebrokenrail.MCPIReborn
+Icon=com.thebrokenrail.MCPIRebornClient
 StartupNotify=false
 StartupWMClass=Minecraft: Pi Edition: Reborn
 Exec=minecraft-pi-reborn-client
 Terminal=false
 Type=Application
-Categories=Application;Game;
+Categories=Game;
diff --git a/launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml b/launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml
new file mode 100644
index 000000000..32771f962
--- /dev/null
+++ b/launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>com.thebrokenrail.MCPIRebornClient</id>
+    <name>Minecraft: Pi Edition: Reborn (Client)</name>
+    <metadata_license>CC0-1.0</metadata_license>
+    <summary>Fun with Blocks</summary>
+    <description><p>Minecraft: Pi Edition Modding Project.</p><p>NOTE: This is not verified by, affiliated with, or supported by Mojang or Microsoft.</p></description>
+    <url type="homepage">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn</url>
+    <screenshots>
+        <screenshot type="default">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/raw/branch/master/images/start.png</screenshot>
+    </screenshots>
+    <launchable type="desktop-id">com.thebrokenrail.MCPIRebornClient.desktop</launchable>
+    <provides>
+        <id>com.thebrokenrail.MCPIRebornClient.desktop</id>
+    </provides>
+    <project_license>LicenseRef-proprietary</project_license>
+    <developer_name>TheBrokenRail &amp; Mojang AB</developer_name>
+    <content_rating type="oars-1.0">
+        <content_attribute id="violence-cartoon">moderate</content_attribute>
+        <content_attribute id="violence-fantasy">none</content_attribute>
+        <content_attribute id="violence-realistic">none</content_attribute>
+        <content_attribute id="violence-bloodshed">none</content_attribute>
+        <content_attribute id="violence-sexual">none</content_attribute>
+        <content_attribute id="drugs-alcohol">none</content_attribute>
+        <content_attribute id="drugs-narcotics">none</content_attribute>
+        <content_attribute id="drugs-tobacco">none</content_attribute>
+        <content_attribute id="sex-nudity">none</content_attribute>
+        <content_attribute id="sex-themes">none</content_attribute>
+        <content_attribute id="language-profanity">none</content_attribute>
+        <content_attribute id="language-humor">none</content_attribute>
+        <content_attribute id="language-discrimination">none</content_attribute>
+        <content_attribute id="social-chat">intense</content_attribute>
+        <content_attribute id="social-info">none</content_attribute>
+        <content_attribute id="social-audio">none</content_attribute>
+        <content_attribute id="social-location">none</content_attribute>
+        <content_attribute id="social-contacts">none</content_attribute>
+        <content_attribute id="money-purchasing">none</content_attribute>
+        <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+</component>
+
diff --git a/launcher/client-data/share/icons/hicolor/scalable/apps/com.thebrokenrail.MCPIReborn.png b/launcher/data/com.thebrokenrail.MCPIReborn.png
similarity index 100%
rename from launcher/client-data/share/icons/hicolor/scalable/apps/com.thebrokenrail.MCPIReborn.png
rename to launcher/data/com.thebrokenrail.MCPIReborn.png
diff --git a/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop b/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop
new file mode 100755
index 000000000..623c9cb60
--- /dev/null
+++ b/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Minecraft: Pi Edition: Reborn (Server)
+Comment=Fun with Blocks
+Icon=com.thebrokenrail.MCPIRebornServer
+Exec=/bin/sh -c "cd ~/.minecraft-pi && minecraft-pi-reborn-server"
+Terminal=true
+Type=Application
+Categories=Game;
diff --git a/launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml b/launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml
new file mode 100644
index 000000000..4efe8e8e3
--- /dev/null
+++ b/launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>com.thebrokenrail.MCPIRebornServer</id>
+    <name>Minecraft: Pi Edition: Reborn (Server)</name>
+    <metadata_license>CC0-1.0</metadata_license>
+    <summary>Fun with Blocks</summary>
+    <description><p>Minecraft: Pi Edition Modding Project.</p><p>NOTE: This is not verified by, affiliated with, or supported by Mojang or Microsoft.</p></description>
+    <url type="homepage">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn</url>
+    <launchable type="desktop-id">com.thebrokenrail.MCPIRebornServer.desktop</launchable>
+    <provides>
+        <id>com.thebrokenrail.MCPIRebornServer.desktop</id>
+    </provides>
+    <project_license>LicenseRef-proprietary</project_license>
+    <developer_name>TheBrokenRail &amp; Mojang AB</developer_name>
+    <content_rating type="oars-1.0">
+        <content_attribute id="violence-cartoon">moderate</content_attribute>
+        <content_attribute id="violence-fantasy">none</content_attribute>
+        <content_attribute id="violence-realistic">none</content_attribute>
+        <content_attribute id="violence-bloodshed">none</content_attribute>
+        <content_attribute id="violence-sexual">none</content_attribute>
+        <content_attribute id="drugs-alcohol">none</content_attribute>
+        <content_attribute id="drugs-narcotics">none</content_attribute>
+        <content_attribute id="drugs-tobacco">none</content_attribute>
+        <content_attribute id="sex-nudity">none</content_attribute>
+        <content_attribute id="sex-themes">none</content_attribute>
+        <content_attribute id="language-profanity">none</content_attribute>
+        <content_attribute id="language-humor">none</content_attribute>
+        <content_attribute id="language-discrimination">none</content_attribute>
+        <content_attribute id="social-chat">intense</content_attribute>
+        <content_attribute id="social-info">none</content_attribute>
+        <content_attribute id="social-audio">none</content_attribute>
+        <content_attribute id="social-location">none</content_attribute>
+        <content_attribute id="social-contacts">none</content_attribute>
+        <content_attribute id="money-purchasing">none</content_attribute>
+        <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+</component>
+
diff --git a/scripts/generate-appimage-builder-yaml.js b/scripts/generate-appimage-builder-yaml.js
index e2c1aa8c9..6698214de 100755
--- a/scripts/generate-appimage-builder-yaml.js
+++ b/scripts/generate-appimage-builder-yaml.js
@@ -8,7 +8,7 @@ const mode = process.argv[2];
 const arch = process.argv[3];
 
 // Data
-const id = `com.thebrokenrail.MCPIReborn${mode === 'server' ? 'Server' : ''}`;
+const id = `com.thebrokenrail.MCPIReborn${mode === 'server' ? 'Server' : 'Client'}`;
 const name = `minecraft-pi-reborn-${mode}`;
 const updateURL = `https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/master/lastSuccessfulBuild/artifact/out/${name}-latest-${arch}.AppImage.zsync`;