Small fixes to default theme