diff --git a/assets/javascripts/discourse/templates/components/custom-field-input.hbs b/assets/javascripts/discourse/components/custom-field-input.hbs
similarity index 63%
rename from assets/javascripts/discourse/templates/components/custom-field-input.hbs
rename to assets/javascripts/discourse/components/custom-field-input.hbs
index 4e3fa2f0..82c7c62a 100644
--- a/assets/javascripts/discourse/templates/components/custom-field-input.hbs
+++ b/assets/javascripts/discourse/components/custom-field-input.hbs
@@ -1,19 +1,19 @@
-{{#if showInputs}}
+{{#if this.showInputs}}
   <td>
     {{wizard-subscription-selector
-      value=field.klass
+      value=this.field.klass
       feature="custom_field"
       attribute="klass"
-      onChange=(action (mut field.klass))
+      onChange=(action (mut this.field.klass))
       options=(hash none="admin.wizard.custom_field.klass.select")
     }}
   </td>
   <td>
     {{wizard-subscription-selector
-      value=field.type
+      value=this.field.type
       feature="custom_field"
       attribute="type"
-      onChange=(action (mut field.type))
+      onChange=(action (mut this.field.type))
       options=(hash none="admin.wizard.custom_field.type.select")
     }}
   </td>
@@ -25,48 +25,48 @@
   </td>
   <td class="multi-select">
     {{multi-select
-      value=field.serializers
-      content=serializerContent
-      onChange=(action (mut field.serializers))
+      value=this.field.serializers
+      content=this.serializerContent
+      onChange=(action (mut this.field.serializers))
       options=(hash none="admin.wizard.custom_field.serializers.select")
     }}
   </td>
   <td class="actions">
-    {{#if loading}}
+    {{#if this.loading}}
       {{loading-spinner size="small"}}
     {{else}}
-      {{#if saveIcon}}
-        {{d-icon saveIcon}}
+      {{#if this.saveIcon}}
+        {{d-icon this.saveIcon}}
       {{/if}}
     {{/if}}
     {{d-button
       action=(action "destroy")
       icon="trash-alt"
       class="destroy"
-      disabled=destroyDisabled
+      disabled=this.destroyDisabled
     }}
     {{d-button
       icon="save"
       action=(action "save")
-      disabled=saveDisabled
+      disabled=this.saveDisabled
       class="save"
     }}
-    {{d-button action=(action "close") icon="times" disabled=closeDisabled}}
+    {{d-button action=(action "close") icon="times" disabled=this.closeDisabled}}
   </td>
 {{else}}
-  <td><label>{{field.klass}}</label></td>
-  <td><label>{{field.type}}</label></td>
-  <td class="input"><label>{{field.name}}</label></td>
+  <td><label>{{this.field.klass}}</label></td>
+  <td><label>{{this.field.type}}</label></td>
+  <td class="input"><label>{{this.field.name}}</label></td>
   <td class="multi-select">
-    {{#if isExternal}}
+    {{#if this.isExternal}}
       &mdash;
     {{else}}
-      {{#each field.serializers as |serializer|}}
+      {{#each this.field.serializers as |serializer|}}
         <label>{{serializer}}</label>
       {{/each}}
     {{/if}}
   </td>
-  {{#if isExternal}}
+  {{#if this.isExternal}}
     <td class="external">
       <label title={{i18n "admin.wizard.custom_field.external.title"}}>
         {{i18n "admin.wizard.custom_field.external.label"}}
diff --git a/assets/javascripts/discourse/components/custom-field-input.js.es6 b/assets/javascripts/discourse/components/custom-field-input.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-field-input.js.es6
rename to assets/javascripts/discourse/components/custom-field-input.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-category-selector.js.es6 b/assets/javascripts/discourse/components/custom-wizard-category-selector.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-category-selector.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-category-selector.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-composer-editor.hbs b/assets/javascripts/discourse/components/custom-wizard-composer-editor.hbs
similarity index 52%
rename from assets/javascripts/discourse/templates/components/custom-wizard-composer-editor.hbs
rename to assets/javascripts/discourse/components/custom-wizard-composer-editor.hbs
index 66283a42..f1411bf6 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-composer-editor.hbs
+++ b/assets/javascripts/discourse/components/custom-wizard-composer-editor.hbs
@@ -1,21 +1,21 @@
 <div class={{this.fieldClass}}>
   <DEditor
-    @tabindex={{field.tabindex}}
-    @value={{composer.reply}}
-    @placeholderOverride={{replyPlaceholder}}
+    @tabindex={{this.field.tabindex}}
+    @value={{this.composer.reply}}
+    @placeholderOverride={{this.replyPlaceholder}}
     @previewUpdated={{this.previewUpdated}}
-    @markdownOptions={{markdownOptions}}
+    @markdownOptions={{this.markdownOptions}}
     @extraButtons={{this.extraButtons}}
     @importQuote={{this.importQuote}}
     @showUploadModal={{this.showUploadModal}}
     @togglePreview={{this.togglePreview}}
-    @validation={{validation}}
-    @loading={{composer.loading}}
-    @showLink={{showLink}}
+    @validation={{this.validation}}
+    @loading={{this.composer.loading}}
+    @showLink={{this.showLink}}
     @wizardComposer={{true}}
-    @fieldId={{field.id}}
-    @disabled={{disableTextarea}}
-    @outletArgs={{hash composer=composer editorType="composer"}}
+    @fieldId={{this.field.id}}
+    @disabled={{this.disableTextarea}}
+    @outletArgs={{hash composer=this.composer editorType="composer"}}
   />
 
   <input
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-date-input.hbs b/assets/javascripts/discourse/components/custom-wizard-date-input.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/custom-wizard-date-input.hbs
rename to assets/javascripts/discourse/components/custom-wizard-date-input.hbs
diff --git a/assets/javascripts/discourse/components/custom-wizard-date-input.js.es6 b/assets/javascripts/discourse/components/custom-wizard-date-input.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-date-input.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-date-input.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-date-time-input.hbs b/assets/javascripts/discourse/components/custom-wizard-date-time-input.hbs
new file mode 100644
index 00000000..0c016d27
--- /dev/null
+++ b/assets/javascripts/discourse/components/custom-wizard-date-time-input.hbs
@@ -0,0 +1,30 @@
+{{#unless this.timeFirst}}
+  {{custom-wizard-date-input
+    date=this.date
+    relativeDate=this.relativeDate
+    onChange=(action "onChangeDate")
+    tabindex=this.dateTabindex
+  }}
+{{/unless}}
+
+{{#if this.showTime}}
+  {{custom-wizard-time-input
+    date=this.date
+    relativeDate=this.relativeDate
+    onChange=(action "onChangeTime")
+    tabindex=this.timeTabindex
+  }}
+{{/if}}
+
+{{#if this.timeFirst}}
+  {{custom-wizard-date-input
+    date=this.date
+    relativeDate=this.relativeDate
+    onChange=(action "onChangeDate")
+    tabindex=this.dateTabindex
+  }}
+{{/if}}
+
+{{#if this.clearable}}
+  {{d-button class="clear-date-time" icon="times" action=(action "onClear")}}
+{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-date-time-input.js.es6 b/assets/javascripts/discourse/components/custom-wizard-date-time-input.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-date-time-input.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-date-time-input.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-editor.hbs b/assets/javascripts/discourse/components/custom-wizard-editor.hbs
similarity index 78%
rename from assets/javascripts/discourse/templates/components/custom-wizard-editor.hbs
rename to assets/javascripts/discourse/components/custom-wizard-editor.hbs
index fd10299c..23c26505 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-editor.hbs
+++ b/assets/javascripts/discourse/components/custom-wizard-editor.hbs
@@ -1,23 +1,23 @@
 <div class="d-editor-overlay hidden"></div>
 
 <div class="d-editor-container">
-  {{#if showPreview}}
-    <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
+  {{#if this.showPreview}}
+    <div class="d-editor-preview-wrapper {{if this.forcePreview 'force-preview'}}">
       <div class="d-editor-preview">
-        {{html-safe preview}}
+        {{html-safe this.preview}}
       </div>
     </div>
   {{else}}
     <div class="d-editor-textarea-wrapper">
       <div class="d-editor-button-bar">
-        {{#each toolbar.groups as |group|}}
+        {{#each this.toolbar.groups as |group|}}
           {{#each group.buttons as |b|}}
             {{#if b.popupMenu}}
               {{toolbar-popup-menu-options
-                onPopupMenuAction=onPopupMenuAction
+                onPopupMenuAction=this.onPopupMenuAction
                 onExpand=(action b.action b)
                 class=b.className
-                content=popupMenuOptions
+                content=this.popupMenuOptions
                 options=(hash popupTitle=b.title icon=b.icon)
               }}
             {{else}}
@@ -42,7 +42,7 @@
         {{/each}}
       </div>
 
-      {{conditional-loading-spinner condition=loading}}
+      {{conditional-loading-spinner condition=this.loading}}
       <Textarea
         tabindex={{this.tabindex}}
         @value={{this.value}}
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-category.hbs b/assets/javascripts/discourse/components/custom-wizard-field-category.hbs
new file mode 100644
index 00000000..7a7eafa7
--- /dev/null
+++ b/assets/javascripts/discourse/components/custom-wizard-field-category.hbs
@@ -0,0 +1,8 @@
+{{custom-wizard-category-selector
+  categories=this.categories
+  class=this.fieldClass
+  whitelist=this.field.content
+  onChange=(action (mut this.categories))
+  tabindex=this.field.tabindex
+  options=(hash maximum=this.field.limit)
+}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-category.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-category.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-category.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-category.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-checkbox.hbs b/assets/javascripts/discourse/components/custom-wizard-field-checkbox.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/custom-wizard-field-checkbox.hbs
rename to assets/javascripts/discourse/components/custom-wizard-field-checkbox.hbs
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-checkbox.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-checkbox.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-checkbox.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-checkbox.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-composer-preview.hbs b/assets/javascripts/discourse/components/custom-wizard-field-composer-preview.hbs
similarity index 70%
rename from assets/javascripts/discourse/templates/components/custom-wizard-field-composer-preview.hbs
rename to assets/javascripts/discourse/components/custom-wizard-field-composer-preview.hbs
index 7e4e777f..302ff486 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-composer-preview.hbs
+++ b/assets/javascripts/discourse/components/custom-wizard-field-composer-preview.hbs
@@ -1,5 +1,5 @@
 <div class="wizard-composer-preview d-editor-preview-wrapper">
   <div class="d-editor-preview">
-    {{html-safe field.preview_template}}
+    {{html-safe this.field.preview_template}}
   </div>
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-composer-preview.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-composer-preview.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-composer-preview.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-composer-preview.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-composer.hbs b/assets/javascripts/discourse/components/custom-wizard-field-composer.hbs
similarity index 82%
rename from assets/javascripts/discourse/templates/components/custom-wizard-field-composer.hbs
rename to assets/javascripts/discourse/components/custom-wizard-field-composer.hbs
index 8fb4b78a..f30908a9 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-composer.hbs
+++ b/assets/javascripts/discourse/components/custom-wizard-field-composer.hbs
@@ -14,10 +14,10 @@
   <DButton
     @action={{this.togglePreview}}
     class="wizard-btn toggle-preview"
-    @label={{togglePreviewLabel}}
+    @label={{this.togglePreviewLabel}}
   />
 
   {{#if this.field.char_counter}}
-    {{wizard-char-counter this.field.value field.max_length}}
+    {{wizard-char-counter this.field.value this.field.max_length}}
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-composer.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-composer.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-composer.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-composer.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-date-time.hbs b/assets/javascripts/discourse/components/custom-wizard-field-date-time.hbs
similarity index 55%
rename from assets/javascripts/discourse/templates/components/custom-wizard-field-date-time.hbs
rename to assets/javascripts/discourse/components/custom-wizard-field-date-time.hbs
index 5faeb3fb..a4127c21 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-date-time.hbs
+++ b/assets/javascripts/discourse/components/custom-wizard-field-date-time.hbs
@@ -1,5 +1,5 @@
 {{custom-wizard-date-time-input
-  date=dateTime
+  date=this.dateTime
   onChange=(action "onChange")
-  tabindex=field.tabindex
+  tabindex=this.field.tabindex
 }}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-date-time.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-date-time.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-date-time.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-date-time.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-date.hbs b/assets/javascripts/discourse/components/custom-wizard-field-date.hbs
new file mode 100644
index 00000000..3f7056c6
--- /dev/null
+++ b/assets/javascripts/discourse/components/custom-wizard-field-date.hbs
@@ -0,0 +1,6 @@
+{{custom-wizard-date-input
+  date=this.date
+  onChange=(action "onChange")
+  tabindex=this.field.tabindex
+  format=this.field.format
+}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-date.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-date.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-date.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-date.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-dropdown.hbs b/assets/javascripts/discourse/components/custom-wizard-field-dropdown.hbs
new file mode 100644
index 00000000..c530864a
--- /dev/null
+++ b/assets/javascripts/discourse/components/custom-wizard-field-dropdown.hbs
@@ -0,0 +1,8 @@
+{{combo-box
+  class=this.fieldClass
+  value=this.field.value
+  content=this.field.content
+  tabindex=this.field.tabindex
+  onChange=(action "onChangeValue")
+  options=(hash none="select_kit.default_header_text")
+}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-dropdown.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-dropdown.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-dropdown.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-dropdown.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-group.hbs b/assets/javascripts/discourse/components/custom-wizard-field-group.hbs
new file mode 100644
index 00000000..dcb4102c
--- /dev/null
+++ b/assets/javascripts/discourse/components/custom-wizard-field-group.hbs
@@ -0,0 +1,10 @@
+{{custom-wizard-group-selector
+  groups=this.site.groups
+  class=this.fieldClass
+  field=this.field
+  whitelist=this.field.content
+  value=this.field.value
+  tabindex=this.field.tabindex
+  onChange=(action (mut this.field.value))
+  options=(hash none="select_kit.default_header_text")
+}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-group.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-group.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-group.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-group.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-number.hbs b/assets/javascripts/discourse/components/custom-wizard-field-number.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/custom-wizard-field-number.hbs
rename to assets/javascripts/discourse/components/custom-wizard-field-number.hbs
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-number.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-number.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-number.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-number.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-tag.hbs b/assets/javascripts/discourse/components/custom-wizard-field-tag.hbs
new file mode 100644
index 00000000..84ec1351
--- /dev/null
+++ b/assets/javascripts/discourse/components/custom-wizard-field-tag.hbs
@@ -0,0 +1,8 @@
+{{custom-wizard-tag-chooser
+  tags=this.field.value
+  class=this.fieldClass
+  tabindex=this.field.tabindex
+  tagGroups=this.field.tag_groups
+  everyTag=true
+  options=(hash maximum=this.field.limit allowAny=this.field.can_create_tag)
+}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-tag.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-tag.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-tag.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-tag.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-text.hbs b/assets/javascripts/discourse/components/custom-wizard-field-text.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/custom-wizard-field-text.hbs
rename to assets/javascripts/discourse/components/custom-wizard-field-text.hbs
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-text.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-text.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-text.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-text.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-textarea.hbs b/assets/javascripts/discourse/components/custom-wizard-field-textarea.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/custom-wizard-field-textarea.hbs
rename to assets/javascripts/discourse/components/custom-wizard-field-textarea.hbs
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-textarea.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-textarea.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-textarea.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-textarea.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-time.hbs b/assets/javascripts/discourse/components/custom-wizard-field-time.hbs
similarity index 55%
rename from assets/javascripts/discourse/templates/components/custom-wizard-field-time.hbs
rename to assets/javascripts/discourse/components/custom-wizard-field-time.hbs
index 665028d0..a63158c7 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-time.hbs
+++ b/assets/javascripts/discourse/components/custom-wizard-field-time.hbs
@@ -1,5 +1,5 @@
 {{custom-wizard-time-input
-  date=time
+  date=this.time
   onChange=(action "onChange")
-  tabindex=field.tabindex
+  tabindex=this.field.tabindex
 }}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-time.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-time.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-time.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-time.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-topic.hbs b/assets/javascripts/discourse/components/custom-wizard-field-topic.hbs
new file mode 100644
index 00000000..fa4b09d1
--- /dev/null
+++ b/assets/javascripts/discourse/components/custom-wizard-field-topic.hbs
@@ -0,0 +1,6 @@
+{{custom-wizard-topic-selector
+  topics=this.topics
+  category=this.field.category
+  onChange=(action "setValue")
+  options=(hash maximum=this.field.limit)
+}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-topic.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-topic.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-topic.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-topic.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-upload.hbs b/assets/javascripts/discourse/components/custom-wizard-field-upload.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/custom-wizard-field-upload.hbs
rename to assets/javascripts/discourse/components/custom-wizard-field-upload.hbs
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-upload.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-upload.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-upload.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-upload.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-url.hbs b/assets/javascripts/discourse/components/custom-wizard-field-url.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/custom-wizard-field-url.hbs
rename to assets/javascripts/discourse/components/custom-wizard-field-url.hbs
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-url.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-url.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-url.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-url.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-user-selector.hbs b/assets/javascripts/discourse/components/custom-wizard-field-user-selector.hbs
new file mode 100644
index 00000000..82423adc
--- /dev/null
+++ b/assets/javascripts/discourse/components/custom-wizard-field-user-selector.hbs
@@ -0,0 +1,5 @@
+{{custom-user-selector
+  usernames=this.field.value
+  placeholderKey=this.field.placeholder
+  tabindex=this.field.tabindex
+}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-user-selector.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-user-selector.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field-user-selector.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field-user-selector.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-field.hbs b/assets/javascripts/discourse/components/custom-wizard-field.hbs
new file mode 100644
index 00000000..f3cbd31d
--- /dev/null
+++ b/assets/javascripts/discourse/components/custom-wizard-field.hbs
@@ -0,0 +1,38 @@
+<label for={{this.field.id}} class="field-label">
+  {{html-safe this.field.translatedLabel}}
+</label>
+
+{{#if this.field.image}}
+  <div class="field-image"><img src={{this.field.image}} /></div>
+{{/if}}
+
+{{#if this.field.description}}
+  <div class="field-description">{{this.cookedDescription}}</div>
+{{/if}}
+
+{{#field-validators field=this.field as |validators|}}
+  {{#if this.inputComponentName}}
+    <div class="input-area">
+      {{component
+        this.inputComponentName
+        field=this.field
+        step=this.step
+        fieldClass=this.fieldClass
+        wizard=this.wizard
+        autocomplete=validators.autocomplete
+      }}
+    </div>
+  {{/if}}
+{{/field-validators}}
+
+{{#if this.field.char_counter}}
+  {{#if this.textType}}
+    {{wizard-char-counter this.field.value this.field.max_length}}
+  {{/if}}
+{{/if}}
+
+{{#if this.field.errorDescription}}
+  <div class="field-error-description">{{html-safe
+      this.field.errorDescription
+    }}</div>
+{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/custom-wizard-field.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-field.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-field.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-group-selector.js.es6 b/assets/javascripts/discourse/components/custom-wizard-group-selector.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-group-selector.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-group-selector.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-no-access.hbs b/assets/javascripts/discourse/components/custom-wizard-no-access.hbs
similarity index 69%
rename from assets/javascripts/discourse/templates/components/custom-wizard-no-access.hbs
rename to assets/javascripts/discourse/components/custom-wizard-no-access.hbs
index 30af5d77..3378f02b 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-no-access.hbs
+++ b/assets/javascripts/discourse/components/custom-wizard-no-access.hbs
@@ -1,9 +1,9 @@
-<div>{{text}}</div>
+<div>{{this.text}}</div>
 <div class="no-access-gutter">
   <a class="return-to-site" {{action "skip"}} role="button">
-    {{i18n "wizard.return_to_site" siteName=siteName}}
+    {{i18n "wizard.return_to_site" siteName=this.siteName}}
   </a>
-  {{#if showLoginButton}}
+  {{#if this.showLoginButton}}
     <DButton
       class="btn-primary btn-small login-button"
       @action={{action "showLogin"}}
diff --git a/assets/javascripts/discourse/components/custom-wizard-no-access.js.es6 b/assets/javascripts/discourse/components/custom-wizard-no-access.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-no-access.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-no-access.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-similar-topic.hbs b/assets/javascripts/discourse/components/custom-wizard-similar-topic.hbs
new file mode 100644
index 00000000..57778456
--- /dev/null
+++ b/assets/javascripts/discourse/components/custom-wizard-similar-topic.hbs
@@ -0,0 +1,6 @@
+<a href={{this.topic.url}} target="_blank" rel="noopener noreferrer">
+  <span class="title">{{html-safe this.topic.fancy_title}}</span>
+  <div class="blurb"><RelativeDate @date={{@topic.created_at}} />
+    -
+    {{html-safe this.topic.blurb}}</div>
+</a>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-similar-topics.hbs b/assets/javascripts/discourse/components/custom-wizard-similar-topics.hbs
similarity index 79%
rename from assets/javascripts/discourse/templates/components/custom-wizard-similar-topics.hbs
rename to assets/javascripts/discourse/components/custom-wizard-similar-topics.hbs
index ba745b2d..71aa58b1 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-similar-topics.hbs
+++ b/assets/javascripts/discourse/components/custom-wizard-similar-topics.hbs
@@ -1,6 +1,6 @@
-{{#if showTopics}}
+{{#if this.showTopics}}
   <ul>
-    {{#each topics as |topic|}}
+    {{#each this.topics as |topic|}}
       <li>{{custom-wizard-similar-topic topic=topic}}</li>
     {{/each}}
   </ul>
diff --git a/assets/javascripts/discourse/components/custom-wizard-similar-topics.js.es6 b/assets/javascripts/discourse/components/custom-wizard-similar-topics.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-similar-topics.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-similar-topics.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-step-form.js.es6 b/assets/javascripts/discourse/components/custom-wizard-step-form.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-step-form.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-step-form.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-step.hbs b/assets/javascripts/discourse/components/custom-wizard-step.hbs
similarity index 53%
rename from assets/javascripts/discourse/templates/components/custom-wizard-step.hbs
rename to assets/javascripts/discourse/components/custom-wizard-step.hbs
index fd4e038e..c57e0455 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-step.hbs
+++ b/assets/javascripts/discourse/components/custom-wizard-step.hbs
@@ -1,21 +1,21 @@
 <div class="wizard-step-contents">
-  {{#if step.title}}
-    <h1 class="wizard-step-title">{{cookedTitle}}</h1>
+  {{#if this.step.title}}
+    <h1 class="wizard-step-title">{{this.cookedTitle}}</h1>
   {{/if}}
 
-  {{#if bannerImage}}
+  {{#if this.bannerImage}}
     <div class="wizard-step-banner">
-      <img src={{bannerImage}} />
+      <img src={{this.bannerImage}} />
     </div>
   {{/if}}
 
-  {{#if step.description}}
-    <div class="wizard-step-description">{{cookedDescription}}</div>
+  {{#if this.step.description}}
+    <div class="wizard-step-description">{{this.cookedDescription}}</div>
   {{/if}}
 
-  {{#custom-wizard-step-form step=step}}
-    {{#each step.fields as |field|}}
-      {{custom-wizard-field field=field step=step wizard=wizard}}
+  {{#custom-wizard-step-form step=this.step}}
+    {{#each this.step.fields as |field|}}
+      {{custom-wizard-field field=field step=this.step wizard=this.wizard}}
     {{/each}}
   {{/custom-wizard-step-form}}
 </div>
@@ -24,57 +24,57 @@
 
   <div class="wizard-progress">
     <div class="white"></div>
-    <div class="black" style={{barStyle}}></div>
+    <div class="black" style={{this.barStyle}}></div>
     <div class="screen"></div>
     <span>{{i18n
         "wizard.step"
-        current=step.displayIndex
-        total=wizard.totalSteps
+        current=this.step.displayIndex
+        total=this.wizard.totalSteps
       }}</span>
   </div>
 
   <div class="wizard-buttons">
-    {{#if saving}}
+    {{#if this.saving}}
       {{loading-spinner size="small"}}
     {{else}}
-      {{#if showQuitButton}}
+      {{#if this.showQuitButton}}
         <a
           href
           {{action "quit"}}
           class="action-link quit"
-          tabindex={{secondaryButtonIndex}}
+          tabindex={{this.secondaryButtonIndex}}
         >{{i18n "wizard.quit"}}</a>
       {{/if}}
-      {{#if showBackButton}}
+      {{#if this.showBackButton}}
         <a
           href
           {{action "backStep"}}
           class="action-link back"
-          tabindex={{secondaryButtonIndex}}
+          tabindex={{this.secondaryButtonIndex}}
         >{{i18n "wizard.back"}}</a>
       {{/if}}
     {{/if}}
 
-    {{#if showNextButton}}
+    {{#if this.showNextButton}}
       <button
         type="button"
         class="wizard-btn next primary"
         {{action "nextStep"}}
-        disabled={{btnsDisabled}}
-        tabindex={{primaryButtonIndex}}
+        disabled={{this.btnsDisabled}}
+        tabindex={{this.primaryButtonIndex}}
       >
         {{i18n "wizard.next"}}
         {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
-    {{#if showDoneButton}}
+    {{#if this.showDoneButton}}
       <button
         type="button"
         class="wizard-btn done"
         {{action "done"}}
-        disabled={{btnsDisabled}}
-        tabindex={{primaryButtonIndex}}
+        disabled={{this.btnsDisabled}}
+        tabindex={{this.primaryButtonIndex}}
       >
         {{i18n "wizard.done_custom"}}
       </button>
diff --git a/assets/javascripts/discourse/components/custom-wizard-step.js.es6 b/assets/javascripts/discourse/components/custom-wizard-step.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-step.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-step.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-tag-chooser.js.es6 b/assets/javascripts/discourse/components/custom-wizard-tag-chooser.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-tag-chooser.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-tag-chooser.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-tag-selector.js.es6 b/assets/javascripts/discourse/components/custom-wizard-tag-selector.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-tag-selector.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-tag-selector.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-text-field.js.es6 b/assets/javascripts/discourse/components/custom-wizard-text-field.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-text-field.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-text-field.js
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-time-input.hbs b/assets/javascripts/discourse/components/custom-wizard-time-input.hbs
similarity index 74%
rename from assets/javascripts/discourse/templates/components/custom-wizard-time-input.hbs
rename to assets/javascripts/discourse/components/custom-wizard-time-input.hbs
index 6207851b..d515d7e8 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-time-input.hbs
+++ b/assets/javascripts/discourse/components/custom-wizard-time-input.hbs
@@ -1,7 +1,7 @@
 {{combo-box
-  value=time
-  content=timeOptions
-  tabindex=tabindex
+  value=this.time
+  content=this.timeOptions
+  tabindex=this.tabindex
   onChange=(action "onChangeTime")
   options=(hash
     translatedNone="--:--"
diff --git a/assets/javascripts/discourse/components/custom-wizard-time-input.js.es6 b/assets/javascripts/discourse/components/custom-wizard-time-input.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-time-input.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-time-input.js
diff --git a/assets/javascripts/discourse/components/custom-wizard-topic-selector.js.es6 b/assets/javascripts/discourse/components/custom-wizard-topic-selector.js
similarity index 100%
rename from assets/javascripts/discourse/components/custom-wizard-topic-selector.js.es6
rename to assets/javascripts/discourse/components/custom-wizard-topic-selector.js
diff --git a/assets/javascripts/discourse/templates/components/field-validators.hbs b/assets/javascripts/discourse/components/field-validators.hbs
similarity index 60%
rename from assets/javascripts/discourse/templates/components/field-validators.hbs
rename to assets/javascripts/discourse/components/field-validators.hbs
index 0bfd3875..63d1311c 100644
--- a/assets/javascripts/discourse/templates/components/field-validators.hbs
+++ b/assets/javascripts/discourse/components/field-validators.hbs
@@ -1,8 +1,8 @@
-{{#if field.validations}}
-  {{#each-in field.validations.above as |type validation|}}
+{{#if this.field.validations}}
+  {{#each-in this.field.validations.above as |type validation|}}
     {{component
       validation.component
-      field=field
+      field=this.field
       type=type
       validation=validation
     }}
@@ -10,10 +10,10 @@
 
   {{yield (hash perform=(action "perform") autocomplete="off")}}
 
-  {{#each-in field.validations.below as |type validation|}}
+  {{#each-in this.field.validations.below as |type validation|}}
     {{component
       validation.component
-      field=field
+      field=this.field
       type=type
       validation=validation
     }}
diff --git a/assets/javascripts/discourse/components/field-validators.js.es6 b/assets/javascripts/discourse/components/field-validators.js
similarity index 100%
rename from assets/javascripts/discourse/components/field-validators.js.es6
rename to assets/javascripts/discourse/components/field-validators.js
diff --git a/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs b/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
index 5e3829da..5c453722 100644
--- a/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
+++ b/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
@@ -1,5 +1,5 @@
 <DModal @closeModal={{@closeModal}} @title={{this.title}}>
-  {{#if loading}}
+  {{#if this.loading}}
     <LoadingSpinner size="large" />
   {{else}}
     <div class="edit-directory-columns-container">
diff --git a/assets/javascripts/discourse/components/similar-topics-validator.hbs b/assets/javascripts/discourse/components/similar-topics-validator.hbs
new file mode 100644
index 00000000..f75ae27b
--- /dev/null
+++ b/assets/javascripts/discourse/components/similar-topics-validator.hbs
@@ -0,0 +1,13 @@
+<label class={{this.currentStateClass}}>
+  {{#if this.currentState}}
+    {{#if this.insufficientCharactersCategories}}
+      {{html-safe (i18n this.currentStateKey catLinks=this.catLinks)}}
+    {{else}}
+      {{i18n this.currentStateKey}}
+    {{/if}}
+  {{/if}}
+</label>
+
+{{#if this.showSimilarTopics}}
+  {{custom-wizard-similar-topics topics=this.similarTopics}}
+{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/similar-topics-validator.js.es6 b/assets/javascripts/discourse/components/similar-topics-validator.js
similarity index 100%
rename from assets/javascripts/discourse/components/similar-topics-validator.js.es6
rename to assets/javascripts/discourse/components/similar-topics-validator.js
diff --git a/assets/javascripts/discourse/components/validator.hbs b/assets/javascripts/discourse/components/validator.hbs
new file mode 100644
index 00000000..dbf6da6b
--- /dev/null
+++ b/assets/javascripts/discourse/components/validator.hbs
@@ -0,0 +1,5 @@
+{{#if this.isValid}}
+  {{i18n this.validMessageKey}}
+{{else}}
+  {{i18n this.invalidMessageKey}}
+{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/validator.js.es6 b/assets/javascripts/discourse/components/validator.js
similarity index 100%
rename from assets/javascripts/discourse/components/validator.js.es6
rename to assets/javascripts/discourse/components/validator.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs b/assets/javascripts/discourse/components/wizard-custom-action.hbs
similarity index 96%
rename from assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
rename to assets/javascripts/discourse/components/wizard-custom-action.hbs
index 34f84049..516e3a7a 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
+++ b/assets/javascripts/discourse/components/wizard-custom-action.hbs
@@ -1,8 +1,8 @@
-{{#if showUndo}}
+{{#if this.showUndo}}
   {{d-button
     action=(action "undoChanges")
-    icon=undoIcon
-    label=undoKey
+    icon=this.undoIcon
+    label=this.undoKey
     class="undo-changes"
   }}
 {{/if}}
@@ -18,7 +18,7 @@
       feature="action"
       attribute="type"
       onChange=(action "changeType")
-      wizard=wizard
+      wizard=this.wizard
       options=(hash none="admin.wizard.select_type")
     }}
   </div>
@@ -32,15 +32,15 @@
   <div class="setting-value">
     {{combo-box
       value=this.action.run_after
-      content=runAfterContent
+      content=this.runAfterContent
       onChange=(action (mut this.action.run_after))
     }}
   </div>
 </div>
 
-{{wizard-message key=messageKey url=messageUrl component="action"}}
+{{wizard-message key=this.messageKey url=this.messageUrl component="action"}}
 
-{{#if basicTopicFields}}
+{{#if this.basicTopicFields}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.title"}}</label>
@@ -68,12 +68,12 @@
     <div class="setting-value">
       {{combo-box
         value=this.action.post
-        content=wizardFields
+        content=this.wizardFields
         nameProperty="label"
         onChange=(action (mut this.action.post))
         options=(hash
           none="admin.wizard.selector.placeholder.wizard_field"
-          isDisabled=showPostBuilder
+          isDisabled=this.showPostBuilder
         )
       }}
 
@@ -93,14 +93,14 @@
       <div class="setting-value editor">
         {{wizard-text-editor
           value=this.action.post_template
-          wizardFields=wizardFields
+          wizardFields=this.wizardFields
         }}
       </div>
     </div>
   {{/if}}
 {{/if}}
 
-{{#if publicTopicFields}}
+{{#if this.publicTopicFields}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_topic.category"}}</label>
@@ -163,7 +163,7 @@
     </div>
   </div>
 
-  {{#if hasEventField}}
+  {{#if this.hasEventField}}
     <div class="setting full">
       <div class="setting-label">
         <label>{{i18n "admin.wizard.action.create_topic.add_event"}}</label>
@@ -180,7 +180,7 @@
     </div>
   {{/if}}
 
-  {{#if hasLocationField}}
+  {{#if this.hasLocationField}}
     <div class="setting full">
       <div class="setting-label">
         <label>{{i18n "admin.wizard.action.create_topic.add_location"}}</label>
@@ -198,7 +198,7 @@
   {{/if}}
 {{/if}}
 
-{{#if sendMessage}}
+{{#if this.sendMessage}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.send_message.recipient"}}</label>
@@ -224,7 +224,7 @@
   </div>
 {{/if}}
 
-{{#if updateProfile}}
+{{#if this.updateProfile}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.update_profile.setting"}}</label>
@@ -247,7 +247,7 @@
   </div>
 {{/if}}
 
-{{#if sendToApi}}
+{{#if this.sendToApi}}
   <div class="setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.send_to_api.api"}}</label>
@@ -256,7 +256,7 @@
     <div class="setting-value">
       {{combo-box
         value=this.action.api
-        content=availableApis
+        content=this.availableApis
         onChange=(action (mut this.action.api))
         options=(hash
           isDisabled=this.action.custom_title_enabled
@@ -274,10 +274,10 @@
     <div class="setting-value">
       {{combo-box
         value=this.action.api_endpoint
-        content=availableEndpoints
+        content=this.availableEndpoints
         onChange=(action (mut this.action.api_endpoint))
         options=(hash
-          isDisabled=apiEmpty
+          isDisabled=this.apiEmpty
           none="admin.wizard.action.send_to_api.select_an_endpoint"
         )
       }}
@@ -294,14 +294,14 @@
         value=this.action.api_body
         previewEnabled=false
         barEnabled=false
-        wizardFields=wizardFields
+        wizardFields=this.wizardFields
         placeholder="admin.wizard.action.send_to_api.body_placeholder"
       }}
     </div>
   </div>
 {{/if}}
 
-{{#if addToGroup}}
+{{#if this.addToGroup}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.group"}}</label>
@@ -326,7 +326,7 @@
   </div>
 {{/if}}
 
-{{#if routeTo}}
+{{#if this.routeTo}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.route_to.url"}}</label>
@@ -350,7 +350,7 @@
   </div>
 {{/if}}
 
-{{#if watchCategories}}
+{{#if this.watchCategories}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.watch_categories.categories"}}</label>
@@ -404,7 +404,7 @@
     <div class="setting-value">
       {{combo-box
         value=this.action.notification_level
-        content=availableNotificationLevels
+        content=this.availableNotificationLevels
         onChange=(action (mut this.action.notification_level))
         options=(hash
           isDisabled=this.action.custom_title_enabled
@@ -445,7 +445,7 @@
   </div>
 {{/if}}
 
-{{#if watchTags}}
+{{#if this.watchTags}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.watch_tags.tags"}}</label>
@@ -478,7 +478,7 @@
     <div class="setting-value">
       {{combo-box
         value=this.action.notification_level
-        content=availableNotificationLevels
+        content=this.availableNotificationLevels
         onChange=(action (mut this.action.notification_level))
         options=(hash
           isDisabled=this.action.custom_title_enabled
@@ -519,7 +519,7 @@
   </div>
 {{/if}}
 
-{{#if createGroup}}
+{{#if this.createGroup}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.name"}}</label>
@@ -743,7 +743,7 @@
   </div>
 {{/if}}
 
-{{#if createCategory}}
+{{#if this.createCategory}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_category.name"}}</label>
@@ -871,7 +871,7 @@
   </div>
 {{/if}}
 
-{{#if hasCustomFields}}
+{{#if this.hasCustomFields}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.custom_fields.label"}}</label>
@@ -889,14 +889,14 @@
           wizardActionSelection="value"
           userFieldSelection="value"
           keyPlaceholder="admin.wizard.action.custom_fields.key"
-          context=customFieldsContext
+          context=this.customFieldsContext
         )
       }}
     </div>
   </div>
 {{/if}}
 
-{{#if sendMessage}}
+{{#if this.sendMessage}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.required"}}</label>
@@ -919,7 +919,7 @@
   </div>
 {{/if}}
 
-{{#if showPostAdvanced}}
+{{#if this.showPostAdvanced}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.poster.label"}}</label>
@@ -994,7 +994,7 @@
   </div>
 {{/if}}
 
-{{#if routeTo}}
+{{#if this.routeTo}}
   <div class="setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.route_to.code"}}</label>
diff --git a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 b/assets/javascripts/discourse/components/wizard-custom-action.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-custom-action.js.es6
rename to assets/javascripts/discourse/components/wizard-custom-action.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs b/assets/javascripts/discourse/components/wizard-custom-field.hbs
similarity index 84%
rename from assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
rename to assets/javascripts/discourse/components/wizard-custom-field.hbs
index 33a4400d..dcf095c1 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
+++ b/assets/javascripts/discourse/components/wizard-custom-field.hbs
@@ -1,8 +1,8 @@
-{{#if showUndo}}
+{{#if this.showUndo}}
   {{d-button
     action=(action "undoChanges")
-    icon=undoIcon
-    label=undoKey
+    icon=this.undoIcon
+    label=this.undoKey
     class="undo-changes"
   }}
 {{/if}}
@@ -42,12 +42,12 @@
   </div>
   <div class="setting-value">
     {{uppy-image-uploader
-      imageUrl=field.image
+      imageUrl=this.field.image
       onUploadDone=(action "imageUploadDone")
       onUploadDeleted=(action "imageUploadDeleted")
       type="wizard-field-image"
       class="no-repeat contain-image"
-      id=(concat "wizard-field-" field.id "-image-upload")
+      id=(concat "wizard-field-" this.field.id "-image-upload")
     }}
   </div>
 </div>
@@ -59,19 +59,19 @@
 
   <div class="setting-value">
     {{wizard-subscription-selector
-      value=field.type
+      value=this.field.type
       feature="field"
       attribute="type"
       onChange=(action "changeType")
-      wizard=wizard
+      wizard=this.wizard
       options=(hash none="admin.wizard.select_type")
     }}
   </div>
 </div>
 
-{{wizard-message key=messageKey url=messageUrl component="field"}}
+{{wizard-message key=this.messageKey url=this.messageUrl component="field"}}
 
-{{#if isTextType}}
+{{#if this.isTextType}}
   <div class="setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.min_length"}}</label>
@@ -128,7 +128,7 @@
   </div>
 {{/if}}
 
-{{#if isComposerPreview}}
+{{#if this.isComposerPreview}}
   <div class="setting full">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.preview_template"}}</label>
@@ -144,7 +144,7 @@
   </div>
 {{/if}}
 
-{{#if isUpload}}
+{{#if this.isUpload}}
   <div class="setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.file_types"}}</label>
@@ -156,7 +156,7 @@
   </div>
 {{/if}}
 
-{{#if showLimit}}
+{{#if this.showLimit}}
   <div class="setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.limit"}}</label>
@@ -168,7 +168,7 @@
   </div>
 {{/if}}
 
-{{#if isDateTime}}
+{{#if this.isDateTime}}
   <div class="setting">
     <div class="setting-label">
       <label>{{html-safe
@@ -185,7 +185,7 @@
   </div>
 {{/if}}
 
-{{#if showPrefill}}
+{{#if this.showPrefill}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.prefill"}}</label>
@@ -193,16 +193,16 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=field.prefill
+        inputs=this.field.prefill
         property="prefill"
         onUpdate=(action "mappedFieldUpdated")
-        options=prefillOptions
+        options=this.prefillOptions
       }}
     </div>
   </div>
 {{/if}}
 
-{{#if showContent}}
+{{#if this.showContent}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.content"}}</label>
@@ -210,16 +210,16 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=field.content
+        inputs=this.field.content
         property="content"
         onUpdate=(action "mappedFieldUpdated")
-        options=contentOptions
+        options=this.contentOptions
       }}
     </div>
   </div>
 {{/if}}
 
-{{#if isTag}}
+{{#if this.isTag}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.tag_groups"}}</label>
@@ -227,9 +227,9 @@
 
     <div class="setting-value">
       {{tag-group-chooser
-        id=(concat field.id "-tag-groups")
-        tagGroups=field.tag_groups
-        onChange=(action (mut field.tag_groups))
+        id=(concat this.field.id "-tag-groups")
+        tagGroups=this.field.tag_groups
+        onChange=(action (mut this.field.tag_groups))
       }}
     </div>
   </div>
@@ -245,7 +245,7 @@
   </div>
 {{/if}}
 
-{{#if isTopic}}
+{{#if this.isTopic}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.category.label"}}</label>
@@ -271,7 +271,7 @@
     </div>
 
     <div class="setting-value">
-      {{wizard-mapper inputs=field.condition options=fieldConditionOptions}}
+      {{wizard-mapper inputs=this.field.condition options=this.fieldConditionOptions}}
     </div>
   </div>
 
@@ -281,11 +281,11 @@
     </div>
 
     <div class="setting-value">
-      {{wizard-mapper inputs=field.index options=fieldIndexOptions}}
+      {{wizard-mapper inputs=this.field.index options=this.fieldIndexOptions}}
     </div>
   </div>
 
-  {{#if isCategory}}
+  {{#if this.isCategory}}
     <div class="setting">
       <div class="setting-label">
         <label>{{i18n "admin.wizard.field.property"}}</label>
@@ -293,16 +293,16 @@
 
       <div class="setting-value">
         {{combo-box
-          value=field.property
-          content=categoryPropertyTypes
-          onChange=(action (mut field.property))
+          value=this.field.property
+          content=this.categoryPropertyTypes
+          onChange=(action (mut this.field.property))
           options=(hash none="admin.wizard.selector.placeholder.property")
         }}
       </div>
     </div>
   {{/if}}
 
-  {{#if validations}}
-    {{wizard-realtime-validations field=field validations=validations}}
+  {{#if this.validations}}
+    {{wizard-realtime-validations field=this.field validations=this.validations}}
   {{/if}}
 {{/wizard-subscription-container}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-custom-field.js.es6 b/assets/javascripts/discourse/components/wizard-custom-field.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-custom-field.js.es6
rename to assets/javascripts/discourse/components/wizard-custom-field.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs b/assets/javascripts/discourse/components/wizard-custom-step.hbs
similarity index 80%
rename from assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
rename to assets/javascripts/discourse/components/wizard-custom-step.hbs
index e6d4d5a7..10a79ffb 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
+++ b/assets/javascripts/discourse/components/wizard-custom-step.hbs
@@ -13,12 +13,12 @@
   </div>
   <div class="setting-value">
     {{uppy-image-uploader
-      imageUrl=step.banner
+      imageUrl=this.step.banner
       onUploadDone=(action "bannerUploadDone")
       onUploadDeleted=(action "bannerUploadDeleted")
       type="wizard-step-banner"
       class="no-repeat contain-image"
-      id=(concat "wizard-step-" step.id "-banner-upload")
+      id=(concat "wizard-step-" this.step.id "-banner-upload")
     }}
   </div>
 </div>
@@ -28,7 +28,7 @@
     <label>{{i18n "admin.wizard.step.description"}}</label>
   </div>
   <div class="setting-value">
-    {{wizard-text-editor value=step.raw_description}}
+    {{wizard-text-editor value=this.step.raw_description}}
   </div>
 </div>
 
@@ -39,7 +39,7 @@
     </div>
 
     <div class="setting-value">
-      {{wizard-mapper inputs=step.condition options=stepConditionOptions}}
+      {{wizard-mapper inputs=this.step.condition options=this.stepConditionOptions}}
     </div>
   </div>
 
@@ -59,7 +59,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=step.required_data
+        inputs=this.step.required_data
         options=(hash
           inputTypes="validation"
           inputConnector="and"
@@ -69,7 +69,7 @@
           context="step"
         )
       }}
-      {{#if step.required_data}}
+      {{#if this.step.required_data}}
         <div class="required-data-message">
           <div class="label">
             {{i18n "admin.wizard.step.required_data.not_permitted_message"}}
@@ -86,7 +86,7 @@
     </div>
     <div class="setting-value">
       {{wizard-mapper
-        inputs=step.permitted_params
+        inputs=this.step.permitted_params
         options=(hash
           pairConnector="set"
           inputTypes="association"
@@ -101,20 +101,20 @@
 
 {{wizard-links
   itemType="field"
-  current=currentField
-  items=step.fields
-  parentId=step.id
+  current=this.currentField
+  items=this.step.fields
+  parentId=this.step.id
 }}
 
-{{#each step.fields as |field|}}
+{{#each this.step.fields as |field|}}
   {{wizard-custom-field
     field=field
-    step=step
-    wizard=wizard
-    currentFieldId=currentField.id
-    fieldTypes=fieldTypes
+    step=this.step
+    wizard=this.wizard
+    currentFieldId=this.currentField.id
+    fieldTypes=this.fieldTypes
     removeField="removeField"
-    wizardFields=wizardFields
-    subscribed=subscribed
+    wizardFields=this.wizardFields
+    subscribed=this.subscribed
   }}
 {{/each}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-custom-step.js.es6 b/assets/javascripts/discourse/components/wizard-custom-step.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-custom-step.js.es6
rename to assets/javascripts/discourse/components/wizard-custom-step.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-links.hbs b/assets/javascripts/discourse/components/wizard-links.hbs
similarity index 87%
rename from assets/javascripts/discourse/templates/components/wizard-links.hbs
rename to assets/javascripts/discourse/components/wizard-links.hbs
index 79fbfcda..728a4e0f 100644
--- a/assets/javascripts/discourse/templates/components/wizard-links.hbs
+++ b/assets/javascripts/discourse/components/wizard-links.hbs
@@ -1,8 +1,8 @@
-<div class="wizard-header medium">{{html-safe (i18n header)}}</div>
+<div class="wizard-header medium">{{html-safe (i18n this.header)}}</div>
 
 <div class="link-list">
-  {{#if anyLinks}}
-    {{#each links as |link|}}
+  {{#if this.anyLinks}}
+    {{#each this.links as |link|}}
       <div data-id={{link.id}}>
         {{d-button
           action=(action "change")
diff --git a/assets/javascripts/discourse/components/wizard-links.js.es6 b/assets/javascripts/discourse/components/wizard-links.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-links.js.es6
rename to assets/javascripts/discourse/components/wizard-links.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-connector.hbs b/assets/javascripts/discourse/components/wizard-mapper-connector.hbs
similarity index 50%
rename from assets/javascripts/discourse/templates/components/wizard-mapper-connector.hbs
rename to assets/javascripts/discourse/components/wizard-mapper-connector.hbs
index 7476c099..1c05884c 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-connector.hbs
+++ b/assets/javascripts/discourse/components/wizard-mapper-connector.hbs
@@ -1,13 +1,13 @@
-{{#if hasMultiple}}
+{{#if this.hasMultiple}}
   {{combo-box
-    value=connector
-    content=connectors
+    value=this.connector
+    content=this.connectors
     onChange=(action "changeConnector")
   }}
 {{else}}
-  {{#if connector}}
+  {{#if this.connector}}
     <span class="connector-single">
-      {{connectorLabel}}
+      {{this.connectorLabel}}
     </span>
   {{/if}}
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-mapper-connector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-connector.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-mapper-connector.js.es6
rename to assets/javascripts/discourse/components/wizard-mapper-connector.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs b/assets/javascripts/discourse/components/wizard-mapper-input.hbs
similarity index 87%
rename from assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
rename to assets/javascripts/discourse/components/wizard-mapper-input.hbs
index d21a90c0..72e59e74 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
+++ b/assets/javascripts/discourse/components/wizard-mapper-input.hbs
@@ -8,7 +8,7 @@
   onUpdate=this.onUpdate
 }}
 
-{{#if hasPairs}}
+{{#if this.hasPairs}}
   <div class="mapper-pairs mapper-block">
     {{#each this.input.pairs as |pair|}}
       {{wizard-mapper-pair
@@ -21,7 +21,7 @@
       }}
     {{/each}}
 
-    {{#if canAddPair}}
+    {{#if this.canAddPair}}
       <a role="button" {{action "addPair"}} class="add-pair">
         {{d-icon "plus"}}
       </a>
@@ -29,8 +29,8 @@
   </div>
 {{/if}}
 
-{{#if hasOutput}}
-  {{#if hasPairs}}
+{{#if this.hasOutput}}
+  {{#if this.hasPairs}}
     {{wizard-mapper-connector
       connector=this.input.output_connector
       connectors=this.connectors
@@ -53,6 +53,6 @@
   </div>
 {{/if}}
 
-<a role="button" class="remove-input" {{action remove this.input}}>
+<a role="button" class="remove-input" {{action this.remove this.input}}>
   {{d-icon "times"}}
 </a>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-mapper-input.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-input.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-mapper-input.js.es6
rename to assets/javascripts/discourse/components/wizard-mapper-input.js
diff --git a/assets/javascripts/discourse/components/wizard-mapper-pair.hbs b/assets/javascripts/discourse/components/wizard-mapper-pair.hbs
new file mode 100644
index 00000000..03b5a86e
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-mapper-pair.hbs
@@ -0,0 +1,41 @@
+<div class="key mapper-block">
+  {{wizard-mapper-selector
+    selectorType="key"
+    inputType=this.inputType
+    value=this.pair.key
+    activeType=this.pair.key_type
+    options=this.options
+    onUpdate=this.onUpdate
+  }}
+</div>
+
+{{wizard-mapper-connector
+  connector=this.pair.connector
+  connectors=this.connectors
+  connectorType="pair"
+  inputType=this.inputType
+  options=this.options
+  onUpdate=this.onUpdate
+}}
+
+<div class="value mapper-block">
+  {{wizard-mapper-selector
+    selectorType="value"
+    inputType=this.inputType
+    value=this.pair.value
+    activeType=this.pair.value_type
+    options=this.options
+    onUpdate=this.onUpdate
+    connector=this.pair.connector
+  }}
+</div>
+
+{{#if this.showJoin}}
+  <span class="join-pair">&</span>
+{{/if}}
+
+{{#if this.showRemove}}
+  <a role="button" {{action this.removePair this.pair}} class="remove-pair">{{d-icon
+      "times"
+    }}</a>
+{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-pair.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-mapper-pair.js.es6
rename to assets/javascripts/discourse/components/wizard-mapper-pair.js
diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector-type.hbs b/assets/javascripts/discourse/components/wizard-mapper-selector-type.hbs
new file mode 100644
index 00000000..48cd1506
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-mapper-selector-type.hbs
@@ -0,0 +1 @@
+{{this.item.label}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector-type.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-selector-type.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-mapper-selector-type.js.es6
rename to assets/javascripts/discourse/components/wizard-mapper-selector-type.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs b/assets/javascripts/discourse/components/wizard-mapper-selector.hbs
similarity index 50%
rename from assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs
rename to assets/javascripts/discourse/components/wizard-mapper-selector.hbs
index 3971cd26..faaef0cf 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs
+++ b/assets/javascripts/discourse/components/wizard-mapper-selector.hbs
@@ -1,14 +1,14 @@
 <div class="type-selector">
-  {{#if hasTypes}}
+  {{#if this.hasTypes}}
     <a role="button" {{action "toggleTypes"}} class="active">
-      {{activeTypeLabel}}
+      {{this.activeTypeLabel}}
     </a>
 
-    {{#if showTypes}}
+    {{#if this.showTypes}}
       <div class="selector-types">
-        {{#each selectorTypes as |item|}}
+        {{#each this.selectorTypes as |item|}}
           {{wizard-mapper-selector-type
-            activeType=activeType
+            activeType=this.activeType
             item=item
             toggle=(action "toggleType")
           }}
@@ -16,62 +16,62 @@
       </div>
     {{/if}}
   {{else}}
-    <span>{{activeTypeLabel}}</span>
+    <span>{{this.activeTypeLabel}}</span>
   {{/if}}
 </div>
 
 <div class="input">
-  {{#if showText}}
+  {{#if this.showText}}
     <Input
       @type="text"
       @value={{this.value}}
-      placeholder={{i18n placeholderKey}}
+      placeholder={{i18n this.placeholderKey}}
       {{on "change" (action "changeInputValue")}}
     />
   {{/if}}
 
-  {{#if showComboBox}}
+  {{#if this.showComboBox}}
     {{combo-box
-      value=value
-      content=comboBoxContent
+      value=this.value
+      content=this.comboBoxContent
       onChange=(action "changeValue")
-      options=(hash none=placeholderKey allowAny=comboBoxAllowAny)
+      options=(hash none=this.placeholderKey allowAny=this.comboBoxAllowAny)
     }}
   {{/if}}
 
-  {{#if showMultiSelect}}
+  {{#if this.showMultiSelect}}
     {{multi-select
-      content=multiSelectContent
-      value=value
+      content=this.multiSelectContent
+      value=this.value
       onChange=(action "changeValue")
-      options=multiSelectOptions
+      options=this.multiSelectOptions
     }}
   {{/if}}
 
-  {{#if showList}}
+  {{#if this.showList}}
     {{wizard-value-list
-      values=value
-      addKey=placeholderKey
+      values=this.value
+      addKey=this.placeholderKey
       onChange=(action "changeValue")
     }}
   {{/if}}
 
-  {{#if showTag}}
+  {{#if this.showTag}}
     {{tag-chooser
-      tags=value
+      tags=this.value
       onChange=(action "changeValue")
       everyTag=true
-      options=(hash none=placeholderKey filterable=true)
+      options=(hash none=this.placeholderKey filterable=true)
     }}
   {{/if}}
 
-  {{#if showUser}}
+  {{#if this.showUser}}
     {{wizard-user-chooser
-      placeholderKey=placeholderKey
-      value=value
+      placeholderKey=this.placeholderKey
+      value=this.value
       autocomplete="discourse"
       onChange=(action "changeUserValue")
-      options=userOptions
+      options=this.userOptions
     }}
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-selector.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
rename to assets/javascripts/discourse/components/wizard-mapper-selector.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper.hbs b/assets/javascripts/discourse/components/wizard-mapper.hbs
similarity index 83%
rename from assets/javascripts/discourse/templates/components/wizard-mapper.hbs
rename to assets/javascripts/discourse/components/wizard-mapper.hbs
index e58b48e6..ee88d598 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper.hbs
+++ b/assets/javascripts/discourse/components/wizard-mapper.hbs
@@ -1,4 +1,4 @@
-{{#each inputs as |input|}}
+{{#each this.inputs as |input|}}
   {{#if input.connector}}
     {{wizard-mapper-connector
       connector=input.connector
@@ -9,13 +9,13 @@
 
   {{wizard-mapper-input
     input=input
-    options=inputOptions
+    options=this.inputOptions
     remove=(action "remove")
     onUpdate=(action "inputUpdated")
   }}
 {{/each}}
 
-{{#if canAdd}}
+{{#if this.canAdd}}
   <span class="add-mapper-input">
     {{d-button action=(action "add") label="admin.wizard.add" icon="plus"}}
   </span>
diff --git a/assets/javascripts/discourse/components/wizard-mapper.js.es6 b/assets/javascripts/discourse/components/wizard-mapper.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-mapper.js.es6
rename to assets/javascripts/discourse/components/wizard-mapper.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-message.hbs b/assets/javascripts/discourse/components/wizard-message.hbs
similarity index 50%
rename from assets/javascripts/discourse/templates/components/wizard-message.hbs
rename to assets/javascripts/discourse/components/wizard-message.hbs
index 4c48002a..45135bf2 100644
--- a/assets/javascripts/discourse/templates/components/wizard-message.hbs
+++ b/assets/javascripts/discourse/components/wizard-message.hbs
@@ -1,11 +1,11 @@
 <div class="message-block primary">
-  {{#if showIcon}}
-    {{d-icon icon}}
+  {{#if this.showIcon}}
+    {{d-icon this.icon}}
   {{/if}}
-  <span class="message-content">{{html-safe message}}</span>
-  {{#if hasItems}}
+  <span class="message-content">{{html-safe this.message}}</span>
+  {{#if this.hasItems}}
     <ul>
-      {{#each items as |item|}}
+      {{#each this.items as |item|}}
         <li>
           <span>{{d-icon item.icon}}</span>
           <span>{{html-safe item.html}}</span>
@@ -15,12 +15,12 @@
   {{/if}}
 </div>
 
-{{#if showDocumentation}}
+{{#if this.showDocumentation}}
   <div class="message-block">
     {{d-icon "question-circle"}}
 
-    <a href={{url}} target="_blank" rel="noopener noreferrer">
-      {{documentation}}
+    <a href={{this.url}} target="_blank" rel="noopener noreferrer">
+      {{this.documentation}}
     </a>
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-message.js.es6 b/assets/javascripts/discourse/components/wizard-message.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-message.js.es6
rename to assets/javascripts/discourse/components/wizard-message.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs b/assets/javascripts/discourse/components/wizard-realtime-validations.hbs
similarity index 92%
rename from assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs
rename to assets/javascripts/discourse/components/wizard-realtime-validations.hbs
index 00078cb2..eb8b3a60 100644
--- a/assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs
+++ b/assets/javascripts/discourse/components/wizard-realtime-validations.hbs
@@ -3,7 +3,7 @@
 </div>
 <div class="setting-value full">
   <ul>
-    {{#each-in field.validations as |type props|}}
+    {{#each-in this.field.validations as |type props|}}
       <li>
         <span class="setting-title">
           <h4>{{i18n (concat "admin.wizard.field.validations." type)}}</h4>
@@ -42,7 +42,7 @@
               />
               {{combo-box
                 value=(readonly props.time_unit)
-                content=timeUnits
+                content=this.timeUnits
                 class="time-unit-selector"
                 onChange=(action (mut props.time_unit))
               }}
@@ -54,13 +54,13 @@
             </div>
             <div class="setting-value">
               {{radio-button
-                name=(concat type field.id)
+                name=(concat type this.field.id)
                 value="above"
                 selection=props.position
               }}
               <span>{{i18n "admin.wizard.field.validations.above"}}</span>
               {{radio-button
-                name=(concat type field.id)
+                name=(concat type this.field.id)
                 value="below"
                 selection=props.position
               }}
diff --git a/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6 b/assets/javascripts/discourse/components/wizard-realtime-validations.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
rename to assets/javascripts/discourse/components/wizard-realtime-validations.js
diff --git a/assets/javascripts/discourse/components/wizard-subscription-container.hbs b/assets/javascripts/discourse/components/wizard-subscription-container.hbs
index a59263ed..0fc5622e 100644
--- a/assets/javascripts/discourse/components/wizard-subscription-container.hbs
+++ b/assets/javascripts/discourse/components/wizard-subscription-container.hbs
@@ -5,9 +5,9 @@
   <div class="subscription-header">
     <h4>{{i18n "admin.wizard.subscription.title"}}</h4>
 
-    <a href={{subscriptionLink}} title={{i18n subscribedTitle}}>
-      {{d-icon subscribedIcon}}
-      {{i18n subscribedLabel}}
+    <a href={{this.subscriptionLink}} title={{i18n this.subscribedTitle}}>
+      {{d-icon this.subscribedIcon}}
+      {{i18n this.subscribedLabel}}
     </a>
   </div>
 
diff --git a/assets/javascripts/discourse/components/wizard-subscription-selector.js.es6 b/assets/javascripts/discourse/components/wizard-subscription-selector.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-subscription-selector.js.es6
rename to assets/javascripts/discourse/components/wizard-subscription-selector.js
diff --git a/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs b/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs
new file mode 100644
index 00000000..e7b27b58
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs
@@ -0,0 +1,16 @@
+<div class="select-kit-header-wrapper">
+
+  {{component
+    this.selectKit.options.selectedNameComponent
+    tabindex=this.tabindex
+    item=this.selectedContent
+    selectKit=this.selectKit
+    shouldDisplayClearableButton=this.shouldDisplayClearableButton
+  }}
+
+  {{#if this.subscriptionRequired}}
+    <span class="subscription-label">{{i18n this.selectorLabel}}</span>
+  {{/if}}
+
+  {{d-icon this.caretIcon class="caret-icon"}}
+</div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.js.es6 b/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.js.es6
rename to assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.js
diff --git a/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs b/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs
new file mode 100644
index 00000000..d6a72a03
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs
@@ -0,0 +1,15 @@
+{{#if this.icons}}
+  <div class="icons">
+    <span class="selection-indicator"></span>
+    {{#each this.icons as |icon|}}
+      {{d-icon icon translatedtitle=(dasherize this.title)}}
+    {{/each}}
+  </div>
+{{/if}}
+
+<div class="texts">
+  <span class="name">{{html-safe this.label}}</span>
+  {{#if this.item.subscriptionRequired}}
+    <span class="subscription-label">{{i18n this.item.selectorLabel}}</span>
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.js.es6 b/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.js.es6
rename to assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.js
diff --git a/assets/javascripts/discourse/components/wizard-subscription-status.hbs b/assets/javascripts/discourse/components/wizard-subscription-status.hbs
index 5309558c..03e740bb 100644
--- a/assets/javascripts/discourse/components/wizard-subscription-status.hbs
+++ b/assets/javascripts/discourse/components/wizard-subscription-status.hbs
@@ -1,11 +1,11 @@
 <div class="supplier-authorize">
   <WizardSubscriptionBadge />
-  {{#if authorized}}
-    {{conditional-loading-spinner size="small" condition=unauthorizing}}
+  {{#if this.authorized}}
+    <ConditionalLoadingSpinner @condition={{this.unauthorizing}} @size="small" />
     <DButton
       class="deauthorize"
       @title="admin.wizard.subscription.deauthorize.title"
-      @disabled={{unauthorizing}}
+      @disabled={{this.unauthorizing}}
       @action={{this.deauthorize}}
     >
       {{i18n "admin.wizard.subscription.deauthorize.label"}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-table-field.hbs b/assets/javascripts/discourse/components/wizard-table-field.hbs
similarity index 52%
rename from assets/javascripts/discourse/templates/components/wizard-table-field.hbs
rename to assets/javascripts/discourse/components/wizard-table-field.hbs
index 5d81b5f4..2f7d8811 100644
--- a/assets/javascripts/discourse/templates/components/wizard-table-field.hbs
+++ b/assets/javascripts/discourse/components/wizard-table-field.hbs
@@ -1,132 +1,132 @@
-{{#if hasValue}}
-  {{#if isText}}
-    {{value.value}}
+{{#if this.hasValue}}
+  {{#if this.isText}}
+    {{this.value.value}}
   {{/if}}
 
-  {{#if isLongtext}}
+  {{#if this.isLongtext}}
     <div class="wizard-table-long-text">
-      <p class="wizard-table-long-text-content {{textState}}">
-        {{value.value}}
+      <p class="wizard-table-long-text-content {{this.textState}}">
+        {{this.value.value}}
       </p>
       <a href {{action "expandText"}}>
-        {{toggleText}}
+        {{this.toggleText}}
       </a>
     </div>
   {{/if}}
 
-  {{#if isComposer}}
+  {{#if this.isComposer}}
     <div class="wizard-table-long-text">
       <p
         class="wizard-table-composer-text wizard-table-long-text-content
-          {{textState}}"
+          {{this.textState}}"
       >
-        {{value.value}}
+        {{this.value.value}}
       </p>
       <a href {{action "expandText"}}>
-        {{toggleText}}
+        {{this.toggleText}}
       </a>
     </div>
   {{/if}}
 
-  {{#if isComposerPreview}}
+  {{#if this.isComposerPreview}}
     {{d-icon "comment-alt"}}
     <span class="wizard-table-composer-text">
       {{i18n "admin.wizard.submissions.composer_preview"}}:
-      {{value.value}}
+      {{this.value.value}}
     </span>
   {{/if}}
 
-  {{#if isTextOnly}}
-    {{value.value}}
+  {{#if this.isTextOnly}}
+    {{this.value.value}}
   {{/if}}
 
-  {{#if isDate}}
+  {{#if this.isDate}}
     <span class="wizard-table-icon-item">
-      {{d-icon "calendar"}}{{value.value}}
+      {{d-icon "calendar"}}{{this.value.value}}
     </span>
   {{/if}}
 
-  {{#if isTime}}
+  {{#if this.isTime}}
     <span class="wizard-table-icon-item">
-      {{d-icon "clock"}}{{value.value}}
+      {{d-icon "clock"}}{{this.value.value}}
     </span>
   {{/if}}
 
-  {{#if isDateTime}}
-    <span class="wizard-table-icon-item" title={{value.value}}>
-      {{d-icon "calendar"}}{{format-date value.value format="medium"}}
+  {{#if this.isDateTime}}
+    <span class="wizard-table-icon-item" title={{this.value.value}}>
+      {{d-icon "calendar"}}{{format-date this.value.value format="medium"}}
     </span>
   {{/if}}
 
-  {{#if isNumber}}
-    {{value.value}}
+  {{#if this.isNumber}}
+    {{this.value.value}}
   {{/if}}
 
-  {{#if isCheckbox}}
-    {{#if checkboxValue}}
+  {{#if this.isCheckbox}}
+    {{#if this.checkboxValue}}
       <span class="wizard-table-icon-item checkbox-true">
-        {{d-icon "check"}}{{value.value}}
+        {{d-icon "check"}}{{this.value.value}}
       </span>
     {{else}}
       <span class="wizard-table-icon-item checkbox-false">
-        {{d-icon "times"}}{{value.value}}
+        {{d-icon "times"}}{{this.value.value}}
       </span>
     {{/if}}
   {{/if}}
 
-  {{#if isUrl}}
+  {{#if this.isUrl}}
     <span class="wizard-table-icon-item url">
       {{d-icon "link"}}
-      <a target="_blank" rel="noopener noreferrer" href={{value.value}}>
-        {{value.value}}
+      <a target="_blank" rel="noopener noreferrer" href={{this.value.value}}>
+        {{this.value.value}}
       </a>
     </span>
   {{/if}}
 
-  {{#if isUpload}}
+  {{#if this.isUpload}}
     <a
       target="_blank"
       rel="noopener noreferrer"
       class="attachment"
-      href={{file.url}}
+      href={{this.file.url}}
       download
     >
-      {{file.original_filename}}
+      {{this.file.original_filename}}
     </a>
   {{/if}}
 
-  {{#if isDropdown}}
+  {{#if this.isDropdown}}
     <span class="wizard-table-icon-item">
       {{d-icon "check-square"}}
-      {{value.value}}
+      {{this.value.value}}
     </span>
   {{/if}}
 
-  {{#if isTag}}
-    {{#each value.value as |tag|}}
+  {{#if this.isTag}}
+    {{#each this.value.value as |tag|}}
       {{discourse-tag tag}}
     {{/each}}
   {{/if}}
 
-  {{#if isCategory}}
+  {{#if this.isCategory}}
     <strong>
       {{i18n "admin.wizard.submissions.category_id"}}:
     </strong>
     <a
       target="_blank"
       rel="noopener noreferrer"
-      href={{categoryUrl}}
-      title={{value.value}}
+      href={{this.categoryUrl}}
+      title={{this.value.value}}
     >
-      {{value.value}}
+      {{this.value.value}}
     </a>
   {{/if}}
 
-  {{#if isTopic}}
+  {{#if this.isTopic}}
     <strong>
       {{i18n "admin.wizard.submissions.topic_id"}}:
     </strong>
-    {{#each value.value as |topic|}}
+    {{#each this.value.value as |topic|}}
       <a
         target="_blank"
         rel="noopener noreferrer"
@@ -138,15 +138,15 @@
     {{/each}}
   {{/if}}
 
-  {{#if isGroup}}
+  {{#if this.isGroup}}
     <strong>
       {{i18n "admin.wizard.submissions.group_id"}}:
     </strong>
-    {{value.value}}
+    {{this.value.value}}
   {{/if}}
 
-  {{#if isUserSelector}}
-    {{#each submittedUsers as |user|}}
+  {{#if this.isUserSelector}}
+    {{#each this.submittedUsers as |user|}}
       {{d-icon "user"}}
       <a
         target="_blank"
@@ -159,26 +159,26 @@
     {{/each}}
   {{/if}}
 
-  {{#if isUser}}
-    <LinkTo @route="user" @model={{value.username}}>
-      {{avatar value imageSize="tiny"}}
+  {{#if this.isUser}}
+    <LinkTo @route="user" @model={{this.value.username}}>
+      {{avatar this.value imageSize="tiny"}}
     </LinkTo>
   {{/if}}
 
-  {{#if showUsername}}
+  {{#if this.showUsername}}
     <a
       target="_blank"
       rel="noopener noreferrer"
-      href={{userProfileUrl}}
-      title={{username}}
+      href={{this.userProfileUrl}}
+      title={{this.username}}
     >
-      {{username}}
+      {{this.username}}
     </a>
   {{/if}}
 
-  {{#if isSubmittedAt}}
-    <span class="date" title={{value}}>
-      {{raw-date value}}
+  {{#if this.isSubmittedAt}}
+    <span class="date" title={{this.value}}>
+      {{raw-date this.value}}
     </span>
   {{/if}}
 {{else}}
diff --git a/assets/javascripts/discourse/components/wizard-table-field.js.es6 b/assets/javascripts/discourse/components/wizard-table-field.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-table-field.js.es6
rename to assets/javascripts/discourse/components/wizard-table-field.js
diff --git a/assets/javascripts/discourse/components/wizard-text-editor.hbs b/assets/javascripts/discourse/components/wizard-text-editor.hbs
new file mode 100644
index 00000000..b61126f9
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-text-editor.hbs
@@ -0,0 +1,34 @@
+{{d-editor value=this.value forcePreview=this.forcePreview placeholder=this.placeholder}}
+
+<div class="wizard-editor-gutter">
+  {{#if this.previewEnabled}}
+    {{d-button action=(action "togglePreview") translatedLabel=this.previewLabel}}
+  {{/if}}
+
+  {{#if this.fieldsEnabled}}
+    {{d-button action=(action "togglePopover") translatedLabel=this.popoverLabel}}
+
+    {{#if this.showPopover}}
+      <div class="wizard-editor-gutter-popover">
+        <label>
+          {{i18n "admin.wizard.action.post_builder.user_properties"}}
+          {{this.userPropertyList}}
+        </label>
+
+        {{#if this.hasWizardFields}}
+          <label>
+            {{i18n "admin.wizard.action.post_builder.wizard_fields"}}
+            {{this.wizardFieldList}}
+          </label>
+        {{/if}}
+
+        {{#if this.hasWizardActions}}
+          <label>
+            {{i18n "admin.wizard.action.post_builder.wizard_actions"}}
+            {{this.wizardActionList}}
+          </label>
+        {{/if}}
+      </div>
+    {{/if}}
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-text-editor.js.es6 b/assets/javascripts/discourse/components/wizard-text-editor.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-text-editor.js.es6
rename to assets/javascripts/discourse/components/wizard-text-editor.js
diff --git a/assets/javascripts/discourse/components/wizard-user-chooser.js.es6 b/assets/javascripts/discourse/components/wizard-user-chooser.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-user-chooser.js.es6
rename to assets/javascripts/discourse/components/wizard-user-chooser.js
diff --git a/assets/javascripts/discourse/templates/components/wizard-user-chooser/wizard-user-chooser-row.hbs b/assets/javascripts/discourse/components/wizard-user-chooser/wizard-user-chooser-row.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/wizard-user-chooser/wizard-user-chooser-row.hbs
rename to assets/javascripts/discourse/components/wizard-user-chooser/wizard-user-chooser-row.hbs
diff --git a/assets/javascripts/discourse/components/wizard-value-list.js.es6 b/assets/javascripts/discourse/components/wizard-value-list.js
similarity index 100%
rename from assets/javascripts/discourse/components/wizard-value-list.js.es6
rename to assets/javascripts/discourse/components/wizard-value-list.js
diff --git a/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs b/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
index 0aef2dcb..0899e2a3 100644
--- a/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
+++ b/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
@@ -1,7 +1,7 @@
-{{#if currentUser.admin}}
+{{#if this.currentUser.admin}}
   {{nav-item route="adminWizards" label="admin.wizard.nav_label"}}
 
-  {{#if wizardErrorNotice}}
+  {{#if this.wizardErrorNotice}}
     {{d-icon "exclaimation-circle"}}
   {{/if}}
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.js.es6 b/assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.js
similarity index 100%
rename from assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.js.es6
rename to assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.js
diff --git a/assets/javascripts/discourse/connectors/top-notices/prompt-completion.js.es6 b/assets/javascripts/discourse/connectors/top-notices/prompt-completion.js
similarity index 100%
rename from assets/javascripts/discourse/connectors/top-notices/prompt-completion.js.es6
rename to assets/javascripts/discourse/connectors/top-notices/prompt-completion.js
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
rename to assets/javascripts/discourse/controllers/admin-wizards-api-show.js
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6
rename to assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-logs-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-logs-show.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-wizards-logs-show.js.es6
rename to assets/javascripts/discourse/controllers/admin-wizards-logs-show.js
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-logs.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
rename to assets/javascripts/discourse/controllers/admin-wizards-logs.js
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-manager.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6
rename to assets/javascripts/discourse/controllers/admin-wizards-manager.js
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
rename to assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-submissions.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6
rename to assets/javascripts/discourse/controllers/admin-wizards-submissions.js
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
rename to assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-wizards-wizard.js.es6
rename to assets/javascripts/discourse/controllers/admin-wizards-wizard.js
diff --git a/assets/javascripts/discourse/controllers/admin-wizards.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-wizards.js.es6
rename to assets/javascripts/discourse/controllers/admin-wizards.js
diff --git a/assets/javascripts/discourse/controllers/custom-wizard-index.js.es6 b/assets/javascripts/discourse/controllers/custom-wizard-index.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/custom-wizard-index.js.es6
rename to assets/javascripts/discourse/controllers/custom-wizard-index.js
diff --git a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6 b/assets/javascripts/discourse/controllers/custom-wizard-step.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
rename to assets/javascripts/discourse/controllers/custom-wizard-step.js
diff --git a/assets/javascripts/discourse/controllers/custom-wizard.js.es6 b/assets/javascripts/discourse/controllers/custom-wizard.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/custom-wizard.js.es6
rename to assets/javascripts/discourse/controllers/custom-wizard.js
diff --git a/assets/javascripts/discourse/custom-wizard-admin-route-map.js.es6 b/assets/javascripts/discourse/custom-wizard-admin-route-map.js
similarity index 100%
rename from assets/javascripts/discourse/custom-wizard-admin-route-map.js.es6
rename to assets/javascripts/discourse/custom-wizard-admin-route-map.js
diff --git a/assets/javascripts/discourse/custom-wizard-route-map.js.es6 b/assets/javascripts/discourse/custom-wizard-route-map.js
similarity index 100%
rename from assets/javascripts/discourse/custom-wizard-route-map.js.es6
rename to assets/javascripts/discourse/custom-wizard-route-map.js
diff --git a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-edits.js
similarity index 100%
rename from assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
rename to assets/javascripts/discourse/initializers/custom-wizard-edits.js
diff --git a/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-redirect.js
similarity index 100%
rename from assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6
rename to assets/javascripts/discourse/initializers/custom-wizard-redirect.js
diff --git a/assets/javascripts/discourse/lib/wizard-json.js.es6 b/assets/javascripts/discourse/lib/wizard-json.js
similarity index 100%
rename from assets/javascripts/discourse/lib/wizard-json.js.es6
rename to assets/javascripts/discourse/lib/wizard-json.js
diff --git a/assets/javascripts/discourse/lib/wizard-mapper.js.es6 b/assets/javascripts/discourse/lib/wizard-mapper.js
similarity index 100%
rename from assets/javascripts/discourse/lib/wizard-mapper.js.es6
rename to assets/javascripts/discourse/lib/wizard-mapper.js
diff --git a/assets/javascripts/discourse/lib/wizard-schema.js.es6 b/assets/javascripts/discourse/lib/wizard-schema.js
similarity index 100%
rename from assets/javascripts/discourse/lib/wizard-schema.js.es6
rename to assets/javascripts/discourse/lib/wizard-schema.js
diff --git a/assets/javascripts/discourse/lib/wizard-submission.js.es6 b/assets/javascripts/discourse/lib/wizard-submission.js
similarity index 100%
rename from assets/javascripts/discourse/lib/wizard-submission.js.es6
rename to assets/javascripts/discourse/lib/wizard-submission.js
diff --git a/assets/javascripts/discourse/lib/wizard.js.es6 b/assets/javascripts/discourse/lib/wizard.js
similarity index 100%
rename from assets/javascripts/discourse/lib/wizard.js.es6
rename to assets/javascripts/discourse/lib/wizard.js
diff --git a/assets/javascripts/discourse/mixins/subscription.js.es6 b/assets/javascripts/discourse/mixins/subscription.js
similarity index 100%
rename from assets/javascripts/discourse/mixins/subscription.js.es6
rename to assets/javascripts/discourse/mixins/subscription.js
diff --git a/assets/javascripts/discourse/mixins/undo-changes.js.es6 b/assets/javascripts/discourse/mixins/undo-changes.js
similarity index 100%
rename from assets/javascripts/discourse/mixins/undo-changes.js.es6
rename to assets/javascripts/discourse/mixins/undo-changes.js
diff --git a/assets/javascripts/discourse/mixins/valid-state.js.es6 b/assets/javascripts/discourse/mixins/valid-state.js
similarity index 100%
rename from assets/javascripts/discourse/mixins/valid-state.js.es6
rename to assets/javascripts/discourse/mixins/valid-state.js
diff --git a/assets/javascripts/discourse/models/custom-wizard-admin.js.es6 b/assets/javascripts/discourse/models/custom-wizard-admin.js
similarity index 100%
rename from assets/javascripts/discourse/models/custom-wizard-admin.js.es6
rename to assets/javascripts/discourse/models/custom-wizard-admin.js
diff --git a/assets/javascripts/discourse/models/custom-wizard-api.js.es6 b/assets/javascripts/discourse/models/custom-wizard-api.js
similarity index 100%
rename from assets/javascripts/discourse/models/custom-wizard-api.js.es6
rename to assets/javascripts/discourse/models/custom-wizard-api.js
diff --git a/assets/javascripts/discourse/models/custom-wizard-custom-field.js.es6 b/assets/javascripts/discourse/models/custom-wizard-custom-field.js
similarity index 100%
rename from assets/javascripts/discourse/models/custom-wizard-custom-field.js.es6
rename to assets/javascripts/discourse/models/custom-wizard-custom-field.js
diff --git a/assets/javascripts/discourse/models/custom-wizard-field.js.es6 b/assets/javascripts/discourse/models/custom-wizard-field.js
similarity index 100%
rename from assets/javascripts/discourse/models/custom-wizard-field.js.es6
rename to assets/javascripts/discourse/models/custom-wizard-field.js
diff --git a/assets/javascripts/discourse/models/custom-wizard-logs.js.es6 b/assets/javascripts/discourse/models/custom-wizard-logs.js
similarity index 100%
rename from assets/javascripts/discourse/models/custom-wizard-logs.js.es6
rename to assets/javascripts/discourse/models/custom-wizard-logs.js
diff --git a/assets/javascripts/discourse/models/custom-wizard-manager.js.es6 b/assets/javascripts/discourse/models/custom-wizard-manager.js
similarity index 100%
rename from assets/javascripts/discourse/models/custom-wizard-manager.js.es6
rename to assets/javascripts/discourse/models/custom-wizard-manager.js
diff --git a/assets/javascripts/discourse/models/custom-wizard-step.js.es6 b/assets/javascripts/discourse/models/custom-wizard-step.js
similarity index 100%
rename from assets/javascripts/discourse/models/custom-wizard-step.js.es6
rename to assets/javascripts/discourse/models/custom-wizard-step.js
diff --git a/assets/javascripts/discourse/models/custom-wizard.js.es6 b/assets/javascripts/discourse/models/custom-wizard.js
similarity index 100%
rename from assets/javascripts/discourse/models/custom-wizard.js.es6
rename to assets/javascripts/discourse/models/custom-wizard.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-api-show.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards-api-show.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-api.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards-api.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards-api.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards-custom-fields.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-custom-fields.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards-custom-fields.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards-custom-fields.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-logs-show.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards-logs-show.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-logs.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards-logs.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards-logs.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards-manager.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-manager.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards-manager.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards-manager.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards-submissions-show.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-submissions.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards-submissions.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards-wizard-show.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-wizard.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards-wizard.js
diff --git a/assets/javascripts/discourse/routes/admin-wizards.js.es6 b/assets/javascripts/discourse/routes/admin-wizards.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-wizards.js.es6
rename to assets/javascripts/discourse/routes/admin-wizards.js
diff --git a/assets/javascripts/discourse/routes/custom-wizard-index.js.es6 b/assets/javascripts/discourse/routes/custom-wizard-index.js
similarity index 100%
rename from assets/javascripts/discourse/routes/custom-wizard-index.js.es6
rename to assets/javascripts/discourse/routes/custom-wizard-index.js
diff --git a/assets/javascripts/discourse/routes/custom-wizard-step.js.es6 b/assets/javascripts/discourse/routes/custom-wizard-step.js
similarity index 100%
rename from assets/javascripts/discourse/routes/custom-wizard-step.js.es6
rename to assets/javascripts/discourse/routes/custom-wizard-step.js
diff --git a/assets/javascripts/discourse/routes/custom-wizard.js.es6 b/assets/javascripts/discourse/routes/custom-wizard.js
similarity index 100%
rename from assets/javascripts/discourse/routes/custom-wizard.js.es6
rename to assets/javascripts/discourse/routes/custom-wizard.js
diff --git a/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs
index 5270aa28..d29b7288 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs
@@ -1,10 +1,10 @@
 <div class="wizard-api-header page">
   <div class="buttons">
-    {{#if updating}}
+    {{#if this.updating}}
       {{loading-spinner size="small"}}
     {{else}}
-      {{#if responseIcon}}
-        {{d-icon responseIcon}}
+      {{#if this.responseIcon}}
+        {{d-icon this.responseIcon}}
       {{/if}}
     {{/if}}
 
@@ -12,25 +12,25 @@
       label="admin.wizard.api.save"
       action=(action "save")
       class="btn-primary"
-      disabled=saveDisabled
+      disabled=this.saveDisabled
     }}
 
-    {{#if showRemove}}
+    {{#if this.showRemove}}
       {{d-button action=(action "remove") label="admin.wizard.api.remove"}}
     {{/if}}
 
-    {{#if error}}
+    {{#if this.error}}
       <div class="error">
-        {{error}}
+        {{this.error}}
       </div>
     {{/if}}
   </div>
 
   <div class="wizard-header large">
-    {{#if api.isNew}}
+    {{#if this.api.isNew}}
       {{i18n "admin.wizard.api.new"}}
     {{else}}
-      <span>{{api.title}}</span>
+      <span>{{this.api.title}}</span>
     {{/if}}
   </div>
 
@@ -43,15 +43,15 @@
       />
     </div>
 
-    <div class="name {{nameClass}}">
+    <div class="name {{this.nameClass}}">
       <label>{{i18n "admin.wizard.api.name"}}</label>
-      {{#if api.isNew}}
+      {{#if this.api.isNew}}
         <Input
           @value={{this.api.name}}
           placeholder={{i18n "admin.wizard.api.name_placeholder"}}
         />
       {{else}}
-        <span>{{api.name}}</span>
+        <span>{{this.api.name}}</span>
       {{/if}}
     </div>
   </div>
@@ -59,18 +59,18 @@
 
 <div class="wizard-api-header">
   <div class="buttons">
-    {{#if isOauth}}
-      {{#if authorizing}}
+    {{#if this.isOauth}}
+      {{#if this.authorizing}}
         {{loading-spinner size="small"}}
       {{else}}
-        {{#if authErrorMessage}}
-          <span>{{authErrorMessage}}</span>
+        {{#if this.authErrorMessage}}
+          <span>{{this.authErrorMessage}}</span>
         {{/if}}
       {{/if}}
       {{d-button
         label="admin.wizard.api.auth.btn"
         action=(action "authorize")
-        disabled=authDisabled
+        disabled=this.authDisabled
         class="btn-primary"
       }}
     {{/if}}
@@ -88,12 +88,12 @@
       {{i18n "admin.wizard.api.auth.settings"}}
     </div>
 
-    {{#if showRedirectUri}}
+    {{#if this.showRedirectUri}}
       <div class="control-group redirect-uri">
         <div class="control-label">
           <label>{{i18n "admin.wizard.api.auth.redirect_uri"}}</label>
           <div class="controls">
-            {{api.redirectUri}}
+            {{this.api.redirectUri}}
           </div>
         </div>
       </div>
@@ -103,16 +103,16 @@
       <label>{{i18n "admin.wizard.api.auth.type"}}</label>
       <div class="controls">
         {{combo-box
-          value=api.authType
-          content=authorizationTypes
-          onChange=(action (mut api.authType))
+          value=this.api.authType
+          content=this.authorizationTypes
+          onChange=(action (mut this.api.authType))
           options=(hash none="admin.wizard.api.auth.type_none")
         }}
       </div>
     </div>
 
-    {{#if isOauth}}
-      {{#if threeLeggedOauth}}
+    {{#if this.isOauth}}
+      {{#if this.threeLeggedOauth}}
         <div class="control-group">
           <label>{{i18n "admin.wizard.api.auth.url"}}</label>
           <div class="controls">
@@ -145,14 +145,14 @@
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.params.label"}}</label>
         <div class="controls">
-          {{#each api.authParams as |param|}}
+          {{#each this.api.authParams as |param|}}
             <div class="param">
               <Input
-                @value={{this.param.key}}
+                @value={{param.key}}
                 placeholder={{i18n "admin.wizard.key"}}
               />
               <Input
-                @value={{this.param.value}}
+                @value={{param.value}}
                 placeholder={{i18n "admin.wizard.value"}}
               />
               {{d-button
@@ -171,7 +171,7 @@
       </div>
     {{/if}}
 
-    {{#if isBasicAuth}}
+    {{#if this.isBasicAuth}}
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.username"}}</label>
         <div class="controls">
@@ -188,10 +188,10 @@
     {{/if}}
   </div>
 
-  {{#if isOauth}}
+  {{#if this.isOauth}}
     <div class="status">
       <div class="authorization">
-        {{#if api.authorized}}
+        {{#if this.api.authorized}}
           <span class="authorization-indicator authorized"></span>
           <span>{{i18n "admin.wizard.api.status.authorized"}}</span>
         {{else}}
@@ -204,11 +204,11 @@
         {{i18n "admin.wizard.api.status.label"}}
       </div>
 
-      {{#if threeLeggedOauth}}
+      {{#if this.threeLeggedOauth}}
         <div class="control-group">
           <label>{{i18n "admin.wizard.api.status.code"}}</label>
           <div class="controls">
-            {{api.code}}
+            {{this.api.code}}
           </div>
         </div>
       {{/if}}
@@ -216,15 +216,15 @@
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.status.access_token"}}</label>
         <div class="controls">
-          {{api.accessToken}}
+          {{this.api.accessToken}}
         </div>
       </div>
 
-      {{#if threeLeggedOauth}}
+      {{#if this.threeLeggedOauth}}
         <div class="control-group">
           <label>{{i18n "admin.wizard.api.status.refresh_token"}}</label>
           <div class="controls">
-            {{api.refreshToken}}
+            {{this.api.refreshToken}}
           </div>
         </div>
       {{/if}}
@@ -232,14 +232,14 @@
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.status.expires_at"}}</label>
         <div class="controls">
-          {{api.tokenExpiresAt}}
+          {{this.api.tokenExpiresAt}}
         </div>
       </div>
 
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.status.refresh_at"}}</label>
         <div class="controls">
-          {{api.tokenRefreshAt}}
+          {{this.api.tokenRefreshAt}}
         </div>
       </div>
     </div>
@@ -257,10 +257,10 @@
     icon="plus"
   }}
 
-  {{#if api.endpoints}}
+  {{#if this.api.endpoints}}
     <div class="endpoint-list">
       <ul>
-        {{#each api.endpoints as |endpoint|}}
+        {{#each this.api.endpoints as |endpoint|}}
           <li>
             <div class="endpoint">
               <div class="endpoint-">
@@ -283,20 +283,20 @@
                 </div>
                 <div class="bottom">
                   {{combo-box
-                    content=endpointMethods
+                    content=this.endpointMethods
                     value=endpoint.method
                     onChange=(action (mut endpoint.method))
                     options=(hash none="admin.wizard.api.endpoint.method")
                   }}
                   {{combo-box
-                    content=contentTypes
+                    content=this.contentTypes
                     value=endpoint.content_type
                     onChange=(action (mut endpoint.content_type))
                     options=(hash none="admin.wizard.api.endpoint.content_type")
                   }}
                   {{multi-select
                     value=endpoint.success_codes
-                    content=successCodes
+                    content=this.successCodes
                     onChange=(action (mut endpoint.success_codes))
                     options=(hash
                       none="admin.wizard.api.endpoint.success_codes"
@@ -335,7 +335,7 @@
         <th>Error</th>
       </thead>
       <tbody>
-        {{#each api.log as |logentry|}}
+        {{#each this.api.log as |logentry|}}
           <tr>
             <td>{{logentry.time}}</td>
             <td class="user-image">
diff --git a/assets/javascripts/discourse/templates/admin-wizards-api.hbs b/assets/javascripts/discourse/templates/admin-wizards-api.hbs
index 6a6c5832..42d8df2d 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-api.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-api.hbs
@@ -1,7 +1,7 @@
 <div class="admin-wizard-controls">
   {{combo-box
-    value=apiName
-    content=apiList
+    value=this.apiName
+    content=this.apiList
     onChange=(route-action "changeApi")
     options=(hash none="admin.wizard.api.select")
   }}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
index 4dda0ac8..5b32fe09 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
@@ -11,26 +11,26 @@
 </div>
 
 {{wizard-message
-  key=messageKey
-  opts=messageOpts
-  type=messageType
-  url=documentationUrl
+  key=this.messageKey
+  opts=this.messageOpts
+  type=this.messageType
+  url=this.documentationUrl
   component="custom_fields"
 }}
 
 <div class="admin-wizard-container">
-  {{#if customFields}}
+  {{#if this.customFields}}
     <table>
       <thead>
         <tr>
-          {{#each fieldKeys as |key|}}
+          {{#each this.fieldKeys as |key|}}
             <th>{{i18n (concat "admin.wizard.custom_field." key ".label")}}</th>
           {{/each}}
           <th></th>
         </tr>
       </thead>
       <tbody>
-        {{#each customFields as |field|}}
+        {{#each this.customFields as |field|}}
           {{custom-field-input
             field=field
             removeField=(action "removeField")
diff --git a/assets/javascripts/discourse/templates/admin-wizards-logs-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-logs-show.hbs
index deb7ed8b..20c73c6d 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-logs-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-logs-show.hbs
@@ -1,7 +1,7 @@
-{{#if logs}}
+{{#if this.logs}}
   <div class="wizard-header large">
     <label>
-      {{i18n "admin.wizard.log.title" name=wizard.name}}
+      {{i18n "admin.wizard.log.title" name=this.wizard.name}}
     </label>
 
     <div class="controls">
@@ -16,7 +16,7 @@
 
   <div class="wizard-table">
     {{#load-more selector=".wizard-table tr" action=(action "loadMore")}}
-      {{#if noResults}}
+      {{#if this.noResults}}
         <p>{{i18n "search.no_results"}}</p>
       {{else}}
         <table>
@@ -29,7 +29,7 @@
             </tr>
           </thead>
           <tbody>
-            {{#each logs as |log|}}
+            {{#each this.logs as |log|}}
               <tr>
                 {{#each-in log as |field value|}}
                   <td class="small">{{wizard-table-field
@@ -43,7 +43,7 @@
         </table>
       {{/if}}
 
-      {{conditional-loading-spinner condition=refreshing}}
+      {{conditional-loading-spinner condition=this.refreshing}}
     {{/load-more}}
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/admin-wizards-logs.hbs b/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
index 703f4fa3..8f286d7b 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
@@ -1,16 +1,16 @@
 <div class="admin-wizard-select admin-wizard-controls">
   {{combo-box
-    value=wizardId
-    content=wizardList
+    value=this.wizardId
+    content=this.wizardList
     onChange=(route-action "changeWizard")
     options=(hash none="admin.wizard.select")
   }}
 </div>
 
 {{wizard-message
-  key=messageKey
-  opts=messageOpts
-  url=documentationUrl
+  key=this.messageKey
+  opts=this.messageOpts
+  url=this.documentationUrl
   component="logs"
 }}
 
diff --git a/assets/javascripts/discourse/templates/admin-wizards-manager.hbs b/assets/javascripts/discourse/templates/admin-wizards-manager.hbs
index ace62498..872a8ba7 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-manager.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-manager.hbs
@@ -2,12 +2,12 @@
   <h3>{{i18n "admin.wizard.manager.title"}}</h3>
 
   <div class="buttons">
-    {{#if filename}}
+    {{#if this.filename}}
       <div class="filename">
         <a role="button" {{action "clearFile"}}>
           {{d-icon "times"}}
         </a>
-        <span>{{filename}}</span>
+        <span>{{this.filename}}</span>
       </div>
     {{/if}}
 
@@ -26,30 +26,30 @@
       id="import-button"
       label="admin.wizard.manager.import"
       action=(action "import")
-      disabled=importDisabled
+      disabled=this.importDisabled
     }}
     {{d-button
       id="export-button"
       label="admin.wizard.manager.export"
       action=(action "export")
-      disabled=exportDisabled
+      disabled=this.exportDisabled
     }}
     {{d-button
       id="destroy-button"
       label="admin.wizard.manager.destroy"
       action=(action "destroy")
-      disabled=destoryDisabled
+      disabled=this.destoryDisabled
     }}
   </div>
 </div>
 
 {{wizard-message
-  key=messageKey
-  url=messageUrl
-  type=messageType
-  opts=messageOpts
-  items=messageItems
-  loading=loading
+  key=this.messageKey
+  url=this.messageUrl
+  type=this.messageType
+  opts=this.messageOpts
+  items=this.messageItems
+  loading=this.loading
   component="manager"
 }}
 
@@ -63,7 +63,7 @@
       </tr>
     </thead>
     <tbody>
-      {{#each wizards as |wizard|}}
+      {{#each this.wizards as |wizard|}}
         <tr data-wizard-id={{dasherize wizard.id}}>
           <td>
             <LinkTo
diff --git a/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
index 96a24a9d..5f52465d 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
@@ -1,7 +1,7 @@
-{{#if submissions}}
+{{#if this.submissions}}
   <div class="wizard-header large">
     <label>
-      {{i18n "admin.wizard.submissions.title" name=wizard.name}}
+      {{i18n "admin.wizard.submissions.title" name=this.wizard.name}}
     </label>
 
     <div class="controls">
@@ -15,7 +15,7 @@
 
     <a
       class="btn btn-default download-link"
-      href={{downloadUrl}}
+      href={{this.downloadUrl}}
       target="_blank"
       rel="noopener noreferrer"
     >
@@ -28,13 +28,13 @@
 
   <div class="wizard-table">
     {{#load-more selector=".wizard-table tr" action=(action "loadMore")}}
-      {{#if noResults}}
+      {{#if this.noResults}}
         <p>{{i18n "search.no_results"}}</p>
       {{else}}
         <table>
           <thead>
             <tr>
-              {{#each fields as |field|}}
+              {{#each this.fields as |field|}}
                 {{#if field.enabled}}
                   <th>
                     {{field.label}}
@@ -44,7 +44,7 @@
             </tr>
           </thead>
           <tbody>
-            {{#each displaySubmissions as |submission|}}
+            {{#each this.displaySubmissions as |submission|}}
               <tr>
                 {{#each-in submission as |field value|}}
                   <td>{{wizard-table-field field=field value=value}}</td>
@@ -55,7 +55,7 @@
         </table>
       {{/if}}
 
-      {{conditional-loading-spinner condition=loadingMore}}
+      {{conditional-loading-spinner condition=this.loadingMore}}
     {{/load-more}}
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs b/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
index 1ccaa3b8..057873e4 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
@@ -1,16 +1,16 @@
 <div class="admin-wizard-select admin-wizard-controls">
   {{combo-box
-    value=wizardId
-    content=wizardList
+    value=this.wizardId
+    content=this.wizardList
     onChange=(route-action "changeWizard")
     options=(hash none="admin.wizard.select")
   }}
 </div>
 
 {{wizard-message
-  key=messageKey
-  opts=messageOpts
-  url=documentationUrl
+  key=this.messageKey
+  opts=this.messageOpts
+  url=this.documentationUrl
   component="submissions"
 }}
 
diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
index af3f0634..e840f227 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
@@ -1,4 +1,4 @@
-{{#if wizard}}
+{{#if this.wizard}}
   <div class="wizard-header large">
     <Input
       @value={{this.wizard.name}}
@@ -7,8 +7,8 @@
     />
 
     <div class="wizard-url">
-      {{#if wizard.name}}
-        {{#if copiedUrl}}
+      {{#if this.wizard.name}}
+        {{#if this.copiedUrl}}
           {{d-button
             class="btn-hover pull-right"
             icon="copy"
@@ -22,10 +22,10 @@
           }}
         {{/if}}
         <a
-          href={{wizardUrl}}
+          href={{this.wizardUrl}}
           target="_blank"
           rel="noopener noreferrer"
-        >{{wizardUrl}}</a>
+        >{{this.wizardUrl}}</a>
       {{/if}}
     </div>
   </div>
@@ -51,10 +51,10 @@
       </div>
       <div class="setting-value">
         {{combo-box
-          content=themes
+          content=this.themes
           valueProperty="id"
-          value=wizard.theme_id
-          onChange=(action (mut wizard.theme_id))
+          value=this.wizard.theme_id
+          onChange=(action (mut this.wizard.theme_id))
           options=(hash none="admin.wizard.no_theme")
         }}
       </div>
@@ -115,7 +115,7 @@
         <span>{{i18n "admin.wizard.after_time_label"}}</span>
         {{d-button
           action=(action "setNextSessionScheduled")
-          translatedLabel=nextSessionScheduledLabel
+          translatedLabel=this.nextSessionScheduledLabel
           class="btn-after-time"
           icon="far-calendar"
         }}
@@ -149,7 +149,7 @@
         </div>
         <div class="setting-value">
           {{wizard-mapper
-            inputs=wizard.permitted
+            inputs=this.wizard.permitted
             options=(hash
               context="wizard"
               inputTypes="assignment,validation"
@@ -181,58 +181,58 @@
     {{/wizard-subscription-container}}
   </div>
 
-  {{wizard-links itemType="step" current=currentStep items=wizard.steps}}
+  {{wizard-links itemType="step" current=this.currentStep items=this.wizard.steps}}
 
-  {{#if currentStep}}
+  {{#if this.currentStep}}
     {{wizard-custom-step
-      step=currentStep
-      wizard=wizard
-      currentField=currentField
-      wizardFields=wizardFields
-      fieldTypes=filteredFieldTypes
-      subscribed=subscribed
+      step=this.currentStep
+      wizard=this.wizard
+      currentField=this.currentField
+      wizardFields=this.wizardFields
+      fieldTypes=this.filteredFieldTypes
+      subscribed=this.subscribed
     }}
   {{/if}}
 
   {{wizard-links
     itemType="action"
-    current=currentAction
-    items=wizard.actions
+    current=this.currentAction
+    items=this.wizard.actions
     generateLabels=true
   }}
 
-  {{#each wizard.actions as |wizardAction|}}
+  {{#each this.wizard.actions as |wizardAction|}}
     {{wizard-custom-action
       action=wizardAction
-      currentActionId=currentAction.id
-      wizard=wizard
-      apis=apis
+      currentActionId=this.currentAction.id
+      wizard=this.wizard
+      apis=this.apis
       removeAction="removeAction"
-      wizardFields=wizardFields
-      fieldTypes=filteredFieldTypes
+      wizardFields=this.wizardFields
+      fieldTypes=this.filteredFieldTypes
     }}
   {{/each}}
 
   <div class="admin-wizard-buttons">
     <button
       {{action "save"}}
-      disabled={{disableSave}}
+      disabled={{this.disableSave}}
       class="btn btn-primary"
       type="button"
     >
       {{i18n "admin.wizard.save"}}
     </button>
 
-    {{#unless creating}}
+    {{#unless this.creating}}
       <button {{action "remove"}} class="btn btn-danger remove" type="button">
         {{d-icon "far-trash-alt"}}{{i18n "admin.wizard.remove"}}
       </button>
     {{/unless}}
 
-    {{conditional-loading-spinner condition=saving size="small"}}
+    {{conditional-loading-spinner condition=this.saving size="small"}}
 
-    {{#if error}}
-      <span class="error">{{d-icon "times"}}{{error}}</span>
+    {{#if this.error}}
+      <span class="error">{{d-icon "times"}}{{this.error}}</span>
     {{/if}}
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
index 7a33dac1..18e53fc8 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
@@ -1,19 +1,22 @@
 <div class="admin-wizard-controls">
-  {{combo-box
-    value=wizardListVal
-    content=wizardList
-    onChange=(route-action "changeWizard")
-    options=(hash none="admin.wizard.select")
-  }}
-
-  {{d-button
-    action=(route-action "createWizard")
-    label="admin.wizard.create"
-    icon="plus"
-  }}
+  <ComboBox
+    @value={{this.wizardListVal}}
+    @content={{this.wizardList}}
+    @onChange={{route-action "changeWizard"}}
+    @options={{hash none="admin.wizard.select"}}
+  />
+  <DButton
+    @action={{route-action "createWizard"}}
+    @label="admin.wizard.create"
+    @icon="plus"
+  />
 </div>
 
-{{wizard-message key=messageKey url=messageUrl component="wizard"}}
+<WizardMessage
+  @key={{this.messageKey}}
+  @url={{this.messageUrl}}
+  @component="wizard"
+/>
 
 <div class="admin-wizard-container settings">
   {{outlet}}
diff --git a/assets/javascripts/discourse/templates/admin-wizards.hbs b/assets/javascripts/discourse/templates/admin-wizards.hbs
index d66839ce..8e5d206d 100644
--- a/assets/javascripts/discourse/templates/admin-wizards.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards.hbs
@@ -10,7 +10,7 @@
     route="adminWizardsSubmissions"
     label="admin.wizard.submissions.nav_label"
   }}
-  {{#if showApi}}
+  {{#if this.showApi}}
     {{nav-item route="adminWizardsApi" label="admin.wizard.api.nav_label"}}
   {{/if}}
   {{nav-item route="adminWizardsLogs" label="admin.wizard.log.nav_label"}}
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-date-time-input.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-date-time-input.hbs
deleted file mode 100644
index 051ce6f8..00000000
--- a/assets/javascripts/discourse/templates/components/custom-wizard-date-time-input.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-{{#unless timeFirst}}
-  {{custom-wizard-date-input
-    date=date
-    relativeDate=relativeDate
-    onChange=(action "onChangeDate")
-    tabindex=dateTabindex
-  }}
-{{/unless}}
-
-{{#if showTime}}
-  {{custom-wizard-time-input
-    date=date
-    relativeDate=relativeDate
-    onChange=(action "onChangeTime")
-    tabindex=timeTabindex
-  }}
-{{/if}}
-
-{{#if timeFirst}}
-  {{custom-wizard-date-input
-    date=date
-    relativeDate=relativeDate
-    onChange=(action "onChangeDate")
-    tabindex=dateTabindex
-  }}
-{{/if}}
-
-{{#if clearable}}
-  {{d-button class="clear-date-time" icon="times" action=(action "onClear")}}
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-category.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-field-category.hbs
deleted file mode 100644
index ee777850..00000000
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-category.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-{{custom-wizard-category-selector
-  categories=categories
-  class=fieldClass
-  whitelist=field.content
-  onChange=(action (mut categories))
-  tabindex=field.tabindex
-  options=(hash maximum=field.limit)
-}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-date.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-field-date.hbs
deleted file mode 100644
index 14504896..00000000
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-date.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-{{custom-wizard-date-input
-  date=date
-  onChange=(action "onChange")
-  tabindex=field.tabindex
-  format=field.format
-}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-dropdown.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-field-dropdown.hbs
deleted file mode 100644
index f03bb975..00000000
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-dropdown.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-{{combo-box
-  class=fieldClass
-  value=field.value
-  content=field.content
-  tabindex=field.tabindex
-  onChange=(action "onChangeValue")
-  options=(hash none="select_kit.default_header_text")
-}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-group.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-field-group.hbs
deleted file mode 100644
index da487422..00000000
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-group.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-{{custom-wizard-group-selector
-  groups=site.groups
-  class=fieldClass
-  field=field
-  whitelist=field.content
-  value=field.value
-  tabindex=field.tabindex
-  onChange=(action (mut field.value))
-  options=(hash none="select_kit.default_header_text")
-}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-tag.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-field-tag.hbs
deleted file mode 100644
index 71ffe7d7..00000000
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-tag.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-{{custom-wizard-tag-chooser
-  tags=field.value
-  class=fieldClass
-  tabindex=field.tabindex
-  tagGroups=field.tag_groups
-  everyTag=true
-  options=(hash maximum=field.limit allowAny=field.can_create_tag)
-}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-topic.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-field-topic.hbs
deleted file mode 100644
index fbaf016b..00000000
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-topic.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-{{custom-wizard-topic-selector
-  topics=topics
-  category=field.category
-  onChange=(action "setValue")
-  options=(hash maximum=field.limit)
-}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-user-selector.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-field-user-selector.hbs
deleted file mode 100644
index 7261cf78..00000000
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-user-selector.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{custom-user-selector
-  usernames=field.value
-  placeholderKey=field.placeholder
-  tabindex=field.tabindex
-}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-field.hbs
deleted file mode 100644
index 0678ac73..00000000
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field.hbs
+++ /dev/null
@@ -1,38 +0,0 @@
-<label for={{field.id}} class="field-label">
-  {{html-safe field.translatedLabel}}
-</label>
-
-{{#if field.image}}
-  <div class="field-image"><img src={{field.image}} /></div>
-{{/if}}
-
-{{#if field.description}}
-  <div class="field-description">{{cookedDescription}}</div>
-{{/if}}
-
-{{#field-validators field=field as |validators|}}
-  {{#if inputComponentName}}
-    <div class="input-area">
-      {{component
-        inputComponentName
-        field=field
-        step=step
-        fieldClass=fieldClass
-        wizard=wizard
-        autocomplete=validators.autocomplete
-      }}
-    </div>
-  {{/if}}
-{{/field-validators}}
-
-{{#if field.char_counter}}
-  {{#if textType}}
-    {{wizard-char-counter field.value field.max_length}}
-  {{/if}}
-{{/if}}
-
-{{#if field.errorDescription}}
-  <div class="field-error-description">{{html-safe
-      field.errorDescription
-    }}</div>
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-similar-topic.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-similar-topic.hbs
deleted file mode 100644
index 2deaec45..00000000
--- a/assets/javascripts/discourse/templates/components/custom-wizard-similar-topic.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<a href={{topic.url}} target="_blank" rel="noopener noreferrer">
-  <span class="title">{{html-safe topic.fancy_title}}</span>
-  <div class="blurb"><RelativeDate @date={{@topic.created_at}} />
-    -
-    {{html-safe topic.blurb}}</div>
-</a>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/similar-topics-validator.hbs b/assets/javascripts/discourse/templates/components/similar-topics-validator.hbs
deleted file mode 100644
index 0849c020..00000000
--- a/assets/javascripts/discourse/templates/components/similar-topics-validator.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<label class={{currentStateClass}}>
-  {{#if currentState}}
-    {{#if insufficientCharactersCategories}}
-      {{html-safe (i18n currentStateKey catLinks=catLinks)}}
-    {{else}}
-      {{i18n currentStateKey}}
-    {{/if}}
-  {{/if}}
-</label>
-
-{{#if showSimilarTopics}}
-  {{custom-wizard-similar-topics topics=similarTopics}}
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/validator.hbs b/assets/javascripts/discourse/templates/components/validator.hbs
deleted file mode 100644
index a64c4e93..00000000
--- a/assets/javascripts/discourse/templates/components/validator.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{#if isValid}}
-  {{i18n validMessageKey}}
-{{else}}
-  {{i18n invalidMessageKey}}
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs
deleted file mode 100644
index 33e9ffa1..00000000
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="key mapper-block">
-  {{wizard-mapper-selector
-    selectorType="key"
-    inputType=inputType
-    value=pair.key
-    activeType=pair.key_type
-    options=options
-    onUpdate=onUpdate
-  }}
-</div>
-
-{{wizard-mapper-connector
-  connector=pair.connector
-  connectors=connectors
-  connectorType="pair"
-  inputType=inputType
-  options=options
-  onUpdate=onUpdate
-}}
-
-<div class="value mapper-block">
-  {{wizard-mapper-selector
-    selectorType="value"
-    inputType=inputType
-    value=pair.value
-    activeType=pair.value_type
-    options=options
-    onUpdate=onUpdate
-    connector=pair.connector
-  }}
-</div>
-
-{{#if showJoin}}
-  <span class="join-pair">&</span>
-{{/if}}
-
-{{#if showRemove}}
-  <a role="button" {{action removePair pair}} class="remove-pair">{{d-icon
-      "times"
-    }}</a>
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-selector-type.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-selector-type.hbs
deleted file mode 100644
index 2ef7f2a3..00000000
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-selector-type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{item.label}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs b/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs
deleted file mode 100644
index 7d18bdd6..00000000
--- a/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="select-kit-header-wrapper">
-
-  {{component
-    selectKit.options.selectedNameComponent
-    tabindex=tabindex
-    item=selectedContent
-    selectKit=selectKit
-    shouldDisplayClearableButton=shouldDisplayClearableButton
-  }}
-
-  {{#if subscriptionRequired}}
-    <span class="subscription-label">{{i18n selectorLabel}}</span>
-  {{/if}}
-
-  {{d-icon caretIcon class="caret-icon"}}
-</div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs b/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs
deleted file mode 100644
index 7d62bb8e..00000000
--- a/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-{{#if icons}}
-  <div class="icons">
-    <span class="selection-indicator"></span>
-    {{#each icons as |icon|}}
-      {{d-icon icon translatedtitle=(dasherize title)}}
-    {{/each}}
-  </div>
-{{/if}}
-
-<div class="texts">
-  <span class="name">{{html-safe label}}</span>
-  {{#if item.subscriptionRequired}}
-    <span class="subscription-label">{{i18n item.selectorLabel}}</span>
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
deleted file mode 100644
index 2f13ebe1..00000000
--- a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
+++ /dev/null
@@ -1,34 +0,0 @@
-{{d-editor value=value forcePreview=forcePreview placeholder=placeholder}}
-
-<div class="wizard-editor-gutter">
-  {{#if previewEnabled}}
-    {{d-button action=(action "togglePreview") translatedLabel=previewLabel}}
-  {{/if}}
-
-  {{#if fieldsEnabled}}
-    {{d-button action=(action "togglePopover") translatedLabel=popoverLabel}}
-
-    {{#if showPopover}}
-      <div class="wizard-editor-gutter-popover">
-        <label>
-          {{i18n "admin.wizard.action.post_builder.user_properties"}}
-          {{userPropertyList}}
-        </label>
-
-        {{#if hasWizardFields}}
-          <label>
-            {{i18n "admin.wizard.action.post_builder.wizard_fields"}}
-            {{wizardFieldList}}
-          </label>
-        {{/if}}
-
-        {{#if hasWizardActions}}
-          <label>
-            {{i18n "admin.wizard.action.post_builder.wizard_actions"}}
-            {{wizardActionList}}
-          </label>
-        {{/if}}
-      </div>
-    {{/if}}
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/custom-wizard-index.hbs b/assets/javascripts/discourse/templates/custom-wizard-index.hbs
index c03a5219..ec856423 100644
--- a/assets/javascripts/discourse/templates/custom-wizard-index.hbs
+++ b/assets/javascripts/discourse/templates/custom-wizard-index.hbs
@@ -1,7 +1,7 @@
-{{#if noAccess}}
-  {{custom-wizard-no-access
-    text=(i18n noAccessI18nKey)
-    wizardId=wizardId
-    reason=noAccessReason
-  }}
+{{#if this.noAccess}}
+  <CustomWizardNoAccess
+    @text={{i18n this.noAccessI18nKey}}
+    @wizardId=this.wizardId
+    @reason={{this.noAccessReason}}
+  />
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/custom-wizard-step.hbs b/assets/javascripts/discourse/templates/custom-wizard-step.hbs
index 135fb825..e7e1fc87 100644
--- a/assets/javascripts/discourse/templates/custom-wizard-step.hbs
+++ b/assets/javascripts/discourse/templates/custom-wizard-step.hbs
@@ -1,19 +1,19 @@
-{{#if stepMessage}}
-  <div class="step-message {{stepMessage.state}}">
+{{#if this.stepMessage}}
+  <div class="step-message {{this.stepMessage.state}}">
     <div class="text">
-      {{stepMessage.text}}
+      {{this.stepMessage.text}}
     </div>
-    {{#if showReset}}
+    {{#if this.showReset}}
       <a role="button" class="reset-wizard" {{action "resetWizard"}}>
         {{i18n "wizard.reset"}}
       </a>
     {{/if}}
   </div>
 {{/if}}
-{{#if step.permitted}}
+{{#if this.step.permitted}}
   {{custom-wizard-step
-    step=step
-    wizard=wizard
+    step=this.step
+    wizard=this.wizard
     goNext=(action "goNext")
     goBack=(action "goBack")
     showMessage=(action "showMessage")
diff --git a/assets/javascripts/discourse/templates/custom-wizard.hbs b/assets/javascripts/discourse/templates/custom-wizard.hbs
index c428dbc3..48ce4674 100644
--- a/assets/javascripts/discourse/templates/custom-wizard.hbs
+++ b/assets/javascripts/discourse/templates/custom-wizard.hbs
@@ -3,9 +3,9 @@
     {{outlet}}
   </div>
   <div class="wizard-footer">
-    {{#if customWizard}}
+    {{#if this.customWizard}}
       <img
-        src={{logoUrl}}
+        src={{this.logoUrl}}
         style="background-image: initial; width: 33px; height: 33px;"
       />
     {{else}}