Bug #1697 - Theme Creation