More theme fixes