Add high contrast override support
Add high contrast override support