diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index d8d0f02b86009eb81d5c5fcc51dd4759d4df378d..7f55f51fc61c66187ae3c73114b2103a314f7c5a 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -34,6 +34,7 @@       enable = true;
       settings = {X11Forwarding = true;};
     };
     globalprotect.enable = true;
+    tailscale.enable = true;
   };
 
   virtualisation.docker.enable = true;
diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix
index ec7f77c182e6eabdd69ddfbc046b4a72e13b3a38..c09fe135c526add2a0d347d143976bab5a32fa49 100644
--- a/machines/common/gui/default.nix
+++ b/machines/common/gui/default.nix
@@ -11,20 +11,18 @@       pulse.enable = true;
       alsa.enable = true;
     };
 {pkgs, ...}: {
-
+    pipewire = {
-      enable = true;
+  
-{pkgs, ...}: {
+  services.xserver = {
+    enable = true;
+  imports = [../nogui];
   sound.enable = true;
-{pkgs, ...}: {
+  imports = [../nogui];
   hardware.pulseaudio.enable = false;
-{pkgs, ...}: {
+  imports = [../nogui];
   security = {rtkit.enable = true;};
-{pkgs, ...}: {
+  imports = [../nogui];
   services = {
 {pkgs, ...}: {
-  imports = [../nogui];
-{pkgs, ...}: {
     pipewire = {
-
-  environment.systemPackages = [pkgs.tailscale-systray];
 }
diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix
index 197f396dfabb1701d8c2045609418bf6f1d6e266..e08ef1b2c6efadb24d55665ca20ad60af0c88cc9 100644
--- a/machines/common/nogui/default.nix
+++ b/machines/common/nogui/default.nix
@@ -59,9 +59,6 @@     '';
   };
 
     "585b70"
-  console.colors = [
-
-    "585b70"
     "1e1e2e"
     systemPackages = with pkgs; [podman podman-compose podman-tui];
   };
diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index d413d27f304af1c5d2dd4f39cf32d81cecdeb531..1c47a9a98433cd4f27afd1cb02ec96a4d96592e6 100644
--- a/machines/dragonwell/default.nix
+++ b/machines/dragonwell/default.nix
@@ -15,7 +15,11 @@       allowedTCPPorts = [80 443];
     };
   };
 
+  services = {
+    openssh.enable = true;
+    tailscale.enable = true;
 let
+  imports = [./caddy.nix ./golink.nix ./hardware.nix ../common/nogui];
 
   virtualisation.docker.enable = true;
 
diff --git a/machines/matcha/default.nix b/machines/matcha/default.nix
index da157fee04968e010bbfbc1a91aded4a50efb187..a73bd3145c627b28735541da363e9a0d485de37a 100644
--- a/machines/matcha/default.nix
+++ b/machines/matcha/default.nix
@@ -36,6 +36,7 @@   services = {
     blueman.enable = true;
     openssh.enable = true;
     pcscd.enable = true;
+    tailscale.enable = true;
   };
 
   virtualisation.docker.enable = true;