Theme Generator improvements