diff --git a/desktop/gnome.nix b/desktop/gnome.nix
index dfc1cbb..fc093d9 100644
--- a/desktop/gnome.nix
+++ b/desktop/gnome.nix
@@ -4,13 +4,13 @@ with pkgs;
 let
   pop-shell = stdenv.mkDerivation rec {
     pname = "pop-shell";
-    version = "2021-03-16";
+    version = "2021-05-07";
 
     src = fetchFromGitHub {
       owner = "pop-os";
       repo = "shell";
-      rev = "77650a9aafa2f7adc328424e36dc91705411feb4";
-      sha256 = "0dff8gl83kx2qzzybk9hxbszv9p8qw8j40qirvfbx6mly7sqknng";
+      rev = "9507dc38f75f56e657cf071d5f8dc578c5dc9352";
+      sha256 = "161946y5nk1nlxafhkxyshqn4va10rk911bdbcwxjnak1w7557gm";
     };
 
     nativeBuildInputs = [ glib nodePackages.typescript ];
@@ -28,7 +28,6 @@ in {
       gnome.dconf-editor
       gnome.gnome-tweaks
       gnome.gnome-shell-extensions # required for user-theme
-      dash-to-panel
       appindicator
       pop-shell
     ];
diff --git a/home/desktop/gnome.nix b/home/desktop/gnome.nix
index 2a23d5f..30dfacf 100644
--- a/home/desktop/gnome.nix
+++ b/home/desktop/gnome.nix
@@ -12,12 +12,11 @@ in {
         "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
-        "dash-to-panel@jderose9.github.com"
         "appindicatorsupport@rgcjonas.gmail.com"
       ];
       favorite-apps = [ "org.gnome.Nautilus.desktop" "firefox.desktop" ];
     };
-    "org/gnome/shell/extensions/user-theme" = { name = "Pop-dark"; };
+    "org/gnome/shell/extensions/user-theme" = { name = "Adwaita-dark"; };
     "org/gnome/shell/extensions/pop-shell" = {
       tile-by-default = true;
       snap-to-grid = true;
@@ -25,11 +24,7 @@ in {
       show-title = false;
       active-hint = false;
     };
-    "org/gnome/shell/extensions/dash-to-panel" = {
-      appicon-padding = 4;
-      panel-size = 36;
-    };
-    "org/gnome/desktop/sound" = { theme-name = "Pop"; };
+    "org/gnome/desktop/sound" = { theme-name = "freedesktop"; };
     "org/gnome/desktop/input-sources" = {
       sources = map mkTuple [ [ "xkb" "gb" ] [ "ibus" "mozc-jp" ] ];
       xkb-options = [ "compose:ralt" ];
diff --git a/home/desktop/gtk.nix b/home/desktop/gtk.nix
index d3191ef..642dc52 100644
--- a/home/desktop/gtk.nix
+++ b/home/desktop/gtk.nix
@@ -1,18 +1,7 @@
 { config, pkgs, ... }:
 
-let
-  pop-gtk-theme = pkgs.pop-gtk-theme.overrideAttrs (oldAttrs: rec {
-    postInstall = ''
-      # fix dark gnome-shell theme
-      ln -s $out/share/gnome-shell/theme/Pop-dark $out/share/themes/Pop-dark/gnome-shell
-    '';
-  });
-in
 {
   gtk.enable = true;
-  gtk.theme.name = "Pop-dark";
-  gtk.theme.package = pop-gtk-theme;
-  gtk.gtk3.extraConfig = {
-    gtk-application-prefer-dark-theme = true;
-  };
+  gtk.theme.name = "Adwaita-dark";
+  gtk.gtk3.extraConfig = { gtk-application-prefer-dark-theme = true; };
 }