diff --git a/docs/TODO.md b/docs/TODO.md
index 148c2db9..77b464ea 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -22,7 +22,6 @@ https://github.com/sindresorhus/Actions
 https://github.com/lanayotech/vagrant-manager
 https://github.com/wellsjo/JSON-Splora
 https://github.com/ytmdesktop/ytmdesktop
-https://github.com/chrissimpkins/Crunch
 https://github.com/leits/MeetingBar
 https://github.com/koekeishiya/skhd
 https://github.com/Ji4n1ng/OpenInTerminal
diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index b221e743..dc5816a5 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -557,6 +557,7 @@ softwareGroups:
     - unbuffer
   Media: &Media
     - beets
+    - crunch
     - exiftool
     - ffmpeg
     - imagemagick
@@ -570,6 +571,7 @@ softwareGroups:
   Media-Desktop: &Media-Desktop
     - balenaetcher
     - brasero
+    - crunch-app
     - gimp
     - handbrake
     - inkscape
diff --git a/home/.chezmoiexternal.toml.tmpl b/home/.chezmoiexternal.toml.tmpl
index 0b092c36..fa202ddd 100644
--- a/home/.chezmoiexternal.toml.tmpl
+++ b/home/.chezmoiexternal.toml.tmpl
@@ -121,6 +121,16 @@
     clone.args = ["--depth", "1"]
     pull.args = ["--ff-only"]
 
+{{- if eq .host.distro.id "darwin" }}
+### Crunch
+[".local/share/crunch"]
+    type = "git-repo"
+    url = "https://github.com/chrissimpkins/Crunch.git"
+    refreshPeriod = "{{ $refreshPeriod }}"
+    clone.args = ["--depth", "1"]
+    pull.args = ["--ff-only"]
+{{- end }}
+
 ### Git Template
 # [".config/git/template/_/husky.sh"]
 #     type = "file"
diff --git a/home/Library/Services/Crunch Image(s).workflow b/home/Library/Services/Crunch Image(s).workflow
new file mode 100644
index 00000000..fe448513
--- /dev/null
+++ b/home/Library/Services/Crunch Image(s).workflow	
@@ -0,0 +1,3 @@
+{{- if eq .host.distro.family "darwin" -}}
+{{ .host.home }}/.local/share/crunch/service/Crunch Image(s).workflow
+{{- end -}}
diff --git a/software.yml b/software.yml
index 402999de..874f991e 100644
--- a/software.yml
+++ b/software.yml
@@ -2610,6 +2610,23 @@ softwarePackages:
     _home: https://github.com/XcodesOrg/xcodes
     _name: Xcodes
     brew:darwin: xcodesorg/made/xcodes
+  crunch:
+    _bin: crunch
+    _desc: The crunch command line executable is a *nix executable that supports parallel PNG image optimization with local (off of the system PATH) installs of the pngquant and zopflipng project dependencies.
+    _docs: https://github.com/chrissimpkins/Crunch
+    _github: https://github.com/chrissimpkins/Crunch
+    _home: https://github.com/chrissimpkins/Crunch
+    _name: Crunch
+    brew: crunch
+  crunch-app:
+    _bin: null
+    _desc: The macOS companion app for the crunch CLI tool that compresses PNG images.
+    _docs: https://github.com/chrissimpkins/Crunch/blob/master/docs/MACOSGUI.md
+    _github: https://github.com/chrissimpkins/Crunch
+    _home: https://github.com/chrissimpkins/Crunch
+    _name: Crunch macOS App
+    _when:cask: '! test -d /Applications/Crunch.app'
+    cask: crunch
   xcodes-app:
     _bin: null
     _desc: macOS desktop app that allows you to download, install, and switch to alternate versions of Xcode