More theme fixes.