Squash Revert newtheme engine (not ready)