diff --git a/home/desktop/niri.nix b/home/desktop/niri.nix
index b587529..33f91e1 100644
--- a/home/desktop/niri.nix
+++ b/home/desktop/niri.nix
@@ -41,6 +41,7 @@ in
     settings = {
       # Autostart DMS if you prefer launching it directly from Niri instead of systemd
       spawn-at-startup = [
+        { command = [ "dms" "run" ]; }
         { command = [ "${launch-lisgd}/bin/launch-lisgd" ]; } # Spawns the daemon
         { command = [ "${launch-wvkbd}/bin/launch-wvkbd" ]; }
       ];
@@ -71,12 +72,11 @@ in
         { # All windows
           geometry-corner-radius = {
             bottom-left = 25.0;
-            bottom-right = 0.0;
-            top-right = 0.0;
+            bottom-right = 25.0;
+            top-right = 25.0;
             top-left = 25.0;
           };
 
-
           draw-border-with-background = true;
           clip-to-geometry = true;
         }
diff --git a/system/services/default.nix b/system/services/default.nix
index 12dd110..57adcbc 100644
--- a/system/services/default.nix
+++ b/system/services/default.nix
@@ -18,15 +18,15 @@ in
     package = inputs.niri.packages.${pkgs.system}.niri-unstable;
   };
 
-  services.displayManager.dms-greeter = {
+  programs.dsearch.enable = true;
+
+  programs.dank-material-shell.greeter = {
     enable = true;
     compositor.name = "niri";
 
-    configHome = "/home/jashton";
+    #configHome = "/home/jashton";
   };
 
-  programs.dsearch.enable = true;
-
   programs.dms-shell = {
     enable = true;
     enableSystemMonitoring = true;
@@ -36,7 +36,7 @@ in
     enableCalendarEvents = true;
 
     systemd = {
-      enable = false;
+      enable = true;
       restartIfChanged = true;
     };