Some theme-fixes