diff --git a/app/src/documents/structure.ts b/app/src/documents/structure.ts
index fe12a4ca6f..6e5b8b52b7 100644
--- a/app/src/documents/structure.ts
+++ b/app/src/documents/structure.ts
@@ -61,7 +61,7 @@ export const items: DocItem[] = [
 
     { id: 'themes', name: 'Themes' },
     { id: 'overview-themes', name: 'Overview', component: ThemingOverview, parentId: 'themes' },
-    { id: 'tokens', name: 'Tokens', component: Tokens, parentId: 'themes' },
+    { id: 'tokens', name: 'Tokens', component: Tokens, parentId: 'themes', tags: ['colors', 'variables'] },
 
     { id: 'testing', name: 'Testing' },
     { id: 'testing-basics', name: 'Basics', component: UtGuideBasicsDoc, parentId: 'testing' },
diff --git a/public/docs/content/examples-modals-ModalWithForm.json b/public/docs/content/examples-modals-ModalWithForm.json
index ec5d6d28cc..f7c9f4a97c 100644
--- a/public/docs/content/examples-modals-ModalWithForm.json
+++ b/public/docs/content/examples-modals-ModalWithForm.json
@@ -1,21 +1,11 @@
-{
-  "object": "value",
-  "document": {
-    "object": "document",
+[
+  {
+    "type": "paragraph",
     "data": {},
-    "nodes": [
+    "children": [
       {
-        "object": "block",
-        "type": "paragraph",
-        "data": {},
-        "nodes": [
-          {
-            "object": "text",
-            "text": "An example of a form within a modal.",
-            "marks": []
-          }
-        ]
+        "text": "An example of a form within a modal."
       }
     ]
   }
-}
\ No newline at end of file
+]
\ No newline at end of file