Adding themes, working on issue #1