diff --git a/nixos/home/apps/cli_tools.nix b/nixos/home/apps/cli_tools.nix
index 2bd4a0e..008f853 100644
--- a/nixos/home/apps/cli_tools.nix
+++ b/nixos/home/apps/cli_tools.nix
@@ -25,6 +25,7 @@
         ranger
         unzip
         fd
+        imagemagick # convert images from formats like jpg, png, etc.
       ]
       ++ (
         if pkgs.system == "x86_64-linux"
diff --git a/nixos/home/desktop/hyprland/hyprland.nix b/nixos/home/desktop/hyprland/hyprland.nix
index 25459d4..a174e09 100644
--- a/nixos/home/desktop/hyprland/hyprland.nix
+++ b/nixos/home/desktop/hyprland/hyprland.nix
@@ -47,25 +47,6 @@
       NIXOS_OZONE_WL = "1";
     };
 
-    stylix.iconTheme = {
-      enable = true;
-      package = pkgs.papirus-icon-theme;
-      dark = "Papirus-Dark";
-    };
-
-    stylix.targets = {
-      dunst.enable = true;
-      kde.enable = true;
-      gtk.enable = true;
-
-      waybar = {
-        enable = true;
-        enableCenterBackColors = false;
-        enableLeftBackColors = false;
-        enableRightBackColors = false;
-      };
-    };
-
     wayland.windowManager.hyprland = {
       enable = true;
 
diff --git a/nixos/home/packages/droid-packages.nix b/nixos/home/packages/droid-packages.nix
index 4f1150e..d5936e1 100644
--- a/nixos/home/packages/droid-packages.nix
+++ b/nixos/home/packages/droid-packages.nix
@@ -56,10 +56,4 @@
     btop.enable = lib.mkDefault true;
     fzf.enable = lib.mkDefault true;
   };
-
-  home.packages = with pkgs; [
-    alejandra
-    nh
-    nixd
-  ];
 }
diff --git a/nixos/home/packages/packages.nix b/nixos/home/packages/packages.nix
index 1cbb5d2..efae2f5 100644
--- a/nixos/home/packages/packages.nix
+++ b/nixos/home/packages/packages.nix
@@ -23,8 +23,12 @@
     ./tools/kitty.nix
     ./tools/tmux.nix
     ./tools/zoxide.nix
+
+    ./style.nix
   ];
 
+  style.enable = true;
+
   sh.bash = {
     enable =
       if userSettings.shell == "bash"
@@ -97,16 +101,8 @@
     fzf.enable = lib.mkDefault true;
   };
 
-  stylix.targets = {
-    bat.enable = lib.mkDefault true;
-    btop.enable = lib.mkDefault true;
-    fzf.enable = lib.mkDefault true;
-  };
-
   home.packages = with pkgs; [
-    alejandra
     nh
-    nixd
   ];
 
   home.file = {
diff --git a/nixos/home/packages/programming/code.nix b/nixos/home/packages/programming/code.nix
index 555d1d1..44ab1d1 100644
--- a/nixos/home/packages/programming/code.nix
+++ b/nixos/home/packages/programming/code.nix
@@ -161,6 +161,10 @@
       programs.vscode.extensions = with pkgs-stable.vscode-extensions; [
         jnoortheen.nix-ide
       ];
+      home.packages = with pkgs-stable; [
+        alejandra
+        nixd
+      ];
     })
 
     (lib.mkIf config.program.vscode.ide.web.enable {
@@ -189,6 +193,10 @@
         github.vscode-pull-request-github
         github.vscode-github-actions
       ];
+
+      programs.vscode.userSettings = {
+        "git.autofetch" = true;
+      };
     })
 
     (lib.mkIf config.program.vscode.markdown.enable {
diff --git a/nixos/home/packages/programming/git.nix b/nixos/home/packages/programming/git.nix
index 7b730f8..0f7d7f1 100644
--- a/nixos/home/packages/programming/git.nix
+++ b/nixos/home/packages/programming/git.nix
@@ -14,12 +14,15 @@
       enable = true;
       userName = "${userSettings.username}";
       userEmail = "kohout.fi.2023@skola.ssps.cz";
+      lfs.enable = true;
     };
 
     home.packages = with pkgs;
       [
         git
         github-cli
+        git-lfs
+        git-credential-manager
       ]
       ++ (
         if pkgs.system == "x86_64-linux"
diff --git a/nixos/home/packages/style.nix b/nixos/home/packages/style.nix
new file mode 100644
index 0000000..1a2e56c
--- /dev/null
+++ b/nixos/home/packages/style.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  options = {
+    style.enable = lib.mkEnableOption "style";
+  };
+
+  config = lib.mkIf config.style.enable {
+    stylix.iconTheme = {
+      enable = true;
+      package = pkgs.papirus-icon-theme;
+      dark = "Papirus-Dark";
+    };
+
+    stylix.targets = {
+      bat.enable = lib.mkDefault true;
+      btop.enable = lib.mkDefault true;
+      fzf.enable = lib.mkDefault true;
+
+      tmux.enable =
+        if config.program.tmux.enable
+        then lib.mkDefault true
+        else lib.mkDefault false;
+      dunst.enable =
+        if config.desktop.hyprland.enable
+        then lib.mkDefault true
+        else lib.mkDefault false;
+
+      kde.enable = true;
+      gtk.enable = true;
+
+      waybar = {
+        enable = true;
+        enableCenterBackColors = false;
+        enableLeftBackColors = false;
+        enableRightBackColors = false;
+      };
+    };
+  };
+}
diff --git a/nixos/home/packages/tools/tmux.nix b/nixos/home/packages/tools/tmux.nix
index d178576..deb15a8 100644
--- a/nixos/home/packages/tools/tmux.nix
+++ b/nixos/home/packages/tools/tmux.nix
@@ -9,8 +9,6 @@
   };
 
   config = lib.mkIf config.program.tmux.enable {
-    #stylix.targets.tmux.enable = true;
-
     programs.tmux = {
       enable = true;
       clock24 = true;