diff --git a/content/content-management/syntax-highlighting.md b/content/content-management/syntax-highlighting.md
index 67d443fd4..a2aa62bb2 100644
--- a/content/content-management/syntax-highlighting.md
+++ b/content/content-management/syntax-highlighting.md
@@ -159,6 +159,11 @@ It is also possible to add syntax highlighting with GitHub flavored code fences.
 ```
 ````
 
+## List of Chroma Highlighting Languages
+
+The full list of Chroma lexers and their aliases (which is the identifier used in the `hightlight` template func or when doing highlighting in code fences):
+
+{{< chroma-lexers >}}
 
 ## Highlight with Pygments Classic
 
diff --git a/data/docs.json b/data/docs.json
index 6400900af..593dcabdf 100644
--- a/data/docs.json
+++ b/data/docs.json
@@ -84,7 +84,6 @@
       {
         "Name": "Base Makefile",
         "Aliases": [
-          "*",
           "bsdmake",
           "mak",
           "make",
@@ -97,7 +96,6 @@
         "Name": "Bash",
         "Aliases": [
           "bash",
-          "bash_*",
           "bashrc",
           "ebuild",
           "eclass",
diff --git a/layouts/shortcodes/chroma-lexers.html b/layouts/shortcodes/chroma-lexers.html
new file mode 100644
index 000000000..0df2b868f
--- /dev/null
+++ b/layouts/shortcodes/chroma-lexers.html
@@ -0,0 +1,6 @@
+<dl>
+{{  range .Site.Data.docs.chroma.lexers }}
+<dt>{{ .Name }}</dt>
+<dd>{{ delimit .Aliases ", " }}</dd>
+{{ end }}
+</dl>
\ No newline at end of file