Move image props and flavor to base