Added high contrast support