diff --git a/core/modules/widgets/tiddler.js b/core/modules/widgets/tiddler.js
index 2cfeb4f34..fcc4fabf1 100755
--- a/core/modules/widgets/tiddler.js
+++ b/core/modules/widgets/tiddler.js
@@ -57,7 +57,7 @@ TiddlerWidget.prototype.getTagClasses = function() {
 	if(tiddler) {
 		var tags = [];
 		$tw.utils.each(tiddler.fields.tags,function(tag) {
-			tags.push("tw-tagged-" + encodeURIComponent(tag));
+			tags.push("tc-tagged-" + encodeURIComponent(tag));
 		});
 		return tags.join(" ");
 	} else {
diff --git a/core/ui/AdvancedSearch.tid b/core/ui/AdvancedSearch.tid
index f1e5e1e0c..b7aa7426a 100644
--- a/core/ui/AdvancedSearch.tid
+++ b/core/ui/AdvancedSearch.tid
@@ -1,5 +1,5 @@
 title: $:/AdvancedSearch
 
-<div class="tw-advanced-search">
+<div class="tc-advanced-search">
 <<tabs "[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch]!has[draft.of]]" "$:/core/ui/AdvancedSearch/System">>
 </div>
diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid
index 5d4da4dc8..b86b48942 100644
--- a/core/ui/AdvancedSearch/Filter.tid
+++ b/core/ui/AdvancedSearch/Filter.tid
@@ -7,11 +7,11 @@ caption: {{$:/language/Search/Filter/Caption}}
 
 <<lingo Filter/Hint>>
 
-<div class="tw-search tw-advanced-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/> <$button popup=<<qualify "$:/state/filterDropdown">> class="tc-btn-invisible">{{$:/core/images/down-arrow}}</$button> <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
+<div class="tc-search tc-advanced-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/> <$button popup=<<qualify "$:/state/filterDropdown">> class="tc-btn-invisible">{{$:/core/images/down-arrow}}</$button> <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
 
-<div class="tw-block-dropdown-wrapper">
+<div class="tc-block-dropdown-wrapper">
 <$reveal state=<<qualify "$:/state/filterDropdown">> type="nomatch" text="" default="">
-<div class="tw-block-dropdown tc-edit-type-dropdown">
+<div class="tc-block-dropdown tc-edit-type-dropdown">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/></$link>
 </$list>
 </div>
@@ -21,7 +21,7 @@ caption: {{$:/language/Search/Filter/Caption}}
 </$linkcatcher>
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-<div class="tw-search-results">
+<div class="tc-search-results">
 <<lingo Filter/Matches>>
 <$list filter={{$:/temp/advancedsearch}} template="$:/core/ui/ListItemTemplate"/>
 </div>
diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid
index 54781683e..b9fb02726 100644
--- a/core/ui/AdvancedSearch/Shadows.tid
+++ b/core/ui/AdvancedSearch/Shadows.tid
@@ -7,13 +7,13 @@ caption: {{$:/language/Search/Shadows/Caption}}
 
 <<lingo Shadows/Hint>>
 
-<div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
+<div class="tc-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
 
 </$linkcatcher>
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 
-<div class="tw-search-results">
+<div class="tc-search-results">
 
 <<lingo Shadows/Matches>>
 
diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid
index 0b81afc0d..ddc99be78 100644
--- a/core/ui/AdvancedSearch/Standard.tid
+++ b/core/ui/AdvancedSearch/Standard.tid
@@ -7,13 +7,13 @@ caption: {{$:/language/Search/Standard/Caption}}
 
 <<lingo Standard/Hint>>
 
-<div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
+<div class="tc-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
 
 </$linkcatcher>
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 
-<div class="tw-search-results">
+<div class="tc-search-results">
 
 <<lingo Standard/Matches>>
 
diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid
index c6921b74d..dd51f323e 100644
--- a/core/ui/AdvancedSearch/System.tid
+++ b/core/ui/AdvancedSearch/System.tid
@@ -7,13 +7,13 @@ caption: {{$:/language/Search/System/Caption}}
 
 <<lingo System/Hint>>
 
-<div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
+<div class="tc-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
 
 </$linkcatcher>
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 
-<div class="tw-search-results">
+<div class="tc-search-results">
 
 <<lingo System/Matches>>
 
diff --git a/core/ui/AlertTemplate.tid b/core/ui/AlertTemplate.tid
index c2c34d730..6f1e4c68a 100644
--- a/core/ui/AlertTemplate.tid
+++ b/core/ui/AlertTemplate.tid
@@ -1,14 +1,14 @@
 title: $:/core/ui/AlertTemplate
 
-<div class="tw-alert">
-<div class="tw-alert-toolbar">
+<div class="tc-alert">
+<div class="tc-alert-toolbar">
 <$button message="tw-delete-tiddler" class="tc-btn-invisible">
 {{$:/core/images/delete-button}}</$button>
 </div>
-<div class="tw-alert-subtitle">
-<$view field="component"/> - <$view field="modified" format="date" template="0hh:0mm:0ss DD MM YYYY"/> <$reveal type="nomatch" state="!!count" text=""><span class="tw-alert-highlight">(count: <$view field="count"/>)</span></$reveal>
+<div class="tc-alert-subtitle">
+<$view field="component"/> - <$view field="modified" format="date" template="0hh:0mm:0ss DD MM YYYY"/> <$reveal type="nomatch" state="!!count" text=""><span class="tc-alert-highlight">(count: <$view field="count"/>)</span></$reveal>
 </div>
-<div class="tw-alert-body">
+<div class="tc-alert-body">
 
 <$transclude/>
 
diff --git a/core/ui/BinaryWarning.tid b/core/ui/BinaryWarning.tid
index a2811ceda..c6e8d3139 100644
--- a/core/ui/BinaryWarning.tid
+++ b/core/ui/BinaryWarning.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/BinaryWarning
 
 \define lingo-base() $:/language/BinaryWarning/
-<div class="tw-binary-warning">
+<div class="tc-binary-warning">
 
 <<lingo Prompt>>
 
diff --git a/core/ui/ControlPanel.tid b/core/ui/ControlPanel.tid
index ce24e1b32..e4e652335 100644
--- a/core/ui/ControlPanel.tid
+++ b/core/ui/ControlPanel.tid
@@ -1,5 +1,5 @@
 title: $:/ControlPanel
 
-<div class="tw-control-panel">
+<div class="tc-control-panel">
 <<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel]!has[draft.of]]" "$:/core/ui/ControlPanel/Basics">>
 </div>
