Merge theme engine v2
Merge pull request #849 from garyc40/pr-theme-engine

New theme engine v2 component