Current dark theme hard to read: Set better colors for light and dark theme 
