From dd9b4dc78790fb3bfbded147f4e8f4585b0c5d27 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Sun, 10 Sep 2023 15:23:05 +0100
Subject: [PATCH] Refactor to allow multiple tours to be loaded at once

---
 .../tiddlywiki/tour/config-CurrentTour.tid    |  2 ++
 plugins/tiddlywiki/tour/globals.tid           | 32 +++++++++++++++++--
 plugins/tiddlywiki/tour/state-tour-step.tid   |  2 +-
 plugins/tiddlywiki/tour/tagsTourStep.tid      |  4 ---
 plugins/tiddlywiki/tour/tour-panel.tid        |  9 ++++--
 .../close-control-panel.tid                   |  4 +--
 .../closing-tiddlers.tid                      |  6 ++--
 .../create-tiddler.tid                        |  4 +--
 .../end-of-fullscreen.tid                     |  4 +--
 .../introduction-to-tiddlywiki}/finished.tid  |  2 +-
 .../introduction-to-tiddlywiki.tid            |  6 ++++
 .../introduction-to-tiddlywiki}/links.tid     |  8 ++---
 .../open-control-panel.tid                    |  4 +--
 .../introduction-to-tiddlywiki}/recent.tid    |  4 +--
 .../introduction-to-tiddlywiki}/search.tid    |  4 +--
 .../tagsTourIntroductionToTiddlyWiki.tid      |  4 +++
 .../tiddlers-Jupiter.tid                      |  4 +--
 .../tiddlers-Saturn.tid                       |  4 +--
 .../introduction-to-tiddlywiki}/tiddlers.tid  |  6 ++--
 .../tiddlywiki-tour-logo.svg                  |  0
 .../tiddlywiki-tour-logo.svg.meta             |  0
 .../introduction-to-tiddlywiki}/welcome.tid   |  4 +--
 22 files changed, 77 insertions(+), 40 deletions(-)
 create mode 100644 plugins/tiddlywiki/tour/config-CurrentTour.tid
 delete mode 100644 plugins/tiddlywiki/tour/tagsTourStep.tid
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/close-control-panel.tid (73%)
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/closing-tiddlers.tid (74%)
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/create-tiddler.tid (82%)
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/end-of-fullscreen.tid (59%)
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/finished.tid (71%)
 create mode 100644 plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/introduction-to-tiddlywiki.tid
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/links.tid (71%)
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/open-control-panel.tid (70%)
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/recent.tid (82%)
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/search.tid (69%)
 create mode 100644 plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tagsTourIntroductionToTiddlyWiki.tid
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/tiddlers-Jupiter.tid (53%)
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/tiddlers-Saturn.tid (50%)
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/tiddlers.tid (60%)
 rename plugins/tiddlywiki/tour/{images => tours/introduction-to-tiddlywiki}/tiddlywiki-tour-logo.svg (100%)
 rename plugins/tiddlywiki/tour/{images => tours/introduction-to-tiddlywiki}/tiddlywiki-tour-logo.svg.meta (100%)
 rename plugins/tiddlywiki/tour/{steps => tours/introduction-to-tiddlywiki}/welcome.tid (64%)

diff --git a/plugins/tiddlywiki/tour/config-CurrentTour.tid b/plugins/tiddlywiki/tour/config-CurrentTour.tid
new file mode 100644
index 000000000..3f7cd7b5e
--- /dev/null
+++ b/plugins/tiddlywiki/tour/config-CurrentTour.tid
@@ -0,0 +1,2 @@
+title: $:/config/CurrentTour
+text: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki
\ No newline at end of file
diff --git a/plugins/tiddlywiki/tour/globals.tid b/plugins/tiddlywiki/tour/globals.tid
index b5797e433..00cb784d1 100644
--- a/plugins/tiddlywiki/tour/globals.tid
+++ b/plugins/tiddlywiki/tour/globals.tid
@@ -1,23 +1,49 @@
 title: $:/plugins/tiddlywiki/tour/globals
 tags: $:/tags/Global
 
