diff --git a/templates/index.html b/templates/index.html
index fc2e262..fc6897c 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -31,6 +31,7 @@
 </tr>
 </thead>
 <tbody>
+{% set allmagicwords = [] %}
 {% for pad in pads %}
 <tr>
 	<td class="name">
@@ -43,6 +44,7 @@
 	<td class="magicwords">
     {% for magicword in pad.magicwords %}
       <a class="magicwords" href="#{{ magicword }}">{{ magicword }}</a>
+    {{ allmagicwords.append(magicword) }}
     {% endfor %}
 	</td>
 	<!--<td class="lastedited">{{ pad.lastedited_iso|datetimeformat }}</td>-->
@@ -53,9 +55,48 @@
 </tbody>
 </table>
 
+
+<div id="magicarea">
+    {% for magicword in allmagicwords | unique %}
+	{% if magicword != "__PUBLISH__" %}
+      	<div class="magic" id="{{magicword}}">
+		<h2>{{ magicword }}</h2>
+		<table>
+		<thead>
+			<tr>
+        		<th>name</th>
+        		<th>versions</th>
+			</tr>
+		</thead>
+		<tbody>
+		{% for pad in pads %}
+			{% if magicword in pad.magicwords %}
+			<tr>
+		        <td class="name">
+                	<a href="{{ pad.link }}">{{ pad.padid }}</a>
+		        </td>
+		        <td class="versions">
+                		{% for v in pad.versions %}<a href="{{ v.url }}">{{ v.type }}</a> {% endfor %}
+		        </td>
+		       <!-- WOW -->
+ 		       <td class="magicwords">
+			    {% for magicword in pad.magicwords %}
+			      <a class="magicwords" href="#{{ magicword }}">{{ magicword }}</a>
+			    {% endfor %}
+		        </td>
+			</tr>
+			{% endif %}
+	        {% endfor %}
+		</tbody>
+		</table>
+    	</div>
+	{% endif %}
+    {% endfor %}
+</div>
+
 <div id="footer">
 	<hr>
-	<p>
+		<p>
 		<small>This page is generated using <a href="https://git.vvvvvvaria.org/varia/etherpump">Etherpump</a>. It is a command-line utility and python library that extends the multi writing and publishing functionalities of the Etherpad.</small>
 		<br><br>
 	</p>