diff --git a/flake.nix b/flake.nix
index a82777e..eb30cfd 100755
--- a/flake.nix
+++ b/flake.nix
@@ -93,44 +93,7 @@
     let
       flakeContext = { inherit inputs; };
     in
-    {
-      # nixosModules = {
-      #   default = import ./modules/default.nix flakeContext;
-      #   desktop = import ./modules/desktop/default.nix flakeContext;
-      #   software = {
-      #     ai = import ./modules/software/ai.nix flakeContext;
-      #     beets = import ./modules/software/beets/default.nix flakeContext;
-      #     daw = import ./modules/software/daw.nix flakeContext;
-      #     virtual = import ./modules/software/virtual.nix flakeContext;
-      #     wine = import ./modules/software/wine.nix flakeContext;
-      #   };
-      #   extra = {
-      #     self = {
-      #       fingerprint = import ./modules/extra/self/fingerprint.nix flakeContext;
-      #       zapret = import ./modules/extra/self/zapret.nix flakeContext;
-      #     };
-      #     musnix = import ./modules/extra/musnix.nix flakeContext; # https://github.com/musnix/musnix
-      #     gaming = {
-      #       aagl = import ./modules/extra/gaming/aagl.nix flakeContext; # https://github.com/ezKEa/aagl-gtk-on-nix
-      #       nix-gaming = import ./modules/extra/gaming/nix-gaming.nix flakeContext; # https://github.com/fufexan/nix-gaming
-      #     };
-      #   };
-      #   server = {
-      #     cloudflared = import ./modules/server/cloudflared.nix flakeContext;
-      #     immich = import ./modules/server/immich.nix flakeContext;
-      #     nextcloud = import ./modules/server/nextcloud.nix flakeContext;
-      #     nginx = import ./modules/server/nginx.nix flakeContext;
-      #     open-webui = import ./modules/server/open-webui.nix flakeContext;
-      #     zerotier = import ./modules/server/zerotier.nix flakeContext;
-      #   };
-      #   vds = {
-      #     cloudflared = import ./modules/vds/cloudflared.nix flakeContext;
-      #     netbird = import ./modules/vds/netbird.nix flakeContext;
-      #     nginx = import ./modules/vds/nginx.nix flakeContext;
-      #     xray = import ./modules/vds/xray.nix flakeContext;
-      #   };
-      # };
-    }
+    { }
     // (import ./homeConfigurations flakeContext)
     // (import ./nixosConfigurations flakeContext)
     // (import ./nixosModules flakeContext)
diff --git a/nixosConfigurations/hosts/vds.nix b/nixosConfigurations/hosts/vds.nix
index 9ec37df..571040a 100755
--- a/nixosConfigurations/hosts/vds.nix
+++ b/nixosConfigurations/hosts/vds.nix
@@ -14,20 +14,7 @@ let
         hostname = "otreca";
       };
 
