diff --git a/justfile b/justfile
index 74b8d02..76ff98e 100644
--- a/justfile
+++ b/justfile
@@ -36,13 +36,15 @@ out TYPE SYSTEM="desktop":
         nix build --dry-run .#nixosConfigurations."{{SYSTEM}}".config.system.build.toplevel -L
         exit 0
       else
-        echo "Error: Unknown argument - '{{SYSTEM}}'"
-        echo "Use one of:"
-        echo "  desktop"
-        echo "  server"
-        echo "  laptop"
-        echo "  wsl"
-        echo "  vm"
+        cat <<EOF
+  Error: Unknown argument - '{{SYSTEM}}'
+  Use one of:
+    desktop
+    server
+    laptop
+    vm
+    wsl
+  EOF
         exit 1
       fi
       ;;
@@ -52,10 +54,12 @@ out TYPE SYSTEM="desktop":
       exit 0
       ;;
     *)
-      echo "Invalid usage: {{TYPE}}.";
-      echo "Use one of:"
-      echo "  nix"
-      echo "  home"
+      cat<<EOF
+  Error: Invalid usage: {{TYPE}}
+  Use one of:
+    nix
+    home
+  EOF
       exit 1
       ;;
   esac
@@ -77,13 +81,15 @@ test TYPE SYSTEM="desktop":
         sudo nixos-rebuild test --flake .#{{SYSTEM}}
         exit 0
       else
-        echo "Error: Unknown argument - '{{SYSTEM}}'"
-        echo "Use one of:"
-        echo "  desktop"
-        echo "  server"
-        echo "  laptop"
-        echo "  wsl"
-        echo "  vm"
+        cat <<EOF
+  Error: Unknown argument - '{{SYSTEM}}'
+  Use one of:
+    desktop
+    server
+    laptop
+    vm
+    wsl
+  EOF
         exit 1
       fi
       ;;
@@ -93,16 +99,18 @@ test TYPE SYSTEM="desktop":
       exit 0
       ;;
     *)
-      echo "Invalid usage: {{TYPE}}.";
-      echo "Use one of:"
-      echo "  nix"
-      echo "  home"
+      cat<<EOF
+  Error: Invalid usage: {{TYPE}}
+  Use one of:
+    nix
+    home
+  EOF
       exit 1
       ;;
   esac
 
 # Build the nix expression and hydrate the results directory
-make TYPE SYSTEM="desktop":
+build TYPE SYSTEM="desktop":
   #!/usr/bin/env bash
   set -euo pipefail
   case "{{TYPE}}" in
@@ -114,17 +122,20 @@ make TYPE SYSTEM="desktop":
         [ "{{SYSTEM}}" = "vm" ] || \
         [ "{{SYSTEM}}" = "laptop" ]
       then
-        echo "Hydrating resulting NixOS configuration for {{SYSTEM}}..."
+        echo "Building resulting NixOS configuration for {{SYSTEM}}..."
         nix build .#nixosConfigurations."{{SYSTEM}}".config.system.build.toplevel -L
+        echo "result directory hydrated"
         exit 0
       else
-        echo "Error: Unknown argument - '{{SYSTEM}}'"
-        echo "Use one of:"
-        echo "  desktop"
-        echo "  server"
-        echo "  laptop"
-        echo "  wsl"
-        echo "  vm"
+        cat <<EOF
+  Error: Unknown argument - '{{SYSTEM}}'
+  Use one of:
+    desktop
+    server
+    laptop
+    vm
+    wsl
+  EOF
         exit 1
       fi
       ;;
@@ -134,10 +145,12 @@ make TYPE SYSTEM="desktop":
       exit 0
       ;;
     *)
-      echo "Invalid usage: {{TYPE}}."
-      echo "Use one of:"
-      echo "  nix"
-      echo "  home"
+      cat<<EOF
+  Error: Invalid usage: {{TYPE}}
+  Use one of:
+    nix
+    home
+  EOF
       exit 1
       ;;
   esac
@@ -155,16 +168,24 @@ vm SYSTEM:
   then
     echo "Building VM for {{SYSTEM}}..."
     nixos-rebuild build-vm --flake .#{{SYSTEM}}
-    result/bin/run-{{SYSTEM}}-vm
+
+    if [[ -f result/bin/run-{{SYSTEM}}-vm ]]; then
+      result/bin/run-{{SYSTEM}}-vm
+    else
+      echo "Error: VM Build failed!"
+      exit 1
+    fi
     exit 0
   else
