Theme Conflict with Market Template