diff --git a/home/themes/vanilla.nix b/home/themes/vanilla.nix
index df8057e..99ca082 100644
--- a/home/themes/vanilla.nix
+++ b/home/themes/vanilla.nix
@@ -1,4 +1,7 @@
 { pkgs, lib, ... }:
+let
+  inherit (lib.my) validatePath;
+in
 {
   dconf = {
     enable = true;
@@ -11,6 +14,10 @@
       name = "Adwaita";
       package = pkgs.gnome-themes-extra;
     };
+    iconTheme = rec {
+      name = validatePath "${package}/share/icons/Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
   };
 
   qt = {
diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix
index 892a5ba..e85b67a 100644
--- a/hosts/marr/default.nix
+++ b/hosts/marr/default.nix
@@ -95,6 +95,7 @@
   };
 
   services = {
+    displayManager.sddm.enable = true;
     dbus.enable = true;
     fwupd.enable = true;
     gvfs.enable = true;
@@ -109,16 +110,6 @@
     gnome.gnome-keyring.enable = true;
     openssh.enable = true;
 
-    greetd = {
-      enable = true;
-      settings = {
-        default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --remember-user-session --time";
-          user = "greeter";
-        };
-      };
-    };
-
     #: Power Consumption {{{
     logind = {
       lidSwitch = "suspend-then-hibernate";
@@ -127,19 +118,7 @@
 
     thermald.enable = true;
 
-    tlp = {
-      enable = false;
-      settings = {
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-        CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-        CPU_MIN_PERF_ON_BAT = 0;
-        CPU_MAX_PERF_ON_BAT = 20;
-
-        # Optional helps save long term battery health
-        START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge
-        STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
-      };
-    };
+    auto-cpufreq.enable = true;
 
     upower = {
       enable = true;