diff --git a/Composer/packages/server/schemas/sdk.en-US.uischema b/Composer/packages/server/schemas/sdk.en-US.uischema
index ee6a4a14c3..4e9c20df03 100644
--- a/Composer/packages/server/schemas/sdk.en-US.uischema
+++ b/Composer/packages/server/schemas/sdk.en-US.uischema
@@ -11,54 +11,6 @@
             }
         }
     },
-    "Microsoft.Ask": {
-        "form": {
-            "label": "Send a response to ask a question",
-            "subtitle": "Ask Activity"
-        }
-    },
-    "Microsoft.AttachmentInput": {
-        "form": {
-            "label": "Prompt for a file or an attachment",
-            "subtitle": "Attachment Input"
-        }
-    },
-    "Microsoft.ChoiceInput": {
-        "form": {
-            "label": "Prompt with multi-choice",
-            "subtitle": "Choice Input"
-        }
-    },
-    "Microsoft.ConfirmInput": {
-        "form": {
-            "label": "Prompt for confirmation",
-            "subtitle": "Confirm Input"
-        }
-    },
-    "Microsoft.DateTimeInput": {
-        "form": {
-            "label": "Prompt for a date or a time",
-            "subtitle": "Date Time Input"
-        }
-    },
-    "Microsoft.NumberInput": {
-        "form": {
-            "label": "Prompt for a number",
-            "subtitle": "Number Input"
-        }
-    },
-    "Microsoft.OAuthInput": {
-        "form": {
-            "label": "OAuth login",
-            "subtitle": "OAuth Input"
-        }
-    },
-    "Microsoft.TextInput": {
-        "form": {
-            "label": "Prompt for text",
-            "subtitle": "Text Input"
-        }
-    },
     "Microsoft.BeginDialog": {
         "form": {
             "label": "Begin a new dialog",
@@ -220,6 +172,54 @@
             "subtitle": "Trace Activity"
         }
     },
+    "Microsoft.Ask": {
+        "form": {
+            "label": "Send a response to ask a question",
+            "subtitle": "Ask Activity"
+        }
+    },
+    "Microsoft.AttachmentInput": {
+        "form": {
+            "label": "Prompt for a file or an attachment",
+            "subtitle": "Attachment Input"
+        }
+    },
+    "Microsoft.ChoiceInput": {
+        "form": {
+            "label": "Prompt with multi-choice",
+            "subtitle": "Choice Input"
+        }
+    },
+    "Microsoft.ConfirmInput": {
+        "form": {
+            "label": "Prompt for confirmation",
+            "subtitle": "Confirm Input"
+        }
+    },
+    "Microsoft.DateTimeInput": {
+        "form": {
+            "label": "Prompt for a date or a time",
+            "subtitle": "Date Time Input"
+        }
+    },
+    "Microsoft.NumberInput": {
+        "form": {
+            "label": "Prompt for a number",
+            "subtitle": "Number Input"
+        }
+    },
+    "Microsoft.OAuthInput": {
+        "form": {
+            "label": "OAuth login",
+            "subtitle": "OAuth Input"
+        }
+    },
+    "Microsoft.TextInput": {
+        "form": {
+            "label": "Prompt for text",
+            "subtitle": "Text Input"
+        }
+    },
     "Microsoft.OnActivity": {
         "form": {
             "label": "Activities",
diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json
index f3080f6c31..c2c78404c6 100644
--- a/Composer/packages/server/src/locales/en-US.json
+++ b/Composer/packages/server/src/locales/en-US.json
@@ -1010,9 +1010,6 @@
   "endofconversation_activity_4aa21306": {
     "message": "EndOfConversation activity"
   },
-  "english_us_1d884ccd": {
-    "message": "English (US)"
-  },
   "enter_a_manifest_url_to_add_a_new_skill_to_your_bo_57e9d660": {
     "message": "Enter a manifest url to add a new skill to your bot."
   },
@@ -1286,9 +1283,6 @@
   "if_this_problem_persists_please_file_an_issue_on_6fbc8e2b": {
     "message": "If this problem persists, please file an issue on"
   },
-  "if_turned_on_then_externally_stored_templates_will_3f487651": {
-    "message": "If turned on then externally stored templates will be selectable in the new bot flow template list"
-  },
   "if_you_already_have_a_luis_account_provide_the_inf_bede07a4": {
     "message": "If you already have a LUIS account, provide the information below. If you do not have an account yet, create a (free) account first."
   },
@@ -1823,9 +1817,6 @@
   "open_notification_panel_5796edb3": {
     "message": "Open notification panel"
   },
-  "open_skills_page_for_configuration_details_a2a484ea": {
-    "message": "Open Skills page for configuration details"
-  },
   "optional_221bcc9d": {
     "message": "Optional"
   },
@@ -2111,9 +2102,6 @@
   "reloading_49d2f661": {
     "message": "Reloading"
   },
-  "remote_templates_a23c242d": {
-    "message": "Remote templates"
-  },
   "remove_f47dc62a": {
     "message": "Remove"
   },
@@ -2369,12 +2357,12 @@
   "spaces_and_special_characters_are_not_allowed_20d47684": {
     "message": "Spaces and special characters are not allowed."
   },
+  "spaces_and_special_characters_are_not_allowed_use__2a61c454": {
+    "message": "Spaces and special characters are not allowed. Use letters, numbers, -, or _ and don''t use number at the beginning."
+  },
   "spaces_and_special_characters_are_not_allowed_use__48acec3c": {
     "message": "Spaces and special characters are not allowed. Use letters, numbers, -, or _."
   },
-  "spaces_and_special_characters_are_not_allowed_use__d24a8636": {
-    "message": "Spaces and special characters are not allowed. Use letters, numbers, -, or _, and begin the name with a letter."
-  },
   "specify_a_name_and_description_for_your_new_dialog_86eb3130": {
     "message": "Specify a name and description for your new dialog."
   },