diff --git a/.editorconfig b/.editorconfig
index 3c0aacdf03..393f23da7f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,7 +11,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{sh,rb,js,yml,adoc}]
+[*.{sh,rb,js,yml,yaml,adoc}]
 indent_style = space
 indent_size = 2
 
diff --git a/builds/flatpak/org.easyrpg.player.yml b/builds/flatpak/org.easyrpg.player.yml
index 89028f2e5f..e6d9ea4519 100644
--- a/builds/flatpak/org.easyrpg.player.yml
+++ b/builds/flatpak/org.easyrpg.player.yml
@@ -1,6 +1,6 @@
 app-id: org.easyrpg.player
 runtime: org.freedesktop.Platform
-runtime-version: '23.08'
+runtime-version: '24.08'
 sdk: org.freedesktop.Sdk
 command: easyrpg-player
 rename-desktop-file: easyrpg-player.desktop
@@ -22,7 +22,7 @@ cleanup:
   - /lib/*.so
 modules:
   # external libraries
-  # this is copied from shared-modules to not add the dependency on it
+  # this is adapted from shared-modules to not add the dependency on it
   - name: libfluidsynth
     buildsystem: cmake-ninja
     config-opts:
@@ -30,8 +30,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/FluidSynth/fluidsynth.git
-        tag: v2.3.4
-        commit: 5ecdc4568e45123216c6888892caad07918ef127
+        tag: v2.3.5
+        commit: 619fc5c3380513146cd05e17decf8d747b02bba4
     cleanup:
       - /bin
       - /share
@@ -44,8 +44,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/fmtlib/fmt.git
-        tag: '9.1.0'
-        commit: a33701196adfad74917046096bf5a2aa0ab0bb50
+        tag: 11.1.4
+        commit: 123913715afeb8a437e6388b4473fcc4753e1c9a
   - name: libxmp
     buildsystem: cmake-ninja
     config-opts:
@@ -56,17 +56,45 @@ modules:
     sources:
       - type: git
         url: https://github.com/libxmp/libxmp.git
-        tag: libxmp-4.6.0
-        commit: 8201d26cf933688a8be64292457c429fd8e654ab
+        tag: libxmp-4.6.2
+        commit: 828ef357943e1fbb13910e7a6fca21987c5c5827
   - name: libinih
     buildsystem: meson
     config-opts:
       - --buildtype=debugoptimized
+      - -Ddefault_library=shared
+      - -Ddistro_install=true
+      - -Dwith_INIReader=false
     sources:
       - type: git
         url: https://github.com/benhoyt/inih.git
-        tag: 58
-        commit: 5cc5e2c24642513aaa5b19126aad42d0e4e0923e
+        tag: r60
+        commit: 9de2a5fe4956447a22a324e2efc0648c5aad5285
+  - name: nlohmann_json
+    buildsystem: cmake-ninja
+    builddir: true
+    config-opts:
+      - -DJSON_BuildTests=OFF
+    sources:
+      - type: git
+        url: https://github.com/nlohmann/json.git
+        tag: v3.11.3
+        commit: 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03
+    cleanup:
+      - /share
+  - name: lhasa
+    config-opts:
+      - --enable-shared
+      - --disable-static
+    sources:
+      - type: git
+        url: https://github.com/fragglet/lhasa.git
+        tag: v0.4.0
+        commit: 3b8f502c1480c5d9f2927e95d7e0f022b9cdd0a1
+    cleanup:
+      - /bin
+      - /share/man
+      - /lib/*.la
   # own libraries
   - name: liblcf
     buildsystem: cmake-ninja
@@ -84,6 +112,7 @@ modules:
       - /share
   - name: player
     buildsystem: cmake-ninja
+    builddir: true
     config-opts:
       - -DCMAKE_BUILD_TYPE=RelWithDebInfo
       - -DPLAYER_VERSION_APPEND='(Flatpak)'
diff --git a/builds/snap/snapcraft.yaml b/builds/snap/snapcraft.yaml
index 68b88de53e..ae3c6be648 100644
--- a/builds/snap/snapcraft.yaml
+++ b/builds/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: easyrpg-player
-base: core20
+base: core22
 adopt-info: easyrpg-player
 summary: easyrpg-player
 description: |
@@ -17,7 +17,7 @@ apps:
     plugs:
       - x11
       - wayland
-      - unity7
+      - unity8
       - opengl
       - audio-playback
       - joystick
@@ -35,16 +35,18 @@ layout:
 
 parts:
   liblcf:
-    plugin: autotools
+    plugin: cmake
     source: https://github.com/EasyRPG/liblcf
     source-type: git
     build-environment:
       - CXXFLAGS: "$CXXFLAGS -fuse-ld=gold -flto=$(nproc) -ffunction-sections -fdata-sections"
       - LDFLAGS:  "$LDFLAGS  -fuse-ld=gold -flto=$(nproc) -Wl,--gc-sections"
-    autotools-configure-parameters:
-      - --prefix=/usr
-      - --disable-static
-      - --disable-tools
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DBUILD_SHARED_LIBS=ON
+      - -DLIBLCF_ENABLE_TOOLS=OFF
+      - -DLIBLCF_UPDATE_MIMEDB=OFF
     override-build: |
       git fetch
       snapcraftctl build
@@ -52,20 +54,22 @@ parts:
     build-packages:
       - libexpat1-dev
       - libicu-dev
+      - libinih-dev
       - icu-devtools
     stage-packages:
-      - libicu66
+      - libicu70
 
-  easyrpg-player:   
-    plugin: autotools
+  easyrpg-player:
+    plugin: cmake
     after: [libwildmidi,liblcf,desktop-glib-only]
     source: https://github.com/EasyRPG/Player
     source-type: git
     build-environment:
       - CXXFLAGS: "$CXXFLAGS -fuse-ld=gold -flto=$(nproc) -ffunction-sections -fdata-sections"
       - LDFLAGS:  "$LDFLAGS  -fuse-ld=gold -flto=$(nproc) -Wl,--gc-sections"
-    autotools-configure-parameters:
-      - --prefix=/usr
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
     override-build: |
       last_committed_tag="$(git tag --list | tail -n1)"
       last_released_tag="$(snap info easyrpg-player | awk '$1 == "latest/beta:" { print $2 }')"
@@ -91,7 +95,6 @@ parts:
       - libpng-dev
       - libsndfile1-dev
       - libsdl2-dev
-      - libsdl2-mixer-dev
       - libspeexdsp-dev
       - libvorbis-dev
       - libxmp-dev
@@ -108,7 +111,6 @@ parts:
       - libpixman-1-0
       - libpng16-16
       - libsdl2-2.0-0
-      - libsdl2-mixer-2.0-0
       - libsndfile1
       - libspeexdsp1
       - libvorbis0a
diff --git a/resources/unix/easyrpg-player.metainfo.xml b/resources/unix/easyrpg-player.metainfo.xml
index b65225d452..3d609a75f6 100644
--- a/resources/unix/easyrpg-player.metainfo.xml
+++ b/resources/unix/easyrpg-player.metainfo.xml
@@ -6,7 +6,7 @@
 	<developer_name>EasyRPG Team</developer_name>
 	<update_contact>easyrpg_AT_easyrpg.org</update_contact>
 
-	<!-- Copyright 2022 EasyRPG team -->
+	<!-- Copyright 2022-2025 EasyRPG team -->
 	<metadata_license>FSFAP</metadata_license>
 	<project_license>GPL-3.0-or-later</project_license>
 
@@ -67,6 +67,16 @@
 	</content_rating>
 
 	<releases>
+		<release version="0.8.1" date="2025-04-07">
+			<description>
+				<p>
+					"Stun"
+				</p>
+				<p>
+					https://blog.easyrpg.org/2025/04/easyrpg-player-0-8-1-stun/
+				</p>
+			</description>
+		</release>
 		<release version="0.8" date="2023-04-29">
 			<description>
 				<p>