Modify dark theme to close #451