diff --git a/home-manager/modules/bottom.nix b/home-manager/modules/bottom.nix
deleted file mode 100755
index 83cb09d..0000000
--- a/home-manager/modules/bottom.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  programs.bottom = {
-    enable = true;
-    settings = {
-      colors = {
-        tableHeaderColor = "#f4dbd6";
-        allCpuColor = "#f4dbd6";
-        avgCpuColor = "#ee99a0";
-        cpuCoreColors = ["#ed8796" "#f5a97f" "#eed49f" "#a6da95" "#7dc4e4" "#c6a0f6"];
-        ramColor = "#a6da95";
-        swapColor = "#f5a97f";
-        rxColor = "#a6da95";
-        txColor = "#ed8796";
-        widgetTitleColor = "#f0c6c6";
-        borderColor = "#5b6078";
-        highlightedBorderColor = "#f5bde6";
-        textColor = "#cad3f5";
-        graphColor = "#a5adcb";
-        cursorColor = "#f5bde6";
-        selectedTextColor = "#181926";
-        selectedBgColor = "#c6a0f6";
-        highBatteryColor = "#a6da95";
-        mediumBatteryColor = "#eed49f";
-        lowBatteryColor = "#ed8796";
-        gpuCoreColors = ["#7dc4e4" "#c6a0f6" "#ed8796" "#f5a97f" "#eed49f" "#a6da95"];
-        arcColor = "#91d7e3";
-      };
-    };
-  };
-}
diff --git a/home-manager/modules/bottom/config/settings.nix b/home-manager/modules/bottom/config/settings.nix
new file mode 100644
index 0000000..dfafb93
--- /dev/null
+++ b/home-manager/modules/bottom/config/settings.nix
@@ -0,0 +1,27 @@
+{
+  settings = {
+    colors = {
+      tableHeaderColor = "#f4dbd6";
+      allCpuColor = "#f4dbd6";
+      avgCpuColor = "#ee99a0";
+      cpuCoreColors = ["#ed8796" "#f5a97f" "#eed49f" "#a6da95" "#7dc4e4" "#c6a0f6"];
+      ramColor = "#a6da95";
+      swapColor = "#f5a97f";
+      rxColor = "#a6da95";
+      txColor = "#ed8796";
+      widgetTitleColor = "#f0c6c6";
+      borderColor = "#5b6078";
+      highlightedBorderColor = "#f5bde6";
+      textColor = "#cad3f5";
+      graphColor = "#a5adcb";
+      cursorColor = "#f5bde6";
+      selectedTextColor = "#181926";
+      selectedBgColor = "#c6a0f6";
+      highBatteryColor = "#a6da95";
+      mediumBatteryColor = "#eed49f";
+      lowBatteryColor = "#ed8796";
+      gpuCoreColors = ["#7dc4e4" "#c6a0f6" "#ed8796" "#f5a97f" "#eed49f" "#a6da95"];
+      arcColor = "#91d7e3";
+    };
+  };
+}
diff --git a/home-manager/modules/bottom/default.nix b/home-manager/modules/bottom/default.nix
new file mode 100755
index 0000000..19ef3da
--- /dev/null
+++ b/home-manager/modules/bottom/default.nix
@@ -0,0 +1,9 @@
+{
+  programs.bottom = let
+    configPath = ./config;
+  in
+    {
+      enable = true;
+    }
+    // (import (configPath + /settings.nix));
+}
diff --git a/home-manager/modules/brave.nix b/home-manager/modules/brave.nix
deleted file mode 100755
index 8735cbf..0000000
--- a/home-manager/modules/brave.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  programs.brave = {
-    enable = true;
-    extensions = [
-      {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # uBlock Origin
-      {id = "cmpdlhmnmjhihmcfnigoememnffkimlk";} # Catppuccin Macchiato
-      {id = "dlnpfhfhmkiebpnlllpehlmklgdggbhn";} # Don't Close Last Tab
-      {id = "iplffkdpngmdjhlpjmppncnlhomiipha";} # Unpaywall
-      {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # SponsorBlock
-      {id = "ponfpcnoihfmfllpaingbgckeeldkhle";} # YouTube Enhancer
-    ];
-  };
-}
diff --git a/home-manager/modules/brave/config/extensions.nix b/home-manager/modules/brave/config/extensions.nix
new file mode 100644
index 0000000..260605b
--- /dev/null
+++ b/home-manager/modules/brave/config/extensions.nix
@@ -0,0 +1,10 @@
+{
+  extensions = [
+    {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # uBlock Origin
+    {id = "cmpdlhmnmjhihmcfnigoememnffkimlk";} # Catppuccin Macchiato
+    {id = "dlnpfhfhmkiebpnlllpehlmklgdggbhn";} # Don't Close Last Tab
+    {id = "iplffkdpngmdjhlpjmppncnlhomiipha";} # Unpaywall
+    {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # SponsorBlock
+    {id = "ponfpcnoihfmfllpaingbgckeeldkhle";} # YouTube Enhancer
+  ];
+}
diff --git a/home-manager/modules/brave/default.nix b/home-manager/modules/brave/default.nix
new file mode 100755
index 0000000..430e88f
--- /dev/null
+++ b/home-manager/modules/brave/default.nix
@@ -0,0 +1,9 @@
+{
+  programs.brave = let
+    configPath = ./config;
+  in
+    {
+      enable = true;
+    }
+    // (import (configPath + /extensions.nix));
+}
diff --git a/home-manager/modules/freetube.nix b/home-manager/modules/freetube.nix
deleted file mode 100755
index 8018325..0000000
--- a/home-manager/modules/freetube.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  programs.freetube = {
-    enable = true;
-    settings = {
-      allSettingsSectionsExpandedByDefault = false;
-      barColor = false;
-      baseTheme = "catppuccinMocha";
-      bounds = {
-        x = 880;
-        y = 221;
-        width = 1200;
-        height = 800;
-        maximized = false;
-        fullScreen = false;
-      };
-      defaultQuality = "1080";
-      downloadAskPath = false;
-      downloadBehavior = "download";
-      downloadFolderPath = "/home/nick/Downloads/FreeTube";
-      expandSideBar = true;
-      externalPlayer = "mpv";
-      hideActiveSubscriptions = false;
-      hideCommentLikes = true;
-      hideCommentPhotos = true;
-      hideHeaderLogo = true;
-      hideLabelsSideBar = true;
-      hidePlaylists = true;
-      hidePopularVideos = true;
-      hideRecommendedVideos = true;
-      hideSubscriptionsShorts = false;
-      hideSubscriptionsVideos = false;
-      hideTrendingVideos = true;
-      hideVideoLikesAndDislikes = true;
-      mainColor = "CatppuccinMochaMauve";
-      maxVideoPlaybackRate = 10;
-      playNextVideo = false;
-      quickBookmarkTargetPlaylistId = "favorites";
-      rememberHistory = false;
-      saveWatchedProgress = false;
-      secColor = "CatppuccinMochaLavender";
-      useDeArrowThumbnails = true;
-      useDeArrowTitles = true;
-      useSponsorBlock = true;
-      defaultTheatreMode = true;
-      listType = "grid";
-      currentLocale = "en_GB";
-    };
-  };
-}
diff --git a/home-manager/modules/freetube/config/settings.nix b/home-manager/modules/freetube/config/settings.nix
new file mode 100644
index 0000000..2643e2a
--- /dev/null
+++ b/home-manager/modules/freetube/config/settings.nix
@@ -0,0 +1,46 @@
+{
+  settings = {
+    allSettingsSectionsExpandedByDefault = false;
+    barColor = false;
+    baseTheme = "catppuccinMocha";
+    bounds = {
+      x = 880;
+      y = 221;
+      width = 1200;
+      height = 800;
+      maximized = false;
+      fullScreen = false;
+    };
+    defaultQuality = "1080";
+    downloadAskPath = false;
+    downloadBehavior = "download";
+    downloadFolderPath = "/home/nick/Downloads/FreeTube";
+    expandSideBar = true;
+    externalPlayer = "mpv";
+    hideActiveSubscriptions = false;
+    hideCommentLikes = true;
+    hideCommentPhotos = true;
+    hideHeaderLogo = true;
+    hideLabelsSideBar = true;
+    hidePlaylists = true;
+    hidePopularVideos = true;
+    hideRecommendedVideos = true;
+    hideSubscriptionsShorts = false;
+    hideSubscriptionsVideos = false;
+    hideTrendingVideos = true;
+    hideVideoLikesAndDislikes = true;
+    mainColor = "CatppuccinMochaMauve";
+    maxVideoPlaybackRate = 10;
+    playNextVideo = false;
+    quickBookmarkTargetPlaylistId = "favorites";
+    rememberHistory = false;
+    saveWatchedProgress = false;
+    secColor = "CatppuccinMochaLavender";
+    useDeArrowThumbnails = true;
+    useDeArrowTitles = true;
+    useSponsorBlock = true;
+    defaultTheatreMode = true;
+    listType = "grid";
+    currentLocale = "en_GB";
+  };
+}
diff --git a/home-manager/modules/freetube/default.nix b/home-manager/modules/freetube/default.nix
new file mode 100755
index 0000000..501e515
--- /dev/null
+++ b/home-manager/modules/freetube/default.nix
@@ -0,0 +1,9 @@
+{
+  programs.freetube = let
+    configPath = ./config;
+  in
+    {
+      enable = true;
+    }
+    // (import (configPath + /settings.nix));
+}
diff --git a/home-manager/modules/helix.nix b/home-manager/modules/helix.nix
deleted file mode 100755
index a0291a0..0000000
--- a/home-manager/modules/helix.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{pkgs, ...}: {
-  programs.helix = {
-    enable = true;
-    package = pkgs.helix;
-    languages = {
-      language = [
-        {
-          auto-format = true;
-          formatter.command = "alejandra";
-          name = "nix";
-        }
-        {
-          auto-format = true;
-          formatter.command = "haskell";
-          name = "haskell";
-        }
-        {
-          auto-format = true;
-          formatter.command = "cssfmt";
-          name = "css";
-        }
-        {
-          auto-format = true;
-          formatter.command = "yuck";
-          name = "yuck";
-        }
-        {
-          auto-format = true;
-          formatter.command = "yamlfmt";
-          name = "yaml";
-        }
-      ];
-    };
-    settings = {
-      editor = {
-        mouse = true;
-        auto-format = true;
-        auto-save = true;
-        line-number = "relative";
-        lsp = {
-          display-messages = true;
-          display-inlay-hints = true;
-        };
-      };
-      keys = {
-        normal = {
-          space = {
-            f = ":format";
-            q = ":q";
-            w = ":w";
-          };
-        };
-      };
-      theme = "catppuccin_macchiato";
-    };
-  };
-}
diff --git a/home-manager/modules/helix/config/languages.nix b/home-manager/modules/helix/config/languages.nix
new file mode 100644
index 0000000..21ad6a3
--- /dev/null
+++ b/home-manager/modules/helix/config/languages.nix
@@ -0,0 +1,31 @@
+{
+  languages = {
+    language = [
+      {
+        auto-format = true;
+        formatter.command = "alejandra";
+        name = "nix";
+      }
+      {
+        auto-format = true;
+        formatter.command = "haskell";
+        name = "haskell";
+      }
+      {
+        auto-format = true;
+        formatter.command = "cssfmt";
+        name = "css";
+      }
+      {
+        auto-format = true;
+        formatter.command = "yuck";
+        name = "yuck";
+      }
+      {
+        auto-format = true;
+        formatter.command = "yamlfmt";
+        name = "yaml";
+      }
+    ];
+  };
+}
diff --git a/home-manager/modules/helix/config/settings.nix b/home-manager/modules/helix/config/settings.nix
new file mode 100644
index 0000000..a279f0a
--- /dev/null
+++ b/home-manager/modules/helix/config/settings.nix
@@ -0,0 +1,24 @@
+{
+  settings = {
+    editor = {
+      mouse = true;
+      auto-format = true;
+      auto-save = true;
+      line-number = "relative";
+      lsp = {
+        display-messages = true;
+        display-inlay-hints = true;
+      };
+    };
+    keys = {
+      normal = {
+        space = {
+          f = ":format";
+          q = ":q";
+          w = ":w";
+        };
+      };
+    };
+    theme = "catppuccin_macchiato";
+  };
+}
diff --git a/home-manager/modules/helix/default.nix b/home-manager/modules/helix/default.nix
new file mode 100755
index 0000000..a5ce991
--- /dev/null
+++ b/home-manager/modules/helix/default.nix
@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+  programs.helix = let
+    configPath = ./config;
+  in
+    {
+      enable = true;
+      package = pkgs.helix;
+    }
+    // (import (configPath + /languages.nix))
+    // (import (configPath + /settings.nix));
+}
diff --git a/home-manager/modules/starship.nix b/home-manager/modules/starship.nix
deleted file mode 100755
index 15dae43..0000000
--- a/home-manager/modules/starship.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  programs.starship = {
-    enable = true;
-    settings = {
-      add_newline = false;
-      character = {
-        success_symbol = "[ ➜](bold #8bd5ca)";
-        error_symbol = "[ ¬◇](bold #ee99a0)";
-      };
-    };
-  };
-}
diff --git a/home-manager/modules/starship/config/settings.nix b/home-manager/modules/starship/config/settings.nix
new file mode 100644
index 0000000..cfeb2ab
--- /dev/null
+++ b/home-manager/modules/starship/config/settings.nix
@@ -0,0 +1,9 @@
+{
+  settings = {
+    add_newline = false;
+    character = {
+      success_symbol = "[ ➜](bold #8bd5ca)";
+      error_symbol = "[ ¬◇](bold #ee99a0)";
+    };
+  };
+}
diff --git a/home-manager/modules/starship/default.nix b/home-manager/modules/starship/default.nix
new file mode 100755
index 0000000..660fd98
--- /dev/null
+++ b/home-manager/modules/starship/default.nix
@@ -0,0 +1,9 @@
+{
+  programs.starship = let
+    configPath = ./config;
+  in
+    {
+      enable = true;
+    }
+    // (import (configPath + /settings.nix));
+}
diff --git a/home-manager/modules/vscode/default.nix b/home-manager/modules/vscode/default.nix
index 435c736..489c60d 100755
--- a/home-manager/modules/vscode/default.nix
+++ b/home-manager/modules/vscode/default.nix
@@ -4,13 +4,15 @@
   ...
 }: {
   programs = {
-    vscode =
+    vscode = let
+      configPath = ./config;
+    in
       {
         enable = true;
         package = pkgs.vscode;
       }
-      // (import ./config/keybindings.nix)
-      // (import ./config/extensions.nix) {inherit pkgs;}
-      // (import ./config/userSettings.nix) {inherit pkgs lib;};
+      // (import (configPath + /keybindings.nix))
+      // (import (configPath + /extensions.nix)) {inherit pkgs;}
+      // (import (configPath + /userSettings.nix)) {inherit pkgs lib;};
   };
 }
