diff --git a/config/home/bash.nix b/config/home/bash.nix
new file mode 100644
index 0000000..d85e14c
--- /dev/null
+++ b/config/home/bash.nix
@@ -0,0 +1,28 @@
+{ config, pkgs, flakeDir, ... }:
+
+{
+  # Configure Bash
+  programs.bash = {
+    enable = true;
+    enableCompletion = true;
+    profileExtra = ''
+      #if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
+      #  exec Hyprland
+      #fi
+    '';
+    sessionVariables = {
+    
+    };
+    shellAliases = {
+      sv="sudo vim";
+      flake-rebuild="sudo nixos-rebuild switch --flake ${flakeDir}";
+      gcCleanup="nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
+      v="vim";
+      ls="lsd";
+      ll="lsd -l";
+      la="lsd -a";
+      lal="lsd -al";
+      ".."="cd ..";
+    };
+  };
+}
diff --git a/config/home/gtk-qt.nix b/config/home/gtk-qt.nix
new file mode 100644
index 0000000..364eaa0
--- /dev/null
+++ b/config/home/gtk-qt.nix
@@ -0,0 +1,54 @@
+{ pkgs, config, ... }:
+
+{
+  # Configure Cursor Theme
+  home.pointerCursor = {
+    gtk.enable = true;
+    x11.enable = true;
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Ice";
+    size = 24;
+  };
+
+  # Theme GTK
+  gtk = {
+    enable = true;
+    font = {
+      name = "Ubuntu";
+      size = 12;
+      package = pkgs.ubuntu_font_family;
+    };
+    theme = {
+      name = "${config.colorScheme.slug}";
+      package = gtkThemeFromScheme {scheme = config.colorScheme;};
+    };
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
+    cursorTheme = {
+      name = "Bibata-Modern-Ice";
+      package = pkgs.bibata-cursors;
+    };
+    gtk3.extraConfig = {
+      Settings = ''
+      gtk-application-prefer-dark-theme=1
+      '';
+    };
+    gtk4.extraConfig = {
+      Settings = ''
+      gtk-application-prefer-dark-theme=1
+      '';
+    };
+  };
+
+  # Theme QT -> GTK
+  qt = {
+    enable = true;
+    platformTheme = "gtk";
+    style = {
+        name = "adwaita-dark";
+        package = pkgs.adwaita-qt;
+    };
+  };
+}
diff --git a/config/home/packages.nix b/config/home/packages.nix
new file mode 100644
index 0000000..6a8bace
--- /dev/null
+++ b/config/home/packages.nix
@@ -0,0 +1,23 @@
+{ pkgs, config, browser, wallpaperDir, flakeDir, ... }:
+
+{
+  # Install Packages For The User
+  home.packages = with pkgs; [
+    pkgs."${browser}" neofetch lolcat cmatrix discord htop btop libvirt
+    swww polkit_gnome grim slurp lm_sensors unzip unrar gnome.file-roller
+    libnotify swaynotificationcenter rofi-wayland imv v4l-utils
+    ydotool wl-clipboard socat cowsay lsd pkg-config transmission-gtk mpv
+    gimp obs-studio blender kdenlive meson hugo gnumake ninja go
+    nodejs godot_4 rustup pavucontrol audacity zeroad xonotic
+    openra font-awesome symbola noto-fonts-color-emoji material-icons
+    spotify brightnessctl swayidle vim wget curl neovide neovim
+    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+    # Import Scripts
+    (import ./config/scripts/emopicker9000.nix { inherit pkgs; })
+    (import ./config/scripts/task-waybar.nix { inherit pkgs; })
+    (import ./config/scripts/squirtle.nix { inherit pkgs; })
+    (import ./config/scripts/wallsetter.nix { inherit pkgs; inherit wallpaperDir; })
+    (import ./config/scripts/themechange.nix { inherit pkgs; inherit flakeDir; })
+    (import ./config/scripts/theme-selector.nix { inherit pkgs; })
+  ];
+}
diff --git a/config/home/starship.nix b/config/home/starship.nix
new file mode 100644
index 0000000..387ac13
--- /dev/null
+++ b/config/home/starship.nix
@@ -0,0 +1,19 @@
+{ pkgs, config, ... }:
+
+{
+  # Starship Prompt
+  programs.starship = {
+    enable = true;
+    package = pkgs.starship;
+    settings = {
+        add_newline = true;
+        character = {
+            success_symbol = "[➜](bold blue)";
+            error_symbol = "[➜](bold red)";
+        };
+        package = {
+            disabled = false;
+        };
+    };
+  };
+}
diff --git a/home.nix b/home.nix
index f90cb67..917556b 100644
--- a/home.nix
+++ b/home.nix
@@ -15,14 +15,23 @@
   # Import Program Configurations
   imports = [
     inputs.nix-colors.homeManagerModules.default
+    # Enable &/ Configure Programs
     ./config/home/waybar.nix
     ./config/home/swaync.nix
     ./config/home/swaylock.nix
+    ./config/home/starship.nix
     ./config/home/neofetch.nix
     ./config/home/hyprland.nix
     ./config/home/kitty.nix
     ./config/home/rofi.nix
     ./config/home/vim.nix
+    ./config/home/bash.nix
+    ./config/home/gtk-qt.nix
+
+    # Install Programs & Scripts For User
+    ./config/home/packages.nix
+
+    # Place Home Files Like Pictures
     ./config/home/files.nix
   ];
 
