Fix some issues with 'light and dark' theme.

Fixes #162.