diff --git a/desktop/gnome.nix b/desktop/gnome.nix
index 788c2c2..f0b346a 100644
--- a/desktop/gnome.nix
+++ b/desktop/gnome.nix
@@ -5,9 +5,17 @@
     with gnomeExtensions; [
       gnome.dconf-editor
       gnome.gnome-tweaks
-      gnome.gnome-shell-extensions # required for user-theme
+      native-window-placement
       appindicator
-      pop-shell
+      (pop-shell.overrideAttrs (old: rec {
+        version = "unstable-2022-03-25";
+        src = fetchFromGitHub {
+          owner = "pop-os";
+          repo = "shell";
+          rev = "a317816d02dd2cb20d31aeca81bf09eccc63e370";
+          sha256 = "sha256-uxoeCv25ew5+NkTpsKjQqDFrqw6ZA/+iYhyCHoCb6jM=";
+        };
+      }))
     ];
 
   services.xserver.displayManager.gdm.enable = true;
diff --git a/flake.lock b/flake.lock
index db2d7a7..d48d753 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1648283590,
-        "narHash": "sha256-OjoAiY2XWr2ah73rY+kvEYLF+q40S/X61tUC0JPuCKw=",
+        "lastModified": 1648366999,
+        "narHash": "sha256-Sdm0lI2ZBc70EnMMmvfDVY7gIM3M4c2L86EdQ9tKRE4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8afee75d0d1cb054cfeddfdc9f7193adc7741c95",
+        "rev": "888eac32bd657bfe0d024c8770130d80d1c02cd3",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1648069223,
-        "narHash": "sha256-BXzQV8p/RR440EB9qY0ULYfTH0zSW1stjUCYeP4SF+E=",
+        "lastModified": 1648390671,
+        "narHash": "sha256-u69opCeHUx3CsdIerD0wVSR+DjfDQjnztObqfk9Trqc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1d08ea2bd83abef174fb43cbfb8a856b8ef2ce26",
+        "rev": "ce8cbe3c01fd8ee2de526ccd84bbf9b82397a510",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1648289973,
-        "narHash": "sha256-OFLCWNigShbl0mxYeOjiqs8MWH5JGcWm6GGMyvA0OO0=",
+        "lastModified": 1648575985,
+        "narHash": "sha256-p847S32OOIuN62cSd3F+FJvEQtpSTgB1VwwmY8j7CY0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "526d47ce95bd4d5e041a4fd3ffb831183d8654fe",
+        "rev": "94582ade540272b91e4075cd05c100ff44ce8986",
         "type": "github"
       },
       "original": {
diff --git a/home/desktop/gnome.nix b/home/desktop/gnome.nix
index 3056d45..f749328 100644
--- a/home/desktop/gnome.nix
+++ b/home/desktop/gnome.nix
@@ -10,14 +10,12 @@ in {
     "org/gnome/shell" = {
       disable-user-extensions = false;
       enabled-extensions = [
-        "user-theme@gnome-shell-extensions.gcampax.github.com"
         "pop-shell@system76.com"
         "native-window-placement@gnome-shell-extensions.gcampax.github.com" # works better with pop-shell
         "appindicatorsupport@rgcjonas.gmail.com"
       ];
       favorite-apps = [ "org.gnome.Nautilus.desktop" "firefox.desktop" ];
     };
-    "org/gnome/shell/extensions/user-theme" = { name = "Adwaita-dark"; };
     "org/gnome/shell/extensions/pop-shell" = {
       tile-by-default = true;
       snap-to-grid = true;
@@ -25,6 +23,7 @@ in {
       show-title = false;
       active-hint = false;
     };
+    "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; };
     "org/gnome/desktop/sound" = { theme-name = "freedesktop"; };
     "org/gnome/desktop/input-sources" = {
       sources = map mkTuple [ [ "xkb" "gb" ] [ "ibus" "mozc-jp" ] ];
diff --git a/home/desktop/gtk.nix b/home/desktop/gtk.nix
index 642dc52..4a8639b 100644
--- a/home/desktop/gtk.nix
+++ b/home/desktop/gtk.nix
@@ -3,5 +3,6 @@
 {
   gtk.enable = true;
   gtk.theme.name = "Adwaita-dark";
-  gtk.gtk3.extraConfig = { gtk-application-prefer-dark-theme = true; };
+  gtk.gtk3.extraConfig.gtk-application-prefer-dark-theme = true;
+  gtk.gtk4.extraConfig.gtk-application-prefer-dark-theme = true;
 }