Some theme fixes