Fix some inconsistent color combinations for the dark theme