Update Theme to new structure