diff --git a/configuration.nix b/configuration.nix
index f15ae57..f2e04e2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -21,6 +21,7 @@ in
       ./modules/nix.nix
       # ./modules/qt.nix
       ./modules/security.nix
+      ./modules/tailscale.nix
       ./modules/users.nix
       ./modules/wm.nix
       ./modules/xdg.nix
@@ -184,6 +185,7 @@ in
 
     i2c-tools
     android-udev-rules
+    tailscale
 
     logiops
   ];
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index a876c98..6cf5fbb 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -22,6 +22,7 @@
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ "i2c-dev" "i2c-piix4" ];
+  boot.kernel.sysctl."net.ipv4.ip_forward" = 1; # Added for Tailscale
   boot.kernel.sysctl."net.ipv6.conf.enp4s0.disable_ipv6" = true;
   boot.kernel.sysctl."net.ipv6.conf.wlp5s0.disable_ipv6" = true;
   boot.kernel.sysctl."net.ipv6.conf.br0.disable_ipv6" = true;
diff --git a/hm/pkgs/gramming-packages.nix b/hm/pkgs/gramming-packages.nix
index 027946d..10ef342 100644
--- a/hm/pkgs/gramming-packages.nix
+++ b/hm/pkgs/gramming-packages.nix
@@ -7,7 +7,7 @@ with pkgs;
   #   ];
   # })
   # IDE's
-  sublime3 vscode # vscode.languages.web vscode.languages.python vscode.languages.nix vscode.languages.bash
+  sublime3 sublime-merge vscode # vscode.languages.web vscode.languages.python vscode.languages.nix vscode.languages.bash
   typora obsidian obsidian-export # vimPlugins.obsidian-nvim
   # Lunarvim Dependencies
   gnumake42 nodejs_22 cargo ripgrep cmake
diff --git a/hm/pkgs/inet-packages.nix b/hm/pkgs/inet-packages.nix
index 0234387..a8e9295 100644
--- a/hm/pkgs/inet-packages.nix
+++ b/hm/pkgs/inet-packages.nix
@@ -26,5 +26,5 @@ with pkgs;
   remmina
 
   mapscii
-  tidal-dl
+  # tidal-dl
 ]
\ No newline at end of file
diff --git a/modules/network.nix b/modules/network.nix
index 86cb100..ac74fc2 100644
--- a/modules/network.nix
+++ b/modules/network.nix
@@ -64,7 +64,8 @@
       extraCommands = ''
       iptables -t raw -A OUTPUT -p udp -m udp --dport 137 -j CT --helper netbios-ns
       '';
-      trustedInterfaces = [ "br0" ];
+      trustedInterfaces = [ "br0" "tailscale0" ];
+      checkReversePath = "loose"; # Added for Tailscale
     };
     bridges = {
       br0 = {
diff --git a/modules/security.nix b/modules/security.nix
index b2f2da9..897e7d8 100644
--- a/modules/security.nix
+++ b/modules/security.nix
@@ -70,7 +70,6 @@
       %wheel ALL=(ALL) NOPASSWD: ${pkgs.input-remapper}/bin/input-remapper-service
       %wheel ALL=(ALL) NOPASSWD: ${pkgs.input-remapper}/bin/input-remapper-control
       %wheel ALL=(ALL) NOPASSWD: /run/wrappers/bin/systemctl restart display-manager
-
     '';
   };
 
diff --git a/modules/tailscale.nix b/modules/tailscale.nix
new file mode 100644
index 0000000..9b0bb5b
--- /dev/null
+++ b/modules/tailscale.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  services.tailscale = {
+    enable = true;
+    package = pkgs.tailscale;
+    interfaceName = "tailscale0";
+    openFirewall = true;
+    port = 41641;
+    useRoutingFeatures = "both";
+    extraSetFlags = [
+      "--advertise-routes=192.168.12.0/24"
+    ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/wm/hyprland/hyprland.nix b/pkgs/wm/hyprland/hyprland.nix
index 34e4fbf..a0c43b5 100644
--- a/pkgs/wm/hyprland/hyprland.nix
+++ b/pkgs/wm/hyprland/hyprland.nix
@@ -244,10 +244,10 @@
         # "${config.home.homeDirectory}/.config/hypr/scripts/start-in-tray.sh"
         "${config.home.homeDirectory}/.config/hypr/scripts/start-keybase-gui.sh"
 
-        # "[workspace 4 silent] remmina -c rdp://wayne@xeon.local"
+        "[workspace 4 silent] remmina -c rdp://wayne@xeon.local"
 
         "[workspace 7 silent] sublime3"
-        "[workspace 9 silentl] keepassxc"
+        "[workspace 9 silent] keepassxc"
         "[workspace 9 silent] /home/wayne/.nix-profile/bin/nextcloud --background"
         "[workspace 9 silent] /nix/store/104jb5a21d1d338zkl1f07si6brsmrk2-keybase-gui-6.2.4/bin/keybase-gui %u &"