diff --git a/config/instances/config/hledger.nix b/config/instances/config/hledger.nix
index dbe6562..50a82e1 100755
--- a/config/instances/config/hledger.nix
+++ b/config/instances/config/hledger.nix
@@ -8,7 +8,6 @@ let
 in
 {
   label = hledgerLabel;
-  email = dummy;
   name = hledgerName;
   paths = {
     path0 = "/mnt/media/storage/${hledgerLabel}";
diff --git a/home/modules/cli/fun/aniCli/default.nix b/home/modules/cli/fun/aniCli/default.nix
new file mode 100755
index 0000000..bd02397
--- /dev/null
+++ b/home/modules/cli/fun/aniCli/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      ani-cli
+      ;
+  };
+}
diff --git a/home/modules/cli/fun/default.nix b/home/modules/cli/fun/default.nix
new file mode 100755
index 0000000..f106bc5
--- /dev/null
+++ b/home/modules/cli/fun/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/utilities/fastFetch/config/settings.nix b/home/modules/cli/fun/fastFetch/config/settings.nix
similarity index 100%
rename from home/modules/cli/utilities/fastFetch/config/settings.nix
rename to home/modules/cli/fun/fastFetch/config/settings.nix
diff --git a/home/modules/cli/utilities/fastFetch/default.nix b/home/modules/cli/fun/fastFetch/default.nix
similarity index 100%
rename from home/modules/cli/utilities/fastFetch/default.nix
rename to home/modules/cli/fun/fastFetch/default.nix
diff --git a/home/modules/cli/utilities/libgenCli/default.nix b/home/modules/cli/fun/libgenCli/default.nix
similarity index 100%
rename from home/modules/cli/utilities/libgenCli/default.nix
rename to home/modules/cli/fun/libgenCli/default.nix
diff --git a/home/modules/cli/utilities/nyanCat/default.nix b/home/modules/cli/fun/nyanCat/default.nix
similarity index 100%
rename from home/modules/cli/utilities/nyanCat/default.nix
rename to home/modules/cli/fun/nyanCat/default.nix
diff --git a/home/modules/cli/utilities/yaBridge/default.nix b/home/modules/cli/fun/yaBridge/default.nix
similarity index 100%
rename from home/modules/cli/utilities/yaBridge/default.nix
rename to home/modules/cli/fun/yaBridge/default.nix
diff --git a/home/modules/cli/utilities/yt-dlp/config/extraConfig.nix b/home/modules/cli/fun/yt-dlp/config/extraConfig.nix
similarity index 100%
rename from home/modules/cli/utilities/yt-dlp/config/extraConfig.nix
rename to home/modules/cli/fun/yt-dlp/config/extraConfig.nix
diff --git a/home/modules/cli/utilities/yt-dlp/config/settings.nix b/home/modules/cli/fun/yt-dlp/config/settings.nix
similarity index 100%
rename from home/modules/cli/utilities/yt-dlp/config/settings.nix
rename to home/modules/cli/fun/yt-dlp/config/settings.nix
diff --git a/home/modules/cli/utilities/yt-dlp/default.nix b/home/modules/cli/fun/yt-dlp/default.nix
similarity index 100%
rename from home/modules/cli/utilities/yt-dlp/default.nix
rename to home/modules/cli/fun/yt-dlp/default.nix
diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
index ff65a4a..ec0a9ae 100755
--- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
@@ -66,7 +66,7 @@ in
     }
     {
       name = instances.hledger.label;
-      url = "http://localhost.${builtins.toString instances.ports.port0}";
+      url = "http://localhost.${builtins.toString instances.hledger.ports.port0}";
       tags = [
         instances.hledger.name
         "hledger"
diff --git a/nixos/modules/hledger.nix b/nixos/modules/hledger.nix
index 8d1f273..ed947f1 100755
--- a/nixos/modules/hledger.nix
+++ b/nixos/modules/hledger.nix
@@ -13,14 +13,13 @@ let
     ;
   service = hledger;
   localhost = web.localhost.address0;
-  host = "${service.subdomain}.${web.domains.url0}";
 in
 {
   services = {
     hledger-web = {
       enable = true;
       host = localhost;
-      baseUrl = "https://${host}";
+      # baseUrl = "https://${host}";
       stateDir = service.paths.path0;
       port = service.ports.port0;
       journalFiles = [