diff --git a/applications/debug/file_browser_test/scenes/file_browser_scene_start.c b/applications/debug/file_browser_test/scenes/file_browser_scene_start.c
index 9211ff3bb2..9eb26944ff 100644
--- a/applications/debug/file_browser_test/scenes/file_browser_scene_start.c
+++ b/applications/debug/file_browser_test/scenes/file_browser_scene_start.c
@@ -19,7 +19,7 @@ bool file_browser_scene_start_on_event(void* context, SceneManagerEvent event) {
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
-        furi_string_set(app->file_path, ANY_PATH("badkb/demo_windows.txt"));
+        furi_string_set(app->file_path, ANY_PATH("badusb/demo_windows.txt"));
         scene_manager_next_scene(app->scene_manager, FileBrowserSceneBrowser);
         consumed = true;
     } else if(event.type == SceneManagerEventTypeTick) {
diff --git a/applications/external b/applications/external
index 820f4834f8..4ac5a1ca44 160000
--- a/applications/external
+++ b/applications/external
@@ -1 +1 @@
-Subproject commit 820f4834f8144987f99936d59e3265860fbf5cfc
+Subproject commit 4ac5a1ca4443eb98cc0ab88543baac64f38bd02d
diff --git a/applications/main/archive/helpers/archive_browser.h b/applications/main/archive/helpers/archive_browser.h
index 232ca5c604..6966dc8de5 100644
--- a/applications/main/archive/helpers/archive_browser.h
+++ b/applications/main/archive/helpers/archive_browser.h
@@ -14,7 +14,7 @@ static const char* tab_default_paths[] = {
     [ArchiveTabSubGhz] = EXT_PATH("subghz"),
     [ArchiveTabLFRFID] = EXT_PATH("lfrfid"),
     [ArchiveTabInfrared] = EXT_PATH("infrared"),
-    [ArchiveTabBadKb] = EXT_PATH("badkb"),
+    [ArchiveTabBadKb] = EXT_PATH("badusb"),
     [ArchiveTabU2f] = "/app:u2f",
     [ArchiveTabApplications] = EXT_PATH("apps"),
     [ArchiveTabSearch] = "/app:search",
diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c
index 081a5dfe82..a72dd3e653 100644
--- a/applications/main/bad_kb/bad_kb_app.c
+++ b/applications/main/bad_kb/bad_kb_app.c
@@ -29,7 +29,7 @@ static void bad_kb_app_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(app->scene_manager);
 }
 
-static void bad_kb_load_settings(BadKbApp* app) {
+void bad_kb_load_settings(BadKbApp* app) {
     furi_string_reset(app->keyboard_layout);
     BadKbConfig* cfg = &app->config;
 
diff --git a/applications/main/bad_kb/bad_kb_app_i.h b/applications/main/bad_kb/bad_kb_app_i.h
index 8618ea999e..e009f0e602 100644
--- a/applications/main/bad_kb/bad_kb_app_i.h
+++ b/applications/main/bad_kb/bad_kb_app_i.h
@@ -102,6 +102,8 @@ typedef enum {
 
 void bad_kb_app_show_loading_popup(BadKbApp* app, bool show);
 
+void bad_kb_load_settings(BadKbApp* app);
+
 int32_t bad_kb_conn_apply(BadKbApp* app);
 
 void bad_kb_conn_reset(BadKbApp* app);
diff --git a/applications/main/bad_kb/bad_kb_paths.h b/applications/main/bad_kb/bad_kb_paths.h
index 72685b905b..4ba1bbbabb 100644
--- a/applications/main/bad_kb/bad_kb_paths.h
+++ b/applications/main/bad_kb/bad_kb_paths.h
@@ -2,7 +2,7 @@
 
 #include <storage/storage.h>
 
-#define BAD_KB_APP_BASE_FOLDER EXT_PATH("badkb")
+#define BAD_KB_APP_BASE_FOLDER EXT_PATH("badusb")
 #define BAD_KB_KEYS_PATH BAD_KB_APP_BASE_FOLDER "/.badkb.keys"
 #define BAD_KB_SETTINGS_PATH BAD_KB_APP_BASE_FOLDER "/.badkb.settings"
 #define BAD_KB_APP_PATH_LAYOUT_FOLDER BAD_KB_APP_BASE_FOLDER "/assets/layouts"
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/ba-BA.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/ba-BA.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/ba-BA.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/ba-BA.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/cz_CS.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/cz_CS.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/cz_CS.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/cz_CS.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/da-DA.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/da-DA.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/da-DA.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/da-DA.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/de-CH.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/de-CH.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/de-CH.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/de-CH.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/de-DE.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/de-DE.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/de-DE.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/de-DE.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/dvorak.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/dvorak.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/dvorak.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/dvorak.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/en-UK.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/en-UK.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/en-UK.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/en-UK.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/en-US.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/en-US.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/en-US.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/en-US.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/es-ES.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/es-ES.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/es-ES.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/es-ES.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/fr-BE.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/fr-BE.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/fr-BE.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/fr-BE.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/fr-CA.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/fr-CA.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/fr-CA.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/fr-CA.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/fr-CH.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/fr-CH.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/fr-CH.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/fr-CH.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/fr-FR-mac.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/fr-FR-mac.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/fr-FR-mac.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/fr-FR-mac.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/fr-FR.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/fr-FR.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/fr-FR.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/fr-FR.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/hr-HR.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/hr-HR.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/hr-HR.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/hr-HR.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/hu-HU.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/hu-HU.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/hu-HU.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/hu-HU.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/it-IT-mac.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/it-IT-mac.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/it-IT-mac.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/it-IT-mac.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/it-IT.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/it-IT.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/it-IT.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/it-IT.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/nb-NO.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/nb-NO.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/nb-NO.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/nb-NO.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/nl-NL.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/nl-NL.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/nl-NL.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/nl-NL.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/pt-BR.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/pt-BR.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/pt-BR.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/pt-BR.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/pt-PT.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/pt-PT.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/pt-PT.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/pt-PT.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/si-SI.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/si-SI.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/si-SI.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/si-SI.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/sk-SK.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/sk-SK.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/sk-SK.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/sk-SK.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/sv-SE.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/sv-SE.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/sv-SE.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/sv-SE.kl
diff --git a/applications/main/bad_kb/resources/badkb/assets/layouts/tr-TR.kl b/applications/main/bad_kb/resources/badusb/assets/layouts/tr-TR.kl
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/assets/layouts/tr-TR.kl
rename to applications/main/bad_kb/resources/badusb/assets/layouts/tr-TR.kl
diff --git a/applications/main/bad_kb/resources/badkb/demo_android.txt b/applications/main/bad_kb/resources/badusb/demo_android.txt
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/demo_android.txt
rename to applications/main/bad_kb/resources/badusb/demo_android.txt
diff --git a/applications/main/bad_kb/resources/badkb/demo_ios.txt b/applications/main/bad_kb/resources/badusb/demo_ios.txt
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/demo_ios.txt
rename to applications/main/bad_kb/resources/badusb/demo_ios.txt
diff --git a/applications/main/bad_kb/resources/badkb/demo_macos.txt b/applications/main/bad_kb/resources/badusb/demo_macos.txt
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/demo_macos.txt
rename to applications/main/bad_kb/resources/badusb/demo_macos.txt
diff --git a/applications/main/bad_kb/resources/badkb/demo_windows.txt b/applications/main/bad_kb/resources/badusb/demo_windows.txt
similarity index 100%
rename from applications/main/bad_kb/resources/badkb/demo_windows.txt
rename to applications/main/bad_kb/resources/badusb/demo_windows.txt
diff --git a/applications/main/bad_kb/scenes/bad_kb_scene_file_select.c b/applications/main/bad_kb/scenes/bad_kb_scene_file_select.c
index 8846826850..790b02a854 100644
--- a/applications/main/bad_kb/scenes/bad_kb_scene_file_select.c
+++ b/applications/main/bad_kb/scenes/bad_kb_scene_file_select.c
@@ -8,15 +8,16 @@ static bool bad_kb_file_select(BadKbApp* bad_kb) {
 
     bad_kb_app_show_loading_popup(bad_kb, true);
     Storage* storage = furi_record_open(RECORD_STORAGE);
-    if(storage_dir_exists(storage, EXT_PATH("badusb"))) {
+    if(storage_dir_exists(storage, EXT_PATH("badkb"))) {
         DialogMessage* message = dialog_message_alloc();
-        dialog_message_set_header(message, "Migrate BadUSB?", 64, 0, AlignCenter, AlignTop);
+        dialog_message_set_header(message, "Migrate Scripts?", 64, 0, AlignCenter, AlignTop);
         dialog_message_set_buttons(message, "No", NULL, "Yes");
         dialog_message_set_text(
             message,
-            "A badusb folder was found!\n"
-            "Momentum uses the badkb folder.\n"
-            "Want to transfer the files?",
+            "Momentum uses the 'badusb'\n"
+            "folder for compatibility.\n"
+            "Want to migrate from\n"
+            "'badkb' folder?",
             64,
             32,
             AlignCenter,
@@ -25,7 +26,12 @@ static bool bad_kb_file_select(BadKbApp* bad_kb) {
         dialog_message_free(message);
         furi_record_close(RECORD_DIALOGS);
         if(res == DialogMessageButtonRight) {
-            storage_common_migrate(storage, EXT_PATH("badusb"), BAD_KB_APP_BASE_FOLDER);
+            storage_common_migrate(storage, EXT_PATH("badkb"), BAD_KB_APP_BASE_FOLDER);
+            if(bad_kb->conn_init_thread) {
+                furi_thread_join(bad_kb->conn_init_thread);
+            }
+            bad_kb_load_settings(bad_kb);
+            bad_kb_config_adjust(&bad_kb->config);
         }
     }
     storage_simply_mkdir(storage, BAD_KB_APP_BASE_FOLDER);