add theme_engine
Merge remote-tracking branch 'upstream/jb43-legacy' into jb43-legacy