diff --git a/README.md b/README.md
index 3d5f06b..b6ac0e3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-<!-- DO NOT EDIT THIS FILE (README.md) -->
-<!-- ALL ENTRIES SHOULD BE IN TO THE data.json -->
-<!-- SEE THE CONTRIBUTING GUIDE (CONTRIBUTING.md) FOR MORE GUIDANCE -->
-<!-- YOU MAY IGNORE THIS MESSAGE IF YOU ARE EDITING THE TEMPLATE -->
+<!-- DO NOT EDIT THIS FILE (`README.md`) -->
+<!-- ALL ENTRIES SHOULD BE ADDED TO AND REMOVED FROM `data.json` -->
+<!-- SEE THE CONTRIBUTING GUIDE (`CONTRIBUTING.md`) FOR MORE GUIDANCE -->
+<!-- YOU MAY IGNORE THIS MESSAGE IF YOU ARE EDITING `README-template.j2` -->
 
 # Awesome First PR Opportunities [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
 
@@ -10,38 +10,24 @@ Inspired by [First Timers Only](https://kentcdodds.com/blog/first-timers-only) b
 If you are a maintainer of open-source projects, add the label `first-timers-only` (or similar) to your project and list it here so that people can find it.
 
 If you are not a programmer but would like to contribute, check out the [Awesome for non-programmers](https://github.com/szabgab/awesome-for-non-programmers) list.
-
 ## Table of Contents:
 
-- [.NET](#net)
-- [Angular](#angular)
-- [Ansible](#ansible)
-- [C](#c)
-- [C#](#c-1)
-- [C++](#c-2)
-- [Clojure](#clojure)
-- [Dart](#dart)
-- [Elixir](#elixir)
-- [Elm](#elm)
-- [Go](#go)
-- [Haskell](#haskell)
-- [Java](#java)
-- [JavaScript](#javascript)
-- [JSON](#json)
-- [Julia](#julia)
-- [Kotlin](#kotlin)
-- [Markdown](#markdown)
-- [MLOps](#mlops)
-- [Perl](#perl)
-- [PHP](#php)
-- [Pug](#pug)
-- [Python](#python)
-- [Ruby](#ruby)
-- [Rust](#rust)
-- [Scala](#scala)
-- [Smalltalk](#smalltalk)
-- [Swift](#swift)
-- [TypeScript](#typescript)
+||Languages|
+|--|--|
+|Misc|[.NET](#net)|
+|A|[Angular](#angular), [Ansible](#ansible)|
+|C|[C](#c), [C#](#c-1), [C++](#c-2), [Clojure](#clojure)|
+|D|[Dart](#dart)|
+|E|[Elixir](#elixir), [Elm](#elm)|
+|G|[Go](#go)|
+|H|[Haskell](#haskell)|
+|J|[Java](#java), [JavaScript](#javascript), [JSON](#json), [Julia](#julia)|
+|K|[Kotlin](#kotlin)|
+|M|[Markdown](#markdown), [MLOps](#mlops)|
+|P|[Perl](#perl), [PHP](#php), [Pug](#pug), [Python](#python)|
+|R|[Ruby](#ruby), [Rust](#rust)|
+|S|[Scala](#scala), [Smalltalk](#smalltalk), [Swift](#swift)|
+|T|[TypeScript](#typescript)|
 
 ## .NET
 
@@ -171,7 +157,6 @@ If you are not a programmer but would like to contribute, check out the [Awesome
 - [HMPL](https://github.com/hmpl-language/hmpl) _(label: good first issue)_ <br> Server-oriented customizable templating for JavaScript.
 - [Hoppscotch](https://github.com/hoppscotch/hoppscotch) _(label: good first issue)_ <br> A free, fast and beautiful API request builder.
 - [HueHive](https://github.com/croma-app/croma) _(label: good first issue)_ <br> A open source react native app iOS and android for color palette management
-- [Hyper](https://github.com/zeit/hyper) _(label: good first issue)_ <br> JS/HTML/CSS Terminal
 - [iD](https://github.com/openstreetmap/iD) _(label: good first issue)_ <br> The easy-to-use OpenStreetMap editor in JavaScript.
 - [Jasmine](https://github.com/jasmine/jasmine) _(label: good first issue)_ <br> Simple JavaScript testing framework for browsers and node.js.
 - [Jest](https://github.com/facebook/jest) _(label: good first issue)_ <br> A complete and easy to set up JavaScript testing solution.