Update to theme structure