diff --git a/core/ui/ControlPanel/Advanced.tid b/core/ui/ControlPanel/Advanced.tid
index 02ed5b153..693a648b8 100644
--- a/core/ui/ControlPanel/Advanced.tid
+++ b/core/ui/ControlPanel/Advanced.tid
@@ -4,6 +4,6 @@ caption: {{$:/language/ControlPanel/Advanced/Caption}}
 
 {{$:/language/ControlPanel/Advanced/Hint}}
 
-<div class="tw-control-panel">
+<div class="tc-control-panel">
 <<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced]!has[draft.of]]" "$:/core/ui/ControlPanel/Advanced/TiddlerFields">>
 </div>
diff --git a/core/ui/ControlPanel/Appearance.tid b/core/ui/ControlPanel/Appearance.tid
index e4ea65b9e..295fbf965 100644
--- a/core/ui/ControlPanel/Appearance.tid
+++ b/core/ui/ControlPanel/Appearance.tid
@@ -4,6 +4,6 @@ caption: {{$:/language/ControlPanel/Appearance/Caption}}
 
 {{$:/language/ControlPanel/Appearance/Hint}}
 
-<div class="tw-control-panel">
+<div class="tc-control-panel">
 <<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Theme">>
 </div>
diff --git a/core/ui/ControlPanel/Appearance/Toolbars.tid b/core/ui/ControlPanel/Appearance/Toolbars.tid
index bcb0aa843..2d750e0e5 100644
--- a/core/ui/ControlPanel/Appearance/Toolbars.tid
+++ b/core/ui/ControlPanel/Appearance/Toolbars.tid
@@ -4,6 +4,6 @@ caption: {{$:/language/ControlPanel/Appearance/Toolbars/Caption}}
 
 {{$:/language/ControlPanel/Appearance/Toolbars/Hint}}
 
