diff --git a/flatpak/org.gnome.Fractal-release.json b/flatpak/org.gnome.Fractal-release.json
index c2766573..d4228f25 100644
--- a/flatpak/org.gnome.Fractal-release.json
+++ b/flatpak/org.gnome.Fractal-release.json
@@ -1,48 +1,51 @@
 {
-    "app-id" : "org.gnome.Fractal",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "3.36",
-    "sdk" : "org.gnome.Sdk",
-    "sdk-extensions" : [
+    "app-id": "org.gnome.Fractal",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "43",
+    "sdk": "org.gnome.Sdk",
+    "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable"
     ],
-    "command" : "fractal",
-    "finish-args" : [
+    "command": "fractal",
+    "finish-args": [
         "--share=network",
         "--share=ipc",
-        "--socket=x11",
+        "--socket=fallback-x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri",
         "--talk-name=org.freedesktop.secrets",
-        "--talk-name=org.freedesktop.Notifications",
-        "--filesystem=home"
+        "--talk-name=org.freedesktop.Notifications"
     ],
-    "build-options" : {
-        "append-path" : "/usr/lib/sdk/rust-stable/bin",
-        "build-args" : [
+    "build-options": {
+        "append-path": "/usr/lib/sdk/rust-stable/bin",
+        "build-args": [
             "--share=network"
-        ],
-        "env" : {
-            "CARGO_HOME" : "/run/build/Fractal/cargo",
-            "RUST_BACKTRACE" : "1"
-        }
+        ]
     },
     "add-extensions": {
         "org.freedesktop.Platform.ffmpeg-full": {
             "directory": "lib/ffmpeg",
-            "version": "19.08",
+            "version": "22.08",
             "add-ld-path": "."
         }
     },
     "cleanup-commands": [
         "mkdir -p /app/lib/ffmpeg"
     ],
-    "modules" : [
+    "cleanup": [
+        "/include",
+        "/lib/pkgconfig",
+        "/lib/*.la",
+        "/lib/girepository-1.0",
+        "/share/gir-1.0",
+        "/share/vala"
+    ],
+    "modules": [
         {
-            "name" : "libhandy",
-            "buildsystem" : "meson",
-            "config-opts" : [
+            "name": "libhandy",
+            "buildsystem": "meson",
+            "config-opts": [
                 "-Dprofiling=false",
                 "-Dintrospection=enabled",
                 "-Dgtk_doc=false",
@@ -51,21 +54,21 @@
                 "-Dvapi=false",
                 "-Dglade_catalog=disabled"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://source.puri.sm/Librem5/libhandy",
-                    "tag" : "v0.0.13"
+                    "type": "git",
+                    "url": "https://source.puri.sm/Librem5/libhandy",
+                    "tag": "v0.0.13"
                 }
             ]
         },
         {
-            "name" : "gspell",
-            "config-opts" : [
+            "name": "gspell",
+            "config-opts": [
                 "--disable-gtk-doc",
                 "--disable-gtk-doc-html"
             ],
-            "cleanup" : [
+            "cleanup": [
                 "/bin",
                 "/include",
                 "/lib/pkgconfig",
@@ -74,40 +77,39 @@
                 "/share/gtk-doc",
                 "/share/vala"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "archive",
-                    "url" : "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.2.tar.xz",
-                    "sha256" : "bb9195c3a95bacf556d0203e9691f7489e0d3bc5ae1e5a440c89b2f2435d3ed6"
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.4.tar.xz",
+                    "sha256": "cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4"
                 }
             ]
         },
         {
-            "name" : "gst-editing-services",
-            "config-opts" : [
-                "--disable-Werror"
-            ],
-            "sources" : [
+            "name": "gst-editing-services",
+            "buildsystem": "meson",
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/gstreamer/gst-editing-services.git",
-                    "tag" : "1.16.1"
+                    "type": "git",
+                    "url": "https://gitlab.freedesktop.org/gstreamer/gst-editing-services.git",
+                    "tag": "1.18.5",
+                    "commit": "29dcc5c1a54f1fabf470bff15dd92b266c527909"
                 }
             ]
         },
         {
-            "name" : "Fractal",
-            "buildsystem" : "meson",
-            "config-opts" : [
+            "name": "Fractal",
+            "buildsystem": "meson",
+            "config-opts": [
                 "-Dprofile=default"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "git",
-                    "branch" : "release-4.4.0",
-                    "url" : ".."
+                    "type": "git",
+                    "branch": "release-4.4.0",
+                    "url": ".."
                 }
             ]
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/flatpak/org.gnome.Fractal.json b/flatpak/org.gnome.Fractal.json
index c2d68bae..be7b2315 100644
--- a/flatpak/org.gnome.Fractal.json
+++ b/flatpak/org.gnome.Fractal.json
@@ -1,54 +1,48 @@
 {
-    "app-id" : "org.gnome.FractalDevel",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "3.36",
-    "sdk" : "org.gnome.Sdk",
-    "sdk-extensions" : [
+    "app-id": "org.gnome.FractalDevel",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "43",
+    "sdk": "org.gnome.Sdk",
+    "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable"
     ],
-    "command" : "fractal",
-    "tags" : [
+    "command": "fractal",
+    "tags": [
         "devel",
         "development",
         "nightly"
     ],
-    "finish-args" : [
+    "finish-args": [
         "--share=network",
         "--share=ipc",
-        "--socket=x11",
+        "--socket=fallback-x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri",
         "--talk-name=org.freedesktop.secrets",
-        "--talk-name=org.freedesktop.Notifications",
-        "--filesystem=home"
+        "--talk-name=org.freedesktop.Notifications"
     ],
-    "build-options" : {
-        "append-path" : "/usr/lib/sdk/rust-stable/bin",
-        "build-args" : [
+    "build-options": {
+        "append-path": "/usr/lib/sdk/rust-stable/bin",
+        "build-args": [
             "--share=network"
-        ],
-        "env" : {
-            "CARGO_HOME" : "/run/build/Fractal/cargo",
-            "RUST_BACKTRACE" : "1",
-            "RUSTFLAGS" : ""
-        }
+        ]
     },
     "add-extensions": {
         "org.freedesktop.Platform.ffmpeg-full": {
             "directory": "lib/ffmpeg",
-            "version": "19.08",
+            "version": "22.08",
             "add-ld-path": "."
         }
     },
     "cleanup-commands": [
         "mkdir -p /app/lib/ffmpeg"
     ],
-    "modules" : [
+    "modules": [
         {
-            "name" : "libhandy",
-            "buildsystem" : "meson",
-            "config-opts" : [
+            "name": "libhandy",
+            "buildsystem": "meson",
+            "config-opts": [
                 "-Dprofiling=false",
                 "-Dintrospection=enabled",
                 "-Dgtk_doc=false",
@@ -57,21 +51,21 @@
                 "-Dvapi=false",
                 "-Dglade_catalog=disabled"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://source.puri.sm/Librem5/libhandy.git",
-                    "tag" : "v0.0.13"
+                    "type": "git",
+                    "url": "https://source.puri.sm/Librem5/libhandy.git",
+                    "tag": "v0.0.13"
                 }
             ]
         },
         {
-            "name" : "gspell",
-            "config-opts" : [
+            "name": "gspell",
+            "config-opts": [
                 "--disable-gtk-doc",
                 "--disable-gtk-doc-html"
             ],
-            "cleanup" : [
+            "cleanup": [
                 "/bin",
                 "/include",
                 "/lib/pkgconfig",
@@ -79,41 +73,40 @@
                 "/share/gir-1.0",
                 "/share/gtk-doc",
                 "/share/vala"
-             ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.2.tar.xz",
-                    "sha256" : "bb9195c3a95bacf556d0203e9691f7489e0d3bc5ae1e5a440c89b2f2435d3ed6"
-                }
-            ]
-        },
-        {
-            "name" : "gst-editing-services",
-            "config-opts" : [
-                "--disable-Werror"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/gstreamer/gst-editing-services.git",
-                    "tag" : "1.16.1"
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.4.tar.xz",
+                    "sha256": "cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4"
                 }
             ]
         },
         {
-            "name" : "fractal",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
+            "name": "gst-editing-services",
+            "buildsystem": "meson",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.freedesktop.org/gstreamer/gst-editing-services.git",
+                    "tag": "1.18.5",
+                    "commit": "29dcc5c1a54f1fabf470bff15dd92b266c527909"
+                }
+            ]
+        },
+        {
+            "name": "fractal",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
                 "-Dprofile=development"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/fractal.git"
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/fractal.git"
                 }
             ]
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build
index b269e723..ce4fb522 100644
--- a/fractal-gtk/res/meson.build
+++ b/fractal-gtk/res/meson.build
@@ -2,7 +2,7 @@ subdir('icons')
 
 desktop_conf = configuration_data()
 desktop_conf.set('icon', application_id)
-desktop_file = i18n.merge_file ('desktop-file',
+desktop_file = i18n.merge_file (
   type: 'desktop',
   input: configure_file(
     input: files('org.gnome.Fractal.desktop.in.in'),
@@ -28,7 +28,7 @@ endif
 
 metainfo_conf = configuration_data()
 metainfo_conf.set('appid', application_id)
-metainfo_file = i18n.merge_file ('metainfo-file',
+metainfo_file = i18n.merge_file (
   input: configure_file(
     input: files('org.gnome.Fractal.metainfo.xml.in.in'),
     output: 'org.gnome.Fractal.metainfo.xml.in',