diff --git a/Cargo.lock b/Cargo.lock
index 92d1d403..421d389f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -64,7 +64,7 @@ source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e7
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps",
+ "system-deps 2.0.3",
 ]
 
 [[package]]
@@ -124,6 +124,7 @@ dependencies = [
  "gettext-rs",
  "gtk-macros",
  "gtk4",
+ "libadwaita",
  "log",
  "once_cell",
  "pretty_env_logger",
@@ -224,13 +225,13 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 2.0.3",
 ]
 
 [[package]]
 name = "gdk4"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs?rev=abea0c9980bc083494eceb30dfab5eeb99a73118#abea0c9980bc083494eceb30dfab5eeb99a73118"
+source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -245,7 +246,7 @@ dependencies = [
 [[package]]
 name = "gdk4-sys"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs?rev=abea0c9980bc083494eceb30dfab5eeb99a73118#abea0c9980bc083494eceb30dfab5eeb99a73118"
+source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -254,7 +255,7 @@ dependencies = [
  "gobject-sys",
  "libc",
  "pango-sys",
- "system-deps",
+ "system-deps 3.0.0",
 ]
 
 [[package]]
@@ -300,7 +301,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 2.0.3",
  "winapi",
 ]
 
@@ -342,7 +343,7 @@ version = "0.13.0"
 source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad"
 dependencies = [
  "libc",
- "system-deps",
+ "system-deps 2.0.3",
 ]
 
 [[package]]
@@ -352,7 +353,7 @@ source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e7
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps",
+ "system-deps 2.0.3",
 ]
 
 [[package]]
@@ -373,13 +374,13 @@ dependencies = [
  "glib-sys",
  "libc",
  "pkg-config",
- "system-deps",
+ "system-deps 2.0.3",
 ]
 
 [[package]]
 name = "gsk4"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs?rev=abea0c9980bc083494eceb30dfab5eeb99a73118#abea0c9980bc083494eceb30dfab5eeb99a73118"
+source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -394,7 +395,7 @@ dependencies = [
 [[package]]
 name = "gsk4-sys"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs?rev=abea0c9980bc083494eceb30dfab5eeb99a73118#abea0c9980bc083494eceb30dfab5eeb99a73118"
+source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269"
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
@@ -403,7 +404,7 @@ dependencies = [
  "graphene-sys",
  "libc",
  "pango-sys",
- "system-deps",
+ "system-deps 3.0.0",
 ]
 
 [[package]]
@@ -415,7 +416,7 @@ checksum = "1874c48e670519ce192093ac906c08a6dde7cb2d18b28722ef237726a39c3a63"
 [[package]]
 name = "gtk4"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs?rev=abea0c9980bc083494eceb30dfab5eeb99a73118#abea0c9980bc083494eceb30dfab5eeb99a73118"
+source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -437,11 +438,11 @@ dependencies = [
 [[package]]
 name = "gtk4-macros"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs?rev=abea0c9980bc083494eceb30dfab5eeb99a73118#abea0c9980bc083494eceb30dfab5eeb99a73118"
+source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269"
 dependencies = [
  "anyhow",
  "heck",
- "itertools",
+ "itertools 0.9.0",
  "proc-macro-crate",
  "proc-macro-error",
  "proc-macro2",
@@ -452,7 +453,7 @@ dependencies = [
 [[package]]
 name = "gtk4-sys"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs?rev=abea0c9980bc083494eceb30dfab5eeb99a73118#abea0c9980bc083494eceb30dfab5eeb99a73118"
+source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -464,7 +465,7 @@ dependencies = [
  "gsk4-sys",
  "libc",
  "pango-sys",
- "system-deps",
+ "system-deps 3.0.0",
 ]
 
 [[package]]
@@ -503,12 +504,54 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
+[[package]]
+name = "libadwaita"
+version = "0.1.0"
+source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#771704c112d67c705c0769b53888e814aed7a4d9"
+dependencies = [
+ "bitflags",
+ "gdk-pixbuf",
+ "gdk4",
+ "gio",
+ "glib",
+ "gtk4",
+ "lazy_static",
+ "libadwaita-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "libadwaita-sys"
+version = "0.1.0"
+source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#771704c112d67c705c0769b53888e814aed7a4d9"
+dependencies = [
+ "gdk-pixbuf-sys",
+ "gdk4-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "gtk4-sys",
+ "libc",
+ "pango-sys",
+ "system-deps 2.0.3",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.85"
@@ -616,7 +659,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 2.0.3",
 ]
 
 [[package]]
@@ -808,6 +851,23 @@ dependencies = [
  "version-compare",
 ]
 
+[[package]]
+name = "system-deps"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14bd4dc3cd87e19c51f550d1b421c628074b3cf4c6daebc7ccbc8a03b237c751"
+dependencies = [
+ "anyhow",
+ "heck",
+ "itertools 0.10.0",
+ "pkg-config",
+ "strum",
+ "strum_macros",
+ "thiserror",
+ "toml",
+ "version-compare",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.2"
diff --git a/Cargo.toml b/Cargo.toml
index 5b68a06d..3e207658 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,4 +14,9 @@ once_cell = "1.5"
 [dependencies.gtk]
 package = "gtk4"
 git = "https://github.com/gtk-rs/gtk4-rs"
-rev = "abea0c9980bc083494eceb30dfab5eeb99a73118"
+# We need to use the same version as libadwaita does
+#rev = "abea0c9980bc083494eceb30dfab5eeb99a73118"
+
+[dependencies.libadwaita]
+package = "libadwaita"
+git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git"
diff --git a/build-aux/org.gnome.FractalNext.Devel.json b/build-aux/org.gnome.FractalNext.Devel.json
index c5bcf485..2ce2d156 100644
--- a/build-aux/org.gnome.FractalNext.Devel.json
+++ b/build-aux/org.gnome.FractalNext.Devel.json
@@ -88,6 +88,22 @@
                 }
             ]
         },
+        {
+            "name": "libadwaita",
+            "buildsystem": "meson",
+            "config-opts": [
+                "-Dlibadwaita:tests=false",
+                "-Dlibadwaita:examples=false",
+                "-Dlibadwaita:vapi=false"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/exalm/libadwaita.git",
+                    "branch": "main"
+                }
+            ]
+        },
         {
             "name": "fractal",
             "buildsystem": "meson",