diff --git a/configuration.nix b/configuration.nix
index dab72b2..1532cab 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,6 +10,7 @@ in
     ./system-modules/sound.nix
     ./system-modules/grub.nix
     ./system-modules/dm.nix
+    ./system-modules/networking.nix
 
     ./system-modules/hsmw.nix
     ./system-modules/docker.nix
@@ -18,11 +19,6 @@ in
     ./system-modules/ollama.nix
   ];
 
-  networking.hostName = "NxXPS";
-
-  networking.networkmanager = {
-    enable = true;
-  };
 
 
 
@@ -84,6 +80,7 @@ in
     dmidecode
   ];
 
+
   fonts.packages = with pkgs; [
     noto-fonts
     noto-fonts-cjk
diff --git a/home-modules/email.nix b/home-modules/email.nix
index 9318cc2..a4a6880 100644
--- a/home-modules/email.nix
+++ b/home-modules/email.nix
@@ -1,17 +1,78 @@
-{ config, pkgs, lib, system, user, allowed, secrets, ... }: 
-
+{ config, pkgs, secrets, ... }: 
 {
   home.packages = with pkgs; [
     thunderbird
   ];
 
   
-  
+  accounts.email.accounts = {
+    "gamil-online" = {
+      address = secrets.email.gmail-online.mail;
+      realName = "Lennart J. Kurzweg";
+      flavor = "gmail.com";
+      primary = true;
+      signature = {
+        text = ''
+          --
+          About Me: https://nx2.site/about-me
+          Contact: https://nx2.site/contact
+          GPG: https://nx2.site/gpg
+        '';
+        showSignature = "append";
+      };
+      thunderbird = {
+        enable = true;
+        profiles = [ "default" ];
+      };
+    };
 
+    "gamil-business" = {
+      address = secrets.email.gmail-business.mail;
+      realName = "Lennart J. Kurzweg";
+      flavor = "gmail.com";
+      signature = {
+        text = ''
+          --
+          About Me: https://nx2.site/about-me
+          Contact: https://nx2.site/contact
+          GPG: https://nx2.site/gpg
+        '';
+        showSignature = "append";
+      };
+      thunderbird = {
+        enable = true;
+        profiles = [ "default" ];
+      };
+    };
 
-  # home.file.".config/meli.config" = {
-
-  # };
+    "hsmw" = {
+      address = secrets.email.hsmw.mail;
+      realName = "Lennart J. Kurzweg";
+      imap = {
+        port = 993;
+        host = "mail.hs-mittweida.de";
+      };
+      smtp = {
+        port = 465;
+        host = "mail.hs-mittweida.de";
+      };
+      signature = {
+        text = ''
+          --
+          MatNr: ${secrets.email.hsmw.mnr}
+          SemGr: ${secrets.email.hsmw.semgr}
+          About Me: https://nx2.site/about-me
+          Contact: https://nx2.site/contact
+          GPG: https://nx2.site/gpg
+        '';
+        showSignature = "append";
+      };
+      thunderbird = {
+        enable = true;
+        profiles = [ "default" ];
+      };
+    };
+  };
 }
 
 
diff --git a/home-modules/git.nix b/home-modules/git.nix
index 491e9d5..424e727 100644
--- a/home-modules/git.nix
+++ b/home-modules/git.nix
@@ -36,5 +36,6 @@
         whitespace-error-style = "22 reverse";
       };
     };
+    iniContent."sendemail.hsmw".smtpUser = secrets.email.hsmw.mail;
   };
 }
\ No newline at end of file
diff --git a/home-modules/vscode.nix b/home-modules/vscode.nix
index 36eb0ae..2fdee63 100644
--- a/home-modules/vscode.nix
+++ b/home-modules/vscode.nix
@@ -41,6 +41,7 @@
       donjayamanne.githistory
       mads-hartmann.bash-ide-vscode
       bungcip.better-toml
+      arrterian.nix-env-selector
       # ms-vscode-remote.remote-ssh
 
     ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
diff --git a/home.nix b/home.nix
index e5e682e..2274a1a 100644
--- a/home.nix
+++ b/home.nix
@@ -59,6 +59,7 @@
     lynx bat du-dust eza neofetch tldr fzf figlet ripgrep lolcat jq glow
     brightnessctl wev 
     element sssnake pipes
+    dig
 
     nodejs
     gnumake
diff --git a/secrets/passwords-and-certificates.nix b/secrets/passwords-and-certificates.nix
index fc04510..b8a8091 100644
Binary files a/secrets/passwords-and-certificates.nix and b/secrets/passwords-and-certificates.nix differ
diff --git a/system-modules/grub.nix b/system-modules/grub.nix
index 78f10e0..5c30456 100644
--- a/system-modules/grub.nix
+++ b/system-modules/grub.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: 
+{ config, pkgs, host, ... }: 
   let 
     grub-theme-ascii-diana = (pkgs.fetchFromGitea {
        domain = "git.nx2.site";
@@ -23,13 +23,22 @@
     fontSize = 50;
     splashImage = null;
  
-    extraEntries = ''
+    extraEntries = if host == "NxXPS" then ''
       menuentry 'Windows 11' --class windows --class os $menuentry_id_option 'osprober-efi-0A97-7A2D' {
         insmod part_gpt
         insmod fat
         search --no-floppy --fs-uuid --set=root 0A97-7A2D
         chainloader /EFI/Microsoft/Boot/bootmgfw.efi
       }
+    '' else ''
+      menuentry 'Windows 11' --class windows --class os $menuentry_id_option 'osprober-efi-8932-4A3D' {
+        insmod part_gpt
+        insmod fat
+        search --no-floppy --label --set=root EFI
+        chainloader /EFI/Microsoft/Boot/bootmgfw.efi
+      }
     '';
   };
 }
+
+
diff --git a/system-modules/hsmw.nix b/system-modules/hsmw.nix
index 00449d2..a629b6e 100644
--- a/system-modules/hsmw.nix
+++ b/system-modules/hsmw.nix
@@ -2,7 +2,7 @@
 
 {
   environment.systemPackages = [
-    pkgs.strongswan
+    pkgs.strongswanNM
   ];
   
   environment.etc = {
@@ -20,6 +20,8 @@
     "ipsec.d/USERTrust-ECC.pem".source = ../secrets/vpn-hsmw/USERTrust-ECC-Certification-Authority.pem;
     "ipsec.d/USERTrust-RSA.pem".source = ../secrets/vpn-hsmw/USERTrust-RSA-Certification-Authority.pem;
   };
+  
+  networking.networkmanager.enableStrongSwan = true;
 
   services.strongswan = {
     enable = true;