Some theme refactoring.
Merge pull request #18 from Chaser324/pr/17

Some theme refactoring.