diff --git a/core/ui/ViewTemplate/body.tid b/core/ui/ViewTemplate/body.tid
index c983fd965..c0cd21e50 100644
--- a/core/ui/ViewTemplate/body.tid
+++ b/core/ui/ViewTemplate/body.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/ViewTemplate/body
 tags: $:/tags/ViewTemplate
 
-<div class="body">
+<div class="tc-tiddler-body">
 
 <$list filter="[all[current]!has[plugin-type]]">
 
diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
index 60c6d73f6..c4ed79eef 100644
--- a/core/wiki/macros/toc.tid
+++ b/core/wiki/macros/toc.tid
@@ -2,7 +2,7 @@ title: $:/core/macros/toc
 tags: $:/tags/Macro
 
 \define toc(tag,sort:"")
-<ol>
+<ol class="tc-toc">
 <$list filter="[tag[$tag$]$sort$]">
 <li>
 <$link>
@@ -42,7 +42,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-expandable(tag,sort:"")
-<ol>
+<ol class="tc-toc toc-expandable">
 <$list filter="[tag[$tag$]$sort$]">
 <<toc-expandable-body tag:"$tag$" sort:"$sort$">>
 </$list>
@@ -77,7 +77,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-selective-expandable(tag,sort:"")
-<ol>
+<ol class="tc-toc toc-selective-expandable">
 <$list filter="[tag[$tag$]$sort$]">
 <<toc-selective-expandable-body tag:"$tag$" sort:"$sort$">>
 </$list>
diff --git a/editions/tw5.com/tiddlers/dev/Working with the TiddlyWiki5 repository.tid b/editions/tw5.com/tiddlers/dev/Working with the TiddlyWiki5 repository.tid
index 535cb2575..7a3866248 100644
--- a/editions/tw5.com/tiddlers/dev/Working with the TiddlyWiki5 repository.tid	
+++ b/editions/tw5.com/tiddlers/dev/Working with the TiddlyWiki5 repository.tid	
@@ -4,6 +4,12 @@ tags: dev howto
 title: Working with the TiddlyWiki5 repository
 type: text/vnd.tiddlywiki
 
+! Introduction
+
+Mario Pietsch has created a short video tutorial on working with the TiddlyWiki5 ~GitHub repository.
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/6ElUruH92tc" frameborder="0" allowfullscreen></iframe>
+
 ! Setting Up
 
 If you plan on working with the TiddlyWiki5 source code then follow these steps:
diff --git a/editions/tw5.com/tiddlers/howtos/Improving TiddlyWiki Documentation.tid b/editions/tw5.com/tiddlers/howtos/Improving TiddlyWiki Documentation.tid
index c316b8a09..89976fb22 100644
--- a/editions/tw5.com/tiddlers/howtos/Improving TiddlyWiki Documentation.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Improving TiddlyWiki Documentation.tid	
@@ -19,4 +19,6 @@ Anyone can submit improvements to the TiddlyWiki documentation that appears on h
 
 [[Jermolene|https://github.com/Jermolene]] or one of the other core developers will then have the opportunity to merge your pull request so that it is incorporated into the next build of http://tiddlywiki.com.
 
-There will be a short video soon!
+Mario Pietsch has created this short video tutorial:
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/L4zTkMYcri8" frameborder="0" allowfullscreen></iframe>
diff --git a/editions/tw5.com/tiddlers/howtos/Video Tutorials.tid b/editions/tw5.com/tiddlers/howtos/Video Tutorials.tid
index 74d13396b..6ed1ef675 100644
--- a/editions/tw5.com/tiddlers/howtos/Video Tutorials.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Video Tutorials.tid	
@@ -22,4 +22,4 @@ The aim is to curate a series of videos to guide people through getting up and r
 
 This video of the second [[OXTWIG]] meeting starts with a tutorial overview demonstrating how to use ~TiddlyWiki in different scenarios:
 
-<iframe width="560" height="315" src="//www.youtube.com/embed/WOK_nVBf_6U" frameborder="0" allowfullscreen></iframe>
+<iframe width="560" height="315" src="http://www.youtube.com/embed/WOK_nVBf_6U" frameborder="0" allowfullscreen></iframe>
diff --git a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid b/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
index e31760db1..169cb8ec3 100644
--- a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
@@ -12,6 +12,8 @@ There are several variants of the macro:
 * `<<toc-expandable>>` produces an expandable tree of links
 * `<<toc-selective-expandable>>` produces an expandable tree of links where the expand/contract buttons are only shown for entries that possess child nodes
 
+The macros all generate HTML ordered lists. The `<ol>` elements are given the class `tc-toc`, with the expandable variant also having the class `tc-toc-expandable` and the selective expandable variant also having the class `tc-toc-selective-expandable`.
+
 ! Parameters
 
 |!Position |!Name |!Description |!Default |
diff --git a/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid
index d271885e8..5d41cedc1 100644
--- a/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid
@@ -33,6 +33,7 @@ Plugins are stored as tiddlers with the following fields:
 |plugin-type |Can be ''plugin'' (default) or ''theme'' |
 |text |JSON encoding of the list of tiddlers comprising the plugin |
 |list |Names of exposed plugin information tiddlers (see below) |
+|name |Name of the theme (only for themes) |
 |dependents |List of dependent plugins (currently only implemented for themes) |
 
 ! Plugin folders
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index fae5fda62..9d4b35c3e 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -129,8 +129,8 @@ table tfoot tr td {
 	max-width: 100%;
 }
 
-.tc-tiddler-frame embed,
-.tc-tiddler-frame iframe {
+.tc-tiddler-body > embed,
+.tc-tiddler-body > iframe {
 	width: 100%;
 	height: 600px;
 }