diff --git a/docs/THEMES.md b/docs/THEMES.md
index 8d6cecb..47bea29 100644
--- a/docs/THEMES.md
+++ b/docs/THEMES.md
@@ -1,7 +1,7 @@
 # Themes
 
-Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps installed.
-You can change the selected theme by changing the import statement at the top of your host's variables file.
+Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
+You can change the selected theme by changing the import statement of your host's variables file.
 
 *To apply the theme to Duckduckgo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`.*
 
diff --git a/docs/TODO.md b/docs/TODO.md
index a2d7ac5..9978873 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -12,4 +12,4 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
   - [ ] Telescope shortcut for file content
   - [ ] Markdown snippets
   - [ ] Make whichkey better
-- [ ] Automount USB Key (And notify-send when it's done)
+- [ ] Automount USB Key (And notify-send when it's done)
\ No newline at end of file
diff --git a/home/server.nix b/home/server.nix
index 317f401..dffd177 100644
--- a/home/server.nix
+++ b/home/server.nix
@@ -1,7 +1,7 @@
 { pkgs, config, ... }: {
 
   imports = [
-    ../hosts/laptop/variables.nix
+    ../hosts/server/variables.nix
 
     # Programs
     ./programs/btop
diff --git a/home/system/sops/server.nix b/home/system/sops/server.nix
index e421c89..97b7d1d 100644
--- a/home/system/sops/server.nix
+++ b/home/system/sops/server.nix
@@ -19,6 +19,11 @@
         owner = "cloudflare-dyndns";
         group = "cloudflare-dyndns";
       };
+      tailscaled-authKey = {
+        path = "/etc/tailscale/authKey";
+        owner = "tailscaled";
+        group = "tailscaled";
+      };
     };
   };
 
diff --git a/hosts/modules/server/tailscale.nix b/hosts/modules/server/tailscale.nix
new file mode 100644
index 0000000..55a51ea
--- /dev/null
+++ b/hosts/modules/server/tailscale.nix
@@ -0,0 +1,14 @@
+{config, ...}:{
+
+    services.tailscale = {
+        enable = true;
+        useRoutingFeatures = "both";
+        authKeyFile = "/etc/tailscale/authKey";
+        openFirewall = true;
+        extraUpFlags = [ "--advertise-exit-node" ];
+    };
+
+    # Fix DNS & IPv6 bugs
+    networking.nftables.enable = true;
+    services.resolved.enable = true;
+}
\ No newline at end of file