diff --git a/TODO b/TODO
index 30f97c51..df1884fd 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,10 @@
-### RUN AFTER NB INSTALL ON BREWFILE
-nb completions install
+
 
 ### Ensure these PATHs are added on Windows
 add to PATH:
 '%ProgramFiles(x86)%\mitmproxy\bin'
 '%ProgramFiles(x86)%\juju'
 
-### Run after git lfs install
-git lfs install
-
 ### POSSIBLY USEFUL SOFTWARE
 https://hackjutsu.com/Lepton/
 
@@ -19,6 +15,7 @@ https://hackjutsu.com/Lepton/
 # we can install via NPM, Go etc.
 # LSD used instead of exa for Windows
 # Glances not on Windows
+# ASDF not on Windows
 # autorestic not on windows
 # gist not on Windows
 # git-secret not on Windows
diff --git a/dotfiles/.config/software/Brewfile-alternatives.yml b/dotfiles/.config/software/Brewfile-alternatives.yml
new file mode 100644
index 00000000..57b5b6a1
--- /dev/null
+++ b/dotfiles/.config/software/Brewfile-alternatives.yml
@@ -0,0 +1,59 @@
+---
+version: '3'
+
+preference:
+  - flatpak
+  - snap
+  - apt
+  - dnf
+  - pacman
+  - apk
+  - brew
+  - yay
+  - choco
+  - scoop
+  - winget
+  - go
+  - cargo
+
+alternatives:
+  delta:
+    brew:
+      - git-delta
+      - example-package
+    scoop: delta
+  git-lfs:
+    brew: git-lfs
+    scoop: git-lfs
+  nb:
+    brew: nb
+  rsync:
+    apt: rsync
+    brew: rsync
+    choco: rsync
+    dnf: rsync
+  shotcut:
+    choco: shotcut
+    flatpak: org.shotcut.Shotcut
+    snap: shotcut
+  volta:
+    brew: volta
+    scoop: volta
+  wget:
+    apk: wget
+    apt: wget
+    brew: rsync
+    dnf: wget
+
+preinstall:
+  example-package: |
+    echo "preinstall routine"
+
+postinstall:
+  git-lfs: |
+    git lfs install
+  nb: |
+    nb completions install
+  volta: |
+    volta setup
+    volta install node@latest
diff --git a/dotfiles/.local/Brewfile.full b/dotfiles/.config/software/desktop/Brewfile
similarity index 100%
rename from dotfiles/.local/Brewfile.full
rename to dotfiles/.config/software/desktop/Brewfile
diff --git a/dotfiles/.local/Packages.config.full b/dotfiles/.config/software/desktop/Packages.config
similarity index 100%
rename from dotfiles/.local/Packages.config.full
rename to dotfiles/.config/software/desktop/Packages.config
diff --git a/dotfiles/.local/Winget.full b/dotfiles/.config/software/desktop/Wingetfile
similarity index 100%
rename from dotfiles/.local/Winget.full
rename to dotfiles/.config/software/desktop/Wingetfile
diff --git a/dotfiles/.local/Brewfile.dev b/dotfiles/.config/software/development/Brewfile
similarity index 99%
rename from dotfiles/.local/Brewfile.dev
rename to dotfiles/.config/software/development/Brewfile
index 9127b5a3..8037dbd1 100644
--- a/dotfiles/.local/Brewfile.dev
+++ b/dotfiles/.config/software/development/Brewfile
@@ -97,7 +97,6 @@ brew "yarn"
 brew "yank"
 brew "goofys"
 brew "awscli"
-brew "azure-cli"
 brew "consul-template"
 brew "wkhtmltopdf"
 brew "watchman"
@@ -114,11 +113,8 @@ brew "nomad"
 brew "mitmproxy"
 brew "juju"
 brew "gradle"
-brew "google-cloud-sdk"
 brew "git-filter-repo"
-brew "gh"
 brew "ffmpeg"
-brew "exiftool"
 
 # Homebrew Casks (only available on macOS)
 # e.g. `brew install --cask <program>`
diff --git a/dotfiles/.local/Packages.config.dev b/dotfiles/.config/software/development/Packages.config
similarity index 100%
rename from dotfiles/.local/Packages.config.dev
rename to dotfiles/.config/software/development/Packages.config
diff --git a/dotfiles/.local/Scoop.dev b/dotfiles/.config/software/development/Scoopfile
similarity index 100%
rename from dotfiles/.local/Scoop.dev
rename to dotfiles/.config/software/development/Scoopfile
diff --git a/dotfiles/.local/Brewfile.terminal b/dotfiles/.config/software/terminal/Brewfile
similarity index 100%
rename from dotfiles/.local/Brewfile.terminal
rename to dotfiles/.config/software/terminal/Brewfile
diff --git a/dotfiles/.local/Packages.config.terminal b/dotfiles/.config/software/terminal/Packages.config
similarity index 100%
rename from dotfiles/.local/Packages.config.terminal
rename to dotfiles/.config/software/terminal/Packages.config
diff --git a/dotfiles/.local/Scoop.terminal b/dotfiles/.config/software/terminal/Scoopfile
similarity index 90%
rename from dotfiles/.local/Scoop.terminal
rename to dotfiles/.config/software/terminal/Scoopfile
index 5d9741b3..46527ae4 100644
--- a/dotfiles/.local/Scoop.terminal
+++ b/dotfiles/.config/software/terminal/Scoopfile
@@ -1,5 +1,3 @@
-scoop bucket add main
-# Missing ASDF
 bat
 bitwarden-cli
 direnv
diff --git a/dotfiles/.local/Scoop.full b/dotfiles/.local/Scoop.full
deleted file mode 100644
index e69de29b..00000000