Fixed border color inconsistencies