diff --git a/hosts/ch-clt-dsk01/home.nix b/hosts/ch-clt-dsk01/home.nix
index fd9b10e..b0ae9a5 100644
--- a/hosts/ch-clt-dsk01/home.nix
+++ b/hosts/ch-clt-dsk01/home.nix
@@ -6,32 +6,15 @@
     ../../modules/home/default.nix
   ];
 
-  options = {
-    host = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-
-    headless = lib.mkOption {
-      type = with lib.types; bool;
-      description = ''
-        Is this machine headless?
-      '';
-    };
-  };
-
   config = {
     home = {
       username = "kiiwy";
       homeDirectory = "/home/kiiwy";
     };
 
-    host = "ch-clt-dsk01";
-    headless = false;
-
     settings = {
+      hostname = "ch-clt-dsk01";
+
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;
@@ -49,6 +32,8 @@
       theming.fonts.enable = true;
       theming.nix-colors.enable = false;
       theming.stylix.enable = true;
+      theming.stylix.wallpaper = "kiiwy";
+      theming.stylix.theme = "theme";
 
       desktop-environments.hyprland.enable = false;
     };
@@ -60,6 +45,8 @@
       unstable.vesktop
       blender
 
+      brave
+
       # Office
       libreoffice
     ];
@@ -70,4 +57,12 @@
     home.stateVersion = "24.05";
   };
 
+  options = {
+    settings.hostname = lib.mkOption {
+      type = with lib.types; str;
+      description = ''
+        Define the host of the machine
+      '';
+    };
+  };
 }
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 7073b7d..9f0b0f0 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -6,22 +6,6 @@
     ../../modules/home/default.nix
   ];
 
-  options = {
-    host = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-
-    headless = lib.mkOption {
-      type = with lib.types; bool;
-      description = ''
-        Is this machine headless?
-      '';
-    };
-  };
-
   config = {
     home = {
       username = "xeovalyte";
@@ -29,9 +13,10 @@
     };
 
     host = "xv-laptop";
-    headless = false;
 
     settings = {
+      hostname = "xv-laptop";
+
       applications.common.enable = true;
       applications.alacritty.enable = true;
       applications.devenv.enable = true;
@@ -89,4 +74,13 @@
     home.stateVersion = "24.05";
   };
 
+  options = {
+    settings.hostname = lib.mkOption {
+      type = with lib.types; str;
+      description = ''
+        Define the host of the machine
+      '';
+    };
+  };
+
 }
diff --git a/modules/home/theming/stylix.nix b/modules/home/theming/stylix.nix
index 1800850..16aff8f 100644
--- a/modules/home/theming/stylix.nix
+++ b/modules/home/theming/stylix.nix
@@ -12,6 +12,20 @@ in {
         Enable stylix configuration
       '';
     };
+
+    settings.theming.stylix.wallpaper = lib.mkOption {
+      type = lib.types.enum ["wallpaper-2" "kiiwy"];
+      description = ''
+        Choose wallpaper
+      '';
+    };
+
+    settings.theming.stylix.theme = lib.mkOption {
+      type = lib.types.string;
+      description = ''
+        Choose theme name. Use "theme" to use them based on wallpaper generation
+      '';
+    };
   };
 
   imports = [
@@ -21,9 +35,14 @@ in {
   config = mkIf cfg.enable {
     stylix.enable = true;
 
-    stylix.image = ../../../assets/wallpaper-2.png;
+    stylix.image = ../../../assets/${cfg.wallpaper};
+
     stylix.polarity = "dark";
-    stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/da-one-ocean.yaml";
+
+    stylix.base16Scheme = if (cfg.wallpaper == "theme") then
+        theme
+      else
+        "${pkgs.base16-schemes}/share/themes/da-one-ocean.yaml";
 
     stylix.autoEnable = true;