diff --git a/common/configuration.nix b/common/configuration.nix
index 2d5c00e..581b861 100644
--- a/common/configuration.nix
+++ b/common/configuration.nix
@@ -66,6 +66,7 @@
     ];
   };
 
+  services.tailscale.enable = true;
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
diff --git a/common/laptop-things.nix b/common/laptop-things.nix
new file mode 100644
index 0000000..7c45f4f
--- /dev/null
+++ b/common/laptop-things.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+
+{
+  services.logind = {
+    extraConfig = "HandlePowerKey=suspend";
+    lidSwitch = "suspend";
+  };
+
+  hardware.bluetooth.enable = true; # enables support for Bluetooth
+
+  # Configure keymap in X11
+  services.xserver = {
+    layout = "us,us";
+    xkbVariant = "dvorak,";
+    xkbOptions = "grp:win_space_toggle";
+  };
+
+  # Configure console keymap
+  console.keyMap = "dvorak";
+}
diff --git a/hosts/NixFrame/configuration.nix b/hosts/NixFrame/configuration.nix
index c1b2a7e..75b1032 100644
--- a/hosts/NixFrame/configuration.nix
+++ b/hosts/NixFrame/configuration.nix
@@ -8,6 +8,8 @@ in
     [
       # ./home-git-repos.nix
       ../../common/configuration.nix
+      ../../common/laptop-things.nix
+      ../../common/exwm.nix
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
@@ -21,15 +23,6 @@ in
   services.xserver.displayManager.sddm.enable = true;
   services.xserver.desktopManager.plasma5.enable = true;
 
-  # home-manager.users.benson = {
-  #   services.network-manager-applet.enable = true;
-  # };
-
-  # VNC Server
-  services.xrdp.enable = true;
-  services.xrdp.defaultWindowManager = "startplasma-x11";
-  services.xrdp.openFirewall = true;
-
   services.syncthing = {
     enable = true;
     user = "benson";
@@ -37,23 +30,6 @@ in
     dataDir = "/home/benson/.config/syncthing/db"; # Folder for Syncthing's database
   };
 
-  services.logind = {
-    extraConfig = "HandlePowerKey=suspend";
-    lidSwitch = "suspend";
-  };
-
-  hardware.bluetooth.enable = true; # enables support for Bluetooth
-
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "us,us";
-    xkbVariant = "dvorak,";
-    xkbOptions = "grp:win_space_toggle";
-  };
-
-  # Configure console keymap
-  console.keyMap = "dvorak";
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.benson = {
     isNormalUser = true;
@@ -66,11 +42,8 @@ in
     ];
   };
 
-  fonts.packages = with pkgs; [ roboto-mono ];
-
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
-  services.tailscale.enable = true;
 
   environment.systemPackages = with pkgs; [