diff --git a/home/system/sops/server.nix b/home/system/sops/server.nix
index 384b6ca..0e645a1 100644
--- a/home/system/sops/server.nix
+++ b/home/system/sops/server.nix
@@ -1,31 +1,31 @@
-{ pkgs, inputs, ... }: {
-  imports = [ inputs.sops-nix.homeManagerModules.sops ];
+{ pkgs, ... }: {
+  # imports = [ inputs.sops-nix.homeManagerModules.sops ];
 
   home.packages = with pkgs; [ sops age ];
 
-  sops = {
-    age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
-    defaultSopsFile = ../../../secrets/server.yaml;
-    secrets = {
-      sshconfig = { path = "/home/hadi/.ssh/config"; };
-      github-key = { path = "/home/hadi/.ssh/github"; };
-      # nextcloud-adminpass = {
-      #   path = "/etc/nextcloud/adminpassFile";
-      #   owner = "nextcloud";
-      #   group = "nextcloud";
-      # };
-      # cloudflare-apitoken = {
-      #   path = "/etc/cloudflare/apiToken";
-      #   owner = "cloudflare-dyndns";
-      #   group = "cloudflare-dyndns";
-      # };
-      # tailscaled-authKey = {
-      #   path = "/etc/tailscale/authKey";
-      #   owner = "tailscaled";
-      #   group = "tailscaled";
-      # };
-    };
-  };
+  # sops = {
+  #   age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
+  #   defaultSopsFile = ../../../secrets/server.yaml;
+  #   secrets = {
+  #     sshconfig = { path = "/home/hadi/.ssh/config"; };
+  #     github-key = { path = "/home/hadi/.ssh/github"; };
+  # nextcloud-adminpass = {
+  #   path = "/etc/nextcloud/adminpassFile";
+  #   owner = "nextcloud";
+  #   group = "nextcloud";
+  # };
+  # cloudflare-apitoken = {
+  #   path = "/etc/cloudflare/apiToken";
+  #   owner = "cloudflare-dyndns";
+  #   group = "cloudflare-dyndns";
+  # };
+  # tailscaled-authKey = {
+  #   path = "/etc/tailscale/authKey";
+  #   owner = "tailscaled";
+  #   group = "tailscaled";
+  # };
+  # };
+  # };
 
-  systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
+  # systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
 }
diff --git a/hosts/modules/server/sops.nix b/hosts/modules/server/sops.nix
new file mode 100644
index 0000000..2e1b3f3
--- /dev/null
+++ b/hosts/modules/server/sops.nix
@@ -0,0 +1,47 @@
+{ inputs, ... }: {
+
+  imports = [ inputs.sops-nix.nixosModule ];
+
+  sops = {
+    age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
+    defaultSopsFile = "../../../secrets/server.yaml";
+    secrets = {
+      sshconfig = {
+        path = "/home/hadi/.ssh/config";
+        owner = "hadi";
+      };
+      github-key = {
+        path = "/home/hadi/.ssh/github";
+        owner = "hadi";
+      };
+      cloudflare-apitoken = {
+        path = "/home/hadi/test.txt";
+        owner = "hadi";
+      };
+    };
+  };
+}
+
+# sops = {
+#   age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
+#   defaultSopsFile = ../../../secrets/server.yaml;
+#   secrets = {
+#     sshconfig = { path = "/home/hadi/.ssh/config"; };
+#     github-key = { path = "/home/hadi/.ssh/github"; };
+# nextcloud-adminpass = {
+#   path = "/etc/nextcloud/adminpassFile";
+#   owner = "nextcloud";
+#   group = "nextcloud";
+# };
+# cloudflare-apitoken = {
+#   path = "/etc/cloudflare/apiToken";
+#   owner = "cloudflare-dyndns";
+#   group = "cloudflare-dyndns";
+# };
+# tailscaled-authKey = {
+#   path = "/etc/tailscale/authKey";
+#   owner = "tailscaled";
+#   group = "tailscaled";
+# };
+# };
+# };
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 51060c0..8be9e78 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -2,6 +2,7 @@
   imports = [
     ./hardware-configuration.nix
     ./variables.nix
+    ../modules/server/security.nix
     ../modules/server/openssh.nix
   ];
 
diff --git a/hosts/server/variables.nix b/hosts/server/variables.nix
index c4457f2..8b74c24 100644
--- a/hosts/server/variables.nix
+++ b/hosts/server/variables.nix
@@ -2,7 +2,7 @@
   imports = [ ../modules/variables-config.nix ];
 
   config.var = {
-    hostname = "jack-nixos";
+    hostname = "jack";
     username = "hadi";
     homeDirectory = "/home/" + config.var.username;
     configDirectory = config.var.homeDirectory + "/.config/nixos";
@@ -25,6 +25,6 @@
     sops = true;
     obsidian = false;
 
-    theme = import ../themes/windows.nix; # select your theme here
+    theme = import ../themes/jack.nix; # select your theme here
   };
 }
diff --git a/hosts/themes/jack.nix b/hosts/themes/jack.nix
new file mode 100644
index 0000000..d865bd5
--- /dev/null
+++ b/hosts/themes/jack.nix
@@ -0,0 +1,52 @@
+{
+  wallpaper = "magma.png";
+
+  font = "SFProDisplay Nerd Font";
+  font-mono = "FiraCode Nerd Font Mono";
+  font-size = 14;
+
+  rounding = 8;
+  gaps-in = 8;
+  gaps-out = 8 * 2;
+  border-size = 2;
+  animation-speed = "slow"; # "fast" | "medium" | "slow"
+  fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
+
+  waybar = {
+    transparent = false;
+    float = false;
+    position = "bottom";
+    font-size = 16;
+  };
+
+  colors = {
+    c0 = "1e1e2e"; # black
+    c1 = "f38ba8"; # red
+    c2 = "a6e3a1"; # green
+    c3 = "fab387"; # yellow
+    c4 = "89b4fa"; # blue
+    c5 = "cba6f7"; # magenta
+    c6 = "74c7ec"; # cyan
+    c7 = "cdd6f4"; # white
+    c8 = "313244"; # bright black
+    c9 = "eba0ac"; # bright red
+    c10 = "94e2d5"; # bright green
+    c11 = "f9e2af"; # bright yellow
+    c12 = "b4befe"; # bright blue
+    c13 = "f5c2e7"; # bright magenta
+    c14 = "94e2d5"; # bright cyan
+    c15 = "bac2de"; # bright white
+
+    bg = "01010b";
+    fg = "cdd6f4";
+    bgalt = "181825";
+    fgalt = "bac2de";
+
+    accent = "f38ba8";
+    accentFg = "1e1e2e";
+
+    # Should make those automtic
+    accentName = "red";
+    accentNumber = "1";
+  };
+}