Dark Theme: Trying to address #454.
Merge pull request #646 from garvankeeley/fix-dark-style

Dark Theme: issue #454.