diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in
index 6083c1a..fb6f7b1 100644
--- a/io.elementary.Sdk.json.in
+++ b/io.elementary.Sdk.json.in
@@ -3,16 +3,16 @@
     "id": "io.elementary.Sdk",
     "id-platform": "io.elementary.Platform",
     "default-branch": "@branch@",
-    "runtime-version": "49",
-    "runtime": "org.gnome.Platform",
-    "sdk": "org.gnome.Sdk",
+    "runtime-version": "25.08",
+    "runtime": "org.freedesktop.Platform",
+    "sdk": "org.freedesktop.Sdk",
     "sdk-extensions": [
-        "org.gnome.Sdk.Debug",
-        "org.gnome.Sdk.Locale",
-        "org.gnome.Sdk.Docs"
+        "org.freedesktop.Sdk.Debug",
+        "org.freedesktop.Sdk.Locale",
+        "org.freedesktop.Sdk.Docs"
     ],
     "platform-extensions": [
-        "org.gnome.Platform.Locale"
+        "org.freedesktop.Platform.Locale"
     ],
     "inherit-extensions": [
         "org.freedesktop.Platform.GL",
@@ -51,35 +51,39 @@
     },
     "modules": [
         {
-            "name": "icons",
-            "buildsystem": "meson",
+            "name": "vala",
+            "cleanup": [
+                "*"
+            ],
+            "buildsystem": "autotools",
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://github.com/elementary/icons.git",
-                    "tag": "8.2.0",
-                    "commit": "6ddbb535af70a5ceeff5e1fec05d9b0562641b2a",
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/vala/0.56/vala-0.56.18.tar.xz",
+                    "sha256": "f2affe7d40ab63db8e7b9ecc3f6bdc9c2fc7e3134c84ff2d795f482fe926a382",
                     "x-checker-data": {
-                        "type": "git",
-                        "tag-pattern": "^([\\d.]+)$"
+                        "type": "gnome",
+                        "name": "vala"
                     }
                 }
             ],
             "modules": [
                 {
-                    "name": "xcursorgen",
+                    "name": "graphviz",
                     "cleanup": [
-                        "*"
+                        "/include",
+                        "/bin",
+                        "/share/graphviz"
                     ],
                     "sources": [
                         {
                             "type": "archive",
-                            "url": "https://xorg.freedesktop.org/archive/individual/app/xcursorgen-1.0.9.tar.gz",
-                            "sha256": "21082be975472e469dd79d46166cee3720fda80a54382dc8d03fa7a4cd39837a",
+                            "url": "https://gitlab.com/graphviz/graphviz/-/archive/14.1.0/graphviz-14.1.0.tar.gz",
+                            "sha256": "71fc8b295d51847e66844ab41825cfb653ef8b5671b5cd2ab36cd14d28a03cfb",
                             "x-checker-data": {
                                 "type": "anitya",
-                                "project-id": 21210,
-                                "url-template": "https://xorg.freedesktop.org/archive/individual/app/xcursorgen-$version.tar.gz"
+                                "project-id": 1249,
+                                "url-template": "https://gitlab.com/graphviz/graphviz/-/archive/$version/graphviz-$version.tar.gz"
                             }
                         }
                     ]
@@ -87,31 +91,78 @@
             ]
         },
         {
-            "name": "stylesheet",
+            "name": "libgee",
+            "buildsystem": "autotools",
+            "build-options": {
+                "cflags": "-Wno-error=incompatible-pointer-types"
+            },
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/libgee/0.20/libgee-0.20.8.tar.xz",
+                    "sha256": "189815ac143d89867193b0c52b7dc31f3aa108a15f04d6b5dca2b6adfad0b0ee",
+                    "x-checker-data": {
+                        "type": "gnome",
+                        "name": "libgee"
+                    }
+                }
+            ]
+        },
+        {
+            "name": "gtk",
             "buildsystem": "meson",
+            "config-opts": [
+                "-Dintrospection=enabled",
+                "-Dbuild-demos=false",
+                "-Dbuild-testsuite=false",
+                "-Dbuild-examples=false",
+                "-Dbuild-tests=false"
+            ],
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://github.com/elementary/stylesheet.git",
-                    "tag": "8.2.2",
-                    "commit": "9cfb767873d583f6ed29e96cf27728bb69fd9237",
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/gtk/4.20/gtk-4.20.3.tar.xz",
+                    "sha256": "2873f2903088a66c71173ea2ed85ffae266a66b972c3a4842bbb2f6f187ec153",
                     "x-checker-data": {
-                        "type": "git",
-                        "tag-pattern": "^([\\d.]+)$"
+                        "type": "gnome",
+                        "name": "gtk",
+                        "versions": {
+                            "<": "4.21"
+                        }
                     }
                 }
