Merge themes and themes branch

Resolved divergence of themes_branch and themes