diff --git a/home/default.nix b/home/default.nix
index e78c262..e3a5d69 100755
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,176 +1,46 @@
 let
-  modulesPath = ./modules;
-  miscPath = modulesPath + "/misc";
+  # Recursively collect directories
+  collectDirs =
+    path:
+    let
+      content = builtins.readDir path;
+      subdirs = builtins.filter (name: content.${name} == "directory") (builtins.attrNames content);
+      buildPath = name: path + "/${name}";
 
-  moduleImport =
-    path: nameTransform:
+      # Get immediate subdirectories
+      thisDirs = map buildPath subdirs;
+      # Recursively get sub-subdirectories
+      subDirs = builtins.concatMap collectDirs thisDirs;
+    in
+    [ path ] ++ subDirs;
+
+  # Import directories and their default.nix files
+  directoryImport =
+    path:
     builtins.listToAttrs (
-      map
-        (name: {
-          name = nameTransform name;
-          value = import (path + "/${name}");
-        })
-        (
-          builtins.filter (
-            name: (builtins.readDir path).${name} == "regular" && builtins.match ".*\\.nix$" name != null
-          ) (builtins.attrNames (builtins.readDir path))
-        )
+      map (dir: {
+        name = baseNameOf (toString dir);
+        value = import dir;
+      }) (collectDirs path)
     );
 
-  modules =
-    moduleImport modulesPath (
-      name:
-      builtins.replaceStrings
-        [
-          ".nix"
-        ]
-        [
-          ""
-        ]
-        name
-    )
-    // moduleImport miscPath (
-      name:
-      "misc-${
-        builtins.replaceStrings
-          [
-            ".nix"
-          ]
-          [
-            ""
-          ]
-          name
-      }"
-    )
-    //
-      (
-        path:
-        builtins.listToAttrs (
-          map
-            (name: {
-              name = name;
-              value = import (path + "/${name}");
-            })
-            (
-              builtins.filter (name: (builtins.readDir path).${name} == "directory" && name != "misc") (
-                builtins.attrNames (builtins.readDir path)
-              )
-            )
-        )
-      )
-        modulesPath;
+  # Create the modules attrset
+  modules = directoryImport ./.;
 in
 {
   flake.homeModules = {
     desktop = {
       imports = builtins.attrValues {
         inherit (modules)
-          brave
-          flameshot
-          misc-android
-          misc-desktop
-          misc-internet
-          misc-tracking
+          cli
+          gui
           ;
       };
     };
-
-    entertainment = {
+    server = {
       imports = builtins.attrValues {
         inherit (modules)
-          freetube
-          misc-entertainment
-          mpv
-          steam
-          ;
-      };
-    };
-
-    firefox = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          firefox
-          ;
-      };
-    };
-
-    hyprland = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          gtk
-          dunst
-          easyEffects
-          gammastep
-          hyprland
-          misc-hyprland
-          network
-          swaylock
-          tofi
-          waybar
-          ;
-      };
-    };
-    productionArt = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          misc-productionArt
-          ;
-      };
-    };
-
-    productionAudio = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          misc-productionAudio
-          ;
-      };
-    };
-
-    productionCode = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          neovim
-          vscode
-          zed
-          ;
-      };
-    };
-
-    productionVideo = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          misc-productionVideo
-          obs-studio
-          yt-dlp
-          ;
-      };
-    };
-
-    productionWriting = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          misc-productionWriting
-          ;
-      };
-    };
-
-    shared = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          bottom
-          direnv
-          fastfetch
-          ghostty
-          git
-          helix
-          homeManager
-          lazygit
-          misc-commandLine
-          nushell
-          starship
-          yazi
-          zellij
-          zoxide
+          cli
           ;
       };
     };
diff --git a/home/modules/brave/config/extensions.nix b/home/modules/brave/config/extensions.nix
deleted file mode 100755
index 87ec8ae..0000000
--- a/home/modules/brave/config/extensions.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-  {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/modules/brave/default.nix b/home/modules/brave/default.nix
deleted file mode 100755
index 2acb240..0000000
--- a/home/modules/brave/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  programs.brave = let
-    configPath = ./config;
-    extensionsPath = import (configPath + /extensions.nix);
-  in {
-    enable = true;
-    extensions = extensionsPath;
-  };
-}
diff --git a/home/modules/misc/android.nix b/home/modules/cli/android/androidFileTransfer/default.nix
old mode 100755
new mode 100644
similarity index 60%
rename from home/modules/misc/android.nix
rename to home/modules/cli/android/androidFileTransfer/default.nix
index ade45f7..0b25158
--- a/home/modules/misc/android.nix
+++ b/home/modules/cli/android/androidFileTransfer/default.nix
@@ -1,13 +1,12 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  ...
+}:
+{
   home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
+    inherit (pkgs)
       android-file-transfer
-      android-tools
-      deskreen
-      scrcpy
       ;
   };
 }
 # requires that users be part of the adbusers group
-
diff --git a/home/modules/cli/android/androidTools/default.nix b/home/modules/cli/android/androidTools/default.nix
new file mode 100644
index 0000000..7b44aa6
--- /dev/null
+++ b/home/modules/cli/android/androidTools/default.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      android-tools
+      ;
+  };
+}
+# requires that users be part of the adbusers group
diff --git a/home/modules/cli/android/default.nix b/home/modules/cli/android/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/cli/android/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/cli/android/simpleMtpfs/default.nix b/home/modules/cli/android/simpleMtpfs/default.nix
new file mode 100644
index 0000000..eea80bd
--- /dev/null
+++ b/home/modules/cli/android/simpleMtpfs/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      simple-mtpfs
+      ;
+  };
+}
diff --git a/home/modules/cli/default.nix b/home/modules/cli/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/cli/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/cli/development/default.nix b/home/modules/cli/development/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/cli/development/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/cli/development/editing/default.nix b/home/modules/cli/development/editing/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/cli/development/editing/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/helix/config/languages.nix b/home/modules/cli/development/editing/helix/config/languages.nix
similarity index 100%
rename from home/modules/helix/config/languages.nix
rename to home/modules/cli/development/editing/helix/config/languages.nix
diff --git a/home/modules/helix/config/settings.nix b/home/modules/cli/development/editing/helix/config/settings.nix
similarity index 100%
rename from home/modules/helix/config/settings.nix
rename to home/modules/cli/development/editing/helix/config/settings.nix
diff --git a/home/modules/cli/development/editing/helix/default.nix b/home/modules/cli/development/editing/helix/default.nix
new file mode 100755
index 0000000..bf25a9f
--- /dev/null
+++ b/home/modules/cli/development/editing/helix/default.nix
@@ -0,0 +1,19 @@
+{
+  pkgs,
+  flake,
+  ...
+}:
+{
+  programs.helix =
+    let
+      configPath = ./config;
+      settingsPath = import (configPath + /settings.nix);
+      languagesPath = import (configPath + /languages.nix);
+    in
+    {
+      enable = true;
+      package = flake.inputs.helix.packages.${pkgs.system}.default;
+      languages = languagesPath;
+      settings = settingsPath;
+    };
+}
diff --git a/home/modules/neovim.nix b/home/modules/cli/development/editing/neovim/default.nix
old mode 100755
new mode 100644
similarity index 100%
rename from home/modules/neovim.nix
rename to home/modules/cli/development/editing/neovim/default.nix
diff --git a/home/modules/cli/development/versioning/default.nix b/home/modules/cli/development/versioning/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/cli/development/versioning/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/git.nix b/home/modules/cli/development/versioning/git/default.nix
old mode 100755
new mode 100644
similarity index 95%
rename from home/modules/git.nix
rename to home/modules/cli/development/versioning/git/default.nix
index 1f08e3a..6be6b72
--- a/home/modules/git.nix
+++ b/home/modules/cli/development/versioning/git/default.nix
@@ -2,10 +2,12 @@
   config,
   flake,
   ...
-}: let
+}:
+let
   user = config.home.username;
   userConfig = flake.config.people.users.${user};
-in {
+in
+{
   programs.git = {
     enable = true;
     userName = userConfig.name;
diff --git a/home/modules/lazygit.nix b/home/modules/cli/development/versioning/lazygit/default.nix
old mode 100755
new mode 100644
similarity index 100%
rename from home/modules/lazygit.nix
rename to home/modules/cli/development/versioning/lazygit/default.nix
diff --git a/home/modules/cli/files/default.nix b/home/modules/cli/files/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/cli/files/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/cli/files/ncdu/default.nix b/home/modules/cli/files/ncdu/default.nix
new file mode 100644
index 0000000..da8a812
--- /dev/null
+++ b/home/modules/cli/files/ncdu/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      ncdu
+      ;
+  };
+}
diff --git a/home/modules/cli/files/samba/default.nix b/home/modules/cli/files/samba/default.nix
new file mode 100644
index 0000000..cef8189
--- /dev/null
+++ b/home/modules/cli/files/samba/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      samba
+      ;
+  };
+}
diff --git a/home/modules/cli/files/unrar/default.nix b/home/modules/cli/files/unrar/default.nix
new file mode 100644
index 0000000..f68860b
--- /dev/null
+++ b/home/modules/cli/files/unrar/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      unrar
+      ;
+  };
+}
diff --git a/home/modules/yazi/config/keymap.nix b/home/modules/cli/files/yazi/config/keymap.nix
similarity index 100%
rename from home/modules/yazi/config/keymap.nix
rename to home/modules/cli/files/yazi/config/keymap.nix
diff --git a/home/modules/yazi/config/settings.nix b/home/modules/cli/files/yazi/config/settings.nix
similarity index 100%
rename from home/modules/yazi/config/settings.nix
rename to home/modules/cli/files/yazi/config/settings.nix
diff --git a/home/modules/cli/files/yazi/default.nix b/home/modules/cli/files/yazi/default.nix
new file mode 100755
index 0000000..fd7c888
--- /dev/null
+++ b/home/modules/cli/files/yazi/default.nix
@@ -0,0 +1,22 @@
+{
+  flake,
+  pkgs,
+  ...
+}:
+{
+  programs.yazi =
+    let
+      configPath = ./config;
+      keymapPath = import (configPath + /keymap.nix);
+      settingsPath = import (configPath + /settings.nix);
+    in
+    {
+      enable = true;
+      # package = flake.inputs.yazi.packages.${pkgs.system}.yazi;
+      enableNushellIntegration = true;
+      keymap = keymapPath;
+      settings = settingsPath;
+    };
+  # Keymap
+  # https://github.com/sxyazi/yazi/blob/main/yazi-config/preset/keymap.toml
+}
diff --git a/home/modules/cli/files/zip/default.nix b/home/modules/cli/files/zip/default.nix
new file mode 100644
index 0000000..96e9218
--- /dev/null
+++ b/home/modules/cli/files/zip/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      zip
+      ;
+  };
+}
diff --git a/home/modules/cli/shell/default.nix b/home/modules/cli/shell/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/cli/shell/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/nushell.nix b/home/modules/cli/shell/nushell/default.nix
old mode 100755
new mode 100644
similarity index 100%
rename from home/modules/nushell.nix
rename to home/modules/cli/shell/nushell/default.nix
diff --git a/home/modules/starship/config/settings.nix b/home/modules/cli/shell/starship/config/settings.nix
similarity index 100%
rename from home/modules/starship/config/settings.nix
rename to home/modules/cli/shell/starship/config/settings.nix
diff --git a/home/modules/starship/default.nix b/home/modules/cli/shell/starship/default.nix
similarity index 100%
rename from home/modules/starship/default.nix
rename to home/modules/cli/shell/starship/default.nix
diff --git a/home/modules/zellij.nix b/home/modules/cli/shell/zellij/default.nix
old mode 100755
new mode 100644
similarity index 100%
rename from home/modules/zellij.nix
rename to home/modules/cli/shell/zellij/default.nix
diff --git a/home/modules/zoxide.nix b/home/modules/cli/shell/zoxide/default.nix
old mode 100755
new mode 100644
similarity index 88%
rename from home/modules/zoxide.nix
rename to home/modules/cli/shell/zoxide/default.nix
index a9acb0d..a9ff9f0
--- a/home/modules/zoxide.nix
+++ b/home/modules/cli/shell/zoxide/default.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.zoxide = {
     enable = true;
     enableNushellIntegration = true;
diff --git a/home/modules/cli/utilities/alsaUtils/default.nix b/home/modules/cli/utilities/alsaUtils/default.nix
new file mode 100644
index 0000000..7477265
--- /dev/null
+++ b/home/modules/cli/utilities/alsaUtils/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      alsa-utils
+      ;
+  };
+}
diff --git a/home/modules/bottom/config/settings.nix b/home/modules/cli/utilities/bottom/config/settings.nix
similarity index 100%
rename from home/modules/bottom/config/settings.nix
rename to home/modules/cli/utilities/bottom/config/settings.nix
diff --git a/home/modules/bottom/default.nix b/home/modules/cli/utilities/bottom/default.nix
similarity index 100%
rename from home/modules/bottom/default.nix
rename to home/modules/cli/utilities/bottom/default.nix
diff --git a/home/modules/cli/utilities/brightnessCtl/default.nix b/home/modules/cli/utilities/brightnessCtl/default.nix
new file mode 100644
index 0000000..7e2366c
--- /dev/null
+++ b/home/modules/cli/utilities/brightnessCtl/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      brightnessctl
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/cifsUtils/default.nix b/home/modules/cli/utilities/cifsUtils/default.nix
new file mode 100644
index 0000000..bffcc14
--- /dev/null
+++ b/home/modules/cli/utilities/cifsUtils/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      cifs-utils
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/default.nix b/home/modules/cli/utilities/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/cli/utilities/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/direnv.nix b/home/modules/cli/utilities/direnv/default.nix
old mode 100755
new mode 100644
similarity index 97%
rename from home/modules/direnv.nix
rename to home/modules/cli/utilities/direnv/default.nix
index eb938fb..1f3caeb
--- a/home/modules/direnv.nix
+++ b/home/modules/cli/utilities/direnv/default.nix
@@ -2,7 +2,8 @@
   flake,
   pkgs,
   ...
