Initial component-level merge of payment gateway and theme engine APIs