+<!--
+
+The following state tiddlers control the tour. They should not be directly modified,
+but rather use the appropriate procedure to ensure that all the associated actions are performed.
+
+$:/config/CurrentTour - title of current tour definition tiddler
+$:/config/ShowTour - "show" (default) or "hide"
+$:/state/tour/step - title of current step of the tour
+
+Tour definition tiddlers have the following fields:
+
+tour-tag - name of tag used to define tour step sequence
+logo - title of tiddler containing logo of tour
+
+
+
+-->
+
+\function tour-current-tag()
+[{$:/config/CurrentTour}get[tour-tag]]
+\end
+
+\function tour-is-not-first-step()
+[all[shadows+tiddlers]tag[$:/tags/Tour/IntroductionToTiddlyWiki]before{$:/state/tour/step}count[]compare:number:gt[0]]
+\end
+
 \procedure tour-initialise-current-tour-step()
 <$transclude $tiddler={{$:/state/tour/step}} $field="enter-actions"/>
 \end
 
 \procedure tour-restart()
 <$action-setfield $tiddler="$:/config/ShowTour" text="show"/>
-<$action-setfield $tiddler="$:/state/tour/step" $field="text" $value={{{ [all[shadows+tiddlers]tag[$:/tags/TourStep]first[]] }}}/>
+<$action-setfield $tiddler="$:/state/tour/step" $field="text" $value={{{ [all[shadows+tiddlers]tag<tour-current-tag>first[]] }}}/>
 <<tour-initialise-current-tour-step>>
 \end
 
 \procedure tour-next-step()
-<$action-setfield $tiddler="$:/state/tour/step" $field="text" $value={{{ [all[shadows+tiddlers]tag[$:/tags/TourStep]after{$:/state/tour/step}else[$:/plugins/tiddlywiki/tour/steps/finished]] }}}/>
+<$action-setfield $tiddler="$:/state/tour/step" $field="text" $value={{{ [all[shadows+tiddlers]tag<tour-current-tag>after{$:/state/tour/step}else[$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/finished]] }}}/>
 <<tour-initialise-current-tour-step>>
 \end
 
 \procedure tour-previous-step()
-<$action-setfield $tiddler="$:/state/tour/step" $field="text" $value={{{ [all[shadows+tiddlers]tag[$:/tags/TourStep]before{$:/state/tour/step}] :else[all[shadows+tiddlers]tag[$:/tags/TourStep]first[]] }}}/>
+<$action-setfield $tiddler="$:/state/tour/step" $field="text" $value={{{ [all[shadows+tiddlers]tag<tour-current-tag>before{$:/state/tour/step}] :else[all[shadows+tiddlers]tag<tour-current-tag>first[]] }}}/>
 <<tour-initialise-current-tour-step>>
 \end
 
diff --git a/plugins/tiddlywiki/tour/state-tour-step.tid b/plugins/tiddlywiki/tour/state-tour-step.tid
index 0264e204a..0c23d5ea4 100644
--- a/plugins/tiddlywiki/tour/state-tour-step.tid
+++ b/plugins/tiddlywiki/tour/state-tour-step.tid
@@ -1,2 +1,2 @@
 title: $:/state/tour/step
-text: $:/plugins/tiddlywiki/tour/steps/welcome
\ No newline at end of file
+text: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/welcome
\ No newline at end of file
diff --git a/plugins/tiddlywiki/tour/tagsTourStep.tid b/plugins/tiddlywiki/tour/tagsTourStep.tid
deleted file mode 100644
index c07c89b77..000000000
--- a/plugins/tiddlywiki/tour/tagsTourStep.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/tags/TourStep
-list: $:/plugins/tiddlywiki/tour/steps/welcome $:/plugins/tiddlywiki/tour/steps/tiddlers $:/plugins/tiddlywiki/tour/steps/links $:/plugins/tiddlywiki/tour/steps/closing-tiddlers $:/plugins/tiddlywiki/tour/steps/end-of-fullscreen $:/plugins/tiddlywiki/tour/steps/open-control-panel $:/plugins/tiddlywiki/tour/steps/close-control-panel $:/plugins/tiddlywiki/tour/steps/search $:/plugins/tiddlywiki/tour/steps/recent $:/plugins/tiddlywiki/tour/steps/create-tiddler
-
-Introduction to ~TiddlyWiki
\ No newline at end of file
diff --git a/plugins/tiddlywiki/tour/tour-panel.tid b/plugins/tiddlywiki/tour/tour-panel.tid
index ea3940c1a..501e84dbf 100644
--- a/plugins/tiddlywiki/tour/tour-panel.tid
+++ b/plugins/tiddlywiki/tour/tour-panel.tid
@@ -4,7 +4,7 @@ tags: $:/tags/PageTemplate
 \define tour-buttons()
 \define tv-action-refresh-policy() always
 <div class="tc-tour-panel-navigation">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/TourStep]before{$:/state/tour/step}count[]compare:number:gt[0]]" variable="ignore">
