diff --git a/core/images/download-button.tid b/core/images/download-button.tid
new file mode 100644
index 000000000..42e6cf72c
--- /dev/null
+++ b/core/images/download-button.tid
@@ -0,0 +1,4 @@
+title: $:/core/images/download-button
+tags: $:/tags/Image
+
+<svg class="tw-image-download-button tw-image-button" width="22pt" height="22pt" viewBox="0 0 129 128"><g fill-rule="evenodd"><path d="M64,128 C99.346224,128 128,99.346224 128,64 C128,28.653776 99.346224,0 64,0 C28.653776,0 0,28.653776 0,64 C0,99.346224 28.653776,128 64,128 Z M64,112 C90.509668,112 112,90.509668 112,64 C112,37.490332 90.509668,16 64,16 C37.490332,16 16,37.490332 16,64 C16,90.509668 37.490332,112 64,112 Z"/><path d="M34.3496823,66.4308767 L61.2415823,93.634668 C63.0411536,95.4551107 65.9588502,95.4551107 67.7584215,93.634668 L94.6503215,66.4308767 C96.4498928,64.610434 96.4498928,61.6588981 94.6503215,59.8384554 C93.7861334,58.9642445 92.6140473,58.4731195 91.3919019,58.4731195 L82.9324098,58.4731195 C80.3874318,58.4731195 78.3243078,56.3860674 78.3243078,53.8115729 L78.3243078,38.6615466 C78.3243078,36.0870521 76.2611837,34 73.7162058,34 L55.283798,34 C52.7388201,34 50.675696,36.0870521 50.675696,38.6615466 L50.675696,38.6615466 L50.675696,53.8115729 C50.675696,56.3860674 48.612572,58.4731195 46.0675941,58.4731195 L37.608102,58.4731195 C35.063124,58.4731195 33,60.5601716 33,63.134666 C33,64.3709859 33.4854943,65.5566658 34.3496823,66.4308767 L34.3496823,66.4308767 Z"/></g></svg>
\ No newline at end of file
diff --git a/core/ui/ViewTemplate/import.tid b/core/ui/ImportListing.tid
similarity index 62%
rename from core/ui/ViewTemplate/import.tid
rename to core/ui/ImportListing.tid
index 80d7dc322..dc27e1918 100644
--- a/core/ui/ViewTemplate/import.tid
+++ b/core/ui/ImportListing.tid
@@ -1,5 +1,4 @@
-title: $:/core/ui/ViewTemplate/import
-tags: $:/tags/ViewTemplate
+title: $:/core/ui/ImportListing
 
 \define lingo-base() $:/language/Import/
 \define messageField()
@@ -8,12 +7,6 @@ message-$(currentTiddler)$
 \define selectionField()
 selection-$(currentTiddler)$
 \end
-<$list filter="[all[current]field:plugin-type[import]]">
-
-<div class="tw-import">
-
-<<lingo Listing/Hint>>
-
 <table>
 <tbody>
 <tr>
@@ -44,10 +37,3 @@ selection-$(currentTiddler)$
 </$list>
 </tbody>
 </table>
-
-<$button message="tw-delete-tiddler" param=<<currentTiddler>>><<lingo Listing/Cancel/Caption>></$button>
-<$button message="tw-perform-import" param=<<currentTiddler>>><<lingo Listing/Import/Caption>></$button>
-
-</div>
-
-</$list>
diff --git a/core/ui/ViewTemplate/body.tid b/core/ui/ViewTemplate/body.tid
index 1c5297631..c983fd965 100644
--- a/core/ui/ViewTemplate/body.tid
+++ b/core/ui/ViewTemplate/body.tid
@@ -3,12 +3,6 @@ tags: $:/tags/ViewTemplate
 
 <div class="body">
 
-<$list filter="[all[current]has[plugin-type]] -[all[current]field:plugin-type[import]]">
-
-{{||$:/core/ui/TiddlerInfo/Advanced/PluginInfo}}
-
-</$list>
-
 <$list filter="[all[current]!has[plugin-type]]">
 
 <$transclude>
