Fix some issues with 'light and dark' theme.