Fix theme build, cleanup