diff --git a/docs/TODO.md b/docs/TODO.md
index 0769c009..e3d92ddc 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -182,6 +182,7 @@ https://github.com/rigoneri/Syte3
 https://github.com/Mintplex-Labs/anything-llm
 * https://webcontainers.io/
 * https://github.com/zulip/zulip
+* https://github.com/ConvoyPanel/panel
 
 
 ## Kubernetes
@@ -191,6 +192,8 @@ https://github.com/Mintplex-Labs/anything-llm
 ## VM
 
 * https://www.cloudhypervisor.org/
+* https://github.com/boxcutter/macos
+* https://github.com/canonical/ubuntu-desktop-installer
 
 ## CLI
 
diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index b2e616dd..9d3ecdd6 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -237,6 +237,7 @@ softwareGroups:
     - fpm
     - gitlab-runner
     - glen
+    - tart
   CLI: &CLI
     - bash-completion
     - bandwhich
@@ -451,6 +452,7 @@ softwareGroups:
     - beekeeper-studio
     - sqlectron
   Development-Tools-Desktop: &Development-Tools-Desktop
+    - catlight
     - github-desktop
     - intellij-idea-ce
     - iterm2
@@ -903,15 +905,21 @@ softwareGroups:
   Utilities: &Utilities
     - nativefier
   Virtualization: &Virtualization
+    - d2vm
     - kvm
+    - libguestfs-tools
     - lxdc
+    - lxd-ui
     - packer
+    - quickemu
     - vagrant
     - vagrant-vmware-utility
+    - vermin
   Virtualization-Desktop: &Virtualization-Desktop
     - docker-desktop
     - gnome-boxes
     - parallels
+    - quickgui
     - vagrant-manager
     - virtualbox
     - vmware
@@ -983,6 +991,7 @@ softwareGroups:
     - electron-app
     - fiddler
     - figma
+    - http-toolkit
     - imagine
     - imageoptim
     - ipfs-desktop
diff --git a/home/.chezmoiexternal.toml.tmpl b/home/.chezmoiexternal.toml.tmpl
index 5b9c6ba7..fb8f8458 100644
--- a/home/.chezmoiexternal.toml.tmpl
+++ b/home/.chezmoiexternal.toml.tmpl
@@ -246,6 +246,12 @@
     url = "https://gitlab.com/megabyte-labs/packer/windows-desktop.git"
     clone.args = ["--depth", "1"]
     pull.args = ["--ff-only"]
+# https://github.com/kholia/OSX-KVM
+[".local/src/osx-kvm"]
+    type = "git-repo"
+    url = "https://github.com/kholia/OSX-KVM.git"
+    clone.args = ["--depth", "1"]
+    pull.args = ["--ff-only"]
 
 ### PowerShell
 [".local/share/powershell/docker"]
diff --git a/software.yml b/software.yml
index 979e5578..750ae8d8 100644
--- a/software.yml
+++ b/software.yml
@@ -541,6 +541,43 @@ softwarePackages:
     _name: AptCacherNG
     ansible: professormanhattan.aptcacherng
     _systemd: apt-cacher-ng
+  http-toolkit:
+    _github: https://github.com/httptoolkit/httptoolkit
+    _name: HTTP Toolkit
+    cask: http-toolkit
+    winget: HTTPToolKit.HTTPToolKit
+  tart:
+    _bin: tart
+    _github: https://github.com/cirruslabs/tart
+    brew:darwin:
+      - tart
+      - cirruslabs/cli/gitlab-tart-executor
+  quickemu:
+    _bin: quickemu
+    _github: https://github.com/quickemu-project/quickemu
+    _pre: sudo apt-add-repository ppa:flexiondotorg/quickemu && sudo apt update
+    apt:ubuntu: quickemu
+  quickgui:
+    _github: https://github.com/quickemu-project/quickgui
+    _pre: sudo add-apt-repository ppa:yannick-mauray/quickgui && sudo apt update
+    apt:ubuntu: quickgui
+  catlight:
+    _github: https://github.com/catlightio/CatLight
+    _name: Catlight
+    when: echo '! test -d /Applications/Catlight.app' | bash
+    cask: catlight
+    deb: https://catlight.io/downloads/linux/beta
+  d2vm:
+    _bin: d2vm
+    _github: https://github.com/linka-cloud/d2vm
+    _name: Docker 2 VM
+    brew: linka-cloud/tap/d2vm
+  lxd-ui:
+    _bin: lxd-ui
+    _github: https://github.com/canonical/lxd-ui
+    _name: LXD UI
+    _post: lxd init && lxc config set core.https_address "[::]:8443"
+    snap: lxd
   gopass:
     _bin: gopass
     _desc: The slightly more awesome standard unix password manager for teams
@@ -2322,6 +2359,11 @@ softwarePackages:
     nix: exa
     pacman: exa
     zypper: exa
+  libguestfs-tools:
+    _bin: guestfish
+    _github: https://github.com/libguestfs/libguestfs
+    apt: libguestfs-tools
+    dnf: libguestfs-tools
   exiftool:
     _bin: exiftool
     _desc: '[exiftool](https://exiftool.org/) is a platform-independent Perl library plus a command-line application for reading, writing and editing meta information in a wide variety of files'
@@ -2456,6 +2498,11 @@ softwarePackages:
     cask: arduino
     choco: arduino
     flatpak: cc.arduino.IDE2
+  vermin:
+    _bin: vermin
+    _github: https://github.com/mhewedy/vermin
+    _name: Vermin
+    go: github.com/mhewedy/vermin@latest
   filezilla:
     _bin: filezilla
     _desc: '[FileZilla](https://filezilla-project.org/) is a free software, cross-platform FTP application, consisting of FileZilla Client and FileZilla Server. Client binaries are available for Windows, Linux, and macOS, server binaries are available for Windows only.'