Feature better themes 7.0

The 7.0 version of the theming improvement code. See the other pull request for details.