+<$list filter="[function[tour-is-not-first-step]]" variable="ignore">
 <$button class="tc-btn-big-green" style="background-color: red;">
 <<tour-previous-step>>
 back
@@ -19,10 +19,13 @@ next
 
 <$list filter="[{$:/config/ShowTour}!is[blank]else[show]match[show]]" variable="ignore">
 <div class={{{ tc-tour-panel [{$:/state/tour/step}get[display-mode]else[normal]addprefix[tc-tour-panel-]] +[join[ ]] }}}>
-[img class="tc-tour-panel-banner-image" [$:/plugins/tiddlywiki/tour/tiddlywiki-tour-logo]]
+<$image class="tc-tour-panel-banner-image" source={{{ [{$:/config/CurrentTour}get[logo]] }}}/>
 <div class="tc-tour-panel-inner">
 <div class="tc-tiddler-controls tc-tour-panel-controls">
-<$button set="$:/config/ShowTour" setTo="no" class="tc-btn-invisible">{{$:/core/images/close-button}}</$button> <span class="tc-tour-panel-controls-icon">{{$:/plugins/tiddlywiki/tour/tour-button-icon}}</span> ''Tour'': {{$:/tags/TourStep!!text}}
+<$button set="$:/config/ShowTour" setTo="no" class="tc-btn-invisible">{{$:/core/images/close-button}}</$button> <span class="tc-tour-panel-controls-icon">{{$:/plugins/tiddlywiki/tour/tour-button-icon}}</span> ''Tour'': 
+<$transclude $tiddler={{$:/config/CurrentTour}} $field="description">
+<$text text={{$:/config/CurrentTour}}/>
+</$transclude>
 </div>
 <$transclude tiddler={{$:/state/tour/step}} mode="block"/>
 <$list filter="[{$:/state/tour/step}has[selector]]" variable="ignore">
diff --git a/plugins/tiddlywiki/tour/steps/close-control-panel.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/close-control-panel.tid
similarity index 73%
rename from plugins/tiddlywiki/tour/steps/close-control-panel.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/close-control-panel.tid
index 837958137..426beafa1 100644
--- a/plugins/tiddlywiki/tour/steps/close-control-panel.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/close-control-panel.tid
@@ -1,5 +1,5 @@
-title: $:/plugins/tiddlywiki/tour/steps/close-control-panel
-tags: $:/tags/TourStep
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/close-control-panel
+tags: $:/tags/Tour/IntroductionToTiddlyWiki
 selector: .tc-story-river div[data-tiddler-title='$:/ControlPanel'] .tc-btn-\%24\%3A\%2Fcore\%2Fui\%2FButtons\%2Fclose
 
 ! Close the control panel
diff --git a/plugins/tiddlywiki/tour/steps/closing-tiddlers.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/closing-tiddlers.tid
similarity index 74%
rename from plugins/tiddlywiki/tour/steps/closing-tiddlers.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/closing-tiddlers.tid
index 237cb50f5..e76bf74bd 100644
--- a/plugins/tiddlywiki/tour/steps/closing-tiddlers.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/closing-tiddlers.tid
@@ -1,7 +1,7 @@
-title: $:/plugins/tiddlywiki/tour/steps/closing-tiddlers
-tags: $:/tags/TourStep
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/closing-tiddlers
+tags: $:/tags/Tour/IntroductionToTiddlyWiki
 display-mode: fullscreen
