Fix the theme so we're back to the light style

This is to be cherry-picked into the master branch immediately