-    echo "Error: Unknown argument - '{{SYSTEM}}'"
-    echo "Use one of:"
-    echo "  desktop"
-    echo "  server"
-    echo "  laptop"
-    echo "  vm"
-    echo "  wsl"
+    cat <<EOF
+  Error: Unknown argument - '{{SYSTEM}}'
+  Use one of:
+    desktop
+    server
+    laptop
+    vm
+    wsl
+  EOF
     exit 1
   fi
 
@@ -207,17 +228,17 @@ gh COMMIT_MESSAGE:
   git commit -m "{{COMMIT_MESSAGE}}"
   git push
 
-#Fetch resources and compute sha256 hash
+# Fetch resources and compute sha256 hash
 hash URL:
   #!/usr/bin/env bash
   set -euo pipefail
 
-  if echo "{{URL}}" | grep -E '\.(tar\.gz|tgz|zip)$'; then
-    CONTENTS=$(nix-prefetch-url --unpack {{URL}} | tail -n 1)
+  if [[ "{{URL}}" =~ \.(tar(\.gz)?|tgz|gz|zip)$ ]]; then
+    CONTENTS=$(nix-prefetch-url --unpack {{URL}})
   else
-    CONTENTS=$(nix-prefetch-url {{URL}} | tail -n 1)
+    CONTENTS=$(nix-prefetch-url {{URL}})
   fi
 
-  HASH=$(nix hash to-sri --type sha256 "$CONTENTS")
+  HASH=$(nix hash convert --hash-algo sha256 "$CONTENTS")
 
   echo -e "\033[32m$HASH\033[0m"
diff --git a/src/system/modules/bitcoin/modules/electrum/default.nix b/src/system/modules/bitcoin/modules/electrum/default.nix
index de8277d..9b210ce 100644
--- a/src/system/modules/bitcoin/modules/electrum/default.nix
+++ b/src/system/modules/bitcoin/modules/electrum/default.nix
@@ -15,16 +15,24 @@ let
 in
 { options.modules.system.bitcoin.electrum = { enable = mkEnableOption "Electrs Server"; };
   config = mkIf (cfg.enable && btc.enable) {
+    #TODO: Fix the failing overlay due to `cargoHash/cargoSha256`
     #nixpkgs.overlays = [
     #  (final: prev: {
     #    electrs = prev.electrs.overrideAttrs (old: rec {
-    #      version = "0.10.4";
+    #      pname = "electrs";
+    #      version = "0.10.8";
     #      src = pkgs.fetchFromGitHub {
     #        owner = "romanz";
-
-    #        rev = "${version}";
-    #        hash = "sha256-4c+FGYM34LSfazzshfRPjA+0BvDL2tvkSr2rasUognc=";
+    #        repo = pname;
+    #        rev = "v${version}";
+    #        hash = "sha256-L26jzAn8vwnw9kFd6ciyYS/OLEFTbN8doNKy3P8qKRE=";
     #      };
+    #      #cargoDeps = old.cargoDeps.overrideAttrs (const {
+    #      #  name = "electrs-${version}.tar.gz";
+    #      #  inherit src;
+    #      #  sha256 = "";
+    #      #});
+    #      cargoHash = "sha256-lBRcq73ri0HR3duo6Z8PdSjnC8okqmG5yWeHxH/LmcU=";
     #    });
     #  })
     #];
diff --git a/src/system/modules/nginx/default.nix b/src/system/modules/nginx/default.nix
index 5aded22..bb35cca 100644
--- a/src/system/modules/nginx/default.nix
+++ b/src/system/modules/nginx/default.nix
@@ -76,8 +76,11 @@ in
             };
           };
         };
-        #"btc.ramos.codes" = mkIf module.bitcoin.enable {
+        #"btc.ramos.codes" = mkIf module.bitcoin.electrum.enable {
         #  locations = {
+        #   "/" = {
+        #     proxyPass = "";
+        #   };
         #  };
         #};
       };
diff --git a/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/colorscheme.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/colorscheme.lua
index 7b5a011..31e0c6e 100644
--- a/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/colorscheme.lua
+++ b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/colorscheme.lua
@@ -48,6 +48,11 @@ return {
 		end,
 	},
 
+  {
+    "folke/todo-comments.nvim",
+    dependencies = { "nvim-lua/plenary.nvim" },
+  },
+
   {
     "fei6409/log-highlight.nvim"
   }