-<div class="tw-control-panel">
-<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance/Toolbars]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar" "$:/state/tabs/controlpanel/toolbars" "tw-vertical">>
+<div class="tc-control-panel">
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance/Toolbars]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar" "$:/state/tabs/controlpanel/toolbars" "tc-vertical">>
 </div>
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid b/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid
index eccd2e0d3..d07f27c77 100644
--- a/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid
+++ b/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid
@@ -15,7 +15,7 @@ $:/config/EditToolbarButtons/Visibility/$(listItem)$
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem">
 
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tw-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
 
 </$list>
 
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid b/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid
index 16fa8c957..37d6a7414 100644
--- a/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid
+++ b/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid
@@ -15,7 +15,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
 
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tw-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
 
 </$list>
 
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid b/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid
index ad50615af..b15374d0e 100644
--- a/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid
+++ b/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid
@@ -15,7 +15,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem">
 
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tw-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
 
 </$list>
 
diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index c4aa34224..1f7914299 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -23,11 +23,11 @@ background-color:$(backgroundColor)$;
 </span>
 </div>
 
-<div class="tw-block-dropdown-wrapper">
+<div class="tc-block-dropdown-wrapper">
 
 <$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
 
-<div class="tw-block-dropdown">
+<div class="tc-block-dropdown">
 
 <$linkcatcher set="$:/temp/NewTagName" setTo="" message="tw-add-tag">
 <$list filter="[!is[shadow]tags[]search{$:/temp/NewTagName}sort[title]]">
diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid
index acd7010cf..3be329fcf 100644
--- a/core/ui/EditTemplate/type.tid
+++ b/core/ui/EditTemplate/type.tid
@@ -4,9 +4,9 @@ tags: $:/tags/EditTemplate
 \define lingo-base() $:/language/EditTemplate/
 <p><$fieldmangler><em class="tc-edit"><<lingo Type/Prompt>></em> <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor"/> <$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <$button message="tw-remove-field" param="type" class="tc-btn-invisible tc-btn-icon">{{$:/core/images/delete-button}}</$button></$fieldmangler></p>
 
-<div class="tw-block-dropdown-wrapper">
+<div class="tc-block-dropdown-wrapper">
 <$reveal state=<<qualify "$:/state/popup/type-dropdown">> type="nomatch" text="" default="">
-<div class="tw-block-dropdown tc-edit-type-dropdown">
+<div class="tc-block-dropdown tc-edit-type-dropdown">
 <$linkcatcher to="!!type">
 <$list filter='[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]each[group]sort[group]]'>
 <div class="tc-dropdown-item">
diff --git a/core/ui/PageTemplate/alerts.tid b/core/ui/PageTemplate/alerts.tid
index c296336e5..ce1b93db9 100644
--- a/core/ui/PageTemplate/alerts.tid
+++ b/core/ui/PageTemplate/alerts.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/PageTemplate/alerts
 tags: $:/tags/PageTemplate
 
-<div class="tw-alerts">
+<div class="tc-alerts">
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Alert]!has[draft.of]]" template="$:/core/ui/AlertTemplate" storyview="pop"/>
 
diff --git a/core/ui/SideBar/More.tid b/core/ui/SideBar/More.tid
index 29c212bd7..ef5e2c4fc 100644
--- a/core/ui/SideBar/More.tid
+++ b/core/ui/SideBar/More.tid
@@ -3,5 +3,5 @@ tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/More/Caption}}
 
 <div class="tw-more-sidebar">
-<<tabs "[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar" "tw-vertical">>
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar" "tc-vertical">>
 </div>
diff --git a/core/ui/SideBar/Tools.tid b/core/ui/SideBar/Tools.tid
index 1c1cd7ea6..d96e7d8de 100644
--- a/core/ui/SideBar/Tools.tid
+++ b/core/ui/SideBar/Tools.tid
@@ -17,7 +17,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
 
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tw-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
 
 </$list>
 
diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid
index b90b9f66a..6f1096fa9 100644
--- a/core/ui/SideBarLists.tid
+++ b/core/ui/SideBarLists.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/SideBarLists
 
 <div class="tw-sidebar-lists">
 
-<div class="tw-search">
+<div class="tc-search">
 <$edit-text tiddler="$:/temp/search" type="search" tag="input"/>
 <$reveal state="$:/temp/search" type="nomatch" text="">
 <$linkcatcher to="$:/temp/search">
