Partially migrate to new theme