Improved theme.