1.6 commit, added theme support