Fixing some color styles for Dark Theme