-}: {
+}:
+{
   programs.direnv = {
     enable = true;
     package = flake.inputs.direnv.packages.${pkgs.system}.default;
diff --git a/home/modules/fastfetch/config/settings.nix b/home/modules/cli/utilities/fastFetch/config/settings.nix
similarity index 100%
rename from home/modules/fastfetch/config/settings.nix
rename to home/modules/cli/utilities/fastFetch/config/settings.nix
diff --git a/home/modules/fastfetch/default.nix b/home/modules/cli/utilities/fastFetch/default.nix
similarity index 97%
rename from home/modules/fastfetch/default.nix
rename to home/modules/cli/utilities/fastFetch/default.nix
index af6e648..b01f4c7 100755
--- a/home/modules/fastfetch/default.nix
+++ b/home/modules/cli/utilities/fastFetch/default.nix
@@ -1,7 +1,8 @@
 let
   configPath = ./config;
   settingsPath = import (configPath + /settings.nix);
-in {
+in
+{
   programs.fastfetch = {
     enable = true;
     settings = settingsPath;
diff --git a/home/modules/cli/utilities/ffmpeg/default.nix b/home/modules/cli/utilities/ffmpeg/default.nix
new file mode 100644
index 0000000..52a9171
--- /dev/null
+++ b/home/modules/cli/utilities/ffmpeg/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      ffmpeg
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/flac/default.nix b/home/modules/cli/utilities/flac/default.nix
new file mode 100644
index 0000000..41010d0
--- /dev/null
+++ b/home/modules/cli/utilities/flac/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      flac
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/gLib/default.nix b/home/modules/cli/utilities/gLib/default.nix
new file mode 100644
index 0000000..0205272
--- /dev/null
+++ b/home/modules/cli/utilities/gLib/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      glib
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/hardInfo/default.nix b/home/modules/cli/utilities/hardInfo/default.nix
new file mode 100644
index 0000000..4161eb7
--- /dev/null
+++ b/home/modules/cli/utilities/hardInfo/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      hardinfo
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/homeManager/default.nix b/home/modules/cli/utilities/homeManager/default.nix
new file mode 100644
index 0000000..6808670
--- /dev/null
+++ b/home/modules/cli/utilities/homeManager/default.nix
@@ -0,0 +1 @@
+{ programs.home-manager.enable = true; }
diff --git a/home/modules/cli/utilities/inetUtils/default.nix b/home/modules/cli/utilities/inetUtils/default.nix
new file mode 100644
index 0000000..38d43a7
--- /dev/null
+++ b/home/modules/cli/utilities/inetUtils/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      inetutils
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/libgenCli/default.nix b/home/modules/cli/utilities/libgenCli/default.nix
new file mode 100644
index 0000000..773e031
--- /dev/null
+++ b/home/modules/cli/utilities/libgenCli/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      libgen-cli
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/nyanCat/default.nix b/home/modules/cli/utilities/nyanCat/default.nix
new file mode 100644
index 0000000..9c6ad8e
--- /dev/null
+++ b/home/modules/cli/utilities/nyanCat/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      nyancat
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/parted/default.nix b/home/modules/cli/utilities/parted/default.nix
new file mode 100644
index 0000000..74443c7
--- /dev/null
+++ b/home/modules/cli/utilities/parted/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      parted
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/pciUtils/default.nix b/home/modules/cli/utilities/pciUtils/default.nix
new file mode 100644
index 0000000..c89c38f
--- /dev/null
+++ b/home/modules/cli/utilities/pciUtils/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      pciutils
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/pinEntry/default.nix b/home/modules/cli/utilities/pinEntry/default.nix
new file mode 100644
index 0000000..d7d439e
--- /dev/null
+++ b/home/modules/cli/utilities/pinEntry/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      pinentry
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/playerCtl/default.nix b/home/modules/cli/utilities/playerCtl/default.nix
new file mode 100644
index 0000000..d34e69c
--- /dev/null
+++ b/home/modules/cli/utilities/playerCtl/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      playerctl
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/protonVpn/default.nix b/home/modules/cli/utilities/protonVpn/default.nix
new file mode 100644
index 0000000..c7fc0f2
--- /dev/null
+++ b/home/modules/cli/utilities/protonVpn/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      protonvpn-cli_2
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/speedTest/default.nix b/home/modules/cli/utilities/speedTest/default.nix
new file mode 100644
index 0000000..17239fc
--- /dev/null
+++ b/home/modules/cli/utilities/speedTest/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      speedtest-rs
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/sshfs/default.nix b/home/modules/cli/utilities/sshfs/default.nix
new file mode 100644
index 0000000..cb6d5d3
--- /dev/null
+++ b/home/modules/cli/utilities/sshfs/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      sshfs
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/tokei/default.nix b/home/modules/cli/utilities/tokei/default.nix
new file mode 100644
index 0000000..bc84f46
--- /dev/null
+++ b/home/modules/cli/utilities/tokei/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      tokei
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/tomb/default.nix b/home/modules/cli/utilities/tomb/default.nix
new file mode 100644
index 0000000..6c6ffb5
--- /dev/null
+++ b/home/modules/cli/utilities/tomb/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      tomb
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/udiskie/default.nix b/home/modules/cli/utilities/udiskie/default.nix
new file mode 100644
index 0000000..25a1535
--- /dev/null
+++ b/home/modules/cli/utilities/udiskie/default.nix
@@ -0,0 +1,7 @@
+{
+  services.udiskie = {
+    enable = true;
+    automount = true;
+    tray = "always";
+  };
+}
diff --git a/home/modules/cli/utilities/wget/default.nix b/home/modules/cli/utilities/wget/default.nix
new file mode 100644
index 0000000..08d3d3c
--- /dev/null
+++ b/home/modules/cli/utilities/wget/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      wget
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/wine/default.nix b/home/modules/cli/utilities/wine/default.nix
new file mode 100644
index 0000000..093fe8a
--- /dev/null
+++ b/home/modules/cli/utilities/wine/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      wine
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/xdgUtils/default.nix b/home/modules/cli/utilities/xdgUtils/default.nix
new file mode 100644
index 0000000..d214120
--- /dev/null
+++ b/home/modules/cli/utilities/xdgUtils/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      xdg-utils
+      ;
+  };
+}
diff --git a/home/modules/cli/utilities/xdoTool/default.nix b/home/modules/cli/utilities/xdoTool/default.nix
new file mode 100644
index 0000000..1bb9bf7
--- /dev/null
+++ b/home/modules/cli/utilities/xdoTool/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      xdotool
+      ;
+  };
+}
diff --git a/home/modules/misc/productionAudio.nix b/home/modules/cli/utilities/yaBridge/default.nix
old mode 100755
new mode 100644
similarity index 56%
rename from home/modules/misc/productionAudio.nix
rename to home/modules/cli/utilities/yaBridge/default.nix
index a72afeb..c5ff0de
--- a/home/modules/misc/productionAudio.nix
+++ b/home/modules/cli/utilities/yaBridge/default.nix
@@ -1,8 +1,10 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  ...
+}:
+{
   home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      reaper
+    inherit (pkgs)
       yabridge
       ;
   };
diff --git a/home/modules/yt-dlp/config/extraConfig.nix b/home/modules/cli/utilities/yt-dlp/config/extraConfig.nix
similarity index 100%
rename from home/modules/yt-dlp/config/extraConfig.nix
rename to home/modules/cli/utilities/yt-dlp/config/extraConfig.nix
diff --git a/home/modules/yt-dlp/config/settings.nix b/home/modules/cli/utilities/yt-dlp/config/settings.nix
similarity index 100%
rename from home/modules/yt-dlp/config/settings.nix
rename to home/modules/cli/utilities/yt-dlp/config/settings.nix
diff --git a/home/modules/cli/utilities/yt-dlp/default.nix b/home/modules/cli/utilities/yt-dlp/default.nix
new file mode 100755
index 0000000..2033dea
--- /dev/null
+++ b/home/modules/cli/utilities/yt-dlp/default.nix
@@ -0,0 +1,13 @@
+{
+  programs.yt-dlp =
+    let
+      configPath = ./config;
+      extraConfigPath = import (configPath + /extraConfig.nix);
+      settingsPath = import (configPath + /settings.nix);
+    in
+    {
+      enable = true;
+      extraConfig = extraConfigPath;
+      settings = settingsPath;
+    };
+}
diff --git a/home/modules/default.nix b/home/modules/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/firefox/config/bookmarks/default.nix b/home/modules/firefox/config/bookmarks/default.nix
deleted file mode 100755
index 31df77f..0000000
--- a/home/modules/firefox/config/bookmarks/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{flake, ...}: let
-  configPath = ./config;
-  flakedPath = configPath + /flake;
-
-  filterFiles = name: builtins.match ".*\\.nix$" name != null;
-
-  regularBookmarks = let
-    files = builtins.attrNames (builtins.readDir configPath);
-  in
-    builtins.foldl' (
-      emptyList: bookmarkFile:
-        emptyList ++ (import (configPath + "/${bookmarkFile}")).bookmarks
-    ) [] (builtins.filter filterFiles files);
-
-  flakedBookmarks = let
-    files = builtins.attrNames (builtins.readDir flakedPath);
-  in
-    builtins.foldl' (
-      emptyList: bookmarkFile:
-        emptyList
-        ++ (import (flakedPath + "/${bookmarkFile}") {
-          inherit
-            flake
-            ;
-        })
-        .bookmarks
-    ) [] (builtins.filter filterFiles files);
-
-  aggregatedBookmarks = regularBookmarks ++ flakedBookmarks;
-in {
-  bookmarks = aggregatedBookmarks;
-}
diff --git a/home/modules/firefox/config/search/config/flake/selfHosted.nix b/home/modules/firefox/config/search/config/flake/selfHosted.nix
deleted file mode 100755
index 0b25ebd..0000000
--- a/home/modules/firefox/config/search/config/flake/selfHosted.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{flake, ...}: let
-  inherit
-    (flake.config.services)
-    instances
-    ;
-in {
-  "${instances.jellyfin.label}" = {
-    definedAliases = [
-      "@jf"
-    ];
-    icon = ./icons/jf.png;
-    urls = [
-      {template = "https://${instances.jellyfin.subdomain}.${instances.web.domains.url0}/web/#/search.html?query={searchTerms}";}
-    ];
-  };
-  "${instances.peertube.label}" = {
-    definedAliases = [
-      "@pt"
-    ];
-    icon = ./icons/pt.png;
-    urls = [
-      {template = "https://${instances.peertube.subdomain}.${instances.web.domains.url1}/search?search={searchTerms}";}
-    ];
-  };
-}
diff --git a/home/modules/firefox/config/settings/default.nix b/home/modules/firefox/config/settings/default.nix
deleted file mode 100755
index 9bae4f2..0000000
--- a/home/modules/firefox/config/settings/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-let
-  configPath = ./config;
-
-  aggregatedSettings = let
-    files = builtins.attrNames (builtins.readDir configPath);
-  in
-    builtins.foldl' (
-      emptySet: settingsFile:
-        emptySet // (import (configPath + "/${settingsFile}"))
-    ) {}
-    (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
-in {
-  settings = aggregatedSettings;
-}
diff --git a/home/modules/firefox/default.nix b/home/modules/firefox/default.nix
deleted file mode 100755
index 3b14ea8..0000000
--- a/home/modules/firefox/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  pkgs,
-  flake,
-  ...
-}: let
-  inherit
-    (flake.config.people)
-    user0
-    ;
-in {
-  programs.firefox = let
-    configPath = ./config;
-    bookmarksPath = import (configPath + /bookmarks) {
-      inherit
-        flake
-        ;
-    };
-    extensionsPath = import (configPath + /extensions) {
-      inherit
-        pkgs
-        ;
-    };
-    searchPath = import (configPath + /search) {
-      inherit
-        flake
-        ;
-    };
-    settingsPath = import (configPath + /settings);
-    themesPath = import (configPath + /themes);
-  in {
-    enable = true;
-    package = pkgs.firefox;
-    profiles = {
-      ${user0} =
-        {
-          isDefault = true;
-          id = 0;
-        }
-        // bookmarksPath
-        // extensionsPath
-        // searchPath
-        // settingsPath
-        // themesPath;
-      testing =
-        {
-          isDefault = false;
-          id = 1;
-        }
-        // bookmarksPath
-        // searchPath
-        // themesPath;
-    };
-  };
-}
diff --git a/home/modules/freetube/default.nix b/home/modules/freetube/default.nix
deleted file mode 100755
index c982ed3..0000000
--- a/home/modules/freetube/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  programs.freetube = let
-    configPath = ./config;
-    settingsPath = import (configPath + /settings.nix);
-  in {
-    enable = true;
-    settings = settingsPath;
-  };
-}
diff --git a/home/modules/gui/apps/browsers/brave/config/extensions.nix b/home/modules/gui/apps/browsers/brave/config/extensions.nix
new file mode 100755
index 0000000..a9b45ff
--- /dev/null
+++ b/home/modules/gui/apps/browsers/brave/config/extensions.nix
@@ -0,0 +1,8 @@
+[
+  { 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/modules/gui/apps/browsers/brave/default.nix b/home/modules/gui/apps/browsers/brave/default.nix
new file mode 100755
index 0000000..8a1b15f
--- /dev/null
+++ b/home/modules/gui/apps/browsers/brave/default.nix
@@ -0,0 +1,11 @@
+{
+  programs.brave =
+    let
+      configPath = ./config;
+      extensionsPath = import (configPath + /extensions.nix);
+    in
+    {
+      enable = true;
+      extensions = extensionsPath;
+    };
+}
diff --git a/home/modules/gui/apps/browsers/chrome/default.nix b/home/modules/gui/apps/browsers/chrome/default.nix
new file mode 100644
index 0000000..906f10e
--- /dev/null
+++ b/home/modules/gui/apps/browsers/chrome/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      google-chrome
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/browsers/default.nix b/home/modules/gui/apps/browsers/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/browsers/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/browsers/edge/default.nix b/home/modules/gui/apps/browsers/edge/default.nix
new file mode 100644
index 0000000..3e2d72e
--- /dev/null
+++ b/home/modules/gui/apps/browsers/edge/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      microsoft-edge
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/browsers/epiphany/default.nix b/home/modules/gui/apps/browsers/epiphany/default.nix
new file mode 100644
index 0000000..252f968
--- /dev/null
+++ b/home/modules/gui/apps/browsers/epiphany/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      epiphany
+      ;
+  };
+}
diff --git a/home/modules/firefox/config/bookmarks/config/academic.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix
similarity index 100%
rename from home/modules/firefox/config/bookmarks/config/academic.nix
rename to home/modules/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix
diff --git a/home/modules/firefox/config/bookmarks/config/development.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix
similarity index 86%
rename from home/modules/firefox/config/bookmarks/config/development.nix
rename to home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix
index 54952e3..71269f2 100755
--- a/home/modules/firefox/config/bookmarks/config/development.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix
@@ -4,7 +4,8 @@ let
     "gitlab"
   ];
   gitlabURL = "https://gitlab.com/";