@@ -15,7 +15,7 @@ title: $:/core/ui/SideBarLists
 
 <$reveal state="$:/temp/search" type="nomatch" text="">
 
-<div class="tw-search-results">
+<div class="tc-search-results">
 
 {{$:/language/Search/Matches}}
 
diff --git a/core/ui/TiddlerInfo/Tools.tid b/core/ui/TiddlerInfo/Tools.tid
index c14d71692..5c4f6a476 100644
--- a/core/ui/TiddlerInfo/Tools.tid
+++ b/core/ui/TiddlerInfo/Tools.tid
@@ -14,7 +14,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem">
 
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tw-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
 
 </$list>
 
diff --git a/editions/tw5.com/tiddlers/GettingStarted.tid b/editions/tw5.com/tiddlers/GettingStarted.tid
index 797c4df58..8259c93b7 100644
--- a/editions/tw5.com/tiddlers/GettingStarted.tid
+++ b/editions/tw5.com/tiddlers/GettingStarted.tid
@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 GettingStarted - $(browser-name)$
 \end
 <$set name="browser-name" value={{$:/info/browser/name}}>
-<$macrocall $name="tabs" state="$:/state/tabs/platform" tabsList="[prefix[GettingStarted - ]]" default=<<default-platform>> class="tw-vertical"/>
+<$macrocall $name="tabs" state="$:/state/tabs/platform" tabsList="[prefix[GettingStarted - ]]" default=<<default-platform>> class="tc-vertical"/>
 </$set>
 
 See also:
diff --git a/editions/tw5.com/tiddlers/ReleaseHistory.tid b/editions/tw5.com/tiddlers/ReleaseHistory.tid
index d7076c5c1..b719d4122 100644
--- a/editions/tw5.com/tiddlers/ReleaseHistory.tid
+++ b/editions/tw5.com/tiddlers/ReleaseHistory.tid
@@ -5,4 +5,4 @@ type: text/vnd.tiddlywiki
 
 Here are the details of recent releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named.
 
-<<tabs "[tag[releasenote]!sort[created]]" "Release 5.0.15-beta" "$:/state/tab2" "tw-vertical" "ReleaseHistoryTemplate">>
+<<tabs "[tag[releasenote]!sort[created]]" "Release 5.0.15-beta" "$:/state/tab2" "tc-vertical" "ReleaseHistoryTemplate">>
diff --git a/editions/tw5.com/tiddlers/macros/TabsMacro.tid b/editions/tw5.com/tiddlers/macros/TabsMacro.tid
index 9279adadf..f8bc2f9d8 100644
--- a/editions/tw5.com/tiddlers/macros/TabsMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TabsMacro.tid
@@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki
 
 The tabs macro displays a list of tiddlers as a tab control. The user can switch between tabs by clicking on them. The tabs are labelled with the title of the corresponding tiddler, unless there is a `caption` field present in which case it is used instead.
 
-By default the tab control arranges the tabs horizontally with the content underneath. You can also choose to have the tabs arranged vertically by passing the class `tw-vertical`.
+By default the tab control arranges the tabs horizontally with the content underneath. You can also choose to have the tabs arranged vertically by passing the class `tc-vertical`.
 
 ! Parameters
 
@@ -26,9 +26,9 @@ Here are some examples of the tabs macro:
 ```
 <<tabs "SampleTabOne SampleTabTwo SampleTabThree SampleTabFour" "SampleTabThree" "$:/state/tab1">>
 
-<<tabs "[tag[sampletab]]" "SampleTabTwo" "$:/state/tab2" "tw-vertical">>
+<<tabs "[tag[sampletab]]" "SampleTabTwo" "$:/state/tab2" "tc-vertical">>
 ```
 
 <<tabs "SampleTabOne SampleTabTwo SampleTabThree SampleTabFour" "SampleTabThree" "$:/state/tab1">>
 
-<<tabs "[tag[sampletab]]" "SampleTabTwo" "$:/state/tab2" "tw-vertical">>
+<<tabs "[tag[sampletab]]" "SampleTabTwo" "$:/state/tab2" "tc-vertical">>
diff --git a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid
index 02638450d..b831687e2 100644
--- a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid
@@ -21,7 +21,7 @@ The tiddler widget assigns several useful CSS classes to variables that it creat
 * ''missingTiddlerClass'': ''"tc-tiddler-exists"'' or ''"tc-tiddler-missing"'' depending upon whether the target tiddler exists
 * ''shadowTiddlerClass'': ''"tc-tiddler-shadow"'' if the tiddler is a shadow tiddler
 * ''systemTiddlerClass'': ''"tc-tiddler-system"'' if the tiddler is a system tiddler
