diff --git a/system/Vanguard.nix b/system/Vanguard.nix
index 3bddeead..a7a01d7f 100644
--- a/system/Vanguard.nix
+++ b/system/Vanguard.nix
@@ -11,6 +11,7 @@
   ];
   stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/onedark.yaml";
   home-manager.users.${username} = {
+    imports = [ ./home/swww/default.nix ];
     home = {
       stateVersion = "23.05";
       packages = with pkgs; [
@@ -64,6 +65,9 @@
           "6, monitor:desc:${primary}"
           "7, monitor:desc:${primary}"
         ];
+        exec-once = [
+          "sleep 2 && systemctl --user start swww-daemon.service && sleep 2 && swww img ${./wallpapers/animated/citadel.gif} && systemctl --user stop hyprpaper.service"
+        ];
       };
   };
   boot = {
diff --git a/system/home/emacs/packages.nix b/system/home/emacs/packages.nix
index ccaa289b..a5874c6d 100644
--- a/system/home/emacs/packages.nix
+++ b/system/home/emacs/packages.nix
@@ -40,7 +40,6 @@ with epkgs;
   magit
   forge
   nix-mode
-  nix-ts-mode
   julia-mode
   julia-ts-mode
   python-docstring
diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix
index 124b9767..d25f467f 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -13,7 +13,6 @@
     ./mako.nix
     ./avizo.nix
     ./wlogout.nix
-    ./swww.nix
   ];
   home.packages = [
     (pkgs.writeShellScriptBin "protonmail-setup-bridge" ''
@@ -26,7 +25,6 @@
   services = {
     kanshi.systemdTarget = "hyprland-session.target";
     gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
-    hyprpaper.enable = lib.mkForce false;
     hypridle = {
       enable = true;
       settings =
@@ -165,7 +163,6 @@
         "systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME"
         "${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}"
         "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"
-        "sleep 2; systemctl --user start swww-daemon.service; sleep 2; systemctl --user start dynamic-wallpaper.service"
         "PASSWORD_STORE_DIR=/dev/null ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n"
         "${pkgs.dex}/bin/dex -a"
       ];
diff --git a/system/home/swww/default.nix b/system/home/swww/default.nix
new file mode 100644
index 00000000..2abbaf60
--- /dev/null
+++ b/system/home/swww/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ swww ];
+  systemd.user.services.swww-daemon = {
+    Unit = {
+      Description = "SWWW Daemon";
+      Wants = [ "graphical-session.target" ];
+      After = [ "graphical-session.target" ];
+    };
+    Service.ExecStart = "${pkgs.swww}/bin/swww-daemon";
+  };
+}
diff --git a/system/home/swww.nix b/system/home/swww/dynamic-wallpaper.nix
similarity index 69%
rename from system/home/swww.nix
rename to system/home/swww/dynamic-wallpaper.nix
index 95b6c45d..560ae7f4 100644
--- a/system/home/swww.nix
+++ b/system/home/swww/dynamic-wallpaper.nix
@@ -24,18 +24,9 @@ let
   '';
 in
 {
-  home.packages = with pkgs; [ swww ];
+  imports = [ ./default.nix ];
   systemd.user = {
-    services = {
-      swww-daemon = {
-        Unit = {
-          Description = "SWWW Daemon";
-          Wants = [ "graphical-session.target" ];
-          After = [ "graphical-session.target" ];
-        };
-        Service.ExecStart = "${pkgs.swww}/bin/swww-daemon";
-      };
-      dynamic-wallpaper = {
+    services.dynamic-wallpaper = {
         Unit = {
           Description = "Change wallpaper based on time of day";
           Wants = [ "swww-daemon.service" ];
@@ -46,13 +37,9 @@ in
           ExecStart = "${dynamicWallpaper}/bin/dynamic-wallpaper";
         };
       };
-    };
-    timers.dynamic-wallpaper = {
-      Install.WantedBy = [ "timers.target" ];
-      Timer = {
-        OnCalendar = "*:0";
-        Unit = "dynamic-wallpaper.service";
-      };
+    timers.dynamic-wallpaper.Timer = {
+      OnCalendar = "*:0";
+      Unit = "dynamic-wallpaper.service";
     };
   };
 }
diff --git a/system/wallpapers/animated/citadel.gif b/system/wallpapers/animated/citadel.gif
new file mode 100644
index 00000000..c0f66de1
Binary files /dev/null and b/system/wallpapers/animated/citadel.gif differ
diff --git a/system/wallpapers/default.jpg b/system/wallpapers/default.jpg
index 871a29af..8f552d2d 100644
Binary files a/system/wallpapers/default.jpg and b/system/wallpapers/default.jpg differ
diff --git a/system/wallpapers/shooting_star.jpg b/system/wallpapers/shooting_star.jpg
new file mode 100644
index 00000000..871a29af
Binary files /dev/null and b/system/wallpapers/shooting_star.jpg differ