-in {
+in
+{
   name = "Development";
   toolbar = false;
   bookmarks = [
@@ -52,32 +53,26 @@ in {
     {
       name = "GitLab (Fallaryn)";
       url = "${gitlabURL}/fallaryn/dotfiles";
-      tags =
-        [
-          "fallaryn"
-        ]
-        ++ gitlabTags;
+      tags = [
+        "fallaryn"
+      ] ++ gitlabTags;
       keyword = "GitLab";
     }
     {
       name = "GitLab (Isaac)";
       url = "${gitlabURL}/askyourself/dotfiles";
-      tags =
-        [
-          "isaac"
-          "askyourself"
-        ]
-        ++ gitlabTags;
+      tags = [
+        "isaac"
+        "askyourself"
+      ] ++ gitlabTags;
       keyword = "GitLab";
     }
     {
       name = "GitLab (Nick)";
       url = "${gitlabURL}/upRootNutrition/dotfiles";
-      tags =
-        [
-          "brbwaffles"
-        ]
-        ++ gitlabTags;
+      tags = [
+        "brbwaffles"
+      ] ++ gitlabTags;
       keyword = "GitLab";
     }
     {
diff --git a/home/modules/firefox/config/bookmarks/config/finances.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix
similarity index 100%
rename from home/modules/firefox/config/bookmarks/config/finances.nix
rename to home/modules/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix
diff --git a/home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
similarity index 100%
rename from home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix
rename to home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
diff --git a/home/modules/firefox/config/bookmarks/config/gaming.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix
similarity index 100%
rename from home/modules/firefox/config/bookmarks/config/gaming.nix
rename to home/modules/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix
diff --git a/home/modules/firefox/config/bookmarks/config/shopping.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix
similarity index 100%
rename from home/modules/firefox/config/bookmarks/config/shopping.nix
rename to home/modules/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix
diff --git a/home/modules/firefox/config/bookmarks/config/socialMedia.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix
similarity index 100%
rename from home/modules/firefox/config/bookmarks/config/socialMedia.nix
rename to home/modules/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix
diff --git a/home/modules/firefox/config/bookmarks/config/tools.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix
similarity index 100%
rename from home/modules/firefox/config/bookmarks/config/tools.nix
rename to home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix
diff --git a/home/modules/firefox/config/bookmarks/config/tracking.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix
similarity index 100%
rename from home/modules/firefox/config/bookmarks/config/tracking.nix
rename to home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix
diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix
new file mode 100755
index 0000000..5d338de
--- /dev/null
+++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix
@@ -0,0 +1,34 @@
+{ flake, ... }:
+let
+  configPath = ./config;
+  flakedPath = configPath + /flake;
+
+  filterFiles = name: builtins.match ".*\\.nix$" name != null;
+
+  regularBookmarks =
+    let
+      files = builtins.attrNames (builtins.readDir configPath);
+    in
+    builtins.foldl' (
+      emptyList: bookmarkFile: emptyList ++ (import (configPath + "/${bookmarkFile}")).bookmarks
+    ) [ ] (builtins.filter filterFiles files);
+
+  flakedBookmarks =
+    let
+      files = builtins.attrNames (builtins.readDir flakedPath);
+    in
+    builtins.foldl' (
+      emptyList: bookmarkFile:
+      emptyList
+      ++ (import (flakedPath + "/${bookmarkFile}") {
+        inherit
+          flake
+          ;
+      }).bookmarks
+    ) [ ] (builtins.filter filterFiles files);
+
+  aggregatedBookmarks = regularBookmarks ++ flakedBookmarks;
+in
+{
+  bookmarks = aggregatedBookmarks;
+}
diff --git a/home/modules/firefox/config/extensions/default.nix b/home/modules/gui/apps/browsers/firefox/config/extensions/default.nix
similarity index 69%
rename from home/modules/firefox/config/extensions/default.nix
rename to home/modules/gui/apps/browsers/firefox/config/extensions/default.nix
index 7404419..7ca99b3 100755
--- a/home/modules/firefox/config/extensions/default.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/extensions/default.nix
@@ -1,7 +1,7 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   extensions = builtins.attrValues {
-    inherit
-      (pkgs.nur.repos.rycee.firefox-addons)
+    inherit (pkgs.nur.repos.rycee.firefox-addons)
       bitwarden
       enhancer-for-youtube
       sponsorblock
diff --git a/home/modules/firefox/config/search/config/academic.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/academic.nix
similarity index 61%
rename from home/modules/firefox/config/search/config/academic.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/config/academic.nix
index 105211c..57889a4 100755
--- a/home/modules/firefox/config/search/config/academic.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/search/config/academic.nix
@@ -5,7 +5,7 @@
     ];
     icon = ./icons/sc.png;
     urls = [
-      {template = "https://sci-hub.ee/{searchTerms}";}
+      { template = "https://sci-hub.ee/{searchTerms}"; }
     ];
   };
   "Wikipedia" = {
@@ -13,7 +13,7 @@
       "@wi"
     ];
     urls = [
-      {template = "https://en.wikipedia.org/wiki/{searchTerms}";}
+      { template = "https://en.wikipedia.org/wiki/{searchTerms}"; }
     ];
   };
 }
diff --git a/home/modules/firefox/config/search/config/development.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix
similarity index 56%
rename from home/modules/firefox/config/search/config/development.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/config/development.nix
index e898847..9d4c03d 100755
--- a/home/modules/firefox/config/search/config/development.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix
@@ -5,7 +5,7 @@
     ];
     icon = ./icons/dn.png;
     urls = [
-      {template = "https://dnschecker.org/#A/{searchTerms}";}
+      { template = "https://dnschecker.org/#A/{searchTerms}"; }
     ];
   };
   "Hackage" = {
@@ -14,7 +14,7 @@
     ];
     icon = ./icons/ha.png;
     urls = [
-      {template = "https://hackage.haskell.org/packages/search?terms={searchTerms}";}
+      { template = "https://hackage.haskell.org/packages/search?terms={searchTerms}"; }
     ];
   };
   "Hoogle" = {
@@ -23,7 +23,7 @@
     ];
     icon = ./icons/ho.png;
     urls = [
-      {template = "https://www.stackage.org/lts-22.33/hoogle?q={searchTerms}";}
+      { template = "https://www.stackage.org/lts-22.33/hoogle?q={searchTerms}"; }
     ];
   };
   "Nix Home Manager" = {
@@ -32,7 +32,7 @@
     ];
     icon = ./icons/nx.png;
     urls = [
-      {template = "https://searchix.alanpearce.eu/options/home-manager/search?query={searchTerms}";}
+      { template = "https://searchix.alanpearce.eu/options/home-manager/search?query={searchTerms}"; }
     ];
   };
   "Nix Options" = {
@@ -41,7 +41,7 @@
     ];
     icon = ./icons/nx.png;
     urls = [
-      {template = "https://searchix.alanpearce.eu/options/nixos/search?query={searchTerms}";}
+      { template = "https://searchix.alanpearce.eu/options/nixos/search?query={searchTerms}"; }
     ];
   };
   "Nix Packages" = {
@@ -50,7 +50,7 @@
     ];
     icon = ./icons/nx.png;
     urls = [
-      {template = "https://searchix.alanpearce.eu/packages/nixpkgs/search?query={searchTerms}";}
+      { template = "https://searchix.alanpearce.eu/packages/nixpkgs/search?query={searchTerms}"; }
     ];
   };
   "Nix Wiki" = {
@@ -59,7 +59,7 @@
     ];
     icon = ./icons/nx.png;
     urls = [
-      {template = "https://nixos.wiki/index.php?search={searchTerms}";}
+      { template = "https://nixos.wiki/index.php?search={searchTerms}"; }
     ];
   };
 }
diff --git a/home/modules/firefox/config/search/config/flake/icons/jf.png b/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png
similarity index 100%
rename from home/modules/firefox/config/search/config/flake/icons/jf.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png
diff --git a/home/modules/firefox/config/search/config/flake/icons/pt.png b/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png
similarity index 100%
rename from home/modules/firefox/config/search/config/flake/icons/pt.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png
diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix
new file mode 100755
index 0000000..f0df93e
--- /dev/null
+++ b/home/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix
@@ -0,0 +1,30 @@
+{ flake, ... }:
+let
+  inherit (flake.config.services)
+    instances
+    ;
+in
+{
+  "${instances.jellyfin.label}" = {
+    definedAliases = [
+      "@jf"
+    ];
+    icon = ./icons/jf.png;
+    urls = [
+      {
+        template = "https://${instances.jellyfin.subdomain}.${instances.web.domains.url0}/web/#/search.html?query={searchTerms}";
+      }
+    ];
+  };
+  "${instances.peertube.label}" = {
+    definedAliases = [
+      "@pt"
+    ];
+    icon = ./icons/pt.png;
+    urls = [
+      {
+        template = "https://${instances.peertube.subdomain}.${instances.web.domains.url1}/search?search={searchTerms}";
+      }
+    ];
+  };
+}
diff --git a/home/modules/firefox/config/search/config/gaming.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix
similarity index 60%
rename from home/modules/firefox/config/search/config/gaming.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix
index 260fb4b..59538e2 100755
--- a/home/modules/firefox/config/search/config/gaming.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix
@@ -5,7 +5,7 @@
     ];
     icon = ./icons/pd.png;
     urls = [
-      {template = "https://www.protondb.com/search?q={searchTerms}";}
+      { template = "https://www.protondb.com/search?q={searchTerms}"; }
     ];
   };
 
@@ -15,7 +15,7 @@
     ];
     icon = ./icons/sd.png;
     urls = [
-      {template = "https://steamdb.info/search/?a=all&q={searchTerms}";}
+      { template = "https://steamdb.info/search/?a=all&q={searchTerms}"; }
     ];
   };
 }
diff --git a/home/modules/firefox/config/search/config/hidden.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/hidden.nix
similarity index 100%
rename from home/modules/firefox/config/search/config/hidden.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/config/hidden.nix
diff --git a/home/modules/firefox/config/search/config/icons/13.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/13.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/13.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/13.png
diff --git a/home/modules/firefox/config/search/config/icons/al.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/al.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/al.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/al.png
diff --git a/home/modules/firefox/config/search/config/icons/am.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/am.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/am.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/am.png
diff --git a/home/modules/firefox/config/search/config/icons/br.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/br.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/br.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/br.png
diff --git a/home/modules/firefox/config/search/config/icons/cr.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/cr.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/cr.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/cr.png
diff --git a/home/modules/firefox/config/search/config/icons/dn.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/dn.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/dn.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/dn.png
diff --git a/home/modules/firefox/config/search/config/icons/do.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/do.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/do.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/do.png
diff --git a/home/modules/firefox/config/search/config/icons/fy.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/fy.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/fy.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/fy.png
diff --git a/home/modules/firefox/config/search/config/icons/ha.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ha.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/ha.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/ha.png
diff --git a/home/modules/firefox/config/search/config/icons/ho.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ho.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/ho.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/ho.png
diff --git a/home/modules/firefox/config/search/config/icons/ka.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ka.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/ka.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/ka.png
diff --git a/home/modules/firefox/config/search/config/icons/ki.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ki.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/ki.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/ki.png
diff --git a/home/modules/firefox/config/search/config/icons/me.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/me.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/me.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/me.png
diff --git a/home/modules/firefox/config/search/config/icons/ne.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ne.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/ne.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/ne.png
diff --git a/home/modules/firefox/config/search/config/icons/nx.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/nx.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/nx.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/nx.png
diff --git a/home/modules/firefox/config/search/config/icons/pd.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pd.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/pd.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/pd.png
diff --git a/home/modules/firefox/config/search/config/icons/ph.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ph.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/ph.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/ph.png
diff --git a/home/modules/firefox/config/search/config/icons/pi.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pi.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/pi.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/pi.png
diff --git a/home/modules/firefox/config/search/config/icons/re.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/re.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/re.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/re.png
diff --git a/home/modules/firefox/config/search/config/icons/rz.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/rz.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/rz.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/rz.png
diff --git a/home/modules/firefox/config/search/config/icons/sb.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sb.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/sb.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/sb.png
diff --git a/home/modules/firefox/config/search/config/icons/sc.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sc.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/sc.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/sc.png
diff --git a/home/modules/firefox/config/search/config/icons/sd.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sd.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/sd.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/sd.png
diff --git a/home/modules/firefox/config/search/config/icons/sk.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sk.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/sk.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/sk.png
diff --git a/home/modules/firefox/config/search/config/icons/tl.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tl.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/tl.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/tl.png
diff --git a/home/modules/firefox/config/search/config/icons/tw.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tw.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/tw.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/tw.png
diff --git a/home/modules/firefox/config/search/config/icons/ur.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ur.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/ur.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/ur.png
diff --git a/home/modules/firefox/config/search/config/icons/vs.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/vs.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/vs.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/vs.png
diff --git a/home/modules/firefox/config/search/config/icons/wi.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/wi.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/wi.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/wi.png
diff --git a/home/modules/firefox/config/search/config/icons/xh.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xh.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/xh.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/xh.png
diff --git a/home/modules/firefox/config/search/config/icons/xv.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xv.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/xv.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/xv.png
diff --git a/home/modules/firefox/config/search/config/icons/yo.png b/home/modules/gui/apps/browsers/firefox/config/search/config/icons/yo.png
similarity index 100%
rename from home/modules/firefox/config/search/config/icons/yo.png
rename to home/modules/gui/apps/browsers/firefox/config/search/config/icons/yo.png
diff --git a/home/modules/firefox/config/search/config/shopping.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/shopping.nix
similarity index 55%
rename from home/modules/firefox/config/search/config/shopping.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/config/shopping.nix
index 1adb1a8..9db95bb 100755
--- a/home/modules/firefox/config/search/config/shopping.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/search/config/shopping.nix
@@ -5,7 +5,7 @@
     ];
     icon = ./icons/am.png;
     urls = [
-      {template = "https://www.amazon.ca/s?k={searchTerms}&ref=nav_bb_sb";}
+      { template = "https://www.amazon.ca/s?k={searchTerms}&ref=nav_bb_sb"; }
     ];
   };
   "Door Dash" = {
@@ -14,7 +14,7 @@
     ];
     icon = ./icons/do.png;
     urls = [
-      {template = "https://www.doordash.com/search/store/{searchTerms}";}
+      { template = "https://www.doordash.com/search/store/{searchTerms}"; }
     ];
   };
   "FYT Supplies" = {
@@ -23,7 +23,9 @@
     ];
     icon = ./icons/fy.png;
     urls = [
-      {template = "https://fytsupplies.ca/search?type=product%2Carticle%2Cpage%2Ccollection&options[prefix]=last&q={searchTerms}*";}
+      {
+        template = "https://fytsupplies.ca/search?type=product%2Carticle%2Cpage%2Ccollection&options[prefix]=last&q={searchTerms}*";
+      }
     ];
   };
   "Kijiji" = {
@@ -32,7 +34,7 @@
     ];
     icon = ./icons/ki.png;
     urls = [
-      {template = "https://www.kijiji.ca/b-winnipeg/{searchTerms}";}
+      { template = "https://www.kijiji.ca/b-winnipeg/{searchTerms}"; }
     ];
   };
   "Memory Express" = {
@@ -41,7 +43,7 @@
     ];
     icon = ./icons/me.png;
     urls = [
-      {template = "https://www.memoryexpress.com/Search/Products?Search={searchTerms}";}
+      { template = "https://www.memoryexpress.com/Search/Products?Search={searchTerms}"; }
     ];
   };
   "Skip The Dishes" = {
@@ -50,7 +52,7 @@
     ];
     icon = ./icons/sk.png;
     urls = [
-      {template = "https://www.skipthedishes.com/winnipeg/items?search={searchTerms}";}
+      { template = "https://www.skipthedishes.com/winnipeg/items?search={searchTerms}"; }
     ];
   };
 }
diff --git a/home/modules/firefox/config/search/config/socialMedia.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/socialMedia.nix
similarity index 60%
rename from home/modules/firefox/config/search/config/socialMedia.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/config/socialMedia.nix
index 56969a8..37813d1 100755
--- a/home/modules/firefox/config/search/config/socialMedia.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/search/config/socialMedia.nix
@@ -5,7 +5,7 @@
     ];
     icon = ./icons/re.png;
     urls = [
-      {template = "https://www.reddit.com/search/?q={searchTerms}";}
+      { template = "https://www.reddit.com/search/?q={searchTerms}"; }
     ];
   };
   "YouTube" = {
@@ -14,7 +14,7 @@
     ];
     icon = ./icons/yo.png;
     urls = [
-      {template = "https://www.youtube.com/results?search_query={searchTerms}";}
+      { template = "https://www.youtube.com/results?search_query={searchTerms}"; }
     ];
   };
   "X" = {
@@ -23,7 +23,7 @@
     ];
     icon = ./icons/tw.png;
     urls = [
-      {template = "https://x.com/search?q={searchTerms}";}
+      { template = "https://x.com/search?q={searchTerms}"; }
     ];
   };
 }