-      imports =
-        with inputs;
-        [
-          (modulesPath + "/installer/scan/not-detected.nix")
-          (modulesPath + "/profiles/qemu-guest.nix")
-
-          ./disko/vds.nix
-          ./hardware/vds.nix
-          disko.nixosModules.disko
-
-          self.nixosModules.default
-          self.homeConfigurations.default.nixosModule
-        ]
-        ++ builtins.attrValues inputs.self.nixosModules.vds;
+      #imports = [];
 
       home-manager = {
         extraSpecialArgs = {
@@ -153,8 +140,18 @@ let
     };
 in
 inputs.nixpkgs.lib.nixosSystem {
-  modules = with inputs; [
+  modules = [
     nixosModule
+
+    (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/profiles/qemu-guest.nix")
+
+    ./disko/vds.nix
+    ./hardware/vds.nix
+    inputs.disko.nixosModules.disko
+
+    inputs.self.nixosModules.default
+    inputs.self.homeConfigurations.default.nixosModule
   ];
   system = "x86_64-linux";
   specialArgs = {
diff --git a/nixosConfigurations/hosts/wsl.nix b/nixosConfigurations/hosts/wsl.nix
index e96d4e2..35f7bc9 100755
--- a/nixosConfigurations/hosts/wsl.nix
+++ b/nixosConfigurations/hosts/wsl.nix
@@ -14,18 +14,8 @@ let
         hostname = "wsl";
       };
 
-      imports = with inputs; [
-        # Hardware
-        nixos-wsl.nixosModules.default
-
-        # Base
-        self.homeConfigurations.default.nixosModule
-        self.nixosModules.default
-
-        # Custom
-        self.nixosModules.software.beets
-        self.nixosModules.server.open-webui
-      ];
+      # imports = [
+      # ];
 
       home-manager = {
         extraSpecialArgs = {
@@ -77,6 +67,11 @@ in
 inputs.nixpkgs.lib.nixosSystem {
   modules = [
     nixosModule
+
+    inputs.nixos-wsl.nixosModules.default
+
+    inputs.self.homeConfigurations.default.nixosModule
+    inputs.self.nixosModules.default
   ];
   system = "x86_64-linux";
   specialArgs = {
diff --git a/nixosModules/desktop/default.nix b/nixosModules/desktop/default.nix
index fd02e12..6a9c5dc 100755
--- a/nixosModules/desktop/default.nix
+++ b/nixosModules/desktop/default.nix
@@ -1,6 +1,6 @@
-{ inputs, ... }@flakeContext:
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
diff --git a/nixosModules/desktop/theming.nix b/nixosModules/desktop/theming.nix
index 357fd17..a285070 100755
--- a/nixosModules/desktop/theming.nix
+++ b/nixosModules/desktop/theming.nix
@@ -6,13 +6,13 @@
 {
   environment = {
     systemPackages = with pkgs; [
+      #qogir-kde
+      #qogir-theme
+      #whitesur-cursors
+      qogir-icon-theme
       whitesur-gtk-theme
       whitesur-icon-theme
-      #whitesur-cursors
       whitesur-kde
-      qogir-icon-theme
-      #qogir-theme
-      #qogir-kde
     ];
   };
 }
diff --git a/nixosModules/options.nix b/nixosModules/options.nix
index c2a2459..a646fe1 100644
--- a/nixosModules/options.nix
+++ b/nixosModules/options.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   ...
 }:
diff --git a/nixosModules/primary/default.nix b/nixosModules/primary/default.nix
new file mode 100755
index 0000000..e343ffa
--- /dev/null
+++ b/nixosModules/primary/default.nix
@@ -0,0 +1,9 @@
+{
+  lib,
+  ...
+}:
+{
+  imports = [
+    ../desktop
+  ];
+}
diff --git a/nixosModules/server/cloudflared.nix b/nixosModules/server/cloudflared.nix
index ad6f5de..213f1cd 100755
--- a/nixosModules/server/cloudflared.nix
+++ b/nixosModules/server/cloudflared.nix
@@ -1,4 +1,3 @@
-{ inputs, ... }@flakeContext:
 {
   config,
   lib,
diff --git a/nixosModules/server/default.nix b/nixosModules/server/default.nix
index b58ba71..2d1f2fd 100755
--- a/nixosModules/server/default.nix
+++ b/nixosModules/server/default.nix
@@ -1,15 +1,18 @@
 {
-  config,
   lib,
   ...
 }:
 {
   imports = [
     #./cloudflared.nix
+    #./open-webui.nix
     ../software/beets
     ./immich.nix
+    ./mealie.nix
+    ./miniflux.nix
     ./nextcloud.nix
     ./nginx.nix
     ./stirling-pdf.nix
+    ./zerotier.nix
   ];
 }
diff --git a/nixosModules/server/open-webui.nix b/nixosModules/server/open-webui.nix
index 7e3fc24..eac3832 100755
--- a/nixosModules/server/open-webui.nix
+++ b/nixosModules/server/open-webui.nix
@@ -1,6 +1,6 @@
-{ inputs, ... }@flakeContext:
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
diff --git a/nixosModules/server/zerotier.nix b/nixosModules/server/zerotier.nix
index e0d2fdf..98b1173 100755
--- a/nixosModules/server/zerotier.nix
+++ b/nixosModules/server/zerotier.nix
@@ -1,4 +1,3 @@
-{ inputs, ... }@flakeContext:
 {
   config,
   lib,
@@ -8,7 +7,7 @@
 {
   services = {
     zerotierone = {
-      enable = enable;
+      enable = false;
       joinNetworks = [
         "db64858fedde087e"
       ];
diff --git a/nixosModules/vds/default.nix b/nixosModules/vds/default.nix
new file mode 100755
index 0000000..d6337f9
--- /dev/null
+++ b/nixosModules/vds/default.nix
@@ -0,0 +1,12 @@
+{
+  lib,
+  ...
+}:
+{
+  imports = [
+    #./cloudflared.nix
+    ./netbird.nix
+    ./nginx.nix
+    ./xray.nix
+  ];
+}
diff --git a/nixosModules/wsl/default.nix b/nixosModules/wsl/default.nix
new file mode 100755
index 0000000..695d2f4
--- /dev/null
+++ b/nixosModules/wsl/default.nix
@@ -0,0 +1,10 @@
+{
+  lib,
+  ...
+}:
+{
+  imports = [
+    ../software/beets
+    ../server/open-webui.nix
+  ];
+}