diff --git a/modules/desktop/themes/layan/layan.nix b/modules/desktop/themes/layan/layan.nix
index d4a972f..bfb3fcb 100644
--- a/modules/desktop/themes/layan/layan.nix
+++ b/modules/desktop/themes/layan/layan.nix
@@ -30,13 +30,15 @@
       pkgs.tela-circle-icon-theme
     ];
 
-    qt.enable = false;
+    qt.enable = true;
     qt.style.name = "kvantum";
     qt.style.package = pkgs.kdePackages.qtstyleplugin-kvantum;
     qt.platformTheme.name = "gtk";
+    home.sessionVariables = {
+      QT_STYLE_OVERRIDE = "kvantum";
+    };
     systemd.user.settings.Manager.DefaultEnvironment = lib.mapAttrs (_: lib.mkDefault) {
       QT_STYLE_OVERRIDE = "kvantum";
-      QT_QPA_PLATFORMTHEME = "gtk";
     };
     xdg.configFile."Kvantum/kvantum.kvconfig".text = lib.generators.toINI {} {
       General.theme = "LayanDark";
diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix
index 367da48..3d7db92 100644
--- a/modules/desktop/waybar.nix
+++ b/modules/desktop/waybar.nix
@@ -1,10 +1,5 @@
 {
-  flake.homeModules.waybar = {
-    config,
-    lib,
-    pkgs,
-    ...
-  }: {
+  flake.homeModules.waybar = {pkgs, ...}: {
     programs.waybar.enable = true;
     programs.waybar.systemd.enable = true;
 
@@ -12,14 +7,6 @@
     services.network-manager-applet.enable = true;
     services.pasystray.enable = true;
 
-    # is already fixed on latest home-manager rev
-    systemd.user.services = {
-      blueman-applet.Unit.After = lib.mkForce ["graphical-session.target"];
-      network-manager-applet.Unit.After = lib.mkForce ["graphical-session.target"];
-      pasystray.Unit.After = lib.mkForce ["graphical-session.target"];
-      waybar.Unit.After = lib.mkForce ["graphical-session.target"];
-    };
-
     home.packages = with pkgs; [
       pulsemixer
       pavucontrol