diff --git a/src/apps/personal/sway.nix b/src/apps/personal/sway.nix
index 80c077c..db18c77 100644
--- a/src/apps/personal/sway.nix
+++ b/src/apps/personal/sway.nix
@@ -129,7 +129,7 @@
             };
             startup = [
                 { command = "dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK"; }
-                { command = "pkill swaync; ${pkgs-unstable.swaynotificationcenter}/bin/swaync"; always = true; }
+                { command = "pkill swaync; pkill waybar; ${pkgs-unstable.swaynotificationcenter}/bin/swaync && waybar"; always = true; }
                 { command = "pkill glpaper; ${pkgs.glpaper}/bin/glpaper eDP-1 ${./sway/shader.glsl} -F -W 1920 -H 1080"; always = true; }
             ];
             terminal = "kitty";
@@ -211,21 +211,4 @@
             exec systemd-cat -t sway sway
         fi
     '';
-
-    systemd.user.services.avizo = {
-        Install.WantedBy = [ "graphical-session.target" ];
-        Service = {
-            ExecReload = "kill -SIGUSR2 \$MAINPID";
-            ExecStart = "${pkgs.avizo}/bin/avizo-service";
-            KillMode = "mixed";
-            Restart = "on-failure";
-        };
-        Unit = {
-            After = "graphical-session.target";
-            Description = "Notification daemon to show volume & brightness changes";
-            Documentation = "N/A (src/apps/personal/sway.nix)";
-            PartOf= "graphical-session.target";
-        };
-    };
 }
-
diff --git a/src/apps/personal/waybar.nix b/src/apps/personal/waybar.nix
index c3d1f83..c67beea 100644
--- a/src/apps/personal/waybar.nix
+++ b/src/apps/personal/waybar.nix
@@ -164,10 +164,10 @@
             }
         '';
 
-        systemd = {
-            enable = true;
-            # target = "sway-session.target";
-        };
+        # systemd = {
+        #    enable = true;  ## Now started in sway.nix
+        #    # target = "sway-session.target";
+        #};
     };
 
     systemd.user.targets.sway.Unit.Wants = [ "waybar.service" ];