#1623 fix theme for highlighted product