diff --git a/Makefile b/Makefile
index 5917680b..6b586abb 100644
--- a/Makefile
+++ b/Makefile
@@ -186,7 +186,7 @@ build/tools/%: tools/%.c
 
 build/tools/%: tools/%.cc tools/common.h
 	@mkdir -p build/tools
-	$(CXX) -O0 -g -Wall -o $@ $<
+	$(CXX) -O2 -Wall -o $@ $<
 
 # Rules - CHARGEN
 
diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom
index 1451d210..fa704fb4 100644
Binary files a/bin/basic_generic.rom and b/bin/basic_generic.rom differ
diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom
index 6bd95ad4..0e2d7647 100644
Binary files a/bin/basic_ultimate64.rom and b/bin/basic_ultimate64.rom differ
diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom
index 523ca3dc..132e1f62 100644
Binary files a/bin/kernal_generic.rom and b/bin/kernal_generic.rom differ
diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom
index 76457332..b2281777 100644
Binary files a/bin/kernal_ultimate64.rom and b/bin/kernal_ultimate64.rom differ
diff --git a/bin/mega65.rom b/bin/mega65.rom
index 851cfa15..f28ce902 100644
Binary files a/bin/mega65.rom and b/bin/mega65.rom differ
diff --git a/bin/mega65_pxlfont.rom b/bin/mega65_pxlfont.rom
index 8dd0ecf4..d52ddce0 100644
Binary files a/bin/mega65_pxlfont.rom and b/bin/mega65_pxlfont.rom differ