diff --git a/clang-format.sh b/clang-format.sh
new file mode 100755
index 000000000..f1eae41ce
--- /dev/null
+++ b/clang-format.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# run this from top-level norns directory before committing...
+find ws-wrapper/src -regex .*[\.][ch] | xargs clang-format -i
+find matron/src -regex .*[\.][ch] | xargs clang-format -i
diff --git a/uncrustify.cfg b/uncrustify.cfg
deleted file mode 100644
index 5f2c806b8..000000000
--- a/uncrustify.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# The type of line endings. Default=Auto.
-newlines                        = lf     # auto/lf/crlf/cr
-
-# The original size of tabs in the input. Default=8.
-input_tab_size                  = 4        # unsigned number
-
-# The number of columns to indent per level.
-# Usually 2, 3, 4, or 8. Default=8.
-indent_columns                  = 4        # unsigned number
-
-# How to use tabs when indenting code
-# 0=spaces only
-# 1=indent with tabs to brace level, align with spaces (default)
-# 2=indent and align with tabs, using spaces when not on a tabstop
-indent_with_tabs                = 0        # unsigned number
\ No newline at end of file
diff --git a/uncrustify.sh b/uncrustify.sh
deleted file mode 100755
index cc1130b3e..000000000
--- a/uncrustify.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# run this from top-level norns directory before committing...
-find ws-wrapper/src -regex .*[\.][ch] | xargs uncrustify -c uncrustify.cfg --no-backup
-find matron/src -regex .*[\.][ch] | xargs uncrustify -c uncrustify.cfg --no-backup