adding themes
merge
Merge branch 'master' of https://github.com/chrisdietz/TimeTrax.git