Makefile: Fix "theme" target
Simplify the messy headers