Theme updating

First commit as a branch of jjallen37’s project.
Merge remote-tracking branch 'origin/theme1'