Minor improvements to theme.