Removing hardcoded color