NewTheme Project

Squashed previous commits.