125 files changed, 1630 insertions, 1867 deletions

diff --git a/Makefile b/Makefile
index 91ab9e4e8e..80e1a90a19 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,13 @@ $(info QMK Firmware $(QMK_VERSION))
 endif
 endif
 
+# Determine which qmk cli to use
+ifeq (,$(shell which qmk))
+    QMK_BIN = bin/qmk
+else
+    QMK_BIN = qmk