updated theme generation