Add a number of theme options.
Fix 0.2 test failure.