diff --git a/home-manager/modules/wezterm.nix b/home-manager/modules/wezterm.nix
deleted file mode 100755
index 7848f28..0000000
--- a/home-manager/modules/wezterm.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  programs.wezterm = {
-    enable = true;
-    extraConfig = ''
-      return {
-        color_scheme = "Catppuccin Macchiato",
-        font_size = 10,
-        enable_tab_bar = false,
-        window_close_confirmation = 'NeverPrompt',
-        term = 'wezterm',
-        enable_wayland = false,
-        front_end = "WebGpu",
-        max_fps = 200
-      }
-    '';
-  };
-}
diff --git a/home-manager/modules/wezterm/config/extraConfig.nix b/home-manager/modules/wezterm/config/extraConfig.nix
new file mode 100644
index 0000000..cd02910
--- /dev/null
+++ b/home-manager/modules/wezterm/config/extraConfig.nix
@@ -0,0 +1,14 @@
+{
+  extraConfig = ''
+    return {
+      color_scheme = "Catppuccin Macchiato",
+      font_size = 10,
+      enable_tab_bar = false,
+      window_close_confirmation = 'NeverPrompt',
+      term = 'wezterm',
+      enable_wayland = false,
+      front_end = "WebGpu",
+      max_fps = 200
+    }
+  '';
+}
diff --git a/home-manager/modules/wezterm/default.nix b/home-manager/modules/wezterm/default.nix
new file mode 100755
index 0000000..f5918a0
--- /dev/null
+++ b/home-manager/modules/wezterm/default.nix
@@ -0,0 +1,9 @@
+{
+  programs.wezterm = let
+    configPath = ./config;
+  in
+    {
+      enable = true;
+    }
+    // (import (configPath + /extraConfig.nix));
+}
diff --git a/home-manager/modules/yazi.nix b/home-manager/modules/yazi.nix
deleted file mode 100755
index f53e22c..0000000
--- a/home-manager/modules/yazi.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  programs.yazi = {
-    enable = true;
-    enableNushellIntegration = true;
-    settings = {
-      log = {
-        enabled = false;
-      };
-      manager = {
-        show_hidden = true;
-        sort_by = "alphabetical";
-        sort_dir_first = true;
-        sort_reverse = false;
-      };
-      preview = {
-        tab_size = 2;
-        max_width = 1500;
-        max_height = 1000;
-      };
-    };
-  };
-}
-# Keymap
-# https://github.com/sxyazi/yazi/blob/main/yazi-config/preset/keymap.toml
-
diff --git a/home-manager/modules/yazi/config/settings.nix b/home-manager/modules/yazi/config/settings.nix
new file mode 100644
index 0000000..96bb9fb
--- /dev/null
+++ b/home-manager/modules/yazi/config/settings.nix
@@ -0,0 +1,18 @@
+{
+  settings = {
+    log = {
+      enabled = false;
+    };
+    manager = {
+      show_hidden = true;
+      sort_by = "alphabetical";
+      sort_dir_first = true;
+      sort_reverse = false;
+    };
+    preview = {
+      tab_size = 2;
+      max_width = 1500;
+      max_height = 1000;
+    };
+  };
+}
diff --git a/home-manager/modules/yazi/default.nix b/home-manager/modules/yazi/default.nix
new file mode 100755
index 0000000..05ceeb4
--- /dev/null
+++ b/home-manager/modules/yazi/default.nix
@@ -0,0 +1,12 @@
+{
+  programs.yazi = let
+    configPath = ./config;
+  in
+    {
+      enable = true;
+      enableNushellIntegration = true;
+    }
+    // (import (configPath + /settings.nix));
+  # Keymap
+  # https://github.com/sxyazi/yazi/blob/main/yazi-config/preset/keymap.toml
+}
diff --git a/home-manager/modules/yt-dlp.nix b/home-manager/modules/yt-dlp.nix
deleted file mode 100755
index 3d8eb21..0000000
--- a/home-manager/modules/yt-dlp.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  programs.yt-dlp = {
-    enable = true;
-    settings = {
-      embed-thumbnail = true;
-      embed-subs = true;
-      sub-langs = "english";
-      downloader = "aria2c";
-      downloader-args = "aria2c:'-c -x8 -s8 -k1M'";
-    };
-    extraConfig = ''
-      --embed-chapters
-      --audio-quality 0
-    '';
-  };
-}
diff --git a/home-manager/modules/yt-dlp/config/extraConfig.nix b/home-manager/modules/yt-dlp/config/extraConfig.nix
new file mode 100644
index 0000000..e5353ed
--- /dev/null
+++ b/home-manager/modules/yt-dlp/config/extraConfig.nix
@@ -0,0 +1,6 @@
+{
+  extraConfig = ''
+    --embed-chapters
+    --audio-quality 0
+  '';
+}
diff --git a/home-manager/modules/yt-dlp/config/settings.nix b/home-manager/modules/yt-dlp/config/settings.nix
new file mode 100644
index 0000000..c320543
--- /dev/null
+++ b/home-manager/modules/yt-dlp/config/settings.nix
@@ -0,0 +1,9 @@
+{
+  settings = {
+    embed-thumbnail = true;
+    embed-subs = true;
+    sub-langs = "english";
+    downloader = "aria2c";
+    downloader-args = "aria2c:'-c -x8 -s8 -k1M'";
+  };
+}
diff --git a/home-manager/modules/yt-dlp/default.nix b/home-manager/modules/yt-dlp/default.nix
new file mode 100755
index 0000000..579fbf9
--- /dev/null
+++ b/home-manager/modules/yt-dlp/default.nix
@@ -0,0 +1,10 @@
+{
+  programs.yt-dlp = let
+    configPath = ./config;
+  in
+    {
+      enable = true;
+    }
+    // (import (configPath + /extraConfig.nix))
+    // (import (configPath + /settings.nix));
+}