diff --git a/subprojects/bahaghari/default.nix b/subprojects/bahaghari/default.nix
index 163c171b..bcab398f 100644
--- a/subprojects/bahaghari/default.nix
+++ b/subprojects/bahaghari/default.nix
@@ -2,16 +2,19 @@
 { }:
 
 {
-  nixosModules = {
-    "bahaghari/tinted-theming" = ./modules/tinted-theming;
+  nixosModules = rec {
+    bahaghari = ./modules;
+    default =  bahaghari;
   };
 
-  homeModules = {
-    "bahaghari/tinted-theming" = ./modules/tinted-theming;
+  homeModules.bahaghari = rec {
+    bahaghari = ./modules;
+    default =  bahaghari;
   };
 
-  nixvimModules = {
-    "bahaghari/tinted-theming" = ./modules/tinted-theming;
+  nixvimModules = rec {
+    bahaghari = ./modules;
+    default = bahaghari;
   };
 
   bahaghariLib = ./lib;
diff --git a/subprojects/bahaghari/modules/default.nix b/subprojects/bahaghari/modules/default.nix
new file mode 100644
index 00000000..f198acdd
--- /dev/null
+++ b/subprojects/bahaghari/modules/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./tinted-theming
+    ./extra-arguments.nix
+  ];
+}
diff --git a/subprojects/bahaghari/modules/extra-arguments.nix b/subprojects/bahaghari/modules/extra-arguments.nix
new file mode 100644
index 00000000..4fc1aa75
--- /dev/null
+++ b/subprojects/bahaghari/modules/extra-arguments.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+let
+  bahaghariLib = import ../lib { inherit pkgs; };
+in
+{
+  # Setting the Bahaghari lib and extra utilities. The extra utilities are
+  # largely based from the `utils` module argument found in NixOS systems.
+  _module.args = {
+    inherit bahaghariLib;
+    bahaghariUtils = import ../lib/utils { inherit config pkgs lib bahaghariLib; };
+  };
+}