Update core/content and core/layout