Continued migration of code to theme/framework