diff --git a/modules/features/sddm.nix b/modules/features/sddm.nix
new file mode 100644
index 0000000..7321071
--- /dev/null
+++ b/modules/features/sddm.nix
@@ -0,0 +1,47 @@
+{
+  flake.nixosModules.sddm = { pkgs, ... }: 
+  let
+    custom-sddm-astronaut = pkgs.sddm-astronaut.override {
+      embeddedTheme= "pixel_sakura";
+    };
+
+    westonIni = pkgs.writeText "weston.ini" ''
+      [output]
+      name=DP-2
+      mode=2560x1440@144
+
+      [output]
+      name=DP-1
+      mode=off
+
+      [output]
+      name=HDMI-A-1
+      mode=off
+    '';
+  in
+  {
+    services.displayManager.sddm = {
+      enable = true;
+      wayland.enable = true;
+      package = pkgs.kdePackages.sddm; # Enforce qt6
+
+      theme = "sddm-astronaut-theme";
+      extraPackages = with pkgs; [
+        custom-sddm-astronaut
+	kdePackages.qtsvg
+	kdePackages.qtmultimedia
+	kdePackages.qtvirtualkeyboard
+      ];
+
+      settings = {
+        Wayland = {
+          CompositorCommand = "${pkgs.weston}/bin/weston --shell=kiosk --config=${westonIni}";
+	};
+      };
+    };
+
+    environment.systemPackages = with pkgs; [
+      custom-sddm-astronaut
+    ];
+  };
+}
diff --git a/modules/features/tiling/gdm.nix b/modules/features/tiling/gdm.nix
deleted file mode 100644
index f8e6f44..0000000
--- a/modules/features/tiling/gdm.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  flake.nixosModules.gdm = {
-    services.displayManager.gdm = {
-      enable = true;
-    };
-  };
-}
diff --git a/modules/features/tiling/niri.nix b/modules/features/tiling/niri.nix
index 3d7194c..6ddb5f8 100644
--- a/modules/features/tiling/niri.nix
+++ b/modules/features/tiling/niri.nix
@@ -8,6 +8,9 @@
         spawn-sh-at-startup = [
           "ckb-next -b"
 	  (lib.getExe self'.packages.myNoctalia)
+
+	  # Wallpapers
+	  "${pkgs.mpvpaper}/bin/mpvpaper -n 900 -o '--hwdec=auto --no-audio --loop-playlist shuffle --panscan=1.0 --scale=nearest' ALL ${./wallpapers}"
         ];
 
         screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png";
@@ -288,6 +291,7 @@
 
     environment.systemPackages = with pkgs; [
       xwayland-satellite
+      mpvpaper
     ];
   };
 }
diff --git a/modules/features/tiling/noctalia.nix b/modules/features/tiling/noctalia.nix
index 6eae8cb..8223ffd 100644
--- a/modules/features/tiling/noctalia.nix
+++ b/modules/features/tiling/noctalia.nix
@@ -39,6 +39,11 @@
         dock = {
           enabled = false;
         };
+	# Using mpvpaper
+	wallpaper = {
+	  enabled = false;
+
+	};
         location = {
           monthBeforeDay = true;
           name = "Severn, Maryland";
diff --git a/modules/features/tiling/wallpapers/cyberpunk-bar-pixel-moewalls-com.mp4 b/modules/features/tiling/wallpapers/cyberpunk-bar-pixel-moewalls-com.mp4
new file mode 100644
index 0000000..cc86693
Binary files /dev/null and b/modules/features/tiling/wallpapers/cyberpunk-bar-pixel-moewalls-com.mp4 differ
diff --git a/modules/features/tiling/wallpapers/kita-ikuyo-sleeping-pixel-bocchi-the-rock-moewalls-com.mp4 b/modules/features/tiling/wallpapers/kita-ikuyo-sleeping-pixel-bocchi-the-rock-moewalls-com.mp4
new file mode 100644
index 0000000..899c091
Binary files /dev/null and b/modules/features/tiling/wallpapers/kita-ikuyo-sleeping-pixel-bocchi-the-rock-moewalls-com.mp4 differ
diff --git a/modules/features/tiling/wallpapers/lofi-girl-reading-book-while-its-raining-outside-pixel-moewalls-com.mp4 b/modules/features/tiling/wallpapers/lofi-girl-reading-book-while-its-raining-outside-pixel-moewalls-com.mp4
new file mode 100644
index 0000000..7633725
Binary files /dev/null and b/modules/features/tiling/wallpapers/lofi-girl-reading-book-while-its-raining-outside-pixel-moewalls-com.mp4 differ
diff --git a/modules/features/tiling/wallpapers/mountain-motel-pixel-moewalls-com.mp4 b/modules/features/tiling/wallpapers/mountain-motel-pixel-moewalls-com.mp4
new file mode 100644
index 0000000..0e94047
Binary files /dev/null and b/modules/features/tiling/wallpapers/mountain-motel-pixel-moewalls-com.mp4 differ
diff --git a/modules/features/tiling/wallpapers/sunset-city-street-pixel-moewalls-com.mp4 b/modules/features/tiling/wallpapers/sunset-city-street-pixel-moewalls-com.mp4
new file mode 100644
index 0000000..748dd52
Binary files /dev/null and b/modules/features/tiling/wallpapers/sunset-city-street-pixel-moewalls-com.mp4 differ
diff --git a/modules/hosts/crow/configuration.nix b/modules/hosts/crow/configuration.nix
index 3575e80..4933a88 100644
--- a/modules/hosts/crow/configuration.nix
+++ b/modules/hosts/crow/configuration.nix
@@ -6,7 +6,7 @@
 
       self.nixosModules.niri
       self.nixosModules.git
-      self.nixosModules.gdm
+      self.nixosModules.sddm
       self.nixosModules.hsr
       self.nixosModules.zsh
     ];