Some theme correction