Continued work on dark theme.