Further fixes to theme.