Cleaned up and properly moved color portions