diff --git a/hosts/configuration_server.nix b/hosts/configuration_server.nix
index 58ecfa1..bd91caf 100644
--- a/hosts/configuration_server.nix
+++ b/hosts/configuration_server.nix
@@ -114,6 +114,10 @@
                                             # sudo flatpak uninstall --delete-data <app-id> (> flatpak list --app) - flatpak uninstall --unused
   };
 
+  programs = {
+    zsh.enable = true;
+  };
+
   nix = {                                   # Nix Package Manager settings
     settings ={
       auto-optimise-store = true;           # Optimise syslinks
diff --git a/hosts/default.nix b/hosts/default.nix
index 36b50fb..c9b77d1 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -97,7 +97,7 @@ in
     modules = [
       agenix.nixosModules.default
       ./nbf5
-      ./configuration_desktop.nix
+      ./configuration_server.nix
       ../modules/hardware/hydraCache.nix
       nixos-hardware.nixosModules.common-cpu-intel
       nixos-hardware.nixosModules.common-pc-ssd
@@ -107,7 +107,7 @@ in
         home-manager.useUserPackages = true;
         home-manager.extraSpecialArgs = { inherit user; };
         home-manager.users.${user} = {
-        imports = [(import ./home.nix)] ++ [(import ./nbf5/home.nix)];
+        imports = [(import ./home_server.nix)] ++ [(import ./nbf5/home.nix)];
         };
       }
     ];
diff --git a/hosts/nbf5/default.nix b/hosts/nbf5/default.nix
index 8cc12e2..4890853 100644
--- a/hosts/nbf5/default.nix
+++ b/hosts/nbf5/default.nix
@@ -41,14 +41,6 @@
     };
   };
 
-#  hardware.sane = {                           # Used for scanning with Xsane
-#    enable = false;
-#    extraBackends = [ pkgs.sane-airscan ];
-#  };
-  hardware = {
-    nitrokey.enable = true;
-  };
-
   environment = {
     systemPackages = with pkgs; [
 #      simple-scan
@@ -81,8 +73,8 @@
         userServices = true;
       };
     };
-    tailscale.enable = true;
 
+    mainsail.enable = true;
   };
 
   #temporary bluetooth fix
diff --git a/hosts/nbf5/hardware-configuration.nix b/hosts/nbf5/hardware-configuration.nix
index 055226a..857f167 100644
--- a/hosts/nbf5/hardware-configuration.nix
+++ b/hosts/nbf5/hardware-configuration.nix
@@ -145,19 +145,12 @@
     interfaces = {
       wlan0 = {
         useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
-        #ipv4.addresses = [ {
-        #    address = "192.168.0.51";
-        #    prefixLength = 24;
-        #} ];
       };
     };
-    #defaultGateway = "192.168.0.1";
-    #nameservers = [ "192.168.0.4" ];
     firewall = {
-      checkReversePath = "loose";
-    #  enable = false;
-    #  #allowedUDPPorts = [ 53 67 ];
-    #  #allowedTCPPorts = [ 53 80 443 9443 ];
+      enable = true;
+      #allowedUDPPorts = [ 53 67 ];
+      allowedTCPPorts = [ 80 443 ];
     };
   };
 
diff --git a/hosts/nbf5/home.nix b/hosts/nbf5/home.nix
index d75f667..6d0fc58 100644
--- a/hosts/nbf5/home.nix
+++ b/hosts/nbf5/home.nix
@@ -24,13 +24,7 @@
   home = {                                # Specific packages for laptop
     packages = with pkgs; [
       # Applications
-      libreoffice                         # Office packages
-      #firefox
-      chromium
-      thunderbird
-      streamlink
-      streamlink-twitch-gui-bin
-      element-desktop
+      firefox
       intel-gpu-tools
       pulsemixer