-* ''tiddlerTagClasses'': A space separated list of CSS classes named ''"tw-tagged-{tagname}"''. For example ''"tw-tagged-introduction"''. Note that tag names are UrlEncoded which means that the tag ''$:/tags/Macro'' appears as the CSS class ''"tw-tagged-%24%3A%2Ftags%2FMacro"''
+* ''tiddlerTagClasses'': A space separated list of CSS classes named ''"tc-tagged-{tagname}"''. For example ''"tc-tagged-introduction"''. Note that tag names are UrlEncoded which means that the tag ''$:/tags/Macro'' appears as the CSS class ''"tc-tagged-%24%3A%2Ftags%2FMacro"''
 
 You can use these variables like this:
 
diff --git a/themes/tiddlywiki/seamless/base.tid b/themes/tiddlywiki/seamless/base.tid
index 904e4f6d1..8c53ca651 100644
--- a/themes/tiddlywiki/seamless/base.tid
+++ b/themes/tiddlywiki/seamless/base.tid
@@ -21,7 +21,7 @@ Rules copied from Snow White
 	<<box-shadow "2px 2px 10px rgba(0, 0, 0, 0.5)">>
 }
 
-.tw-block-dropdown {
+.tc-block-dropdown {
 	border-radius: 4px;
 	<<box-shadow "2px 2px 10px rgba(0, 0, 0, 0.5)">>
 }
@@ -40,7 +40,7 @@ Rules copied from Snow White
 	<<box-shadow "inset 0 1px 0 #fff">>;
 }
 
