diff --git a/Makefile b/Makefile
index b25ff44..e042bd0 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ all: build/firmware.hex
 
 generated/hardware_layout.h: $(KEYBOARD_LAYOUT_JSON) $(GENERATE_LAYOUT)
 	mkdir -p $(@D)
-	$(PYTHON) $(GENERATE_LAYOUT) -i $(KEYBOARD_LAYOUT_JSON) -o $@
+	$(PYTHON) $(GENERATE_LAYOUT) -i $(KEYBOARD_LAYOUT_JSON) -l cpp -o $@
 
 build/pch/Arduino.h.gch:
 	mkdir -p $(@D)
diff --git a/simulator/Makefile b/simulator/Makefile
index 8393d2f..83aa3e6 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -16,7 +16,7 @@ all: simulator
 
 ../generated/hardware_layout.h: $(KEYBOARD_LAYOUT_JSON) $(GENERATE_LAYOUT)
 	mkdir -p $(@D)
-	$(PYTHON) $(GENERATE_LAYOUT) -i $(KEYBOARD_LAYOUT_JSON) -o $@
+	$(PYTHON) $(GENERATE_LAYOUT) -i $(KEYBOARD_LAYOUT_JSON) -l cpp -o $@
 
 obj/%.o: %.cpp $(HEADERS) ../generated/hardware_layout.h
 	mkdir -p $(@D)
diff --git a/submodules/scripts b/submodules/scripts
index d70d3e1..9042e43 160000
--- a/submodules/scripts
+++ b/submodules/scripts
@@ -1 +1 @@
-Subproject commit d70d3e16a42df169362857df2d68830e26b274f5
+Subproject commit 9042e43f3971969a8d2ed52ea95e31c7900ecd6e