diff --git a/config/desktop.nix b/config/desktop.nix
index 36347639..d38ec9b1 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -115,7 +115,7 @@ in {
     enabled = "ibus";
     ibus.engines = with pkgs.ibus-engines; [anthy];
   };
-  services.polkit.enable = true;
+  security.polkit.enable = true;
   security.pam.services.kwallet = {
     name = "kwallet";
     enableKwallet = true;
diff --git a/config/programs/sway.nix b/config/programs/sway.nix
index 68f8b63f..99d5c987 100644
--- a/config/programs/sway.nix
+++ b/config/programs/sway.nix
@@ -158,7 +158,6 @@ in {
     extraConfig = ''
       exec ${configure-gtk}/bin/configure-gtk
       exec ${pkgs.systemd}/bin/systemctl --user import-environment
-      exec ${start-extra-services}/bin/start-extra-services
     '';
   };
 
diff --git a/config/programs/swayidle.nix b/config/programs/swayidle.nix
index 7a97a278..b7a69e8e 100644
--- a/config/programs/swayidle.nix
+++ b/config/programs/swayidle.nix
@@ -41,7 +41,7 @@ in {
       {
         timeout = 305;
         command = "${screen-off-script}";
-        resume = "${resume-script}";
+        resumeCommand = "${resume-script}";
       }
       {
         timeout = 900;
diff --git a/config/programs/theming.nix b/config/programs/theming.nix
index a00a5928..6f819cb9 100644
--- a/config/programs/theming.nix
+++ b/config/programs/theming.nix
@@ -1,7 +1,7 @@
-{pkgs, ...}: let
+{pkgs, config, ...}: let
   theme = import ../../extra/theme.nix;
   inherit (config.lib.formats.rasi) mkLiteral;
-  rasiColor = c: mkLiteral (cssColor c);
+  rasiColor = c: mkLiteral (theme.cssColor c);
 in {
   gtk = {
     enable = true;
@@ -216,14 +216,12 @@ in {
       width = 600;
     };
     element-text = element;
-    element-icon = element;
-    mode-switcher = element;
     window = {
       height = mkLiteral "360px";
       border = mkLiteral "3px";
       border-color = mkLiteral "@border-col";
       background-color = mkLiteral "@bg-col";
-      opacity = 0.9;
+      opacity = mkLiteral "0.9";
     };
     mainbox = {
       background-color = mkLiteral "@bg-col";
@@ -269,7 +267,7 @@ in {
       text-color = mkLiteral "@fg-col";
     };
 
-    element-icon = {
+    element-icon = element // {
       size = mkLiteral "25px";
     };
 
@@ -278,7 +276,7 @@ in {
       text-color = mkLiteral "@fg-col2";
     };
 
-    mode-switcher = {
+    mode-switcher = element // {
       spacing = 0;
     };
 
@@ -286,8 +284,8 @@ in {
       padding = mkLiteral "10px";
       background-color = mkLiteral "@bg-col-light";
       text-color = mkLiteral "@grey";
-      vertical-align = 0.5;
-      horizontal-align = 0.5;
+      vertical-align = mkLiteral "0.5";
+      horizontal-align = mkLiteral "0.5";
     };
 
     "button selected" = {
diff --git a/config/programs/waybar.nix b/config/programs/waybar.nix
index 97c2b811..411546d3 100644
--- a/config/programs/waybar.nix
+++ b/config/programs/waybar.nix
@@ -60,11 +60,11 @@
           };
           tooltip-format = "MPD (connected)";
           tooltip-format-disconnected = "MPD (disconnected)";
-          on-click = "${pkgs.mpc}/bin/mpc toggle";
+          on-click = "${pkgs.mpc-cli}/bin/mpc toggle";
           on-click-middle = "${pkgs.foot}/bin/foot ${pkgs.ncmpcpp}/bin/ncmpcpp";
-          on-click-right = "${pkgs.mpc}/bin/mpc stop";
-          on-scroll-up = "${pkgs.mpc}/bin/seekthrough +00:00:10";
-          on-scroll-down = "${pkgs.mpc}/bin/seekthrough -00:00:10";
+          on-click-right = "${pkgs.mpc-cli}/bin/mpc stop";
+          on-scroll-up = "${pkgs.mpc-cli}/bin/mpc seekthrough +00:00:10";
+          on-scroll-down = "${pkgs.mpc-cli}/bin/mpc seekthrough -00:00:10";
         };
         idle_inhibitor = {
           format = "{icon}";