Rebase and work new theme engine