diff --git a/modules/default.nix b/modules/default.nix
index 8aabf4f..b73244a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -146,16 +146,19 @@ rec {
 
     services.xserver = {
       enable = true;
-      autorun = false;
+      autorun = lib.mkDefault false;
       xkb.layout = "us";
       xkb.options = "eurosign:e";
 
-      displayManager = {
+      displayManager = lib.mkDefault {
         defaultSession = "fg42";
         startx.enable = true;
       };
 
       libinput.enable = true; # for touchpad support
+      libinput.mouse.accelProfile = "adaptive";
+      libinput.mouse.accelSpeed = "-0.5";
+
       videoDrivers = [
         "amdgpu"
       ];
@@ -244,13 +247,18 @@ rec {
     boot.loader.grub.efiInstallAsRemovable = true;
   };
 
-  disk = diskFile: { lib, pkgs, inputs, hostBuilderConfig, ... }: {
+  disk = diskFile: { lib, pkgs, inputs, hostBuilderConfig, ... }:
+    let diskDesc = import diskFile; in {
     imports = [
       "${inputs.disko}/module.nix"
     ];
 
+    environment.systemPackages = [
+      pkgs.disko
+    ];
+
+    disko = lib.optionalAttrs (!hostBuilderConfig.inVM) diskDesc.disko;
 
-    disko = lib.optionalAttrs (!hostBuilderConfig.inVM) (import diskFile).disko;
     environment.etc = {
       "disks.nix".source = diskFile;
     };
diff --git a/users/mary/desktop.nix b/users/mary/desktop.nix
index 63a2de1..ae9af5d 100644
--- a/users/mary/desktop.nix
+++ b/users/mary/desktop.nix
@@ -214,7 +214,7 @@
       F = "find . -iname";
       f = "fd";
       _ = "sudo";
-      rebuild = "sudo nixos-rebuild switch --flake '/home/lxsameer/src/Universe#majin'";
+      rebuild = "sudo nixos-rebuild switch --flake '/home/mary/src/Universe#maryland'";
       "..." = "../..";
       "...." = "../../..";
       "....." = "../../../..";
diff --git a/worlds/maryland.nix b/worlds/maryland.nix
index 7b67b8f..15a07c8 100644
--- a/worlds/maryland.nix
+++ b/worlds/maryland.nix
@@ -39,9 +39,24 @@ let
     hardware.cpu.amd.updateMicrocode = true;
 
     services.xserver.enable = true;
-    services.xserver.displayManager.sddm.enable = true;
-    services.xserver.desktopManager.plasma5.enable = true;
-
+    services.xserver.autorun = lib.mkForce true;
+    # services.xserver.desktopManager.plasma5.enable = true;
+    # services.xserver.desktopManager.plasma5.runUsingSystemd = true;
+    # services.xserver.displayManager = lib.mkForce {
+    #     defaultSession = "plasma";
+    #     sddm.enable = true;
+    # };
+    services.xserver.displayManager = lib.mkForce {
+        defaultSession = "gnome-xorg";
+	gdm.enable = true;
+    };
+    
+    services.xserver.desktopManager.gnome.enable = lib.mkForce true;
+    environment.systemPackages = with pkgs; [ gnomeExtensions.appindicator gnome.adwaita-icon-theme ];
+    services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
+    programs.dconf.enable = true;
+    
+    services.dbus.enable = true;
     # I want to fully control my users via nix
     users.mutableUsers = false;
     networking.extraHosts = ''
@@ -51,7 +66,7 @@ let
     services.printing.enable = true;
     services.avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
       openFirewall = true;
     };
 
@@ -60,7 +75,7 @@ let
 
     networking.firewall = {
       enable = true;
-      allowedTCPPorts = [ 8000 ];
+      allowedTCPPorts = [ 8000 22 ];
     };
 
   };