diff --git a/core/ui/ViewTemplate/plugin.tid b/core/ui/ViewTemplate/plugin.tid
new file mode 100644
index 000000000..2c7d2081c
--- /dev/null
+++ b/core/ui/ViewTemplate/plugin.tid
@@ -0,0 +1,8 @@
+title: $:/core/ui/ViewTemplate/plugin
+tags: $:/tags/ViewTemplate
+
+<$list filter="[all[current]has[plugin-type]] -[all[current]field:plugin-type[import]]">
+
+{{||$:/core/ui/TiddlerInfo/Advanced/PluginInfo}}
+
+</$list>
diff --git a/plugins/tiddlywiki/upgrade/SiteSubtitle.tid b/plugins/tiddlywiki/upgrade/SiteSubtitle.tid
new file mode 100644
index 000000000..51b9b8f2c
--- /dev/null
+++ b/plugins/tiddlywiki/upgrade/SiteSubtitle.tid
@@ -0,0 +1,3 @@
+title: $:/SiteSubtitle
+
+upgrade your files to the latest version
\ No newline at end of file
diff --git a/plugins/tiddlywiki/upgrade/SiteTitle.tid b/plugins/tiddlywiki/upgrade/SiteTitle.tid
new file mode 100644
index 000000000..132593edc
--- /dev/null
+++ b/plugins/tiddlywiki/upgrade/SiteTitle.tid
@@ -0,0 +1,3 @@
+title: $:/SiteTitle
+
+~TiddlyWiki Upgrader
\ No newline at end of file
diff --git a/plugins/tiddlywiki/upgrade/UpdateAddressBar.tid b/plugins/tiddlywiki/upgrade/UpdateAddressBar.tid
new file mode 100644
index 000000000..4718fa658
--- /dev/null
+++ b/plugins/tiddlywiki/upgrade/UpdateAddressBar.tid
@@ -0,0 +1,3 @@
+title: $:/config/Navigation/UpdateAddressBar
+
+no
\ No newline at end of file
diff --git a/plugins/tiddlywiki/upgrade/UpgradeWizard.tid b/plugins/tiddlywiki/upgrade/UpgradeWizard.tid
index 69e9dc275..3c5a883fa 100644
--- a/plugins/tiddlywiki/upgrade/UpgradeWizard.tid
+++ b/plugins/tiddlywiki/upgrade/UpgradeWizard.tid
@@ -1,34 +1,44 @@
 title: $:/UpgradeWizard
 tags: $:/tags/StoryBackdrop
 
+<div class="tw-upgrade-wizard-wrapper">
+
+<div class="tw-upgrade-wizard">
+
+! ~TiddlyWiki Upgrade Wizard
+
 <$list filter="[[$:/Import]is[missing]]">
 
-Drag a TiddlyWiki file here to upgrade it
+{{$:/core/images/download-button}}
 
-<$browse/>
+Drag a ~TiddlyWiki file here to upgrade it
+
+or click to pick the file <$browse/>
 
 </$list>
 
 <$reveal state="$:/Import!!status" type="match" text="pending">
 
-And now there's a pending import
+The following tiddlers will be included in the upgrade
 
 <$set name="storyTiddler" value="$:/Import">
 
-<$tiddler tiddler="$:/Import">
-
-<$transclude tiddler="$:/core/ui/ViewTemplate/import"/>
-
-</$tiddler>
+{{$:/Import||$:/core/ui/ImportListing}}
 
 </$set>
 
+<$button message="tw-perform-import" param=<<currentTiddler>>>Upgrade</$button>
+
 </$reveal>
 
 <$reveal state="$:/Import!!status" type="match" text="complete">
 
-All done
+Upgrade completed. Click the button below to save your upgraded ~TiddlyWiki file
 
 {{$:/plugins/tiddlywiki/upgrade/save}}
 
 </$reveal>
+
+</div>
+
+</div>
diff --git a/plugins/tiddlywiki/upgrade/sidebar.tid b/plugins/tiddlywiki/upgrade/sidebar.tid
new file mode 100644
index 000000000..b87a68be3
--- /dev/null
+++ b/plugins/tiddlywiki/upgrade/sidebar.tid
@@ -0,0 +1,3 @@
+title: $:/state/sidebar
+
+no
\ No newline at end of file
diff --git a/plugins/tiddlywiki/upgrade/styles.tid b/plugins/tiddlywiki/upgrade/styles.tid
new file mode 100644
index 000000000..dc2bc2de6
--- /dev/null
+++ b/plugins/tiddlywiki/upgrade/styles.tid
@@ -0,0 +1,40 @@
+title: $:/plugins/tiddlywiki/upgrade/styles
+tags: $:/tags/stylesheet
+
+.tw-upgrade-wizard-wrapper {
+	width: 100%;
+	text-align: center;
+}
+
+.tw-upgrade-wizard {
+	background: <<colour tiddler-background>>;
+	padding: 2em;
+	display: inline-block;
+	position: relative;
+}
+
+.tw-upgrade-wizard svg.tw-image-download-button {
+	width: 14em;
+	height: 14em;
+	fill: <<colour muted-foreground>>;
+}
+
+.tw-upgrade-wizard table {
+	text-align: left;
+}
+
+.tw-upgrade-wizard input[type=file] {
+	position: absolute;
+	top: 0;
+	right: 0;
+	min-width: 100%;
+	min-height: 100%;
+	font-size: 999px;
+	text-align: right;
+	filter: alpha(opacity=0);
+	opacity: 0;
+	outline: none;
+	background: white;
+	cursor: pointer;
+	display: block;
+}
\ No newline at end of file