Fix non-hex colors too