Rebase and work new theme engine 1/2