diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index 10350e2fc..904ba89b2 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -4,7 +4,7 @@ tags: $:/tags/EditTemplate
 \define tag-styles()
 background-color:$(backgroundColor)$;
 \end
-<div class="tw-edit-tags"><$fieldmangler><$list filter="[is[current]tags[]sort[title]]" storyview="pop" itemClass="tw-tag-editor-label"><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text" /><$button message="tw-remove-tag" param={{!!title}} class="btn-invisible tw-remove-tag-button">&times;</$button></span></$set>
+<div class="tw-edit-tags"><$fieldmangler><$list filter="[is[current]tags[]sort[title]]" storyview="pop"><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text" /><$button message="tw-remove-tag" param={{!!title}} class="btn-invisible tw-remove-tag-button">&times;</$button></span></$set>
 </$list>
 
 <div class="tw-edit-add-tag"><span class="tw-add-tag-name"><$edit-text tiddler="$:/NewTagName" tag="input" default="" placeholder="tag name" focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/NewTagName}} set="$:/NewTagName" setTo="" class="">add</$button></span></div>
diff --git a/core/ui/MoreSideBar/All.tid b/core/ui/MoreSideBar/All.tid
index caa2b4ef0..4acbd3a05 100644
--- a/core/ui/MoreSideBar/All.tid
+++ b/core/ui/MoreSideBar/All.tid
@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/All
 tags: $:/tags/MoreSideBar
 caption: All
 
-<$list filter="[!is[system]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[!is[system]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/MoreSideBar/Drafts.tid b/core/ui/MoreSideBar/Drafts.tid
index 697e4444e..fd402a488 100644
--- a/core/ui/MoreSideBar/Drafts.tid
+++ b/core/ui/MoreSideBar/Drafts.tid
@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Drafts
 tags: $:/tags/MoreSideBar
 caption: Drafts
 
-<$list filter="[has[draft.of]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[has[draft.of]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/MoreSideBar/Missing.tid b/core/ui/MoreSideBar/Missing.tid
index 5ab441832..b0a13b833 100644
--- a/core/ui/MoreSideBar/Missing.tid
+++ b/core/ui/MoreSideBar/Missing.tid
@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Missing
 tags: $:/tags/MoreSideBar
 caption: Missing
 
-<$list filter="[is[missing]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/MissingTemplate"/>
+<$list filter="[is[missing]sort[title]]" template="$:/core/ui/MissingTemplate"/>
diff --git a/core/ui/MoreSideBar/Orphans.tid b/core/ui/MoreSideBar/Orphans.tid
index 01e9a145a..9ff891248 100644
--- a/core/ui/MoreSideBar/Orphans.tid
+++ b/core/ui/MoreSideBar/Orphans.tid
@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Orphans
 tags: $:/tags/MoreSideBar
 caption: Orphans
 
-<$list filter="[is[orphan]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[is[orphan]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/MoreSideBar/Shadows.tid b/core/ui/MoreSideBar/Shadows.tid
index 848e4e98d..53afdfe6c 100644
--- a/core/ui/MoreSideBar/Shadows.tid
+++ b/core/ui/MoreSideBar/Shadows.tid
@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Shadows
 tags: $:/tags/MoreSideBar
 caption: Shadows
 
-<$list filter="[is[shadow]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[is[shadow]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/MoreSideBar/System.tid b/core/ui/MoreSideBar/System.tid
index 6705c07f6..bf785270e 100644
--- a/core/ui/MoreSideBar/System.tid
+++ b/core/ui/MoreSideBar/System.tid
@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/System
 tags: $:/tags/MoreSideBar
 caption: System
 
-<$list filter="[is[system]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[is[system]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/MoreSideBar/Tags.tid b/core/ui/MoreSideBar/Tags.tid
index 8a5496fe1..13ee6e213 100644
--- a/core/ui/MoreSideBar/Tags.tid
+++ b/core/ui/MoreSideBar/Tags.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/MoreSideBar/Tags
 tags: $:/tags/MoreSideBar
 caption: Tags
 
-<$list filter="[tags[]sort[title]]" itemClass="tw-menu-list-item">
+<$list filter="[tags[]sort[title]]">
 <$transclude tiddler="$:/core/ui/TagTemplate"/> <small class="tw-menu-list-count"><$count filter="[is[current]tagging[]]"/></small>
 </$list>
 ----
diff --git a/core/ui/SideBar/Open.tid b/core/ui/SideBar/Open.tid
index d39803b06..588c48b6c 100644
--- a/core/ui/SideBar/Open.tid
+++ b/core/ui/SideBar/Open.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/SideBar/Open
 tags: $:/tags/SideBar
 caption: Open
 
-<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop" itemClass="tw-menu-list-item tw-open-tiddler-list">
+<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">
 <$button message="tw-close-tiddler" class="btn-invisible btn-mini">&times;</$button> <$link to={{!!title}}><$view field="title"/></$link>
 </$list>
 <$button message="tw-close-all-tiddlers" class="btn-invisible btn-mini">close all</$button>
