diff --git a/README.md b/README.md
index 0190f16e..0c454685 100644
--- a/README.md
+++ b/README.md
@@ -4,22 +4,24 @@ The Custom Wizard Plugin lets you make forms for your Discourse forum. Better us
 
 <img src="https://camo.githubusercontent.com/593432f1fc9658ffca104065668cc88fa21dffcd3002cb78ffd50c71f33a2523/68747470733a2f2f706176696c696f6e2d6173736574732e6e7963332e63646e2e6469676974616c6f6365616e7370616365732e636f6d2f706c7567696e732f77697a6172642d7265706f7369746f72792d62616e6e65722e706e67" alt="" data-canonical-src="https://pavilion-assets.nyc3.cdn.digitaloceanspaces.com/plugins/wizard-repository-banner.png" style="max-width: 100%;" width="400">
 
+👋 Looking to report an issue? We're managing issues for this plugin using our [bug report wizard](https://coop.pavilion.tech/w/bug-report).
+
 ## Install
 
 If you're not sure how to install a plugin in Discourse, please follow the [plugin installation guide](https://meta.discourse.org/t/install-a-plugin/19157) or contact your Discourse hosting provider.
 
 ## Documentation
 
-[Read the full documentation here](https://discourse.pluginmanager.org/c/discourse-custom-wizard/documentation), or go directly to the relevant section
+[Read the full documentation here](https://coop.pavilion.tech/c/82), or go directly to the relevant section
 
-- [Wizard Administration](https://discourse.pluginmanager.org/t/wizard-administration)
-- [Wizard Settings](https://discourse.pluginmanager.org/t/wizard-settings)
-- [Step Settings](https://discourse.pluginmanager.org/t/step-settings)
-- [Field Settings](https://discourse.pluginmanager.org/t/field-settings)
-- [Conditional Settings](https://discourse.pluginmanager.org/t/conditional-settings)
-- [Field Interpolation](https://discourse.pluginmanager.org/t/field-interpolation)
-- [Wizard Examples and Templates](https://discourse.pluginmanager.org/t/wizard-examples-and-templates)
+- [Wizard Administration](https://coop.pavilion.tech/t/1602)
+- [Wizard Settings](https://coop.pavilion.tech/t/1614)
+- [Step Settings](https://coop.pavilion.tech/t/1735)
+- [Field Settings](https://coop.pavilion.tech/t/1580)
+- [Conditional Settings](https://coop.pavilion.tech/t/1673)
+- [Field Interpolation](https://coop.pavilion.tech/t/1557)
+- [Handling Dates and Times](https://coop.pavilion.tech/t/1708)
 
 ## Support
 
-- [Report a bug](https://discourse.pluginmanager.org/w/bug-report)
+- [Report an issue](https://coop.pavilion.tech/w/bug-report)
diff --git a/assets/javascripts/discourse/lib/wizard-schema.js.es6 b/assets/javascripts/discourse/lib/wizard-schema.js.es6
index 24bda1d3..47257d82 100644
--- a/assets/javascripts/discourse/lib/wizard-schema.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-schema.js.es6
@@ -244,6 +244,7 @@ const custom_field = {
 
 export function buildFieldTypes(types) {
   wizardSchema.field.types = types;
+  wizardSchema.field.type = Object.keys(types);
 }
 
 field.type = Object.keys(field.types);
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
index 038d22fb..1a48f9e2 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
@@ -65,13 +65,16 @@
   </div>
 
   <div class="setting-value">
-    {{combo-box
+    {{wizard-subscription-selector
       value=field.type
-      content=fieldTypes
+      feature="field"
+      attribute="type"
       onChange=(action "changeType")
+      wizard=wizard
       options=(hash
         none="admin.wizard.select_type"
-      )}}
+      )
+    }}
   </div>
 </div>
 
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
index c1aadd4b..e02c4014 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
@@ -117,6 +117,7 @@
   {{wizard-custom-field
     field=field
     step=step
+    wizard=wizard
     currentFieldId=currentField.id
     fieldTypes=fieldTypes
     removeField="removeField"