diff --git a/drupal/Makefile b/drupal/Makefile
index 952b28f..1db52f5 100644
--- a/drupal/Makefile
+++ b/drupal/Makefile
@@ -55,9 +55,36 @@ debug:
 		(XDEBUG=1 ./.devtools/start && sleep 1 && [ "$$(./.devtools/info xdebug)" = "enabled" ] && echo "Enabled XDebug. Run 'make start' to disable." || (echo "Failed to enable XDebug." && exit 1))
 
 # Allow running Drush commands with `make drush <command>`.
+#
+# Every target this Makefile defines, so a Drush argument that collides with
+# one can be caught below.
+MAKE_TARGETS := help build assemble provision start stop info describe debug \
+                drush login delete destroy reset
+
 ifeq (drush,$(firstword $(MAKECMDGOALS)))
   DRUSH_RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
-  $(eval $(DRUSH_RUN_ARGS):;@:)
+
+  # Swallow the trailing goals so make does not try to build them. This uses a
+  # match-anything rule rather than `$(eval $(DRUSH_RUN_ARGS):;@:)`, because
+  # almost every Drush command is namespaced with a colon and make reads
+  # `tome:export:` as a rule of its own, failing with "target pattern contains
+  # no '%'". Make cannot have a colon in a target name at all, so a
+  # match-anything rule is the only way to accept those goals.
+  #
+  # It only applies to goals with no rule of their own, though, so a Drush
+  # argument that happens to share a name with a real target (`make drush help`)
+  # would run Drush *and* that target. Refuse that rather than quietly do both.
+  DRUSH_GOAL_CLASH := $(filter $(MAKE_TARGETS),$(DRUSH_RUN_ARGS))
+  ifneq ($(DRUSH_GOAL_CLASH),)
+    $(error `$(DRUSH_GOAL_CLASH)` is also a make target, so `make drush \
+      $(DRUSH_RUN_ARGS)` would run both. Use: make drush \
+      DRUSH_RUN_ARGS="$(DRUSH_RUN_ARGS)")
+  endif
+
+  # Flags cannot be goals either, because make claims them for itself, so
+  # `make drush tome:export --yes` never reaches Drush. Same escape hatch.
+  %:
+	@:
 endif
 
 drush:
diff --git a/drupal/composer.json b/drupal/composer.json
index 67d1f2a..17ec5a7 100644
--- a/drupal/composer.json
+++ b/drupal/composer.json
@@ -110,7 +110,9 @@
                 "Fix ViewsPathTranslatorSubscriber crash on views with no JSON:API route": "patches/druxt-views-path-translator-route-name.patch"
             },
             "drupal/tome": {
-                "Fix subprocess commands built with a joined string, not an argv array": "patches/tome-process-array-not-string.patch"
+                "Fix subprocess commands built with a joined string, not an argv array": "patches/tome-process-array-not-string.patch",
+                "Declare normalizer supported types so entity-specific normalizers are used": "patches/tome-normalizer-supported-types.patch",
+                "Sort the content index so its order does not depend on export order": "patches/tome-deterministic-content-index.patch"
             }
         }
     }
