diff --git a/home/modules/theme.nix b/home/modules/theme.nix
index 8e18337..30504b9 100644
--- a/home/modules/theme.nix
+++ b/home/modules/theme.nix
@@ -80,6 +80,7 @@ in
 
     gtk = lib.mkIf hostConfig.isLinux {
       enable = true;
+      gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
       font = {
         name = "SF Pro Display";
         size = 11;
diff --git a/home/modules/ui.nix b/home/modules/ui.nix
index 229b870..7459120 100644
--- a/home/modules/ui.nix
+++ b/home/modules/ui.nix
@@ -37,9 +37,12 @@ let
   '';
 in
 {
-  home.sessionVariables = {
-    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-  };
+  home.sessionVariables = lib.mkMerge [
+    { QT_AUTO_SCREEN_SCALE_FACTOR = "1"; }
+    (lib.mkIf config.gtk.enable {
+      GTK_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+    })
+  ];
 
   dconf = {
     enable = true;
@@ -69,6 +72,11 @@ in
 
   programs.waybar = {
     enable = true;
+    package = pkgs.waybar.overrideAttrs (old: {
+      postInstall = (old.postInstall or "") + ''
+        rm -rf $out/share/systemd
+      '';
+    });
     settings.mainBar = {
       reload_style_on_change = true;
       layer = "top";