diff --git a/data/keywords.yml b/data/keywords.yml
index a340d8918..1259671e6 100644
--- a/data/keywords.yml
+++ b/data/keywords.yml
@@ -1,248 +1,366 @@
-- title: JSON Schema Keywords
-  description: >-
-    JSON Schema keywords are the building blocks of JSON Schema. They are used
-    to define the structure of a JSON document
-  categorys:
-    - name: Core
-      keywords:
-        - name: $anchor
-          links:
-            - 'https://json-schema.org/learn/json-schema-examples#ecommerce-system'
-            - 'https://json-schema.org/understanding-json-schema/structuring#anchor'
-            - 'https://www.learnjsonschema.com/2020-12/core/anchor'
-        - name: $comment
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/comments#comments'
-            - 'https://www.learnjsonschema.com/2020-12/core/comment'
-        - name: $defs
-          links:
-            - 'https://json-schema.org/learn/miscellaneous-examples'
-            - 'https://json-schema.org/understanding-json-schema/structuring#defs'
-            - 'https://www.learnjsonschema.com/2020-12/core/defs'
-        - name: $dynamicAnchor
-          links:
-            - 'https://www.learnjsonschema.com/2020-12/core/dynamicanchor'
-        - name: $dynamicRef
-          links:
-            - 'https://www.learnjsonschema.com/2020-12/core/dynamicref'
-        - name: $id
-          links:
-            - 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
-            - 'https://json-schema.org/understanding-json-schema/basics#declaring-a-unique-identifier'
-            - 'https://www.learnjsonschema.com/2020-12/core/id'
-        - name: $ref
-          links:
-            - 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
-            - 'https://json-schema.org/understanding-json-schema/basics#declaring-a-json-schema'
-            - 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
-            - 'https://json-schema.org/understanding-json-schema/structuring#id'
-            - 'https://www.learnjsonschema.com/2020-12/core/ref'
-        - name: $schema
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/schema'
-            - 'https://www.learnjsonschema.com/2020-12/core/schema'
-        - name: $vocabulary
-          links:
-            - 'https://www.learnjsonschema.com/2020-12/core/vocabulary'
-    - name: Applicator
-      keywords:
-        - name: additionalProperties
-          links:
-            - 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
-            - 'https://json-schema.org/understanding-json-schema/reference/object#additionalproperties'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/additionalproperties'
-        - name: allOf
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
-            - 'https://json-schema.org/understanding-json-schema/reference/combining#schema-composition'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/allof'
-        - name: anyOf
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
-            - 'https://json-schema.org/understanding-json-schema/reference/combining#schema-composition'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/anyof'
-        - name: contains
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/array#contains'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/contains'
-        - name: else
-          links:
-            - 'https://json-schema.org/learn/miscellaneous-examples'
-            - 'https://json-schema.org/understanding-json-schema/reference/conditionals#ifthenelse'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/else'
-        - name: if
-          links:
-            - 'https://json-schema.org/learn/miscellaneous-examples'
-            - 'https://json-schema.org/understanding-json-schema/reference/conditionals#ifthenelse'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/if'
-        - name: items
-          links:
-            - 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
-            - 'https://json-schema.org/understanding-json-schema/reference/array#items'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/items'
-        - name: not
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/combining#schema-composition'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/not'
-        - name: oneOf
-          links:
-            - 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
-            - 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
-            - 'https://json-schema.org/understanding-json-schema/reference/combining#schema-composition'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/oneof'
-        - name: patternProperties
-          links:
-            - 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
-            - 'https://json-schema.org/understanding-json-schema/reference/object#patternProperties'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/patternproperties'
-        - name: prefixitems
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/array#tupleValidation'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/prefixitems'
-        - name: properties
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/object#properties'
-            - 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/properties'
-        - name: propertynames
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/object#propertyNames'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/propertynames'
-        - name: then
-          links:
-            - 'https://json-schema.org/learn/miscellaneous-examples'
-            - 'https://json-schema.org/understanding-json-schema/reference/conditionals#ifthenelse'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/then'
-    - name: Validation
-      keywords:
-        - name: const
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/const#constant-values'
-            - 'https://www.learnjsonschema.com/2020-12/validation/const'
-        - name: dependentRequired
-          links:
-            - 'https://json-schema.org/learn/miscellaneous-examples'
-            - 'https://json-schema.org/understanding-json-schema/reference/conditionals#applying-subschemas-conditionally'
-            - 'https://www.learnjsonschema.com/2020-12/validation/dependentrequired'
-        - name: dependentSchemas
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/conditionals#dependentSchemas'
-            - 'https://www.learnjsonschema.com/2020-12/applicator/dependentschemas'
-        - name: enum
-          links:
-            - 'https://json-schema.org/learn/miscellaneous-examples'
-            - 'https://json-schema.org/understanding-json-schema/reference/enum#enumerated-values'
-            - 'https://www.learnjsonschema.com/2020-12/validation/enum'
-        - name: exclusiveMaximum
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/numeric#range'
-            - 'https://www.learnjsonschema.com/2020-12/validation/exclusivemaximum'
-        - name: exclusiveMinimum
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/numeric#range'
-            - 'https://www.learnjsonschema.com/2020-12/validation/exclusiveminimum'
-        - name: maxContains
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/array#mincontains-maxcontains'
-            - 'https://www.learnjsonschema.com/2020-12/validation/maxcontains'
-        - name: maximum
-          links:
-            - 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
-            - 'https://json-schema.org/understanding-json-schema/reference/numeric#range'
-            - 'https://www.learnjsonschema.com/2020-12/validation/maximum'
-        - name: minitems
-          links:
-            - 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
-            - 'https://json-schema.org/understanding-json-schema/reference/array#length'
-            - 'https://www.learnjsonschema.com/2020-12/validation/minitems'
-        - name: minLength
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/string#length'
-            - 'https://www.learnjsonschema.com/2020-12/validation/minitems'
-            - 'https://www.learnjsonschema.com/2020-12/validation/minLength'
-        - name: minProperties
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/object#size'
-            - 'https://json-schema.org/draft/2020-12/json-schema-validation#name-minproperties'
-            - 'https://www.learnjsonschema.com/2020-12/validation/minProperties'
-        - name: multipleOf
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/numeric#multiples'
-            - 'https://www.learnjsonschema.com/2020-12/validation/multipleof'
-        - name: pattern
-          links:
-            - 'https://json-schema.org/learn/miscellaneous-examples'
-            - 'https://json-schema.org/understanding-json-schema/reference/string#regexp'
-            - 'https://www.learnjsonschema.com/2020-12/validation/pattern'
-        - name: required
-          links:
-            - 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
-            - 'https://json-schema.org/understanding-json-schema/reference/object#extending'
-            - 'https://www.learnjsonschema.com/2020-12/validation/required'
-        - name: type
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/type'
-            - 'https://json-schema.org/understanding-json-schema/basics#the-type-keyword'
-            - 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
-            - 'https://www.learnjsonschema.com/2020-12/validation/type'
-        - name: uniqueItems
-          links:
-            - 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
-            - 'https://json-schema.org/understanding-json-schema/reference/array#uniqueItems'
-            - 'https://www.learnjsonschema.com/2020-12/validation/uniqueitems'
-    - name: Content
-      keywords:
-        - name: contentEncoding
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/non_json_data#contentencoding'
-            - 'https://www.learnjsonschema.com/2020-12/content/contentencoding'
-        - name: contentMediaType
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/non_json_data#contentmediatype'
-            - 'https://www.learnjsonschema.com/2020-12/content/contentmediatype'
-        - name: contentschema
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/non_json_data#contentschema'
-            - 'https://www.learnjsonschema.com/2020-12/content/contentschema'
-    - name: Meta Data
-      keywords:
-        - name: default
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/annotations'
-            - 'https://www.learnjsonschema.com/2020-12/meta-data/default'
-        - name: deprecated
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/annotations'
-            - 'https://www.learnjsonschema.com/2020-12/meta-data/deprecated'
-        - name: description
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/annotations'
-            - 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
-            - 'https://www.learnjsonschema.com/2020-12/meta-data/description'
-        - name: examples
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/annotations'
-            - 'https://www.learnjsonschema.com/2020-12/meta-data/examples'
-        - name: readOnly
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/annotations'
-            - 'https://www.learnjsonschema.com/2020-12/meta-data/readonly'
-        - name: title
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/annotations'
-            - 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
-            - 'https://www.learnjsonschema.com/2020-12/meta-data/title'
-        - name: writeOnly
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/annotations'
-            - 'https://www.learnjsonschema.com/2020-12/meta-data/writeonly'
-    - name: Unevaluated
-      keywords:
-        - name: unevaluateditems
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
-            - 'https://www.learnjsonschema.com/2020-12/unevaluated/unevaluateditems'
-        - name: unevaluatedproperties
-          links:
-            - 'https://json-schema.org/understanding-json-schema/reference/object#unevaluatedproperties'
-            - 'https://www.learnjsonschema.com/2020-12/unevaluated/unevaluatedproperties'
+- name: $anchor
+  vocabulary: [core]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/core/anchor'
+  links:
+    - url: 'https://json-schema.org/learn/json-schema-examples#ecommerce-system'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/structuring#anchor'
+      title:
+- name: $comment
+  vocabulary: [core]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/core/comment'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/comments#comments'
+      title:
+- name: $defs
+  vocabulary: [core]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/core/defs'
+  links:
+    - url: 'https://json-schema.org/learn/miscellaneous-examples'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/structuring#defs'
+      title:
+- name: $dynamicAnchor
+  vocabulary: [core]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/core/dynamicanchor'
+  links:
+    - url: 'https://www.learnjsonschema.com/2020-12/core/dynamicanchor'
+      title:
+- name: $dynamicRef
+  vocabulary: [core]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/core/dynamicref'
+  links:
+    - url: 'https://www.learnjsonschema.com/2020-12/core/dynamicref'
+      title:
+- name: $id
+  vocabulary: [core]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/core/id'
+  links:
+    - url: 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/basics#declaring-a-unique-identifier'
+      title:
+- name: $ref
+  vocabulary: [core]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/core/ref'
+  links:
+    - url: 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/basics#declaring-a-json-schema'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/structuring#id'
+      title:
+- name: $schema
+  vocabulary: [core]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/core/schema'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/schema'
+      title:
+- name: $vocabulary
+  vocabulary: [core]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/core/vocabulary'
+  links:
+    - url: 'https://www.learnjsonschema.com/2020-12/core/vocabulary'
+      title:
+- name: additionalProperties
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/additionalproperties'
+  links:
+    - url: 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/object#additionalproperties'
+      title:
+- name: allOf
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/allof'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/combining#schema-composition'
+      title:
+- name: anyOf
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/anyof'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/combining#schema-composition'
+      title:
+- name: contains
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/contains'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#contains'
+      title:
+- name: else
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/else'
+  links:
+    - url: 'https://json-schema.org/learn/miscellaneous-examples'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/conditionals#ifthenelse'
+      title:
+- name: if
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/if'
+  links:
+    - url: 'https://json-schema.org/learn/miscellaneous-examples'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/conditionals#ifthenelse'
+      title:
+- name: items
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/items'
+  links:
+    - url: 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#items'
+      title:
+- name: not
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/not'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/combining#schema-composition'
+      title:
+- name: oneOf
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/oneof'
+  links:
+    - url: 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/combining#schema-composition'
+      title:
+- name: patternProperties
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/patternproperties'
+  links:
+    - url: 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/object#patternProperties'
+      title:
+- name: prefixitems
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/prefixitems'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#tupleValidation'
+      title:
+- name: properties
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/properties'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/object#properties'
+      title:
+    - url: 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
+      title:
+- name: propertynames
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/propertynames'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/object#propertyNames'
+      title:
+- name: then
+  vocabulary: [Applicator]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/then'
+  links:
+    - url: 'https://json-schema.org/learn/miscellaneous-examples'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/conditionals#ifthenelse'
+      title:
+- name: const
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/const'
+  links:
+    - url: 'https://json-schema.org/learn/miscellaneous-examples'
+      title:
+- name: dependentRequired
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/dependentrequired'
+  links:
+    - url: 'https://json-schema.org/learn/miscellaneous-examples'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/conditionals#applying-subschemas-conditionally'
+      title:
+- name: dependentSchemas
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/dependentschemas'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/conditionals#dependentSchemas'
+      title:
+- name: enum
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/enum'
+  links:
+    - url: 'https://json-schema.org/learn/miscellaneous-examples'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/enum#enumerated-values'
+      title:
+- name: exclusiveMaximum
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/exclusivemaximum'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/numeric#range'
+      title:
+- name: exclusiveMinimum
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/exclusiveminimum'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/numeric#range'
+      title:
+- name: maxContains
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/maxcontains'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#mincontains-maxcontains'
+      title:
+- name: maximum
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/maximum'
+  links:
+    - url: 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/numeric#range'
+      title:
+- name: minitems
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/minitems'
+  links:
+    - url: 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#length'
+      title:
+- name: minLength
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/minLength'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/string#length'
+      title:
+    - url: 'https://www.learnjsonschema.com/2020-12/validation/minitems'
+      title:
+- name: minProperties
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/minProperties'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/object#size'
+      title:
+    - url: 'https://json-schema.org/draft/2020-12/json-schema-validation#name-minproperties'
+      title:
+- name: multipleOf
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/multipleof'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/numeric#multiples'
+      title:
+- name: pattern
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/pattern'
+  links:
+    - url: 'https://json-schema.org/learn/miscellaneous-examples'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/string#regexp'
+      title:
+- name: required
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/required'
+  links:
+    - url: 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/object#extending'
+      title:
+- name: type
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/type'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/type'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/basics#the-type-keyword'
+      title:
+    - url: 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
+      title:
+- name: uniqueItems
+  vocabulary: [Validation]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/uniqueitems'
+  links:
+    - url: 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
+      title:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#uniqueItems'
+      title:
+- name: contentEncoding
+  vocabulary: [Content]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/content/contentencoding'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/non_json_data#contentencoding'
+      title:
+- name: contentMediaType
+  vocabulary: [Content]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/content/contentmediatype'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/non_json_data#contentmediatype'
+      title:
+- name: contentschema
+  vocabulary: [Content]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/content/contentschema'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/non_json_data#contentschema'
+      title:
+- name: default
+  vocabulary: [Meta Data]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/meta-data/default'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/annotations'
+      title:
+- name: deprecated
+  vocabulary: [Meta Data]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/meta-data/deprecated'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/annotations'
+      title:
+- name: description
+  vocabulary: [Meta Data]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/meta-data/description'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/annotations'
+      title:
+    - url: 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
+      title:
+- name: examples
+  vocabulary: [Meta Data]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/meta-data/examples'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/annotations'
+      title:
+- name: readOnly
+  vocabulary: [Meta Data]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/meta-data/readonly'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/annotations'
+      title:
+- name: title
+  vocabulary: [Meta Data]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/meta-data/title'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/annotations'
+      title:
+    - url: 'https://json-schema.org/learn/getting-started-step-by-step#create-a-schema-definition'
+      title:
+- name: writeOnly
+  vocabulary: [Meta Data]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/meta-data/writeonly'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/annotations'
+      title:
+- name: unevaluateditems
+  vocabulary: [Unevaluated]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/unevaluated/unevaluateditems'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
+      title:
+- name: unevaluatedproperties
+  vocabulary: [Unevaluated]
+  learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/unevaluated/unevaluatedproperties'
+  links:
+    - url: 'https://json-schema.org/understanding-json-schema/reference/object#unevaluatedproperties'
+      title:
diff --git a/pages/keywords/index.page.tsx b/pages/keywords/index.page.tsx
index 0e2f916d2..61b2f9223 100644
--- a/pages/keywords/index.page.tsx
+++ b/pages/keywords/index.page.tsx
@@ -20,21 +20,27 @@ export async function getStaticProps() {
 }
 
 interface DataObject {
-  title: string;
-  description: string;
-  categorys: CategoryObject[];
-}
-
-interface CategoryObject {
   name: string;
-  keywords: KeywordObject[];
+  vocabulary: string[];
+  learnjsonschemalink: string;
+  links: LinkObject[];
 }
 