diff --git a/home/modules/firefox/config/search/config/spank.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/spank.nix
similarity index 63%
rename from home/modules/firefox/config/search/config/spank.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/config/spank.nix
index 1ac3ecc..fedc206 100755
--- a/home/modules/firefox/config/search/config/spank.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/search/config/spank.nix
@@ -5,7 +5,7 @@
     ];
     icon = ./icons/sb.png;
     urls = [
-      {template = "https://spankbang.com/s/{searchTerms}/";}
+      { template = "https://spankbang.com/s/{searchTerms}/"; }
     ];
   };
   "XHampster" = {
@@ -14,7 +14,7 @@
     ];
     icon = ./icons/xh.png;
     urls = [
-      {template = "https://xhamster.com/search/{searchTerms}";}
+      { template = "https://xhamster.com/search/{searchTerms}"; }
     ];
   };
   "XVideos" = {
@@ -23,7 +23,7 @@
     ];
     icon = ./icons/xv.png;
     urls = [
-      {template = "https://www.xvideos.com/?k={searchTerms}";}
+      { template = "https://www.xvideos.com/?k={searchTerms}"; }
     ];
   };
 }
diff --git a/home/modules/firefox/config/search/config/tools.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/tools.nix
similarity index 55%
rename from home/modules/firefox/config/search/config/tools.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/config/tools.nix
index 0255ff3..fc0265d 100755
--- a/home/modules/firefox/config/search/config/tools.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/search/config/tools.nix
@@ -5,7 +5,7 @@
     ];
     icon = ./icons/al.png;
     urls = [
-      {template = "https://alternativeto.net/browse/search/?q={searchTerms}";}
+      { template = "https://alternativeto.net/browse/search/?q={searchTerms}"; }
     ];
   };
   "Rhyme Zone" = {
@@ -14,7 +14,9 @@
     ];
     icon = ./icons/rz.png;
     urls = [
-      {template = "https://www.rhymezone.com/r/rhyme.cgi?Word={searchTerms}&typeofrhyme=perfect&org1=syl&org2=l&org3=y";}
+      {
+        template = "https://www.rhymezone.com/r/rhyme.cgi?Word={searchTerms}&typeofrhyme=perfect&org1=syl&org2=l&org3=y";
+      }
     ];
   };
   "Urban Dictionary" = {
@@ -23,7 +25,7 @@
     ];
     icon = ./icons/ur.png;
     urls = [
-      {template = "https://www.urbandictionary.com/define.php?term={searchTerms}";}
+      { template = "https://www.urbandictionary.com/define.php?term={searchTerms}"; }
     ];
   };
   "Stanford Encyclopedia of Philosophy" = {
@@ -32,7 +34,7 @@
     ];
     icon = ./icons/ph.png;
     urls = [
-      {template = "https://plato.stanford.edu/search/searcher.py?query={searchTerms}";}
+      { template = "https://plato.stanford.edu/search/searcher.py?query={searchTerms}"; }
     ];
   };
 }
diff --git a/home/modules/firefox/config/search/config/tracking.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/tracking.nix
similarity index 55%
rename from home/modules/firefox/config/search/config/tracking.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/config/tracking.nix
index 63597ac..ee72fcd 100755
--- a/home/modules/firefox/config/search/config/tracking.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/search/config/tracking.nix
@@ -5,7 +5,7 @@
     ];
     icon = ./icons/13.png;
     urls = [
-      {template = "https://1337x.to/search/{searchTerms}/1/";}
+      { template = "https://1337x.to/search/{searchTerms}/1/"; }
     ];
   };
   "Core Radio" = {
@@ -14,7 +14,7 @@
     ];
     icon = ./icons/cr.png;
     urls = [
-      {template = "https://coreradio.online/?do=search&subaction=search&story={searchTerms}";}
+      { template = "https://coreradio.online/?do=search&subaction=search&story={searchTerms}"; }
     ];
   };
   "The Pirate Bay" = {
@@ -23,7 +23,9 @@
     ];
     icon = ./icons/pi.png;
     urls = [
-      {template = "https://thepiratebay.org/search.php?q={searchTerms}&all=on&search=Pirate+Search&page=0&orderby=";}
+      {
+        template = "https://thepiratebay.org/search.php?q={searchTerms}&all=on&search=Pirate+Search&page=0&orderby=";
+      }
     ];
   };
   "Torrent Leech" = {
@@ -32,7 +34,7 @@
     ];
     icon = ./icons/tl.png;
     urls = [
-      {template = "https://www.torrentleech.org/torrents/browse/index/query/{searchTerms}";}
+      { template = "https://www.torrentleech.org/torrents/browse/index/query/{searchTerms}"; }
     ];
   };
   "VSTorrent" = {
@@ -41,7 +43,7 @@
     ];
     icon = ./icons/vs.png;
     urls = [
-      {template = "https://vstorrent.org/?s={searchTerms}";}
+      { template = "https://vstorrent.org/?s={searchTerms}"; }
     ];
   };
 }
diff --git a/home/modules/firefox/config/search/config/web.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/web.nix
similarity index 59%
rename from home/modules/firefox/config/search/config/web.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/config/web.nix
index d1ac2fe..e2946e3 100755
--- a/home/modules/firefox/config/search/config/web.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/search/config/web.nix
@@ -5,7 +5,7 @@
     ];
     icon = ./icons/br.png;
     urls = [
-      {template = "https://search.brave.com/search?q={searchTerms}&source=web";}
+      { template = "https://search.brave.com/search?q={searchTerms}&source=web"; }
     ];
   };
   "Kagi" = {
@@ -14,7 +14,7 @@
     ];
     icon = ./icons/ka.png;
     urls = [
-      {template = "https://kagi.com/search?q={searchTerms}";}
+      { template = "https://kagi.com/search?q={searchTerms}"; }
     ];
   };
 }
diff --git a/home/modules/firefox/config/search/default.nix b/home/modules/gui/apps/browsers/firefox/config/search/default.nix
similarity index 51%
rename from home/modules/firefox/config/search/default.nix
rename to home/modules/gui/apps/browsers/firefox/config/search/default.nix
index 4b60b1c..d2f1b33 100755
--- a/home/modules/firefox/config/search/default.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/search/default.nix
@@ -1,30 +1,33 @@
-{flake, ...}: let
+{ flake, ... }:
+let
   configPath = ./config;
   flakedPath = configPath + /flake;
 
-  regularSearchEngines = let
-    files = builtins.attrNames (builtins.readDir configPath);
-  in
+  regularSearchEngines =
+    let
+      files = builtins.attrNames (builtins.readDir configPath);
+    in
     builtins.foldl' (
