Merge theme engine v2