-interface KeywordObject {
-  name: string;
-  links: string[];
+interface LinkObject {
+  url: string;
+  title: string;
 }
 
+// interface CategoryObject {
+//   name: string;
+//   keywords: KeywordObject[];
+// }
+
+// interface KeywordObject {
+//   name: string;
+//   links: string[];
+// }
+
 export default function StaticMarkdownPage({ datas }: { datas: DataObject[] }) {
   const markdownFile = '_index';
   return (
@@ -42,50 +48,41 @@ export default function StaticMarkdownPage({ datas }: { datas: DataObject[] }) {
       <Head>
         <title>JSON Schema - Keywords</title>
       </Head>
-      {datas.map((data: DataObject, index: number) => (
-        <div key={index}>
-          <Headline1> {data.title}</Headline1>
-          <p className='text-slate-600 block leading-7 dark:text-slate-300'>
-            {data.description}
-          </p>
+      <Headline1>JSON Schema Keywords</Headline1>
+      <p className='text-slate-600 block leading-7 dark:text-slate-300'>
+        JSON Schema keywords are the building blocks of JSON Schema. They are
+        used to define the structure of a JSON document
+      </p>
 
-          <div>
-            {data.categorys.map((category, index: number) => (
-              <div key={index}>
-                <Headline3> {category.name}</Headline3>
-                <table className='table-auto border-collapse w-full bg-slate-200 dark:bg-slate-900 text-slate-700 dark:text-slate-300'>
-                  <tbody>
-                    {category.keywords.map((keyword, index: number) => (
-                      <tr
-                        key={index}
-                        className='dark:hover:bg-slate-950 hover:bg-slate-300'
-                      >
-                        <td className='border text-center border-slate-400 dark:border-slate-500 p-2'>
-                          {keyword.name}
-                        </td>
-                        <td className='border border-slate-400 dark:border-slate-500 p-2 '>
-                          {keyword.links.map((link, index: number) => (
-                            <Link
-                              href={link}
-                              key={index}
-                              className='text-linkBlue hover:text-blue-700'
-                              target='_blank'
-                            >
-                              <p className='m-1  text-[14px] tracking-wider'>
-                                {link}
-                              </p>
-                            </Link>
-                          ))}
-                        </td>
-                      </tr>
-                    ))}
-                  </tbody>
-                </table>{' '}
-              </div>
-            ))}
+      <div className='mt-8'>
+        {datas.map((data: DataObject, index: number) => (
+          <div key={index} className='mt-8'>
+            <Headline3>{data.name}</Headline3>
+            <p className='text-slate-600 block leading-7 dark:text-slate-300'>
+              {data.vocabulary.join(', ')}
+            </p>
+            <Link
+              href={data.learnjsonschemalink}
+              className='text-blue-500 hover:underline'
+            >
+              {data.learnjsonschemalink}
+              Learn JSON Schema
+            </Link>
+            <ul className='mt-4'>
+              {data.links.map((link: LinkObject, index: number) => (
+                <li key={index}>
+                  <Link
+                    href={link.url}
+                    className='text-blue-500 hover:underline'
+                  >
+                    {link.title}
+                  </Link>
+                </li>
+              ))}
+            </ul>
           </div>
-        </div>
-      ))}
+        ))}
+      </div>
 
       <DocsHelp markdownFile={markdownFile} />
     </SectionContext.Provider>