diff --git a/drupal/composer.lock b/drupal/composer.lock
index 5740299..538f832 100644
--- a/drupal/composer.lock
+++ b/drupal/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9171b1672f197bd6c82ccdaf6b4ce05a",
+    "content-hash": "02b3acaa59077d8a5207710ce486c9a1",
     "packages": [
         {
             "name": "asm89/stack-cors",
diff --git a/drupal/config/block_content.type.basic.yml b/drupal/config/block_content.type.basic.yml
index 0312915..dff30ec 100644
--- a/drupal/config/block_content.type.basic.yml
+++ b/drupal/config/block_content.type.basic.yml
@@ -6,5 +6,5 @@ _core:
   default_config_hash: zglzjmYxi0G0ag9MZ02y0LSJOdpWRwJxyP_OvFojFyo
 id: basic
 label: 'Basic block'
-revision: 0
+revision: false
 description: 'A basic block contains a title and a body.'
diff --git a/drupal/config/core.entity_form_mode.user.register.yml b/drupal/config/core.entity_form_mode.user.register.yml
index 458c4fa..6dc7fc0 100644
--- a/drupal/config/core.entity_form_mode.user.register.yml
+++ b/drupal/config/core.entity_form_mode.user.register.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: flXhTcp55yLcyy7ZLOhPGKGZobZQJdkAFVWV3LseiuI
 id: user.register
 label: Register
+description: null
 targetEntityType: user
 cache: true
diff --git a/drupal/config/core.entity_view_mode.block_content.full.yml b/drupal/config/core.entity_view_mode.block_content.full.yml
index 4f4d35f..b054342 100644
--- a/drupal/config/core.entity_view_mode.block_content.full.yml
+++ b/drupal/config/core.entity_view_mode.block_content.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: 4tedlMuvQjDOdvHdw86_e-2Rt78aR7TGFMfOK8Ejppg
 id: block_content.full
 label: Full
+description: null
 targetEntityType: block_content
 cache: true
diff --git a/drupal/config/core.entity_view_mode.comment.full.yml b/drupal/config/core.entity_view_mode.comment.full.yml
index e84e4de..bee6ed4 100644
--- a/drupal/config/core.entity_view_mode.comment.full.yml
+++ b/drupal/config/core.entity_view_mode.comment.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: K7eNlfU7NEUajz01wItywZklr2oaPgL6s1_97fmDXLA
 id: comment.full
 label: 'Full comment'
+description: null
 targetEntityType: comment
 cache: true
diff --git a/drupal/config/core.entity_view_mode.node.full.yml b/drupal/config/core.entity_view_mode.node.full.yml
index 20a9f0d..818e238 100644
--- a/drupal/config/core.entity_view_mode.node.full.yml
+++ b/drupal/config/core.entity_view_mode.node.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: ElrtInxGjZd7GaapJ5O9n-ugi2hG2IxFivtgn0tHOsk
 id: node.full
 label: 'Full content'
+description: null
 targetEntityType: node
 cache: true
diff --git a/drupal/config/core.entity_view_mode.node.rss.yml b/drupal/config/core.entity_view_mode.node.rss.yml
index 2dd73d5..d760b2e 100644
--- a/drupal/config/core.entity_view_mode.node.rss.yml
+++ b/drupal/config/core.entity_view_mode.node.rss.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: vlYzr-rp2f9NMp-Qlr4sFjlqRq-90mco5-afLNGwCrU
 id: node.rss
 label: RSS
+description: null
 targetEntityType: node
 cache: true
diff --git a/drupal/config/core.entity_view_mode.node.search_index.yml b/drupal/config/core.entity_view_mode.node.search_index.yml
index 67c2314..716a633 100644
--- a/drupal/config/core.entity_view_mode.node.search_index.yml
+++ b/drupal/config/core.entity_view_mode.node.search_index.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: fVFfJv_GzBRE-wpRHbfD5a3VjnhbEOXG6lvRd3uaccY
 id: node.search_index
 label: 'Search index'
+description: null
 targetEntityType: node
 cache: true
diff --git a/drupal/config/core.entity_view_mode.node.search_result.yml b/drupal/config/core.entity_view_mode.node.search_result.yml
index 3789d54..e32ee69 100644
--- a/drupal/config/core.entity_view_mode.node.search_result.yml
+++ b/drupal/config/core.entity_view_mode.node.search_result.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: 6GCOQ-jP2RbdbHA5YWQ6bT8CfGbqrBYKOSC_XY4E3ZM
 id: node.search_result
 label: 'Search result highlighting input'
+description: null
 targetEntityType: node
 cache: true
diff --git a/drupal/config/core.entity_view_mode.node.teaser.yml b/drupal/config/core.entity_view_mode.node.teaser.yml
index 01b61b9..2ebd773 100644
--- a/drupal/config/core.entity_view_mode.node.teaser.yml
+++ b/drupal/config/core.entity_view_mode.node.teaser.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: Mz9qWr1kUYK0mjRAGDsr5XS6PvtZ24en_7ndt-pyWe4
 id: node.teaser
 label: Teaser
+description: null
 targetEntityType: node
 cache: true
diff --git a/drupal/config/core.entity_view_mode.taxonomy_term.full.yml b/drupal/config/core.entity_view_mode.taxonomy_term.full.yml
index 4a47105..2613d5f 100644
--- a/drupal/config/core.entity_view_mode.taxonomy_term.full.yml
+++ b/drupal/config/core.entity_view_mode.taxonomy_term.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: '-PPKjsNQPvoIDjOuUAvlLocYD976MNjb9Zpgyz5_BWE'
 id: taxonomy_term.full
 label: 'Taxonomy term page'
+description: null
 targetEntityType: taxonomy_term
 cache: true
diff --git a/drupal/config/core.entity_view_mode.user.compact.yml b/drupal/config/core.entity_view_mode.user.compact.yml
index 779ae17..3fa1b67 100644
--- a/drupal/config/core.entity_view_mode.user.compact.yml
+++ b/drupal/config/core.entity_view_mode.user.compact.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: 71CSAr_LNPcgu6D6jI4INl1KATkahmeyUFBETAWya8g
 id: user.compact
 label: Compact
+description: null
 targetEntityType: user
 cache: true
diff --git a/drupal/config/core.entity_view_mode.user.full.yml b/drupal/config/core.entity_view_mode.user.full.yml
index 62ecb60..3921796 100644
--- a/drupal/config/core.entity_view_mode.user.full.yml
+++ b/drupal/config/core.entity_view_mode.user.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: mQIF_foYjmnVSr9MpcD4CTaJE_FpO1AyDd_DskztGhM
 id: user.full
 label: 'User account'
+description: null
 targetEntityType: user
 cache: true
diff --git a/drupal/config/core.extension.yml b/drupal/config/core.extension.yml
index c06a489..499b3e0 100644
--- a/drupal/config/core.extension.yml
+++ b/drupal/config/core.extension.yml
@@ -32,7 +32,6 @@ module:
   menu_link_content: 0
   menu_ui: 0
   mysql: 0
-  sqlite: 0
   node: 0
   options: 0
   page_cache: 0
@@ -41,6 +40,7 @@ module:
   search: 0
   serialization: 0
   shortcut: 0
+  sqlite: 0
   system: 0
   taxonomy: 0
   text: 0
diff --git a/drupal/config/field.field.block_content.basic.body.yml b/drupal/config/field.field.block_content.basic.body.yml
index bbb851e..a2e0296 100644
--- a/drupal/config/field.field.block_content.basic.body.yml
+++ b/drupal/config/field.field.block_content.basic.body.yml
@@ -22,4 +22,5 @@ default_value_callback: ''
 settings:
   display_summary: false
   required_summary: false
+  allowed_formats: {  }
 field_type: text_with_summary
diff --git a/drupal/config/field.field.comment.comment.comment_body.yml b/drupal/config/field.field.comment.comment.comment_body.yml
index 577b922..effaa10 100644
--- a/drupal/config/field.field.comment.comment.comment_body.yml
+++ b/drupal/config/field.field.comment.comment.comment_body.yml
@@ -19,5 +19,6 @@ required: true
 translatable: true
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/drupal/config/field.field.node.article.body.yml b/drupal/config/field.field.node.article.body.yml
index 3df86a9..6fd623b 100644
--- a/drupal/config/field.field.node.article.body.yml
+++ b/drupal/config/field.field.node.article.body.yml
@@ -22,4 +22,5 @@ default_value_callback: ''
 settings:
   display_summary: true
   required_summary: false
+  allowed_formats: {  }
 field_type: text_with_summary
diff --git a/drupal/config/field.field.node.page.body.yml b/drupal/config/field.field.node.page.body.yml
index 7b953e1..7f04b54 100644
--- a/drupal/config/field.field.node.page.body.yml
+++ b/drupal/config/field.field.node.page.body.yml
@@ -22,4 +22,5 @@ default_value_callback: ''
 settings:
   display_summary: true
   required_summary: false
+  allowed_formats: {  }
 field_type: text_with_summary
diff --git a/drupal/config/filter.format.basic_html.yml b/drupal/config/filter.format.basic_html.yml
index 671745f..827406c 100644
--- a/drupal/config/filter.format.basic_html.yml
+++ b/drupal/config/filter.format.basic_html.yml
@@ -10,15 +10,12 @@ name: 'Basic HTML'
 format: basic_html
 weight: 0
 filters:
-  filter_html:
-    id: filter_html
-    provider: filter
+  editor_file_reference:
+    id: editor_file_reference
+    provider: editor
     status: true
-    weight: -10
-    settings:
-      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <span> <img src alt height width data-entity-type data-entity-uuid data-align data-caption>'
-      filter_html_help: false
-      filter_html_nofollow: false
+    weight: 11
+    settings: {  }
   filter_align:
     id: filter_align
     provider: filter
@@ -31,15 +28,18 @@ filters:
     status: true
     weight: 8
     settings: {  }
+  filter_html:
+    id: filter_html
+    provider: filter
+    status: true
+    weight: -10
+    settings:
+      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <span> <img src alt height width data-entity-type data-entity-uuid data-align data-caption>'
+      filter_html_help: false
+      filter_html_nofollow: false
   filter_html_image_secure:
     id: filter_html_image_secure
     provider: filter
     status: true
     weight: 9
     settings: {  }
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: 11
-    settings: {  }
diff --git a/drupal/config/filter.format.full_html.yml b/drupal/config/filter.format.full_html.yml
index d4b8e9d..7612c87 100644
--- a/drupal/config/filter.format.full_html.yml
+++ b/drupal/config/filter.format.full_html.yml
@@ -10,6 +10,12 @@ name: 'Full HTML'
 format: full_html
 weight: 2
 filters:
+  editor_file_reference:
+    id: editor_file_reference
+    provider: editor
+    status: true
+    weight: 11
+    settings: {  }
   filter_align:
     id: filter_align
     provider: filter
@@ -28,9 +34,3 @@ filters:
     status: true
     weight: 10
     settings: {  }
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: 11
-    settings: {  }
diff --git a/drupal/config/filter.format.plain_text.yml b/drupal/config/filter.format.plain_text.yml
index 3b9c79c..3b891ed 100644
--- a/drupal/config/filter.format.plain_text.yml
+++ b/drupal/config/filter.format.plain_text.yml
@@ -8,6 +8,12 @@ name: 'Plain text'
 format: plain_text
 weight: 10
 filters:
+  filter_autop:
+    id: filter_autop
+    provider: filter
+    status: true
+    weight: 0
+    settings: {  }
   filter_html_escape:
     id: filter_html_escape
     provider: filter
@@ -21,9 +27,3 @@ filters:
     weight: 0
     settings:
       filter_url_length: 72
-  filter_autop:
-    id: filter_autop
-    provider: filter
-    status: true
-    weight: 0
-    settings: {  }
diff --git a/drupal/config/filter.format.restricted_html.yml b/drupal/config/filter.format.restricted_html.yml
index d66ba0b..1389f55 100644
--- a/drupal/config/filter.format.restricted_html.yml
+++ b/drupal/config/filter.format.restricted_html.yml
@@ -8,6 +8,12 @@ name: 'Restricted HTML'
 format: restricted_html
 weight: 1
 filters:
+  filter_autop:
+    id: filter_autop
+    provider: filter
+    status: true
+    weight: 0
+    settings: {  }
   filter_html:
     id: filter_html
     provider: filter
@@ -17,12 +23,6 @@ filters:
       allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id>'
       filter_html_help: true
       filter_html_nofollow: false
-  filter_autop:
-    id: filter_autop
-    provider: filter
-    status: true
-    weight: 0
-    settings: {  }
   filter_url:
     id: filter_url
     provider: filter
diff --git a/drupal/config/node.type.page.yml b/drupal/config/node.type.page.yml
index 72d8998..8ff2f9b 100644
--- a/drupal/config/node.type.page.yml
+++ b/drupal/config/node.type.page.yml
@@ -6,7 +6,7 @@ _core:
   default_config_hash: KuyA4NHPXcmKAjRtwa0vQc2ZcyrUJy6IlS2TAyMNRbc
 name: 'Basic page'
 type: page
-description: 'Use <em>basic pages</em> for your static content, such as an ''About us'' page.'
+description: "Use <em>basic pages</em> for your static content, such as an 'About us' page."
 help: ''
 new_revision: true
 preview_mode: 1
diff --git a/drupal/config/system.cron.yml b/drupal/config/system.cron.yml
index 49e58a0..6d1cca2 100644
--- a/drupal/config/system.cron.yml
+++ b/drupal/config/system.cron.yml
@@ -3,4 +3,4 @@ _core:
 threshold:
   requirements_warning: 172800
   requirements_error: 1209600
-logging: 1
+logging: true
diff --git a/drupal/config/taxonomy.vocabulary.tags.yml b/drupal/config/taxonomy.vocabulary.tags.yml
index 3766bf4..f124f08 100644
--- a/drupal/config/taxonomy.vocabulary.tags.yml
+++ b/drupal/config/taxonomy.vocabulary.tags.yml
@@ -8,3 +8,4 @@ name: Tags
 vid: tags
 description: 'Use tags to group articles on similar topics into categories.'
 weight: 0
+new_revision: false
diff --git a/drupal/config/views.settings.yml b/drupal/config/views.settings.yml
index 31e1ec5..9ed6dad 100644
--- a/drupal/config/views.settings.yml
+++ b/drupal/config/views.settings.yml
@@ -2,12 +2,10 @@ _core:
   default_config_hash: uZHsLrDp1ThO0RvupHKcPzLOyVvWexm58JTTHNDo7yc
 display_extenders:
   - jsonapi_views
-skip_cache: false
 sql_signature: false
 ui:
   show:
     additional_queries: false
-    advanced_column: false
     default_display: false
     performance_statistics: false
     preview_information: true
@@ -15,6 +13,7 @@ ui:
       enabled: false
       where: above
     display_embed: false
+    advanced_column: false
   always_live_preview: true
   exposed_filter_any_label: old_any
 field_rewrite_elements:
@@ -47,3 +46,4 @@ field_rewrite_elements:
   ins: INS
   q: Q
   s: S
+skip_cache: false
diff --git a/drupal/config/views.view.block_content.yml b/drupal/config/views.view.block_content.yml
index 22b1a21..46f32fe 100644
--- a/drupal/config/views.view.block_content.yml
+++ b/drupal/config/views.view.block_content.yml
@@ -349,8 +349,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: false
           group_info:
             label: ''
@@ -391,8 +389,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
             reduce: false
           is_grouped: false
           group_info:
diff --git a/drupal/config/views.view.comment.yml b/drupal/config/views.view.comment.yml
index 1ffae16..5c7481e 100644
--- a/drupal/config/views.view.comment.yml
+++ b/drupal/config/views.view.comment.yml
@@ -657,8 +657,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: false
           group_info:
             label: ''
@@ -697,8 +695,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: false
           group_info:
             label: ''
@@ -742,8 +738,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
             reduce: false
           is_grouped: false
           group_info:
@@ -1467,8 +1461,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: false
           group_info:
             label: ''
@@ -1507,8 +1499,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: false
           group_info:
             label: ''
@@ -1552,8 +1542,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
             reduce: false
           is_grouped: false
           group_info:
diff --git a/drupal/config/views.view.content.yml b/drupal/config/views.view.content.yml
index f73d5d7..95b8ffc 100644
--- a/drupal/config/views.view.content.yml
+++ b/drupal/config/views.view.content.yml
@@ -301,8 +301,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: false
           group_info:
             label: ''
@@ -343,8 +341,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
             reduce: false
           is_grouped: false
           group_info:
@@ -434,8 +430,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
             reduce: false
           is_grouped: false
           group_info:
diff --git a/drupal/config/views.view.files.yml b/drupal/config/views.view.files.yml
index 1d7a8c6..ad1ef14 100644
--- a/drupal/config/views.view.files.yml
+++ b/drupal/config/views.view.files.yml
@@ -522,8 +522,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: false
           group_info:
             label: ''
@@ -564,8 +562,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: false
           group_info:
             label: ''
@@ -606,8 +602,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
             reduce: false
           is_grouped: false
           group_info:
@@ -1023,7 +1017,6 @@ display:
           default_argument_type: fixed
           default_argument_options:
             argument: ''
-          default_argument_skip_url: false
           summary_options:
             base_path: ''
             count: true
@@ -1040,6 +1033,7 @@ display:
           validate_options: {  }
           break_phrase: false
           not: false
+          default_argument_skip_url: false
       filters: {  }
       filter_groups:
         operator: AND
diff --git a/drupal/config/views.view.glossary.yml b/drupal/config/views.view.glossary.yml
index adf2254..f168435 100644
--- a/drupal/config/views.view.glossary.yml
+++ b/drupal/config/views.view.glossary.yml
@@ -239,7 +239,6 @@ display:
           default_argument_type: fixed
           default_argument_options:
             argument: a
-          default_argument_skip_url: false
           summary_options: {  }
           summary:
             format: default_summary
@@ -254,6 +253,7 @@ display:
           path_case: lower
           transform_dash: false
           break_phrase: false
+          default_argument_skip_url: false
       filters:
         status:
           id: status
@@ -406,7 +406,6 @@ display:
           default_argument_type: fixed
           default_argument_options:
             argument: a
-          default_argument_skip_url: false
           summary_options:
             items_per_page: 25
             inline: true
@@ -424,6 +423,7 @@ display:
           path_case: lower
           transform_dash: false
           break_phrase: false
+          default_argument_skip_url: false
       query:
         type: views_query
         options: {  }
diff --git a/drupal/config/views.view.taxonomy_term.yml b/drupal/config/views.view.taxonomy_term.yml
index f5a49c9..204a038 100644
--- a/drupal/config/views.view.taxonomy_term.yml
+++ b/drupal/config/views.view.taxonomy_term.yml
@@ -108,7 +108,6 @@ display:
           default_argument_type: fixed
           default_argument_options:
             argument: ''
-          default_argument_skip_url: false
           summary_options:
             base_path: ''
             count: true
@@ -131,6 +130,7 @@ display:
           add_table: false
           require_value: false
           reduce_duplicates: false
+          default_argument_skip_url: false
       filters:
         langcode:
           id: langcode
diff --git a/drupal/config/views.view.user_admin_people.yml b/drupal/config/views.view.user_admin_people.yml
index 5efc351..70de6f3 100644
--- a/drupal/config/views.view.user_admin_people.yml
+++ b/drupal/config/views.view.user_admin_people.yml
@@ -551,8 +551,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: false
           group_info:
             label: ''
@@ -596,8 +594,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: true
           group_info:
             label: Status
@@ -644,8 +640,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
             reduce: false
           is_grouped: false
           group_info:
@@ -686,8 +680,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
             reduce: false
           is_grouped: false
           group_info:
diff --git a/drupal/config/views.view.watchdog.yml b/drupal/config/views.view.watchdog.yml
index 3e08bf4..5507975 100644
--- a/drupal/config/views.view.watchdog.yml
+++ b/drupal/config/views.view.watchdog.yml
@@ -525,8 +525,6 @@ display:
             multiple: true
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
             reduce: false
           is_grouped: false
           group_info:
@@ -566,8 +564,6 @@ display:
             multiple: true
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
             reduce: false
           is_grouped: false
           group_info:
diff --git a/drupal/config/views.view.who_s_new.yml b/drupal/config/views.view.who_s_new.yml
index b9dd129..c1ad294 100644
--- a/drupal/config/views.view.who_s_new.yml
+++ b/drupal/config/views.view.who_s_new.yml
@@ -7,7 +7,7 @@ dependencies:
 _core:
   default_config_hash: zji0_13MyVGK7Bn1lUMDeZyyOIZedWvqpYUeM_SioPI
 id: who_s_new
-label: 'Who''s new'
+label: "Who's new"
 module: user
 description: 'Shows a list of the newest user accounts on the site.'
 tag: default
@@ -20,7 +20,7 @@ display:
     display_plugin: default
     position: 0
     display_options:
-      title: 'Who''s new'
+      title: "Who's new"
       fields:
         name:
           id: name
@@ -180,13 +180,13 @@ display:
       tags: {  }
   block_1:
     id: block_1
-    display_title: 'Who''s new'
+    display_title: "Who's new"
     display_plugin: block
     position: 1
     display_options:
       display_description: 'A list of new users'
       display_extenders: {  }
-      block_description: 'Who''s new'
+      block_description: "Who's new"
       block_category: User
     cache_metadata:
       max-age: -1
diff --git a/drupal/config/views.view.who_s_online.yml b/drupal/config/views.view.who_s_online.yml
index 82b2537..8d5520a 100644
--- a/drupal/config/views.view.who_s_online.yml
+++ b/drupal/config/views.view.who_s_online.yml
@@ -7,7 +7,7 @@ dependencies:
 _core:
   default_config_hash: suDsVMgawXoQt4rfmdfpr05EVX3z3KyfDDTYgeSM898
 id: who_s_online
-label: 'Who''s online block'
+label: "Who's online block"
 module: user
 description: 'Shows the user names of the most recently active users, and the total number of active users.'
 tag: default
@@ -20,7 +20,7 @@ display:
     display_plugin: default
     position: 0
     display_options:
-      title: 'Who''s online'
+      title: "Who's online"
       fields:
         name:
           id: name
@@ -154,8 +154,6 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
           is_grouped: false
           group_info:
             label: ''
@@ -210,13 +208,13 @@ display:
       tags: {  }
   who_s_online_block:
     id: who_s_online_block
-    display_title: 'Who''s online'
+    display_title: "Who's online"
     display_plugin: block
     position: 1
     display_options:
       display_description: 'A list of users that are currently logged in.'
       display_extenders: {  }
-      block_description: 'Who''s online'
+      block_description: "Who's online"
     cache_metadata:
       max-age: -1
       contexts:
diff --git a/drupal/content/meta/index.json b/drupal/content/meta/index.json
index e314203..df2a5eb 100644
--- a/drupal/content/meta/index.json
+++ b/drupal/content/meta/index.json
@@ -1,6 +1,6 @@
 {
-    "shortcut.c662dd6f-36f8-42c7-8fe8-8a1004369523": [],
     "shortcut.af1e6d83-49f9-4faa-a033-bf393079f2d9": [],
+    "shortcut.c662dd6f-36f8-42c7-8fe8-8a1004369523": [],
     "user.4cf17172-8f59-4b81-8a15-43daa951c8ae": [],
     "user.bc3d3925-9f4c-470f-af1e-44d3d15d2bda": []
 }
\ No newline at end of file
diff --git a/drupal/content/shortcut.af1e6d83-49f9-4faa-a033-bf393079f2d9.json b/drupal/content/shortcut.af1e6d83-49f9-4faa-a033-bf393079f2d9.json
index f9e0dd5..b81e7be 100644
--- a/drupal/content/shortcut.af1e6d83-49f9-4faa-a033-bf393079f2d9.json
+++ b/drupal/content/shortcut.af1e6d83-49f9-4faa-a033-bf393079f2d9.json
@@ -29,6 +29,7 @@
     "link": [
         {
             "uri": "internal:\/admin\/content",
+            "resolvable_uri": "\/admin\/content",
             "title": null,
             "options": []
         }
diff --git a/drupal/content/shortcut.c662dd6f-36f8-42c7-8fe8-8a1004369523.json b/drupal/content/shortcut.c662dd6f-36f8-42c7-8fe8-8a1004369523.json
index c4a1fab..02a443b 100644
--- a/drupal/content/shortcut.c662dd6f-36f8-42c7-8fe8-8a1004369523.json
+++ b/drupal/content/shortcut.c662dd6f-36f8-42c7-8fe8-8a1004369523.json
@@ -29,6 +29,7 @@
     "link": [
         {
             "uri": "internal:\/node\/add",
+            "resolvable_uri": "\/node\/add",
             "title": null,
             "options": []
         }
diff --git a/drupal/content/user.4cf17172-8f59-4b81-8a15-43daa951c8ae.json b/drupal/content/user.4cf17172-8f59-4b81-8a15-43daa951c8ae.json
index 0ddeff8..5d9af7e 100644
--- a/drupal/content/user.4cf17172-8f59-4b81-8a15-43daa951c8ae.json
+++ b/drupal/content/user.4cf17172-8f59-4b81-8a15-43daa951c8ae.json
@@ -42,14 +42,12 @@
     ],
     "created": [
         {
-            "value": "2022-02-15T00:11:50+00:00",
-            "format": "Y-m-d\\TH:i:sP"
+            "value": "2022-02-15T00:11:50+00:00"
         }
     ],
     "changed": [
         {
-            "value": "2022-02-15T00:11:50+00:00",
-            "format": "Y-m-d\\TH:i:sP"
+            "value": "2022-02-15T00:11:50+00:00"
         }
     ],
     "roles": [
diff --git a/drupal/content/user.bc3d3925-9f4c-470f-af1e-44d3d15d2bda.json b/drupal/content/user.bc3d3925-9f4c-470f-af1e-44d3d15d2bda.json
index 144fd78..9137ad2 100644
--- a/drupal/content/user.bc3d3925-9f4c-470f-af1e-44d3d15d2bda.json
+++ b/drupal/content/user.bc3d3925-9f4c-470f-af1e-44d3d15d2bda.json
@@ -28,7 +28,7 @@
     "mail": [],
     "timezone": [
         {
-            "value": ""
+            "value": "UTC"
         }
     ],
     "status": [
@@ -38,14 +38,12 @@
     ],
     "created": [
         {
-            "value": "2022-02-15T00:11:50+00:00",
-            "format": "Y-m-d\\TH:i:sP"
+            "value": "2022-02-15T00:11:50+00:00"
         }
     ],
     "changed": [
         {
-            "value": "2022-02-15T00:11:50+00:00",
-            "format": "Y-m-d\\TH:i:sP"
+            "value": "2022-02-15T00:11:50+00:00"
         }
     ],
     "roles": [],
diff --git a/drupal/files/public/.htaccess b/drupal/files/public/.htaccess
deleted file mode 100644
index 25776a3..0000000
--- a/drupal/files/public/.htaccess
+++ /dev/null
@@ -1,24 +0,0 @@
-# Deny all requests from Apache 2.4+.
-<IfModule mod_authz_core.c>
-  Require all denied
-</IfModule>
-
-# Deny all requests from Apache 2.0-2.2.
-<IfModule !mod_authz_core.c>
-  Deny from all
-</IfModule>
-
-# Turn off all options we don't need.
-Options -Indexes -ExecCGI -Includes -MultiViews
-
-# Set the catch-all handler to prevent scripts from being executed.
-SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
-<Files *>
-  # Override the handler again if we're run later in the evaluation list.
-  SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
-</Files>
-
-# If we know how to do it safely, disable the PHP engine entirely.
-<IfModule mod_php7.c>
-  php_flag engine off
-</IfModule>
\ No newline at end of file
diff --git a/drupal/patches.lock.json b/drupal/patches.lock.json
index 966d625..4d819eb 100644
--- a/drupal/patches.lock.json
+++ b/drupal/patches.lock.json
@@ -1,5 +1,5 @@
 {
-    "_hash": "ab06c2732e6997777e25ed4b8b189fc9757e5273cbcbe8612e783f7a8d18ebdb",
+    "_hash": "20c9d7099ba28ec3c6dbf2708084b56edb93785dd1a39e9fc0c1aa0de8e73434",
     "patches": {
         "drupal/druxt": [
             {
@@ -23,6 +23,26 @@
                 "extra": {
                     "provenance": "root"
                 }
+            },
+            {
+                "package": "drupal/tome",
+                "description": "Declare normalizer supported types so entity-specific normalizers are used",
+                "url": "patches/tome-normalizer-supported-types.patch",
+                "sha256": "c857235b91961a030bfb0d63673fd2756aca4d72025a3463ddd8445d3bae0b06",
+                "depth": 1,
+                "extra": {
+                    "provenance": "root"
+                }
+            },
+            {
+                "package": "drupal/tome",
+                "description": "Sort the content index so its order does not depend on export order",
+                "url": "patches/tome-deterministic-content-index.patch",
+                "sha256": "0fa9e0a2c65059fc11208f9ad1f0f059e0e82959b42a1ccce196f55f02f52e98",
+                "depth": 1,
+                "extra": {
+                    "provenance": "root"
+                }
             }
         ]
     }
diff --git a/drupal/patches/tome-deterministic-content-index.patch b/drupal/patches/tome-deterministic-content-index.patch
new file mode 100644
index 0000000..bdbfe76
--- /dev/null
+++ b/drupal/patches/tome-deterministic-content-index.patch
@@ -0,0 +1,23 @@
+--- a/modules/tome_sync/src/ContentIndexerTrait.php
++++ b/modules/tome_sync/src/ContentIndexerTrait.php
+@@ -78,6 +78,11 @@
+     }
+     $dependencies = array_values(array_unique($dependencies));
+     $index[TomeSyncHelper::getContentName($entity)] = $dependencies;
++    // Entities are indexed in whatever order they happen to be exported, which
++    // is not stable between installs. Sorting makes the file a function of its
++    // contents alone, so a diff shows what actually changed rather than the
++    // order two unrelated entities came back from the database in.
++    ksort($index);
+     ftruncate($handle, 0);
+     rewind($handle);
+     fwrite($handle, json_encode($index, JSON_PRETTY_PRINT));
+@@ -115,6 +120,8 @@
+     foreach ($index as &$dependencies) {
+       $dependencies = array_diff($dependencies, [$name]);
+     }
++    unset($dependencies);
++    ksort($index);
+     ftruncate($handle, 0);
+     rewind($handle);
+     fwrite($handle, json_encode($index, JSON_PRETTY_PRINT));
diff --git a/drupal/patches/tome-normalizer-supported-types.patch b/drupal/patches/tome-normalizer-supported-types.patch
new file mode 100644
index 0000000..8f6c50e
--- /dev/null
+++ b/drupal/patches/tome-normalizer-supported-types.patch
@@ -0,0 +1,67 @@
+--- a/modules/tome_sync/src/Normalizer/ContentEntityNormalizer.php
++++ b/modules/tome_sync/src/Normalizer/ContentEntityNormalizer.php
+@@ -2,6 +2,7 @@
+ 
+ namespace Drupal\tome_sync\Normalizer;
+ 
++use Drupal\Core\Entity\ContentEntityInterface;
+ use Drupal\serialization\Normalizer\ContentEntityNormalizer as BaseContentEntityNormalizer;
+ 
+ /**
+@@ -67,4 +68,11 @@
+     return $values;
+   }
+ 
++  /**
++   * {@inheritdoc}
++   */
++  public function getSupportedTypes(?string $format): array {
++    return [ContentEntityInterface::class => TRUE];
++  }
++
+ }
+--- a/modules/tome_sync/src/Normalizer/UserEntityNormalizer.php
++++ b/modules/tome_sync/src/Normalizer/UserEntityNormalizer.php
+@@ -2,6 +2,8 @@
+ 
+ namespace Drupal\tome_sync\Normalizer;
+ 
++use Drupal\user\UserInterface;
++
+ /**
+  * Normalizes/denormalizes Drupal user entities into an array structure.
+  *
+@@ -28,4 +30,11 @@
+     return $values;
+   }
+ 
++  /**
++   * {@inheritdoc}
++   */
++  public function getSupportedTypes(?string $format): array {
++    return [UserInterface::class => TRUE];
++  }
++
+ }
+--- a/modules/tome_sync/src/Normalizer/PathAliasNormalizer.php
++++ b/modules/tome_sync/src/Normalizer/PathAliasNormalizer.php
+@@ -7,6 +7,7 @@
+ use Drupal\Core\Entity\EntityRepositoryInterface;
+ use Drupal\Core\Entity\EntityTypeManagerInterface;
+ use Drupal\Core\Entity\EntityTypeRepositoryInterface;
++use Drupal\path_alias\PathAliasInterface;
+ 
+ /**
+  * Normalizer for Path alias entities.
+@@ -100,4 +101,11 @@
+     return $entity;
+   }
+ 
++  /**
++   * {@inheritdoc}
++   */
++  public function getSupportedTypes(?string $format): array {
++    return [PathAliasInterface::class => TRUE];
++  }
++
+ }