Contiue code migration to theme