Add ability to select a theme. Fix broken theme tests.