-      emptySet: searchEngine:
-        emptySet // (import (configPath + "/${searchEngine}"))
-    ) {} (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
+      emptySet: searchEngine: emptySet // (import (configPath + "/${searchEngine}"))
+    ) { } (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
 
-  flakedSearchEngines = let
-    files = builtins.attrNames (builtins.readDir flakedPath);
-  in
+  flakedSearchEngines =
+    let
+      files = builtins.attrNames (builtins.readDir flakedPath);
+    in
     builtins.foldl' (
       emptySet: searchEngine:
-        emptySet
-        // (import (flakedPath + "/${searchEngine}") {
-          inherit
-            flake
-            ;
-        })
-    ) {} (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
+      emptySet
+      // (import (flakedPath + "/${searchEngine}") {
+        inherit
+          flake
+          ;
+      })
+    ) { } (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
 
   aggregatedSearchEngines = regularSearchEngines // flakedSearchEngines;
-in {
+in
+{
   search = {
     force = true;
     default = "Kagi";
diff --git a/home/modules/firefox/config/settings/config/cosmetics.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/cosmetics.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix
diff --git a/home/modules/firefox/config/settings/config/diskAvoidance.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/diskAvoidance.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix
diff --git a/home/modules/firefox/config/settings/config/fingerprinting.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/fingerprinting.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix
diff --git a/home/modules/firefox/config/settings/config/formFill.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/formFill.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/formFill.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/formFill.nix
diff --git a/home/modules/firefox/config/settings/config/geolocation.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/geolocation.nix
similarity index 59%
rename from home/modules/firefox/config/settings/config/geolocation.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/geolocation.nix
index c2181e0..cc5924e 100755
--- a/home/modules/firefox/config/settings/config/geolocation.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/settings/config/geolocation.nix
@@ -1,5 +1,6 @@
 {
-  "geo.provider.network.url" = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
+  "geo.provider.network.url" =
+    "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
   "geo.provider.ms-windows-location" = false;
   "geo.provider.use_corelocation" = false;
   "geo.provider.use_gpsd" = false;
diff --git a/home/modules/firefox/config/settings/config/hardening.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/hardening.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/hardening.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/hardening.nix
diff --git a/home/modules/firefox/config/settings/config/https.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/https.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/https.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/https.nix
diff --git a/home/modules/firefox/config/settings/config/misc.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/misc.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/misc.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/misc.nix
diff --git a/home/modules/firefox/config/settings/config/noTouching.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/noTouching.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/noTouching.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/noTouching.nix
diff --git a/home/modules/firefox/config/settings/config/opSec.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/opSec.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/opSec.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/opSec.nix
diff --git a/home/modules/firefox/config/settings/config/outbound.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/outbound.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/outbound.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/outbound.nix
diff --git a/home/modules/firefox/config/settings/config/passwords.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/passwords.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/passwords.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/passwords.nix
diff --git a/home/modules/firefox/config/settings/config/privacy.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/privacy.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/privacy.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/privacy.nix
diff --git a/home/modules/firefox/config/settings/config/proxy.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/proxy.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/proxy.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/proxy.nix
diff --git a/home/modules/firefox/config/settings/config/startup.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/startup.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/startup.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/startup.nix
diff --git a/home/modules/firefox/config/settings/config/telemetry.nix b/home/modules/gui/apps/browsers/firefox/config/settings/config/telemetry.nix
similarity index 100%
rename from home/modules/firefox/config/settings/config/telemetry.nix
rename to home/modules/gui/apps/browsers/firefox/config/settings/config/telemetry.nix
diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/default.nix b/home/modules/gui/apps/browsers/firefox/config/settings/default.nix
new file mode 100755
index 0000000..9644f42
--- /dev/null
+++ b/home/modules/gui/apps/browsers/firefox/config/settings/default.nix
@@ -0,0 +1,14 @@
+let
+  configPath = ./config;
+
+  aggregatedSettings =
+    let
+      files = builtins.attrNames (builtins.readDir configPath);
+    in
+    builtins.foldl' (
+      emptySet: settingsFile: emptySet // (import (configPath + "/${settingsFile}"))
+    ) { } (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
+in
+{
+  settings = aggregatedSettings;
+}
diff --git a/home/modules/firefox/config/themes/config/userChrome.css b/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css
similarity index 100%
rename from home/modules/firefox/config/themes/config/userChrome.css
rename to home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css
diff --git a/home/modules/firefox/config/themes/default.nix b/home/modules/gui/apps/browsers/firefox/config/themes/default.nix
similarity index 100%
rename from home/modules/firefox/config/themes/default.nix
rename to home/modules/gui/apps/browsers/firefox/config/themes/default.nix
diff --git a/home/modules/gui/apps/browsers/firefox/default.nix b/home/modules/gui/apps/browsers/firefox/default.nix
new file mode 100755
index 0000000..80cb8fc
--- /dev/null
+++ b/home/modules/gui/apps/browsers/firefox/default.nix
@@ -0,0 +1,57 @@
+{
+  pkgs,
+  flake,
+  ...
+}:
+let
+  inherit (flake.config.people)
+    user0
+    ;
+in
+{
+  programs.firefox =
+    let
+      configPath = ./config;
+      bookmarksPath = import (configPath + /bookmarks) {
+        inherit
+          flake
+          ;
+      };
+      extensionsPath = import (configPath + /extensions) {
+        inherit
+          pkgs
+          ;
+      };
+      searchPath = import (configPath + /search) {
+        inherit
+          flake
+          ;
+      };
+      settingsPath = import (configPath + /settings);
+      themesPath = import (configPath + /themes);
+    in
+    {
+      enable = true;
+      package = pkgs.firefox;
+      profiles = {
+        ${user0} =
+          {
+            isDefault = true;
+            id = 0;
+          }
+          // bookmarksPath
+          // extensionsPath
+          // searchPath
+          // settingsPath
+          // themesPath;
+        testing =
+          {
+            isDefault = false;
+            id = 1;
+          }
+          // bookmarksPath
+          // searchPath
+          // themesPath;
+      };
+    };
+}
diff --git a/home/modules/gui/apps/browsers/ladybird/default.nix b/home/modules/gui/apps/browsers/ladybird/default.nix
new file mode 100644
index 0000000..68b8aed
--- /dev/null
+++ b/home/modules/gui/apps/browsers/ladybird/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      ladybird
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/browsers/opera/default.nix b/home/modules/gui/apps/browsers/opera/default.nix
new file mode 100644
index 0000000..12922ed
--- /dev/null
+++ b/home/modules/gui/apps/browsers/opera/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      opera
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/browsers/tor/default.nix b/home/modules/gui/apps/browsers/tor/default.nix
new file mode 100644
index 0000000..d96d1ba
--- /dev/null
+++ b/home/modules/gui/apps/browsers/tor/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      tor-browser
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/browsers/vivaldi/default.nix b/home/modules/gui/apps/browsers/vivaldi/default.nix
new file mode 100644
index 0000000..7995243
--- /dev/null
+++ b/home/modules/gui/apps/browsers/vivaldi/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      vivaldi
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/default.nix b/home/modules/gui/apps/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/gaming/default.nix b/home/modules/gui/apps/gaming/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/gaming/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/gaming/heroic/default.nix b/home/modules/gui/apps/gaming/heroic/default.nix
new file mode 100644
index 0000000..269aeed
--- /dev/null
+++ b/home/modules/gui/apps/gaming/heroic/default.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      heroic
+      gogdl
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/gaming/lutris/default.nix b/home/modules/gui/apps/gaming/lutris/default.nix
new file mode 100644
index 0000000..f6a2f43
--- /dev/null
+++ b/home/modules/gui/apps/gaming/lutris/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      lutris
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/gaming/prismLauncher/default.nix b/home/modules/gui/apps/gaming/prismLauncher/default.nix
new file mode 100644
index 0000000..fdcf772
--- /dev/null
+++ b/home/modules/gui/apps/gaming/prismLauncher/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      prismlauncher
+      ;
+  };
+}
diff --git a/home/modules/steam/default.nix b/home/modules/gui/apps/gaming/steam/default.nix
similarity index 82%
rename from home/modules/steam/default.nix
rename to home/modules/gui/apps/gaming/steam/default.nix
index 276de79..191e287 100755
--- a/home/modules/steam/default.nix
+++ b/home/modules/gui/apps/gaming/steam/default.nix
@@ -1,7 +1,10 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  ...
+}:
+{
   home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
+    inherit (pkgs)
       steam
       ;
   };
diff --git a/home/modules/steam/steam_dev.cfg b/home/modules/gui/apps/gaming/steam/steam_dev.cfg
similarity index 100%
rename from home/modules/steam/steam_dev.cfg
rename to home/modules/gui/apps/gaming/steam/steam_dev.cfg
diff --git a/home/modules/gui/apps/ide/default.nix b/home/modules/gui/apps/ide/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/ide/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/vscode/config/extensions.nix b/home/modules/gui/apps/ide/vsCode/config/extensions.nix
similarity index 87%
rename from home/modules/vscode/config/extensions.nix
rename to home/modules/gui/apps/ide/vsCode/config/extensions.nix
index afb9ed4..c8add2a 100755
--- a/home/modules/vscode/config/extensions.nix
+++ b/home/modules/gui/apps/ide/vsCode/config/extensions.nix
@@ -1,5 +1,6 @@
-{pkgs, ...}:
-with pkgs.vscode-extensions; [
+{ pkgs, ... }:
+with pkgs.vscode-extensions;
+[
   catppuccin.catppuccin-vsc
   eamodio.gitlens
   elmtooling.elm-ls-vscode
diff --git a/home/modules/vscode/config/keybindings.nix b/home/modules/gui/apps/ide/vsCode/config/keybindings.nix
similarity index 100%
rename from home/modules/vscode/config/keybindings.nix
rename to home/modules/gui/apps/ide/vsCode/config/keybindings.nix
diff --git a/home/modules/vscode/config/userSettings.nix b/home/modules/gui/apps/ide/vsCode/config/userSettings.nix
similarity index 100%
rename from home/modules/vscode/config/userSettings.nix
rename to home/modules/gui/apps/ide/vsCode/config/userSettings.nix
diff --git a/home/modules/gui/apps/ide/vsCode/default.nix b/home/modules/gui/apps/ide/vsCode/default.nix
new file mode 100755
index 0000000..0035ef5
--- /dev/null
+++ b/home/modules/gui/apps/ide/vsCode/default.nix
@@ -0,0 +1,34 @@
+{
+  pkgs,
+  lib,
+  flake,
+  ...
+}:
+{
+  programs = {
+    vscode =
+      let
+        configPath = ./config;
+        keybindingsPath = import (configPath + /keybindings.nix);
+        extensionsPath = import (configPath + /extensions.nix) {
+          inherit
+            pkgs
+            ;
+        };
+        userSettingsPath = import (configPath + /userSettings.nix) {
+          inherit
+            pkgs
+            lib
+            flake
+            ;
+        };
+      in
+      {
+        enable = true;
+        package = pkgs.vscode;
+        keybindings = keybindingsPath;
+        extensions = extensionsPath;
+        userSettings = userSettingsPath;
+      };
+  };
+}
diff --git a/home/modules/zed/config/extensions/default.nix b/home/modules/gui/apps/ide/zed/config/extensions/default.nix
similarity index 100%
rename from home/modules/zed/config/extensions/default.nix
rename to home/modules/gui/apps/ide/zed/config/extensions/default.nix
diff --git a/home/modules/zed/config/extraPackages/default.nix b/home/modules/gui/apps/ide/zed/config/extraPackages/default.nix
similarity index 100%
rename from home/modules/zed/config/extraPackages/default.nix
rename to home/modules/gui/apps/ide/zed/config/extraPackages/default.nix
diff --git a/home/modules/zed/config/userKeymaps/default.nix b/home/modules/gui/apps/ide/zed/config/userKeymaps/default.nix
similarity index 100%
rename from home/modules/zed/config/userKeymaps/default.nix
rename to home/modules/gui/apps/ide/zed/config/userKeymaps/default.nix
diff --git a/home/modules/zed/config/userSettings/config/assistant/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/config/assistant/default.nix
similarity index 100%
rename from home/modules/zed/config/userSettings/config/assistant/default.nix
rename to home/modules/gui/apps/ide/zed/config/userSettings/config/assistant/default.nix
diff --git a/home/modules/zed/config/userSettings/config/git/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/config/git/default.nix
similarity index 100%
rename from home/modules/zed/config/userSettings/config/git/default.nix
rename to home/modules/gui/apps/ide/zed/config/userSettings/config/git/default.nix
diff --git a/home/modules/zed/config/userSettings/config/interface/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/config/interface/default.nix
similarity index 100%
rename from home/modules/zed/config/userSettings/config/interface/default.nix
rename to home/modules/gui/apps/ide/zed/config/userSettings/config/interface/default.nix
diff --git a/home/modules/zed/config/userSettings/config/languages/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/config/languages/default.nix
similarity index 100%
rename from home/modules/zed/config/userSettings/config/languages/default.nix
rename to home/modules/gui/apps/ide/zed/config/userSettings/config/languages/default.nix
diff --git a/home/modules/zed/config/userSettings/config/lsp/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/config/lsp/default.nix
similarity index 100%
rename from home/modules/zed/config/userSettings/config/lsp/default.nix
rename to home/modules/gui/apps/ide/zed/config/userSettings/config/lsp/default.nix
diff --git a/home/modules/gui/apps/ide/zed/config/userSettings/config/misc/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/config/misc/default.nix
new file mode 100755
index 0000000..9376843
--- /dev/null
+++ b/home/modules/gui/apps/ide/zed/config/userSettings/config/misc/default.nix
@@ -0,0 +1,20 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+{
+  node = {
+    path = lib.getExe pkgs.nodejs;
+    npm_path = lib.getExe' pkgs.nodejs "npm";
+  };
+
+  soft_wrap = "editor_width";
+
+  auto_update = false;
+  autosave = "on_focus_change";
+  load_direnv = "shell_hook";
+  base_keymap = "VSCode";
+  restore_on_startup = "last_session";
+  show_wrap_guides = true;
+}
diff --git a/home/modules/zed/config/userSettings/config/terminal/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/config/terminal/default.nix
similarity index 100%
rename from home/modules/zed/config/userSettings/config/terminal/default.nix
rename to home/modules/gui/apps/ide/zed/config/userSettings/config/terminal/default.nix
diff --git a/home/modules/zed/config/userSettings/config/theme/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/config/theme/default.nix
similarity index 100%
rename from home/modules/zed/config/userSettings/config/theme/default.nix
rename to home/modules/gui/apps/ide/zed/config/userSettings/config/theme/default.nix
diff --git a/home/modules/zed/config/userSettings/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/default.nix
similarity index 69%
rename from home/modules/zed/config/userSettings/default.nix
rename to home/modules/gui/apps/ide/zed/config/userSettings/default.nix
index e52c2e7..8436f72 100755
--- a/home/modules/zed/config/userSettings/default.nix
+++ b/home/modules/gui/apps/ide/zed/config/userSettings/default.nix
@@ -27,6 +27,7 @@ let
       ;
   };
   gitPath = import (configPath + /git);
+  miscPath = import (configPath + /misc) { inherit lib pkgs; };
 in
 {
   assistant = assistantPath;
@@ -36,18 +37,6 @@ in
   terminal = terminalPath;
   experimental.theme_overrides = experimentalPath;
 
-  node = {
-    path = lib.getExe pkgs.nodejs;
-    npm_path = lib.getExe' pkgs.nodejs "npm";
-  };
-
-  soft_wrap = "editor_width";
-
-  auto_update = false;
-  autosave = "on_focus_change";
-  load_direnv = "shell_hook";
-  base_keymap = "VSCode";
-  restore_on_startup = "last_session";
-  show_wrap_guides = true;
 }
 // interfacePath
+// miscPath
diff --git a/home/modules/zed/default.nix b/home/modules/gui/apps/ide/zed/default.nix
similarity index 100%
rename from home/modules/zed/default.nix
rename to home/modules/gui/apps/ide/zed/default.nix
diff --git a/home/modules/gui/apps/media/audio/audioEditing/default.nix b/home/modules/gui/apps/media/audio/audioEditing/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/audioEditing/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/audio/audioEditing/metadata/default.nix b/home/modules/gui/apps/media/audio/audioEditing/metadata/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/audioEditing/metadata/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/audio/audioEditing/metadata/kid3/default.nix b/home/modules/gui/apps/media/audio/audioEditing/metadata/kid3/default.nix
new file mode 100644
index 0000000..84b3603
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/audioEditing/metadata/kid3/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      kid3
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/audio/audioEditing/metadata/mp3Gain/default.nix b/home/modules/gui/apps/media/audio/audioEditing/metadata/mp3Gain/default.nix
new file mode 100644
index 0000000..536217f
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/audioEditing/metadata/mp3Gain/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      mp3gain
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/audio/audioEditing/metadata/puddleTag/default.nix b/home/modules/gui/apps/media/audio/audioEditing/metadata/puddleTag/default.nix
new file mode 100644
index 0000000..15440cf
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/audioEditing/metadata/puddleTag/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      puddletag
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/audio/audioEditing/production/default.nix b/home/modules/gui/apps/media/audio/audioEditing/production/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/audioEditing/production/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/audio/audioEditing/production/reaper/default.nix b/home/modules/gui/apps/media/audio/audioEditing/production/reaper/default.nix
new file mode 100644
index 0000000..bd04481
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/audioEditing/production/reaper/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      reaper
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/audio/audioPlaying/default.nix b/home/modules/gui/apps/media/audio/audioPlaying/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/audioPlaying/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix b/home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix
new file mode 100644
index 0000000..91238af
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      feishin
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix b/home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix
new file mode 100644
index 0000000..8f343e4
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      spotify
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/audio/default.nix b/home/modules/gui/apps/media/audio/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/audio/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/default.nix b/home/modules/gui/apps/media/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/doc/default.nix b/home/modules/gui/apps/media/doc/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/doc/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/doc/docEditing/default.nix b/home/modules/gui/apps/media/doc/docEditing/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/doc/docEditing/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/misc/productionWriting.nix b/home/modules/gui/apps/media/doc/docEditing/libreOffice/default.nix
old mode 100755
new mode 100644
similarity index 57%
rename from home/modules/misc/productionWriting.nix
rename to home/modules/gui/apps/media/doc/docEditing/libreOffice/default.nix
index 1088362..5529351
--- a/home/modules/misc/productionWriting.nix
+++ b/home/modules/gui/apps/media/doc/docEditing/libreOffice/default.nix
@@ -1,9 +1,11 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  ...
+}:
+{
   home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
+    inherit (pkgs)
       libreoffice
-      obsidian
       ;
   };
 }
diff --git a/home/modules/gui/apps/media/doc/docEditing/logseq/default.nix b/home/modules/gui/apps/media/doc/docEditing/logseq/default.nix
new file mode 100644
index 0000000..c5e70d1
--- /dev/null
+++ b/home/modules/gui/apps/media/doc/docEditing/logseq/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      logseq
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/doc/docEditing/obsidian/default.nix b/home/modules/gui/apps/media/doc/docEditing/obsidian/default.nix
new file mode 100644
index 0000000..6071fd9
--- /dev/null
+++ b/home/modules/gui/apps/media/doc/docEditing/obsidian/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      obsidian
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/doc/docEditing/wpsOffice/default.nix b/home/modules/gui/apps/media/doc/docEditing/wpsOffice/default.nix
new file mode 100644
index 0000000..bae1d6d
--- /dev/null
+++ b/home/modules/gui/apps/media/doc/docEditing/wpsOffice/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      wpsoffice
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/doc/docViewing/default.nix b/home/modules/gui/apps/media/doc/docViewing/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/doc/docViewing/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/doc/docViewing/okular/default.nix b/home/modules/gui/apps/media/doc/docViewing/okular/default.nix
new file mode 100644
index 0000000..a561e70
--- /dev/null
+++ b/home/modules/gui/apps/media/doc/docViewing/okular/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      okular
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/images/default.nix b/home/modules/gui/apps/media/images/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/images/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/images/imageEditing/default.nix b/home/modules/gui/apps/media/images/imageEditing/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/images/imageEditing/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix b/home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix
new file mode 100644
index 0000000..1e59bdb
--- /dev/null
+++ b/home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix
@@ -0,0 +1,18 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      inkscape-with-extensions
+      ;
+    inherit (pkgs.inkscape-extensions)
+      # inkcut
+      hexmap
+      textext
+      silhouette
+      applytransforms
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix b/home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix
new file mode 100644
index 0000000..bc29e09
--- /dev/null
+++ b/home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs.kdePackages)
+      kolourpaint
+      ;
+  };
+}
diff --git a/home/modules/misc/productionArt.nix b/home/modules/gui/apps/media/images/imageEditing/krita/default.nix
old mode 100755
new mode 100644
similarity index 51%
rename from home/modules/misc/productionArt.nix
rename to home/modules/gui/apps/media/images/imageEditing/krita/default.nix
index 0bb7ef0..3f3fca7
--- a/home/modules/misc/productionArt.nix
+++ b/home/modules/gui/apps/media/images/imageEditing/krita/default.nix
@@ -1,9 +1,12 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  ...
+}:
+{
   home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      inkscape
+    inherit (pkgs)
       krita
+      krita-plugin-gmic
       ;
   };
 }