-enter-actions: <$action-setfield $tiddler="$:/temp/Tour/DemoStoryList" list="$:/plugins/tiddlywiki/tour/steps/tiddlers/Jupiter $:/plugins/tiddlywiki/tour/steps/tiddlers/Saturn"/>
+enter-actions: <$action-setfield $tiddler="$:/temp/Tour/DemoStoryList" list="$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Jupiter $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Saturn"/>
 
 \define tour-simplified-tiddler-close-button() yes
 
diff --git a/plugins/tiddlywiki/tour/steps/create-tiddler.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/create-tiddler.tid
similarity index 82%
rename from plugins/tiddlywiki/tour/steps/create-tiddler.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/create-tiddler.tid
index 7f76c5b13..1d7ff3859 100644
--- a/plugins/tiddlywiki/tour/steps/create-tiddler.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/create-tiddler.tid
@@ -1,5 +1,5 @@
-title: $:/plugins/tiddlywiki/tour/steps/create-tiddler
-tags: $:/tags/TourStep
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/create-tiddler
+tags: $:/tags/Tour/IntroductionToTiddlyWiki
 selector: .tc-story-river div[data-tiddler-title="Draft of 'New Tiddler'"] input[value]:not([value="Congratulations"])
 selector-fallback-1: .tc-story-river div[data-tiddler-title='Draft of \'New Tiddler\''] .tc-btn-\%24\%3A\%2Fcore\%2Fui\%2FButtons\%2Fsave
 selector-fallback-2: .tc-btn-\%24\%3A\%2Fcore\%2Fui\%2FButtons\%2Fnew-tiddler
diff --git a/plugins/tiddlywiki/tour/steps/end-of-fullscreen.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/end-of-fullscreen.tid
similarity index 59%
rename from plugins/tiddlywiki/tour/steps/end-of-fullscreen.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/end-of-fullscreen.tid
index ab6a5bd0a..bc86591b9 100644
--- a/plugins/tiddlywiki/tour/steps/end-of-fullscreen.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/end-of-fullscreen.tid
@@ -1,5 +1,5 @@
-title: $:/plugins/tiddlywiki/tour/steps/end-of-fullscreen
-tags: $:/tags/TourStep
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/end-of-fullscreen
+tags: $:/tags/Tour/IntroductionToTiddlyWiki
 display-mode: fullscreen
 
 ! Going deeper
diff --git a/plugins/tiddlywiki/tour/steps/finished.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/finished.tid
similarity index 71%
rename from plugins/tiddlywiki/tour/steps/finished.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/finished.tid
index 4d7b4365a..83ed5e71e 100644
--- a/plugins/tiddlywiki/tour/steps/finished.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/finished.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/tour/steps/finished
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/finished
 
 ! Congratulations
 
diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/introduction-to-tiddlywiki.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/introduction-to-tiddlywiki.tid
new file mode 100644
index 000000000..50e45199a
--- /dev/null
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/introduction-to-tiddlywiki.tid
@@ -0,0 +1,6 @@
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki
+tour-tag: $:/tags/Tour/IntroductionToTiddlyWiki
+logo: $:/plugins/tiddlywiki/tour/tiddlywiki-tour-logo
+description: Introduction to ~TiddlyWiki
+
+An introductory tour to ~TiddlyWiki
\ No newline at end of file
diff --git a/plugins/tiddlywiki/tour/steps/links.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/links.tid
similarity index 71%
rename from plugins/tiddlywiki/tour/steps/links.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/links.tid
index be72437cc..b6baf0c21 100644
--- a/plugins/tiddlywiki/tour/steps/links.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/links.tid
@@ -1,7 +1,7 @@
-title: $:/plugins/tiddlywiki/tour/steps/links
-tags: $:/tags/TourStep
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/links
+tags: $:/tags/Tour/IntroductionToTiddlyWiki
 display-mode: fullscreen
