Revert "Simplify cursor color handling"