[1/2] Add new theme engine! --- and some reorder