-enter-actions: <$action-setfield $tiddler="$:/temp/Tour/DemoStoryList" list="$:/plugins/tiddlywiki/tour/steps/tiddlers/Jupiter"/>
+enter-actions: <$action-setfield $tiddler="$:/temp/Tour/DemoStoryList" list="$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Jupiter"/>
 
 ! How do links work in ~TiddlyWiki?
 
@@ -20,7 +20,7 @@ Try clicking the link to "Saturn".
 
 </$navigator>
 
-<$list filter="[[$:/temp/Tour/DemoStoryList]contains[$:/plugins/tiddlywiki/tour/steps/tiddlers/Saturn]limit[1]]" variable="ignore">
+<$list filter="[[$:/temp/Tour/DemoStoryList]contains[$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Saturn]limit[1]]" variable="ignore">
 
 <$confetti/>
 
diff --git a/plugins/tiddlywiki/tour/steps/open-control-panel.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/open-control-panel.tid
similarity index 70%
rename from plugins/tiddlywiki/tour/steps/open-control-panel.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/open-control-panel.tid
index 071b64f52..2d85becef 100644
--- a/plugins/tiddlywiki/tour/steps/open-control-panel.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/open-control-panel.tid
@@ -1,5 +1,5 @@
-title: $:/plugins/tiddlywiki/tour/steps/open-control-panel
-tags: $:/tags/TourStep
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/open-control-panel
+tags: $:/tags/Tour/IntroductionToTiddlyWiki
 selector: .tc-btn-\%24\%3A\%2Fcore\%2Fui\%2FButtons\%2Fcontrol-panel
 
 ! Welcome to ~TiddlyWiki
diff --git a/plugins/tiddlywiki/tour/steps/recent.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/recent.tid
similarity index 82%
rename from plugins/tiddlywiki/tour/steps/recent.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/recent.tid
index 9983f8b96..ca3527ef7 100644
--- a/plugins/tiddlywiki/tour/steps/recent.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/recent.tid
@@ -1,5 +1,5 @@
-title: $:/plugins/tiddlywiki/tour/steps/recent
-tags: $:/tags/TourStep
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/recent
+tags: $:/tags/Tour/IntroductionToTiddlyWiki
 selector: .tc-sidebar-tabs-main .tc-timeline > .tc-menu-list-item:nth-child(1) .tc-menu-list-subitem:nth-child(1) .tc-tiddlylink
 selector-fallback-1: .tc-sidebar-tabs-main button:nth-child(3)
 
diff --git a/plugins/tiddlywiki/tour/steps/search.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/search.tid
similarity index 69%
rename from plugins/tiddlywiki/tour/steps/search.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/search.tid
index 94285be51..f027670b6 100644
--- a/plugins/tiddlywiki/tour/steps/search.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/search.tid
@@ -1,5 +1,5 @@
-title: $:/plugins/tiddlywiki/tour/steps/search
-tags: $:/tags/TourStep
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/search
+tags: $:/tags/Tour/IntroductionToTiddlyWiki
 selector: .tc-sidebar-search .tc-popup-handle
 
 ! Searching
diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tagsTourIntroductionToTiddlyWiki.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tagsTourIntroductionToTiddlyWiki.tid
new file mode 100644
index 000000000..bf70c73cb
--- /dev/null
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tagsTourIntroductionToTiddlyWiki.tid
@@ -0,0 +1,4 @@
+title: $:/tags/Tour/IntroductionToTiddlyWiki
+list: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/welcome $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/links $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/closing-tiddlers $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/end-of-fullscreen $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/open-control-panel $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/close-control-panel $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/search $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/recent $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/create-tiddler
+
+Introduction to ~TiddlyWiki
\ No newline at end of file
diff --git a/plugins/tiddlywiki/tour/steps/tiddlers-Jupiter.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers-Jupiter.tid
similarity index 53%
rename from plugins/tiddlywiki/tour/steps/tiddlers-Jupiter.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers-Jupiter.tid
index 39893879a..0358eebf7 100644
--- a/plugins/tiddlywiki/tour/steps/tiddlers-Jupiter.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers-Jupiter.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/tour/steps/tiddlers/Jupiter
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Jupiter
 caption: Jupiter
 
