diff --git a/modules/desktop/sway.nix b/modules/desktop/sway.nix
index efea45e..ad2db90 100644
--- a/modules/desktop/sway.nix
+++ b/modules/desktop/sway.nix
@@ -7,6 +7,7 @@
     {
       programs.wshowkeys.enable = true;
       programs.sway.enable = true;
+      programs.dconf.enable = true;
       services.dbus.packages = with pkgs; [ dconf ];
       xdg.portal = {
         enable = true;
@@ -73,8 +74,8 @@
         enable = true;
         xwayland = true;
         wrapperFeatures = {
-          base = false;
-          gtk = false;
+          base = true;
+          gtk = true;
         };
         extraConfig = ''workspace 1'';
         config =
diff --git a/users/catvayor.nix b/users/catvayor.nix
index 93e61d1..4f641b3 100644
--- a/users/catvayor.nix
+++ b/users/catvayor.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   lib,
   mods,
@@ -24,7 +23,6 @@
     ];
   };
 
-  nixpkgs.config.pulseaudio = true;
   services.gvfs.enable = true;
   programs.thunar.enable = true;
   programs.thunar.plugins = with pkgs.xfce; [
@@ -83,7 +81,19 @@
     gtk = {
       enable = true;
       theme = {
-        package = pkgs.arc-theme;
+        package = pkgs.arc-theme.overrideAttrs (o: {
+          postInstall =
+            (o.postInstall or "")
+            + ''
+              pushd $out/share/themes/Arc-Dark/gtk-4.0/
+              . <(gresource list gtk.gresource |\
+                  sed 's/^\(.*\/arc-theme\/\)\(.*\)$/mkdir -p $(dirname ".\/\2");\
+                      gresource extract gtk.gresource \"\1\2\" > \2/')
+              substituteInPlace gtk.css\
+                  --replace-fail 'resource:///org/gnome/arc-theme' "file://$(realpath .)"
+              popd
+            '';
+        });
         name = "Arc-Dark";
       };
       iconTheme = {