diff --git a/home/modules/gui/apps/media/images/imageViewing/default.nix b/home/modules/gui/apps/media/images/imageViewing/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/images/imageViewing/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix b/home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix
new file mode 100644
index 0000000..244c425
--- /dev/null
+++ b/home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      gwenview
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix b/home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix
new file mode 100644
index 0000000..00faf88
--- /dev/null
+++ b/home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      nomacs
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/video/default.nix b/home/modules/gui/apps/media/video/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/video/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix b/home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix
new file mode 100644
index 0000000..d1d72c5
--- /dev/null
+++ b/home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      davinci-resolve
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/video/videoEditing/default.nix b/home/modules/gui/apps/media/video/videoEditing/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/video/videoEditing/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix b/home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix
new file mode 100644
index 0000000..e14d341
--- /dev/null
+++ b/home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs.kdePackages)
+      kdenlive
+      ;
+  };
+}
diff --git a/home/modules/obs-studio/default.nix b/home/modules/gui/apps/media/video/videoEditing/obsStudio/default.nix
similarity index 82%
rename from home/modules/obs-studio/default.nix
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/default.nix
index 646df6f..98f31d1 100755
--- a/home/modules/obs-studio/default.nix
+++ b/home/modules/gui/apps/media/video/videoEditing/obsStudio/default.nix
@@ -1,10 +1,10 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs = {
     obs-studio = {
       enable = true;
       plugins = builtins.attrValues {
-        inherit
-          (pkgs.obs-studio-plugins)
+        inherit (pkgs.obs-studio-plugins)
           obs-tuna
           obs-vkcapture
           obs-multi-rtmp
diff --git a/home/modules/obs-studio/themes/Catppuccin Frappe (compact).qss b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin Frappe (compact).qss
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss
diff --git a/home/modules/obs-studio/themes/Catppuccin Frappe.qss b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin Frappe.qss
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss
diff --git a/home/modules/obs-studio/themes/Catppuccin Latte (compact).qss b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin Latte (compact).qss
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss
diff --git a/home/modules/obs-studio/themes/Catppuccin Latte.qss b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin Latte.qss
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss
diff --git a/home/modules/obs-studio/themes/Catppuccin Macchiato (compact).qss b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin Macchiato (compact).qss
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss
diff --git a/home/modules/obs-studio/themes/Catppuccin Macchiato.qss b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin Macchiato.qss
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss
diff --git a/home/modules/obs-studio/themes/Catppuccin Mocha (compact).qss b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin Mocha (compact).qss
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss
diff --git a/home/modules/obs-studio/themes/Catppuccin Mocha.qss b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin Mocha.qss
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/alert.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/alert.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_checked.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_checked.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_checked_focus.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_checked_focus.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_unchecked.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_unchecked.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/close.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/close.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/cogs.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/cogs.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/collapse.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/collapse.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/dots-vert.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/dots-vert.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/dots.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/dots.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/down.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/down.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/entry-clear.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/entry-clear.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/expand.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/expand.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/filter.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/filter.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/interact.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/interact.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/left.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/left.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/locked.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/locked.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/media-pause.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/media-pause.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/media/media_next.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/media/media_next.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/media/media_pause.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/media/media_pause.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/media/media_play.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/media/media_play.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/media/media_previous.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/media/media_previous.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/media/media_restart.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/media/media_restart.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/media/media_stop.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/media/media_stop.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/minus.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/minus.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/mute.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/mute.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/no_sources.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/no_sources.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/plus.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/plus.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/popout.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/popout.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/refresh.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/refresh.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/revert.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/revert.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/right.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/right.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/save.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/save.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/settings/accessibility.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/settings/accessibility.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/settings/advanced.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/settings/advanced.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/settings/audio.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/settings/audio.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/settings/general.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/settings/general.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/settings/hotkeys.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/settings/hotkeys.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/settings/output.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/settings/output.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/settings/stream.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/settings/stream.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/settings/video.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/settings/video.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/brush.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/brush.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/camera.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/camera.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/default.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/default.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/gamepad.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/gamepad.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/globe.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/globe.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/group.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/group.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/image.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/image.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/media.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/media.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/microphone.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/microphone.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/scene.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/scene.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/slideshow.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/slideshow.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/text.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/text.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/window.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/window.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/sources/windowaudio.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/sources/windowaudio.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/trash.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/trash.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/up.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/up.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/updown.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/updown.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Dark/visible.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Dark/visible.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/alert.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/alert.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/checkbox_checked.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/checkbox_checked.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/checkbox_checked_disabled.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/checkbox_checked_disabled.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/checkbox_checked_focus.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/checkbox_checked_focus.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/checkbox_unchecked.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/checkbox_unchecked.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/close.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/close.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/cogs.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/cogs.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/collapse.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/collapse.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/dots-vert.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/dots-vert.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/dots.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/dots.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/down.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/down.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/entry-clear.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/entry-clear.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/expand.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/expand.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/filter.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/filter.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/interact.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/interact.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/left.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/left.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/locked.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/locked.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/media-pause.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/media-pause.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/media/media_next.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/media/media_next.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/media/media_pause.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/media/media_pause.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/media/media_play.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/media/media_play.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/media/media_previous.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/media/media_previous.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/media/media_restart.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/media/media_restart.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/media/media_stop.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/media/media_stop.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/minus.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/minus.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/mute.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/mute.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/no_sources.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/no_sources.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/plus.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/plus.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/popout.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/popout.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/refresh.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/refresh.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/revert.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/revert.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/right.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/right.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/save.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/save.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/settings/accessibility.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/settings/accessibility.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/settings/advanced.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/settings/advanced.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/settings/audio.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/settings/audio.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/settings/general.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/settings/general.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/settings/hotkeys.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/settings/hotkeys.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/settings/output.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/settings/output.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/settings/stream.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/settings/stream.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/settings/video.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/settings/video.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/brush.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/brush.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/camera.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/camera.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/default.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/default.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/gamepad.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/gamepad.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/globe.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/globe.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/group.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/group.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/image.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/image.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/media.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/media.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/microphone.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/microphone.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/scene.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/scene.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/slideshow.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/slideshow.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/text.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/text.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/window.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/window.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/sources/windowaudio.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/sources/windowaudio.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/trash.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/trash.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/up.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/up.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/updown.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/updown.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg
diff --git a/home/modules/obs-studio/themes/Catppuccin/Light/visible.svg b/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg
similarity index 100%
rename from home/modules/obs-studio/themes/Catppuccin/Light/visible.svg
rename to home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg
diff --git a/home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix b/home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix
new file mode 100644
index 0000000..db0aade
--- /dev/null
+++ b/home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      shotcut
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/media/video/videoPlaying/default.nix b/home/modules/gui/apps/media/video/videoPlaying/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/media/video/videoPlaying/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/freetube/config/settings.nix b/home/modules/gui/apps/media/video/videoPlaying/freetube/config/settings.nix
similarity index 100%
rename from home/modules/freetube/config/settings.nix
rename to home/modules/gui/apps/media/video/videoPlaying/freetube/config/settings.nix
diff --git a/home/modules/gui/apps/media/video/videoPlaying/freetube/default.nix b/home/modules/gui/apps/media/video/videoPlaying/freetube/default.nix
new file mode 100755
index 0000000..2872d9c
--- /dev/null
+++ b/home/modules/gui/apps/media/video/videoPlaying/freetube/default.nix
@@ -0,0 +1,11 @@
+{
+  programs.freetube =
+    let
+      configPath = ./config;
+      settingsPath = import (configPath + /settings.nix);
+    in
+    {
+      enable = true;
+      settings = settingsPath;
+    };
+}
diff --git a/home/modules/mpv.nix b/home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix
old mode 100755
new mode 100644
similarity index 100%
rename from home/modules/mpv.nix
rename to home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix
diff --git a/home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix b/home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix
new file mode 100644
index 0000000..22c2741
--- /dev/null
+++ b/home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      stremio
+      ;
+  };
+}
diff --git a/home/modules/misc/productionVideo.nix b/home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix
old mode 100755
new mode 100644
similarity index 56%
rename from home/modules/misc/productionVideo.nix
rename to home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix
index 8f048ae..196150b
--- a/home/modules/misc/productionVideo.nix
+++ b/home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix
@@ -1,8 +1,10 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  ...
+}:
+{
   home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      shotcut
+    inherit (pkgs)
       syncplay
       ;
   };
diff --git a/home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix b/home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix
new file mode 100644
index 0000000..6df9a4e
--- /dev/null
+++ b/home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      vlc
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/messaging/default.nix b/home/modules/gui/apps/messaging/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/messaging/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/messaging/discord/default.nix b/home/modules/gui/apps/messaging/discord/default.nix
new file mode 100644
index 0000000..29513ac
--- /dev/null
+++ b/home/modules/gui/apps/messaging/discord/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      discord
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/messaging/element/default.nix b/home/modules/gui/apps/messaging/element/default.nix
new file mode 100644
index 0000000..9dfabfb
--- /dev/null
+++ b/home/modules/gui/apps/messaging/element/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      element-desktop
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/messaging/nheko/default.nix b/home/modules/gui/apps/messaging/nheko/default.nix
new file mode 100644
index 0000000..601835b
--- /dev/null
+++ b/home/modules/gui/apps/messaging/nheko/default.nix
@@ -0,0 +1,8 @@
+{
+  programs.nheko = {
+    enable = true;
+    settings = {
+
+    };
+  };
+}
diff --git a/home/modules/gui/apps/messaging/signal/default.nix b/home/modules/gui/apps/messaging/signal/default.nix
new file mode 100644
index 0000000..6e06ffc
--- /dev/null
+++ b/home/modules/gui/apps/messaging/signal/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      signal-desktop
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/messaging/slack/default.nix b/home/modules/gui/apps/messaging/slack/default.nix
new file mode 100644
index 0000000..33a2328
--- /dev/null
+++ b/home/modules/gui/apps/messaging/slack/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      slack
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/messaging/teams/default.nix b/home/modules/gui/apps/messaging/teams/default.nix
new file mode 100644
index 0000000..fd6207b
--- /dev/null
+++ b/home/modules/gui/apps/messaging/teams/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      teams-for-linux
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/messaging/vesktop/default.nix b/home/modules/gui/apps/messaging/vesktop/default.nix
new file mode 100644
index 0000000..d2fcbcd
--- /dev/null
+++ b/home/modules/gui/apps/messaging/vesktop/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      vesktop
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/sharing/default.nix b/home/modules/gui/apps/sharing/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/sharing/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/sharing/nicotinePlus/default.nix b/home/modules/gui/apps/sharing/nicotinePlus/default.nix
new file mode 100644
index 0000000..5adb194
--- /dev/null
+++ b/home/modules/gui/apps/sharing/nicotinePlus/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      nicotine-plus
+      ;
+  };
+}
diff --git a/home/modules/qbittorrent/catppuccin-macchiato.qbtheme b/home/modules/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme
similarity index 100%
rename from home/modules/qbittorrent/catppuccin-macchiato.qbtheme
rename to home/modules/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme
diff --git a/home/modules/gui/apps/sharing/qBittorrent/default.nix b/home/modules/gui/apps/sharing/qBittorrent/default.nix
new file mode 100755
index 0000000..e5bbf8b
--- /dev/null
+++ b/home/modules/gui/apps/sharing/qBittorrent/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      qbittorrent
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/sharing/soulseekQt/default.nix b/home/modules/gui/apps/sharing/soulseekQt/default.nix
new file mode 100644
index 0000000..9010be4
--- /dev/null
+++ b/home/modules/gui/apps/sharing/soulseekQt/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      soulseekqt
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/terminal/default.nix b/home/modules/gui/apps/terminal/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/terminal/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/ghostty/config/settings.nix b/home/modules/gui/apps/terminal/ghostty/config/settings.nix
similarity index 100%
rename from home/modules/ghostty/config/settings.nix
rename to home/modules/gui/apps/terminal/ghostty/config/settings.nix
diff --git a/home/modules/ghostty/config/themes.nix b/home/modules/gui/apps/terminal/ghostty/config/themes.nix
similarity index 100%
rename from home/modules/ghostty/config/themes.nix
rename to home/modules/gui/apps/terminal/ghostty/config/themes.nix
diff --git a/home/modules/ghostty/default.nix b/home/modules/gui/apps/terminal/ghostty/default.nix
similarity index 100%
rename from home/modules/ghostty/default.nix
rename to home/modules/gui/apps/terminal/ghostty/default.nix
diff --git a/home/modules/gui/apps/terminal/kitty/default.nix b/home/modules/gui/apps/terminal/kitty/default.nix
new file mode 100644
index 0000000..9209a4b
--- /dev/null
+++ b/home/modules/gui/apps/terminal/kitty/default.nix
@@ -0,0 +1,19 @@
+{
+  flake,
+  ...
+}:
+let
+  inherit (flake.config.aesthetics.themes)
+    font
+    ;
+in
+{
+  programs.kitty = {
+    enable = true;
+    font = {
+      name = font.name;
+      size = font.size.terminal;
+    };
+    themeFile = "Catppuccin-Macchiato";
+  };
+}
diff --git a/home/modules/wezterm/config/extraConfig.nix b/home/modules/gui/apps/terminal/wezterm/config/extraConfig.nix
similarity index 86%
rename from home/modules/wezterm/config/extraConfig.nix
rename to home/modules/gui/apps/terminal/wezterm/config/extraConfig.nix
index dd5d7cc..39be657 100755
--- a/home/modules/wezterm/config/extraConfig.nix
+++ b/home/modules/gui/apps/terminal/wezterm/config/extraConfig.nix
@@ -7,7 +7,7 @@ in
 ''
   return {
     color_scheme = "Catppuccin Macchiato",
-    font_size = ${font.size.terminal},
+    font_size = ${builtins.toString font.size.terminal},
     font = wezterm.font('${font.name}'),
     enable_tab_bar = false,
     window_close_confirmation = 'NeverPrompt',
diff --git a/home/modules/gui/apps/terminal/wezterm/default.nix b/home/modules/gui/apps/terminal/wezterm/default.nix
new file mode 100755
index 0000000..b8bab5c
--- /dev/null
+++ b/home/modules/gui/apps/terminal/wezterm/default.nix
@@ -0,0 +1,16 @@
+{ flake, ... }:
+{
+  programs.wezterm =
+    let
+      configPath = ./config;
+      extraConfigPath = import (configPath + /extraConfig.nix) {
+        inherit
+          flake
+          ;
+      };
+    in
+    {
+      enable = true;
+      extraConfig = extraConfigPath;
+    };
+}
diff --git a/home/modules/gui/apps/tools/bitwarden/default.nix b/home/modules/gui/apps/tools/bitwarden/default.nix
new file mode 100644
index 0000000..95c3fa6
--- /dev/null
+++ b/home/modules/gui/apps/tools/bitwarden/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      bitwarden
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/tools/default.nix b/home/modules/gui/apps/tools/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/apps/tools/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/apps/tools/deskreen/default.nix b/home/modules/gui/apps/tools/deskreen/default.nix
new file mode 100644
index 0000000..99b59bf
--- /dev/null
+++ b/home/modules/gui/apps/tools/deskreen/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      deskreen
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/tools/emote/default.nix b/home/modules/gui/apps/tools/emote/default.nix
new file mode 100644
index 0000000..acd508d
--- /dev/null
+++ b/home/modules/gui/apps/tools/emote/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      emote
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/tools/gnomeCalculator/default.nix b/home/modules/gui/apps/tools/gnomeCalculator/default.nix
new file mode 100644
index 0000000..61cbf02
--- /dev/null
+++ b/home/modules/gui/apps/tools/gnomeCalculator/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      gnome-calculator
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/tools/ledger/default.nix b/home/modules/gui/apps/tools/ledger/default.nix
new file mode 100644
index 0000000..be4be59
--- /dev/null
+++ b/home/modules/gui/apps/tools/ledger/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      ledger-live-desktop
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/tools/scrcpy/default.nix b/home/modules/gui/apps/tools/scrcpy/default.nix
new file mode 100644
index 0000000..b6ab64c
--- /dev/null
+++ b/home/modules/gui/apps/tools/scrcpy/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      scrcpy
+      ;
+  };
+}
diff --git a/home/modules/gui/apps/tools/usbImager/default.nix b/home/modules/gui/apps/tools/usbImager/default.nix
new file mode 100644
index 0000000..3985884
--- /dev/null
+++ b/home/modules/gui/apps/tools/usbImager/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      usbimager
+      ;
+  };
+}
diff --git a/home/modules/gui/default.nix b/home/modules/gui/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/gui/desktop/default.nix b/home/modules/gui/desktop/default.nix
new file mode 100644
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/gui/desktop/default.nix
@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/home/modules/dunst/config/settings.nix b/home/modules/gui/desktop/dunst/config/settings.nix
similarity index 100%
rename from home/modules/dunst/config/settings.nix
rename to home/modules/gui/desktop/dunst/config/settings.nix
diff --git a/home/modules/dunst/default.nix b/home/modules/gui/desktop/dunst/default.nix
similarity index 88%
rename from home/modules/dunst/default.nix
rename to home/modules/gui/desktop/dunst/default.nix
index 7562f56..90a525e 100755
--- a/home/modules/dunst/default.nix
+++ b/home/modules/gui/desktop/dunst/default.nix
@@ -1,11 +1,13 @@
-{flake, ...}: let
+{ flake, ... }:
+let
   configPath = ./config;
   settingsPath = import (configPath + /settings.nix) {
     inherit
       flake
       ;
   };
