Updates to migration of code to theme