-.tw-alert {
+.tc-alert {
 	border-radius: 6px;
 	<<box-shadow "0 3px 7px rgba(0,0,0,0.6)">>
 }
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index fb205812e..5e33d80e6 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -54,7 +54,7 @@ canvas.tc-edit-bitmapeditor  {
 	<<box-shadow "2px 2px 10px rgba(0, 0, 0, 0.5)">>
 }
 
-.tw-block-dropdown {
+.tc-block-dropdown {
 	border-radius: 4px;
 	<<box-shadow "2px 2px 10px rgba(0, 0, 0, 0.5)">>
 }
@@ -74,7 +74,7 @@ canvas.tc-edit-bitmapeditor  {
 }
 
 
-.tw-alert {
+.tc-alert {
 	border-radius: 6px;
 	<<box-shadow "0 3px 7px rgba(0,0,0,0.6)">>
 }
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 96d36baad..97760e0f4 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -79,7 +79,7 @@ dl dt {
 	margin-top: 6px;
 }
 
-.tw-muted {
+.tc-muted {
 	color: <<colour muted-foreground>>;
 }
 
@@ -389,15 +389,15 @@ button.tw-tag-label, span.tw-tag-label {
 	color: <<colour sidebar-foreground>>;
 }
 
-.tw-advanced-search input {
+.tc-advanced-search input {
 	width: 60%;
 }
 
-.tw-search a svg {
+.tc-search a svg {
 	height: 0.75em;
 }
 
-.tw-search-results {
+.tc-search-results {
 	padding-top: 14px;
 }
 
@@ -670,7 +670,7 @@ button.tw-tag-label, span.tw-tag-label {
 	margin: 4px 0 4px 0;
 }
 
-.tc-tiddler-frame .tw-binary-warning {
+.tc-tiddler-frame .tc-binary-warning {
 	width: 100%;
 	height: 5em;
 	text-align: center;
@@ -937,11 +937,11 @@ canvas.tc-edit-bitmapeditor  {
 	padding: 0 0.5em 0 0.5em;
 }
 
-.tw-block-dropdown-wrapper {
+.tc-block-dropdown-wrapper {
 	position: relative;
 }
 
-.tw-block-dropdown {
+.tc-block-dropdown {
 	position: absolute;
 	min-width: 280px;
 	border: 1px solid <<colour dropdown-border>>;
@@ -952,18 +952,18 @@ canvas.tc-edit-bitmapeditor  {
 	z-index: 1000;
 }
 
-.tw-block-dropdown a {
+.tc-block-dropdown a {
 	display: block;
 	padding: 4px 14px 4px 14px;
 }
 
 .tc-drop-down .tc-dropdown-item,
-.tw-block-dropdown .tc-dropdown-item {
+.tc-block-dropdown .tc-dropdown-item {
 	padding: 4px 14px 4px 7px;
 	color: <<colour muted-foreground>>;
 }
 
-.tw-block-dropdown a:hover {
+.tc-block-dropdown a:hover {
 	color: <<colour tiddler-link-background>>;
 	background-color: <<colour tiddler-link-foreground>>;
 	text-decoration: none;
@@ -1062,7 +1062,7 @@ canvas.tc-edit-bitmapeditor  {
 ** Tabs
 */
 
-.tw-tab-set.tw-vertical {
+.tw-tab-set.tc-vertical {
 	display: -webkit-flex;
 	display: flex;
 }
@@ -1073,7 +1073,7 @@ canvas.tc-edit-bitmapeditor  {
 	margin-bottom: -1px;
 }
 
-.tw-tab-buttons.tw-vertical  {
+.tw-tab-buttons.tc-vertical  {
 	z-index: 100;
 	display: block;
 	padding-top: 14px;
@@ -1106,7 +1106,7 @@ canvas.tc-edit-bitmapeditor  {
 	border-right: 1px solid <<colour tab-border>>;
 }
 
-.tw-tab-buttons.tw-vertical button {
+.tw-tab-buttons.tc-vertical button {
 	display: block;
 	width: 100%;
 	margin-top: 3px;
@@ -1117,7 +1117,7 @@ canvas.tc-edit-bitmapeditor  {
 	border-right: none;
 }
 
-.tw-tab-buttons.tw-vertical button.tw-tab-selected {
+.tw-tab-buttons.tc-vertical button.tw-tab-selected {
 	background-color: <<colour tab-background-selected>>;
 	border-right: 1px solid <<colour tab-background-selected>>;
 }
@@ -1126,7 +1126,7 @@ canvas.tc-edit-bitmapeditor  {
 	border-top: 1px solid <<colour tab-divider>>;
 }
 
-.tw-tab-divider.tw-vertical  {
+.tw-tab-divider.tc-vertical  {
 	display: none;
 }
 
@@ -1134,7 +1134,7 @@ canvas.tc-edit-bitmapeditor  {
 	margin-top: 14px;
 }
 
-.tw-tab-content.tw-vertical  {
+.tw-tab-content.tc-vertical  {
 	display: inline-block;
 	vertical-align: top;
 	padding-top: 0;
@@ -1182,7 +1182,7 @@ canvas.tc-edit-bitmapeditor  {
 ** Alerts
 */
 
-.tw-alerts {
+.tc-alerts {
 	position: fixed;
 	top: 0;
 	left: 0;
@@ -1190,7 +1190,7 @@ canvas.tc-edit-bitmapeditor  {
 	z-index: 20000;
 }
 
-.tw-alert {
+.tc-alert {
 	position: relative;
 	margin: 28px;
 	padding: 14px 14px 14px 14px;
@@ -1198,22 +1198,22 @@ canvas.tc-edit-bitmapeditor  {
 	background-color: <<colour alert-background>>;
 }
 
-.tw-alert-toolbar {
+.tc-alert-toolbar {
 	position: absolute;
 	top: 14px;
 	right: 14px;
 }
 
-.tw-alert-toolbar svg {
+.tc-alert-toolbar svg {
 	fill: <<colour alert-muted-foreground>>;
 }
 
-.tw-alert-subtitle {
+.tc-alert-subtitle {
 	color: <<colour alert-muted-foreground>>;
 	font-weight: bold;
 }
 
-.tw-alert-highlight {
+.tc-alert-highlight {
 	color: <<colour alert-highlight>>;	
 }
 
@@ -1240,11 +1240,11 @@ canvas.tc-edit-bitmapeditor  {
 ** Control panel
 */
 
-.tw-control-panel td {
+.tc-control-panel td {
 	padding: 4px;
 }
 
-.tw-control-panel table, .tw-control-panel table input, .tw-control-panel table textarea {
+.tc-control-panel table, .tc-control-panel table input, .tc-control-panel table textarea {
 	width: 100%;
 }