diff --git a/.editorconfig b/.editorconfig
index 3d7d00f2efa..2add8436ccd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -37,6 +37,9 @@ end_of_line = lf
 [*.sh]
 end_of_line = lf
 
+[*.xml]
+end_of_line = lf
+
 [.clang-format]
 end_of_line = lf
 
diff --git a/Packaging/nix/devilutionx.metainfo.xml b/Packaging/nix/devilutionx.metainfo.xml
index ca8341011ca..cc92b1d7b45 100644
--- a/Packaging/nix/devilutionx.metainfo.xml
+++ b/Packaging/nix/devilutionx.metainfo.xml
@@ -1,127 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-	<id>org.diasurgical.DevilutionX</id>
-
-	<name>DevilutionX</name>
-	<summary>Diablo/Hellfire source port for modern operating systems</summary>
-
-	<metadata_license>CC-BY-SA-4.0</metadata_license>
-	<project_license>LicenseRef-proprietary</project_license>
-
-	<url type="homepage">https://github.com/diasurgical/devilutionX</url>
-	<url type="bugtracker">https://github.com/diasurgical/devilutionX/issues</url>
-	<url type="contact">https://discord.gg/devilutionx</url>
-	<url type="vcs-browser">https://github.com/diasurgical/devilutionX</url>
-
-	<content_rating type="oars-1.1">
-		<content_attribute id="violence-fantasy">moderate</content_attribute>
-		<content_attribute id="drugs-alcohol">moderate</content_attribute>
-		<content_attribute id="sex-nudity">moderate</content_attribute>
-		<content_attribute id="sex-themes">moderate</content_attribute>
-		<content_attribute id="language-profanity">mild</content_attribute>
-		<content_attribute id="language-humor">mild</content_attribute>
-		<content_attribute id="social-chat">intense</content_attribute>
-	</content_rating>
-
-	<categories>
-		<category>Game</category>
-		<category>ActionGame</category>
-		<category>RolePlaying</category>
-	</categories>
-
-	<supports>
-		<control>pointing</control>
-		<control>keyboard</control>
-		<control>touch</control>
-		<control>gamepad</control>
-	</supports>
-
-	<description>
-		<p>
-      DevilutionX is a source port of Diablo and Hellfire that strives to make it simple to run the game while providing engine improvements, bugfixes, and some optional quality of life features. This includes support for modern operating systems and higher resolutions, controller and touch control support, translations, stash, optional experience and enemy health bars, etc.
-		</p>
-		<p>
-      Note: DevilutionX requires data files from original Diablo/Hellfire. By default, a demo version of Diablo is installed.
-		</p>
-		<p>
-	  To install the full version of Diablo, copy DIABDAT.MPQ from the CD or GOG-installation (or extract it from the GoG installer) to ~/.var/app/org.diasurgical.DevilutionX/data/diasurgical/devilution.
-		</p>
-		<p>
-	  To run the Diablo: Hellfire expansion you will need to also copy hellfire.mpq, hfmonk.mpq, hfmusic.mpq, hfvoice.mpq.
-		</p>
-	</description>
-
-	<launchable type="desktop-id">devilutionx.desktop</launchable>
-	<screenshots>
-		<screenshot type="default">
-			<image>https://raw.githubusercontent.com/flathub/org.diasurgical.DevilutionX/master/screens/screen1.png</image>
-		</screenshot>
-		<screenshot>
-			<image>https://raw.githubusercontent.com/flathub/org.diasurgical.DevilutionX/master/screens/screen2.png</image>
-		</screenshot>
-		<screenshot>
-			<image>https://raw.githubusercontent.com/flathub/org.diasurgical.DevilutionX/master/screens/screen3.png</image>
-		</screenshot>
-	</screenshots>
-	<releases>
-		<release version="1.5.2" date="2024-02-04">
-			<description>
-				<p>This release includes the following updates:</p>
-				<ul>
-					<li>Fix issues with joining games due to invalid player data</li>
-					<li>Improve rendering of Chinese/Japanese/Korean texts</li>
-					<li>Fix Hellfire items not saving their identified state</li>
-					<li>Fix stash corrupting when converting a hero between Diablo and Hellfire</li>
-				</ul>
-				<p>Please visit the full changelog for more detailed notes</p>
-			</description>
-			<url>https://github.com/diasurgical/devilutionX/releases/tag/1.5.2</url>
-		</release>
-		<release version="1.5.1" date="2023-09-02">
-			<description>
-				<p>This is a primarily bugfix release, which includes the following updates:</p>
-				<ul>
-					<li>Resolve various gameplay and graphical issues</li>
-					<li>Revamped settings menu for better organization</li>
-					<li>Rectification of crashes identified in version 1.5.0</li>
-					<li>Reduced RAM usage for improved performance</li>
-					<li>Updates to PVP arenas</li>
-					<li>Increased reliability in multiplayer functionality</li>
-					<li>Improved translations</li>
-					<li>Fixed gameplay recording playback issues</li>
-				</ul>
-				<p>Please visit the full changelog for more detailed notes</p>
-			</description>
-			<url>https://github.com/diasurgical/devilutionX/releases/tag/1.5.1</url>
-		</release>
-		<release version="1.5.0" date="2023-06-13">
-			<description>
-				<p>This release includes a lot of features, such as:</p>
-				<ul>
-					<li>All quests are playable in multiplayer</li>
-					<li>PVP arenas</li>
-					<li>Controller button remapping</li>
-					<li>Tons of bugfixes, including for original Diablo/Hellfire</li>
-				</ul>
-				<p>And a lot more! Please visit the link for detailed notes.</p>
-			</description>
-			<url>https://github.com/diasurgical/devilutionX/releases/tag/1.5.0</url>
-		</release>
-		<release version="1.4.1" date="2022-07-25"/>
-		<release version="1.4.0" date="2022-04-14"/>
-		<release version="1.3.0" date="2021-11-02"/>
-		<release version="1.2.1" date="2021-04-13"/>
-		<release version="1.2.0" date="2021-04-06"/>
-		<release version="1.1.0" date="2020-10-11"/>
-		<release version="1.0.3" date="2020-10-11"/>
-		<release version="1.0.2" date="2020-10-10"/>
-		<release version="1.0.1" date="2020-03-09"/>
-		<release version="1.0.0" date="2019-12-31"/>
-		<release version="0.5.0" date="2019-10-10"/>
-		<release version="0.4.0" date="2019-03-20"/>
-		<release version="0.3.1" date="2019-03-20"/>
-		<release version="0.3.0" date="2019-03-20"/>
-		<release version="0.2.0" date="2019-03-17"/>
-		<release version="0.1.0" date="2019-02-27"/>
-	</releases>
-</component>
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+	<id>org.diasurgical.DevilutionX</id>
+
+	<developer id="org.diasurgical">
+		<name>Diasurgical team</name>
+	</developer>
+
+	<name>DevilutionX</name>
+	<summary>Diablo/Hellfire source port</summary>
+
+	<metadata_license>CC-BY-SA-4.0</metadata_license>
+	<project_license>LicenseRef-proprietary</project_license>
+
+	<url type="homepage">https://github.com/diasurgical/devilutionX</url>
+	<url type="bugtracker">https://github.com/diasurgical/devilutionX/issues</url>
+	<url type="contact">https://discord.gg/devilutionx</url>
+	<url type="vcs-browser">https://github.com/diasurgical/devilutionX</url>
+
+	<content_rating type="oars-1.1">
+		<content_attribute id="violence-fantasy">moderate</content_attribute>
+		<content_attribute id="drugs-alcohol">moderate</content_attribute>
+		<content_attribute id="sex-nudity">moderate</content_attribute>
+		<content_attribute id="sex-themes">moderate</content_attribute>
+		<content_attribute id="language-profanity">mild</content_attribute>
+		<content_attribute id="language-humor">mild</content_attribute>
+		<content_attribute id="social-chat">intense</content_attribute>
+	</content_rating>
+
+	<categories>
+		<category>Game</category>
+		<category>ActionGame</category>
+		<category>RolePlaying</category>
+	</categories>
+
+	<supports>
+		<control>pointing</control>
+		<control>keyboard</control>
+		<control>touch</control>
+		<control>gamepad</control>
+	</supports>
+
+	<description>
+		<p>
+      DevilutionX is a source port of Diablo and Hellfire that strives to make it simple to run the game while providing engine improvements, bugfixes, and some optional quality of life features. This includes support for modern operating systems and higher resolutions, controller and touch control support, translations, stash, optional experience and enemy health bars, etc.
+		</p>
+		<p>
+      Note: DevilutionX requires data files from original Diablo/Hellfire. By default, a demo version of Diablo is installed.
+		</p>
+		<p>
+	  To install the full version of Diablo, copy DIABDAT.MPQ from the CD or GOG-installation (or extract it from the GoG installer) to ~/.var/app/org.diasurgical.DevilutionX/data/diasurgical/devilution.
+		</p>
+		<p>
+	  To run the Diablo: Hellfire expansion you will need to also copy hellfire.mpq, hfmonk.mpq, hfmusic.mpq, hfvoice.mpq.
+		</p>
+	</description>
+
+	<launchable type="desktop-id">devilutionx.desktop</launchable>
+	<screenshots>
+		<screenshot type="default">
+			<image>https://raw.githubusercontent.com/flathub/org.diasurgical.DevilutionX/master/screens/screen1.png</image>
+			<caption>Diablo gameplay in widescreen</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://raw.githubusercontent.com/flathub/org.diasurgical.DevilutionX/master/screens/screen2.png</image>
+			<caption>Diablo gameplay with enemy health bar and XP bar</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://raw.githubusercontent.com/flathub/org.diasurgical.DevilutionX/master/screens/screen3.png</image>
+			<caption>Diablo gameplay on Android mobile device</caption>
+		</screenshot>
+	</screenshots>
+	<releases>
+		<release version="1.5.2" date="2024-02-04">
+			<description>
+				<p>This release includes the following updates:</p>
+				<ul>
+					<li>Fix issues with joining games due to invalid player data</li>
+					<li>Improve rendering of Chinese/Japanese/Korean texts</li>
+					<li>Fix Hellfire items not saving their identified state</li>
+					<li>Fix stash corrupting when converting a hero between Diablo and Hellfire</li>
+				</ul>
+				<p>Please visit the full changelog for more detailed notes</p>
+			</description>
+			<url>https://github.com/diasurgical/devilutionX/releases/tag/1.5.2</url>
+		</release>
+		<release version="1.5.1" date="2023-09-02">
+			<description>
+				<p>This is a primarily bugfix release, which includes the following updates:</p>
+				<ul>
+					<li>Resolve various gameplay and graphical issues</li>
+					<li>Revamped settings menu for better organization</li>
+					<li>Rectification of crashes identified in version 1.5.0</li>
+					<li>Reduced RAM usage for improved performance</li>
+					<li>Updates to PVP arenas</li>
+					<li>Increased reliability in multiplayer functionality</li>
+					<li>Improved translations</li>
+					<li>Fixed gameplay recording playback issues</li>
+				</ul>
+				<p>Please visit the full changelog for more detailed notes</p>
+			</description>
+			<url>https://github.com/diasurgical/devilutionX/releases/tag/1.5.1</url>
+		</release>
+		<release version="1.5.0" date="2023-06-13">
+			<description>
+				<p>This release includes a lot of features, such as:</p>
+				<ul>
+					<li>All quests are playable in multiplayer</li>
+					<li>PVP arenas</li>
+					<li>Controller button remapping</li>
+					<li>Tons of bugfixes, including for original Diablo/Hellfire</li>
+				</ul>
+				<p>And a lot more! Please visit the link for detailed notes.</p>
+			</description>
+			<url>https://github.com/diasurgical/devilutionX/releases/tag/1.5.0</url>
+		</release>
+		<release version="1.4.1" date="2022-07-25"/>
+		<release version="1.4.0" date="2022-04-14"/>
+		<release version="1.3.0" date="2021-11-02"/>
+		<release version="1.2.1" date="2021-04-13"/>
+		<release version="1.2.0" date="2021-04-06"/>
+		<release version="1.1.0" date="2020-10-11"/>
+		<release version="1.0.3" date="2020-10-11"/>
+		<release version="1.0.2" date="2020-10-10"/>
+		<release version="1.0.1" date="2020-03-09"/>
+		<release version="1.0.0" date="2019-12-31"/>
+		<release version="0.5.0" date="2019-10-10"/>
+		<release version="0.4.0" date="2019-03-20"/>
+		<release version="0.3.1" date="2019-03-20"/>
+		<release version="0.3.0" date="2019-03-20"/>
+		<release version="0.2.0" date="2019-03-17"/>
+		<release version="0.1.0" date="2019-02-27"/>
+	</releases>
+</component>