-in {
+in
+{
   services.dunst = {
     enable = true;
     settings = settingsPath;
diff --git a/home/modules/easyEffects.nix b/home/modules/gui/desktop/easyEffects/default.nix
old mode 100755
new mode 100644
similarity index 100%
rename from home/modules/easyEffects.nix
rename to home/modules/gui/desktop/easyEffects/default.nix
diff --git a/home/modules/flameshot.nix b/home/modules/gui/desktop/flameshot/default.nix
old mode 100755
new mode 100644
similarity index 100%
rename from home/modules/flameshot.nix
rename to home/modules/gui/desktop/flameshot/default.nix
diff --git a/home/modules/gammastep.nix b/home/modules/gui/desktop/gammastep/default.nix
old mode 100755
new mode 100644
similarity index 91%
rename from home/modules/gammastep.nix
rename to home/modules/gui/desktop/gammastep/default.nix
index b89d5f5..5dd5ecf
--- a/home/modules/gammastep.nix
+++ b/home/modules/gui/desktop/gammastep/default.nix
@@ -4,7 +4,7 @@
     tray = true;
     provider = "geoclue2";
     temperature = {
-      day = 3500;
+      day = 6500;
       night = 3500;
     };
     dawnTime = "8:00-8:30";
diff --git a/home/modules/gtk/config/cursorTheme.nix b/home/modules/gui/desktop/gtk/config/cursorTheme.nix
similarity index 85%
rename from home/modules/gtk/config/cursorTheme.nix
rename to home/modules/gui/desktop/gtk/config/cursorTheme.nix
index 0ed9fc7..dcbf7f7 100755
--- a/home/modules/gtk/config/cursorTheme.nix
+++ b/home/modules/gui/desktop/gtk/config/cursorTheme.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   name = "catppuccin-macchiato-dark-cursors";
   package = pkgs.catppuccin-cursors.macchiatoDark;
 }
diff --git a/home/modules/gtk/config/gtk3.nix b/home/modules/gui/desktop/gtk/config/gtk3.nix
similarity index 100%
rename from home/modules/gtk/config/gtk3.nix
rename to home/modules/gui/desktop/gtk/config/gtk3.nix
diff --git a/home/modules/gtk/config/homeCursor.nix b/home/modules/gui/desktop/gtk/config/homeCursor.nix
similarity index 100%
rename from home/modules/gtk/config/homeCursor.nix
rename to home/modules/gui/desktop/gtk/config/homeCursor.nix
diff --git a/home/modules/gtk/config/iconTheme.nix b/home/modules/gui/desktop/gtk/config/iconTheme.nix
similarity index 88%
rename from home/modules/gtk/config/iconTheme.nix
rename to home/modules/gui/desktop/gtk/config/iconTheme.nix
index bed3c9a..199e53d 100755
--- a/home/modules/gtk/config/iconTheme.nix
+++ b/home/modules/gui/desktop/gtk/config/iconTheme.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   package = pkgs.catppuccin-papirus-folders.override {
     flavor = "macchiato";
     accent = "mauve";
diff --git a/home/modules/gtk/config/theme.nix b/home/modules/gui/desktop/gtk/config/theme.nix
similarity index 91%
rename from home/modules/gtk/config/theme.nix
rename to home/modules/gui/desktop/gtk/config/theme.nix
index 4ac6418..ae38e2a 100755
--- a/home/modules/gtk/config/theme.nix
+++ b/home/modules/gui/desktop/gtk/config/theme.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   package = pkgs.catppuccin-gtk.override {
     size = "compact";
     variant = "macchiato";
diff --git a/home/modules/gtk/default.nix b/home/modules/gui/desktop/gtk/default.nix
similarity index 100%
rename from home/modules/gtk/default.nix
rename to home/modules/gui/desktop/gtk/default.nix
diff --git a/home/modules/hyprland/hypridle/config/settings.nix b/home/modules/gui/desktop/hypridle/config/settings.nix
similarity index 97%
rename from home/modules/hyprland/hypridle/config/settings.nix
rename to home/modules/gui/desktop/hypridle/config/settings.nix
index 681e441..3fac7d5 100755
--- a/home/modules/hyprland/hypridle/config/settings.nix
+++ b/home/modules/gui/desktop/hypridle/config/settings.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   general = {
     lock_cmd = "pidof swaylock || swaylock";
     before_sleep_cmd = "loginctl lock-session";
diff --git a/home/modules/hyprland/hypridle/default.nix b/home/modules/gui/desktop/hypridle/default.nix
similarity index 96%
rename from home/modules/hyprland/hypridle/default.nix
rename to home/modules/gui/desktop/hypridle/default.nix
index 33cfa7d..c4e1d2b 100755
--- a/home/modules/hyprland/hypridle/default.nix
+++ b/home/modules/gui/desktop/hypridle/default.nix
@@ -2,14 +2,16 @@
   flake,
   pkgs,
   ...
-}: let
+}:
+let
   configPath = ./config;
   settingsPath = import (configPath + /settings.nix) {
     inherit
       pkgs
       ;
   };
-in {
+in
+{
   services.hypridle = {
     enable = true;
     package = flake.inputs.hypridle.packages.${pkgs.system}.hypridle;
diff --git a/home/modules/hyprland/hyprland/config/animations.nix b/home/modules/gui/desktop/hyprland/config/animations.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/animations.nix
rename to home/modules/gui/desktop/hyprland/config/animations.nix
diff --git a/home/modules/hyprland/hyprland/config/bind.nix b/home/modules/gui/desktop/hyprland/config/bind.nix
similarity index 90%
rename from home/modules/hyprland/hyprland/config/bind.nix
rename to home/modules/gui/desktop/hyprland/config/bind.nix
index 60619df..6cc0a99 100755
--- a/home/modules/hyprland/hyprland/config/bind.nix
+++ b/home/modules/gui/desktop/hyprland/config/bind.nix
@@ -2,7 +2,8 @@
   flake,
   config,
   ...
-}: let
+}:
+let
   inherit (flake.config.people) user0 user1;
   user = config.home.username;
 
@@ -28,11 +29,12 @@
     "S, exec, steam"
     "period, exec, emote"
     "L, exec, ${
-      if user == user0
-      then "slack"
-      else if user == user1
-      then "flatpak run org.vinegarhq.Sober"
-      else ""
+      if user == user0 then
+        "slack"
+      else if user == user1 then
+        "flatpak run org.vinegarhq.Sober"
+      else
+        ""
     }"
     # Workspaces
     "1, workspace, 1"
@@ -97,13 +99,12 @@
     "End, exec, shutdown now"
   ];
 in
-  superBinds
-  ++ superShiftBinds
-  ++ superCtrlBinds
-  ++ altBinds
-  ++ ctrlBinds
-  ++ ctrlShiftBinds
-  ++ shiftBinds
+superBinds
+++ superShiftBinds
+++ superCtrlBinds
+++ altBinds
+++ ctrlBinds
+++ ctrlShiftBinds
+++ shiftBinds
 # Docs
 # https://wiki.hyprland.org/Getting-Started/Master-Tutorial/
-
diff --git a/home/modules/hyprland/hyprland/config/bindl.nix b/home/modules/gui/desktop/hyprland/config/bindl.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/bindl.nix
rename to home/modules/gui/desktop/hyprland/config/bindl.nix
diff --git a/home/modules/hyprland/hyprland/config/bindm.nix b/home/modules/gui/desktop/hyprland/config/bindm.nix
similarity index 86%
rename from home/modules/hyprland/hyprland/config/bindm.nix
rename to home/modules/gui/desktop/hyprland/config/bindm.nix
index 475bb29..6c5ec83 100755
--- a/home/modules/hyprland/hyprland/config/bindm.nix
+++ b/home/modules/gui/desktop/hyprland/config/bindm.nix
@@ -7,5 +7,4 @@ let
     "mouse:272, movewindow"
   ];
 in
-  superBinds
-  ++ altBinds
+superBinds ++ altBinds
diff --git a/home/modules/hyprland/hyprland/config/binds.nix b/home/modules/gui/desktop/hyprland/config/binds.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/binds.nix
rename to home/modules/gui/desktop/hyprland/config/binds.nix
diff --git a/home/modules/hyprland/hyprland/config/decoration.nix b/home/modules/gui/desktop/hyprland/config/decoration.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/decoration.nix
rename to home/modules/gui/desktop/hyprland/config/decoration.nix
diff --git a/home/modules/hyprland/hyprland/config/dwindle.nix b/home/modules/gui/desktop/hyprland/config/dwindle.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/dwindle.nix
rename to home/modules/gui/desktop/hyprland/config/dwindle.nix
diff --git a/home/modules/hyprland/hyprland/config/exec-once.nix b/home/modules/gui/desktop/hyprland/config/exec-once.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/exec-once.nix
rename to home/modules/gui/desktop/hyprland/config/exec-once.nix
diff --git a/home/modules/hyprland/hyprland/config/general.nix b/home/modules/gui/desktop/hyprland/config/general.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/general.nix
rename to home/modules/gui/desktop/hyprland/config/general.nix
diff --git a/home/modules/hyprland/hyprland/config/input.nix b/home/modules/gui/desktop/hyprland/config/input.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/input.nix
rename to home/modules/gui/desktop/hyprland/config/input.nix
diff --git a/home/modules/hyprland/hyprland/config/misc.nix b/home/modules/gui/desktop/hyprland/config/misc.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/misc.nix
rename to home/modules/gui/desktop/hyprland/config/misc.nix
diff --git a/home/modules/hyprland/hyprland/config/windowrulev2.nix b/home/modules/gui/desktop/hyprland/config/windowrulev2.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/windowrulev2.nix
rename to home/modules/gui/desktop/hyprland/config/windowrulev2.nix
diff --git a/home/modules/hyprland/hyprland/config/xwayland.nix b/home/modules/gui/desktop/hyprland/config/xwayland.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/config/xwayland.nix
rename to home/modules/gui/desktop/hyprland/config/xwayland.nix
diff --git a/home/modules/hyprland/hyprland/default.nix b/home/modules/gui/desktop/hyprland/default.nix
similarity index 100%
rename from home/modules/hyprland/hyprland/default.nix
rename to home/modules/gui/desktop/hyprland/default.nix
diff --git a/home/modules/network.nix b/home/modules/gui/desktop/network/default.nix
old mode 100755
new mode 100644
similarity index 100%
rename from home/modules/network.nix
rename to home/modules/gui/desktop/network/default.nix
diff --git a/home/modules/gui/desktop/nwgLook/default.nix b/home/modules/gui/desktop/nwgLook/default.nix
new file mode 100644
index 0000000..fdc0a10
--- /dev/null
+++ b/home/modules/gui/desktop/nwgLook/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      nwg-look
+      ;
+  };
+}
diff --git a/home/modules/gui/desktop/plasmaNm/default.nix b/home/modules/gui/desktop/plasmaNm/default.nix
new file mode 100644
index 0000000..c8553b4
--- /dev/null
+++ b/home/modules/gui/desktop/plasmaNm/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs.kdePackages)
+      plasma-nm
+      ;
+  };
+}
diff --git a/home/modules/swaylock/config/settings.nix b/home/modules/gui/desktop/swaylock/config/settings.nix
similarity index 100%
rename from home/modules/swaylock/config/settings.nix
rename to home/modules/gui/desktop/swaylock/config/settings.nix
diff --git a/home/modules/swaylock/default.nix b/home/modules/gui/desktop/swaylock/default.nix
similarity index 100%
rename from home/modules/swaylock/default.nix
rename to home/modules/gui/desktop/swaylock/default.nix
diff --git a/home/modules/tofi/config/settings.nix b/home/modules/gui/desktop/tofi/config/settings.nix
similarity index 100%
rename from home/modules/tofi/config/settings.nix
rename to home/modules/gui/desktop/tofi/config/settings.nix
diff --git a/home/modules/tofi/default.nix b/home/modules/gui/desktop/tofi/default.nix
similarity index 100%
rename from home/modules/tofi/default.nix
rename to home/modules/gui/desktop/tofi/default.nix
diff --git a/home/modules/waybar/config/scripts/get_weather.sh b/home/modules/gui/desktop/waybar/config/scripts/get_weather.sh
similarity index 100%
rename from home/modules/waybar/config/scripts/get_weather.sh
rename to home/modules/gui/desktop/waybar/config/scripts/get_weather.sh
diff --git a/home/modules/waybar/config/settings.nix b/home/modules/gui/desktop/waybar/config/settings.nix
similarity index 91%
rename from home/modules/waybar/config/settings.nix
rename to home/modules/gui/desktop/waybar/config/settings.nix
index 7dbf8d0..9a6b4c3 100755
--- a/home/modules/waybar/config/settings.nix
+++ b/home/modules/gui/desktop/waybar/config/settings.nix
@@ -1,9 +1,10 @@
-{flake, ...}: let
-  inherit
-    (flake.config.people)
+{ flake, ... }:
+let
+  inherit (flake.config.people)
     user0
     ;
