Updated to fix colors