diff --git a/site.cfg b/site.cfg
index aefadb2..a71dd2a 100644
--- a/site.cfg
+++ b/site.cfg
@@ -146,6 +146,10 @@ content: content-promote.tpl.html
navigation: navigation-about.tpl.html
content: content-sitemap.tpl.html
+[tags]
+navigation: navigation-main.tpl.html
+content: content-tags.tpl.html
+
[twat_episode]
navigation: navigation-get-shows.tpl.html
content: content-twat_episode.tpl.html
diff --git a/templates/content-tags.tpl.html b/templates/content-tags.tpl.html
new file mode 100644
index 0000000..8afc1cf
--- /dev/null
+++ b/templates/content-tags.tpl.html
@@ -0,0 +1,84 @@
+
+
+
+$Template::Stash::PRIVATE = undef; # Allow . in tag
+
+
+
+
+
+
+
+
+
+
+ Tag summary
+ Page generated on
+ This section summarises all of the tags currently used throughout the
+ database. The tags are in alphabetical order and each is followed by links to
+ the show numbers where it is used so you can see the context the author used
+ it in. There are currently unique tags in the system.
+ Alphabetical index
+ This is an index to the initial letters of the tags below.
+
+
+
+
+ ↑ Go to index
+ Tags beginning with ''
+
+
+
+ Go to TOP of page
+
+
+$Template::Stash::PRIVATE = 1;
+
diff --git a/templates/navigation-main.tpl.html b/templates/navigation-main.tpl.html
index e694c4a..e773eec 100644
--- a/templates/navigation-main.tpl.html
+++ b/templates/navigation-main.tpl.html
@@ -5,7 +5,7 @@
Get Shows
Give Shows
Contribute
- Tags
+ Tags
About
Search
diff --git a/templates/queries-tags-mysql.tpl.html b/templates/queries-tags-mysql.tpl.html
new file mode 100644
index 0000000..9b5e099
--- /dev/null
+++ b/templates/queries-tags-mysql.tpl.html
@@ -0,0 +1 @@
+
diff --git a/templates/queries-tags-sqlite.tpl.html b/templates/queries-tags-sqlite.tpl.html
new file mode 100644
index 0000000..9b5e099
--- /dev/null
+++ b/templates/queries-tags-sqlite.tpl.html
@@ -0,0 +1 @@
+