Better color handling