Further theme fixes.