Some theme fixes.