Bug #1697 - Theme Creation (Merge do João Costa)