Theme Generator restructuring
Updated Theme generator