+            ]
+        },
+        {
+            "name": "sassc",
+            "cleanup": [
+                "*"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/sass/sassc.git",
+                    "tag": "3.6.2"
+                },
+                {
+                    "type": "script",
+                    "dest-filename": "autogen.sh",
+                    "commands": [
+                        "autoreconf -si"
+                    ]
+                }
             ],
             "modules": [
                 {
-                    "name": "sassc",
+                    "name": "libsass",
                     "cleanup": [
                         "*"
                     ],
                     "sources": [
                         {
                             "type": "git",
-                            "url": "https://github.com/sass/sassc.git",
-                            "tag": "3.6.2"
+                            "url": "https://github.com/sass/libsass.git",
+                            "tag": "3.6.5"
                         },
                         {
                             "type": "script",
@@ -120,32 +171,84 @@
                                 "autoreconf -si"
                             ]
                         }
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "libadwaita",
+            "buildsystem": "meson",
+            "config-opts": [
+                "-Dtests=false",
+                "-Dexamples=false"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/libadwaita/1.8/libadwaita-1.8.2.tar.xz",
+                    "sha256": "589a6e0f4191740e8690a7d3298e16fa0d4061341b551da7abb2f030b550adb1",
+                    "x-checker-data": {
+                        "type": "gnome",
+                        "name": "libadwaita",
+                        "versions": {
+                            "<": "1.9"
+                        }
+                    }
+                }
+            ]
+        },
+        {
+            "name": "icons",
+            "buildsystem": "meson",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/elementary/icons.git",
+                    "tag": "8.2.0",
+                    "commit": "6ddbb535af70a5ceeff5e1fec05d9b0562641b2a",
+                    "x-checker-data": {
+                        "type": "git",
+                        "tag-pattern": "^([\\d.]+)$"
+                    }
+                }
+            ],
+            "modules": [
+                {
+                    "name": "xcursorgen",
+                    "cleanup": [
+                        "*"
                     ],
-                    "modules": [
+                    "sources": [
                         {
-                            "name": "libsass",
-                            "cleanup": [
-                                "*"
-                            ],
-                            "sources": [
-                                {
-                                    "type": "git",
-                                    "url": "https://github.com/sass/libsass.git",
-                                    "tag": "3.6.5"
-                                },
-                                {
-                                    "type": "script",
-                                    "dest-filename": "autogen.sh",
-                                    "commands": [
-                                        "autoreconf -si"
-                                    ]
-                                }
-                            ]
+                            "type": "archive",
+                            "url": "https://xorg.freedesktop.org/archive/individual/app/xcursorgen-1.0.9.tar.gz",
+                            "sha256": "21082be975472e469dd79d46166cee3720fda80a54382dc8d03fa7a4cd39837a",
+                            "x-checker-data": {
+                                "type": "anitya",
+                                "project-id": 21210,
+                                "url-template": "https://xorg.freedesktop.org/archive/individual/app/xcursorgen-$version.tar.gz"
+                            }
                         }
                     ]
                 }
             ]
         },
+        {
+            "name": "stylesheet",
+            "buildsystem": "meson",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/elementary/stylesheet.git",
+                    "tag": "8.2.2",
+                    "commit": "9cfb767873d583f6ed29e96cf27728bb69fd9237",
+                    "x-checker-data": {
+                        "type": "git",
+                        "tag-pattern": "^([\\d.]+)$"
+                    }
+                }
+            ]
+        },
         {
             "name": "granite",
             "buildsystem": "meson",