diff --git a/_data/validator-cli.yaml b/_data/validator-cli.yaml
deleted file mode 100644
index 887d5b1c..00000000
--- a/_data/validator-cli.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- name: ajv-cli
-  license: MIT
-  url: 'https://www.npmjs.com/package/ajv-cli'
-  draft:
-    - 7
-    - 6
-    - 4
-- name: Polyglottal JSON Schema Validator
-  license: MIT
-  url: 'https://www.npmjs.com/package/pajv'
-  draft:
-    - 6
-    - 4
-  notes: can be used with YAML and many other formats besides JSON
diff --git a/_data/validator-libraries-modern.yml b/_data/validator-libraries-modern.yml
index 1ca88375..ec1a67e7 100644
--- a/_data/validator-libraries-modern.yml
+++ b/_data/validator-libraries-modern.yml
@@ -27,6 +27,11 @@
       notes:
       draft: [7, 6, 4]
       license: BSD-3-Clause
+    - name: qri-io/jsonschema
+      url: https://github.com/qri-io/jsonschema
+      draft: [7]
+      license: MIT
+      notes: includes custom validator support, rich error returns
 - name: Java
   implementations:
     - name: everit-org/json-schema
@@ -38,7 +43,7 @@
   implementations:
     - name: ajv
       url: https://github.com/epoberezkin/ajv
-      notes: "for Node.js and browsers - *supports [custom keywords](https://github.com/epoberezkin/ajv-keywords) and [$data reference](https://github.com/json-schema-org/json-schema-spec/issues/51)*"
+      notes: "for Node.js and browsers - supports [custom keywords](https://github.com/epoberezkin/ajv-keywords) and [$data reference](https://github.com/json-schema-org/json-schema-spec/issues/51)"
       draft: [7, 6, 4]
       license: MIT
     - name: djv
@@ -76,3 +81,22 @@
       notes:
       draft: [7, 6, 4]
       license: MIT
+- name: Web (Online)
+  implementations:
+    - name: JSON Schema Validator
+      url: https://www.jsonschemavalidator.net/
+      draft: [7, 6, 4, 3]
+    - name: JSON Schema Lint
+      url: http://jsonschemalint.com/
+      draft: [6, 4, 3, 2, 1]
+- name: Command Line
+  implementations:
+    - name: ajv-cli
+      license: MIT
+      url: 'https://www.npmjs.com/package/ajv-cli'
+      draft: [7, 6, 4]
+    - name: Polyglottal JSON Schema Validator
+      license: MIT
+      url: 'https://www.npmjs.com/package/pajv'
+      draft: [6, 4]
+      notes: can be used with YAML and many other formats besides JSON
diff --git a/implementations.md b/implementations.md
index 46961f3f..58a1257c 100644
--- a/implementations.md
+++ b/implementations.md
@@ -22,11 +22,9 @@ If you have updates to this list, make a pull request on the [GitHub repo](https
 Validators
 ----------
 
-### Libraries
-
 <nav class="intra" markdown="1">
 
-{% assign validator-libraries = site.data.validator-libraries-modern | sort:"name" %}
+{% assign validator-libraries = site.data.validator-libraries-modern %}
 
 {% for language in validator-libraries %}
 -   [{{ language.name }}](#validator-{% if language.anchor-name %}{{ language.anchor-name }}{% else %}{{ language.name | downcase }}{% endif %})
@@ -34,7 +32,7 @@ Validators
 
 </nav>
 
-<!-- To add a validator library, add it in _data/validator-libraries-modern.yml -->
+<!-- To add a validator, add it in _data/validator-libraries-modern.yml -->
 
 <ul>
   {% for language in validator-libraries %}
@@ -46,11 +44,14 @@ Validators
         <a href="{{implementation.url}}">{{ implementation.name }}</a>
 
         {% if implementation.draft %}
-            <em>supports draft-0{{ implementation.draft | join: ", draft-0" }}</em>
+            <em>draft-0{{ implementation.draft | join: ", -0" }}</em>
         {% endif %}
 
         {{implementation.notes | markdownify | remove: '<p>' | remove: '</p>'}}
-        ({{ implementation.license | join: ", " }})
+
+        {% if implementation.license %}
+            ({{ implementation.license | join: ", " }})
+        {% endif %}
 
         </li>
     {% endfor %}
@@ -59,22 +60,6 @@ Validators
   {% endfor %}
 </ul>
 
-
-
-### Online
-
--   [JSON Schema Validator](https://www.jsonschemavalidator.net/) - validate against your own schemas
--   [JSON Schema Lint](http://jsonschemalint.com/) - validate against your own schemas
--   [quicktype.io](https://app.quicktype.io/#l=schema) - infer JSON Schema from samples, and generate TypeScript, C++, go, Java, C#, Swift, etc. types from JSON Schema
-
-### Command Line
-
-<!-- To add a validator library, add it in _data/validator-libraries-modern.yml -->
-
-{% for tool in site.data.validator-cli %}
-- [{{ tool.name }}]({{ tool.url }}) <em>[draft-0{{ tool.draft | join: ", draft-0" }}]</em> ({{ tool.license | join: ", " }}){% if tool.notes %}
-  - {{ tool.notes }} {% endif %}{% endfor %}
-
 ### Benchmarks
 
 Benchmarks that compare at least two implementations supporting draft-06+ may be listed here.
@@ -142,6 +127,7 @@ Generators that produce schemas that are compatible with draft-06+ (e.g. no bool
     -   [typescript-json-schema](https://github.com/YousefED/typescript-json-schema)
 -   Online (web tool)
     -   [jsonschema.net](http://www.jsonschema.net) - generates schemas from example data
+    -   [quicktype.io](https://app.quicktype.io/#l=schema) - infer JSON Schema from samples, and generate TypeScript, C++, go, Java, C#, Swift, etc. types from JSON Schema
 
 Data parsing and code generation
 --------------------------------