diff --git a/core/language/en-GB/SideBar.multids b/core/language/en-GB/SideBar.multids
index f7543632b..b2daeac2f 100644
--- a/core/language/en-GB/SideBar.multids
+++ b/core/language/en-GB/SideBar.multids
@@ -10,6 +10,7 @@ Recent/Caption: Recent
 Shadows/Caption: Shadows
 System/Caption: System
 Tags/Caption: Tags
+Tags/TagManager/Caption: Tag Manager
 Tags/Untagged/Caption: untagged
 Tools/Caption: Tools
 Types/Caption: Types
diff --git a/core/ui/MoreSideBar/Tags.tid b/core/ui/MoreSideBar/Tags.tid
index 2a81da962..92c4ad2ca 100644
--- a/core/ui/MoreSideBar/Tags.tid
+++ b/core/ui/MoreSideBar/Tags.tid
@@ -2,6 +2,9 @@ title: $:/core/ui/MoreSideBar/Tags
 tags: $:/tags/MoreSideBar
 caption: {{$:/language/SideBar/Tags/Caption}}
 
+\define lingo-base() $:/language/SideBar/Tags/
+<$button to="$:/TagManager"><<lingo TagManager/Caption>></$button>
+
 <$list filter="[tags[]sort[title]]">
 
 <$transclude tiddler="$:/core/ui/TagTemplate"/> <small class="tw-menu-list-count"><$count filter="[is[current]tagging[]]"/></small>
diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
new file mode 100644
index 000000000..419d240fb
--- /dev/null
+++ b/core/ui/TagManager.tid
@@ -0,0 +1,16 @@
+title: $:/TagManager
+
+<table>
+<tbody>
+<tr>
+<th>Tag</th>
+<th>Colour</th>
+</tr>
+<$list filter="[tags[]sort[title]]">
+<tr>
+<td><$view field="title"/></td>
+<td><$edit-text field="color" tag="input" type="color"/></td>
+</tr>
+</$list>
+</tbody>
+</table>
diff --git a/editions/tw5.com/tiddlers/system/DefaultTiddlers.tid b/editions/tw5.com/tiddlers/system/DefaultTiddlers.tid
index d15470bd3..1192bee59 100644
--- a/editions/tw5.com/tiddlers/system/DefaultTiddlers.tid
+++ b/editions/tw5.com/tiddlers/system/DefaultTiddlers.tid
@@ -3,6 +3,7 @@ modified: 20131202102344517
 title: $:/DefaultTiddlers
 type: text/vnd.tiddlywiki
 
+$:/TagManager
 HelloThere
 GettingStarted
 Upgrading