diff --git a/components.js b/components.js
index 6da3a95d58..1510773afd 100644
--- a/components.js
+++ b/components.js
@@ -44,6 +44,7 @@ var components = {
 		},
 		"markup": {
 			"title": "Markup",
+			"alias": ["html", "xml", "svg", "mathml"],
 			"aliasTitles": {
 				"html": "HTML",
 				"xml": "XML",
@@ -58,12 +59,14 @@ var components = {
 		},
 		"clike": {
 			"title": "C-like",
-			"option": "default"
+			"option": "default",
+			"overrideExampleHeader": true
 		},
 		"javascript": {
 			"title": "JavaScript",
-			"option": "default",
-			"require": "clike"
+			"require": "clike",
+			"alias": "js",
+			"option": "default"
 		},
 		"abap": {
 			"title": "ABAP",
@@ -130,6 +133,7 @@ var components = {
 		},
 		"batch": {
 			"title": "Batch",
+			"alias": "shell",
 			"owner": "Golmote"
 		},
 		"bison": {
@@ -153,6 +157,7 @@ var components = {
 		"csharp": {
 			"title": "C#",
 			"require": "clike",
+			"alias": "dotnet",
 			"owner": "mvalipour"
 		},
 		"cpp": {
@@ -200,6 +205,7 @@ var components = {
 		"django": {
 			"title": "Django/Jinja2",
 			"require": "markup",
+			"alias": "jinja2",
 			"owner": "romanvm"
 		},
 		"docker": {
@@ -433,6 +439,7 @@ var components = {
 		"opencl": {
 			"title": "OpenCL",
 			"require": "cpp",
+			"overrideExampleHeader": true,
 			"owner": "Milania1"
 		},
 		"oz": {
@@ -506,7 +513,7 @@ var components = {
 			"owner": "multipetros"
 		},
 		"q": {
-			"title": "Q",
+			"title": "Q (kdb+ database)",
 			"owner": "Golmote"
 		},
 		"qore": {
@@ -619,6 +626,7 @@ var components = {
 		"typescript": {
 			"title": "TypeScript",
 			"require": "javascript",
+			"alias": "ts",
 			"owner": "vkbansal"
 		},
 		"vbnet": {
diff --git a/examples.js b/examples.js
index a686fa787f..ba275c5559 100644
--- a/examples.js
+++ b/examples.js
@@ -104,6 +104,42 @@ function getFileContents(filepath) {
 	});
 }
 
+function buildContentsHeader(id) {
+	var language = languages[id];
+	var header = '<h1>' + language.title + '</h1>';
+	if (language.overrideExampleHeader) {
+		return header;
+	}
+	if (language.alias) {
+		var alias = language.alias;
+		if (Prism.util.type(alias) !== 'Array') {
+			alias = [alias];
+		}
+
+		header += '<p>To use this language, use one of the following classes:</p>';
+		header += '<ul><li><code class="language-none">"language-' + id + '"</code></li>';
+		alias.forEach(function (alias) {
+			header += '<li><code class="language-none">"language-' + alias + '"</code></li>';
+		});
+		header += '</ul>';
+	} else {
+		header += '<p>To use this language, use the class <code class="language-none">"language-' + id + '"</code>.</p>';
+	}
+	if (language.require) {
+		var require = language.require;
+		if (Prism.util.type(require) !== 'Array') {
+			require = [require];
+		}
+
+		header += '<p><strong>Dependencies:</strong> The following dependencies need to be loaded before this component: ';
+		header += require.map(function (dep) {
+			return '<code class="language-none">' + dep + '</code>';
+		}).join(', ');
+		header += '.</p>';
+	}
+	return header;
+}
+
 function update(id) {
 	var language = languages[id];
 	if (language.enabled) {
@@ -111,7 +147,7 @@ function update(id) {
 			language.examplesPromise = getFileContents(language.examplesPath);
 		}
 		language.examplesPromise.then(function (contents) {
-			examples[id].innerHTML = contents;
+			examples[id].innerHTML = buildContentsHeader(id) + contents;
 
 			loadLanguage(id).then(function () {
 				var elements = examples[id].querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');
diff --git a/examples/prism-abap.html b/examples/prism-abap.html
index 8781285620..dfda1f7f18 100644
--- a/examples/prism-abap.html
+++ b/examples/prism-abap.html
@@ -1,6 +1,3 @@
-<h1>ABAP</h1>
-<p>To use this language, use the class "language-abap".</p>
-
 <h2>Comments</h2>
 <pre><code>
 * Line Comments
diff --git a/examples/prism-actionscript.html b/examples/prism-actionscript.html
index 5c3f297f8c..abb5804dbb 100644
--- a/examples/prism-actionscript.html
+++ b/examples/prism-actionscript.html
@@ -1,6 +1,3 @@
-<h1>ActionScript</h1>
-<p>To use this language, use the class "language-actionscript".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /* Multi-line
diff --git a/examples/prism-ada.html b/examples/prism-ada.html
index 7836a5a1fc..1783027e7e 100644
--- a/examples/prism-ada.html
+++ b/examples/prism-ada.html
@@ -1,6 +1,3 @@
-<h1>Ada</h1>
-<p>To use this language, use the class "language-ada".</p>
-
 <h2>Strings</h2>
 <pre><code>"foo ""bar"" baz"
 "Multi-line strings are appended with a " &
diff --git a/examples/prism-apacheconf.html b/examples/prism-apacheconf.html
index 29ac4ad4b4..f6953e1b0d 100644
--- a/examples/prism-apacheconf.html
+++ b/examples/prism-apacheconf.html
@@ -1,6 +1,3 @@
-<h1>Apache Configuration</h1>
-<p>To use this language, use the class "language-apacheconf".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment
 # &lt;VirtualHost *:80>
diff --git a/examples/prism-apl.html b/examples/prism-apl.html
index 10844d7b1b..61a7e4694c 100644
--- a/examples/prism-apl.html
+++ b/examples/prism-apl.html
@@ -1,6 +1,3 @@
-<h1>APL</h1>
-<p>To use this language, use the class "language-apl".</p>
-
 <h2>Comments</h2>
 <pre><code>#!/usr/bin/env runapl
 a←1 2 3 ⍝ this is a comment</code></pre>
diff --git a/examples/prism-applescript.html b/examples/prism-applescript.html
index d652240395..c88390e819 100644
--- a/examples/prism-applescript.html
+++ b/examples/prism-applescript.html
@@ -1,6 +1,3 @@
-<h1>AppleScript</h1>
-<p>To use this language, use the class "language-applescript".</p>
-
 <h2>Comments</h2>
 <pre><code>-- Single line comment
 #!/usr/bin/osascript
diff --git a/examples/prism-arduino.html b/examples/prism-arduino.html
index 26628f9a30..915f700f48 100644
--- a/examples/prism-arduino.html
+++ b/examples/prism-arduino.html
@@ -1,6 +1,3 @@
-<h1>Arduino</h1>
-<p>To use this language, use the class "language-arduino".</p>
-
 <h2>Strings</h2>
 <pre><code>"foo \"bar\" baz"
 'foo \'bar\' baz'
diff --git a/examples/prism-arff.html b/examples/prism-arff.html
index 1cc2eb29af..418120996a 100644
--- a/examples/prism-arff.html
+++ b/examples/prism-arff.html
@@ -1,6 +1,3 @@
-<h1>ARFF</h1>
-<p>To use this language, use the class "language-arff".</p>
-
 <h2>Comments</h2>
 <pre><code>%
 % Some comments
diff --git a/examples/prism-asciidoc.html b/examples/prism-asciidoc.html
index 770c7e4cda..d6df3021b5 100644
--- a/examples/prism-asciidoc.html
+++ b/examples/prism-asciidoc.html
@@ -1,6 +1,3 @@
-<h1>AsciiDoc</h1>
-<p>To use this language, use the class "language-asciidoc".</p>
-
 <h2>Comments</h2>
 <pre><code>/////
 Comment block
diff --git a/examples/prism-asm6502.html b/examples/prism-asm6502.html
index 23d3aafc7d..21f4b687f8 100644
--- a/examples/prism-asm6502.html
+++ b/examples/prism-asm6502.html
@@ -1,6 +1,3 @@
-<h1>6502 Assembly</h1>
-<p>To use this language, use the class "language-asm6502".</p>
-
 <h2>Comments</h2>
 <pre><code>; This is a comment</code></pre>
 
diff --git a/examples/prism-aspnet.html b/examples/prism-aspnet.html
index cdc1fc3701..d9c30fcf96 100644
--- a/examples/prism-aspnet.html
+++ b/examples/prism-aspnet.html
@@ -1,6 +1,3 @@
-<h1>ASP.NET (C#)</h1>
-<p>To use this language, use the class "language-aspnet".</p>
-
 <h2>Comments</h2>
 <pre><code><%-- This is a comment --%>
 <%-- This is a
diff --git a/examples/prism-autohotkey.html b/examples/prism-autohotkey.html
index e7afbbc236..620edb2eab 100644
--- a/examples/prism-autohotkey.html
+++ b/examples/prism-autohotkey.html
@@ -1,6 +1,3 @@
-<h1>AutoHotkey</h1>
-<p>To use this language, use the class "language-autohotkey".</p>
-
 <h2>Comments</h2>
 <pre><code>; This is a comment</code></pre>
 
diff --git a/examples/prism-autoit.html b/examples/prism-autoit.html
index d119b1a5f1..51220b421c 100644
--- a/examples/prism-autoit.html
+++ b/examples/prism-autoit.html
@@ -1,6 +1,3 @@
-<h1>AutoIt</h1>
-<p>To use this language, use the class "language-autoit".</p>
-
 <h2>Comments</h2>
 <pre><code>; Single-line comment
 #comments-start
diff --git a/examples/prism-bash.html b/examples/prism-bash.html
index 18c65b8ba8..3e0febfaba 100644
--- a/examples/prism-bash.html
+++ b/examples/prism-bash.html
@@ -1,6 +1,3 @@
-<h1>Bash</h1>
-<p>To use this language, use the class "language-bash".</p>
-
 <h2>Shebang</h2>
 <pre><code>#!/bin/bash</code></pre>
 
diff --git a/examples/prism-basic.html b/examples/prism-basic.html
index f4495e33f1..3630a8a2c0 100644
--- a/examples/prism-basic.html
+++ b/examples/prism-basic.html
@@ -1,6 +1,3 @@
-<h1>BASIC</h1>
-<p>To use this language, use the class "language-basic".</p>
-
 <p>Note: this component focuses on first and second-generation BASICs (such as MSX BASIC, GW-BASIC, SuperBASIC, QuickBASIC, PowerBASIC...).</p>
 
 <h2>Comments</h2>
diff --git a/examples/prism-batch.html b/examples/prism-batch.html
index d9bab37944..13f9018c00 100644
--- a/examples/prism-batch.html
+++ b/examples/prism-batch.html
@@ -1,10 +1,3 @@
-<h1>Batch</h1>
-<p>To use this language, use one of the following classes:</p>
-<ul>
-	<li>"language-batch"</li>
-	<li>"language-shell"</li>
-</ul>
-
 <h2>Comments</h2>
 <pre><code>::
 :: Foo bar
diff --git a/examples/prism-bison.html b/examples/prism-bison.html
index 5cb00828bc..9c7edeb8da 100644
--- a/examples/prism-bison.html
+++ b/examples/prism-bison.html
@@ -1,6 +1,3 @@
-<h1>Bison</h1>
-<p>To use this language, use the class "language-bison".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single-line comment
 /* Multi-line
diff --git a/examples/prism-brainfuck.html b/examples/prism-brainfuck.html
index e4cf9fe22d..89a435c92f 100644
--- a/examples/prism-brainfuck.html
+++ b/examples/prism-brainfuck.html
@@ -1,6 +1,3 @@
-<h1>Brainfuck</h1>
-<p>To use this language, use the class "language-brainfuck".</p>
-
 <h2>Full example</h2>
 <pre><code>+++++ +++               Set Cell #0 to 8
 [
diff --git a/examples/prism-bro.html b/examples/prism-bro.html
index 426d8c2f55..83d6374e67 100644
--- a/examples/prism-bro.html
+++ b/examples/prism-bro.html
@@ -1,6 +1,3 @@
-<h1>Bro</h1>
-<p>To use this language, use the class "language-bro".</p>
-
 <h2>Comments</h2>
 <pre><code># Single line comment
 </code></pre>
diff --git a/examples/prism-c.html b/examples/prism-c.html
index ae5e77d963..aee1c06a87 100644
--- a/examples/prism-c.html
+++ b/examples/prism-c.html
@@ -1,6 +1,3 @@
-<h1>C</h1>
-<p>To use this language, use the class "language-c".</p>
-
 <h2>Strings</h2>
 <pre><code>"foo \"bar\" baz"
 'foo \'bar\' baz'
diff --git a/examples/prism-clike.html b/examples/prism-clike.html
index 9e68f25c2b..79a8076409 100644
--- a/examples/prism-clike.html
+++ b/examples/prism-clike.html
@@ -1,7 +1,6 @@
-<h1>C-like</h1>
 <p>The C-like component is not really a language on its own,
 	it is the basis of many other components. To use it directly, however,
-	use the class "language-clike".</p>
+	use the class <code class="language-none">"language-clike"</code>.</p>
 
 <h2>Comments</h2>
 <pre><code>// Single line comment
diff --git a/examples/prism-clojure.html b/examples/prism-clojure.html
index 9d01ea31c3..abc50194b3 100644
--- a/examples/prism-clojure.html
+++ b/examples/prism-clojure.html
@@ -1,6 +1,3 @@
-<h1>Clojure</h1>
-<p>To use this language, use the class "language-clojure".</p>
-
 <h2>Full example</h2>
 <pre><code>
 ; This code is copied from https://learnxinyminutes.com/docs/clojure/
diff --git a/examples/prism-coffeescript.html b/examples/prism-coffeescript.html
index 8d7537bef9..a710aa990d 100644
--- a/examples/prism-coffeescript.html
+++ b/examples/prism-coffeescript.html
@@ -1,6 +1,3 @@
-<h1>CoffeeScript</h1>
-<p>To use this language, use the class "language-coffeescript".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment
 ### This is a
diff --git a/examples/prism-cpp.html b/examples/prism-cpp.html
index 054f4afd3e..32bdcbda56 100644
--- a/examples/prism-cpp.html
+++ b/examples/prism-cpp.html
@@ -1,6 +1,3 @@
-<h1>C++</h1>
-<p>To use this language, use the class "language-cpp".</p>
-
 <h2>Strings</h2>
 <pre><code>"foo \"bar\" baz"
 'foo \'bar\' baz'
diff --git a/examples/prism-crystal.html b/examples/prism-crystal.html
index 3440e82b4a..e824217b8f 100644
--- a/examples/prism-crystal.html
+++ b/examples/prism-crystal.html
@@ -1,6 +1,3 @@
-<h1>Crystal</h1>
-<p>To use this language, use the class "language-crystal".</p>
-
 <h2>Number literals with underscores and postfix</h2>
 <pre><code>1_u32
 123_456.789e-10_f64</code></pre>
diff --git a/examples/prism-csharp.html b/examples/prism-csharp.html
index 8805585d19..c6d76c2b44 100644
--- a/examples/prism-csharp.html
+++ b/examples/prism-csharp.html
@@ -1,10 +1,3 @@
-<h1>C#</h1>
-<p>To use this language, use one of the following classes:</p>
-<ul>
-	<li>"language-csharp"</li>
-	<li>"language-dotnet"</li>
-</ul>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /* Multi-line
diff --git a/examples/prism-csp.html b/examples/prism-csp.html
index ff89659a6d..e10a416b0e 100644
--- a/examples/prism-csp.html
+++ b/examples/prism-csp.html
@@ -1,6 +1,3 @@
-<h1>HTTP Content-Security-Policy header value</h1>
-<p>To use this language, use the class "language-csp".</p>
-
 <h2>A complete policy</h2>
 <pre><code>default-src 'none';
 script-src my.cdn.com;
diff --git a/examples/prism-css.html b/examples/prism-css.html
index 73cda7e6a3..e211053efd 100644
--- a/examples/prism-css.html
+++ b/examples/prism-css.html
@@ -1,6 +1,3 @@
-<h1>CSS</h1>
-<p>To use this language, use the class "language-css".</p>
-
 <h2>Empty rule</h2>
 <pre><code>*{} * {} p {}</code></pre>
 <pre><code>ul,
diff --git a/examples/prism-d.html b/examples/prism-d.html
index a3a0a3e893..46db3f5311 100644
--- a/examples/prism-d.html
+++ b/examples/prism-d.html
@@ -1,6 +1,3 @@
-<h1>D</h1>
-<p>To use this language, use the class "language-d".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /* Multi-line
diff --git a/examples/prism-dart.html b/examples/prism-dart.html
index e4de63416f..e38d85eae2 100644
--- a/examples/prism-dart.html
+++ b/examples/prism-dart.html
@@ -1,6 +1,3 @@
-<h1>Dart</h1>
-<p>To use this language, use the class "language-dart".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /// Documentation single line comment
diff --git a/examples/prism-diff.html b/examples/prism-diff.html
index 0bc7723afb..b9229a1740 100644
--- a/examples/prism-diff.html
+++ b/examples/prism-diff.html
@@ -1,6 +1,3 @@
-<h1>Diff</h1>
-<p>To use this language, use the class "language-diff".</p>
-
 <h2>Normal Diff</h2>
 <pre><code>7c7
 &lt; qt: core
diff --git a/examples/prism-django.html b/examples/prism-django.html
index 1260fae557..ac9cf0df73 100644
--- a/examples/prism-django.html
+++ b/examples/prism-django.html
@@ -1,10 +1,3 @@
-<h1>Django/Jinja2</h1>
-<p>To use this language, use one of the following classes:</p>
-<ul>
-  <li>"language-django"</li>
-  <li>"language-jinja2"</li>
-</ul>
-
 <h2>Comment</h2>
 <pre><code>{# This is a comment #}</code></pre>
 
diff --git a/examples/prism-docker.html b/examples/prism-docker.html
index a37b2df2ed..86511b3889 100644
--- a/examples/prism-docker.html
+++ b/examples/prism-docker.html
@@ -1,6 +1,3 @@
-<h1>Docker</h1>
-<p>To use this language, use the class "language-docker".</p>
-
 <h2>Comments</h2>
 <pre><code># These are the comments for a dockerfile.
 # I want to make sure $(variables) don't break out,
diff --git a/examples/prism-eiffel.html b/examples/prism-eiffel.html
index ac992833bb..94c18b22f5 100644
--- a/examples/prism-eiffel.html
+++ b/examples/prism-eiffel.html
@@ -1,6 +1,3 @@
-<h1>Eiffel</h1>
-<p>To use this language, use the class "language-eiffel".</p>
-
 <h2>Comments</h2>
 <pre><code>-- A comment
 </code></pre>
diff --git a/examples/prism-elixir.html b/examples/prism-elixir.html
index 297c39b3dd..56ea52b419 100644
--- a/examples/prism-elixir.html
+++ b/examples/prism-elixir.html
@@ -1,6 +1,3 @@
-<h1>Elixir</h1>
-<p>To use this language, use the class "language-elixir".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment</code></pre>
 
diff --git a/examples/prism-elm.html b/examples/prism-elm.html
index d5f14f0270..00d0e33314 100644
--- a/examples/prism-elm.html
+++ b/examples/prism-elm.html
@@ -1,6 +1,3 @@
-<h1>Elm</h1>
-<p>To user this language, use the class "language-elm".</p>
-
 <h2>Comments</h2>
 <pre><code>-- Single line comment
 {- Multi-line
diff --git a/examples/prism-erlang.html b/examples/prism-erlang.html
index 637d7a1071..05445adfc2 100644
--- a/examples/prism-erlang.html
+++ b/examples/prism-erlang.html
@@ -1,6 +1,3 @@
-<h1>Erlang</h1>
-<p>To use this language, use the class "language-erlang".</p>
-
 <h2>Comments</h2>
 <pre><code>% This is a comment
 %% coding: utf-8</code></pre>
diff --git a/examples/prism-flow.html b/examples/prism-flow.html
index 2742d214e4..76f3e14a18 100644
--- a/examples/prism-flow.html
+++ b/examples/prism-flow.html
@@ -1,6 +1,3 @@
-<h1>Flow</h1>
-<p>To use this language, use the class "language-flow".</p>
-
 <h2>Primitive types</h2>
 <pre><code>function method(x: number, y: string, z: boolean) {}
 function stringifyBasicValue(value: string | number) {}
diff --git a/examples/prism-fortran.html b/examples/prism-fortran.html
index 12e9c2070b..537c93d13b 100644
--- a/examples/prism-fortran.html
+++ b/examples/prism-fortran.html
@@ -1,6 +1,3 @@
-<h1>Fortran</h1>
-<p>To use this language, use the class "language-fortran".</p>
-
 <h2>Comments</h2>
 <pre><code>! This is a comment</code></pre>
 
diff --git a/examples/prism-fsharp.html b/examples/prism-fsharp.html
index 3e441a5d45..6a4330b652 100644
--- a/examples/prism-fsharp.html
+++ b/examples/prism-fsharp.html
@@ -1,6 +1,3 @@
-<h1>F#</h1>
-<p>To use this language, use the class "language-fsharp".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 (* Multi-line
diff --git a/examples/prism-gherkin.html b/examples/prism-gherkin.html
index 41bf19aff8..f38446e720 100644
--- a/examples/prism-gherkin.html
+++ b/examples/prism-gherkin.html
@@ -1,6 +1,3 @@
-<h1>Gherkin</h1>
-<p>To use this language, use the class "language-gherkin".</p>
-
 <h2>Strings</h2>
 <pre><code>"foo \"bar\" baz"
 'foo \'bar\' baz'
diff --git a/examples/prism-git.html b/examples/prism-git.html
index 7d37d4b816..cd5668d175 100644
--- a/examples/prism-git.html
+++ b/examples/prism-git.html
@@ -1,6 +1,3 @@
-<h1>Git</h1>
-<p>To use this language, use the class "language-git".</p>
-
 <h2>Comments</h2>
 <pre><code># On branch prism-examples
 # Changes to be committed:
diff --git a/examples/prism-glsl.html b/examples/prism-glsl.html
index ab9d8d704d..7492a422ba 100644
--- a/examples/prism-glsl.html
+++ b/examples/prism-glsl.html
@@ -1,6 +1,3 @@
-<h1>GLSL (OpenGL Shading Language)</h1>
-<p>To use this language, use the class "language-glsl".</p>
-
 <h2>Vertex shader example</h2>
 <pre><code>attribute vec3 vertex;
 attribute vec3 normal;
diff --git a/examples/prism-go.html b/examples/prism-go.html
index 196dcf468e..205a1a7e29 100644
--- a/examples/prism-go.html
+++ b/examples/prism-go.html
@@ -1,6 +1,3 @@
-<h1>Go</h1>
-<p>To use this language, use the class "language-go".</p>
-
 <h2>Comments</h2>
 <pre><code>// This is a comment
 /* This is a comment
diff --git a/examples/prism-graphql.html b/examples/prism-graphql.html
index 8ad337c1f4..12113a9d80 100644
--- a/examples/prism-graphql.html
+++ b/examples/prism-graphql.html
@@ -1,6 +1,3 @@
-<h1>GraphQL</h1>
-<p>To use this language, use the class "language-graphql".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment</code></pre>
 
diff --git a/examples/prism-groovy.html b/examples/prism-groovy.html
index 0c588f6159..3ec1d6d39b 100644
--- a/examples/prism-groovy.html
+++ b/examples/prism-groovy.html
@@ -1,6 +1,3 @@
-<h1>Groovy</h1>
-<p>To use this language, use the class "language-groovy".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /* Multi-line
diff --git a/examples/prism-haml.html b/examples/prism-haml.html
index c5561e5b02..c2cc670c32 100644
--- a/examples/prism-haml.html
+++ b/examples/prism-haml.html
@@ -1,6 +1,3 @@
-<h1>Haml</h1>
-<p>To use this language, use the class "language-haml".</p>
-
 <h2>Comments</h2>
 <pre><code>
 / This is comment
diff --git a/examples/prism-handlebars.html b/examples/prism-handlebars.html
index 49c5096e34..c39c8b742d 100644
--- a/examples/prism-handlebars.html
+++ b/examples/prism-handlebars.html
@@ -1,6 +1,3 @@
-<h1>Handlebars</h1>
-<p>To use this language, use the class "language-handlebars".</p>
-
 <h2>Comments</h2>
 <pre><code>{{! This is a comment with &lt;p>some markup&lt;/p> in it }}
 {{! This is a comment }} {{ this_is_not }}</code></pre>
diff --git a/examples/prism-haskell.html b/examples/prism-haskell.html
index 1c504992ce..de58eb79bf 100644
--- a/examples/prism-haskell.html
+++ b/examples/prism-haskell.html
@@ -1,6 +1,3 @@
-<h1>Haskell</h1>
-<p>To use this language, use the class "language-haskell".</p>
-
 <h2>Comments</h2>
 <pre><code>-- Single line comment
 {- Multi-line
diff --git a/examples/prism-haxe.html b/examples/prism-haxe.html
index 866042bdb6..61fbf0e4b7 100644
--- a/examples/prism-haxe.html
+++ b/examples/prism-haxe.html
@@ -1,6 +1,3 @@
-<h1>Haxe</h1>
-<p>To use this language, use the class "language-haxe".</p>
-
 <h2>Strings and string interpolation</h2>
 <pre><code>"Foo
 bar $baz"
diff --git a/examples/prism-hpkp.html b/examples/prism-hpkp.html
index 20e83fa9a7..ced16eb7cc 100644
--- a/examples/prism-hpkp.html
+++ b/examples/prism-hpkp.html
@@ -1,6 +1,3 @@
-<h1>HTTP Public-Key-Pins header value</h1>
-<p>To use this language, use the class "language-hpkp".</p>
-
 <h2>Pin for one year with report-uri</h2>
 <pre><code>pin-sha256="EpOpN/ahUF6jhWShDUdy+NvvtaGcu5F7qM6+x2mfkh4=";
 max-age=31536000;
diff --git a/examples/prism-hsts.html b/examples/prism-hsts.html
index d6d59e7188..f7d0e4512e 100644
--- a/examples/prism-hsts.html
+++ b/examples/prism-hsts.html
@@ -1,6 +1,3 @@
-<h1>HTTP Strict-Transport-Security header value</h1>
-<p>To use this language, use the class "language-hsts".</p>
-
 <h2>Policy with far-future max-age</h2>
 <pre><code>max-age=31536000</code></pre>
 
diff --git a/examples/prism-http.html b/examples/prism-http.html
index 38419791e4..a2091768fe 100644
--- a/examples/prism-http.html
+++ b/examples/prism-http.html
@@ -1,6 +1,3 @@
-<h1>HTTP</h1>
-<p>To use this language, use the class "language-http".</p>
-
 <h2>Request header</h2>
 <pre><code>GET http://localhost:9999/foo.html HTTP/1.1
 Accept-Language: fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3
diff --git a/examples/prism-ichigojam.html b/examples/prism-ichigojam.html
index 60ee3322d7..24bcbf22d4 100644
--- a/examples/prism-ichigojam.html
+++ b/examples/prism-ichigojam.html
@@ -1,6 +1,3 @@
-<h1>IchigoJam</h1>
-<p>To use this language, use the class "language-ichigojam".</p>
-
 <p>Note: this component focuses on IchigoJam, which uses a small subset of basic and introduces its own markers.</p>
 
 <h2>Comments</h2>
diff --git a/examples/prism-icon.html b/examples/prism-icon.html
index 55b836090c..1dce690cb7 100644
--- a/examples/prism-icon.html
+++ b/examples/prism-icon.html
@@ -1,6 +1,3 @@
-<h1>Icon</h1>
-<p>To use this language, use the class "language-icon".</p>
-
 <h2>Comments</h2>
 <pre><code>#
 # Foobar</code></pre>
diff --git a/examples/prism-inform7.html b/examples/prism-inform7.html
index 2dba462a27..9e2214f01d 100644
--- a/examples/prism-inform7.html
+++ b/examples/prism-inform7.html
@@ -1,6 +1,3 @@
-<h1>Inform 7</h1>
-<p>To use this language, use the class "language-inform7".</p>
-
 <h2>Comments</h2>
 <pre><code>[This is a comment]
 [This is a
diff --git a/examples/prism-ini.html b/examples/prism-ini.html
index d404e42720..284fbe440c 100644
--- a/examples/prism-ini.html
+++ b/examples/prism-ini.html
@@ -1,6 +1,3 @@
-<h1>Ini</h1>
-<p>To use this language, use the class "language-ini".</p>
-
 <h2>Comments</h2>
 <pre><code>; This is a comment</code></pre>
 
diff --git a/examples/prism-io.html b/examples/prism-io.html
index 7397639a85..ff5160a43d 100644
--- a/examples/prism-io.html
+++ b/examples/prism-io.html
@@ -1,6 +1,3 @@
-<h1>Io</h1>
-<p>To use this language, use the class "language-io".</p>
-
 <h2>Comments</h2>
 <pre><code>//
 // Foobar
diff --git a/examples/prism-j.html b/examples/prism-j.html
index 33f3c6c474..cf4c109afa 100644
--- a/examples/prism-j.html
+++ b/examples/prism-j.html
@@ -1,6 +1,3 @@
-<h1>J</h1>
-<p>To use this language, use the class "language-j".</p>
-
 <h2>Comments</h2>
 <pre><code>NB. This is a comment</code></pre>
 
diff --git a/examples/prism-java.html b/examples/prism-java.html
index 5643de2423..691a6b10ec 100644
--- a/examples/prism-java.html
+++ b/examples/prism-java.html
@@ -1,6 +1,3 @@
-<h1>Java</h1>
-<p>To use this language, use the class "language-java".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /* Multi-line
diff --git a/examples/prism-javascript.html b/examples/prism-javascript.html
index c6ec2a6173..ef86a9023a 100644
--- a/examples/prism-javascript.html
+++ b/examples/prism-javascript.html
@@ -1,10 +1,3 @@
-<h1>JavaScript</h1>
-<p>To use this language, use one of the following classes:</p>
-<ul>
-	<li>"language-javascript"</li>
-	<li>"language-js"</li>
-</ul>
-
 <h2>Variable assignment</h2>
 <pre><code>var foo = "bar", baz = 5;</code></pre>
 
diff --git a/examples/prism-jolie.html b/examples/prism-jolie.html
index a26c53865e..8d23d995ab 100644
--- a/examples/prism-jolie.html
+++ b/examples/prism-jolie.html
@@ -1,6 +1,3 @@
-<h1>Jolie</h1>
-<p>To use this language, use the class "language-jolie".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /* Multi-line
diff --git a/examples/prism-jsx.html b/examples/prism-jsx.html
index 76e18b7637..faff492034 100644
--- a/examples/prism-jsx.html
+++ b/examples/prism-jsx.html
@@ -1,6 +1,3 @@
-<h1>React JSX</h1>
-<p>To use this language, use the class "language-jsx".</p>
-
 <h2>Full example</h2>
 <pre><code>var ExampleApplication = React.createClass({
     render: function() {
diff --git a/examples/prism-julia.html b/examples/prism-julia.html
index 38c95f113c..b69d0454f8 100644
--- a/examples/prism-julia.html
+++ b/examples/prism-julia.html
@@ -1,6 +1,3 @@
-<h1>Julia</h1>
-<p>To use this language, use the class "language-julia".</p>
-
 <h2>Full example</h2>
 <pre><code>function mandel(z)
     c = z
diff --git a/examples/prism-keyman.html b/examples/prism-keyman.html
index 05898fd1cd..770827d586 100644
--- a/examples/prism-keyman.html
+++ b/examples/prism-keyman.html
@@ -1,6 +1,3 @@
-<h1>Keyman</h1>
-<p>To use this language, use the class "language-keyman".</p>
-
 <h2>Comments</h2>
 <pre><code>c This is a comment</code></pre>
 
diff --git a/examples/prism-kotlin.html b/examples/prism-kotlin.html
index d40841d3ae..7c8f7b4ee4 100644
--- a/examples/prism-kotlin.html
+++ b/examples/prism-kotlin.html
@@ -1,6 +1,3 @@
-<h1>Kotlin</h1>
-<p>To use this language, use the class "language-kotlin".</p>
-
 <h2>Numbers</h2>
 <pre><code>123
 123L
diff --git a/examples/prism-latex.html b/examples/prism-latex.html
index 4d8769f9e4..137df3605d 100644
--- a/examples/prism-latex.html
+++ b/examples/prism-latex.html
@@ -1,6 +1,3 @@
-<h1>LaTeX</h1>
-<p>To use this language, use the class "language-latex".</p>
-
 <h2>Comments</h2>
 <pre><code>% This is a comment</code></pre>
 
diff --git a/examples/prism-less.html b/examples/prism-less.html
index c84bc68287..db8a5e6411 100644
--- a/examples/prism-less.html
+++ b/examples/prism-less.html
@@ -1,6 +1,3 @@
-<h1>Less</h1>
-<p>To use this language, use the class "language-less".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /* Multi-line
diff --git a/examples/prism-liquid.html b/examples/prism-liquid.html
index 46951c384b..7497197558 100644
--- a/examples/prism-liquid.html
+++ b/examples/prism-liquid.html
@@ -1,6 +1,3 @@
-<h1>Liquid</h1>
-<p>To use this language, use the class "language-liquid".</p>
-
 <h2>Comments</h2>
 <pre><code>{% comment %}This is a comment{% endcomment %}</code></pre>
 
diff --git a/examples/prism-livescript.html b/examples/prism-livescript.html
index 7bc4ff82c9..e9194d363c 100644
--- a/examples/prism-livescript.html
+++ b/examples/prism-livescript.html
@@ -1,6 +1,3 @@
-<h1>LiveScript</h1>
-<p>To use this language, use the class "language-livescript".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a single line comment
 /* This is a
diff --git a/examples/prism-lolcode.html b/examples/prism-lolcode.html
index e985546b5b..38308328aa 100644
--- a/examples/prism-lolcode.html
+++ b/examples/prism-lolcode.html
@@ -1,6 +1,3 @@
-<h1>LOLCODE</h1>
-<p>To use this language, use the class "language-lolcode".</p>
-
 <h2>Comments</h2>
 <pre><code>BTW Single line comment
 OBTW Multi-line
diff --git a/examples/prism-lua.html b/examples/prism-lua.html
index 5791f2d155..288b7675a4 100644
--- a/examples/prism-lua.html
+++ b/examples/prism-lua.html
@@ -1,6 +1,3 @@
-<h1>Lua</h1>
-<p>To use this language, use the class "language-lua".</p>
-
 <h2>Comments</h2>
 <pre><code>#!/usr/local/bin/lua
 --
diff --git a/examples/prism-makefile.html b/examples/prism-makefile.html
index 738c9a9759..45f6f420ff 100644
--- a/examples/prism-makefile.html
+++ b/examples/prism-makefile.html
@@ -1,6 +1,3 @@
-<h1>Makefile</h1>
-<p>To use this language, use the class "language-makefile".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment
 include foo # This is another comment</code></pre>
diff --git a/examples/prism-markdown.html b/examples/prism-markdown.html
index 6eea73d741..bed477e3e5 100644
--- a/examples/prism-markdown.html
+++ b/examples/prism-markdown.html
@@ -1,6 +1,3 @@
-<h1>Markdown</h1>
-<p>To use this language, use the class "language-markdown".</p>
-
 <h2>Titles</h2>
 <pre><code>Title 1
 ==
diff --git a/examples/prism-markup.html b/examples/prism-markup.html
index c1f9d33861..ac00e7f637 100644
--- a/examples/prism-markup.html
+++ b/examples/prism-markup.html
@@ -1,13 +1,3 @@
-<h1>Markup</h1>
-<p>To use this language, use one of the following classes:</p>
-<ul>
-	<li>"language-markup"</li>
-	<li>"language-xml"</li>
-	<li>"language-html"</li>
-	<li>"language-mathml"</li>
-	<li>"language-svg"</li>
-</ul>
-
 <h2>Empty tag</h2>
 <pre><code>&lt;p>&lt;/p></code></pre>
 
diff --git a/examples/prism-matlab.html b/examples/prism-matlab.html
index 00e985dd37..a3917f50cd 100644
--- a/examples/prism-matlab.html
+++ b/examples/prism-matlab.html
@@ -1,6 +1,3 @@
-<h1>MATLAB</h1>
-<p>To use this language, use the class "language-matlab".</p>
-
 <h2>Strings</h2>
 <pre><code>myString = 'Hello, world';
 otherString = 'You''re right';</code></pre>
diff --git a/examples/prism-mel.html b/examples/prism-mel.html
index 876f1ee8d2..e887975657 100644
--- a/examples/prism-mel.html
+++ b/examples/prism-mel.html
@@ -1,6 +1,3 @@
-<h1>MEL (Maya Embedded Language)</h1>
-<p>To use this language, use the class "language-mel".</p>
-
 <h2>Comments</h2>
 <pre><code>// This is a comment</code></pre>
 
diff --git a/examples/prism-mizar.html b/examples/prism-mizar.html
index 7a590d6f88..98d626c02f 100644
--- a/examples/prism-mizar.html
+++ b/examples/prism-mizar.html
@@ -1,6 +1,3 @@
-<h1>Mizar</h1>
-<p>To use this language, use the class "language-mizar".</p>
-
 <h2>Full example</h2>
 
 <pre><code>:: Example from http://webdocs.cs.ualberta.ca/~piotr/Mizar/Dagstuhl97/
diff --git a/examples/prism-monkey.html b/examples/prism-monkey.html
index 7a579f8b47..81128965f9 100644
--- a/examples/prism-monkey.html
+++ b/examples/prism-monkey.html
@@ -1,6 +1,3 @@
-<h1>Monkey</h1>
-<p>To use this language, use the class "language-monkey".</p>
-
 <h2>Comments</h2>
 <pre><code>' This is a comment
 
diff --git a/examples/prism-n4js.html b/examples/prism-n4js.html
index e6db81a8ab..19e5a6d5de 100755
--- a/examples/prism-n4js.html
+++ b/examples/prism-n4js.html
@@ -1,7 +1,3 @@
-<h1>N4JS</h1>
-<p>To use this language, use the class "language-n4js".</p>
-
-
 <h2>Keywords</h2>
 <pre><code>
 class C {..}
diff --git a/examples/prism-nasm.html b/examples/prism-nasm.html
index 5d20ceb33d..c1b7c926e3 100644
--- a/examples/prism-nasm.html
+++ b/examples/prism-nasm.html
@@ -1,6 +1,3 @@
-<h1>NASM</h1>
-<p>To use this language, use the class "language-nasm".</p>
-
 <h2>Comments</h2>
 <pre><code>; This is a comment</code></pre>
 
diff --git a/examples/prism-nginx.html b/examples/prism-nginx.html
index 6ea8b05bfc..49d14664d3 100644
--- a/examples/prism-nginx.html
+++ b/examples/prism-nginx.html
@@ -1,6 +1,3 @@
-<h1>Nginx</h1>
-<p>To use this language, use the class "language-nginx".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment</code></pre>
 
diff --git a/examples/prism-nim.html b/examples/prism-nim.html
index 6aca4d6b2d..c661125918 100644
--- a/examples/prism-nim.html
+++ b/examples/prism-nim.html
@@ -1,6 +1,3 @@
-<h1>Nim</h1>
-<p>To use this language, use the class "language-nim".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment</code></pre>
 
diff --git a/examples/prism-nix.html b/examples/prism-nix.html
index 731b909d8e..9015776948 100644
--- a/examples/prism-nix.html
+++ b/examples/prism-nix.html
@@ -1,6 +1,3 @@
-<h1>Nix</h1>
-<p>To use this language, use the class "language-nix".</p>
-
 <h2>Comments</h2>
 <pre><code>#
 # Single line comment
diff --git a/examples/prism-nsis.html b/examples/prism-nsis.html
index 059db451ce..193791bbf9 100644
--- a/examples/prism-nsis.html
+++ b/examples/prism-nsis.html
@@ -1,6 +1,3 @@
-<h1>NSIS</h1>
-<p>To use this language, use the class "language-nsis".</p>
-
 <h2>Comments</h2>
 <pre><code>; Single line comment
 # Single line comment
diff --git a/examples/prism-objectivec.html b/examples/prism-objectivec.html
index 8cd0164ecb..025a8d71e3 100644
--- a/examples/prism-objectivec.html
+++ b/examples/prism-objectivec.html
@@ -1,6 +1,3 @@
-<h1>Objective C</h1>
-<p>To use this language, use the class "language-objectivec".</p>
-
 <h2>Full example</h2>
 <pre><code>#import &lt;UIKit/UIKit.h>
 #import "Dependency.h"
diff --git a/examples/prism-ocaml.html b/examples/prism-ocaml.html
index fdb29162a9..0534b1d165 100644
--- a/examples/prism-ocaml.html
+++ b/examples/prism-ocaml.html
@@ -1,6 +1,3 @@
-<h1>OCaml</h1>
-<p>To use this language, use the class "language-ocaml".</p>
-
 <h2>Comments</h2>
 <pre><code>(* Simple comment *)
 (* Multi-line
diff --git a/examples/prism-opencl.html b/examples/prism-opencl.html
index 7681f954d7..f901230bba 100644
--- a/examples/prism-opencl.html
+++ b/examples/prism-opencl.html
@@ -1,5 +1,8 @@
-<h1>OpenCL</h1>
-<p>To use this language, use the class "language-opencl" for OpenCL kernel code. Host code is automatically highlighted in "language-c" respectively "language-cpp" classes.</p>
+<p>
+	To use this language, use the class <code class="language-none">"language-opencl"</code> for OpenCL kernel code.
+	Host code is automatically highlighted in <code class="language-none">"language-c"</code>
+	respectively <code class="language-none">"language-cpp"</code> classes.
+</p>
 
 <h2>OpenCL host code</h2>
 <pre class="language-cpp"><code>// OpenCL functions, constants, etc. are also highlighted in OpenCL host code in the c or cpp language
diff --git a/examples/prism-oz.html b/examples/prism-oz.html
index 73e170ae21..d70ec2edaa 100644
--- a/examples/prism-oz.html
+++ b/examples/prism-oz.html
@@ -1,6 +1,3 @@
-<h1>Oz</h1>
-<p>To use this language, use the class "language-oz".</p>
-
 <h2>Comments</h2>
 <pre><code>%
 % Foobar
diff --git a/examples/prism-parigp.html b/examples/prism-parigp.html
index 9ec10f2b1a..029302bc31 100644
--- a/examples/prism-parigp.html
+++ b/examples/prism-parigp.html
@@ -1,6 +1,3 @@
-<h1>PARI/GP</h1>
-<p>To use this language, use the class "language-parigp".</p>
-
 <h2>Comments</h2>
 <pre><code>\\ Single line comment
 /* Multi line
diff --git a/examples/prism-parser.html b/examples/prism-parser.html
index 733a510a72..4b4e9c0d81 100644
--- a/examples/prism-parser.html
+++ b/examples/prism-parser.html
@@ -1,6 +1,3 @@
-<h1>Parser</h1>
-<p>To use this language, use the class "language-parser".</p>
-
 <h2>Comments</h2>
 <pre><code>$foo[bar] # Some comment</code></pre>
 
diff --git a/examples/prism-pascal.html b/examples/prism-pascal.html
index 7fd7997d79..dfea11a61d 100644
--- a/examples/prism-pascal.html
+++ b/examples/prism-pascal.html
@@ -1,6 +1,3 @@
-<h1>Pascal</h1>
-<p>To use this language, use the class "language-pascal".</p>
-
 <h2>Comments</h2>
 <pre><code>(* This is an
 old style comment *)
diff --git a/examples/prism-perl.html b/examples/prism-perl.html
index 2a7b4ab1d1..85c3681521 100644
--- a/examples/prism-perl.html
+++ b/examples/prism-perl.html
@@ -1,6 +1,3 @@
-<h1>Perl</h1>
-<p>To use this language, use the class "language-perl".</p>
-
 <h2>Comments</h2>
 <pre><code># Single line comment
 =head1 Here There
diff --git a/examples/prism-php.html b/examples/prism-php.html
index c80ec9f86b..1a25589c7c 100644
--- a/examples/prism-php.html
+++ b/examples/prism-php.html
@@ -1,6 +1,3 @@
-<h1>PHP</h1>
-<p>To use this language, use the class "language-php".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /* Multi-line
diff --git a/examples/prism-powershell.html b/examples/prism-powershell.html
index ffbbd2d129..e5dba2e025 100644
--- a/examples/prism-powershell.html
+++ b/examples/prism-powershell.html
@@ -1,6 +1,3 @@
-<h1>PowerShell</h1>
-<p>To use this language, use the class "language-powershell".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment
 <# This is a
diff --git a/examples/prism-processing.html b/examples/prism-processing.html
index 110b72d0a5..3c74ba3b98 100644
--- a/examples/prism-processing.html
+++ b/examples/prism-processing.html
@@ -1,6 +1,3 @@
-<h1>Processing</h1>
-<p>To use this language, use the class "language-processing".</p>
-
 <h2>Full example</h2>
 <pre><code>// Processing implementation of Game of Life by Joan Soler-Adillon
 // from https://processing.org/examples/gameoflife.html
diff --git a/examples/prism-prolog.html b/examples/prism-prolog.html
index e43898a9d0..b231bcae7c 100644
--- a/examples/prism-prolog.html
+++ b/examples/prism-prolog.html
@@ -1,6 +1,3 @@
-<h1>Prolog</h1>
-<p>To use this language, use the class "language-prolog".</p>
-
 <h2>Comments</h2>
 <pre><code>% This is a comment
 /* This is a
diff --git a/examples/prism-properties.html b/examples/prism-properties.html
index 8a618054f2..bbc81f99af 100644
--- a/examples/prism-properties.html
+++ b/examples/prism-properties.html
@@ -1,6 +1,3 @@
-<h1>.properties</h1>
-<p>To use this language, use the class "language-properties".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment
 ! This is a comment too</code></pre>
diff --git a/examples/prism-pug.html b/examples/prism-pug.html
index e977c324fd..d37de5caba 100644
--- a/examples/prism-pug.html
+++ b/examples/prism-pug.html
@@ -1,6 +1,3 @@
-<h1>Pug</h1>
-<p>To use this language, use the class "language-pug".</p>
-
 <h2>Comments</h2>
 <pre><code>// Some
   multiline
diff --git a/examples/prism-puppet.html b/examples/prism-puppet.html
index fe3ce370b4..963f95da5e 100644
--- a/examples/prism-puppet.html
+++ b/examples/prism-puppet.html
@@ -1,6 +1,3 @@
-<h1>Puppet</h1>
-<p>To use this language, use the class "language-puppet".</p>
-
 <h2>Comments</h2>
 <pre><code>#
 # Foobar
diff --git a/examples/prism-pure.html b/examples/prism-pure.html
index 81354eaf20..d7a0129b12 100644
--- a/examples/prism-pure.html
+++ b/examples/prism-pure.html
@@ -1,6 +1,3 @@
-<h1>Pure</h1>
-<p>To use this language, use the class "language-pure".</p>
-
 <h2>Comments</h2>
 <pre><code>#! shebang
 // Single line comment
diff --git a/examples/prism-python.html b/examples/prism-python.html
index 7560dfc6c2..a8c383b889 100644
--- a/examples/prism-python.html
+++ b/examples/prism-python.html
@@ -1,6 +1,3 @@
-<h1>Python</h1>
-<p>To use this language, use the class "language-python".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment
 # -*- coding: &lt;encoding-name> -*-</code></pre>
diff --git a/examples/prism-q.html b/examples/prism-q.html
index a22d557c96..7a0e7b315d 100644
--- a/examples/prism-q.html
+++ b/examples/prism-q.html
@@ -1,6 +1,3 @@
-<h1>Q (kdb+ database)</h1>
-<p>To use this language, use the class "language-q".</p>
-
 <h2>Comments</h2>
 <pre><code>foo / This is a comment
 / This is a comment too
diff --git a/examples/prism-qore.html b/examples/prism-qore.html
index 99b1b4cf70..710e1614e7 100644
--- a/examples/prism-qore.html
+++ b/examples/prism-qore.html
@@ -1,6 +1,3 @@
-<h1>Qore</h1>
-<p>To use this language, use the class "language-qore".</p>
-
 <h2>Full example</h2>
 <pre><code>#!/usr/bin/env qore
 
diff --git a/examples/prism-r.html b/examples/prism-r.html
index 8e33ac7c9b..3c694189d2 100644
--- a/examples/prism-r.html
+++ b/examples/prism-r.html
@@ -1,6 +1,3 @@
-<h1>R</h1>
-<p>To use this language, use the class "language-r".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment</code></pre>
 
diff --git a/examples/prism-reason.html b/examples/prism-reason.html
index be0ee2d5f1..8842f24c6e 100644
--- a/examples/prism-reason.html
+++ b/examples/prism-reason.html
@@ -1,6 +1,3 @@
-<h1>Reason</h1>
-<p>To use this language, use the class "language-reason".</p>
-
 <h2>Comments</h2>
 <pre><code>/* This is a comment */</code></pre>
 
diff --git a/examples/prism-renpy.html b/examples/prism-renpy.html
index cb0fbc8ede..dffac07c4b 100644
--- a/examples/prism-renpy.html
+++ b/examples/prism-renpy.html
@@ -1,6 +1,3 @@
-<h1>Ren'py</h1>
-<p>To use this language, use the class "language-renpy".</p>
-
 <h2>Comments</h2>
 <pre>
     <code># This is a comment</code>
diff --git a/examples/prism-rest.html b/examples/prism-rest.html
index 5b41b5c43b..511e87c9e1 100644
--- a/examples/prism-rest.html
+++ b/examples/prism-rest.html
@@ -1,6 +1,3 @@
-<h1>reST (reStructuredText)</h1>
-<p>To use this language, use the class "language-rest".</p>
-
 <h2>Titles</h2>
 <pre><code>===============
  Section Title
diff --git a/examples/prism-rip.html b/examples/prism-rip.html
index 5d192798c0..99769c3b3b 100644
--- a/examples/prism-rip.html
+++ b/examples/prism-rip.html
@@ -1,6 +1,3 @@
-<h1>Rip</h1>
-<p>To use this language, use the class "language-rip".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment</code></pre>
 
diff --git a/examples/prism-roboconf.html b/examples/prism-roboconf.html
index 6b5dbe746e..ca57221e79 100644
--- a/examples/prism-roboconf.html
+++ b/examples/prism-roboconf.html
@@ -1,6 +1,3 @@
-<h1>Roboconf</h1>
-<p>To use this language, use the class "language-roboconf".</p>
-
 <h2>Full example</h2>
 <pre><code>ApacheServer {
     # Apache instances will be deployed by Roboconf's Puppet extension
diff --git a/examples/prism-ruby.html b/examples/prism-ruby.html
index 095faf16c3..c1aeaffb4e 100644
--- a/examples/prism-ruby.html
+++ b/examples/prism-ruby.html
@@ -1,6 +1,3 @@
-<h1>Ruby</h1>
-<p>To use this language, use the class "language-ruby".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment
 =begin
diff --git a/examples/prism-rust.html b/examples/prism-rust.html
index 10943b97eb..d447968423 100644
--- a/examples/prism-rust.html
+++ b/examples/prism-rust.html
@@ -1,6 +1,3 @@
-<h1>Rust</h1>
-<p>To use this language, use the class "language-rust".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /// Doc comments
diff --git a/examples/prism-sas.html b/examples/prism-sas.html
index 9d9acef7f7..8932ebb036 100644
--- a/examples/prism-sas.html
+++ b/examples/prism-sas.html
@@ -1,6 +1,3 @@
-<h1>SAS</h1>
-<p>To use this language, use the class "language-sas".</p>
-
 <h2>Comments</h2>
 <pre><code>/* This is a
 multi-line comment */
diff --git a/examples/prism-sass.html b/examples/prism-sass.html
index 68a7763e5c..7200e789cc 100644
--- a/examples/prism-sass.html
+++ b/examples/prism-sass.html
@@ -1,6 +1,3 @@
-<h1>Sass (Sass)</h1>
-<p>To use this language, use the class "language-sass".</p>
-
 <h2>Comments</h2>
 <pre><code>/* This comment will appear in the CSS output.
   This is nested beneath the comment,
diff --git a/examples/prism-scala.html b/examples/prism-scala.html
index 87a40b1ffd..1dc56f8714 100644
--- a/examples/prism-scala.html
+++ b/examples/prism-scala.html
@@ -1,6 +1,3 @@
-<h1>Scala</h1>
-<p>To use this language, use the class "language-scala".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /* Mutli-line
diff --git a/examples/prism-scheme.html b/examples/prism-scheme.html
index 7bf8f379b7..de50f2267c 100644
--- a/examples/prism-scheme.html
+++ b/examples/prism-scheme.html
@@ -1,6 +1,3 @@
-<h1>Scheme</h1>
-<p>To use this language, use the class "language-scheme".</p>
-
 <h2>Comments</h2>
 <pre><code>; This is a comment</code></pre>
 
diff --git a/examples/prism-scss.html b/examples/prism-scss.html
index 77482727bb..f0daaf577d 100644
--- a/examples/prism-scss.html
+++ b/examples/prism-scss.html
@@ -1,6 +1,3 @@
-<h1>Sass (Scss)</h1>
-<p>To use this language, use the class "language-scss".</p>
-
 <h2>Comments</h2>
 <pre><code>// Single line comment
 /* Multi-line
diff --git a/examples/prism-smalltalk.html b/examples/prism-smalltalk.html
index 63e4edb5f9..7fb70f8f7c 100644
--- a/examples/prism-smalltalk.html
+++ b/examples/prism-smalltalk.html
@@ -1,6 +1,3 @@
-<h1>Smalltalk</h1>
-<p>To use this language, use the class "language-smalltalk".</p>
-
 <h2>Numbers</h2>
 <pre><code>3
 30.45
diff --git a/examples/prism-smarty.html b/examples/prism-smarty.html
index 47f62d665e..5e57922fa4 100644
--- a/examples/prism-smarty.html
+++ b/examples/prism-smarty.html
@@ -1,6 +1,3 @@
-<h1>Smarty</h1>
-<p>To use this language, use the class "language-smarty".</p>
-
 <h2>Comments</h2>
 <pre><code>{* This is a comment with &lt;p>some markup&lt;/p> in it *}
 {* Multi-line
diff --git a/examples/prism-sql.html b/examples/prism-sql.html
index 5de33877a8..6fe9977523 100644
--- a/examples/prism-sql.html
+++ b/examples/prism-sql.html
@@ -1,6 +1,3 @@
-<h1>SQL</h1>
-<p>To use this language, use the class "language-sql".</p>
-
 <h2>Comments</h2>
 <pre><code># Single line comment
 -- Single line comment
diff --git a/examples/prism-stylus.html b/examples/prism-stylus.html
index a0cdf5dc11..2b8ffdca91 100644
--- a/examples/prism-stylus.html
+++ b/examples/prism-stylus.html
@@ -1,6 +1,3 @@
-<h1>Stylus</h1>
-<p>To use this language, use the class "language-stylus".</p>
-
 <h2>Full Example</h2>
 <pre><code>/*!
  * Adds the given numbers together.
diff --git a/examples/prism-swift.html b/examples/prism-swift.html
index 21c6a16ca6..98d6eb55e2 100644
--- a/examples/prism-swift.html
+++ b/examples/prism-swift.html
@@ -1,6 +1,3 @@
-<h1>Swift</h1>
-<p>To use this language, use the class "language-swift".</p>
-
 <h2>Comments</h2>
 <pre><code>// this is a comment
 /* this is also a comment,
diff --git a/examples/prism-tcl.html b/examples/prism-tcl.html
index 4a4c8edf8a..080d817c7c 100644
--- a/examples/prism-tcl.html
+++ b/examples/prism-tcl.html
@@ -1,6 +1,3 @@
-<h1>Tcl</h1>
-<p>To use this language, use the class "language-tcl".</p>
-
 <h2>Comments</h2>
 <pre><code># This is a comment</code></pre>
 
diff --git a/examples/prism-textile.html b/examples/prism-textile.html
index 6720885f33..4ff4d12798 100644
--- a/examples/prism-textile.html
+++ b/examples/prism-textile.html
@@ -1,6 +1,3 @@
-<h1>Textile</h1>
-<p>To use this language, use the class "language-textile".</p>
-
 <h2>HTML</h2>
 <pre><code>I am &lt;b>very&lt;/b> serious.
 
diff --git a/examples/prism-tsx.html b/examples/prism-tsx.html
index 636aa3f047..d83d1dd839 100644
--- a/examples/prism-tsx.html
+++ b/examples/prism-tsx.html
@@ -1,6 +1,3 @@
-<h1>React TSX</h1>
-<p>To use this language, use the class "language-tsx".</p>
-
 <h2>Full example</h2>
 <pre><code>import * as React from 'react';
 
diff --git a/examples/prism-twig.html b/examples/prism-twig.html
index 22528c76a3..0a7078151d 100644
--- a/examples/prism-twig.html
+++ b/examples/prism-twig.html
@@ -1,6 +1,3 @@
-<h1>Twig</h1>
-<p>To use this language, use the class "language-twig".</p>
-
 <h2>Comments</h2>
 <pre><code>{# Some comment
 on multiple lines
diff --git a/examples/prism-typescript.html b/examples/prism-typescript.html
index e4790b0ee3..561c4dc4d0 100755
--- a/examples/prism-typescript.html
+++ b/examples/prism-typescript.html
@@ -1,10 +1,3 @@
-<h1>TypeScript</h1>
-<p>To use this language, use one of the following classes:</p>
-<ul>
-    <li>"language-typescript"</li>
-    <li>"language-ts"</li>
-</ul>
-
 <h2>Full example</h2>
 <pre><code>interface SearchFunc {
   (source: string, subString: string): boolean;
diff --git a/examples/prism-vbnet.html b/examples/prism-vbnet.html
index 95a515c5b0..bc2a376b2e 100644
--- a/examples/prism-vbnet.html
+++ b/examples/prism-vbnet.html
@@ -1,6 +1,3 @@
-<h1>VB.Net</h1>
-<p>To use this language, use the class "language-vbnet".</p>
-
 <h2>Comments</h2>
 <pre><code>!foobar
 REM foobar
diff --git a/examples/prism-verilog.html b/examples/prism-verilog.html
index 878dd76596..d7c9a0bfc9 100644
--- a/examples/prism-verilog.html
+++ b/examples/prism-verilog.html
@@ -1,5 +1,3 @@
-<h1>Verilog &amp; System Verilog</h1>
-<p>To use this language, use the class "language-verilog".</p>
 <p>Note that this package supports syntax highlighting for both Verilog and System Verilog.</p>
 
 <h2>Comments</h2>
diff --git a/examples/prism-vhdl.html b/examples/prism-vhdl.html
index 1dbf649f79..b495085155 100644
--- a/examples/prism-vhdl.html
+++ b/examples/prism-vhdl.html
@@ -1,6 +1,3 @@
-<h1>VHDL</h1>
-<p>To use this language, use the class "language-vhdl".</p>
-
 <h2>Comments</h2>
 <pre><code>-- I am a comment
 I am not</code></pre>
diff --git a/examples/prism-vim.html b/examples/prism-vim.html
index c51c7f8115..567b8206e8 100644
--- a/examples/prism-vim.html
+++ b/examples/prism-vim.html
@@ -1,6 +1,3 @@
-<h1>vim</h1>
-<p>To use this language, use the class "language-vim".</p>
-
 <h2>Comments</h2>
 <pre><code>" This is a comment</code></pre>
 
diff --git a/examples/prism-wiki.html b/examples/prism-wiki.html
index 6cded5ef98..295eb3f812 100644
--- a/examples/prism-wiki.html
+++ b/examples/prism-wiki.html
@@ -1,6 +1,3 @@
-<h1>Wiki markup</h1>
-<p>To use this language, use the class "language-wiki".</p>
-
 <h2>Embedded markup</h2>
 <pre><code>Paragraphs can be forced in lists by using HTML tags.
 Two line break symbols, &lt;code>&lt;nowiki>&lt;br />&lt;br />&lt;/nowiki>&lt;/code>, will create the desired effect. So will enclosing all but the first paragraph with &lt;code>&lt;nowiki>&lt;p>...&lt;/p>&lt;/nowiki>&lt;/code></code></pre>
diff --git a/examples/prism-xeora.html b/examples/prism-xeora.html
index 12835cbdde..541a916518 100644
--- a/examples/prism-xeora.html
+++ b/examples/prism-xeora.html
@@ -1,6 +1,3 @@
-<h1>Xeora</h1>
-<p>To use this language, use the class "language-xeora".</p>
-
 <h2>Special Constants</h2>
 <pre><code>$DomainContents$
 $PageRenderDuration$</code></pre>
diff --git a/examples/prism-xojo.html b/examples/prism-xojo.html
index 2f5b8b8dc5..35480744dd 100644
--- a/examples/prism-xojo.html
+++ b/examples/prism-xojo.html
@@ -1,6 +1,3 @@
-<h1>Xojo (REALbasic)</h1>
-<p>To use this language, use the class "language-xojo".</p>
-
 <h2>Comments</h2>
 <pre><code>' This is a comment
 // This is a comment too
diff --git a/examples/prism-yaml.html b/examples/prism-yaml.html
index 14cc5bdd4f..bea52f8651 100644
--- a/examples/prism-yaml.html
+++ b/examples/prism-yaml.html
@@ -1,6 +1,3 @@
-<h1>YAML</h1>
-<p>To use this language, use the class "language-yaml".</p>
-
 <h2>Null and Boolean</h2>
 <pre><code>---
 A null: null
diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js
index 19e8e0f86d..e696274a47 100644
--- a/plugins/show-language/prism-show-language.js
+++ b/plugins/show-language/prism-show-language.js
@@ -11,7 +11,7 @@ if (!Prism.plugins.toolbar) {
 }
 
 // The languages map is built automatically with gulp
-var Languages = /*languages_placeholder[*/{"html":"HTML","xml":"XML","svg":"SVG","mathml":"MathML","css":"CSS","clike":"C-like","javascript":"JavaScript","abap":"ABAP","actionscript":"ActionScript","apacheconf":"Apache Configuration","apl":"APL","applescript":"AppleScript","arff":"ARFF","asciidoc":"AsciiDoc","asm6502":"6502 Assembly","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","autoit":"AutoIt","basic":"BASIC","csharp":"C#","cpp":"C++","coffeescript":"CoffeeScript","csp":"Content-Security-Policy","css-extras":"CSS Extras","django":"Django/Jinja2","fsharp":"F#","glsl":"GLSL","graphql":"GraphQL","http":"HTTP","hpkp":"HTTP Public-Key-Pins","hsts":"HTTP Strict-Transport-Security","ichigojam":"IchigoJam","inform7":"Inform 7","json":"JSON","latex":"LaTeX","livescript":"LiveScript","lolcode":"LOLCODE","matlab":"MATLAB","mel":"MEL","n4js":"N4JS","nasm":"NASM","nginx":"nginx","nsis":"NSIS","objectivec":"Objective-C","ocaml":"OCaml","opencl":"OpenCL","parigp":"PARI/GP","php":"PHP","php-extras":"PHP Extras","powershell":"PowerShell","properties":".properties","protobuf":"Protocol Buffers","jsx":"React JSX","tsx":"React TSX","renpy":"Ren'py","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","typescript":"TypeScript","vbnet":"VB.Net","vhdl":"VHDL","vim":"vim","wiki":"Wiki markup","xojo":"Xojo (REALbasic)","yaml":"YAML"}/*]*/;
+var Languages = /*languages_placeholder[*/{"html":"HTML","xml":"XML","svg":"SVG","mathml":"MathML","css":"CSS","clike":"C-like","javascript":"JavaScript","abap":"ABAP","actionscript":"ActionScript","apacheconf":"Apache Configuration","apl":"APL","applescript":"AppleScript","arff":"ARFF","asciidoc":"AsciiDoc","asm6502":"6502 Assembly","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","autoit":"AutoIt","basic":"BASIC","csharp":"C#","cpp":"C++","coffeescript":"CoffeeScript","csp":"Content-Security-Policy","css-extras":"CSS Extras","django":"Django/Jinja2","fsharp":"F#","glsl":"GLSL","graphql":"GraphQL","http":"HTTP","hpkp":"HTTP Public-Key-Pins","hsts":"HTTP Strict-Transport-Security","ichigojam":"IchigoJam","inform7":"Inform 7","json":"JSON","latex":"LaTeX","livescript":"LiveScript","lolcode":"LOLCODE","matlab":"MATLAB","mel":"MEL","n4js":"N4JS","nasm":"NASM","nginx":"nginx","nsis":"NSIS","objectivec":"Objective-C","ocaml":"OCaml","opencl":"OpenCL","parigp":"PARI/GP","php":"PHP","php-extras":"PHP Extras","powershell":"PowerShell","properties":".properties","protobuf":"Protocol Buffers","q":"Q (kdb+ database)","jsx":"React JSX","tsx":"React TSX","renpy":"Ren'py","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","typescript":"TypeScript","vbnet":"VB.Net","vhdl":"VHDL","vim":"vim","wiki":"Wiki markup","xojo":"Xojo (REALbasic)","yaml":"YAML"}/*]*/;
 Prism.plugins.toolbar.registerButton('show-language', function(env) {
 	var pre = env.element.parentNode;
 	if (!pre || !/pre/i.test(pre.nodeName)) {
diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js
index 214b1c763d..9965a39f3f 100644
--- a/plugins/show-language/prism-show-language.min.js
+++ b/plugins/show-language/prism-show-language.min.js
@@ -1 +1 @@
-!function(){if("undefined"!=typeof self&&self.Prism&&self.document){if(!Prism.plugins.toolbar)return console.warn("Show Languages plugin loaded before Toolbar plugin."),void 0;var e={html:"HTML",xml:"XML",svg:"SVG",mathml:"MathML",css:"CSS",clike:"C-like",javascript:"JavaScript",abap:"ABAP",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",arff:"ARFF",asciidoc:"AsciiDoc",asm6502:"6502 Assembly",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",autoit:"AutoIt",basic:"BASIC",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript",csp:"Content-Security-Policy","css-extras":"CSS Extras",django:"Django/Jinja2",fsharp:"F#",glsl:"GLSL",graphql:"GraphQL",http:"HTTP",hpkp:"HTTP Public-Key-Pins",hsts:"HTTP Strict-Transport-Security",ichigojam:"IchigoJam",inform7:"Inform 7",json:"JSON",latex:"LaTeX",livescript:"LiveScript",lolcode:"LOLCODE",matlab:"MATLAB",mel:"MEL",n4js:"N4JS",nasm:"NASM",nginx:"nginx",nsis:"NSIS",objectivec:"Objective-C",ocaml:"OCaml",opencl:"OpenCL",parigp:"PARI/GP",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",properties:".properties",protobuf:"Protocol Buffers",jsx:"React JSX",tsx:"React TSX",renpy:"Ren'py",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vbnet:"VB.Net",vhdl:"VHDL",vim:"vim",wiki:"Wiki markup",xojo:"Xojo (REALbasic)",yaml:"YAML"};Prism.plugins.toolbar.registerButton("show-language",function(t){var a=t.element.parentNode;if(a&&/pre/i.test(a.nodeName)){var s=a.getAttribute("data-language")||e[t.language]||t.language.substring(0,1).toUpperCase()+t.language.substring(1),i=document.createElement("span");return i.textContent=s,i}})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism&&self.document){if(!Prism.plugins.toolbar)return console.warn("Show Languages plugin loaded before Toolbar plugin."),void 0;var e={html:"HTML",xml:"XML",svg:"SVG",mathml:"MathML",css:"CSS",clike:"C-like",javascript:"JavaScript",abap:"ABAP",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",arff:"ARFF",asciidoc:"AsciiDoc",asm6502:"6502 Assembly",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",autoit:"AutoIt",basic:"BASIC",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript",csp:"Content-Security-Policy","css-extras":"CSS Extras",django:"Django/Jinja2",fsharp:"F#",glsl:"GLSL",graphql:"GraphQL",http:"HTTP",hpkp:"HTTP Public-Key-Pins",hsts:"HTTP Strict-Transport-Security",ichigojam:"IchigoJam",inform7:"Inform 7",json:"JSON",latex:"LaTeX",livescript:"LiveScript",lolcode:"LOLCODE",matlab:"MATLAB",mel:"MEL",n4js:"N4JS",nasm:"NASM",nginx:"nginx",nsis:"NSIS",objectivec:"Objective-C",ocaml:"OCaml",opencl:"OpenCL",parigp:"PARI/GP",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",properties:".properties",protobuf:"Protocol Buffers",q:"Q (kdb+ database)",jsx:"React JSX",tsx:"React TSX",renpy:"Ren'py",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vbnet:"VB.Net",vhdl:"VHDL",vim:"vim",wiki:"Wiki markup",xojo:"Xojo (REALbasic)",yaml:"YAML"};Prism.plugins.toolbar.registerButton("show-language",function(t){var a=t.element.parentNode;if(a&&/pre/i.test(a.nodeName)){var s=a.getAttribute("data-language")||e[t.language]||t.language.substring(0,1).toUpperCase()+t.language.substring(1),i=document.createElement("span");return i.textContent=s,i}})}}();
\ No newline at end of file