diff --git a/plugin.json b/plugin.json
index 0086f9e2..61b34e98 100644
--- a/plugin.json
+++ b/plugin.json
@@ -5,7 +5,7 @@
     "homepage_url": "https://github.com/mattermost/mattermost-plugin-demo",
     "support_url": "https://github.com/mattermost/mattermost-plugin-demo/issues",
     "icon_path": "assets/icon.svg",
-    "version": "0.8.0",
+    "version": "0.9.0",
     "min_server_version": "5.26.0",
     "server": {
         "executables": {
@@ -20,91 +20,119 @@
     "settings_schema": {
         "header": "Header: Configure your demo plugin settings below",
         "footer": "Footer: The code for this demo plugin can be found [here](https://github.com/mattermost/mattermost-plugin-demo)",
-        "settings": [{
-            "key": "ChannelName",
-            "display_name": "Channel Name",
-            "type": "text",
-            "help_text": "The channel to use as part of the demo plugin, created for each team automatically if it does not exist.",
-            "placeholder": "demo_plugin",
-            "default": "demo_plugin"
-        }, {
-            "key": "Username",
-            "display_name": "Username",
-            "type": "text",
-            "help_text": "The user to use as part of the demo plugin, created automatically if it does not exist.",
-            "placeholder": "demo_plugin",
-            "default": "demo_plugin"
-        }, {
-            "key": "LastName",
-            "display_name": "Demo User Last Name",
-            "type": "radio",
-            "help_text": "Select the last name for the demo user",
-            "default": "Plugin User",
-            "options": [{
-                "display_name": "Plugin User",
-                "value": "Plugin User"
-            }, {
-                "display_name": "Demoson III",
-                "value": "Demoson III"
-            }, {
-                "display_name": "McDemo",
-                "value": "McDemo"
-            }]
-        }, {
-            "key": "TextStyle",
-            "display_name": "Text Style",
-            "type": "dropdown",
-            "help_text": "Change the text style of the messages posted by this plugin",
-            "default": "",
-            "options": [{
-                "display_name": "none",
-                "value": ""
-            }, {
-                "display_name": "italics",
-                "value": "_"
-            }, {
-                "display_name": "bold",
-                "value": "**"
-            }]
-        }, {
-            "key": "RandomSecret",
-            "display_name": "Random Secret",
-            "type": "generated",
-            "help_text": "Generate a random string that the demo plugin will watch for. If the secret string is mentioned in any channel then the demo plugin will publish a special message.",
-            "regenerate_help_text": "Generate a new secret string.",
-            "default": "CFgcq9Hr9OKSevvqH_SH-mPlgVklmpUm"
-        }, {
-            "key": "SecretMessage",
-            "display_name": "Secret Message",
-            "type": "custom",
-            "help_text": "The message posted by the demo plugin when the secret phrase is detected.",
-            "default": "Yay! The random secret string was posted! Go to the settings page for this plugin in the system console to generate a new random secret."
-        }, {
-            "key": "CustomSetting",
-            "type": "custom"
-        }, {
-            "key": "EnableMentionUser",
-            "display_name": "Enable Mention User",
-            "type": "bool",
-            "help_text": "Enable or disable the demo plugin to tag a username on every message sent. The username value is set below.",
-            "default": false
-        }, {
-            "key": "MentionUser",
-            "display_name": "Mention User",
-            "type": "username",
-            "help_text": "Configure the username to be mentioned by the demo plugin. Must be enabled in the setting above.",
-            "placeholder": "demo_plugin",
-            "default": "demo_plugin"
-        }, {
-            "key": "secretNumber",
-            "display_name": "Secret Number",
-            "type": "number",
-            "help_text": "A secret number that the demo plugin will watch for. If the secret number is mentioned in any channel then the demo plugin will publish a special message.",
-            "placeholder": "Some secret number",
-            "default": 123
-        }]
+        "settings": [
+            {
+                "key": "ChannelName",
+                "display_name": "Channel Name",
+                "type": "text",
+                "help_text": "The channel to use as part of the demo plugin, created for each team automatically if it does not exist.",
+                "placeholder": "demo_plugin",
+                "default": "demo_plugin"
+            },
+            {
+                "key": "Username",
+                "display_name": "Username",
+                "type": "text",
+                "help_text": "The user to use as part of the demo plugin, created automatically if it does not exist.",
+                "placeholder": "demo_plugin",
+                "default": "demo_plugin"
+            },
+            {
+                "key": "LastName",
+                "display_name": "Demo User Last Name",
+                "type": "radio",
+                "help_text": "Select the last name for the demo user",
+                "placeholder": "",
+                "default": "Plugin User",
+                "options": [
+                    {
+                        "display_name": "Plugin User",
+                        "value": "Plugin User"
+                    },
+                    {
+                        "display_name": "Demoson III",
+                        "value": "Demoson III"
+                    },
+                    {
+                        "display_name": "McDemo",
+                        "value": "McDemo"
+                    }
+                ]
+            },
+            {
+                "key": "TextStyle",
+                "display_name": "Text Style",
+                "type": "dropdown",
+                "help_text": "Change the text style of the messages posted by this plugin",
+                "placeholder": "",
+                "default": "",
+                "options": [
+                    {
+                        "display_name": "none",
+                        "value": ""
+                    },
+                    {
+                        "display_name": "italics",
+                        "value": "_"
+                    },
+                    {
+                        "display_name": "bold",
+                        "value": "**"
+                    }
+                ]
+            },
+            {
+                "key": "RandomSecret",
+                "display_name": "Random Secret",
+                "type": "generated",
+                "help_text": "Generate a random string that the demo plugin will watch for. If the secret string is mentioned in any channel then the demo plugin will publish a special message.",
+                "regenerate_help_text": "Generate a new secret string.",
+                "placeholder": "",
+                "default": "CFgcq9Hr9OKSevvqH_SH-mPlgVklmpUm"
+            },
+            {
+                "key": "SecretMessage",
+                "display_name": "Secret Message",
+                "type": "custom",
+                "help_text": "The message posted by the demo plugin when the secret phrase is detected.",
+                "placeholder": "",
+                "default": "Yay! The random secret string was posted! Go to the settings page for this plugin in the system console to generate a new random secret."
+            },
+            {
+                "key": "CustomSetting",
+                "display_name": "",
+                "type": "custom",
+                "help_text": "",
+                "placeholder": "",
+                "default": null
+            },
+            {
+                "key": "EnableMentionUser",
+                "display_name": "Enable Mention User",
+                "type": "bool",
+                "help_text": "Enable or disable the demo plugin to tag a username on every message sent. The username value is set below.",
+                "placeholder": "",
+                "default": false
+            },
+            {
+                "key": "MentionUser",
+                "display_name": "Mention User",
+                "type": "username",
+                "help_text": "Configure the username to be mentioned by the demo plugin. Must be enabled in the setting above.",
+                "placeholder": "demo_plugin",
+                "default": "demo_plugin"
+            },
+            {
+                "key": "secretNumber",
+                "display_name": "Secret Number",
+                "type": "number",
+                "help_text": "A secret number that the demo plugin will watch for. If the secret number is mentioned in any channel then the demo plugin will publish a special message.",
+                "placeholder": "Some secret number",
+                "default": 123
+            }
+        ]
     },
-    "required_configuration" : {
+    "required_configuration": {
         "ServiceSettings": {
             "EnableGifPicker": true
         },
diff --git a/server/manifest.go b/server/manifest.go
index afb110ab..01f69e58 100644
--- a/server/manifest.go
+++ b/server/manifest.go
@@ -18,7 +18,7 @@ const manifestStr = `
   "homepage_url": "https://github.com/mattermost/mattermost-plugin-demo",
   "support_url": "https://github.com/mattermost/mattermost-plugin-demo/issues",
   "icon_path": "assets/icon.svg",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "min_server_version": "5.26.0",
   "server": {
     "executables": {
diff --git a/webapp/src/manifest.js b/webapp/src/manifest.js
index 49431cf2..9e261282 100644
--- a/webapp/src/manifest.js
+++ b/webapp/src/manifest.js
@@ -8,7 +8,7 @@ const manifest = JSON.parse(`
     "homepage_url": "https://github.com/mattermost/mattermost-plugin-demo",
     "support_url": "https://github.com/mattermost/mattermost-plugin-demo/issues",
     "icon_path": "assets/icon.svg",
-    "version": "0.8.0",
+    "version": "0.9.0",
     "min_server_version": "5.26.0",
     "server": {
         "executables": {