diff --git a/flake.lock b/flake.lock
index 2046a49..7691036 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,11 +25,11 @@
     },
     "catppuccin": {
       "locked": {
-        "lastModified": 1712482981,
-        "narHash": "sha256-LJOOpTey9Y29C/TK4h9KP7v4HvqDL3mLyT9hSWCfFlI=",
+        "lastModified": 1712890104,
+        "narHash": "sha256-56RS7wdJ2QDUNCQt/9lx8MFcwuTdVQnzBV+9QToLLmM=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "4043beb6c792a40e9c513aa261f4ba10601a4457",
+        "rev": "850c26a3a2474b0d068abc89c905f536cca415de",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712462372,
-        "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
+        "lastModified": 1712759992,
+        "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
+        "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
         "type": "github"
       },
       "original": {
@@ -162,11 +162,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712521891,
-        "narHash": "sha256-qJRkB7QZo2mdR/nABeHQKi3xkQxUsSGjVVQXTSHQocI=",
+        "lastModified": 1712909442,
+        "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "ec53086c76303dc8880fa7ba06c45abcae8b3398",
+        "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55",
         "type": "github"
       },
       "original": {
@@ -270,11 +270,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1712566108,
-        "narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=",
+        "lastModified": 1712760404,
+        "narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465",
+        "rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
         "type": "github"
       },
       "original": {
@@ -286,11 +286,11 @@
     },
     "nixpkgs-raw": {
       "locked": {
-        "lastModified": 1712437997,
-        "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
+        "lastModified": 1712741485,
+        "narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
+        "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72",
         "type": "github"
       },
       "original": {
@@ -301,11 +301,11 @@
     },
     "nixpkgs-unstable-raw": {
       "locked": {
-        "lastModified": 1712439257,
-        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
+        "lastModified": 1712791164,
+        "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
+        "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
         "type": "github"
       },
       "original": {
@@ -316,11 +316,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1712605683,
-        "narHash": "sha256-+ZnPwPchvPG+rOFfpxLjKm+5ZNRtYUBtn1KkEojgsSc=",
+        "lastModified": 1712906890,
+        "narHash": "sha256-MkhmSqGqQ5cDa1VzqkA76h6+9rYCY2IJzSRglNV+Vr4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "1db8af43c9b75768461a01d84e17596e331df77f",
+        "rev": "0fb8bccadea16d13d87210c21fbae09b26c28e07",
         "type": "github"
       },
       "original": {
@@ -429,11 +429,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712580452,
-        "narHash": "sha256-X1LjMY8wpnflD2nq7GuYxTichyWR9qxw8eGmzyEW4h8=",
+        "lastModified": 1712884817,
+        "narHash": "sha256-zs8oMnWHg3g0P+3ZsEj69m9aZCrGa/bqZUHRV9sF0w0=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "5041ca76d6c80d057673e5202fa4167f81202391",
+        "rev": "882c461b61050a266fe9bc8d93d342f24b54250f",
         "type": "github"
       },
       "original": {
diff --git a/machines/SteamDeck/configuration.nix b/machines/SteamDeck/configuration.nix
index 6e0b86e..7c2af0a 100755
--- a/machines/SteamDeck/configuration.nix
+++ b/machines/SteamDeck/configuration.nix
@@ -45,7 +45,7 @@
       enable = true;
     };
   };
-  services.xserver.displayManager.sddm.enable = lib.mkForce false;
+  services.displayManager.sddm.enable = lib.mkForce false;
 
   # Enable bluetooth
   hardware.bluetooth = {
diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix
index f3a64c1..f8e13d9 100755
--- a/machines/WinMax2/configuration.nix
+++ b/machines/WinMax2/configuration.nix
@@ -69,8 +69,8 @@
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-  services.xserver = {
-    xkb.layout = lib.mkForce "us";
+  services = {
+    xserver.xkb.layout = lib.mkForce "us";
     displayManager.sddm.settings = {
       General.GreeterEnvironment = "QT_SCREEN_SCALE_FACTORS=2";
     };
diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix
index b88ff52..e382060 100644
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@@ -49,10 +49,12 @@
     '';
   };
 in {
-  services.xserver = {
-    # Enable the Plasma 5 Desktop Environment
-    desktopManager.plasma5.enable = true;
+  services = {
     displayManager.defaultSession = "plasmawayland";
+    xserver = {
+      # Enable the Plasma 5 Desktop Environment
+      desktopManager.plasma5.enable = true;
+    };
   };
 
   qt.enable = true;
diff --git a/roles/kde/sddm.nix b/roles/kde/sddm.nix
index 8fd3b6a..bc331d7 100644
--- a/roles/kde/sddm.nix
+++ b/roles/kde/sddm.nix
@@ -3,7 +3,7 @@
   pkgs,
   ...
 }: let
-  currentTheme = config.services.xserver.displayManager.sddm.theme;
+  currentTheme = config.services.displayManager.sddm.theme;
 
   sddm-sugar-candy = pkgs.stdenv.mkDerivation {
     pname = "sddm-sugar-candy";
@@ -43,11 +43,11 @@
   };
 in {
   # Enable SDDM.
-  services.xserver.displayManager.sddm = {
+  services.displayManager.sddm = {
     enable = true;
     theme = "sugar-candy";
     settings = {
-      General = {Numlock = "on";};
+      General = {Numlock = "off";};
       Theme = {CursorTheme = "Breeze_Snow";};
     };
   };