diff --git a/Composer/packages/client/src/pages/design/creationModal.tsx b/Composer/packages/client/src/pages/design/creationModal.tsx
index 06897ea76c..c109971fff 100644
--- a/Composer/packages/client/src/pages/design/creationModal.tsx
+++ b/Composer/packages/client/src/pages/design/creationModal.tsx
@@ -29,7 +29,6 @@ interface CreationModalProps {
 export const CreationModal: React.FC<CreationModalProps> = (props) => {
   const {
     fetchStorages,
-    fetchTemplates,
     fetchFolderItemsByPath,
     setCreationFlowStatus,
     createFolder,
@@ -66,7 +65,7 @@ export const CreationModal: React.FC<CreationModalProps> = (props) => {
 
   const fetchResources = async () => {
     await fetchStorages();
-    fetchTemplates();
+    fetchTemplatesV2();
   };
 
   useEffect(() => {
@@ -103,6 +102,8 @@ export const CreationModal: React.FC<CreationModalProps> = (props) => {
         description: formData.description,
         location: formData.location,
         schemaUrl: formData.schemaUrl,
+        runtimeType: formData.runtimeType,
+        runtimeLanguage: formData.runtimeLanguage,
         appLocale,
         templateDir: formData?.pvaData?.templateDir,
         eTag: formData?.pvaData?.eTag,
@@ -124,16 +125,16 @@ export const CreationModal: React.FC<CreationModalProps> = (props) => {
     props.onDismiss?.();
   };
 
-  const handleDefineConversationSubmit = async (formData, templateId: string) => {
-    handleSubmit(formData, templateId);
-  };
-
   const handleSubmit = async (formData, templateId: string) => {
     handleDismiss();
     saveTemplateId(templateId);
     await handleCreateNew(formData, templateId);
   };
 
+  const handleDefineConversationSubmit = async (formData, templateId: string) => {
+    handleSubmit(formData, templateId);
+  };
+
   const handleCreateNext = async (templateId: string) => {
     setCreationFlowStatus(CreationFlowStatus.NEW_FROM_TEMPLATE);
     setTemplateId(templateId);
@@ -142,10 +143,10 @@ export const CreationModal: React.FC<CreationModalProps> = (props) => {
   const openBot = async (botFolder) => {
     handleDismiss();
     if (creationFlowType === 'Skill') {
-      addExistingSkillToBotProject(botFolder);
+      addExistingSkillToBotProject(botFolder.path, botFolder.storage);
       TelemetryClient.track('AddNewSkillCompleted');
     } else {
-      openProject(botFolder);
+      openProject(botFolder.path, botFolder.storage);
     }
   };
 
diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json
index 8b7a65eb2e..40592a4f8f 100644
--- a/Composer/packages/server/src/locales/en-US.json
+++ b/Composer/packages/server/src/locales/en-US.json
@@ -728,6 +728,9 @@
   "configure_ecb97e30": {
     "message": "Configure"
   },
+  "configure_title_1a4383b7": {
+    "message": "Configure { title }"
+  },
   "configured_8d0f4dc8": {
     "message": "Configured"
   },
@@ -818,6 +821,9 @@
   "copy_and_share_this_information_with_your_azure_ad_2ec77eeb": {
     "message": "Copy and share this information with your Azure admin. After your Luis key is provisioned, you will be ready to test your bot."
   },
+  "copy_and_share_this_information_with_your_azure_ad_a41b99ea": {
+    "message": "Copy and share this information with your Azure admin. After your Speech key is provisioned, you will be ready to test your bot with speech."
+  },
   "copy_content_for_translation_7affbcbb": {
     "message": "Copy content for translation"
   },
@@ -878,6 +884,9 @@
   "create_a_new_skill_manifest_or_select_which_one_yo_a97e9616": {
     "message": "Create a new skill manifest or select which one you want to edit"
   },
+  "create_a_new_speech_resource_c3c8fe60": {
+    "message": "Create a new Speech resource"
+  },
   "create_a_publishing_profile_a79c6808": {
     "message": "Create a publishing profile"
   },
@@ -947,6 +956,9 @@
   "create_new_qna_resources_ea2f7b37": {
     "message": "Create new QNA resources"
   },
+  "create_new_speech_resources_73a921be": {
+    "message": "Create new Speech resources"
+  },
   "create_or_edit_skill_manifest_8ad98da9": {
     "message": "Create or edit skill manifest"
   },
@@ -1091,9 +1103,6 @@
   "deleting_dialogid_failed_1d7cc05a": {
     "message": "Deleting \"{ dialogId }\" failed."
   },
-  "deleting_one_source_file_will_also_delete_qna_file_f3afd698": {
-    "message": "Deleting one source file will also delete qna files with the same name on other locales"
-  },
   "describe_your_skill_88554792": {
     "message": "Describe your skill"
   },
@@ -1139,6 +1148,9 @@
   "dialog_cancelled_cancel_dialog_event_3eba3d7e": {
     "message": "Dialog cancelled (Cancel dialog event)"
   },
+  "dialog_d99c0378": {
+    "message": "Dialog"
+  },
   "dialog_data_61d5539b": {
     "message": "Dialog data"
   },
@@ -1181,8 +1193,8 @@
   "dialogfactory_missing_schema_5c3255c4": {
     "message": "DialogFactory missing schema."
   },
-  "dialognum_plural_0_no_bots_1_one_bot_other_bots_ha_1cf10787": {
-    "message": "{ dialogNum, plural,\n     =0 {No bots}\n     =1 {One bot}\n  other {# bots}\n} have been found.\n            { dialogNum, select,\n      0 {}\n  other {Press down arrow key to navigate the search results}\n}"
+  "dialognum_plural_0_no_bots_have_1_one_bot_has_othe_549c9b69": {
+    "message": "{ dialogNum, plural,\n     =0 {No bots have}\n     =1 {One bot has}\n  other {# bots have}\n} been found.\n            { dialogNum, select,\n      0 {}\n  other {Press down arrow key to navigate the search results}\n}"
   },
   "dialogs_triggers_and_actions_8a39ffea": {
     "message": "Dialogs, triggers, and actions"
@@ -1238,6 +1250,9 @@
   "due_to_the_following_error_we_were_unable_to_succe_897e7abb": {
     "message": "Due to the following error, we were unable to successfully add your selected LUIS keys to your bot project:"
   },
+  "due_to_the_following_error_we_were_unable_to_succe_9e2dcd4a": {
+    "message": "Due to the following error, we were unable to successfully add your selected Speech keys to your bot project:"
+  },
   "duplicate_31cec192": {
     "message": "Duplicate"
   },
@@ -1379,8 +1394,8 @@
   "ensure_your_bot_can_understand_your_users_by_frequ_c3f5c722": {
     "message": "Ensure your bot can understand your users by frequently training your LUIS model."
   },
-  "enter_a_manifest_url_to_add_a_new_skill_to_your_bo_eb966c95": {
-    "message": "Enter a manifest URL to add a new skill to your bot."
+  "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."
   },
   "enter_a_max_value_14e8ba52": {
     "message": "Enter a max value"
@@ -1430,14 +1445,20 @@
   "enter_name_for_new_resource_group_96fe8ea8": {
     "message": "Enter name for new resource group"
   },
+  "enter_name_for_new_speech_resources_d4cd8f5d": {
+    "message": "Enter name for new Speech resources"
+  },
   "enter_qna_maker_subscription_key_d26b4bad": {
     "message": "Enter QnA Maker Subscription key"
   },
   "enter_qna_region_4dae87f5": {
     "message": "Enter QnA region"
   },
-  "enter_skill_host_endpoint_url_7489a83f": {
-    "message": "Enter Skill host endpoint URL"
+  "enter_skill_host_endpoint_url_e22eeab5": {
+    "message": "Enter Skill host endpoint url"
+  },
+  "enter_speech_region_7e86bace": {
+    "message": "Enter Speech region"
   },
   "entities_ef09392c": {
     "message": "Entities"
@@ -1490,6 +1511,9 @@
   "error_provisioning_25835400": {
     "message": "Error provisioning."
   },
+  "errorscount_plural_0_no_errors_1_one_error_other_e_a8c998bb": {
+    "message": "{ errorsCount, plural,\n     =0 {No errors}\n     =1 {One error}\n  other {# errors}\n}"
+  },
   "errorsmsg_8f5d3d85": {
     "message": "{ errorsMsg }"
   },
@@ -1553,6 +1577,9 @@
   "external_services_da7820ce": {
     "message": "External services"
   },
+  "external_skill_73e16d25": {
+    "message": "External skill"
+  },
   "extract_question_and_answer_pairs_from_an_online_f_7316548e": {
     "message": "Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. Learn more about knowledge base sources. Skip this step to add questions and answers manually after creation. The number of sources and file size you can add depends on the QnA service SKU you choose. Learn more about QnA Maker SKUs."
   },
@@ -1646,6 +1673,9 @@
   "form_b674666c": {
     "message": "form"
   },
+  "form_dialog_7327a4ff": {
+    "message": "Form dialog"
+  },
   "form_dialog_error_ba7c37fe": {
     "message": "Form dialog error"
   },
@@ -1658,9 +1688,15 @@
   "form_editor_7c2b02f0": {
     "message": "form editor"
   },
+  "form_field_8566629d": {
+    "message": "Form field"
+  },
   "form_title_baf85c7e": {
     "message": "form title"
   },
+  "form_trigger_e8828303": {
+    "message": "Form trigger"
+  },
   "form_wide_operations_1c1a73eb": {
     "message": "form-wide operations"
   },
@@ -1808,14 +1844,14 @@
   "import_as_new_35630827": {
     "message": "Import as new"
   },
-  "import_new_url_and_overwrite_5e463747": {
-    "message": "Import new URL and overwrite"
+  "import_new_url_and_overwrite_ef1f405e": {
+    "message": "Import new url and overwrite"
   },
   "import_schema_75659c5f": {
     "message": "Import schema"
   },
-  "import_url_62402b7c": {
-    "message": "Import URL"
+  "import_url_ccaa2f16": {
+    "message": "Import Url"
   },
   "import_your_bot_to_new_project_8751d82f": {
     "message": "Import your bot to new project"
@@ -1859,6 +1895,9 @@
   "input_your_details_below_to_create_a_new_qna_resou_82b28d39": {
     "message": "Input your details below to create a new QNA resource. You will be able to manage your new resource in the Azure portal. Learn more"
   },
+  "input_your_details_below_to_create_a_new_speech_re_51b79b16": {
+    "message": "Input your details below to create a new Speech resource. You will be able to manage your new resource in the Azure portal. Learn more"
+  },
   "insert_a_property_reference_in_memory_95d27746": {
     "message": "Insert a property reference in memory"
   },
@@ -1988,8 +2027,8 @@
   "knowledge_base_name_7d83bbe4": {
     "message": "Knowledge base name"
   },
-  "knowledge_qna_1a599dcf": {
-    "message": "Knowledge (QnA)"
+  "knowledge_qna_7a4e84f7": {
+    "message": "Knowledge(QnA)"
   },
   "knowledge_source_dd66f38f": {
     "message": "Knowledge source"
@@ -2054,6 +2093,9 @@
   "leave_product_tour_49585718": {
     "message": "Leave Product Tour?"
   },
+  "lg_e6ee5b4a": {
+    "message": "LG"
+  },
   "lg_editor_ee0184e6": {
     "message": "LG editor"
   },
@@ -2117,6 +2159,9 @@
   "loading_bde52856": {
     "message": "Loading"
   },
+  "loading_keys_22ceedc": {
+    "message": "Loading keys..."
+  },
   "local_bot_runtime_manager_812cbd0c": {
     "message": "Local bot runtime manager"
   },
@@ -2159,6 +2204,9 @@
   "looping_ddae56ff": {
     "message": "Looping"
   },
+  "lu_15572a02": {
+    "message": "LU"
+  },
   "lu_editor_d09fb2b0": {
     "message": "LU editor"
   },
@@ -2237,11 +2285,11 @@
   "manifest_editor_1426637": {
     "message": "manifest editor"
   },
-  "manifest_url_a6250c02": {
-    "message": "Manifest URL"
+  "manifest_url_30824e88": {
+    "message": "Manifest url"
   },
-  "manifest_url_can_not_be_accessed_ba43fc31": {
-    "message": "Manifest URL can not be accessed"
+  "manifest_url_can_not_be_accessed_a7f147b2": {
+    "message": "Manifest url can not be accessed"
   },
   "manifest_version_1edc004a": {
     "message": "Manifest Version"
@@ -2444,6 +2492,9 @@
   "no_existing_qna_resource_found_in_this_subscriptio_a547349b": {
     "message": "No existing QNA resource found in this subscription. Click “Next” to create new."
   },
+  "no_existing_speech_resource_found_in_this_subscrip_4bc27bc3": {
+    "message": "No existing Speech resource found in this subscription. Click “Next” to create a new one."
+  },
   "no_extensions_installed_4b925277": {
     "message": "No extensions installed"
   },
@@ -2669,8 +2720,8 @@
   "please_enter_an_event_name_a148275a": {
     "message": "Please enter an event name"
   },
-  "please_input_a_manifest_url_79cce9d5": {
-    "message": "Please input a manifest URL"
+  "please_input_a_manifest_url_d726edbf": {
+    "message": "Please input a manifest Url"
   },
   "please_input_regex_pattern_5cd659a2": {
     "message": "Please input regEx pattern"
@@ -2834,9 +2885,6 @@
   "publish_profile_to_configure_ca758e68": {
     "message": "Publish profile to configure:"
   },
-  "publish_profiles_36fb522d": {
-    "message": "Publish profiles"
-  },
   "publish_selected_bots_825bc03a": {
     "message": "Publish selected bots"
   },
@@ -2861,6 +2909,9 @@
   "publishing_name_to_publishtarget_failed_8677b68d": {
     "message": "Publishing { name } to { publishTarget } failed."
   },
+  "publishing_profile_6d7064ce": {
+    "message": "Publishing Profile"
+  },
   "publishing_target_46605bc5": {
     "message": "Publishing target"
   },
@@ -3050,6 +3101,9 @@
   "resource_group_41fc9245": {
     "message": "Resource group:"
   },
+  "resource_group_59eac426": {
+    "message": "Resource group"
+  },
   "resource_group_982beb22": {
     "message": "Resource Group"
   },
@@ -3230,6 +3284,9 @@
   "select_runtime_version_to_add_d63d383b": {
     "message": "Select runtime version to add"
   },
+  "select_speech_keys_3a21b942": {
+    "message": "Select Speech keys"
+  },
   "select_subscription_c5678611": {
     "message": "Select subscription"
   },
@@ -3242,6 +3299,9 @@
   "select_which_tasks_this_skill_can_perform_172b0eae": {
     "message": "Select which tasks this skill can perform"
   },
+  "select_your_azure_subscription_and_choose_from_exi_1e05256f": {
+    "message": "Select your Azure subscription and choose from existing Speech keys, or create a new Speech resource. Learn more"
+  },
   "select_your_azure_subscription_and_choose_from_exi_73b6e4d6": {
     "message": "Select your Azure subscription and choose from existing QNA keys, or create a new QNA resource. Learn more"
   },
@@ -3350,8 +3410,8 @@
   "skill_host_endpoint_4118a173": {
     "message": "Skill host endpoint"
   },
-  "skill_host_endpoint_url_702c277c": {
-    "message": "Skill host endpoint URL"
+  "skill_host_endpoint_url_e68b65f6": {
+    "message": "Skill host endpoint url"
   },
   "skill_manifest_endpoint_is_configured_improperly_e083731d": {
     "message": "Skill manifest endpoint is configured improperly"
@@ -3407,6 +3467,12 @@
   "speech_16063aed": {
     "message": "Speech"
   },
+  "speech_key_1ab3f84a": {
+    "message": "Speech key"
+  },
+  "speech_region_864a8a83": {
+    "message": "Speech region"
+  },
   "spoken_text_used_by_the_channel_to_render_audibly_d07c7427": {
     "message": "Spoken text used by the channel to render audibly."
   },
@@ -3572,6 +3638,12 @@
   "the_following_qna_key_has_been_successfully_added__7c97bbc0": {
     "message": "The following QnA key has been successfully added to your bot project:"
   },
+  "the_following_speech_key_has_been_successfully_add_4bf0b587": {
+    "message": "The following Speech key has been successfully added to your bot project:"
+  },
+  "the_following_speech_resource_was_successfully_cre_c4037861": {
+    "message": "The following Speech resource was successfully created and added to your bot project:"
+  },
   "the_main_dialog_is_the_foundation_of_every_bot_cre_d4a938ff": {
     "message": "The main dialog is the foundation of every bot created in Composer. There is only one main dialog and all other dialogs are children of it. It gets initialized every time your bot runs and is the entry point into the bot."
   },
@@ -3701,6 +3773,9 @@
   "tips_80d0da2b": {
     "message": "tips"
   },
+  "title_connection_eaec11f8": {
+    "message": "{ title } connection"
+  },
   "title_ee03d132": {
     "message": "Title"
   },
@@ -3764,6 +3839,12 @@
   "train_your_language_model_ee4cec6a": {
     "message": "Train your language model"
   },
+  "trigger_f0ee1fbf": {
+    "message": "Trigger"
+  },
+  "trigger_group_79a00ac6": {
+    "message": "Trigger group"
+  },
   "trigger_phrases_are_inputs_from_users_that_will_be_f8c61866": {
     "message": "Trigger phrases are inputs from users that will be used to train your LUIS model. This follows .lu file format."
   },
@@ -3869,11 +3950,11 @@
   "updating_scripts_e17a5722": {
     "message": "Updating scripts... "
   },
-  "url_22a5f3b8": {
-    "message": "URL"
+  "url_8c4ff7d2": {
+    "message": "Url"
   },
-  "url_should_start_with_http_or_https_c34632bb": {
-    "message": "URL should start with http:// or https://"
+  "url_should_start_with_http_s_9ca55d94": {
+    "message": "Url should start with http[s]://"
   },
   "use_custom_luis_authoring_key_9c71470b": {
     "message": "Use custom LUIS authoring key"
@@ -3965,6 +4046,9 @@
   "warning_aacb8c24": {
     "message": "Warning"
   },
+  "warningscount_plural_0_no_warnings_1_one_warning_o_347cc928": {
+    "message": "{ warningsCount, plural,\n     =0 {No warnings}\n     =1 {One warning}\n  other {# warnings}\n}"
+  },
   "warningsmsg_e2c04bfe": {
     "message": "{ warningsMsg }"
   },