clean up theme engine commit