Continued work on custom theme.