Initial integration of the new theme