@@ -38,94 +47,6 @@
     userEmail = "${gitEmail}";
   };
 
-  # Starship Prompt
-  programs.starship = {
-    enable = true;
-    package = pkgs.starship;
-    settings = {
-        add_newline = true;
-        character = {
-            success_symbol = "[➜](bold green)";
-            error_symbol = "[➜](bold red)";
-        };
-        package = {
-            disabled = false;
-        };
-    };
-  };
-
-  # Install Packages For The User
-  home.packages = with pkgs; [
-    pkgs."${browser}" neofetch lolcat cmatrix discord htop btop libvirt
-    swww polkit_gnome grim slurp lm_sensors unzip unrar gnome.file-roller
-    libnotify swaynotificationcenter rofi-wayland imv v4l-utils
-    ydotool wl-clipboard socat cowsay lsd pkg-config transmission-gtk mpv
-    gimp obs-studio blender kdenlive meson hugo gnumake ninja go
-    nodejs godot_4 rustup pavucontrol audacity zeroad xonotic
-    openra font-awesome symbola noto-fonts-color-emoji material-icons
-    spotify brightnessctl swayidle vim wget curl neovide neovim
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-    # Import Scripts
-    (import ./config/scripts/emopicker9000.nix { inherit pkgs; })
-    (import ./config/scripts/task-waybar.nix { inherit pkgs; })
-    (import ./config/scripts/squirtle.nix { inherit pkgs; })
-    (import ./config/scripts/wallsetter.nix { inherit pkgs; inherit wallpaperDir; })
-    (import ./config/scripts/themechange.nix { inherit pkgs; inherit flakeDir; })
-    (import ./config/scripts/theme-selector.nix { inherit pkgs; })
-  ];
-
-
-  # Configure Cursor Theme
-  home.pointerCursor = {
-    gtk.enable = true;
-    x11.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Ice";
-    size = 24;
-  };
-
-  # Theme GTK
-  gtk = {
-    enable = true;
-    font = {
-      name = "Ubuntu";
-      size = 12;
-      package = pkgs.ubuntu_font_family;
-    };
-    theme = {
-      name = "${config.colorScheme.slug}";
-      package = gtkThemeFromScheme {scheme = config.colorScheme;};
-    };
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
-    cursorTheme = {
-      name = "Bibata-Modern-Ice";
-      package = pkgs.bibata-cursors;
-    };
-    gtk3.extraConfig = {
-      Settings = ''
-      gtk-application-prefer-dark-theme=1
-      '';
-    };
-    gtk4.extraConfig = {
-      Settings = ''
-      gtk-application-prefer-dark-theme=1
-      '';
-    };
-  };
-
-  # Theme QT -> GTK
-  qt = {
-    enable = true;
-    platformTheme = "gtk";
-    style = {
-        name = "adwaita-dark";
-        package = pkgs.adwaita-qt;
-    };
-  };
-
   # Create XDG Dirs
   xdg = {
     userDirs = {
@@ -134,31 +55,5 @@
     };
   };
 
-  # Configure Bash
-  programs.bash = {
-    enable = true;
-    enableCompletion = true;
-    profileExtra = ''
-      #if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
-      #  exec Hyprland
-      #fi
-    '';
-    sessionVariables = {
-    
-    };
-    shellAliases = {
-      sv="sudo vim";
-      flake-rebuild="sudo nixos-rebuild switch --flake ${flakeDir}";
-      laptop-rebuild="sudo nixos-rebuild switch --flake ${flakeDir}";
-      gcCleanup="nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
-      v="vim";
-      ls="lsd";
-      ll="lsd -l";
-      la="lsd -a";
-      lal="lsd -al";
-      ".."="cd ..";
-    };
-  };
-
   programs.home-manager.enable = true;
 }