Continued migration of theme code