diff --git a/Makefile b/Makefile
index 2386e9b6..e73fd773 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,9 @@ THIRD_PARTY_HARDWARE=hardware/keyboardio/avr
 GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always)
 include ./_Makefile.Master
 astyle:
-	astyle --style=linux ArduinoKeyboard.ino *.h
+        find . -type f -name \*.cpp |xargs -n 1 astyle --style=google
+        find . -type f -name \*.ino |xargs -n 1 astyle --style=google
+        find . -type f -name \*.h |xargs -n 1 astyle --style=google
 
 generate-keymaps:
 	-rm keymaps_generated.h