upd dronich

subghz things and remove rtos finally
remove rtos
2025-12-12 12:42:30 +04:00 · 2023-11-13 15:02:01 +04:00 · 2023-11-13 12:42:05 +04:00 · 2023-11-13 12:27:21 +04:00 · 2023-11-11 20:18:55 +04:00 · 2023-11-10 16:22:34 +09:00
3593 changed files with 193881 additions and 152939 deletions
--- a/.ci_files/anims_ofw.txt
+++ b/.ci_files/anims_ofw.txt
@@ -0,0 +1,177 @@
+Filetype: Flipper Animation Manifest
+Version: 1
+
+Name: L1_Waves_128x50
+Min butthurt: 0
+Max butthurt: 5
+Min level: 1
+Max level: 3
+Weight: 3
+
+Name: L1_Laptop_128x51
+Min butthurt: 0
+Max butthurt: 7
+Min level: 1
+Max level: 1
+Weight: 3
+
+Name: L1_Sleep_128x64
+Min butthurt: 0
+Max butthurt: 10
+Min level: 1
+Max level: 3
+Weight: 3
+
+Name: L1_Recording_128x51
+Min butthurt: 0
+Max butthurt: 8
+Min level: 1
+Max level: 1
+Weight: 3
+
+Name: L1_Furippa1_128x64
+Min butthurt: 0
+Max butthurt: 6
+Min level: 1
+Max level: 1
+Weight: 3
+
+Name: L1_Read_books_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 1
+Max level: 1
+Weight: 3
+
+Name: L1_Cry_128x64
+Min butthurt: 8
+Max butthurt: 13
+Min level: 1
+Max level: 3
+Weight: 3
+
+Name: L1_Boxing_128x64
+Min butthurt: 10
+Max butthurt: 13
+Min level: 1
+Max level: 3
+Weight: 3
+
+Name: L1_Mad_fist_128x64
+Min butthurt: 9
+Max butthurt: 13
+Min level: 1
+Max level: 3
+Weight: 3
+
+Name: L1_Mods_128x64
+Min butthurt: 0
+Max butthurt: 9
+Min level: 1
+Max level: 3
+Weight: 4
+
+Name: L1_Painting_128x64
+Min butthurt: 0
+Max butthurt: 7
+Min level: 1
+Max level: 3
+Weight: 3
+
+Name: L1_Leaving_sad_128x64
+Min butthurt: 14
+Max butthurt: 14
+Min level: 1
+Max level: 3
+Weight: 3
+
+Name: L1_Kaiju_128x64
+Min butthurt: 0
+Max butthurt: 10
+Min level: 1
+Max level: 3
+Weight: 4
+
+Name: L1_My_dude_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 1
+Max level: 3
+Weight: 4
+
+Name: L2_Wake_up_128x64
+Min butthurt: 0
+Max butthurt: 12
+Min level: 2
+Max level: 3
+Weight: 4
+
+Name: L2_Furippa2_128x64
+Min butthurt: 0
+Max butthurt: 6
+Min level: 2
+Max level: 2
+Weight: 3
+
+Name: L2_Hacking_pc_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 2
+Max level: 2
+Weight: 3
+
+Name: L2_Soldering_128x64
+Min butthurt: 0
+Max butthurt: 10
+Min level: 2
+Max level: 2
+Weight: 3
+
+Name: L2_Dj_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 2
+Max level: 3
+Weight: 4
+
+Name: L3_Furippa3_128x64
+Min butthurt: 0
+Max butthurt: 6
+Min level: 3
+Max level: 3
+Weight: 3
+
+Name: L3_Hijack_radio_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 3
+Max level: 3
+Weight: 3
+
+Name: L3_Lab_research_128x54
+Min butthurt: 0
+Max butthurt: 10
+Min level: 3
+Max level: 3
+Weight: 3
+
+Name: L1_Senpai_128x64
+Min butthurt: 0
+Max butthurt: 5
+Min level: 1
+Max level: 3
+Weight: 4
+
+Name: L1_Sad_song_128x64
+Min butthurt: 8
+Max butthurt: 13
+Min level: 1
+Max level: 3
+Weight: 4
+
+Name: L2_Coding_in_the_shell_128x64
+Min butthurt: 0
+Max butthurt: 12
+Min level: 2
+Max level: 3
+Weight: 4
--- a/.ci_files/rgb.patch
+++ b/.ci_files/rgb.patch
@@ -0,0 +1,677 @@
+diff --git a/applications/services/notification/notification_app.c b/applications/services/notification/notification_app.c
+index 5769ced..c5d3088 100644
+--- a/applications/services/notification/notification_app.c
+++ b/applications/services/notification/notification_app.c
+@@ -9,6 +9,7 @@
+ #include "notification.h"
+ #include "notification_messages.h"
+ #include "notification_app.h"
+#include "applications/settings/notification_settings/rgb_backlight.h"
+ 
+ #define TAG "NotificationSrv"
+ 
+@@ -589,6 +590,7 @@ int32_t notification_srv(void* p) {
+             break;
+         case SaveSettingsMessage:
+             notification_save_settings(app);
+            rgb_backlight_save_settings();
+             break;
+         }
+ 
+diff --git a/applications/settings/notification_settings/notification_settings_app.c b/applications/settings/notification_settings/notification_settings_app.c
+index 1955012..19d953d 100644
+--- a/applications/settings/notification_settings/notification_settings_app.c
+++ b/applications/settings/notification_settings/notification_settings_app.c
+@@ -3,6 +3,7 @@
+ #include <gui/modules/variable_item_list.h>
+ #include <gui/view_dispatcher.h>
+ #include <lib/toolbox/value_index.h>
+#include <applications/settings/notification_settings/rgb_backlight.h>
+ 
+ #define MAX_NOTIFICATION_SETTINGS 4
+ 
+@@ -20,6 +21,8 @@ static const NotificationSequence sequence_note_c = {
+     NULL,
+ };
+ 
+static VariableItem* temp_item;
+
+ #define CONTRAST_COUNT 11
+ const char* const contrast_text[CONTRAST_COUNT] = {
+     "-5",
+@@ -156,6 +159,59 @@ static void vibro_changed(VariableItem* item) {
+     notification_message(app->notification, &sequence_single_vibro);
+ }
+ 
+// Set RGB backlight color
+static void color_changed(VariableItem* item) {
+    NotificationAppSettings* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+    rgb_backlight_set_color(index);
+    variable_item_set_current_value_text(item, rgb_backlight_get_color_text(index));
+    notification_message(app->notification, &sequence_display_backlight_on);
+}
+
+// TODO: refactor and fix this
+static void color_set_custom_red(VariableItem* item) {
+    NotificationAppSettings* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+    rgb_backlight_set_custom_color(index, 0);
+    char valtext[4] = {};
+    snprintf(valtext, sizeof(valtext), "%d", index);
+    variable_item_set_current_value_text(item, valtext);
+    rgb_backlight_set_color(13);
+    rgb_backlight_update(app->notification->settings.display_brightness * 0xFF, true);
+    // Set to custom color explicitly
+    variable_item_set_current_value_index(temp_item, 13);
+    variable_item_set_current_value_text(temp_item, rgb_backlight_get_color_text(13));
+    notification_message(app->notification, &sequence_display_backlight_on);
+}
+static void color_set_custom_green(VariableItem* item) {
+    NotificationAppSettings* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+    rgb_backlight_set_custom_color(index, 1);
+    char valtext[4] = {};
+    snprintf(valtext, sizeof(valtext), "%d", index);
+    variable_item_set_current_value_text(item, valtext);
+    rgb_backlight_set_color(13);
+    rgb_backlight_update(app->notification->settings.display_brightness * 0xFF, true);
+    // Set to custom color explicitly
+    variable_item_set_current_value_index(temp_item, 13);
+    variable_item_set_current_value_text(temp_item, rgb_backlight_get_color_text(13));
+    notification_message(app->notification, &sequence_display_backlight_on);
+}
+static void color_set_custom_blue(VariableItem* item) {
+    NotificationAppSettings* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+    rgb_backlight_set_custom_color(index, 2);
+    char valtext[4] = {};
+    snprintf(valtext, sizeof(valtext), "%d", index);
+    variable_item_set_current_value_text(item, valtext);
+    rgb_backlight_set_color(13);
+    rgb_backlight_update(app->notification->settings.display_brightness * 0xFF, true);
+    // Set to custom color explicitly
+    variable_item_set_current_value_index(temp_item, 13);
+    variable_item_set_current_value_text(temp_item, rgb_backlight_get_color_text(13));
+    notification_message(app->notification, &sequence_display_backlight_on);
+}
+
+ static uint32_t notification_app_settings_exit(void* context) {
+     UNUSED(context);
+     return VIEW_NONE;
+@@ -180,8 +236,40 @@ static NotificationAppSettings* alloc_settings() {
+     variable_item_set_current_value_index(item, value_index);
+     variable_item_set_current_value_text(item, contrast_text[value_index]);
+ 
+    // RGB Colors
+    item = variable_item_list_add(
+        app->variable_item_list, "LCD Color", rgb_backlight_get_color_count(), color_changed, app);
+    value_index = rgb_backlight_get_settings()->display_color_index;
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, rgb_backlight_get_color_text(value_index));
+    temp_item = item;
+
+    // Custom Color - REFACTOR THIS
+    item = variable_item_list_add(
+        app->variable_item_list, "Custom Red", 255, color_set_custom_red, app);
+    value_index = rgb_backlight_get_settings()->custom_r;
+    variable_item_set_current_value_index(item, value_index);
+    char valtext[4] = {};
+    snprintf(valtext, sizeof(valtext), "%d", value_index);
+    variable_item_set_current_value_text(item, valtext);
+
+    item = variable_item_list_add(
+        app->variable_item_list, "Custom Green", 255, color_set_custom_green, app);
+    value_index = rgb_backlight_get_settings()->custom_g;
+    variable_item_set_current_value_index(item, value_index);
+    snprintf(valtext, sizeof(valtext), "%d", value_index);
+    variable_item_set_current_value_text(item, valtext);
+
+    item = variable_item_list_add(
+        app->variable_item_list, "Custom Blue", 255, color_set_custom_blue, app);
+    value_index = rgb_backlight_get_settings()->custom_b;
+    variable_item_set_current_value_index(item, value_index);
+    snprintf(valtext, sizeof(valtext), "%d", value_index);
+    variable_item_set_current_value_text(item, valtext);
+    // End of RGB
+
+     item = variable_item_list_add(
+-        app->variable_item_list, "LCD Backlight", BACKLIGHT_COUNT, backlight_changed, app);
+        app->variable_item_list, "LCD Brightness", BACKLIGHT_COUNT, backlight_changed, app);
+     value_index = value_index_float(
+         app->notification->settings.display_brightness, backlight_value, BACKLIGHT_COUNT);
+     variable_item_set_current_value_index(item, value_index);
+diff --git a/applications/settings/notification_settings/rgb_backlight.c b/applications/settings/notification_settings/rgb_backlight.c
+new file mode 100644
+index 0000000..98f0d3a
+--- /dev/null
+++ b/applications/settings/notification_settings/rgb_backlight.c
+@@ -0,0 +1,217 @@
+/*
+    RGB backlight FlipperZero driver
+    Copyright (C) 2022-2023 Victor Nikitchuk (https://github.com/quen0n)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "rgb_backlight.h"
+#include <furi_hal.h>
+#include <storage/storage.h>
+
+#define RGB_BACKLIGHT_SETTINGS_VERSION 6
+#define RGB_BACKLIGHT_SETTINGS_FILE_NAME ".rgb_backlight.settings"
+#define RGB_BACKLIGHT_SETTINGS_PATH INT_PATH(RGB_BACKLIGHT_SETTINGS_FILE_NAME)
+
+#define COLOR_COUNT (sizeof(colors) / sizeof(RGBBacklightColor))
+
+#define TAG "RGB Backlight"
+
+static RGBBacklightSettings rgb_settings = {
+    .version = RGB_BACKLIGHT_SETTINGS_VERSION,
+    .display_color_index = 0,
+    .custom_r = 254,
+    .custom_g = 254,
+    .custom_b = 254,
+    .settings_is_loaded = false};
+
+static const RGBBacklightColor colors[] = {
+    {"Orange", 255, 60, 0},
+    {"Yellow", 255, 144, 0},
+    {"Spring", 167, 255, 0},
+    {"Lime", 0, 255, 0},
+    {"Aqua", 0, 255, 127},
+    {"Cyan", 0, 210, 210},
+    {"Azure", 0, 127, 255},
+    {"Blue", 0, 0, 255},
+    {"Purple", 127, 0, 255},
+    {"Magenta", 210, 0, 210},
+    {"Pink", 255, 0, 127},
+    {"Red", 255, 0, 0},
+    {"White", 254, 210, 200},
+    {"Custom", 0, 0, 0},
+};
+
+uint8_t rgb_backlight_get_color_count(void) {
+    return COLOR_COUNT;
+}
+
+const char* rgb_backlight_get_color_text(uint8_t index) {
+    return colors[index].name;
+}
+
+void rgb_backlight_load_settings(void) {
+    // Do not load settings if we are in other boot modes than normal
+    if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {
+        rgb_settings.settings_is_loaded = true;
+        return;
+    }
+
+    // Wait for all required services to start and create their records
+    uint8_t timeout = 0;
+    while(!furi_record_exists(RECORD_STORAGE)) {
+        timeout++;
+        if(timeout > 150) {
+            rgb_settings.settings_is_loaded = true;
+            return;
+        }
+        furi_delay_ms(5);
+    }
+
+    RGBBacklightSettings settings;
+    File* file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
+    const size_t settings_size = sizeof(RGBBacklightSettings);
+
+    FURI_LOG_D(TAG, "loading settings from \"%s\"", RGB_BACKLIGHT_SETTINGS_PATH);
+    bool fs_result =
+        storage_file_open(file, RGB_BACKLIGHT_SETTINGS_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
+
+    if(fs_result) {
+        uint16_t bytes_count = storage_file_read(file, &settings, settings_size);
+
+        if(bytes_count != settings_size) {
+            fs_result = false;
+        }
+    }
+
+    if(fs_result) {
+        FURI_LOG_D(TAG, "load success");
+        if(settings.version != RGB_BACKLIGHT_SETTINGS_VERSION) {
+            FURI_LOG_E(
+                TAG,
+                "version(%d != %d) mismatch",
+                settings.version,
+                RGB_BACKLIGHT_SETTINGS_VERSION);
+        } else {
+            memcpy(&rgb_settings, &settings, settings_size);
+        }
+    } else {
+        FURI_LOG_E(TAG, "load failed, %s", storage_file_get_error_desc(file));
+    }
+
+    storage_file_close(file);
+    storage_file_free(file);
+    furi_record_close(RECORD_STORAGE);
+    rgb_settings.settings_is_loaded = true;
+};
+
+void rgb_backlight_save_settings(void) {
+    RGBBacklightSettings settings;
+    File* file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
+    const size_t settings_size = sizeof(RGBBacklightSettings);
+
+    FURI_LOG_D(TAG, "saving settings to \"%s\"", RGB_BACKLIGHT_SETTINGS_PATH);
+
+    memcpy(&settings, &rgb_settings, settings_size);
+
+    bool fs_result =
+        storage_file_open(file, RGB_BACKLIGHT_SETTINGS_PATH, FSAM_WRITE, FSOM_CREATE_ALWAYS);
+
+    if(fs_result) {
+        uint16_t bytes_count = storage_file_write(file, &settings, settings_size);
+
+        if(bytes_count != settings_size) {
+            fs_result = false;
+        }
+    }
+
+    if(fs_result) {
+        FURI_LOG_D(TAG, "save success");
+    } else {
+        FURI_LOG_E(TAG, "save failed, %s", storage_file_get_error_desc(file));
+    }
+
+    storage_file_close(file);
+    storage_file_free(file);
+    furi_record_close(RECORD_STORAGE);
+};
+
+RGBBacklightSettings* rgb_backlight_get_settings(void) {
+    if(!rgb_settings.settings_is_loaded) {
+        rgb_backlight_load_settings();
+    }
+    return &rgb_settings;
+}
+
+void rgb_backlight_set_color(uint8_t color_index) {
+    if(color_index > (rgb_backlight_get_color_count() - 1)) color_index = 0;
+    rgb_settings.display_color_index = color_index;
+}
+
+void rgb_backlight_set_custom_color(uint8_t color, uint8_t index) {
+    if(index > 2) return;
+    if(index == 0) {
+        rgb_settings.custom_r = color;
+    } else if(index == 1) {
+        rgb_settings.custom_g = color;
+    } else if(index == 2) {
+        rgb_settings.custom_b = color;
+    }
+}
+
+void rgb_backlight_update(uint8_t brightness, bool bypass) {
+    if(!rgb_settings.settings_is_loaded) {
+        rgb_backlight_load_settings();
+    }
+
+    if(!bypass) {
+        static uint8_t last_color_index = 255;
+        static uint8_t last_brightness = 123;
+
+        if(last_brightness == brightness && last_color_index == rgb_settings.display_color_index) {
+            return;
+        }
+
+        last_brightness = brightness;
+        last_color_index = rgb_settings.display_color_index;
+    }
+
+    for(uint8_t i = 0; i < SK6805_get_led_count(); i++) {
+        if(rgb_settings.display_color_index == 13) {
+            uint8_t r = rgb_settings.custom_r * (brightness / 255.0f);
+            uint8_t g = rgb_settings.custom_g * (brightness / 255.0f);
+            uint8_t b = rgb_settings.custom_b * (brightness / 255.0f);
+
+            SK6805_set_led_color(i, r, g, b);
+        } else {
+            if((colors[rgb_settings.display_color_index].red == 0) &&
+               (colors[rgb_settings.display_color_index].green == 0) &&
+               (colors[rgb_settings.display_color_index].blue == 0)) {
+                uint8_t r = colors[0].red * (brightness / 255.0f);
+                uint8_t g = colors[0].green * (brightness / 255.0f);
+                uint8_t b = colors[0].blue * (brightness / 255.0f);
+
+                SK6805_set_led_color(i, r, g, b);
+            } else {
+                uint8_t r = colors[rgb_settings.display_color_index].red * (brightness / 255.0f);
+                uint8_t g = colors[rgb_settings.display_color_index].green * (brightness / 255.0f);
+                uint8_t b = colors[rgb_settings.display_color_index].blue * (brightness / 255.0f);
+
+                SK6805_set_led_color(i, r, g, b);
+            }
+        }
+    }
+
+    SK6805_update();
+}
+diff --git a/applications/settings/notification_settings/rgb_backlight.h b/applications/settings/notification_settings/rgb_backlight.h
+new file mode 100644
+index 0000000..68dacda
+--- /dev/null
+++ b/applications/settings/notification_settings/rgb_backlight.h
+@@ -0,0 +1,91 @@
+/*
+    RGB backlight FlipperZero driver
+    Copyright (C) 2022-2023 Victor Nikitchuk (https://github.com/quen0n)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include <furi.h>
+#include "SK6805.h"
+
+typedef struct {
+    char* name;
+    uint8_t red;
+    uint8_t green;
+    uint8_t blue;
+} RGBBacklightColor;
+
+typedef struct {
+    uint8_t version;
+    uint8_t display_color_index;
+    uint8_t custom_r;
+    uint8_t custom_g;
+    uint8_t custom_b;
+    bool settings_is_loaded;
+} RGBBacklightSettings;
+
+/**
+ * @brief Получить текущие настройки RGB-подсветки
+ *
+ * @return Указатель на структуру настроек
+ */
+RGBBacklightSettings* rgb_backlight_get_settings(void);
+
+/**
+ * @brief Загрузить настройки подсветки с SD-карты
+ */
+void rgb_backlight_load_settings(void);
+
+/**
+ * @brief Сохранить текущие настройки RGB-подсветки
+ */
+void rgb_backlight_save_settings(void);
+
+/**
+ * @brief Применить текущие настройки RGB-подсветки
+ *
+ * @param brightness Яркость свечения (0-255)
+ * @param bypass Применить настройки принудительно
+ */
+void rgb_backlight_update(uint8_t brightness, bool bypass);
+
+/**
+ * @brief Установить цвет RGB-подсветки
+ *
+ * @param color_index Индекс цвета (0 - rgb_backlight_get_color_count())
+ */
+void rgb_backlight_set_color(uint8_t color_index);
+
+/**
+ * @brief Set custom color values by index - 0=R 1=G 2=B
+ *
+ * @param color - color value (0-255)
+ * @param index - color index (0-2) 0=R 1=G 2=B
+ */
+void rgb_backlight_set_custom_color(uint8_t color, uint8_t index);
+
+/**
+ * @brief Получить количество доступных цветов
+ *
+ * @return Число доступных вариантов цвета
+ */
+uint8_t rgb_backlight_get_color_count(void);
+
+/**
+ * @brief Получить текстовое название цвета
+ *
+ * @param index Индекс из доступных вариантов цвета
+ * @return Указатель на строку с названием цвета
+ */
+const char* rgb_backlight_get_color_text(uint8_t index);
+\ No newline at end of file
+diff --git a/firmware/targets/f7/furi_hal/furi_hal_light.c b/firmware/targets/f7/furi_hal/furi_hal_light.c
+index 83e1603..45798ca 100644
+--- a/firmware/targets/f7/furi_hal/furi_hal_light.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_light.c
+@@ -3,6 +3,7 @@
+ #include <furi_hal_light.h>
+ #include <lp5562.h>
+ #include <stdint.h>
+#include <applications/settings/notification_settings/rgb_backlight.h>
+ 
+ #define LED_CURRENT_RED 50
+ #define LED_CURRENT_GREEN 50
+@@ -31,22 +32,21 @@ void furi_hal_light_init() {
+ }
+ 
+ void furi_hal_light_set(Light light, uint8_t value) {
+-    furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
+-    if(light & LightRed) {
+-        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelRed, value);
+-    }
+-    if(light & LightGreen) {
+-        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelGreen, value);
+-    }
+-    if(light & LightBlue) {
+-        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value);
+-    }
+     if(light & LightBacklight) {
+-        uint8_t prev = lp5562_get_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelWhite);
+-        lp5562_execute_ramp(
+-            &furi_hal_i2c_handle_power, LP5562Engine1, LP5562ChannelWhite, prev, value, 100);
+        rgb_backlight_update(value, false);
+    } else {
+        furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
+        if(light & LightRed) {
+            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelRed, value);
+        }
+        if(light & LightGreen) {
+            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelGreen, value);
+        }
+        if(light & LightBlue) {
+            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value);
+        }
+        furi_hal_i2c_release(&furi_hal_i2c_handle_power);
+     }
+-    furi_hal_i2c_release(&furi_hal_i2c_handle_power);
+ }
+ 
+ void furi_hal_light_blink_start(Light light, uint8_t brightness, uint16_t on_time, uint16_t period) {
+diff --git a/lib/drivers/SK6805.c b/lib/drivers/SK6805.c
+new file mode 100644
+index 0000000..572e1df
+--- /dev/null
+++ b/lib/drivers/SK6805.c
+@@ -0,0 +1,101 @@
+/*
+    SK6805 FlipperZero driver
+    Copyright (C) 2022-2023 Victor Nikitchuk (https://github.com/quen0n)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "SK6805.h"
+#include <furi_hal.h>
+
+/* Настройки */
+#define SK6805_LED_COUNT 3 //Количество светодиодов на плате подсветки
+#define SK6805_LED_PIN &led_pin //Порт подключения светодиодов
+
+#ifdef FURI_DEBUG
+#define DEBUG_PIN &gpio_ext_pa7
+#define DEBUG_INIT() \
+    furi_hal_gpio_init(DEBUG_PIN, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh)
+#define DEBUG_SET_HIGH() furi_hal_gpio_write(DEBUG_PIN, true)
+#define DEBUG_SET_LOW() furi_hal_gpio_write(DEBUG_PIN, false)
+#else
+#define DEBUG_INIT()
+#define DEBUG_SET_HIGH()
+#define DEBUG_SET_LOW()
+#endif
+
+static const GpioPin led_pin = {.port = GPIOA, .pin = LL_GPIO_PIN_8};
+static uint8_t led_buffer[SK6805_LED_COUNT][3];
+
+void SK6805_init(void) {
+    DEBUG_INIT();
+    furi_hal_gpio_write(SK6805_LED_PIN, false);
+    furi_hal_gpio_init(SK6805_LED_PIN, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+}
+
+uint8_t SK6805_get_led_count(void) {
+    return (const uint8_t)SK6805_LED_COUNT;
+}
+void SK6805_set_led_color(uint8_t led_index, uint8_t r, uint8_t g, uint8_t b) {
+    furi_check(led_index < SK6805_LED_COUNT);
+
+    led_buffer[led_index][0] = g;
+    led_buffer[led_index][1] = r;
+    led_buffer[led_index][2] = b;
+}
+
+void SK6805_update(void) {
+    SK6805_init();
+    furi_kernel_lock();
+    uint32_t end;
+    /* Последовательная отправка цветов светодиодов */
+    for(uint8_t lednumber = 0; lednumber < SK6805_LED_COUNT; lednumber++) {
+        //Последовательная отправка цветов светодиода
+        for(uint8_t color = 0; color < 3; color++) {
+            //Последовательная отправка битов цвета
+            uint8_t i = 0b10000000;
+            while(i != 0) {
+                if(led_buffer[lednumber][color] & (i)) {
+                    furi_hal_gpio_write(SK6805_LED_PIN, true);
+                    DEBUG_SET_HIGH();
+                    end = DWT->CYCCNT + 30;
+                    //T1H 600 us (615 us)
+                    while(DWT->CYCCNT < end) {
+                    }
+                    furi_hal_gpio_write(SK6805_LED_PIN, false);
+                    DEBUG_SET_LOW();
+                    end = DWT->CYCCNT + 26;
+                    //T1L  600 us (587 us)
+                    while(DWT->CYCCNT < end) {
+                    }
+                } else {
+                    furi_hal_gpio_write(SK6805_LED_PIN, true);
+                    DEBUG_SET_HIGH();
+                    end = DWT->CYCCNT + 11;
+                    //T0H 300 ns (312 ns)
+                    while(DWT->CYCCNT < end) {
+                    }
+                    furi_hal_gpio_write(SK6805_LED_PIN, false);
+                    DEBUG_SET_LOW();
+                    end = DWT->CYCCNT + 43;
+                    //T0L 900 ns (890 ns)
+                    while(DWT->CYCCNT < end) {
+                    }
+                }
+                i >>= 1;
+            }
+        }
+    }
+    furi_kernel_unlock();
+}
+diff --git a/lib/drivers/SK6805.h b/lib/drivers/SK6805.h
+new file mode 100644
+index 0000000..7c58956
+--- /dev/null
+++ b/lib/drivers/SK6805.h
+@@ -0,0 +1,51 @@
+/*
+    SK6805 FlipperZero driver
+    Copyright (C) 2022-2023 Victor Nikitchuk (https://github.com/quen0n)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#ifndef SK6805_H_
+#define SK6805_H_
+
+#include <furi.h>
+
+/**
+ * @brief Инициализация линии управления подсветкой
+ */
+void SK6805_init(void);
+
+/**
+ * @brief Получить количество светодиодов в подсветке
+ *
+ * @return Количество светодиодов
+ */
+uint8_t SK6805_get_led_count(void);
+
+/**
+ * @brief Установить цвет свечения светодиода
+ *
+ * @param led_index номер светодиода (от 0 до SK6805_get_led_count())
+ * @param r значение красного (0-255)
+ * @param g значение зелёного (0-255)
+ * @param b значение синего (0-255)
+ */
+void SK6805_set_led_color(uint8_t led_index, uint8_t r, uint8_t g, uint8_t b);
+
+/**
+ * @brief Обновление состояния подсветки дисплея
+ */
+void SK6805_update(void);
+
+#endif /* SK6805_H_ */
+\ No newline at end of file
--- a/.clang-format
+++ b/.clang-format
@@ -1,86 +1,191 @@
+---
+Language:        Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: AlwaysBreak
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
+AlignArrayOfStructures: None
+AlignConsecutiveMacros: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveBitFields: None
+AlignConsecutiveDeclarations: None
 AlignEscapedNewlines: Left
-AlignOperands: true
+AlignOperands:   Align
 AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: true
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: true
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
 AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
+AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+  - __capability
 BinPackArguments: false
 BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
 BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: true
 BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
 BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: false
-ColumnLimit: 99
+ColumnLimit:     99
+CommentPragmas:  '^ IWYU pragma:'
+QualifierAlignment: Leave
 CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
+DeriveLineEnding: true
 DerivePointerAlignment: false
-DisableFormat: false
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
 ExperimentalAutoDetectBinPacking: false
+PackConstructorInitializers: BinPack
+BasedOnStyle:    ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+AllowAllConstructorInitializersOnNextLine: true
 FixNamespaceComments: false
-
-IncludeBlocks: Preserve
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Preserve
 IncludeCategories:
-  - Regex: '.*'
-    Priority: 1
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
 IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
 IndentCaseLabels: false
+IndentCaseBlocks: false
+IndentGotoLabels: true
 IndentPPDirectives: None
-IndentWidth: 4
+IndentExternBlock: AfterExternBlock
+IndentRequires:  false
+IndentWidth:     4
 IndentWrappedFunctionNames: true
+InsertTrailingCommas: None
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
 MacroBlockBegin: ''
-MacroBlockEnd: ''
+MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 4
+ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
-
-# Taken from git's rules
 PenaltyBreakAssignment: 10
 PenaltyBreakBeforeFirstCallParameter: 30
 PenaltyBreakComment: 10
 PenaltyBreakFirstLessLess: 0
+PenaltyBreakOpenParenthesis: 0
 PenaltyBreakString: 10
+PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 100
 PenaltyReturnTypeOnItsOwnLine: 60
-
+PenaltyIndentedWhitespace: 0
 PointerAlignment: Left
-ReflowComments: false
-SortIncludes: false
+PPIndentWidth:   -1
+ReferenceAlignment: Pointer
+ReflowComments:  false
+RemoveBracesLLVM: false
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    Never
+SortJavaStaticImport: Before
 SortUsingDeclarations: false
 SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: Never
+SpaceBeforeParensOptions:
+  AfterControlStatements: false
+  AfterForeachMacros: false
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   false
+  AfterOverloadedOperator: false
+  BeforeNonEmptyParentheses: false
+SpaceAroundPointerQualifiers: Default
 SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
 SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard: Cpp03
-TabWidth: 4
-UseTab: Never
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: Both
+Standard:        c++03
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        4
+UseCRLF:         false
+UseTab:          Never
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+...
+
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,73 +1,176 @@
 kind: pipeline
 type: docker
-name: "Build firmware"
+name: "Release firmware"
+
+platform:
+  os: linux
+  arch: amd64

 steps:
  - name: "Update submodules"
    image: alpine/git
    commands:
      - git submodule sync
-      - git -c protocol.version=2 submodule update --init --force --recursive
+      - git -c protocol.version=2 submodule update --init --force --recursive --jobs 4
      - git submodule foreach git config --local gc.auto 0
      - git log -1 --format='%H'

-  - name: "Build default fw"
+  - name: "Build clean"
+    image: hfdj/fztools
+    pull: never
+    commands:
+      - export DIST_SUFFIX=${DRONE_TAG}c
+      - export WORKFLOW_BRANCH_OR_TAG=release-cfw
+      - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - rm -rf applications/main/clock_app/resources/apps/
+      - rm -rf build/
+      - rm -rf dist/
+      - rm -rf .sconsign.dblite
+      - ./fbt COMPACT=1 DEBUG=0 updater_package
+      - mkdir artifacts-clean
+      - mv dist/f7-C/* artifacts-clean/
+      - ls -laS artifacts-clean
+      - ls -laS artifacts-clean/f7-update-${DRONE_TAG}c
+    environment:
+      FBT_TOOLS_CUSTOM_LINK:
+        from_secret: fbt_link
+
+  - name: "Build default"
    image: hfdj/fztools
    pull: never
    commands:
      - export DIST_SUFFIX=${DRONE_TAG}
-      - export WORKFLOW_BRANCH_OR_TAG=dev-cfw
+      - export WORKFLOW_BRANCH_OR_TAG=release-cfw
+      - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
+      - tar zxvf all-the-apps-base.tgz
+      - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
+      - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
+      - rm -rf base_pack_build
+      - rm -rf all-the-apps-base.tgz
+      - rm -f build/f7-firmware-C/toolbox/version.*
      - ./fbt COMPACT=1 DEBUG=0 updater_package
      - mkdir artifacts-default
      - mv dist/f7-C/* artifacts-default/
      - ls -laS artifacts-default
      - ls -laS artifacts-default/f7-update-${DRONE_TAG}
-      - sed -i 's/(version)/'${DRONE_TAG}'/g' CHANGELOG.md
-      - echo '# [Install via Web Updater](https://my.flipp.dev/?url=https://unleashedflip.com/builds/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=dev-cfw&version='${DRONE_TAG}')' >> CHANGELOG.md
    environment:
      FBT_TOOLS_CUSTOM_LINK:
        from_secret: fbt_link

-  - name: "Bundle resources"
-    image: kramos/alpine-zip
+  - name: "Build with extra apps"
+    image: hfdj/fztools
+    pull: never
    commands:
-      - mkdir sd-card
-      - mkdir -p sd-card/subghz/assets
-      - mkdir -p sd-card/nfc/assets
-      - mkdir -p sd-card/infrared/assets
-      - mkdir -p sd-card/unirf
-      - mkdir -p sd-card/rfidfuzzer
-      - mkdir -p sd-card/subplaylist
-      - mkdir -p sd-card/badusb/layouts
-      - cp assets/resources/badusb/layouts/* sd-card/badusb/layouts/
-      - cp assets/resources/subghz/assets/dangerous_settings sd-card/subghz/assets/dangerous_settings
-      - cp assets/resources/subghz/assets/setting_user sd-card/subghz/assets/setting_user
-      - cp assets/resources/subghz/assets/keeloq_mfcodes sd-card/subghz/assets/keeloq_mfcodes
-      - cp assets/resources/nfc/assets/mf_classic_dict.nfc sd-card/nfc/assets/mf_classic_dict.nfc
-      - cp assets/resources/infrared/assets/tv.ir sd-card/infrared/assets/tv.ir
-      - cp assets/resources/infrared/assets/ac.ir sd-card/infrared/assets/ac.ir
-      - cp assets/resources/infrared/assets/fans.ir sd-card/infrared/assets/fans.ir
-      - cp assets/resources/infrared/assets/projectors.ir sd-card/infrared/assets/projectors.ir
-      - cp assets/resources/infrared/assets/audio.ir sd-card/infrared/assets/audio.ir
-      - cp assets/resources/unirf/unirf_map_example.txt sd-card/unirf/unirf_map_example.txt
-      - cp assets/resources/rfidfuzzer/example_uids.txt sd-card/rfidfuzzer/example_uids.txt
-      - cp assets/resources/subplaylist/example_playlist.txt sd-card/subplaylist/example_playlist.txt
-      - cp assets/resources/Manifest sd-card/Manifest
-      - zip -r artifacts-default/sd-card-${DRONE_TAG}.zip sd-card
-      - rm -rf sd-card
-      - ls -laS artifacts-default
+      - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz
+      - tar zxvf all-the-apps-extra.tgz
+      - cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/
+      - rm -rf extra_pack_build
+      - export DIST_SUFFIX=${DRONE_TAG}e
+      - export WORKFLOW_BRANCH_OR_TAG=release-cfw
+      - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - rm -f build/f7-firmware-C/toolbox/version.*
+      - ./fbt COMPACT=1 DEBUG=0 updater_package
+      - mkdir artifacts-extra-apps
+      - mv dist/f7-C/* artifacts-extra-apps/
+      - ls -laS artifacts-extra-apps
+      - ls -laS artifacts-extra-apps/f7-update-${DRONE_TAG}e
+    environment:
+      FBT_TOOLS_CUSTOM_LINK:
+        from_secret: fbt_link
+
+  - name: "Build with RGB patch"
+    image: hfdj/fztools
+    pull: never
+    commands:
+      - git apply .ci_files/rgb.patch
+      - export DIST_SUFFIX=${DRONE_TAG}r
+      - export WORKFLOW_BRANCH_OR_TAG=release-cfw-rgb
+      - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - rm -f build/f7-firmware-C/toolbox/version.*
+      - ./fbt COMPACT=1 DEBUG=0 updater_package
+      - mkdir artifacts-rgb-patch
+      - mv dist/f7-C/* artifacts-rgb-patch/
+      - ls -laS artifacts-rgb-patch
+      - ls -laS artifacts-rgb-patch/f7-update-${DRONE_TAG}r
+    environment:
+      FBT_TOOLS_CUSTOM_LINK:
+        from_secret: fbt_link
+
+  - name: "Build with ofw anims"
+    image: hfdj/fztools
+    pull: never
+    commands:
+      - git clean -df
+      - git checkout -- .
+      - rm -f assets/dolphin/external/manifest.txt
+      - cp .ci_files/anims_ofw.txt assets/dolphin/external/manifest.txt
+      - rm -rf applications/main/clock_app/resources/apps/
+      - export DIST_SUFFIX=${DRONE_TAG}n
+      - export WORKFLOW_BRANCH_OR_TAG=no-custom-anims
+      - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - rm -f build/f7-firmware-C/toolbox/version.*
+      - ./fbt COMPACT=1 DEBUG=0 updater_package
+      - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
+      - tar zxvf all-the-apps-base.tgz
+      - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
+      - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
+      - rm -rf base_pack_build
+      - rm -rf all-the-apps-base.tgz
+      - rm -f build/f7-firmware-C/toolbox/version.*
+      - ./fbt COMPACT=1 DEBUG=0 updater_package
+      - mkdir artifacts-ofw-anims
+      - mv dist/f7-C/* artifacts-ofw-anims/
+      - ls -laS artifacts-ofw-anims
+      - ls -laS artifacts-ofw-anims/f7-update-${DRONE_TAG}n
+      - sed -i 's/(version)/'${DRONE_TAG}'/g' CHANGELOG.md
+      - echo '# [Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw/${DRONE_TAG}/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')' >> CHANGELOG.md
+      - echo '' >> CHANGELOG.md
+      - echo '### [Version with only main apps - Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c)' >> CHANGELOG.md
+      - echo '' >> CHANGELOG.md
+      - echo '### [Version without custom animations - Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)' >> CHANGELOG.md
+      - echo '' >> CHANGELOG.md
+      - echo '### [Version with RGB patch - only for hardware mod! - Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r)' >> CHANGELOG.md
+      - echo '' >> CHANGELOG.md
+      - echo '## [Version with Extra apps - Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)' >> CHANGELOG.md
+    environment:
+      FBT_TOOLS_CUSTOM_LINK:
+        from_secret: fbt_link

  - name: "Bundle self-update packages"
    image: kramos/alpine-zip
    commands:
-      - tar czpf artifacts-default/flipper-z-f7-update-${DRONE_TAG}.tgz -C artifacts-default f7-update-${DRONE_TAG}
+      - cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_TAG}e.tgz .
+      - cp artifacts-rgb-patch/flipper-z-f7-update-${DRONE_TAG}r.tgz .
+      - cp artifacts-clean/flipper-z-f7-update-${DRONE_TAG}c.tgz .
+      - cp artifacts-ofw-anims/flipper-z-f7-update-${DRONE_TAG}n.tgz .
      - cp artifacts-default/flipper-z-f7-update-${DRONE_TAG}.tgz .
+      - zip -r artifacts-extra-apps/flipper-z-f7-update-${DRONE_TAG}e.zip artifacts-extra-apps/f7-update-${DRONE_TAG}e
+      - zip -r artifacts-rgb-patch/flipper-z-f7-update-${DRONE_TAG}r.zip artifacts-rgb-patch/f7-update-${DRONE_TAG}r
+      - zip -r artifacts-clean/flipper-z-f7-update-${DRONE_TAG}c.zip artifacts-clean/f7-update-${DRONE_TAG}c
+      - zip -r artifacts-ofw-anims/flipper-z-f7-update-${DRONE_TAG}n.zip artifacts-ofw-anims/f7-update-${DRONE_TAG}n
      - zip -r artifacts-default/flipper-z-f7-update-${DRONE_TAG}.zip artifacts-default/f7-update-${DRONE_TAG}
+      - tar czpf artifacts-default/flipper-z-any-scripts-${DRONE_TAG}.tgz scripts
+      - rm -rf artifacts-extra-apps/f7-update-${DRONE_TAG}
+      - rm -rf artifacts-rgb-patch/f7-update-${DRONE_TAG}
+      - rm -rf artifacts-clean/f7-update-${DRONE_TAG}
+      - rm -rf artifacts-ofw-anims/f7-update-${DRONE_TAG}
      - rm -rf artifacts-default/f7-update-${DRONE_TAG}
+      - ls -laS artifacts-extra-apps
+      - ls -laS artifacts-rgb-patch
+      - ls -laS artifacts-clean
+      - ls -laS artifacts-ofw-anims
      - ls -laS artifacts-default
+      - mv artifacts-default/ ${DRONE_TAG}
+      - ls -laS ${DRONE_TAG}

-  - name: "Upload to updates server"
-    image: appleboy/drone-scp
+  - name: "Upload default to updates srv"
+    image: appleboy/drone-scp:linux-amd64
    settings:
      host:
        from_secret: dep_host
@@ -78,8 +181,74 @@ steps:
      port:
        from_secret: dep_port
      target:
-        from_secret: dep_target
-      source: flipper-z-f7-update-${DRONE_TAG}.tgz
+        from_secret: dep_target_new
+      source:
+        - ${DRONE_TAG}/*.tgz
+        - ${DRONE_TAG}/*.zip
+        - ${DRONE_TAG}/*.json
+        - ${DRONE_TAG}/*.elf
+        - ${DRONE_TAG}/*.dfu
+        - ${DRONE_TAG}/*.bin
+
+  - name: "Upload no-anims to updates srv"
+    image: appleboy/drone-scp:linux-amd64
+    settings:
+      host:
+        from_secret: dep_host
+      username:
+        from_secret: dep_user
+      password:
+        from_secret: dep_passwd
+      port:
+        from_secret: dep_port
+      target:
+        from_secret: dep_target_noanim
+      source: flipper-z-f7-update-${DRONE_TAG}n.tgz
+
+  - name: "Upload extra apps version to updates srv"
+    image: appleboy/drone-scp:linux-amd64
+    settings:
+      host:
+        from_secret: dep_host
+      username:
+        from_secret: dep_user
+      password:
+        from_secret: dep_passwd
+      port:
+        from_secret: dep_port
+      target:
+        from_secret: dep_target_extra
+      source: flipper-z-f7-update-${DRONE_TAG}e.tgz
+
+  - name: "Upload rgb patch version to updates srv"
+    image: appleboy/drone-scp:linux-amd64
+    settings:
+      host:
+        from_secret: dep_host
+      username:
+        from_secret: dep_user
+      password:
+        from_secret: dep_passwd
+      port:
+        from_secret: dep_port
+      target:
+        from_secret: dep_target_extra
+      source: flipper-z-f7-update-${DRONE_TAG}r.tgz
+
+  - name: "Upload clean version to updates srv"
+    image: appleboy/drone-scp:linux-amd64
+    settings:
+      host:
+        from_secret: dep_host
+      username:
+        from_secret: dep_user
+      password:
+        from_secret: dep_passwd
+      port:
+        from_secret: dep_port
+      target:
+        from_secret: dep_target_extra
+      source: flipper-z-f7-update-${DRONE_TAG}c.tgz

  - name: "Do Github release"
    image: ddplugins/github-release
@@ -91,9 +260,12 @@ steps:
      api_key:
        from_secret: github_apikey
      files:
-        - artifacts-default/*.tgz
-        - artifacts-default/*.zip
-        - artifacts-default/flipper-z-f7-full-${DRONE_TAG}.dfu
+        - ${DRONE_TAG}/*.tgz
+        - ${DRONE_TAG}/*.zip
+        - artifacts-ofw-anims/*.tgz
+        - artifacts-extra-apps/*.tgz
+        - artifacts-rgb-patch/*.tgz
+        - artifacts-clean/*.tgz
      title: ${DRONE_TAG}
      note: CHANGELOG.md
      checksum:
@@ -101,6 +273,17 @@ steps:
        - sha1
        - crc32

+  - name: "Trigger update server reindex"
+    image: hfdj/fztools
+    pull: never
+    environment:
+      UPD_KEY:
+        from_secret: git_update_serv_token
+      UPD_URL:
+        from_secret: git_update_server_url
+    commands:
+      - curl -X POST -F 'key='$UPD_KEY'' $UPD_URL
+
  - name: "Send files to telegram"
    image: appleboy/drone-telegram
    settings:
@@ -115,30 +298,71 @@ steps:
        Version: {{build.tag}}


-        [-Github-](https://github.com/Eng1n33r/flipperzero-firmware/releases/tag/${DRONE_TAG})
+        [-> Sponsor our project](https://boosty.to/mmxdev)


-        [-Install via Web Updater-](https://my.flipp.dev/?url=https://unleashedflip.com/builds/flipper-z-f7-update-${DRONE_TAG}.tgz&channel=dev-cfw&version=${DRONE_TAG})"
+        [-Github - Changelog-](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/${DRONE_TAG})
+
+
+        [-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
+
+
+        [-Download latest extra apps pack-](https://github.com/xMasterX/all-the-plugins/releases/latest)
+
+
+        [-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz&channel=release-cfw&version=${DRONE_TAG})
+
+
+        [-Version with only main apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_TAG}c.tgz&channel=release-cfw&version=${DRONE_TAG}c)
+
+
+        [-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-${DRONE_TAG}n.tgz&channel=release-cfw&version=${DRONE_TAG}n)
+
+
+        [-Version with RGB patch - only for hardware mod! - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_TAG}r.tgz&channel=release-cfw&version=${DRONE_TAG}r)
+
+
+        [-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_TAG}r.tgz)
+
+
+        [-Version with Extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_TAG}e.tgz&channel=release-cfw&version=${DRONE_TAG}e)"
      document:
-        - artifacts-default/flipper-z-f7-update-${DRONE_TAG}.tgz
+        - ${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz

  - name: "Send discord notification"
-    image: appleboy/drone-discord
+    image: hfdj/fztools
+    pull: never
+    environment:
+      DISCORD_WEBHOOK:
+        from_secret: dis_release_webhook
+    commands:
+      - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/discord.sh"
+      - chmod +x ./discord.sh
+      - ./discord.sh --text 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://github.com/xMasterX/all-the-plugins/releases/latest)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version with only main apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c)\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with RGB patch - only for hardware mod! - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz)\n\n[-Version with Extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)'
+
+  - name: "Send clean build to telegram"
+    image: appleboy/drone-telegram
    settings:
-      webhook_id:
-        from_secret: ds_wh_id
-      webhook_token:
-        from_secret: ds_wh_token
-      message: "New Unleashed firmware released!
+      token:
+        from_secret: tgtoken
+      to:
+        from_secret: tgid
+      format: markdown
+      message: "Build with only main apps:"
+      document:
+        - flipper-z-f7-update-${DRONE_TAG}c.tgz

-
-        Version: {{build.tag}}
-
-
-        [[Github]](https://github.com/Eng1n33r/flipperzero-firmware/releases/tag/${DRONE_TAG})
-
-
-        [-Install via Web Updater-](https://my.flipp.dev/?url=https://unleashedflip.com/builds/flipper-z-f7-update-${DRONE_TAG}.tgz&channel=dev-cfw&version=${DRONE_TAG})"
+  - name: "Send extra pack build to telegram"
+    image: appleboy/drone-telegram
+    settings:
+      token:
+        from_secret: tgtoken
+      to:
+        from_secret: tgid
+      format: markdown
+      message: "Build with extra apps pack:"
+      document:
+        - flipper-z-f7-update-${DRONE_TAG}e.tgz

 trigger:
  event:
@@ -146,3 +370,302 @@ trigger:

 node:
  typ: haupt
+
+---
+kind: pipeline
+type: docker
+name: "Dev build"
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: "Update submodules"
+    image: alpine/git
+    commands:
+      - git submodule sync
+      - git -c protocol.version=2 submodule update --init --force --recursive --jobs 4
+      - git submodule foreach git config --local gc.auto 0
+      - git log -1 --format='%H'
+
+  - name: "Build dev clean"
+    image: hfdj/fztools
+    pull: never
+    commands:
+      - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}c
+      - export WORKFLOW_BRANCH_OR_TAG=dev-cfw
+      - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - rm -rf applications/main/clock_app/resources/apps/
+      - rm -rf build/
+      - rm -rf dist/
+      - rm -rf .sconsign.dblite
+      - ./fbt COMPACT=1 DEBUG=0 updater_package
+      - mkdir artifacts-clean
+      - mv dist/f7-C/* artifacts-clean/
+      - ls -laS artifacts-clean
+      - ls -laS artifacts-clean/f7-update-${DRONE_BUILD_NUMBER}c
+    environment:
+      FBT_TOOLS_CUSTOM_LINK:
+        from_secret: fbt_link
+
+
+  - name: "Build dev default"
+    image: hfdj/fztools
+    pull: never
+    commands:
+      - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}
+      - export WORKFLOW_BRANCH_OR_TAG=dev-cfw
+      - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
+      - tar zxvf all-the-apps-base.tgz
+      - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
+      - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
+      - rm -rf base_pack_build
+      - rm -rf all-the-apps-base.tgz
+      - rm -f build/f7-firmware-C/toolbox/version.*
+      - ./fbt COMPACT=1 DEBUG=0 updater_package
+      - mkdir artifacts-default
+      - mv dist/f7-C/* artifacts-default/
+      - ls -laS artifacts-default
+      - ls -laS artifacts-default/f7-update-${DRONE_BUILD_NUMBER}
+    environment:
+      FBT_TOOLS_CUSTOM_LINK:
+        from_secret: fbt_link
+
+  - name: "Build dev with extra apps"
+    image: hfdj/fztools
+    pull: never
+    commands:
+      - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz
+      - tar zxvf all-the-apps-extra.tgz
+      - cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/
+      - rm -rf extra_pack_build
+      - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}e
+      - export WORKFLOW_BRANCH_OR_TAG=dev-cfw
+      - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - rm -f build/f7-firmware-C/toolbox/version.*
+      - ./fbt COMPACT=1 DEBUG=0 updater_package
+      - mkdir artifacts-extra-apps
+      - mv dist/f7-C/* artifacts-extra-apps/
+      - ls -laS artifacts-extra-apps
+      - ls -laS artifacts-extra-apps/f7-update-${DRONE_BUILD_NUMBER}e
+    environment:
+      FBT_TOOLS_CUSTOM_LINK:
+        from_secret: fbt_link
+
+  - name: "Build dev with rgb patch"
+    image: hfdj/fztools
+    pull: never
+    commands:
+      - git apply .ci_files/rgb.patch
+      - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}r
+      - export WORKFLOW_BRANCH_OR_TAG=dev-cfw-rgb
+      - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - rm -f build/f7-firmware-C/toolbox/version.*
+      - ./fbt COMPACT=1 DEBUG=0 updater_package
+      - mkdir artifacts-rgb-patch
+      - mv dist/f7-C/* artifacts-rgb-patch/
+      - ls -laS artifacts-rgb-patch
+      - ls -laS artifacts-rgb-patch/f7-update-${DRONE_BUILD_NUMBER}r
+    environment:
+      FBT_TOOLS_CUSTOM_LINK:
+        from_secret: fbt_link
+
+  - name: "Bundle self-update packages"
+    image: kramos/alpine-zip
+    commands:
+      - cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz .
+      - cp artifacts-rgb-patch/flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz .
+      - cp artifacts-clean/flipper-z-f7-update-${DRONE_BUILD_NUMBER}c.tgz .
+      - cp artifacts-default/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz .
+      - rm -rf artifacts-default/f7-update-${DRONE_BUILD_NUMBER}
+      - ls -laS artifacts-default
+      - mv artifacts-default/ dev
+      - ls -laS dev
+
+  - name: "Clean dev folder"
+    image: appleboy/drone-ssh:linux-amd64
+    settings:
+      host:
+        from_secret: dep_host
+      username:
+        from_secret: dep_user
+      password:
+        from_secret: dep_passwd
+      port:
+        from_secret: dep_port
+      command_timeout: 30s
+      script:
+        - cd web/unleashedflip.com/public_html/fw/dev && rm -f ./*
+
+  - name: "Upload default to updates srv"
+    image: appleboy/drone-scp:linux-amd64
+    settings:
+      host:
+        from_secret: dep_host
+      username:
+        from_secret: dep_user
+      password:
+        from_secret: dep_passwd
+      port:
+        from_secret: dep_port
+      target:
+        from_secret: dep_target_new
+      source:
+        - dev/*.tgz
+        - dev/*.zip
+        - dev/*.json
+        - dev/*.elf
+        - dev/*.dfu
+        - dev/*.bin
+
+  - name: "Upload extra apps version to updates srv"
+    image: appleboy/drone-scp:linux-amd64
+    settings:
+      host:
+        from_secret: dep_host
+      username:
+        from_secret: dep_user
+      password:
+        from_secret: dep_passwd
+      port:
+        from_secret: dep_port
+      target:
+        from_secret: dep_target_extra
+      source: flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz
+
+  - name: "Upload rgb patch version to updates srv"
+    image: appleboy/drone-scp:linux-amd64
+    settings:
+      host:
+        from_secret: dep_host
+      username:
+        from_secret: dep_user
+      password:
+        from_secret: dep_passwd
+      port:
+        from_secret: dep_port
+      target:
+        from_secret: dep_target_extra
+      source: flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz
+
+  - name: "Upload clean version to updates srv"
+    image: appleboy/drone-scp:linux-amd64
+    settings:
+      host:
+        from_secret: dep_host
+      username:
+        from_secret: dep_user
+      password:
+        from_secret: dep_passwd
+      port:
+        from_secret: dep_port
+      target:
+        from_secret: dep_target_extra
+      source: flipper-z-f7-update-${DRONE_BUILD_NUMBER}c.tgz
+
+  - name: "Trigger update server reindex"
+    image: hfdj/fztools
+    pull: never
+    environment:
+      UPD_KEY:
+        from_secret: git_update_serv_token
+      UPD_URL:
+        from_secret: git_update_server_url
+    commands:
+      - curl -X POST -F 'key='$UPD_KEY'' $UPD_URL
+
+  - name: "Send message to telegram"
+    image: appleboy/drone-telegram
+    settings:
+      token:
+        from_secret: tgtoken
+      to:
+        from_secret: tgid_dev
+      format: markdown
+      message: "Unleashed firmware dev build successful!
+
+
+        Build: {{build.number}}
+
+        Commit: https://github.com/DarkFlippers/unleashed-firmware/commit/{{commit.sha}}
+
+
+
+        [-> Sponsor our project](https://boosty.to/mmxdev)
+
+
+        [-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER})
+        
+
+        [-Version with only main apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}c.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER}c)
+        
+
+        [-Version with RGB patch - only for hardware mod! - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER}r)
+
+
+        [-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz)
+
+
+        [-Version with Extra apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER}e)"
+
+  - name: "Send build to telegram"
+    image: appleboy/drone-telegram
+    settings:
+      token:
+        from_secret: tgtoken
+      to:
+        from_secret: tgid_dev
+      format: markdown
+      message: "Regular Build:"
+      document:
+        - dev/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz
+
+  - name: "Send clean build to telegram"
+    image: appleboy/drone-telegram
+    settings:
+      token:
+        from_secret: tgtoken
+      to:
+        from_secret: tgid_dev
+      format: markdown
+      message: "Clean (Main apps only) Build:"
+      document:
+        - flipper-z-f7-update-${DRONE_BUILD_NUMBER}c.tgz
+
+  - name: "Send extra pack build to telegram"
+    image: appleboy/drone-telegram
+    settings:
+      token:
+        from_secret: tgtoken
+      to:
+        from_secret: tgid_dev
+      format: markdown
+      message: "Build with extra apps pack:"
+      document:
+        - flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz
+
+  - name: "Send discord notification"
+    image: hfdj/fztools
+    pull: never
+    environment:
+      DISCORD_WEBHOOK:
+        from_secret: dis_dev_webhook
+    commands:
+      - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/discord.sh"
+      - chmod +x ./discord.sh
+      - ./discord.sh --text 'Unleashed firmware dev build successful!\n\nBuild - '${DRONE_BUILD_NUMBER}'\n\nCommit - https://github.com/DarkFlippers/unleashed-firmware/commit/'${DRONE_COMMIT_SHA}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[-Version with Extra apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'e.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'e)\n\n[-Version with only main apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'c.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'c)\n\n[-Version with RGB patch - only for hardware mod! - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz)\n\n[-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}')'
+
+trigger:
+  branch:
+    - dev
+  event:
+    - push
+
+node:
+  typ: haupt
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+# Default
+* @xMasterX
+
+# Assets
+/assets/resources/infrared/assets/ @amec0e @Leptopt1los @xMasterX
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,7 @@
+patreon: mmxdev
+custom:
+  [
+    "https://boosty.to/mmxdev",
+    "https://pay.cloudtips.ru/p/7b3e9d65",
+    "https://yoomoney.ru/fundraise/XA49mgQLPA0.221209",
+  ]
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,5 +4,5 @@ contact_links:
    url: https://t.me/flipperzero_unofficial
    about: Unofficial Telegram chat
  - name: Discord
-    url: https://discord.gg/58D6E8BtTU
+    url: https://discord.unleashedflip.com
    about: Unofficial Discord Community
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,114 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+run-name: "CodeQL Analyze ${{ github.ref_name }} by @${{ github.ACTOR }}"
+
+on:
+  push:
+    branches: ["dev"]
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: [ "ubuntu-latest" ]
+    timeout-minutes: 60
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ["cpp"]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+    env:
+      PATH_SARIF_DIR: ".github/results.sarif"
+      PATH_SARIF_FILE: ".github/results.sarif/${{ matrix.language }}.sarif"
+      FBT_NO_SYNC: 0
+      DIST_SUFFIX: "codeql"
+      WORKFLOW_BRANCH_OR_TAG: release-cfw
+      LANG_CATEGORY: "/language:${{matrix.language}}"
+
+    steps:
+      - name: Checkout Firmware Files
+        uses: actions/checkout@v3
+        with:
+          clean: "true"
+          submodules: "true"
+          fetch-depth: "0"
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          setup-python-dependencies: true
+
+      - name: Resolve CodeQL Build Env
+        uses: github/codeql-action/resolve-environment@v2
+        with:
+          language: ${{ matrix.language }}
+          #debug: true
+
+      - name: Build Firmware
+        shell: bash
+        if: ${{ success() }}
+        run: |
+          ./fbt COMPACT=1 DEBUG=0 FBT_NO_SYNC=${{ env.FBT_NO_SYNC }}
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        if: ${{ success() }}
+        with:
+          threads: 4
+          category: "${{ env.LANG_CATEGORY }}"
+          output: "${{ env.PATH_SARIF_DIR }}"
+          upload-database: false
+          upload: "failure-only" # disable the upload here - we will upload in a different action
+
+      - name: Filter dirs for SARIF
+        uses: advanced-security/filter-sarif@v1
+        if: ${{ success() }}
+        with:
+          # filter out all test files unless they contain a sql-injection vulnerability
+          patterns: |
+            -build/**
+            -dist/**
+            -toolchain/**
+            -lib/**
+          input: "${{ env.PATH_SARIF_FILE }}"
+          output: "${{ env.PATH_SARIF_FILE }}"
+
+      - name: Upload CodeQL SARIF
+        uses: github/codeql-action/upload-sarif@v2
+        if: ${{ success() }}
+        with:
+          category: "${{ env.LANG_CATEGORY }}"
+          sarif_file: "${{ env.PATH_SARIF_FILE }}"
+
+      # optional: for debugging the uploaded sarif
+      # - name: Upload loc as a Build Artifact
+      #   uses: actions/upload-artifact@v3
+      #   with:
+      #     name: sarif-results
+      #     path: sarif-results
+      #     retention-days: 1
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
+*~
 *.swp
+*.swo
 *.gdb_history
+*.old


 # LSP
@@ -27,15 +30,9 @@ bindings/
 .mxproject
 Brewfile.lock.json

-# Visual Studio Code
-.vscode/
-
-# legendary cmake's
-build
-CMakeLists.txt
-
-# bundle output
-dist
+# Kate
+.kateproject
+.kateconfig

 # kde
 .directory
@@ -43,8 +40,21 @@ null.d

 # SCons
 .sconsign.dblite
+
+
+# Visual Studio Code
+/.vscode
+
+# bundle output
+/dist
+/artifacts-default
+/artifacts-ofw-anims
+/artifacts-rgb-patch
+/artifacts-extra-apps
+/artifacts-clean
+
 # SCons build dir
-build/
+/build

 # Toolchain
 /toolchain
@@ -55,3 +65,8 @@ openocd.log
 # PVS Studio temporary files
 .PVS-Studio/
 PVS-Studio.log
+*.PVS-Studio.*
+
+.gdbinit
+
+/fbt_options_local.py
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "lib/mlib"]
 	path = lib/mlib
 	url = https://github.com/P-p-H-d/mlib.git
-[submodule "lib/STM32CubeWB"]
-	path = lib/STM32CubeWB
-	url = https://github.com/Flipper-Zero/STM32CubeWB.git
 [submodule "lib/littlefs"]
 	path = lib/littlefs
 	url = https://github.com/littlefs-project/littlefs.git
@@ -13,6 +10,7 @@
 [submodule "assets/protobuf"]
 	path = assets/protobuf
 	url = https://github.com/flipperdevices/flipperzero-protobuf.git
+	shallow = false
 [submodule "lib/libusb_stm32"]
 	path = lib/libusb_stm32
 	url = https://github.com/flipperdevices/libusb_stm32.git
@@ -22,9 +20,25 @@
 [submodule "lib/microtar"]
 	path = lib/microtar
 	url = https://github.com/amachronic/microtar.git
-[submodule "lib/scons"]
-	path = lib/scons
-	url = https://github.com/SCons/scons.git
 [submodule "lib/mbedtls"]
 	path = lib/mbedtls
 	url = https://github.com/Mbed-TLS/mbedtls.git
+[submodule "lib/cxxheaderparser"]
+	path = lib/cxxheaderparser
+	url = https://github.com/robotpy/cxxheaderparser.git
+[submodule "lib/heatshrink"]
+	path = lib/heatshrink
+	url = https://github.com/flipperdevices/heatshrink.git
+[submodule "lib/st_cmsis_device_wb"]
+	path = lib/stm32wb_cmsis
+	url = https://github.com/STMicroelectronics/cmsis_device_wb
+[submodule "lib/stm32wbxx_hal_driver"]
+	path = lib/stm32wb_hal
+	url = https://github.com/STMicroelectronics/stm32wbxx_hal_driver
+[submodule "lib/stm32wb_copro"]
+	path = lib/stm32wb_copro
+	url = https://github.com/flipperdevices/stm32wb_copro.git
+[submodule "subghz_remote"]
+	path = applications/main/subghz_remote
+	url = https://github.com/DarkFlippers/SubGHz_Remote.git
+	branch = ufw_main_app
--- a/.pvsconfig
+++ b/.pvsconfig
@@ -1,10 +1,12 @@
 # MLib macros we can't do much about.
+//-V:M_LET:1048,1044
 //-V:M_EACH:1048,1044
 //-V:ARRAY_DEF:760,747,568,776,729,712,654
 //-V:LIST_DEF:760,747,568,712,729,654,776
 //-V:BPTREE_DEF2:779,1086,557,773,512
 //-V:DICT_DEF2:779,524,776,760,1044,1001,729,590,568,747,685
 //-V:ALGO_DEF:1048,747,1044
+//-V:TUPLE_DEF2:524,590,1001,760

 # Non-severe malloc/null pointer deref warnings
 //-V::522:2,3
@@ -15,8 +17,33 @@
 # Potentially null argument warnings
 //-V:memset:575
 //-V:memcpy:575
+//-V:memcmp:575
+//-V:strlen:575
 //-V:strcpy:575
+//-V:strncpy:575
 //-V:strchr:575

 # For loop warning on M_FOREACH
 //-V:for:1044
+
+# Bitwise OR
+//-V:bit:792
+
+# Do not complain about similar code
+//-V::525
+
+# Common embedded development pointer operations
+//-V::566
+//-V::1032
+
+# Warnings about length mismatch
+//-V:property_value_out:666
+
+# Model-related warnings
+//-V:with_view_model:1044,1048
+
+# Functions that always return the same error code
+//-V:picopass_device_decrypt:1048
+
+# Examples
+//V_EXCLUDE_PATH applications/examples/
--- a/.pvsoptions
+++ b/.pvsoptions
@@ -1 +1 @@
--rules-config .pvsconfig -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/ST25RFAL002 -e lib/STM32CubeWB -e lib/u8g2 -e */arm-none-eabi/*
+--ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/*
--- a/.vscode/.gitignore
+++ b/.vscode/.gitignore
@@ -1,4 +1,5 @@
-./c_cpp_properties.json
-./launch.json
-./settings.json
-./tasks.json
+/c_cpp_properties.json
+/extensions.json
+/launch.json
+/settings.json
+/tasks.json
--- a/.vscode/example/c_cpp_properties.json
+++ b/.vscode/example/c_cpp_properties.json
@@ -1,32 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Win32",
-            "compilerPath": "${workspaceFolder}/toolchain/i686-windows/bin/arm-none-eabi-gcc.exe",
-            "intelliSenseMode": "gcc-arm",
-            "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
-            "configurationProvider": "ms-vscode.cpptools",
-            "cStandard": "gnu17",
-            "cppStandard": "c++17"
-        },
-        {
-            "name": "Linux",
-            "compilerPath": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gcc",
-            "intelliSenseMode": "gcc-arm",
-            "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
-            "configurationProvider": "ms-vscode.cpptools",
-            "cStandard": "gnu17",
-            "cppStandard": "c++17"
-        },
-        {
-            "name": "Mac",
-            "compilerPath": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gcc",
-            "intelliSenseMode": "gcc-arm",
-            "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
-            "configurationProvider": "ms-vscode.cpptools",
-            "cStandard": "gnu17",
-            "cppStandard": "c++17"
-        }
-    ],
-    "version": 4
-}
--- a/.vscode/example/clangd/extensions.json
+++ b/.vscode/example/clangd/extensions.json
@@ -0,0 +1,19 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+	// List of extensions which should be recommended for users of this workspace.
+	"recommendations": [
+		"ms-python.black-formatter",
+		"llvm-vs-code-extensions.vscode-clangd",
+		"amiralizadeh9480.cpp-helper",
+		"marus25.cortex-debug",
+		"zxh404.vscode-proto3",
+		"augustocdias.tasks-shell-input"
+	],
+	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+	"unwantedRecommendations": [
+		"twxs.cmake",
+		"ms-vscode.cpptools",
+		"ms-vscode.cmake-tools"
+	]
+}
--- a/.vscode/example/cpptools/c_cpp_properties.json
+++ b/.vscode/example/cpptools/c_cpp_properties.json
@@ -0,0 +1,32 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "compilerPath": "${workspaceFolder}/toolchain/x86_64-windows/bin/arm-none-eabi-gcc.exe",
+            "intelliSenseMode": "gcc-arm",
+            "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
+            "configurationProvider": "ms-vscode.cpptools",
+            "cStandard": "gnu17",
+            "cppStandard": "c++17"
+        },
+        {
+            "name": "Linux",
+            "compilerPath": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gcc",
+            "intelliSenseMode": "gcc-arm",
+            "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
+            "configurationProvider": "ms-vscode.cpptools",
+            "cStandard": "gnu17",
+            "cppStandard": "c++17"
+        },
+        {
+            "name": "Mac",
+            "compilerPath": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gcc",
+            "intelliSenseMode": "gcc-arm",
+            "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
+            "configurationProvider": "ms-vscode.cpptools",
+            "cStandard": "gnu17",
+            "cppStandard": "c++17"
+        }
+    ],
+    "version": 4
+}
--- a/.vscode/example/cpptools/extensions.json
+++ b/.vscode/example/cpptools/extensions.json
@@ -0,0 +1,20 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+	// List of extensions which should be recommended for users of this workspace.
+	"recommendations": [
+		"ms-python.black-formatter",
+		"ms-vscode.cpptools",
+		"amiralizadeh9480.cpp-helper",
+		"marus25.cortex-debug",
+		"zxh404.vscode-proto3",
+		"augustocdias.tasks-shell-input",
+		"rioj7.command-variable"
+	],
+	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+	"unwantedRecommendations": [
+		"llvm-vs-code-extensions.vscode-clangd",
+		"twxs.cmake",
+		"ms-vscode.cmake-tools"
+	]
+}
--- a/.vscode/example/launch.json
+++ b/.vscode/example/launch.json
@@ -9,8 +9,12 @@
            "type": "command",
            "command": "shellCommand.execute",
            "args": {
-                "command": "./fbt get_blackmagic",
-                "description": "Get Blackmagic device",
+                "useSingleResult": true,
+                "env": {
+                    "PATH": "${workspaceFolder}${command:extension.commandvariable.envListSep}${env:PATH}"
+                },
+                "command": "fbt -s get_blackmagic",
+                "description": "Get Blackmagic device"
            }
        }
    ],
@@ -23,15 +27,21 @@
            "type": "cortex-debug",
            "servertype": "openocd",
            "device": "stlink",
-            "svdFile": "./debug/STM32WB55_CM4.svd",
+            "svdFile": "./scripts/debug/STM32WB55_CM4.svd",
+            // If you're debugging early in the boot process, before OS scheduler is running,
+            // you have to comment out the following line.
            "rtos": "FreeRTOS",
            "configFiles": [
                "interface/stlink.cfg",
-                "./debug/stm32wbx.cfg",
+                "./scripts/debug/stm32wbx.cfg",
            ],
            "postAttachCommands": [
-                // "attach 1",
-                "compare-sections",
+                "source scripts/debug/flipperversion.py",
+                "fw-version",
+                // "compare-sections",
+                "source scripts/debug/flipperapps.py",
+                "fap-set-debug-elf-root build/latest/.extapps",
+                // "source scripts/debug/FreeRTOS/FreeRTOS.py",
            ]
            // "showDevDebugOutput": "raw",
        },
@@ -43,14 +53,18 @@
            "type": "cortex-debug",
            "servertype": "external",
            "gdbTarget": "${input:BLACKMAGIC}",
-            "svdFile": "./debug/STM32WB55_CM4.svd",
+            "svdFile": "./scripts/debug/STM32WB55_CM4.svd",
            "rtos": "FreeRTOS",
            "postAttachCommands": [
                "monitor swdp_scan",
                "attach 1",
                "set confirm off",
                "set mem inaccessible-by-default off",
-                "compare-sections",
+                "source scripts/debug/flipperversion.py",
+                "fw-version",
+                "source scripts/debug/flipperapps.py",
+                "fap-set-debug-elf-root build/latest/.extapps",
+                // "compare-sections",
            ]
            // "showDevDebugOutput": "raw",
        },
@@ -63,18 +77,37 @@
            "servertype": "jlink",
            "interface": "swd",
            "device": "STM32WB55RG",
-            "svdFile": "./debug/STM32WB55_CM4.svd",
+            "svdFile": "./scripts/debug/STM32WB55_CM4.svd",
            "rtos": "FreeRTOS",
+            "postAttachCommands": [
+                "source scripts/debug/flipperversion.py",
+                "fw-version",
+                "source scripts/debug/flipperapps.py",
+                "fap-set-debug-elf-root build/latest/.extapps",
+            ]
            // "showDevDebugOutput": "raw",
        },
        {
-            "name": "fbt debug",
-            "type": "python",
-            "request": "launch",
-            "program": "./lib/scons/scripts/scons.py",
-            "args": [
-                "sdk"
-            ]
+            "name": "Attach FW (DAP)",
+            "cwd": "${workspaceFolder}",
+            "executable": "./build/latest/firmware.elf",
+            "request": "attach",
+            "type": "cortex-debug",
+            "servertype": "openocd",
+            "device": "cmsis-dap",
+            "svdFile": "./scripts/debug/STM32WB55_CM4.svd",
+            "rtos": "FreeRTOS",
+            "configFiles": [
+                "interface/cmsis-dap.cfg",
+                "./scripts/debug/stm32wbx.cfg",
+            ],
+            "postAttachCommands": [
+                "source scripts/debug/flipperversion.py",
+                "fw-version",
+                "source scripts/debug/flipperapps.py",
+                "fap-set-debug-elf-root build/latest/.extapps",
+            ],
+            // "showDevDebugOutput": "raw",
        },
        {
            "name": "python debug",
--- a/.vscode/example/settings.json
+++ b/.vscode/example/settings.json
@@ -6,17 +6,25 @@
    "cortex-debug.enableTelemetry": false,
    "cortex-debug.variableUseNaturalFormat": true,
    "cortex-debug.showRTOS": true,
-    "cortex-debug.armToolchainPath.windows": "${workspaceFolder}/toolchain/i686-windows/bin",
+    "cortex-debug.armToolchainPath.windows": "${workspaceFolder}/toolchain/x86_64-windows/bin",
    "cortex-debug.armToolchainPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/bin",
    "cortex-debug.armToolchainPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/bin",
-    "cortex-debug.openocdPath.windows": "${workspaceFolder}/toolchain/i686-windows/openocd/bin/openocd.exe",
+    "cortex-debug.openocdPath.windows": "${workspaceFolder}/toolchain/x86_64-windows/openocd/bin/openocd.exe",
    "cortex-debug.openocdPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/openocd/bin/openocd",
    "cortex-debug.openocdPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/openocd/bin/openocd",
+    "cortex-debug.gdbPath.windows": "${workspaceFolder}/toolchain/x86_64-windows/bin/arm-none-eabi-gdb-py.bat",
+    "cortex-debug.gdbPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gdb-py",
+    "cortex-debug.gdbPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gdb-py",
    "editor.formatOnSave": true,
    "files.associations": {
        "*.scons": "python",
        "SConscript": "python",
        "SConstruct": "python",
        "*.fam": "python",
-    }
+    },
+    "clangd.arguments": [
+        // We might be able to tighten this a bit more to only include the correct toolchain.
+        "--query-driver=**",
+        "--compile-commands-dir=${workspaceFolder}/build/latest"
+    ]
 }
--- a/.vscode/example/tasks.json
+++ b/.vscode/example/tasks.json
@@ -4,41 +4,41 @@
    "version": "2.0.0",
    "tasks": [
        {
-            "label": "[Release] Build",
+            "label": "[Release] Build Firmware",
            "group": "build",
            "type": "shell",
            "command": "./fbt COMPACT=1 DEBUG=0"
        },
        {
-            "label": "[Debug] Build",
+            "label": "[Debug] Build Firmware",
            "group": "build",
            "type": "shell",
            "command": "./fbt"
        },
        {
-            "label": "[Release] Flash (ST-Link)",
+            "label": "[FBT] Format",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt format"
+        },
+        {
+            "label": "[FBT] Clear",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt -c"
+        },
+        {
+            "label": "[Release] Flash (SWD)",
            "group": "build",
            "type": "shell",
            "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash"
        },
        {
-            "label": "[Debug] Flash (ST-Link)",
+            "label": "[Debug] Flash (SWD)",
            "group": "build",
            "type": "shell",
            "command": "./fbt FORCE=1 flash"
        },
-        {
-            "label": "[Release] Flash (blackmagic)",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_blackmagic"
-        },
-        {
-            "label": "[Debug] Flash (blackmagic)",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt FORCE=1 flash_blackmagic"
-        },
        {
            "label": "[Release] Flash (JLink)",
            "group": "build",
@@ -93,11 +93,103 @@
            "type": "shell",
            "command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb"
        },
+        {
+            "label": "[Debug] Flash (USB, with resources)",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt FORCE=1 flash_usb_full"
+        },
        {
            "label": "[Release] Flash (USB, with resources)",
            "group": "build",
            "type": "shell",
            "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full"
        },
+        {
+            "label": "[Debug] Create PVS-Studio report",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt firmware_pvs"
+        },
+        {
+            "label": "[Debug] Build FAPs",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt fap_dist"
+        },
+        {
+            "label": "[Release] Build FAPs",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt COMPACT=1 DEBUG=0 fap_dist"
+        },
+        {
+            "label": "[Debug] Build App",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt build APPSRC=${relativeFileDirname}"
+        },
+        {
+            "label": "[Release] Build App",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt COMPACT=1 DEBUG=0 build APPSRC=${relativeFileDirname}"
+        },
+        {
+            "label": "[Debug] Launch App on Flipper",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt launch APPSRC=${relativeFileDirname}"
+        },
+        {
+            "label": "[Release] Launch App on Flipper",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt COMPACT=1 DEBUG=0 launch APPSRC=${relativeFileDirname}"
+        },
+        {
+            "label": "[Debug] Launch App on Flipper with Serial Console",
+            "dependsOrder": "sequence",
+            "group": "build",
+            "dependsOn": [
+                "[Debug] Launch App on Flipper",
+                "Serial Console"
+            ]
+        },
+        {
+            "label": "[Debug] Build and upload all FAPs to Flipper over USB",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt fap_deploy"
+        },
+        {
+            "label": "[Release] Build and upload all FAPs to Flipper over USB",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt COMPACT=1 DEBUG=0 fap_deploy"
+        },
+        {
+            // Press Ctrl+] to quit
+            "label": "Serial Console",
+            "type": "shell",
+            "command": "./fbt cli",
+            "group": "none",
+            "isBackground": true,
+            "options": {
+                "env": {
+                    "FBT_NO_SYNC": "0"
+                }
+            },
+            "presentation": {
+                "reveal": "always",
+                "revealProblems": "never",
+                "showReuseMessage": false,
+                "panel": "dedicated",
+                "focus": true,
+                "echo": true,
+                "close": true,
+                "group": "Logger"
+            }
+        }
    ]
 }
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,15 +0,0 @@
-{
-	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-	// List of extensions which should be recommended for users of this workspace.
-	"recommendations": [
-		"ms-python.black-formatter",
-		"ms-vscode.cpptools",
-		"amiralizadeh9480.cpp-helper",
-		"marus25.cortex-debug",
-		"zxh404.vscode-proto3",
-		"augustocdias.tasks-shell-input"
-	],
-	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-	"unwantedRecommendations": []
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,62 @@
-### New changes
-* .sub playlist plugin [(by darmiel)](https://github.com/darmiel/flipper-playlist) (PR #62)
-* HW Region will be reported as 0 so it won't call subghz provisioning in apps (I hope)
+## New changes
+* SubGHz: Add 4 more systems to Add Manually (untested!)
+* SubGHz: Add Manually fixes
+* SubGHz: Added NiceFlor-S to ignore options, removed colons. (by @G2Dolphin | PR #620)
+* Misc code cleanup
+* RGB: Fix white color on reboot, move settings, add custom color option
+* **BLE Spam app** updated to latest version (Android, Windows support) (by @Willy-JL) -> (app can be found in builds ` `, `e`, `n`, `r`)
+* OFW: Fix double arrows and add proper indication
+* OFW: SubGHz: add manually fix 12-bits is 0xFFF (or 0xFF0) CAME/NICE 12-bit
+* OFW: Fix various crashes if debug libraries used 

-**Note: To avoid issues prefer installing using web updater or by self update package, all needed assets will be installed**
+----

-Self-update package (update from microSD) - `flipper-z-f7-update-(version).zip` or `.tgz` for iOS mobile app
+[-> How to install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
+
+[-> Download qFlipper (official link)](https://flipperzero.one/update)
+
+## Please support development of the project
+|Service|Remark|Link/Wallet|
+|-|-|-|
+|**Patreon**||https://patreon.com/mmxdev|
+|**Boosty**|patreon alternative|https://boosty.to/mmxdev|
+|cloudtips|only RU payments accepted|https://pay.cloudtips.ru/p/7b3e9d65|
+|YooMoney|only RU payments accepted|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
+|USDT|(TRC20)|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
+|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
+|ETH|(BSC/ERC20-Tokens)|`darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)|
+|BTC||`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
+|DOGE||`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
+|LTC||`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
+|XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
+|TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|
+
+#### Thanks to our sponsors:
+callmezimbra, Quen0n, MERRON, grvpvl (lvpvrg), art_col, ThurstonWaffles, Moneron, UterGrooll, LUCFER, Northpirate, zloepuzo, T.Rat, Alexey B., ionelife, ...
+and all other great people who supported our project and me (xMasterX), thanks to you all!
+
+
+## **Recommended update option - Web Updater**
+
+### What `n`, `r`, `e`, ` `, `c` means? What I need to download if I don't want to use Web updater?
+What build I should download and what this name means - `flipper-z-f7-update-(version)(n / r / e / c).tgz` ? <br>
+`flipper-z` = for Flipper Zero device<br>
+`f7` = Hardware version - same for all flipper zero devices<br>
+`update` = Update package, contains updater, all assets (plugins, IR libs, etc.), and firmware itself<br>
+`(version)` = Firmware version<br>
+| Designation | 3 Custom Animation | [Base Apps](https://github.com/xMasterX/all-the-plugins#default-pack) | [Extra Apps](https://github.com/xMasterX/all-the-plugins#extra-pack) | ⚠️RGB mode* |
+|-----|:---:|:---:|:---:|:---:|
+| ` ` | ✅ | ✅ |  |  |
+| `c` | ✅ |  |  |  |
+| `n` |  | ✅ |  |  |
+| `e` | ✅ | ✅ | ✅ |  |
+| `r` | ✅ | ✅ | ✅ | ✅ |
+
+⚠️This is [hardware mod](https://github.com/quen0n/flipperzero-firmware-rgb#readme), works only on modded flippers! do not install on non modded device!
+
+Firmware Self-update package (update from microSD) - `flipper-z-f7-update-(version).tgz` for mobile app / qFlipper / web<br>
+Archive of `scripts` folder (contains scripts for FW/plugins development) - `flipper-z-any-scripts-(version).tgz`<br>
+SDK files for plugins development and uFBT - `flipper-z-f7-sdk-(version).zip`

-DFU for update using qFlipper - `flipper-z-f7-full-(version).dfu`

-If using DFU update method, download this archive and unpack it to your microSD, replacing all files except files you have edited manually -
-`sd-card-(version).zip`

--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -3,15 +3,15 @@
 Nice to see you reading this document, we really appreciate it.

 As all documents of this kind it's unable to cover everything.
-But it will cover general rules that we enforcing on PR review.
+But it will cover general rules that we are enforcing on PR review.

-Also we already have automatic rules checking and formatting,
-but it got it's limitations and this guide is still mandatory.
+Also, we already have automatic rules checking and formatting,
+but it got its limitations and this guide is still mandatory.

-Some part of this project do have it's own naming and coding guides.
+Some part of this project do have its own naming and coding guides.
 For example: assets. Take a look into `ReadMe.md` in assets folder for more details.

-Also 3rd party libraries are none of our concern.
+Also, 3rd party libraries are none of our concern.

 And yes, this set is not final and we are open to discussion.
 If you want to add/remove/change something here please feel free to open new ticket.
@@ -30,7 +30,7 @@ Our guide is inspired by, but not claiming to be compatible with:

 Code we write is intended to be public.
 Avoid one-liners from hell and keep code complexity under control.
-Try to make code self explanatory and add comments if needed.
+Try to make code self-explanatory and add comments if needed.
 Leave references to standards that you are implementing.
 Use project wiki to document new/reverse engineered standards.

@@ -48,11 +48,11 @@ Almost everything in flipper firmware is built around this concept.
 # C coding style

 - Tab is 4 spaces
- Use `fbt format` to reformat source code and check style guide before commit
+- Use `./fbt format` to reformat source code and check style guide before commit

 ## Naming

-### Type names are CamelCase
+### Type names are PascalCase

 Examples:

@@ -89,7 +89,7 @@ Enforced by linter.
 Suffixes:

 - `alloc` - allocate and init instance. C style constructor. Returns pointer to instance.
- `free` - deinit and release instance. C style destructor. Takes pointer to instance.
+- `free` - de-init and release instance. C style destructor. Takes pointer to instance.

 # C++ coding style

--- a/21
+++ b/21
@@ -1,21 +0,0 @@
-$(info +-------------------------------------------------+)
-$(info |                                                 |)
-$(info |      Hello, this is Flipper team speaking!      |)
-$(info |                                                 |)
-$(info |       We've migrated to new build system        |)
-$(info |          It's nice and based on scons           |)
-$(info |                                                 |)
-$(info |      Crash course:                              |)
-$(info |                                                 |)
-$(info |        `./fbt`                                  |)
-$(info |        `./fbt flash`                            |)
-$(info |        `./fbt debug`                            |)
-$(info |                                                 |)
-$(info |      More details in documentation/fbt.md       |)
-$(info |                                                 |)
-$(info |      Also Please leave your feedback here:      |)
-$(info |           https://flipp.dev/4RDu                |)
-$(info |                      or                         |)
-$(info |           https://flipp.dev/2XM8                |)
-$(info |                                                 |)
-$(info +-------------------------------------------------+)
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,156 +1,268 @@
 <h3 align="center">
-<a href="https://github.com/Eng1n33r/flipperzero-firmware">
+<a href="https://github.com/DarkFlippers/unleashed-firmware">
 <img src="https://user-images.githubusercontent.com/10697207/186202043-26947e28-b1cc-459a-8f20-ffcc7fc0c71c.png" align="center" alt="fzCUSTOM" border="0">
 </a>
 </h3>
+<div align="center" id="badges">
+	<a href="https://discord.unleashedflip.com">
+		<img src="https://img.shields.io/discord/937479784148115456?style=flat-square&logo=discord&label=Discord&color=%237289DA&link=https%3A%2F%2Fdiscord.unleashedflip.com%2F" alt="Discord server"/>
+	</a>
+	<a href="https://t.me/flipperzero_unofficial">
+		<img src="https://img.shields.io/endpoint?label=EN%20Channel&style=flat-square&url=https%3A%2F%2Fmogyo.ro%2Fquart-apis%2Ftgmembercount%3Fchat_id%3Dflipperzero_unofficial" alt="EN TG channel"/>
+	</a>
+	<a href="https://t.me/flipperzero_unofficial_ru">
+		<img src="https://img.shields.io/endpoint?label=RU%20Channel&style=flat-square&url=https%3A%2F%2Fmogyo.ro%2Fquart-apis%2Ftgmembercount%3Fchat_id%3Dflipperzero_unofficial_ru" alt="RU TG channel"/>	
+	</a>
+	<a href="https://t.me/flipperzero_unofficial_ua">
+		<img src="https://img.shields.io/endpoint?label=UA%20Channel&style=flat-square&url=https%3A%2F%2Fmogyo.ro%2Fquart-apis%2Ftgmembercount%3Fchat_id%3Dflipperzero_unofficial_ua" alt="UA TG channel"/>
+	</a>
+</div>

-### Welcome to Flipper Zero Unleashed Firmware repo! 
-Our goal is to make any features possible in this device without any limitations! 
+### Welcome to the Flipper Zero Unleashed Firmware repo! 

-Please help us implement emulation for all subghz dynamic (rolling code) protocols!
+#### **This firmware is a fork from** [flipperdevices/flipperzero-firmware](https://github.com/flipperdevices/flipperzero-firmware)

 <br>

-### This software is for experimental purposes only and is not meant for any illegal activity/purposes. <br> We do not condone illegal activity and strongly encourage keeping transmissions to legal/valid uses allowed by law. <br> Also this software is made without any support from Flipper Devices and in no way related to official devs. 
+### Most stable custom firmware focused on new features and improvements of original firmware components, with almost no UI changes

 <br>
-Our Discord Community:
-<br>
-<a href="https://discord.gg/flipperzero-unofficial"><img src="https://discordapp.com/api/guilds/937479784148115456/widget.png?style=banner4" alt="Unofficial Discord Community"></a>
+
+##### This software is for experimental purposes only and is not meant for any illegal activity/purposes. <br> We do not condone illegal activity and strongly encourage keeping transmissions to legal/valid uses allowed by law. <br> Also, this software is made without any support from Flipper Devices and is in no way related to the official devs. 
+

 <br>
-<br>
-<br>
+
+## FAQ (frequently asked questions)
+[Follow this link to find answers to most asked questions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/FAQ.md)
+
+## Dev builds (unstable)
+- https://dev.unleashedflip.com/
+- https://t.me/kotnehleb
+## Releases in Telegram
+- https://t.me/unleashed_fw

 # What's changed
-* SubGHz regional TX restrictions removed
-* SubGHz frequecy range can be extended in settings file (Warning: It can damage flipper's hardware)
-* Many rolling code protocols now have the ability to save & send captured signals
-* FAAC SLH (Spa) & BFT Mitto (secure with seed) manual creation
-* Sub-GHz static code brute-force plugin
-* LFRFID Fuzzer plugin
-* Custom community plugins and games added
-* Extra SubGHz frequencies + extra Mifare Classic keys
-* Picopass/iClass plugin included in releases
-* Recompiled IR TV Universal Remote for ALL buttons
-* Universal remote for Projectors, Fans, A/Cs and Audio(soundbars, etc.)
-* BadUSB keyboard layouts
-* Customizable Flipper name
-* Other small fixes and changes throughout
+- **Sub-GHz** *lib & hal*
+	- Regional TX restrictions removed
+	- Extra Sub-GHz frequencies
+	- Frequency range can be extended in settings file (Warning: It can damage Flipper's hardware)
+	- Many rolling code [protocols](https://github.com/DarkFlippers/unleashed-firmware#current-modified-and-new-sub-ghz-protocols-list) now have the ability to save & send captured signals
+	- FAAC SLH (Spa) & BFT Mitto (keeloq secure with seed) manual creation
+	- External CC1101 module support [(by quen0n)](https://github.com/DarkFlippers/unleashed-firmware/pull/307)
+- **Sub-GHz** *Main App*
+	- Save last used frequency [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
+	- New frequency analyzer [(by ClusterM)](https://github.com/DarkFlippers/unleashed-firmware/pull/43)
+	- Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
+	- Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79)
+	- New option to use timestamps + protocol name when you saving file, instead of random name - Enable in `Radio Settings -> Time in names = ON`
+	- Read mode UI improvements (shows time when signal was received) (by @wosk)
+	- External CC1101 module support (Hardware SPI used)
+	- **Hold right in received signal list to delete selected signal**
+	- **Custom buttons for Keeloq / Alutech AT4N / Nice Flor S / Somfy Telis / Security+ 2.0 / CAME Atomo** - now you can use arrow buttons to send signal with different button code
+	-   `Add manually` menu extended with new protocols
+	- FAAC SLH, BFT Mitto / Somfy Telis / Nice Flor S / CAME Atomo, etc.. manual creation with programming new remote into receiver (use button 0xF for BFT Mitto, 0x8 (Prog) on Somfy Telis)
+	- Debug mode counter increase settings (+1 -> +5, +10, default: +1)
+	- Debug PIN output settings for protocol development
+	
+- **Sub-GHz apps** *by unleashed team*
+	- Sub-GHz Bruteforce - static code brute-force plugin | 
+		- Time delay (between signals) setting (hold Up in main screen(says Up to Save)) + configure repeats in protocols list by pressing right button on selected protocol
+        - Load your own file and select bytes you want to bruteforce or use preconfigured options in protocols list
+	- Sub-GHz Remote - remote control for 5 sub-ghz files | bind one file for each button
+		- use the built-in constructor or make config file by following this [instruction](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md)
+- **Infrared**
+	- Recompiled IR TV Universal Remote for ALL buttons
+	- Universal remotes for Projectors, Fans, A/Cs and Audio(soundbars, etc.) -> Also always updated and verified by our team
+	- Infrared -> `RCA` Protocol
+	- Infrared -> Debug TX PIN output settings
+- **NFC/RFID/iButton**
+	* LFRFID/iButton Fuzzer plugins
+	* Extra Mifare Classic keys
+	* `Add manually` -> Mifare Classic with custom UID
+	* Picopass/iClass plugin (now with emulation support!) included in releases
+- **Quality of life & other features**
+	- Customizable Flipper name **Update! Now can be changed in Settings->Desktop** (by @xMasterX and @Willy-JL)
+	- Text Input UI element -> Cursor feature (by @Willy-JL)
+	- Byte Input Mini editor -> **Press UP** multiple times until the nibble editor appears
+	- Clock on Desktop -> `Settings -> Desktop -> Show Clock`
+	- Battery percentage display with different styles `Settings -> Desktop -> Battery View`
+	- More games in Dummy Mode -> click or hold any of arrow buttons
+	- Lock device with pin(or regular lock if pin not set) by holding UP button on main screen [(by an4tur0r)](https://github.com/DarkFlippers/unleashed-firmware/pull/107)
+	- **BadBT** plugin (BT version of BadKB) [(by Willy-JL, ClaraCrazy, XFW contributors)](https://github.com/ClaraCrazy/Flipper-Xtreme/tree/dev/applications/main/bad_kb) - (See in Applications->Tools) - (aka BadUSB via Bluetooth)
+	- BadUSB -> Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout)
+	- Custom community plugins and games added + all known working apps can be downloaded in extra pack in every release
+	- Other small fixes and changes throughout
+	- See other changes in readme below

-See changelog in releases for latest updates!
+Also check the [changelog in releases](https://github.com/DarkFlippers/unleashed-firmware/releases) for latest updates!

-### Current modified and new SubGHz protocols list:
- HCS101
- An-Motors
- CAME Atomo
- FAAC SLH (Spa) [External seed calculation required]
- BFT Mitto [External seed calculation required]
- Keeloq [Not ALL systems supported yet!]
- Nice Flor S
- Security+ v1 & v2
+### Current modified and new Sub-GHz protocols list:
+Thanks to Official team (to their SubGHz Developer, Skorp) for implementing decoders for these protocols in OFW.
+
+Keeloq [Not ALL systems supported for decode or emulation yet!] - [Supported manufacturers list](https://0bin.net/paste/VwR2lNJY#WH9vnPgvcp7w6zVKucFCuNREKAcOij8KsJ6vqLfMn3b)
+
+Encoders or sending made by @xMasterX:
+- Nero Radio 57bit (+ 56bit encoder improvements)
+- CAME 12bit/24bit encoder fixes (Fixes now merged in OFW)
+- Keeloq: HCS101
+- Keeloq: AN-Motors
+- Keeloq: JCM Tech
+- Keeloq: MHouse
+- Keeloq: Nice Smilo
+- Keeloq: DTM Neo
+- Keeloq: FAAC RC,XT
+- Keeloq: Mutancode
+- Keeloq: Normstahl
+- Keeloq: Beninca + Allmatic
+- Keeloq: Stilmatic
+- Keeloq: CAME Space
+- Keeloq: Aprimatic (model TR and similar)
+- Keeloq: Centurion Nova (thanks Carlos !)
+
+Encoders or sending made by @Eng1n33r(first implementation in Q2 2022) & @xMasterX (current version):
+- CAME Atomo -> Update! check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
+- Nice Flor S -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
+- FAAC SLH (Spa) -> Update!!! Check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
+- Keeloq: BFT Mitto -> Update! Check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
 - Star Line
+- Security+ v1 & v2 (encoders was made in OFW)

-## Support us so we can buy equipment and develop new features
-* ETH/BSC/ERC20-Tokens: `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`
-* BTC: `bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`
-* DOGE: `D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`
-* LTC: `ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`
+Encoders made by @assasinfil & @xMasterX:
+- Somfy Telis -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
+- Somfy Keytis
+- KingGates Stylo 4k
+- Alutech AT-4N -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
+- Nice ON2E (Nice One) -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)

-### Community apps included:
+## Please support development of the project
+The majority of this project is developed and maintained by me, @xMasterX.
+I'm unemployed, and the only income I receive is from your donations.
+Our team is small and the guys are working on this project as much as they can solely based on the enthusiasm they have for this project and the community.
+- @gid9798 - SubGHz, Plugins, many other things
+- @assasinfil - SubGHz protocols
+- @Svaarich - UI design and animations
+- @amec0e & @Leptopt1los - Infrared assets
+- Community moderators in Telegram, Discord, and Reddit
+- And of course our GitHub community. Your PRs are a very important part of this firmware and open-source development.

- RFID Fuzzer plugin [(by Ganapati)](https://github.com/Eng1n33r/flipperzero-firmware/pull/54) with some changes by xMasterX
- Sub-GHz bruteforce plugin [(by Ganapati & xMasterX)](https://github.com/Eng1n33r/flipperzero-firmware/pull/57)
- Sub-GHz playlist plugin [(by darmiel)](https://github.com/Eng1n33r/flipperzero-firmware/pull/62)
- ESP8266 Deauther plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module)
- WiFi Scanner plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module)
- MultiConverter plugin [(by theisolinearchip)](https://github.com/theisolinearchip/flipperzero_stuff)
- WAV player plugin (fixed) [(OFW: DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/tree/zlo/wav-player)
- UPC-A Barcode generator plugin [(by McAzzaMan)](https://github.com/McAzzaMan/flipperzero-firmware/tree/UPC-A_Barcode_Generator/applications/barcode_generator)
- GPIO: Sentry Safe plugin [(by H4ckd4ddy)](https://github.com/H4ckd4ddy/flipperzero-sentry-safe-plugin)
- ESP32: WiFi Marauder companion plugin [(by 0xchocolate)](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion)
- NRF24: Sniffer & MouseJacker (with changes) [(by mothball187)](https://github.com/mothball187/flipperzero-nrf24/tree/main/mousejacker)
- Simple Clock (fixed) [(Original by CompaqDisc)](https://gist.github.com/CompaqDisc/4e329c501bd03c1e801849b81f48ea61)
- UniversalRF Remix / Sub-GHz Remote [(by ESurge)](https://github.com/ESurge/flipperzero-firmware-unirfremix)[(updated and all protocol support added by darmiel & xMasterX)](https://github.com/darmiel/flipper-playlist/tree/feat/unirf-protocols)
- Tetris (with fixes) [(by jeffplang)](https://github.com/jeffplang/flipperzero-firmware/tree/tetris_game/applications/tetris_game)
- Spectrum Analyzer (with changes) [(by jolcese)](https://github.com/jolcese/flipperzero-firmware/tree/spectrum/applications/spectrum_analyzer) - [Ultra Narrow mode & scan channels non-consecutively](https://github.com/theY4Kman/flipperzero-firmware/commits?author=theY4Kman)
- Arkanoid (with fixes) [(by gotnull)](https://github.com/gotnull/flipperzero-firmware-wPlugins)
- Tic Tac Toe (with fixes) [(by gotnull)](https://github.com/gotnull/flipperzero-firmware-wPlugins)
+The amount of work done on this project is huge and we need your support, no matter how large or small. Even if you just say, "Thank you Unleashed firmware developers!" somewhere. Doing so will help us continue our work and will help drive us to make the firmware better every time.
+Also, regarding our releases, every build has and always will be free and open-source. There will be no paywall releases or closed-source apps within the firmware. As long as I am working on this project it will never happen.
+You can support us by using links or addresses below:
+|Service|Remark|Link/Wallet|
+|-|-|-|
+|**Patreon**||https://patreon.com/mmxdev|
+|**Boosty**|patreon alternative|https://boosty.to/mmxdev|
+|cloudtips|only RU payments accepted|https://pay.cloudtips.ru/p/7b3e9d65|
+|YooMoney|only RU payments accepted|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
+|USDT|(TRC20)|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
+|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
+|ETH|(BSC/ERC20-Tokens)|`darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)|
+|BTC||`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
+|DOGE||`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
+|LTC||`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
+|XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
+|TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|

-### Other changes
+## Community apps included

- BadUSB Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout)
- New frequency analyzer - [(by ClusterM)](https://github.com/ClusterM)
+### [🎲 Download Extra plugins for Unleashed](https://github.com/xMasterX/all-the-plugins/releases/latest)
+### [List of Extra pack](https://github.com/xMasterX/all-the-plugins/tree/dev#extra-pack) | [List of Base *(Deafult)* pack](https://github.com/xMasterX/all-the-plugins/tree/dev#default-pack)
+
+See full list and sources here: [xMasterX/all-the-plugins](https://github.com/xMasterX/all-the-plugins/tree/dev)
+
+### Official Flipper Zero Apps Catalog [web version](https://lab.flipper.net/apps) or mobile app

 # Instructions
-## [- How to install firmware](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/HowToInstall.md)
+## First lock official docs [docs.flipper.net](https://docs.flipper.net/)
+## [How to install](/documentation/HowToInstall.md) - [versions info](/CHANGELOG.md#recommended-update-option---web-updater): `n`,` `,`e`...
+## Firmware & Development

-## [- How to build firmware](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/HowToBuild.md)
+### - **[How to build](/documentation/HowToBuild.md#how-to-build-by-yourself) | [Project-structure](#project-structure)**

-## [- BadUSB: how to add new keyboard layouts](https://github.com/dummy-decoy/flipperzero_badusb_kl)
+### - **CLion IDE** - How to setup workspace for flipper firmware development [by Savely Krasovsky](https://krasovs.ky/2022/11/01/flipper-zero-clion.html)

-## [- How to change Flipper name](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/CustomFlipperName.md)
+### - **"Hello world!"** - plugin tutorial [English<sub> by DroomOne</sub> ](https://github.com/DroomOne/Flipper-Plugin-Tutorial) | [Russian<sub> by Pavel Yakovlev</sub>](https://yakovlev.me/hello-flipper-zero/)

-### **Plugins**
+### - [How to write your own app](https://flipper.atmanos.com/docs/overview/intro). Docs by atmanos **⚠️outdated API**

-## [- Configure Sub-GHz Remote App](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/SubGHzRemotePlugin.md)
+## Firmware & main Apps feature

-## [- Barcode Generator](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/BarcodeGenerator.md)
+### - System: [How to change Flipper name](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/CustomFlipperName.md)

-## [- Multi Converter](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/MultiConverter.md)
+### - BadUSB: [How to add new keyboard layouts](https://github.com/dummy-decoy/flipperzero_badusb_kl)

-## [- WAV Player sample files & how to convert](https://github.com/UberGuidoZ/Flipper/tree/main/Wav_Player#readme)
+### - Infrared: [How to make captures to add them into Universal IR remotes](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/InfraredCaptures.md)

-## [- SubGHz playlist generator script](https://github.com/darmiel/flipper-scripts/blob/main/playlist/playlist_creator_by_chunk.py)
+## **Sub-GHz**

-### **Plugins that works with external hardware**
+### - External Radio: [How to connect CC1101 module](https://github.com/quen0n/flipperzero-ext-cc1101)

-## [- How to use: [NRF24] plugins](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/NRF24.md)
+### - Transmission is blocked? [How to extend Sub-GHz frequency range](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/DangerousSettings.md)

-## [- How to use: [WiFi] Scanner](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module#readme)
+### - [How to add extra Sub-GHz frequencies](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzSettings.md)

-## [- How to use: [ESP8266] Deauther](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module#readme)
+### - [How to use Flipper as new remote (Nice FlorS, BFT Mitto, Somfy Telis, Aprimatic, AN-Motors, etc..)](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)

-## [- How to use: [ESP32] WiFi Marauder](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard)
+### - [~~Configure Sub-GHz Remote App~~](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md) Not recomeded, please use embedded configurator

-## [- [WiFi] Scanner - Web Flasher for module firmware](https://sequoiasan.github.io/FlipperZero-WiFi-Scanner_Module/)
+## **Plugins**

-## [- [ESP8266] Deauther - Web Flasher for module firmware](https://sequoiasan.github.io/FlipperZero-Wifi-ESP8266-Deauther-Module/)
+### - TOTP (Authenticator): [config description](https://github.com/akopachov/flipper-zero_authenticator/blob/master/docs/conf-file_description.md)

-## [- Windows: How to Upload .bin to ESP32/ESP8266](https://github.com/SequoiaSan/Guide-How-To-Upload-bin-to-ESP8266-ESP32)
+### - Mifare Nested plugin: [How to recover keys](https://github.com/AloneLiberty/FlipperNested#how-to-use-it)

-## [- How to use: [GPIO] SentrySafe plugin](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/SentrySafe.md)
+### - Barcode Generator: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/BarcodeGenerator.md)

-### **SubGHz**
+### - Multi Converter: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/MultiConverter.md)

-## [- Transmission is blocked? - How to extend SubGHz frequency range](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/DangerousSettings.md)
+### - WAV Player: [sample files & how to convert](https://github.com/UberGuidoZ/Flipper/tree/main/Wav_Player#readme)

-## [- How to add extra SubGHz frequencies](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/SubGHzSettings.md)
+### - Sub-GHz playlist: [generator script](https://github.com/darmiel/flipper-scripts/blob/main/playlist/playlist_creator_by_chunk.py)
+
+## **Plugins that works with external hardware** [GPIO]
+
+### - Unitemp - Temperature sensors reader: [How to use & supported sensors](https://github.com/quen0n/unitemp-flipperzero#readme)
+
+### - [NMEA] GPS: [How to use](https://github.com/xMasterX/all-the-plugins/blob/dev/base_pack/gps_nmea_uart/README.md)
+
+### - i2c Tools [How to use](https://github.com/xMasterX/all-the-plugins/blob/dev/base_pack/flipper_i2ctools/README.md)
+
+### - [NRF24] plugins: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/NRF24.md)
+
+
+### - [WiFi] Scanner: [How to use](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module#readme) | [Web Flasher](https://sequoiasan.github.io/FlipperZero-WiFi-Scanner_Module/)
+
+### - [ESP8266] Deauther: [How to use](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module#readme) | [Web Flasher](https://sequoiasan.github.io/FlipperZero-Wifi-ESP8266-Deauther-Module/)
+
+### - [ESP32] WiFi Marauder: [How to use](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard)<sub> docs by UberGuidoZ</sub> | [Marauder repo](https://github.com/justcallmekoko/ESP32Marauder)
+
+### - [ESP32-CAM] Camera Suite: [How to use](https://github.com/CodyTolene/Flipper-Zero-Camera-Suite)
+
+### - How to Upload `.bin` to ESP32/ESP8266: [Windows](https://github.com/SequoiaSan/Guide-How-To-Upload-bin-to-ESP8266-ESP32) | [FAP "ESP flasher"](https://github.com/0xchocolate/flipperzero-esp-flasher)
+
+### - [GPIO] SentrySafe plugin: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SentrySafe.md)

 <br>
 <br>

-# Where I can find IR, SubGhz, ... files, DBs, and other stuff?
-## [Awesome Flipper Zero - Github](https://github.com/djsime1/awesome-flipperzero)
+# Where I can find IR, Sub-GHz, ... files, DBs, and other stuff?
 ## [UberGuidoZ Playground - Large collection of files - Github](https://github.com/UberGuidoZ/Flipper)
-## [CAME-12bit, NICE-12bit, Linear-10bit, PT-2240 - SubGHz fixed code bruteforce](https://github.com/tobiabocchi/flipperzero-bruteforce)
+## [Awesome Flipper Zero - Github](https://github.com/djsime1/awesome-flipperzero)

 <br>
 <br>

 # Links

-* Unofficial Discord: [discord.gg/flipperzero-unofficial](https://discord.gg/flipperzero-unofficial)
-* Docs by atmanos / How to write your own app (outdated API): [https://flipper.atmanos.com/docs/overview/intro](https://flipper.atmanos.com/docs/overview/intro)
-
-* Official Docs: [http://docs.flipperzero.one](http://docs.flipperzero.one)
+* Official Docs: [docs.flipper.net](https://docs.flipper.net/)
 * Official Forum: [forum.flipperzero.one](https://forum.flipperzero.one/)

 # Project structure

 - `applications`    - Applications and services used in firmware
 - `assets`          - Assets used by applications and services
- `furi`            - Furi Core: os level primitives and helpers
+- `furi`            - Furi Core: OS-level primitives and helpers
 - `debug`           - Debug tool: GDB-plugins, SVD-file and etc
 - `documentation`   - Documentation generation system configs and input files
 - `firmware`        - Firmware source code
@@ -158,4 +270,4 @@ See changelog in releases for latest updates!
 - `site_scons`      - Build helpers
 - `scripts`         - Supplementary scripts and python libraries home

-Also pay attention to `ReadMe.md` files inside of those directories.
+Also, pay attention to the `ReadMe.md` files inside those directories.
--- a/199
+++ b/199
@@ -7,65 +7,45 @@
 # construction of certain targets behind command-line options.

 import os
-import subprocess
+from fbt.util import path_as_posix
+
+DefaultEnvironment(tools=[])

 EnsurePythonVersion(3, 8)

-DefaultEnvironment(tools=[])
 # Progress(["OwO\r", "owo\r", "uwu\r", "owo\r"], interval=15)

-
 # This environment is created only for loading options & validating file/dir existence
 fbt_variables = SConscript("site_scons/commandline.scons")
-cmd_environment = Environment(tools=[], variables=fbt_variables)
-Help(fbt_variables.GenerateHelpText(cmd_environment))
+cmd_environment = Environment(
+    toolpath=["#/scripts/fbt_tools"],
+    tools=[
+        ("fbt_help", {"vars": fbt_variables}),
+    ],
+    variables=fbt_variables,
+)

 # Building basic environment - tools, utility methods, cross-compilation
 # settings, gcc flags for Cortex-M4, basic builders and more
 coreenv = SConscript(
    "site_scons/environ.scons",
    exports={"VAR_ENV": cmd_environment},
+    toolpath=["#/scripts/fbt_tools"],
 )
 SConscript("site_scons/cc.scons", exports={"ENV": coreenv})

-# Store root dir in environment for certain tools
-coreenv["ROOT_DIR"] = Dir(".")
-
-
 # Create a separate "dist" environment and add construction envs to it
 distenv = coreenv.Clone(
-    tools=["fbt_dist", "openocd", "blackmagic", "jflash"],
-    OPENOCD_GDB_PIPE=[
-        "|openocd -c 'gdb_port pipe; log_output debug/openocd.log' ${[SINGLEQUOTEFUNC(OPENOCD_OPTS)]}"
+    tools=[
+        "fbt_dist",
+        "fbt_debugopts",
+        "openocd",
+        "blackmagic",
+        "jflash",
    ],
-    GDBOPTS_BASE=[
-        "-ex",
-        "target extended-remote ${GDBREMOTE}",
-        "-ex",
-        "set confirm off",
-    ],
-    GDBOPTS_BLACKMAGIC=[
-        "-ex",
-        "monitor swdp_scan",
-        "-ex",
-        "monitor debug_bmp enable",
-        "-ex",
-        "attach 1",
-        "-ex",
-        "set mem inaccessible-by-default off",
-    ],
-    GDBPYOPTS=[
-        "-ex",
-        "source debug/FreeRTOS/FreeRTOS.py",
-        "-ex",
-        "source debug/PyCortexMDebug/PyCortexMDebug.py",
-        "-ex",
-        "svd_load ${SVD_FILE}",
-        "-ex",
-        "compare-sections",
-    ],
-    JFLASHPROJECT="${ROOT_DIR.abspath}/debug/fw.jflash",
    ENV=os.environ,
+    UPDATE_BUNDLE_DIR="dist/${DIST_DIR}/f${TARGET_HW}-update-${DIST_SUFFIX}",
+    VSCODE_LANG_SERVER=ARGUMENTS.get("LANG_SERVER", "cpptools"),
 )

 firmware_env = distenv.AddFwProject(
@@ -87,20 +67,22 @@ if GetOption("fullenv") or any(
    # Target for self-update package
    dist_basic_arguments = [
        "--bundlever",
-        '"${UPDATE_VERSION_STRING}"',
+        "${UPDATE_VERSION_STRING}",
    ]
    dist_radio_arguments = [
        "--radio",
-        '"${ROOT_DIR.abspath}/${COPRO_STACK_BIN_DIR}/${COPRO_STACK_BIN}"',
+        "${ROOT_DIR.abspath}/${COPRO_STACK_BIN_DIR}/${COPRO_STACK_BIN}",
        "--radiotype",
        "${COPRO_STACK_TYPE}",
        "${COPRO_DISCLAIMER}",
        "--obdata",
-        '"${ROOT_DIR.abspath}/${COPRO_OB_DATA}"',
+        "${ROOT_DIR.abspath}/${COPRO_OB_DATA}",
+        "--stackversion",
+        "${COPRO_CUBE_VERSION}",
    ]
    dist_resource_arguments = [
        "-r",
-        '"${ROOT_DIR.abspath}/assets/resources"',
+        firmware_env.subst("${RESOURCES_ROOT}"),
    ]
    dist_splash_arguments = (
        [
@@ -113,7 +95,7 @@ if GetOption("fullenv") or any(

    selfupdate_dist = distenv.DistCommand(
        "updater_package",
-        (distenv["DIST_DEPENDS"], firmware_env["FW_RESOURCES"]),
+        (distenv["DIST_DEPENDS"], firmware_env["FW_RESOURCES_MANIFEST"]),
        DIST_EXTRA=[
            *dist_basic_arguments,
            *dist_radio_arguments,
@@ -146,7 +128,8 @@ if GetOption("fullenv") or any(

    # Installation over USB & CLI
    usb_update_package = distenv.AddUsbFlashTarget(
-        "#build/usbinstall.flag", (firmware_env["FW_RESOURCES"], selfupdate_dist)
+        "#build/usbinstall.flag",
+        (firmware_env["FW_RESOURCES_MANIFEST"], selfupdate_dist),
    )
    distenv.Alias("flash_usb_full", usb_update_package)

@@ -160,28 +143,76 @@ if GetOption("fullenv") or any(
 basic_dist = distenv.DistCommand("fw_dist", distenv["DIST_DEPENDS"])
 distenv.Default(basic_dist)

+dist_dir_name = distenv.GetProjectDirName()
+dist_dir = distenv.Dir(f"#/dist/{dist_dir_name}")
+external_apps_artifacts = firmware_env["FW_EXTAPPS"]
+external_app_list = external_apps_artifacts.application_map.values()
+
+fap_dist = [
+    distenv.Install(
+        dist_dir.Dir("debug_elf"),
+        list(app_artifact.debug for app_artifact in external_app_list),
+    ),
+    *(
+        distenv.Install(
+            dist_dir.File(dist_entry[1]).dir,
+            app_artifact.compact,
+        )
+        for app_artifact in external_app_list
+        for dist_entry in app_artifact.dist_entries
+    ),
+]
+Depends(
+    fap_dist,
+    list(app_artifact.validator for app_artifact in external_app_list),
+)
+Alias("fap_dist", fap_dist)
+
+# Copy all faps to device
+
+fap_deploy = distenv.PhonyTarget(
+    "fap_deploy",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/storage.py",
+            "-p",
+            "${FLIP_PORT}",
+            "send",
+            "${SOURCE}",
+            "/ext/apps",
+        ]
+    ],
+    source=firmware_env.Dir(("${RESOURCES_ROOT}/apps")),
+)
+Depends(fap_deploy, firmware_env["FW_RESOURCES_MANIFEST"])
+
+
 # Target for bundling core2 package for qFlipper
 copro_dist = distenv.CoproBuilder(
-    distenv.Dir("assets/core2_firmware"),
+    "#/build/core2_firmware.tgz",
    [],
 )
+distenv.AlwaysBuild(copro_dist)
 distenv.Alias("copro_dist", copro_dist)

-firmware_flash = distenv.AddOpenOCDFlashTarget(firmware_env)
+
+firmware_flash = distenv.AddFwFlashTarget(firmware_env)
 distenv.Alias("flash", firmware_flash)

+# To be implemented in fwflash.py
 firmware_jflash = distenv.AddJFlashTarget(firmware_env)
 distenv.Alias("jflash", firmware_jflash)

-firmware_bm_flash = distenv.PhonyTarget(
-    "flash_blackmagic",
+distenv.PhonyTarget(
+    "gdb_trace_all",
    "$GDB $GDBOPTS $SOURCES $GDBFLASH",
    source=firmware_env["FW_ELF"],
-    GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
-    GDBREMOTE="${BLACKMAGIC_ADDR}",
+    GDBOPTS="${GDBOPTS_BASE}",
+    GDBREMOTE="${OPENOCD_GDB_PIPE}",
    GDBFLASH=[
        "-ex",
-        "load",
+        "thread apply all bt",
        "-ex",
        "quit",
    ],
@@ -194,6 +225,7 @@ firmware_debug = distenv.PhonyTarget(
    source=firmware_env["FW_ELF"],
    GDBOPTS="${GDBOPTS_BASE}",
    GDBREMOTE="${OPENOCD_GDB_PIPE}",
+    FBT_FAP_DEBUG_ELF_ROOT=path_as_posix(firmware_env.subst("$FBT_FAP_DEBUG_ELF_ROOT")),
 )
 distenv.Depends(firmware_debug, firmware_flash)

@@ -203,16 +235,38 @@ distenv.PhonyTarget(
    source=firmware_env["FW_ELF"],
    GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
    GDBREMOTE="${BLACKMAGIC_ADDR}",
+    FBT_FAP_DEBUG_ELF_ROOT=path_as_posix(firmware_env.subst("$FBT_FAP_DEBUG_ELF_ROOT")),
 )

 # Debug alien elf
+debug_other_opts = [
+    "-ex",
+    "source ${FBT_DEBUG_DIR}/PyCortexMDebug/PyCortexMDebug.py",
+    # "-ex",
+    # "source ${FBT_DEBUG_DIR}/FreeRTOS/FreeRTOS.py",
+    "-ex",
+    "source ${FBT_DEBUG_DIR}/flipperversion.py",
+    "-ex",
+    "fw-version",
+]
+
 distenv.PhonyTarget(
    "debug_other",
    "${GDBPYCOM}",
-    GDBPYOPTS='-ex "source debug/PyCortexMDebug/PyCortexMDebug.py" ',
+    GDBOPTS="${GDBOPTS_BASE}",
    GDBREMOTE="${OPENOCD_GDB_PIPE}",
+    GDBPYOPTS=debug_other_opts,
 )

+distenv.PhonyTarget(
+    "debug_other_blackmagic",
+    "${GDBPYCOM}",
+    GDBOPTS="${GDBOPTS_BASE}  ${GDBOPTS_BLACKMAGIC}",
+    GDBREMOTE="${BLACKMAGIC_ADDR}",
+    GDBPYOPTS=debug_other_opts,
+)
+
+
 # Just start OpenOCD
 distenv.PhonyTarget(
    "openocd",
@@ -222,14 +276,14 @@ distenv.PhonyTarget(
 # Linter
 distenv.PhonyTarget(
    "lint",
-    "${PYTHON3} scripts/lint.py check ${LINT_SOURCES}",
-    LINT_SOURCES=firmware_env["LINT_SOURCES"],
+    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py check ${LINT_SOURCES}",
+    LINT_SOURCES=[n.srcnode() for n in firmware_env["LINT_SOURCES"]],
 )

 distenv.PhonyTarget(
    "format",
-    "${PYTHON3} scripts/lint.py format ${LINT_SOURCES}",
-    LINT_SOURCES=firmware_env["LINT_SOURCES"],
+    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py format ${LINT_SOURCES}",
+    LINT_SOURCES=[n.srcnode() for n in firmware_env["LINT_SOURCES"]],
 )

 # PY_LINT_SOURCES contains recursively-built modules' SConscript files + application manifests
@@ -240,7 +294,6 @@ firmware_env.Append(
        "site_scons",
        "scripts",
        # Extra files
-        "applications/extapps.scons",
        "SConstruct",
        "firmware.scons",
        "fbt_options.py",
@@ -270,7 +323,10 @@ distenv.PhonyTarget(
 )

 # Start Flipper CLI via PySerial's miniterm
-distenv.PhonyTarget("cli", "${PYTHON3} scripts/serial_cli.py")
+distenv.PhonyTarget("cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py -p ${FLIP_PORT}")
+
+# Update WiFi devboard firmware
+distenv.PhonyTarget("devboard_flash", "${PYTHON3} ${FBT_SCRIPT_DIR}/wifi_board.py")


 # Find blackmagic probe
@@ -279,8 +335,31 @@ distenv.PhonyTarget(
    "@echo $( ${BLACKMAGIC_ADDR} $)",
 )

+
+# Find STLink probe ids
+distenv.PhonyTarget(
+    "get_stlink",
+    distenv.Action(
+        lambda **kw: distenv.GetDevices(),
+        None,
+    ),
+)
+
 # Prepare vscode environment
-vscode_dist = distenv.Install("#.vscode", distenv.Glob("#.vscode/example/*"))
+VSCODE_LANG_SERVER = cmd_environment["LANG_SERVER"]
+vscode_dist = distenv.Install(
+    "#.vscode",
+    [
+        distenv.Glob("#.vscode/example/*.json"),
+        distenv.Glob(f"#.vscode/example/{VSCODE_LANG_SERVER}/*.json"),
+    ],
+)
 distenv.Precious(vscode_dist)
 distenv.NoClean(vscode_dist)
 distenv.Alias("vscode_dist", vscode_dist)
+
+# Configure shell with build tools
+distenv.PhonyTarget(
+    "env",
+    "@echo $( ${FBT_SCRIPT_DIR}/toolchain/fbtenv.sh $)",
+)
--- a/applications/ReadMe.md
+++ b/applications/ReadMe.md
@@ -1,38 +1,78 @@
 # Structure

- `about`               - Small About application that shows flipper info
- `accessor`            - Wiegand server
+## debug 
+
+Applications for factory testing the Flipper.
+
+- `accessor`            - Wiegand server 
+- `battery_test_app`    - Battery debug app
+- `blink_test`          - LED blinker   
+- `bt_debug_app`        - BT test app. Requires full BT stack installed
+- `display_test`        - Various display tests & tweaks
+- `file_browser_test`   - Test UI for file picker
+- `keypad_test`         - Keypad test
+- `lfrfid_debug`        - LF RFID debug tool
+- `text_box_test`       - UI tests
+- `uart_echo`           - UART mode test 
+- `unit_tests`          - Unit tests
+- `usb_mouse`           - USB HID test
+- `usb_test`            - Other USB tests
+- `vibro_test`          - Vibro test
+
+
+## main
+
+Applications for main Flipper menu.
+
 - `archive`             - Archive and file manager 
 - `bad_usb`             - Bad USB application
+- `gpio`                - GPIO application: includes USART bridge and GPIO control
+- `ibutton`             - iButton application, onewire keys and more
+- `infrared`            - Infrared application, controls your IR devices
+- `lfrfid`              - LF RFID application
+- `nfc`                 - NFC application, HF rfid, EMV and etc
+- `subghz`              - SubGhz application, 433 fobs and etc
+- `u2f`                 - U2F Application
+
+
+## services
+
+Background services providing system APIs to applications.
+
+- `applications.h`      - Firmware application list header
+
 - `bt`                  - BLE service and application
 - `cli`                 - Console service and API
 - `crypto`              - Crypto cli tools
- `debug_tools`         - Different tools that we use for debug
 - `desktop`             - Desktop service
 - `dialogs`             - Dialogs service: GUI Dialogs for your app
 - `dolphin`             - Dolphin service and supplementary apps
- `gpio`                - GPIO application: includes USART bridge and GPIO control
 - `gui`                 - GUI service and API
- `ibutton`             - iButton application, onewire keys and more
 - `input`               - Input service
- `infrared`            - Infrared application, controls your IR devices
- `lfrfid`              - LF RFID application
- `lfrfid_debug`        - LF RFID debug tool
 - `loader`              - Application loader service
- `music_player`        - Music player app (demo)
- `nfc`                 - NFC application, HF rfid, EMV and etc
 - `notification`        - Notification service 
 - `power`               - Power service
- `power_observer`      - Power debug tool
 - `rpc`                 - RPC service and API
- `scened_app_example`  - C++ application example
- `snake_game`          - Snake game application
 - `storage`             - Storage service, internal + sdcard
- `storage_settings`    - Storage settings app
- `subghz`              - SubGhz application, 433 fobs and etc
- `system`              - System settings, tools and API
- `tests`               - Unit tests and etc
- `u2f`                 - U2F Application
- `updater`             - Update service & application

- `application.h`       - Firmware application list header
+
+## settings
+
+Small applications providing configuration for basic firmware and its services.
+
+- `about`               - Small About application that shows flipper info
+- `bt_settings_app`     - Bluetooth options
+- `desktop_settings`    - Desktop configuration
+- `dolphin_passport`    - Dolphin passport app
+- `notification_settings` - LCD brightness, sound volume, etc configuration
+- `power_settings_app`  - Basic power options
+- `storage_settings`    - Storage settings app
+- `system`              - System settings
+
+
+## system
+
+Utility apps not visible in other menus.
+
+- `storage_move_to_sd`  - Data migration tool for internal storage
+- `updater`             - Update service & application
--- a/applications/accessor/application.fam
+++ b/applications/accessor/application.fam
@@ -1,10 +0,0 @@
-App(
-    appid="accessor",
-    name="Accessor",
-    apptype=FlipperAppType.DEBUG,
-    entry_point="accessor_app",
-    cdefines=["APP_ACCESSOR"],
-    requires=["gui"],
-    stack_size=4 * 1024,
-    order=40,
-)
--- a/applications/applications.h
+++ b/applications/applications.h
@@ -1,78 +0,0 @@
-#pragma once
-
-#include <furi.h>
-#include <gui/icon.h>
-
-typedef enum {
-    FlipperApplicationFlagDefault = 0,
-    FlipperApplicationFlagInsomniaSafe = (1 << 0),
-} FlipperApplicationFlag;
-
-typedef struct {
-    const FuriThreadCallback app;
-    const char* name;
-    const size_t stack_size;
-    const Icon* icon;
-    const FlipperApplicationFlag flags;
-} FlipperApplication;
-
-typedef void (*FlipperOnStartHook)(void);
-
-extern const char* FLIPPER_AUTORUN_APP_NAME;
-
-/* Services list
- * Spawned on startup
- */
-extern const FlipperApplication FLIPPER_SERVICES[];
-extern const size_t FLIPPER_SERVICES_COUNT;
-
-/* Apps list
- * Spawned by loader
- */
-extern const FlipperApplication FLIPPER_APPS[];
-extern const size_t FLIPPER_APPS_COUNT;
-
-/* On system start hooks
- * Called by loader, after OS initialization complete
- */
-extern const FlipperOnStartHook FLIPPER_ON_SYSTEM_START[];
-extern const size_t FLIPPER_ON_SYSTEM_START_COUNT;
-
-/* Plugins list
- * Spawned by loader
- */
-extern const FlipperApplication FLIPPER_PLUGINS[];
-extern const size_t FLIPPER_PLUGINS_COUNT;
-
-/* Games list
-* Spawned by loader
-*/
-extern const FlipperApplication FLIPPER_GAMES[];
-extern const size_t FLIPPER_GAMES_COUNT;
-
-/* Debug menu apps
- * Spawned by loader
- */
-extern const FlipperApplication FLIPPER_DEBUG_APPS[];
-extern const size_t FLIPPER_DEBUG_APPS_COUNT;
-
-/* System apps
- * Can only be spawned by loader by name
- */
-extern const FlipperApplication FLIPPER_SYSTEM_APPS[];
-extern const size_t FLIPPER_SYSTEM_APPS_COUNT;
-
-/* Seperate scene app holder
- * Spawned by loader
- */
-extern const FlipperApplication FLIPPER_SCENE;
-extern const FlipperApplication FLIPPER_SCENE_APPS[];
-extern const size_t FLIPPER_SCENE_APPS_COUNT;
-
-extern const FlipperApplication FLIPPER_ARCHIVE;
-
-/* Settings list
- * Spawned by loader
- */
-extern const FlipperApplication FLIPPER_SETTINGS_APPS[];
-extern const size_t FLIPPER_SETTINGS_APPS_COUNT;
--- a/applications/archive/application.fam
+++ b/applications/archive/application.fam
@@ -1,11 +0,0 @@
-App(
-    appid="archive",
-    name="Archive",
-    apptype=FlipperAppType.ARCHIVE,
-    entry_point="archive_app",
-    cdefines=["APP_ARCHIVE"],
-    requires=["gui"],
-    stack_size=4 * 1024,
-    icon="A_FileManager_14",
-    order=0,
-)
--- a/applications/archive/archive.c
+++ b/applications/archive/archive.c
@@ -1,79 +0,0 @@
-#include "archive_i.h"
-#include "m-string.h"
-
-bool archive_custom_event_callback(void* context, uint32_t event) {
-    furi_assert(context);
-    ArchiveApp* archive = (ArchiveApp*)context;
-    return scene_manager_handle_custom_event(archive->scene_manager, event);
-}
-
-bool archive_back_event_callback(void* context) {
-    furi_assert(context);
-    ArchiveApp* archive = (ArchiveApp*)context;
-    return scene_manager_handle_back_event(archive->scene_manager);
-}
-
-ArchiveApp* archive_alloc() {
-    ArchiveApp* archive = malloc(sizeof(ArchiveApp));
-
-    archive->gui = furi_record_open(RECORD_GUI);
-    archive->text_input = text_input_alloc();
-    string_init(archive->fav_move_str);
-
-    archive->view_dispatcher = view_dispatcher_alloc();
-    archive->scene_manager = scene_manager_alloc(&archive_scene_handlers, archive);
-
-    view_dispatcher_enable_queue(archive->view_dispatcher);
-    view_dispatcher_attach_to_gui(
-        archive->view_dispatcher, archive->gui, ViewDispatcherTypeFullscreen);
-
-    view_dispatcher_set_event_callback_context(archive->view_dispatcher, archive);
-    view_dispatcher_set_custom_event_callback(
-        archive->view_dispatcher, archive_custom_event_callback);
-    view_dispatcher_set_navigation_event_callback(
-        archive->view_dispatcher, archive_back_event_callback);
-
-    archive->browser = browser_alloc();
-
-    view_dispatcher_add_view(
-        archive->view_dispatcher, ArchiveViewBrowser, archive_browser_get_view(archive->browser));
-
-    view_dispatcher_add_view(
-        archive->view_dispatcher, ArchiveViewTextInput, text_input_get_view(archive->text_input));
-
-    archive->widget = widget_alloc();
-    view_dispatcher_add_view(
-        archive->view_dispatcher, ArchiveViewWidget, widget_get_view(archive->widget));
-
-    return archive;
-}
-
-void archive_free(ArchiveApp* archive) {
-    furi_assert(archive);
-
-    view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewBrowser);
-    view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewTextInput);
-    view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewWidget);
-    widget_free(archive->widget);
-    view_dispatcher_free(archive->view_dispatcher);
-    scene_manager_free(archive->scene_manager);
-    browser_free(archive->browser);
-    string_clear(archive->fav_move_str);
-
-    text_input_free(archive->text_input);
-
-    furi_record_close(RECORD_GUI);
-    archive->gui = NULL;
-
-    free(archive);
-}
-
-int32_t archive_app(void* p) {
-    UNUSED(p);
-    ArchiveApp* archive = archive_alloc();
-    scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneBrowser);
-    view_dispatcher_run(archive->view_dispatcher);
-    archive_free(archive);
-
-    return 0;
-}
--- a/applications/archive/archive_i.h
+++ b/applications/archive/archive_i.h
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "archive.h"
-#include <stdint.h>
-#include <furi.h>
-#include <gui/gui_i.h>
-#include <gui/view_dispatcher.h>
-#include <gui/scene_manager.h>
-#include <gui/modules/text_input.h>
-#include <gui/modules/widget.h>
-#include <loader/loader.h>
-
-#include "views/archive_browser_view.h"
-#include "scenes/archive_scene.h"
-
-typedef enum {
-    ArchiveViewBrowser,
-    ArchiveViewTextInput,
-    ArchiveViewWidget,
-    ArchiveViewTotal,
-} ArchiveViewEnum;
-
-struct ArchiveApp {
-    Gui* gui;
-    ViewDispatcher* view_dispatcher;
-    SceneManager* scene_manager;
-    ArchiveBrowserView* browser;
-    TextInput* text_input;
-    Widget* widget;
-    FuriPubSubSubscription* loader_stop_subscription;
-    string_t fav_move_str;
-    char text_store[MAX_NAME_LEN];
-    char file_extension[MAX_EXT_LEN + 1];
-};
--- a/applications/archive/helpers/archive_browser.c
+++ b/applications/archive/helpers/archive_browser.c
@@ -1,506 +0,0 @@
-#include "archive/views/archive_browser_view.h"
-#include "archive_files.h"
-#include "archive_apps.h"
-#include "archive_browser.h"
-#include <core/common_defines.h>
-#include <core/log.h>
-#include "gui/modules/file_browser_worker.h"
-#include "m-string.h"
-#include <math.h>
-
-static void
-    archive_folder_open_cb(void* context, uint32_t item_cnt, int32_t file_idx, bool is_root) {
-    furi_assert(context);
-    ArchiveBrowserView* browser = (ArchiveBrowserView*)context;
-
-    int32_t load_offset = 0;
-    browser->is_root = is_root;
-    ArchiveTabEnum tab = archive_get_tab(browser);
-
-    if((item_cnt == 0) && (archive_is_home(browser)) && (tab != ArchiveTabBrowser)) {
-        archive_switch_tab(browser, browser->last_tab_switch_dir);
-    } else if(!string_start_with_str_p(browser->path, "/app:")) {
-        with_view_model(
-            browser->view, (ArchiveBrowserViewModel * model) {
-                files_array_reset(model->files);
-                model->item_cnt = item_cnt;
-                model->item_idx = (file_idx > 0) ? file_idx : 0;
-                load_offset =
-                    CLAMP(model->item_idx - FILE_LIST_BUF_LEN / 2, (int32_t)model->item_cnt, 0);
-                model->array_offset = 0;
-                model->list_offset = 0;
-                model->list_loading = true;
-                model->folder_loading = false;
-                return false;
-            });
-        archive_update_offset(browser);
-
-        file_browser_worker_load(browser->worker, load_offset, FILE_LIST_BUF_LEN);
-    }
-}
-
-static void archive_list_load_cb(void* context, uint32_t list_load_offset) {
-    furi_assert(context);
-    ArchiveBrowserView* browser = (ArchiveBrowserView*)context;
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            files_array_reset(model->files);
-            model->array_offset = list_load_offset;
-            return false;
-        });
-}
-
-static void archive_list_item_cb(void* context, string_t item_path, bool is_folder, bool is_last) {
-    furi_assert(context);
-    ArchiveBrowserView* browser = (ArchiveBrowserView*)context;
-
-    if(!is_last) {
-        archive_add_file_item(browser, is_folder, string_get_cstr(item_path));
-    } else {
-        with_view_model(
-            browser->view, (ArchiveBrowserViewModel * model) {
-                model->list_loading = false;
-                return true;
-            });
-    }
-}
-
-static void archive_long_load_cb(void* context) {
-    furi_assert(context);
-    ArchiveBrowserView* browser = (ArchiveBrowserView*)context;
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            model->folder_loading = true;
-            return true;
-        });
-}
-
-static void archive_file_browser_set_path(
-    ArchiveBrowserView* browser,
-    string_t path,
-    const char* filter_ext,
-    bool skip_assets) {
-    furi_assert(browser);
-    if(!browser->worker_running) {
-        browser->worker = file_browser_worker_alloc(path, filter_ext, skip_assets);
-        file_browser_worker_set_callback_context(browser->worker, browser);
-        file_browser_worker_set_folder_callback(browser->worker, archive_folder_open_cb);
-        file_browser_worker_set_list_callback(browser->worker, archive_list_load_cb);
-        file_browser_worker_set_item_callback(browser->worker, archive_list_item_cb);
-        file_browser_worker_set_long_load_callback(browser->worker, archive_long_load_cb);
-        browser->worker_running = true;
-    } else {
-        furi_assert(browser->worker);
-        file_browser_worker_set_config(browser->worker, path, filter_ext, skip_assets);
-    }
-}
-
-bool archive_is_item_in_array(ArchiveBrowserViewModel* model, uint32_t idx) {
-    size_t array_size = files_array_size(model->files);
-
-    if((idx >= (uint32_t)model->array_offset + array_size) ||
-       (idx < (uint32_t)model->array_offset)) {
-        return false;
-    }
-
-    return true;
-}
-
-void archive_update_offset(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            uint16_t bounds = model->item_cnt > 3 ? 2 : model->item_cnt;
-
-            if((model->item_cnt > 3u) && (model->item_idx >= ((int32_t)model->item_cnt - 1))) {
-                model->list_offset = model->item_idx - 3;
-            } else if(model->list_offset < model->item_idx - bounds) {
-                model->list_offset =
-                    CLAMP(model->item_idx - 2, (int32_t)model->item_cnt - bounds, 0);
-            } else if(model->list_offset > model->item_idx - bounds) {
-                model->list_offset =
-                    CLAMP(model->item_idx - 1, (int32_t)model->item_cnt - bounds, 0);
-            }
-
-            return true;
-        });
-}
-
-void archive_update_focus(ArchiveBrowserView* browser, const char* target) {
-    furi_assert(browser);
-    furi_assert(target);
-
-    archive_get_items(browser, string_get_cstr(browser->path));
-
-    if(!archive_file_get_array_size(browser) && archive_is_home(browser)) {
-        archive_switch_tab(browser, TAB_RIGHT);
-    } else {
-        with_view_model(
-            browser->view, (ArchiveBrowserViewModel * model) {
-                uint16_t idx = 0;
-                while(idx < files_array_size(model->files)) {
-                    ArchiveFile_t* current = files_array_get(model->files, idx);
-                    if(!string_search(current->path, target)) {
-                        model->item_idx = idx + model->array_offset;
-                        break;
-                    }
-                    ++idx;
-                }
-                return false;
-            });
-
-        archive_update_offset(browser);
-    }
-}
-
-size_t archive_file_get_array_size(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-
-    uint16_t size = 0;
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            size = files_array_size(model->files);
-            return false;
-        });
-    return size;
-}
-
-void archive_set_item_count(ArchiveBrowserView* browser, uint32_t count) {
-    furi_assert(browser);
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            model->item_cnt = count;
-            model->item_idx = CLAMP(model->item_idx, (int32_t)model->item_cnt - 1, 0);
-            return false;
-        });
-    archive_update_offset(browser);
-}
-
-void archive_file_array_rm_selected(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-    uint32_t items_cnt = 0;
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            files_array_remove_v(
-                model->files,
-                model->item_idx - model->array_offset,
-                model->item_idx - model->array_offset + 1);
-            model->item_cnt--;
-            model->item_idx = CLAMP(model->item_idx, (int32_t)model->item_cnt - 1, 0);
-            items_cnt = model->item_cnt;
-            return false;
-        });
-
-    if((items_cnt == 0) && (archive_is_home(browser))) {
-        archive_switch_tab(browser, TAB_RIGHT);
-    }
-
-    archive_update_offset(browser);
-}
-
-void archive_file_array_swap(ArchiveBrowserView* browser, int8_t dir) {
-    furi_assert(browser);
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            ArchiveFile_t temp;
-            size_t array_size = files_array_size(model->files) - 1;
-            uint8_t swap_idx = CLAMP((size_t)(model->item_idx + dir), array_size, 0u);
-
-            if(model->item_idx == 0 && dir < 0) {
-                ArchiveFile_t_init(&temp);
-                files_array_pop_at(&temp, model->files, array_size);
-                files_array_push_at(model->files, model->item_idx, temp);
-                ArchiveFile_t_clear(&temp);
-            } else if(((uint32_t)model->item_idx == array_size) && (dir > 0)) {
-                ArchiveFile_t_init(&temp);
-                files_array_pop_at(&temp, model->files, 0);
-                files_array_push_at(model->files, array_size, temp);
-                ArchiveFile_t_clear(&temp);
-            } else {
-                files_array_swap_at(model->files, model->item_idx, swap_idx);
-            }
-            return false;
-        });
-}
-
-void archive_file_array_rm_all(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            files_array_reset(model->files);
-            return false;
-        });
-}
-
-void archive_file_array_load(ArchiveBrowserView* browser, int8_t dir) {
-    furi_assert(browser);
-
-    int32_t offset_new = 0;
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            if(model->item_cnt > FILE_LIST_BUF_LEN) {
-                if(dir < 0) {
-                    offset_new = model->item_idx - FILE_LIST_BUF_LEN / 4 * 3;
-                } else if(dir == 0) {
-                    offset_new = model->item_idx - FILE_LIST_BUF_LEN / 4 * 2;
-                } else {
-                    offset_new = model->item_idx - FILE_LIST_BUF_LEN / 4 * 1;
-                }
-                if(offset_new > 0) {
-                    offset_new =
-                        CLAMP(offset_new, (int32_t)model->item_cnt - FILE_LIST_BUF_LEN, 0);
-                } else {
-                    offset_new = 0;
-                }
-            }
-            return false;
-        });
-
-    file_browser_worker_load(browser->worker, offset_new, FILE_LIST_BUF_LEN);
-}
-
-ArchiveFile_t* archive_get_current_file(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-
-    ArchiveFile_t* selected;
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            selected = files_array_size(model->files) ?
-                           files_array_get(model->files, model->item_idx - model->array_offset) :
-                           NULL;
-            return false;
-        });
-    return selected;
-}
-
-ArchiveFile_t* archive_get_file_at(ArchiveBrowserView* browser, size_t idx) {
-    furi_assert(browser);
-
-    ArchiveFile_t* selected;
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            idx = CLAMP(idx - model->array_offset, files_array_size(model->files), 0u);
-            selected = files_array_size(model->files) ? files_array_get(model->files, idx) : NULL;
-            return false;
-        });
-    return selected;
-}
-
-ArchiveTabEnum archive_get_tab(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-
-    ArchiveTabEnum tab_id;
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            tab_id = model->tab_idx;
-            return false;
-        });
-    return tab_id;
-}
-
-bool archive_is_home(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-
-    if(browser->is_root) {
-        return true;
-    }
-
-    const char* default_path = archive_get_default_path(archive_get_tab(browser));
-    return (string_cmp_str(browser->path, default_path) == 0);
-}
-
-const char* archive_get_name(ArchiveBrowserView* browser) {
-    ArchiveFile_t* selected = archive_get_current_file(browser);
-    return string_get_cstr(selected->path);
-}
-
-void archive_set_tab(ArchiveBrowserView* browser, ArchiveTabEnum tab) {
-    furi_assert(browser);
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            model->tab_idx = tab;
-            return false;
-        });
-}
-
-void archive_add_app_item(ArchiveBrowserView* browser, const char* name) {
-    furi_assert(browser);
-    furi_assert(name);
-
-    ArchiveFile_t item;
-    ArchiveFile_t_init(&item);
-    string_set_str(item.path, name);
-    archive_set_file_type(&item, name, false, true);
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            files_array_push_back(model->files, item);
-            model->item_cnt = files_array_size(model->files);
-            return false;
-        });
-    ArchiveFile_t_clear(&item);
-}
-
-void archive_add_file_item(ArchiveBrowserView* browser, bool is_folder, const char* name) {
-    furi_assert(browser);
-    furi_assert(name);
-
-    ArchiveFile_t item;
-
-    ArchiveFile_t_init(&item);
-    string_init_set_str(item.path, name);
-    archive_set_file_type(&item, string_get_cstr(browser->path), is_folder, false);
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            files_array_push_back(model->files, item);
-            return false;
-        });
-    ArchiveFile_t_clear(&item);
-}
-
-void archive_show_file_menu(ArchiveBrowserView* browser, bool show) {
-    furi_assert(browser);
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            if(show) {
-                if(archive_is_item_in_array(model, model->item_idx)) {
-                    model->menu = true;
-                    model->menu_idx = 0;
-                    ArchiveFile_t* selected =
-                        files_array_get(model->files, model->item_idx - model->array_offset);
-                    selected->fav = archive_is_favorite("%s", string_get_cstr(selected->path));
-                }
-            } else {
-                model->menu = false;
-                model->menu_idx = 0;
-            }
-
-            return true;
-        });
-}
-
-void archive_favorites_move_mode(ArchiveBrowserView* browser, bool active) {
-    furi_assert(browser);
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            model->move_fav = active;
-            return true;
-        });
-}
-
-static bool archive_is_dir_exists(string_t path) {
-    if(string_equal_str_p(path, STORAGE_ANY_PATH_PREFIX)) {
-        return true;
-    }
-    bool state = false;
-    FileInfo file_info;
-    Storage* storage = furi_record_open(RECORD_STORAGE);
-    if(storage_common_stat(storage, string_get_cstr(path), &file_info) == FSE_OK) {
-        if(file_info.flags & FSF_DIRECTORY) {
-            state = true;
-        }
-    }
-    furi_record_close(RECORD_STORAGE);
-    return state;
-}
-
-void archive_switch_tab(ArchiveBrowserView* browser, InputKey key) {
-    furi_assert(browser);
-    ArchiveTabEnum tab = archive_get_tab(browser);
-
-    browser->last_tab_switch_dir = key;
-
-    if(key == InputKeyLeft) {
-        tab = ((tab - 1) + ArchiveTabTotal) % ArchiveTabTotal;
-    } else {
-        tab = (tab + 1) % ArchiveTabTotal;
-    }
-
-    browser->is_root = true;
-    archive_set_tab(browser, tab);
-
-    string_set_str(browser->path, archive_get_default_path(tab));
-    bool tab_empty = true;
-    if(tab == ArchiveTabFavorites) {
-        if(archive_favorites_count(browser) > 0) {
-            tab_empty = false;
-        }
-    } else if(string_start_with_str_p(browser->path, "/app:")) {
-        char* app_name = strchr(string_get_cstr(browser->path), ':');
-        if(app_name != NULL) {
-            if(archive_app_is_available(browser, string_get_cstr(browser->path))) {
-                tab_empty = false;
-            }
-        }
-    } else {
-        tab = archive_get_tab(browser);
-        if(archive_is_dir_exists(browser->path)) {
-            bool skip_assets = (strcmp(archive_get_tab_ext(tab), "*") == 0) ? false : true;
-            archive_file_browser_set_path(
-                browser, browser->path, archive_get_tab_ext(tab), skip_assets);
-            tab_empty = false; // Empty check will be performed later
-        } else {
-            tab_empty = true;
-        }
-    }
-
-    if((tab_empty) && (tab != ArchiveTabBrowser)) {
-        archive_switch_tab(browser, key);
-    } else {
-        with_view_model(
-            browser->view, (ArchiveBrowserViewModel * model) {
-                model->item_idx = 0;
-                model->array_offset = 0;
-                return false;
-            });
-        archive_get_items(browser, string_get_cstr(browser->path));
-        archive_update_offset(browser);
-    }
-}
-
-void archive_enter_dir(ArchiveBrowserView* browser, string_t path) {
-    furi_assert(browser);
-    furi_assert(path);
-
-    int32_t idx_temp = 0;
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            idx_temp = model->item_idx;
-            return false;
-        });
-
-    string_set(browser->path, path);
-    file_browser_worker_folder_enter(browser->worker, path, idx_temp);
-}
-
-void archive_leave_dir(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-
-    file_browser_worker_folder_exit(browser->worker);
-}
-
-void archive_refresh_dir(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-
-    int32_t idx_temp = 0;
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            idx_temp = model->item_idx;
-            return false;
-        });
-    file_browser_worker_folder_refresh(browser->worker, idx_temp);
-}
--- a/applications/archive/helpers/archive_favorites.c
+++ b/applications/archive/helpers/archive_favorites.c
@@ -1,337 +0,0 @@
-
-#include "archive_favorites.h"
-#include "archive_files.h"
-#include "archive_apps.h"
-#include "archive_browser.h"
-
-#define ARCHIVE_FAV_FILE_BUF_LEN 32
-
-static bool archive_favorites_read_line(File* file, string_t str_result) {
-    string_reset(str_result);
-    uint8_t buffer[ARCHIVE_FAV_FILE_BUF_LEN];
-    bool result = false;
-
-    do {
-        uint16_t read_count = storage_file_read(file, buffer, ARCHIVE_FAV_FILE_BUF_LEN);
-        if(storage_file_get_error(file) != FSE_OK) {
-            return false;
-        }
-
-        for(uint16_t i = 0; i < read_count; i++) {
-            if(buffer[i] == '\n') {
-                uint32_t position = storage_file_tell(file);
-                if(storage_file_get_error(file) != FSE_OK) {
-                    return false;
-                }
-
-                position = position - read_count + i + 1;
-
-                storage_file_seek(file, position, true);
-                if(storage_file_get_error(file) != FSE_OK) {
-                    return false;
-                }
-
-                result = true;
-                break;
-            } else {
-                string_push_back(str_result, buffer[i]);
-            }
-        }
-
-        if(result || read_count == 0) {
-            break;
-        }
-    } while(true);
-
-    return result;
-}
-
-uint16_t archive_favorites_count(void* context) {
-    furi_assert(context);
-
-    Storage* fs_api = furi_record_open(RECORD_STORAGE);
-    File* file = storage_file_alloc(fs_api);
-
-    string_t buffer;
-    string_init(buffer);
-
-    bool result = storage_file_open(file, ARCHIVE_FAV_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
-    uint16_t lines = 0;
-
-    if(result) {
-        while(1) {
-            if(!archive_favorites_read_line(file, buffer)) {
-                break;
-            }
-            if(!string_size(buffer)) {
-                continue; // Skip empty lines
-            }
-            ++lines;
-        }
-    }
-
-    storage_file_close(file);
-
-    string_clear(buffer);
-    storage_file_free(file);
-    furi_record_close(RECORD_STORAGE);
-
-    return lines;
-}
-
-static bool archive_favourites_rescan() {
-    string_t buffer;
-    string_init(buffer);
-    Storage* storage = furi_record_open(RECORD_STORAGE);
-    File* file = storage_file_alloc(storage);
-
-    bool result = storage_file_open(file, ARCHIVE_FAV_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
-    if(result) {
-        while(1) {
-            if(!archive_favorites_read_line(file, buffer)) {
-                break;
-            }
-            if(!string_size(buffer)) {
-                continue;
-            }
-
-            if(string_search(buffer, "/app:") == 0) {
-                if(archive_app_is_available(NULL, string_get_cstr(buffer))) {
-                    archive_file_append(ARCHIVE_FAV_TEMP_PATH, "%s\n", string_get_cstr(buffer));
-                }
-            } else {
-                if(storage_file_exists(storage, string_get_cstr(buffer))) {
-                    archive_file_append(ARCHIVE_FAV_TEMP_PATH, "%s\n", string_get_cstr(buffer));
-                }
-            }
-        }
-    }
-
-    string_clear(buffer);
-
-    storage_file_close(file);
-    storage_common_remove(storage, ARCHIVE_FAV_PATH);
-    storage_common_rename(storage, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH);
-    storage_common_remove(storage, ARCHIVE_FAV_TEMP_PATH);
-
-    storage_file_free(file);
-    furi_record_close(RECORD_STORAGE);
-
-    return result;
-}
-
-bool archive_favorites_read(void* context) {
-    furi_assert(context);
-
-    ArchiveBrowserView* browser = context;
-    Storage* storage = furi_record_open(RECORD_STORAGE);
-    File* file = storage_file_alloc(storage);
-
-    string_t buffer;
-    FileInfo file_info;
-    string_init(buffer);
-
-    bool need_refresh = false;
-    uint16_t file_count = 0;
-
-    archive_file_array_rm_all(browser);
-
-    bool result = storage_file_open(file, ARCHIVE_FAV_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
-
-    if(result) {
-        while(1) {
-            if(!archive_favorites_read_line(file, buffer)) {
-                break;
-            }
-            if(!string_size(buffer)) {
-                continue;
-            }
-
-            if(string_search(buffer, "/app:") == 0) {
-                if(archive_app_is_available(browser, string_get_cstr(buffer))) {
-                    archive_add_app_item(browser, string_get_cstr(buffer));
-                    file_count++;
-                } else {
-                    need_refresh = true;
-                }
-            } else {
-                if(storage_file_exists(storage, string_get_cstr(buffer))) {
-                    storage_common_stat(storage, string_get_cstr(buffer), &file_info);
-                    archive_add_file_item(
-                        browser, (file_info.flags & FSF_DIRECTORY), string_get_cstr(buffer));
-                    file_count++;
-                } else {
-                    need_refresh = true;
-                }
-            }
-
-            string_reset(buffer);
-        }
-    }
-    storage_file_close(file);
-    string_clear(buffer);
-    storage_file_free(file);
-    furi_record_close(RECORD_STORAGE);
-
-    archive_set_item_count(browser, file_count);
-
-    if(need_refresh) {
-        archive_favourites_rescan();
-    }
-
-    return result;
-}
-
-bool archive_favorites_delete(const char* format, ...) {
-    string_t buffer;
-    string_t filename;
-    va_list args;
-    va_start(args, format);
-    string_init_vprintf(filename, format, args);
-    va_end(args);
-
-    string_init(buffer);
-    Storage* fs_api = furi_record_open(RECORD_STORAGE);
-    File* file = storage_file_alloc(fs_api);
-
-    bool result = storage_file_open(file, ARCHIVE_FAV_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
-
-    if(result) {
-        while(1) {
-            if(!archive_favorites_read_line(file, buffer)) {
-                break;
-            }
-            if(!string_size(buffer)) {
-                continue;
-            }
-
-            if(string_search(buffer, filename)) {
-                archive_file_append(ARCHIVE_FAV_TEMP_PATH, "%s\n", string_get_cstr(buffer));
-            }
-        }
-    }
-
-    string_clear(buffer);
-    string_clear(filename);
-
-    storage_file_close(file);
-    storage_common_remove(fs_api, ARCHIVE_FAV_PATH);
-    storage_common_rename(fs_api, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH);
-    storage_common_remove(fs_api, ARCHIVE_FAV_TEMP_PATH);
-
-    storage_file_free(file);
-    furi_record_close(RECORD_STORAGE);
-
-    return result;
-}
-
-bool archive_is_favorite(const char* format, ...) {
-    string_t buffer;
-    string_t filename;
-    va_list args;
-    va_start(args, format);
-    string_init_vprintf(filename, format, args);
-    va_end(args);
-
-    string_init(buffer);
-    Storage* fs_api = furi_record_open(RECORD_STORAGE);
-    File* file = storage_file_alloc(fs_api);
-
-    bool found = false;
-    bool result = storage_file_open(file, ARCHIVE_FAV_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
-
-    if(result) {
-        while(1) {
-            if(!archive_favorites_read_line(file, buffer)) {
-                break;
-            }
-            if(!string_size(buffer)) {
-                continue;
-            }
-            if(!string_search(buffer, filename)) {
-                found = true;
-                break;
-            }
-        }
-    }
-
-    storage_file_close(file);
-    string_clear(buffer);
-    string_clear(filename);
-    storage_file_free(file);
-    furi_record_close(RECORD_STORAGE);
-
-    return found;
-}
-
-bool archive_favorites_rename(const char* src, const char* dst) {
-    furi_assert(src);
-    furi_assert(dst);
-
-    Storage* fs_api = furi_record_open(RECORD_STORAGE);
-    File* file = storage_file_alloc(fs_api);
-
-    string_t path;
-    string_t buffer;
-
-    string_init(buffer);
-    string_init(path);
-
-    string_printf(path, "%s", src);
-    bool result = storage_file_open(file, ARCHIVE_FAV_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
-
-    if(result) {
-        while(1) {
-            if(!archive_favorites_read_line(file, buffer)) {
-                break;
-            }
-            if(!string_size(buffer)) {
-                continue;
-            }
-
-            archive_file_append(
-                ARCHIVE_FAV_TEMP_PATH,
-                "%s\n",
-                string_search(buffer, path) ? string_get_cstr(buffer) : dst);
-        }
-    }
-
-    string_clear(buffer);
-    string_clear(path);
-
-    storage_file_close(file);
-    storage_common_remove(fs_api, ARCHIVE_FAV_PATH);
-    storage_common_rename(fs_api, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH);
-    storage_common_remove(fs_api, ARCHIVE_FAV_TEMP_PATH);
-
-    storage_file_free(file);
-    furi_record_close(RECORD_STORAGE);
-
-    return result;
-}
-
-void archive_add_to_favorites(const char* file_path) {
-    furi_assert(file_path);
-
-    archive_file_append(ARCHIVE_FAV_PATH, "%s\n", file_path);
-}
-
-void archive_favorites_save(void* context) {
-    furi_assert(context);
-
-    ArchiveBrowserView* browser = context;
-    Storage* fs_api = furi_record_open(RECORD_STORAGE);
-    File* file = storage_file_alloc(fs_api);
-
-    for(size_t i = 0; i < archive_file_get_array_size(browser); i++) {
-        ArchiveFile_t* item = archive_get_file_at(browser, i);
-        archive_file_append(ARCHIVE_FAV_TEMP_PATH, "%s\n", string_get_cstr(item->path));
-    }
-
-    storage_common_remove(fs_api, ARCHIVE_FAV_PATH);
-    storage_common_rename(fs_api, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH);
-    storage_common_remove(fs_api, ARCHIVE_FAV_TEMP_PATH);
-
-    storage_file_free(file);
-    furi_record_close(RECORD_STORAGE);
-}
--- a/applications/archive/helpers/archive_favorites.h
+++ b/applications/archive/helpers/archive_favorites.h
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <storage/storage.h>
-
-#define ARCHIVE_FAV_PATH ANY_PATH("favorites.txt")
-#define ARCHIVE_FAV_TEMP_PATH ANY_PATH("favorites.tmp")
-
-uint16_t archive_favorites_count(void* context);
-bool archive_favorites_read(void* context);
-bool archive_favorites_delete(const char* format, ...);
-bool archive_is_favorite(const char* format, ...);
-bool archive_favorites_rename(const char* src, const char* dst);
-void archive_add_to_favorites(const char* file_path);
-void archive_favorites_save(void* context);
--- a/applications/archive/helpers/archive_files.c
+++ b/applications/archive/helpers/archive_files.c
@@ -1,111 +0,0 @@
-#include "archive_files.h"
-#include "archive_apps.h"
-#include "archive_browser.h"
-
-#define TAG "Archive"
-
-#define ASSETS_DIR "assets"
-
-void archive_set_file_type(ArchiveFile_t* file, const char* path, bool is_folder, bool is_app) {
-    furi_assert(file);
-
-    file->is_app = is_app;
-    if(is_app) {
-        file->type = archive_get_app_filetype(archive_get_app_type(path));
-    } else {
-        for(size_t i = 0; i < COUNT_OF(known_ext); i++) {
-            if((known_ext[i][0] == '?') || (known_ext[i][0] == '*')) continue;
-            if(string_search_str(file->path, known_ext[i], 0) != STRING_FAILURE) {
-                if(i == ArchiveFileTypeBadUsb) {
-                    if(string_search_str(file->path, archive_get_default_path(ArchiveTabBadUsb)) ==
-                       0) {
-                        file->type = i;
-                        return; // *.txt file is a BadUSB script only if it is in BadUSB folder
-                    }
-                } else {
-                    file->type = i;
-                    return;
-                }
-            }
-        }
-
-        if(is_folder) {
-            file->type = ArchiveFileTypeFolder;
-        } else {
-            file->type = ArchiveFileTypeUnknown;
-        }
-    }
-}
-
-bool archive_get_items(void* context, const char* path) {
-    furi_assert(context);
-
-    bool res = false;
-    ArchiveBrowserView* browser = context;
-
-    if(archive_get_tab(browser) == ArchiveTabFavorites) {
-        res = archive_favorites_read(browser);
-    } else if(strncmp(path, "/app:", 5) == 0) {
-        res = archive_app_read_dir(browser, path);
-    }
-    return res;
-}
-
-void archive_file_append(const char* path, const char* format, ...) {
-    furi_assert(path);
-
-    string_t string;
-    va_list args;
-    va_start(args, format);
-    string_init_vprintf(string, format, args);
-    va_end(args);
-
-    Storage* fs_api = furi_record_open(RECORD_STORAGE);
-    File* file = storage_file_alloc(fs_api);
-
-    bool res = storage_file_open(file, path, FSAM_WRITE, FSOM_OPEN_APPEND);
-
-    if(res) {
-        storage_file_write(file, string_get_cstr(string), string_size(string));
-    }
-
-    storage_file_close(file);
-    storage_file_free(file);
-    furi_record_close(RECORD_STORAGE);
-}
-
-void archive_delete_file(void* context, const char* format, ...) {
-    furi_assert(context);
-
-    string_t filename;
-    va_list args;
-    va_start(args, format);
-    string_init_vprintf(filename, format, args);
-    va_end(args);
-
-    ArchiveBrowserView* browser = context;
-    Storage* fs_api = furi_record_open(RECORD_STORAGE);
-
-    FileInfo fileinfo;
-    storage_common_stat(fs_api, string_get_cstr(filename), &fileinfo);
-
-    bool res = false;
-
-    if(fileinfo.flags & FSF_DIRECTORY) {
-        res = storage_simply_remove_recursive(fs_api, string_get_cstr(filename));
-    } else {
-        res = (storage_common_remove(fs_api, string_get_cstr(filename)) == FSE_OK);
-    }
-
-    furi_record_close(RECORD_STORAGE);
-
-    if(archive_is_favorite("%s", string_get_cstr(filename))) {
-        archive_favorites_delete("%s", string_get_cstr(filename));
-    }
-
-    if(res) {
-        archive_file_array_rm_selected(browser);
-    }
-
-    string_clear(filename);
-}
--- a/applications/archive/helpers/archive_files.h
+++ b/applications/archive/helpers/archive_files.h
@@ -1,64 +0,0 @@
-#pragma once
-
-#include <m-array.h>
-#include <m-string.h>
-#include <storage/storage.h>
-
-typedef enum {
-    ArchiveFileTypeIButton,
-    ArchiveFileTypeNFC,
-    ArchiveFileTypeSubGhz,
-    ArchiveFileTypeLFRFID,
-    ArchiveFileTypeInfrared,
-    ArchiveFileTypeBadUsb,
-    ArchiveFileTypeU2f,
-    ArchiveFileTypeUpdateManifest,
-    ArchiveFileTypeFolder,
-    ArchiveFileTypeUnknown,
-    ArchiveFileTypeLoading,
-} ArchiveFileTypeEnum;
-
-typedef struct {
-    string_t path;
-    ArchiveFileTypeEnum type;
-    bool fav;
-    bool is_app;
-} ArchiveFile_t;
-
-static void ArchiveFile_t_init(ArchiveFile_t* obj) {
-    obj->type = ArchiveFileTypeUnknown;
-    obj->is_app = false;
-    obj->fav = false;
-    string_init(obj->path);
-}
-
-static void ArchiveFile_t_init_set(ArchiveFile_t* obj, const ArchiveFile_t* src) {
-    obj->type = src->type;
-    obj->is_app = src->is_app;
-    obj->fav = src->fav;
-    string_init_set(obj->path, src->path);
-}
-
-static void ArchiveFile_t_set(ArchiveFile_t* obj, const ArchiveFile_t* src) {
-    obj->type = src->type;
-    obj->is_app = src->is_app;
-    obj->fav = src->fav;
-    string_set(obj->path, src->path);
-}
-
-static void ArchiveFile_t_clear(ArchiveFile_t* obj) {
-    string_clear(obj->path);
-}
-
-ARRAY_DEF(
-    files_array,
-    ArchiveFile_t,
-    (INIT(API_2(ArchiveFile_t_init)),
-     SET(API_6(ArchiveFile_t_set)),
-     INIT_SET(API_6(ArchiveFile_t_init_set)),
-     CLEAR(API_2(ArchiveFile_t_clear))))
-
-void archive_set_file_type(ArchiveFile_t* file, const char* path, bool is_folder, bool is_app);
-bool archive_get_items(void* context, const char* path);
-void archive_file_append(const char* path, const char* format, ...);
-void archive_delete_file(void* context, const char* format, ...);
--- a/applications/archive/scenes/archive_scene_browser.c
+++ b/applications/archive/scenes/archive_scene_browser.c
@@ -1,221 +0,0 @@
-#include "../archive_i.h"
-#include "../helpers/archive_files.h"
-#include "../helpers/archive_apps.h"
-#include "../helpers/archive_favorites.h"
-#include "../helpers/archive_browser.h"
-#include "../views/archive_browser_view.h"
-#include "archive/scenes/archive_scene.h"
-
-#define TAG "ArchiveSceneBrowser"
-
-#define SCENE_STATE_DEFAULT (0)
-#define SCENE_STATE_NEED_REFRESH (1)
-
-static const char* flipper_app_name[] = {
-    [ArchiveFileTypeIButton] = "iButton",
-    [ArchiveFileTypeNFC] = "NFC",
-    [ArchiveFileTypeSubGhz] = "Sub-GHz",
-    [ArchiveFileTypeLFRFID] = "125 kHz RFID",
-    [ArchiveFileTypeInfrared] = "Infrared",
-    [ArchiveFileTypeBadUsb] = "Bad USB",
-    [ArchiveFileTypeU2f] = "U2F",
-    [ArchiveFileTypeUpdateManifest] = "UpdaterApp",
-};
-
-static void archive_loader_callback(const void* message, void* context) {
-    furi_assert(message);
-    furi_assert(context);
-    const LoaderEvent* event = message;
-    ArchiveApp* archive = (ArchiveApp*)context;
-
-    if(event->type == LoaderEventTypeApplicationStopped) {
-        view_dispatcher_send_custom_event(
-            archive->view_dispatcher, ArchiveBrowserEventListRefresh);
-    }
-}
-
-static void archive_run_in_app(ArchiveBrowserView* browser, ArchiveFile_t* selected) {
-    UNUSED(browser);
-    Loader* loader = furi_record_open(RECORD_LOADER);
-
-    LoaderStatus status;
-    if(selected->is_app) {
-        char* param = strrchr(string_get_cstr(selected->path), '/');
-        if(param != NULL) {
-            param++;
-        }
-        status = loader_start(loader, flipper_app_name[selected->type], param);
-    } else {
-        status = loader_start(
-            loader, flipper_app_name[selected->type], string_get_cstr(selected->path));
-    }
-
-    if(status != LoaderStatusOk) {
-        FURI_LOG_E(TAG, "loader_start failed: %d", status);
-    }
-
-    furi_record_close(RECORD_LOADER);
-}
-
-void archive_scene_browser_callback(ArchiveBrowserEvent event, void* context) {
-    ArchiveApp* archive = (ArchiveApp*)context;
-    view_dispatcher_send_custom_event(archive->view_dispatcher, event);
-}
-
-void archive_scene_browser_on_enter(void* context) {
-    ArchiveApp* archive = (ArchiveApp*)context;
-    ArchiveBrowserView* browser = archive->browser;
-    browser->is_root = true;
-
-    archive_browser_set_callback(browser, archive_scene_browser_callback, archive);
-    archive_update_focus(browser, archive->text_store);
-    view_dispatcher_switch_to_view(archive->view_dispatcher, ArchiveViewBrowser);
-
-    Loader* loader = furi_record_open(RECORD_LOADER);
-    archive->loader_stop_subscription =
-        furi_pubsub_subscribe(loader_get_pubsub(loader), archive_loader_callback, archive);
-    furi_record_close(RECORD_LOADER);
-
-    uint32_t state = scene_manager_get_scene_state(archive->scene_manager, ArchiveAppSceneBrowser);
-
-    if(state == SCENE_STATE_NEED_REFRESH) {
-        view_dispatcher_send_custom_event(
-            archive->view_dispatcher, ArchiveBrowserEventListRefresh);
-    }
-
-    scene_manager_set_scene_state(
-        archive->scene_manager, ArchiveAppSceneBrowser, SCENE_STATE_DEFAULT);
-}
-
-bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
-    ArchiveApp* archive = (ArchiveApp*)context;
-    ArchiveBrowserView* browser = archive->browser;
-    ArchiveFile_t* selected = archive_get_current_file(browser);
-
-    bool favorites = archive_get_tab(browser) == ArchiveTabFavorites;
-    bool consumed = false;
-
-    if(event.type == SceneManagerEventTypeCustom) {
-        switch(event.event) {
-        case ArchiveBrowserEventFileMenuOpen:
-            archive_show_file_menu(browser, true);
-            consumed = true;
-            break;
-        case ArchiveBrowserEventFileMenuClose:
-            archive_show_file_menu(browser, false);
-            consumed = true;
-            break;
-        case ArchiveBrowserEventFileMenuRun:
-            if(archive_is_known_app(selected->type)) {
-                archive_run_in_app(browser, selected);
-                archive_show_file_menu(browser, false);
-            }
-            consumed = true;
-            break;
-        case ArchiveBrowserEventFileMenuPin: {
-            const char* name = archive_get_name(browser);
-            if(favorites) {
-                archive_favorites_delete(name);
-                archive_file_array_rm_selected(browser);
-                archive_show_file_menu(browser, false);
-            } else if(archive_is_known_app(selected->type)) {
-                if(archive_is_favorite("%s", name)) {
-                    archive_favorites_delete("%s", name);
-                } else {
-                    archive_file_append(ARCHIVE_FAV_PATH, "%s\n", name);
-                }
-                archive_show_file_menu(browser, false);
-            }
-            consumed = true;
-        } break;
-
-        case ArchiveBrowserEventFileMenuRename:
-            if(favorites) {
-                browser->callback(ArchiveBrowserEventEnterFavMove, browser->context);
-            } else if((archive_is_known_app(selected->type)) && (selected->is_app == false)) {
-                archive_show_file_menu(browser, false);
-                scene_manager_set_scene_state(
-                    archive->scene_manager, ArchiveAppSceneBrowser, SCENE_STATE_NEED_REFRESH);
-                scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneRename);
-            }
-            consumed = true;
-            break;
-        case ArchiveBrowserEventFileMenuDelete:
-            if(archive_get_tab(browser) != ArchiveTabFavorites) {
-                scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneDelete);
-            }
-            consumed = true;
-            break;
-        case ArchiveBrowserEventEnterDir:
-            archive_enter_dir(browser, selected->path);
-            consumed = true;
-            break;
-        case ArchiveBrowserEventFavMoveUp:
-            archive_file_array_swap(browser, 1);
-            consumed = true;
-            break;
-        case ArchiveBrowserEventFavMoveDown:
-            archive_file_array_swap(browser, -1);
-            consumed = true;
-            break;
-        case ArchiveBrowserEventEnterFavMove:
-            string_set(archive->fav_move_str, selected->path);
-            archive_show_file_menu(browser, false);
-            archive_favorites_move_mode(archive->browser, true);
-            consumed = true;
-            break;
-        case ArchiveBrowserEventExitFavMove:
-            archive_update_focus(browser, string_get_cstr(archive->fav_move_str));
-            archive_favorites_move_mode(archive->browser, false);
-            consumed = true;
-            break;
-        case ArchiveBrowserEventSaveFavMove:
-            archive_favorites_move_mode(archive->browser, false);
-            archive_favorites_save(archive->browser);
-            consumed = true;
-            break;
-        case ArchiveBrowserEventLoadPrevItems:
-            archive_file_array_load(archive->browser, -1);
-            consumed = true;
-            break;
-        case ArchiveBrowserEventLoadNextItems:
-            archive_file_array_load(archive->browser, 1);
-            consumed = true;
-            break;
-        case ArchiveBrowserEventListRefresh:
-            if(!favorites) {
-                archive_refresh_dir(browser);
-            } else {
-                archive_favorites_read(browser);
-            }
-            consumed = true;
-            break;
-
-        case ArchiveBrowserEventExit:
-            if(!archive_is_home(browser)) {
-                archive_leave_dir(browser);
-            } else {
-                Loader* loader = furi_record_open(RECORD_LOADER);
-                furi_pubsub_unsubscribe(
-                    loader_get_pubsub(loader), archive->loader_stop_subscription);
-                furi_record_close(RECORD_LOADER);
-
-                view_dispatcher_stop(archive->view_dispatcher);
-            }
-            consumed = true;
-            break;
-
-        default:
-            break;
-        }
-    }
-    return consumed;
-}
-
-void archive_scene_browser_on_exit(void* context) {
-    ArchiveApp* archive = (ArchiveApp*)context;
-
-    Loader* loader = furi_record_open(RECORD_LOADER);
-    furi_pubsub_unsubscribe(loader_get_pubsub(loader), archive->loader_stop_subscription);
-    furi_record_close(RECORD_LOADER);
-}
--- a/applications/archive/scenes/archive_scene_config.h
+++ b/applications/archive/scenes/archive_scene_config.h
@@ -1,3 +0,0 @@
-ADD_SCENE(archive, browser, Browser)
-ADD_SCENE(archive, rename, Rename)
-ADD_SCENE(archive, delete, Delete)
--- a/applications/archive/scenes/archive_scene_rename.c
+++ b/applications/archive/scenes/archive_scene_rename.c
@@ -1,89 +0,0 @@
-#include "../archive_i.h"
-#include "../helpers/archive_favorites.h"
-#include "../helpers/archive_files.h"
-#include "../helpers/archive_browser.h"
-#include "archive/views/archive_browser_view.h"
-#include "toolbox/path.h"
-
-#define SCENE_RENAME_CUSTOM_EVENT (0UL)
-#define MAX_TEXT_INPUT_LEN 22
-
-void archive_scene_rename_text_input_callback(void* context) {
-    ArchiveApp* archive = (ArchiveApp*)context;
-    view_dispatcher_send_custom_event(archive->view_dispatcher, SCENE_RENAME_CUSTOM_EVENT);
-}
-
-void archive_scene_rename_on_enter(void* context) {
-    ArchiveApp* archive = (ArchiveApp*)context;
-
-    TextInput* text_input = archive->text_input;
-    ArchiveFile_t* current = archive_get_current_file(archive->browser);
-
-    string_t filename;
-    string_init(filename);
-    path_extract_filename(current->path, filename, true);
-    strlcpy(archive->text_store, string_get_cstr(filename), MAX_NAME_LEN);
-
-    path_extract_extension(current->path, archive->file_extension, MAX_EXT_LEN);
-
-    text_input_set_header_text(text_input, "Rename:");
-
-    text_input_set_result_callback(
-        text_input,
-        archive_scene_rename_text_input_callback,
-        archive,
-        archive->text_store,
-        MAX_TEXT_INPUT_LEN,
-        false);
-
-    ValidatorIsFile* validator_is_file = validator_is_file_alloc_init(
-        string_get_cstr(archive->browser->path), archive->file_extension, "");
-    text_input_set_validator(text_input, validator_is_file_callback, validator_is_file);
-
-    string_clear(filename);
-
-    view_dispatcher_switch_to_view(archive->view_dispatcher, ArchiveViewTextInput);
-}
-
-bool archive_scene_rename_on_event(void* context, SceneManagerEvent event) {
-    ArchiveApp* archive = (ArchiveApp*)context;
-    bool consumed = false;
-
-    if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == SCENE_RENAME_CUSTOM_EVENT) {
-            Storage* fs_api = furi_record_open(RECORD_STORAGE);
-
-            const char* path_src = archive_get_name(archive->browser);
-            ArchiveFile_t* file = archive_get_current_file(archive->browser);
-
-            string_t path_dst;
-            string_init(path_dst);
-            path_extract_dirname(path_src, path_dst);
-            string_cat_printf(path_dst, "/%s%s", archive->text_store, known_ext[file->type]);
-
-            storage_common_rename(fs_api, path_src, string_get_cstr(path_dst));
-            furi_record_close(RECORD_STORAGE);
-
-            if(file->fav) {
-                archive_favorites_rename(path_src, string_get_cstr(path_dst));
-            }
-
-            string_clear(path_dst);
-
-            scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneBrowser);
-            consumed = true;
-        }
-    }
-    return consumed;
-}
-
-void archive_scene_rename_on_exit(void* context) {
-    ArchiveApp* archive = (ArchiveApp*)context;
-
-    // Clear view
-    void* validator_context = text_input_get_validator_callback_context(archive->text_input);
-    text_input_set_validator(archive->text_input, NULL, NULL);
-    validator_is_file_free(validator_context);
-
-    text_input_reset(archive->text_input);
-}
--- a/applications/archive/views/archive_browser_view.c
+++ b/applications/archive/views/archive_browser_view.c
@@ -1,393 +0,0 @@
-#include "assets_icons.h"
-#include "toolbox/path.h"
-#include <furi.h>
-#include "../archive_i.h"
-#include "archive_browser_view.h"
-#include "../helpers/archive_browser.h"
-
-static const char* ArchiveTabNames[] = {
-    [ArchiveTabFavorites] = "Favorites",
-    [ArchiveTabIButton] = "iButton",
-    [ArchiveTabNFC] = "NFC",
-    [ArchiveTabSubGhz] = "Sub-GHz",
-    [ArchiveTabLFRFID] = "RFID LF",
-    [ArchiveTabInfrared] = "Infrared",
-    [ArchiveTabBadUsb] = "Bad USB",
-    [ArchiveTabU2f] = "U2F",
-    [ArchiveTabBrowser] = "Browser",
-};
-
-static const Icon* ArchiveItemIcons[] = {
-    [ArchiveFileTypeIButton] = &I_ibutt_10px,
-    [ArchiveFileTypeNFC] = &I_Nfc_10px,
-    [ArchiveFileTypeSubGhz] = &I_sub1_10px,
-    [ArchiveFileTypeLFRFID] = &I_125_10px,
-    [ArchiveFileTypeInfrared] = &I_ir_10px,
-    [ArchiveFileTypeBadUsb] = &I_badusb_10px,
-    [ArchiveFileTypeU2f] = &I_u2f_10px,
-    [ArchiveFileTypeUpdateManifest] = &I_update_10px,
-    [ArchiveFileTypeFolder] = &I_dir_10px,
-    [ArchiveFileTypeUnknown] = &I_unknown_10px,
-    [ArchiveFileTypeLoading] = &I_loading_10px,
-};
-
-void archive_browser_set_callback(
-    ArchiveBrowserView* browser,
-    ArchiveBrowserViewCallback callback,
-    void* context) {
-    furi_assert(browser);
-    furi_assert(callback);
-    browser->callback = callback;
-    browser->context = context;
-}
-
-static void render_item_menu(Canvas* canvas, ArchiveBrowserViewModel* model) {
-    canvas_set_color(canvas, ColorWhite);
-    canvas_draw_box(canvas, 71, 17, 57, 46);
-    canvas_set_color(canvas, ColorBlack);
-    elements_slightly_rounded_frame(canvas, 70, 16, 58, 48);
-
-    string_t menu[MENU_ITEMS];
-
-    string_init_set_str(menu[0], "Run in app");
-    string_init_set_str(menu[1], "Pin");
-    string_init_set_str(menu[2], "Rename");
-    string_init_set_str(menu[3], "Delete");
-
-    ArchiveFile_t* selected = files_array_get(model->files, model->item_idx - model->array_offset);
-
-    if((selected->fav) || (model->tab_idx == ArchiveTabFavorites)) {
-        string_set_str(menu[1], "Unpin");
-    }
-
-    if(!archive_is_known_app(selected->type)) {
-        string_set_str(menu[0], "---");
-        string_set_str(menu[1], "---");
-        string_set_str(menu[2], "---");
-    } else {
-        if(model->tab_idx == ArchiveTabFavorites) {
-            string_set_str(menu[2], "Move");
-            string_set_str(menu[3], "---");
-        } else if(selected->is_app) {
-            string_set_str(menu[2], "---");
-        }
-    }
-
-    for(size_t i = 0; i < MENU_ITEMS; i++) {
-        canvas_draw_str(canvas, 82, 27 + i * 11, string_get_cstr(menu[i]));
-        string_clear(menu[i]);
-    }
-
-    canvas_draw_icon(canvas, 74, 20 + model->menu_idx * 11, &I_ButtonRight_4x7);
-}
-
-static void archive_draw_frame(Canvas* canvas, uint16_t idx, bool scrollbar, bool moving) {
-    uint8_t x_offset = moving ? MOVE_OFFSET : 0;
-
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_box(
-        canvas,
-        0 + x_offset,
-        15 + idx * FRAME_HEIGHT,
-        (scrollbar ? 122 : 127) - x_offset,
-        FRAME_HEIGHT);
-
-    canvas_set_color(canvas, ColorWhite);
-    canvas_draw_dot(canvas, 0 + x_offset, 15 + idx * FRAME_HEIGHT);
-    canvas_draw_dot(canvas, 1 + x_offset, 15 + idx * FRAME_HEIGHT);
-    canvas_draw_dot(canvas, 0 + x_offset, (15 + idx * FRAME_HEIGHT) + 1);
-
-    canvas_draw_dot(canvas, 0 + x_offset, (15 + idx * FRAME_HEIGHT) + 11);
-    canvas_draw_dot(canvas, scrollbar ? 121 : 126, 15 + idx * FRAME_HEIGHT);
-    canvas_draw_dot(canvas, scrollbar ? 121 : 126, (15 + idx * FRAME_HEIGHT) + 11);
-}
-
-static void archive_draw_loading(Canvas* canvas, ArchiveBrowserViewModel* model) {
-    furi_assert(model);
-
-    uint8_t x = 128 / 2 - 24 / 2;
-    uint8_t y = 64 / 2 - 24 / 2;
-
-    canvas_draw_icon(canvas, x, y, &A_Loading_24);
-}
-
-static void draw_list(Canvas* canvas, ArchiveBrowserViewModel* model) {
-    furi_assert(model);
-
-    size_t array_size = files_array_size(model->files);
-    bool scrollbar = model->item_cnt > 4;
-
-    for(uint32_t i = 0; i < MIN(model->item_cnt, MENU_ITEMS); ++i) {
-        string_t str_buf;
-        string_init(str_buf);
-        int32_t idx = CLAMP((uint32_t)(i + model->list_offset), model->item_cnt, 0u);
-        uint8_t x_offset = (model->move_fav && model->item_idx == idx) ? MOVE_OFFSET : 0;
-
-        ArchiveFileTypeEnum file_type = ArchiveFileTypeLoading;
-
-        if(archive_is_item_in_array(model, idx)) {
-            ArchiveFile_t* file = files_array_get(
-                model->files, CLAMP(idx - model->array_offset, (int32_t)(array_size - 1), 0));
-            path_extract_filename(file->path, str_buf, archive_is_known_app(file->type));
-            file_type = file->type;
-        } else {
-            string_set_str(str_buf, "---");
-        }
-
-        elements_string_fit_width(
-            canvas, str_buf, (scrollbar ? MAX_LEN_PX - 6 : MAX_LEN_PX) - x_offset);
-
-        if(model->item_idx == idx) {
-            archive_draw_frame(canvas, i, scrollbar, model->move_fav);
-        } else {
-            canvas_set_color(canvas, ColorBlack);
-        }
-
-        canvas_draw_icon(canvas, 2 + x_offset, 16 + i * FRAME_HEIGHT, ArchiveItemIcons[file_type]);
-        canvas_draw_str(canvas, 15 + x_offset, 24 + i * FRAME_HEIGHT, string_get_cstr(str_buf));
-
-        string_clear(str_buf);
-    }
-
-    if(scrollbar) {
-        elements_scrollbar_pos(canvas, 126, 15, 49, model->item_idx, model->item_cnt);
-    }
-
-    if(model->menu) {
-        render_item_menu(canvas, model);
-    }
-}
-
-static void archive_render_status_bar(Canvas* canvas, ArchiveBrowserViewModel* model) {
-    furi_assert(model);
-
-    const char* tab_name = ArchiveTabNames[model->tab_idx];
-
-    canvas_draw_icon(canvas, 0, 0, &I_Background_128x11);
-
-    canvas_set_color(canvas, ColorWhite);
-    canvas_draw_box(canvas, 0, 0, 50, 13);
-    canvas_draw_box(canvas, 107, 0, 20, 13);
-
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_rframe(canvas, 0, 0, 51, 13, 1); // frame
-    canvas_draw_line(canvas, 49, 1, 49, 11); // shadow right
-    canvas_draw_line(canvas, 1, 11, 49, 11); // shadow bottom
-    canvas_draw_str_aligned(canvas, 25, 9, AlignCenter, AlignBottom, tab_name);
-
-    canvas_draw_rframe(canvas, 107, 0, 21, 13, 1);
-    canvas_draw_line(canvas, 126, 1, 126, 11);
-    canvas_draw_line(canvas, 108, 11, 126, 11);
-
-    if(model->move_fav) {
-        canvas_draw_icon(canvas, 110, 4, &I_ButtonUp_7x4);
-        canvas_draw_icon(canvas, 117, 4, &I_ButtonDown_7x4);
-    } else {
-        canvas_draw_icon(canvas, 111, 2, &I_ButtonLeft_4x7);
-        canvas_draw_icon(canvas, 119, 2, &I_ButtonRight_4x7);
-    }
-
-    canvas_set_color(canvas, ColorWhite);
-    canvas_draw_dot(canvas, 50, 0);
-    canvas_draw_dot(canvas, 127, 0);
-
-    canvas_set_color(canvas, ColorBlack);
-}
-
-void archive_view_render(Canvas* canvas, void* mdl) {
-    ArchiveBrowserViewModel* model = mdl;
-
-    archive_render_status_bar(canvas, mdl);
-
-    if(model->folder_loading) {
-        archive_draw_loading(canvas, model);
-    } else if(model->item_cnt > 0) {
-        draw_list(canvas, model);
-    } else {
-        canvas_draw_str_aligned(
-            canvas, GUI_DISPLAY_WIDTH / 2, 40, AlignCenter, AlignCenter, "Empty");
-    }
-}
-
-View* archive_browser_get_view(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-    return browser->view;
-}
-
-static bool is_file_list_load_required(ArchiveBrowserViewModel* model) {
-    size_t array_size = files_array_size(model->files);
-
-    if((model->list_loading) || (array_size >= model->item_cnt)) {
-        return false;
-    }
-
-    if((model->array_offset > 0) &&
-       (model->item_idx < (model->array_offset + FILE_LIST_BUF_LEN / 4))) {
-        return true;
-    }
-
-    if(((model->array_offset + array_size) < model->item_cnt) &&
-       (model->item_idx > (int32_t)(model->array_offset + array_size - FILE_LIST_BUF_LEN / 4))) {
-        return true;
-    }
-
-    return false;
-}
-
-bool archive_view_input(InputEvent* event, void* context) {
-    furi_assert(event);
-    furi_assert(context);
-
-    ArchiveBrowserView* browser = context;
-
-    bool in_menu;
-    bool move_fav_mode;
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            in_menu = model->menu;
-            move_fav_mode = model->move_fav;
-            return false;
-        });
-
-    if(in_menu) {
-        if(event->type == InputTypeShort) {
-            if(event->key == InputKeyUp || event->key == InputKeyDown) {
-                with_view_model(
-                    browser->view, (ArchiveBrowserViewModel * model) {
-                        if(event->key == InputKeyUp) {
-                            model->menu_idx = ((model->menu_idx - 1) + MENU_ITEMS) % MENU_ITEMS;
-                        } else if(event->key == InputKeyDown) {
-                            model->menu_idx = (model->menu_idx + 1) % MENU_ITEMS;
-                        }
-                        return true;
-                    });
-            }
-
-            if(event->key == InputKeyOk) {
-                uint8_t idx;
-                with_view_model(
-                    browser->view, (ArchiveBrowserViewModel * model) {
-                        idx = model->menu_idx;
-                        return false;
-                    });
-                browser->callback(file_menu_actions[idx], browser->context);
-            } else if(event->key == InputKeyBack) {
-                browser->callback(ArchiveBrowserEventFileMenuClose, browser->context);
-            }
-        }
-
-    } else {
-        if(event->type == InputTypeShort) {
-            if(event->key == InputKeyLeft || event->key == InputKeyRight) {
-                if(move_fav_mode) return false;
-                archive_switch_tab(browser, event->key);
-            } else if(event->key == InputKeyBack) {
-                if(move_fav_mode) {
-                    browser->callback(ArchiveBrowserEventExitFavMove, browser->context);
-                } else {
-                    browser->callback(ArchiveBrowserEventExit, browser->context);
-                }
-            }
-        }
-
-        if((event->key == InputKeyUp || event->key == InputKeyDown) &&
-           (event->type == InputTypeShort || event->type == InputTypeRepeat)) {
-            with_view_model(
-                browser->view, (ArchiveBrowserViewModel * model) {
-                    if(event->key == InputKeyUp) {
-                        model->item_idx =
-                            ((model->item_idx - 1) + model->item_cnt) % model->item_cnt;
-                        if(is_file_list_load_required(model)) {
-                            model->list_loading = true;
-                            browser->callback(ArchiveBrowserEventLoadPrevItems, browser->context);
-                        }
-                        if(move_fav_mode) {
-                            browser->callback(ArchiveBrowserEventFavMoveUp, browser->context);
-                        }
-                    } else if(event->key == InputKeyDown) {
-                        model->item_idx = (model->item_idx + 1) % model->item_cnt;
-                        if(is_file_list_load_required(model)) {
-                            model->list_loading = true;
-                            browser->callback(ArchiveBrowserEventLoadNextItems, browser->context);
-                        }
-                        if(move_fav_mode) {
-                            browser->callback(ArchiveBrowserEventFavMoveDown, browser->context);
-                        }
-                    }
-
-                    return true;
-                });
-            archive_update_offset(browser);
-        }
-
-        if(event->key == InputKeyOk) {
-            ArchiveFile_t* selected = archive_get_current_file(browser);
-
-            if(selected) {
-                bool favorites = archive_get_tab(browser) == ArchiveTabFavorites;
-                bool folder = selected->type == ArchiveFileTypeFolder;
-
-                if(event->type == InputTypeShort) {
-                    if(favorites) {
-                        if(move_fav_mode) {
-                            browser->callback(ArchiveBrowserEventSaveFavMove, browser->context);
-                        } else {
-                            browser->callback(ArchiveBrowserEventFileMenuRun, browser->context);
-                        }
-                    } else if(folder) {
-                        browser->callback(ArchiveBrowserEventEnterDir, browser->context);
-                    } else {
-                        browser->callback(ArchiveBrowserEventFileMenuOpen, browser->context);
-                    }
-                } else if(event->type == InputTypeLong) {
-                    if(move_fav_mode) {
-                        browser->callback(ArchiveBrowserEventSaveFavMove, browser->context);
-                    } else if(folder || favorites) {
-                        browser->callback(ArchiveBrowserEventFileMenuOpen, browser->context);
-                    }
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-ArchiveBrowserView* browser_alloc() {
-    ArchiveBrowserView* browser = malloc(sizeof(ArchiveBrowserView));
-    browser->view = view_alloc();
-    view_allocate_model(browser->view, ViewModelTypeLocking, sizeof(ArchiveBrowserViewModel));
-    view_set_context(browser->view, browser);
-    view_set_draw_callback(browser->view, archive_view_render);
-    view_set_input_callback(browser->view, archive_view_input);
-
-    string_init_set_str(browser->path, archive_get_default_path(TAB_DEFAULT));
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            files_array_init(model->files);
-            model->tab_idx = TAB_DEFAULT;
-            return true;
-        });
-
-    return browser;
-}
-
-void browser_free(ArchiveBrowserView* browser) {
-    furi_assert(browser);
-
-    if(browser->worker_running) {
-        file_browser_worker_free(browser->worker);
-    }
-
-    with_view_model(
-        browser->view, (ArchiveBrowserViewModel * model) {
-            files_array_clear(model->files);
-            return false;
-        });
-
-    string_clear(browser->path);
-
-    view_free(browser->view);
-    free(browser);
-}
--- a/applications/archive/views/archive_browser_view.h
+++ b/applications/archive/views/archive_browser_view.h
@@ -1,109 +0,0 @@
-#pragma once
-
-#include <gui/gui_i.h>
-#include <gui/view.h>
-#include <gui/canvas.h>
-#include <gui/elements.h>
-#include <furi.h>
-#include <storage/storage.h>
-#include "../helpers/archive_files.h"
-#include "../helpers/archive_favorites.h"
-#include "gui/modules/file_browser_worker.h"
-
-#define MAX_LEN_PX 110
-#define MAX_NAME_LEN 255
-#define MAX_EXT_LEN 6
-#define FRAME_HEIGHT 12
-#define MENU_ITEMS 4u
-#define MOVE_OFFSET 5u
-
-typedef enum {
-    ArchiveTabFavorites,
-    ArchiveTabSubGhz,
-    ArchiveTabLFRFID,
-    ArchiveTabNFC,
-    ArchiveTabInfrared,
-    ArchiveTabIButton,
-    ArchiveTabBadUsb,
-    ArchiveTabU2f,
-    ArchiveTabBrowser,
-    ArchiveTabTotal,
-} ArchiveTabEnum;
-
-typedef enum {
-    ArchiveBrowserEventFileMenuOpen,
-    ArchiveBrowserEventFileMenuClose,
-    ArchiveBrowserEventFileMenuRun,
-    ArchiveBrowserEventFileMenuPin,
-    ArchiveBrowserEventFileMenuRename,
-    ArchiveBrowserEventFileMenuDelete,
-
-    ArchiveBrowserEventEnterDir,
-
-    ArchiveBrowserEventFavMoveUp,
-    ArchiveBrowserEventFavMoveDown,
-    ArchiveBrowserEventEnterFavMove,
-    ArchiveBrowserEventExitFavMove,
-    ArchiveBrowserEventSaveFavMove,
-
-    ArchiveBrowserEventLoadPrevItems,
-    ArchiveBrowserEventLoadNextItems,
-
-    ArchiveBrowserEventListRefresh,
-
-    ArchiveBrowserEventExit,
-} ArchiveBrowserEvent;
-
-static const uint8_t file_menu_actions[MENU_ITEMS] = {
-    [0] = ArchiveBrowserEventFileMenuRun,
-    [1] = ArchiveBrowserEventFileMenuPin,
-    [2] = ArchiveBrowserEventFileMenuRename,
-    [3] = ArchiveBrowserEventFileMenuDelete,
-};
-
-typedef struct ArchiveBrowserView ArchiveBrowserView;
-
-typedef void (*ArchiveBrowserViewCallback)(ArchiveBrowserEvent event, void* context);
-
-typedef enum {
-    BrowserActionBrowse,
-    BrowserActionItemMenu,
-    BrowserActionTotal,
-} BrowserActionEnum;
-
-struct ArchiveBrowserView {
-    View* view;
-    BrowserWorker* worker;
-    bool worker_running;
-    ArchiveBrowserViewCallback callback;
-    void* context;
-    string_t path;
-    InputKey last_tab_switch_dir;
-    bool is_root;
-};
-
-typedef struct {
-    ArchiveTabEnum tab_idx;
-    files_array_t files;
-
-    uint8_t menu_idx;
-    bool menu;
-    bool move_fav;
-    bool list_loading;
-    bool folder_loading;
-
-    uint32_t item_cnt;
-    int32_t item_idx;
-    int32_t array_offset;
-    int32_t list_offset;
-} ArchiveBrowserViewModel;
-
-void archive_browser_set_callback(
-    ArchiveBrowserView* browser,
-    ArchiveBrowserViewCallback callback,
-    void* context);
-
-View* archive_browser_get_view(ArchiveBrowserView* browser);
-
-ArchiveBrowserView* browser_alloc();
-void browser_free(ArchiveBrowserView* browser);
--- a/applications/arkanoid/application.fam
+++ b/applications/arkanoid/application.fam
@@ -1,10 +0,0 @@
-App(
-    appid="arkanoid_game",
-    name="Arkanoid",
-    apptype=FlipperAppType.GAME,
-    entry_point="arkanoid_game_app",
-    cdefines=["APP_ARKANOID_GAME"],
-    requires=["gui"],
-    stack_size=4 * 1024,
-    order=30,
-)
--- a/applications/arkanoid/arkanoid_game.c
+++ b/applications/arkanoid/arkanoid_game.c
@@ -1,456 +0,0 @@
-#include <furi.h>
-#include <gui/gui.h>
-#include <input/input.h>
-#include <stdlib.h>
-#include <gui/view.h>
-#include <notification/notification.h>
-#include <notification/notification_messages.h>
-
-#define TAG "Arkanoid"
-
-#define FLIPPER_LCD_WIDTH 128
-#define FLIPPER_LCD_HEIGHT 64
-
-typedef enum { EventTypeTick, EventTypeKey } EventType;
-
-typedef struct {
-    //Brick Bounds used in collision detection
-    int leftBrick;
-    int rightBrick;
-    int topBrick;
-    int bottomBrick;
-    bool isHit[4][13]; //Array of if bricks are hit or not
-} BrickState;
-
-typedef struct {
-    int dx; //Initial movement of ball
-    int dy; //Initial movement of ball
-    int xb; //Balls starting possition
-    int yb; //Balls starting possition
-    bool released; //If the ball has been released by the player
-    //Ball Bounds used in collision detection
-    int leftBall;
-    int rightBall;
-    int topBall;
-    int bottomBall;
-} BallState;
-
-typedef struct {
-    BallState ball_state;
-    BrickState brick_state;
-    NotificationApp* notify;
-    unsigned int COLUMNS; //Columns of bricks
-    unsigned int ROWS; //Rows of bricks
-    bool initialDraw; //If the inital draw has happened
-    int xPaddle; //X position of paddle
-    char text[16]; //General string buffer
-    bool bounced; //Used to fix double bounce glitch
-    int lives; //Amount of lives
-    int level; //Current level
-    unsigned int score; //Score for the game
-    unsigned int brickCount; //Amount of bricks hit
-    int tick; //Tick counter
-} ArkanoidState;
-
-typedef struct {
-    EventType type;
-    InputEvent input;
-} GameEvent;
-
-static const NotificationSequence sequence_short_sound = {
-    &message_note_c5,
-    &message_delay_50,
-    &message_sound_off,
-    NULL,
-};
-
-// generate number in range [min,max)
-int rand_range(int min, int max) {
-    int number = min + rand() % (max - min);
-    return number;
-}
-
-void move_ball(Canvas* canvas, ArkanoidState* st) {
-    st->tick++;
-    if(st->ball_state.released) {
-        //Move ball
-        if(abs(st->ball_state.dx) == 2) {
-            st->ball_state.xb += st->ball_state.dx / 2;
-            // 2x speed is really 1.5 speed
-            if(st->tick % 2 == 0) st->ball_state.xb += st->ball_state.dx / 2;
-        } else {
-            st->ball_state.xb += st->ball_state.dx;
-        }
-        st->ball_state.yb = st->ball_state.yb + st->ball_state.dy;
-
-        //Set bounds
-        st->ball_state.leftBall = st->ball_state.xb;
-        st->ball_state.rightBall = st->ball_state.xb + 2;
-        st->ball_state.topBall = st->ball_state.yb;
-        st->ball_state.bottomBall = st->ball_state.yb + 2;
-
-        //Bounce off top edge
-        if(st->ball_state.yb <= 0) {
-            st->ball_state.yb = 2;
-            st->ball_state.dy = -st->ball_state.dy;
-        }
-
-        //Lose a life if bottom edge hit
-        if(st->ball_state.yb >= FLIPPER_LCD_HEIGHT) {
-            canvas_draw_frame(canvas, st->xPaddle, FLIPPER_LCD_HEIGHT - 1, 11, 1);
-            st->xPaddle = 54;
-            st->ball_state.yb = 60;
-            st->ball_state.released = false;
-            st->lives--;
-
-            if(rand_range(0, 2) == 0) {
-                st->ball_state.dx = 1;
-            } else {
-                st->ball_state.dx = -1;
-            }
-        }
-
-        //Bounce off left side
-        if(st->ball_state.xb <= 0) {
-            st->ball_state.xb = 2;
-            st->ball_state.dx = -st->ball_state.dx;
-        }
-
-        //Bounce off right side
-        if(st->ball_state.xb >= FLIPPER_LCD_WIDTH - 2) {
-            st->ball_state.xb = FLIPPER_LCD_WIDTH - 4;
-            st->ball_state.dx = -st->ball_state.dx;
-            // arduboy.tunes.tone(523, 250);
-        }
-
-        //Bounce off paddle
-        if(st->ball_state.xb + 1 >= st->xPaddle && st->ball_state.xb <= st->xPaddle + 12 &&
-           st->ball_state.yb + 2 >= FLIPPER_LCD_HEIGHT - 1 &&
-           st->ball_state.yb <= FLIPPER_LCD_HEIGHT) {
-            st->ball_state.dy = -st->ball_state.dy;
-            st->ball_state.dx =
-                ((st->ball_state.xb - (st->xPaddle + 6)) / 3); //Applies spin on the ball
-            // prevent straight bounce, but not prevent roguuemaster from stealing
-            if(st->ball_state.dx == 0) {
-                st->ball_state.dx = (rand_range(0, 2) == 1) ? 1 : -1;
-            }
-        }
-
-        //Bounce off Bricks
-        for(unsigned int row = 0; row < st->ROWS; row++) {
-            for(unsigned int column = 0; column < st->COLUMNS; column++) {
-                if(!st->brick_state.isHit[row][column]) {
-                    //Sets Brick bounds
-                    st->brick_state.leftBrick = 10 * column;
-                    st->brick_state.rightBrick = 10 * column + 10;
-                    st->brick_state.topBrick = 6 * row + 1;
-                    st->brick_state.bottomBrick = 6 * row + 7;
-
-                    //If A collison has occured
-                    if(st->ball_state.topBall <= st->brick_state.bottomBrick &&
-                       st->ball_state.bottomBall >= st->brick_state.topBrick &&
-                       st->ball_state.leftBall <= st->brick_state.rightBrick &&
-                       st->ball_state.rightBall >= st->brick_state.leftBrick) {
-                        st->score += st->level;
-                        // Blink led when we hit some brick
-                        notification_message(st->notify, &sequence_short_sound);
-                        //notification_message(st->notify, &sequence_blink_white_100);
-
-                        st->brickCount++;
-                        st->brick_state.isHit[row][column] = true;
-                        canvas_draw_frame(canvas, 10 * column, 2 + 6 * row, 8, 4);
-
-                        //Vertical collision
-                        if(st->ball_state.bottomBall > st->brick_state.bottomBrick ||
-                           st->ball_state.topBall < st->brick_state.topBrick) {
-                            //Only bounce once each ball move
-                            if(!st->bounced) {
-                                st->ball_state.dy = -st->ball_state.dy;
-                                st->ball_state.yb += st->ball_state.dy;
-                                st->bounced = true;
-                            }
-                        }
-
-                        //Hoizontal collision
-                        if(st->ball_state.leftBall < st->brick_state.leftBrick ||
-                           st->ball_state.rightBall > st->brick_state.rightBrick) {
-                            //Only bounce once brick each ball move
-                            if(!st->bounced) {
-                                st->ball_state.dx = -st->ball_state.dx;
-                                st->ball_state.xb += st->ball_state.dx;
-                                st->bounced = true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        //Reset Bounce
-        st->bounced = false;
-    } else {
-        //Ball follows paddle
-        st->ball_state.xb = st->xPaddle + 5;
-    }
-}
-
-void draw_lives(Canvas* canvas, ArkanoidState* arkanoid_state) {
-    if(arkanoid_state->lives == 3) {
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 7);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 7);
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 8);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 8);
-
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 11);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 11);
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 12);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 12);
-
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 15);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 15);
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 16);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 16);
-    } else if(arkanoid_state->lives == 2) {
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 7);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 7);
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 8);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 8);
-
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 11);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 11);
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 12);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 12);
-    } else {
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 7);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 7);
-        canvas_draw_dot(canvas, 4, FLIPPER_LCD_HEIGHT - 8);
-        canvas_draw_dot(canvas, 3, FLIPPER_LCD_HEIGHT - 8);
-    }
-}
-
-void draw_score(Canvas* canvas, ArkanoidState* arkanoid_state) {
-    snprintf(arkanoid_state->text, sizeof(arkanoid_state->text), "%u", arkanoid_state->score);
-    canvas_draw_str_aligned(
-        canvas,
-        FLIPPER_LCD_WIDTH - 2,
-        FLIPPER_LCD_HEIGHT - 6,
-        AlignRight,
-        AlignBottom,
-        arkanoid_state->text);
-}
-
-void draw_ball(Canvas* canvas, ArkanoidState* ast) {
-    canvas_draw_dot(canvas, ast->ball_state.xb, ast->ball_state.yb);
-    canvas_draw_dot(canvas, ast->ball_state.xb + 1, ast->ball_state.yb);
-    canvas_draw_dot(canvas, ast->ball_state.xb, ast->ball_state.yb + 1);
-    canvas_draw_dot(canvas, ast->ball_state.xb + 1, ast->ball_state.yb + 1);
-
-    move_ball(canvas, ast);
-}
-
-void draw_paddle(Canvas* canvas, ArkanoidState* arkanoid_state) {
-    canvas_draw_frame(canvas, arkanoid_state->xPaddle, FLIPPER_LCD_HEIGHT - 1, 11, 1);
-}
-
-void reset_level(Canvas* canvas, ArkanoidState* arkanoid_state) {
-    //Undraw paddle
-    canvas_draw_frame(canvas, arkanoid_state->xPaddle, FLIPPER_LCD_HEIGHT - 1, 11, 1);
-
-    //Undraw ball
-    canvas_draw_dot(canvas, arkanoid_state->ball_state.xb, arkanoid_state->ball_state.yb);
-    canvas_draw_dot(canvas, arkanoid_state->ball_state.xb + 1, arkanoid_state->ball_state.yb);
-    canvas_draw_dot(canvas, arkanoid_state->ball_state.xb, arkanoid_state->ball_state.yb + 1);
-    canvas_draw_dot(canvas, arkanoid_state->ball_state.xb + 1, arkanoid_state->ball_state.yb + 1);
-
-    //Alter various variables to reset the game
-    arkanoid_state->xPaddle = 54;
-    arkanoid_state->ball_state.yb = 60;
-    arkanoid_state->brickCount = 0;
-    arkanoid_state->ball_state.released = false;
-
-    // Reset all brick hit states
-    for(unsigned int row = 0; row < arkanoid_state->ROWS; row++) {
-        for(unsigned int column = 0; column < arkanoid_state->COLUMNS; column++) {
-            arkanoid_state->brick_state.isHit[row][column] = false;
-        }
-    }
-}
-
-static void arkanoid_state_init(ArkanoidState* arkanoid_state) {
-    // Init notification
-    arkanoid_state->notify = furi_record_open(RECORD_NOTIFICATION);
-
-    // Set the initial game state
-    arkanoid_state->COLUMNS = 13;
-    arkanoid_state->ROWS = 4;
-    arkanoid_state->ball_state.dx = -1;
-    arkanoid_state->ball_state.dy = -1;
-    arkanoid_state->bounced = false;
-    arkanoid_state->lives = 3;
-    arkanoid_state->level = 1;
-    arkanoid_state->score = 0;
-    arkanoid_state->COLUMNS = 13;
-    arkanoid_state->COLUMNS = 13;
-
-    // Reset initial state
-    arkanoid_state->initialDraw = false;
-}
-
-static void arkanoid_draw_callback(Canvas* const canvas, void* ctx) {
-    ArkanoidState* arkanoid_state = acquire_mutex((ValueMutex*)ctx, 25);
-    if(arkanoid_state == NULL) {
-        return;
-    }
-
-    //Initial level draw
-    if(!arkanoid_state->initialDraw) {
-        arkanoid_state->initialDraw = true;
-
-        // Set default font for text
-        canvas_set_font(canvas, FontSecondary);
-
-        //Draws the new level
-        reset_level(canvas, arkanoid_state);
-    }
-
-    //Draws new bricks and resets their values
-    for(unsigned int row = 0; row < arkanoid_state->ROWS; row++) {
-        for(unsigned int column = 0; column < arkanoid_state->COLUMNS; column++) {
-            if(!arkanoid_state->brick_state.isHit[row][column]) {
-                canvas_draw_frame(canvas, 10 * column, 2 + 6 * row, 8, 4);
-            }
-        }
-    }
-
-    if(arkanoid_state->lives > 0) {
-        draw_paddle(canvas, arkanoid_state);
-        draw_ball(canvas, arkanoid_state);
-        draw_score(canvas, arkanoid_state);
-        draw_lives(canvas, arkanoid_state);
-
-        if(arkanoid_state->brickCount == arkanoid_state->ROWS * arkanoid_state->COLUMNS) {
-            arkanoid_state->level++;
-            reset_level(canvas, arkanoid_state);
-        }
-    } else {
-        reset_level(canvas, arkanoid_state);
-        arkanoid_state->initialDraw = false;
-        arkanoid_state->lives = 3;
-        arkanoid_state->score = 0;
-    }
-
-    release_mutex((ValueMutex*)ctx, arkanoid_state);
-}
-
-static void arkanoid_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
-    furi_assert(event_queue);
-
-    GameEvent event = {.type = EventTypeKey, .input = *input_event};
-    furi_message_queue_put(event_queue, &event, FuriWaitForever);
-}
-
-static void arkanoid_update_timer_callback(FuriMessageQueue* event_queue) {
-    furi_assert(event_queue);
-
-    GameEvent event = {.type = EventTypeTick};
-    furi_message_queue_put(event_queue, &event, 0);
-}
-
-int32_t arkanoid_game_app(void* p) {
-    UNUSED(p);
-    int32_t return_code = 0;
-    // Set random seed from interrupts
-    srand(DWT->CYCCNT);
-
-    FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(GameEvent));
-
-    ArkanoidState* arkanoid_state = malloc(sizeof(ArkanoidState));
-    arkanoid_state_init(arkanoid_state);
-
-    ValueMutex state_mutex;
-    if(!init_mutex(&state_mutex, arkanoid_state, sizeof(ArkanoidState))) {
-        FURI_LOG_E(TAG, "Cannot create mutex\r\n");
-        return_code = 255;
-        goto free_and_exit;
-    }
-
-    // Set system callbacks
-    ViewPort* view_port = view_port_alloc();
-    view_port_draw_callback_set(view_port, arkanoid_draw_callback, &state_mutex);
-    view_port_input_callback_set(view_port, arkanoid_input_callback, event_queue);
-
-    FuriTimer* timer =
-        furi_timer_alloc(arkanoid_update_timer_callback, FuriTimerTypePeriodic, event_queue);
-    furi_timer_start(timer, furi_kernel_get_tick_frequency() / 22);
-
-    // Open GUI and register view_port
-    Gui* gui = furi_record_open(RECORD_GUI);
-    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
-
-    GameEvent event;
-    for(bool processing = true; processing;) {
-        FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
-        ArkanoidState* arkanoid_state = (ArkanoidState*)acquire_mutex_block(&state_mutex);
-
-        if(event_status == FuriStatusOk) {
-            // Key events
-            if(event.type == EventTypeKey) {
-                if(event.input.type == InputTypePress || event.input.type == InputTypeLong ||
-                   event.input.type == InputTypeRepeat) {
-                    switch(event.input.key) {
-                    case InputKeyBack:
-                        processing = false;
-                        break;
-                    case InputKeyRight:
-                        if(arkanoid_state->xPaddle < FLIPPER_LCD_WIDTH - 12) {
-                            arkanoid_state->xPaddle += 8;
-                        }
-                        break;
-                    case InputKeyLeft:
-                        if(arkanoid_state->xPaddle > 0) {
-                            arkanoid_state->xPaddle -= 8;
-                        }
-                        break;
-                    case InputKeyUp:
-                        break;
-                    case InputKeyDown:
-                        break;
-                    case InputKeyOk:
-                        //Release ball if FIRE pressed
-                        arkanoid_state->ball_state.released = true;
-
-                        //Apply random direction to ball on release
-                        if(rand_range(0, 2) == 0) {
-                            arkanoid_state->ball_state.dx = 1;
-                        } else {
-                            arkanoid_state->ball_state.dx = -1;
-                        }
-
-                        //Makes sure the ball heads upwards
-                        arkanoid_state->ball_state.dy = -1;
-                        break;
-                    }
-                }
-            }
-        } else {
-            // Event timeout
-            FURI_LOG_D(TAG, "furi_message_queue: Event timeout");
-        }
-
-        view_port_update(view_port);
-        release_mutex(&state_mutex, arkanoid_state);
-    }
-    furi_timer_free(timer);
-    view_port_enabled_set(view_port, false);
-    gui_remove_view_port(gui, view_port);
-    furi_record_close(RECORD_GUI);
-    furi_record_close(RECORD_NOTIFICATION);
-    view_port_free(view_port);
-    delete_mutex(&state_mutex);
-
-free_and_exit:
-    free(arkanoid_state);
-    furi_message_queue_free(event_queue);
-
-    return return_code;
-}
--- a/applications/bad_usb/application.fam
+++ b/applications/bad_usb/application.fam
@@ -1,14 +0,0 @@
-App(
-    appid="bad_usb",
-    name="Bad USB",
-    apptype=FlipperAppType.APP,
-    entry_point="bad_usb_app",
-    cdefines=["APP_BAD_USB"],
-    requires=[
-        "gui",
-        "dialogs",
-    ],
-    stack_size=2 * 1024,
-    icon="A_BadUsb_14",
-    order=70,
-)
--- a/applications/bad_usb/bad_usb_script.c
+++ b/applications/bad_usb/bad_usb_script.c
@@ -1,664 +0,0 @@
-#include <furi.h>
-#include <furi_hal.h>
-#include <gui/gui.h>
-#include <input/input.h>
-#include <lib/toolbox/args.h>
-#include <furi_hal_usb_hid.h>
-#include <storage/storage.h>
-#include "bad_usb_script.h"
-#include <dolphin/dolphin.h>
-
-#define TAG "BadUSB"
-#define WORKER_TAG TAG "Worker"
-#define FILE_BUFFER_LEN 16
-
-#define SCRIPT_STATE_ERROR (-1)
-#define SCRIPT_STATE_END (-2)
-#define SCRIPT_STATE_NEXT_LINE (-3)
-
-#define BADUSB_ASCII_TO_KEY(script, x) \
-    (((uint8_t)x < 128) ? (script->layout[(uint8_t)x]) : HID_KEYBOARD_NONE)
-
-typedef enum {
-    WorkerEvtToggle = (1 << 0),
-    WorkerEvtEnd = (1 << 1),
-    WorkerEvtConnect = (1 << 2),
-    WorkerEvtDisconnect = (1 << 3),
-} WorkerEvtFlags;
-
-struct BadUsbScript {
-    FuriHalUsbHidConfig hid_cfg;
-    BadUsbState st;
-    string_t file_path;
-    uint32_t defdelay;
-    uint16_t layout[128];
-    FuriThread* thread;
-    uint8_t file_buf[FILE_BUFFER_LEN + 1];
-    uint8_t buf_start;
-    uint8_t buf_len;
-    bool file_end;
-    string_t line;
-
-    string_t line_prev;
-    uint32_t repeat_cnt;
-};
-
-typedef struct {
-    char* name;
-    uint16_t keycode;
-} DuckyKey;
-
-static const DuckyKey ducky_keys[] = {
-    {"CTRL-ALT", KEY_MOD_LEFT_CTRL | KEY_MOD_LEFT_ALT},
-    {"CTRL-SHIFT", KEY_MOD_LEFT_CTRL | KEY_MOD_LEFT_SHIFT},
-    {"ALT-SHIFT", KEY_MOD_LEFT_ALT | KEY_MOD_LEFT_SHIFT},
-    {"ALT-GUI", KEY_MOD_LEFT_ALT | KEY_MOD_LEFT_GUI},
-    {"GUI-SHIFT", KEY_MOD_LEFT_GUI | KEY_MOD_LEFT_SHIFT},
-
-    {"CTRL", KEY_MOD_LEFT_CTRL},
-    {"CONTROL", KEY_MOD_LEFT_CTRL},
-    {"SHIFT", KEY_MOD_LEFT_SHIFT},
-    {"ALT", KEY_MOD_LEFT_ALT},
-    {"GUI", KEY_MOD_LEFT_GUI},
-    {"WINDOWS", KEY_MOD_LEFT_GUI},
-
-    {"DOWNARROW", HID_KEYBOARD_DOWN_ARROW},
-    {"DOWN", HID_KEYBOARD_DOWN_ARROW},
-    {"LEFTARROW", HID_KEYBOARD_LEFT_ARROW},
-    {"LEFT", HID_KEYBOARD_LEFT_ARROW},
-    {"RIGHTARROW", HID_KEYBOARD_RIGHT_ARROW},
-    {"RIGHT", HID_KEYBOARD_RIGHT_ARROW},
-    {"UPARROW", HID_KEYBOARD_UP_ARROW},
-    {"UP", HID_KEYBOARD_UP_ARROW},
-
-    {"ENTER", HID_KEYBOARD_RETURN},
-    {"BREAK", HID_KEYBOARD_PAUSE},
-    {"PAUSE", HID_KEYBOARD_PAUSE},
-    {"CAPSLOCK", HID_KEYBOARD_CAPS_LOCK},
-    {"DELETE", HID_KEYBOARD_DELETE},
-    {"BACKSPACE", HID_KEYPAD_BACKSPACE},
-    {"END", HID_KEYBOARD_END},
-    {"ESC", HID_KEYBOARD_ESCAPE},
-    {"ESCAPE", HID_KEYBOARD_ESCAPE},
-    {"HOME", HID_KEYBOARD_HOME},
-    {"INSERT", HID_KEYBOARD_INSERT},
-    {"NUMLOCK", HID_KEYPAD_NUMLOCK},
-    {"PAGEUP", HID_KEYBOARD_PAGE_UP},
-    {"PAGEDOWN", HID_KEYBOARD_PAGE_DOWN},
-    {"PRINTSCREEN", HID_KEYBOARD_PRINT_SCREEN},
-    {"SCROLLOCK", HID_KEYBOARD_SCROLL_LOCK},
-    {"SPACE", HID_KEYBOARD_SPACEBAR},
-    {"TAB", HID_KEYBOARD_TAB},
-    {"MENU", HID_KEYBOARD_APPLICATION},
-    {"APP", HID_KEYBOARD_APPLICATION},
-
-    {"F1", HID_KEYBOARD_F1},
-    {"F2", HID_KEYBOARD_F2},
-    {"F3", HID_KEYBOARD_F3},
-    {"F4", HID_KEYBOARD_F4},
-    {"F5", HID_KEYBOARD_F5},
-    {"F6", HID_KEYBOARD_F6},
-    {"F7", HID_KEYBOARD_F7},
-    {"F8", HID_KEYBOARD_F8},
-    {"F9", HID_KEYBOARD_F9},
-    {"F10", HID_KEYBOARD_F10},
-    {"F11", HID_KEYBOARD_F11},
-    {"F12", HID_KEYBOARD_F12},
-};
-
-static const char ducky_cmd_comment[] = {"REM"};
-static const char ducky_cmd_id[] = {"ID"};
-static const char ducky_cmd_delay[] = {"DELAY "};
-static const char ducky_cmd_string[] = {"STRING "};
-static const char ducky_cmd_defdelay_1[] = {"DEFAULT_DELAY "};
-static const char ducky_cmd_defdelay_2[] = {"DEFAULTDELAY "};
-static const char ducky_cmd_repeat[] = {"REPEAT "};
-
-static const char ducky_cmd_altchar[] = {"ALTCHAR "};
-static const char ducky_cmd_altstr_1[] = {"ALTSTRING "};
-static const char ducky_cmd_altstr_2[] = {"ALTCODE "};
-
-static const char ducky_cmd_lang[] = {"DUCKY_LANG"};
-
-static const uint8_t numpad_keys[10] = {
-    HID_KEYPAD_0,
-    HID_KEYPAD_1,
-    HID_KEYPAD_2,
-    HID_KEYPAD_3,
-    HID_KEYPAD_4,
-    HID_KEYPAD_5,
-    HID_KEYPAD_6,
-    HID_KEYPAD_7,
-    HID_KEYPAD_8,
-    HID_KEYPAD_9,
-};
-
-static bool ducky_get_number(const char* param, uint32_t* val) {
-    uint32_t value = 0;
-    if(sscanf(param, "%lu", &value) == 1) {
-        *val = value;
-        return true;
-    }
-    return false;
-}
-
-static uint32_t ducky_get_command_len(const char* line) {
-    uint32_t len = strlen(line);
-    for(uint32_t i = 0; i < len; i++) {
-        if(line[i] == ' ') return i;
-    }
-    return 0;
-}
-
-static bool ducky_is_line_end(const char chr) {
-    return ((chr == ' ') || (chr == '\0') || (chr == '\r') || (chr == '\n'));
-}
-
-static void ducky_numlock_on() {
-    if((furi_hal_hid_get_led_state() & HID_KB_LED_NUM) == 0) {
-        furi_hal_hid_kb_press(HID_KEYBOARD_LOCK_NUM_LOCK);
-        furi_hal_hid_kb_release(HID_KEYBOARD_LOCK_NUM_LOCK);
-    }
-}
-
-static bool ducky_numpad_press(const char num) {
-    if((num < '0') || (num > '9')) return false;
-
-    uint16_t key = numpad_keys[num - '0'];
-    furi_hal_hid_kb_press(key);
-    furi_hal_hid_kb_release(key);
-
-    return true;
-}
-
-static bool ducky_altchar(const char* charcode) {
-    uint8_t i = 0;
-    bool state = false;
-
-    FURI_LOG_I(WORKER_TAG, "char %s", charcode);
-
-    furi_hal_hid_kb_press(KEY_MOD_LEFT_ALT);
-
-    while(!ducky_is_line_end(charcode[i])) {
-        state = ducky_numpad_press(charcode[i]);
-        if(state == false) break;
-        i++;
-    }
-
-    furi_hal_hid_kb_release(KEY_MOD_LEFT_ALT);
-    return state;
-}
-
-static bool ducky_altstring(const char* param) {
-    uint32_t i = 0;
-    bool state = false;
-
-    while(param[i] != '\0') {
-        if((param[i] < ' ') || (param[i] > '~')) {
-            i++;
-            continue; // Skip non-printable chars
-        }
-
-        char temp_str[4];
-        snprintf(temp_str, 4, "%u", param[i]);
-
-        state = ducky_altchar(temp_str);
-        if(state == false) break;
-        i++;
-    }
-    return state;
-}
-
-static bool ducky_string(BadUsbScript* bad_usb, const char* param) {
-    uint32_t i = 0;
-    while(param[i] != '\0') {
-        uint16_t keycode = BADUSB_ASCII_TO_KEY(bad_usb, param[i]);
-        if(keycode != HID_KEYBOARD_NONE) {
-            furi_hal_hid_kb_press(keycode);
-            furi_hal_hid_kb_release(keycode);
-        }
-        i++;
-    }
-    return true;
-}
-
-static uint16_t ducky_get_keycode(BadUsbScript* bad_usb, const char* param, bool accept_chars) {
-    for(uint8_t i = 0; i < (sizeof(ducky_keys) / sizeof(ducky_keys[0])); i++) {
-        uint8_t key_cmd_len = strlen(ducky_keys[i].name);
-        if((strncmp(param, ducky_keys[i].name, key_cmd_len) == 0) &&
-           (ducky_is_line_end(param[key_cmd_len]))) {
-            return ducky_keys[i].keycode;
-        }
-    }
-    if((accept_chars) && (strlen(param) > 0)) {
-        return (BADUSB_ASCII_TO_KEY(bad_usb, param[0]) & 0xFF);
-    }
-    return 0;
-}
-
-static int32_t ducky_parse_line(BadUsbScript* bad_usb, string_t line) {
-    uint32_t line_len = string_size(line);
-    const char* line_tmp = string_get_cstr(line);
-    bool state = false;
-
-    for(uint32_t i = 0; i < line_len; i++) {
-        if((line_tmp[i] != ' ') && (line_tmp[i] != '\t') && (line_tmp[i] != '\n')) {
-            line_tmp = &line_tmp[i];
-            break; // Skip spaces and tabs
-        }
-        if(i == line_len - 1) return SCRIPT_STATE_NEXT_LINE; // Skip empty lines
-    }
-
-    FURI_LOG_D(WORKER_TAG, "line:%s", line_tmp);
-
-    // General commands
-    if(strncmp(line_tmp, ducky_cmd_comment, strlen(ducky_cmd_comment)) == 0) {
-        // REM - comment line
-        return (0);
-    } else if(strncmp(line_tmp, ducky_cmd_id, strlen(ducky_cmd_id)) == 0) {
-        // ID - executed in ducky_script_preload
-        return (0);
-    } else if(strncmp(line_tmp, ducky_cmd_lang, strlen(ducky_cmd_lang)) == 0) {
-        // DUCKY_LANG - ignore command to retain compatibility with existing scripts
-        return (0);
-    } else if(strncmp(line_tmp, ducky_cmd_delay, strlen(ducky_cmd_delay)) == 0) {
-        // DELAY
-        line_tmp = &line_tmp[ducky_get_command_len(line_tmp) + 1];
-        uint32_t delay_val = 0;
-        state = ducky_get_number(line_tmp, &delay_val);
-        if((state) && (delay_val > 0)) {
-            return (int32_t)delay_val;
-        }
-        return SCRIPT_STATE_ERROR;
-    } else if(
-        (strncmp(line_tmp, ducky_cmd_defdelay_1, strlen(ducky_cmd_defdelay_1)) == 0) ||
-        (strncmp(line_tmp, ducky_cmd_defdelay_2, strlen(ducky_cmd_defdelay_2)) == 0)) {
-        // DEFAULT_DELAY
-        line_tmp = &line_tmp[ducky_get_command_len(line_tmp) + 1];
-        state = ducky_get_number(line_tmp, &bad_usb->defdelay);
-        return (state) ? (0) : SCRIPT_STATE_ERROR;
-    } else if(strncmp(line_tmp, ducky_cmd_string, strlen(ducky_cmd_string)) == 0) {
-        // STRING
-        line_tmp = &line_tmp[ducky_get_command_len(line_tmp) + 1];
-        state = ducky_string(bad_usb, line_tmp);
-        return (state) ? (0) : SCRIPT_STATE_ERROR;
-    } else if(strncmp(line_tmp, ducky_cmd_altchar, strlen(ducky_cmd_altchar)) == 0) {
-        // ALTCHAR
-        line_tmp = &line_tmp[ducky_get_command_len(line_tmp) + 1];
-        ducky_numlock_on();
-        state = ducky_altchar(line_tmp);
-        return (state) ? (0) : SCRIPT_STATE_ERROR;
-    } else if(
-        (strncmp(line_tmp, ducky_cmd_altstr_1, strlen(ducky_cmd_altstr_1)) == 0) ||
-        (strncmp(line_tmp, ducky_cmd_altstr_2, strlen(ducky_cmd_altstr_2)) == 0)) {
-        // ALTSTRING
-        line_tmp = &line_tmp[ducky_get_command_len(line_tmp) + 1];
-        ducky_numlock_on();
-        state = ducky_altstring(line_tmp);
-        return (state) ? (0) : SCRIPT_STATE_ERROR;
-    } else if(strncmp(line_tmp, ducky_cmd_repeat, strlen(ducky_cmd_repeat)) == 0) {
-        // REPEAT
-        line_tmp = &line_tmp[ducky_get_command_len(line_tmp) + 1];
-        state = ducky_get_number(line_tmp, &bad_usb->repeat_cnt);
-        return (state) ? (0) : SCRIPT_STATE_ERROR;
-    } else {
-        // Special keys + modifiers
-        uint16_t key = ducky_get_keycode(bad_usb, line_tmp, false);
-        if(key == HID_KEYBOARD_NONE) return SCRIPT_STATE_ERROR;
-        if((key & 0xFF00) != 0) {
-            // It's a modifier key
-            line_tmp = &line_tmp[ducky_get_command_len(line_tmp) + 1];
-            key |= ducky_get_keycode(bad_usb, line_tmp, true);
-        }
-        furi_hal_hid_kb_press(key);
-        furi_hal_hid_kb_release(key);
-        return (0);
-    }
-    return SCRIPT_STATE_ERROR;
-}
-
-static bool ducky_set_usb_id(BadUsbScript* bad_usb, const char* line) {
-    if(sscanf(line, "%lX:%lX", &bad_usb->hid_cfg.vid, &bad_usb->hid_cfg.pid) == 2) {
-        bad_usb->hid_cfg.manuf[0] = '\0';
-        bad_usb->hid_cfg.product[0] = '\0';
-
-        uint8_t id_len = ducky_get_command_len(line);
-        if(!ducky_is_line_end(line[id_len + 1])) {
-            sscanf(
-                &line[id_len + 1],
-                "%31[^\r\n:]:%31[^\r\n]",
-                bad_usb->hid_cfg.manuf,
-                bad_usb->hid_cfg.product);
-        }
-        FURI_LOG_D(
-            WORKER_TAG,
-            "set id: %04X:%04X mfr:%s product:%s",
-            bad_usb->hid_cfg.vid,
-            bad_usb->hid_cfg.pid,
-            bad_usb->hid_cfg.manuf,
-            bad_usb->hid_cfg.product);
-        return true;
-    }
-    return false;
-}
-
-static bool ducky_script_preload(BadUsbScript* bad_usb, File* script_file) {
-    uint8_t ret = 0;
-    uint32_t line_len = 0;
-
-    string_reset(bad_usb->line);
-
-    do {
-        ret = storage_file_read(script_file, bad_usb->file_buf, FILE_BUFFER_LEN);
-        for(uint16_t i = 0; i < ret; i++) {
-            if(bad_usb->file_buf[i] == '\n' && line_len > 0) {
-                bad_usb->st.line_nb++;
-                line_len = 0;
-            } else {
-                if(bad_usb->st.line_nb == 0) { // Save first line
-                    string_push_back(bad_usb->line, bad_usb->file_buf[i]);
-                }
-                line_len++;
-            }
-        }
-        if(storage_file_eof(script_file)) {
-            if(line_len > 0) {
-                bad_usb->st.line_nb++;
-                break;
-            }
-        }
-    } while(ret > 0);
-
-    const char* line_tmp = string_get_cstr(bad_usb->line);
-    bool id_set = false; // Looking for ID command at first line
-    if(strncmp(line_tmp, ducky_cmd_id, strlen(ducky_cmd_id)) == 0) {
-        id_set = ducky_set_usb_id(bad_usb, &line_tmp[strlen(ducky_cmd_id) + 1]);
-    }
-
-    if(id_set) {
-        furi_check(furi_hal_usb_set_config(&usb_hid, &bad_usb->hid_cfg));
-    } else {
-        furi_check(furi_hal_usb_set_config(&usb_hid, NULL));
-    }
-
-    storage_file_seek(script_file, 0, true);
-    string_reset(bad_usb->line);
-
-    return true;
-}
-
-static int32_t ducky_script_execute_next(BadUsbScript* bad_usb, File* script_file) {
-    int32_t delay_val = 0;
-
-    if(bad_usb->repeat_cnt > 0) {
-        bad_usb->repeat_cnt--;
-        delay_val = ducky_parse_line(bad_usb, bad_usb->line_prev);
-        if(delay_val == SCRIPT_STATE_NEXT_LINE) { // Empty line
-            return 0;
-        } else if(delay_val < 0) { // Script error
-            bad_usb->st.error_line = bad_usb->st.line_cur - 1;
-            FURI_LOG_E(WORKER_TAG, "Unknown command at line %lu", bad_usb->st.line_cur - 1);
-            return SCRIPT_STATE_ERROR;
-        } else {
-            return (delay_val + bad_usb->defdelay);
-        }
-    }
-
-    string_set(bad_usb->line_prev, bad_usb->line);
-    string_reset(bad_usb->line);
-
-    while(1) {
-        if(bad_usb->buf_len == 0) {
-            bad_usb->buf_len = storage_file_read(script_file, bad_usb->file_buf, FILE_BUFFER_LEN);
-            if(storage_file_eof(script_file)) {
-                if((bad_usb->buf_len < FILE_BUFFER_LEN) && (bad_usb->file_end == false)) {
-                    bad_usb->file_buf[bad_usb->buf_len] = '\n';
-                    bad_usb->buf_len++;
-                    bad_usb->file_end = true;
-                }
-            }
-
-            bad_usb->buf_start = 0;
-            if(bad_usb->buf_len == 0) return SCRIPT_STATE_END;
-        }
-        for(uint8_t i = bad_usb->buf_start; i < (bad_usb->buf_start + bad_usb->buf_len); i++) {
-            if(bad_usb->file_buf[i] == '\n' && string_size(bad_usb->line) > 0) {
-                bad_usb->st.line_cur++;
-                bad_usb->buf_len = bad_usb->buf_len + bad_usb->buf_start - (i + 1);
-                bad_usb->buf_start = i + 1;
-                delay_val = ducky_parse_line(bad_usb, bad_usb->line);
-                if(delay_val < 0) {
-                    bad_usb->st.error_line = bad_usb->st.line_cur;
-                    FURI_LOG_E(WORKER_TAG, "Unknown command at line %lu", bad_usb->st.line_cur);
-                    return SCRIPT_STATE_ERROR;
-                } else {
-                    return (delay_val + bad_usb->defdelay);
-                }
-            } else {
-                string_push_back(bad_usb->line, bad_usb->file_buf[i]);
-            }
-        }
-        bad_usb->buf_len = 0;
-        if(bad_usb->file_end) return SCRIPT_STATE_END;
-    }
-
-    return 0;
-}
-
-static void bad_usb_hid_state_callback(bool state, void* context) {
-    furi_assert(context);
-    BadUsbScript* bad_usb = context;
-
-    if(state == true)
-        furi_thread_flags_set(furi_thread_get_id(bad_usb->thread), WorkerEvtConnect);
-    else
-        furi_thread_flags_set(furi_thread_get_id(bad_usb->thread), WorkerEvtDisconnect);
-}
-
-static int32_t bad_usb_worker(void* context) {
-    BadUsbScript* bad_usb = context;
-
-    BadUsbWorkerState worker_state = BadUsbStateInit;
-    int32_t delay_val = 0;
-
-    FuriHalUsbInterface* usb_mode_prev = furi_hal_usb_get_config();
-
-    FURI_LOG_I(WORKER_TAG, "Init");
-    File* script_file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
-    string_init(bad_usb->line);
-    string_init(bad_usb->line_prev);
-
-    furi_hal_hid_set_state_callback(bad_usb_hid_state_callback, bad_usb);
-
-    while(1) {
-        if(worker_state == BadUsbStateInit) { // State: initialization
-            if(storage_file_open(
-                   script_file,
-                   string_get_cstr(bad_usb->file_path),
-                   FSAM_READ,
-                   FSOM_OPEN_EXISTING)) {
-                if((ducky_script_preload(bad_usb, script_file)) && (bad_usb->st.line_nb > 0)) {
-                    if(furi_hal_hid_is_connected()) {
-                        worker_state = BadUsbStateIdle; // Ready to run
-                    } else {
-                        worker_state = BadUsbStateNotConnected; // USB not connected
-                    }
-                } else {
-                    worker_state = BadUsbStateScriptError; // Script preload error
-                }
-            } else {
-                FURI_LOG_E(WORKER_TAG, "File open error");
-                worker_state = BadUsbStateFileError; // File open error
-            }
-            bad_usb->st.state = worker_state;
-
-        } else if(worker_state == BadUsbStateNotConnected) { // State: USB not connected
-            uint32_t flags = furi_thread_flags_wait(
-                WorkerEvtEnd | WorkerEvtConnect, FuriFlagWaitAny, FuriWaitForever);
-            furi_check((flags & FuriFlagError) == 0);
-            if(flags & WorkerEvtEnd) {
-                break;
-            } else if(flags & WorkerEvtConnect) {
-                worker_state = BadUsbStateIdle; // Ready to run
-            }
-            bad_usb->st.state = worker_state;
-
-        } else if(worker_state == BadUsbStateIdle) { // State: ready to start
-            uint32_t flags = furi_thread_flags_wait(
-                WorkerEvtEnd | WorkerEvtToggle | WorkerEvtDisconnect,
-                FuriFlagWaitAny,
-                FuriWaitForever);
-            furi_check((flags & FuriFlagError) == 0);
-            if(flags & WorkerEvtEnd) {
-                break;
-            } else if(flags & WorkerEvtToggle) { // Start executing script
-                DOLPHIN_DEED(DolphinDeedBadUsbPlayScript);
-                delay_val = 0;
-                bad_usb->buf_len = 0;
-                bad_usb->st.line_cur = 0;
-                bad_usb->defdelay = 0;
-                bad_usb->repeat_cnt = 0;
-                bad_usb->file_end = false;
-                storage_file_seek(script_file, 0, true);
-                worker_state = BadUsbStateRunning;
-            } else if(flags & WorkerEvtDisconnect) {
-                worker_state = BadUsbStateNotConnected; // USB disconnected
-            }
-            bad_usb->st.state = worker_state;
-
-        } else if(worker_state == BadUsbStateRunning) { // State: running
-            uint16_t delay_cur = (delay_val > 1000) ? (1000) : (delay_val);
-            uint32_t flags = furi_thread_flags_wait(
-                WorkerEvtEnd | WorkerEvtToggle | WorkerEvtDisconnect, FuriFlagWaitAny, delay_cur);
-            delay_val -= delay_cur;
-            if(!(flags & FuriFlagError)) {
-                if(flags & WorkerEvtEnd) {
-                    break;
-                } else if(flags & WorkerEvtToggle) {
-                    worker_state = BadUsbStateIdle; // Stop executing script
-                    furi_hal_hid_kb_release_all();
-                } else if(flags & WorkerEvtDisconnect) {
-                    worker_state = BadUsbStateNotConnected; // USB disconnected
-                    furi_hal_hid_kb_release_all();
-                }
-                bad_usb->st.state = worker_state;
-                continue;
-            } else if((flags == FuriFlagErrorTimeout) || (flags == FuriFlagErrorResource)) {
-                if(delay_val > 0) {
-                    bad_usb->st.delay_remain--;
-                    continue;
-                }
-                bad_usb->st.state = BadUsbStateRunning;
-                delay_val = ducky_script_execute_next(bad_usb, script_file);
-                if(delay_val == SCRIPT_STATE_ERROR) { // Script error
-                    delay_val = 0;
-                    worker_state = BadUsbStateScriptError;
-                    bad_usb->st.state = worker_state;
-                } else if(delay_val == SCRIPT_STATE_END) { // End of script
-                    delay_val = 0;
-                    worker_state = BadUsbStateIdle;
-                    bad_usb->st.state = BadUsbStateDone;
-                    furi_hal_hid_kb_release_all();
-                    continue;
-                } else if(delay_val > 1000) {
-                    bad_usb->st.state = BadUsbStateDelay; // Show long delays
-                    bad_usb->st.delay_remain = delay_val / 1000;
-                }
-            } else {
-                furi_check((flags & FuriFlagError) == 0);
-            }
-
-        } else if(
-            (worker_state == BadUsbStateFileError) ||
-            (worker_state == BadUsbStateScriptError)) { // State: error
-            uint32_t flags = furi_thread_flags_wait(
-                WorkerEvtEnd, FuriFlagWaitAny, FuriWaitForever); // Waiting for exit command
-            furi_check((flags & FuriFlagError) == 0);
-            if(flags & WorkerEvtEnd) {
-                break;
-            }
-        }
-    }
-
-    furi_hal_hid_set_state_callback(NULL, NULL);
-
-    furi_hal_usb_set_config(usb_mode_prev, NULL);
-
-    storage_file_close(script_file);
-    storage_file_free(script_file);
-    string_clear(bad_usb->line);
-    string_clear(bad_usb->line_prev);
-
-    FURI_LOG_I(WORKER_TAG, "End");
-
-    return 0;
-}
-
-static void bad_usb_script_set_default_keyboard_layout(BadUsbScript* bad_usb) {
-    furi_assert(bad_usb);
-    memset(bad_usb->layout, HID_KEYBOARD_NONE, sizeof(bad_usb->layout));
-    memcpy(bad_usb->layout, hid_asciimap, MIN(sizeof(hid_asciimap), sizeof(bad_usb->layout)));
-}
-
-BadUsbScript* bad_usb_script_open(string_t file_path) {
-    furi_assert(file_path);
-
-    BadUsbScript* bad_usb = malloc(sizeof(BadUsbScript));
-    string_init(bad_usb->file_path);
-    string_set(bad_usb->file_path, file_path);
-    bad_usb_script_set_default_keyboard_layout(bad_usb);
-
-    bad_usb->st.state = BadUsbStateInit;
-
-    bad_usb->thread = furi_thread_alloc();
-    furi_thread_set_name(bad_usb->thread, "BadUsbWorker");
-    furi_thread_set_stack_size(bad_usb->thread, 2048);
-    furi_thread_set_context(bad_usb->thread, bad_usb);
-    furi_thread_set_callback(bad_usb->thread, bad_usb_worker);
-
-    furi_thread_start(bad_usb->thread);
-    return bad_usb;
-}
-
-void bad_usb_script_close(BadUsbScript* bad_usb) {
-    furi_assert(bad_usb);
-    furi_thread_flags_set(furi_thread_get_id(bad_usb->thread), WorkerEvtEnd);
-    furi_thread_join(bad_usb->thread);
-    furi_thread_free(bad_usb->thread);
-    string_clear(bad_usb->file_path);
-    free(bad_usb);
-}
-
-void bad_usb_script_set_keyboard_layout(BadUsbScript* bad_usb, string_t layout_path) {
-    furi_assert(bad_usb);
-
-    if((bad_usb->st.state == BadUsbStateRunning) || (bad_usb->st.state == BadUsbStateDelay)) {
-        // do not update keyboard layout while a script is running
-        return;
-    }
-
-    File* layout_file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
-    if(!string_empty_p(layout_path)) {
-        if(storage_file_open(
-               layout_file, string_get_cstr(layout_path), FSAM_READ, FSOM_OPEN_EXISTING)) {
-            uint16_t layout[128];
-            if(storage_file_read(layout_file, layout, sizeof(layout)) == sizeof(layout)) {
-                memcpy(bad_usb->layout, layout, sizeof(layout));
-            }
-        }
-        storage_file_close(layout_file);
-    } else {
-        bad_usb_script_set_default_keyboard_layout(bad_usb);
-    }
-    storage_file_free(layout_file);
-}
-
-void bad_usb_script_toggle(BadUsbScript* bad_usb) {
-    furi_assert(bad_usb);
-    furi_thread_flags_set(furi_thread_get_id(bad_usb->thread), WorkerEvtToggle);
-}
-
-BadUsbState* bad_usb_script_get_state(BadUsbScript* bad_usb) {
-    furi_assert(bad_usb);
-    return &(bad_usb->st);
-}
--- a/applications/bad_usb/bad_usb_script.h
+++ b/applications/bad_usb/bad_usb_script.h
@@ -1,47 +0,0 @@
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <furi.h>
-#include <m-string.h>
-
-typedef struct BadUsbScript BadUsbScript;
-
-typedef enum {
-    BadUsbStateInit,
-    BadUsbStateNotConnected,
-    BadUsbStateIdle,
-    BadUsbStateRunning,
-    BadUsbStateDelay,
-    BadUsbStateDone,
-    BadUsbStateScriptError,
-    BadUsbStateFileError,
-} BadUsbWorkerState;
-
-typedef struct {
-    BadUsbWorkerState state;
-    uint16_t line_cur;
-    uint16_t line_nb;
-    uint32_t delay_remain;
-    uint16_t error_line;
-} BadUsbState;
-
-BadUsbScript* bad_usb_script_open(string_t file_path);
-
-void bad_usb_script_close(BadUsbScript* bad_usb);
-
-void bad_usb_script_set_keyboard_layout(BadUsbScript* bad_usb, string_t layout_path);
-
-void bad_usb_script_start(BadUsbScript* bad_usb);
-
-void bad_usb_script_stop(BadUsbScript* bad_usb);
-
-void bad_usb_script_toggle(BadUsbScript* bad_usb);
-
-BadUsbState* bad_usb_script_get_state(BadUsbScript* bad_usb);
-
-#ifdef __cplusplus
-}
-#endif
--- a/applications/bad_usb/scenes/bad_usb_scene_config_layout.c
+++ b/applications/bad_usb/scenes/bad_usb_scene_config_layout.c
@@ -1,50 +0,0 @@
-#include "../bad_usb_app_i.h"
-#include "furi_hal_power.h"
-#include "furi_hal_usb.h"
-#include <storage/storage.h>
-
-static bool bad_usb_layout_select(BadUsbApp* bad_usb) {
-    furi_assert(bad_usb);
-
-    string_t predefined_path;
-    string_init(predefined_path);
-    if(!string_empty_p(bad_usb->keyboard_layout)) {
-        string_set(predefined_path, bad_usb->keyboard_layout);
-    } else {
-        string_set_str(predefined_path, BAD_USB_APP_PATH_LAYOUT_FOLDER);
-    }
-
-    // Input events and views are managed by file_browser
-    bool res = dialog_file_browser_show(
-        bad_usb->dialogs,
-        bad_usb->keyboard_layout,
-        predefined_path,
-        BAD_USB_APP_LAYOUT_EXTENSION,
-        true,
-        &I_keyboard_10px,
-        true);
-
-    string_clear(predefined_path);
-    return res;
-}
-
-void bad_usb_scene_config_layout_on_enter(void* context) {
-    BadUsbApp* bad_usb = context;
-
-    if(bad_usb_layout_select(bad_usb)) {
-        bad_usb_script_set_keyboard_layout(bad_usb->bad_usb_script, bad_usb->keyboard_layout);
-    }
-    scene_manager_previous_scene(bad_usb->scene_manager);
-}
-
-bool bad_usb_scene_config_layout_on_event(void* context, SceneManagerEvent event) {
-    UNUSED(context);
-    UNUSED(event);
-    // BadUsbApp* bad_usb = context;
-    return false;
-}
-
-void bad_usb_scene_config_layout_on_exit(void* context) {
-    UNUSED(context);
-    // BadUsbApp* bad_usb = context;
-}
--- a/applications/bad_usb/scenes/bad_usb_scene_file_select.c
+++ b/applications/bad_usb/scenes/bad_usb_scene_file_select.c
@@ -1,51 +0,0 @@
-#include "../bad_usb_app_i.h"
-#include "furi_hal_power.h"
-#include "furi_hal_usb.h"
-
-static bool bad_usb_file_select(BadUsbApp* bad_usb) {
-    furi_assert(bad_usb);
-
-    // Input events and views are managed by file_browser
-    bool res = dialog_file_browser_show(
-        bad_usb->dialogs,
-        bad_usb->file_path,
-        bad_usb->file_path,
-        BAD_USB_APP_SCRIPT_EXTENSION,
-        true,
-        &I_badusb_10px,
-        true);
-
-    return res;
-}
-
-void bad_usb_scene_file_select_on_enter(void* context) {
-    BadUsbApp* bad_usb = context;
-
-    furi_hal_usb_disable();
-    if(bad_usb->bad_usb_script) {
-        bad_usb_script_close(bad_usb->bad_usb_script);
-        bad_usb->bad_usb_script = NULL;
-    }
-
-    if(bad_usb_file_select(bad_usb)) {
-        bad_usb->bad_usb_script = bad_usb_script_open(bad_usb->file_path);
-        bad_usb_script_set_keyboard_layout(bad_usb->bad_usb_script, bad_usb->keyboard_layout);
-
-        scene_manager_next_scene(bad_usb->scene_manager, BadUsbSceneWork);
-    } else {
-        furi_hal_usb_enable();
-        view_dispatcher_stop(bad_usb->view_dispatcher);
-    }
-}
-
-bool bad_usb_scene_file_select_on_event(void* context, SceneManagerEvent event) {
-    UNUSED(context);
-    UNUSED(event);
-    // BadUsbApp* bad_usb = context;
-    return false;
-}
-
-void bad_usb_scene_file_select_on_exit(void* context) {
-    UNUSED(context);
-    // BadUsbApp* bad_usb = context;
-}
--- a/applications/bad_usb/scenes/bad_usb_scene_work.c
+++ b/applications/bad_usb/scenes/bad_usb_scene_work.c
@@ -1,55 +0,0 @@
-#include "../bad_usb_script.h"
-#include "../bad_usb_app_i.h"
-#include "../views/bad_usb_view.h"
-#include "furi_hal.h"
-#include "m-string.h"
-#include "toolbox/path.h"
-
-void bad_usb_scene_work_button_callback(InputKey key, void* context) {
-    furi_assert(context);
-    BadUsbApp* app = context;
-    view_dispatcher_send_custom_event(app->view_dispatcher, key);
-}
-
-bool bad_usb_scene_work_on_event(void* context, SceneManagerEvent event) {
-    BadUsbApp* app = context;
-    bool consumed = false;
-
-    if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == InputKeyLeft) {
-            scene_manager_next_scene(app->scene_manager, BadUsbSceneConfig);
-            consumed = true;
-        } else if(event.event == InputKeyOk) {
-            bad_usb_script_toggle(app->bad_usb_script);
-            consumed = true;
-        }
-    } else if(event.type == SceneManagerEventTypeTick) {
-        bad_usb_set_state(app->bad_usb_view, bad_usb_script_get_state(app->bad_usb_script));
-    }
-    return consumed;
-}
-
-void bad_usb_scene_work_on_enter(void* context) {
-    BadUsbApp* app = context;
-
-    string_t file_name;
-    string_init(file_name);
-    path_extract_filename(app->file_path, file_name, true);
-    bad_usb_set_file_name(app->bad_usb_view, string_get_cstr(file_name));
-    string_clear(file_name);
-
-    string_t layout;
-    string_init(layout);
-    path_extract_filename(app->keyboard_layout, layout, true);
-    bad_usb_set_layout(app->bad_usb_view, string_get_cstr(layout));
-    string_clear(layout);
-
-    bad_usb_set_state(app->bad_usb_view, bad_usb_script_get_state(app->bad_usb_script));
-
-    bad_usb_set_button_callback(app->bad_usb_view, bad_usb_scene_work_button_callback, app);
-    view_dispatcher_switch_to_view(app->view_dispatcher, BadUsbAppViewWork);
-}
-
-void bad_usb_scene_work_on_exit(void* context) {
-    UNUSED(context);
-}
--- a/applications/bad_usb/views/bad_usb_view.c
+++ b/applications/bad_usb/views/bad_usb_view.c
@@ -1,199 +0,0 @@
-#include "bad_usb_view.h"
-#include "../bad_usb_script.h"
-#include <toolbox/path.h>
-#include <gui/elements.h>
-
-#define MAX_NAME_LEN 64
-
-struct BadUsb {
-    View* view;
-    BadUsbButtonCallback callback;
-    void* context;
-};
-
-typedef struct {
-    char file_name[MAX_NAME_LEN];
-    char layout[MAX_NAME_LEN];
-    BadUsbState state;
-    uint8_t anim_frame;
-} BadUsbModel;
-
-static void bad_usb_draw_callback(Canvas* canvas, void* _model) {
-    BadUsbModel* model = _model;
-
-    string_t disp_str;
-    string_init_set_str(disp_str, model->file_name);
-    elements_string_fit_width(canvas, disp_str, 128 - 2);
-    canvas_set_font(canvas, FontSecondary);
-    canvas_draw_str(canvas, 2, 8, string_get_cstr(disp_str));
-
-    if(strlen(model->layout) == 0) {
-        string_set(disp_str, "(default)");
-    } else {
-        string_reset(disp_str);
-        string_push_back(disp_str, '(');
-        for(size_t i = 0; i < strlen(model->layout); i++)
-            string_push_back(disp_str, model->layout[i]);
-        string_push_back(disp_str, ')');
-    }
-    elements_string_fit_width(canvas, disp_str, 128 - 2);
-    canvas_draw_str(canvas, 2, 8 + canvas_current_font_height(canvas), string_get_cstr(disp_str));
-
-    string_reset(disp_str);
-
-    canvas_draw_icon(canvas, 22, 24, &I_UsbTree_48x22);
-
-    if((model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone)) {
-        elements_button_center(canvas, "Run");
-    } else if((model->state.state == BadUsbStateRunning) || (model->state.state == BadUsbStateDelay)) {
-        elements_button_center(canvas, "Stop");
-    }
-
-    if((model->state.state == BadUsbStateNotConnected) ||
-       (model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone)) {
-        elements_button_left(canvas, "Config");
-    }
-
-    if(model->state.state == BadUsbStateNotConnected) {
-        canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
-        canvas_set_font(canvas, FontPrimary);
-        canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Connect");
-        canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "to USB");
-    } else if(model->state.state == BadUsbStateFileError) {
-        canvas_draw_icon(canvas, 4, 26, &I_Error_18x18);
-        canvas_set_font(canvas, FontPrimary);
-        canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "File");
-        canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "ERROR");
-    } else if(model->state.state == BadUsbStateScriptError) {
-        canvas_draw_icon(canvas, 4, 26, &I_Error_18x18);
-        canvas_set_font(canvas, FontPrimary);
-        canvas_draw_str_aligned(canvas, 127, 33, AlignRight, AlignBottom, "ERROR:");
-        canvas_set_font(canvas, FontSecondary);
-        string_printf(disp_str, "line %u", model->state.error_line);
-        canvas_draw_str_aligned(
-            canvas, 127, 46, AlignRight, AlignBottom, string_get_cstr(disp_str));
-        string_reset(disp_str);
-    } else if(model->state.state == BadUsbStateIdle) {
-        canvas_draw_icon(canvas, 4, 26, &I_Smile_18x18);
-        canvas_set_font(canvas, FontBigNumbers);
-        canvas_draw_str_aligned(canvas, 114, 40, AlignRight, AlignBottom, "0");
-        canvas_draw_icon(canvas, 117, 26, &I_Percent_10x14);
-    } else if(model->state.state == BadUsbStateRunning) {
-        if(model->anim_frame == 0) {
-            canvas_draw_icon(canvas, 4, 23, &I_EviSmile1_18x21);
-        } else {
-            canvas_draw_icon(canvas, 4, 23, &I_EviSmile2_18x21);
-        }
-        canvas_set_font(canvas, FontBigNumbers);
-        string_printf(disp_str, "%u", ((model->state.line_cur - 1) * 100) / model->state.line_nb);
-        canvas_draw_str_aligned(
-            canvas, 114, 40, AlignRight, AlignBottom, string_get_cstr(disp_str));
-        string_reset(disp_str);
-        canvas_draw_icon(canvas, 117, 26, &I_Percent_10x14);
-    } else if(model->state.state == BadUsbStateDone) {
-        canvas_draw_icon(canvas, 4, 23, &I_EviSmile1_18x21);
-        canvas_set_font(canvas, FontBigNumbers);
-        canvas_draw_str_aligned(canvas, 114, 40, AlignRight, AlignBottom, "100");
-        string_reset(disp_str);
-        canvas_draw_icon(canvas, 117, 26, &I_Percent_10x14);
-    } else if(model->state.state == BadUsbStateDelay) {
-        if(model->anim_frame == 0) {
-            canvas_draw_icon(canvas, 4, 23, &I_EviWaiting1_18x21);
-        } else {
-            canvas_draw_icon(canvas, 4, 23, &I_EviWaiting2_18x21);
-        }
-        canvas_set_font(canvas, FontBigNumbers);
-        string_printf(disp_str, "%u", ((model->state.line_cur - 1) * 100) / model->state.line_nb);
-        canvas_draw_str_aligned(
-            canvas, 114, 40, AlignRight, AlignBottom, string_get_cstr(disp_str));
-        string_reset(disp_str);
-        canvas_draw_icon(canvas, 117, 26, &I_Percent_10x14);
-        canvas_set_font(canvas, FontSecondary);
-        string_printf(disp_str, "delay %us", model->state.delay_remain);
-        canvas_draw_str_aligned(
-            canvas, 127, 50, AlignRight, AlignBottom, string_get_cstr(disp_str));
-        string_reset(disp_str);
-    } else {
-        canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
-    }
-
-    string_clear(disp_str);
-}
-
-static bool bad_usb_input_callback(InputEvent* event, void* context) {
-    furi_assert(context);
-    BadUsb* bad_usb = context;
-    bool consumed = false;
-
-    if(event->type == InputTypeShort) {
-        if((event->key == InputKeyLeft) || (event->key == InputKeyOk)) {
-            consumed = true;
-            furi_assert(bad_usb->callback);
-            bad_usb->callback(event->key, bad_usb->context);
-        }
-    }
-
-    return consumed;
-}
-
-BadUsb* bad_usb_alloc() {
-    BadUsb* bad_usb = malloc(sizeof(BadUsb));
-
-    bad_usb->view = view_alloc();
-    view_allocate_model(bad_usb->view, ViewModelTypeLocking, sizeof(BadUsbModel));
-    view_set_context(bad_usb->view, bad_usb);
-    view_set_draw_callback(bad_usb->view, bad_usb_draw_callback);
-    view_set_input_callback(bad_usb->view, bad_usb_input_callback);
-
-    return bad_usb;
-}
-
-void bad_usb_free(BadUsb* bad_usb) {
-    furi_assert(bad_usb);
-    view_free(bad_usb->view);
-    free(bad_usb);
-}
-
-View* bad_usb_get_view(BadUsb* bad_usb) {
-    furi_assert(bad_usb);
-    return bad_usb->view;
-}
-
-void bad_usb_set_button_callback(BadUsb* bad_usb, BadUsbButtonCallback callback, void* context) {
-    furi_assert(bad_usb);
-    furi_assert(callback);
-    with_view_model(
-        bad_usb->view, (BadUsbModel * model) {
-            UNUSED(model);
-            bad_usb->callback = callback;
-            bad_usb->context = context;
-            return true;
-        });
-}
-
-void bad_usb_set_file_name(BadUsb* bad_usb, const char* name) {
-    furi_assert(name);
-    with_view_model(
-        bad_usb->view, (BadUsbModel * model) {
-            strlcpy(model->file_name, name, MAX_NAME_LEN);
-            return true;
-        });
-}
-
-void bad_usb_set_layout(BadUsb* bad_usb, const char* layout) {
-    furi_assert(layout);
-    with_view_model(
-        bad_usb->view, (BadUsbModel * model) {
-            strlcpy(model->layout, layout, MAX_NAME_LEN);
-            return true;
-        });
-}
-void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st) {
-    furi_assert(st);
-    with_view_model(
-        bad_usb->view, (BadUsbModel * model) {
-            memcpy(&(model->state), st, sizeof(BadUsbState));
-            model->anim_frame ^= 1;
-            return true;
-        });
-}
--- a/applications/barcode_generator/application.fam
+++ b/applications/barcode_generator/application.fam
@@ -1,13 +0,0 @@
-App(
-    appid="barcode_generator",
-    name="UPC-A Generator",
-    apptype=FlipperAppType.PLUGIN,
-    entry_point="barcode_UPCA_generator_app",
-    cdefines=["APP_BARCODE_GEN"],
-    requires=[
-        "gui",
-        "dialogs",
-    ],
-    stack_size=1 * 1024,
-    order=50,
-)
--- a/applications/barcode_generator/barcode_generator.c
+++ b/applications/barcode_generator/barcode_generator.c
@@ -1,545 +0,0 @@
-#include <furi.h>
-#include <gui/gui.h>
-#include <input/input.h>
-#include <stdlib.h>
-
-#define BARCODE_STARTING_POS 16
-#define BARCODE_HEIGHT 50
-#define BARCODE_Y_START 3
-#define BARCODE_TEXT_OFFSET 9
-
-typedef enum {
-    EventTypeTick,
-    EventTypeKey,
-} EventType;
-
-typedef struct {
-    EventType type;
-    InputEvent input;
-} PluginEvent;
-
-typedef struct {
-    int barcodeNumeral[12]; //The current barcode number
-    int editingIndex; //The index of the editing symbol
-    int menuIndex; //The index of the menu cursor
-    int modeIndex; //Set to 0 for view, 1 for edit, 2 for menu
-    bool doParityCalculation; //Should do parity check?
-} PluginState;
-
-void number_0(
-    Canvas* canvas,
-    bool rightHand,
-    int startingPosition) { //UPC Code for #0 on left is OOOIIOI
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str(
-        canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, "0");
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_box(canvas, startingPosition, BARCODE_Y_START, 3, BARCODE_HEIGHT); //OOO
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 3, BARCODE_Y_START, 2, BARCODE_HEIGHT); //II
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 5, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 6, BARCODE_Y_START, 1, BARCODE_HEIGHT); //I
-}
-void number_1(
-    Canvas* canvas,
-    bool rightHand,
-    int startingPosition) { //UPC Code for #1 on left is OOIIOOI
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str(
-        canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, "1");
-
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_box(canvas, startingPosition, BARCODE_Y_START, 2, BARCODE_HEIGHT); //OO
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 2, BARCODE_Y_START, 2, BARCODE_HEIGHT); //II
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 4, BARCODE_Y_START, 2, BARCODE_HEIGHT); //OO
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 6, BARCODE_Y_START, 1, BARCODE_HEIGHT); //I
-}
-void number_2(
-    Canvas* canvas,
-    bool rightHand,
-    int startingPosition) { //UPC Code for #2 on left is OOIOOII
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str(
-        canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, "2");
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_box(canvas, startingPosition, BARCODE_Y_START, 2, BARCODE_HEIGHT); //OO
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 2, BARCODE_Y_START, 1, BARCODE_HEIGHT); //I
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 3, BARCODE_Y_START, 2, BARCODE_HEIGHT); //OO
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 5, BARCODE_Y_START, 2, BARCODE_HEIGHT); //II
-}
-void number_3(
-    Canvas* canvas,
-    bool rightHand,
-    int startingPosition) { //UPC Code for #3 on left is OIIIIOI
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str(
-        canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, "3");
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_box(canvas, startingPosition, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 1, BARCODE_Y_START, 4, BARCODE_HEIGHT); //IIII
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 5, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 6, BARCODE_Y_START, 1, BARCODE_HEIGHT); //I
-}
-void number_4(
-    Canvas* canvas,
-    bool rightHand,
-    int startingPosition) { //UPC Code for #4 on left is OIOOOII
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str(
-        canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, "4");
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_box(canvas, startingPosition, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 1, BARCODE_Y_START, 1, BARCODE_HEIGHT); //I
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 2, BARCODE_Y_START, 3, BARCODE_HEIGHT); //OOO
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 5, BARCODE_Y_START, 2, BARCODE_HEIGHT); //II
-}
-void number_5(
-    Canvas* canvas,
-    bool rightHand,
-    int startingPosition) { //UPC Code for #5 on left is OIIOOOI
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str(
-        canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, "5");
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_box(canvas, startingPosition, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 1, BARCODE_Y_START, 2, BARCODE_HEIGHT); //II
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 3, BARCODE_Y_START, 3, BARCODE_HEIGHT); //OOO
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 6, BARCODE_Y_START, 1, BARCODE_HEIGHT); //I
-}
-void number_6(
-    Canvas* canvas,
-    bool rightHand,
-    int startingPosition) { //UPC Code for #6 on left is OIOIIII
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str(
-        canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, "6");
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_box(canvas, startingPosition, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 1, BARCODE_Y_START, 1, BARCODE_HEIGHT); //I
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 2, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 3, BARCODE_Y_START, 4, BARCODE_HEIGHT); //IIII
-}
-void number_7(
-    Canvas* canvas,
-    bool rightHand,
-    int startingPosition) { //UPC Code for #7 on left is OIIIOII
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str(
-        canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, "7");
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_box(canvas, startingPosition, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 1, BARCODE_Y_START, 3, BARCODE_HEIGHT); //III
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 4, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 5, BARCODE_Y_START, 2, BARCODE_HEIGHT); //II
-}
-void number_8(
-    Canvas* canvas,
-    bool rightHand,
-    int startingPosition) { //UPC Code for #8 on left is OIIOIII
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str(
-        canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, "8");
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_box(canvas, startingPosition, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 1, BARCODE_Y_START, 2, BARCODE_HEIGHT); //II
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 3, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 4, BARCODE_Y_START, 3, BARCODE_HEIGHT); //III
-}
-void number_9(
-    Canvas* canvas,
-    bool rightHand,
-    int startingPosition) { //UPC Code for #9 on left is OOOIOII
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str(
-        canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, "9");
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_box(canvas, startingPosition, BARCODE_Y_START, 3, BARCODE_HEIGHT); //OOO
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 3, BARCODE_Y_START, 1, BARCODE_HEIGHT); //I
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 4, BARCODE_Y_START, 1, BARCODE_HEIGHT); //O
-    canvas_invert_color(canvas);
-    canvas_draw_box(canvas, startingPosition + 5, BARCODE_Y_START, 2, BARCODE_HEIGHT); //II
-}
-
-static void render_callback(Canvas* const canvas, void* ctx) {
-    PluginState* plugin_state = acquire_mutex((ValueMutex*)ctx, 25);
-    if(plugin_state == NULL) {
-        return;
-    }
-
-    //I originally had all of these values being generated at runtime by math, but that kept giving me trouble.
-    int editingMarkerPosition[12] = {
-        19,
-        26,
-        33,
-        40,
-        47,
-        54,
-        66,
-        73,
-        80,
-        87,
-        94,
-        101,
-    };
-    int menuTextLocations[6] = {
-        20,
-        30,
-        40,
-        50,
-        60,
-        70,
-    };
-
-    if(plugin_state->modeIndex == 2) { //if in the menu
-        canvas_set_color(canvas, ColorBlack);
-        canvas_draw_str_aligned(canvas, 64, 6, AlignCenter, AlignCenter, "MENU");
-        canvas_draw_frame(canvas, 50, 0, 29, 11); //box around Menu
-        canvas_draw_str_aligned(
-            canvas, 64, menuTextLocations[0], AlignCenter, AlignCenter, "View");
-        canvas_draw_str_aligned(
-            canvas, 64, menuTextLocations[1], AlignCenter, AlignCenter, "Edit");
-        canvas_draw_str_aligned(
-            canvas, 64, menuTextLocations[2], AlignCenter, AlignCenter, "Parity?");
-
-        canvas_draw_frame(canvas, 81, menuTextLocations[2] - 2, 6, 6);
-        if(plugin_state->doParityCalculation == true) {
-            canvas_draw_box(canvas, 83, menuTextLocations[2], 2, 2);
-        }
-        canvas_draw_str_aligned(
-            canvas, 64, menuTextLocations[3], AlignCenter, AlignCenter, "TODO");
-        canvas_draw_disc(
-            canvas, 40, menuTextLocations[plugin_state->menuIndex], 2); //draw menu cursor
-    }
-
-    if(plugin_state->modeIndex != 2) { //if not in the menu
-        canvas_set_color(canvas, ColorBlack);
-        //canvas_draw_glyph(canvas, 115, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, 'M');
-        canvas_draw_box(canvas, BARCODE_STARTING_POS, BARCODE_Y_START, 1, BARCODE_HEIGHT + 2);
-        //canvas_draw_box(canvas, BARCODE_STARTING_POS + 1, 1, 1, 50); //left blank on purpose
-        canvas_draw_box(
-            canvas,
-            (BARCODE_STARTING_POS + 2),
-            BARCODE_Y_START,
-            1,
-            BARCODE_HEIGHT + 2); //start saftey
-        for(int index = 0; index < 12; index++) {
-            bool isOnRight = false;
-            if(index >= 6) {
-                isOnRight = true;
-            }
-            if((index == 11) && (plugin_state->doParityCalculation)) { //calculate the check digit
-                int checkDigit =
-                    plugin_state->barcodeNumeral[0] + plugin_state->barcodeNumeral[2] +
-                    plugin_state->barcodeNumeral[4] + plugin_state->barcodeNumeral[6] +
-                    plugin_state->barcodeNumeral[8] + plugin_state->barcodeNumeral[10];
-                //add all odd positions Confusing because 0index
-                checkDigit = checkDigit * 3; //times 3
-                checkDigit += plugin_state->barcodeNumeral[1] + plugin_state->barcodeNumeral[3] +
-                              plugin_state->barcodeNumeral[5] + plugin_state->barcodeNumeral[7] +
-                              plugin_state->barcodeNumeral[9];
-                //add all even positions to above. Confusing because 0index
-                checkDigit = checkDigit % 10; //mod 10
-                //if m - 0 then x12 = 0, otherwise x12 is 10 - m
-                if(checkDigit == 0) {
-                    plugin_state->barcodeNumeral[11] = 0;
-                } else {
-                    checkDigit = 10 - checkDigit;
-                    plugin_state->barcodeNumeral[11] = checkDigit;
-                }
-            }
-            switch(plugin_state->barcodeNumeral[index]) {
-            case 0:
-                number_0(canvas, isOnRight, editingMarkerPosition[index]);
-                break;
-            case 1:
-                number_1(canvas, isOnRight, editingMarkerPosition[index]);
-                break;
-            case 2:
-                number_2(canvas, isOnRight, editingMarkerPosition[index]);
-                break;
-            case 3:
-                number_3(canvas, isOnRight, editingMarkerPosition[index]);
-                break;
-            case 4:
-                number_4(canvas, isOnRight, editingMarkerPosition[index]);
-                break;
-            case 5:
-                number_5(canvas, isOnRight, editingMarkerPosition[index]);
-                break;
-            case 6:
-                number_6(canvas, isOnRight, editingMarkerPosition[index]);
-                break;
-            case 7:
-                number_7(canvas, isOnRight, editingMarkerPosition[index]);
-                break;
-            case 8:
-                number_8(canvas, isOnRight, editingMarkerPosition[index]);
-                break;
-            case 9:
-                number_9(canvas, isOnRight, editingMarkerPosition[index]);
-                break;
-            }
-        }
-
-        canvas_set_color(canvas, ColorBlack);
-        //canvas_draw_box(canvas, BARCODE_STARTING_POS + 45, BARCODE_Y_START, 1, BARCODE_HEIGHT);
-        canvas_draw_box(canvas, BARCODE_STARTING_POS + 46, BARCODE_Y_START, 1, BARCODE_HEIGHT + 2);
-        //canvas_draw_box(canvas, BARCODE_STARTING_POS + 47, BARCODE_Y_START, 1, BARCODE_HEIGHT);
-        canvas_draw_box(canvas, BARCODE_STARTING_POS + 48, BARCODE_Y_START, 1, BARCODE_HEIGHT + 2);
-        //canvas_draw_box(canvas, BARCODE_STARTING_POS + 49, BARCODE_Y_START, 1, BARCODE_HEIGHT);
-
-        if(plugin_state->modeIndex == 1) {
-            canvas_set_color(canvas, ColorBlack);
-            canvas_draw_box(
-                canvas,
-                editingMarkerPosition[plugin_state->editingIndex],
-                63,
-                7,
-                1); //draw editing cursor
-        }
-
-        canvas_set_color(canvas, ColorBlack);
-        canvas_draw_box(canvas, BARCODE_STARTING_POS + 92, BARCODE_Y_START, 1, BARCODE_HEIGHT + 2);
-        //canvas_draw_box(canvas, 14, 1, 1, 50); //left blank on purpose
-        canvas_draw_box(
-            canvas,
-            (BARCODE_STARTING_POS + 2) + 92,
-            BARCODE_Y_START,
-            1,
-            BARCODE_HEIGHT + 2); //end safety
-    }
-
-    release_mutex((ValueMutex*)ctx, plugin_state);
-}
-
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
-    furi_assert(event_queue);
-
-    PluginEvent event = {.type = EventTypeKey, .input = *input_event};
-    furi_message_queue_put(event_queue, &event, FuriWaitForever);
-}
-
-static void barcode_UPCA_generator_state_init(PluginState* const plugin_state) {
-    int i;
-    for(i = 0; i < 12; ++i) {
-        if(i > 9) {
-            plugin_state->barcodeNumeral[i] = i - 10;
-        } else if(i < 10) {
-            plugin_state->barcodeNumeral[i] = i;
-        }
-    }
-    plugin_state->editingIndex = 0;
-    plugin_state->modeIndex = 0;
-    plugin_state->doParityCalculation = true;
-    plugin_state->menuIndex = 0;
-}
-
-int32_t barcode_UPCA_generator_app(void* p) {
-    UNUSED(p);
-    //testing
-    FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
-
-    PluginState* plugin_state = malloc(sizeof(PluginState));
-    barcode_UPCA_generator_state_init(plugin_state);
-    ValueMutex state_mutex;
-    if(!init_mutex(&state_mutex, plugin_state, sizeof(PluginState))) {
-        FURI_LOG_E("barcode_UPCA_generator", "cannot create mutex\r\n");
-        furi_message_queue_free(event_queue);
-        free(plugin_state);
-        return 255;
-    }
-
-    // Set system callbacks
-    ViewPort* view_port = view_port_alloc();
-    view_port_draw_callback_set(view_port, render_callback, &state_mutex);
-    view_port_input_callback_set(view_port, input_callback, event_queue);
-
-    // Open GUI and register view_port
-    Gui* gui = furi_record_open(RECORD_GUI);
-    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
-
-    PluginEvent event;
-    for(bool processing = true; processing;) {
-        FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
-        PluginState* plugin_state = (PluginState*)acquire_mutex_block(&state_mutex);
-        int barcodeMaxIndex;
-        if(plugin_state->doParityCalculation == true) {
-            barcodeMaxIndex = 11;
-        }
-        if(plugin_state->doParityCalculation == false) {
-            barcodeMaxIndex = 12;
-        }
-
-        if(event_status == FuriStatusOk) {
-            // press events
-            if(event.type == EventTypeKey) {
-                if((event.input.type == InputTypePress) || (event.input.type == InputTypeRepeat)) {
-                    switch(event.input.key) {
-                    case InputKeyUp:
-                        if(plugin_state->modeIndex == 1) { //if edit mode
-                            plugin_state->barcodeNumeral[plugin_state->editingIndex]++;
-                        }
-                        if(plugin_state->barcodeNumeral[plugin_state->editingIndex] > 9) {
-                            plugin_state->barcodeNumeral[plugin_state->editingIndex] = 0;
-                        }
-                        if(plugin_state->modeIndex == 2) { //if menu mode
-                            plugin_state->menuIndex--;
-                        }
-                        if(plugin_state->menuIndex < 0) {
-                            plugin_state->menuIndex = 3;
-                        }
-                        break;
-                    case InputKeyDown:
-                        if(plugin_state->modeIndex == 1) {
-                            plugin_state->barcodeNumeral[plugin_state->editingIndex]--;
-                        }
-                        if(plugin_state->barcodeNumeral[plugin_state->editingIndex] < 0) {
-                            plugin_state->barcodeNumeral[plugin_state->editingIndex] = 9;
-                        }
-                        if(plugin_state->modeIndex == 2) { //if menu mode
-                            plugin_state->menuIndex++;
-                        }
-                        if(plugin_state->menuIndex > 3) {
-                            plugin_state->menuIndex = 0;
-                        }
-                        break;
-                    case InputKeyRight:
-                        if(plugin_state->modeIndex == 1) {
-                            plugin_state->editingIndex++;
-                        }
-                        if(plugin_state->editingIndex >= barcodeMaxIndex) {
-                            plugin_state->editingIndex = 0;
-                        }
-                        break;
-                    case InputKeyLeft:
-                        if(plugin_state->modeIndex == 1) {
-                            plugin_state->editingIndex--;
-                        }
-                        if(plugin_state->editingIndex < 0) {
-                            plugin_state->editingIndex = barcodeMaxIndex - 1;
-                        }
-                        break;
-                    case InputKeyOk:
-                        if((plugin_state->modeIndex == 0) ||
-                           (plugin_state->modeIndex == 1)) { //if normal or edit more, open menu
-                            plugin_state->modeIndex = 2;
-                            break;
-                        } else if(
-                            (plugin_state->modeIndex == 2) &&
-                            (plugin_state->menuIndex ==
-                             1)) { //if hits select in menu, while index is 1. edit mode
-                            plugin_state->modeIndex = 1;
-                            break;
-                        } else if(
-                            (plugin_state->modeIndex == 2) &&
-                            (plugin_state->menuIndex ==
-                             0)) { //if hits select in menu, while index is 0. view mode
-                            plugin_state->modeIndex = 0;
-                            break;
-                        } else if(
-                            (plugin_state->modeIndex == 2) &&
-                            (plugin_state->menuIndex ==
-                             2)) { //if hits select in menu, while index is 2. Parity switch
-                            plugin_state->doParityCalculation =
-                                !plugin_state->doParityCalculation; //invert bool
-                            break;
-                        } else {
-                            break;
-                        }
-
-                    case InputKeyBack:
-                        if(plugin_state->modeIndex == 0) {
-                            processing = false;
-                        }
-                        if(plugin_state->modeIndex == 2) {
-                            plugin_state->modeIndex = 0;
-                        }
-                        break;
-                    }
-                }
-            }
-        } else {
-            FURI_LOG_D("barcode_UPCA_generator", "osMessageQueue: event timeout");
-            // event timeout
-        }
-
-        view_port_update(view_port);
-        release_mutex(&state_mutex, plugin_state);
-    }
-
-    view_port_enabled_set(view_port, false);
-    gui_remove_view_port(gui, view_port);
-    furi_record_close(RECORD_GUI);
-    view_port_free(view_port);
-    furi_message_queue_free(event_queue);
-
-    return 0;
-}
--- a/applications/bt/application.fam
+++ b/applications/bt/application.fam
@@ -1,66 +0,0 @@
-App(
-    appid="bt",
-    name="BtSrv",
-    apptype=FlipperAppType.SERVICE,
-    entry_point="bt_srv",
-    cdefines=["SRV_BT"],
-    requires=[
-        "cli",
-        "dialogs",
-    ],
-    provides=[
-        "bt_start",
-        "bt_settings",
-        #"bt_debug",
-    ],
-    stack_size=1 * 1024,
-    order=20,
-)
-
-App(
-    appid="bt_start",
-    apptype=FlipperAppType.STARTUP,
-    entry_point="bt_on_system_start",
-    order=70,
-)
-
-App(
-    appid="bt_settings",
-    name="Bluetooth",
-    apptype=FlipperAppType.SETTINGS,
-    entry_point="bt_settings_app",
-    stack_size=1 * 1024,
-    requires=[
-        "bt",
-        "gui",
-    ],
-    order=10,
-)
-
-App(
-    appid="bt_debug",
-    name="Bluetooth Debug",
-    apptype=FlipperAppType.DEBUG,
-    entry_point="bt_debug_app",
-    stack_size=1 * 1024,
-    requires=[
-        "bt",
-        "gui",
-        "dialogs",
-    ],
-    order=110,
-)
-
-App(
-    appid="bt_hid",
-    name="Bluetooth Remote",
-    apptype=FlipperAppType.PLUGIN,
-    entry_point="bt_hid_app",
-    stack_size=1 * 1024,
-    cdefines=["APP_BLE_HID"],
-    requires=[
-        "bt",
-        "gui",
-    ],
-    order=10,
-)
--- a/applications/bt/bt_debug_app/views/bt_test.c
+++ b/applications/bt/bt_debug_app/views/bt_test.c
@@ -1,422 +0,0 @@
-#include "bt_test.h"
-
-#include <gui/canvas.h>
-#include <gui/elements.h>
-#include <m-array.h>
-#include <m-string.h>
-#include <furi.h>
-#include <stdint.h>
-
-struct BtTestParam {
-    const char* label;
-    uint8_t current_value_index;
-    string_t current_value_text;
-    uint8_t values_count;
-    BtTestParamChangeCallback change_callback;
-    void* context;
-};
-
-ARRAY_DEF(BtTestParamArray, BtTestParam, M_POD_OPLIST);
-
-struct BtTest {
-    View* view;
-    BtTestChangeStateCallback change_state_callback;
-    BtTestBackCallback back_callback;
-    void* context;
-};
-
-typedef struct {
-    BtTestState state;
-    BtTestParamArray_t params;
-    uint8_t position;
-    uint8_t window_position;
-    const char* message;
-    float rssi;
-    uint32_t packets_num_rx;
-    uint32_t packets_num_tx;
-} BtTestModel;
-
-#define BT_TEST_START_MESSAGE "Ok - Start"
-#define BT_TEST_STOP_MESSAGE "Ok - Stop"
-
-static void bt_test_process_up(BtTest* bt_test);
-static void bt_test_process_down(BtTest* bt_test);
-static void bt_test_process_left(BtTest* bt_test);
-static void bt_test_process_right(BtTest* bt_test);
-static void bt_test_process_ok(BtTest* bt_test);
-static void bt_test_process_back(BtTest* bt_test);
-
-static void bt_test_draw_callback(Canvas* canvas, void* _model) {
-    BtTestModel* model = _model;
-    char info_str[32];
-
-    const uint8_t param_height = 16;
-    const uint8_t param_width = 123;
-
-    canvas_clear(canvas);
-
-    uint8_t position = 0;
-    BtTestParamArray_it_t it;
-
-    canvas_set_font(canvas, FontSecondary);
-    for(BtTestParamArray_it(it, model->params); !BtTestParamArray_end_p(it);
-        BtTestParamArray_next(it)) {
-        uint8_t param_position = position - model->window_position;
-        uint8_t params_on_screen = 3;
-        uint8_t y_offset = 0;
-
-        if(param_position < params_on_screen) {
-            const BtTestParam* param = BtTestParamArray_cref(it);
-            uint8_t param_y = y_offset + (param_position * param_height);
-            uint8_t param_text_y = param_y + param_height - 4;
-
-            if(position == model->position) {
-                canvas_set_color(canvas, ColorBlack);
-                elements_slightly_rounded_box(
-                    canvas, 0, param_y + 1, param_width, param_height - 2);
-                canvas_set_color(canvas, ColorWhite);
-            } else {
-                canvas_set_color(canvas, ColorBlack);
-            }
-
-            canvas_draw_str(canvas, 6, param_text_y, param->label);
-
-            if(param->current_value_index > 0) {
-                canvas_draw_str(canvas, 50, param_text_y, "<");
-            }
-
-            canvas_draw_str(canvas, 61, param_text_y, string_get_cstr(param->current_value_text));
-
-            if(param->current_value_index < (param->values_count - 1)) {
-                canvas_draw_str(canvas, 113, param_text_y, ">");
-            }
-        }
-
-        position++;
-    }
-
-    elements_scrollbar(canvas, model->position, BtTestParamArray_size(model->params));
-    canvas_draw_str(canvas, 6, 60, model->message);
-    if(model->state == BtTestStateStarted) {
-        if(model->rssi != 0.0f) {
-            snprintf(info_str, sizeof(info_str), "RSSI:%3.1f dB", (double)model->rssi);
-            canvas_draw_str_aligned(canvas, 124, 60, AlignRight, AlignBottom, info_str);
-        }
-    } else if(model->state == BtTestStateStopped) {
-        if(model->packets_num_rx) {
-            snprintf(info_str, sizeof(info_str), "%ld pack rcv", model->packets_num_rx);
-            canvas_draw_str_aligned(canvas, 124, 60, AlignRight, AlignBottom, info_str);
-        } else if(model->packets_num_tx) {
-            snprintf(info_str, sizeof(info_str), "%ld pack sent", model->packets_num_tx);
-            canvas_draw_str_aligned(canvas, 124, 60, AlignRight, AlignBottom, info_str);
-        }
-    }
-}
-
-static bool bt_test_input_callback(InputEvent* event, void* context) {
-    BtTest* bt_test = context;
-    furi_assert(bt_test);
-    bool consumed = false;
-
-    if(event->type == InputTypeShort) {
-        switch(event->key) {
-        case InputKeyUp:
-            consumed = true;
-            bt_test_process_up(bt_test);
-            break;
-        case InputKeyDown:
-            consumed = true;
-            bt_test_process_down(bt_test);
-            break;
-        case InputKeyLeft:
-            consumed = true;
-            bt_test_process_left(bt_test);
-            break;
-        case InputKeyRight:
-            consumed = true;
-            bt_test_process_right(bt_test);
-            break;
-        case InputKeyOk:
-            consumed = true;
-            bt_test_process_ok(bt_test);
-            break;
-        case InputKeyBack:
-            consumed = false;
-            bt_test_process_back(bt_test);
-            break;
-        default:
-            break;
-        }
-    }
-
-    return consumed;
-}
-
-void bt_test_process_up(BtTest* bt_test) {
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            uint8_t params_on_screen = 3;
-            if(model->position > 0) {
-                model->position--;
-                if(((model->position - model->window_position) < 1) &&
-                   model->window_position > 0) {
-                    model->window_position--;
-                }
-            } else {
-                model->position = BtTestParamArray_size(model->params) - 1;
-                if(model->position > (params_on_screen - 1)) {
-                    model->window_position = model->position - (params_on_screen - 1);
-                }
-            }
-            return true;
-        });
-}
-
-void bt_test_process_down(BtTest* bt_test) {
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            uint8_t params_on_screen = 3;
-            if(model->position < (BtTestParamArray_size(model->params) - 1)) {
-                model->position++;
-                if((model->position - model->window_position) > (params_on_screen - 2) &&
-                   model->window_position <
-                       (BtTestParamArray_size(model->params) - params_on_screen)) {
-                    model->window_position++;
-                }
-            } else {
-                model->position = 0;
-                model->window_position = 0;
-            }
-            return true;
-        });
-}
-
-BtTestParam* bt_test_get_selected_param(BtTestModel* model) {
-    BtTestParam* param = NULL;
-
-    BtTestParamArray_it_t it;
-    uint8_t position = 0;
-    for(BtTestParamArray_it(it, model->params); !BtTestParamArray_end_p(it);
-        BtTestParamArray_next(it)) {
-        if(position == model->position) {
-            break;
-        }
-        position++;
-    }
-
-    param = BtTestParamArray_ref(it);
-
-    furi_assert(param);
-    return param;
-}
-
-void bt_test_process_left(BtTest* bt_test) {
-    BtTestParam* param;
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            param = bt_test_get_selected_param(model);
-            if(param->current_value_index > 0) {
-                param->current_value_index--;
-                if(param->change_callback) {
-                    model->state = BtTestStateStopped;
-                    model->message = BT_TEST_START_MESSAGE;
-                    model->rssi = 0.0f;
-                    model->packets_num_rx = 0;
-                    model->packets_num_tx = 0;
-                }
-            }
-            return true;
-        });
-    if(param->change_callback) {
-        param->change_callback(param);
-    }
-}
-
-void bt_test_process_right(BtTest* bt_test) {
-    BtTestParam* param;
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            param = bt_test_get_selected_param(model);
-            if(param->current_value_index < (param->values_count - 1)) {
-                param->current_value_index++;
-                if(param->change_callback) {
-                    model->state = BtTestStateStopped;
-                    model->message = BT_TEST_START_MESSAGE;
-                    model->rssi = 0.0f;
-                    model->packets_num_rx = 0;
-                    model->packets_num_tx = 0;
-                }
-            }
-            return true;
-        });
-    if(param->change_callback) {
-        param->change_callback(param);
-    }
-}
-
-void bt_test_process_ok(BtTest* bt_test) {
-    BtTestState state;
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            if(model->state == BtTestStateStarted) {
-                model->state = BtTestStateStopped;
-                model->message = BT_TEST_START_MESSAGE;
-                model->rssi = 0.0f;
-                model->packets_num_rx = 0;
-                model->packets_num_tx = 0;
-            } else if(model->state == BtTestStateStopped) {
-                model->state = BtTestStateStarted;
-                model->message = BT_TEST_STOP_MESSAGE;
-            }
-            state = model->state;
-            return true;
-        });
-    if(bt_test->change_state_callback) {
-        bt_test->change_state_callback(state, bt_test->context);
-    }
-}
-
-void bt_test_process_back(BtTest* bt_test) {
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            model->state = BtTestStateStopped;
-            model->rssi = 0.0f;
-            model->packets_num_rx = 0;
-            model->packets_num_tx = 0;
-            return false;
-        });
-    if(bt_test->back_callback) {
-        bt_test->back_callback(bt_test->context);
-    }
-}
-
-BtTest* bt_test_alloc() {
-    BtTest* bt_test = malloc(sizeof(BtTest));
-    bt_test->view = view_alloc();
-    view_set_context(bt_test->view, bt_test);
-    view_allocate_model(bt_test->view, ViewModelTypeLocking, sizeof(BtTestModel));
-    view_set_draw_callback(bt_test->view, bt_test_draw_callback);
-    view_set_input_callback(bt_test->view, bt_test_input_callback);
-
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            model->state = BtTestStateStopped;
-            model->message = "Ok - Start";
-            BtTestParamArray_init(model->params);
-            model->position = 0;
-            model->window_position = 0;
-            model->rssi = 0.0f;
-            model->packets_num_tx = 0;
-            model->packets_num_rx = 0;
-            return true;
-        });
-
-    return bt_test;
-}
-
-void bt_test_free(BtTest* bt_test) {
-    furi_assert(bt_test);
-
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            BtTestParamArray_it_t it;
-            for(BtTestParamArray_it(it, model->params); !BtTestParamArray_end_p(it);
-                BtTestParamArray_next(it)) {
-                string_clear(BtTestParamArray_ref(it)->current_value_text);
-            }
-            BtTestParamArray_clear(model->params);
-            return false;
-        });
-    view_free(bt_test->view);
-    free(bt_test);
-}
-
-View* bt_test_get_view(BtTest* bt_test) {
-    furi_assert(bt_test);
-    return bt_test->view;
-}
-
-BtTestParam* bt_test_param_add(
-    BtTest* bt_test,
-    const char* label,
-    uint8_t values_count,
-    BtTestParamChangeCallback change_callback,
-    void* context) {
-    BtTestParam* param = NULL;
-    furi_assert(label);
-    furi_assert(bt_test);
-
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            param = BtTestParamArray_push_new(model->params);
-            param->label = label;
-            param->values_count = values_count;
-            param->change_callback = change_callback;
-            param->context = context;
-            param->current_value_index = 0;
-            string_init(param->current_value_text);
-            return true;
-        });
-
-    return param;
-}
-
-void bt_test_set_rssi(BtTest* bt_test, float rssi) {
-    furi_assert(bt_test);
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            model->rssi = rssi;
-            return true;
-        });
-}
-
-void bt_test_set_packets_tx(BtTest* bt_test, uint32_t packets_num) {
-    furi_assert(bt_test);
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            model->packets_num_tx = packets_num;
-            return true;
-        });
-}
-
-void bt_test_set_packets_rx(BtTest* bt_test, uint32_t packets_num) {
-    furi_assert(bt_test);
-    with_view_model(
-        bt_test->view, (BtTestModel * model) {
-            model->packets_num_rx = packets_num;
-            return true;
-        });
-}
-
-void bt_test_set_change_state_callback(BtTest* bt_test, BtTestChangeStateCallback callback) {
-    furi_assert(bt_test);
-    furi_assert(callback);
-    bt_test->change_state_callback = callback;
-}
-
-void bt_test_set_back_callback(BtTest* bt_test, BtTestBackCallback callback) {
-    furi_assert(bt_test);
-    furi_assert(callback);
-    bt_test->back_callback = callback;
-}
-
-void bt_test_set_context(BtTest* bt_test, void* context) {
-    furi_assert(bt_test);
-    bt_test->context = context;
-}
-
-void bt_test_set_current_value_index(BtTestParam* param, uint8_t current_value_index) {
-    param->current_value_index = current_value_index;
-}
-
-void bt_test_set_current_value_text(BtTestParam* param, const char* current_value_text) {
-    string_set_str(param->current_value_text, current_value_text);
-}
-
-uint8_t bt_test_get_current_value_index(BtTestParam* param) {
-    return param->current_value_index;
-}
-
-void* bt_test_get_context(BtTestParam* param) {
-    return param->context;
-}
--- a/applications/bt/bt_hid_app/bt_hid.c
+++ b/applications/bt/bt_hid_app/bt_hid.c
@@ -1,197 +0,0 @@
-#include "bt_hid.h"
-#include <furi_hal_bt.h>
-#include <applications/notification/notification_messages.h>
-
-#define TAG "BtHidApp"
-
-enum BtDebugSubmenuIndex {
-    BtHidSubmenuIndexKeynote,
-    BtHidSubmenuIndexKeyboard,
-    BtHidSubmenuIndexMedia,
-    BtHidSubmenuIndexMouse,
-};
-
-void bt_hid_submenu_callback(void* context, uint32_t index) {
-    furi_assert(context);
-    BtHid* app = context;
-    if(index == BtHidSubmenuIndexKeynote) {
-        app->view_id = BtHidViewKeynote;
-        view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewKeynote);
-    } else if(index == BtHidSubmenuIndexKeyboard) {
-        app->view_id = BtHidViewKeyboard;
-        view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewKeyboard);
-    } else if(index == BtHidSubmenuIndexMedia) {
-        app->view_id = BtHidViewMedia;
-        view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewMedia);
-    } else if(index == BtHidSubmenuIndexMouse) {
-        app->view_id = BtHidViewMouse;
-        view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewMouse);
-    }
-}
-
-void bt_hid_dialog_callback(DialogExResult result, void* context) {
-    furi_assert(context);
-    BtHid* app = context;
-    if(result == DialogExResultLeft) {
-        view_dispatcher_stop(app->view_dispatcher);
-    } else if(result == DialogExResultRight) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, app->view_id); // Show last view
-    } else if(result == DialogExResultCenter) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewSubmenu);
-    }
-}
-
-uint32_t bt_hid_exit_confirm_view(void* context) {
-    UNUSED(context);
-    return BtHidViewExitConfirm;
-}
-
-uint32_t bt_hid_exit(void* context) {
-    UNUSED(context);
-    return VIEW_NONE;
-}
-
-void bt_hid_connection_status_changed_callback(BtStatus status, void* context) {
-    furi_assert(context);
-    BtHid* bt_hid = context;
-    bool connected = (status == BtStatusConnected);
-    if(connected) {
-        notification_internal_message(bt_hid->notifications, &sequence_set_blue_255);
-    } else {
-        notification_internal_message(bt_hid->notifications, &sequence_reset_blue);
-    }
-    bt_hid_keynote_set_connected_status(bt_hid->bt_hid_keynote, connected);
-    bt_hid_keyboard_set_connected_status(bt_hid->bt_hid_keyboard, connected);
-    bt_hid_media_set_connected_status(bt_hid->bt_hid_media, connected);
-    bt_hid_mouse_set_connected_status(bt_hid->bt_hid_mouse, connected);
-}
-
-BtHid* bt_hid_app_alloc() {
-    BtHid* app = malloc(sizeof(BtHid));
-
-    // Gui
-    app->gui = furi_record_open(RECORD_GUI);
-
-    // Bt
-    app->bt = furi_record_open(RECORD_BT);
-
-    // Notifications
-    app->notifications = furi_record_open(RECORD_NOTIFICATION);
-
-    // View dispatcher
-    app->view_dispatcher = view_dispatcher_alloc();
-    view_dispatcher_enable_queue(app->view_dispatcher);
-    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
-
-    // Submenu view
-    app->submenu = submenu_alloc();
-    submenu_add_item(
-        app->submenu, "Keynote", BtHidSubmenuIndexKeynote, bt_hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu, "Keyboard", BtHidSubmenuIndexKeyboard, bt_hid_submenu_callback, app);
-    submenu_add_item(app->submenu, "Media", BtHidSubmenuIndexMedia, bt_hid_submenu_callback, app);
-    submenu_add_item(app->submenu, "Mouse", BtHidSubmenuIndexMouse, bt_hid_submenu_callback, app);
-    view_set_previous_callback(submenu_get_view(app->submenu), bt_hid_exit);
-    view_dispatcher_add_view(
-        app->view_dispatcher, BtHidViewSubmenu, submenu_get_view(app->submenu));
-
-    // Dialog view
-    app->dialog = dialog_ex_alloc();
-    dialog_ex_set_result_callback(app->dialog, bt_hid_dialog_callback);
-    dialog_ex_set_context(app->dialog, app);
-    dialog_ex_set_left_button_text(app->dialog, "Exit");
-    dialog_ex_set_right_button_text(app->dialog, "Stay");
-    dialog_ex_set_center_button_text(app->dialog, "Menu");
-    dialog_ex_set_header(app->dialog, "Close Current App?", 16, 12, AlignLeft, AlignTop);
-    view_dispatcher_add_view(
-        app->view_dispatcher, BtHidViewExitConfirm, dialog_ex_get_view(app->dialog));
-
-    // Keynote view
-    app->bt_hid_keynote = bt_hid_keynote_alloc();
-    view_set_previous_callback(
-        bt_hid_keynote_get_view(app->bt_hid_keynote), bt_hid_exit_confirm_view);
-    view_dispatcher_add_view(
-        app->view_dispatcher, BtHidViewKeynote, bt_hid_keynote_get_view(app->bt_hid_keynote));
-
-    // Keyboard view
-    app->bt_hid_keyboard = bt_hid_keyboard_alloc();
-    view_set_previous_callback(
-        bt_hid_keyboard_get_view(app->bt_hid_keyboard), bt_hid_exit_confirm_view);
-    view_dispatcher_add_view(
-        app->view_dispatcher, BtHidViewKeyboard, bt_hid_keyboard_get_view(app->bt_hid_keyboard));
-
-    // Media view
-    app->bt_hid_media = bt_hid_media_alloc();
-    view_set_previous_callback(bt_hid_media_get_view(app->bt_hid_media), bt_hid_exit_confirm_view);
-    view_dispatcher_add_view(
-        app->view_dispatcher, BtHidViewMedia, bt_hid_media_get_view(app->bt_hid_media));
-
-    // Mouse view
-    app->bt_hid_mouse = bt_hid_mouse_alloc();
-    view_set_previous_callback(bt_hid_mouse_get_view(app->bt_hid_mouse), bt_hid_exit_confirm_view);
-    view_dispatcher_add_view(
-        app->view_dispatcher, BtHidViewMouse, bt_hid_mouse_get_view(app->bt_hid_mouse));
-
-    // TODO switch to menu after Media is done
-    app->view_id = BtHidViewSubmenu;
-    view_dispatcher_switch_to_view(app->view_dispatcher, app->view_id);
-
-    return app;
-}
-
-void bt_hid_app_free(BtHid* app) {
-    furi_assert(app);
-
-    // Reset notification
-    notification_internal_message(app->notifications, &sequence_reset_blue);
-
-    // Free views
-    view_dispatcher_remove_view(app->view_dispatcher, BtHidViewSubmenu);
-    submenu_free(app->submenu);
-    view_dispatcher_remove_view(app->view_dispatcher, BtHidViewExitConfirm);
-    dialog_ex_free(app->dialog);
-    view_dispatcher_remove_view(app->view_dispatcher, BtHidViewKeynote);
-    bt_hid_keynote_free(app->bt_hid_keynote);
-    view_dispatcher_remove_view(app->view_dispatcher, BtHidViewKeyboard);
-    bt_hid_keyboard_free(app->bt_hid_keyboard);
-    view_dispatcher_remove_view(app->view_dispatcher, BtHidViewMedia);
-    bt_hid_media_free(app->bt_hid_media);
-    view_dispatcher_remove_view(app->view_dispatcher, BtHidViewMouse);
-    bt_hid_mouse_free(app->bt_hid_mouse);
-    view_dispatcher_free(app->view_dispatcher);
-
-    // Close records
-    furi_record_close(RECORD_GUI);
-    app->gui = NULL;
-    furi_record_close(RECORD_NOTIFICATION);
-    app->notifications = NULL;
-    furi_record_close(RECORD_BT);
-    app->bt = NULL;
-
-    // Free rest
-    free(app);
-}
-
-int32_t bt_hid_app(void* p) {
-    UNUSED(p);
-    // Switch profile to Hid
-    BtHid* app = bt_hid_app_alloc();
-    bt_set_status_changed_callback(app->bt, bt_hid_connection_status_changed_callback, app);
-    // Change profile
-    if(!bt_set_profile(app->bt, BtProfileHidKeyboard)) {
-        FURI_LOG_E(TAG, "Failed to switch profile");
-        bt_hid_app_free(app);
-        return -1;
-    }
-    furi_hal_bt_start_advertising();
-
-    view_dispatcher_run(app->view_dispatcher);
-
-    bt_set_status_changed_callback(app->bt, NULL, NULL);
-    // Change back profile to Serial
-    bt_set_profile(app->bt, BtProfileSerial);
-
-    bt_hid_app_free(app);
-
-    return 0;
-}
--- a/applications/bt/bt_hid_app/bt_hid.h
+++ b/applications/bt/bt_hid_app/bt_hid.h
@@ -1,38 +0,0 @@
-#pragma once
-
-#include <furi.h>
-#include <bt/bt_service/bt.h>
-#include <gui/gui.h>
-#include <gui/view.h>
-#include <gui/view_dispatcher.h>
-#include <applications/notification/notification.h>
-
-#include <gui/modules/submenu.h>
-#include <gui/modules/dialog_ex.h>
-#include "views/bt_hid_keynote.h"
-#include "views/bt_hid_keyboard.h"
-#include "views/bt_hid_media.h"
-#include "views/bt_hid_mouse.h"
-
-typedef struct {
-    Bt* bt;
-    Gui* gui;
-    NotificationApp* notifications;
-    ViewDispatcher* view_dispatcher;
-    Submenu* submenu;
-    DialogEx* dialog;
-    BtHidKeynote* bt_hid_keynote;
-    BtHidKeyboard* bt_hid_keyboard;
-    BtHidMedia* bt_hid_media;
-    BtHidMouse* bt_hid_mouse;
-    uint32_t view_id;
-} BtHid;
-
-typedef enum {
-    BtHidViewSubmenu,
-    BtHidViewKeynote,
-    BtHidViewKeyboard,
-    BtHidViewMedia,
-    BtHidViewMouse,
-    BtHidViewExitConfirm,
-} BtHidView;
--- a/applications/bt/bt_hid_app/views/bt_hid_keyboard.c
+++ b/applications/bt/bt_hid_app/views/bt_hid_keyboard.c
@@ -1,384 +0,0 @@
-#include "bt_hid_keyboard.h"
-#include <furi.h>
-#include <furi_hal_bt_hid.h>
-#include <furi_hal_usb_hid.h>
-#include <gui/elements.h>
-#include <gui/icon_i.h>
-
-struct BtHidKeyboard {
-    View* view;
-};
-
-typedef struct {
-    bool shift;
-    bool alt;
-    bool ctrl;
-    bool gui;
-    uint8_t x;
-    uint8_t y;
-    uint8_t last_key_code;
-    uint16_t modifier_code;
-    bool ok_pressed;
-    bool back_pressed;
-    bool connected;
-    char key_string[5];
-} BtHidKeyboardModel;
-
-typedef struct {
-    uint8_t width;
-    char* key;
-    const Icon* icon;
-    char* shift_key;
-    uint8_t value;
-} BtHidKeyboardKey;
-
-typedef struct {
-    int8_t x;
-    int8_t y;
-} BtHidKeyboardPoint;
-
-// 4 BY 12
-#define MARGIN_TOP 0
-#define MARGIN_LEFT 4
-#define KEY_WIDTH 9
-#define KEY_HEIGHT 12
-#define KEY_PADDING 1
-#define ROW_COUNT 6
-#define COLUMN_COUNT 12
-
-// 0 width items are not drawn, but there value is used
-const BtHidKeyboardKey bt_hid_keyboard_keyset[ROW_COUNT][COLUMN_COUNT] = {
-    {
-        {.width = 1, .icon = NULL, .key = "1", .shift_key = "!", .value = HID_KEYBOARD_1},
-        {.width = 1, .icon = NULL, .key = "2", .shift_key = "@", .value = HID_KEYBOARD_2},
-        {.width = 1, .icon = NULL, .key = "3", .shift_key = "#", .value = HID_KEYBOARD_3},
-        {.width = 1, .icon = NULL, .key = "4", .shift_key = "$", .value = HID_KEYBOARD_4},
-        {.width = 1, .icon = NULL, .key = "5", .shift_key = "%", .value = HID_KEYBOARD_5},
-        {.width = 1, .icon = NULL, .key = "6", .shift_key = "^", .value = HID_KEYBOARD_6},
-        {.width = 1, .icon = NULL, .key = "7", .shift_key = "&", .value = HID_KEYBOARD_7},
-        {.width = 1, .icon = NULL, .key = "8", .shift_key = "*", .value = HID_KEYBOARD_8},
-        {.width = 1, .icon = NULL, .key = "9", .shift_key = "(", .value = HID_KEYBOARD_9},
-        {.width = 1, .icon = NULL, .key = "0", .shift_key = ")", .value = HID_KEYBOARD_0},
-        {.width = 2, .icon = &I_Pin_arrow_left_9x7, .value = HID_KEYBOARD_DELETE},
-        {.width = 0, .value = HID_KEYBOARD_DELETE},
-    },
-    {
-        {.width = 1, .icon = NULL, .key = "q", .shift_key = "Q", .value = HID_KEYBOARD_Q},
-        {.width = 1, .icon = NULL, .key = "w", .shift_key = "W", .value = HID_KEYBOARD_W},
-        {.width = 1, .icon = NULL, .key = "e", .shift_key = "E", .value = HID_KEYBOARD_E},
-        {.width = 1, .icon = NULL, .key = "r", .shift_key = "R", .value = HID_KEYBOARD_R},
-        {.width = 1, .icon = NULL, .key = "t", .shift_key = "T", .value = HID_KEYBOARD_T},
-        {.width = 1, .icon = NULL, .key = "y", .shift_key = "Y", .value = HID_KEYBOARD_Y},
-        {.width = 1, .icon = NULL, .key = "u", .shift_key = "U", .value = HID_KEYBOARD_U},
-        {.width = 1, .icon = NULL, .key = "i", .shift_key = "I", .value = HID_KEYBOARD_I},
-        {.width = 1, .icon = NULL, .key = "o", .shift_key = "O", .value = HID_KEYBOARD_O},
-        {.width = 1, .icon = NULL, .key = "p", .shift_key = "P", .value = HID_KEYBOARD_P},
-        {.width = 1, .icon = NULL, .key = "[", .shift_key = "{", .value = HID_KEYBOARD_OPEN_BRACKET},
-        {.width = 1,
-         .icon = NULL,
-         .key = "]",
-         .shift_key = "}",
-         .value = HID_KEYBOARD_CLOSE_BRACKET},
-    },
-    {
-        {.width = 1, .icon = NULL, .key = "a", .shift_key = "A", .value = HID_KEYBOARD_A},
-        {.width = 1, .icon = NULL, .key = "s", .shift_key = "S", .value = HID_KEYBOARD_S},
-        {.width = 1, .icon = NULL, .key = "d", .shift_key = "D", .value = HID_KEYBOARD_D},
-        {.width = 1, .icon = NULL, .key = "f", .shift_key = "F", .value = HID_KEYBOARD_F},
-        {.width = 1, .icon = NULL, .key = "g", .shift_key = "G", .value = HID_KEYBOARD_G},
-        {.width = 1, .icon = NULL, .key = "h", .shift_key = "H", .value = HID_KEYBOARD_H},
-        {.width = 1, .icon = NULL, .key = "j", .shift_key = "J", .value = HID_KEYBOARD_J},
-        {.width = 1, .icon = NULL, .key = "k", .shift_key = "K", .value = HID_KEYBOARD_K},
-        {.width = 1, .icon = NULL, .key = "l", .shift_key = "L", .value = HID_KEYBOARD_L},
-        {.width = 1, .icon = NULL, .key = ";", .shift_key = ":", .value = HID_KEYBOARD_SEMICOLON},
-        {.width = 2, .icon = &I_Pin_arrow_right_9x7, .value = HID_KEYBOARD_RETURN},
-        {.width = 0, .value = HID_KEYBOARD_RETURN},
-    },
-    {
-        {.width = 1, .icon = NULL, .key = "z", .shift_key = "Z", .value = HID_KEYBOARD_Z},
-        {.width = 1, .icon = NULL, .key = "x", .shift_key = "X", .value = HID_KEYBOARD_X},
-        {.width = 1, .icon = NULL, .key = "c", .shift_key = "C", .value = HID_KEYBOARD_C},
-        {.width = 1, .icon = NULL, .key = "v", .shift_key = "V", .value = HID_KEYBOARD_V},
-        {.width = 1, .icon = NULL, .key = "b", .shift_key = "B", .value = HID_KEYBOARD_B},
-        {.width = 1, .icon = NULL, .key = "n", .shift_key = "N", .value = HID_KEYBOARD_N},
-        {.width = 1, .icon = NULL, .key = "m", .shift_key = "M", .value = HID_KEYBOARD_M},
-        {.width = 1, .icon = NULL, .key = "/", .shift_key = "?", .value = HID_KEYBOARD_SLASH},
-        {.width = 1, .icon = NULL, .key = "\\", .shift_key = "|", .value = HID_KEYBOARD_BACKSLASH},
-        {.width = 1, .icon = NULL, .key = "`", .shift_key = "~", .value = HID_KEYBOARD_GRAVE_ACCENT},
-        {.width = 1, .icon = &I_ButtonUp_7x4, .value = HID_KEYBOARD_UP_ARROW},
-        {.width = 1, .icon = NULL, .key = "-", .shift_key = "_", .value = HID_KEYBOARD_MINUS},
-    },
-    {
-        {.width = 1, .icon = &I_Pin_arrow_up7x9, .value = HID_KEYBOARD_L_SHIFT},
-        {.width = 1, .icon = NULL, .key = ",", .shift_key = "<", .value = HID_KEYPAD_COMMA},
-        {.width = 1, .icon = NULL, .key = ".", .shift_key = ">", .value = HID_KEYBOARD_DOT},
-        {.width = 4, .icon = NULL, .key = " ", .value = HID_KEYBOARD_SPACEBAR},
-        {.width = 0, .value = HID_KEYBOARD_SPACEBAR},
-        {.width = 0, .value = HID_KEYBOARD_SPACEBAR},
-        {.width = 0, .value = HID_KEYBOARD_SPACEBAR},
-        {.width = 1, .icon = NULL, .key = "'", .shift_key = "\"", .value = HID_KEYBOARD_APOSTROPHE},
-        {.width = 1, .icon = NULL, .key = "=", .shift_key = "+", .value = HID_KEYBOARD_EQUAL_SIGN},
-        {.width = 1, .icon = &I_ButtonLeft_4x7, .value = HID_KEYBOARD_LEFT_ARROW},
-        {.width = 1, .icon = &I_ButtonDown_7x4, .value = HID_KEYBOARD_DOWN_ARROW},
-        {.width = 1, .icon = &I_ButtonRight_4x7, .value = HID_KEYBOARD_RIGHT_ARROW},
-    },
-    {
-        {.width = 3, .icon = NULL, .key = "Ctrl", .value = HID_KEYBOARD_L_CTRL},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_CTRL},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_CTRL},
-        {.width = 3, .icon = NULL, .key = "Alt", .value = HID_KEYBOARD_L_ALT},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_ALT},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_ALT},
-        {.width = 3, .icon = NULL, .key = "Cmd", .value = HID_KEYBOARD_L_GUI},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_GUI},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_GUI},
-        {.width = 3, .icon = NULL, .key = "Tab", .value = HID_KEYBOARD_TAB},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_TAB},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_TAB},
-    },
-};
-
-static void bt_hid_keyboard_to_upper(char* str) {
-    while(*str) {
-        *str = toupper((unsigned char)*str);
-        str++;
-    }
-}
-
-static void bt_hid_keyboard_draw_key(
-    Canvas* canvas,
-    BtHidKeyboardModel* model,
-    uint8_t x,
-    uint8_t y,
-    BtHidKeyboardKey key,
-    bool selected) {
-    if(!key.width) return;
-
-    canvas_set_color(canvas, ColorBlack);
-    uint8_t keyWidth = KEY_WIDTH * key.width + KEY_PADDING * (key.width - 1);
-    if(selected) {
-        // Draw a filled box
-        elements_slightly_rounded_box(
-            canvas,
-            MARGIN_LEFT + x * (KEY_WIDTH + KEY_PADDING),
-            MARGIN_TOP + y * (KEY_HEIGHT + KEY_PADDING),
-            keyWidth,
-            KEY_HEIGHT);
-        canvas_set_color(canvas, ColorWhite);
-    } else {
-        // Draw a framed box
-        elements_slightly_rounded_frame(
-            canvas,
-            MARGIN_LEFT + x * (KEY_WIDTH + KEY_PADDING),
-            MARGIN_TOP + y * (KEY_HEIGHT + KEY_PADDING),
-            keyWidth,
-            KEY_HEIGHT);
-    }
-    if(key.icon != NULL) {
-        // Draw the icon centered on the button
-        canvas_draw_icon(
-            canvas,
-            MARGIN_LEFT + x * (KEY_WIDTH + KEY_PADDING) + keyWidth / 2 - key.icon->width / 2,
-            MARGIN_TOP + y * (KEY_HEIGHT + KEY_PADDING) + KEY_HEIGHT / 2 - key.icon->height / 2,
-            key.icon);
-    } else {
-        // If shift is toggled use the shift key when available
-        strcpy(model->key_string, (model->shift && key.shift_key != 0) ? key.shift_key : key.key);
-        // Upper case if ctrl or alt was toggled true
-        if((model->ctrl && key.value == HID_KEYBOARD_L_CTRL) ||
-           (model->alt && key.value == HID_KEYBOARD_L_ALT) ||
-           (model->gui && key.value == HID_KEYBOARD_L_GUI)) {
-            bt_hid_keyboard_to_upper(model->key_string);
-        }
-        canvas_draw_str_aligned(
-            canvas,
-            MARGIN_LEFT + x * (KEY_WIDTH + KEY_PADDING) + keyWidth / 2 + 1,
-            MARGIN_TOP + y * (KEY_HEIGHT + KEY_PADDING) + KEY_HEIGHT / 2,
-            AlignCenter,
-            AlignCenter,
-            model->key_string);
-    }
-}
-
-static void bt_hid_keyboard_draw_callback(Canvas* canvas, void* context) {
-    furi_assert(context);
-    BtHidKeyboardModel* model = context;
-
-    // Header
-    if(!model->connected) {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
-        canvas_set_font(canvas, FontPrimary);
-        elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Keyboard");
-        elements_multiline_text_aligned(
-            canvas, 4, 60, AlignLeft, AlignBottom, "Waiting for Connection...");
-        return; // Dont render the keyboard if we are not yet connected
-    }
-
-    canvas_set_font(canvas, FontKeyboard);
-    // Start shifting the all keys up if on the next row (Scrolling)
-    uint8_t initY = model->y - 4 > 0 ? model->y - 4 : 0;
-    for(uint8_t y = initY; y < ROW_COUNT; y++) {
-        const BtHidKeyboardKey* keyboardKeyRow = bt_hid_keyboard_keyset[y];
-        uint8_t x = 0;
-        for(uint8_t i = 0; i < COLUMN_COUNT; i++) {
-            BtHidKeyboardKey key = keyboardKeyRow[i];
-            // Select when the button is hovered
-            // Select if the button is hovered within its width
-            // Select if back is clicked and its the backspace key
-            // Deselect when the button clicked or not hovered
-            bool keySelected = (x <= model->x && model->x < (x + key.width)) && y == model->y;
-            bool backSelected = model->back_pressed && key.value == HID_KEYBOARD_DELETE;
-            bt_hid_keyboard_draw_key(
-                canvas,
-                model,
-                x,
-                y - initY,
-                key,
-                (!model->ok_pressed && keySelected) || backSelected);
-            x += key.width;
-        }
-    }
-}
-
-static uint8_t bt_hid_keyboard_get_selected_key(BtHidKeyboardModel* model) {
-    BtHidKeyboardKey key = bt_hid_keyboard_keyset[model->y][model->x];
-    // Use upper case if shift is toggled
-    bool useUppercase = model->shift;
-    // Check if the key has an upper case version
-    bool hasUppercase = key.shift_key != 0;
-    if(useUppercase && hasUppercase)
-        return key.value;
-    else
-        return key.value;
-}
-
-static void bt_hid_keyboard_get_select_key(BtHidKeyboardModel* model, BtHidKeyboardPoint delta) {
-    // Keep going until a valid spot is found, this allows for nulls and zero width keys in the map
-    do {
-        if(((int8_t)model->y) + delta.y < 0)
-            model->y = ROW_COUNT - 1;
-        else
-            model->y = (model->y + delta.y) % ROW_COUNT;
-    } while(delta.y != 0 && bt_hid_keyboard_keyset[model->y][model->x].value == 0);
-
-    do {
-        if(((int8_t)model->x) + delta.x < 0)
-            model->x = COLUMN_COUNT - 1;
-        else
-            model->x = (model->x + delta.x) % COLUMN_COUNT;
-    } while(delta.x != 0 && bt_hid_keyboard_keyset[model->y][model->x].width ==
-                                0); // Skip zero width keys, pretend they are one key
-}
-
-static void bt_hid_keyboard_process(BtHidKeyboard* bt_hid_keyboard, InputEvent* event) {
-    with_view_model(
-        bt_hid_keyboard->view, (BtHidKeyboardModel * model) {
-            if(event->key == InputKeyOk) {
-                if(event->type == InputTypePress) {
-                    model->ok_pressed = true;
-                } else if(event->type == InputTypeLong || event->type == InputTypeShort) {
-                    model->last_key_code = bt_hid_keyboard_get_selected_key(model);
-
-                    // Toggle the modifier key when clicked, and click the key
-                    if(model->last_key_code == HID_KEYBOARD_L_SHIFT) {
-                        model->shift = !model->shift;
-                        if(model->shift)
-                            model->modifier_code |= KEY_MOD_LEFT_SHIFT;
-                        else
-                            model->modifier_code &= ~KEY_MOD_LEFT_SHIFT;
-                    } else if(model->last_key_code == HID_KEYBOARD_L_ALT) {
-                        model->alt = !model->alt;
-                        if(model->alt)
-                            model->modifier_code |= KEY_MOD_LEFT_ALT;
-                        else
-                            model->modifier_code &= ~KEY_MOD_LEFT_ALT;
-                    } else if(model->last_key_code == HID_KEYBOARD_L_CTRL) {
-                        model->ctrl = !model->ctrl;
-                        if(model->ctrl)
-                            model->modifier_code |= KEY_MOD_LEFT_CTRL;
-                        else
-                            model->modifier_code &= ~KEY_MOD_LEFT_CTRL;
-                    } else if(model->last_key_code == HID_KEYBOARD_L_GUI) {
-                        model->gui = !model->gui;
-                        if(model->gui)
-                            model->modifier_code |= KEY_MOD_LEFT_GUI;
-                        else
-                            model->modifier_code &= ~KEY_MOD_LEFT_GUI;
-                    }
-                    furi_hal_bt_hid_kb_press(model->modifier_code | model->last_key_code);
-                } else if(event->type == InputTypeRelease) {
-                    // Release happens after short and long presses
-                    furi_hal_bt_hid_kb_release(model->modifier_code | model->last_key_code);
-                    model->ok_pressed = false;
-                }
-            } else if(event->key == InputKeyBack) {
-                // If back is pressed for a short time, backspace
-                if(event->type == InputTypePress) {
-                    model->back_pressed = true;
-                } else if(event->type == InputTypeShort) {
-                    furi_hal_bt_hid_kb_press(HID_KEYBOARD_DELETE);
-                    furi_hal_bt_hid_kb_release(HID_KEYBOARD_DELETE);
-                } else if(event->type == InputTypeRelease) {
-                    model->back_pressed = false;
-                }
-            } else if(event->type == InputTypePress || event->type == InputTypeRepeat) {
-                // Cycle the selected keys
-                if(event->key == InputKeyUp) {
-                    bt_hid_keyboard_get_select_key(model, (BtHidKeyboardPoint){.x = 0, .y = -1});
-                } else if(event->key == InputKeyDown) {
-                    bt_hid_keyboard_get_select_key(model, (BtHidKeyboardPoint){.x = 0, .y = 1});
-                } else if(event->key == InputKeyLeft) {
-                    bt_hid_keyboard_get_select_key(model, (BtHidKeyboardPoint){.x = -1, .y = 0});
-                } else if(event->key == InputKeyRight) {
-                    bt_hid_keyboard_get_select_key(model, (BtHidKeyboardPoint){.x = 1, .y = 0});
-                }
-            }
-            return true;
-        });
-}
-
-static bool bt_hid_keyboard_input_callback(InputEvent* event, void* context) {
-    furi_assert(context);
-    BtHidKeyboard* bt_hid_keyboard = context;
-    bool consumed = false;
-
-    if(event->type == InputTypeLong && event->key == InputKeyBack) {
-        furi_hal_bt_hid_kb_release_all();
-    } else {
-        bt_hid_keyboard_process(bt_hid_keyboard, event);
-        consumed = true;
-    }
-
-    return consumed;
-}
-
-BtHidKeyboard* bt_hid_keyboard_alloc() {
-    BtHidKeyboard* bt_hid_keyboard = malloc(sizeof(BtHidKeyboard));
-    bt_hid_keyboard->view = view_alloc();
-    view_set_context(bt_hid_keyboard->view, bt_hid_keyboard);
-    view_allocate_model(bt_hid_keyboard->view, ViewModelTypeLocking, sizeof(BtHidKeyboardModel));
-    view_set_draw_callback(bt_hid_keyboard->view, bt_hid_keyboard_draw_callback);
-    view_set_input_callback(bt_hid_keyboard->view, bt_hid_keyboard_input_callback);
-
-    return bt_hid_keyboard;
-}
-
-void bt_hid_keyboard_free(BtHidKeyboard* bt_hid_keyboard) {
-    furi_assert(bt_hid_keyboard);
-    view_free(bt_hid_keyboard->view);
-    free(bt_hid_keyboard);
-}
-
-View* bt_hid_keyboard_get_view(BtHidKeyboard* bt_hid_keyboard) {
-    furi_assert(bt_hid_keyboard);
-    return bt_hid_keyboard->view;
-}
-
-void bt_hid_keyboard_set_connected_status(BtHidKeyboard* bt_hid_keyboard, bool connected) {
-    furi_assert(bt_hid_keyboard);
-    with_view_model(
-        bt_hid_keyboard->view, (BtHidKeyboardModel * model) {
-            model->connected = connected;
-            return true;
-        });
-}
--- a/applications/bt/bt_hid_app/views/bt_hid_keyboard.h
+++ b/applications/bt/bt_hid_app/views/bt_hid_keyboard.h
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-
-typedef struct BtHidKeyboard BtHidKeyboard;
-
-BtHidKeyboard* bt_hid_keyboard_alloc();
-
-void bt_hid_keyboard_free(BtHidKeyboard* bt_hid_keyboard);
-
-View* bt_hid_keyboard_get_view(BtHidKeyboard* bt_hid_keyboard);
-
-void bt_hid_keyboard_set_connected_status(BtHidKeyboard* bt_hid_keyboard, bool connected);
--- a/applications/bt/bt_hid_app/views/bt_hid_keynote.c
+++ b/applications/bt/bt_hid_app/views/bt_hid_keynote.c
@@ -1,204 +0,0 @@
-#include "bt_hid_keynote.h"
-#include <furi.h>
-#include <furi_hal_bt_hid.h>
-#include <furi_hal_usb_hid.h>
-#include <gui/elements.h>
-
-struct BtHidKeynote {
-    View* view;
-};
-
-typedef struct {
-    bool left_pressed;
-    bool up_pressed;
-    bool right_pressed;
-    bool down_pressed;
-    bool ok_pressed;
-    bool back_pressed;
-    bool connected;
-} BtHidKeynoteModel;
-
-static void bt_hid_keynote_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) {
-    canvas_draw_triangle(canvas, x, y, 5, 3, dir);
-    if(dir == CanvasDirectionBottomToTop) {
-        canvas_draw_line(canvas, x, y + 6, x, y - 1);
-    } else if(dir == CanvasDirectionTopToBottom) {
-        canvas_draw_line(canvas, x, y - 6, x, y + 1);
-    } else if(dir == CanvasDirectionRightToLeft) {
-        canvas_draw_line(canvas, x + 6, y, x - 1, y);
-    } else if(dir == CanvasDirectionLeftToRight) {
-        canvas_draw_line(canvas, x - 6, y, x + 1, y);
-    }
-}
-
-static void bt_hid_keynote_draw_callback(Canvas* canvas, void* context) {
-    furi_assert(context);
-    BtHidKeynoteModel* model = context;
-
-    // Header
-    if(model->connected) {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
-    } else {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
-    }
-    canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Keynote");
-
-    canvas_draw_icon(canvas, 68, 2, &I_Pin_back_arrow_10x8);
-    canvas_set_font(canvas, FontSecondary);
-    elements_multiline_text_aligned(canvas, 127, 3, AlignRight, AlignTop, "Hold to exit");
-
-    // Up
-    canvas_draw_icon(canvas, 21, 24, &I_Button_18x18);
-    if(model->up_pressed) {
-        elements_slightly_rounded_box(canvas, 24, 26, 13, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    bt_hid_keynote_draw_arrow(canvas, 30, 30, CanvasDirectionBottomToTop);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Down
-    canvas_draw_icon(canvas, 21, 45, &I_Button_18x18);
-    if(model->down_pressed) {
-        elements_slightly_rounded_box(canvas, 24, 47, 13, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    bt_hid_keynote_draw_arrow(canvas, 30, 55, CanvasDirectionTopToBottom);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Left
-    canvas_draw_icon(canvas, 0, 45, &I_Button_18x18);
-    if(model->left_pressed) {
-        elements_slightly_rounded_box(canvas, 3, 47, 13, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    bt_hid_keynote_draw_arrow(canvas, 7, 53, CanvasDirectionRightToLeft);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Right
-    canvas_draw_icon(canvas, 42, 45, &I_Button_18x18);
-    if(model->right_pressed) {
-        elements_slightly_rounded_box(canvas, 45, 47, 13, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    bt_hid_keynote_draw_arrow(canvas, 53, 53, CanvasDirectionLeftToRight);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Ok
-    canvas_draw_icon(canvas, 63, 25, &I_Space_65x18);
-    if(model->ok_pressed) {
-        elements_slightly_rounded_box(canvas, 66, 27, 60, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 74, 29, &I_Ok_btn_9x9);
-    elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, "Space");
-    canvas_set_color(canvas, ColorBlack);
-
-    // Back
-    canvas_draw_icon(canvas, 63, 45, &I_Space_65x18);
-    if(model->back_pressed) {
-        elements_slightly_rounded_box(canvas, 66, 47, 60, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 74, 49, &I_Pin_back_arrow_10x8);
-    elements_multiline_text_aligned(canvas, 91, 57, AlignLeft, AlignBottom, "Back");
-}
-
-static void bt_hid_keynote_process(BtHidKeynote* bt_hid_keynote, InputEvent* event) {
-    with_view_model(
-        bt_hid_keynote->view, (BtHidKeynoteModel * model) {
-            if(event->type == InputTypePress) {
-                if(event->key == InputKeyUp) {
-                    model->up_pressed = true;
-                    furi_hal_bt_hid_kb_press(HID_KEYBOARD_UP_ARROW);
-                } else if(event->key == InputKeyDown) {
-                    model->down_pressed = true;
-                    furi_hal_bt_hid_kb_press(HID_KEYBOARD_DOWN_ARROW);
-                } else if(event->key == InputKeyLeft) {
-                    model->left_pressed = true;
-                    furi_hal_bt_hid_kb_press(HID_KEYBOARD_LEFT_ARROW);
-                } else if(event->key == InputKeyRight) {
-                    model->right_pressed = true;
-                    furi_hal_bt_hid_kb_press(HID_KEYBOARD_RIGHT_ARROW);
-                } else if(event->key == InputKeyOk) {
-                    model->ok_pressed = true;
-                    furi_hal_bt_hid_kb_press(HID_KEYBOARD_SPACEBAR);
-                } else if(event->key == InputKeyBack) {
-                    model->back_pressed = true;
-                }
-            } else if(event->type == InputTypeRelease) {
-                if(event->key == InputKeyUp) {
-                    model->up_pressed = false;
-                    furi_hal_bt_hid_kb_release(HID_KEYBOARD_UP_ARROW);
-                } else if(event->key == InputKeyDown) {
-                    model->down_pressed = false;
-                    furi_hal_bt_hid_kb_release(HID_KEYBOARD_DOWN_ARROW);
-                } else if(event->key == InputKeyLeft) {
-                    model->left_pressed = false;
-                    furi_hal_bt_hid_kb_release(HID_KEYBOARD_LEFT_ARROW);
-                } else if(event->key == InputKeyRight) {
-                    model->right_pressed = false;
-                    furi_hal_bt_hid_kb_release(HID_KEYBOARD_RIGHT_ARROW);
-                } else if(event->key == InputKeyOk) {
-                    model->ok_pressed = false;
-                    furi_hal_bt_hid_kb_release(HID_KEYBOARD_SPACEBAR);
-                } else if(event->key == InputKeyBack) {
-                    model->back_pressed = false;
-                }
-            } else if(event->type == InputTypeShort) {
-                if(event->key == InputKeyBack) {
-                    furi_hal_bt_hid_kb_press(HID_KEYBOARD_DELETE);
-                    furi_hal_bt_hid_kb_release(HID_KEYBOARD_DELETE);
-                    furi_hal_bt_hid_consumer_key_press(HID_CONSUMER_AC_BACK);
-                    furi_hal_bt_hid_consumer_key_release(HID_CONSUMER_AC_BACK);
-                }
-            }
-            return true;
-        });
-}
-
-static bool bt_hid_keynote_input_callback(InputEvent* event, void* context) {
-    furi_assert(context);
-    BtHidKeynote* bt_hid_keynote = context;
-    bool consumed = false;
-
-    if(event->type == InputTypeLong && event->key == InputKeyBack) {
-        furi_hal_bt_hid_kb_release_all();
-    } else {
-        bt_hid_keynote_process(bt_hid_keynote, event);
-        consumed = true;
-    }
-
-    return consumed;
-}
-
-BtHidKeynote* bt_hid_keynote_alloc() {
-    BtHidKeynote* bt_hid_keynote = malloc(sizeof(BtHidKeynote));
-    bt_hid_keynote->view = view_alloc();
-    view_set_context(bt_hid_keynote->view, bt_hid_keynote);
-    view_allocate_model(bt_hid_keynote->view, ViewModelTypeLocking, sizeof(BtHidKeynoteModel));
-    view_set_draw_callback(bt_hid_keynote->view, bt_hid_keynote_draw_callback);
-    view_set_input_callback(bt_hid_keynote->view, bt_hid_keynote_input_callback);
-
-    return bt_hid_keynote;
-}
-
-void bt_hid_keynote_free(BtHidKeynote* bt_hid_keynote) {
-    furi_assert(bt_hid_keynote);
-    view_free(bt_hid_keynote->view);
-    free(bt_hid_keynote);
-}
-
-View* bt_hid_keynote_get_view(BtHidKeynote* bt_hid_keynote) {
-    furi_assert(bt_hid_keynote);
-    return bt_hid_keynote->view;
-}
-
-void bt_hid_keynote_set_connected_status(BtHidKeynote* bt_hid_keynote, bool connected) {
-    furi_assert(bt_hid_keynote);
-    with_view_model(
-        bt_hid_keynote->view, (BtHidKeynoteModel * model) {
-            model->connected = connected;
-            return true;
-        });
-}
--- a/applications/bt/bt_hid_app/views/bt_hid_keynote.h
+++ b/applications/bt/bt_hid_app/views/bt_hid_keynote.h
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-
-typedef struct BtHidKeynote BtHidKeynote;
-
-BtHidKeynote* bt_hid_keynote_alloc();
-
-void bt_hid_keynote_free(BtHidKeynote* bt_hid_keynote);
-
-View* bt_hid_keynote_get_view(BtHidKeynote* bt_hid_keynote);
-
-void bt_hid_keynote_set_connected_status(BtHidKeynote* bt_hid_keynote, bool connected);
--- a/applications/bt/bt_hid_app/views/bt_hid_media.c
+++ b/applications/bt/bt_hid_app/views/bt_hid_media.c
@@ -1,203 +0,0 @@
-#include "bt_hid_media.h"
-#include <furi.h>
-#include <furi_hal_bt_hid.h>
-#include <furi_hal_usb_hid.h>
-#include <gui/elements.h>
-
-struct BtHidMedia {
-    View* view;
-};
-
-typedef struct {
-    bool left_pressed;
-    bool up_pressed;
-    bool right_pressed;
-    bool down_pressed;
-    bool ok_pressed;
-    bool connected;
-} BtHidMediaModel;
-
-static void bt_hid_media_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) {
-    canvas_draw_triangle(canvas, x, y, 5, 3, dir);
-    if(dir == CanvasDirectionBottomToTop) {
-        canvas_draw_dot(canvas, x, y - 1);
-    } else if(dir == CanvasDirectionTopToBottom) {
-        canvas_draw_dot(canvas, x, y + 1);
-    } else if(dir == CanvasDirectionRightToLeft) {
-        canvas_draw_dot(canvas, x - 1, y);
-    } else if(dir == CanvasDirectionLeftToRight) {
-        canvas_draw_dot(canvas, x + 1, y);
-    }
-}
-
-static void bt_hid_media_draw_callback(Canvas* canvas, void* context) {
-    furi_assert(context);
-    BtHidMediaModel* model = context;
-
-    // Header
-    if(model->connected) {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
-    } else {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
-    }
-    canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Media");
-    canvas_set_font(canvas, FontSecondary);
-
-    // Keypad circles
-    canvas_draw_icon(canvas, 76, 8, &I_Circles_47x47);
-
-    // Up
-    if(model->up_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 93, 9, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 96, 12, &I_Volup_8x6);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Down
-    if(model->down_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 93, 41, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 96, 45, &I_Voldwn_6x6);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Left
-    if(model->left_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 77, 25, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    bt_hid_media_draw_arrow(canvas, 82, 31, CanvasDirectionRightToLeft);
-    bt_hid_media_draw_arrow(canvas, 86, 31, CanvasDirectionRightToLeft);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Right
-    if(model->right_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 109, 25, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    bt_hid_media_draw_arrow(canvas, 112, 31, CanvasDirectionLeftToRight);
-    bt_hid_media_draw_arrow(canvas, 116, 31, CanvasDirectionLeftToRight);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Ok
-    if(model->ok_pressed) {
-        canvas_draw_icon(canvas, 93, 25, &I_Pressed_Button_13x13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    bt_hid_media_draw_arrow(canvas, 96, 31, CanvasDirectionLeftToRight);
-    canvas_draw_line(canvas, 100, 29, 100, 33);
-    canvas_draw_line(canvas, 102, 29, 102, 33);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Exit
-    canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
-    canvas_set_font(canvas, FontSecondary);
-    elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Hold to exit");
-}
-
-static void bt_hid_media_process_press(BtHidMedia* bt_hid_media, InputEvent* event) {
-    with_view_model(
-        bt_hid_media->view, (BtHidMediaModel * model) {
-            if(event->key == InputKeyUp) {
-                model->up_pressed = true;
-                furi_hal_bt_hid_consumer_key_press(HID_CONSUMER_VOLUME_INCREMENT);
-            } else if(event->key == InputKeyDown) {
-                model->down_pressed = true;
-                furi_hal_bt_hid_consumer_key_press(HID_CONSUMER_VOLUME_DECREMENT);
-            } else if(event->key == InputKeyLeft) {
-                model->left_pressed = true;
-                furi_hal_bt_hid_consumer_key_press(HID_CONSUMER_SCAN_PREVIOUS_TRACK);
-            } else if(event->key == InputKeyRight) {
-                model->right_pressed = true;
-                furi_hal_bt_hid_consumer_key_press(HID_CONSUMER_SCAN_NEXT_TRACK);
-            } else if(event->key == InputKeyOk) {
-                model->ok_pressed = true;
-                furi_hal_bt_hid_consumer_key_press(HID_CONSUMER_PLAY_PAUSE);
-            }
-            return true;
-        });
-}
-
-static void bt_hid_media_process_release(BtHidMedia* bt_hid_media, InputEvent* event) {
-    with_view_model(
-        bt_hid_media->view, (BtHidMediaModel * model) {
-            if(event->key == InputKeyUp) {
-                model->up_pressed = false;
-                furi_hal_bt_hid_consumer_key_release(HID_CONSUMER_VOLUME_INCREMENT);
-            } else if(event->key == InputKeyDown) {
-                model->down_pressed = false;
-                furi_hal_bt_hid_consumer_key_release(HID_CONSUMER_VOLUME_DECREMENT);
-            } else if(event->key == InputKeyLeft) {
-                model->left_pressed = false;
-                furi_hal_bt_hid_consumer_key_release(HID_CONSUMER_SCAN_PREVIOUS_TRACK);
-            } else if(event->key == InputKeyRight) {
-                model->right_pressed = false;
-                furi_hal_bt_hid_consumer_key_release(HID_CONSUMER_SCAN_NEXT_TRACK);
-            } else if(event->key == InputKeyOk) {
-                model->ok_pressed = false;
-                furi_hal_bt_hid_consumer_key_release(HID_CONSUMER_PLAY_PAUSE);
-            }
-            return true;
-        });
-}
-
-static bool bt_hid_media_input_callback(InputEvent* event, void* context) {
-    furi_assert(context);
-    BtHidMedia* bt_hid_media = context;
-    bool consumed = false;
-
-    if(event->type == InputTypePress) {
-        bt_hid_media_process_press(bt_hid_media, event);
-        consumed = true;
-    } else if(event->type == InputTypeRelease) {
-        bt_hid_media_process_release(bt_hid_media, event);
-        consumed = true;
-    } else if(event->type == InputTypeShort) {
-        if(event->key == InputKeyBack) {
-            furi_hal_bt_hid_consumer_key_release_all();
-        }
-    }
-
-    return consumed;
-}
-
-BtHidMedia* bt_hid_media_alloc() {
-    BtHidMedia* bt_hid_media = malloc(sizeof(BtHidMedia));
-    bt_hid_media->view = view_alloc();
-    view_set_context(bt_hid_media->view, bt_hid_media);
-    view_allocate_model(bt_hid_media->view, ViewModelTypeLocking, sizeof(BtHidMediaModel));
-    view_set_draw_callback(bt_hid_media->view, bt_hid_media_draw_callback);
-    view_set_input_callback(bt_hid_media->view, bt_hid_media_input_callback);
-
-    return bt_hid_media;
-}
-
-void bt_hid_media_free(BtHidMedia* bt_hid_media) {
-    furi_assert(bt_hid_media);
-    view_free(bt_hid_media->view);
-    free(bt_hid_media);
-}
-
-View* bt_hid_media_get_view(BtHidMedia* bt_hid_media) {
-    furi_assert(bt_hid_media);
-    return bt_hid_media->view;
-}
-
-void bt_hid_media_set_connected_status(BtHidMedia* bt_hid_media, bool connected) {
-    furi_assert(bt_hid_media);
-    with_view_model(
-        bt_hid_media->view, (BtHidMediaModel * model) {
-            model->connected = connected;
-            return true;
-        });
-}
--- a/applications/bt/bt_hid_app/views/bt_hid_media.h
+++ b/applications/bt/bt_hid_app/views/bt_hid_media.h
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-
-typedef struct BtHidMedia BtHidMedia;
-
-BtHidMedia* bt_hid_media_alloc();
-
-void bt_hid_media_free(BtHidMedia* bt_hid_media);
-
-View* bt_hid_media_get_view(BtHidMedia* bt_hid_media);
-
-void bt_hid_media_set_connected_status(BtHidMedia* bt_hid_media, bool connected);
--- a/applications/bt/bt_hid_app/views/bt_hid_mouse.c
+++ b/applications/bt/bt_hid_app/views/bt_hid_mouse.c
@@ -1,218 +0,0 @@
-#include "bt_hid_mouse.h"
-#include <furi.h>
-#include <furi_hal_bt_hid.h>
-#include <furi_hal_usb_hid.h>
-#include <gui/elements.h>
-
-struct BtHidMouse {
-    View* view;
-};
-#define MOUSE_MOVE_SHORT 5
-#define MOUSE_MOVE_LONG 20
-
-typedef struct {
-    bool left_pressed;
-    bool up_pressed;
-    bool right_pressed;
-    bool down_pressed;
-    bool left_mouse_pressed;
-    bool left_mouse_held;
-    bool right_mouse_pressed;
-    bool connected;
-} BtHidMouseModel;
-
-static void bt_hid_mouse_draw_callback(Canvas* canvas, void* context) {
-    furi_assert(context);
-    BtHidMouseModel* model = context;
-
-    // Header
-    if(model->connected) {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
-    } else {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
-    }
-    canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Mouse");
-    canvas_set_font(canvas, FontSecondary);
-
-    if(model->left_mouse_held == true) {
-        elements_multiline_text_aligned(canvas, 0, 62, AlignLeft, AlignBottom, "Selecting...");
-    } else {
-        canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
-        canvas_set_font(canvas, FontSecondary);
-        elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Hold to exit");
-    }
-
-    // Keypad circles
-    canvas_draw_icon(canvas, 64, 8, &I_Circles_47x47);
-
-    // Up
-    if(model->up_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 81, 9, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 84, 10, &I_Pin_arrow_up7x9);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Down
-    if(model->down_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 81, 41, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 84, 43, &I_Pin_arrow_down_7x9);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Left
-    if(model->left_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 65, 25, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 67, 28, &I_Pin_arrow_left_9x7);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Right
-    if(model->right_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 97, 25, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 99, 28, &I_Pin_arrow_right_9x7);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Ok
-    if(model->left_mouse_pressed) {
-        canvas_draw_icon(canvas, 81, 25, &I_Ok_btn_pressed_13x13);
-    } else {
-        canvas_draw_icon(canvas, 83, 27, &I_Left_mouse_icon_9x9);
-    }
-
-    // Back
-    if(model->right_mouse_pressed) {
-        canvas_draw_icon(canvas, 108, 48, &I_Ok_btn_pressed_13x13);
-    } else {
-        canvas_draw_icon(canvas, 110, 50, &I_Right_mouse_icon_9x9);
-    }
-}
-
-static void bt_hid_mouse_process(BtHidMouse* bt_hid_mouse, InputEvent* event) {
-    with_view_model(
-        bt_hid_mouse->view, (BtHidMouseModel * model) {
-            if(event->key == InputKeyBack) {
-                if(event->type == InputTypeShort) {
-                    furi_hal_bt_hid_mouse_press(HID_MOUSE_BTN_RIGHT);
-                    furi_hal_bt_hid_mouse_release(HID_MOUSE_BTN_RIGHT);
-                } else if(event->type == InputTypePress) {
-                    model->right_mouse_pressed = true;
-                } else if(event->type == InputTypeRelease) {
-                    model->right_mouse_pressed = false;
-                }
-            } else if(event->key == InputKeyOk) {
-                if(event->type == InputTypeShort) {
-                    // Just release if it was being held before
-                    if(!model->left_mouse_held) furi_hal_bt_hid_mouse_press(HID_MOUSE_BTN_LEFT);
-                    furi_hal_bt_hid_mouse_release(HID_MOUSE_BTN_LEFT);
-                    model->left_mouse_held = false;
-                } else if(event->type == InputTypeLong) {
-                    furi_hal_bt_hid_mouse_press(HID_MOUSE_BTN_LEFT);
-                    model->left_mouse_held = true;
-                    model->left_mouse_pressed = true;
-                } else if(event->type == InputTypePress) {
-                    model->left_mouse_pressed = true;
-                } else if(event->type == InputTypeRelease) {
-                    // Only release if it wasn't a long press
-                    if(!model->left_mouse_held) model->left_mouse_pressed = false;
-                }
-
-            } else if(event->key == InputKeyRight) {
-                if(event->type == InputTypePress) {
-                    model->right_pressed = true;
-                    furi_hal_bt_hid_mouse_move(MOUSE_MOVE_SHORT, 0);
-                } else if(event->type == InputTypeRepeat) {
-                    furi_hal_bt_hid_mouse_move(MOUSE_MOVE_LONG, 0);
-                } else if(event->type == InputTypeRelease) {
-                    model->right_pressed = false;
-                }
-            } else if(event->key == InputKeyLeft) {
-                if(event->type == InputTypePress) {
-                    model->left_pressed = true;
-                    furi_hal_bt_hid_mouse_move(-MOUSE_MOVE_SHORT, 0);
-                } else if(event->type == InputTypeRepeat) {
-                    furi_hal_bt_hid_mouse_move(-MOUSE_MOVE_LONG, 0);
-                } else if(event->type == InputTypeRelease) {
-                    model->left_pressed = false;
-                }
-            } else if(event->key == InputKeyDown) {
-                if(event->type == InputTypePress) {
-                    model->down_pressed = true;
-                    furi_hal_bt_hid_mouse_move(0, MOUSE_MOVE_SHORT);
-                } else if(event->type == InputTypeRepeat) {
-                    furi_hal_bt_hid_mouse_move(0, MOUSE_MOVE_LONG);
-                } else if(event->type == InputTypeRelease) {
-                    model->down_pressed = false;
-                }
-            } else if(event->key == InputKeyUp) {
-                if(event->type == InputTypePress) {
-                    model->up_pressed = true;
-                    furi_hal_bt_hid_mouse_move(0, -MOUSE_MOVE_SHORT);
-                } else if(event->type == InputTypeRepeat) {
-                    furi_hal_bt_hid_mouse_move(0, -MOUSE_MOVE_LONG);
-                } else if(event->type == InputTypeRelease) {
-                    model->up_pressed = false;
-                }
-            }
-            return true;
-        });
-}
-
-static bool bt_hid_mouse_input_callback(InputEvent* event, void* context) {
-    furi_assert(context);
-    BtHidMouse* bt_hid_mouse = context;
-    bool consumed = false;
-
-    if(event->type == InputTypeLong && event->key == InputKeyBack) {
-        furi_hal_bt_hid_mouse_release_all();
-    } else {
-        bt_hid_mouse_process(bt_hid_mouse, event);
-        consumed = true;
-    }
-
-    return consumed;
-}
-
-BtHidMouse* bt_hid_mouse_alloc() {
-    BtHidMouse* bt_hid_mouse = malloc(sizeof(BtHidMouse));
-    bt_hid_mouse->view = view_alloc();
-    view_set_context(bt_hid_mouse->view, bt_hid_mouse);
-    view_allocate_model(bt_hid_mouse->view, ViewModelTypeLocking, sizeof(BtHidMouseModel));
-    view_set_draw_callback(bt_hid_mouse->view, bt_hid_mouse_draw_callback);
-    view_set_input_callback(bt_hid_mouse->view, bt_hid_mouse_input_callback);
-
-    return bt_hid_mouse;
-}
-
-void bt_hid_mouse_free(BtHidMouse* bt_hid_mouse) {
-    furi_assert(bt_hid_mouse);
-    view_free(bt_hid_mouse->view);
-    free(bt_hid_mouse);
-}
-
-View* bt_hid_mouse_get_view(BtHidMouse* bt_hid_mouse) {
-    furi_assert(bt_hid_mouse);
-    return bt_hid_mouse->view;
-}
-
-void bt_hid_mouse_set_connected_status(BtHidMouse* bt_hid_mouse, bool connected) {
-    furi_assert(bt_hid_mouse);
-    with_view_model(
-        bt_hid_mouse->view, (BtHidMouseModel * model) {
-            model->connected = connected;
-            return true;
-        });
-}
--- a/applications/bt/bt_hid_app/views/bt_hid_mouse.h
+++ b/applications/bt/bt_hid_app/views/bt_hid_mouse.h
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-
-typedef struct BtHidMouse BtHidMouse;
-
-BtHidMouse* bt_hid_mouse_alloc();
-
-void bt_hid_mouse_free(BtHidMouse* bt_hid_mouse);
-
-View* bt_hid_mouse_get_view(BtHidMouse* bt_hid_mouse);
-
-void bt_hid_mouse_set_connected_status(BtHidMouse* bt_hid_mouse, bool connected);
--- a/applications/bt/bt_service/bt.h
+++ b/applications/bt/bt_service/bt.h
@@ -1,61 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define RECORD_BT "bt"
-
-typedef struct Bt Bt;
-
-typedef enum {
-    BtStatusUnavailable,
-    BtStatusOff,
-    BtStatusAdvertising,
-    BtStatusConnected,
-} BtStatus;
-
-typedef enum {
-    BtProfileSerial,
-    BtProfileHidKeyboard,
-} BtProfile;
-
-typedef void (*BtStatusChangedCallback)(BtStatus status, void* context);
-
-/** Change BLE Profile
- * @note Call of this function leads to 2nd core restart
- *
- * @param bt        Bt instance
- * @param profile   BtProfile
- *
- * @return          true on success
- */
-bool bt_set_profile(Bt* bt, BtProfile profile);
-
-/** Disconnect from Central
- *
- * @param bt        Bt instance
- */
-void bt_disconnect(Bt* bt);
-
-/** Set callback for Bluetooth status change notification
- *
- * @param bt        Bt instance
- * @param callback  BtStatusChangedCallback instance
- * @param context   pointer to context
- */
-void bt_set_status_changed_callback(Bt* bt, BtStatusChangedCallback callback, void* context);
-
-/** Forget bonded devices
- * @note Leads to wipe ble key storage and deleting bt.keys
- *
- * @param bt        Bt instance
- */
-void bt_forget_bonded_devices(Bt* bt);
-
-#ifdef __cplusplus
-}
-#endif
--- a/applications/bt/bt_service/bt_api.c
+++ b/applications/bt/bt_service/bt_api.c
@@ -1,41 +0,0 @@
-#include "bt_i.h"
-
-bool bt_set_profile(Bt* bt, BtProfile profile) {
-    furi_assert(bt);
-
-    // Send message
-    bool result = false;
-    BtMessage message = {
-        .type = BtMessageTypeSetProfile, .data.profile = profile, .result = &result};
-    furi_check(
-        furi_message_queue_put(bt->message_queue, &message, FuriWaitForever) == FuriStatusOk);
-    // Wait for unlock
-    furi_event_flag_wait(bt->api_event, BT_API_UNLOCK_EVENT, FuriFlagWaitAny, FuriWaitForever);
-
-    return result;
-}
-
-void bt_disconnect(Bt* bt) {
-    furi_assert(bt);
-
-    // Send message
-    BtMessage message = {.type = BtMessageTypeDisconnect};
-    furi_check(
-        furi_message_queue_put(bt->message_queue, &message, FuriWaitForever) == FuriStatusOk);
-    // Wait for unlock
-    furi_event_flag_wait(bt->api_event, BT_API_UNLOCK_EVENT, FuriFlagWaitAny, FuriWaitForever);
-}
-
-void bt_set_status_changed_callback(Bt* bt, BtStatusChangedCallback callback, void* context) {
-    furi_assert(bt);
-
-    bt->status_changed_cb = callback;
-    bt->status_changed_ctx = context;
-}
-
-void bt_forget_bonded_devices(Bt* bt) {
-    furi_assert(bt);
-    BtMessage message = {.type = BtMessageTypeForgetBondedDevices};
-    furi_check(
-        furi_message_queue_put(bt->message_queue, &message, FuriWaitForever) == FuriStatusOk);
-}
--- a/applications/bt/bt_service/bt_i.h
+++ b/applications/bt/bt_service/bt_i.h
@@ -1,66 +0,0 @@
-#pragma once
-
-#include "bt.h"
-
-#include <furi.h>
-#include <furi_hal.h>
-
-#include <gui/gui.h>
-#include <gui/view_port.h>
-#include <gui/view.h>
-
-#include <dialogs/dialogs.h>
-#include <power/power_service/power.h>
-#include <applications/rpc/rpc.h>
-#include <applications/notification/notification.h>
-
-#include "../bt_settings.h"
-
-#define BT_API_UNLOCK_EVENT (1UL << 0)
-
-typedef enum {
-    BtMessageTypeUpdateStatus,
-    BtMessageTypeUpdateBatteryLevel,
-    BtMessageTypeUpdatePowerState,
-    BtMessageTypePinCodeShow,
-    BtMessageTypeKeysStorageUpdated,
-    BtMessageTypeSetProfile,
-    BtMessageTypeDisconnect,
-    BtMessageTypeForgetBondedDevices,
-} BtMessageType;
-
-typedef union {
-    uint32_t pin_code;
-    uint8_t battery_level;
-    BtProfile profile;
-} BtMessageData;
-
-typedef struct {
-    BtMessageType type;
-    BtMessageData data;
-    bool* result;
-} BtMessage;
-
-struct Bt {
-    uint8_t* bt_keys_addr_start;
-    uint16_t bt_keys_size;
-    uint16_t max_packet_size;
-    BtSettings bt_settings;
-    BtStatus status;
-    BtProfile profile;
-    FuriMessageQueue* message_queue;
-    NotificationApp* notification;
-    Gui* gui;
-    ViewPort* statusbar_view_port;
-    ViewPort* pin_code_view_port;
-    uint32_t pin_code;
-    DialogsApp* dialogs;
-    DialogMessage* dialog_message;
-    Power* power;
-    Rpc* rpc;
-    RpcSession* rpc_session;
-    FuriEventFlag* rpc_event;
-    FuriEventFlag* api_event;
-    BtStatusChangedCallback status_changed_cb;
-    void* status_changed_ctx;
-};
--- a/applications/bt/bt_service/bt_keys_storage.c
+++ b/applications/bt/bt_service/bt_keys_storage.c
@@ -1,57 +0,0 @@
-#include "bt_keys_storage.h"
-
-#include <furi.h>
-#include <lib/toolbox/saved_struct.h>
-#include <storage/storage.h>
-
-#define BT_KEYS_STORAGE_PATH INT_PATH(BT_KEYS_STORAGE_FILE_NAME)
-#define BT_KEYS_STORAGE_VERSION (0)
-#define BT_KEYS_STORAGE_MAGIC (0x18)
-
-bool bt_keys_storage_load(Bt* bt) {
-    furi_assert(bt);
-    bool file_loaded = false;
-
-    furi_hal_bt_get_key_storage_buff(&bt->bt_keys_addr_start, &bt->bt_keys_size);
-    furi_hal_bt_nvm_sram_sem_acquire();
-    file_loaded = saved_struct_load(
-        BT_KEYS_STORAGE_PATH,
-        bt->bt_keys_addr_start,
-        bt->bt_keys_size,
-        BT_KEYS_STORAGE_MAGIC,
-        BT_KEYS_STORAGE_VERSION);
-    furi_hal_bt_nvm_sram_sem_release();
-
-    return file_loaded;
-}
-
-bool bt_keys_storage_save(Bt* bt) {
-    furi_assert(bt);
-    furi_assert(bt->bt_keys_addr_start);
-    bool file_saved = false;
-
-    furi_hal_bt_nvm_sram_sem_acquire();
-    file_saved = saved_struct_save(
-        BT_KEYS_STORAGE_PATH,
-        bt->bt_keys_addr_start,
-        bt->bt_keys_size,
-        BT_KEYS_STORAGE_MAGIC,
-        BT_KEYS_STORAGE_VERSION);
-    furi_hal_bt_nvm_sram_sem_release();
-
-    return file_saved;
-}
-
-bool bt_keys_storage_delete(Bt* bt) {
-    furi_assert(bt);
-    bool delete_succeed = false;
-    bool bt_is_active = furi_hal_bt_is_active();
-
-    furi_hal_bt_stop_advertising();
-    delete_succeed = furi_hal_bt_clear_white_list();
-    if(bt_is_active) {
-        furi_hal_bt_start_advertising();
-    }
-
-    return delete_succeed;
-}
--- a/applications/bt/bt_service/bt_keys_storage.h
+++ b/applications/bt/bt_service/bt_keys_storage.h
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "bt_i.h"
-#include "bt_keys_filename.h"
-
-bool bt_keys_storage_load(Bt* bt);
-
-bool bt_keys_storage_save(Bt* bt);
-
-bool bt_keys_storage_delete(Bt* bt);
--- a/applications/cli/application.fam
+++ b/applications/cli/application.fam
@@ -1,9 +0,0 @@
-App(
-    appid="cli",
-    name="CliSrv",
-    apptype=FlipperAppType.SERVICE,
-    entry_point="cli_srv",
-    cdefines=["SRV_CLI"],
-    stack_size=4 * 1024,
-    order=30,
-)
--- a/applications/cli/cli_command_gpio.c
+++ b/applications/cli/cli_command_gpio.c
@@ -1,228 +0,0 @@
-#include "cli_command_gpio.h"
-
-#include <furi.h>
-#include <furi_hal.h>
-#include <lib/toolbox/args.h>
-
-typedef struct {
-    const GpioPin* pin;
-    const char* name;
-    const bool debug;
-} CliCommandGpio;
-
-const CliCommandGpio cli_command_gpio_pins[] = {
-    {.pin = &gpio_ext_pc0, .name = "PC0", .debug = false},
-    {.pin = &gpio_ext_pc1, .name = "PC1", .debug = false},
-    {.pin = &gpio_ext_pc3, .name = "PC3", .debug = false},
-    {.pin = &gpio_ext_pb2, .name = "PB2", .debug = false},
-    {.pin = &gpio_ext_pb3, .name = "PB3", .debug = false},
-    {.pin = &gpio_ext_pa4, .name = "PA4", .debug = false},
-    {.pin = &gpio_ext_pa6, .name = "PA6", .debug = false},
-    {.pin = &gpio_ext_pa7, .name = "PA7", .debug = false},
-    /* Dangerous pins, may damage hardware */
-    {.pin = &gpio_infrared_rx, .name = "PA0", .debug = true},
-    {.pin = &gpio_usart_rx, .name = "PB7", .debug = true},
-    {.pin = &gpio_speaker, .name = "PB8", .debug = true},
-    {.pin = &gpio_infrared_tx, .name = "PB9", .debug = true},
-};
-
-void cli_command_gpio_print_usage() {
-    printf("Usage:\r\n");
-    printf("gpio <cmd> <args>\r\n");
-    printf("Cmd list:\r\n");
-    printf("\tmode <pin_name> <0|1>\t - Set gpio mode: 0 - input, 1 - output\r\n");
-    printf("\tset <pin_name> <0|1>\t - Set gpio value\r\n");
-    printf("\tread <pin_name>\t - Read gpio value\r\n");
-}
-
-static bool pin_name_to_int(string_t pin_name, size_t* result) {
-    bool found = false;
-    bool debug = furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug);
-    for(size_t i = 0; i < COUNT_OF(cli_command_gpio_pins); i++) {
-        if(!string_cmp(pin_name, cli_command_gpio_pins[i].name)) {
-            if(!cli_command_gpio_pins[i].debug || (cli_command_gpio_pins[i].debug && debug)) {
-                *result = i;
-                found = true;
-                break;
-            }
-        }
-    }
-
-    return found;
-}
-
-static void gpio_print_pins(void) {
-    printf("Wrong pin name. Available pins: ");
-    bool debug = furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug);
-    for(size_t i = 0; i < COUNT_OF(cli_command_gpio_pins); i++) {
-        if(!cli_command_gpio_pins[i].debug || (cli_command_gpio_pins[i].debug && debug)) {
-            printf("%s ", cli_command_gpio_pins[i].name);
-        }
-    }
-}
-
-typedef enum { OK, ERR_CMD_SYNTAX, ERR_PIN, ERR_VALUE } GpioParseError;
-
-static GpioParseError gpio_command_parse(string_t args, size_t* pin_num, uint8_t* value) {
-    string_t pin_name;
-    string_init(pin_name);
-
-    size_t ws = string_search_char(args, ' ');
-    if(ws == STRING_FAILURE) {
-        return ERR_CMD_SYNTAX;
-    }
-
-    string_set_n(pin_name, args, 0, ws);
-    string_right(args, ws);
-    string_strim(args);
-
-    if(!pin_name_to_int(pin_name, pin_num)) {
-        string_clear(pin_name);
-        return ERR_PIN;
-    }
-
-    string_clear(pin_name);
-
-    if(!string_cmp(args, "0")) {
-        *value = 0;
-    } else if(!string_cmp(args, "1")) {
-        *value = 1;
-    } else {
-        return ERR_VALUE;
-    }
-
-    return OK;
-}
-
-void cli_command_gpio_mode(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(context);
-
-    size_t num = 0;
-    uint8_t value = 255;
-
-    GpioParseError err = gpio_command_parse(args, &num, &value);
-
-    if(ERR_CMD_SYNTAX == err) {
-        cli_print_usage("gpio mode", "<pin_name> <0|1>", string_get_cstr(args));
-        return;
-    } else if(ERR_PIN == err) {
-        gpio_print_pins();
-        return;
-    } else if(ERR_VALUE == err) {
-        printf("Value is invalid. Enter 1 for input or 0 for output");
-        return;
-    }
-
-    if(cli_command_gpio_pins[num].debug) {
-        printf(
-            "Changeing this pin mode may damage hardware. Are you sure you want to continue? (y/n)?\r\n");
-        char c = cli_getc(cli);
-        if(c != 'y' && c != 'Y') {
-            printf("Cancelled.\r\n");
-            return;
-        }
-    }
-
-    if(value == 1) { // output
-        furi_hal_gpio_write(cli_command_gpio_pins[num].pin, false);
-        furi_hal_gpio_init_simple(cli_command_gpio_pins[num].pin, GpioModeOutputPushPull);
-        printf("Pin %s is now an output (low)", cli_command_gpio_pins[num].name);
-    } else { // input
-        furi_hal_gpio_init_simple(cli_command_gpio_pins[num].pin, GpioModeInput);
-        printf("Pin %s is now an input", cli_command_gpio_pins[num].name);
-    }
-}
-
-void cli_command_gpio_read(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(context);
-
-    size_t num = 0;
-    if(!pin_name_to_int(args, &num)) {
-        gpio_print_pins();
-        return;
-    }
-
-    if(LL_GPIO_MODE_INPUT !=
-       LL_GPIO_GetPinMode(
-           cli_command_gpio_pins[num].pin->port, cli_command_gpio_pins[num].pin->pin)) {
-        printf("Err: pin %s is not set as an input.", cli_command_gpio_pins[num].name);
-        return;
-    }
-
-    uint8_t val = !!furi_hal_gpio_read(cli_command_gpio_pins[num].pin);
-
-    printf("Pin %s <= %u", cli_command_gpio_pins[num].name, val);
-}
-
-void cli_command_gpio_set(Cli* cli, string_t args, void* context) {
-    UNUSED(context);
-
-    size_t num = 0;
-    uint8_t value = 0;
-    GpioParseError err = gpio_command_parse(args, &num, &value);
-
-    if(ERR_CMD_SYNTAX == err) {
-        cli_print_usage("gpio set", "<pin_name> <0|1>", string_get_cstr(args));
-        return;
-    } else if(ERR_PIN == err) {
-        gpio_print_pins();
-        return;
-    } else if(ERR_VALUE == err) {
-        printf("Value is invalid. Enter 1 for high or 0 for low");
-        return;
-    }
-
-    if(LL_GPIO_MODE_OUTPUT !=
-       LL_GPIO_GetPinMode(
-           cli_command_gpio_pins[num].pin->port, cli_command_gpio_pins[num].pin->pin)) {
-        printf("Err: pin %s is not set as an output.", cli_command_gpio_pins[num].name);
-        return;
-    }
-
-    // Extra check if debug pins used
-    if(cli_command_gpio_pins[num].debug) {
-        printf(
-            "Setting this pin may damage hardware. Are you sure you want to continue? (y/n)?\r\n");
-        char c = cli_getc(cli);
-        if(c != 'y' && c != 'Y') {
-            printf("Cancelled.\r\n");
-            return;
-        }
-    }
-
-    furi_hal_gpio_write(cli_command_gpio_pins[num].pin, !!value);
-    printf("Pin %s => %u", cli_command_gpio_pins[num].name, !!value);
-}
-
-void cli_command_gpio(Cli* cli, string_t args, void* context) {
-    string_t cmd;
-    string_init(cmd);
-
-    do {
-        if(!args_read_string_and_trim(args, cmd)) {
-            cli_command_gpio_print_usage();
-            break;
-        }
-
-        if(string_cmp_str(cmd, "mode") == 0) {
-            cli_command_gpio_mode(cli, args, context);
-            break;
-        }
-
-        if(string_cmp_str(cmd, "set") == 0) {
-            cli_command_gpio_set(cli, args, context);
-            break;
-        }
-
-        if(string_cmp_str(cmd, "read") == 0) {
-            cli_command_gpio_read(cli, args, context);
-            break;
-        }
-
-        cli_command_gpio_print_usage();
-    } while(false);
-
-    string_clear(cmd);
-}
--- a/applications/cli/cli_command_gpio.h
+++ b/applications/cli/cli_command_gpio.h
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "cli_i.h"
-
-void cli_command_gpio(Cli* cli, string_t args, void* context);
--- a/applications/cli/cli_commands.c
+++ b/applications/cli/cli_commands.c
@@ -1,338 +0,0 @@
-#include "cli_commands.h"
-#include "cli_command_gpio.h"
-
-#include <furi_hal.h>
-#include <furi_hal_info.h>
-#include <task_control_block.h>
-#include <time.h>
-#include <notification/notification_messages.h>
-#include <loader/loader.h>
-#include <stream_buffer.h>
-
-// Close to ISO, `date +'%Y-%m-%d %H:%M:%S %u'`
-#define CLI_DATE_FORMAT "%.4d-%.2d-%.2d %.2d:%.2d:%.2d %d"
-
-void cli_command_device_info_callback(const char* key, const char* value, bool last, void* context) {
-    UNUSED(context);
-    UNUSED(last);
-    printf("%-30s: %s\r\n", key, value);
-}
-
-/* 
- * Device Info Command
- * This command is intended to be used by humans
- */
-void cli_command_device_info(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(args);
-    furi_hal_info_get(cli_command_device_info_callback, context);
-}
-
-void cli_command_help(Cli* cli, string_t args, void* context) {
-    UNUSED(args);
-    UNUSED(context);
-    printf("Commands we have:");
-
-    // Command count
-    const size_t commands_count = CliCommandTree_size(cli->commands);
-    const size_t commands_count_mid = commands_count / 2 + commands_count % 2;
-
-    // Use 2 iterators from start and middle to show 2 columns
-    CliCommandTree_it_t it_left;
-    CliCommandTree_it(it_left, cli->commands);
-    CliCommandTree_it_t it_right;
-    CliCommandTree_it(it_right, cli->commands);
-    for(size_t i = 0; i < commands_count_mid; i++) CliCommandTree_next(it_right);
-
-    // Iterate throw tree
-    for(size_t i = 0; i < commands_count_mid; i++) {
-        printf("\r\n");
-        // Left Column
-        if(!CliCommandTree_end_p(it_left)) {
-            printf("%-30s", string_get_cstr(*CliCommandTree_ref(it_left)->key_ptr));
-            CliCommandTree_next(it_left);
-        }
-        // Right Column
-        if(!CliCommandTree_end_p(it_right)) {
-            printf("%s", string_get_cstr(*CliCommandTree_ref(it_right)->key_ptr));
-            CliCommandTree_next(it_right);
-        }
-    };
-
-    if(string_size(args) > 0) {
-        cli_nl();
-        printf("Also I have no clue what '");
-        printf("%s", string_get_cstr(args));
-        printf("' is.");
-    }
-}
-
-void cli_command_date(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(context);
-
-    FuriHalRtcDateTime datetime = {0};
-
-    if(string_size(args) > 0) {
-        uint16_t hours, minutes, seconds, month, day, year, weekday;
-        int ret = sscanf(
-            string_get_cstr(args),
-            "%hu-%hu-%hu %hu:%hu:%hu %hu",
-            &year,
-            &month,
-            &day,
-            &hours,
-            &minutes,
-            &seconds,
-            &weekday);
-
-        // Some variables are going to discard upper byte
-        // There will be some funky behaviour which is not breaking anything
-        datetime.hour = hours;
-        datetime.minute = minutes;
-        datetime.second = seconds;
-        datetime.weekday = weekday;
-        datetime.month = month;
-        datetime.day = day;
-        datetime.year = year;
-
-        if(ret != 7) {
-            printf(
-                "Invalid datetime format, use `%s`. sscanf %d %s",
-                "%Y-%m-%d %H:%M:%S %u",
-                ret,
-                string_get_cstr(args));
-            return;
-        }
-
-        if(!furi_hal_rtc_validate_datetime(&datetime)) {
-            printf("Invalid datetime data");
-            return;
-        }
-
-        furi_hal_rtc_set_datetime(&datetime);
-        // Verification
-        furi_hal_rtc_get_datetime(&datetime);
-        printf(
-            "New datetime is: " CLI_DATE_FORMAT,
-            datetime.year,
-            datetime.month,
-            datetime.day,
-            datetime.hour,
-            datetime.minute,
-            datetime.second,
-            datetime.weekday);
-    } else {
-        furi_hal_rtc_get_datetime(&datetime);
-        printf(
-            CLI_DATE_FORMAT,
-            datetime.year,
-            datetime.month,
-            datetime.day,
-            datetime.hour,
-            datetime.minute,
-            datetime.second,
-            datetime.weekday);
-    }
-}
-
-#define CLI_COMMAND_LOG_RING_SIZE 2048
-#define CLI_COMMAND_LOG_BUFFER_SIZE 64
-
-void cli_command_log_tx_callback(const uint8_t* buffer, size_t size, void* context) {
-    xStreamBufferSend(context, buffer, size, 0);
-}
-
-void cli_command_log(Cli* cli, string_t args, void* context) {
-    UNUSED(args);
-    UNUSED(context);
-    StreamBufferHandle_t ring = xStreamBufferCreate(CLI_COMMAND_LOG_RING_SIZE, 1);
-    uint8_t buffer[CLI_COMMAND_LOG_BUFFER_SIZE];
-
-    furi_hal_console_set_tx_callback(cli_command_log_tx_callback, ring);
-
-    printf("Press CTRL+C to stop...\r\n");
-    while(!cli_cmd_interrupt_received(cli)) {
-        size_t ret = xStreamBufferReceive(ring, buffer, CLI_COMMAND_LOG_BUFFER_SIZE, 50);
-        cli_write(cli, buffer, ret);
-    }
-
-    furi_hal_console_set_tx_callback(NULL, NULL);
-
-    vStreamBufferDelete(ring);
-}
-
-void cli_command_vibro(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(context);
-    if(!string_cmp(args, "0")) {
-        NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
-        notification_message_block(notification, &sequence_reset_vibro);
-        furi_record_close(RECORD_NOTIFICATION);
-    } else if(!string_cmp(args, "1")) {
-        NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
-        notification_message_block(notification, &sequence_set_vibro_on);
-        furi_record_close(RECORD_NOTIFICATION);
-    } else {
-        cli_print_usage("vibro", "<1|0>", string_get_cstr(args));
-    }
-}
-
-void cli_command_debug(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(context);
-    if(!string_cmp(args, "0")) {
-        furi_hal_rtc_reset_flag(FuriHalRtcFlagDebug);
-        loader_update_menu();
-        printf("Debug disabled.");
-    } else if(!string_cmp(args, "1")) {
-        furi_hal_rtc_set_flag(FuriHalRtcFlagDebug);
-        loader_update_menu();
-        printf("Debug enabled.");
-    } else {
-        cli_print_usage("debug", "<1|0>", string_get_cstr(args));
-    }
-}
-
-void cli_command_led(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(context);
-    // Get first word as light name
-    NotificationMessage notification_led_message;
-    string_t light_name;
-    string_init(light_name);
-    size_t ws = string_search_char(args, ' ');
-    if(ws == STRING_FAILURE) {
-        cli_print_usage("led", "<r|g|b|bl> <0-255>", string_get_cstr(args));
-        string_clear(light_name);
-        return;
-    } else {
-        string_set_n(light_name, args, 0, ws);
-        string_right(args, ws);
-        string_strim(args);
-    }
-    // Check light name
-    if(!string_cmp(light_name, "r")) {
-        notification_led_message.type = NotificationMessageTypeLedRed;
-    } else if(!string_cmp(light_name, "g")) {
-        notification_led_message.type = NotificationMessageTypeLedGreen;
-    } else if(!string_cmp(light_name, "b")) {
-        notification_led_message.type = NotificationMessageTypeLedBlue;
-    } else if(!string_cmp(light_name, "bl")) {
-        notification_led_message.type = NotificationMessageTypeLedDisplayBacklight;
-    } else {
-        cli_print_usage("led", "<r|g|b|bl> <0-255>", string_get_cstr(args));
-        string_clear(light_name);
-        return;
-    }
-    string_clear(light_name);
-    // Read light value from the rest of the string
-    char* end_ptr;
-    uint32_t value = strtoul(string_get_cstr(args), &end_ptr, 0);
-    if(!(value < 256 && *end_ptr == '\0')) {
-        cli_print_usage("led", "<r|g|b|bl> <0-255>", string_get_cstr(args));
-        return;
-    }
-
-    // Set led value
-    notification_led_message.data.led.value = value;
-
-    // Form notification sequence
-    const NotificationSequence notification_sequence = {
-        &notification_led_message,
-        NULL,
-    };
-
-    // Send notification
-    NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
-    notification_internal_message_block(notification, &notification_sequence);
-    furi_record_close(RECORD_NOTIFICATION);
-}
-
-void cli_command_ps(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(args);
-    UNUSED(context);
-
-    const uint8_t threads_num_max = 32;
-    FuriThreadId threads_ids[threads_num_max];
-    uint8_t thread_num = furi_thread_enumerate(threads_ids, threads_num_max);
-    printf(
-        "%-20s %-14s %-8s %-8s %s\r\n", "Name", "Stack start", "Heap", "Stack", "Stack min free");
-    for(uint8_t i = 0; i < thread_num; i++) {
-        TaskControlBlock* tcb = (TaskControlBlock*)threads_ids[i];
-        printf(
-            "%-20s 0x%-12lx %-8d %-8ld %-8ld\r\n",
-            furi_thread_get_name(threads_ids[i]),
-            (uint32_t)tcb->pxStack,
-            memmgr_heap_get_thread_memory(threads_ids[i]),
-            (uint32_t)(tcb->pxEndOfStack - tcb->pxStack + 1) * sizeof(StackType_t),
-            furi_thread_get_stack_space(threads_ids[i]));
-    }
-    printf("\r\nTotal: %d", thread_num);
-}
-
-void cli_command_free(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(args);
-    UNUSED(context);
-
-    printf("Free heap size: %d\r\n", memmgr_get_free_heap());
-    printf("Total heap size: %d\r\n", memmgr_get_total_heap());
-    printf("Minimum heap size: %d\r\n", memmgr_get_minimum_free_heap());
-    printf("Maximum heap block: %d\r\n", memmgr_heap_get_max_free_block());
-
-    printf("Pool free: %d\r\n", memmgr_pool_get_free());
-    printf("Maximum pool block: %d\r\n", memmgr_pool_get_max_block());
-}
-
-void cli_command_free_blocks(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(args);
-    UNUSED(context);
-
-    memmgr_heap_printf_free_blocks();
-}
-
-void cli_command_i2c(Cli* cli, string_t args, void* context) {
-    UNUSED(cli);
-    UNUSED(args);
-    UNUSED(context);
-
-    furi_hal_i2c_acquire(&furi_hal_i2c_handle_external);
-    printf("Scanning external i2c on PC0(SCL)/PC1(SDA)\r\n"
-           "Clock: 100khz, 7bit address\r\n"
-           "\r\n");
-    printf("  | 0 1 2 3 4 5 6 7 8 9 A B C D E F\r\n");
-    printf("--+--------------------------------\r\n");
-    for(uint8_t row = 0; row < 0x8; row++) {
-        printf("%x | ", row);
-        for(uint8_t column = 0; column <= 0xF; column++) {
-            bool ret = furi_hal_i2c_is_device_ready(
-                &furi_hal_i2c_handle_external, ((row << 4) + column) << 1, 2);
-            printf("%c ", ret ? '#' : '-');
-        }
-        printf("\r\n");
-    }
-    furi_hal_i2c_release(&furi_hal_i2c_handle_external);
-}
-
-void cli_commands_init(Cli* cli) {
-    cli_add_command(cli, "!", CliCommandFlagParallelSafe, cli_command_device_info, NULL);
-    cli_add_command(cli, "device_info", CliCommandFlagParallelSafe, cli_command_device_info, NULL);
-
-    cli_add_command(cli, "?", CliCommandFlagParallelSafe, cli_command_help, NULL);
-    cli_add_command(cli, "help", CliCommandFlagParallelSafe, cli_command_help, NULL);
-
-    cli_add_command(cli, "date", CliCommandFlagParallelSafe, cli_command_date, NULL);
-    cli_add_command(cli, "log", CliCommandFlagParallelSafe, cli_command_log, NULL);
-    cli_add_command(cli, "debug", CliCommandFlagDefault, cli_command_debug, NULL);
-    cli_add_command(cli, "ps", CliCommandFlagParallelSafe, cli_command_ps, NULL);
-    cli_add_command(cli, "free", CliCommandFlagParallelSafe, cli_command_free, NULL);
-    cli_add_command(cli, "free_blocks", CliCommandFlagParallelSafe, cli_command_free_blocks, NULL);
-
-    cli_add_command(cli, "vibro", CliCommandFlagDefault, cli_command_vibro, NULL);
-    cli_add_command(cli, "led", CliCommandFlagDefault, cli_command_led, NULL);
-    cli_add_command(cli, "gpio", CliCommandFlagDefault, cli_command_gpio, NULL);
-    cli_add_command(cli, "i2c", CliCommandFlagDefault, cli_command_i2c, NULL);
-}
--- a/applications/cli/cli_vcp.c
+++ b/applications/cli/cli_vcp.c
@@ -1,326 +0,0 @@
-#include <furi_hal_usb_cdc_i.h>
-#include <furi_hal.h>
-#include <furi.h>
-#include <stream_buffer.h>
-#include "cli_i.h"
-
-#define TAG "CliVcp"
-
-#define USB_CDC_PKT_LEN CDC_DATA_SZ
-#define VCP_RX_BUF_SIZE (USB_CDC_PKT_LEN * 3)
-#define VCP_TX_BUF_SIZE (USB_CDC_PKT_LEN * 3)
-
-#define VCP_IF_NUM 0
-
-typedef enum {
-    VcpEvtStop = (1 << 0),
-    VcpEvtConnect = (1 << 1),
-    VcpEvtDisconnect = (1 << 2),
-    VcpEvtStreamRx = (1 << 3),
-    VcpEvtRx = (1 << 4),
-    VcpEvtStreamTx = (1 << 5),
-    VcpEvtTx = (1 << 6),
-} WorkerEvtFlags;
-
-#define VCP_THREAD_FLAG_ALL                                                                 \
-    (VcpEvtStop | VcpEvtConnect | VcpEvtDisconnect | VcpEvtRx | VcpEvtTx | VcpEvtStreamRx | \
-     VcpEvtStreamTx)
-
-typedef struct {
-    FuriThread* thread;
-
-    StreamBufferHandle_t tx_stream;
-    StreamBufferHandle_t rx_stream;
-
-    volatile bool connected;
-    volatile bool running;
-
-    FuriHalUsbInterface* usb_if_prev;
-
-    uint8_t data_buffer[USB_CDC_PKT_LEN];
-} CliVcp;
-
-static int32_t vcp_worker(void* context);
-static void vcp_on_cdc_tx_complete(void* context);
-static void vcp_on_cdc_rx(void* context);
-static void vcp_state_callback(void* context, uint8_t state);
-static void vcp_on_cdc_control_line(void* context, uint8_t state);
-
-static CdcCallbacks cdc_cb = {
-    vcp_on_cdc_tx_complete,
-    vcp_on_cdc_rx,
-    vcp_state_callback,
-    vcp_on_cdc_control_line,
-    NULL,
-};
-
-static CliVcp* vcp = NULL;
-
-static const uint8_t ascii_soh = 0x01;
-static const uint8_t ascii_eot = 0x04;
-
-static void cli_vcp_init() {
-    if(vcp == NULL) {
-        vcp = malloc(sizeof(CliVcp));
-        vcp->tx_stream = xStreamBufferCreate(VCP_TX_BUF_SIZE, 1);
-        vcp->rx_stream = xStreamBufferCreate(VCP_RX_BUF_SIZE, 1);
-    }
-    furi_assert(vcp->thread == NULL);
-
-    vcp->connected = false;
-
-    vcp->thread = furi_thread_alloc();
-    furi_thread_set_name(vcp->thread, "CliVcpWorker");
-    furi_thread_set_stack_size(vcp->thread, 1024);
-    furi_thread_set_callback(vcp->thread, vcp_worker);
-    furi_thread_start(vcp->thread);
-
-    FURI_LOG_I(TAG, "Init OK");
-}
-
-static void cli_vcp_deinit() {
-    furi_thread_flags_set(furi_thread_get_id(vcp->thread), VcpEvtStop);
-    furi_thread_join(vcp->thread);
-    furi_thread_free(vcp->thread);
-    vcp->thread = NULL;
-}
-
-static int32_t vcp_worker(void* context) {
-    UNUSED(context);
-    bool tx_idle = true;
-    size_t missed_rx = 0;
-    uint8_t last_tx_pkt_len = 0;
-
-    // Switch USB to VCP mode (if it is not set yet)
-    vcp->usb_if_prev = furi_hal_usb_get_config();
-    if((vcp->usb_if_prev != &usb_cdc_single) && (vcp->usb_if_prev != &usb_cdc_dual)) {
-        furi_hal_usb_set_config(&usb_cdc_single, NULL);
-    }
-    furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb, NULL);
-
-    FURI_LOG_D(TAG, "Start");
-    vcp->running = true;
-
-    while(1) {
-        uint32_t flags =
-            furi_thread_flags_wait(VCP_THREAD_FLAG_ALL, FuriFlagWaitAny, FuriWaitForever);
-        furi_assert((flags & FuriFlagError) == 0);
-
-        // VCP session opened
-        if(flags & VcpEvtConnect) {
-#ifdef CLI_VCP_DEBUG
-            FURI_LOG_D(TAG, "Connect");
-#endif
-            if(vcp->connected == false) {
-                vcp->connected = true;
-                xStreamBufferSend(vcp->rx_stream, &ascii_soh, 1, FuriWaitForever);
-            }
-        }
-
-        // VCP session closed
-        if(flags & VcpEvtDisconnect) {
-#ifdef CLI_VCP_DEBUG
-            FURI_LOG_D(TAG, "Disconnect");
-#endif
-            if(vcp->connected == true) {
-                vcp->connected = false;
-                xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0);
-                xStreamBufferSend(vcp->rx_stream, &ascii_eot, 1, FuriWaitForever);
-            }
-        }
-
-        // Rx buffer was read, maybe there is enough space for new data?
-        if((flags & VcpEvtStreamRx) && (missed_rx > 0)) {
-#ifdef CLI_VCP_DEBUG
-            FURI_LOG_D(TAG, "StreamRx");
-#endif
-            if(xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) {
-                flags |= VcpEvtRx;
-                missed_rx--;
-            }
-        }
-
-        // New data received
-        if(flags & VcpEvtRx) {
-            if(xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) {
-                int32_t len = furi_hal_cdc_receive(VCP_IF_NUM, vcp->data_buffer, USB_CDC_PKT_LEN);
-#ifdef CLI_VCP_DEBUG
-                FURI_LOG_D(TAG, "Rx %d", len);
-#endif
-                if(len > 0) {
-                    furi_check(
-                        xStreamBufferSend(vcp->rx_stream, vcp->data_buffer, len, FuriWaitForever) ==
-                        (size_t)len);
-                }
-            } else {
-#ifdef CLI_VCP_DEBUG
-                FURI_LOG_D(TAG, "Rx missed");
-#endif
-                missed_rx++;
-            }
-        }
-
-        // New data in Tx buffer
-        if(flags & VcpEvtStreamTx) {
-#ifdef CLI_VCP_DEBUG
-            FURI_LOG_D(TAG, "StreamTx");
-#endif
-            if(tx_idle) {
-                flags |= VcpEvtTx;
-            }
-        }
-
-        // CDC write transfer done
-        if(flags & VcpEvtTx) {
-            size_t len =
-                xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0);
-#ifdef CLI_VCP_DEBUG
-            FURI_LOG_D(TAG, "Tx %d", len);
-#endif
-            if(len > 0) { // Some data left in Tx buffer. Sending it now
-                tx_idle = false;
-                furi_hal_cdc_send(VCP_IF_NUM, vcp->data_buffer, len);
-                last_tx_pkt_len = len;
-            } else { // There is nothing to send.
-                if(last_tx_pkt_len == 64) {
-                    // Send extra zero-length packet if last packet len is 64 to indicate transfer end
-                    furi_hal_cdc_send(VCP_IF_NUM, NULL, 0);
-                } else {
-                    // Set flag to start next transfer instantly
-                    tx_idle = true;
-                }
-                last_tx_pkt_len = 0;
-            }
-        }
-
-        if(flags & VcpEvtStop) {
-            vcp->connected = false;
-            vcp->running = false;
-            furi_hal_cdc_set_callbacks(VCP_IF_NUM, NULL, NULL);
-            // Restore previous USB mode (if it was set during init)
-            if((vcp->usb_if_prev != &usb_cdc_single) && (vcp->usb_if_prev != &usb_cdc_dual)) {
-                furi_hal_usb_unlock();
-                furi_hal_usb_set_config(vcp->usb_if_prev, NULL);
-            }
-            xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0);
-            xStreamBufferSend(vcp->rx_stream, &ascii_eot, 1, FuriWaitForever);
-            break;
-        }
-    }
-    FURI_LOG_D(TAG, "End");
-    return 0;
-}
-
-static size_t cli_vcp_rx(uint8_t* buffer, size_t size, uint32_t timeout) {
-    furi_assert(vcp);
-    furi_assert(buffer);
-
-    if(vcp->running == false) {
-        return 0;
-    }
-
-#ifdef CLI_VCP_DEBUG
-    FURI_LOG_D(TAG, "rx %u start", size);
-#endif
-
-    size_t rx_cnt = 0;
-
-    while(size > 0) {
-        size_t batch_size = size;
-        if(batch_size > VCP_RX_BUF_SIZE) batch_size = VCP_RX_BUF_SIZE;
-
-        size_t len = xStreamBufferReceive(vcp->rx_stream, buffer, batch_size, timeout);
-#ifdef CLI_VCP_DEBUG
-        FURI_LOG_D(TAG, "rx %u ", batch_size);
-#endif
-        if(len == 0) break;
-        furi_thread_flags_set(furi_thread_get_id(vcp->thread), VcpEvtStreamRx);
-        size -= len;
-        buffer += len;
-        rx_cnt += len;
-    }
-
-#ifdef CLI_VCP_DEBUG
-    FURI_LOG_D(TAG, "rx %u end", size);
-#endif
-    return rx_cnt;
-}
-
-static void cli_vcp_tx(const uint8_t* buffer, size_t size) {
-    furi_assert(vcp);
-    furi_assert(buffer);
-
-    if(vcp->running == false) {
-        return;
-    }
-
-#ifdef CLI_VCP_DEBUG
-    FURI_LOG_D(TAG, "tx %u start", size);
-#endif
-
-    while(size > 0 && vcp->connected) {
-        size_t batch_size = size;
-        if(batch_size > USB_CDC_PKT_LEN) batch_size = USB_CDC_PKT_LEN;
-
-        xStreamBufferSend(vcp->tx_stream, buffer, batch_size, FuriWaitForever);
-        furi_thread_flags_set(furi_thread_get_id(vcp->thread), VcpEvtStreamTx);
-#ifdef CLI_VCP_DEBUG
-        FURI_LOG_D(TAG, "tx %u", batch_size);
-#endif
-
-        size -= batch_size;
-        buffer += batch_size;
-    }
-
-#ifdef CLI_VCP_DEBUG
-    FURI_LOG_D(TAG, "tx %u end", size);
-#endif
-}
-
-static void cli_vcp_tx_stdout(const char* data, size_t size) {
-    cli_vcp_tx((const uint8_t*)data, size);
-}
-
-static void vcp_state_callback(void* context, uint8_t state) {
-    UNUSED(context);
-    if(state == 0) {
-        furi_thread_flags_set(furi_thread_get_id(vcp->thread), VcpEvtDisconnect);
-    }
-}
-
-static void vcp_on_cdc_control_line(void* context, uint8_t state) {
-    UNUSED(context);
-    // bit 0: DTR state, bit 1: RTS state
-    bool dtr = state & (1 << 0);
-
-    if(dtr == true) {
-        furi_thread_flags_set(furi_thread_get_id(vcp->thread), VcpEvtConnect);
-    } else {
-        furi_thread_flags_set(furi_thread_get_id(vcp->thread), VcpEvtDisconnect);
-    }
-}
-
-static void vcp_on_cdc_rx(void* context) {
-    UNUSED(context);
-    uint32_t ret = furi_thread_flags_set(furi_thread_get_id(vcp->thread), VcpEvtRx);
-    furi_check((ret & FuriFlagError) == 0);
-}
-
-static void vcp_on_cdc_tx_complete(void* context) {
-    UNUSED(context);
-    furi_thread_flags_set(furi_thread_get_id(vcp->thread), VcpEvtTx);
-}
-
-static bool cli_vcp_is_connected(void) {
-    furi_assert(vcp);
-    return vcp->connected;
-}
-
-CliSession cli_vcp = {
-    cli_vcp_init,
-    cli_vcp_deinit,
-    cli_vcp_rx,
-    cli_vcp_tx,
-    cli_vcp_tx_stdout,
-    cli_vcp_is_connected,
-};
--- a/applications/clock_app/application.fam
+++ b/applications/clock_app/application.fam
@@ -1,11 +0,0 @@
-App(
-    appid="clock",
-    name="Clock",
-    apptype=FlipperAppType.APP,
-    entry_point="clock_app",
-    cdefines=["APP_CLOCK"],
-    requires=["gui"],
-    icon="A_Clock_14",
-    stack_size=2 * 1024,
-    order=9,
-)
--- a/applications/clock_app/clock_app.c
+++ b/applications/clock_app/clock_app.c
@@ -1,146 +0,0 @@
-#include <furi.h>
-#include <furi_hal.h>
-
-#include <gui/elements.h>
-
-#include <gui/gui.h>
-#include <input/input.h>
-
-#define TAG "Clock"
-#define CLOCK_DATE_FORMAT "%.4d-%.2d-%.2d"
-#define CLOCK_TIME_FORMAT "%.2d:%.2d:%.2d"
-
-typedef enum {
-    EventTypeTick,
-    EventTypeKey,
-} EventType;
-
-typedef struct {
-    EventType type;
-    InputEvent input;
-} PluginEvent;
-
-typedef struct {
-    FuriHalRtcDateTime datetime;
-} ClockState;
-
-static void clock_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
-    furi_assert(event_queue);
-
-    PluginEvent event = {.type = EventTypeKey, .input = *input_event};
-    furi_message_queue_put(event_queue, &event, FuriWaitForever);
-}
-
-static void clock_render_callback(Canvas* const canvas, void* ctx) {
-    canvas_clear(canvas);
-    canvas_set_color(canvas, ColorBlack);
-
-    ClockState* state = (ClockState*)acquire_mutex((ValueMutex*)ctx, 25);
-
-    char strings[2][20];
-
-    snprintf(
-        strings[0],
-        sizeof(strings[0]),
-        CLOCK_DATE_FORMAT,
-        state->datetime.year,
-        state->datetime.month,
-        state->datetime.day);
-    snprintf(
-        strings[1],
-        sizeof(strings[1]),
-        CLOCK_TIME_FORMAT,
-        state->datetime.hour,
-        state->datetime.minute,
-        state->datetime.second);
-
-    release_mutex((ValueMutex*)ctx, state);
-    canvas_set_font(canvas, FontBigNumbers);
-    canvas_draw_str_aligned(canvas, 64, 42 - 16, AlignCenter, AlignCenter, strings[1]);
-    canvas_set_font(canvas, FontSecondary);
-    canvas_draw_str_aligned(canvas, 64, 52 - 8, AlignCenter, AlignTop, strings[0]);
-}
-
-static void clock_state_init(ClockState* const state) {
-    furi_hal_rtc_get_datetime(&state->datetime);
-}
-
-// Runs every 1000ms by default
-static void clock_tick(void* ctx) {
-    furi_assert(ctx);
-    FuriMessageQueue* event_queue = ctx;
-    PluginEvent event = {.type = EventTypeTick};
-    // It's OK to loose this event if system overloaded
-    furi_message_queue_put(event_queue, &event, 0);
-}
-
-int32_t clock_app(void* p) {
-    UNUSED(p);
-    FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
-
-    ClockState* plugin_state = malloc(sizeof(ClockState));
-    clock_state_init(plugin_state);
-    ValueMutex state_mutex;
-    if(!init_mutex(&state_mutex, plugin_state, sizeof(ClockState))) {
-        FURI_LOG_E(TAG, "cannot create mutex\r\n");
-        furi_message_queue_free(event_queue);
-        free(plugin_state);
-        return 255;
-    }
-
-    // Set system callbacks
-    ViewPort* view_port = view_port_alloc();
-    view_port_draw_callback_set(view_port, clock_render_callback, &state_mutex);
-    view_port_input_callback_set(view_port, clock_input_callback, event_queue);
-    FuriTimer* timer = furi_timer_alloc(clock_tick, FuriTimerTypePeriodic, event_queue);
-    furi_timer_start(timer, furi_kernel_get_tick_frequency());
-
-    // Open GUI and register view_port
-    Gui* gui = furi_record_open(RECORD_GUI);
-    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
-
-    // Main loop
-    PluginEvent event;
-    for(bool processing = true; processing;) {
-        FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
-        ClockState* plugin_state = (ClockState*)acquire_mutex_block(&state_mutex);
-
-        if(event_status == FuriStatusOk) {
-            // press events
-            if(event.type == EventTypeKey) {
-                if(event.input.type == InputTypeShort || event.input.type == InputTypeRepeat) {
-                    switch(event.input.key) {
-                    case InputKeyUp:
-                    case InputKeyDown:
-                    case InputKeyRight:
-                    case InputKeyLeft:
-                    case InputKeyOk:
-                        break;
-                    case InputKeyBack:
-                        // Exit the plugin
-                        processing = false;
-                        break;
-                    }
-                }
-            } else if(event.type == EventTypeTick) {
-                furi_hal_rtc_get_datetime(&plugin_state->datetime);
-            }
-        } else {
-            FURI_LOG_D(TAG, "furi_message_queue: event timeout");
-            // event timeout
-        }
-
-        view_port_update(view_port);
-        release_mutex(&state_mutex, plugin_state);
-    }
-
-    furi_timer_free(timer);
-    view_port_enabled_set(view_port, false);
-    gui_remove_view_port(gui, view_port);
-    furi_record_close(RECORD_GUI);
-    view_port_free(view_port);
-    furi_message_queue_free(event_queue);
-    delete_mutex(&state_mutex);
-
-    return 0;
-}
--- a/applications/debug/accessor/accessor.cpp
+++ b/applications/debug/accessor/accessor.cpp
--- a/applications/debug/accessor/accessor_app.cpp
+++ b/applications/debug/accessor/accessor_app.cpp
@@ -31,9 +31,10 @@ void AccessorApp::run(void) {
    onewire_host_stop(onewire_host);
 }

-AccessorApp::AccessorApp() {
+AccessorApp::AccessorApp()
+    : text_store{0} {
    notification = static_cast<NotificationApp*>(furi_record_open(RECORD_NOTIFICATION));
-    onewire_host = onewire_host_alloc();
+    onewire_host = onewire_host_alloc(&gpio_ibutton);
    furi_hal_power_enable_otg();
 }

--- a/applications/debug/accessor/accessor_app.h
+++ b/applications/debug/accessor/accessor_app.h
--- a/applications/debug/accessor/accessor_event.h
+++ b/applications/debug/accessor/accessor_event.h
--- a/applications/debug/accessor/accessor_view_manager.cpp
+++ b/applications/debug/accessor/accessor_view_manager.cpp
--- a/applications/debug/accessor/accessor_view_manager.h
+++ b/applications/debug/accessor/accessor_view_manager.h
--- a/applications/debug/accessor/application.fam
+++ b/applications/debug/accessor/application.fam
@@ -0,0 +1,12 @@
+App(
+    appid="accessor",
+    name="Accessor",
+    apptype=FlipperAppType.DEBUG,
+    targets=["f7"],
+    entry_point="accessor_app",
+    cdefines=["APP_ACCESSOR"],
+    requires=["gui"],
+    stack_size=4 * 1024,
+    order=40,
+    fap_category="Debug",
+)
--- a/applications/debug/accessor/helpers/wiegand.cpp
+++ b/applications/debug/accessor/helpers/wiegand.cpp
@@ -71,7 +71,7 @@ void WIEGAND::end() {
 }

 void WIEGAND::ReadD0() {
-    _bitCount++; // Increament bit count for Interrupt connected to D0
+    _bitCount++; // Increment bit count for Interrupt connected to D0
    if(_bitCount > 31) // If bit count more than 31, process high bits
    {
        _cardTempHigh |= ((0x80000000 & _cardTemp) >> 31); //	shift value to high bits
@@ -171,13 +171,10 @@ bool WIEGAND::DoWiegandConversion() {
                    return true;
                } else {
                    _lastWiegand = sysTick;
-                    _bitCount = 0;
-                    _cardTemp = 0;
-                    _cardTempHigh = 0;
                    return false;
                }

-                // TODO: Handle validation failure case!
+                // TODO FL-3490: Handle validation failure case!
            } else if(4 == _bitCount) {
                // 4-bit Wiegand codes have no data integrity check so we just
                // read the LOW nibble.
--- a/applications/debug/accessor/helpers/wiegand.h
+++ b/applications/debug/accessor/helpers/wiegand.h
--- a/applications/debug/accessor/scene/accessor_scene_generic.h
+++ b/applications/debug/accessor/scene/accessor_scene_generic.h
--- a/applications/debug/accessor/scene/accessor_scene_start.cpp
+++ b/applications/debug/accessor/scene/accessor_scene_start.cpp
--- a/applications/debug/accessor/scene/accessor_scene_start.h
+++ b/applications/debug/accessor/scene/accessor_scene_start.h
--- a/applications/debug/application.fam
+++ b/applications/debug/application.fam
@@ -0,0 +1,17 @@
+App(
+    appid="debug_apps",
+    name="Basic debug apps bundle",
+    apptype=FlipperAppType.METAPACKAGE,
+    provides=[
+        "blink_test",
+        "vibro_test",
+        "keypad_test",
+        "usb_test",
+        "usb_mouse",
+        "uart_echo",
+        "display_test",
+        "text_box_test",
+        "file_browser_test",
+        "speaker_debug",
+    ],
+)
--- a/applications/debug/battery_test_app/application.fam
+++ b/applications/debug/battery_test_app/application.fam
@@ -0,0 +1,15 @@
+App(
+    appid="battery_test",
+    name="Battery Test",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="battery_test_app",
+    cdefines=["APP_BATTERY_TEST"],
+    requires=[
+        "gui",
+        "power",
+    ],
+    stack_size=1 * 1024,
+    order=130,
+    fap_category="Debug",
+    fap_libs=["assets"],
+)
--- a/applications/debug/battery_test_app/battery_test_app.c
+++ b/applications/debug/battery_test_app/battery_test_app.c
@@ -27,7 +27,7 @@ static void battery_test_battery_info_update_model(void* context) {
        .charge = app->info.charge,
        .health = app->info.health,
    };
-    battery_info_set_data(app->batery_info, &battery_info_data);
+    battery_info_set_data(app->battery_info, &battery_info_data);
    notification_message(app->notifications, &sequence_display_backlight_on);
 }

@@ -48,13 +48,13 @@ BatteryTestApp* battery_test_alloc() {
    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);

    // Views
-    app->batery_info = battery_info_alloc();
+    app->battery_info = battery_info_alloc();
    view_set_previous_callback(
-        battery_info_get_view(app->batery_info), battery_test_exit_confirm_view);
+        battery_info_get_view(app->battery_info), battery_test_exit_confirm_view);
    view_dispatcher_add_view(
        app->view_dispatcher,
        BatteryTestAppViewBatteryInfo,
-        battery_info_get_view(app->batery_info));
+        battery_info_get_view(app->battery_info));

    app->dialog = dialog_ex_alloc();
    dialog_ex_set_header(app->dialog, "Close Battery Test?", 64, 12, AlignCenter, AlignTop);
@@ -76,7 +76,7 @@ void battery_test_free(BatteryTestApp* app) {

    // Views
    view_dispatcher_remove_view(app->view_dispatcher, BatteryTestAppViewBatteryInfo);
-    battery_info_free(app->batery_info);
+    battery_info_free(app->battery_info);
    view_dispatcher_remove_view(app->view_dispatcher, BatteryTestAppViewExitDialog);
    dialog_ex_free(app->dialog);
    // View dispatcher
--- a/applications/debug/battery_test_app/battery_test_app.h
+++ b/applications/debug/battery_test_app/battery_test_app.h
@@ -6,14 +6,15 @@
 #include <notification/notification.h>

 #include <gui/modules/dialog_ex.h>
-#include <power/power_settings_app/views/battery_info.h>
+// FIXME
+#include "../settings/power_settings_app/views/battery_info.h"

 typedef struct {
    Power* power;
    Gui* gui;
    NotificationApp* notifications;
    ViewDispatcher* view_dispatcher;
-    BatteryInfo* batery_info;
+    BatteryInfo* battery_info;
    DialogEx* dialog;
    PowerInfo info;
 } BatteryTestApp;
--- a/applications/debug/battery_test_app/views/battery_info.c
+++ b/applications/debug/battery_test_app/views/battery_info.c
@@ -0,0 +1,148 @@
+#include "battery_info.h"
+#include <furi.h>
+#include <gui/elements.h>
+#include <assets_icons.h>
+
+#define LOW_CHARGE_THRESHOLD 10
+#define HIGH_DRAIN_CURRENT_THRESHOLD 100
+
+struct BatteryInfo {
+    View* view;
+};
+
+static void draw_stat(Canvas* canvas, int x, int y, const Icon* icon, char* val) {
+    canvas_draw_frame(canvas, x - 7, y + 7, 30, 13);
+    canvas_draw_icon(canvas, x, y, icon);
+    canvas_set_color(canvas, ColorWhite);
+    canvas_draw_box(canvas, x - 4, y + 16, 24, 6);
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_str_aligned(canvas, x + 8, y + 22, AlignCenter, AlignBottom, val);
+};
+
+static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
+    char emote[20] = {};
+    char header[20] = {};
+    char value[20] = {};
+
+    int32_t drain_current = data->gauge_current * (-1000);
+    uint32_t charge_current = data->gauge_current * 1000;
+
+    // Draw battery
+    canvas_draw_icon(canvas, x, y, &I_BatteryBody_52x28);
+    if(charge_current > 0) {
+        canvas_draw_icon(canvas, x + 16, y + 7, &I_FaceCharging_29x14);
+    } else if(drain_current > HIGH_DRAIN_CURRENT_THRESHOLD) {
+        canvas_draw_icon(canvas, x + 16, y + 7, &I_FaceConfused_29x14);
+    } else if(data->charge < LOW_CHARGE_THRESHOLD) {
+        canvas_draw_icon(canvas, x + 16, y + 7, &I_FaceNopower_29x14);
+    } else {
+        canvas_draw_icon(canvas, x + 16, y + 7, &I_FaceNormal_29x14);
+    }
+
+    // Draw bubble
+    elements_bubble(canvas, 53, 0, 71, 39);
+
+    // Set text
+    if(charge_current > 0) {
+        snprintf(emote, sizeof(emote), "%s", "Yummy!");
+        snprintf(header, sizeof(header), "%s", "Charging at");
+        snprintf(
+            value,
+            sizeof(value),
+            "%lu.%luV   %lumA",
+            (uint32_t)(data->vbus_voltage),
+            (uint32_t)(data->vbus_voltage * 10) % 10,
+            charge_current);
+    } else if(drain_current > 0) {
+        snprintf(
+            emote,
+            sizeof(emote),
+            "%s",
+            drain_current > HIGH_DRAIN_CURRENT_THRESHOLD ? "Oh no!" : "Om-nom-nom!");
+        snprintf(header, sizeof(header), "%s", "Consumption is");
+        snprintf(
+            value,
+            sizeof(value),
+            "%ld %s",
+            drain_current,
+            drain_current > HIGH_DRAIN_CURRENT_THRESHOLD ? "mA!" : "mA");
+    } else if(drain_current != 0) {
+        snprintf(header, 20, "...");
+    } else if(data->charging_voltage < 4.2) {
+        // Non-default battery charging limit, mention it
+        snprintf(emote, sizeof(emote), "Charged!");
+        snprintf(header, sizeof(header), "Limited to");
+        snprintf(
+            value,
+            sizeof(value),
+            "%lu.%luV",
+            (uint32_t)(data->charging_voltage),
+            (uint32_t)(data->charging_voltage * 10) % 10);
+    } else {
+        snprintf(header, sizeof(header), "Charged!");
+    }
+
+    canvas_draw_str_aligned(canvas, 92, y + 3, AlignCenter, AlignCenter, emote);
+    canvas_draw_str_aligned(canvas, 92, y + 15, AlignCenter, AlignCenter, header);
+    canvas_draw_str_aligned(canvas, 92, y + 27, AlignCenter, AlignCenter, value);
+};
+
+static void battery_info_draw_callback(Canvas* canvas, void* context) {
+    furi_assert(context);
+    BatteryInfoModel* model = context;
+
+    canvas_clear(canvas);
+    canvas_set_color(canvas, ColorBlack);
+    draw_battery(canvas, model, 0, 5);
+
+    char batt_level[10];
+    char temperature[10];
+    char voltage[10];
+    char health[10];
+
+    snprintf(batt_level, sizeof(batt_level), "%lu%%", (uint32_t)model->charge);
+    snprintf(temperature, sizeof(temperature), "%lu C", (uint32_t)model->gauge_temperature);
+    snprintf(
+        voltage,
+        sizeof(voltage),
+        "%lu.%01lu V",
+        (uint32_t)model->gauge_voltage,
+        (uint32_t)(model->gauge_voltage * 10) % 10UL);
+    snprintf(health, sizeof(health), "%d%%", model->health);
+
+    draw_stat(canvas, 8, 42, &I_Battery_16x16, batt_level);
+    draw_stat(canvas, 40, 42, &I_Temperature_16x16, temperature);
+    draw_stat(canvas, 72, 42, &I_Voltage_16x16, voltage);
+    draw_stat(canvas, 104, 42, &I_Health_16x16, health);
+}
+
+BatteryInfo* battery_info_alloc() {
+    BatteryInfo* battery_info = malloc(sizeof(BatteryInfo));
+    battery_info->view = view_alloc();
+    view_set_context(battery_info->view, battery_info);
+    view_allocate_model(battery_info->view, ViewModelTypeLocking, sizeof(BatteryInfoModel));
+    view_set_draw_callback(battery_info->view, battery_info_draw_callback);
+
+    return battery_info;
+}
+
+void battery_info_free(BatteryInfo* battery_info) {
+    furi_assert(battery_info);
+    view_free(battery_info->view);
+    free(battery_info);
+}
+
+View* battery_info_get_view(BatteryInfo* battery_info) {
+    furi_assert(battery_info);
+    return battery_info->view;
+}
+
+void battery_info_set_data(BatteryInfo* battery_info, BatteryInfoModel* data) {
+    furi_assert(battery_info);
+    furi_assert(data);
+    with_view_model(
+        battery_info->view,
+        BatteryInfoModel * model,
+        { memcpy(model, data, sizeof(BatteryInfoModel)); },
+        true);
+}
--- a/applications/debug/battery_test_app/views/battery_info.h
+++ b/applications/debug/battery_test_app/views/battery_info.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <gui/view.h>
+
+typedef struct BatteryInfo BatteryInfo;
+
+typedef struct {
+    float vbus_voltage;
+    float gauge_voltage;
+    float gauge_current;
+    float gauge_temperature;
+    float charging_voltage;
+    uint8_t charge;
+    uint8_t health;
+} BatteryInfoModel;
+
+BatteryInfo* battery_info_alloc();
+
+void battery_info_free(BatteryInfo* battery_info);
+
+View* battery_info_get_view(BatteryInfo* battery_info);
+
+void battery_info_set_data(BatteryInfo* battery_info, BatteryInfoModel* data);
--- a/applications/debug/blink_test/application.fam
+++ b/applications/debug/blink_test/application.fam
@@ -0,0 +1,11 @@
+App(
+    appid="blink_test",
+    name="Blink Test",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="blink_test_app",
+    cdefines=["APP_BLINK"],
+    requires=["gui"],
+    stack_size=1 * 1024,
+    order=10,
+    fap_category="Debug",
+)
--- a/applications/debug/blink_test/blink_test.c
+++ b/applications/debug/blink_test/blink_test.c
--- a/applications/debug/bt_debug_app/application.fam
+++ b/applications/debug/bt_debug_app/application.fam
@@ -0,0 +1,18 @@
+App(
+    appid="bt_debug",
+    name="Bluetooth Debug",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="bt_debug_app",
+    cdefines=["SRV_BT"],
+    requires=[
+        "bt",
+        "gui",
+        "dialogs",
+    ],
+    provides=[
+        "bt_debug",
+    ],
+    stack_size=1 * 1024,
+    order=110,
+    fap_category="Debug",
+)
--- a/applications/debug/bt_debug_app/bt_debug_app.c
+++ b/applications/debug/bt_debug_app/bt_debug_app.c
@@ -31,9 +31,6 @@ uint32_t bt_debug_start_view(void* context) {
 BtDebugApp* bt_debug_app_alloc() {
    BtDebugApp* app = malloc(sizeof(BtDebugApp));

-    // Load settings
-    bt_settings_load(&app->settings);
-
    // Gui
    app->gui = furi_record_open(RECORD_GUI);

@@ -98,20 +95,22 @@ void bt_debug_app_free(BtDebugApp* app) {
 int32_t bt_debug_app(void* p) {
    UNUSED(p);
    if(!furi_hal_bt_is_testing_supported()) {
-        FURI_LOG_E(TAG, "Incorrect radio stack: radio testing fetures are absent.");
+        FURI_LOG_E(TAG, "Incorrect radio stack: radio testing features are absent.");
        DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
        dialog_message_show_storage_error(dialogs, "Incorrect\nRadioStack");
        return 255;
    }

    BtDebugApp* app = bt_debug_app_alloc();
+    // Was bt active?
+    const bool was_active = furi_hal_bt_is_active();
    // Stop advertising
    furi_hal_bt_stop_advertising();

    view_dispatcher_run(app->view_dispatcher);

    // Restart advertising
-    if(app->settings.enabled) {
+    if(was_active) {
        furi_hal_bt_start_advertising();
    }
    bt_debug_app_free(app);
--- a/applications/debug/bt_debug_app/bt_debug_app.h
+++ b/applications/debug/bt_debug_app/bt_debug_app.h
@@ -4,15 +4,14 @@
 #include <gui/gui.h>
 #include <gui/view.h>
 #include <gui/view_dispatcher.h>
+#include <gui/modules/submenu.h>
+
 #include <dialogs/dialogs.h>

-#include <gui/modules/submenu.h>
 #include "views/bt_carrier_test.h"
 #include "views/bt_packet_test.h"
-#include "../bt_settings.h"

 typedef struct {
-    BtSettings settings;
    Gui* gui;
    ViewDispatcher* view_dispatcher;
    Submenu* submenu;
--- a/Show More
+++ b/Show More