diff --git a/topics/json-api/index.md b/topics/json-api/index.md
new file mode 100644
index 00000000000..eded1d69fe0
--- /dev/null
+++ b/topics/json-api/index.md
@@ -0,0 +1,18 @@
+---
+display_name: "JSON:API"
+created_by: Yehuda Katz, Dan Gebhardt, Gabe Sullice, Jeldrik Hanschke, Tyler Kellen, Steve Klabnik,Ethan Resnick
+logo: json-api.png
+released: May 3, 2013
+short_description: "JSON:API is a specification for building APIs in JSON."
+topic: json-api
+url: https://jsonapi.org
+related: json, emberjs, rest-api, json-ld, hal, hateoas, siren, hydra, collection-json
+---
+**JSON:API** is a specification for how a client should request that resources be fetched or modified, and how a server should respond to those requests. JSON:API is designed to minimize both the number of requests and the amount of data transmitted between clients and servers. This first draft was extracted from the JSON transport implicitly defined by Ember Data’s REST adapter. In general, Ember Data’s goal is to eliminate the need for ad-hoc code per application to communicate with servers that communicate in a well-defined way. The REST Adapter in Ember Data implicitly defined a protocol that custom servers could implement to get a drop-in client for all of their resources. The goals of the media type are to balance:
+
+* A generic media type that can work across a broad set of use cases, including the generally used relationship types
+* Similarity to existing server-side framework practices (and human readability for debugging)
+* Ease of implementation on the server side
+* Ease of implementation on the client side
+
+This specification reached a stable version 1.0 on May 29, 2015.
diff --git a/topics/json-api/json-api.png b/topics/json-api/json-api.png
new file mode 100644
index 00000000000..65774a336f7
Binary files /dev/null and b/topics/json-api/json-api.png differ
diff --git a/topics/json/index.md b/topics/json/index.md
index 22ffe29ed26..3c6ecced705 100644
--- a/topics/json/index.md
+++ b/topics/json/index.md
@@ -1,5 +1,4 @@
 ---
-aliases: json-api, jsonapi
 created_by: Douglas Crockford
 display_name: JSON
 logo: json.png
@@ -9,5 +8,6 @@ short_description: JSON (JavaScript Object Notation) allows for easy interchange
 topic: json
 url: http://www.json.org/
 wikipedia_url: https://en.wikipedia.org/wiki/JSON
+related: toml, yaml, json5, jsonc, xml, json-api, bson, json-ld, properties, jq
 ---
-JSON (JavaScript Object Notation) is a standard file format that uses text to communicate data objects to array data types. This notation makes it easy for applications to parse and generate files. JSON grew out of the need to have a real-time server-to-web browser communication.
+**JSON** (**J**ava**S**cript **O**bject **N**otation) is a standard file format that uses text to communicate data objects to array data types. This notation makes it easy for applications to parse and generate files. JSON grew out of the need to have a real-time server-to-web browser communication.
diff --git a/topics/kokkos/index.md b/topics/kokkos/index.md
new file mode 100644
index 00000000000..2a9a12f088d
--- /dev/null
+++ b/topics/kokkos/index.md
@@ -0,0 +1,10 @@
+---
+display_name: Kokkos
+github_url: https://github.com/kokkos
+logo: kokkos.png
+related: c-plus-plus, parallel-computing, high-performance-computing
+short_description: Kokkos C++ Performance Portability EcoSystem.
+topic: kokkos
+url: https://kokkos.github.io/
+---
+The Kokkos C++ Performance Portability Ecosystem is a production level solution for writing modern C++ applications in a hardware agnostic way. The Ecosystem consists of multiple libraries addressing the primary concerns for developing and maintaining applications in a portable way. The three main components are the [Kokkos Core Programming Model](https://github.com/kokkos/kokkos), the [Kokkos Kernels Math Libraries ](https://github.com/kokkos/kokkos-kernels) and the [Kokkos Profiling and Debugging Tools](https://github.com/kokkos/kokkos-tools).
diff --git a/topics/kokkos/kokkos.png b/topics/kokkos/kokkos.png
new file mode 100644
index 00000000000..ef36c6f556d
Binary files /dev/null and b/topics/kokkos/kokkos.png differ