-Jupiter is the largest planet in the Solar System. It is the fifth planet from the Sun. Jupiter is a gas giant because it is so large and made of gas. The other gas giants in the Solar System are [[Saturn|$:/plugins/tiddlywiki/tour/steps/tiddlers/Saturn]], Uranus, and Neptune.
+Jupiter is the largest planet in the Solar System. It is the fifth planet from the Sun. Jupiter is a gas giant because it is so large and made of gas. The other gas giants in the Solar System are [[Saturn|$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Saturn]], Uranus, and Neptune.
diff --git a/plugins/tiddlywiki/tour/steps/tiddlers-Saturn.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers-Saturn.tid
similarity index 50%
rename from plugins/tiddlywiki/tour/steps/tiddlers-Saturn.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers-Saturn.tid
index 7488b7824..babf8a310 100644
--- a/plugins/tiddlywiki/tour/steps/tiddlers-Saturn.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers-Saturn.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/tour/steps/tiddlers/Saturn
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Saturn
 caption: Saturn
 
-Saturn is the sixth planet from the Sun located in the Solar System. It is the second largest planet in the Solar System, after Jupiter. Saturn is one of the four gas giant planets in the Solar System, along with [[Jupiter|$:/plugins/tiddlywiki/tour/steps/tiddlers/Jupiter]], Uranus, and Neptune.
\ No newline at end of file
+Saturn is the sixth planet from the Sun located in the Solar System. It is the second largest planet in the Solar System, after Jupiter. Saturn is one of the four gas giant planets in the Solar System, along with [[Jupiter|$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Jupiter]], Uranus, and Neptune.
\ No newline at end of file
diff --git a/plugins/tiddlywiki/tour/steps/tiddlers.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers.tid
similarity index 60%
rename from plugins/tiddlywiki/tour/steps/tiddlers.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers.tid
index cedef6c13..c0f4205b7 100644
--- a/plugins/tiddlywiki/tour/steps/tiddlers.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers.tid
@@ -1,5 +1,5 @@
-title: $:/plugins/tiddlywiki/tour/steps/tiddlers
-tags: $:/tags/TourStep
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers
+tags: $:/tags/Tour/IntroductionToTiddlyWiki
 display-mode: fullscreen
 
 ! How does ~TiddlyWiki work?
@@ -10,7 +10,7 @@ A tiddler is like an index card.
 
 <$let tv-wikilinks="no">
 
-{{$:/plugins/tiddlywiki/tour/steps/tiddlers/Jupiter||$:/plugins/tiddlywiki/tour/simplified-tiddler}}
+{{$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Jupiter||$:/plugins/tiddlywiki/tour/simplified-tiddler}}
 
 </$let>
 
diff --git a/plugins/tiddlywiki/tour/images/tiddlywiki-tour-logo.svg b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlywiki-tour-logo.svg
similarity index 100%
rename from plugins/tiddlywiki/tour/images/tiddlywiki-tour-logo.svg
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlywiki-tour-logo.svg
diff --git a/plugins/tiddlywiki/tour/images/tiddlywiki-tour-logo.svg.meta b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlywiki-tour-logo.svg.meta
similarity index 100%
rename from plugins/tiddlywiki/tour/images/tiddlywiki-tour-logo.svg.meta
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlywiki-tour-logo.svg.meta
diff --git a/plugins/tiddlywiki/tour/steps/welcome.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/welcome.tid
similarity index 64%
rename from plugins/tiddlywiki/tour/steps/welcome.tid
rename to plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/welcome.tid
index 7e7ff2c5e..c10d96c58 100644
--- a/plugins/tiddlywiki/tour/steps/welcome.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/welcome.tid
@@ -1,5 +1,5 @@
-title: $:/plugins/tiddlywiki/tour/steps/welcome
-tags: $:/tags/TourStep
+title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/welcome
+tags: $:/tags/Tour/IntroductionToTiddlyWiki
 display-mode: fullscreen
 
 ! Hello!