diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index 97ea2910c..e46e67c95 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -28,7 +28,9 @@
   :mode "/Dockerfile$"
   :config
   ;; TODO
-  (set! :build 'docker 'dockerfile-mode '+data-dockerfile-p '+data/dockerfile-build))
+  ;; (set! :build 'build-image 'dockerfile-mode '+data/dockerfile-build
+  ;;   :when '+data-dockerfile-p)
+  )
 
 
 ;; For ROM hacking or debugging
diff --git a/modules/lang/go/autoload.el b/modules/lang/go/autoload.el
index 3826ff7f5..51a6ce66b 100644
--- a/modules/lang/go/autoload.el
+++ b/modules/lang/go/autoload.el
@@ -1,5 +1,13 @@
 ;;; lang/go/autoload.el
 
+;;;###autoload
+;; TODO (defun +go/build ())
+
+
+;;
+;; Tests
+;;
+
 (defvar +go-test-last nil
   "The last test run.")
 
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index d48156bc0..ae07f767c 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -187,6 +187,8 @@
   ;;   (set! :build 'launchbar-action '+javascript-lb6-mode
   ;;     (lambda ()
   ;;       (when-let (dir (f-traverse-upwards (lambda (f) (f-ext? f "lbaction"))))
-  ;;         (shell-command (format "open '%s'" dir))))))
+  ;;         (shell-command (format "open '%s'" dir))))
+  ;;     :when
+  ;;     (lambda () (f-traverse-upwards (lambda (f) (f-ext? f "lbaction"))))))
   )
 
diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el
index cdd50ce6c..9bd00f184 100644
--- a/modules/lang/lua/config.el
+++ b/modules/lang/lua/config.el
@@ -34,7 +34,7 @@
   :modes (lua-mode markdown-mode json-mode)
   :files (and "main.lua" "conf.lua")
   :init
-  (set! :build 'love2D '+lua-love-mode
+  (set! :build 'run-love-app '+lua-love-mode
     (lambda ()
       (async-shell-command (format "open -a love.app '%s'" (doom-project-root))))))
 
diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index b40f56c3b..61f0a0ff1 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -80,4 +80,4 @@
 ;;   :files "Rakefile"
 ;;   :init
 ;;   (set! :build 'rake '+ruby-rake-mode '+ruby/rake
-;;     :when (doom-project-has! "Rakefile")))
+;;     :when (lambda () (doom-project-has! "Rakefile"))))
diff --git a/modules/lang/rust/autoload.el b/modules/lang/rust/autoload.el
index ad33222ff..5a335efbb 100644
--- a/modules/lang/rust/autoload.el
+++ b/modules/lang/rust/autoload.el
@@ -1,2 +1,7 @@
 ;;; lang/rust/autoload.el
 
+;;;###autoload
+;; TODO (defun +rust/run-cargo () (interactive))
+
+;;;###autoload
+;; TODO (defun +rust-cargo-project-p ())
diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el
index cc3607dc4..9eb32a2ae 100644
--- a/modules/lang/rust/config.el
+++ b/modules/lang/rust/config.el
@@ -8,8 +8,8 @@
   :init
   (add-hook 'rust-mode-hook 'flycheck-mode)
   :config
-  (set! :build 'cargo-run '(rust-mode toml-mode)
-         '+rust-is-cargo-project-p '+rust/cargo-run))
+  (set! :build 'run-cargo '(rust-mode toml-mode) '+rust/run-cargo
+    :when '+rust-cargo-project-p))
 
 
 (def-package! racer
diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el
index 1c9e577ff..f52c17241 100644
--- a/modules/lang/web/+css.el
+++ b/modules/lang/web/+css.el
@@ -36,7 +36,7 @@
   :mode ("\\.scss$" . scss-mode)
   :config
   (set! :company-backend '(css-mode scss-mode) '(company-css company-yasnippet))
-  (set! :build 'compile 'scss-mode '+css/scss-build))
+  (set! :build 'compile-to-css 'scss-mode '+css/scss-build))
 
 
 (def-package! sass-mode
@@ -44,7 +44,7 @@
   :config
   (setq sass-command-options '("--style compressed"))
   (set! :company-backend 'sass-mode '(company-css company-yasnippet))
-  (set! :build 'compile 'sass-mode '+css/sass-build))
+  (set! :build 'compile-to-css 'sass-mode '+css/sass-build))
 
 
 (def-package! less-css-mode
diff --git a/modules/lang/web/autoload/css.el b/modules/lang/web/autoload/css.el
index 9c7fe82d1..cf69234ba 100644
--- a/modules/lang/web/autoload/css.el
+++ b/modules/lang/web/autoload/css.el
@@ -1,10 +1,10 @@
 ;;; lang/web/+css.el
 
 ;;;###autoload
-(defun +css/scss-build ()) ; TODO
+;; TODO (defun +css/scss-build ())
 
 ;;;###autoload
-(defun +css/sass-build ()) ; TODO
+;; TODO (defun +css/sass-build ())
 
 ;;;###autoload
 (defun +css/toggle-inline-or-block ()