diff --git a/core/wiki/peek-stylesheets.tid b/core/wiki/peek-stylesheets.tid
index 7d9726fbeda..58ffaebcac4 100644
--- a/core/wiki/peek-stylesheets.tid
+++ b/core/wiki/peek-stylesheets.tid
@@ -1,76 +1,52 @@
 title: $:/snippets/peek-stylesheets
 
-\define expandable-stylesheets-list()
-\whitespace trim
-<ol>
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
-<$vars state=<<qualify "$:/state/peek-stylesheets/open/">>>
-<$set name="state" value={{{ [<state>addsuffix<currentTiddler>] }}}>
-<li>
-<$reveal type="match" state=<<state>> text="yes" tag="span">
-<$button set=<<state>> setTo="no" class="tc-btn-invisible">
-{{$:/core/images/down-arrow}}
-</$button>
-</$reveal>
-<$reveal type="nomatch" state=<<state>> text="yes" tag="span">
-<$button set=<<state>> setTo="yes" class="tc-btn-invisible">
-{{$:/core/images/right-arrow}}
-</$button>
-</$reveal>
-<$link>
-<$view field="title"/>
-</$link>
-<$reveal type="match" state=<<state>> text="yes" tag="div">
-<$set name="source" tiddler=<<currentTiddler>>>
-<$wikify name="styles" text=<<source>>>
+\procedure expandable-content()
+<$wikify name="styles" text={{!!text}}>
 <$codeblock code=<<styles>> language="css"/>
 </$wikify>
-</$set>
-</$reveal>
-</li>
-</$set>
-</$vars>
-</$list>
-</ol>
 \end
 
-\define stylesheets-list()
+\procedure toggle-content()
+<$parameters openState="" open="[<openState>substitute[]get[text]else[no]]" openImage="$:/core/images/down-arrow" closedImage="$:/core/images/right-arrow" openCaption="" closedCaption="">
+<%if [<openState>!is[blank]] %>
+<$checkbox tiddler={{{ [<openState>substitute[]] }}} field="text" checked="yes" style.appearance="none">
+<span style.cursor="pointer">
+<%if [subfilter<open>match[yes]] %>
+<$transclude $tiddler=<<openImage>> size="1em" /> <<openCaption>>
+<%else%>
+<$transclude $tiddler=<<closedImage>> size="1em" /> <<closedCaption>>
+<%endif%>
+</span>
+</$checkbox>
+<%endif%>
+</$parameters>
+\end
+
+\procedure expandable-list()
 \whitespace trim
+<$parameters filter="" openState="" open="[<openState>substitute[]get[text]else[no]]">
 <ol>
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
+<$list filter=<<filter>> >
 <li>
-<$link>
-<$view field="title"/>
-</$link>
-<$set name="source" tiddler=<<currentTiddler>>>
-<$wikify name="styles" text=<<source>>>
-<pre>
-<code>
-<$text text=<<styles>>/>
-</code>
-</pre>
-</$wikify>
-</$set>
+<$transclude $variable="toggle-content" open=<<open>> openState=<<openState>> />
+<$link/>
+<%if [subfilter<open>match[yes]]%>
+<<expandable-content>>
+<%endif%>
 </li>
 </$list>
 </ol>
+</$parameters>
 \end
-\whitespace trim
 
-<$vars modeState=<<qualify "$:/state/peek-stylesheets/mode/">>>
+<$let modeState=`$:/state/peek-stylesheets/mode/$(qualify)$` mode={{{ [<modeState>get[text]else[expand]] }}} listFilter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
 
-<$reveal type="nomatch" state=<<modeState>> text="expanded" tag="div">
-<$button set=<<modeState>> setTo="expanded" class="tc-btn-invisible">{{$:/core/images/chevron-right}} {{$:/language/ControlPanel/Stylesheets/Expand/Caption}}</$button>
-</$reveal>
-<$reveal type="match" state=<<modeState>> text="expanded" tag="div">
-<$button set=<<modeState>> setTo="restored" class="tc-btn-invisible">{{$:/core/images/chevron-down}} {{$:/language/ControlPanel/Stylesheets/Restore/Caption}}</$button>
-</$reveal>
+<$transclude $variable="toggle-content" openImage="$:/core/images/chevron-right" closedImage="$:/core/images/chevron-down" openState=<<modeState>> openCaption={{$:/language/ControlPanel/Stylesheets/Expand/Caption}} closedCaption={{$:/language/ControlPanel/Stylesheets/Restore/Caption}}/>
 
-<$reveal type="nomatch" state=<<modeState>> text="expanded" tag="div">
-<<expandable-stylesheets-list>>
-</$reveal>
-<$reveal type="match" state=<<modeState>> text="expanded" tag="div">
-<<stylesheets-list>>
-</$reveal>
+<%if [<mode>match[expand]]%>
+<$transclude $variable="expandable-list" filter=<<listFilter>> open="yes"/>
+<%else%>
+<$transclude $variable="expandable-list" filter=<<listFilter>> openState="$:/state/peek-tiddler/open/$(currentTiddler)$$(qualify)$"/>
+<%endif%>
 
-</$vars>
+</$let>
\ No newline at end of file