diff --git a/home-manager/common/desktops/plasma6/plasma-manager.nix b/home-manager/common/desktops/plasma6/plasma-manager.nix
index e6ee716d..6b4205bf 100644
--- a/home-manager/common/desktops/plasma6/plasma-manager.nix
+++ b/home-manager/common/desktops/plasma6/plasma-manager.nix
@@ -3,13 +3,29 @@
     enable = true;
     overrideConfig = true;
     configFile = {
-      # Configure 4 desktops
-      "kwinrc"."Desktops"."Id_1" = "6397510c-04f5-4aaf-bff9-66cea108b111";
-      "kwinrc"."Desktops"."Id_2" = "99b48444-5d80-4ea3-9602-35235349b6f9";
-      "kwinrc"."Desktops"."Id_3" = "4a2ae169-0b7e-43ed-97c6-8a2d55b0a379";
-      "kwinrc"."Desktops"."Id_4" = "2bca1e94-a84d-4514-a2c8-a7acfaf10371";
-      "kwinrc"."Desktops"."Number" = 4;
-      "kwinrc"."Desktops"."Rows" = 1;
+      kscreenlockerrc = {
+        # Set Lock Screen Wallpaper
+        "Greeter/Wallpaper/org.kde.image/General" =  {
+          Image = "/etc/nixos/git/wallpapers/${theme}/wallpaper1.png";
+          PreviewImage = "/etc/nixos/git/wallpapers/${theme}/wallpaper1.png";
+        };
+      };
+      kwinrc = {
+        # Set NightLight coordinates 
+        NightColor = {
+          Active = true;
+          Mode = "Location";
+          LatitudeFixed = 34.6583850931677;
+          LongitudeFixed = 138.0368098159509;
+        };
+        # Set Virtual Desktops
+        Desktops = {
+          Number = {
+            value = 4;
+            immutable = true;
+          };
+        };
+      };
     };
 
     workspace = {
@@ -19,6 +35,11 @@
       theme = "Arc-Dark";
       colorScheme = "Arc";
     };
+
+    kwin = {
+
+    };
+
     panels = [
       {
         location = "bottom";
diff --git a/nixos/hosts/framework-server/containers.nix b/nixos/hosts/framework-server/containers.nix
index cce4d2e6..e2605825 100644
--- a/nixos/hosts/framework-server/containers.nix
+++ b/nixos/hosts/framework-server/containers.nix
@@ -4,7 +4,7 @@ let
 in {
 
   containers = {
-    rdesktop = libx.mkContainer { hostname = "rdesktop"; ip = "2"; desktop = "plasma6"; unfree = true; theme = "green"; };
+    rdesktop = libx.mkContainer { hostname = "rdesktop"; ip = "2"; desktop = "plasma6"; unfree = true; };
   };
 
   # Networking config