diff --git a/core/ui/TiddlerInfo/List.tid b/core/ui/TiddlerInfo/List.tid
index ef4228100..2fe02e9fd 100644
--- a/core/ui/TiddlerInfo/List.tid
+++ b/core/ui/TiddlerInfo/List.tid
@@ -2,4 +2,4 @@ title: $:/core/ui/TiddlerInfo/List
 tags: $:/tags/TiddlerInfo
 caption: List
 
-<$list filter="[list{!!title}]" itemClass="tw-menu-list-item" emptyMessage="This tiddler does not have a list" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[list{!!title}]" emptyMessage="This tiddler does not have a list" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/TiddlerInfo/Listed.tid b/core/ui/TiddlerInfo/Listed.tid
index 772ed781c..eea1d35e0 100644
--- a/core/ui/TiddlerInfo/Listed.tid
+++ b/core/ui/TiddlerInfo/Listed.tid
@@ -2,4 +2,4 @@ title: $:/core/ui/TiddlerInfo/Listed
 tags: $:/tags/TiddlerInfo
 caption: Listed
 
-<$list filter="[is[current]listed[]!is[system]]" itemClass="tw-menu-list-item" emptyMessage="This tiddler is not listed by any others" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[is[current]listed[]!is[system]]" emptyMessage="This tiddler is not listed by any others" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/TiddlerInfo/Tagging.tid b/core/ui/TiddlerInfo/Tagging.tid
index b42fa7f06..f9f8f0054 100644
--- a/core/ui/TiddlerInfo/Tagging.tid
+++ b/core/ui/TiddlerInfo/Tagging.tid
@@ -2,4 +2,4 @@ title: $:/core/ui/TiddlerInfo/Tagging
 tags: $:/tags/TiddlerInfo
 caption: Tagging
 
-<$list filter="[is[current]tagging[]]" itemClass="tw-menu-list-item" emptyMessage="No tiddlers are tagged with this one" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[is[current]tagging[]]" emptyMessage="No tiddlers are tagged with this one" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/ViewTemplate/tags.tid b/core/ui/ViewTemplate/tags.tid
index 2648ac1b5..8f2d1519c 100644
--- a/core/ui/ViewTemplate/tags.tid
+++ b/core/ui/ViewTemplate/tags.tid
@@ -1,4 +1,4 @@
 title: $:/core/ui/ViewTemplate/tags
 tags: $:/tags/ViewTemplate
 
-<div class="tw-tags-wrapper"><$list filter="[is[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop" itemClass="tw-tag-list-item"/></div>
+<div class="tw-tags-wrapper"><$list filter="[is[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/></div>
diff --git a/core/wiki/recentchanges.tid b/core/wiki/recentchanges.tid
index f1fd438fc..e65c4afd1 100644
--- a/core/wiki/recentchanges.tid
+++ b/core/wiki/recentchanges.tid
@@ -1,9 +1,9 @@
 title: $:/snippets/recentchanges
 
-<$list filter="[!is[system]has[modified]!sort[modified]limit[100]eachday[modified]]" itemClass="tw-menu-list-item">
+<$list filter="[!is[system]has[modified]!sort[modified]limit[100]eachday[modified]]">
 <div class="tw-menu-list-item">
 <$view field="modified" format="date" template="DDth MMM YYYY"/>
-<$list filter="[sameday{!!modified}!is[system]!sort[modified]]" itemClass="tw-menu-list-subitem">
+<$list filter="[sameday{!!modified}!is[system]!sort[modified]]">
 <div class="tw-menu-list-subitem">
 <$link to={{!!title}}>
 <$view field="title"/>
diff --git a/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid
index f9507943d..f7f28a33d 100644
--- a/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid
@@ -27,7 +27,7 @@ The [[$:/StoryList]] tiddler is an example of a StateTiddler: a tiddler that is
 Note how this approach makes the ''open'' tab in the sidebar very easy to implement: it is just another list widget referencing the same state tiddler, but with a different template:
 
 ```
-<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop" itemClass="tw-menu-list-item tw-open-tiddler-list">
+<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">
 <$button message="tw-close-tiddler" class="btn-invisible btn-mini">&times;</$button> <$link to={{!!title}}><$view field="title"/></$link>
 </$list>
 ```
diff --git a/editions/tw5.com/tiddlers/widgets/ListWidget.tid b/editions/tw5.com/tiddlers/widgets/ListWidget.tid
index d9b52cf42..1e2ec848d 100644
--- a/editions/tw5.com/tiddlers/widgets/ListWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ListWidget.tid
@@ -70,10 +70,10 @@ The outer list filter selects each discrete value found in the `type` field. The
 The ''recent'' listing is performed with this markup:
 
 ```
-<$list filter="[!is[system]has[modified]!sort[modified]limit[100]eachday[modified]]" itemClass="tw-menu-list-item">
+<$list filter="[!is[system]has[modified]!sort[modified]limit[100]eachday[modified]]">
 <div class="tw-menu-list-item">
 <$view field="modified" format="date" template="DDth MMM YYYY"/>
-<$list filter="[sameday{!!modified}!is[system]!sort[modified]]" itemClass="tw-menu-list-subitem">
+<$list filter="[sameday{!!modified}!is[system]!sort[modified]]">
 <div class="tw-menu-list-subitem">
 <$link to={{!!title}}><$view field="title"/></$link>
 </div>