massive updates to theme