-in {
+in
+{
   mainBar = {
     position = "bottom";
     layer = "top";
@@ -34,7 +35,9 @@ in {
 
     clock = {
       calendar = {
-        format = {today = "<span color='#ff6699'><b><u>{}</u></b></span>";};
+        format = {
+          today = "<span color='#ff6699'><b><u>{}</u></b></span>";
+        };
       };
       format = " {:%H:%M}";
       tooltip = true;
@@ -57,10 +60,10 @@ in {
         sort-by-number = true;
       };
       persistent-workspaces = {
-        "1" = [];
-        "2" = [];
-        "3" = [];
-        "4" = [];
+        "1" = [ ];
+        "2" = [ ];
+        "3" = [ ];
+        "4" = [ ];
       };
     };
 
@@ -110,7 +113,11 @@ in {
         phone = "";
         portable = "";
         car = "";
-        default = ["" "" ""];
+        default = [
+          ""
+          ""
+          ""
+        ];
       };
     };
     "custom/launcher" = {
@@ -153,4 +160,3 @@ in {
   };
 }
 # https://unicodes.jessetane.com/
-
diff --git a/home/modules/waybar/config/style.nix b/home/modules/gui/desktop/waybar/config/style.nix
similarity index 100%
rename from home/modules/waybar/config/style.nix
rename to home/modules/gui/desktop/waybar/config/style.nix
diff --git a/home/modules/waybar/default.nix b/home/modules/gui/desktop/waybar/default.nix
similarity index 78%
rename from home/modules/waybar/default.nix
rename to home/modules/gui/desktop/waybar/default.nix
index e8ce787..a8e2ad3 100755
--- a/home/modules/waybar/default.nix
+++ b/home/modules/gui/desktop/waybar/default.nix
@@ -2,15 +2,17 @@
   flake,
   pkgs,
   ...
-}: let
+}:
+let
   configPath = ./config;
-  settingsPath = import (configPath + /settings.nix) {inherit flake;};
+  settingsPath = import (configPath + /settings.nix) { inherit flake; };
   stylePath = import (configPath + /style.nix) {
     inherit
       flake
       ;
   };
-in {
+in
+{
   programs.waybar = {
     enable = true;
     package = flake.inputs.waybar.packages.${pkgs.system}.default;
diff --git a/home/modules/gui/desktop/wlClipboard/default.nix b/home/modules/gui/desktop/wlClipboard/default.nix
new file mode 100644
index 0000000..744847b
--- /dev/null
+++ b/home/modules/gui/desktop/wlClipboard/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      wl-clipboard
+      ;
+  };
+}
diff --git a/home/modules/hyprland/wpaperd/default.nix b/home/modules/gui/desktop/wpaperd/default.nix
similarity index 98%
rename from home/modules/hyprland/wpaperd/default.nix
rename to home/modules/gui/desktop/wpaperd/default.nix
index 9336795..b200e08 100755
--- a/home/modules/hyprland/wpaperd/default.nix
+++ b/home/modules/gui/desktop/wpaperd/default.nix
@@ -2,7 +2,8 @@
   flake,
   pkgs,
   ...
-}: {
+}:
+{
   programs.wpaperd = {
     enable = true;
     package = flake.inputs.wpaperd.packages.${pkgs.system}.default;
diff --git a/home/modules/hyprland/wpaperd/wallpaper/1675745745_veter123472_DOOM_Eternal_Doomguy_realistic_detailed_aa2852d5-9ac6-42b9-b0c7-78336e9577bd-standard-scale-1_50x-gigapixel.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/1675745745_veter123472_DOOM_Eternal_Doomguy_realistic_detailed_aa2852d5-9ac6-42b9-b0c7-78336e9577bd-standard-scale-1_50x-gigapixel.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/1675745745_veter123472_DOOM_Eternal_Doomguy_realistic_detailed_aa2852d5-9ac6-42b9-b0c7-78336e9577bd-standard-scale-1_50x-gigapixel.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/1675745745_veter123472_DOOM_Eternal_Doomguy_realistic_detailed_aa2852d5-9ac6-42b9-b0c7-78336e9577bd-standard-scale-1_50x-gigapixel.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/Copilot1.png b/home/modules/gui/desktop/wpaperd/wallpaper/Copilot1.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/Copilot1.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/Copilot1.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/Copilot10.png b/home/modules/gui/desktop/wpaperd/wallpaper/Copilot10.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/Copilot10.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/Copilot10.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/Copilot2.png b/home/modules/gui/desktop/wpaperd/wallpaper/Copilot2.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/Copilot2.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/Copilot2.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/Copilot3.png b/home/modules/gui/desktop/wpaperd/wallpaper/Copilot3.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/Copilot3.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/Copilot3.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/Copilot4.png b/home/modules/gui/desktop/wpaperd/wallpaper/Copilot4.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/Copilot4.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/Copilot4.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/Copilot5.png b/home/modules/gui/desktop/wpaperd/wallpaper/Copilot5.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/Copilot5.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/Copilot5.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/Copilot6.png b/home/modules/gui/desktop/wpaperd/wallpaper/Copilot6.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/Copilot6.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/Copilot6.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/Copilot7.png b/home/modules/gui/desktop/wpaperd/wallpaper/Copilot7.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/Copilot7.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/Copilot7.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/Copilot8.png b/home/modules/gui/desktop/wpaperd/wallpaper/Copilot8.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/Copilot8.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/Copilot8.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/Copilot9.png b/home/modules/gui/desktop/wpaperd/wallpaper/Copilot9.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/Copilot9.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/Copilot9.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/pinksky.png b/home/modules/gui/desktop/wpaperd/wallpaper/pinksky.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/pinksky.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/pinksky.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/u6ne2q214dx71.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/u6ne2q214dx71.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/u6ne2q214dx71.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/u6ne2q214dx71.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-0wj757.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-0wj757.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-0wj757.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-0wj757.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-2ege2g.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-2ege2g.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-2ege2g.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-2ege2g.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-4dj2qo.png b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4dj2qo.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-4dj2qo.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4dj2qo.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-4xq6vv.png b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4xq6vv.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-4xq6vv.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4xq6vv.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-5dyvy3.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-5dyvy3.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-735xv3.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-735xv3.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-735xv3.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-735xv3.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-8xe25y.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-8xe25y.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-8xe25y.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-8xe25y.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-95591x.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-95591x.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-95591x.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-95591x.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-g8ky73.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-g8ky73.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-g8ky73.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-g8ky73.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-j8wzvp.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-j8wzvp.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-nekxjk.png b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nekxjk.png
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-nekxjk.png
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nekxjk.png
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-nryz87.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nryz87.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-nryz87.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nryz87.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-r7yey1.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-r7yey1.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-r7yey1.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-r7yey1.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-vge32m.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vge32m.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-vge32m.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vge32m.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallhaven-vgxgem.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vgxgem.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallhaven-vgxgem.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vgxgem.jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (25).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (25).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (25).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (25).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg
diff --git a/home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg
similarity index 100%
rename from home/modules/hyprland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg
rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg
diff --git a/home/modules/helix/default.nix b/home/modules/helix/default.nix
deleted file mode 100755
index 7940678..0000000
--- a/home/modules/helix/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  pkgs,
-  flake,
-  ...
-}: {
-  programs.helix = let
-    configPath = ./config;
-    settingsPath = import (configPath + /settings.nix);
-    languagesPath = import (configPath + /languages.nix);
-  in {
-    enable = true;
-    package = flake.inputs.helix.packages.${pkgs.system}.default;
-    languages = languagesPath;
-    settings = settingsPath;
-  };
-}
diff --git a/home/modules/homeManager.nix b/home/modules/homeManager.nix
deleted file mode 100755
index 551c718..0000000
--- a/home/modules/homeManager.nix
+++ /dev/null
@@ -1 +0,0 @@
-{programs.home-manager.enable = true;}
diff --git a/home/modules/hyprland/default.nix b/home/modules/hyprland/default.nix
deleted file mode 100755
index fa20567..0000000
--- a/home/modules/hyprland/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./hypridle
-    ./hyprland
-    ./wpaperd
-  ];
-}
diff --git a/home/modules/misc/commandLine.nix b/home/modules/misc/commandLine.nix
deleted file mode 100755
index 3666f1e..0000000
--- a/home/modules/misc/commandLine.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = builtins.attrValues {
-    inherit (pkgs)
-      cifs-utils
-      ffmpeg
-      flac
-      hardinfo
-      inetutils
-      libgen-cli
-      libnatpmp
-      ncdu
-      networkmanager-openvpn
-      nyancat
-      openssl
-      pciutils
-      pinentry
-      samba
-      simple-mtpfs
-      sshfs
-      speedtest-rs
-      tokei
-      tomb
-      unrar
-      unzip
-      wget
-      wine
-      xdg-utils
-      xdotool
-      zip
-      nodejs
-      ;
-  };
-}
diff --git a/home/modules/misc/desktop.nix b/home/modules/misc/desktop.nix
deleted file mode 100755
index 30e08f5..0000000
--- a/home/modules/misc/desktop.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{pkgs, ...}: {
-  home.packages = builtins.attrValues {
-    inherit
-      (pkgs.kdePackages)
-      kolourpaint
-      okular
-      partitionmanager
-      plasma-nm
-      ;
-    inherit
-      (pkgs)
-      nwg-look
-      bulky
-      gnome-calculator
-      gnome-disk-utility
-      gnome-software
-      gnome-characters
-      emote
-      gparted
-      usbimager
-      nomacs
-      jamesdsp
-      networkmanagerapplet
-      ;
-  };
-}
diff --git a/home/modules/misc/entertainment.nix b/home/modules/misc/entertainment.nix
deleted file mode 100755
index 0ff54c3..0000000
--- a/home/modules/misc/entertainment.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      feishin
-      prismlauncher
-      spotify
-      vlc
-      ;
-  };
-}
diff --git a/home/modules/misc/hyprland.nix b/home/modules/misc/hyprland.nix
deleted file mode 100755
index c8a8bec..0000000
--- a/home/modules/misc/hyprland.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      udiskie
-      alsa-utils
-      wl-clipboard
-      swaylock
-      playerctl
-      brightnessctl
-      glib
-      ;
-  };
-}
diff --git a/home/modules/misc/internet.nix b/home/modules/misc/internet.nix
deleted file mode 100755
index f7cb9d7..0000000
--- a/home/modules/misc/internet.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{pkgs, ...}: {
-  home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      # Browsers
-      google-chrome
-      # Messaging
-      discord
-      element-desktop
-      signal-desktop
-      slack
-      vesktop
-      # Privacy
-      bitwarden
-      ledger-live-desktop
-      protonvpn-cli_2
-      tor-browser
-      ;
-  };
-}
diff --git a/home/modules/misc/tracking.nix b/home/modules/misc/tracking.nix
deleted file mode 100755
index 63799a8..0000000
--- a/home/modules/misc/tracking.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      # Mp3
-      kid3
-      mp3gain
-      puddletag
-      # Tracking
-      nicotine-plus
-      soulseekqt
-      ;
-  };
-}
diff --git a/home/modules/nextcloud.nix b/home/modules/nextcloud.nix
deleted file mode 100755
index 6d6bc7c..0000000
--- a/home/modules/nextcloud.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  services.nextcloud-client = {
-    enable = true;
-    startInBackground = true;
-  };
-}
diff --git a/home/modules/qbittorrent/default.nix b/home/modules/qbittorrent/default.nix
deleted file mode 100755
index 3b531ae..0000000
--- a/home/modules/qbittorrent/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      qbitttorrent
-      ;
-  };
-}
diff --git a/home/modules/vscode/default.nix b/home/modules/vscode/default.nix
deleted file mode 100755
index 3504561..0000000
--- a/home/modules/vscode/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  pkgs,
-  lib,
-  flake,
-  ...
-}: {
-  programs = {
-    vscode = let
-      configPath = ./config;
-      keybindingsPath = import (configPath + /keybindings.nix);
-      extensionsPath = import (configPath + /extensions.nix) {
-        inherit
-          pkgs
-          ;
-      };
-      userSettingsPath = import (configPath + /userSettings.nix) {
-        inherit
-          pkgs
-          lib
-          flake
-          ;
-      };
-    in {
-      enable = true;
-      package = pkgs.vscode;
-      keybindings = keybindingsPath;
-      extensions = extensionsPath;
-      userSettings = userSettingsPath;
-    };
-  };
-}
diff --git a/home/modules/wezterm/default.nix b/home/modules/wezterm/default.nix
deleted file mode 100755
index d5d061c..0000000
--- a/home/modules/wezterm/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{flake, ...}: {
-  programs.wezterm = let
-    configPath = ./config;
-    extraConfigPath = import (configPath + /extraConfig.nix) {
-      inherit
-        flake
-        ;
-    };
-  in {
-    enable = true;
-    extraConfig = extraConfigPath;
-  };
-}
diff --git a/home/modules/yazi/default.nix b/home/modules/yazi/default.nix
deleted file mode 100755
index 13094df..0000000
--- a/home/modules/yazi/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  flake,
-  pkgs,
-  ...
-}: {
-  programs.yazi = let
-    configPath = ./config;
-    keymapPath = import (configPath + /keymap.nix);
-    settingsPath = import (configPath + /settings.nix);
-  in {
-    enable = true;
-    # package = flake.inputs.yazi.packages.${pkgs.system}.yazi;
-    enableNushellIntegration = true;
-    keymap = keymapPath;
-    settings = settingsPath;
-  };
-  # Keymap
-  # https://github.com/sxyazi/yazi/blob/main/yazi-config/preset/keymap.toml
-}
diff --git a/home/modules/yt-dlp/default.nix b/home/modules/yt-dlp/default.nix
deleted file mode 100755
index 343fcd3..0000000
--- a/home/modules/yt-dlp/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  programs.yt-dlp = let
-    configPath = ./config;
-    extraConfigPath = import (configPath + /extraConfig.nix);
-    settingsPath = import (configPath + /settings.nix);
-  in {
-    enable = true;
-    extraConfig = extraConfigPath;
-    settings = settingsPath;
-  };
-}
diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix
index b671942..f3879e9 100755
--- a/nixos/modules/nix.nix
+++ b/nixos/modules/nix.nix
@@ -10,6 +10,8 @@
       permittedInsecurePackages = [
         "electron-unwrapped-33.0.2"
         "electron-31.7.7"
+        "electron-27.3.11"
+        "olm-3.2.16"
       ];
     };
   };
diff --git a/profiles/user0/configs/desktop.nix b/profiles/user0/configs/desktop.nix
index 9c2c2bd..2343ebd 100755
--- a/profiles/user0/configs/desktop.nix
+++ b/profiles/user0/configs/desktop.nix
@@ -1,24 +1,13 @@
-{flake, ...}: let
-  inherit
-    (flake)
+{ flake, ... }:
+let
+  inherit (flake)
     self
     ;
 
-  moduleImports =
-    map
-    (module: self.homeModules.${module})
-    [
-      "desktop"
-      "entertainment"
-      "firefox"
-      "hyprland"
-      "productionArt"
-      "productionAudio"
-      "productionCode"
-      "productionVideo"
-      "productionWriting"
-      "shared"
-    ];
-in {
+  moduleImports = map (module: self.homeModules.${module}) [
+    "desktop"
+  ];
+in
+{
   imports = moduleImports;
 }
diff --git a/profiles/user0/configs/laptop.nix b/profiles/user0/configs/laptop.nix
index d6b7f9b..2343ebd 100755
--- a/profiles/user0/configs/laptop.nix
+++ b/profiles/user0/configs/laptop.nix
@@ -1,20 +1,13 @@
-{flake, ...}: let
-  inherit
-    (flake)
+{ flake, ... }:
+let
+  inherit (flake)
     self
     ;
 
-  moduleImports =
-    map
-    (module: self.homeModules.${module})
-    [
-      "entertainment"
-      "firefox"
-      "desktop"
-      "productionCode"
-      "productionWriting"
-      "shared"
-    ];
-in {
+  moduleImports = map (module: self.homeModules.${module}) [
+    "desktop"
+  ];
+in
+{
   imports = moduleImports;
 }
diff --git a/profiles/user0/configs/server.nix b/profiles/user0/configs/server.nix
index d14df22..6ed7e0e 100755
--- a/profiles/user0/configs/server.nix
+++ b/profiles/user0/configs/server.nix
@@ -1,15 +1,13 @@
-{flake, ...}: let
-  inherit
-    (flake)
+{ flake, ... }:
+let
+  inherit (flake)
     self
     ;
 
-  moduleImports =
-    map
-    (module: self.homeModules.${module})
-    [
-      "shared"
-    ];
-in {
+  moduleImports = map (module: self.homeModules.${module}) [
+    "cli"
+  ];
+in
+{
   imports = moduleImports;
 }
diff --git a/profiles/user1/configs/desktop.nix b/profiles/user1/configs/desktop.nix
index 480313f..2343ebd 100755
--- a/profiles/user1/configs/desktop.nix
+++ b/profiles/user1/configs/desktop.nix
@@ -1,18 +1,13 @@
-{flake, ...}: let
-  inherit
-    (flake)
+{ flake, ... }:
+let
+  inherit (flake)
     self
     ;
 
-  moduleImports =
-    map
-    (module: self.homeModules.${module})
-    [
-      "desktop"
-      "entertainment"
-      "productionWriting"
-      "shared"
-    ];
-in {
+  moduleImports = map (module: self.homeModules.${module}) [
+    "desktop"
+  ];
+in
+{
   imports = moduleImports;
 }
diff --git a/profiles/user1/configs/laptop.nix b/profiles/user1/configs/laptop.nix
index 480313f..2343ebd 100755
--- a/profiles/user1/configs/laptop.nix
+++ b/profiles/user1/configs/laptop.nix
@@ -1,18 +1,13 @@
-{flake, ...}: let
-  inherit
-    (flake)
+{ flake, ... }:
+let
+  inherit (flake)
     self
     ;
 
-  moduleImports =
-    map
-    (module: self.homeModules.${module})
-    [
-      "desktop"
-      "entertainment"
-      "productionWriting"
-      "shared"
-    ];
-in {
+  moduleImports = map (module: self.homeModules.${module}) [
+    "desktop"
+  ];
+in
+{
   imports = moduleImports;
 }