diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 22003b3..971b594 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -31,7 +31,7 @@
 
       exec-once = [
         "swww init"
-        "swww img /home/hadi/nextcloud/wallpaper/Dim.png"
+        "swww img /home/hadi/Nextcloud/wallpaper/Dim_12000x6000.png"
       ];
 
       monitor = [
diff --git a/home/misc/default.nix b/home/misc/default.nix
index 34e6eb3..69d3e3b 100644
--- a/home/misc/default.nix
+++ b/home/misc/default.nix
@@ -1,4 +1,14 @@
 {
+
+  # TODO:
+  # choose output sound
+  # choose wallpaper
+  # import wireguard config
+  # powermenu
+  # menu
+  # custom colors on all config files
+  # vim format on save
+
   home.file = {
     ".ssh/config" = {
       text = ''
diff --git a/home/nvim/cmp.nix b/home/nvim/cmp.nix
index dee8cd5..da40ac9 100644
--- a/home/nvim/cmp.nix
+++ b/home/nvim/cmp.nix
@@ -10,68 +10,69 @@
     cmp = {
       enable = true;
       settings = {
-        snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
+        snippet.expand =
+          "function(args) require('luasnip').lsp_expand(args.body) end";
         sources = [
-        { name = "nvim_lsp"; }
-        { name = "luasnip"; }
-        { name = "buffer"; }
-        { name = "nvim_lua"; }
-        { name = "path"; }
+          { name = "nvim_lsp"; }
+          { name = "luasnip"; }
+          { name = "buffer"; }
+          { name = "nvim_lua"; }
+          { name = "path"; }
         ];
 
         formatting = {
           fields = [ "abbr" "kind" "menu" ];
           format =
-# lua
+            # lua
             ''
-            function(_, item)
-            local icons = {
-              Namespace = "󰌗",
-              Text = "󰉿",
-              Method = "󰆧",
-              Function = "󰆧",
-              Constructor = "",
-              Field = "󰜢",
-              Variable = "󰀫",
-              Class = "󰠱",
-              Interface = "",
-              Module = "",
-              Property = "󰜢",
-              Unit = "󰑭",
-              Value = "󰎠",
-              Enum = "",
-              Keyword = "󰌋",
-              Snippet = "",
-              Color = "󰏘",
-              File = "󰈚",
-              Reference = "󰈇",
-              Folder = "󰉋",
-              EnumMember = "",
-              Constant = "󰏿",
-              Struct = "󰙅",
-              Event = "",
-              Operator = "󰆕",
-              TypeParameter = "󰊄",
-              Table = "",
-              Object = "󰅩",
-              Tag = "",
-              Array = "[]",
-              Boolean = "",
-              Number = "",
-              Null = "󰟢",
-              String = "󰉿",
-              Calendar = "",
-              Watch = "󰥔",
-              Package = "",
-              Copilot = "",
-              Codeium = "",
-              TabNine = "",
-            }
+                function(_, item)
+                local icons = {
+                  Namespace = "󰌗",
+                  Text = "󰉿",
+                  Method = "󰆧",
+                  Function = "󰆧",
+                  Constructor = "",
+                  Field = "󰜢",
+                  Variable = "󰀫",
+                  Class = "󰠱",
+                  Interface = "",
+                  Module = "",
+                  Property = "󰜢",
+                  Unit = "󰑭",
+                  Value = "󰎠",
+                  Enum = "",
+                  Keyword = "󰌋",
+                  Snippet = "",
+                  Color = "󰏘",
+                  File = "󰈚",
+                  Reference = "󰈇",
+                  Folder = "󰉋",
+                  EnumMember = "",
+                  Constant = "󰏿",
+                  Struct = "󰙅",
+                  Event = "",
+                  Operator = "󰆕",
+                  TypeParameter = "󰊄",
+                  Table = "",
+                  Object = "󰅩",
+                  Tag = "",
+                  Array = "[]",
+                  Boolean = "",
+                  Number = "",
+                  Null = "󰟢",
+                  String = "󰉿",
+                  Calendar = "",
+                  Watch = "󰥔",
+                  Package = "",
+                  Copilot = "",
+                  Codeium = "",
+                  TabNine = "",
+                }
 
-          local icon = icons[item.kind] or ""
-            item.kind = string.format("%s %s", icon, item.kind or "")
-            return item
-            end
+              local icon = icons[item.kind] or ""
+                item.kind = string.format("%s %s", icon, item.kind or "")
+                return item
+                end
             '';
         };
 
diff --git a/home/nvim/lsp.nix b/home/nvim/lsp.nix
index 4544024..335c8f6 100644
--- a/home/nvim/lsp.nix
+++ b/home/nvim/lsp.nix
@@ -1,5 +1,7 @@
 {
-  programs.nixvim.plugins.lsp = {
+  programs.nixvim.plugins = {
+    lsp-format.enable = true;
+    lsp = {
     enable = true;
     servers = {
       bashls.enable = true;
@@ -15,4 +17,5 @@
       "K" = "hover";
     };
   };
+  };
 }
diff --git a/home/nvim/options.nix b/home/nvim/options.nix
index ef62225..0daa0d3 100644
--- a/home/nvim/options.nix
+++ b/home/nvim/options.nix
@@ -1,6 +1,6 @@
 {
 
-     programs.nixvim.globals.mapleader = " ";
+  programs.nixvim.globals.mapleader = " ";
   programs.nixvim.options = {
     updatetime = 100; # Faster completion
 
diff --git a/home/shell/zsh.nix b/home/shell/zsh.nix
index 8cc660e..add1b5f 100644
--- a/home/shell/zsh.nix
+++ b/home/shell/zsh.nix
@@ -27,7 +27,7 @@
       celar = "clear";
       e = "exit";
       cd = "z";
-      ls = "eza --icons";
+      ls = "eza --icons=always";
       open = "xdg-open";
       icat = "kitty +kitten icat";
     };
diff --git a/home/variables/theme/config/template.nix b/home/variables/theme/config/template.nix
new file mode 100644
index 0000000..6dcfdae
--- /dev/null
+++ b/home/variables/theme/config/template.nix
@@ -0,0 +1,64 @@
+{ lib, ... }:
+
+with lib;
+
+{
+  options.theme = {
+
+    rounding = mkOption {
+      type = types.int;
+      description = "Borders rounding";
+    };
+
+    gaps-in = mkOption {
+      type = types.int;
+      description = "Gaps in";
+    };
+
+    gaps-out = mkOption {
+      type = types.int;
+      description = "Gaps out";
+    };
+
+    border-size = mkOption {
+      type = types.int;
+      description = "Border size";
+    };
+
+    colors = let
+      mkColorOption = name: {
+        inherit name;
+        value = mkOption {
+          type = types.strMatching "[a-fA-F0-9]{6}";
+          description = "Color ${name}.";
+        };
+      };
+    in listToAttrs (map mkColorOption [
+      "bg"
+      "fg"
+      "alt-bg"
+      "alt-fg"
+      "primary-bg"
+      "primary-fg"
+      "secondary-bg"
+      "secondary-fg"
+      "cursor"
+      "color0"
+      "color1"
+      "color2"
+      "color3"
+      "color4"
+      "color5"
+      "color6"
+      "color7"
+      "color8"
+      "color9"
+      "color10"
+      "color11"
+      "color12"
+      "color13"
+      "color14"
+      "color15"
+    ]);
+  };
+}