Miscellaneous theme fixes

Generated by commit e4675a5e20cacde66728cd5ace383c7b2dea623a; pushed by Travis build 26.