More refinements to default theme