Some theme improvements