Fix some issues with 'light and dark' theme.
Merge pull request #165 from maniac103/theme-fix

Fix some issues with 'light and dark' theme.