diff --git a/.gitignore b/.gitignore
index 8f4ab0e1f..813505b50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,5 @@ openocd.log
 # PVS Studio temporary files
 .PVS-Studio/
 PVS-Studio.log
+
+.gdbinit
diff --git a/.pvsconfig b/.pvsconfig
index d17eaa5a0..5f1ffb7cb 100644
--- a/.pvsconfig
+++ b/.pvsconfig
@@ -5,6 +5,7 @@
 //-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
diff --git a/.vscode/example/launch.json b/.vscode/example/launch.json
index c8b0c601d..5c46d3979 100644
--- a/.vscode/example/launch.json
+++ b/.vscode/example/launch.json
@@ -38,6 +38,7 @@
             "postAttachCommands": [
                 // "compare-sections",
                 "source debug/flipperapps.py",
+                "fap-set-debug-elf-root build/latest/.extapps",
                 // "source debug/FreeRTOS/FreeRTOS.py",
                 // "svd_load debug/STM32WB55_CM4.svd"
             ]
@@ -59,6 +60,7 @@
                 "set confirm off",
                 "set mem inaccessible-by-default off",
                 "source debug/flipperapps.py",
+                "fap-set-debug-elf-root build/latest/.extapps",
                 // "compare-sections",
             ]
             // "showDevDebugOutput": "raw",
@@ -76,6 +78,7 @@
             "rtos": "FreeRTOS",
             "postAttachCommands": [
                 "source debug/flipperapps.py",
+                "fap-set-debug-elf-root build/latest/.extapps",
             ]
             // "showDevDebugOutput": "raw",
         },
@@ -95,6 +98,7 @@
             ],
             "postAttachCommands": [
                 "source debug/flipperapps.py",
+                "fap-set-debug-elf-root build/latest/.extapps",
             ],
             // "showDevDebugOutput": "raw",
         },
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 717abe826..9e6c3258e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 ### New changes
-* Fix crash when furi_halt is called (was found when you try to power off flipper with usb cable connected)
-* Fix bug when NFC keys was removed during scan
+* OFW: **NFC magic cards support (gen1a) (ability to write UID)**
+* Plugins -> PR: FlappyBird - draw bird via icon animation (by @an4tur0r | PR #149)
+* Plugins: DHT Temp montior - Fix DHT22 timeout bug and other fixes by @quen0n
+* Infrared: Universal remote assets update (by @Amec0e)
+* OFW: SubGhz: fix incorrect response in rpc mode. Code cleanup
+* OFW: Storage: tree timestamps
+* OFW: Dolphin: add L1_Mods_128x64 animation 
+* OFW: Run Bad USB immediately after connection 
 
 #### [🎲 Download latest extra apps pack](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps)
 
diff --git a/ReadMe.md b/ReadMe.md
index 946afe3bf..d5c91a137 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -56,8 +56,8 @@ Also check changelog in releases for latest updates!
 - Keeloq: Normstahl
 - CAME Atomo
 - Nice Flor S
-- FAAC SLH (Spa) [External seed calculation required (For info conatct me in Discord: Nano#8998)] 
-- BFT Mitto [External seed calculation required (For info conatct me in Discord: Nano#8998)] 
+- FAAC SLH (Spa) [External seed calculation required (For info contact me in Discord: Nano#8998)] 
+- BFT Mitto [External seed calculation required (For info contact me in Discord: Nano#8998)] 
 - Security+ v1 & v2
 - Star Line (saving only)
 
@@ -91,21 +91,24 @@ Also check changelog in releases for latest updates!
 - Metronome [(by panki27)](https://github.com/panki27/Metronome)
 - DTMF Dolphin [(by litui)](https://github.com/litui/dtmf_dolphin)
 - **TOTP (Authenticator)** [(by akopachov)](https://github.com/akopachov/flipper-zero_authenticator)
-- GPS [(By ezod)](https://github.com/ezod/flipperzero-gps) works with module `NMEA 0183` via UART (13TX, 14RX, GND pins on Flipper)
-- i2c Tools [(By NaejEL)](https://github.com/NaejEL/flipperzero-i2ctools) - C0 -> SCL / C1 -> SDA / GND -> GND | 3v3 logic levels only!
-- Temperature Sensor Plugin - HTU21D / SI7021 [(By Mywk)](https://github.com/Mywk/FlipperTemperatureSensor) - [How to Connect](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/plugins/temperature_sensor/Readme.md)
+- GPS [(by ezod)](https://github.com/ezod/flipperzero-gps) works with module `NMEA 0183` via UART (13TX, 14RX, GND pins on Flipper)
+- i2c Tools [(by NaejEL)](https://github.com/NaejEL/flipperzero-i2ctools) - C0 -> SCL / C1 -> SDA / GND -> GND | 3v3 logic levels only!
+- Temperature Sensor Plugin - HTU21D / SI7021 [(by Mywk)](https://github.com/Mywk/FlipperTemperatureSensor) - [How to Connect](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/plugins/temperature_sensor/Readme.md)
 - HC-SR04 Distance sensor - Ported and modified by @xMasterX [(original by Sanqui)](https://github.com/Sanqui/flipperzero-firmware/tree/hc_sr04) - How to connect -> (5V -> VCC) / (GND -> GND) / (13|TX -> Trig) / (14|RX -> Echo)
 - Morse Code [(by wh00hw)](https://github.com/wh00hw/MorseCodeFAP)
+- AM2320/AM2321 Temp. Sensor plugin [(by xMasterX)](https://github.com/xMasterX/AM2320_Flipper_Plugin) - [How to Connect](https://github.com/xMasterX/AM2320_Flipper_Plugin)
+- DHT11/22 Temp. Sensor Monitor [(by quen0n)](https://github.com/quen0n/FipperZero-DHT-Monitor) - How to connect -> (5V -> VCC) / (GND -> GND) / (Selected Pin -> out)
 
 Games:
-- DOOM (fixed) [(By p4nic4ttack)](https://github.com/p4nic4ttack/doom-flipper-zero/)
+- DOOM (fixed) [(by p4nic4ttack)](https://github.com/p4nic4ttack/doom-flipper-zero/)
 - Zombiez [(Reworked By DevMilanIan)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/240) [(Original By Dooskington)](https://github.com/Dooskington/flipperzero-zombiez)
-- Flappy Bird [(By DroomOne)](https://github.com/DroomOne/flipperzero-firmware/tree/dev/applications/flappy_bird)
+- Flappy Bird [(by DroomOne)](https://github.com/DroomOne/flipperzero-firmware/tree/dev/applications/flappy_bird)
 - Arkanoid (refactored by xMasterX) [(by gotnull)](https://github.com/gotnull/flipperzero-firmware-wPlugins)
 - Tic Tac Toe (refactored by xMasterX) [(by gotnull)](https://github.com/gotnull/flipperzero-firmware-wPlugins)
 - Tetris (with fixes) [(by jeffplang)](https://github.com/jeffplang/flipperzero-firmware/tree/tetris_game/applications/tetris_game)
 - Minesweeper [(by panki27)](https://github.com/panki27/minesweeper)
 - Heap Defence (aka Stack Attack) - Ported to latest firmware by @xMasterX - [(original by wquinoa & Vedmein)](https://github.com/Vedmein/flipperzero-firmware/tree/hd/svisto-perdelki)
+- Game15 [(by x27)](https://github.com/x27/flipperzero-game15)
 
 ### Other changes
 
@@ -115,6 +118,7 @@ Games:
 - SubGHz -> Save last used frequency and modulation [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
 - SubGHz -> Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
 - SubGHz -> Long press OK button in SubGHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79)
+- 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)
 
 # Instructions
 ## [- How to install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
@@ -131,7 +135,7 @@ Games:
 
 ## [- Configure Sub-GHz Remote App](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md)
 
-## [- TOTP (Authenticator) config description](https://github.com/akopachov/flipper-zero_authenticator/blob/master/.github/conf-file_description.md)
+## [- TOTP (Authenticator) config description](https://github.com/akopachov/flipper-zero_authenticator/blob/master/docs/conf-file_description.md)
 
 ## [- Barcode Generator](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/BarcodeGenerator.md)
 
diff --git a/SConstruct b/SConstruct
index 448df9715..3ee89f646 100644
--- a/SConstruct
+++ b/SConstruct
@@ -33,10 +33,6 @@ coreenv = SConscript(
 )
 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=[
@@ -47,6 +43,7 @@ distenv = coreenv.Clone(
         "jflash",
     ],
     ENV=os.environ,
+    UPDATE_BUNDLE_DIR="dist/${DIST_DIR}/f${TARGET_HW}-update-${DIST_SUFFIX}",
 )
 
 firmware_env = distenv.AddFwProject(
@@ -144,21 +141,28 @@ distenv.Default(basic_dist)
 dist_dir = distenv.GetProjetDirName()
 fap_dist = [
     distenv.Install(
-        f"#/dist/{dist_dir}/apps/debug_elf",
-        firmware_env["FW_EXTAPPS"]["debug"].values(),
+        distenv.Dir(f"#/dist/{dist_dir}/apps/debug_elf"),
+        list(
+            app_artifact.debug
+            for app_artifact in firmware_env["FW_EXTAPPS"].applications.values()
+        ),
     ),
-    *(
-        distenv.Install(f"#/dist/{dist_dir}/apps/{dist_entry[0]}", dist_entry[1])
-        for dist_entry in firmware_env["FW_EXTAPPS"]["dist"].values()
+    distenv.Install(
+        f"#/dist/{dist_dir}/apps",
+        "#/assets/resources/apps",
     ),
 ]
-Depends(fap_dist, firmware_env["FW_EXTAPPS"]["validators"].values())
+Depends(
+    fap_dist,
+    list(
+        app_artifact.validator
+        for app_artifact in firmware_env["FW_EXTAPPS"].applications.values()
+    ),
+)
 Alias("fap_dist", fap_dist)
 # distenv.Default(fap_dist)
 
-distenv.Depends(
-    firmware_env["FW_RESOURCES"], firmware_env["FW_EXTAPPS"]["resources_dist"]
-)
+distenv.Depends(firmware_env["FW_RESOURCES"], firmware_env["FW_EXTAPPS"].resources_dist)
 
 
 # Target for bundling core2 package for qFlipper
@@ -196,6 +200,9 @@ firmware_debug = distenv.PhonyTarget(
     source=firmware_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE}",
     GDBREMOTE="${OPENOCD_GDB_PIPE}",
+    FBT_FAP_DEBUG_ELF_ROOT=firmware_env.subst("$FBT_FAP_DEBUG_ELF_ROOT").replace(
+        "\\", "/"
+    ),
 )
 distenv.Depends(firmware_debug, firmware_flash)
 
@@ -205,6 +212,9 @@ distenv.PhonyTarget(
     source=firmware_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
     GDBREMOTE="${BLACKMAGIC_ADDR}",
+    FBT_FAP_DEBUG_ELF_ROOT=firmware_env.subst("$FBT_FAP_DEBUG_ELF_ROOT").replace(
+        "\\", "/"
+    ),
 )
 
 # Debug alien elf
@@ -213,7 +223,7 @@ distenv.PhonyTarget(
     "${GDBPYCOM}",
     GDBOPTS="${GDBOPTS_BASE}",
     GDBREMOTE="${OPENOCD_GDB_PIPE}",
-    GDBPYOPTS='-ex "source debug/PyCortexMDebug/PyCortexMDebug.py" ',
+    GDBPYOPTS='-ex "source ${FBT_DEBUG_DIR}/PyCortexMDebug/PyCortexMDebug.py" ',
 )
 
 distenv.PhonyTarget(
@@ -233,13 +243,13 @@ distenv.PhonyTarget(
 # Linter
 distenv.PhonyTarget(
     "lint",
-    "${PYTHON3} scripts/lint.py check ${LINT_SOURCES}",
+    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py check ${LINT_SOURCES}",
     LINT_SOURCES=firmware_env["LINT_SOURCES"],
 )
 
 distenv.PhonyTarget(
     "format",
-    "${PYTHON3} scripts/lint.py format ${LINT_SOURCES}",
+    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py format ${LINT_SOURCES}",
     LINT_SOURCES=firmware_env["LINT_SOURCES"],
 )
 
@@ -280,7 +290,7 @@ 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")
 
 
 # Find blackmagic probe
diff --git a/applications/debug/unit_tests/infrared/infrared_test.c b/applications/debug/unit_tests/infrared/infrared_test.c
index 8879c8fc8..2bcb95da8 100644
--- a/applications/debug/unit_tests/infrared/infrared_test.c
+++ b/applications/debug/unit_tests/infrared/infrared_test.c
@@ -424,6 +424,7 @@ MU_TEST(infrared_test_decoder_mixed) {
     infrared_test_run_decoder(InfraredProtocolRC5, 5);
     infrared_test_run_decoder(InfraredProtocolSamsung32, 1);
     infrared_test_run_decoder(InfraredProtocolSIRC, 3);
+    infrared_test_run_decoder(InfraredProtocolKaseikyo, 1);
 }
 
 MU_TEST(infrared_test_decoder_nec) {
@@ -489,6 +490,15 @@ MU_TEST(infrared_test_encoder_rc6) {
     infrared_test_run_encoder(InfraredProtocolRC6, 1);
 }
 
+MU_TEST(infrared_test_decoder_kaseikyo) {
+    infrared_test_run_decoder(InfraredProtocolKaseikyo, 1);
+    infrared_test_run_decoder(InfraredProtocolKaseikyo, 2);
+    infrared_test_run_decoder(InfraredProtocolKaseikyo, 3);
+    infrared_test_run_decoder(InfraredProtocolKaseikyo, 4);
+    infrared_test_run_decoder(InfraredProtocolKaseikyo, 5);
+    infrared_test_run_decoder(InfraredProtocolKaseikyo, 6);
+}
+
 MU_TEST(infrared_test_encoder_decoder_all) {
     infrared_test_run_encoder_decoder(InfraredProtocolNEC, 1);
     infrared_test_run_encoder_decoder(InfraredProtocolNECext, 1);
@@ -498,6 +508,7 @@ MU_TEST(infrared_test_encoder_decoder_all) {
     infrared_test_run_encoder_decoder(InfraredProtocolRC6, 1);
     infrared_test_run_encoder_decoder(InfraredProtocolRC5, 1);
     infrared_test_run_encoder_decoder(InfraredProtocolSIRC, 1);
+    infrared_test_run_encoder_decoder(InfraredProtocolKaseikyo, 1);
 }
 
 MU_TEST_SUITE(infrared_test) {
@@ -515,6 +526,7 @@ MU_TEST_SUITE(infrared_test) {
     MU_RUN_TEST(infrared_test_decoder_nec);
     MU_RUN_TEST(infrared_test_decoder_samsung32);
     MU_RUN_TEST(infrared_test_decoder_necext1);
+    MU_RUN_TEST(infrared_test_decoder_kaseikyo);
     MU_RUN_TEST(infrared_test_decoder_mixed);
     MU_RUN_TEST(infrared_test_encoder_decoder_all);
 }
diff --git a/applications/main/bad_usb/application.fam b/applications/main/bad_usb/application.fam
index 4da34f0de..2442dd3aa 100644
--- a/applications/main/bad_usb/application.fam
+++ b/applications/main/bad_usb/application.fam
@@ -11,4 +11,5 @@ App(
     stack_size=2 * 1024,
     icon="A_BadUsb_14",
     order=70,
+    fap_libs=["assets"],
 )
diff --git a/applications/main/bad_usb/bad_usb_script.c b/applications/main/bad_usb/bad_usb_script.c
index 4d6066c17..6c1c9d58d 100644
--- a/applications/main/bad_usb/bad_usb_script.c
+++ b/applications/main/bad_usb/bad_usb_script.c
@@ -86,7 +86,7 @@ static const DuckyKey ducky_keys[] = {
     {"PAGEUP", HID_KEYBOARD_PAGE_UP},
     {"PAGEDOWN", HID_KEYBOARD_PAGE_DOWN},
     {"PRINTSCREEN", HID_KEYBOARD_PRINT_SCREEN},
-    {"SCROLLOCK", HID_KEYBOARD_SCROLL_LOCK},
+    {"SCROLLLOCK", HID_KEYBOARD_SCROLL_LOCK},
     {"SPACE", HID_KEYBOARD_SPACEBAR},
     {"TAB", HID_KEYBOARD_TAB},
     {"MENU", HID_KEYBOARD_APPLICATION},
@@ -347,10 +347,6 @@ static int32_t
         furi_hal_hid_kb_release(key);
         return (0);
     }
-    if(error != NULL) {
-        strncpy(error, "Unknown error", error_len);
-    }
-    return SCRIPT_STATE_ERROR;
 }
 
 static bool ducky_set_usb_id(BadUsbScript* bad_usb, const char* line) {
@@ -533,12 +529,16 @@ static int32_t bad_usb_worker(void* context) {
 
         } else if(worker_state == BadUsbStateNotConnected) { // State: USB not connected
             uint32_t flags = furi_thread_flags_wait(
-                WorkerEvtEnd | WorkerEvtConnect, FuriFlagWaitAny, FuriWaitForever);
+                WorkerEvtEnd | WorkerEvtConnect | WorkerEvtToggle,
+                FuriFlagWaitAny,
+                FuriWaitForever);
             furi_check((flags & FuriFlagError) == 0);
             if(flags & WorkerEvtEnd) {
                 break;
             } else if(flags & WorkerEvtConnect) {
                 worker_state = BadUsbStateIdle; // Ready to run
+            } else if(flags & WorkerEvtToggle) {
+                worker_state = BadUsbStateWillRun; // Will run when USB is connected
             }
             bad_usb->st.state = worker_state;
 
@@ -565,6 +565,31 @@ static int32_t bad_usb_worker(void* context) {
             }
             bad_usb->st.state = worker_state;
 
+        } else if(worker_state == BadUsbStateWillRun) { // State: start on connection
+            uint32_t flags = furi_thread_flags_wait(
+                WorkerEvtEnd | WorkerEvtConnect | WorkerEvtToggle,
+                FuriFlagWaitAny,
+                FuriWaitForever);
+            furi_check((flags & FuriFlagError) == 0);
+            if(flags & WorkerEvtEnd) {
+                break;
+            } else if(flags & WorkerEvtConnect) { // 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);
+                // extra time for PC to recognize Flipper as keyboard
+                furi_thread_flags_wait(0, FuriFlagWaitAny, 1500);
+                worker_state = BadUsbStateRunning;
+            } else if(flags & WorkerEvtToggle) { // Cancel scheduled execution
+                worker_state = BadUsbStateNotConnected;
+            }
+            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(
@@ -642,7 +667,7 @@ static void bad_usb_script_set_default_keyboard_layout(BadUsbScript* bad_usb) {
 BadUsbScript* bad_usb_script_open(FuriString* file_path) {
     furi_assert(file_path);
 
-    BadUsbScript* bad_usb = malloc(sizeof(BadUsbScript));
+    BadUsbScript* bad_usb = malloc(sizeof(BadUsbScript)); //-V773
     bad_usb->file_path = furi_string_alloc();
     furi_string_set(bad_usb->file_path, file_path);
     bad_usb_script_set_default_keyboard_layout(bad_usb);
diff --git a/applications/main/bad_usb/bad_usb_script.h b/applications/main/bad_usb/bad_usb_script.h
index c8b3a1653..1e4d98fe7 100644
--- a/applications/main/bad_usb/bad_usb_script.h
+++ b/applications/main/bad_usb/bad_usb_script.h
@@ -12,6 +12,7 @@ typedef enum {
     BadUsbStateInit,
     BadUsbStateNotConnected,
     BadUsbStateIdle,
+    BadUsbStateWillRun,
     BadUsbStateRunning,
     BadUsbStateDelay,
     BadUsbStateDone,
diff --git a/applications/main/bad_usb/views/bad_usb_view.c b/applications/main/bad_usb/views/bad_usb_view.c
index 8af844de1..bb9dc3b7e 100644
--- a/applications/main/bad_usb/views/bad_usb_view.c
+++ b/applications/main/bad_usb/views/bad_usb_view.c
@@ -45,10 +45,13 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) {
 
     canvas_draw_icon(canvas, 22, 24, &I_UsbTree_48x22);
 
-    if((model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone)) {
+    if((model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone) ||
+       (model->state.state == BadUsbStateNotConnected)) {
         elements_button_center(canvas, "Run");
     } else if((model->state.state == BadUsbStateRunning) || (model->state.state == BadUsbStateDelay)) {
         elements_button_center(canvas, "Stop");
+    } else if(model->state.state == BadUsbStateWillRun) {
+        elements_button_center(canvas, "Cancel");
     }
 
     if((model->state.state == BadUsbStateNotConnected) ||
@@ -61,6 +64,11 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) {
         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 == BadUsbStateWillRun) {
+        canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
+        canvas_set_font(canvas, FontPrimary);
+        canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Will run");
+        canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "on connect");
     } else if(model->state.state == BadUsbStateFileError) {
         canvas_draw_icon(canvas, 4, 26, &I_Error_18x18);
         canvas_set_font(canvas, FontPrimary);
diff --git a/applications/main/clock_app/clock_app.c b/applications/main/clock_app/clock_app.c
index 1bd92d9ec..c5b4dd9e8 100644
--- a/applications/main/clock_app/clock_app.c
+++ b/applications/main/clock_app/clock_app.c
@@ -216,6 +216,8 @@ int32_t clock_app(void* p) {
                     // Exit the plugin
                     processing = false;
                     break;
+                default:
+                    break;
                 }
             }
         } /*else if(event.type == EventTypeTick) {
diff --git a/applications/main/fap_loader/fap_loader_app.c b/applications/main/fap_loader/fap_loader_app.c
index 9b4c92335..10cec086a 100644
--- a/applications/main/fap_loader/fap_loader_app.c
+++ b/applications/main/fap_loader/fap_loader_app.c
@@ -155,7 +155,7 @@ static bool fap_loader_select_app(FapLoader* loader) {
 }
 
 static FapLoader* fap_loader_alloc(const char* path) {
-    FapLoader* loader = malloc(sizeof(FapLoader));
+    FapLoader* loader = malloc(sizeof(FapLoader)); //-V773
     loader->fap_path = furi_string_alloc_set(path);
     loader->storage = furi_record_open(RECORD_STORAGE);
     loader->dialogs = furi_record_open(RECORD_DIALOGS);
diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam
index 64f8db5b0..efeb8b6fe 100644
--- a/applications/main/gpio/application.fam
+++ b/applications/main/gpio/application.fam
@@ -8,4 +8,5 @@ App(
     stack_size=1 * 1024,
     icon="A_GPIO_14",
     order=50,
+    fap_libs=["assets"],
 )
diff --git a/applications/main/gpio/usb_uart_bridge.c b/applications/main/gpio/usb_uart_bridge.c
index a5caceafa..a1ab40329 100644
--- a/applications/main/gpio/usb_uart_bridge.c
+++ b/applications/main/gpio/usb_uart_bridge.c
@@ -184,7 +184,7 @@ static int32_t usb_uart_worker(void* context) {
     while(1) {
         uint32_t events =
             furi_thread_flags_wait(WORKER_ALL_RX_EVENTS, FuriFlagWaitAny, FuriWaitForever);
-        furi_check((events & FuriFlagError) == 0);
+        furi_check(!(events & FuriFlagError));
         if(events & WorkerEvtStop) break;
         if(events & WorkerEvtRxDone) {
             size_t len = furi_stream_buffer_receive(
@@ -288,7 +288,7 @@ static int32_t usb_uart_tx_thread(void* context) {
     while(1) {
         uint32_t events =
             furi_thread_flags_wait(WORKER_ALL_TX_EVENTS, FuriFlagWaitAny, FuriWaitForever);
-        furi_check((events & FuriFlagError) == 0);
+        furi_check(!(events & FuriFlagError));
         if(events & WorkerEvtTxStop) break;
         if(events & WorkerEvtCdcRx) {
             furi_check(furi_mutex_acquire(usb_uart->usb_mutex, FuriWaitForever) == FuriStatusOk);
diff --git a/applications/main/ibutton/application.fam b/applications/main/ibutton/application.fam
index 0bc6f8a9b..77bb9a33c 100644
--- a/applications/main/ibutton/application.fam
+++ b/applications/main/ibutton/application.fam
@@ -12,6 +12,7 @@ App(
     icon="A_iButton_14",
     stack_size=2 * 1024,
     order=60,
+    fap_libs=["assets"],
 )
 
 App(
diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam
index 6f76ed429..9c5eaf392 100644
--- a/applications/main/infrared/application.fam
+++ b/applications/main/infrared/application.fam
@@ -12,6 +12,7 @@ App(
     icon="A_Infrared_14",
     stack_size=3 * 1024,
     order=40,
+    fap_libs=["assets"],
 )
 
 App(
diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam
index 4a1498181..150a6f3db 100644
--- a/applications/main/lfrfid/application.fam
+++ b/applications/main/lfrfid/application.fam
@@ -14,6 +14,7 @@ App(
     icon="A_125khz_14",
     stack_size=2 * 1024,
     order=20,
+    fap_libs=["assets"],
 )
 
 App(
diff --git a/applications/main/lfrfid/lfrfid.c b/applications/main/lfrfid/lfrfid.c
index 513227306..d391c5e89 100644
--- a/applications/main/lfrfid/lfrfid.c
+++ b/applications/main/lfrfid/lfrfid.c
@@ -32,7 +32,7 @@ static void rpc_command_callback(RpcAppSystemEvent rpc_event, void* context) {
 }
 
 static LfRfid* lfrfid_alloc() {
-    LfRfid* lfrfid = malloc(sizeof(LfRfid));
+    LfRfid* lfrfid = malloc(sizeof(LfRfid)); //-V773
 
     lfrfid->storage = furi_record_open(RECORD_STORAGE);
     lfrfid->dialogs = furi_record_open(RECORD_DIALOGS);
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_read_success.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_read_success.c
index ae31e92cc..444c9a540 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_read_success.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_read_success.c
@@ -24,7 +24,7 @@ void nfc_scene_mf_classic_read_success_on_enter(void* context) {
     widget_add_button_element(
         widget, GuiButtonTypeRight, "More", nfc_scene_mf_classic_read_success_widget_callback, nfc);
 
-    FuriString* temp_str;
+    FuriString* temp_str = NULL;
     if(furi_string_size(nfc->dev->dev_data.parsed_data)) {
         temp_str = furi_string_alloc_set(nfc->dev->dev_data.parsed_data);
     } else {
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_success.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_success.c
index 63bffbf36..cb5ccd6e8 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_success.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_success.c
@@ -31,7 +31,7 @@ void nfc_scene_mf_ultralight_read_success_on_enter(void* context) {
         nfc_scene_mf_ultralight_read_success_widget_callback,
         nfc);
 
-    FuriString* temp_str;
+    FuriString* temp_str = NULL;
     if(furi_string_size(nfc->dev->dev_data.parsed_data)) {
         temp_str = furi_string_alloc_set(nfc->dev->dev_data.parsed_data);
     } else {
diff --git a/applications/main/subghz/scenes/subghz_scene_receiver_info.c b/applications/main/subghz/scenes/subghz_scene_receiver_info.c
index 0176f9613..e9c849e1e 100644
--- a/applications/main/subghz/scenes/subghz_scene_receiver_info.c
+++ b/applications/main/subghz/scenes/subghz_scene_receiver_info.c
@@ -170,9 +170,7 @@ bool subghz_scene_receiver_info_on_event(void* context, SceneManagerEvent event)
         } else if(event.event == SubGhzCustomEventSceneReceiverInfoSave) {
             //CC1101 Stop RX -> Save
             subghz->state_notifications = SubGhzNotificationStateIDLE;
-            if(subghz->txrx->hopper_state != SubGhzHopperStateOFF) {
-                subghz->txrx->hopper_state = SubGhzHopperStateOFF;
-            }
+            subghz->txrx->hopper_state = SubGhzHopperStateOFF;
             if(subghz->txrx->txrx_state == SubGhzTxRxStateRx) {
                 subghz_rx_end(subghz);
                 subghz_sleep(subghz);
diff --git a/applications/main/subghz/scenes/subghz_scene_rpc.c b/applications/main/subghz/scenes/subghz_scene_rpc.c
index 4ccc15f9e..0422a37a4 100644
--- a/applications/main/subghz/scenes/subghz_scene_rpc.c
+++ b/applications/main/subghz/scenes/subghz_scene_rpc.c
@@ -42,9 +42,8 @@ bool subghz_scene_rpc_on_event(void* context, SceneManagerEvent event) {
             bool result = false;
             if((subghz->txrx->txrx_state == SubGhzTxRxStateSleep) &&
                (state == SubGhzRpcStateLoaded)) {
-                subghz_blink_start(subghz);
                 result = subghz_tx_start(subghz, subghz->txrx->fff_data);
-                result = true;
+                if(result) subghz_blink_start(subghz);
             }
             rpc_system_app_confirm(subghz->rpc_ctx, RpcAppEventButtonPress, result);
         } else if(event.event == SubGhzCustomEventSceneRpcButtonRelease) {
diff --git a/applications/main/subghz/scenes/subghz_scene_set_seed_bft.c b/applications/main/subghz/scenes/subghz_scene_set_seed_bft.c
index dcb7e6850..1d6f9d70b 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_seed_bft.c
+++ b/applications/main/subghz/scenes/subghz_scene_set_seed_bft.c
@@ -67,6 +67,8 @@ bool subghz_scene_set_seed_bft_on_event(void* context, SceneManagerEvent event)
                 flipper_format_write_hex(
                     subghz->txrx->fff_data, "Seed", seed_data, sizeof(uint32_t));
 
+                flipper_format_write_string_cstr(subghz->txrx->fff_data, "Manufacture", "BFT");
+
                 generated_protocol = true;
             } else {
                 generated_protocol = false;
diff --git a/applications/main/subghz/subghz_i.c b/applications/main/subghz/subghz_i.c
index 41cda3bba..2555e6b5e 100644
--- a/applications/main/subghz/subghz_i.c
+++ b/applications/main/subghz/subghz_i.c
@@ -520,12 +520,6 @@ bool subghz_path_is_file(FuriString* path) {
 }
 
 uint32_t subghz_random_serial(void) {
-    static bool rand_generator_inited = false;
-
-    if(!rand_generator_inited) {
-        srand(DWT->CYCCNT);
-        rand_generator_inited = true;
-    }
     return (uint32_t)rand();
 }
 
diff --git a/applications/main/u2f/application.fam b/applications/main/u2f/application.fam
index 6b32e0225..82010ffb4 100644
--- a/applications/main/u2f/application.fam
+++ b/applications/main/u2f/application.fam
@@ -11,4 +11,5 @@ App(
     stack_size=2 * 1024,
     icon="A_U2F_14",
     order=80,
+    fap_libs=["assets"],
 )
diff --git a/applications/main/u2f/u2f_hid.c b/applications/main/u2f/u2f_hid.c
index 4922d6a5a..b6e86384d 100644
--- a/applications/main/u2f/u2f_hid.c
+++ b/applications/main/u2f/u2f_hid.c
@@ -203,7 +203,7 @@ static int32_t u2f_hid_worker(void* context) {
             WorkerEvtStop | WorkerEvtConnect | WorkerEvtDisconnect | WorkerEvtRequest,
             FuriFlagWaitAny,
             FuriWaitForever);
-        furi_check((flags & FuriFlagError) == 0);
+        furi_check(!(flags & FuriFlagError));
         if(flags & WorkerEvtStop) break;
         if(flags & WorkerEvtConnect) {
             u2f_set_state(u2f_hid->u2f_instance, 1);
diff --git a/applications/main/unirfremix/unirfremix_app.c b/applications/main/unirfremix/unirfremix_app.c
index 0ed42da7b..af231a80a 100644
--- a/applications/main/unirfremix/unirfremix_app.c
+++ b/applications/main/unirfremix/unirfremix_app.c
@@ -1044,6 +1044,8 @@ int32_t unirfremix_app(void* p) {
                 unirfremix_tx_stop(app);
                 exit_loop = true;
                 break;
+            default:
+                break;
             }
 
             if(app->processing == 0) {
@@ -1115,6 +1117,8 @@ int32_t unirfremix_app(void* p) {
             case InputKeyBack:
                 exit_loop = true;
                 break;
+            default:
+                break;
             }
 
             if(exit_loop == true) {
diff --git a/applications/plugins/am2320_temp_sensor/application.fam b/applications/plugins/am2320_temp_sensor/application.fam
new file mode 100644
index 000000000..9a17539dd
--- /dev/null
+++ b/applications/plugins/am2320_temp_sensor/application.fam
@@ -0,0 +1,14 @@
+App(
+    appid="am2320_temp_sensor",
+    name="[AM2320] Temp. Sensor",
+    apptype=FlipperAppType.EXTERNAL,
+    entry_point="am_temperature_sensor_app",
+    cdefines=["APP_AM_TEMPERATURE_SENSOR"],
+    requires=[
+        "gui",
+    ],
+    stack_size=2 * 1024,
+    order=90,
+	fap_icon="temperature_sensor.png",
+    fap_category="GPIO",
+)
diff --git a/applications/plugins/am2320_temp_sensor/temperature_sensor.c b/applications/plugins/am2320_temp_sensor/temperature_sensor.c
new file mode 100644
index 000000000..212014e22
--- /dev/null
+++ b/applications/plugins/am2320_temp_sensor/temperature_sensor.c
@@ -0,0 +1,336 @@
+/* Flipper Plugin to read the values from a AM2320/AM2321 Sensor */
+/* Created by @xMasterX, original app (was used as template) by Mywk - https://github.com/Mywk */
+/* Lib used as reference: https://github.com/Gozem/am2320/blob/master/am2321.c*/
+#include <furi.h>
+#include <furi_hal.h>
+#include <furi_hal_i2c.h>
+#include <math.h>
+
+#include <gui/gui.h>
+#include <input/input.h>
+
+#include <notification/notification_messages.h>
+
+#include <string.h>
+
+#define TS_DEFAULT_VALUE 0xFFFF
+
+#define AM2320_ADDRESS (0x5C << 1)
+
+#define DATA_BUFFER_SIZE 8
+
+// External I2C BUS
+#define I2C_BUS &furi_hal_i2c_handle_external
+
+typedef enum {
+    TSSInitializing,
+    TSSNoSensor,
+    TSSPendingUpdate,
+} TSStatus;
+
+typedef enum {
+    TSEventTypeTick,
+    TSEventTypeInput,
+} TSEventType;
+
+typedef struct {
+    TSEventType type;
+    InputEvent input;
+} TSEvent;
+
+extern const NotificationSequence sequence_blink_red_100;
+extern const NotificationSequence sequence_blink_blue_100;
+
+static TSStatus temperature_sensor_current_status = TSSInitializing;
+
+// Temperature and Humidity data buffers, ready to print
+char ts_data_buffer_temperature_c[DATA_BUFFER_SIZE];
+char ts_data_buffer_temperature_f[DATA_BUFFER_SIZE];
+char ts_data_buffer_relative_humidity[DATA_BUFFER_SIZE];
+char ts_data_buffer_absolute_humidity[DATA_BUFFER_SIZE];
+
+// CRC16 calculation
+static uint16_t get_crc16(const uint8_t* buf, size_t len) {
+    uint16_t crc = 0xFFFF;
+
+    while(len--) {
+        crc ^= (uint16_t)*buf++;
+        for(unsigned i = 0; i < 8; i++) {
+            if(crc & 0x0001) {
+                crc >>= 1;
+                crc ^= 0xA001;
+            } else {
+                crc >>= 1;
+            }
+        }
+    }
+
+    return crc;
+}
+// Combine bytes
+static uint16_t combine_bytes(uint8_t msb, uint8_t lsb) {
+    return ((uint16_t)msb << 8) | (uint16_t)lsb;
+}
+
+// Executes an I2C wake up, sends command and reads result
+// true if fetch was successful, false otherwise
+static bool temperature_sensor_get_data(uint8_t* buffer, uint8_t size) {
+    uint32_t timeout = furi_ms_to_ticks(100);
+    uint8_t cmdbuffer[3] = {0, 0, 0};
+    bool ret = false;
+
+    // Aquire I2C bus
+    furi_hal_i2c_acquire(I2C_BUS);
+
+    // Wake UP AM2320 (sensor goes to sleep to not warm up and affect the humidity sensor)
+    furi_hal_i2c_is_device_ready(I2C_BUS, (uint8_t)AM2320_ADDRESS, timeout);
+    // Check if device woken up then we do next stuff
+    if(furi_hal_i2c_is_device_ready(I2C_BUS, (uint8_t)AM2320_ADDRESS, timeout)) {
+        // Wait a bit
+        furi_delay_us(1000);
+
+        // Prepare command: Addr 0x03, start register = 0x00, number of registers to read = 0x04
+        cmdbuffer[0] = 0x03;
+        cmdbuffer[1] = 0x00;
+        cmdbuffer[2] = 0x04;
+
+        // Transmit command to read registers
+        ret = furi_hal_i2c_tx(I2C_BUS, (uint8_t)AM2320_ADDRESS, cmdbuffer, 3, timeout);
+
+        // Wait a bit
+        furi_delay_us(1600);
+        if(ret) {
+            /*
+             * Read out 8 bytes of data
+             * Byte 0: Should be Modbus function code 0x03
+             * Byte 1: Should be number of registers to read (0x04)
+             * Byte 2: Humidity msb
+             * Byte 3: Humidity lsb
+             * Byte 4: Temperature msb
+             * Byte 5: Temperature lsb
+             * Byte 6: CRC lsb byte
+             * Byte 7: CRC msb byte
+             */
+            ret = furi_hal_i2c_rx(I2C_BUS, (uint8_t)AM2320_ADDRESS, buffer, size, timeout);
+        }
+    }
+    // Release i2c bus
+    furi_hal_i2c_release(I2C_BUS);
+
+    return ret;
+}
+
+// Fetches temperature and humidity from sensor
+// Temperature and humidity must be preallocated
+// true if fetch was successful, false otherwise
+static bool temperature_sensor_fetch_info(double* temperature, double* humidity) {
+    *humidity = (float)0;
+    bool ret = false;
+
+    uint8_t buffer[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+
+    // Fetch data from sensor
+    ret = temperature_sensor_get_data(buffer, 8);
+
+    // If we got no result
+    if(!ret) return false;
+
+    if(buffer[0] != 0x03) return false; // must be 0x03 modbus reply
+    if(buffer[1] != 0x04) return false; // must be 0x04 number of registers reply
+
+    // Check CRC16 sum, if not correct - return false
+    uint16_t crcdata = get_crc16(buffer, 6);
+    uint16_t crcread = combine_bytes(buffer[7], buffer[6]);
+    if(crcdata != crcread) return false;
+
+    // Combine bytes for temp and humidity
+    uint16_t temp16 = combine_bytes(buffer[4], buffer[5]);
+    uint16_t humi16 = combine_bytes(buffer[2], buffer[3]);
+
+    /* Temperature resolution is 16Bit, 
+   * temperature highest bit (Bit15) is equal to 1 indicates a
+   * negative temperature, the temperature highest bit (Bit15)
+   * is equal to 0 indicates a positive temperature; 
+   * temperature in addition to the most significant bit (Bit14 ~ Bit0)
+   *  indicates the temperature sensor string value.
+   * Temperature sensor value is a string of 10 times the
+   * actual temperature value.
+   */
+    if(temp16 & 0x8000) {
+        temp16 = -(temp16 & 0x7FFF);
+    }
+
+    // Prepare output data
+    *temperature = (float)temp16 / 10.0;
+    *humidity = (float)humi16 / 10.0;
+
+    return true;
+}
+
+// Draw callback
+
+static void temperature_sensor_draw_callback(Canvas* canvas, void* ctx) {
+    UNUSED(ctx);
+
+    canvas_clear(canvas);
+    canvas_set_font(canvas, FontPrimary);
+    canvas_draw_str(canvas, 2, 10, "AM2320/AM2321 Sensor");
+
+    canvas_set_font(canvas, FontSecondary);
+    canvas_draw_str(canvas, 2, 62, "Press back to exit.");
+
+    switch(temperature_sensor_current_status) {
+    case TSSInitializing:
+        canvas_draw_str(canvas, 2, 30, "Initializing..");
+        break;
+    case TSSNoSensor:
+        canvas_draw_str(canvas, 2, 30, "No sensor found!");
+        break;
+    case TSSPendingUpdate: {
+        canvas_draw_str(canvas, 3, 24, "Temperature");
+        canvas_draw_str(canvas, 68, 24, "Humidity");
+
+        // Draw vertical lines
+        canvas_draw_line(canvas, 61, 16, 61, 50);
+        canvas_draw_line(canvas, 62, 16, 62, 50);
+
+        // Draw horizontal line
+        canvas_draw_line(canvas, 2, 27, 122, 27);
+
+        // Draw temperature and humidity values
+        canvas_draw_str(canvas, 8, 38, ts_data_buffer_temperature_c);
+        canvas_draw_str(canvas, 42, 38, "C");
+        canvas_draw_str(canvas, 8, 48, ts_data_buffer_temperature_f);
+        canvas_draw_str(canvas, 42, 48, "F");
+        canvas_draw_str(canvas, 68, 38, ts_data_buffer_relative_humidity);
+        canvas_draw_str(canvas, 100, 38, "%");
+        canvas_draw_str(canvas, 68, 48, ts_data_buffer_absolute_humidity);
+        canvas_draw_str(canvas, 100, 48, "g/m3");
+
+    } break;
+    default:
+        break;
+    }
+}
+
+// Input callback
+
+static void temperature_sensor_input_callback(InputEvent* input_event, void* ctx) {
+    furi_assert(ctx);
+    FuriMessageQueue* event_queue = ctx;
+
+    TSEvent event = {.type = TSEventTypeInput, .input = *input_event};
+    furi_message_queue_put(event_queue, &event, FuriWaitForever);
+}
+
+// Timer callback
+
+static void temperature_sensor_timer_callback(FuriMessageQueue* event_queue) {
+    furi_assert(event_queue);
+
+    TSEvent event = {.type = TSEventTypeTick};
+    furi_message_queue_put(event_queue, &event, 0);
+}
+
+// App entry point
+
+int32_t am_temperature_sensor_app(void* p) {
+    UNUSED(p);
+
+    furi_hal_power_suppress_charge_enter();
+    // Declare our variables and assign variables a default value
+    TSEvent tsEvent;
+    bool sensorFound = false;
+    double celsius, fahrenheit, rel_humidity, abs_humidity = TS_DEFAULT_VALUE;
+
+    // Used for absolute humidity calculation
+    double vapour_pressure = 0;
+
+    FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(TSEvent));
+
+    // Register callbacks
+    ViewPort* view_port = view_port_alloc();
+    view_port_draw_callback_set(view_port, temperature_sensor_draw_callback, NULL);
+    view_port_input_callback_set(view_port, temperature_sensor_input_callback, event_queue);
+
+    // Create timer and register its callback
+    FuriTimer* timer =
+        furi_timer_alloc(temperature_sensor_timer_callback, FuriTimerTypePeriodic, event_queue);
+    furi_timer_start(timer, furi_kernel_get_tick_frequency());
+
+    // Register viewport
+    Gui* gui = furi_record_open(RECORD_GUI);
+    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
+
+    // Used to notify the user by blinking red (error) or blue (fetch successful)
+    NotificationApp* notifications = furi_record_open(RECORD_NOTIFICATION);
+
+    while(1) {
+        furi_check(furi_message_queue_get(event_queue, &tsEvent, FuriWaitForever) == FuriStatusOk);
+
+        // Handle events
+        if(tsEvent.type == TSEventTypeInput) {
+            // Exit on back key
+            if(tsEvent.input.key ==
+               InputKeyBack) // We dont check for type here, we can check the type of keypress like: (event.input.type == InputTypeShort)
+                break;
+
+        } else if(tsEvent.type == TSEventTypeTick) {
+            // Update sensor data
+            // Fetch data and set the sensor current status accordingly
+            sensorFound = temperature_sensor_fetch_info(&celsius, &rel_humidity);
+            temperature_sensor_current_status = (sensorFound ? TSSPendingUpdate : TSSNoSensor);
+
+            if(sensorFound) {
+                // Blink blue
+                notification_message(notifications, &sequence_blink_blue_100);
+
+                if(celsius != TS_DEFAULT_VALUE && rel_humidity != TS_DEFAULT_VALUE) {
+                    // Convert celsius to fahrenheit
+                    fahrenheit = (celsius * 9 / 5) + 32;
+
+                    // Calculate absolute humidity - For more info refer to https://github.com/Mywk/FlipperTemperatureSensor/issues/1
+                    // Calculate saturation vapour pressure first
+                    vapour_pressure =
+                        (double)6.11 *
+                        pow(10, (double)(((double)7.5 * celsius) / ((double)237.3 + celsius)));
+                    // Then the vapour pressure in Pa
+                    vapour_pressure = vapour_pressure * rel_humidity;
+                    // Calculate absolute humidity
+                    abs_humidity =
+                        (double)2.16679 * (double)(vapour_pressure / ((double)273.15 + celsius));
+
+                    // Fill our buffers here, not on the canvas draw callback
+                    snprintf(ts_data_buffer_temperature_c, DATA_BUFFER_SIZE, "%.2f", celsius);
+                    snprintf(ts_data_buffer_temperature_f, DATA_BUFFER_SIZE, "%.2f", fahrenheit);
+                    snprintf(
+                        ts_data_buffer_relative_humidity, DATA_BUFFER_SIZE, "%.2f", rel_humidity);
+                    snprintf(
+                        ts_data_buffer_absolute_humidity, DATA_BUFFER_SIZE, "%.2f", abs_humidity);
+                }
+
+            } else {
+                // Reset our variables to their default values
+                celsius = fahrenheit = rel_humidity = abs_humidity = TS_DEFAULT_VALUE;
+
+                // Blink red
+                notification_message(notifications, &sequence_blink_red_100);
+            }
+        }
+
+        uint32_t wait_ticks = furi_ms_to_ticks(!sensorFound ? 100 : 500);
+        furi_delay_tick(wait_ticks);
+    }
+
+    furi_hal_power_suppress_charge_exit();
+    // Dobby is freee (free our variables, Flipper will crash if we don't do this!)
+    furi_timer_free(timer);
+    gui_remove_view_port(gui, view_port);
+    view_port_free(view_port);
+    furi_message_queue_free(event_queue);
+
+    furi_record_close(RECORD_NOTIFICATION);
+    furi_record_close(RECORD_GUI);
+
+    return 0;
+}
diff --git a/applications/plugins/temperature_sensor/temperature_sensor.png b/applications/plugins/am2320_temp_sensor/temperature_sensor.png
similarity index 100%
rename from applications/plugins/temperature_sensor/temperature_sensor.png
rename to applications/plugins/am2320_temp_sensor/temperature_sensor.png
diff --git a/applications/plugins/arkanoid/arkanoid_game.c b/applications/plugins/arkanoid/arkanoid_game.c
index 91ae8e736..0b0458424 100644
--- a/applications/plugins/arkanoid/arkanoid_game.c
+++ b/applications/plugins/arkanoid/arkanoid_game.c
@@ -370,8 +370,6 @@ static void arkanoid_update_timer_callback(FuriMessageQueue* event_queue) {
 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));
 
@@ -448,14 +446,13 @@ int32_t arkanoid_game_app(void* p) {
                             arkanoid_state->ball_state.dy = -1;
                             //start the game flag
                             arkanoid_state->gameStarted = true;
-                            break;
                         }
+                        break;
+                    default:
+                        break;
                     }
                 }
             }
-        } else {
-            // Event timeout
-            FURI_LOG_D(TAG, "furi_message_queue: Event timeout");
         }
 
         view_port_update(view_port);
diff --git a/applications/plugins/barcode_generator/barcode_generator.c b/applications/plugins/barcode_generator/barcode_generator.c
index 5eabfe0a8..776862531 100644
--- a/applications/plugins/barcode_generator/barcode_generator.c
+++ b/applications/plugins/barcode_generator/barcode_generator.c
@@ -339,8 +339,6 @@ int32_t barcode_generator_app(void* p) {
                     break;
                 }
             }
-        } else {
-            FURI_LOG_D("barcode_generator", "osMessageQueue: event timeout");
         }
 
         view_port_update(view_port);
diff --git a/applications/plugins/dap_link/dap_link.c b/applications/plugins/dap_link/dap_link.c
index 58d032b91..443d77c5e 100644
--- a/applications/plugins/dap_link/dap_link.c
+++ b/applications/plugins/dap_link/dap_link.c
@@ -13,6 +13,8 @@
 #include "dap_config.h"
 #include "gui/dap_gui.h"
 #include "usb/dap_v2_usb.h"
+#include <dialogs/dialogs.h>
+#include "dap_link_icons.h"
 
 /***************************************************************************/
 /****************************** DAP COMMON *********************************/
@@ -495,6 +497,24 @@ DapConfig* dap_app_get_config(DapApp* app) {
 int32_t dap_link_app(void* p) {
     UNUSED(p);
 
+    if(furi_hal_usb_is_locked()) {
+        DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
+        DialogMessage* message = dialog_message_alloc();
+        dialog_message_set_header(message, "Connection\nis active!", 3, 2, AlignLeft, AlignTop);
+        dialog_message_set_text(
+            message,
+            "Disconnect from\nPC or phone to\nuse this function.",
+            3,
+            30,
+            AlignLeft,
+            AlignTop);
+        dialog_message_set_icon(message, &I_ActiveConnection_50x64, 78, 0);
+        dialog_message_show(dialogs, message);
+        dialog_message_free(message);
+        furi_record_close(RECORD_DIALOGS);
+        return -1;
+    }
+
     // alloc app
     DapApp* app = dap_app_alloc();
     app_handle = app;
diff --git a/applications/plugins/dap_link/gui/scenes/dap_scene_config.c b/applications/plugins/dap_link/gui/scenes/dap_scene_config.c
index 56b06411c..48d5fedcd 100644
--- a/applications/plugins/dap_link/gui/scenes/dap_scene_config.c
+++ b/applications/plugins/dap_link/gui/scenes/dap_scene_config.c
@@ -72,8 +72,8 @@ void dap_scene_config_on_enter(void* context) {
     variable_item_set_current_value_index(item, config->uart_swap);
     variable_item_set_current_value_text(item, uart_swap[config->uart_swap]);
 
-    item = variable_item_list_add(var_item_list, "Help and Pinout", 0, NULL, NULL);
-    item = variable_item_list_add(var_item_list, "About", 0, NULL, NULL);
+    variable_item_list_add(var_item_list, "Help and Pinout", 0, NULL, NULL);
+    variable_item_list_add(var_item_list, "About", 0, NULL, NULL);
 
     variable_item_list_set_selected_item(
         var_item_list, scene_manager_get_scene_state(app->scene_manager, DapSceneConfig));
diff --git a/applications/plugins/dap_link/icons/ActiveConnection_50x64.png b/applications/plugins/dap_link/icons/ActiveConnection_50x64.png
new file mode 100644
index 000000000..1d7686ddd
Binary files /dev/null and b/applications/plugins/dap_link/icons/ActiveConnection_50x64.png differ
diff --git a/applications/plugins/dht_temp_sensor/DHT.h b/applications/plugins/dht_temp_sensor/DHT.h
index 5b460e5cf..409847d8b 100644
--- a/applications/plugins/dht_temp_sensor/DHT.h
+++ b/applications/plugins/dht_temp_sensor/DHT.h
@@ -8,7 +8,8 @@
 #define DHT_POLLING_CONTROL 1 //Включение проверки частоты опроса датчика
 #define DHT_POLLING_INTERVAL_DHT11 \
     2000 //Интервал опроса DHT11 (0.5 Гц по даташиту). Можно поставить 1500, будет работать
-#define DHT_POLLING_INTERVAL_DHT22 1000 //Интервал опроса DHT22 (1 Гц по даташиту)
+//Костыль, временно 2 секунды для датчика AM2302
+#define DHT_POLLING_INTERVAL_DHT22 2000 //Интервал опроса DHT22 (1 Гц по даташиту)
 #define DHT_IRQ_CONTROL //Выключать прерывания во время обмена данных с датчиком
 /* Структура возвращаемых датчиком данных */
 typedef struct {
diff --git a/applications/plugins/dht_temp_sensor/quenon_dht_mon.c b/applications/plugins/dht_temp_sensor/quenon_dht_mon.c
index bbb91ec3d..78d309f5d 100644
--- a/applications/plugins/dht_temp_sensor/quenon_dht_mon.c
+++ b/applications/plugins/dht_temp_sensor/quenon_dht_mon.c
@@ -11,18 +11,18 @@ const GpioPin RX_14 = {.pin = LL_GPIO_PIN_7, .port = GPIOB};
 
 //Перечень достуных портов ввода/вывода
 static const GpioItem gpio_item[] = {
-    {2, "2", &gpio_ext_pa7},
-    {3, "3", &gpio_ext_pa6},
-    {4, "4", &gpio_ext_pa4},
-    {5, "5", &gpio_ext_pb3},
-    {6, "6", &gpio_ext_pb2},
-    {7, "7", &gpio_ext_pc3},
-    {10, "10 (SWC)", &SWC_10},
+    {2, "2 (A7)", &gpio_ext_pa7},
+    {3, "3 (A6)", &gpio_ext_pa6},
+    {4, "4 (A4)", &gpio_ext_pa4},
+    {5, "5 (B3)", &gpio_ext_pb3},
+    {6, "6 (B2)", &gpio_ext_pb2},
+    {7, "7 (C3)", &gpio_ext_pc3},
+    {10, " 10(SWC) ", &SWC_10},
     {12, "12 (SIO)", &SIO_12},
     {13, "13 (TX)", &TX_13},
     {14, "14 (RX)", &RX_14},
-    {15, "15", &gpio_ext_pc1},
-    {16, "16", &gpio_ext_pc0},
+    {15, "15 (C1)", &gpio_ext_pc1},
+    {16, "16 (C0)", &gpio_ext_pc0},
     {17, "17 (1W)", &ibutton_gpio}};
 
 //Данные плагина
@@ -442,6 +442,8 @@ int32_t quenon_dht_mon_app() {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
diff --git a/applications/plugins/dht_temp_sensor/scenes/DHTMon_sensorEdit_scene.c b/applications/plugins/dht_temp_sensor/scenes/DHTMon_sensorEdit_scene.c
index b9c5a1134..5decac3d1 100644
--- a/applications/plugins/dht_temp_sensor/scenes/DHTMon_sensorEdit_scene.c
+++ b/applications/plugins/dht_temp_sensor/scenes/DHTMon_sensorEdit_scene.c
@@ -81,7 +81,7 @@ void sensorEdit_scene(PluginData* app) {
     app->item =
         variable_item_list_add(variable_item_list, "Type:", 2, addSensor_sensorTypeChanged, app);
 
-    variable_item_set_current_value_index(nameItem, app->currentSensorEdit->type);
+    variable_item_set_current_value_index(app->item, app->currentSensorEdit->type);
     variable_item_set_current_value_text(app->item, sensorsTypes[app->currentSensorEdit->type]);
 
     //GPIO
@@ -93,6 +93,9 @@ void sensorEdit_scene(PluginData* app) {
         app->item, DHTMon_GPIO_getName(app->currentSensorEdit->GPIO));
     variable_item_list_add(variable_item_list, "Save", 1, NULL, app);
 
+    //Сброс выбранного пункта в ноль
+    variable_item_list_set_selected_item(variable_item_list, 0);
+
     view_dispatcher_switch_to_view(app->view_dispatcher, ADDSENSOR_MENU_VIEW);
 }
 void sensorEdit_sceneRemove(void) {
diff --git a/applications/plugins/flappy_bird/application.fam b/applications/plugins/flappy_bird/application.fam
index dd8c67e85..0912178ca 100644
--- a/applications/plugins/flappy_bird/application.fam
+++ b/applications/plugins/flappy_bird/application.fam
@@ -9,4 +9,5 @@ App(
     order=100,
     fap_icon="flappy_10px.png",
     fap_category="Games",
+    fap_icon_assets="assets",
 )
diff --git a/applications/plugins/flappy_bird/assets/bird/frame_01.png b/applications/plugins/flappy_bird/assets/bird/frame_01.png
new file mode 100644
index 000000000..0cd187053
Binary files /dev/null and b/applications/plugins/flappy_bird/assets/bird/frame_01.png differ
diff --git a/applications/plugins/flappy_bird/assets/bird/frame_02.png b/applications/plugins/flappy_bird/assets/bird/frame_02.png
new file mode 100644
index 000000000..3c37cdb8b
Binary files /dev/null and b/applications/plugins/flappy_bird/assets/bird/frame_02.png differ
diff --git a/applications/plugins/flappy_bird/assets/bird/frame_03.png b/applications/plugins/flappy_bird/assets/bird/frame_03.png
new file mode 100644
index 000000000..a111ce163
Binary files /dev/null and b/applications/plugins/flappy_bird/assets/bird/frame_03.png differ
diff --git a/applications/plugins/flappy_bird/assets/bird/frame_rate b/applications/plugins/flappy_bird/assets/bird/frame_rate
new file mode 100644
index 000000000..e440e5c84
--- /dev/null
+++ b/applications/plugins/flappy_bird/assets/bird/frame_rate
@@ -0,0 +1 @@
+3
\ No newline at end of file
diff --git a/applications/plugins/flappy_bird/bird.h b/applications/plugins/flappy_bird/bird.h
deleted file mode 100644
index 8162080be..000000000
--- a/applications/plugins/flappy_bird/bird.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <furi.h>
-
-uint8_t bird_array[3][15][11] = {
-    {
-        {0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0},
-        {0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0},
-        {0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0},
-        {0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0},
-        {0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0},
-        {0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1},
-        {1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1},
-        {1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1},
-        {1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1},
-        {1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
-        {1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
-        {0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0},
-        {0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0},
-        {0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0},
-        {0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0},
-    },
-    {
-        {0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0},
-        {0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0},
-        {0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0},
-        {0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0},
-        {0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0},
-        {0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1},
-        {1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1},
-        {1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1},
-        {1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1},
-        {1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
-        {1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
-        {0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0},
-        {0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0},
-        {0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0},
-        {0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0},
-    },
-    {
-        {0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0},
-        {0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0},
-        {0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0},
-        {0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0},
-        {0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0},
-        {0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1},
-        {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1},
-        {1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1},
-        {1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1},
-        {1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
-        {1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
-        {0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0},
-        {0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0},
-        {0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0},
-        {0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0},
-    }};
diff --git a/applications/plugins/flappy_bird/flappy_bird.c b/applications/plugins/flappy_bird/flappy_bird.c
index 9895c2c31..2eeaf7816 100644
--- a/applications/plugins/flappy_bird/flappy_bird.c
+++ b/applications/plugins/flappy_bird/flappy_bird.c
@@ -1,9 +1,10 @@
-#include <furi.h>
-#include <gui/gui.h>
-#include <input/input.h>
 #include <stdlib.h>
 
-#include "bird.h"
+#include <FlappyBird_icons.h>
+#include <furi.h>
+#include <gui/gui.h>
+#include <gui/icon_animation_i.h>
+#include <input/input.h>
 
 #define TAG "Flappy"
 #define DEBUG false
@@ -36,6 +37,7 @@ typedef struct {
 typedef struct {
     float gravity;
     POINT point;
+    IconAnimation* sprite;
 } BIRD;
 
 typedef struct {
@@ -89,6 +91,7 @@ static void flappy_game_state_init(GameState* const game_state) {
     bird.gravity = 0.0f;
     bird.point.x = 15;
     bird.point.y = 32;
+    bird.sprite = icon_animation_alloc(&A_bird);
 
     game_state->debug = DEBUG;
     game_state->bird = bird;
@@ -100,6 +103,11 @@ static void flappy_game_state_init(GameState* const game_state) {
     flappy_game_random_pilar(game_state);
 }
 
+static void flappy_game_state_free(GameState* const game_state) {
+    icon_animation_free(game_state->bird.sprite);
+    free(game_state);
+}
+
 static void flappy_game_tick(GameState* const game_state) {
     if(game_state->state == GameStateLife) {
         if(!game_state->debug) {
@@ -213,27 +221,16 @@ static void flappy_game_render_callback(Canvas* const canvas, void* ctx) {
                     FLIPPER_LCD_HEIGHT - pilar->height - FLAPPY_GAB_HEIGHT);
             }
         }
-        // Flappy
-        for(int h = 0; h < FLAPPY_BIRD_HEIGHT; h++) {
-            for(int w = 0; w < FLAPPY_BIRD_WIDTH; w++) {
-                // Switch animation
-                int bird = 0;
-                if(game_state->bird.gravity < -0.5)
-                    bird = 1;
-                else
-                    bird = 2;
 
-                // Draw bird pixels
-                if(bird_array[bird][h][w] == 1) {
-                    int x = game_state->bird.point.x + h;
-                    int y = game_state->bird.point.y + w;
+        // Switch animation
+        game_state->bird.sprite->frame = 1;
+        if(game_state->bird.gravity < -0.5)
+            game_state->bird.sprite->frame = 0;
+        else if(game_state->bird.gravity > 0.5)
+            game_state->bird.sprite->frame = 2;
 
-                    canvas_draw_dot(canvas, x, y);
-                }
-            }
-        }
-
-        // Stats
+        canvas_draw_icon_animation(
+            canvas, game_state->bird.point.x, game_state->bird.point.y, game_state->bird.sprite);
 
         canvas_set_font(canvas, FontSecondary);
         char buffer[12];
@@ -345,14 +342,13 @@ int32_t flappy_game_app(void* p) {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             } else if(event.type == EventTypeTick) {
                 flappy_game_tick(game_state);
             }
-        } else {
-            //FURI_LOG_D(TAG, "osMessageQueue: event timeout");
-            // event timeout
         }
 
         view_port_update(view_port);
@@ -367,7 +363,7 @@ int32_t flappy_game_app(void* p) {
     delete_mutex(&state_mutex);
 
 free_and_exit:
-    free(game_state);
+    flappy_game_state_free(game_state);
     furi_message_queue_free(event_queue);
 
     return return_code;
diff --git a/applications/plugins/flipfrid/scene/flipfrid_scene_entrypoint.c b/applications/plugins/flipfrid/scene/flipfrid_scene_entrypoint.c
index 3a1ce4951..1ac91625f 100644
--- a/applications/plugins/flipfrid/scene/flipfrid_scene_entrypoint.c
+++ b/applications/plugins/flipfrid/scene/flipfrid_scene_entrypoint.c
@@ -134,6 +134,8 @@ void flipfrid_scene_entrypoint_on_event(FlipFridEvent event, FlipFridState* cont
             case InputKeyBack:
                 context->is_running = false;
                 break;
+            default:
+                break;
             }
         }
     }
diff --git a/applications/plugins/flipfrid/scene/flipfrid_scene_load_custom_uids.c b/applications/plugins/flipfrid/scene/flipfrid_scene_load_custom_uids.c
index cc9e9871d..9130b2d92 100644
--- a/applications/plugins/flipfrid/scene/flipfrid_scene_load_custom_uids.c
+++ b/applications/plugins/flipfrid/scene/flipfrid_scene_load_custom_uids.c
@@ -71,6 +71,8 @@ void flipfrid_scene_load_custom_uids_on_event(FlipFridEvent event, FlipFridState
             case InputKeyBack:
                 context->current_scene = SceneEntryPoint;
                 break;
+            default:
+                break;
             }
         }
     }
diff --git a/applications/plugins/flipfrid/scene/flipfrid_scene_load_file.c b/applications/plugins/flipfrid/scene/flipfrid_scene_load_file.c
index 76864018b..b2e27fc9a 100644
--- a/applications/plugins/flipfrid/scene/flipfrid_scene_load_file.c
+++ b/applications/plugins/flipfrid/scene/flipfrid_scene_load_file.c
@@ -158,6 +158,8 @@ void flipfrid_scene_load_file_on_event(FlipFridEvent event, FlipFridState* conte
             case InputKeyBack:
                 context->current_scene = SceneEntryPoint;
                 break;
+            default:
+                break;
             }
         }
     }
diff --git a/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c b/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c
index 3baa4ea49..c2f1a77ca 100644
--- a/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c
+++ b/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c
@@ -546,6 +546,8 @@ void flipfrid_scene_run_attack_on_event(FlipFridEvent event, FlipFridState* cont
                 notification_message(context->notify, &sequence_blink_stop);
                 context->current_scene = SceneEntryPoint;
                 break;
+            default:
+                break;
             }
         }
     }
diff --git a/applications/plugins/flipfrid/scene/flipfrid_scene_select_field.c b/applications/plugins/flipfrid/scene/flipfrid_scene_select_field.c
index 79416d616..ccb49e910 100644
--- a/applications/plugins/flipfrid/scene/flipfrid_scene_select_field.c
+++ b/applications/plugins/flipfrid/scene/flipfrid_scene_select_field.c
@@ -129,6 +129,8 @@ void flipfrid_scene_select_field_on_event(FlipFridEvent event, FlipFridState* co
                 furi_string_reset(context->notification_msg);
                 context->current_scene = SceneSelectFile;
                 break;
+            default:
+                break;
             }
             FURI_LOG_D(TAG, "Position: %d/%d", context->key_index, nb_bytes);
         }
diff --git a/applications/plugins/game15/README.md b/applications/plugins/game15/README.md
new file mode 100644
index 000000000..b1710c919
--- /dev/null
+++ b/applications/plugins/game15/README.md
@@ -0,0 +1,13 @@
+
+# Game "15" for Flipper Zero
+
+[Original link](https://github.com/x27/flipperzero-game15)
+
+Logic game [Wikipedia](https://en.wikipedia.org/wiki/15_puzzle)
+
+![Game screen](images/Game15.png)
+
+![Restore game](images/Game15Restore.png)
+
+![Popoup](images/Game15Popup.png)
+
diff --git a/applications/plugins/game15/application.fam b/applications/plugins/game15/application.fam
new file mode 100644
index 000000000..ab00316c1
--- /dev/null
+++ b/applications/plugins/game15/application.fam
@@ -0,0 +1,12 @@
+App(
+    appid="game15",
+    name="Game 15",
+    apptype=FlipperAppType.EXTERNAL,
+    entry_point="game15_app",
+    cdefines=["APP_GAME15"],
+    requires=["gui"],
+    stack_size=1 * 1024,
+    fap_icon="game15_10px.png",
+    order=30,
+    fap_category="Games",
+)
diff --git a/applications/plugins/game15/game15.c b/applications/plugins/game15/game15.c
new file mode 100644
index 000000000..d9b059466
--- /dev/null
+++ b/applications/plugins/game15/game15.c
@@ -0,0 +1,468 @@
+#include <furi.h>
+#include <gui/gui.h>
+#include <notification/notification.h>
+#include <notification/notification_messages.h>
+#include <storage/storage.h>
+
+#include "sandbox.h"
+
+#define FPS 20
+#define CELL_WIDTH 10
+#define CELL_HEIGHT 8
+#define MOVE_TICKS 5
+#define KEY_STACK_SIZE 16
+#define SAVING_DIRECTORY "/ext/apps/Games"
+#define SAVING_FILENAME SAVING_DIRECTORY "/game15.save"
+#define POPUP_MENU_ITEMS 2
+
+typedef enum {
+    DirectionNone,
+    DirectionUp,
+    DirectionDown,
+    DirectionLeft,
+    DirectionRight
+} direction_e;
+
+typedef enum { ScenePlay, SceneWin, ScenePopup } scene_e;
+
+typedef struct {
+    uint8_t cell_index;
+    uint8_t zero_index;
+    uint8_t move_direction;
+    uint8_t move_ticks;
+} moving_cell_t;
+
+typedef struct {
+    uint16_t top_record;
+    scene_e scene;
+    uint16_t move_count;
+    uint32_t tick_count;
+    uint8_t board[16];
+} game_state_t;
+
+static game_state_t game_state;
+static NotificationApp* notification;
+static moving_cell_t moving_cell;
+static uint8_t loaded_saving_ticks;
+static uint8_t popup_menu_selected_item;
+
+static const char* popup_menu_strings[] = {"Continue", "Reset"};
+
+static uint8_t keys[KEY_STACK_SIZE];
+static uint8_t key_stack_head = 0;
+
+static const uint8_t pic_cells[] = {
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x30, 0xfc, 0x38, 0xfc, 0x30, 0xfc, 0x30, 0xfc, 0x30, 0xfc, 0x30, 0xfc, 0x30, 0xfc, 0x30, 0xfc,
+    0x78, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0x60, 0xfc, 0x30, 0xfc, 0x18, 0xfc, 0x0c, 0xfc, 0xfc, 0xfc,
+    0x78, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0x60, 0xfc, 0xc0, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0x78, 0xfc,
+    0x70, 0xfc, 0x78, 0xfc, 0x68, 0xfc, 0x6c, 0xfc, 0x6c, 0xfc, 0xec, 0xfc, 0xfc, 0xfc, 0x60, 0xfc,
+    0xfc, 0xfc, 0x0c, 0xfc, 0x0c, 0xfc, 0x7c, 0xfc, 0xc0, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0x78, 0xfc,
+    0x78, 0xfc, 0x0c, 0xfc, 0x0c, 0xfc, 0x7c, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0x78, 0xfc,
+    0xfc, 0xfc, 0xc0, 0xfc, 0xc0, 0xfc, 0xc0, 0xfc, 0xc0, 0xfc, 0xc0, 0xfc, 0xc0, 0xfc, 0xc0, 0xfc,
+    0x78, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0x78, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0x78, 0xfc,
+    0x78, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0xcc, 0xfc, 0xf8, 0xfc, 0xc0, 0xfc, 0xc0, 0xfc, 0x78, 0xfc,
+    0xe6, 0xfd, 0x37, 0xff, 0x36, 0xff, 0x36, 0xff, 0x36, 0xff, 0x36, 0xff, 0x36, 0xff, 0xe6, 0xfd,
+    0x8c, 0xfd, 0xce, 0xfd, 0x8c, 0xfd, 0x8c, 0xfd, 0x8c, 0xfd, 0x8c, 0xfd, 0x8c, 0xfd, 0x8c, 0xfd,
+    0xe6, 0xfd, 0x37, 0xff, 0x36, 0xff, 0x86, 0xfd, 0xc6, 0xfc, 0x66, 0xfc, 0x36, 0xfc, 0xf6, 0xff,
+    0xe6, 0xfd, 0x37, 0xff, 0x36, 0xff, 0x86, 0xfd, 0x06, 0xff, 0x36, 0xff, 0x36, 0xff, 0xe6, 0xfd,
+    0xc6, 0xfd, 0xe7, 0xfd, 0xa6, 0xfd, 0xb6, 0xfd, 0xb6, 0xfd, 0xb6, 0xff, 0xf6, 0xff, 0x86, 0xfd,
+    0xf6, 0xff, 0x37, 0xfc, 0x36, 0xfc, 0xf6, 0xfd, 0x06, 0xff, 0x36, 0xff, 0x36, 0xff, 0xe6, 0xfd,
+};
+
+static const uint8_t pic_digits[] = {
+    0xf0, 0xf2, 0xf2, 0xf2, 0xf2, 0xf0, 0xf9, 0xf8, 0xf9, 0xf9, 0xf9, 0xf0, 0xf0, 0xf2, 0xf3,
+    0xf1, 0xfc, 0xf0, 0xf0, 0xf3, 0xf1, 0xf3, 0xf2, 0xf0, 0xf3, 0xf1, 0xf2, 0xf2, 0xf0, 0xf3,
+    0xf0, 0xfc, 0xf0, 0xf3, 0xf2, 0xf0, 0x00, 0x0c, 0x00, 0x02, 0x02, 0x00, 0x00, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x00, 0x03, 0x03, 0x00,
+};
+
+static const uint8_t pic_top[] = {11, 4, 0x88, 0xf8, 0xad, 0xfa, 0xad, 0xf8, 0x8d, 0xfe};
+static const uint8_t pic_move[] =
+    {17, 4, 0x2e, 0x2a, 0xfe, 0xa4, 0xaa, 0xff, 0xaa, 0x2a, 0xff, 0x2e, 0x36, 0xfe};
+static const uint8_t pic_time[] = {15, 4, 0xa8, 0x8b, 0x2d, 0xe9, 0xad, 0xca, 0xad, 0x8b};
+
+static const uint8_t pic_puzzled[] = {
+    0xff, 0xcf, 0x00, 0xf3, 0xff, 0xfc, 0x3f, 0x03, 0xc0, 0xff, 0xf3, 0x0f, 0xdc, 0xff, 0xcf,
+    0x00, 0xf3, 0xff, 0xfc, 0x3f, 0x03, 0xc0, 0xff, 0xf3, 0x0f, 0xdc, 0x03, 0xcc, 0x00, 0x03,
+    0x38, 0x00, 0x0e, 0x03, 0xc0, 0x00, 0x30, 0x30, 0xdc, 0x03, 0xcc, 0x00, 0x03, 0x1c, 0x00,
+    0x07, 0x03, 0xc0, 0x00, 0x30, 0x30, 0xdc, 0xff, 0xcf, 0x00, 0x03, 0x0e, 0x80, 0x03, 0x03,
+    0xc0, 0xff, 0x33, 0xc0, 0xdc, 0xff, 0xcf, 0x00, 0x03, 0x07, 0xc0, 0x01, 0x03, 0xc0, 0xff,
+    0x33, 0xc0, 0xdc, 0x03, 0xc0, 0x00, 0x83, 0x03, 0xe0, 0x00, 0x03, 0xc0, 0x00, 0x30, 0xc0,
+    0xd0, 0x03, 0xc0, 0x00, 0xc3, 0x01, 0x70, 0x00, 0x03, 0xc0, 0x00, 0x30, 0xc0, 0xd0, 0x03,
+    0xc0, 0xff, 0xf3, 0xff, 0xfc, 0x3f, 0xff, 0xcf, 0xff, 0xf3, 0xff, 0xdc, 0x03, 0xc0, 0xff,
+    0xf3, 0xff, 0xfc, 0x3f, 0xff, 0xcf, 0xff, 0xf3, 0xff, 0xdc};
+
+static void key_stack_init() {
+    key_stack_head = 0;
+}
+
+static uint8_t key_stack_pop() {
+    return keys[--key_stack_head];
+}
+
+static bool key_stack_is_empty() {
+    return key_stack_head == 0;
+}
+
+static int key_stack_push(uint8_t value) {
+    if(key_stack_head != KEY_STACK_SIZE) {
+        keys[key_stack_head] = value;
+        key_stack_head++;
+        return key_stack_head;
+    } else
+        return -1;
+}
+
+static bool storage_game_state_load() {
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    File* file = storage_file_alloc(storage);
+
+    uint16_t bytes_readed = 0;
+    if(storage_file_open(file, SAVING_FILENAME, FSAM_READ, FSOM_OPEN_EXISTING))
+        bytes_readed = storage_file_read(file, &game_state, sizeof(game_state_t));
+    storage_file_close(file);
+    storage_file_free(file);
+    furi_record_close(RECORD_STORAGE);
+    return bytes_readed == sizeof(game_state_t);
+}
+
+static void storage_game_state_save() {
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+
+    if(storage_common_stat(storage, SAVING_DIRECTORY, NULL) == FSE_NOT_EXIST) {
+        if(!storage_simply_mkdir(storage, SAVING_DIRECTORY)) {
+            return;
+        }
+    }
+
+    File* file = storage_file_alloc(storage);
+    if(storage_file_open(file, SAVING_FILENAME, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
+        storage_file_write(file, &game_state, sizeof(game_state_t));
+    }
+    storage_file_close(file);
+    storage_file_free(file);
+    furi_record_close(RECORD_STORAGE);
+}
+
+static void set_moving_cell_by_direction(direction_e direction) {
+    moving_cell.move_direction = DirectionNone;
+    moving_cell.zero_index = 0xff;
+
+    for(int i = 0; i < 16; i++) {
+        if(!game_state.board[i]) {
+            moving_cell.zero_index = i;
+            break;
+        }
+    }
+    if(moving_cell.zero_index == 0xff) return;
+
+    uint8_t x = moving_cell.zero_index % 4;
+    uint8_t y = moving_cell.zero_index / 4;
+
+    moving_cell.cell_index = moving_cell.zero_index;
+
+    if(direction == DirectionUp && y < 3)
+        moving_cell.cell_index += 4;
+    else if(direction == DirectionDown && y > 0)
+        moving_cell.cell_index -= 4;
+    else if(direction == DirectionLeft && x < 3)
+        moving_cell.cell_index++;
+    else if(direction == DirectionRight && x > 0)
+        moving_cell.cell_index--;
+    else
+        return;
+
+    moving_cell.move_ticks = 0;
+    moving_cell.move_direction = direction;
+}
+
+static bool is_board_has_solution() {
+    uint8_t i, j, inv = 0;
+    for(i = 0; i < 16; ++i)
+        if(game_state.board[i])
+            for(j = 0; j < i; ++j)
+                if(game_state.board[j] > game_state.board[i]) ++inv;
+    for(i = 0; i < 16; ++i)
+        if(game_state.board[i] == 0) inv += 1 + i / 4;
+
+    return inv % 2 == 0;
+}
+
+static void board_init() {
+    for(int i = 0; i < 16; i++) {
+        game_state.board[i] = (i + 1) % 16;
+    }
+
+    do {
+        for(int i = 15; i >= 1; i--) {
+            int j = rand() % (i + 1);
+            uint8_t tmp = game_state.board[j];
+            game_state.board[j] = game_state.board[i];
+            game_state.board[i] = tmp;
+        }
+    } while(!is_board_has_solution());
+}
+
+static void game_init() {
+    game_state.scene = ScenePlay;
+    game_state.move_count = 0;
+    game_state.tick_count = 0;
+    moving_cell.move_direction = DirectionNone;
+    board_init();
+    key_stack_init();
+    popup_menu_selected_item = 0;
+}
+
+static bool is_board_solved() {
+    for(int i = 0; i < 16; i++)
+        if(((i + 1) % 16) != game_state.board[i]) return false;
+    return true;
+}
+
+static void game_tick() {
+    switch(game_state.scene) {
+    case ScenePlay:
+        game_state.tick_count++;
+        if(loaded_saving_ticks) loaded_saving_ticks--;
+        if(moving_cell.move_direction == DirectionNone && !key_stack_is_empty()) {
+            set_moving_cell_by_direction(key_stack_pop());
+            if(moving_cell.move_direction == DirectionNone) {
+                notification_message(notification, &sequence_single_vibro);
+                key_stack_init();
+            }
+        }
+
+        if(moving_cell.move_direction != DirectionNone) {
+            moving_cell.move_ticks++;
+            if(moving_cell.move_ticks == MOVE_TICKS) {
+                game_state.board[moving_cell.zero_index] =
+                    game_state.board[moving_cell.cell_index];
+                game_state.board[moving_cell.cell_index] = 0;
+                moving_cell.move_direction = DirectionNone;
+                game_state.move_count++;
+            }
+            if(is_board_solved()) {
+                notification_message(notification, &sequence_double_vibro);
+                if(game_state.move_count < game_state.top_record || game_state.top_record == 0) {
+                    game_state.top_record = game_state.move_count;
+                    storage_game_state_save();
+                }
+                game_state.scene = SceneWin;
+            }
+        }
+        break;
+
+    case SceneWin:
+        if(!key_stack_is_empty()) game_init();
+        break;
+
+    case ScenePopup:
+        if(!key_stack_is_empty()) {
+            switch(key_stack_pop()) {
+            case DirectionDown:
+                popup_menu_selected_item++;
+                popup_menu_selected_item = popup_menu_selected_item % POPUP_MENU_ITEMS;
+                break;
+            case DirectionUp:
+                popup_menu_selected_item--;
+                popup_menu_selected_item = popup_menu_selected_item % POPUP_MENU_ITEMS;
+                break;
+            case DirectionNone:
+                if(popup_menu_selected_item == 0) {
+                    game_state.scene = ScenePlay;
+                    notification_message(notification, &sequence_single_vibro);
+                } else if(popup_menu_selected_item == 1) {
+                    notification_message(notification, &sequence_single_vibro);
+                    game_init();
+                }
+                break;
+            }
+        }
+        break;
+    }
+}
+
+static void draw_cell(Canvas* canvas, uint8_t x, uint8_t y, uint8_t cell_number) {
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_rframe(canvas, x, y, 18, 14, 1);
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_xbm(canvas, x + 4, y + 3, CELL_WIDTH, CELL_HEIGHT, pic_cells + cell_number * 16);
+}
+
+static void board_draw(Canvas* canvas) {
+    for(int i = 0; i < 16; i++) {
+        if(game_state.board[i]) {
+            if(moving_cell.move_direction == DirectionNone || moving_cell.cell_index != i)
+                draw_cell(canvas, (i % 4) * 20 + 7, (i / 4) * 16 + 1, game_state.board[i]);
+            if(moving_cell.move_direction != DirectionNone && moving_cell.cell_index == i) {
+                uint8_t from_x = (moving_cell.cell_index % 4) * 20 + 7;
+                uint8_t from_y = (moving_cell.cell_index / 4) * 16 + 1;
+                uint8_t to_x = (moving_cell.zero_index % 4) * 20 + 7;
+                uint8_t to_y = (moving_cell.zero_index / 4) * 16 + 1;
+                int now_x = from_x + (to_x - from_x) * moving_cell.move_ticks / MOVE_TICKS;
+                int now_y = from_y + (to_y - from_y) * moving_cell.move_ticks / MOVE_TICKS;
+                draw_cell(canvas, now_x, now_y, game_state.board[i]);
+            }
+        }
+    }
+}
+
+static void number_draw(Canvas* canvas, uint8_t y, uint32_t value) {
+    uint8_t x = 121;
+    while(true) {
+        uint8_t digit = value % 10;
+        canvas_draw_xbm(canvas, x, y, 4, 6, pic_digits + digit * 6);
+        x -= 5;
+        value = value / 10;
+        if(!value) break;
+    }
+}
+
+static void plate_draw(
+    Canvas* canvas,
+    uint8_t y,
+    const uint8_t* header,
+    uint32_t value,
+    bool dont_draw_zero_value) {
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_rbox(canvas, 92, y, 35, 19, 2);
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_xbm(canvas, 95, y + 3, header[0], header[1], &header[2]);
+    if((!value && !dont_draw_zero_value) || value) number_draw(canvas, y + 10, value);
+}
+
+static void info_draw(Canvas* canvas) {
+    plate_draw(canvas, 1, pic_top, game_state.top_record, true);
+    plate_draw(canvas, 22, pic_move, game_state.move_count, false);
+    plate_draw(canvas, 43, pic_time, game_state.tick_count / FPS, false);
+}
+
+static void gray_screen(Canvas* const canvas) {
+    canvas_set_color(canvas, ColorWhite);
+    for(int x = 0; x < 128; x += 2) {
+        for(int y = 0; y < 64; y++) {
+            canvas_draw_dot(canvas, x + (y % 2 == 1 ? 0 : 1), y);
+        }
+    }
+}
+
+static void render_callback(Canvas* const canvas) {
+    canvas_set_color(canvas, ColorWhite);
+    canvas_draw_box(canvas, 0, 0, 128, 64);
+
+    if(game_state.scene == ScenePlay || game_state.scene == SceneWin ||
+       game_state.scene == ScenePopup) {
+        canvas_set_color(canvas, ColorBlack);
+        board_draw(canvas);
+        info_draw(canvas);
+
+        if(loaded_saving_ticks && game_state.scene != ScenePopup) {
+            canvas_set_color(canvas, ColorWhite);
+            canvas_draw_rbox(canvas, 20, 24, 88, 16, 4);
+            canvas_set_color(canvas, ColorBlack);
+            canvas_draw_rframe(canvas, 20, 24, 88, 16, 4);
+            canvas_draw_str_aligned(canvas, 64, 32, AlignCenter, AlignCenter, "Restore game ...");
+        }
+    }
+
+    if(game_state.scene == SceneWin) {
+        gray_screen(canvas);
+        canvas_draw_box(canvas, 7, 20, 114, 24);
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_box(canvas, 8, 21, 112, 22);
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_box(canvas, 10, 23, 108, 18);
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_xbm(canvas, 14, 27, 100, 10, pic_puzzled);
+    } else if(game_state.scene == ScenePopup) {
+        gray_screen(canvas);
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_rbox(canvas, 28, 16, 72, 32, 4);
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_rframe(canvas, 28, 16, 72, 32, 4);
+
+        for(int i = 0; i < POPUP_MENU_ITEMS; i++) {
+            if(i == popup_menu_selected_item) {
+                canvas_set_color(canvas, ColorBlack);
+                canvas_draw_box(canvas, 34, 20 + 12 * i, 60, 12);
+            }
+
+            canvas_set_color(canvas, i == popup_menu_selected_item ? ColorWhite : ColorBlack);
+            canvas_draw_str_aligned(
+                canvas, 64, 26 + 12 * i, AlignCenter, AlignCenter, popup_menu_strings[i]);
+        }
+    }
+}
+
+static void game_event_handler(GameEvent const event) {
+    if(event.type == EventTypeKey) {
+        if(event.input.type == InputTypePress) {
+            switch(event.input.key) {
+            case InputKeyUp:
+                key_stack_push(DirectionUp);
+                break;
+            case InputKeyDown:
+                key_stack_push(DirectionDown);
+                break;
+            case InputKeyRight:
+                key_stack_push(DirectionRight);
+                break;
+            case InputKeyLeft:
+                key_stack_push(DirectionLeft);
+                break;
+            case InputKeyOk:
+                if(game_state.scene == ScenePlay) {
+                    game_state.scene = ScenePopup;
+                    key_stack_init();
+                } else
+                    key_stack_push(DirectionNone);
+                break;
+            case InputKeyBack:
+                if(game_state.scene == ScenePopup) {
+                    game_state.scene = ScenePlay;
+                } else {
+                    storage_game_state_save();
+                    sandbox_loop_exit();
+                }
+                break;
+            default:
+                break;
+            }
+        }
+    } else if(event.type == EventTypeTick) {
+        game_tick();
+    }
+}
+
+static void game_alloc() {
+    key_stack_init();
+    notification = furi_record_open(RECORD_NOTIFICATION);
+    notification_message_block(notification, &sequence_display_backlight_enforce_on);
+}
+
+static void game_free() {
+    notification_message_block(notification, &sequence_display_backlight_enforce_auto);
+    furi_record_close(RECORD_NOTIFICATION);
+}
+
+int32_t game15_app() {
+    game_alloc();
+    game_init();
+
+    loaded_saving_ticks = 0;
+    if(storage_game_state_load()) {
+        if(game_state.scene != ScenePlay)
+            game_init();
+        else
+            loaded_saving_ticks = FPS;
+    } else
+        game_init();
+
+    sandbox_init(
+        FPS, (SandboxRenderCallback)render_callback, (SandboxEventHandler)game_event_handler);
+    sandbox_loop();
+    sandbox_free();
+    game_free();
+    return 0;
+}
diff --git a/applications/plugins/game15/game15_10px.png b/applications/plugins/game15/game15_10px.png
new file mode 100644
index 000000000..16c4f1038
Binary files /dev/null and b/applications/plugins/game15/game15_10px.png differ
diff --git a/applications/plugins/game15/images/Game15.png b/applications/plugins/game15/images/Game15.png
new file mode 100644
index 000000000..f13c2907b
Binary files /dev/null and b/applications/plugins/game15/images/Game15.png differ
diff --git a/applications/plugins/game15/images/Game15Popup.png b/applications/plugins/game15/images/Game15Popup.png
new file mode 100644
index 000000000..1df14729f
Binary files /dev/null and b/applications/plugins/game15/images/Game15Popup.png differ
diff --git a/applications/plugins/game15/images/Game15Restore.png b/applications/plugins/game15/images/Game15Restore.png
new file mode 100644
index 000000000..05aac27f6
Binary files /dev/null and b/applications/plugins/game15/images/Game15Restore.png differ
diff --git a/applications/plugins/game15/sandbox.c b/applications/plugins/game15/sandbox.c
new file mode 100644
index 000000000..e3b759fc8
--- /dev/null
+++ b/applications/plugins/game15/sandbox.c
@@ -0,0 +1,93 @@
+#include <furi.h>
+#include <gui/gui.h>
+#include "sandbox.h"
+
+FuriMessageQueue* sandbox_event_queue;
+FuriMutex** sandbox_mutex;
+ViewPort* sandbox_view_port;
+Gui* sandbox_gui;
+FuriTimer* sandbox_timer;
+bool sandbox_loop_processing;
+SandboxRenderCallback sandbox_user_render_callback;
+SandboxEventHandler sandbox_user_event_handler;
+
+static void sandbox_render_callback(Canvas* const canvas, void* context) {
+    UNUSED(context);
+    if(furi_mutex_acquire(sandbox_mutex, 25) != FuriStatusOk) return;
+
+    if(sandbox_user_render_callback) sandbox_user_render_callback(canvas);
+
+    furi_mutex_release(sandbox_mutex);
+}
+
+static void sandbox_input_callback(InputEvent* input_event, void* context) {
+    UNUSED(context);
+    GameEvent event = {.type = EventTypeKey, .input = *input_event};
+    furi_message_queue_put(sandbox_event_queue, &event, FuriWaitForever);
+}
+
+static void sandbox_timer_callback(void* context) {
+    UNUSED(context);
+    GameEvent event = {.type = EventTypeTick};
+    furi_message_queue_put(sandbox_event_queue, &event, 0);
+}
+
+void sandbox_loop() {
+    sandbox_loop_processing = true;
+    while(sandbox_loop_processing) {
+        GameEvent event;
+        FuriStatus event_status = furi_message_queue_get(sandbox_event_queue, &event, 100);
+        if(event_status != FuriStatusOk) {
+            // timeout
+            continue;
+        }
+
+        furi_mutex_acquire(sandbox_mutex, FuriWaitForever);
+
+        if(sandbox_user_event_handler) sandbox_user_event_handler(event);
+
+        view_port_update(sandbox_view_port);
+        furi_mutex_release(sandbox_mutex);
+    }
+}
+
+void sandbox_loop_exit() {
+    sandbox_loop_processing = false;
+}
+
+void sandbox_init(
+    uint8_t fps,
+    SandboxRenderCallback u_render_callback,
+    SandboxEventHandler u_event_handler) {
+    sandbox_user_render_callback = u_render_callback;
+    sandbox_user_event_handler = u_event_handler;
+
+    sandbox_event_queue = furi_message_queue_alloc(8, sizeof(GameEvent));
+    sandbox_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
+
+    sandbox_view_port = view_port_alloc();
+    view_port_draw_callback_set(sandbox_view_port, sandbox_render_callback, NULL);
+    view_port_input_callback_set(sandbox_view_port, sandbox_input_callback, NULL);
+
+    sandbox_gui = furi_record_open(RECORD_GUI);
+    gui_add_view_port(sandbox_gui, sandbox_view_port, GuiLayerFullscreen);
+
+    if(fps > 0) {
+        sandbox_timer = furi_timer_alloc(sandbox_timer_callback, FuriTimerTypePeriodic, NULL);
+        furi_timer_start(sandbox_timer, furi_kernel_get_tick_frequency() / fps);
+    } else
+        sandbox_timer = NULL;
+}
+
+void sandbox_free() {
+    if(sandbox_timer) furi_timer_free(sandbox_timer);
+
+    gui_remove_view_port(sandbox_gui, sandbox_view_port);
+    view_port_enabled_set(sandbox_view_port, false);
+    view_port_free(sandbox_view_port);
+
+    if(furi_mutex_acquire(sandbox_mutex, FuriWaitForever) == FuriStatusOk) {
+        furi_mutex_free(sandbox_mutex);
+    }
+    furi_message_queue_free(sandbox_event_queue);
+}
diff --git a/applications/plugins/game15/sandbox.h b/applications/plugins/game15/sandbox.h
new file mode 100644
index 000000000..ea7dff37b
--- /dev/null
+++ b/applications/plugins/game15/sandbox.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <input/input.h>
+
+typedef enum {
+    EventTypeTick,
+    EventTypeKey,
+} EventType;
+
+typedef struct {
+    EventType type;
+    InputEvent input;
+} GameEvent;
+
+typedef void (*SandboxRenderCallback)(Canvas* canvas);
+typedef void (*SandboxEventHandler)(GameEvent event);
+
+void sandbox_init(
+    uint8_t fps,
+    SandboxRenderCallback render_callback,
+    SandboxEventHandler event_handler);
+void sandbox_loop();
+void sandbox_loop_exit();
+void sandbox_free();
diff --git a/applications/plugins/gps_nmea_uart/README.md b/applications/plugins/gps_nmea_uart/README.md
index 5e36dabda..7af0fa3b3 100644
--- a/applications/plugins/gps_nmea_uart/README.md
+++ b/applications/plugins/gps_nmea_uart/README.md
@@ -1,6 +1,7 @@
 # GPS for Flipper Zero
 
 [Original link](https://github.com/ezod/flipperzero-gps)
+
 [Adafruit Ultimate GPS Breakout].
 
 ![ui](ui.png)
diff --git a/applications/plugins/gps_nmea_uart/gps.c b/applications/plugins/gps_nmea_uart/gps.c
index 1df4882b5..62053cede 100644
--- a/applications/plugins/gps_nmea_uart/gps.c
+++ b/applications/plugins/gps_nmea_uart/gps.c
@@ -110,11 +110,11 @@ int32_t gps_app(void* p) {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
-        } else {
-            FURI_LOG_D("GPS", "FuriMessageQueue: event timeout");
         }
 
         view_port_update(view_port);
diff --git a/applications/plugins/hc_sr04/application.fam b/applications/plugins/hc_sr04/application.fam
index 17599b5d1..ad451a102 100644
--- a/applications/plugins/hc_sr04/application.fam
+++ b/applications/plugins/hc_sr04/application.fam
@@ -1,6 +1,6 @@
 App(
     appid="hc_sr04",
-    name="HC-SR04 Dist. Sensor",
+    name="[HC-SR] Dist. Sensor",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="hc_sr04_app",
     cdefines=["APP_HC_SR04"],
diff --git a/applications/plugins/hc_sr04/hc_sr04.c b/applications/plugins/hc_sr04/hc_sr04.c
index 911e92dc6..dbbf4f3ec 100644
--- a/applications/plugins/hc_sr04/hc_sr04.c
+++ b/applications/plugins/hc_sr04/hc_sr04.c
@@ -230,6 +230,8 @@ int32_t hc_sr04_app() {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
diff --git a/applications/plugins/heap_defence_game/heap_defence.c b/applications/plugins/heap_defence_game/heap_defence.c
index c4375bafe..e43bcf425 100644
--- a/applications/plugins/heap_defence_game/heap_defence.c
+++ b/applications/plugins/heap_defence_game/heap_defence.c
@@ -500,7 +500,6 @@ static void heap_defense_timer_callback(FuriMessageQueue* event_queue) {
 
 int32_t heap_defence_app(void* p) {
     UNUSED(p);
-    srand(DWT->CYCCNT);
 
     //FURI_LOG_W(TAG, "Heap defence start %d", __LINE__);
     FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(GameEvent));
diff --git a/applications/plugins/temperature_sensor/Readme.md b/applications/plugins/htu21d_temp_sensor/Readme.md
similarity index 100%
rename from applications/plugins/temperature_sensor/Readme.md
rename to applications/plugins/htu21d_temp_sensor/Readme.md
diff --git a/applications/plugins/temperature_sensor/application.fam b/applications/plugins/htu21d_temp_sensor/application.fam
similarity index 89%
rename from applications/plugins/temperature_sensor/application.fam
rename to applications/plugins/htu21d_temp_sensor/application.fam
index f465c5c93..b3101f42e 100644
--- a/applications/plugins/temperature_sensor/application.fam
+++ b/applications/plugins/htu21d_temp_sensor/application.fam
@@ -1,6 +1,6 @@
 App(
     appid="temperature_sensor",
-    name="[HTU21D] Temp Sensor",
+    name="[HTU21D] Temp. Sensor",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="temperature_sensor_app",
     cdefines=["APP_TEMPERATURE_SENSOR"],
diff --git a/applications/plugins/temperature_sensor/docs/App.png b/applications/plugins/htu21d_temp_sensor/docs/App.png
similarity index 100%
rename from applications/plugins/temperature_sensor/docs/App.png
rename to applications/plugins/htu21d_temp_sensor/docs/App.png
diff --git a/applications/plugins/temperature_sensor/docs/Connection.png b/applications/plugins/htu21d_temp_sensor/docs/Connection.png
similarity index 100%
rename from applications/plugins/temperature_sensor/docs/Connection.png
rename to applications/plugins/htu21d_temp_sensor/docs/Connection.png
diff --git a/applications/plugins/temperature_sensor/docs/Flipper.png b/applications/plugins/htu21d_temp_sensor/docs/Flipper.png
similarity index 100%
rename from applications/plugins/temperature_sensor/docs/Flipper.png
rename to applications/plugins/htu21d_temp_sensor/docs/Flipper.png
diff --git a/applications/plugins/temperature_sensor/temperature_sensor.c b/applications/plugins/htu21d_temp_sensor/temperature_sensor.c
similarity index 100%
rename from applications/plugins/temperature_sensor/temperature_sensor.c
rename to applications/plugins/htu21d_temp_sensor/temperature_sensor.c
diff --git a/applications/plugins/htu21d_temp_sensor/temperature_sensor.png b/applications/plugins/htu21d_temp_sensor/temperature_sensor.png
new file mode 100644
index 000000000..b6fe6d7fe
Binary files /dev/null and b/applications/plugins/htu21d_temp_sensor/temperature_sensor.png differ
diff --git a/applications/plugins/metronome/metronome.c b/applications/plugins/metronome/metronome.c
index e0770f2f8..0afa15a36 100644
--- a/applications/plugins/metronome/metronome.c
+++ b/applications/plugins/metronome/metronome.c
@@ -318,6 +318,8 @@ int32_t metronome_app() {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 } else if(event.input.type == InputTypeLong) {
                     // hold events
@@ -338,6 +340,8 @@ int32_t metronome_app() {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 } else if(event.input.type == InputTypeRepeat) {
                     // repeat events
@@ -357,6 +361,8 @@ int32_t metronome_app() {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
diff --git a/applications/plugins/minesweeper/minesweeper.c b/applications/plugins/minesweeper/minesweeper.c
index 95044c04c..fa9fdcc78 100644
--- a/applications/plugins/minesweeper/minesweeper.c
+++ b/applications/plugins/minesweeper/minesweeper.c
@@ -476,6 +476,8 @@ int32_t minesweeper_app(void* p) {
                         // Exit the plugin
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 } else if(event.input.type == InputTypeLong) {
                     // hold events
@@ -493,6 +495,8 @@ int32_t minesweeper_app(void* p) {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
diff --git a/applications/plugins/morse_code/morse_code.c b/applications/plugins/morse_code/morse_code.c
index 0b4790721..a29454371 100644
--- a/applications/plugins/morse_code/morse_code.c
+++ b/applications/plugins/morse_code/morse_code.c
@@ -27,7 +27,6 @@ typedef struct {
     MorseCodeWorker* worker;
 } MorseCode;
 
-
 static void render_callback(Canvas* const canvas, void* ctx) {
     MorseCode* morse_code = ctx;
     furi_check(furi_mutex_acquire(morse_code->model_mutex, FuriWaitForever) == FuriStatusOk);
@@ -35,20 +34,26 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     canvas_set_font(canvas, FontPrimary);
 
     //write words
-    elements_multiline_text_aligned(canvas, 64, 30, AlignCenter, AlignCenter, furi_string_get_cstr(morse_code->model->words));
-    
-     // volume view_port
+    elements_multiline_text_aligned(
+        canvas, 64, 30, AlignCenter, AlignCenter, furi_string_get_cstr(morse_code->model->words));
+
+    // volume view_port
     uint8_t vol_bar_x_pos = 124;
     uint8_t vol_bar_y_pos = 0;
-    const uint8_t volume_h =
-        (64 / (COUNT_OF(MORSE_CODE_VOLUMES) - 1)) * morse_code->model->volume;
+    const uint8_t volume_h = (64 / (COUNT_OF(MORSE_CODE_VOLUMES) - 1)) * morse_code->model->volume;
     canvas_draw_frame(canvas, vol_bar_x_pos, vol_bar_y_pos, 4, 64);
     canvas_draw_box(canvas, vol_bar_x_pos, vol_bar_y_pos + (64 - volume_h), 4, volume_h);
 
     //dit bpm
     canvas_draw_str_aligned(
-        canvas, 0, 10, AlignLeft, AlignCenter, furi_string_get_cstr(furi_string_alloc_printf("Dit: %ld ms", morse_code->model->dit_delta)));
-    
+        canvas,
+        0,
+        10,
+        AlignLeft,
+        AlignCenter,
+        furi_string_get_cstr(
+            furi_string_alloc_printf("Dit: %ld ms", morse_code->model->dit_delta)));
+
     //button info
     elements_button_center(canvas, "Press/Hold");
     furi_mutex_release(morse_code->model_mutex);
@@ -59,9 +64,7 @@ static void input_callback(InputEvent* input_event, void* ctx) {
     furi_message_queue_put(morse_code->input_queue, input_event, FuriWaitForever);
 }
 
-static void morse_code_worker_callback(
-    FuriString* words,
-    void* context) {
+static void morse_code_worker_callback(FuriString* words, void* context) {
     MorseCode* morse_code = context;
     furi_check(furi_mutex_acquire(morse_code->model_mutex, FuriWaitForever) == FuriStatusOk);
     morse_code->model->words = words;
@@ -115,45 +118,45 @@ int32_t morse_code_app() {
     InputEvent input;
     morse_code_worker_start(morse_code->worker);
     morse_code_worker_set_volume(
-                    morse_code->worker, MORSE_CODE_VOLUMES[morse_code->model->volume]);
-    morse_code_worker_set_dit_delta(morse_code->worker,  morse_code->model->dit_delta);
-    while(furi_message_queue_get(morse_code->input_queue, &input, FuriWaitForever) == FuriStatusOk){
+        morse_code->worker, MORSE_CODE_VOLUMES[morse_code->model->volume]);
+    morse_code_worker_set_dit_delta(morse_code->worker, morse_code->model->dit_delta);
+    while(furi_message_queue_get(morse_code->input_queue, &input, FuriWaitForever) ==
+          FuriStatusOk) {
         furi_check(furi_mutex_acquire(morse_code->model_mutex, FuriWaitForever) == FuriStatusOk);
         if(input.key == InputKeyBack) {
-                furi_mutex_release(morse_code->model_mutex);
-                break;
-        }else if(input.key == InputKeyOk){
-                if(input.type == InputTypePress)
-                    morse_code_worker_play(morse_code->worker, true);
-                else if(input.type == InputTypeRelease)
-                    morse_code_worker_play(morse_code->worker, false);
-            }else if(input.key == InputKeyUp && input.type == InputTypePress){
-                 if(morse_code->model->volume < COUNT_OF(MORSE_CODE_VOLUMES) - 1)
-                    morse_code->model->volume++;
-                morse_code_worker_set_volume(
-                    morse_code->worker, MORSE_CODE_VOLUMES[morse_code->model->volume]);
-            }else if(input.key == InputKeyDown && input.type == InputTypePress){
-                 if(morse_code->model->volume > 0) 
-                    morse_code->model->volume--;
-                morse_code_worker_set_volume(
-                    morse_code->worker, MORSE_CODE_VOLUMES[morse_code->model->volume]);
-            }else if(input.key == InputKeyLeft && input.type == InputTypePress){
-                 if(morse_code->model->dit_delta > 10) 
-                    morse_code->model->dit_delta-=10;
-                morse_code_worker_set_dit_delta(
-                    morse_code->worker,  morse_code->model->dit_delta);
-            }
-            else if(input.key == InputKeyRight && input.type == InputTypePress){
-                 if(morse_code->model->dit_delta >= 10) 
-                    morse_code->model->dit_delta+=10;
-                morse_code_worker_set_dit_delta(
-                    morse_code->worker,  morse_code->model->dit_delta);
-            }
-                
-        FURI_LOG_D("Input", "%s %s %ld", input_get_key_name(input.key), input_get_type_name(input.type), input.sequence);
-        
+            furi_mutex_release(morse_code->model_mutex);
+            break;
+        } else if(input.key == InputKeyOk) {
+            if(input.type == InputTypePress)
+                morse_code_worker_play(morse_code->worker, true);
+            else if(input.type == InputTypeRelease)
+                morse_code_worker_play(morse_code->worker, false);
+        } else if(input.key == InputKeyUp && input.type == InputTypePress) {
+            if(morse_code->model->volume < COUNT_OF(MORSE_CODE_VOLUMES) - 1)
+                morse_code->model->volume++;
+            morse_code_worker_set_volume(
+                morse_code->worker, MORSE_CODE_VOLUMES[morse_code->model->volume]);
+        } else if(input.key == InputKeyDown && input.type == InputTypePress) {
+            if(morse_code->model->volume > 0) morse_code->model->volume--;
+            morse_code_worker_set_volume(
+                morse_code->worker, MORSE_CODE_VOLUMES[morse_code->model->volume]);
+        } else if(input.key == InputKeyLeft && input.type == InputTypePress) {
+            if(morse_code->model->dit_delta > 10) morse_code->model->dit_delta -= 10;
+            morse_code_worker_set_dit_delta(morse_code->worker, morse_code->model->dit_delta);
+        } else if(input.key == InputKeyRight && input.type == InputTypePress) {
+            if(morse_code->model->dit_delta >= 10) morse_code->model->dit_delta += 10;
+            morse_code_worker_set_dit_delta(morse_code->worker, morse_code->model->dit_delta);
+        }
+
+        FURI_LOG_D(
+            "Input",
+            "%s %s %ld",
+            input_get_key_name(input.key),
+            input_get_type_name(input.type),
+            input.sequence);
+
         furi_mutex_release(morse_code->model_mutex);
-        view_port_update(morse_code->view_port);  
+        view_port_update(morse_code->view_port);
     }
     morse_code_worker_stop(morse_code->worker);
     morse_code_free(morse_code);
diff --git a/applications/plugins/morse_code/morse_code_worker.c b/applications/plugins/morse_code/morse_code_worker.c
index 54ee747c5..b465abc5b 100644
--- a/applications/plugins/morse_code/morse_code_worker.c
+++ b/applications/plugins/morse_code/morse_code_worker.c
@@ -2,19 +2,20 @@
 #include <furi_hal.h>
 #include <lib/flipper_format/flipper_format.h>
 
-
 #define TAG "MorseCodeWorker"
 
 #define MORSE_CODE_VERSION 0
 
 //A-Z0-1
-const char morse_array[36][6] ={
-    ".-", "-...", "-.-.", "-..", ".", "..-.", "--.", "....", "..", ".---", "-.-", ".-..", "--", "-.", "---", ".--.",
-    "--.-", ".-.", "...", "-", "..-", "...-", ".--", "-..-", "-.--", "--..", ".----", "..---", "...--", "....-", ".....",
-    "-....", "--...", "---..", "----.", "-----"
-    };
-const char symbol_array[36] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-    'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
+const char morse_array[36][6] = {".-",    "-...",  "-.-.",  "-..",   ".",     "..-.",
+                                 "--.",   "....",  "..",    ".---",  "-.-",   ".-..",
+                                 "--",    "-.",    "---",   ".--.",  "--.-",  ".-.",
+                                 "...",   "-",     "..-",   "...-",  ".--",   "-..-",
+                                 "-.--",  "--..",  ".----", "..---", "...--", "....-",
+                                 ".....", "-....", "--...", "---..", "----.", "-----"};
+const char symbol_array[36] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+                               'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+                               'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
 
 struct MorseCodeWorker {
     FuriThread* thread;
@@ -28,31 +29,28 @@ struct MorseCodeWorker {
     FuriString* words;
 };
 
-void morse_code_worker_fill_buffer(MorseCodeWorker* instance, uint32_t duration){
+void morse_code_worker_fill_buffer(MorseCodeWorker* instance, uint32_t duration) {
     FURI_LOG_D("MorseCode: Duration", "%ld", duration);
-    if( duration <= instance->dit_delta)
+    if(duration <= instance->dit_delta)
         furi_string_push_back(instance->buffer, *DOT);
     else if(duration <= (instance->dit_delta * 3))
         furi_string_push_back(instance->buffer, *LINE);
-    if(furi_string_size(instance->buffer) > 5)
-        furi_string_reset(instance->buffer);
+    if(furi_string_size(instance->buffer) > 5) furi_string_reset(instance->buffer);
     FURI_LOG_D("MorseCode: Buffer", "%s", furi_string_get_cstr(instance->buffer));
 }
 
-void morse_code_worker_fill_letter(MorseCodeWorker* instance){
-    if(furi_string_size(instance->words) > 63)
-        furi_string_reset(instance->words);
-    for (size_t i = 0; i < sizeof(morse_array); i++){
-            if(furi_string_cmp_str(instance->buffer, morse_array[i]) == 0){
-                furi_string_push_back(instance->words, symbol_array[i]);
-                furi_string_reset(instance->buffer);
-                break;
-            }        
+void morse_code_worker_fill_letter(MorseCodeWorker* instance) {
+    if(furi_string_size(instance->words) > 63) furi_string_reset(instance->words);
+    for(size_t i = 0; i < sizeof(morse_array); i++) {
+        if(furi_string_cmp_str(instance->buffer, morse_array[i]) == 0) {
+            furi_string_push_back(instance->words, symbol_array[i]);
+            furi_string_reset(instance->buffer);
+            break;
         }
+    }
     FURI_LOG_D("MorseCode: Words", "%s", furi_string_get_cstr(instance->words));
 }
 
-
 static int32_t morse_code_worker_thread_callback(void* context) {
     furi_assert(context);
     MorseCodeWorker* instance = context;
@@ -61,16 +59,16 @@ static int32_t morse_code_worker_thread_callback(void* context) {
     uint32_t end_tick = 0;
     bool pushed = true;
     bool spaced = true;
-    while(instance->is_running){
+    while(instance->is_running) {
         furi_delay_ms(SLEEP);
-        if(instance->play){
-            if(!was_playing){
+        if(instance->play) {
+            if(!was_playing) {
                 start_tick = furi_get_tick();
                 furi_hal_speaker_start(FREQUENCY, instance->volume);
                 was_playing = true;
             }
-        }else{
-            if(was_playing){
+        } else {
+            if(was_playing) {
                 pushed = false;
                 spaced = false;
                 furi_hal_speaker_stop();
@@ -80,21 +78,21 @@ static int32_t morse_code_worker_thread_callback(void* context) {
                 start_tick = 0;
             }
         }
-       if(!pushed){
-            if(end_tick + (instance->dit_delta * 3) < furi_get_tick()){
+        if(!pushed) {
+            if(end_tick + (instance->dit_delta * 3) < furi_get_tick()) {
                 //NEW LETTER
                 morse_code_worker_fill_letter(instance);
                 if(instance->callback)
-                        instance->callback(instance->words, instance->callback_context);
+                    instance->callback(instance->words, instance->callback_context);
                 pushed = true;
             }
         }
-        if(!spaced){
-            if(end_tick + (instance->dit_delta * 7) < furi_get_tick()){
+        if(!spaced) {
+            if(end_tick + (instance->dit_delta * 7) < furi_get_tick()) {
                 //NEW WORD
                 furi_string_push_back(instance->words, *SPACE);
                 if(instance->callback)
-                        instance->callback(instance->words, instance->callback_context);
+                    instance->callback(instance->words, instance->callback_context);
                 spaced = true;
             }
         }
@@ -132,17 +130,17 @@ void morse_code_worker_set_callback(
     instance->callback_context = context;
 }
 
-void morse_code_worker_play(MorseCodeWorker* instance, bool play){
+void morse_code_worker_play(MorseCodeWorker* instance, bool play) {
     furi_assert(instance);
     instance->play = play;
 }
 
-void morse_code_worker_set_volume(MorseCodeWorker* instance, float level){
+void morse_code_worker_set_volume(MorseCodeWorker* instance, float level) {
     furi_assert(instance);
     instance->volume = level;
 }
 
-void morse_code_worker_set_dit_delta(MorseCodeWorker* instance, uint32_t delta){
+void morse_code_worker_set_dit_delta(MorseCodeWorker* instance, uint32_t delta) {
     furi_assert(instance);
     instance->dit_delta = delta;
 }
diff --git a/applications/plugins/morse_code/morse_code_worker.h b/applications/plugins/morse_code/morse_code_worker.h
index cc84a2674..524876476 100644
--- a/applications/plugins/morse_code/morse_code_worker.h
+++ b/applications/plugins/morse_code/morse_code_worker.h
@@ -10,9 +10,7 @@
 #define LINE "-"
 #define SPACE " "
 
-typedef void (*MorseCodeWorkerCallback)(
-    FuriString* buffer,
-    void* context);
+typedef void (*MorseCodeWorkerCallback)(FuriString* buffer, void* context);
 
 typedef struct MorseCodeWorker MorseCodeWorker;
 
@@ -34,9 +32,3 @@ void morse_code_worker_play(MorseCodeWorker* instance, bool play);
 void morse_code_worker_set_volume(MorseCodeWorker* instance, float level);
 
 void morse_code_worker_set_dit_delta(MorseCodeWorker* instance, uint32_t delta);
-
-
-
-
-
-
diff --git a/applications/plugins/mousejacker/mousejacker.c b/applications/plugins/mousejacker/mousejacker.c
index e050f0a25..3b1b2e6f7 100644
--- a/applications/plugins/mousejacker/mousejacker.c
+++ b/applications/plugins/mousejacker/mousejacker.c
@@ -372,6 +372,8 @@ int32_t mousejacker_app(void* p) {
                         plugin_state->close_thread_please = false;
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
@@ -382,7 +384,7 @@ int32_t mousejacker_app(void* p) {
     }
 
     furi_thread_free(plugin_state->mjthread);
-    furi_hal_spi_release(nrf24_HANDLE);
+    nrf24_deinit();
     view_port_enabled_set(view_port, false);
     gui_remove_view_port(gui, view_port);
     furi_record_close(RECORD_GUI);
diff --git a/applications/plugins/nfc_magic/application.fam b/applications/plugins/nfc_magic/application.fam
new file mode 100644
index 000000000..1f324e85f
--- /dev/null
+++ b/applications/plugins/nfc_magic/application.fam
@@ -0,0 +1,20 @@
+App(
+    appid="nfc_magic",
+    name="NFC Magic",
+    apptype=FlipperAppType.EXTERNAL,
+    entry_point="nfc_magic_app",
+    requires=[
+        "storage",
+        "gui",
+    ],
+    stack_size=4 * 1024,
+    order=30,
+    fap_icon="../../../assets/icons/Archive/Nfc_10px.png",
+    fap_category="Tools",
+    fap_private_libs=[
+        Lib(
+            name="magic",
+        ),
+    ],
+    fap_icon_assets="assets",
+)
diff --git a/applications/plugins/nfc_magic/assets/DolphinCommon_56x48.png b/applications/plugins/nfc_magic/assets/DolphinCommon_56x48.png
new file mode 100644
index 000000000..089aaed83
Binary files /dev/null and b/applications/plugins/nfc_magic/assets/DolphinCommon_56x48.png differ
diff --git a/applications/plugins/nfc_magic/assets/DolphinNice_96x59.png b/applications/plugins/nfc_magic/assets/DolphinNice_96x59.png
new file mode 100644
index 000000000..a299d3630
Binary files /dev/null and b/applications/plugins/nfc_magic/assets/DolphinNice_96x59.png differ
diff --git a/applications/plugins/nfc_magic/assets/Loading_24.png b/applications/plugins/nfc_magic/assets/Loading_24.png
new file mode 100644
index 000000000..93a59fe68
Binary files /dev/null and b/applications/plugins/nfc_magic/assets/Loading_24.png differ
diff --git a/applications/plugins/nfc_magic/assets/NFC_manual_60x50.png b/applications/plugins/nfc_magic/assets/NFC_manual_60x50.png
new file mode 100644
index 000000000..787c0bcfe
Binary files /dev/null and b/applications/plugins/nfc_magic/assets/NFC_manual_60x50.png differ
diff --git a/applications/plugins/nfc_magic/lib/magic/magic.c b/applications/plugins/nfc_magic/lib/magic/magic.c
new file mode 100644
index 000000000..3cfca748b
--- /dev/null
+++ b/applications/plugins/nfc_magic/lib/magic/magic.c
@@ -0,0 +1,214 @@
+#include "magic.h"
+
+#include <furi_hal_nfc.h>
+
+#define TAG "Magic"
+
+#define MAGIC_CMD_WUPA (0x40)
+#define MAGIC_CMD_WIPE (0x41)
+#define MAGIC_CMD_READ (0x43)
+#define MAGIC_CMD_WRITE (0x43)
+
+#define MAGIC_MIFARE_READ_CMD (0x30)
+#define MAGIC_MIFARE_WRITE_CMD (0xA0)
+
+#define MAGIC_ACK (0x0A)
+
+#define MAGIC_BUFFER_SIZE (32)
+
+bool magic_wupa() {
+    bool magic_activated = false;
+    uint8_t tx_data[MAGIC_BUFFER_SIZE] = {};
+    uint8_t rx_data[MAGIC_BUFFER_SIZE] = {};
+    uint16_t rx_len = 0;
+    FuriHalNfcReturn ret = 0;
+
+    do {
+        // Setup nfc poller
+        furi_hal_nfc_exit_sleep();
+        furi_hal_nfc_ll_txrx_on();
+        furi_hal_nfc_ll_poll();
+        ret = furi_hal_nfc_ll_set_mode(
+            FuriHalNfcModePollNfca, FuriHalNfcBitrate106, FuriHalNfcBitrate106);
+        if(ret != FuriHalNfcReturnOk) break;
+
+        furi_hal_nfc_ll_set_fdt_listen(FURI_HAL_NFC_LL_FDT_LISTEN_NFCA_POLLER);
+        furi_hal_nfc_ll_set_fdt_poll(FURI_HAL_NFC_LL_FDT_POLL_NFCA_POLLER);
+        furi_hal_nfc_ll_set_error_handling(FuriHalNfcErrorHandlingNfc);
+        furi_hal_nfc_ll_set_guard_time(FURI_HAL_NFC_LL_GT_NFCA);
+
+        // Start communication
+        tx_data[0] = MAGIC_CMD_WUPA;
+        ret = furi_hal_nfc_ll_txrx_bits(
+            tx_data,
+            7,
+            rx_data,
+            sizeof(rx_data),
+            &rx_len,
+            FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_TX_MANUAL | FURI_HAL_NFC_LL_TXRX_FLAGS_AGC_ON |
+                FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_RX_KEEP,
+            furi_hal_nfc_ll_ms2fc(20));
+        if(ret != FuriHalNfcReturnIncompleteByte) break;
+        if(rx_len != 4) break;
+        if(rx_data[0] != MAGIC_ACK) break;
+        magic_activated = true;
+    } while(false);
+
+    if(!magic_activated) {
+        furi_hal_nfc_ll_txrx_off();
+        furi_hal_nfc_start_sleep();
+    }
+
+    return magic_activated;
+}
+
+bool magic_data_access_cmd() {
+    bool write_cmd_success = false;
+    uint8_t tx_data[MAGIC_BUFFER_SIZE] = {};
+    uint8_t rx_data[MAGIC_BUFFER_SIZE] = {};
+    uint16_t rx_len = 0;
+    FuriHalNfcReturn ret = 0;
+
+    do {
+        tx_data[0] = MAGIC_CMD_WRITE;
+        ret = furi_hal_nfc_ll_txrx_bits(
+            tx_data,
+            8,
+            rx_data,
+            sizeof(rx_data),
+            &rx_len,
+            FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_TX_MANUAL | FURI_HAL_NFC_LL_TXRX_FLAGS_AGC_ON |
+                FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_RX_KEEP,
+            furi_hal_nfc_ll_ms2fc(20));
+        if(ret != FuriHalNfcReturnIncompleteByte) break;
+        if(rx_len != 4) break;
+        if(rx_data[0] != MAGIC_ACK) break;
+
+        write_cmd_success = true;
+    } while(false);
+
+    if(!write_cmd_success) {
+        furi_hal_nfc_ll_txrx_off();
+        furi_hal_nfc_start_sleep();
+    }
+
+    return write_cmd_success;
+}
+
+bool magic_read_block(uint8_t block_num, MfClassicBlock* data) {
+    furi_assert(data);
+
+    bool read_success = false;
+
+    uint8_t tx_data[MAGIC_BUFFER_SIZE] = {};
+    uint8_t rx_data[MAGIC_BUFFER_SIZE] = {};
+    uint16_t rx_len = 0;
+    FuriHalNfcReturn ret = 0;
+
+    do {
+        tx_data[0] = MAGIC_MIFARE_READ_CMD;
+        tx_data[1] = block_num;
+        ret = furi_hal_nfc_ll_txrx_bits(
+            tx_data,
+            2 * 8,
+            rx_data,
+            sizeof(rx_data),
+            &rx_len,
+            FURI_HAL_NFC_LL_TXRX_FLAGS_AGC_ON,
+            furi_hal_nfc_ll_ms2fc(20));
+
+        if(ret != FuriHalNfcReturnOk) break;
+        if(rx_len != 16 * 8) break;
+        memcpy(data->value, rx_data, sizeof(data->value));
+        read_success = true;
+    } while(false);
+
+    if(!read_success) {
+        furi_hal_nfc_ll_txrx_off();
+        furi_hal_nfc_start_sleep();
+    }
+
+    return read_success;
+}
+
+bool magic_write_blk(uint8_t block_num, MfClassicBlock* data) {
+    furi_assert(data);
+
+    bool write_success = false;
+    uint8_t tx_data[MAGIC_BUFFER_SIZE] = {};
+    uint8_t rx_data[MAGIC_BUFFER_SIZE] = {};
+    uint16_t rx_len = 0;
+    FuriHalNfcReturn ret = 0;
+
+    do {
+        tx_data[0] = MAGIC_MIFARE_WRITE_CMD;
+        tx_data[1] = block_num;
+        ret = furi_hal_nfc_ll_txrx_bits(
+            tx_data,
+            2 * 8,
+            rx_data,
+            sizeof(rx_data),
+            &rx_len,
+            FURI_HAL_NFC_LL_TXRX_FLAGS_AGC_ON | FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_RX_KEEP,
+            furi_hal_nfc_ll_ms2fc(20));
+        if(ret != FuriHalNfcReturnIncompleteByte) break;
+        if(rx_len != 4) break;
+        if(rx_data[0] != MAGIC_ACK) break;
+
+        memcpy(tx_data, data->value, sizeof(data->value));
+        ret = furi_hal_nfc_ll_txrx_bits(
+            tx_data,
+            16 * 8,
+            rx_data,
+            sizeof(rx_data),
+            &rx_len,
+            FURI_HAL_NFC_LL_TXRX_FLAGS_AGC_ON | FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_RX_KEEP,
+            furi_hal_nfc_ll_ms2fc(20));
+        if(ret != FuriHalNfcReturnIncompleteByte) break;
+        if(rx_len != 4) break;
+        if(rx_data[0] != MAGIC_ACK) break;
+
+        write_success = true;
+    } while(false);
+
+    if(!write_success) {
+        furi_hal_nfc_ll_txrx_off();
+        furi_hal_nfc_start_sleep();
+    }
+
+    return write_success;
+}
+
+bool magic_wipe() {
+    bool wipe_success = false;
+    uint8_t tx_data[MAGIC_BUFFER_SIZE] = {};
+    uint8_t rx_data[MAGIC_BUFFER_SIZE] = {};
+    uint16_t rx_len = 0;
+    FuriHalNfcReturn ret = 0;
+
+    do {
+        tx_data[0] = MAGIC_CMD_WIPE;
+        ret = furi_hal_nfc_ll_txrx_bits(
+            tx_data,
+            8,
+            rx_data,
+            sizeof(rx_data),
+            &rx_len,
+            FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_TX_MANUAL | FURI_HAL_NFC_LL_TXRX_FLAGS_AGC_ON |
+                FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_RX_KEEP,
+            furi_hal_nfc_ll_ms2fc(2000));
+
+        if(ret != FuriHalNfcReturnIncompleteByte) break;
+        if(rx_len != 4) break;
+        if(rx_data[0] != MAGIC_ACK) break;
+
+        wipe_success = true;
+    } while(false);
+
+    return wipe_success;
+}
+
+void magic_deactivate() {
+    furi_hal_nfc_ll_txrx_off();
+    furi_hal_nfc_start_sleep();
+}
diff --git a/applications/plugins/nfc_magic/lib/magic/magic.h b/applications/plugins/nfc_magic/lib/magic/magic.h
new file mode 100644
index 000000000..64c60a0a7
--- /dev/null
+++ b/applications/plugins/nfc_magic/lib/magic/magic.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <lib/nfc/protocols/mifare_classic.h>
+
+bool magic_wupa();
+
+bool magic_read_block(uint8_t block_num, MfClassicBlock* data);
+
+bool magic_data_access_cmd();
+
+bool magic_write_blk(uint8_t block_num, MfClassicBlock* data);
+
+bool magic_wipe();
+
+void magic_deactivate();
diff --git a/applications/plugins/nfc_magic/nfc_magic.c b/applications/plugins/nfc_magic/nfc_magic.c
new file mode 100644
index 000000000..38eecba6a
--- /dev/null
+++ b/applications/plugins/nfc_magic/nfc_magic.c
@@ -0,0 +1,169 @@
+#include "nfc_magic_i.h"
+
+bool nfc_magic_custom_event_callback(void* context, uint32_t event) {
+    furi_assert(context);
+    NfcMagic* nfc_magic = context;
+    return scene_manager_handle_custom_event(nfc_magic->scene_manager, event);
+}
+
+bool nfc_magic_back_event_callback(void* context) {
+    furi_assert(context);
+    NfcMagic* nfc_magic = context;
+    return scene_manager_handle_back_event(nfc_magic->scene_manager);
+}
+
+void nfc_magic_tick_event_callback(void* context) {
+    furi_assert(context);
+    NfcMagic* nfc_magic = context;
+    scene_manager_handle_tick_event(nfc_magic->scene_manager);
+}
+
+void nfc_magic_show_loading_popup(void* context, bool show) {
+    NfcMagic* nfc_magic = context;
+    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
+
+    if(show) {
+        // Raise timer priority so that animations can play
+        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewLoading);
+    } else {
+        // Restore default timer priority
+        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+    }
+}
+
+NfcMagic* nfc_magic_alloc() {
+    NfcMagic* nfc_magic = malloc(sizeof(NfcMagic));
+
+    nfc_magic->worker = nfc_magic_worker_alloc();
+    nfc_magic->view_dispatcher = view_dispatcher_alloc();
+    nfc_magic->scene_manager = scene_manager_alloc(&nfc_magic_scene_handlers, nfc_magic);
+    view_dispatcher_enable_queue(nfc_magic->view_dispatcher);
+    view_dispatcher_set_event_callback_context(nfc_magic->view_dispatcher, nfc_magic);
+    view_dispatcher_set_custom_event_callback(
+        nfc_magic->view_dispatcher, nfc_magic_custom_event_callback);
+    view_dispatcher_set_navigation_event_callback(
+        nfc_magic->view_dispatcher, nfc_magic_back_event_callback);
+    view_dispatcher_set_tick_event_callback(
+        nfc_magic->view_dispatcher, nfc_magic_tick_event_callback, 100);
+
+    // Nfc device
+    nfc_magic->nfc_dev = nfc_device_alloc();
+
+    // Open GUI record
+    nfc_magic->gui = furi_record_open(RECORD_GUI);
+    view_dispatcher_attach_to_gui(
+        nfc_magic->view_dispatcher, nfc_magic->gui, ViewDispatcherTypeFullscreen);
+
+    // Open Notification record
+    nfc_magic->notifications = furi_record_open(RECORD_NOTIFICATION);
+
+    // Submenu
+    nfc_magic->submenu = submenu_alloc();
+    view_dispatcher_add_view(
+        nfc_magic->view_dispatcher, NfcMagicViewMenu, submenu_get_view(nfc_magic->submenu));
+
+    // Popup
+    nfc_magic->popup = popup_alloc();
+    view_dispatcher_add_view(
+        nfc_magic->view_dispatcher, NfcMagicViewPopup, popup_get_view(nfc_magic->popup));
+
+    // Loading
+    nfc_magic->loading = loading_alloc();
+    view_dispatcher_add_view(
+        nfc_magic->view_dispatcher, NfcMagicViewLoading, loading_get_view(nfc_magic->loading));
+
+    // Text Input
+    nfc_magic->text_input = text_input_alloc();
+    view_dispatcher_add_view(
+        nfc_magic->view_dispatcher,
+        NfcMagicViewTextInput,
+        text_input_get_view(nfc_magic->text_input));
+
+    // Custom Widget
+    nfc_magic->widget = widget_alloc();
+    view_dispatcher_add_view(
+        nfc_magic->view_dispatcher, NfcMagicViewWidget, widget_get_view(nfc_magic->widget));
+
+    return nfc_magic;
+}
+
+void nfc_magic_free(NfcMagic* nfc_magic) {
+    furi_assert(nfc_magic);
+
+    // Nfc device
+    nfc_device_free(nfc_magic->nfc_dev);
+
+    // Submenu
+    view_dispatcher_remove_view(nfc_magic->view_dispatcher, NfcMagicViewMenu);
+    submenu_free(nfc_magic->submenu);
+
+    // Popup
+    view_dispatcher_remove_view(nfc_magic->view_dispatcher, NfcMagicViewPopup);
+    popup_free(nfc_magic->popup);
+
+    // Loading
+    view_dispatcher_remove_view(nfc_magic->view_dispatcher, NfcMagicViewLoading);
+    loading_free(nfc_magic->loading);
+
+    // TextInput
+    view_dispatcher_remove_view(nfc_magic->view_dispatcher, NfcMagicViewTextInput);
+    text_input_free(nfc_magic->text_input);
+
+    // Custom Widget
+    view_dispatcher_remove_view(nfc_magic->view_dispatcher, NfcMagicViewWidget);
+    widget_free(nfc_magic->widget);
+
+    // Worker
+    nfc_magic_worker_stop(nfc_magic->worker);
+    nfc_magic_worker_free(nfc_magic->worker);
+
+    // View Dispatcher
+    view_dispatcher_free(nfc_magic->view_dispatcher);
+
+    // Scene Manager
+    scene_manager_free(nfc_magic->scene_manager);
+
+    // GUI
+    furi_record_close(RECORD_GUI);
+    nfc_magic->gui = NULL;
+
+    // Notifications
+    furi_record_close(RECORD_NOTIFICATION);
+    nfc_magic->notifications = NULL;
+
+    free(nfc_magic);
+}
+
+static const NotificationSequence nfc_magic_sequence_blink_start_blue = {
+    &message_blink_start_10,
+    &message_blink_set_color_blue,
+    &message_do_not_reset,
+    NULL,
+};
+
+static const NotificationSequence nfc_magic_sequence_blink_stop = {
+    &message_blink_stop,
+    NULL,
+};
+
+void nfc_magic_blink_start(NfcMagic* nfc_magic) {
+    notification_message(nfc_magic->notifications, &nfc_magic_sequence_blink_start_blue);
+}
+
+void nfc_magic_blink_stop(NfcMagic* nfc_magic) {
+    notification_message(nfc_magic->notifications, &nfc_magic_sequence_blink_stop);
+}
+
+int32_t nfc_magic_app(void* p) {
+    UNUSED(p);
+    NfcMagic* nfc_magic = nfc_magic_alloc();
+
+    scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneStart);
+
+    view_dispatcher_run(nfc_magic->view_dispatcher);
+
+    nfc_magic_free(nfc_magic);
+
+    return 0;
+}
diff --git a/applications/plugins/nfc_magic/nfc_magic.h b/applications/plugins/nfc_magic/nfc_magic.h
new file mode 100644
index 000000000..1abf1371e
--- /dev/null
+++ b/applications/plugins/nfc_magic/nfc_magic.h
@@ -0,0 +1,3 @@
+#pragma once
+
+typedef struct NfcMagic NfcMagic;
diff --git a/applications/plugins/nfc_magic/nfc_magic_i.h b/applications/plugins/nfc_magic/nfc_magic_i.h
new file mode 100644
index 000000000..01b300826
--- /dev/null
+++ b/applications/plugins/nfc_magic/nfc_magic_i.h
@@ -0,0 +1,77 @@
+#pragma once
+
+#include "nfc_magic.h"
+#include "nfc_magic_worker.h"
+
+#include "lib/magic/magic.h"
+
+#include <furi.h>
+#include <gui/gui.h>
+#include <gui/view_dispatcher.h>
+#include <gui/scene_manager.h>
+#include <notification/notification_messages.h>
+
+#include <gui/modules/submenu.h>
+#include <gui/modules/popup.h>
+#include <gui/modules/loading.h>
+#include <gui/modules/text_input.h>
+#include <gui/modules/widget.h>
+
+#include <input/input.h>
+
+#include "scenes/nfc_magic_scene.h"
+
+#include <storage/storage.h>
+#include <lib/toolbox/path.h>
+
+#include <lib/nfc/nfc_device.h>
+#include "nfc_magic_icons.h"
+
+enum NfcMagicCustomEvent {
+    // Reserve first 100 events for button types and indexes, starting from 0
+    NfcMagicCustomEventReserved = 100,
+
+    NfcMagicCustomEventViewExit,
+    NfcMagicCustomEventWorkerExit,
+    NfcMagicCustomEventByteInputDone,
+    NfcMagicCustomEventTextInputDone,
+};
+
+struct NfcMagic {
+    NfcMagicWorker* worker;
+    ViewDispatcher* view_dispatcher;
+    Gui* gui;
+    NotificationApp* notifications;
+    SceneManager* scene_manager;
+    // NfcMagicDevice* dev;
+    NfcDevice* nfc_dev;
+
+    FuriString* text_box_store;
+
+    // Common Views
+    Submenu* submenu;
+    Popup* popup;
+    Loading* loading;
+    TextInput* text_input;
+    Widget* widget;
+};
+
+typedef enum {
+    NfcMagicViewMenu,
+    NfcMagicViewPopup,
+    NfcMagicViewLoading,
+    NfcMagicViewTextInput,
+    NfcMagicViewWidget,
+} NfcMagicView;
+
+NfcMagic* nfc_magic_alloc();
+
+void nfc_magic_text_store_set(NfcMagic* nfc_magic, const char* text, ...);
+
+void nfc_magic_text_store_clear(NfcMagic* nfc_magic);
+
+void nfc_magic_blink_start(NfcMagic* nfc_magic);
+
+void nfc_magic_blink_stop(NfcMagic* nfc_magic);
+
+void nfc_magic_show_loading_popup(void* context, bool show);
diff --git a/applications/plugins/nfc_magic/nfc_magic_worker.c b/applications/plugins/nfc_magic/nfc_magic_worker.c
new file mode 100644
index 000000000..0623211e2
--- /dev/null
+++ b/applications/plugins/nfc_magic/nfc_magic_worker.c
@@ -0,0 +1,174 @@
+#include "nfc_magic_worker_i.h"
+
+#include "lib/magic/magic.h"
+
+#define TAG "NfcMagicWorker"
+
+static void
+    nfc_magic_worker_change_state(NfcMagicWorker* nfc_magic_worker, NfcMagicWorkerState state) {
+    furi_assert(nfc_magic_worker);
+
+    nfc_magic_worker->state = state;
+}
+
+NfcMagicWorker* nfc_magic_worker_alloc() {
+    NfcMagicWorker* nfc_magic_worker = malloc(sizeof(NfcMagicWorker));
+
+    // Worker thread attributes
+    nfc_magic_worker->thread = furi_thread_alloc();
+    furi_thread_set_name(nfc_magic_worker->thread, "NfcMagicWorker");
+    furi_thread_set_stack_size(nfc_magic_worker->thread, 8192);
+    furi_thread_set_callback(nfc_magic_worker->thread, nfc_magic_worker_task);
+    furi_thread_set_context(nfc_magic_worker->thread, nfc_magic_worker);
+
+    nfc_magic_worker->callback = NULL;
+    nfc_magic_worker->context = NULL;
+
+    nfc_magic_worker_change_state(nfc_magic_worker, NfcMagicWorkerStateReady);
+
+    return nfc_magic_worker;
+}
+
+void nfc_magic_worker_free(NfcMagicWorker* nfc_magic_worker) {
+    furi_assert(nfc_magic_worker);
+
+    furi_thread_free(nfc_magic_worker->thread);
+    free(nfc_magic_worker);
+}
+
+void nfc_magic_worker_stop(NfcMagicWorker* nfc_magic_worker) {
+    furi_assert(nfc_magic_worker);
+
+    nfc_magic_worker_change_state(nfc_magic_worker, NfcMagicWorkerStateStop);
+    furi_thread_join(nfc_magic_worker->thread);
+}
+
+void nfc_magic_worker_start(
+    NfcMagicWorker* nfc_magic_worker,
+    NfcMagicWorkerState state,
+    NfcDeviceData* dev_data,
+    NfcMagicWorkerCallback callback,
+    void* context) {
+    furi_assert(nfc_magic_worker);
+    furi_assert(dev_data);
+
+    nfc_magic_worker->callback = callback;
+    nfc_magic_worker->context = context;
+    nfc_magic_worker->dev_data = dev_data;
+    nfc_magic_worker_change_state(nfc_magic_worker, state);
+    furi_thread_start(nfc_magic_worker->thread);
+}
+
+int32_t nfc_magic_worker_task(void* context) {
+    NfcMagicWorker* nfc_magic_worker = context;
+
+    if(nfc_magic_worker->state == NfcMagicWorkerStateCheck) {
+        nfc_magic_worker_check(nfc_magic_worker);
+    } else if(nfc_magic_worker->state == NfcMagicWorkerStateWrite) {
+        nfc_magic_worker_write(nfc_magic_worker);
+    } else if(nfc_magic_worker->state == NfcMagicWorkerStateWipe) {
+        nfc_magic_worker_wipe(nfc_magic_worker);
+    }
+
+    nfc_magic_worker_change_state(nfc_magic_worker, NfcMagicWorkerStateReady);
+
+    return 0;
+}
+
+void nfc_magic_worker_write(NfcMagicWorker* nfc_magic_worker) {
+    bool card_found_notified = false;
+    FuriHalNfcDevData nfc_data = {};
+    MfClassicData* src_data = &nfc_magic_worker->dev_data->mf_classic_data;
+
+    while(nfc_magic_worker->state == NfcMagicWorkerStateWrite) {
+        if(furi_hal_nfc_detect(&nfc_data, 200)) {
+            if(!card_found_notified) {
+                nfc_magic_worker->callback(
+                    NfcMagicWorkerEventCardDetected, nfc_magic_worker->context);
+                card_found_notified = true;
+            }
+            furi_hal_nfc_sleep();
+
+            if(!magic_wupa()) {
+                FURI_LOG_E(TAG, "Not Magic card");
+                nfc_magic_worker->callback(
+                    NfcMagicWorkerEventWrongCard, nfc_magic_worker->context);
+                break;
+            }
+            if(!magic_data_access_cmd()) {
+                FURI_LOG_E(TAG, "Not Magic card");
+                nfc_magic_worker->callback(
+                    NfcMagicWorkerEventWrongCard, nfc_magic_worker->context);
+                break;
+            }
+            for(size_t i = 0; i < 64; i++) {
+                FURI_LOG_D(TAG, "Writing block %d", i);
+                if(!magic_write_blk(i, &src_data->block[i])) {
+                    FURI_LOG_E(TAG, "Failed to write %d block", i);
+                    nfc_magic_worker->callback(NfcMagicWorkerEventFail, nfc_magic_worker->context);
+                    break;
+                }
+            }
+            nfc_magic_worker->callback(NfcMagicWorkerEventSuccess, nfc_magic_worker->context);
+            break;
+        } else {
+            if(card_found_notified) {
+                nfc_magic_worker->callback(
+                    NfcMagicWorkerEventNoCardDetected, nfc_magic_worker->context);
+                card_found_notified = false;
+            }
+        }
+        furi_delay_ms(300);
+    }
+    magic_deactivate();
+}
+
+void nfc_magic_worker_check(NfcMagicWorker* nfc_magic_worker) {
+    bool card_found_notified = false;
+
+    while(nfc_magic_worker->state == NfcMagicWorkerStateCheck) {
+        if(magic_wupa()) {
+            if(!card_found_notified) {
+                nfc_magic_worker->callback(
+                    NfcMagicWorkerEventCardDetected, nfc_magic_worker->context);
+                card_found_notified = true;
+            }
+
+            nfc_magic_worker->callback(NfcMagicWorkerEventSuccess, nfc_magic_worker->context);
+            break;
+        } else {
+            if(card_found_notified) {
+                nfc_magic_worker->callback(
+                    NfcMagicWorkerEventNoCardDetected, nfc_magic_worker->context);
+                card_found_notified = false;
+            }
+        }
+        furi_delay_ms(300);
+    }
+    magic_deactivate();
+}
+
+void nfc_magic_worker_wipe(NfcMagicWorker* nfc_magic_worker) {
+    MfClassicBlock block;
+    memset(&block, 0, sizeof(MfClassicBlock));
+    block.value[0] = 0x01;
+    block.value[1] = 0x02;
+    block.value[2] = 0x03;
+    block.value[3] = 0x04;
+    block.value[4] = 0x04;
+    block.value[5] = 0x08;
+    block.value[6] = 0x04;
+
+    while(nfc_magic_worker->state == NfcMagicWorkerStateWipe) {
+        magic_deactivate();
+        furi_delay_ms(300);
+        if(!magic_wupa()) continue;
+        if(!magic_wipe()) continue;
+        if(!magic_data_access_cmd()) continue;
+        if(!magic_write_blk(0, &block)) continue;
+        nfc_magic_worker->callback(NfcMagicWorkerEventSuccess, nfc_magic_worker->context);
+        magic_deactivate();
+        break;
+    }
+    magic_deactivate();
+}
diff --git a/applications/plugins/nfc_magic/nfc_magic_worker.h b/applications/plugins/nfc_magic/nfc_magic_worker.h
new file mode 100644
index 000000000..9d29bb3a8
--- /dev/null
+++ b/applications/plugins/nfc_magic/nfc_magic_worker.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <lib/nfc/nfc_device.h>
+
+typedef struct NfcMagicWorker NfcMagicWorker;
+
+typedef enum {
+    NfcMagicWorkerStateReady,
+
+    NfcMagicWorkerStateCheck,
+    NfcMagicWorkerStateWrite,
+    NfcMagicWorkerStateWipe,
+
+    NfcMagicWorkerStateStop,
+} NfcMagicWorkerState;
+
+typedef enum {
+    NfcMagicWorkerEventSuccess,
+    NfcMagicWorkerEventFail,
+    NfcMagicWorkerEventCardDetected,
+    NfcMagicWorkerEventNoCardDetected,
+    NfcMagicWorkerEventWrongCard,
+} NfcMagicWorkerEvent;
+
+typedef bool (*NfcMagicWorkerCallback)(NfcMagicWorkerEvent event, void* context);
+
+NfcMagicWorker* nfc_magic_worker_alloc();
+
+void nfc_magic_worker_free(NfcMagicWorker* nfc_magic_worker);
+
+void nfc_magic_worker_stop(NfcMagicWorker* nfc_magic_worker);
+
+void nfc_magic_worker_start(
+    NfcMagicWorker* nfc_magic_worker,
+    NfcMagicWorkerState state,
+    NfcDeviceData* dev_data,
+    NfcMagicWorkerCallback callback,
+    void* context);
diff --git a/applications/plugins/nfc_magic/nfc_magic_worker_i.h b/applications/plugins/nfc_magic/nfc_magic_worker_i.h
new file mode 100644
index 000000000..0cde2e712
--- /dev/null
+++ b/applications/plugins/nfc_magic/nfc_magic_worker_i.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <furi.h>
+
+#include "nfc_magic_worker.h"
+
+struct NfcMagicWorker {
+    FuriThread* thread;
+
+    NfcDeviceData* dev_data;
+
+    NfcMagicWorkerCallback callback;
+    void* context;
+
+    NfcMagicWorkerState state;
+};
+
+int32_t nfc_magic_worker_task(void* context);
+
+void nfc_magic_worker_check(NfcMagicWorker* nfc_magic_worker);
+
+void nfc_magic_worker_write(NfcMagicWorker* nfc_magic_worker);
+
+void nfc_magic_worker_wipe(NfcMagicWorker* nfc_magic_worker);
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene.c
new file mode 100644
index 000000000..520ef2a9d
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene.c
@@ -0,0 +1,30 @@
+#include "nfc_magic_scene.h"
+
+// Generate scene on_enter handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
+void (*const nfc_magic_on_enter_handlers[])(void*) = {
+#include "nfc_magic_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Generate scene on_event handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
+bool (*const nfc_magic_on_event_handlers[])(void* context, SceneManagerEvent event) = {
+#include "nfc_magic_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Generate scene on_exit handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
+void (*const nfc_magic_on_exit_handlers[])(void* context) = {
+#include "nfc_magic_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Initialize scene handlers configuration structure
+const SceneManagerHandlers nfc_magic_scene_handlers = {
+    .on_enter_handlers = nfc_magic_on_enter_handlers,
+    .on_event_handlers = nfc_magic_on_event_handlers,
+    .on_exit_handlers = nfc_magic_on_exit_handlers,
+    .scene_num = NfcMagicSceneNum,
+};
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene.h b/applications/plugins/nfc_magic/scenes/nfc_magic_scene.h
new file mode 100644
index 000000000..f1e9f715d
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <gui/scene_manager.h>
+
+// Generate scene id and total number
+#define ADD_SCENE(prefix, name, id) NfcMagicScene##id,
+typedef enum {
+#include "nfc_magic_scene_config.h"
+    NfcMagicSceneNum,
+} NfcMagicScene;
+#undef ADD_SCENE
+
+extern const SceneManagerHandlers nfc_magic_scene_handlers;
+
+// Generate scene on_enter handlers declaration
+#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*);
+#include "nfc_magic_scene_config.h"
+#undef ADD_SCENE
+
+// Generate scene on_event handlers declaration
+#define ADD_SCENE(prefix, name, id) \
+    bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event);
+#include "nfc_magic_scene_config.h"
+#undef ADD_SCENE
+
+// Generate scene on_exit handlers declaration
+#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context);
+#include "nfc_magic_scene_config.h"
+#undef ADD_SCENE
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_check.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_check.c
new file mode 100644
index 000000000..d51797242
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_check.c
@@ -0,0 +1,87 @@
+#include "../nfc_magic_i.h"
+
+enum {
+    NfcMagicSceneCheckStateCardSearch,
+    NfcMagicSceneCheckStateCardFound,
+};
+
+bool nfc_magic_check_worker_callback(NfcMagicWorkerEvent event, void* context) {
+    furi_assert(context);
+
+    NfcMagic* nfc_magic = context;
+    view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, event);
+
+    return true;
+}
+
+static void nfc_magic_scene_check_setup_view(NfcMagic* nfc_magic) {
+    Popup* popup = nfc_magic->popup;
+    popup_reset(popup);
+    uint32_t state = scene_manager_get_scene_state(nfc_magic->scene_manager, NfcMagicSceneCheck);
+
+    if(state == NfcMagicSceneCheckStateCardSearch) {
+        popup_set_icon(nfc_magic->popup, 0, 8, &I_NFC_manual_60x50);
+        popup_set_text(
+            nfc_magic->popup, "Apply card to\nthe back", 128, 32, AlignRight, AlignCenter);
+    } else {
+        popup_set_icon(popup, 12, 23, &I_Loading_24);
+        popup_set_header(popup, "Checking\nDon't move...", 52, 32, AlignLeft, AlignCenter);
+    }
+
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewPopup);
+}
+
+void nfc_magic_scene_check_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    scene_manager_set_scene_state(
+        nfc_magic->scene_manager, NfcMagicSceneCheck, NfcMagicSceneCheckStateCardSearch);
+    nfc_magic_scene_check_setup_view(nfc_magic);
+
+    // Setup and start worker
+    nfc_magic_worker_start(
+        nfc_magic->worker,
+        NfcMagicWorkerStateCheck,
+        &nfc_magic->nfc_dev->dev_data,
+        nfc_magic_check_worker_callback,
+        nfc_magic);
+    nfc_magic_blink_start(nfc_magic);
+}
+
+bool nfc_magic_scene_check_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == NfcMagicWorkerEventSuccess) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneMagicInfo);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventWrongCard) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneNotMagic);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventCardDetected) {
+            scene_manager_set_scene_state(
+                nfc_magic->scene_manager, NfcMagicSceneCheck, NfcMagicSceneCheckStateCardFound);
+            nfc_magic_scene_check_setup_view(nfc_magic);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventNoCardDetected) {
+            scene_manager_set_scene_state(
+                nfc_magic->scene_manager, NfcMagicSceneCheck, NfcMagicSceneCheckStateCardSearch);
+            nfc_magic_scene_check_setup_view(nfc_magic);
+            consumed = true;
+        }
+    }
+    return consumed;
+}
+
+void nfc_magic_scene_check_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    nfc_magic_worker_stop(nfc_magic->worker);
+    scene_manager_set_scene_state(
+        nfc_magic->scene_manager, NfcMagicSceneCheck, NfcMagicSceneCheckStateCardSearch);
+    // Clear view
+    popup_reset(nfc_magic->popup);
+
+    nfc_magic_blink_stop(nfc_magic);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_config.h b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_config.h
new file mode 100644
index 000000000..557e26914
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_config.h
@@ -0,0 +1,12 @@
+ADD_SCENE(nfc_magic, start, Start)
+ADD_SCENE(nfc_magic, file_select, FileSelect)
+ADD_SCENE(nfc_magic, write_confirm, WriteConfirm)
+ADD_SCENE(nfc_magic, wrong_card, WrongCard)
+ADD_SCENE(nfc_magic, write, Write)
+ADD_SCENE(nfc_magic, write_fail, WriteFail)
+ADD_SCENE(nfc_magic, success, Success)
+ADD_SCENE(nfc_magic, check, Check)
+ADD_SCENE(nfc_magic, not_magic, NotMagic)
+ADD_SCENE(nfc_magic, magic_info, MagicInfo)
+ADD_SCENE(nfc_magic, wipe, Wipe)
+ADD_SCENE(nfc_magic, wipe_fail, WipeFail)
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_file_select.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_file_select.c
new file mode 100644
index 000000000..a19237ed4
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_file_select.c
@@ -0,0 +1,34 @@
+#include "../nfc_magic_i.h"
+
+static bool nfc_magic_scene_file_select_is_file_suitable(NfcDevice* nfc_dev) {
+    return (nfc_dev->format == NfcDeviceSaveFormatMifareClassic) &&
+           (nfc_dev->dev_data.mf_classic_data.type == MfClassicType1k) &&
+           (nfc_dev->dev_data.nfc_data.uid_len == 4);
+}
+
+void nfc_magic_scene_file_select_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+    // Process file_select return
+    nfc_device_set_loading_callback(nfc_magic->nfc_dev, nfc_magic_show_loading_popup, nfc_magic);
+
+    if(nfc_file_select(nfc_magic->nfc_dev)) {
+        if(nfc_magic_scene_file_select_is_file_suitable(nfc_magic->nfc_dev)) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneWriteConfirm);
+        } else {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneWrongCard);
+        }
+    } else {
+        scene_manager_previous_scene(nfc_magic->scene_manager);
+    }
+}
+
+bool nfc_magic_scene_file_select_on_event(void* context, SceneManagerEvent event) {
+    UNUSED(context);
+    UNUSED(event);
+    return false;
+}
+
+void nfc_magic_scene_file_select_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+    nfc_device_set_loading_callback(nfc_magic->nfc_dev, NULL, nfc_magic);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_magic_info.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_magic_info.c
new file mode 100644
index 000000000..e9b226b3a
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_magic_info.c
@@ -0,0 +1,45 @@
+#include "../nfc_magic_i.h"
+
+void nfc_magic_scene_magic_info_widget_callback(
+    GuiButtonType result,
+    InputType type,
+    void* context) {
+    NfcMagic* nfc_magic = context;
+    if(type == InputTypeShort) {
+        view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, result);
+    }
+}
+
+void nfc_magic_scene_magic_info_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+    Widget* widget = nfc_magic->widget;
+
+    notification_message(nfc_magic->notifications, &sequence_success);
+
+    widget_add_icon_element(widget, 73, 17, &I_DolphinCommon_56x48);
+    widget_add_string_element(
+        widget, 3, 4, AlignLeft, AlignTop, FontPrimary, "Magic card detected");
+    widget_add_button_element(
+        widget, GuiButtonTypeLeft, "Retry", nfc_magic_scene_magic_info_widget_callback, nfc_magic);
+
+    // Setup and start worker
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewWidget);
+}
+
+bool nfc_magic_scene_magic_info_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == GuiButtonTypeLeft) {
+            consumed = scene_manager_previous_scene(nfc_magic->scene_manager);
+        }
+    }
+    return consumed;
+}
+
+void nfc_magic_scene_magic_info_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    widget_reset(nfc_magic->widget);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_not_magic.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_not_magic.c
new file mode 100644
index 000000000..b87f7f383
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_not_magic.c
@@ -0,0 +1,44 @@
+#include "../nfc_magic_i.h"
+
+void nfc_magic_scene_not_magic_widget_callback(GuiButtonType result, InputType type, void* context) {
+    NfcMagic* nfc_magic = context;
+    if(type == InputTypeShort) {
+        view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, result);
+    }
+}
+
+void nfc_magic_scene_not_magic_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+    Widget* widget = nfc_magic->widget;
+
+    notification_message(nfc_magic->notifications, &sequence_error);
+
+    // widget_add_icon_element(widget, 73, 17, &I_DolphinCommon_56x48);
+    widget_add_string_element(
+        widget, 3, 4, AlignLeft, AlignTop, FontPrimary, "This is wrong card");
+    widget_add_string_multiline_element(
+        widget, 4, 17, AlignLeft, AlignTop, FontSecondary, "Not a magic\ncard");
+    widget_add_button_element(
+        widget, GuiButtonTypeLeft, "Retry", nfc_magic_scene_not_magic_widget_callback, nfc_magic);
+
+    // Setup and start worker
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewWidget);
+}
+
+bool nfc_magic_scene_not_magic_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == GuiButtonTypeLeft) {
+            consumed = scene_manager_previous_scene(nfc_magic->scene_manager);
+        }
+    }
+    return consumed;
+}
+
+void nfc_magic_scene_not_magic_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    widget_reset(nfc_magic->widget);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_start.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_start.c
new file mode 100644
index 000000000..f2984443f
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_start.c
@@ -0,0 +1,61 @@
+#include "../nfc_magic_i.h"
+enum SubmenuIndex {
+    SubmenuIndexCheck,
+    SubmenuIndexWriteGen1A,
+    SubmenuIndexWipe,
+};
+
+void nfc_magic_scene_start_submenu_callback(void* context, uint32_t index) {
+    NfcMagic* nfc_magic = context;
+    view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, index);
+}
+
+void nfc_magic_scene_start_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    Submenu* submenu = nfc_magic->submenu;
+    submenu_add_item(
+        submenu,
+        "Check Magic Tag",
+        SubmenuIndexCheck,
+        nfc_magic_scene_start_submenu_callback,
+        nfc_magic);
+    submenu_add_item(
+        submenu,
+        "Write Gen1A",
+        SubmenuIndexWriteGen1A,
+        nfc_magic_scene_start_submenu_callback,
+        nfc_magic);
+    submenu_add_item(
+        submenu, "Wipe", SubmenuIndexWipe, nfc_magic_scene_start_submenu_callback, nfc_magic);
+
+    submenu_set_selected_item(
+        submenu, scene_manager_get_scene_state(nfc_magic->scene_manager, NfcMagicSceneStart));
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewMenu);
+}
+
+bool nfc_magic_scene_start_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == SubmenuIndexCheck) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneCheck);
+            consumed = true;
+        } else if(event.event == SubmenuIndexWriteGen1A) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneFileSelect);
+            consumed = true;
+        } else if(event.event == SubmenuIndexWipe) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneWipe);
+            consumed = true;
+        }
+        scene_manager_set_scene_state(nfc_magic->scene_manager, NfcMagicSceneStart, event.event);
+    }
+
+    return consumed;
+}
+
+void nfc_magic_scene_start_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+    submenu_reset(nfc_magic->submenu);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_success.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_success.c
new file mode 100644
index 000000000..37441e80e
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_success.c
@@ -0,0 +1,42 @@
+#include "../nfc_magic_i.h"
+
+void nfc_magic_scene_success_popup_callback(void* context) {
+    NfcMagic* nfc_magic = context;
+    view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, NfcMagicCustomEventViewExit);
+}
+
+void nfc_magic_scene_success_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    notification_message(nfc_magic->notifications, &sequence_success);
+
+    Popup* popup = nfc_magic->popup;
+    popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59);
+    popup_set_header(popup, "Success!", 10, 20, AlignLeft, AlignBottom);
+    popup_set_timeout(popup, 1500);
+    popup_set_context(popup, nfc_magic);
+    popup_set_callback(popup, nfc_magic_scene_success_popup_callback);
+    popup_enable_timeout(popup);
+
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewPopup);
+}
+
+bool nfc_magic_scene_success_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == NfcMagicCustomEventViewExit) {
+            consumed = scene_manager_search_and_switch_to_previous_scene(
+                nfc_magic->scene_manager, NfcMagicSceneStart);
+        }
+    }
+    return consumed;
+}
+
+void nfc_magic_scene_success_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    // Clear view
+    popup_reset(nfc_magic->popup);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_wipe.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_wipe.c
new file mode 100644
index 000000000..1ca194286
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_wipe.c
@@ -0,0 +1,90 @@
+#include "../nfc_magic_i.h"
+
+enum {
+    NfcMagicSceneWipeStateCardSearch,
+    NfcMagicSceneWipeStateCardFound,
+};
+
+bool nfc_magic_wipe_worker_callback(NfcMagicWorkerEvent event, void* context) {
+    furi_assert(context);
+
+    NfcMagic* nfc_magic = context;
+    view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, event);
+
+    return true;
+}
+
+static void nfc_magic_scene_wipe_setup_view(NfcMagic* nfc_magic) {
+    Popup* popup = nfc_magic->popup;
+    popup_reset(popup);
+    uint32_t state = scene_manager_get_scene_state(nfc_magic->scene_manager, NfcMagicSceneWipe);
+
+    if(state == NfcMagicSceneWipeStateCardSearch) {
+        popup_set_icon(nfc_magic->popup, 0, 8, &I_NFC_manual_60x50);
+        popup_set_text(
+            nfc_magic->popup, "Apply card to\nthe back", 128, 32, AlignRight, AlignCenter);
+    } else {
+        popup_set_icon(popup, 12, 23, &I_Loading_24);
+        popup_set_header(popup, "Wiping\nDon't move...", 52, 32, AlignLeft, AlignCenter);
+    }
+
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewPopup);
+}
+
+void nfc_magic_scene_wipe_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    scene_manager_set_scene_state(
+        nfc_magic->scene_manager, NfcMagicSceneWipe, NfcMagicSceneWipeStateCardSearch);
+    nfc_magic_scene_wipe_setup_view(nfc_magic);
+
+    // Setup and start worker
+    nfc_magic_worker_start(
+        nfc_magic->worker,
+        NfcMagicWorkerStateWipe,
+        &nfc_magic->nfc_dev->dev_data,
+        nfc_magic_wipe_worker_callback,
+        nfc_magic);
+    nfc_magic_blink_start(nfc_magic);
+}
+
+bool nfc_magic_scene_wipe_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == NfcMagicWorkerEventSuccess) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneSuccess);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventFail) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneWipeFail);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventWrongCard) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneNotMagic);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventCardDetected) {
+            scene_manager_set_scene_state(
+                nfc_magic->scene_manager, NfcMagicSceneWipe, NfcMagicSceneWipeStateCardFound);
+            nfc_magic_scene_wipe_setup_view(nfc_magic);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventNoCardDetected) {
+            scene_manager_set_scene_state(
+                nfc_magic->scene_manager, NfcMagicSceneWipe, NfcMagicSceneWipeStateCardSearch);
+            nfc_magic_scene_wipe_setup_view(nfc_magic);
+            consumed = true;
+        }
+    }
+    return consumed;
+}
+
+void nfc_magic_scene_wipe_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    nfc_magic_worker_stop(nfc_magic->worker);
+    scene_manager_set_scene_state(
+        nfc_magic->scene_manager, NfcMagicSceneWipe, NfcMagicSceneWipeStateCardSearch);
+    // Clear view
+    popup_reset(nfc_magic->popup);
+
+    nfc_magic_blink_stop(nfc_magic);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_wipe_fail.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_wipe_fail.c
new file mode 100644
index 000000000..828b65e6c
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_wipe_fail.c
@@ -0,0 +1,41 @@
+#include "../nfc_magic_i.h"
+
+void nfc_magic_scene_wipe_fail_widget_callback(GuiButtonType result, InputType type, void* context) {
+    NfcMagic* nfc_magic = context;
+    if(type == InputTypeShort) {
+        view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, result);
+    }
+}
+
+void nfc_magic_scene_wipe_fail_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+    Widget* widget = nfc_magic->widget;
+
+    notification_message(nfc_magic->notifications, &sequence_error);
+
+    widget_add_icon_element(widget, 73, 17, &I_DolphinCommon_56x48);
+    widget_add_string_element(widget, 3, 4, AlignLeft, AlignTop, FontPrimary, "Wipe failed");
+    widget_add_button_element(
+        widget, GuiButtonTypeLeft, "Retry", nfc_magic_scene_wipe_fail_widget_callback, nfc_magic);
+
+    // Setup and start worker
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewWidget);
+}
+
+bool nfc_magic_scene_wipe_fail_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == GuiButtonTypeLeft) {
+            consumed = scene_manager_previous_scene(nfc_magic->scene_manager);
+        }
+    }
+    return consumed;
+}
+
+void nfc_magic_scene_wipe_fail_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    widget_reset(nfc_magic->widget);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_write.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_write.c
new file mode 100644
index 000000000..c3e6f962a
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_write.c
@@ -0,0 +1,90 @@
+#include "../nfc_magic_i.h"
+
+enum {
+    NfcMagicSceneWriteStateCardSearch,
+    NfcMagicSceneWriteStateCardFound,
+};
+
+bool nfc_magic_write_worker_callback(NfcMagicWorkerEvent event, void* context) {
+    furi_assert(context);
+
+    NfcMagic* nfc_magic = context;
+    view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, event);
+
+    return true;
+}
+
+static void nfc_magic_scene_write_setup_view(NfcMagic* nfc_magic) {
+    Popup* popup = nfc_magic->popup;
+    popup_reset(popup);
+    uint32_t state = scene_manager_get_scene_state(nfc_magic->scene_manager, NfcMagicSceneWrite);
+
+    if(state == NfcMagicSceneWriteStateCardSearch) {
+        popup_set_text(
+            nfc_magic->popup, "Apply card to\nthe back", 128, 32, AlignRight, AlignCenter);
+        popup_set_icon(nfc_magic->popup, 0, 8, &I_NFC_manual_60x50);
+    } else {
+        popup_set_icon(popup, 12, 23, &I_Loading_24);
+        popup_set_header(popup, "Writing\nDon't move...", 52, 32, AlignLeft, AlignCenter);
+    }
+
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewPopup);
+}
+
+void nfc_magic_scene_write_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    scene_manager_set_scene_state(
+        nfc_magic->scene_manager, NfcMagicSceneWrite, NfcMagicSceneWriteStateCardSearch);
+    nfc_magic_scene_write_setup_view(nfc_magic);
+
+    // Setup and start worker
+    nfc_magic_worker_start(
+        nfc_magic->worker,
+        NfcMagicWorkerStateWrite,
+        &nfc_magic->nfc_dev->dev_data,
+        nfc_magic_write_worker_callback,
+        nfc_magic);
+    nfc_magic_blink_start(nfc_magic);
+}
+
+bool nfc_magic_scene_write_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == NfcMagicWorkerEventSuccess) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneSuccess);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventFail) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneWriteFail);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventWrongCard) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneNotMagic);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventCardDetected) {
+            scene_manager_set_scene_state(
+                nfc_magic->scene_manager, NfcMagicSceneWrite, NfcMagicSceneWriteStateCardFound);
+            nfc_magic_scene_write_setup_view(nfc_magic);
+            consumed = true;
+        } else if(event.event == NfcMagicWorkerEventNoCardDetected) {
+            scene_manager_set_scene_state(
+                nfc_magic->scene_manager, NfcMagicSceneWrite, NfcMagicSceneWriteStateCardSearch);
+            nfc_magic_scene_write_setup_view(nfc_magic);
+            consumed = true;
+        }
+    }
+    return consumed;
+}
+
+void nfc_magic_scene_write_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    nfc_magic_worker_stop(nfc_magic->worker);
+    scene_manager_set_scene_state(
+        nfc_magic->scene_manager, NfcMagicSceneWrite, NfcMagicSceneWriteStateCardSearch);
+    // Clear view
+    popup_reset(nfc_magic->popup);
+
+    nfc_magic_blink_stop(nfc_magic);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_write_confirm.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_write_confirm.c
new file mode 100644
index 000000000..d31c1c194
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_write_confirm.c
@@ -0,0 +1,64 @@
+#include "../nfc_magic_i.h"
+
+void nfc_magic_scene_write_confirm_widget_callback(
+    GuiButtonType result,
+    InputType type,
+    void* context) {
+    NfcMagic* nfc_magic = context;
+    if(type == InputTypeShort) {
+        view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, result);
+    }
+}
+
+void nfc_magic_scene_write_confirm_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+    Widget* widget = nfc_magic->widget;
+
+    widget_add_string_element(widget, 3, 0, AlignLeft, AlignTop, FontPrimary, "Risky operation");
+    widget_add_text_box_element(
+        widget,
+        0,
+        13,
+        128,
+        54,
+        AlignLeft,
+        AlignTop,
+        "Writing to this card will change manufacturer block. On some cards it may not be rewritten",
+        false);
+    widget_add_button_element(
+        widget,
+        GuiButtonTypeCenter,
+        "Continue",
+        nfc_magic_scene_write_confirm_widget_callback,
+        nfc_magic);
+    widget_add_button_element(
+        widget,
+        GuiButtonTypeLeft,
+        "Back",
+        nfc_magic_scene_write_confirm_widget_callback,
+        nfc_magic);
+
+    // Setup and start worker
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewWidget);
+}
+
+bool nfc_magic_scene_write_confirm_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == GuiButtonTypeLeft) {
+            consumed = scene_manager_previous_scene(nfc_magic->scene_manager);
+        } else if(event.event == GuiButtonTypeCenter) {
+            scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneWrite);
+            consumed = true;
+        }
+    }
+    return consumed;
+}
+
+void nfc_magic_scene_write_confirm_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    widget_reset(nfc_magic->widget);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_write_fail.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_write_fail.c
new file mode 100644
index 000000000..8a465bf61
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_write_fail.c
@@ -0,0 +1,58 @@
+#include "../nfc_magic_i.h"
+
+void nfc_magic_scene_write_fail_widget_callback(
+    GuiButtonType result,
+    InputType type,
+    void* context) {
+    NfcMagic* nfc_magic = context;
+    if(type == InputTypeShort) {
+        view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, result);
+    }
+}
+
+void nfc_magic_scene_write_fail_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+    Widget* widget = nfc_magic->widget;
+
+    notification_message(nfc_magic->notifications, &sequence_error);
+
+    widget_add_icon_element(widget, 72, 17, &I_DolphinCommon_56x48);
+    widget_add_string_element(
+        widget, 7, 4, AlignLeft, AlignTop, FontPrimary, "Writing gone wrong!");
+    widget_add_string_multiline_element(
+        widget,
+        7,
+        17,
+        AlignLeft,
+        AlignTop,
+        FontSecondary,
+        "Not all sectors\nwere written\ncorrectly.");
+
+    widget_add_button_element(
+        widget, GuiButtonTypeLeft, "Finish", nfc_magic_scene_write_fail_widget_callback, nfc_magic);
+
+    // Setup and start worker
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewWidget);
+}
+
+bool nfc_magic_scene_write_fail_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == GuiButtonTypeLeft) {
+            consumed = scene_manager_search_and_switch_to_previous_scene(
+                nfc_magic->scene_manager, NfcMagicSceneStart);
+        }
+    } else if(event.type == SceneManagerEventTypeBack) {
+        consumed = scene_manager_search_and_switch_to_previous_scene(
+            nfc_magic->scene_manager, NfcMagicSceneStart);
+    }
+    return consumed;
+}
+
+void nfc_magic_scene_write_fail_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    widget_reset(nfc_magic->widget);
+}
diff --git a/applications/plugins/nfc_magic/scenes/nfc_magic_scene_wrong_card.c b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_wrong_card.c
new file mode 100644
index 000000000..69bf9eb50
--- /dev/null
+++ b/applications/plugins/nfc_magic/scenes/nfc_magic_scene_wrong_card.c
@@ -0,0 +1,53 @@
+#include "../nfc_magic_i.h"
+
+void nfc_magic_scene_wrong_card_widget_callback(
+    GuiButtonType result,
+    InputType type,
+    void* context) {
+    NfcMagic* nfc_magic = context;
+    if(type == InputTypeShort) {
+        view_dispatcher_send_custom_event(nfc_magic->view_dispatcher, result);
+    }
+}
+
+void nfc_magic_scene_wrong_card_on_enter(void* context) {
+    NfcMagic* nfc_magic = context;
+    Widget* widget = nfc_magic->widget;
+
+    notification_message(nfc_magic->notifications, &sequence_error);
+
+    widget_add_icon_element(widget, 73, 17, &I_DolphinCommon_56x48);
+    widget_add_string_element(
+        widget, 1, 4, AlignLeft, AlignTop, FontPrimary, "This is wrong card");
+    widget_add_string_multiline_element(
+        widget,
+        1,
+        17,
+        AlignLeft,
+        AlignTop,
+        FontSecondary,
+        "Writing is supported\nonly for 4 bytes UID\nMifare CLassic 1k");
+    widget_add_button_element(
+        widget, GuiButtonTypeLeft, "Retry", nfc_magic_scene_wrong_card_widget_callback, nfc_magic);
+
+    // Setup and start worker
+    view_dispatcher_switch_to_view(nfc_magic->view_dispatcher, NfcMagicViewWidget);
+}
+
+bool nfc_magic_scene_wrong_card_on_event(void* context, SceneManagerEvent event) {
+    NfcMagic* nfc_magic = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == GuiButtonTypeLeft) {
+            consumed = scene_manager_previous_scene(nfc_magic->scene_manager);
+        }
+    }
+    return consumed;
+}
+
+void nfc_magic_scene_wrong_card_on_exit(void* context) {
+    NfcMagic* nfc_magic = context;
+
+    widget_reset(nfc_magic->widget);
+}
diff --git a/applications/plugins/nrfsniff/nrfsniff.c b/applications/plugins/nrfsniff/nrfsniff.c
index acf413d65..094775426 100644
--- a/applications/plugins/nrfsniff/nrfsniff.c
+++ b/applications/plugins/nrfsniff/nrfsniff.c
@@ -399,6 +399,8 @@ int32_t nrfsniff_app(void* p) {
                     case InputKeyBack:
                         if(event.input.type == InputTypeLong) processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
@@ -440,7 +442,7 @@ int32_t nrfsniff_app(void* p) {
     sample_time = DEFAULT_SAMPLE_TIME;
     target_rate = 8; // rate can be either 8 (2Mbps) or 0 (1Mbps)
     sniffing_state = false;
-    furi_hal_spi_release(nrf24_HANDLE);
+    nrf24_deinit();
     view_port_enabled_set(view_port, false);
     gui_remove_view_port(gui, view_port);
     furi_record_close(RECORD_GUI);
diff --git a/applications/plugins/picopass/125_10px.png b/applications/plugins/picopass/125_10px.png
new file mode 100644
index 000000000..ce01284a2
Binary files /dev/null and b/applications/plugins/picopass/125_10px.png differ
diff --git a/applications/plugins/picopass/application.fam b/applications/plugins/picopass/application.fam
index 145444a3a..3e68a7bd9 100644
--- a/applications/plugins/picopass/application.fam
+++ b/applications/plugins/picopass/application.fam
@@ -9,7 +9,7 @@ App(
     ],
     stack_size=4 * 1024,
     order=30,
-    fap_icon="../../../assets/icons/Archive/125_10px.png",
+    fap_icon="125_10px.png",
     fap_category="Tools",
     fap_libs=["mbedtls"],
     fap_private_libs=[
diff --git a/applications/plugins/picopass/picopass_worker_i.h b/applications/plugins/picopass/picopass_worker_i.h
index 101d4d8f2..ded40e6c6 100644
--- a/applications/plugins/picopass/picopass_worker_i.h
+++ b/applications/plugins/picopass/picopass_worker_i.h
@@ -9,8 +9,6 @@
 #include <furi_hal.h>
 
 #include <stdlib.h>
-#include <st25r3916.h>
-#include <rfal_analogConfig.h>
 #include <rfal_rf.h>
 
 #include <platform.h>
diff --git a/applications/plugins/picopass/rfal_picopass.c b/applications/plugins/picopass/rfal_picopass.c
index 50cd4e95d..ac66cb92d 100644
--- a/applications/plugins/picopass/rfal_picopass.c
+++ b/applications/plugins/picopass/rfal_picopass.c
@@ -1,5 +1,4 @@
 #include "rfal_picopass.h"
-#include "utils.h"
 
 #define RFAL_PICOPASS_TXRX_FLAGS                                                    \
     (FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_TX_MANUAL | FURI_HAL_NFC_LL_TXRX_FLAGS_AGC_ON | \
@@ -97,7 +96,7 @@ FuriHalNfcReturn rfalPicoPassPollerSelect(uint8_t* csn, rfalPicoPassSelectRes* s
 
     rfalPicoPassSelectReq selReq;
     selReq.CMD = RFAL_PICOPASS_CMD_SELECT;
-    ST_MEMCPY(selReq.CSN, csn, RFAL_PICOPASS_UID_LEN);
+    memcpy(selReq.CSN, csn, RFAL_PICOPASS_UID_LEN);
     uint16_t recvLen = 0;
     uint32_t flags = RFAL_PICOPASS_TXRX_FLAGS;
     uint32_t fwt = furi_hal_nfc_ll_ms2fc(20);
@@ -146,8 +145,8 @@ FuriHalNfcReturn rfalPicoPassPollerCheck(uint8_t* mac, rfalPicoPassCheckRes* chk
     FuriHalNfcReturn ret;
     rfalPicoPassCheckReq chkReq;
     chkReq.CMD = RFAL_PICOPASS_CMD_CHECK;
-    ST_MEMCPY(chkReq.mac, mac, 4);
-    ST_MEMSET(chkReq.null, 0, 4);
+    memcpy(chkReq.mac, mac, 4);
+    memset(chkReq.null, 0, 4);
     uint16_t recvLen = 0;
     uint32_t flags = RFAL_PICOPASS_TXRX_FLAGS;
     uint32_t fwt = furi_hal_nfc_ll_ms2fc(20);
diff --git a/applications/plugins/sentry_safe/sentry_safe.c b/applications/plugins/sentry_safe/sentry_safe.c
index f88661beb..4d9c12fc7 100644
--- a/applications/plugins/sentry_safe/sentry_safe.c
+++ b/applications/plugins/sentry_safe/sentry_safe.c
@@ -143,6 +143,8 @@ int32_t sentry_safe_app(void* p) {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
diff --git a/applications/plugins/snake_game/snake_game.c b/applications/plugins/snake_game/snake_game.c
index 2867134bc..e21ec1801 100644
--- a/applications/plugins/snake_game/snake_game.c
+++ b/applications/plugins/snake_game/snake_game.c
@@ -196,8 +196,8 @@ static Point snake_game_get_new_fruit(SnakeState const* const snake_state) {
             if((buffer[y] & mask) == 0) {
                 if(newFruit == 0) {
                     Point p = {
-                        .x = x,
-                        .y = y,
+                        .x = x * 2,
+                        .y = y * 2,
                     };
                     return p;
                 }
@@ -315,7 +315,6 @@ static void
 
 int32_t snake_game_app(void* p) {
     UNUSED(p);
-    srand(DWT->CYCCNT);
 
     FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(SnakeEvent));
 
@@ -378,6 +377,8 @@ int32_t snake_game_app(void* p) {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             } else if(event.type == EventTypeTick) {
diff --git a/applications/plugins/spectrum_analyzer/spectrum_analyzer.c b/applications/plugins/spectrum_analyzer/spectrum_analyzer.c
index d94739bc1..8d68c5a1a 100644
--- a/applications/plugins/spectrum_analyzer/spectrum_analyzer.c
+++ b/applications/plugins/spectrum_analyzer/spectrum_analyzer.c
@@ -496,6 +496,8 @@ int32_t spectrum_analyzer_app(void* p) {
         case InputKeyBack:
             exit_loop = true;
             break;
+        default:
+            break;
         }
 
         furi_mutex_release(spectrum_analyzer->model_mutex);
diff --git a/applications/plugins/tetris_game/tetris_game.c b/applications/plugins/tetris_game/tetris_game.c
index 29b61cd2a..8d3b9fb7a 100644
--- a/applications/plugins/tetris_game/tetris_game.c
+++ b/applications/plugins/tetris_game/tetris_game.c
@@ -345,8 +345,6 @@ static void
 }
 
 int32_t tetris_game_app() {
-    srand(DWT->CYCCNT);
-
     FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(TetrisEvent));
 
     TetrisState* tetris_state = malloc(sizeof(TetrisState));
@@ -437,6 +435,8 @@ int32_t tetris_game_app() {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             } else if(event.type == EventTypeTick) {
diff --git a/applications/plugins/tictactoe_game/tictactoe_game.c b/applications/plugins/tictactoe_game/tictactoe_game.c
index b3a0d5c84..fe57d7c62 100644
--- a/applications/plugins/tictactoe_game/tictactoe_game.c
+++ b/applications/plugins/tictactoe_game/tictactoe_game.c
@@ -358,12 +358,11 @@ int32_t tictactoe_game_app(void* p) {
                     case InputKeyOk:
                         tictactoe_state->button_state = true;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
-        } else {
-            // Event timeout
-            FURI_LOG_D(TAG, "furi_message_queue: Event timeout");
         }
 
         view_port_update(view_port);
diff --git a/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.c b/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.c
index fc39b66cd..04b73595b 100644
--- a/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.c
+++ b/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.c
@@ -282,6 +282,8 @@ bool totp_scene_add_new_token_handle_event(PluginEvent* const event, PluginState
                     totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
                 }
                 break;
+            default:
+                break;
             }
         }
     }
diff --git a/applications/plugins/totp/scenes/app_settings/totp_app_settings.c b/applications/plugins/totp/scenes/app_settings/totp_app_settings.c
index cdb775a8d..b3e6ab847 100644
--- a/applications/plugins/totp/scenes/app_settings/totp_app_settings.c
+++ b/applications/plugins/totp/scenes/app_settings/totp_app_settings.c
@@ -158,6 +158,8 @@ bool totp_scene_app_settings_handle_event(PluginEvent* const event, PluginState*
                 }
                 break;
             }
+            default:
+                break;
             }
         }
     }
diff --git a/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.c b/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.c
index 4ed79accd..cdb77f5e2 100644
--- a/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.c
+++ b/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.c
@@ -143,6 +143,8 @@ bool totp_scene_authenticate_handle_event(PluginEvent* const event, PluginState*
                     scene_state->code_length--;
                 }
                 break;
+            default:
+                break;
             }
         }
     }
diff --git a/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.c b/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.c
index 674bcd41e..c9547a1ab 100644
--- a/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.c
+++ b/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.c
@@ -303,6 +303,8 @@ bool totp_scene_generate_token_handle_event(PluginEvent* const event, PluginStat
                 break;
             case InputKeyBack:
                 break;
+            default:
+                break;
             }
         }
     }
diff --git a/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.c b/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.c
index 22c37dc2c..717cb64bc 100644
--- a/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.c
+++ b/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.c
@@ -179,6 +179,8 @@ bool totp_scene_token_menu_handle_event(PluginEvent* const event, PluginState* p
                 }
                 break;
             }
+            default:
+                break;
             }
         }
     }
diff --git a/applications/plugins/weather_station/helpers/weather_station_types.h b/applications/plugins/weather_station/helpers/weather_station_types.h
index 2976cbce8..5a66dd0ce 100644
--- a/applications/plugins/weather_station/helpers/weather_station_types.h
+++ b/applications/plugins/weather_station/helpers/weather_station_types.h
@@ -3,7 +3,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 
-#define WS_VERSION_APP "0.3.1"
+#define WS_VERSION_APP "0.4"
 #define WS_DEVELOPED "SkorP"
 #define WS_GITHUB "https://github.com/flipperdevices/flipperzero-firmware"
 
diff --git a/applications/plugins/weather_station/protocols/acurite_592txr.c b/applications/plugins/weather_station/protocols/acurite_592txr.c
index db05af095..5384a3c91 100644
--- a/applications/plugins/weather_station/protocols/acurite_592txr.c
+++ b/applications/plugins/weather_station/protocols/acurite_592txr.c
@@ -4,7 +4,7 @@
 
 /*
  * Help
- * https://github.com/merbanan/rtl_433/blob/5bef4e43133ac4c0e2d18d36f87c52b4f9458453/src/devices/acurite.c
+ * https://github.com/merbanan/rtl_433/blob/master/src/devices/acurite.c
  * 
  * Acurite 592TXR Temperature Humidity sensor decoder
  * Message Type 0x04, 7 bytes
@@ -293,7 +293,7 @@ void ws_protocol_decoder_acurite_592txr_get_string(void* context, FuriString* ou
         "%s %dbit\r\n"
         "Key:0x%lX%08lX\r\n"
         "Sn:0x%lX Ch:%d  Bat:%d\r\n"
-        "Temp:%d.%d C Hum:%d%%",
+        "Temp:%3.1f C Hum:%d%%",
         instance->generic.protocol_name,
         instance->generic.data_count_bit,
         (uint32_t)(instance->generic.data >> 32),
@@ -301,7 +301,6 @@ void ws_protocol_decoder_acurite_592txr_get_string(void* context, FuriString* ou
         instance->generic.id,
         instance->generic.channel,
         instance->generic.battery_low,
-        (int16_t)instance->generic.temp,
-        abs(((int16_t)(instance->generic.temp * 10) - (((int16_t)instance->generic.temp) * 10))),
+        (double)instance->generic.temp,
         instance->generic.humidity);
 }
diff --git a/applications/plugins/weather_station/protocols/acurite_606tx.c b/applications/plugins/weather_station/protocols/acurite_606tx.c
index 3c9144057..4cb5d18b8 100644
--- a/applications/plugins/weather_station/protocols/acurite_606tx.c
+++ b/applications/plugins/weather_station/protocols/acurite_606tx.c
@@ -234,7 +234,7 @@ void ws_protocol_decoder_acurite_606tx_get_string(void* context, FuriString* out
         "%s %dbit\r\n"
         "Key:0x%lX%08lX\r\n"
         "Sn:0x%lX Ch:%d  Bat:%d\r\n"
-        "Temp:%d.%d C Hum:%d%%",
+        "Temp:%3.1f C Hum:%d%%",
         instance->generic.protocol_name,
         instance->generic.data_count_bit,
         (uint32_t)(instance->generic.data >> 32),
@@ -242,7 +242,6 @@ void ws_protocol_decoder_acurite_606tx_get_string(void* context, FuriString* out
         instance->generic.id,
         instance->generic.channel,
         instance->generic.battery_low,
-        (int16_t)instance->generic.temp,
-        abs(((int16_t)(instance->generic.temp * 10) - (((int16_t)instance->generic.temp) * 10))),
+        (double)instance->generic.temp,
         instance->generic.humidity);
 }
diff --git a/applications/plugins/weather_station/protocols/acurite_609txc.c b/applications/plugins/weather_station/protocols/acurite_609txc.c
new file mode 100644
index 000000000..aeb0785eb
--- /dev/null
+++ b/applications/plugins/weather_station/protocols/acurite_609txc.c
@@ -0,0 +1,247 @@
+#include "acurite_609txc.h"
+
+#define TAG "WSProtocolAcurite_609TXC"
+
+/*
+ * Help
+ * https://github.com/merbanan/rtl_433/blob/5bef4e43133ac4c0e2d18d36f87c52b4f9458453/src/devices/acurite.c#L216
+ *
+ *     0000 1111 | 0011 0000 | 0101 1100 | 0000 0000 | 1110 0111
+ *     iiii iiii | buuu tttt | tttt tttt | hhhh hhhh | cccc cccc
+ * - i: identification; changes on battery switch
+ * - c: checksum (sum of previous by bytes)
+ * - u: unknown
+ * - b: battery low; flag to indicate low battery voltage
+ * - t: temperature; in °C * 10, 12 bit with complement
+ * - h: humidity
+ *
+ */
+
+static const SubGhzBlockConst ws_protocol_acurite_609txc_const = {
+    .te_short = 500,
+    .te_long = 1000,
+    .te_delta = 150,
+    .min_count_bit_for_found = 40,
+};
+
+struct WSProtocolDecoderAcurite_609TXC {
+    SubGhzProtocolDecoderBase base;
+
+    SubGhzBlockDecoder decoder;
+    WSBlockGeneric generic;
+};
+
+struct WSProtocolEncoderAcurite_609TXC {
+    SubGhzProtocolEncoderBase base;
+
+    SubGhzProtocolBlockEncoder encoder;
+    WSBlockGeneric generic;
+};
+
+typedef enum {
+    Acurite_609TXCDecoderStepReset = 0,
+    Acurite_609TXCDecoderStepSaveDuration,
+    Acurite_609TXCDecoderStepCheckDuration,
+} Acurite_609TXCDecoderStep;
+
+const SubGhzProtocolDecoder ws_protocol_acurite_609txc_decoder = {
+    .alloc = ws_protocol_decoder_acurite_609txc_alloc,
+    .free = ws_protocol_decoder_acurite_609txc_free,
+
+    .feed = ws_protocol_decoder_acurite_609txc_feed,
+    .reset = ws_protocol_decoder_acurite_609txc_reset,
+
+    .get_hash_data = ws_protocol_decoder_acurite_609txc_get_hash_data,
+    .serialize = ws_protocol_decoder_acurite_609txc_serialize,
+    .deserialize = ws_protocol_decoder_acurite_609txc_deserialize,
+    .get_string = ws_protocol_decoder_acurite_609txc_get_string,
+};
+
+const SubGhzProtocolEncoder ws_protocol_acurite_609txc_encoder = {
+    .alloc = NULL,
+    .free = NULL,
+
+    .deserialize = NULL,
+    .stop = NULL,
+    .yield = NULL,
+};
+
+const SubGhzProtocol ws_protocol_acurite_609txc = {
+    .name = WS_PROTOCOL_ACURITE_609TXC_NAME,
+    .type = SubGhzProtocolWeatherStation,
+    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
+            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable,
+
+    .decoder = &ws_protocol_acurite_609txc_decoder,
+    .encoder = &ws_protocol_acurite_609txc_encoder,
+};
+
+void* ws_protocol_decoder_acurite_609txc_alloc(SubGhzEnvironment* environment) {
+    UNUSED(environment);
+    WSProtocolDecoderAcurite_609TXC* instance = malloc(sizeof(WSProtocolDecoderAcurite_609TXC));
+    instance->base.protocol = &ws_protocol_acurite_609txc;
+    instance->generic.protocol_name = instance->base.protocol->name;
+    return instance;
+}
+
+void ws_protocol_decoder_acurite_609txc_free(void* context) {
+    furi_assert(context);
+    WSProtocolDecoderAcurite_609TXC* instance = context;
+    free(instance);
+}
+
+void ws_protocol_decoder_acurite_609txc_reset(void* context) {
+    furi_assert(context);
+    WSProtocolDecoderAcurite_609TXC* instance = context;
+    instance->decoder.parser_step = Acurite_609TXCDecoderStepReset;
+}
+
+static bool ws_protocol_acurite_609txc_check(WSProtocolDecoderAcurite_609TXC* instance) {
+    if(!instance->decoder.decode_data) return false;
+    uint8_t crc = (uint8_t)(instance->decoder.decode_data >> 32) +
+                  (uint8_t)(instance->decoder.decode_data >> 24) +
+                  (uint8_t)(instance->decoder.decode_data >> 16) +
+                  (uint8_t)(instance->decoder.decode_data >> 8);
+    return (crc == (instance->decoder.decode_data & 0xFF));
+}
+
+/**
+ * Analysis of received data
+ * @param instance Pointer to a WSBlockGeneric* instance
+ */
+static void ws_protocol_acurite_609txc_remote_controller(WSBlockGeneric* instance) {
+    instance->id = (instance->data >> 32) & 0xFF;
+    instance->battery_low = (instance->data >> 31) & 1;
+
+    instance->channel = WS_NO_CHANNEL;
+
+    // Temperature in Celsius is encoded as a 12 bit integer value
+    // multiplied by 10 using the 4th - 6th nybbles (bytes 1 & 2)
+    // negative values are recovered by sign extend from int16_t.
+    int16_t temp_raw =
+        (int16_t)(((instance->data >> 12) & 0xf000) | ((instance->data >> 16) << 4));
+    instance->temp = (temp_raw >> 4) * 0.1f;
+    instance->humidity = (instance->data >> 8) & 0xff;
+    instance->btn = WS_NO_BTN;
+}
+
+void ws_protocol_decoder_acurite_609txc_feed(void* context, bool level, uint32_t duration) {
+    furi_assert(context);
+    WSProtocolDecoderAcurite_609TXC* instance = context;
+
+    switch(instance->decoder.parser_step) {
+    case Acurite_609TXCDecoderStepReset:
+        if((!level) && (DURATION_DIFF(duration, ws_protocol_acurite_609txc_const.te_short * 17) <
+                        ws_protocol_acurite_609txc_const.te_delta * 8)) {
+            //Found syncPrefix
+            instance->decoder.parser_step = Acurite_609TXCDecoderStepSaveDuration;
+            instance->decoder.decode_data = 0;
+            instance->decoder.decode_count_bit = 0;
+        }
+        break;
+
+    case Acurite_609TXCDecoderStepSaveDuration:
+        if(level) {
+            instance->decoder.te_last = duration;
+            instance->decoder.parser_step = Acurite_609TXCDecoderStepCheckDuration;
+        } else {
+            instance->decoder.parser_step = Acurite_609TXCDecoderStepReset;
+        }
+        break;
+
+    case Acurite_609TXCDecoderStepCheckDuration:
+        if(!level) {
+            if(DURATION_DIFF(instance->decoder.te_last, ws_protocol_acurite_609txc_const.te_short) <
+               ws_protocol_acurite_609txc_const.te_delta) {
+                if((DURATION_DIFF(duration, ws_protocol_acurite_609txc_const.te_short) <
+                    ws_protocol_acurite_609txc_const.te_delta) ||
+                   (duration > ws_protocol_acurite_609txc_const.te_long * 3)) {
+                    //Found syncPostfix
+                    instance->decoder.parser_step = Acurite_609TXCDecoderStepReset;
+                    if((instance->decoder.decode_count_bit ==
+                        ws_protocol_acurite_609txc_const.min_count_bit_for_found) &&
+                       ws_protocol_acurite_609txc_check(instance)) {
+                        instance->generic.data = instance->decoder.decode_data;
+                        instance->generic.data_count_bit = instance->decoder.decode_count_bit;
+                        ws_protocol_acurite_609txc_remote_controller(&instance->generic);
+                        if(instance->base.callback)
+                            instance->base.callback(&instance->base, instance->base.context);
+                    }
+                    instance->decoder.decode_data = 0;
+                    instance->decoder.decode_count_bit = 0;
+                } else if(
+                    DURATION_DIFF(duration, ws_protocol_acurite_609txc_const.te_long) <
+                    ws_protocol_acurite_609txc_const.te_delta * 2) {
+                    subghz_protocol_blocks_add_bit(&instance->decoder, 0);
+                    instance->decoder.parser_step = Acurite_609TXCDecoderStepSaveDuration;
+                } else if(
+                    DURATION_DIFF(duration, ws_protocol_acurite_609txc_const.te_long * 2) <
+                    ws_protocol_acurite_609txc_const.te_delta * 4) {
+                    subghz_protocol_blocks_add_bit(&instance->decoder, 1);
+                    instance->decoder.parser_step = Acurite_609TXCDecoderStepSaveDuration;
+                } else {
+                    instance->decoder.parser_step = Acurite_609TXCDecoderStepReset;
+                }
+            } else {
+                instance->decoder.parser_step = Acurite_609TXCDecoderStepReset;
+            }
+        } else {
+            instance->decoder.parser_step = Acurite_609TXCDecoderStepReset;
+        }
+        break;
+    }
+}
+
+uint8_t ws_protocol_decoder_acurite_609txc_get_hash_data(void* context) {
+    furi_assert(context);
+    WSProtocolDecoderAcurite_609TXC* instance = context;
+    return subghz_protocol_blocks_get_hash_data(
+        &instance->decoder, (instance->decoder.decode_count_bit / 8) + 1);
+}
+
+bool ws_protocol_decoder_acurite_609txc_serialize(
+    void* context,
+    FlipperFormat* flipper_format,
+    SubGhzRadioPreset* preset) {
+    furi_assert(context);
+    WSProtocolDecoderAcurite_609TXC* instance = context;
+    return ws_block_generic_serialize(&instance->generic, flipper_format, preset);
+}
+
+bool ws_protocol_decoder_acurite_609txc_deserialize(void* context, FlipperFormat* flipper_format) {
+    furi_assert(context);
+    WSProtocolDecoderAcurite_609TXC* instance = context;
+    bool ret = false;
+    do {
+        if(!ws_block_generic_deserialize(&instance->generic, flipper_format)) {
+            break;
+        }
+        if(instance->generic.data_count_bit !=
+           ws_protocol_acurite_609txc_const.min_count_bit_for_found) {
+            FURI_LOG_E(TAG, "Wrong number of bits in key");
+            break;
+        }
+        ret = true;
+    } while(false);
+    return ret;
+}
+
+void ws_protocol_decoder_acurite_609txc_get_string(void* context, FuriString* output) {
+    furi_assert(context);
+    WSProtocolDecoderAcurite_609TXC* instance = context;
+    furi_string_printf(
+        output,
+        "%s %dbit\r\n"
+        "Key:0x%lX%08lX\r\n"
+        "Sn:0x%lX Ch:%d  Bat:%d\r\n"
+        "Temp:%3.1f C Hum:%d%%",
+        instance->generic.protocol_name,
+        instance->generic.data_count_bit,
+        (uint32_t)(instance->generic.data >> 40),
+        (uint32_t)(instance->generic.data),
+        instance->generic.id,
+        instance->generic.channel,
+        instance->generic.battery_low,
+        (double)instance->generic.temp,
+        instance->generic.humidity);
+}
diff --git a/applications/plugins/weather_station/protocols/acurite_609txc.h b/applications/plugins/weather_station/protocols/acurite_609txc.h
new file mode 100644
index 000000000..f87c20e9b
--- /dev/null
+++ b/applications/plugins/weather_station/protocols/acurite_609txc.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include <lib/subghz/protocols/base.h>
+
+#include <lib/subghz/blocks/const.h>
+#include <lib/subghz/blocks/decoder.h>
+#include <lib/subghz/blocks/encoder.h>
+#include "ws_generic.h"
+#include <lib/subghz/blocks/math.h>
+
+#define WS_PROTOCOL_ACURITE_609TXC_NAME "Acurite-609TXC"
+
+typedef struct WSProtocolDecoderAcurite_609TXC WSProtocolDecoderAcurite_609TXC;
+typedef struct WSProtocolEncoderAcurite_609TXC WSProtocolEncoderAcurite_609TXC;
+
+extern const SubGhzProtocolDecoder ws_protocol_acurite_609txc_decoder;
+extern const SubGhzProtocolEncoder ws_protocol_acurite_609txc_encoder;
+extern const SubGhzProtocol ws_protocol_acurite_609txc;
+
+/**
+ * Allocate WSProtocolDecoderAcurite_609TXC.
+ * @param environment Pointer to a SubGhzEnvironment instance
+ * @return WSProtocolDecoderAcurite_609TXC* pointer to a WSProtocolDecoderAcurite_609TXC instance
+ */
+void* ws_protocol_decoder_acurite_609txc_alloc(SubGhzEnvironment* environment);
+
+/**
+ * Free WSProtocolDecoderAcurite_609TXC.
+ * @param context Pointer to a WSProtocolDecoderAcurite_609TXC instance
+ */
+void ws_protocol_decoder_acurite_609txc_free(void* context);
+
+/**
+ * Reset decoder WSProtocolDecoderAcurite_609TXC.
+ * @param context Pointer to a WSProtocolDecoderAcurite_609TXC instance
+ */
+void ws_protocol_decoder_acurite_609txc_reset(void* context);
+
+/**
+ * Parse a raw sequence of levels and durations received from the air.
+ * @param context Pointer to a WSProtocolDecoderAcurite_609TXC instance
+ * @param level Signal level true-high false-low
+ * @param duration Duration of this level in, us
+ */
+void ws_protocol_decoder_acurite_609txc_feed(void* context, bool level, uint32_t duration);
+
+/**
+ * Getting the hash sum of the last randomly received parcel.
+ * @param context Pointer to a WSProtocolDecoderAcurite_609TXC instance
+ * @return hash Hash sum
+ */
+uint8_t ws_protocol_decoder_acurite_609txc_get_hash_data(void* context);
+
+/**
+ * Serialize data WSProtocolDecoderAcurite_609TXC.
+ * @param context Pointer to a WSProtocolDecoderAcurite_609TXC instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @param preset The modulation on which the signal was received, SubGhzRadioPreset
+ * @return true On success
+ */
+bool ws_protocol_decoder_acurite_609txc_serialize(
+    void* context,
+    FlipperFormat* flipper_format,
+    SubGhzRadioPreset* preset);
+
+/**
+ * Deserialize data WSProtocolDecoderAcurite_609TXC.
+ * @param context Pointer to a WSProtocolDecoderAcurite_609TXC instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @return true On success
+ */
+bool ws_protocol_decoder_acurite_609txc_deserialize(void* context, FlipperFormat* flipper_format);
+
+/**
+ * Getting a textual representation of the received data.
+ * @param context Pointer to a WSProtocolDecoderAcurite_609TXC instance
+ * @param output Resulting text
+ */
+void ws_protocol_decoder_acurite_609txc_get_string(void* context, FuriString* output);
diff --git a/applications/plugins/weather_station/protocols/ambient_weather.c b/applications/plugins/weather_station/protocols/ambient_weather.c
new file mode 100644
index 000000000..5ae22b790
--- /dev/null
+++ b/applications/plugins/weather_station/protocols/ambient_weather.c
@@ -0,0 +1,276 @@
+#include "ambient_weather.h"
+#include <lib/toolbox/manchester_decoder.h>
+
+#define TAG "WSProtocolAmbient_Weather"
+
+/*
+ * Help
+ * https://github.com/merbanan/rtl_433/blob/master/src/devices/ambient_weather.c
+ * 
+ * Decode Ambient Weather F007TH, F012TH, TF 30.3208.02, SwitchDoc F016TH.
+ * Devices supported:
+ * - Ambient Weather F007TH Thermo-Hygrometer.
+ * - Ambient Weather F012TH Indoor/Display Thermo-Hygrometer.
+ * - TFA senders 30.3208.02 from the TFA "Klima-Monitor" 30.3054,
+ * - SwitchDoc Labs F016TH.
+ * This decoder handles the 433mhz/868mhz thermo-hygrometers.
+ * The 915mhz (WH*) family of devices use different modulation/encoding.
+ * Byte 0   Byte 1   Byte 2   Byte 3   Byte 4   Byte 5
+ * xxxxMMMM IIIIIIII BCCCTTTT TTTTTTTT HHHHHHHH MMMMMMMM
+ * - x: Unknown 0x04 on F007TH/F012TH
+ * - M: Model Number?, 0x05 on F007TH/F012TH/SwitchDocLabs F016TH
+ * - I: ID byte (8 bits), volatie, changes at power up,
+ * - B: Battery Low
+ * - C: Channel (3 bits 1-8) - F007TH set by Dip switch, F012TH soft setting
+ * - T: Temperature 12 bits - Fahrenheit * 10 + 400
+ * - H: Humidity (8 bits)
+ * - M: Message integrity check LFSR Digest-8, gen 0x98, key 0x3e, init 0x64
+ * 
+ * three repeats without gap
+ * full preamble is 0x00145 (the last bits might not be fixed, e.g. 0x00146)
+ * and on decoding also 0xffd45
+ */
+
+#define AMBIENT_WEATHER_PACKET_HEADER_1 0xFFD440000000000 //0xffd45 .. 0xffd46
+#define AMBIENT_WEATHER_PACKET_HEADER_2 0x001440000000000 //0x00145 .. 0x00146
+#define AMBIENT_WEATHER_PACKET_HEADER_MASK 0xFFFFC0000000000
+
+static const SubGhzBlockConst ws_protocol_ambient_weather_const = {
+    .te_short = 500,
+    .te_long = 1000,
+    .te_delta = 120,
+    .min_count_bit_for_found = 48,
+};
+
+struct WSProtocolDecoderAmbient_Weather {
+    SubGhzProtocolDecoderBase base;
+
+    SubGhzBlockDecoder decoder;
+    WSBlockGeneric generic;
+    ManchesterState manchester_saved_state;
+    uint16_t header_count;
+};
+
+struct WSProtocolEncoderAmbient_Weather {
+    SubGhzProtocolEncoderBase base;
+
+    SubGhzProtocolBlockEncoder encoder;
+    WSBlockGeneric generic;
+};
+
+const SubGhzProtocolDecoder ws_protocol_ambient_weather_decoder = {
+    .alloc = ws_protocol_decoder_ambient_weather_alloc,
+    .free = ws_protocol_decoder_ambient_weather_free,
+
+    .feed = ws_protocol_decoder_ambient_weather_feed,
+    .reset = ws_protocol_decoder_ambient_weather_reset,
+
+    .get_hash_data = ws_protocol_decoder_ambient_weather_get_hash_data,
+    .serialize = ws_protocol_decoder_ambient_weather_serialize,
+    .deserialize = ws_protocol_decoder_ambient_weather_deserialize,
+    .get_string = ws_protocol_decoder_ambient_weather_get_string,
+};
+
+const SubGhzProtocolEncoder ws_protocol_ambient_weather_encoder = {
+    .alloc = NULL,
+    .free = NULL,
+
+    .deserialize = NULL,
+    .stop = NULL,
+    .yield = NULL,
+};
+
+const SubGhzProtocol ws_protocol_ambient_weather = {
+    .name = WS_PROTOCOL_AMBIENT_WEATHER_NAME,
+    .type = SubGhzProtocolWeatherStation,
+    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
+            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable,
+
+    .decoder = &ws_protocol_ambient_weather_decoder,
+    .encoder = &ws_protocol_ambient_weather_encoder,
+};
+
+void* ws_protocol_decoder_ambient_weather_alloc(SubGhzEnvironment* environment) {
+    UNUSED(environment);
+    WSProtocolDecoderAmbient_Weather* instance = malloc(sizeof(WSProtocolDecoderAmbient_Weather));
+    instance->base.protocol = &ws_protocol_ambient_weather;
+    instance->generic.protocol_name = instance->base.protocol->name;
+    return instance;
+}
+
+void ws_protocol_decoder_ambient_weather_free(void* context) {
+    furi_assert(context);
+    WSProtocolDecoderAmbient_Weather* instance = context;
+    free(instance);
+}
+
+void ws_protocol_decoder_ambient_weather_reset(void* context) {
+    furi_assert(context);
+    WSProtocolDecoderAmbient_Weather* instance = context;
+    manchester_advance(
+        instance->manchester_saved_state,
+        ManchesterEventReset,
+        &instance->manchester_saved_state,
+        NULL);
+}
+
+static bool ws_protocol_ambient_weather_check_crc(WSProtocolDecoderAmbient_Weather* instance) {
+    uint8_t msg[] = {
+        instance->decoder.decode_data >> 40,
+        instance->decoder.decode_data >> 32,
+        instance->decoder.decode_data >> 24,
+        instance->decoder.decode_data >> 16,
+        instance->decoder.decode_data >> 8};
+
+    uint8_t crc = subghz_protocol_blocks_lfsr_digest8(msg, 5, 0x98, 0x3e) ^ 0x64;
+    return (crc == (uint8_t)(instance->decoder.decode_data & 0xFF));
+}
+
+/**
+ * Analysis of received data
+ * @param instance Pointer to a WSBlockGeneric* instance
+ */
+static void ws_protocol_ambient_weather_remote_controller(WSBlockGeneric* instance) {
+    instance->id = (instance->data >> 32) & 0xFF;
+    instance->battery_low = (instance->data >> 31) & 1;
+    instance->channel = ((instance->data >> 28) & 0x07) + 1;
+    instance->temp = ws_block_generic_fahrenheit_to_celsius(
+        ((float)((instance->data >> 16) & 0x0FFF) - 400.0f) / 10.0f);
+    instance->humidity = (instance->data >> 8) & 0xFF;
+    instance->btn = WS_NO_BTN;
+
+    // ToDo maybe it won't be needed
+    /*
+    Sanity checks to reduce false positives and other bad data
+    Packets with Bad data often pass the MIC check.
+    - humidity > 100 (such as 255) and
+    - temperatures > 140 F (such as 369.5 F and 348.8 F
+    Specs in the F007TH and F012TH manuals state the range is:
+    - Temperature: -40 to 140 F
+    - Humidity: 10 to 99%
+    @todo - sanity check b[0] "model number"
+    - 0x45 - F007TH and F012TH
+    - 0x?5 - SwitchDocLabs F016TH temperature sensor (based on comment b[0] & 0x0f == 5)
+    - ? - TFA 30.3208.02
+    if (instance->humidity < 0 || instance->humidity > 100) {
+        ERROR;
+    }
+
+    if (instance->temp < -40.0 || instance->temp > 140.0) {
+         ERROR;
+    }
+    */
+}
+
+void ws_protocol_decoder_ambient_weather_feed(void* context, bool level, uint32_t duration) {
+    furi_assert(context);
+    WSProtocolDecoderAmbient_Weather* instance = context;
+
+    ManchesterEvent event = ManchesterEventReset;
+    if(!level) {
+        if(DURATION_DIFF(duration, ws_protocol_ambient_weather_const.te_short) <
+           ws_protocol_ambient_weather_const.te_delta) {
+            event = ManchesterEventShortLow;
+        } else if(
+            DURATION_DIFF(duration, ws_protocol_ambient_weather_const.te_long) <
+            ws_protocol_ambient_weather_const.te_delta * 2) {
+            event = ManchesterEventLongLow;
+        }
+    } else {
+        if(DURATION_DIFF(duration, ws_protocol_ambient_weather_const.te_short) <
+           ws_protocol_ambient_weather_const.te_delta) {
+            event = ManchesterEventShortHigh;
+        } else if(
+            DURATION_DIFF(duration, ws_protocol_ambient_weather_const.te_long) <
+            ws_protocol_ambient_weather_const.te_delta * 2) {
+            event = ManchesterEventLongHigh;
+        }
+    }
+    if(event != ManchesterEventReset) {
+        bool data;
+        bool data_ok = manchester_advance(
+            instance->manchester_saved_state, event, &instance->manchester_saved_state, &data);
+
+        if(data_ok) {
+            instance->decoder.decode_data = (instance->decoder.decode_data << 1) | !data;
+        }
+
+        if(((instance->decoder.decode_data & AMBIENT_WEATHER_PACKET_HEADER_MASK) ==
+            AMBIENT_WEATHER_PACKET_HEADER_1) ||
+           ((instance->decoder.decode_data & AMBIENT_WEATHER_PACKET_HEADER_MASK) ==
+            AMBIENT_WEATHER_PACKET_HEADER_2)) {
+            if(ws_protocol_ambient_weather_check_crc(instance)) {
+                instance->generic.data = instance->decoder.decode_data;
+                instance->generic.data_count_bit =
+                    ws_protocol_ambient_weather_const.min_count_bit_for_found;
+                ws_protocol_ambient_weather_remote_controller(&instance->generic);
+                if(instance->base.callback)
+                    instance->base.callback(&instance->base, instance->base.context);
+                instance->decoder.decode_data = 0;
+                instance->decoder.decode_count_bit = 0;
+            }
+        }
+    } else {
+        instance->decoder.decode_data = 0;
+        instance->decoder.decode_count_bit = 0;
+        manchester_advance(
+            instance->manchester_saved_state,
+            ManchesterEventReset,
+            &instance->manchester_saved_state,
+            NULL);
+    }
+}
+
+uint8_t ws_protocol_decoder_ambient_weather_get_hash_data(void* context) {
+    furi_assert(context);
+    WSProtocolDecoderAmbient_Weather* instance = context;
+    return subghz_protocol_blocks_get_hash_data(
+        &instance->decoder, (instance->decoder.decode_count_bit / 8) + 1);
+}
+
+bool ws_protocol_decoder_ambient_weather_serialize(
+    void* context,
+    FlipperFormat* flipper_format,
+    SubGhzRadioPreset* preset) {
+    furi_assert(context);
+    WSProtocolDecoderAmbient_Weather* instance = context;
+    return ws_block_generic_serialize(&instance->generic, flipper_format, preset);
+}
+
+bool ws_protocol_decoder_ambient_weather_deserialize(void* context, FlipperFormat* flipper_format) {
+    furi_assert(context);
+    WSProtocolDecoderAmbient_Weather* instance = context;
+    bool ret = false;
+    do {
+        if(!ws_block_generic_deserialize(&instance->generic, flipper_format)) {
+            break;
+        }
+        if(instance->generic.data_count_bit !=
+           ws_protocol_ambient_weather_const.min_count_bit_for_found) {
+            FURI_LOG_E(TAG, "Wrong number of bits in key");
+            break;
+        }
+        ret = true;
+    } while(false);
+    return ret;
+}
+
+void ws_protocol_decoder_ambient_weather_get_string(void* context, FuriString* output) {
+    furi_assert(context);
+    WSProtocolDecoderAmbient_Weather* instance = context;
+    furi_string_printf(
+        output,
+        "%s %dbit\r\n"
+        "Key:0x%lX%08lX\r\n"
+        "Sn:0x%lX Ch:%d  Bat:%d\r\n"
+        "Temp:%3.1f C Hum:%d%%",
+        instance->generic.protocol_name,
+        instance->generic.data_count_bit,
+        (uint32_t)(instance->generic.data >> 32),
+        (uint32_t)(instance->generic.data),
+        instance->generic.id,
+        instance->generic.channel,
+        instance->generic.battery_low,
+        (double)instance->generic.temp,
+        instance->generic.humidity);
+}
diff --git a/applications/plugins/weather_station/protocols/ambient_weather.h b/applications/plugins/weather_station/protocols/ambient_weather.h
new file mode 100644
index 000000000..04cc5819c
--- /dev/null
+++ b/applications/plugins/weather_station/protocols/ambient_weather.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include <lib/subghz/protocols/base.h>
+
+#include <lib/subghz/blocks/const.h>
+#include <lib/subghz/blocks/decoder.h>
+#include <lib/subghz/blocks/encoder.h>
+#include "ws_generic.h"
+#include <lib/subghz/blocks/math.h>
+
+#define WS_PROTOCOL_AMBIENT_WEATHER_NAME "Ambient_Weather"
+
+typedef struct WSProtocolDecoderAmbient_Weather WSProtocolDecoderAmbient_Weather;
+typedef struct WSProtocolEncoderAmbient_Weather WSProtocolEncoderAmbient_Weather;
+
+extern const SubGhzProtocolDecoder ws_protocol_ambient_weather_decoder;
+extern const SubGhzProtocolEncoder ws_protocol_ambient_weather_encoder;
+extern const SubGhzProtocol ws_protocol_ambient_weather;
+
+/**
+ * Allocate WSProtocolDecoderAmbient_Weather.
+ * @param environment Pointer to a SubGhzEnvironment instance
+ * @return WSProtocolDecoderAmbient_Weather* pointer to a WSProtocolDecoderAmbient_Weather instance
+ */
+void* ws_protocol_decoder_ambient_weather_alloc(SubGhzEnvironment* environment);
+
+/**
+ * Free WSProtocolDecoderAmbient_Weather.
+ * @param context Pointer to a WSProtocolDecoderAmbient_Weather instance
+ */
+void ws_protocol_decoder_ambient_weather_free(void* context);
+
+/**
+ * Reset decoder WSProtocolDecoderAmbient_Weather.
+ * @param context Pointer to a WSProtocolDecoderAmbient_Weather instance
+ */
+void ws_protocol_decoder_ambient_weather_reset(void* context);
+
+/**
+ * Parse a raw sequence of levels and durations received from the air.
+ * @param context Pointer to a WSProtocolDecoderAmbient_Weather instance
+ * @param level Signal level true-high false-low
+ * @param duration Duration of this level in, us
+ */
+void ws_protocol_decoder_ambient_weather_feed(void* context, bool level, uint32_t duration);
+
+/**
+ * Getting the hash sum of the last randomly received parcel.
+ * @param context Pointer to a WSProtocolDecoderAmbient_Weather instance
+ * @return hash Hash sum
+ */
+uint8_t ws_protocol_decoder_ambient_weather_get_hash_data(void* context);
+
+/**
+ * Serialize data WSProtocolDecoderAmbient_Weather.
+ * @param context Pointer to a WSProtocolDecoderAmbient_Weather instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @param preset The modulation on which the signal was received, SubGhzRadioPreset
+ * @return true On success
+ */
+bool ws_protocol_decoder_ambient_weather_serialize(
+    void* context,
+    FlipperFormat* flipper_format,
+    SubGhzRadioPreset* preset);
+
+/**
+ * Deserialize data WSProtocolDecoderAmbient_Weather.
+ * @param context Pointer to a WSProtocolDecoderAmbient_Weather instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @return true On success
+ */
+bool ws_protocol_decoder_ambient_weather_deserialize(void* context, FlipperFormat* flipper_format);
+
+/**
+ * Getting a textual representation of the received data.
+ * @param context Pointer to a WSProtocolDecoderAmbient_Weather instance
+ * @param output Resulting text
+ */
+void ws_protocol_decoder_ambient_weather_get_string(void* context, FuriString* output);
diff --git a/applications/plugins/weather_station/protocols/gt_wt_03.c b/applications/plugins/weather_station/protocols/gt_wt_03.c
index 1492374c9..7831cf069 100644
--- a/applications/plugins/weather_station/protocols/gt_wt_03.c
+++ b/applications/plugins/weather_station/protocols/gt_wt_03.c
@@ -4,7 +4,7 @@
 
 /*
  * Help
- * https://github.com/merbanan/rtl_433/blob/5f0ff6db624270a4598958ab9dd79bb385ced3ef/src/devices/gt_wt_03.c
+ * https://github.com/merbanan/rtl_433/blob/master/src/devices/gt_wt_03.c
  * 
  * 
  * Globaltronics GT-WT-03 sensor on 433.92MHz.
@@ -327,7 +327,7 @@ void ws_protocol_decoder_gt_wt_03_get_string(void* context, FuriString* output)
         "%s %dbit\r\n"
         "Key:0x%lX%08lX\r\n"
         "Sn:0x%lX Ch:%d  Bat:%d\r\n"
-        "Temp:%d.%d C Hum:%d%%",
+        "Temp:%3.1f C Hum:%d%%",
         instance->generic.protocol_name,
         instance->generic.data_count_bit,
         (uint32_t)(instance->generic.data >> 32),
@@ -335,7 +335,6 @@ void ws_protocol_decoder_gt_wt_03_get_string(void* context, FuriString* output)
         instance->generic.id,
         instance->generic.channel,
         instance->generic.battery_low,
-        (int16_t)instance->generic.temp,
-        abs(((int16_t)(instance->generic.temp * 10) - (((int16_t)instance->generic.temp) * 10))),
+        (double)instance->generic.temp,
         instance->generic.humidity);
 }
diff --git a/applications/plugins/weather_station/protocols/infactory.c b/applications/plugins/weather_station/protocols/infactory.c
index b08a4e9db..2d444d981 100644
--- a/applications/plugins/weather_station/protocols/infactory.c
+++ b/applications/plugins/weather_station/protocols/infactory.c
@@ -283,7 +283,7 @@ void ws_protocol_decoder_infactory_get_string(void* context, FuriString* output)
         "%s %dbit\r\n"
         "Key:0x%lX%08lX\r\n"
         "Sn:0x%lX Ch:%d  Bat:%d\r\n"
-        "Temp:%d.%d C Hum:%d%%",
+        "Temp:%3.1f C Hum:%d%%",
         instance->generic.protocol_name,
         instance->generic.data_count_bit,
         (uint32_t)(instance->generic.data >> 32),
@@ -291,7 +291,6 @@ void ws_protocol_decoder_infactory_get_string(void* context, FuriString* output)
         instance->generic.id,
         instance->generic.channel,
         instance->generic.battery_low,
-        (int16_t)instance->generic.temp,
-        abs(((int16_t)(instance->generic.temp * 10) - (((int16_t)instance->generic.temp) * 10))),
+        (double)instance->generic.temp,
         instance->generic.humidity);
 }
diff --git a/applications/plugins/weather_station/protocols/lacrosse_tx141thbv2.c b/applications/plugins/weather_station/protocols/lacrosse_tx141thbv2.c
index 828d49be7..e4b612250 100644
--- a/applications/plugins/weather_station/protocols/lacrosse_tx141thbv2.c
+++ b/applications/plugins/weather_station/protocols/lacrosse_tx141thbv2.c
@@ -4,7 +4,7 @@
 
 /*
  * Help
- * https://github.com/merbanan/rtl_433/blob/7e83cfd27d14247b6c3c81732bfe4a4f9a974d30/src/devices/lacrosse_tx141x.c
+ * https://github.com/merbanan/rtl_433/blob/master/src/devices/lacrosse_tx141x.c
  *  
  *     iiii iiii | bkcc tttt | tttt tttt | hhhh hhhh | cccc cccc | u
  * - i: identification; changes on battery switch
@@ -284,7 +284,7 @@ void ws_protocol_decoder_lacrosse_tx141thbv2_get_string(void* context, FuriStrin
         "%s %dbit\r\n"
         "Key:0x%lX%08lX\r\n"
         "Sn:0x%lX Ch:%d  Bat:%d\r\n"
-        "Temp:%d.%d C Hum:%d%%",
+        "Temp:%3.1f C Hum:%d%%",
         instance->generic.protocol_name,
         instance->generic.data_count_bit,
         (uint32_t)(instance->generic.data >> 32),
@@ -292,7 +292,6 @@ void ws_protocol_decoder_lacrosse_tx141thbv2_get_string(void* context, FuriStrin
         instance->generic.id,
         instance->generic.channel,
         instance->generic.battery_low,
-        (int16_t)instance->generic.temp,
-        abs(((int16_t)(instance->generic.temp * 10) - (((int16_t)instance->generic.temp) * 10))),
+        (double)instance->generic.temp,
         instance->generic.humidity);
 }
diff --git a/applications/plugins/weather_station/protocols/nexus_th.c b/applications/plugins/weather_station/protocols/nexus_th.c
index a2ab0f412..7d4a77aea 100644
--- a/applications/plugins/weather_station/protocols/nexus_th.c
+++ b/applications/plugins/weather_station/protocols/nexus_th.c
@@ -4,7 +4,7 @@
 
 /*
  * Help
- * https://github.com/merbanan/rtl_433/blob/ef2d37cf51e3264d11cde9149ef87de2f0a4d37a/src/devices/nexus.c
+ * https://github.com/merbanan/rtl_433/blob/master/src/devices/nexus.c
  *
  * Nexus sensor protocol with ID, temperature and optional humidity
  * also FreeTec (Pearl) NC-7345 sensors for FreeTec Weatherstation NC-7344,
@@ -247,7 +247,7 @@ void ws_protocol_decoder_nexus_th_get_string(void* context, FuriString* output)
         "%s %dbit\r\n"
         "Key:0x%lX%08lX\r\n"
         "Sn:0x%lX Ch:%d  Bat:%d\r\n"
-        "Temp:%d.%d C Hum:%d%%",
+        "Temp:%3.1f C Hum:%d%%",
         instance->generic.protocol_name,
         instance->generic.data_count_bit,
         (uint32_t)(instance->generic.data >> 32),
@@ -255,7 +255,6 @@ void ws_protocol_decoder_nexus_th_get_string(void* context, FuriString* output)
         instance->generic.id,
         instance->generic.channel,
         instance->generic.battery_low,
-        (int16_t)instance->generic.temp,
-        abs(((int16_t)(instance->generic.temp * 10) - (((int16_t)instance->generic.temp) * 10))),
+        (double)instance->generic.temp,
         instance->generic.humidity);
 }
diff --git a/applications/plugins/weather_station/protocols/protocol_items.c b/applications/plugins/weather_station/protocols/protocol_items.c
index 3ec9e995a..d2b20e51a 100644
--- a/applications/plugins/weather_station/protocols/protocol_items.c
+++ b/applications/plugins/weather_station/protocols/protocol_items.c
@@ -6,9 +6,11 @@ const SubGhzProtocol* weather_station_protocol_registry_items[] = {
     &ws_protocol_nexus_th,
     &ws_protocol_gt_wt_03,
     &ws_protocol_acurite_606tx,
+    &ws_protocol_acurite_609txc,
     &ws_protocol_lacrosse_tx141thbv2,
     &ws_protocol_oregon2,
     &ws_protocol_acurite_592txr,
+    &ws_protocol_ambient_weather,
 };
 
 const SubGhzProtocolRegistry weather_station_protocol_registry = {
diff --git a/applications/plugins/weather_station/protocols/protocol_items.h b/applications/plugins/weather_station/protocols/protocol_items.h
index 8f3eb53d7..45b297e10 100644
--- a/applications/plugins/weather_station/protocols/protocol_items.h
+++ b/applications/plugins/weather_station/protocols/protocol_items.h
@@ -6,8 +6,10 @@
 #include "nexus_th.h"
 #include "gt_wt_03.h"
 #include "acurite_606tx.h"
+#include "acurite_609txc.h"
 #include "lacrosse_tx141thbv2.h"
 #include "oregon2.h"
 #include "acurite_592txr.h"
+#include "ambient_weather.h"
 
 extern const SubGhzProtocolRegistry weather_station_protocol_registry;
diff --git a/applications/plugins/weather_station/protocols/thermopro_tx4.c b/applications/plugins/weather_station/protocols/thermopro_tx4.c
index 9a2eacb2f..0882bc33d 100644
--- a/applications/plugins/weather_station/protocols/thermopro_tx4.c
+++ b/applications/plugins/weather_station/protocols/thermopro_tx4.c
@@ -246,7 +246,7 @@ void ws_protocol_decoder_thermopro_tx4_get_string(void* context, FuriString* out
         "%s %dbit\r\n"
         "Key:0x%lX%08lX\r\n"
         "Sn:0x%lX Ch:%d  Bat:%d\r\n"
-        "Temp:%d.%d C Hum:%d%%",
+        "Temp:%3.1f C Hum:%d%%",
         instance->generic.protocol_name,
         instance->generic.data_count_bit,
         (uint32_t)(instance->generic.data >> 32),
@@ -254,7 +254,6 @@ void ws_protocol_decoder_thermopro_tx4_get_string(void* context, FuriString* out
         instance->generic.id,
         instance->generic.channel,
         instance->generic.battery_low,
-        (int16_t)instance->generic.temp,
-        abs(((int16_t)(instance->generic.temp * 10) - (((int16_t)instance->generic.temp) * 10))),
+        (double)instance->generic.temp,
         instance->generic.humidity);
 }
diff --git a/applications/plugins/weather_station/views/weather_station_receiver_info.c b/applications/plugins/weather_station/views/weather_station_receiver_info.c
index 34ec122d1..49b447f10 100644
--- a/applications/plugins/weather_station/views/weather_station_receiver_info.c
+++ b/applications/plugins/weather_station/views/weather_station_receiver_info.c
@@ -75,12 +75,7 @@ void ws_view_receiver_info_draw(Canvas* canvas, WSReceiverInfoModel* model) {
 
     if(model->generic->temp != WS_NO_TEMPERATURE) {
         canvas_draw_icon(canvas, 18, 42, &I_Therm_7x16);
-        snprintf(
-            buffer,
-            sizeof(buffer),
-            "%3.2d.%d C",
-            (int16_t)model->generic->temp,
-            abs(((int16_t)(model->generic->temp * 10) - (((int16_t)model->generic->temp) * 10))));
+        snprintf(buffer, sizeof(buffer), "%3.1f C", (double)model->generic->temp);
         canvas_draw_str_aligned(canvas, 63, 46, AlignRight, AlignTop, buffer);
         canvas_draw_circle(canvas, 55, 45, 1);
     }
diff --git a/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c b/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c
index c5afa6502..55e6f63a4 100644
--- a/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c
+++ b/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c
@@ -34,7 +34,7 @@ void wifi_marauder_scene_console_output_on_enter(void* context) {
         app->text_box_store_strlen = 0;
         if(0 == strncmp("help", app->selected_tx_string, strlen("help"))) {
             const char* help_msg =
-                "For app support/feedback,\nreach out to me:\n@cococode#6011 (discord)\n0xchocolate (github)\n";
+                "Marauder companion v0.2.1\nFor app support/feedback,\nreach out to me:\n@cococode#6011 (discord)\n0xchocolate (github)\n";
             furi_string_cat_str(app->text_box_store, help_msg);
             app->text_box_store_strlen += strlen(help_msg);
         }
diff --git a/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c b/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c
index b6d3f7059..a2dbf4b02 100644
--- a/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c
+++ b/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c
@@ -10,7 +10,7 @@ typedef enum { FOCUS_CONSOLE_END = 0, FOCUS_CONSOLE_START, FOCUS_CONSOLE_TOGGLE
 #define SHOW_STOPSCAN_TIP (true)
 #define NO_TIP (false)
 
-#define MAX_OPTIONS (6)
+#define MAX_OPTIONS (7)
 typedef struct {
     const char* item_string;
     const char* options_menu[MAX_OPTIONS];
@@ -56,9 +56,9 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
     {"Sniff",
-     {"beacon", "deauth", "esp", "pmkid", "pwn"},
-     5,
-     {"sniffbeacon", "sniffdeauth", "sniffesp", "sniffpmkid", "sniffpwn"},
+     {"beacon", "deauth", "esp", "pmkid", "probe", "pwn", "raw"},
+     7,
+     {"sniffbeacon", "sniffdeauth", "sniffesp", "sniffpmkid", "sniffprobe", "sniffpwn", "sniffraw"},
      NO_ARGS,
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
diff --git a/applications/services/cli/cli_command_gpio.c b/applications/services/cli/cli_command_gpio.c
index 54671eda4..3e7301cdc 100644
--- a/applications/services/cli/cli_command_gpio.c
+++ b/applications/services/cli/cli_command_gpio.c
@@ -40,7 +40,7 @@ static bool pin_name_to_int(FuriString* pin_name, size_t* result) {
     bool debug = furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug);
     for(size_t i = 0; i < COUNT_OF(cli_command_gpio_pins); i++) {
         if(!furi_string_cmp(pin_name, cli_command_gpio_pins[i].name)) {
-            if(!cli_command_gpio_pins[i].debug || (cli_command_gpio_pins[i].debug && debug)) {
+            if(!cli_command_gpio_pins[i].debug || debug) {
                 *result = i;
                 found = true;
                 break;
@@ -55,21 +55,26 @@ 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)) {
+        if(!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;
+typedef enum {
+    GpioParseReturnOk,
+    GpioParseReturnCmdSyntaxError,
+    GpioParseReturnPinError,
+    GpioParseReturnValueError
+} GpioParseReturn;
 
-static GpioParseError gpio_command_parse(FuriString* args, size_t* pin_num, uint8_t* value) {
+static GpioParseReturn gpio_command_parse(FuriString* args, size_t* pin_num, uint8_t* value) {
     FuriString* pin_name;
     pin_name = furi_string_alloc();
 
     size_t ws = furi_string_search_char(args, ' ');
     if(ws == FURI_STRING_FAILURE) {
-        return ERR_CMD_SYNTAX;
+        return GpioParseReturnCmdSyntaxError;
     }
 
     furi_string_set_n(pin_name, args, 0, ws);
@@ -78,7 +83,7 @@ static GpioParseError gpio_command_parse(FuriString* args, size_t* pin_num, uint
 
     if(!pin_name_to_int(pin_name, pin_num)) {
         furi_string_free(pin_name);
-        return ERR_PIN;
+        return GpioParseReturnPinError;
     }
 
     furi_string_free(pin_name);
@@ -88,10 +93,10 @@ static GpioParseError gpio_command_parse(FuriString* args, size_t* pin_num, uint
     } else if(!furi_string_cmp(args, "1")) {
         *value = 1;
     } else {
-        return ERR_VALUE;
+        return GpioParseReturnValueError;
     }
 
-    return OK;
+    return GpioParseReturnOk;
 }
 
 void cli_command_gpio_mode(Cli* cli, FuriString* args, void* context) {
@@ -101,15 +106,15 @@ void cli_command_gpio_mode(Cli* cli, FuriString* args, void* context) {
     size_t num = 0;
     uint8_t value = 255;
 
-    GpioParseError err = gpio_command_parse(args, &num, &value);
+    GpioParseReturn err = gpio_command_parse(args, &num, &value);
 
-    if(ERR_CMD_SYNTAX == err) {
+    if(err == GpioParseReturnCmdSyntaxError) {
         cli_print_usage("gpio mode", "<pin_name> <0|1>", furi_string_get_cstr(args));
         return;
-    } else if(ERR_PIN == err) {
+    } else if(err == GpioParseReturnPinError) {
         gpio_print_pins();
         return;
-    } else if(ERR_VALUE == err) {
+    } else if(err == GpioParseReturnValueError) {
         printf("Value is invalid. Enter 1 for input or 0 for output");
         return;
     }
@@ -161,15 +166,15 @@ void cli_command_gpio_set(Cli* cli, FuriString* args, void* context) {
 
     size_t num = 0;
     uint8_t value = 0;
-    GpioParseError err = gpio_command_parse(args, &num, &value);
+    GpioParseReturn err = gpio_command_parse(args, &num, &value);
 
-    if(ERR_CMD_SYNTAX == err) {
+    if(err == GpioParseReturnCmdSyntaxError) {
         cli_print_usage("gpio set", "<pin_name> <0|1>", furi_string_get_cstr(args));
         return;
-    } else if(ERR_PIN == err) {
+    } else if(err == GpioParseReturnPinError) {
         gpio_print_pins();
         return;
-    } else if(ERR_VALUE == err) {
+    } else if(err == GpioParseReturnValueError) {
         printf("Value is invalid. Enter 1 for high or 0 for low");
         return;
     }
diff --git a/applications/services/cli/cli_vcp.c b/applications/services/cli/cli_vcp.c
index 1e27e185b..94b82950d 100644
--- a/applications/services/cli/cli_vcp.c
+++ b/applications/services/cli/cli_vcp.c
@@ -103,7 +103,7 @@ static int32_t vcp_worker(void* context) {
     while(1) {
         uint32_t flags =
             furi_thread_flags_wait(VCP_THREAD_FLAG_ALL, FuriFlagWaitAny, FuriWaitForever);
-        furi_assert((flags & FuriFlagError) == 0);
+        furi_assert(!(flags & FuriFlagError));
 
         // VCP session opened
         if(flags & VcpEvtConnect) {
@@ -303,7 +303,7 @@ static void vcp_on_cdc_control_line(void* context, uint8_t state) {
 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);
+    furi_check(!(ret & FuriFlagError));
 }
 
 static void vcp_on_cdc_tx_complete(void* context) {
diff --git a/applications/services/crypto/crypto_cli.c b/applications/services/crypto/crypto_cli.c
index a64a3ad0b..1b26ba9fb 100644
--- a/applications/services/crypto/crypto_cli.c
+++ b/applications/services/crypto/crypto_cli.c
@@ -167,7 +167,7 @@ void crypto_cli_decrypt(Cli* cli, FuriString* args) {
 void crypto_cli_has_key(Cli* cli, FuriString* args) {
     UNUSED(cli);
     int key_slot = 0;
-    uint8_t iv[16];
+    uint8_t iv[16] = {0};
 
     do {
         if(!args_read_int_and_trim(args, &key_slot) || !(key_slot > 0 && key_slot <= 100)) {
@@ -249,7 +249,7 @@ void crypto_cli_store_key(Cli* cli, FuriString* args) {
         }
 
         if(key_slot > 0) {
-            uint8_t iv[16];
+            uint8_t iv[16] = {0};
             if(key_slot > 1) {
                 if(!furi_hal_crypto_store_load_key(key_slot - 1, iv)) {
                     printf(
diff --git a/applications/services/desktop/views/desktop_view_locked.c b/applications/services/desktop/views/desktop_view_locked.c
index d18ed6c98..0bf757036 100644
--- a/applications/services/desktop/views/desktop_view_locked.c
+++ b/applications/services/desktop/views/desktop_view_locked.c
@@ -160,7 +160,7 @@ static bool desktop_view_locked_input(InputEvent* event, void* context) {
     view_commit_model(locked_view->view, is_changed);
 
     if(view_state == DesktopViewLockedStateUnlocked) {
-        return view_state != DesktopViewLockedStateUnlocked;
+        return false;
     } else if(view_state == DesktopViewLockedStateLocked && pin_locked) {
         locked_view->callback(DesktopLockedEventShowPinInput, locked_view->context);
     } else if(
diff --git a/applications/services/gui/application.fam b/applications/services/gui/application.fam
index 76ace7fab..193b9dfd3 100644
--- a/applications/services/gui/application.fam
+++ b/applications/services/gui/application.fam
@@ -12,6 +12,7 @@ App(
     order=70,
     sdk_headers=[
         "gui.h",
+        "icon_i.h",
         "elements.h",
         "canvas_i.h",
         "view_dispatcher.h",
diff --git a/applications/services/gui/gui.c b/applications/services/gui/gui.c
index 2d06d70c7..9f6ebcd76 100644
--- a/applications/services/gui/gui.c
+++ b/applications/services/gui/gui.c
@@ -436,7 +436,7 @@ void gui_add_framebuffer_callback(Gui* gui, GuiCanvasCommitCallback callback, vo
     const CanvasCallbackPair p = {callback, context};
 
     gui_lock(gui);
-    furi_assert(CanvasCallbackPairArray_count(gui->canvas_callback_pair, p) == 0);
+    furi_assert(!CanvasCallbackPairArray_count(gui->canvas_callback_pair, p));
     CanvasCallbackPairArray_push_back(gui->canvas_callback_pair, p);
     gui_unlock(gui);
 
diff --git a/applications/services/gui/modules/file_browser_worker.c b/applications/services/gui/modules/file_browser_worker.c
index 4bff50c42..494c839e1 100644
--- a/applications/services/gui/modules/file_browser_worker.c
+++ b/applications/services/gui/modules/file_browser_worker.c
@@ -363,7 +363,7 @@ static int32_t browser_worker(void* context) {
 
 BrowserWorker*
     file_browser_worker_alloc(FuriString* path, const char* filter_ext, bool skip_assets) {
-    BrowserWorker* browser = malloc(sizeof(BrowserWorker));
+    BrowserWorker* browser = malloc(sizeof(BrowserWorker)); //-V773
 
     idx_last_array_init(browser->idx_last);
 
diff --git a/applications/services/gui/modules/widget_elements/widget_element_button.c b/applications/services/gui/modules/widget_elements/widget_element_button.c
index be33b1897..e3267058e 100644
--- a/applications/services/gui/modules/widget_elements/widget_element_button.c
+++ b/applications/services/gui/modules/widget_elements/widget_element_button.c
@@ -60,7 +60,7 @@ WidgetElement* widget_element_button_create(
     ButtonCallback callback,
     void* context) {
     // Allocate and init model
-    GuiButtonModel* model = malloc(sizeof(GuiButtonModel));
+    GuiButtonModel* model = malloc(sizeof(GuiButtonModel)); //-V773
     model->button_type = button_type;
     model->callback = callback;
     model->context = context;
diff --git a/applications/services/gui/view_dispatcher.c b/applications/services/gui/view_dispatcher.c
index 1736558cb..4034cc0b4 100644
--- a/applications/services/gui/view_dispatcher.c
+++ b/applications/services/gui/view_dispatcher.c
@@ -23,7 +23,7 @@ void view_dispatcher_free(ViewDispatcher* view_dispatcher) {
         gui_remove_view_port(view_dispatcher->gui, view_dispatcher->view_port);
     }
     // Crash if not all views were freed
-    furi_assert(ViewDict_size(view_dispatcher->views) == 0);
+    furi_assert(!ViewDict_size(view_dispatcher->views));
 
     ViewDict_clear(view_dispatcher->views);
     // Free ViewPort
@@ -157,7 +157,7 @@ void view_dispatcher_remove_view(ViewDispatcher* view_dispatcher, uint32_t view_
         view_dispatcher->ongoing_input_view = NULL;
     }
     // Remove view
-    ViewDict_erase(view_dispatcher->views, view_id);
+    furi_check(ViewDict_erase(view_dispatcher->views, view_id));
 
     view_set_update_callback(view, NULL);
     view_set_update_callback_context(view, NULL);
@@ -304,8 +304,7 @@ void view_dispatcher_handle_custom_event(ViewDispatcher* view_dispatcher, uint32
     }
     // If custom event is not consumed in View, call callback
     if(!is_consumed && view_dispatcher->custom_event_callback) {
-        is_consumed =
-            view_dispatcher->custom_event_callback(view_dispatcher->event_context, event);
+        view_dispatcher->custom_event_callback(view_dispatcher->event_context, event);
     }
 }
 
diff --git a/applications/services/gui/view_port.c b/applications/services/gui/view_port.c
index baa8f7bd2..ffd01450b 100644
--- a/applications/services/gui/view_port.c
+++ b/applications/services/gui/view_port.c
@@ -7,61 +7,51 @@
 
 // TODO add mutex to view_port ops
 
-static void view_port_remap_buttons_vertical(InputEvent* event) {
-    switch(event->key) {
-    case InputKeyUp:
-        event->key = InputKeyRight;
-        break;
-    case InputKeyDown:
-        event->key = InputKeyLeft;
-        break;
-    case InputKeyRight:
-        event->key = InputKeyDown;
-        break;
-    case InputKeyLeft:
-        event->key = InputKeyUp;
-        break;
-    default:
-        break;
-    }
-}
+_Static_assert(ViewPortOrientationMAX == 4, "Incorrect ViewPortOrientation count");
+_Static_assert(
+    (ViewPortOrientationHorizontal == 0 && ViewPortOrientationHorizontalFlip == 1 &&
+     ViewPortOrientationVertical == 2 && ViewPortOrientationVerticalFlip == 3),
+    "Incorrect ViewPortOrientation order");
+_Static_assert(InputKeyMAX == 6, "Incorrect InputKey count");
+_Static_assert(
+    (InputKeyUp == 0 && InputKeyDown == 1 && InputKeyRight == 2 && InputKeyLeft == 3 &&
+     InputKeyOk == 4 && InputKeyBack == 5),
+    "Incorrect InputKey order");
 
-static void view_port_remap_buttons_vertical_flip(InputEvent* event) {
-    switch(event->key) {
-    case InputKeyUp:
-        event->key = InputKeyLeft;
-        break;
-    case InputKeyDown:
-        event->key = InputKeyRight;
-        break;
-    case InputKeyRight:
-        event->key = InputKeyUp;
-        break;
-    case InputKeyLeft:
-        event->key = InputKeyDown;
-        break;
-    default:
-        break;
-    }
-}
+/** InputKey directional keys mappings for different screen orientations
+* 
+*/
+static const InputKey view_port_input_mapping[ViewPortOrientationMAX][InputKeyMAX] = {
+    {InputKeyUp,
+     InputKeyDown,
+     InputKeyRight,
+     InputKeyLeft,
+     InputKeyOk,
+     InputKeyBack}, //ViewPortOrientationHorizontal
+    {InputKeyDown,
+     InputKeyUp,
+     InputKeyLeft,
+     InputKeyRight,
+     InputKeyOk,
+     InputKeyBack}, //ViewPortOrientationHorizontalFlip
+    {InputKeyRight,
+     InputKeyLeft,
+     InputKeyDown,
+     InputKeyUp,
+     InputKeyOk,
+     InputKeyBack}, //ViewPortOrientationVertical
+    {InputKeyLeft,
+     InputKeyRight,
+     InputKeyUp,
+     InputKeyDown,
+     InputKeyOk,
+     InputKeyBack}, //ViewPortOrientationVerticalFlip
+};
 
-static void view_port_remap_buttons_horizontal_flip(InputEvent* event) {
-    switch(event->key) {
-    case InputKeyUp:
-        event->key = InputKeyDown;
-        break;
-    case InputKeyDown:
-        event->key = InputKeyUp;
-        break;
-    case InputKeyRight:
-        event->key = InputKeyLeft;
-        break;
-    case InputKeyLeft:
-        event->key = InputKeyRight;
-        break;
-    default:
-        break;
-    }
+// Remaps directional pad buttons on Flipper based on ViewPort orientation
+static void view_port_map_input(InputEvent* event, ViewPortOrientation orientation) {
+    furi_assert(orientation < ViewPortOrientationMAX && event->key < InputKeyMAX);
+    event->key = view_port_input_mapping[orientation][event->key];
 }
 
 static void view_port_setup_canvas_orientation(const ViewPort* view_port, Canvas* canvas) {
@@ -170,19 +160,7 @@ void view_port_input(ViewPort* view_port, InputEvent* event) {
 
     if(view_port->input_callback) {
         ViewPortOrientation orientation = view_port_get_orientation(view_port);
-        switch(orientation) {
-        case ViewPortOrientationHorizontalFlip:
-            view_port_remap_buttons_horizontal_flip(event);
-            break;
-        case ViewPortOrientationVertical:
-            view_port_remap_buttons_vertical(event);
-            break;
-        case ViewPortOrientationVerticalFlip:
-            view_port_remap_buttons_vertical_flip(event);
-            break;
-        default:
-            break;
-        }
+        view_port_map_input(event, orientation);
         view_port->input_callback(event, view_port->input_callback_context);
     }
 }
diff --git a/applications/services/gui/view_port.h b/applications/services/gui/view_port.h
index 169681ac0..703e99248 100644
--- a/applications/services/gui/view_port.h
+++ b/applications/services/gui/view_port.h
@@ -19,6 +19,7 @@ typedef enum {
     ViewPortOrientationHorizontalFlip,
     ViewPortOrientationVertical,
     ViewPortOrientationVerticalFlip,
+    ViewPortOrientationMAX, /**< Special value, don't use it */
 } ViewPortOrientation;
 
 /** ViewPort Draw callback
diff --git a/applications/services/input/input.c b/applications/services/input/input.c
index 7b8433aef..d1aef9e8a 100644
--- a/applications/services/input/input.c
+++ b/applications/services/input/input.c
@@ -60,8 +60,9 @@ const char* input_get_type_name(InputType type) {
         return "Long";
     case InputTypeRepeat:
         return "Repeat";
+    default:
+        return "Unknown";
     }
-    return "Unknown";
 }
 
 int32_t input_srv(void* p) {
diff --git a/applications/services/input/input.h b/applications/services/input/input.h
index bd0ba3902..172b16361 100644
--- a/applications/services/input/input.h
+++ b/applications/services/input/input.h
@@ -22,6 +22,7 @@ typedef enum {
     InputTypeShort, /**< Short event, emitted after InputTypeRelease done withing INPUT_LONG_PRESS interval */
     InputTypeLong, /**< Long event, emmited after INPUT_LONG_PRESS interval, asynchronouse to InputTypeRelease  */
     InputTypeRepeat, /**< Repeat event, emmited with INPUT_REPEATE_PRESS period after InputTypeLong event */
+    InputTypeMAX, /**< Special value for exceptional */
 } InputType;
 
 /** Input Event, dispatches with FuriPubSub */
diff --git a/applications/services/loader/loader.c b/applications/services/loader/loader.c
index bc456536c..712576e14 100644
--- a/applications/services/loader/loader.c
+++ b/applications/services/loader/loader.c
@@ -269,22 +269,18 @@ static void loader_thread_state_callback(FuriThreadState thread_state, void* con
         event.type = LoaderEventTypeApplicationStarted;
         furi_pubsub_publish(loader_instance->pubsub, &event);
 
-        if(!loader_instance->application->flags & FlipperApplicationFlagInsomniaSafe) {
+        if(!(loader_instance->application->flags & FlipperApplicationFlagInsomniaSafe)) {
             furi_hal_power_insomnia_enter();
         }
     } else if(thread_state == FuriThreadStateStopped) {
-        FURI_LOG_I(
-            TAG,
-            "Application thread stopped. Free heap: %d. Thread allocation balance: %d.",
-            memmgr_get_free_heap(),
-            furi_thread_get_heap_size(instance->application_thread));
+        FURI_LOG_I(TAG, "Application stopped. Free heap: %d", memmgr_get_free_heap());
 
         if(loader_instance->application_arguments) {
             free(loader_instance->application_arguments);
             loader_instance->application_arguments = NULL;
         }
 
-        if(!loader_instance->application->flags & FlipperApplicationFlagInsomniaSafe) {
+        if(!(loader_instance->application->flags & FlipperApplicationFlagInsomniaSafe)) {
             furi_hal_power_insomnia_exit();
         }
         loader_unlock(instance);
diff --git a/applications/services/notification/notification_app.c b/applications/services/notification/notification_app.c
index 640bd7d71..6091f0aa7 100644
--- a/applications/services/notification/notification_app.c
+++ b/applications/services/notification/notification_app.c
@@ -22,7 +22,7 @@ static const uint8_t reset_blink_mask = 1 << 6;
 
 void notification_vibro_on();
 void notification_vibro_off();
-void notification_sound_on(float pwm, float freq);
+void notification_sound_on(float freq, float volume);
 void notification_sound_off();
 
 uint8_t notification_settings_get_display_brightness(NotificationApp* app, uint8_t value);
diff --git a/applications/services/rpc/rpc_storage.c b/applications/services/rpc/rpc_storage.c
index 1b545b414..16e343fce 100644
--- a/applications/services/rpc/rpc_storage.c
+++ b/applications/services/rpc/rpc_storage.c
@@ -138,6 +138,41 @@ static void rpc_system_storage_info_process(const PB_Main* request, void* contex
     furi_record_close(RECORD_STORAGE);
 }
 
+static void rpc_system_storage_timestamp_process(const PB_Main* request, void* context) {
+    furi_assert(request);
+    furi_assert(context);
+    furi_assert(request->which_content == PB_Main_storage_timestamp_request_tag);
+
+    FURI_LOG_D(TAG, "Timestamp");
+
+    RpcStorageSystem* rpc_storage = context;
+    RpcSession* session = rpc_storage->session;
+    furi_assert(session);
+
+    rpc_system_storage_reset_state(rpc_storage, session, true);
+
+    PB_Main* response = malloc(sizeof(PB_Main));
+    response->command_id = request->command_id;
+
+    Storage* fs_api = furi_record_open(RECORD_STORAGE);
+
+    const char* path = request->content.storage_timestamp_request.path;
+    uint32_t timestamp = 0;
+    FS_Error error = storage_common_timestamp(fs_api, path, &timestamp);
+
+    response->command_status = rpc_system_storage_get_error(error);
+    response->which_content = PB_Main_empty_tag;
+
+    if(error == FSE_OK) {
+        response->which_content = PB_Main_storage_timestamp_response_tag;
+        response->content.storage_timestamp_response.timestamp = timestamp;
+    }
+
+    rpc_send_and_release(session, response);
+    free(response);
+    furi_record_close(RECORD_STORAGE);
+}
+
 static void rpc_system_storage_stat_process(const PB_Main* request, void* context) {
     furi_assert(request);
     furi_assert(context);
@@ -405,6 +440,10 @@ static void rpc_system_storage_write_process(const PB_Main* request, void* conte
     if(!fs_operation_success) {
         send_response = true;
         command_status = rpc_system_storage_get_file_error(file);
+        if(command_status == PB_CommandStatus_OK) {
+            // Report errors not handled by underlying APIs
+            command_status = PB_CommandStatus_ERROR_STORAGE_INTERNAL;
+        }
     }
 
     if(send_response) {
@@ -668,6 +707,9 @@ void* rpc_system_storage_alloc(RpcSession* session) {
     rpc_handler.message_handler = rpc_system_storage_info_process;
     rpc_add_handler(session, PB_Main_storage_info_request_tag, &rpc_handler);
 
+    rpc_handler.message_handler = rpc_system_storage_timestamp_process;
+    rpc_add_handler(session, PB_Main_storage_timestamp_request_tag, &rpc_handler);
+
     rpc_handler.message_handler = rpc_system_storage_stat_process;
     rpc_add_handler(session, PB_Main_storage_stat_request_tag, &rpc_handler);
 
diff --git a/applications/services/storage/storage.c b/applications/services/storage/storage.c
index 700408c9d..1816bf921 100644
--- a/applications/services/storage/storage.c
+++ b/applications/services/storage/storage.c
@@ -39,6 +39,7 @@ Storage* storage_app_alloc() {
 
     for(uint8_t i = 0; i < STORAGE_COUNT; i++) {
         storage_data_init(&app->storage[i]);
+        storage_data_timestamp(&app->storage[i]);
     }
 
 #ifndef FURI_RAM_EXEC
diff --git a/applications/services/storage/storage.h b/applications/services/storage/storage.h
index 968b69048..9c133e9be 100644
--- a/applications/services/storage/storage.h
+++ b/applications/services/storage/storage.h
@@ -177,6 +177,16 @@ bool storage_dir_rewind(File* file);
 
 /******************* Common Functions *******************/
 
+/** Retrieves unix timestamp of last access
+ *
+ * @param      storage    The storage instance
+ * @param      path       path to file/directory
+ * @param      timestamp  the timestamp pointer
+ *
+ * @return     FS_Error operation result
+ */
+FS_Error storage_common_timestamp(Storage* storage, const char* path, uint32_t* timestamp);
+
 /** Retrieves information about a file/directory
  * @param app pointer to the api
  * @param path path to file/directory
diff --git a/applications/services/storage/storage_cli.c b/applications/services/storage/storage_cli.c
index 880fb9700..c83f16499 100644
--- a/applications/services/storage/storage_cli.c
+++ b/applications/services/storage/storage_cli.c
@@ -32,6 +32,7 @@ static void storage_cli_print_usage() {
     printf("\tmkdir\t - creates a new directory\r\n");
     printf("\tmd5\t - md5 hash of the file\r\n");
     printf("\tstat\t - info about file or dir\r\n");
+    printf("\ttimestamp\t - last modification timestamp\r\n");
 };
 
 static void storage_cli_print_error(FS_Error error) {
@@ -274,7 +275,7 @@ static void storage_cli_read_chunks(Cli* cli, FuriString* path, FuriString* args
     uint32_t buffer_size;
     int parsed_count = sscanf(furi_string_get_cstr(args), "%lu", &buffer_size);
 
-    if(parsed_count == EOF || parsed_count != 1) {
+    if(parsed_count != 1) {
         storage_cli_print_usage();
     } else if(storage_file_open(file, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
         uint64_t file_size = storage_file_size(file);
@@ -314,7 +315,7 @@ static void storage_cli_write_chunk(Cli* cli, FuriString* path, FuriString* args
     uint32_t buffer_size;
     int parsed_count = sscanf(furi_string_get_cstr(args), "%lu", &buffer_size);
 
-    if(parsed_count == EOF || parsed_count != 1) {
+    if(parsed_count != 1) {
         storage_cli_print_usage();
     } else {
         if(storage_file_open(file, furi_string_get_cstr(path), FSAM_WRITE, FSOM_OPEN_APPEND)) {
@@ -386,6 +387,22 @@ static void storage_cli_stat(Cli* cli, FuriString* path) {
     furi_record_close(RECORD_STORAGE);
 }
 
+static void storage_cli_timestamp(Cli* cli, FuriString* path) {
+    UNUSED(cli);
+    Storage* api = furi_record_open(RECORD_STORAGE);
+
+    uint32_t timestamp = 0;
+    FS_Error error = storage_common_timestamp(api, furi_string_get_cstr(path), &timestamp);
+
+    if(error != FSE_OK) {
+        printf("Invalid arguments\r\n");
+    } else {
+        printf("Timestamp %lu\r\n", timestamp);
+    }
+
+    furi_record_close(RECORD_STORAGE);
+}
+
 static void storage_cli_copy(Cli* cli, FuriString* old_path, FuriString* args) {
     UNUSED(cli);
     Storage* api = furi_record_open(RECORD_STORAGE);
@@ -578,6 +595,11 @@ void storage_cli(Cli* cli, FuriString* args, void* context) {
             break;
         }
 
+        if(furi_string_cmp_str(cmd, "timestamp") == 0) {
+            storage_cli_timestamp(cli, path);
+            break;
+        }
+
         storage_cli_print_usage();
     } while(false);
 
diff --git a/applications/services/storage/storage_external_api.c b/applications/services/storage/storage_external_api.c
index c0c730fb7..2c3a7bfc9 100644
--- a/applications/services/storage/storage_external_api.c
+++ b/applications/services/storage/storage_external_api.c
@@ -354,6 +354,16 @@ bool storage_dir_rewind(File* file) {
 
 /****************** COMMON ******************/
 
+FS_Error storage_common_timestamp(Storage* storage, const char* path, uint32_t* timestamp) {
+    S_API_PROLOGUE;
+
+    SAData data = {.ctimestamp = {.path = path, .timestamp = timestamp}};
+
+    S_API_MESSAGE(StorageCommandCommonTimestamp);
+    S_API_EPILOGUE;
+    return S_RETURN_ERROR;
+}
+
 FS_Error storage_common_stat(Storage* storage, const char* path, FileInfo* fileinfo) {
     S_API_PROLOGUE;
 
@@ -535,8 +545,8 @@ static FS_Error
 
 FS_Error storage_common_merge(Storage* storage, const char* old_path, const char* new_path) {
     FS_Error error;
-    const char* new_path_tmp;
-    FuriString* new_path_next;
+    const char* new_path_tmp = NULL;
+    FuriString* new_path_next = NULL;
     new_path_next = furi_string_alloc();
 
     FileInfo fileinfo;
diff --git a/applications/services/storage/storage_glue.c b/applications/services/storage/storage_glue.c
index c5682f67b..c6ff08bdc 100644
--- a/applications/services/storage/storage_glue.c
+++ b/applications/services/storage/storage_glue.c
@@ -82,6 +82,14 @@ const char* storage_data_status_text(StorageData* storage) {
     return result;
 }
 
+void storage_data_timestamp(StorageData* storage) {
+    storage->timestamp = furi_hal_rtc_get_timestamp();
+}
+
+uint32_t storage_data_get_timestamp(StorageData* storage) {
+    return storage->timestamp;
+}
+
 /****************** storage glue ******************/
 
 bool storage_has_file(const File* file, StorageData* storage_data) {
diff --git a/applications/services/storage/storage_glue.h b/applications/services/storage/storage_glue.h
index 53fa0de19..6fdc70099 100644
--- a/applications/services/storage/storage_glue.h
+++ b/applications/services/storage/storage_glue.h
@@ -42,6 +42,8 @@ bool storage_data_lock(StorageData* storage);
 bool storage_data_unlock(StorageData* storage);
 StorageStatus storage_data_status(StorageData* storage);
 const char* storage_data_status_text(StorageData* storage);
+void storage_data_timestamp(StorageData* storage);
+uint32_t storage_data_get_timestamp(StorageData* storage);
 
 LIST_DEF(
     StorageFileList,
@@ -58,6 +60,7 @@ struct StorageData {
     FuriMutex* mutex;
     StorageStatus status;
     StorageFileList_t files;
+    uint32_t timestamp;
 };
 
 bool storage_has_file(const File* file, StorageData* storage_data);
diff --git a/applications/services/storage/storage_i.h b/applications/services/storage/storage_i.h
index 5c836ccd2..406fc921e 100644
--- a/applications/services/storage/storage_i.h
+++ b/applications/services/storage/storage_i.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <furi.h>
+#include <furi_hal.h>
 #include <gui/gui.h>
 #include "storage_glue.h"
 #include "storage_sd_api.h"
diff --git a/applications/services/storage/storage_message.h b/applications/services/storage/storage_message.h
index 78cd1e03c..987268017 100644
--- a/applications/services/storage/storage_message.h
+++ b/applications/services/storage/storage_message.h
@@ -42,6 +42,11 @@ typedef struct {
     uint16_t name_length;
 } SADataDRead;
 
+typedef struct {
+    const char* path;
+    uint32_t* timestamp;
+} SADataCTimestamp;
+
 typedef struct {
     const char* path;
     FileInfo* fileinfo;
@@ -78,6 +83,7 @@ typedef union {
     SADataDOpen dopen;
     SADataDRead dread;
 
+    SADataCTimestamp ctimestamp;
     SADataCStat cstat;
     SADataCFSInfo cfsinfo;
 
@@ -112,6 +118,7 @@ typedef enum {
     StorageCommandDirClose,
     StorageCommandDirRead,
     StorageCommandDirRewind,
+    StorageCommandCommonTimestamp,
     StorageCommandCommonStat,
     StorageCommandCommonRemove,
     StorageCommandCommonMkDir,
diff --git a/applications/services/storage/storage_processing.c b/applications/services/storage/storage_processing.c
index 8643e974e..795a5d11c 100644
--- a/applications/services/storage/storage_processing.c
+++ b/applications/services/storage/storage_processing.c
@@ -114,6 +114,9 @@ bool storage_process_file_open(
         if(storage_path_already_open(real_path, storage->files)) {
             file->error_id = FSE_ALREADY_OPEN;
         } else {
+            if(access_mode & FSAM_WRITE) {
+                storage_data_timestamp(storage);
+            }
             storage_push_storage_file(file, real_path, type, storage);
             FS_CALL(storage, file.open(storage, file, remove_vfs(path), access_mode, open_mode));
         }
@@ -166,6 +169,7 @@ static uint16_t storage_process_file_write(
     if(storage == NULL) {
         file->error_id = FSE_INVALID_PARAMETER;
     } else {
+        storage_data_timestamp(storage);
         FS_CALL(storage, file.write(storage, file, buff, bytes_to_write));
     }
 
@@ -209,6 +213,7 @@ static bool storage_process_file_truncate(Storage* app, File* file) {
     if(storage == NULL) {
         file->error_id = FSE_INVALID_PARAMETER;
     } else {
+        storage_data_timestamp(storage);
         FS_CALL(storage, file.truncate(storage, file));
     }
 
@@ -222,6 +227,7 @@ static bool storage_process_file_sync(Storage* app, File* file) {
     if(storage == NULL) {
         file->error_id = FSE_INVALID_PARAMETER;
     } else {
+        storage_data_timestamp(storage);
         FS_CALL(storage, file.sync(storage, file));
     }
 
@@ -332,6 +338,21 @@ bool storage_process_dir_rewind(Storage* app, File* file) {
 
 /******************* Common FS Functions *******************/
 
+static FS_Error
+    storage_process_common_timestamp(Storage* app, const char* path, uint32_t* timestamp) {
+    FS_Error ret = FSE_OK;
+    StorageType type = storage_get_type_by_path(app, path);
+
+    if(storage_type_is_not_valid(type)) {
+        ret = FSE_INVALID_NAME;
+    } else {
+        StorageData* storage = storage_get_storage_by_type(app, type);
+        *timestamp = storage_data_get_timestamp(storage);
+    }
+
+    return ret;
+}
+
 static FS_Error storage_process_common_stat(Storage* app, const char* path, FileInfo* fileinfo) {
     FS_Error ret = FSE_OK;
     StorageType type = storage_get_type_by_path(app, path);
@@ -366,6 +387,7 @@ static FS_Error storage_process_common_remove(Storage* app, const char* path) {
             break;
         }
 
+        storage_data_timestamp(storage);
         FS_CALL(storage, common.remove(storage, remove_vfs(path)));
     } while(false);
 
@@ -382,6 +404,7 @@ static FS_Error storage_process_common_mkdir(Storage* app, const char* path) {
         ret = FSE_INVALID_NAME;
     } else {
         StorageData* storage = storage_get_storage_by_type(app, type);
+        storage_data_timestamp(storage);
         FS_CALL(storage, common.mkdir(storage, remove_vfs(path)));
     }
 
@@ -417,6 +440,7 @@ static FS_Error storage_process_sd_format(Storage* app) {
         ret = FSE_NOT_READY;
     } else {
         ret = sd_format_card(&app->storage[ST_EXT]);
+        storage_data_timestamp(&app->storage[ST_EXT]);
     }
 
     return ret;
@@ -429,6 +453,7 @@ static FS_Error storage_process_sd_unmount(Storage* app) {
         ret = FSE_NOT_READY;
     } else {
         sd_unmount_card(&app->storage[ST_EXT]);
+        storage_data_timestamp(&app->storage[ST_EXT]);
     }
 
     return ret;
@@ -541,6 +566,10 @@ void storage_process_message_internal(Storage* app, StorageMessage* message) {
         message->return_data->bool_value =
             storage_process_dir_rewind(app, message->data->file.file);
         break;
+    case StorageCommandCommonTimestamp:
+        message->return_data->error_value = storage_process_common_timestamp(
+            app, message->data->ctimestamp.path, message->data->ctimestamp.timestamp);
+        break;
     case StorageCommandCommonStat:
         message->return_data->error_value = storage_process_common_stat(
             app, message->data->cstat.path, message->data->cstat.fileinfo);
diff --git a/applications/services/storage/storages/storage_ext.c b/applications/services/storage/storages/storage_ext.c
index 7341a6ec8..0c81a0006 100644
--- a/applications/services/storage/storages/storage_ext.c
+++ b/applications/services/storage/storages/storage_ext.c
@@ -90,6 +90,7 @@ static bool sd_mount_card(StorageData* storage, bool notify) {
         }
     }
 
+    storage_data_timestamp(storage);
     storage_data_unlock(storage);
 
     return result;
diff --git a/applications/settings/power_settings_app/views/battery_info.c b/applications/settings/power_settings_app/views/battery_info.c
index e1b7adb4b..bbb0acb9a 100644
--- a/applications/settings/power_settings_app/views/battery_info.c
+++ b/applications/settings/power_settings_app/views/battery_info.c
@@ -3,6 +3,9 @@
 #include <gui/elements.h>
 #include <assets_icons.h>
 
+#define LOW_CHARGE_THRESHOLD 10
+#define HIGH_DRAIN_CURRENT_THRESHOLD 100
+
 struct BatteryInfo {
     View* view;
 };
@@ -28,9 +31,9 @@ static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
     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 > 100) {
+    } else if(drain_current > HIGH_DRAIN_CURRENT_THRESHOLD) {
         canvas_draw_icon(canvas, x + 16, y + 7, &I_FaceConfused_29x14);
-    } else if(data->charge < 10) {
+    } 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);
@@ -51,11 +54,19 @@ static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
             (uint32_t)(data->vbus_voltage * 10) % 10,
             charge_current);
     } else if(drain_current > 0) {
-        snprintf(emote, sizeof(emote), "%s", drain_current > 100 ? "Oh no!" : "Om-nom-nom!");
+        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 > 100 ? "mA!" : "mA");
-    } else if(charge_current != 0 || drain_current != 0) {
+            value,
+            sizeof(value),
+            "%ld %s",
+            drain_current,
+            drain_current > HIGH_DRAIN_CURRENT_THRESHOLD ? "mA!" : "mA");
+    } else if(drain_current != 0) {
         snprintf(header, 20, "...");
     } else {
         snprintf(header, sizeof(header), "Charged!");
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_0.png b/assets/dolphin/external/L1_Mods_128x64/frame_0.png
new file mode 100644
index 000000000..220908495
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_0.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_1.png b/assets/dolphin/external/L1_Mods_128x64/frame_1.png
new file mode 100644
index 000000000..9123906fb
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_1.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_10.png b/assets/dolphin/external/L1_Mods_128x64/frame_10.png
new file mode 100644
index 000000000..e90ad5e90
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_10.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_11.png b/assets/dolphin/external/L1_Mods_128x64/frame_11.png
new file mode 100644
index 000000000..031c0ad81
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_11.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_12.png b/assets/dolphin/external/L1_Mods_128x64/frame_12.png
new file mode 100644
index 000000000..856e068fd
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_12.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_13.png b/assets/dolphin/external/L1_Mods_128x64/frame_13.png
new file mode 100644
index 000000000..a0366b2cf
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_13.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_14.png b/assets/dolphin/external/L1_Mods_128x64/frame_14.png
new file mode 100644
index 000000000..24fd557ab
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_14.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_15.png b/assets/dolphin/external/L1_Mods_128x64/frame_15.png
new file mode 100644
index 000000000..3bf1d3ed2
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_15.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_16.png b/assets/dolphin/external/L1_Mods_128x64/frame_16.png
new file mode 100644
index 000000000..f0b44898f
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_16.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_17.png b/assets/dolphin/external/L1_Mods_128x64/frame_17.png
new file mode 100644
index 000000000..c98c70c91
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_17.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_18.png b/assets/dolphin/external/L1_Mods_128x64/frame_18.png
new file mode 100644
index 000000000..4f7b7ae82
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_18.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_19.png b/assets/dolphin/external/L1_Mods_128x64/frame_19.png
new file mode 100644
index 000000000..b3ad6700c
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_19.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_2.png b/assets/dolphin/external/L1_Mods_128x64/frame_2.png
new file mode 100644
index 000000000..c4aac4b91
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_2.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_20.png b/assets/dolphin/external/L1_Mods_128x64/frame_20.png
new file mode 100644
index 000000000..ea2eae4d7
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_20.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_21.png b/assets/dolphin/external/L1_Mods_128x64/frame_21.png
new file mode 100644
index 000000000..900cc7d12
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_21.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_22.png b/assets/dolphin/external/L1_Mods_128x64/frame_22.png
new file mode 100644
index 000000000..de6c511e4
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_22.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_23.png b/assets/dolphin/external/L1_Mods_128x64/frame_23.png
new file mode 100644
index 000000000..4f82f63bc
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_23.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_24.png b/assets/dolphin/external/L1_Mods_128x64/frame_24.png
new file mode 100644
index 000000000..d7c614902
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_24.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_25.png b/assets/dolphin/external/L1_Mods_128x64/frame_25.png
new file mode 100644
index 000000000..768030b3c
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_25.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_26.png b/assets/dolphin/external/L1_Mods_128x64/frame_26.png
new file mode 100644
index 000000000..12f22abdb
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_26.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_27.png b/assets/dolphin/external/L1_Mods_128x64/frame_27.png
new file mode 100644
index 000000000..9fca976de
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_27.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_28.png b/assets/dolphin/external/L1_Mods_128x64/frame_28.png
new file mode 100644
index 000000000..4b2ab5863
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_28.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_29.png b/assets/dolphin/external/L1_Mods_128x64/frame_29.png
new file mode 100644
index 000000000..69c709adc
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_29.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_3.png b/assets/dolphin/external/L1_Mods_128x64/frame_3.png
new file mode 100644
index 000000000..1b0e77426
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_3.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_30.png b/assets/dolphin/external/L1_Mods_128x64/frame_30.png
new file mode 100644
index 000000000..13caae7ca
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_30.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_31.png b/assets/dolphin/external/L1_Mods_128x64/frame_31.png
new file mode 100644
index 000000000..b1d1e8bfe
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_31.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_32.png b/assets/dolphin/external/L1_Mods_128x64/frame_32.png
new file mode 100644
index 000000000..acf000827
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_32.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_33.png b/assets/dolphin/external/L1_Mods_128x64/frame_33.png
new file mode 100644
index 000000000..b6c6fbb19
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_33.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_34.png b/assets/dolphin/external/L1_Mods_128x64/frame_34.png
new file mode 100644
index 000000000..7d2dcda5d
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_34.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_35.png b/assets/dolphin/external/L1_Mods_128x64/frame_35.png
new file mode 100644
index 000000000..461270ba4
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_35.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_36.png b/assets/dolphin/external/L1_Mods_128x64/frame_36.png
new file mode 100644
index 000000000..b018a94c1
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_36.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_37.png b/assets/dolphin/external/L1_Mods_128x64/frame_37.png
new file mode 100644
index 000000000..fa2b303cc
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_37.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_38.png b/assets/dolphin/external/L1_Mods_128x64/frame_38.png
new file mode 100644
index 000000000..ed38122f5
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_38.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_39.png b/assets/dolphin/external/L1_Mods_128x64/frame_39.png
new file mode 100644
index 000000000..38610bb4b
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_39.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_4.png b/assets/dolphin/external/L1_Mods_128x64/frame_4.png
new file mode 100644
index 000000000..45e47de12
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_4.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_40.png b/assets/dolphin/external/L1_Mods_128x64/frame_40.png
new file mode 100644
index 000000000..7f6b4b29a
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_40.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_5.png b/assets/dolphin/external/L1_Mods_128x64/frame_5.png
new file mode 100644
index 000000000..7c293b485
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_5.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_6.png b/assets/dolphin/external/L1_Mods_128x64/frame_6.png
new file mode 100644
index 000000000..e72e7a30e
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_6.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_7.png b/assets/dolphin/external/L1_Mods_128x64/frame_7.png
new file mode 100644
index 000000000..5c840d6f6
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_7.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_8.png b/assets/dolphin/external/L1_Mods_128x64/frame_8.png
new file mode 100644
index 000000000..f689f190c
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_8.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_9.png b/assets/dolphin/external/L1_Mods_128x64/frame_9.png
new file mode 100644
index 000000000..628394e57
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_9.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/meta.txt b/assets/dolphin/external/L1_Mods_128x64/meta.txt
new file mode 100644
index 000000000..0225c7e55
--- /dev/null
+++ b/assets/dolphin/external/L1_Mods_128x64/meta.txt
@@ -0,0 +1,14 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 23
+Active frames: 18
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
+Active cycles: 1
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 0
\ No newline at end of file
diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt
index 60b8fc25f..b03d52fc3 100644
--- a/assets/dolphin/external/manifest.txt
+++ b/assets/dolphin/external/manifest.txt
@@ -15,13 +15,6 @@ Min level: 1
 Max level: 1
 Weight: 3
 
-Name: L1_Halloween_128x64
-Min butthurt: 0
-Max butthurt: 13
-Min level: 1
-Max level: 3
-Weight: 8
-
 Name: L1_Sleep_128x64
 Min butthurt: 0
 Max butthurt: 10
@@ -92,12 +85,19 @@ 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: 5
+
 Name: L1_Painting_128x64
 Min butthurt: 0
 Max butthurt: 7
 Min level: 1
 Max level: 3
-Weight: 6
+Weight: 4
 
 Name: L3_Hijack_radio_128x64
 Min butthurt: 0
diff --git a/assets/icons/StatusBar/Background_128x11.png b/assets/icons/StatusBar/Background_128x11.png
index e43b32d16..78ef029ae 100644
Binary files a/assets/icons/StatusBar/Background_128x11.png and b/assets/icons/StatusBar/Background_128x11.png differ
diff --git a/assets/protobuf b/assets/protobuf
index 6727eaf28..e5af96e08 160000
--- a/assets/protobuf
+++ b/assets/protobuf
@@ -1 +1 @@
-Subproject commit 6727eaf287db077dcd28719cd764f5804712223e
+Subproject commit e5af96e08fea8351898f7b8c6d1e34ce5fd6cdef
diff --git a/assets/resources/infrared/assets/ac.ir b/assets/resources/infrared/assets/ac.ir
index fe8992907..3fca38e91 100644
--- a/assets/resources/infrared/assets/ac.ir
+++ b/assets/resources/infrared/assets/ac.ir
@@ -1,6 +1,73 @@
 Filetype: IR library file
 Version: 1
-# Last Updated 9th Oct, 2022
+# Last Updated 30th Oct, 2022
+#
+# POWER_ON
+name: POWER
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 9048 4430 705 501 705 501 704 1603 729 1579 728 479 726 480 726 505 701 506 701 505 700 505 701 505 701 1606 701 505 701 505 701 506 700 505 701 505 701 506 700 506 700 505 701 506 700 1607 701 1607 701 505 701 505 701 505 700 506 700 506 700 1608 700 505 701 1607 700 505 701 506 701 1607 700 505 700 19917 724 505 701 1607 700 505 701 505 700 1607 700 506 700 1607 701 505 700 506 700 1607 701 506 700 506 700 506 700 506 700 1607 700 505 701 505 701 506 700 505 702 506 700 505 700 506 700 506 700 505 701 505 700 506 700 506 700 505 701 1608 700 1607 700 1608 700 506 700 39927 9074 4408 726 481 725 505 700 1606 700 1607 701 505 701 505 701 505 700 506 700 506 700 505 701 505 701 1607 700 506 700 505 701 506 701 505 701 505 701 505 701 505 701 505 701 505 700 1607 701 1607 701 505 701 505 701 505 701 505 701 505 701 1608 700 1607 701 1607 700 506 700 506 700 1607 700 506 701 19938 700 505 701 505 700 505 701 505 700 505 701 505 701 505 701 506 700 506 700 505 701 506 700 505 701 505 701 505 700 506 699 506 700 505 700 505 700 506 700 506 700 506 699 504 701 506 700 505 701 506 700 505 701 505 701 506 700 506 699 1607 700 1607 700 1608 700
+#
+name: MODE
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 9105 4400 730 500 731 1552 755 1576 730 1577 729 477 728 478 727 479 727 479 727 479 727 479 727 479 728 1581 726 479 727 479 726 479 727 479 727 479 727 479 727 479 726 479 727 479 728 1580 728 1581 726 479 727 479 727 480 726 479 727 480 727 1580 727 479 727 1581 726 479 727 479 727 1581 727 479 727 19915 727 479 727 479 727 479 727 479 727 479 727 479 727 479 727 479 726 479 727 1581 726 480 726 480 726 480 726 480 726 1582 726 480 726 480 726 480 726 481 725 481 724 481 725 481 725 481 725 481 725 481 725 481 725 481 725 481 725 482 724 482 724 1583 724 482 724 39924 9074 4407 727 478 728 1580 728 1580 727 1580 728 477 728 478 728 478 728 479 728 478 728 479 727 479 727 1580 727 479 727 479 727 479 727 479 727 479 728 478 728 478 727 479 727 478 728 1581 727 1580 727 479 727 479 726 479 727 479 727 478 727 1581 726 1581 727 1580 727 479 727 479 727 1581 726 479 728 19915 727 479 727 480 726 480 726 481 725 505 700 481 725 480 725 504 701 505 701 480 726 505 702 482 724 505 701 505 701 505 701 505 701 505 701 505 701 505 701 505 701 505 701 505 701 505 700 505 700 505 701 506 700 506 701 505 701 505 701 506 701 505 701 505 701
+#
+name: TEMP+
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 9049 4430 705 501 705 1602 705 1602 730 1578 728 1580 727 479 726 1583 724 505 701 1607 700 506 700 505 700 1607 700 506 700 506 700 506 700 506 700 506 700 505 701 506 700 505 701 506 701 1607 702 1607 700 506 700 505 701 506 700 505 700 506 700 1607 700 506 701 1607 700 506 700 506 700 1607 700 506 700 19940 700 1607 701 505 700 505 700 505 700 1607 700 505 700 506 700 506 700 506 701 1606 701 506 700 506 700 506 700 506 700 1608 699 506 699 506 700 506 700 506 700 505 701 505 701 506 700 506 699 506 700 506 700 506 700 506 700 505 700 506 700 1608 700 1608 700 506 700 39927 9072 4409 727 479 726 1606 701 1607 701 1607 700 1606 701 505 701 1606 701 505 700 1608 700 505 700 505 701 1607 701 505 701 506 700 505 700 506 700 506 700 505 701 505 700 505 700 506 701 1607 700 1607 700 506 700 506 700 505 701 505 701 506 700 1607 701 1608 700 1608 699 505 700 506 700 1607 700 506 700 19940 700 505 701 506 700 505 701 506 700 505 701 505 700 505 701 505 701 505 701 505 701 505 701 506 700 505 701 506 699 506 700 506 700 506 700 506 700 505 701 506 700 1607 700 506 700 506 700 506 700 506 700 506 701 506 700 506 700 506 700 1606 700 506 701 506 700
+#
+name: TEMP-
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 9052 4428 705 500 706 1601 705 1602 730 1579 729 1579 729 478 727 1580 727 479 727 479 727 479 727 479 727 1581 726 480 726 479 727 480 726 480 726 479 727 479 727 480 726 480 726 479 727 1581 726 1581 726 480 726 480 726 480 726 480 726 480 725 1581 726 480 726 1583 725 480 726 480 726 1582 725 481 725 19911 727 1581 727 479 727 479 727 479 727 1581 726 480 727 479 727 479 727 479 727 1581 726 480 726 480 725 480 726 479 727 1581 726 479 726 480 726 480 726 480 725 480 726 480 726 480 725 480 726 480 726 481 725 481 725 482 724 481 725 1607 700 505 701 1582 725 505 701 39925 9075 4405 728 477 729 1579 728 1579 728 1579 728 1579 728 478 728 1579 728 478 728 478 728 478 727 478 728 1579 728 478 728 478 728 478 727 478 728 478 728 478 728 478 728 478 728 478 728 1579 728 1580 727 478 728 478 728 479 728 479 728 478 727 1580 727 1580 727 1580 727 479 727 478 729 1580 727 478 728 19913 728 478 728 477 729 478 728 478 728 478 728 478 728 478 728 478 728 478 728 478 728 477 729 478 728 478 728 478 728 478 727 478 728 478 728 477 728 478 728 478 728 1579 728 478 728 478 728 478 728 478 728 478 728 478 728 478 727 1580 727 478 728 478 728 479 727
+# LEFT-RIGHT
+name: SWING
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 9080 4428 704 501 704 1602 705 1602 705 1602 705 1602 705 501 705 1602 705 501 704 501 705 501 705 502 704 1604 728 478 728 478 728 478 728 504 728 478 728 478 728 478 727 479 727 478 728 1580 728 1580 728 478 728 478 727 478 728 478 728 478 728 1580 728 478 728 1579 729 478 728 479 727 1580 727 478 728 19913 727 478 728 478 727 478 727 478 728 1580 728 478 728 478 728 479 727 479 727 1580 727 479 727 479 727 479 727 479 727 1580 727 478 727 478 728 479 727 479 726 478 727 479 727 479 727 479 727 479 727 479 727 479 727 479 727 479 727 1581 727 479 727 1581 726 479 727 39924 9050 4430 704 502 729 1579 729 1579 729 1579 728 1579 728 478 727 1580 728 478 727 478 728 478 728 478 727 1580 727 478 728 478 728 478 728 478 728 478 728 478 728 478 727 479 727 479 727 1581 727 1580 727 478 728 478 728 478 728 478 728 478 727 1580 728 1581 727 1581 727 479 727 479 727 1579 728 479 727 19912 728 478 728 478 728 478 728 478 728 478 728 478 728 478 728 478 728 478 728 478 728 478 728 478 728 478 728 478 727 478 728 478 728 478 728 478 728 479 727 479 727 1580 728 479 727 479 727 479 727 479 727 479 727 479 727 479 726 1581 726 479 727 480 727 479 727
+#
+name: POWER
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 190 26844 503 368 475 395 475 395 475 367 476 395 475 25347 3527 1695 451 1290 451 420 476 394 476 394 475 1264 475 370 471 399 470 400 470 400 443 1298 443 400 470 1270 471 1270 471 400 470 1270 471 1271 470 1270 471 1270 471 1271 470 400 470 373 470 1271 470 400 470 400 470 400 443 400 470 400 470 400 443 400 470 400 470 400 470 374 469 1271 470 400 470 1271 470 400 470 401 442 401 469 1272 469 1272 469 401 469 401 469 374 469 401 469 401 469 401 442 401 469 401 469 401 469 374 469 401 469 401 469 374 469 401 469 401 469 401 442 1300 441 1299 442 1300 441 402 468 1272 469 402 468 1272 469 1273 468 34903 3522 1703 471 1270 471 400 470 373 470 400 470 1270 471 400 470 400 443 400 470 400 470 1270 471 400 443 1298 443 1297 444 400 470 1270 471 1270 471 1270 471 1270 471 1270 471 400 470 400 470 1270 471 373 470 400 470 400 470 400 443 400 470 400 470 400 470 373 470 400 470 400 470 400 443 1298 443 400 470 400 470 400 443 400 470 1271 470 400 470 1271 470 1271 470 400 470 1271 470 1271 470 1271 470 373 470 400 470 1271 470 1271 470 400 470 1271 470 1271 470 400 443 400 470 400 470 400 470 1271 470 373 470 1271 470 401 469 1271 470 400 470 1271 470 34903 3522 1702 471 1269 472 373 470 399 471 399 471 1270 471 399 444 399 471 399 471 399 471 1270 471 372 471 1270 471 1270 471 399 471 1270 471 1270 471 1270 471 1270 471 1270 471 399 471 399 444 1297 444 399 471 399 471 399 471 372 471 399 471 399 471 373 470 399 471 399 471 399 444 400 470 399 471 399 471 373 470 400 470 400 470 399 444 400 470 1270 471 400 470 400 470 1270 471 1271 470 1271 470 372 471 400 470 400 470 400 443 1298 443 400 470 1271 470 1271 470 400 470 400 443 401 469 400 470 401 469 373 470 401 469 401 469 401 442 401 469 401 469 401 469 375 468 402 468 401 469 1273 468 1296 445 426 416 426 445 426 444 426 417 426 444 426 444 426 444 399 444 426 444 426 444 426 417 426 444 426 444 426 444 399 444 426 444 426 444 426 417 1324 417 1325 416 426 444 426 444 427 416 427 444 426 444 426 444 399 444 427 443 427 443 426 417 1325 416 1325 416 427 443 427 443 426 444 399 444 427 443 427 444 427 416 427 444 427 443 427 443 400 443 427 443 427 443 400 443 427 443 427 443 427 416 1325 416 427 443 427 443 427 443 400 443 427 443 1298 443 1298 443 427 443 427 416 427 443 427 443 427 443 400 443 427 443 1298 443 427 443 400 443 428 442 427 443 427 416 428 443 427 443 427 443 400 443 1298 443 1298 443 428 442 428 442 428 415 428 442 1299 442
+#
+name: TEMP+
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 473 397 473 397 473 397 472 371 472 397 473 25350 3523 1697 449 1292 449 422 474 397 473 397 473 1267 473 372 470 401 468 402 468 402 441 1300 441 402 468 1272 469 1272 469 402 468 1273 468 1273 468 1272 469 1273 468 1273 468 403 440 402 468 1273 468 402 468 402 468 375 468 402 468 402 468 402 441 402 468 402 468 402 468 376 467 1273 468 402 468 1273 468 402 468 402 441 402 468 1273 468 1273 468 402 468 403 467 376 467 403 467 403 467 376 467 403 467 403 467 403 440 403 467 403 467 403 467 376 467 403 467 403 467 403 440 1302 439 1302 439 1302 439 404 466 1274 467 403 467 1274 467 1275 466 34905 3520 1705 469 1273 468 402 441 402 468 402 468 1273 468 402 468 376 467 402 468 402 468 1273 468 402 441 1300 441 1300 441 403 467 1273 468 1273 468 1273 468 1273 468 1273 468 403 467 402 468 1273 468 376 467 402 468 402 468 402 441 403 467 403 468 402 441 403 467 403 467 403 467 376 467 1274 467 403 467 403 467 403 440 403 467 1274 467 403 467 403 467 376 467 1274 467 1274 467 1274 467 1274 467 403 467 404 466 1274 467 1274 467 404 439 1302 439 1302 439 404 466 404 466 404 439 1302 439 1302 439 404 466 1275 466 404 466 1275 466 404 466 1275 466 34906 3519 1705 468 1273 468 376 467 402 468 402 468 1273 468 402 441 402 468 402 468 402 468 1273 468 376 467 1273 468 1273 468 402 468 1273 468 1273 468 1273 468 1273 468 1273 468 402 468 376 467 1273 468 402 468 402 468 403 440 403 467 403 467 403 467 376 467 403 467 403 467 403 440 403 467 403 468 402 468 376 467 403 467 403 467 403 440 403 467 403 467 403 440 403 467 1274 467 1274 467 1274 467 403 467 404 466 376 467 1274 467 1275 466 404 466 1275 466 1275 466 404 466 404 439 404 466 404 467 404 466 377 466 404 466 404 466 404 439 404 466 404 466 405 438 405 465 404 466 405 465 1276 465 1299 442 378 465 406 464 405 465 406 437 405 465 428 442 428 442 401 442 428 442 428 442 428 415 429 441 428 442 429 414 429 441 429 441 428 442 401 442 1300 441 1299 442 429 441 429 441 429 414 429 441 429 441 429 441 402 441 429 441 429 441 429 414 1327 414 1327 414 429 441 429 441 429 441 402 441 429 441 429 441 402 441 429 441 429 441 429 414 429 441 429 441 429 441 402 441 429 441 429 441 429 414 1328 413 430 441 429 441 429 441 402 441 429 441 1300 441 1301 440 429 441 402 441 430 440 430 440 430 413 430 441 429 441 1301 440 430 440 403 440 430 440 430 440 430 413 430 440 430 440 430 440 1301 440 1301 440 1301 440 403 440 430 440 430 440 403 440 1301 440
+#
+name: TEMP-
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 504 342 501 394 476 394 475 367 476 394 476 25347 3528 1694 451 1290 451 420 476 393 477 394 475 1264 476 369 472 398 471 399 471 399 444 1297 444 399 471 1269 472 1269 472 399 471 1269 472 1270 471 1270 471 1269 472 1270 471 399 471 372 471 1270 471 399 471 399 471 399 444 399 471 399 471 399 444 399 471 399 471 399 471 372 471 1270 471 399 471 1270 471 399 471 399 444 399 471 1270 471 1270 471 399 471 399 471 372 471 399 471 399 471 399 444 400 470 399 471 400 443 400 471 399 471 400 471 372 471 400 470 399 471 400 443 1298 443 1298 443 1298 443 400 470 1271 470 400 470 1271 470 1271 470 34902 3523 1702 471 1269 472 399 471 372 471 399 471 1270 471 399 471 372 471 399 471 399 471 1269 472 399 444 1297 444 1297 444 399 471 1270 471 1270 471 1270 471 1269 472 1270 471 399 471 399 471 1270 471 372 471 399 471 399 471 399 444 399 471 399 471 399 471 373 470 399 471 399 471 399 444 1297 444 399 471 400 470 400 443 400 470 1270 471 399 471 399 471 373 470 1270 471 1271 470 1270 471 1270 471 400 470 400 470 1271 470 1271 470 400 443 1298 443 1298 443 400 470 400 470 400 470 1271 470 1271 470 373 470 1271 470 400 470 1271 470 400 470 1271 470 34902 3523 1702 471 1270 471 373 470 399 471 399 471 1270 471 399 444 400 470 399 471 399 471 1270 471 373 470 1270 471 1270 471 399 471 1270 471 1270 471 1270 471 1270 471 1270 471 399 471 400 443 1298 443 400 470 400 470 400 470 373 470 400 470 399 471 373 470 400 470 400 470 400 443 400 470 400 470 400 470 373 470 400 470 400 470 400 443 400 470 400 470 400 470 373 470 1271 470 1271 470 1271 470 400 470 400 470 373 470 400 470 1271 470 401 469 1272 469 1271 470 401 442 401 469 401 469 401 469 374 469 401 469 401 469 401 442 401 469 401 469 401 469 374 469 401 469 401 469 401 442 1300 441 1300 441 401 469 401 469 402 441 402 468 402 468 402 468 375 468 402 468 402 468 402 441 402 468 402 468 402 468 375 468 403 467 403 467 403 440 403 467 1274 467 1273 468 404 466 427 416 403 467 404 466 427 443 400 443 427 443 427 443 427 416 427 444 1298 443 1298 443 427 443 427 443 400 443 427 443 427 443 427 416 427 443 427 443 427 416 427 443 427 443 427 443 400 443 427 443 427 443 427 416 428 442 1298 443 427 443 428 442 400 443 427 443 427 443 1298 443 1298 443 427 416 428 442 427 443 428 442 400 443 428 442 428 442 1299 442 400 443 428 442 428 442 428 415 428 442 428 442 428 442 401 442 1299 442 428 442 1299 442 428 442 428 415 428 442 428 442 1299 442
+#
+name: POWER
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 1286 428 1251 408 442 1241 1289 399 1280 431 408 1247 1283 431 408 1248 442 1242 437 1246 443 1240 439 8135 1279 434 1256 430 409 1246 1284 430 1260 426 413 1242 1287 426 413 1243 436 1247 443 1241 438 1245 445 8130 1284 428 1262 424 415 1240 1279 435 1255 430 409 1247 1283 430 409 1247 443 1241 438 1245 434 1249 441 8133 1281 432 1258 428 411 1244 1286 428 1251 407 443 1240 1279 434 416 1240 439 1244 435 1249 441 1243 436 8137 1287 400 1279 433 417 1239 1280 433 1257 430 409 1246 1284 429 410 1246 444 1240 439 1245 445 1239 440 8133 1281 405 1285 428 411 1245 1285 429 1261 425 414 1241 1289 425 414 1242 437 1246 444 1240 439 1245 434 8139 1285 428 1251 435 415 1240 1279 434 1256 430 409 1246 1283 430 409 1247 443 1241 438 1245 445 1239 440 8133 1281 432 1258 428 411 1244 1286 428 1251 407 443 1240 1279 434 416 1240 439 1244 435 1249 441 1243 436 8137 1287 426 1253 432 407 1248 1281 432 1258 401 438 1244 1285 427 412 1244 435 1248 442 1242 437 1247 442 8131 1283 403 1287 426 413 1242 1287 426 1253 433 417 1239 1280 432 418 1238 441 1243 436 1247 442 1241 438 8136 1288 398 1281 404 435 1248 1281 404 1286 400 439 1244 1285 400 439 1244 435 1249 441 1243 436 1247 442 8131 1283 404 1285 400 439 1243 1286 401 1278 407 443 1240 1289 397 442 1240 439 1245 434 1249 441 1243 436 8138 1286 401 1278 407 443 1240 1279 407 1283 403 436 1246 1283 403 436 1246 444 1240 439 1245 434 1249 441 8134 1280 406 1284 402 437 1246 1283 402 1288 398 441 1242 1288 399 440 1242 437 1247 443 1241 438 1245 434 8140 1284 402 1288 398 441 1242 1287 425 1254 432 407 1249 1281 432 407 1249 441 1243 436 1247 443 1241 438 8136 1288 425 1254 405 434 1248 1281 406 1284 401 438 1245 1285 402 437 1246 433 1250 440 1244 435 1248 442
+#
+name: MODE
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 1281 406 1284 403 436 1246 1284 403 1276 409 441 1242 437 1246 433 1250 440 1244 1286 401 438 1244 435 8137 1287 400 1279 407 432 1250 1280 407 1283 403 436 1246 433 1250 440 1244 435 1248 1282 405 434 1248 442 8131 1283 404 1286 401 438 1244 1285 401 1278 408 442 1240 439 1244 435 1248 442 1242 1287 400 439 1243 436 8137 1287 399 1280 406 433 1250 1280 407 1283 403 436 1246 433 1250 440 1244 435 1248 1282 406 433 1249 441 8132 1282 404 1286 402 437 1244 1285 402 1277 408 442 1240 439 1244 435 1249 441 1243 1286 401 438 1243 436 8136 1277 409 1281 407 432 1249 1280 406 1284 402 437 1244 435 1249 441 1242 437 1247 1282 405 434 1248 442 8130 1283 403 1287 401 438 1243 1286 400 1279 407 432 1249 441 1243 436 1247 443 1241 1278 409 441 1241 438 8134 1279 407 1283 431 408 1247 1282 404 1286 427 412 1243 436 1247 442 1241 438 1245 1284 403 436 1245 434 8139 1285 401 1278 435 415 1240 1279 408 1282 404 435 1246 433 1250 440 1244 435 1249 1280 407 432 1249 441 8132 1281 405 1285 402 437 1244 1285 401 1278 407 432 1250 440 1243 436 1247 443 1241 1278 409 441 1241 438 8135 1279 407 1283 431 408 1246 1283 404 1275 436 414 1242 437 1246 433 1250 440 1244 1285 401 438 1244 435 8137 1277 409 1281 433 406 1249 1281 405 1285 401 438 1243 436 1247 442 1241 438 1245 1284 402 437 1246 433 8138 1286 401 1278 408 442 1241 1278 408 1281 404 435 1246 433 1249 440 1243 436 1247 1282 405 434 1247 442 8130 1283 404 1285 401 438 1243 1286 400 1279 406 433 1248 442 1242 437 1246 433 1250 1279 408 442 1240 439 8133 1280 407 1282 403 436 1245 1284 403 1276 409 441 1240 439 1244 435 1249 440 1243 1286 400 439 1243 436 8136 1287 400 1279 406 433 1248 1281 406 1284 401 438 1243 436 1247 442 1241 438 1245 1284 402 437 1245 434 8138 1286 401 1278 407 432 1250 1279 406 1284 402 437 1245 434 1249 441 1242 437 1246 1283 403 436 1247 432 8139 1285 401 1278 435 415 1241 1278 407 1283 404 435 1246 433 1250 440 1243 436 1247 1282 404 435 1247 443 8130 1283 402 1277 436 414 1241 1278 408 1282 404 435 1247 432 1251 439 1244 435 1249 1280 406 433 1249 441 8131 1283 403 1276 411 439 1242 1277 410 1280 405 434 1248 442 1241 438 1245 434 1249 1280 407 432 1249 441 8132 1282 404 1286 428 411 1243 1286 400 1279 406 433 1248 442 1242 437 1246 433 1250 1279 408 431 1250 440 8132 1281 405 1285 429 410 1244 1285 401 1278 407 432 1250 439 1243 436 1247 443 1241 1278 409 441 1241 438 8134 1280 406 1284 404 435 1245 1284 403 1276 435 415 1241 438 1244 435 1249 440 1242 1287 400 439 1242 437 8135 1279 407 1283 431 408 1246 1283 403 1276 409 441 1241 438 1245 434 1249 441 1243 1286 400 439 1243 436 8136 1278 408 1313 401 407 1248 1281 404 1286 400 439 1243 436 1247 443 1240 439 1245 1284 402 437 1245 434 8138 1286 400 1310 403 405 1250 1279 406 1304 382 437 1245 434 1249 441 1243 436 1247 1282 404 435 1248 442 8130 1283 403 1287 401 438 1244 1285 401 1309 377 442 1240 439 1244 435 1248 441 1242 1287 401 438 1244 435 8137 1287 402 1308 405 414 1241 1309 405 1284 402 406 1249 440 1242 437 1247 442 1241 1309 406 412 1242 437 8137 1307 407 1251 434 416 1240 1289 424 1255 431 408 1247 442 1241 438 1245 444 1240 1289 424 415 1240 439 8134 1310 404 1254 432 407 1248 1281 432 1257 428 411 1244 435 1249 440 1243 436 1247 1313 401 407 1248 442 8131 1313 401 1257 428 411 1244 1285 429 1261 425 414 1241 438 1245 434 1250 440 1244 1285 428 411 1245 434 8139 1316 399 1259 426 413 1242 1287 426 1253 433 406 1249 440 1243 436 1247 443 1241 1288 399 440 1242 437
+#
+name: TIMER
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 1280 406 1283 431 408 1246 1283 403 1276 437 413 1243 436 1247 1282 404 435 1248 441 1242 437 1246 433 8140 1283 404 1285 428 411 1244 1285 400 1279 408 431 1250 439 1244 1285 401 438 1245 434 1249 440 1243 436 8137 1286 401 1278 409 441 1241 1278 407 1282 404 435 1247 442 1241 1278 408 442 1241 438 1245 434 1250 440 8134 1279 407 1282 405 434 1247 1282 404 1285 401 438 1244 435 1248 1281 405 434 1249 440 1242 437 1247 442 8131 1282 405 1284 402 437 1245 1284 401 1278 409 441 1241 438 1245 1284 402 437 1246 433 1250 439 1244 435 8139 1284 402 1277 410 440 1242 1277 409 1280 432 407 1248 441 1242 1277 410 440 1243 436 1247 442 1241 438 8135 1278 409 1280 433 406 1249 1280 406 1283 403 436 1246 433 1250 1279 408 442 1241 438 1246 433 1250 439 8134 1279 408 1281 407 432 1249 1280 406 1283 404 435 1247 442 1241 1278 409 441 1242 437 1247 442 1241 438 8136 1287 400 1279 408 442 1240 1279 407 1282 431 408 1248 441 1241 1278 409 441 1243 436 1247 442 1241 438 8136 1287 400 1279 408 442 1241 1278 408 1281 405 434 1249 440 1242 1287 400 439 1244 435 1248 442 1242 437 8137 1286 401 1278 409 441 1242 1277 409 1281 406 433 1249 440 1243 1286 400 439 1244 435 1248 441 1243 436 8137 1286 402 1277 409 441 1242 1277 409 1280 406 433 1249 440 1242 1287 400 439 1243 436 1247 442 1241 438 8136 1287 400 1279 407 432 1250 1279 408 1281 404 435 1246 443 1240 1279 409 441 1241 438 1245 434 1249 440 8134 1279 409 1280 405 434 1247 1282 405 1284 402 437 1243 436 1248 1281 406 433 1248 441 1242 437 1247 442 8132 1280 407 1282 430 409 1245 1284 404 1275 410 440 1242 437 1246 1283 405 434 1247 442 1241 438 1272 407 8141 1282 405 1284 402 437 1243 1286 402 1277 408 442 1240 439 1244 1285 403 436 1245 434 1249 440 1244 435 8138 1285 403 1276 410 440 1242 1287 400 1279 407 432 1248 441 1242 1287 401 438 1243 436 1247 442 1242 437 8136 1287 401 1278 408 431 1249 1280 408 1281 404 435 1245 434 1250 1279 408 442 1240 439 1244 435 1249 440 8133 1279 408 1281 404 435 1246 1283 404 1285 400 439 1242 437 1247 1282 405 434 1247 442 1241 438 1246 433 8140 1283 405 1284 401 438 1243 1286 401 1278 408 431 1249 440 1243 1286 402 437 1244 435 1248 441 1242 437 8137 1286 401 1278 408 442 1240 1279 408 1281 404 435 1246 433 1250 1279 408 442 1240 439 1244 435 1249 440 8133 1280 408 1282 404 435 1246 1283 431 1259 401 438 1242 437 1247 1282 405 434 1247 442 1241 438 1246 443 8130 1283 405 1284 401 438 1269 1260 427 1252 433 406 1276 413 1243 1286 401 438 1270 409 1248 441 1242 437 8136 1287 401 1278 407 432 1249 1280 434 1255 403 436 1245 444 1240 1279 408 442 1240 439 1245 434 1249 440 8134 1278 435 1254 405 434 1247 1282 405 1284 401 438 1243 436 1248 1281 406 433 1249 440 1243 436 1247 442 8131 1281 406 1283 401 438 1244 1285 401 1288 397 442 1241 438 1245 1284 402 437 1246 443 1240 439 1244 435 8139 1284 402 1287 398 441 1241 1288 398 1281 404 435 1248 441 1242 1287 398 441 1242 437 1246 443 1240 439 8134 1289 397 1282 403 436 1246 1283 403 1286 398 441 1242 437 1246 1283 403 436 1247 442 1241 438 1245 434
 #
 # ON
 name: POWER
@@ -1287,3 +1354,10 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 3302 1618 435 393 436 391 438 1207 431 396 433 1213 435 392 437 391 438 388 441 1206 432 1214 434 392 437 389 440 388 431 1215 433 1213 435 392 437 390 439 388 431 396 433 395 434 392 437 390 439 388 431 396 433 394 435 392 437 390 439 388 441 1205 433 395 434 392 437 389 440 388 431 396 433 394 435 392 437 1209 439 388 431 397 432 394 435 393 436 1210 438 387 432 396 433 394 435 392 437 390 439 388 431 1215 433 394 435 1211 437 1208 440 1205 433 1213 435 1211 437 1209 439
 #
+# POWER_OFF
+name: POWER
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 9048 4430 705 500 706 1602 705 1602 729 476 730 1579 728 478 728 1580 727 480 726 480 726 480 726 480 726 1606 702 505 701 481 725 481 724 505 701 481 725 504 702 505 701 504 701 505 701 1606 702 504 702 504 701 504 701 504 702 505 701 505 701 1606 701 504 702 1607 701 504 701 504 701 1607 701 505 701 19915 726 1582 726 481 725 504 701 505 701 1606 701 505 701 505 701 505 701 505 700 1606 701 505 701 505 701 505 701 504 702 1606 701 505 701 504 701 505 701 504 702 505 701 505 701 505 701 505 701 505 701 505 701 505 701 505 701 505 701 1606 701 505 701 1607 700 1606 701 39924 9075 4406 728 478 728 1581 727 1581 726 481 725 1582 725 480 725 1606 701 504 702 481 725 505 701 505 701 1606 701 504 702 505 701 505 701 505 701 505 701 505 701 505 701 505 701 505 701 1606 701 505 701 505 701 505 701 505 701 505 701 505 701 1606 701 1607 701 1607 701 505 701 505 701 1607 701 506 701 19913 726 480 726 480 726 480 726 480 726 479 727 479 727 480 725 479 727 479 726 480 726 480 726 480 726 480 726 480 726 480 726 504 701 480 726 480 725 505 702 481 725 1606 701 505 701 481 725 481 725 505 700 505 701 504 701 505 701 1607 701 504 701 505 700 1607 701
+#
diff --git a/assets/resources/infrared/assets/fans.ir b/assets/resources/infrared/assets/fans.ir
index a693c0037..d0e6884f0 100644
--- a/assets/resources/infrared/assets/fans.ir
+++ b/assets/resources/infrared/assets/fans.ir
@@ -1,6 +1,18 @@
 Filetype: IR library file
 Version: 1
-# Last Updated 9th Oct, 2022
+# Last Updated 30th Oct, 2022
+#
+name: POWER
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 1285 426 1258 427 414 1267 1248 436 1258 427 414 1267 406 1276 408 1248 435 1247 437 1271 413 1244 1282 7286 1279 432 1252 433 409 1273 1253 431 1253 432 410 1273 411 1271 413 1243 440 1241 442 1240 433 1275 1251 7292 1283 427 1257 428 413 1268 1258 427 1257 428 414 1268 416 1240 433 1249 434 1248 435 1246 438 1245 1281 7287 1278 406 1278 434 408 1274 1252 432 1252 433 409 1274 410 1246 438 1244 440 1243 440 1241 443 1240 1275 7294 1281 402 1282 430 412 1270 1256 428 1256 429 412 1243 441 1241 443 1240 433 1249 434 1247 436 1246 1280 7288 1277 433 1251 434 408 1248 1278 432 1251 433 409 1273 411 1245 439 1244 440 1242 442 1240 433 1249 1277 7292 1283 400 1304 406 435 1246 1248 436 1279 405 436 1246 406 1249 434 1247 436 1245 438 1244 440 1242 1284 7285 1280 430 1285 400 442 1241 1285 399 1285 400 441 1240 444 1212 440 1241 443 1240 433 1249 434 1273 1284 7259 1306 404 1280 405 436 1245 1281 403 1281 404 438 1244 440 1216 468 1214 438 1244 440 1242 442 1241 1305 7262 1303 408 1276 407 434 1249 1277 407 1276 407 435 1248 436 1220 464 1219 464 1217 466 1242 441 1214 1312
+#
+name: SPEED+
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 1280 431 1252 431 410 1244 1281 430 1253 430 411 1270 413 1242 441 1240 433 1249 434 1247 1278 433 408 8129 1277 433 1250 433 408 1274 1251 432 1251 433 409 1273 410 1271 412 1269 414 1241 432 1250 1275 435 406 8133 1283 426 1257 427 414 1267 1248 436 1247 436 405 1276 407 1248 435 1247 436 1245 438 1244 1281 429 412 8126 1280 430 1253 430 411 1270 1255 429 1254 429 412 1269 414 1241 432 1276 407 1248 435 1247 1278 432 410 8129 1277 432 1251 433 408 1273 1252 431 1252 431 411 1272 411 1269 414 1241 442 1240 433 1275 1250 434 408 8130 1276 434 1249 434 407 1275 1250 433 1250 433 408 1274 409 1272 411 1244 439 1268 415 1240 1275 436 405 8133 1283 427 1256 427 414 1267 1248 436 1258 426 405 1277 406 1274 409 1273 410 1245 438 1244 1281 429 412 8125 1281 429 1254 429 412 1269 1256 428 1255 428 413 1268 415 1266 407 1248 435 1247 436 1245 1280 430 411 8127 1279 431 1252 431 411 1271 1254 430 1253 430 412 1270 413 1268 415 1240 433 1275 408 1247 1278 432 410 8128 1278 432 1251 432 410 1272 1253 431 1252 431 410 1271 412 1242 441 1267 406 1250 433 1248 1277 433 409 8129 1277 433 1250 433 409 1272 1253 431 1252 431 410 1271 412 1242 441 1241 432 1250 433 1248 1277 433 409 8129 1277 433 1250 434 408 1246 1279 432 1251 432 409 1245 438 1244 439 1242 441 1240 433 1249 1276 434 407
 #
 name: POWER
 type: raw
diff --git a/assets/unit_tests/infrared/test_kaseikyo.irtest b/assets/unit_tests/infrared/test_kaseikyo.irtest
new file mode 100644
index 000000000..d0142fecd
--- /dev/null
+++ b/assets/unit_tests/infrared/test_kaseikyo.irtest
@@ -0,0 +1,105 @@
+Filetype: IR tests file
+Version: 1
+#
+name: decoder_input1
+type: raw
+data: 1000000 3363 1685 407 436 411 432 415 1240 434 410 437 1245 439 404 433 1249 435 408 439 431 406 1249 435 435 412 405 442 1241 433 1249 435 408 439 405 442 428 409 434 413 430 407 411 436 433 414 429 408 1248 436 407 440 1243 441 428 409 434 413 431 406 1249 435 1248 436 406 441 1242 442 1240 434 409 438 431 416 428 409 408 439 430 407 411 436 407 440 429 408 436 411 432 415 402 435 1247 437 1245 439 1243 441 1238 436
+#
+name: decoder_expected1
+type: parsed_array
+count: 1
+#
+protocol: Kaseikyo
+address: 41 54 32 00
+command: 1B 00 00 00
+repeat: false
+#
+name: decoder_input2
+type: raw
+data: 1000000 3365 1683 409 434 413 431 406 1276 408 435 412 1270 414 429 408 1248 436 434 413 430 407 1275 409 434 413 431 406 1276 408 1248 436 433 414 430 407 437 410 433 414 429 408 436 411 432 415 428 409 1246 438 432 415 1267 407 437 410 433 414 429 408 436 411 432 415 1266 408 1250 434 1248 436 432 415 429 408 435 412 432 415 428 409 434 413 430 407 437 410 433 414 429 408 436 411 432 415 428 409 435 412 1240 434
+#
+name: decoder_expected2
+type: parsed_array
+count: 1
+#
+protocol: Kaseikyo
+address: 41 54 32 00
+command: 1C 00 00 00
+repeat: false
+#
+name: decoder_input3
+type: raw
+data: 1000000 3361 1661 442 427 410 434 413 1243 441 428 409 1247 437 432 415 1241 433 410 437 407 440 1242 432 437 410 407 440 1242 442 1241 433 436 411 407 440 430 407 436 411 406 441 402 435 435 412 431 416 1240 434 410 437 1245 439 404 433 411 436 407 440 403 434 436 411 432 415 429 408 1249 435 1247 437 1245 439 430 407 1250 434 434 413 404 433 438 409 434 413 1243 441 1241 433 410 437 1245 439 430 407 1250 434 432 415
+#
+name: decoder_expected3
+type: parsed_array
+count: 1
+#
+protocol: Kaseikyo
+address: 41 54 32 00
+command: 70 01 00 00
+repeat: false
+#
+name: decoder_input4
+type: raw
+data: 1000000 3365 1656 436 406 441 402 435 1248 436 406 441 1242 432 410 437 1246 438 404 433 410 437 1246 438 404 433 437 410 1245 491 1190 442 401 436 435 412 431 416 427 410 433 414 429 408 435 412 431 416 1240 434 435 412 1244 440 1241 433 436 411 433 414 402 435 409 438 405 442 402 435 1247 437 1244 440 1241 433 437 410 1245 439 430 407 410 437 406 441 402 435 409 438 1243 441 402 435 1247 437 406 441 1240 434 433 414
+#
+name: decoder_expected4
+type: parsed_array
+count: 1
+#
+protocol: Kaseikyo
+address: 43 54 32 00
+command: 70 01 00 00
+repeat: false
+#
+name: decoder_input5
+type: raw
+data: 1000000 3357 1665 438 431 416 428 409 1247 437 432 415 1241 433 436 411 1245 439 430 407 436 411 1245 439 430 407 437 410 1246 438 1243 441 428 409 436 411 432 415 428 409 435 412 431 416 427 410 434 413 1243 441 427 410 1247 437 1245 439 430 407 437 410 1246 438 1244 440 429 408 1250 434 1248 488 355 440 429 408 436 411 432 415 428 408 435 412 431 416 428 409 1247 437 432 415 428 409 1248 436 1246 490 1191 441 1240 434
+#
+name: decoder_expected5
+type: parsed_array
+count: 1
+#
+protocol: Kaseikyo
+address: 43 54 32 00
+command: 1B 00 00 00
+repeat: false
+#
+name: decoder_input6
+type: raw
+data: 1000000 3358 1664 439 430 407 437 410 1245 439 430 407 1250 434 434 413 1243 441 428 409 435 412 1244 440 428 409 435 412 1244 440 1242 432 437 410 434 413 430 407 436 411 432 415 428 409 435 412 431 416 1240 434 435 412 1244 440 1242 442 427 410 434 413 1243 441 427 409 1247 437 433 414 429 408 436 411 432 415 428 409 435 412 431 416 427 410 434 413 1243 441 1240 486 357 438 432 415 1240 434 436 411 432 415 425 412
+#
+name: decoder_expected6
+type: parsed_array
+count: 1
+#
+protocol: Kaseikyo
+address: 43 54 32 00
+command: 05 00 00 00
+repeat: false
+#
+name: encoder_decoder_input1
+type: parsed_array
+count: 4
+#
+protocol: Kaseikyo
+address: 41 54 32 00
+command: 1B 00 00 00
+repeat: false
+#
+protocol: Kaseikyo
+address: 41 54 32 00
+command: 70 01 00 00
+repeat: false
+#
+protocol: Kaseikyo
+address: 43 54 32 00
+command: 05 00 00 00
+repeat: false
+#
+protocol: Kaseikyo
+address: 43 54 32 00
+command: 1B 00 00 00
+repeat: false
+#
diff --git a/debug/flipperapps.py b/debug/flipperapps.py
index 8e1aa2daf..e815e40b1 100644
--- a/debug/flipperapps.py
+++ b/debug/flipperapps.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Tuple, Dict
+from typing import Optional, Tuple, Dict, ClassVar
 import struct
 import posixpath
 import os
@@ -22,14 +22,18 @@ class AppState:
     debug_link_elf: str = ""
     debug_link_crc: int = 0
 
+    DEBUG_ELF_ROOT: ClassVar[Optional[str]] = None
+
     def __post_init__(self):
         if self.other_sections is None:
             self.other_sections = {}
 
-    def get_original_elf_path(self, elf_path="build/latest/.extapps") -> str:
+    def get_original_elf_path(self) -> str:
+        if self.DEBUG_ELF_ROOT is None:
+            raise ValueError("DEBUG_ELF_ROOT not set; call fap-set-debug-elf-root")
         return (
-            posixpath.join(elf_path, self.debug_link_elf)
-            if elf_path
+            posixpath.join(self.DEBUG_ELF_ROOT, self.debug_link_elf)
+            if self.DEBUG_ELF_ROOT
             else self.debug_link_elf
         )
 
@@ -84,7 +88,9 @@ class AppState:
         if debug_link_size := int(app_state["debug_link_info"]["debug_link_size"]):
             debug_link_data = (
                 gdb.selected_inferior()
-                .read_memory(int(app_state["debug_link_info"]["debug_link"]), debug_link_size)
+                .read_memory(
+                    int(app_state["debug_link_info"]["debug_link"]), debug_link_size
+                )
                 .tobytes()
             )
             state.debug_link_elf, state.debug_link_crc = AppState.parse_debug_link_data(
@@ -103,6 +109,29 @@ class AppState:
         return state
 
 
+class SetFapDebugElfRoot(gdb.Command):
+    """Set path to original ELF files for debug info"""
+
+    def __init__(self):
+        super().__init__(
+            "fap-set-debug-elf-root", gdb.COMMAND_FILES, gdb.COMPLETE_FILENAME
+        )
+        self.dont_repeat()
+
+    def invoke(self, arg, from_tty):
+        AppState.DEBUG_ELF_ROOT = arg
+        try:
+            global helper
+            print(f"Set '{arg}' as debug info lookup path for Flipper external apps")
+            helper.attach_fw()
+            gdb.events.stop.connect(helper.handle_stop)
+        except gdb.error as e:
+            print(f"Support for Flipper external apps debug is not available: {e}")
+
+
+SetFapDebugElfRoot()
+
+
 class FlipperAppDebugHelper:
     def __init__(self):
         self.app_ptr = None
@@ -149,9 +178,4 @@ class FlipperAppDebugHelper:
 
 
 helper = FlipperAppDebugHelper()
-try:
-    helper.attach_fw()
-    print("Support for Flipper external apps debug is enabled")
-    gdb.events.stop.connect(helper.handle_stop)
-except gdb.error as e:
-    print(f"Support for Flipper external apps debug is not available: {e}")
+print("Support for Flipper external apps debug is loaded")
diff --git a/documentation/UnitTests.md b/documentation/UnitTests.md
new file mode 100644
index 000000000..3f56a9a90
--- /dev/null
+++ b/documentation/UnitTests.md
@@ -0,0 +1,49 @@
+# Unit tests
+## Intro
+Unit tests are special pieces of code that apply known inputs to the feature code and check the results to see if they were correct. 
+They are crucial for writing robust, bug-free code.
+
+Flipper Zero firmware includes a separate application called [unit_tests](/applications/debug/unit_tests).
+It is run directly on the Flipper Zero in order to employ its hardware features and to rule out any platform-related differences.
+
+When contributing code to the Flipper Zero firmware, it is highly desirable to supply unit tests along with the proposed features. 
+Running existing unit tests is useful to ensure that the new code doesn't introduce any regressions.
+
+## Running unit tests
+In order to run the unit tests, follow these steps:
+1. Compile the firmware with the tests enabled: `./fbt FIRMWARE_APP_SET=unit_tests`.
+2. Flash the firmware using your preferred method.
+3. Copy the [assets/unit_tests](assets/unit_tests) folder to the root your Flipper Zero's SD card.
+4. Launch the CLI session and run the `unit_tests` command.
+
+**NOTE:** To run a particular test (and skip all others), specify its name as the command argument. 
+See [test_index.c](applications/debug/unit_tests/test_index.c) for the complete list of test names.
+
+## Adding unit tests
+### General
+#### Entry point
+The common entry point for all tests it the [unit_tests](applications/debug/unit_tests) application. Test-specific code is placed into an arbitrarily named subdirectory and is then called from the [test_index.c](applications/debug/unit_tests/test_index.c) source file.
+#### Test assets
+Some unit tests require external data in order to function. These files (commonly called assets) reside in the [assets/unit_tests](/assets/unit_tests) directory in their respective subdirectories. Asset files can be of any type (plain text, FlipperFormat(FFF), binary etc).
+### Application-specific
+#### Infrared
+Each infrared protocol has a corresponding set of unit tests, so it makes sense to implement one when adding support for a new protocol.
+In order to add unit tests for your protocol, follow these steps:
+1. Create a file named `test_<your_protocol_name>.irtest` in the [assets](assets/unit_tests/infrared) directory.
+2. Fill it with the test data (more on it below).
+3. Add the test code to [infrared_test.c](applications/debug/unit_tests/infrared/infrared_test.c).
+4. Update the [assets](assets/unit_tests/infrared) on your Flipper Zero and run the tests to see if they pass.
+
+##### Test data format
+Each unit test has 3 sections: 
+1. `decoder` - takes in raw signal and outputs decoded messages.
+2. `encoder` - takes in decoded messages and outputs raw signal.
+3. `encoder_decoder` - takes in decoded messages, turns them into raw signal and then decodes again. 
+
+Infrared test asset files have an `.irtest` extension and are regular `.ir` files with a few additions.
+Decoder input data has signal names `decoder_input_N`, where N is a test sequence number. Expected data goes under the name `decoder_expected_N`. When testing the encoder these two are switched.
+
+Decoded data is represented in arrays (since a single raw signal may decode to several messages). If there is only one signal, then it has to be an array of size 1. Use the existing files as syntax examples.
+
+##### Getting raw signals
+Recording raw IR signals is possible using Flipper Zero. Launch the CLI session, run `ir rx raw`, then point the remote towards Flipper's receiver and send the signals. The raw signal data will be printed to the console in a convenient format.
diff --git a/fbt_options.py b/fbt_options.py
index 6dd350753..ccc8dcc96 100644
--- a/fbt_options.py
+++ b/fbt_options.py
@@ -49,12 +49,12 @@ OPENOCD_OPTS = [
     "-c",
     "transport select hla_swd",
     "-f",
-    "debug/stm32wbx.cfg",
+    "${FBT_DEBUG_DIR}/stm32wbx.cfg",
     "-c",
     "stm32wbx.cpu configure -rtos auto",
 ]
 
-SVD_FILE = "debug/STM32WB55_CM4.svd"
+SVD_FILE = "${FBT_DEBUG_DIR}/STM32WB55_CM4.svd"
 
 # Look for blackmagic probe on serial ports and local network
 BLACKMAGIC = "auto"
diff --git a/firmware.scons b/firmware.scons
index 63a1aa3f7..6a9237477 100644
--- a/firmware.scons
+++ b/firmware.scons
@@ -1,6 +1,7 @@
 Import("ENV", "fw_build_meta")
 
 from SCons.Errors import UserError
+from SCons.Node import FS
 import itertools
 
 from fbt_extra.util import (
@@ -14,14 +15,12 @@ env = ENV.Clone(
         ("compilation_db", {"COMPILATIONDB_COMSTR": "\tCDB\t${TARGET}"}),
         "fwbin",
         "fbt_apps",
-        "fbt_sdk",
     ],
     COMPILATIONDB_USE_ABSPATH=False,
     BUILD_DIR=fw_build_meta["build_dir"],
     IS_BASE_FIRMWARE=fw_build_meta["type"] == "firmware",
     FW_FLAVOR=fw_build_meta["flavor"],
-    PLUGIN_ELF_DIR="${BUILD_DIR}",
-    LIB_DIST_DIR="${BUILD_DIR}/lib",
+    LIB_DIST_DIR=fw_build_meta["build_dir"].Dir("lib"),
     LINT_SOURCES=[
         "applications",
     ],
@@ -112,7 +111,9 @@ lib_targets = env.BuildModules(
 
 
 # Now, env is fully set up with everything to build apps
-fwenv = env.Clone()
+fwenv = env.Clone(FW_ARTIFACTS=[])
+
+fw_artifacts = fwenv["FW_ARTIFACTS"]
 
 # Set up additional app-specific build flags
 SConscript("site_scons/firmwareopts.scons", exports={"ENV": fwenv})
@@ -130,14 +131,24 @@ if extra_int_apps := GetOption("extra_int_apps"):
 if fwenv["FAP_EXAMPLES"]:
     fwenv.Append(APPDIRS=[("applications/examples", False)])
 
-fwenv.LoadApplicationManifests()
+for app_dir, _ in env["APPDIRS"]:
+    app_dir_node = env.Dir("#").Dir(app_dir)
+
+    for entry in app_dir_node.glob("*"):
+        if isinstance(entry, FS.Dir) and not str(entry).startswith("."):
+            fwenv.LoadAppManifest(entry)
+
+
 fwenv.PrepareApplicationsBuild()
 
-# Build external apps
+# Build external apps + configure SDK
 if env["IS_BASE_FIRMWARE"]:
-    extapps = fwenv["FW_EXTAPPS"] = SConscript(
-        "site_scons/extapps.scons", exports={"ENV": fwenv}
+    fwenv.SetDefault(FBT_FAP_DEBUG_ELF_ROOT="${BUILD_DIR}/.extapps")
+    fwenv["FW_EXTAPPS"] = SConscript(
+        "site_scons/extapps.scons",
+        exports={"ENV": fwenv},
     )
+    fw_artifacts.append(fwenv["FW_EXTAPPS"].sdk_tree)
 
 
 # Add preprocessor definitions for current set of apps
@@ -220,7 +231,10 @@ Depends(fwelf, lib_targets)
 AddPostAction(fwelf, fwenv["APPBUILD_DUMP"])
 AddPostAction(
     fwelf,
-    Action('${PYTHON3} "${ROOT_DIR}/scripts/fwsize.py" elf ${TARGET}', "Firmware size"),
+    Action(
+        '${PYTHON3} "${BIN_SIZE_SCRIPT}" elf ${TARGET}',
+        "Firmware size",
+    ),
 )
 
 # Produce extra firmware files
@@ -228,7 +242,7 @@ fwhex = fwenv["FW_HEX"] = fwenv.HEXBuilder("${FIRMWARE_BUILD_CFG}")
 fwbin = fwenv["FW_BIN"] = fwenv.BINBuilder("${FIRMWARE_BUILD_CFG}")
 AddPostAction(
     fwbin,
-    Action('@${PYTHON3} "${ROOT_DIR}/scripts/fwsize.py" bin ${TARGET}'),
+    Action('@${PYTHON3} "${BIN_SIZE_SCRIPT}" bin ${TARGET}'),
 )
 
 fwdfu = fwenv["FW_DFU"] = fwenv.DFUBuilder("${FIRMWARE_BUILD_CFG}")
@@ -238,17 +252,22 @@ fwdump = fwenv.ObjDump("${FIRMWARE_BUILD_CFG}")
 Alias(fwenv["FIRMWARE_BUILD_CFG"] + "_list", fwdump)
 
 
-fw_artifacts = fwenv["FW_ARTIFACTS"] = [
-    fwhex,
-    fwbin,
-    fwdfu,
-    fwenv["FW_VERSION_JSON"],
-]
+fw_artifacts.extend(
+    [
+        fwhex,
+        fwbin,
+        fwdfu,
+        fwenv["FW_VERSION_JSON"],
+    ]
+)
 
 
 fwcdb = fwenv.CompilationDatabase()
 # without filtering, both updater & firmware commands would be generated in same file
-fwenv.Replace(COMPILATIONDB_PATH_FILTER=fwenv.subst("*${FW_FLAVOR}*"))
+fwenv.Replace(
+    COMPILATIONDB_PATH_FILTER=fwenv.subst("*${FW_FLAVOR}*"),
+    COMPILATIONDB_SRCPATH_FILTER="*.c*",
+)
 AlwaysBuild(fwcdb)
 Precious(fwcdb)
 NoClean(fwcdb)
@@ -272,34 +291,5 @@ if should_gen_cdb_and_link_dir(fwenv, BUILD_TARGETS):
 
 Alias(fwenv["FIRMWARE_BUILD_CFG"] + "_all", fw_artifacts)
 
-if fwenv["IS_BASE_FIRMWARE"]:
-    sdk_source = fwenv.SDKPrebuilder(
-        "sdk_origin",
-        # Deps on root SDK headers and generated files
-        (fwenv["SDK_HEADERS"], fwenv["FW_ASSETS_HEADERS"]),
-    )
-    # Extra deps on headers included in deeper levels
-    Depends(sdk_source, fwenv.ProcessSdkDepends("sdk_origin.d"))
-
-    fwenv["SDK_DIR"] = fwenv.Dir("sdk")
-    sdk_tree = fwenv.SDKTree(fwenv["SDK_DIR"], "sdk_origin")
-    fw_artifacts.append(sdk_tree)
-    # AlwaysBuild(sdk_tree)
-    Alias("sdk_tree", sdk_tree)
-
-    sdk_apicheck = fwenv.SDKSymUpdater(fwenv["SDK_DEFINITION"], "sdk_origin")
-    Precious(sdk_apicheck)
-    NoClean(sdk_apicheck)
-    AlwaysBuild(sdk_apicheck)
-    Alias("sdk_check", sdk_apicheck)
-
-    sdk_apisyms = fwenv.SDKSymGenerator(
-        "assets/compiled/symbols.h", fwenv["SDK_DEFINITION"]
-    )
-    Alias("api_syms", sdk_apisyms)
-
-    if fwenv["FORCE"]:
-        fwenv.AlwaysBuild(sdk_source, sdk_tree, sdk_apicheck, sdk_apisyms)
-
 
 Return("fwenv")
diff --git a/firmware/SConscript b/firmware/SConscript
index d6715f124..23fbcc661 100644
--- a/firmware/SConscript
+++ b/firmware/SConscript
@@ -2,11 +2,10 @@ Import("env")
 
 env.Append(
     LINT_SOURCES=["firmware"],
-    # SDK_HEADERS=[env.File("#/firmware/targets/furi_hal_include/furi_hal.h")],
     SDK_HEADERS=[
-        *env.GlobRecursive("*.h", "#/firmware/targets/furi_hal_include", "*_i.h"),
-        *env.GlobRecursive("*.h", "#/firmware/targets/f${TARGET_HW}/furi_hal", "*_i.h"),
-        File("#/firmware/targets/f7/platform_specific/intrinsic_export.h"),
+        *env.GlobRecursive("*.h", "targets/furi_hal_include", "*_i.h"),
+        *env.GlobRecursive("*.h", "targets/f${TARGET_HW}/furi_hal", "*_i.h"),
+        File("targets/f7/platform_specific/intrinsic_export.h"),
         File("#/firmware/targets/furi_hal_include/furi_hal_subghz.h"),
     ],
 )
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index a05319b9d..b7fd132f0 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,8.2,,
+Version,+,8.42,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -8,6 +8,7 @@ Header,+,applications/services/dolphin/dolphin.h,,
 Header,+,applications/services/gui/canvas_i.h,,
 Header,+,applications/services/gui/elements.h,,
 Header,+,applications/services/gui/gui.h,,
+Header,+,applications/services/gui/icon_i.h,,
 Header,+,applications/services/gui/modules/button_menu.h,,
 Header,+,applications/services/gui/modules/button_panel.h,,
 Header,+,applications/services/gui/modules/byte_input.h,,
@@ -123,7 +124,35 @@ Header,+,lib/lfrfid/lfrfid_raw_worker.h,,
 Header,+,lib/lfrfid/lfrfid_worker.h,,
 Header,+,lib/lfrfid/protocols/lfrfid_protocols.h,,
 Header,+,lib/lfrfid/tools/bit_lib.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_button.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_consumer.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_desktop.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_device.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_game.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_keyboard.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_led.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_ordinal.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_power.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_simulation.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_sport.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_telephony.h,,
+Header,+,lib/libusb_stm32/inc/hid_usage_vr.h,,
+Header,+,lib/libusb_stm32/inc/usb.h,,
+Header,+,lib/libusb_stm32/inc/usb_cdc.h,,
+Header,+,lib/libusb_stm32/inc/usb_cdca.h,,
+Header,+,lib/libusb_stm32/inc/usb_cdce.h,,
+Header,+,lib/libusb_stm32/inc/usb_cdci.h,,
+Header,+,lib/libusb_stm32/inc/usb_cdcp.h,,
+Header,+,lib/libusb_stm32/inc/usb_cdcw.h,,
+Header,+,lib/libusb_stm32/inc/usb_dfu.h,,
+Header,+,lib/libusb_stm32/inc/usb_hid.h,,
+Header,+,lib/libusb_stm32/inc/usb_std.h,,
+Header,+,lib/libusb_stm32/inc/usb_tmc.h,,
+Header,+,lib/libusb_stm32/inc/usbd_core.h,,
+Header,+,lib/mbedtls/include/mbedtls/des.h,,
+Header,+,lib/mbedtls/include/mbedtls/sha1.h,,
 Header,+,lib/micro-ecc/uECC.h,,
+Header,+,lib/nfc/nfc_device.h,,
 Header,+,lib/one_wire/ibutton/ibutton_worker.h,,
 Header,+,lib/one_wire/maxim_crc.h,,
 Header,+,lib/one_wire/one_wire_device.h,,
@@ -161,6 +190,7 @@ Header,+,lib/toolbox/stream/file_stream.h,,
 Header,+,lib/toolbox/stream/stream.h,,
 Header,+,lib/toolbox/stream/string_stream.h,,
 Header,+,lib/toolbox/tar/tar_archive.h,,
+Header,+,lib/toolbox/value_index.h,,
 Header,+,lib/toolbox/version.h,,
 Header,+,lib/u8g2/u8g2.h,,
 Function,-,LL_ADC_CommonDeInit,ErrorStatus,ADC_Common_TypeDef*
@@ -417,6 +447,7 @@ Function,-,_system_r,int,"_reent*, const char*"
 Function,-,_tempnam_r,char*,"_reent*, const char*, const char*"
 Function,-,_tmpfile_r,FILE*,_reent*
 Function,-,_tmpnam_r,char*,"_reent*, char*"
+Function,-,_tzset_r,void,_reent*
 Function,-,_ungetc_r,int,"_reent*, int, FILE*"
 Function,-,_unsetenv_r,int,"_reent*, const char*"
 Function,-,_vasiprintf_r,int,"_reent*, char**, const char*, __gnuc_va_list"
@@ -464,6 +495,8 @@ Function,+,args_read_hex_bytes,_Bool,"FuriString*, uint8_t*, size_t"
 Function,+,args_read_int_and_trim,_Bool,"FuriString*, int*"
 Function,+,args_read_probably_quoted_string_and_trim,_Bool,"FuriString*, FuriString*"
 Function,+,args_read_string_and_trim,_Bool,"FuriString*, FuriString*"
+Function,-,asctime,char*,const tm*
+Function,-,asctime_r,char*,"const tm*, char*"
 Function,-,asin,double,double
 Function,-,asinf,float,float
 Function,-,asinh,double,double
@@ -645,6 +678,7 @@ Function,+,cli_read_timeout,size_t,"Cli*, uint8_t*, size_t, uint32_t"
 Function,+,cli_session_close,void,Cli*
 Function,+,cli_session_open,void,"Cli*, void*"
 Function,+,cli_write,void,"Cli*, const uint8_t*, size_t"
+Function,-,clock,clock_t,
 Function,-,copysign,double,"double, double"
 Function,-,copysignf,float,"float, float"
 Function,-,copysignl,long double,"long double, long double"
@@ -656,7 +690,17 @@ Function,-,coshl,long double,long double
 Function,-,cosl,long double,long double
 Function,+,crc32_calc_buffer,uint32_t,"uint32_t, const void*, size_t"
 Function,+,crc32_calc_file,uint32_t,"File*, const FileCrcProgressCb, void*"
+Function,-,crypto1_bit,uint8_t,"Crypto1*, uint8_t, int"
+Function,-,crypto1_byte,uint8_t,"Crypto1*, uint8_t, int"
+Function,-,crypto1_decrypt,void,"Crypto1*, uint8_t*, uint16_t, uint8_t*"
+Function,-,crypto1_encrypt,void,"Crypto1*, uint8_t*, uint8_t*, uint16_t, uint8_t*, uint8_t*"
+Function,-,crypto1_filter,uint32_t,uint32_t
+Function,-,crypto1_init,void,"Crypto1*, uint64_t"
+Function,-,crypto1_reset,void,Crypto1*
+Function,-,crypto1_word,uint32_t,"Crypto1*, uint32_t, int"
 Function,-,ctermid,char*,char*
+Function,-,ctime,char*,const time_t*
+Function,-,ctime_r,char*,"const time_t*, char*"
 Function,-,cuserid,char*,char*
 Function,+,delete_mutex,_Bool,ValueMutex*
 Function,+,dialog_ex_alloc,DialogEx*,
@@ -683,6 +727,7 @@ Function,+,dialog_message_set_icon,void,"DialogMessage*, const Icon*, uint8_t, u
 Function,+,dialog_message_set_text,void,"DialogMessage*, const char*, uint8_t, uint8_t, Align, Align"
 Function,+,dialog_message_show,DialogMessageButton,"DialogsApp*, const DialogMessage*"
 Function,+,dialog_message_show_storage_error,void,"DialogsApp*, const char*"
+Function,-,difftime,double,"time_t, time_t"
 Function,-,digital_signal_alloc,DigitalSignal*,uint32_t
 Function,-,digital_signal_append,_Bool,"DigitalSignal*, DigitalSignal*"
 Function,-,digital_signal_free,void,DigitalSignal*
@@ -735,6 +780,8 @@ Function,+,elements_text_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t,
 Function,+,empty_screen_alloc,EmptyScreen*,
 Function,+,empty_screen_free,void,EmptyScreen*
 Function,+,empty_screen_get_view,View*,EmptyScreen*
+Function,-,emv_card_emulation,_Bool,FuriHalNfcTxRxContext*
+Function,-,emv_read_bank_card,_Bool,"FuriHalNfcTxRxContext*, EmvApplication*"
 Function,-,erand48,double,unsigned short[3]
 Function,-,erf,double,double
 Function,-,erfc,double,double
@@ -1146,6 +1193,7 @@ Function,+,furi_hal_nfc_ll_set_fdt_poll,void,uint32_t
 Function,+,furi_hal_nfc_ll_set_guard_time,void,uint32_t
 Function,+,furi_hal_nfc_ll_set_mode,FuriHalNfcReturn,"FuriHalNfcMode, FuriHalNfcBitrate, FuriHalNfcBitrate"
 Function,+,furi_hal_nfc_ll_txrx,FuriHalNfcReturn,"uint8_t*, uint16_t, uint8_t*, uint16_t, uint16_t*, uint32_t, uint32_t"
+Function,+,furi_hal_nfc_ll_txrx_bits,FuriHalNfcReturn,"uint8_t*, uint16_t, uint8_t*, uint16_t, uint16_t*, uint32_t, uint32_t"
 Function,+,furi_hal_nfc_ll_txrx_off,void,
 Function,+,furi_hal_nfc_ll_txrx_on,void,
 Function,+,furi_hal_nfc_sleep,void,
@@ -1231,6 +1279,7 @@ Function,+,furi_hal_rtc_get_fault_data,uint32_t,
 Function,+,furi_hal_rtc_get_log_level,uint8_t,
 Function,+,furi_hal_rtc_get_pin_fails,uint32_t,
 Function,+,furi_hal_rtc_get_register,uint32_t,FuriHalRtcRegister
+Function,+,furi_hal_rtc_get_timestamp,uint32_t,
 Function,-,furi_hal_rtc_init,void,
 Function,-,furi_hal_rtc_init_early,void,
 Function,+,furi_hal_rtc_is_flag_set,_Bool,FuriHalRtcFlag
@@ -1495,6 +1544,8 @@ Function,-,getenv,char*,const char*
 Function,-,gets,char*,char*
 Function,-,getsubopt,int,"char**, char**, char**"
 Function,-,getw,int,FILE*
+Function,-,gmtime,tm*,const time_t*
+Function,-,gmtime_r,tm*,"const time_t*, tm*"
 Function,+,gui_add_framebuffer_callback,void,"Gui*, GuiCanvasCommitCallback, void*"
 Function,+,gui_add_view_port,void,"Gui*, ViewPort*, GuiLayer"
 Function,+,gui_get_framebuffer_size,size_t,Gui*
@@ -1694,6 +1745,8 @@ Function,+,loader_update_menu,void,
 Function,+,loading_alloc,Loading*,
 Function,+,loading_free,void,Loading*
 Function,+,loading_get_view,View*,Loading*
+Function,-,localtime,tm*,const time_t*
+Function,-,localtime_r,tm*,"const time_t*, tm*"
 Function,-,log,double,double
 Function,-,log10,double,double
 Function,-,log10f,float,float
@@ -1722,6 +1775,36 @@ Function,+,manchester_encoder_advance,_Bool,"ManchesterEncoderState*, const _Boo
 Function,+,manchester_encoder_finish,ManchesterEncoderResult,ManchesterEncoderState*
 Function,+,manchester_encoder_reset,void,ManchesterEncoderState*
 Function,+,maxim_crc8,uint8_t,"const uint8_t*, const uint8_t, const uint8_t"
+Function,-,mbedtls_des3_crypt_cbc,int,"mbedtls_des3_context*, int, size_t, unsigned char[8], const unsigned char*, unsigned char*"
+Function,-,mbedtls_des3_crypt_ecb,int,"mbedtls_des3_context*, const unsigned char[8], unsigned char[8]"
+Function,-,mbedtls_des3_free,void,mbedtls_des3_context*
+Function,-,mbedtls_des3_init,void,mbedtls_des3_context*
+Function,-,mbedtls_des3_set2key_dec,int,"mbedtls_des3_context*, const unsigned char[8 * 2]"
+Function,-,mbedtls_des3_set2key_enc,int,"mbedtls_des3_context*, const unsigned char[8 * 2]"
+Function,-,mbedtls_des3_set3key_dec,int,"mbedtls_des3_context*, const unsigned char[8 * 3]"
+Function,-,mbedtls_des3_set3key_enc,int,"mbedtls_des3_context*, const unsigned char[8 * 3]"
+Function,-,mbedtls_des_crypt_cbc,int,"mbedtls_des_context*, int, size_t, unsigned char[8], const unsigned char*, unsigned char*"
+Function,-,mbedtls_des_crypt_ecb,int,"mbedtls_des_context*, const unsigned char[8], unsigned char[8]"
+Function,-,mbedtls_des_free,void,mbedtls_des_context*
+Function,-,mbedtls_des_init,void,mbedtls_des_context*
+Function,-,mbedtls_des_key_check_key_parity,int,const unsigned char[8]
+Function,-,mbedtls_des_key_check_weak,int,const unsigned char[8]
+Function,-,mbedtls_des_key_set_parity,void,unsigned char[8]
+Function,-,mbedtls_des_self_test,int,int
+Function,-,mbedtls_des_setkey,void,"uint32_t[32], const unsigned char[8]"
+Function,-,mbedtls_des_setkey_dec,int,"mbedtls_des_context*, const unsigned char[8]"
+Function,-,mbedtls_des_setkey_enc,int,"mbedtls_des_context*, const unsigned char[8]"
+Function,-,mbedtls_internal_sha1_process,int,"mbedtls_sha1_context*, const unsigned char[64]"
+Function,-,mbedtls_platform_gmtime_r,tm*,"const mbedtls_time_t*, tm*"
+Function,-,mbedtls_platform_zeroize,void,"void*, size_t"
+Function,-,mbedtls_sha1,int,"const unsigned char*, size_t, unsigned char[20]"
+Function,-,mbedtls_sha1_clone,void,"mbedtls_sha1_context*, const mbedtls_sha1_context*"
+Function,-,mbedtls_sha1_finish,int,"mbedtls_sha1_context*, unsigned char[20]"
+Function,-,mbedtls_sha1_free,void,mbedtls_sha1_context*
+Function,-,mbedtls_sha1_init,void,mbedtls_sha1_context*
+Function,-,mbedtls_sha1_self_test,int,int
+Function,-,mbedtls_sha1_starts,int,mbedtls_sha1_context*
+Function,-,mbedtls_sha1_update,int,"mbedtls_sha1_context*, const unsigned char*, size_t"
 Function,-,mblen,int,"const char*, size_t"
 Function,-,mbstowcs,size_t,"wchar_t*, const char*, size_t"
 Function,-,mbtowc,int,"wchar_t*, const char*, size_t"
@@ -1756,12 +1839,107 @@ Function,+,menu_free,void,Menu*
 Function,+,menu_get_view,View*,Menu*
 Function,+,menu_reset,void,Menu*
 Function,+,menu_set_selected_item,void,"Menu*, uint32_t"
+Function,-,mf_classic_auth_attempt,_Bool,"FuriHalNfcTxRxContext*, MfClassicAuthContext*, uint64_t"
+Function,-,mf_classic_auth_init_context,void,"MfClassicAuthContext*, uint8_t"
+Function,-,mf_classic_authenticate,_Bool,"FuriHalNfcTxRxContext*, uint8_t, uint64_t, MfClassicKey"
+Function,-,mf_classic_check_card_type,_Bool,"uint8_t, uint8_t, uint8_t"
+Function,-,mf_classic_dict_add_key,_Bool,"MfClassicDict*, uint8_t*"
+Function,-,mf_classic_dict_add_key_str,_Bool,"MfClassicDict*, FuriString*"
+Function,-,mf_classic_dict_alloc,MfClassicDict*,MfClassicDictType
+Function,-,mf_classic_dict_check_presence,_Bool,MfClassicDictType
+Function,-,mf_classic_dict_delete_index,_Bool,"MfClassicDict*, uint32_t"
+Function,-,mf_classic_dict_find_index,_Bool,"MfClassicDict*, uint8_t*, uint32_t*"
+Function,-,mf_classic_dict_find_index_str,_Bool,"MfClassicDict*, FuriString*, uint32_t*"
+Function,-,mf_classic_dict_free,void,MfClassicDict*
+Function,-,mf_classic_dict_get_key_at_index,_Bool,"MfClassicDict*, uint64_t*, uint32_t"
+Function,-,mf_classic_dict_get_key_at_index_str,_Bool,"MfClassicDict*, FuriString*, uint32_t"
+Function,-,mf_classic_dict_get_next_key,_Bool,"MfClassicDict*, uint64_t*"
+Function,-,mf_classic_dict_get_next_key_str,_Bool,"MfClassicDict*, FuriString*"
+Function,-,mf_classic_dict_get_total_keys,uint32_t,MfClassicDict*
+Function,-,mf_classic_dict_is_key_present,_Bool,"MfClassicDict*, uint8_t*"
+Function,-,mf_classic_dict_is_key_present_str,_Bool,"MfClassicDict*, FuriString*"
+Function,-,mf_classic_dict_rewind,_Bool,MfClassicDict*
+Function,-,mf_classic_emulator,_Bool,"MfClassicEmulator*, FuriHalNfcTxRxContext*"
+Function,-,mf_classic_get_classic_type,MfClassicType,"int8_t, uint8_t, uint8_t"
+Function,-,mf_classic_get_read_sectors_and_keys,void,"MfClassicData*, uint8_t*, uint8_t*"
+Function,-,mf_classic_get_sector_by_block,uint8_t,uint8_t
+Function,-,mf_classic_get_sector_trailer_block_num_by_sector,uint8_t,uint8_t
+Function,-,mf_classic_get_sector_trailer_by_sector,MfClassicSectorTrailer*,"MfClassicData*, uint8_t"
+Function,-,mf_classic_get_total_sectors_num,uint8_t,MfClassicType
+Function,-,mf_classic_get_type_str,const char*,MfClassicType
+Function,-,mf_classic_is_allowed_access_data_block,_Bool,"MfClassicData*, uint8_t, MfClassicKey, MfClassicAction"
+Function,-,mf_classic_is_allowed_access_sector_trailer,_Bool,"MfClassicData*, uint8_t, MfClassicKey, MfClassicAction"
+Function,-,mf_classic_is_block_read,_Bool,"MfClassicData*, uint8_t"
+Function,-,mf_classic_is_card_read,_Bool,MfClassicData*
+Function,-,mf_classic_is_key_found,_Bool,"MfClassicData*, uint8_t, MfClassicKey"
+Function,-,mf_classic_is_sector_data_read,_Bool,"MfClassicData*, uint8_t"
+Function,-,mf_classic_is_sector_read,_Bool,"MfClassicData*, uint8_t"
+Function,-,mf_classic_is_sector_trailer,_Bool,uint8_t
+Function,-,mf_classic_read_card,uint8_t,"FuriHalNfcTxRxContext*, MfClassicReader*, MfClassicData*"
+Function,-,mf_classic_read_sector,void,"FuriHalNfcTxRxContext*, MfClassicData*, uint8_t"
+Function,-,mf_classic_reader_add_sector,void,"MfClassicReader*, uint8_t, uint64_t, uint64_t"
+Function,-,mf_classic_set_block_read,void,"MfClassicData*, uint8_t, MfClassicBlock*"
+Function,-,mf_classic_set_key_found,void,"MfClassicData*, uint8_t, MfClassicKey, uint64_t"
+Function,-,mf_classic_set_key_not_found,void,"MfClassicData*, uint8_t, MfClassicKey"
+Function,-,mf_classic_set_sector_data_not_read,void,MfClassicData*
+Function,-,mf_classic_update_card,uint8_t,"FuriHalNfcTxRxContext*, MfClassicData*"
+Function,-,mf_classic_write_block,_Bool,"FuriHalNfcTxRxContext*, MfClassicBlock*, uint8_t, MfClassicKey, uint64_t"
+Function,-,mf_classic_write_sector,_Bool,"FuriHalNfcTxRxContext*, MfClassicData*, MfClassicData*, uint8_t"
+Function,-,mf_df_cat_application,void,"MifareDesfireApplication*, FuriString*"
+Function,-,mf_df_cat_application_info,void,"MifareDesfireApplication*, FuriString*"
+Function,-,mf_df_cat_card_info,void,"MifareDesfireData*, FuriString*"
+Function,-,mf_df_cat_data,void,"MifareDesfireData*, FuriString*"
+Function,-,mf_df_cat_file,void,"MifareDesfireFile*, FuriString*"
+Function,-,mf_df_cat_free_mem,void,"MifareDesfireFreeMemory*, FuriString*"
+Function,-,mf_df_cat_key_settings,void,"MifareDesfireKeySettings*, FuriString*"
+Function,-,mf_df_cat_version,void,"MifareDesfireVersion*, FuriString*"
+Function,-,mf_df_check_card_type,_Bool,"uint8_t, uint8_t, uint8_t"
+Function,-,mf_df_clear,void,MifareDesfireData*
+Function,-,mf_df_parse_get_application_ids_response,_Bool,"uint8_t*, uint16_t, MifareDesfireApplication**"
+Function,-,mf_df_parse_get_file_ids_response,_Bool,"uint8_t*, uint16_t, MifareDesfireFile**"
+Function,-,mf_df_parse_get_file_settings_response,_Bool,"uint8_t*, uint16_t, MifareDesfireFile*"
+Function,-,mf_df_parse_get_free_memory_response,_Bool,"uint8_t*, uint16_t, MifareDesfireFreeMemory*"
+Function,-,mf_df_parse_get_key_settings_response,_Bool,"uint8_t*, uint16_t, MifareDesfireKeySettings*"
+Function,-,mf_df_parse_get_key_version_response,_Bool,"uint8_t*, uint16_t, MifareDesfireKeyVersion*"
+Function,-,mf_df_parse_get_version_response,_Bool,"uint8_t*, uint16_t, MifareDesfireVersion*"
+Function,-,mf_df_parse_read_data_response,_Bool,"uint8_t*, uint16_t, MifareDesfireFile*"
+Function,-,mf_df_parse_select_application_response,_Bool,"uint8_t*, uint16_t"
+Function,-,mf_df_prepare_get_application_ids,uint16_t,uint8_t*
+Function,-,mf_df_prepare_get_file_ids,uint16_t,uint8_t*
+Function,-,mf_df_prepare_get_file_settings,uint16_t,"uint8_t*, uint8_t"
+Function,-,mf_df_prepare_get_free_memory,uint16_t,uint8_t*
+Function,-,mf_df_prepare_get_key_settings,uint16_t,uint8_t*
+Function,-,mf_df_prepare_get_key_version,uint16_t,"uint8_t*, uint8_t"
+Function,-,mf_df_prepare_get_value,uint16_t,"uint8_t*, uint8_t"
+Function,-,mf_df_prepare_get_version,uint16_t,uint8_t*
+Function,-,mf_df_prepare_read_data,uint16_t,"uint8_t*, uint8_t, uint32_t, uint32_t"
+Function,-,mf_df_prepare_read_records,uint16_t,"uint8_t*, uint8_t, uint32_t, uint32_t"
+Function,-,mf_df_prepare_select_application,uint16_t,"uint8_t*, uint8_t[3]"
+Function,-,mf_df_read_card,_Bool,"FuriHalNfcTxRxContext*, MifareDesfireData*"
+Function,-,mf_ul_check_card_type,_Bool,"uint8_t, uint8_t, uint8_t"
+Function,-,mf_ul_prepare_emulation,void,"MfUltralightEmulator*, MfUltralightData*"
+Function,-,mf_ul_prepare_emulation_response,_Bool,"uint8_t*, uint16_t, uint8_t*, uint16_t*, uint32_t*, void*"
+Function,-,mf_ul_pwdgen_amiibo,uint32_t,FuriHalNfcDevData*
+Function,-,mf_ul_pwdgen_xiaomi,uint32_t,FuriHalNfcDevData*
+Function,-,mf_ul_read_card,_Bool,"FuriHalNfcTxRxContext*, MfUltralightReader*, MfUltralightData*"
+Function,-,mf_ul_reset,void,MfUltralightData*
+Function,-,mf_ul_reset_emulation,void,"MfUltralightEmulator*, _Bool"
+Function,-,mf_ultralight_authenticate,_Bool,"FuriHalNfcTxRxContext*, uint32_t, uint16_t*"
+Function,-,mf_ultralight_fast_read_pages,_Bool,"FuriHalNfcTxRxContext*, MfUltralightReader*, MfUltralightData*"
+Function,-,mf_ultralight_get_config_pages,MfUltralightConfigPages*,MfUltralightData*
+Function,-,mf_ultralight_read_counters,_Bool,"FuriHalNfcTxRxContext*, MfUltralightData*"
+Function,-,mf_ultralight_read_pages,_Bool,"FuriHalNfcTxRxContext*, MfUltralightReader*, MfUltralightData*"
+Function,-,mf_ultralight_read_pages_direct,_Bool,"FuriHalNfcTxRxContext*, uint8_t, uint8_t*"
+Function,-,mf_ultralight_read_signature,_Bool,"FuriHalNfcTxRxContext*, MfUltralightData*"
+Function,-,mf_ultralight_read_tearing_flags,_Bool,"FuriHalNfcTxRxContext*, MfUltralightData*"
+Function,-,mf_ultralight_read_version,_Bool,"FuriHalNfcTxRxContext*, MfUltralightReader*, MfUltralightData*"
 Function,-,mkdtemp,char*,char*
 Function,-,mkostemp,int,"char*, int"
 Function,-,mkostemps,int,"char*, int, int"
 Function,-,mkstemp,int,char*
 Function,-,mkstemps,int,"char*, int"
 Function,-,mktemp,char*,char*
+Function,-,mktime,time_t,tm*
 Function,-,modf,double,"double, double*"
 Function,-,modff,float,"float, float*"
 Function,-,modfl,long double,"long double, long double*"
@@ -1778,6 +1956,19 @@ Function,-,nextafterl,long double,"long double, long double"
 Function,-,nexttoward,double,"double, long double"
 Function,-,nexttowardf,float,"float, long double"
 Function,-,nexttowardl,long double,"long double, long double"
+Function,+,nfc_device_alloc,NfcDevice*,
+Function,+,nfc_device_clear,void,NfcDevice*
+Function,+,nfc_device_data_clear,void,NfcDeviceData*
+Function,+,nfc_device_delete,_Bool,"NfcDevice*, _Bool"
+Function,+,nfc_device_free,void,NfcDevice*
+Function,+,nfc_device_load,_Bool,"NfcDevice*, const char*, _Bool"
+Function,+,nfc_device_load_key_cache,_Bool,NfcDevice*
+Function,+,nfc_device_restore,_Bool,"NfcDevice*, _Bool"
+Function,+,nfc_device_save,_Bool,"NfcDevice*, const char*"
+Function,+,nfc_device_save_shadow,_Bool,"NfcDevice*, const char*"
+Function,+,nfc_device_set_loading_callback,void,"NfcDevice*, NfcLoadingCallback, void*"
+Function,+,nfc_device_set_name,void,"NfcDevice*, const char*"
+Function,+,nfc_file_select,_Bool,NfcDevice*
 Function,-,nfca_append_crc16,void,"uint8_t*, uint16_t"
 Function,-,nfca_emulation_handler,_Bool,"uint8_t*, uint16_t, uint8_t*, uint16_t*"
 Function,-,nfca_get_crc16,uint16_t,"uint8_t*, uint16_t"
@@ -1790,6 +1981,7 @@ Function,+,notification_message,void,"NotificationApp*, const NotificationSequen
 Function,+,notification_message_block,void,"NotificationApp*, const NotificationSequence*"
 Function,-,nrand48,long,unsigned short[3]
 Function,-,nrf24_configure,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t*, uint8_t*, uint8_t, uint8_t, _Bool, _Bool"
+Function,+,nrf24_deinit,void,
 Function,+,nrf24_find_channel,uint8_t,"FuriHalSpiBusHandle*, uint8_t*, uint8_t*, uint8_t, uint8_t, uint8_t, uint8_t, _Bool"
 Function,-,nrf24_flush_rx,uint8_t,FuriHalSpiBusHandle*
 Function,-,nrf24_flush_tx,uint8_t,FuriHalSpiBusHandle*
@@ -1891,6 +2083,7 @@ Function,+,power_reboot,void,PowerBootMode
 Function,+,powf,float,"float, float"
 Function,-,powl,long double,"long double, long double"
 Function,-,printf,int,"const char*, ..."
+Function,-,prng_successor,uint32_t,"uint32_t, uint32_t"
 Function,+,protocol_dict_alloc,ProtocolDict*,"const ProtocolBase**, size_t"
 Function,-,protocol_dict_decoders_feed,ProtocolId,"ProtocolDict*, _Bool, uint32_t"
 Function,-,protocol_dict_decoders_feed_by_feature,ProtocolId,"ProtocolDict*, uint32_t, _Bool, uint32_t"
@@ -2107,6 +2300,7 @@ Function,-,rfalT1TPollerRall,ReturnCode,"const uint8_t*, uint8_t*, uint16_t, uin
 Function,-,rfalT1TPollerRid,ReturnCode,rfalT1TRidRes*
 Function,-,rfalT1TPollerWrite,ReturnCode,"const uint8_t*, uint8_t, uint8_t"
 Function,-,rfalTransceiveBitsBlockingTx,ReturnCode,"uint8_t*, uint16_t, uint8_t*, uint16_t, uint16_t*, uint32_t, uint32_t"
+Function,-,rfalTransceiveBitsBlockingTxRx,ReturnCode,"uint8_t*, uint16_t, uint8_t*, uint16_t, uint16_t*, uint32_t, uint32_t"
 Function,-,rfalTransceiveBlockingRx,ReturnCode,
 Function,-,rfalTransceiveBlockingTx,ReturnCode,"uint8_t*, uint16_t, uint8_t*, uint16_t, uint16_t*, uint32_t, uint32_t"
 Function,-,rfalTransceiveBlockingTxRx,ReturnCode,"uint8_t*, uint16_t, uint8_t*, uint16_t, uint16_t*, uint32_t, uint32_t"
@@ -2216,6 +2410,7 @@ Function,+,storage_common_mkdir,FS_Error,"Storage*, const char*"
 Function,+,storage_common_remove,FS_Error,"Storage*, const char*"
 Function,+,storage_common_rename,FS_Error,"Storage*, const char*, const char*"
 Function,+,storage_common_stat,FS_Error,"Storage*, const char*, FileInfo*"
+Function,+,storage_common_timestamp,FS_Error,"Storage*, const char*, uint32_t*"
 Function,+,storage_dir_close,_Bool,File*
 Function,+,storage_dir_open,_Bool,"File*, const char*"
 Function,+,storage_dir_read,_Bool,"File*, FileInfo*, char*, uint16_t"
@@ -2301,6 +2496,8 @@ Function,+,stream_write_vaformat,size_t,"Stream*, const char*, va_list"
 Function,-,strerror,char*,int
 Function,-,strerror_l,char*,"int, locale_t"
 Function,-,strerror_r,char*,"int, char*, size_t"
+Function,-,strftime,size_t,"char*, size_t, const char*, const tm*"
+Function,-,strftime_l,size_t,"char*, size_t, const char*, const tm*, locale_t"
 Function,+,string_stream_alloc,Stream*,
 Function,-,strlcat,size_t,"char*, const char*, size_t"
 Function,+,strlcpy,size_t,"char*, const char*, size_t"
@@ -2315,6 +2512,8 @@ Function,-,strndup,char*,"const char*, size_t"
 Function,-,strnlen,size_t,"const char*, size_t"
 Function,-,strnstr,char*,"const char*, const char*, size_t"
 Function,-,strpbrk,char*,"const char*, const char*"
+Function,-,strptime,char*,"const char*, const char*, tm*"
+Function,-,strptime_l,char*,"const char*, const char*, tm*, locale_t"
 Function,+,strrchr,char*,"const char*, int"
 Function,-,strsep,char*,"char**, const char*"
 Function,-,strsignal,char*,int
@@ -2925,6 +3124,7 @@ Function,-,tga_save,void,const char*
 Function,-,tgamma,double,double
 Function,-,tgammaf,float,float
 Function,-,tgammal,long double,long double
+Function,-,time,time_t,time_t*
 Function,+,timerCalculateTimer,uint32_t,uint16_t
 Function,-,timerDelay,void,uint16_t
 Function,+,timerIsExpired,_Bool,uint32_t
@@ -2943,6 +3143,7 @@ Function,-,toupper_l,int,"int, locale_t"
 Function,-,trunc,double,double
 Function,-,truncf,float,float
 Function,-,truncl,long double,long double
+Function,-,tzset,void,
 Function,-,u8g2_AddPolygonXY,void,"u8g2_t*, int16_t, int16_t"
 Function,-,u8g2_ClearBuffer,void,u8g2_t*
 Function,-,u8g2_ClearDisplay,void,u8g2_t*
@@ -4084,6 +4285,9 @@ Function,-,vTimerSetTimerNumber,void,"TimerHandle_t, UBaseType_t"
 Function,+,validator_is_file_alloc_init,ValidatorIsFile*,"const char*, const char*, const char*"
 Function,+,validator_is_file_callback,_Bool,"const char*, FuriString*, void*"
 Function,+,validator_is_file_free,void,ValidatorIsFile*
+Function,+,value_index_bool,uint8_t,"const _Bool, const _Bool[], uint8_t"
+Function,+,value_index_float,uint8_t,"const float, const float[], uint8_t"
+Function,+,value_index_uint32,uint8_t,"const uint32_t, const uint32_t[], uint8_t"
 Function,+,variable_item_get_context,void*,VariableItem*
 Function,+,variable_item_get_current_value_index,uint8_t,VariableItem*
 Function,+,variable_item_list_add,VariableItem*,"VariableItemList*, const char*, uint8_t, VariableItemChangeCallback, void*"
@@ -4255,10 +4459,13 @@ Variable,-,MSIRangeTable,const uint32_t[16],
 Variable,-,SmpsPrescalerTable,const uint32_t[4][6],
 Variable,+,SystemCoreClock,uint32_t,
 Variable,+,_ctype_,const char[],
+Variable,-,_daylight,int,
 Variable,+,_global_impure_ptr,_reent*,
 Variable,+,_impure_ptr,_reent*,
 Variable,-,_sys_errlist,const char*[],
 Variable,-,_sys_nerr,int,
+Variable,-,_timezone,long,
+Variable,-,_tzname,char*[2],
 Variable,+,cli_vcp,CliSession,
 Variable,+,furi_hal_i2c_bus_external,FuriHalI2cBus,
 Variable,+,furi_hal_i2c_bus_power,FuriHalI2cBus,
diff --git a/firmware/targets/f7/ble_glue/gap.c b/firmware/targets/f7/ble_glue/gap.c
index aa8cd2c90..cf27df3a3 100644
--- a/firmware/targets/f7/ble_glue/gap.c
+++ b/firmware/targets/f7/ble_glue/gap.c
@@ -179,7 +179,7 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification(void* pckt) {
 
         case EVT_BLUE_GAP_PASS_KEY_REQUEST: {
             // Generate random PIN code
-            uint32_t pin = rand() % 999999;
+            uint32_t pin = rand() % 999999; //-V1064
             aci_gap_pass_key_resp(gap->service.connection_handle, pin);
             if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock)) {
                 FURI_LOG_I(TAG, "Pass key request event. Pin: ******");
@@ -478,7 +478,6 @@ bool gap_init(GapConfig* config, GapEventCallback on_event_cb, void* context) {
 
     gap = malloc(sizeof(Gap));
     gap->config = config;
-    srand(DWT->CYCCNT);
     // Create advertising timer
     gap->advertise_timer = furi_timer_alloc(gap_advetise_timer_callback, FuriTimerTypeOnce, NULL);
     // Initialization of GATT & GAP layer
diff --git a/firmware/targets/f7/furi_hal/furi_hal_crypto.c b/firmware/targets/f7/furi_hal/furi_hal_crypto.c
index dbd8c58c2..e0ed3ab9b 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_crypto.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_crypto.c
@@ -91,7 +91,7 @@ bool furi_hal_crypto_verify_key(uint8_t key_slot) {
     uint8_t keys_nb = 0;
     uint8_t valid_keys_nb = 0;
     uint8_t last_valid_slot = ENCLAVE_FACTORY_KEY_SLOTS;
-    uint8_t empty_iv[16];
+    uint8_t empty_iv[16] = {0};
     furi_hal_crypto_verify_enclave(&keys_nb, &valid_keys_nb);
     if(key_slot <= ENCLAVE_FACTORY_KEY_SLOTS) { // It's a factory key
         if(key_slot > keys_nb) return false;
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc.c b/firmware/targets/f7/furi_hal/furi_hal_nfc.c
index 3ebf4f82b..2d27313ae 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_nfc.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_nfc.c
@@ -786,6 +786,17 @@ FuriHalNfcReturn furi_hal_nfc_ll_txrx(
     return rfalTransceiveBlockingTxRx(txBuf, txBufLen, rxBuf, rxBufLen, actLen, flags, fwt);
 }
 
+FuriHalNfcReturn furi_hal_nfc_ll_txrx_bits(
+    uint8_t* txBuf,
+    uint16_t txBufLen,
+    uint8_t* rxBuf,
+    uint16_t rxBufLen,
+    uint16_t* actLen,
+    uint32_t flags,
+    uint32_t fwt) {
+    return rfalTransceiveBitsBlockingTxRx(txBuf, txBufLen, rxBuf, rxBufLen, actLen, flags, fwt);
+}
+
 void furi_hal_nfc_ll_poll() {
     rfalWorker();
 }
\ No newline at end of file
diff --git a/firmware/targets/f7/furi_hal/furi_hal_resources.h b/firmware/targets/f7/furi_hal/furi_hal_resources.h
index d16c567e6..8d53ec48a 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_resources.h
+++ b/firmware/targets/f7/furi_hal/furi_hal_resources.h
@@ -20,6 +20,7 @@ typedef enum {
     InputKeyLeft,
     InputKeyOk,
     InputKeyBack,
+    InputKeyMAX, /**< Special value */
 } InputKey;
 
 /* Light */
diff --git a/firmware/targets/f7/furi_hal/furi_hal_rtc.c b/firmware/targets/f7/furi_hal/furi_hal_rtc.c
index 24dad38fa..14ece9466 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_rtc.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_rtc.c
@@ -318,6 +318,12 @@ uint32_t furi_hal_rtc_get_pin_fails() {
     return furi_hal_rtc_get_register(FuriHalRtcRegisterPinFails);
 }
 
+uint32_t furi_hal_rtc_get_timestamp() {
+    FuriHalRtcDateTime datetime = {0};
+    furi_hal_rtc_get_datetime(&datetime);
+    return furi_hal_rtc_datetime_to_timestamp(&datetime);
+}
+
 uint32_t furi_hal_rtc_datetime_to_timestamp(FuriHalRtcDateTime* datetime) {
     uint32_t timestamp = 0;
     uint8_t years = 0;
diff --git a/firmware/targets/furi_hal_include/furi_hal_nfc.h b/firmware/targets/furi_hal_include/furi_hal_nfc.h
index 90d968fea..d3f6de602 100644
--- a/firmware/targets/furi_hal_include/furi_hal_nfc.h
+++ b/firmware/targets/furi_hal_include/furi_hal_nfc.h
@@ -398,6 +398,7 @@ void furi_hal_nfc_ll_txrx_on();
 
 void furi_hal_nfc_ll_txrx_off();
 
+// TODO rework all pollers with furi_hal_nfc_ll_txrx_bits
 FuriHalNfcReturn furi_hal_nfc_ll_txrx(
     uint8_t* txBuf,
     uint16_t txBufLen,
@@ -407,6 +408,15 @@ FuriHalNfcReturn furi_hal_nfc_ll_txrx(
     uint32_t flags,
     uint32_t fwt);
 
+FuriHalNfcReturn furi_hal_nfc_ll_txrx_bits(
+    uint8_t* txBuf,
+    uint16_t txBufLen,
+    uint8_t* rxBuf,
+    uint16_t rxBufLen,
+    uint16_t* actLen,
+    uint32_t flags,
+    uint32_t fwt);
+
 void furi_hal_nfc_ll_poll();
 
 #ifdef __cplusplus
diff --git a/firmware/targets/furi_hal_include/furi_hal_rtc.h b/firmware/targets/furi_hal_include/furi_hal_rtc.h
index bdae3b931..361225fb2 100644
--- a/firmware/targets/furi_hal_include/furi_hal_rtc.h
+++ b/firmware/targets/furi_hal_include/furi_hal_rtc.h
@@ -93,6 +93,8 @@ void furi_hal_rtc_set_pin_fails(uint32_t value);
 
 uint32_t furi_hal_rtc_get_pin_fails();
 
+uint32_t furi_hal_rtc_get_timestamp();
+
 uint32_t furi_hal_rtc_datetime_to_timestamp(FuriHalRtcDateTime* datetime);
 
 #ifdef __cplusplus
diff --git a/furi/core/check.c b/furi/core/check.c
index cf1b790e8..1c2a005f3 100644
--- a/furi/core/check.c
+++ b/furi/core/check.c
@@ -1,6 +1,7 @@
 #include "check.h"
 #include "common_defines.h"
 
+#include <stm32wbxx.h>
 #include <furi_hal_console.h>
 #include <furi_hal_power.h>
 #include <furi_hal_rtc.h>
@@ -24,30 +25,31 @@ PLACE_IN_SECTION("MB_MEM2") uint32_t __furi_check_registers[12] = {0};
                  :                                      \
                  : "memory");
 
-#ifdef FURI_DEBUG
-// Restore registers and halt MCU with bkpt mcu debug state
-#define RESTORE_REGISTERS_AND_HALT_MCU()                \
-    asm volatile("ldr r12, =__furi_check_registers  \n" \
-                 "ldm r12, {r0-r11}                 \n" \
-                 "loop%=:                           \n" \
-                 "bkpt 0x00                         \n" \
-                 "wfi                               \n" \
-                 "b loop%=                          \n" \
-                 :                                      \
-                 :                                      \
-                 : "memory");
-#else
-// Restore registers and halt MCU for release builds without bkpt instruction
-#define RESTORE_REGISTERS_AND_HALT_MCU()                \
-    asm volatile("ldr r12, =__furi_check_registers  \n" \
-                 "ldm r12, {r0-r11}                 \n" \
+/** Restore registers and halt MCU
+ * 
+ * - Always use it with GET_MESSAGE_AND_STORE_REGISTERS
+ * - If debugger is(was) connected this routine will raise bkpt
+ * - If debugger is not connected then endless loop
+ * 
+ */
+#define RESTORE_REGISTERS_AND_HALT_MCU(debug)           \
+    register const bool r0 asm("r0") = debug;           \
+    asm volatile("cbnz  r0, with_debugger%=         \n" \
+                 "ldr   r12, =__furi_check_registers\n" \
+                 "ldm   r12, {r0-r11}               \n" \
                  "loop%=:                           \n" \
                  "wfi                               \n" \
-                 "b loop%=                          \n" \
-                 :                                      \
+                 "b     loop%=                      \n" \
+                 "with_debugger%=:                  \n" \
+                 "ldr   r12, =__furi_check_registers\n" \
+                 "ldm   r12, {r0-r11}               \n" \
+                 "debug_loop%=:                     \n" \
+                 "bkpt  0x00                        \n" \
+                 "wfi                               \n" \
+                 "b     debug_loop%=                \n" \
                  :                                      \
+                 : "r"(r0)                              \
                  : "memory");
-#endif
 
 extern size_t xPortGetTotalHeapSize(void);
 extern size_t xPortGetFreeHeapSize(void);
@@ -109,16 +111,19 @@ FURI_NORETURN void __furi_crash() {
     }
     __furi_print_heap_info();
 
-#ifdef FURI_DEBUG
-    furi_hal_console_puts("\r\nSystem halted. Connect debugger for more info\r\n");
-    furi_hal_console_puts("\033[0m\r\n");
-    RESTORE_REGISTERS_AND_HALT_MCU();
-#else
-    furi_hal_rtc_set_fault_data((uint32_t)__furi_check_message);
-    furi_hal_console_puts("\r\nRebooting system.\r\n");
-    furi_hal_console_puts("\033[0m\r\n");
-    furi_hal_power_reset();
-#endif
+    // Check if debug enabled by DAP
+    // https://developer.arm.com/documentation/ddi0403/d/Debug-Architecture/ARMv7-M-Debug/Debug-register-support-in-the-SCS/Debug-Halting-Control-and-Status-Register--DHCSR?lang=en
+    bool debug = CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk;
+    if(debug) {
+        furi_hal_console_puts("\r\nSystem halted. Connect debugger for more info\r\n");
+        furi_hal_console_puts("\033[0m\r\n");
+        RESTORE_REGISTERS_AND_HALT_MCU(debug);
+    } else {
+        furi_hal_rtc_set_fault_data((uint32_t)__furi_check_message);
+        furi_hal_console_puts("\r\nRebooting system.\r\n");
+        furi_hal_console_puts("\033[0m\r\n");
+        furi_hal_power_reset();
+    }
     __builtin_unreachable();
 }
 
@@ -137,6 +142,11 @@ FURI_NORETURN void __furi_halt() {
     furi_hal_console_puts(__furi_check_message);
     furi_hal_console_puts("\r\nSystem halted. Bye-bye!\r\n");
     furi_hal_console_puts("\033[0m\r\n");
-    RESTORE_REGISTERS_AND_HALT_MCU();
+
+    // Check if debug enabled by DAP
+    // https://developer.arm.com/documentation/ddi0403/d/Debug-Architecture/ARMv7-M-Debug/Debug-register-support-in-the-SCS/Debug-Halting-Control-and-Status-Register--DHCSR?lang=en
+    bool debug = CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk;
+    RESTORE_REGISTERS_AND_HALT_MCU(debug);
+
     __builtin_unreachable();
 }
diff --git a/furi/core/check.h b/furi/core/check.h
index 78efc1451..192c5260e 100644
--- a/furi/core/check.h
+++ b/furi/core/check.h
@@ -46,7 +46,7 @@ FURI_NORETURN void __furi_halt();
 /** Check condition and crash if check failed */
 #define furi_check(__e)                          \
     do {                                         \
-        if((__e) == 0) {                         \
+        if(!(__e)) {                             \
             furi_crash("furi_check failed\r\n"); \
         }                                        \
     } while(0)
@@ -55,7 +55,7 @@ FURI_NORETURN void __furi_halt();
 #ifdef FURI_DEBUG
 #define furi_assert(__e)                          \
     do {                                          \
-        if((__e) == 0) {                          \
+        if(!(__e)) {                              \
             furi_crash("furi_assert failed\r\n"); \
         }                                         \
     } while(0)
diff --git a/furi/core/event_flag.c b/furi/core/event_flag.c
index 5d2a49910..07dd30a16 100644
--- a/furi/core/event_flag.c
+++ b/furi/core/event_flag.c
@@ -25,7 +25,7 @@ uint32_t furi_event_flag_set(FuriEventFlag* instance, uint32_t flags) {
     uint32_t rflags;
     BaseType_t yield;
 
-    if(FURI_IS_IRQ_MODE() != 0U) {
+    if(FURI_IS_IRQ_MODE()) {
         yield = pdFALSE;
         if(xEventGroupSetBitsFromISR(hEventGroup, (EventBits_t)flags, &yield) == pdFAIL) {
             rflags = (uint32_t)FuriStatusErrorResource;
@@ -48,7 +48,7 @@ uint32_t furi_event_flag_clear(FuriEventFlag* instance, uint32_t flags) {
     EventGroupHandle_t hEventGroup = (EventGroupHandle_t)instance;
     uint32_t rflags;
 
-    if(FURI_IS_IRQ_MODE() != 0U) {
+    if(FURI_IS_IRQ_MODE()) {
         rflags = xEventGroupGetBitsFromISR(hEventGroup);
 
         if(xEventGroupClearBitsFromISR(hEventGroup, (EventBits_t)flags) == pdFAIL) {
@@ -73,7 +73,7 @@ uint32_t furi_event_flag_get(FuriEventFlag* instance) {
     EventGroupHandle_t hEventGroup = (EventGroupHandle_t)instance;
     uint32_t rflags;
 
-    if(FURI_IS_IRQ_MODE() != 0U) {
+    if(FURI_IS_IRQ_MODE()) {
         rflags = xEventGroupGetBitsFromISR(hEventGroup);
     } else {
         rflags = xEventGroupGetBits(hEventGroup);
diff --git a/furi/core/memmgr_heap.c b/furi/core/memmgr_heap.c
index 32b2875cc..ac51b4a20 100644
--- a/furi/core/memmgr_heap.c
+++ b/furi/core/memmgr_heap.c
@@ -150,8 +150,7 @@ void memmgr_heap_disable_thread_trace(FuriThreadId thread_id) {
     vTaskSuspendAll();
     {
         memmgr_heap_thread_trace_depth++;
-        furi_check(MemmgrHeapThreadDict_get(memmgr_heap_thread_dict, (uint32_t)thread_id) != NULL);
-        MemmgrHeapThreadDict_erase(memmgr_heap_thread_dict, (uint32_t)thread_id);
+        furi_check(MemmgrHeapThreadDict_erase(memmgr_heap_thread_dict, (uint32_t)thread_id));
         memmgr_heap_thread_trace_depth--;
     }
     (void)xTaskResumeAll();
@@ -212,7 +211,8 @@ static inline void traceFREE(void* pointer, size_t size) {
         MemmgrHeapAllocDict_t* alloc_dict =
             MemmgrHeapThreadDict_get(memmgr_heap_thread_dict, (uint32_t)thread_id);
         if(alloc_dict) {
-            MemmgrHeapAllocDict_erase(*alloc_dict, (uint32_t)pointer);
+            // In some cases thread may want to release memory that was not allocated by it
+            (void)MemmgrHeapAllocDict_erase(*alloc_dict, (uint32_t)pointer);
         }
         memmgr_heap_thread_trace_depth--;
     }
diff --git a/furi/core/mutex.c b/furi/core/mutex.c
index 78ea05196..ab66b0f18 100644
--- a/furi/core/mutex.c
+++ b/furi/core/mutex.c
@@ -45,7 +45,7 @@ FuriStatus furi_mutex_acquire(FuriMutex* instance, uint32_t timeout) {
 
     stat = FuriStatusOk;
 
-    if(FURI_IS_IRQ_MODE() != 0U) {
+    if(FURI_IS_IRQ_MODE()) {
         stat = FuriStatusErrorISR;
     } else if(hMutex == NULL) {
         stat = FuriStatusErrorParameter;
@@ -85,7 +85,7 @@ FuriStatus furi_mutex_release(FuriMutex* instance) {
 
     stat = FuriStatusOk;
 
-    if(FURI_IS_IRQ_MODE() != 0U) {
+    if(FURI_IS_IRQ_MODE()) {
         stat = FuriStatusErrorISR;
     } else if(hMutex == NULL) {
         stat = FuriStatusErrorParameter;
@@ -111,7 +111,7 @@ FuriThreadId furi_mutex_get_owner(FuriMutex* instance) {
 
     hMutex = (SemaphoreHandle_t)((uint32_t)instance & ~1U);
 
-    if((FURI_IS_IRQ_MODE() != 0U) || (hMutex == NULL)) {
+    if((FURI_IS_IRQ_MODE()) || (hMutex == NULL)) {
         owner = 0;
     } else {
         owner = (FuriThreadId)xSemaphoreGetMutexHolder(hMutex);
diff --git a/furi/core/semaphore.c b/furi/core/semaphore.c
index a204cbe6e..8c99bfc54 100644
--- a/furi/core/semaphore.c
+++ b/furi/core/semaphore.c
@@ -45,7 +45,7 @@ FuriStatus furi_semaphore_acquire(FuriSemaphore* instance, uint32_t timeout) {
 
     stat = FuriStatusOk;
 
-    if(FURI_IS_IRQ_MODE() != 0U) {
+    if(FURI_IS_IRQ_MODE()) {
         if(timeout != 0U) {
             stat = FuriStatusErrorParameter;
         } else {
@@ -80,7 +80,7 @@ FuriStatus furi_semaphore_release(FuriSemaphore* instance) {
 
     stat = FuriStatusOk;
 
-    if(FURI_IS_IRQ_MODE() != 0U) {
+    if(FURI_IS_IRQ_MODE()) {
         yield = pdFALSE;
 
         if(xSemaphoreGiveFromISR(hSemaphore, &yield) != pdTRUE) {
@@ -104,7 +104,7 @@ uint32_t furi_semaphore_get_count(FuriSemaphore* instance) {
     SemaphoreHandle_t hSemaphore = (SemaphoreHandle_t)instance;
     uint32_t count;
 
-    if(FURI_IS_IRQ_MODE() != 0U) {
+    if(FURI_IS_IRQ_MODE()) {
         count = (uint32_t)uxSemaphoreGetCountFromISR(hSemaphore);
     } else {
         count = (uint32_t)uxSemaphoreGetCount(hSemaphore);
diff --git a/furi/core/stream_buffer.c b/furi/core/stream_buffer.c
index b9d0629fe..2df84fa5b 100644
--- a/furi/core/stream_buffer.c
+++ b/furi/core/stream_buffer.c
@@ -23,7 +23,7 @@ size_t furi_stream_buffer_send(
     uint32_t timeout) {
     size_t ret;
 
-    if(FURI_IS_IRQ_MODE() != 0U) {
+    if(FURI_IS_IRQ_MODE()) {
         BaseType_t yield;
         ret = xStreamBufferSendFromISR(stream_buffer, data, length, &yield);
         portYIELD_FROM_ISR(yield);
@@ -41,7 +41,7 @@ size_t furi_stream_buffer_receive(
     uint32_t timeout) {
     size_t ret;
 
-    if(FURI_IS_IRQ_MODE() != 0U) {
+    if(FURI_IS_IRQ_MODE()) {
         BaseType_t yield;
         ret = xStreamBufferReceiveFromISR(stream_buffer, data, length, &yield);
         portYIELD_FROM_ISR(yield);
diff --git a/furi/core/string.c b/furi/core/string.c
index 099f70c11..901b1f625 100644
--- a/furi/core/string.c
+++ b/furi/core/string.c
@@ -29,13 +29,13 @@ FuriString* furi_string_alloc() {
 }
 
 FuriString* furi_string_alloc_set(const FuriString* s) {
-    FuriString* string = malloc(sizeof(FuriString));
+    FuriString* string = malloc(sizeof(FuriString)); //-V773
     string_init_set(string->string, s->string);
     return string;
 }
 
 FuriString* furi_string_alloc_set_str(const char cstr[]) {
-    FuriString* string = malloc(sizeof(FuriString));
+    FuriString* string = malloc(sizeof(FuriString)); //-V773
     string_init_set(string->string, cstr);
     return string;
 }
diff --git a/furi/core/thread.c b/furi/core/thread.c
index 508146f63..8320a47e8 100644
--- a/furi/core/thread.c
+++ b/furi/core/thread.c
@@ -12,6 +12,8 @@
 #include <furi_hal_rtc.h>
 #include <furi_hal_console.h>
 
+#define TAG "FuriThread"
+
 #define THREAD_NOTIFY_INDEX 1 // Index 0 is used for stream buffers
 
 typedef struct FuriThreadStdout FuriThreadStdout;
@@ -50,6 +52,7 @@ static int32_t __furi_thread_stdout_flush(FuriThread* thread);
 __attribute__((__noreturn__)) void furi_thread_catch() {
     asm volatile("nop"); // extra magic
     furi_crash("You are doing it wrong");
+    __builtin_unreachable();
 }
 
 static void furi_thread_set_state(FuriThread* thread, FuriThreadState state) {
@@ -81,6 +84,12 @@ static void furi_thread_body(void* context) {
     if(thread->heap_trace_enabled == true) {
         furi_delay_ms(33);
         thread->heap_size = memmgr_heap_get_thread_memory((FuriThreadId)task_handle);
+        furi_log_print_format(
+            thread->heap_size ? FuriLogLevelError : FuriLogLevelInfo,
+            TAG,
+            "%s allocation balance: %d",
+            thread->name ? thread->name : "Thread",
+            thread->heap_size);
         memmgr_heap_disable_thread_trace((FuriThreadId)task_handle);
     }
 
@@ -88,8 +97,8 @@ static void furi_thread_body(void* context) {
 
     if(thread->is_service) {
         FURI_LOG_E(
-            "Service",
-            "%s thread exited. Thread memory cannot be reclaimed.",
+            TAG,
+            "%s service thread exited. Thread memory cannot be reclaimed.",
             thread->name ? thread->name : "<unknown service>");
     }
 
@@ -112,6 +121,12 @@ FuriThread* furi_thread_alloc() {
     FuriThread* thread = malloc(sizeof(FuriThread));
     thread->output.buffer = furi_string_alloc();
     thread->is_service = false;
+
+    if(furi_thread_get_current_id()) {
+        FuriThread* parent = pvTaskGetThreadLocalStoragePointer(NULL, 0);
+        if(parent) thread->heap_trace_enabled = parent->heap_trace_enabled;
+    }
+
     return thread;
 }
 
diff --git a/lib/SConscript b/lib/SConscript
index 0b1800a02..57cfb3f3a 100644
--- a/lib/SConscript
+++ b/lib/SConscript
@@ -17,13 +17,13 @@ env.Append(
         "lib/print",
     ],
     SDK_HEADERS=[
-        File("#/lib/one_wire/one_wire_host_timing.h"),
-        File("#/lib/one_wire/one_wire_host.h"),
-        File("#/lib/one_wire/one_wire_slave.h"),
-        File("#/lib/one_wire/one_wire_device.h"),
-        File("#/lib/one_wire/ibutton/ibutton_worker.h"),
-        File("#/lib/one_wire/maxim_crc.h"),
-        File("#/lib/u8g2/u8g2.h"),
+        File("one_wire/one_wire_host_timing.h"),
+        File("one_wire/one_wire_host.h"),
+        File("one_wire/one_wire_slave.h"),
+        File("one_wire/one_wire_device.h"),
+        File("one_wire/ibutton/ibutton_worker.h"),
+        File("one_wire/maxim_crc.h"),
+        File("u8g2/u8g2.h"),
     ],
 )
 
diff --git a/lib/ST25RFAL002/include/rfal_rf.h b/lib/ST25RFAL002/include/rfal_rf.h
index e1b864830..35e9a4454 100644
--- a/lib/ST25RFAL002/include/rfal_rf.h
+++ b/lib/ST25RFAL002/include/rfal_rf.h
@@ -1496,6 +1496,15 @@ ReturnCode rfalTransceiveBlockingTxRx(
     uint32_t flags,
     uint32_t fwt);
 
+ReturnCode rfalTransceiveBitsBlockingTxRx(
+    uint8_t* txBuf,
+    uint16_t txBufLen,
+    uint8_t* rxBuf,
+    uint16_t rxBufLen,
+    uint16_t* actLen,
+    uint32_t flags,
+    uint32_t fwt);
+
 ReturnCode rfalTransceiveBitsBlockingTx(
     uint8_t* txBuf,
     uint16_t txBufLen,
diff --git a/lib/ST25RFAL002/source/st25r3916/rfal_rfst25r3916.c b/lib/ST25RFAL002/source/st25r3916/rfal_rfst25r3916.c
index 9ad35bcb6..0bad67a6d 100644
--- a/lib/ST25RFAL002/source/st25r3916/rfal_rfst25r3916.c
+++ b/lib/ST25RFAL002/source/st25r3916/rfal_rfst25r3916.c
@@ -1607,6 +1607,23 @@ ReturnCode rfalTransceiveBlockingTxRx(
     return ret;
 }
 
+ReturnCode rfalTransceiveBitsBlockingTxRx(
+    uint8_t* txBuf,
+    uint16_t txBufLen,
+    uint8_t* rxBuf,
+    uint16_t rxBufLen,
+    uint16_t* actLen,
+    uint32_t flags,
+    uint32_t fwt) {
+    ReturnCode ret;
+
+    EXIT_ON_ERR(
+        ret, rfalTransceiveBitsBlockingTx(txBuf, txBufLen, rxBuf, rxBufLen, actLen, flags, fwt));
+    ret = rfalTransceiveBlockingRx();
+
+    return ret;
+}
+
 /*******************************************************************************/
 static ReturnCode rfalRunTransceiveWorker(void) {
     if(gRFAL.state == RFAL_STATE_TXRX) {
diff --git a/lib/STM32CubeWB.scons b/lib/STM32CubeWB.scons
index a00b07d98..cbdde9814 100644
--- a/lib/STM32CubeWB.scons
+++ b/lib/STM32CubeWB.scons
@@ -15,8 +15,8 @@ env.Append(
     ],
     SDK_HEADERS=[
         *env.GlobRecursive("*_ll_*.h", "#/lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/", exclude="*usb.h"),
-        File("#/lib/STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/FreeRTOS.h"),
-        File("#/lib/STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/stream_buffer.h"),
+        File("STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/FreeRTOS.h"),
+        File("STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/stream_buffer.h"),
     ],
 )
 
diff --git a/lib/drivers/SConscript b/lib/drivers/SConscript
index 1ca613289..d82f09f1d 100644
--- a/lib/drivers/SConscript
+++ b/lib/drivers/SConscript
@@ -5,7 +5,7 @@ env.Append(
         "#/lib/drivers",
     ],
     SDK_HEADERS=[
-        File("#/lib/drivers/nrf24.h"),
+        File("nrf24.h"),
     ],
 )
 
diff --git a/lib/drivers/nrf24.c b/lib/drivers/nrf24.c
index 2905072d3..8b3776445 100644
--- a/lib/drivers/nrf24.c
+++ b/lib/drivers/nrf24.c
@@ -12,6 +12,13 @@ void nrf24_init() {
     furi_hal_gpio_write(nrf24_CE_PIN, false);
 }
 
+void nrf24_deinit() {
+    furi_hal_spi_release(nrf24_HANDLE);
+    furi_hal_spi_bus_handle_deinit(nrf24_HANDLE);
+    furi_hal_gpio_write(nrf24_CE_PIN, false);
+    furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
+}
+
 void nrf24_spi_trx(
     FuriHalSpiBusHandle* handle,
     uint8_t* tx,
diff --git a/lib/drivers/nrf24.h b/lib/drivers/nrf24.h
index 584eaaea7..3cfcfe089 100644
--- a/lib/drivers/nrf24.h
+++ b/lib/drivers/nrf24.h
@@ -116,6 +116,11 @@ uint8_t nrf24_set_tx_mode(FuriHalSpiBusHandle* handle);
  */
 void nrf24_init();
 
+/** Must call this when we end using nrf24 device
+ * 
+ */
+void nrf24_deinit();
+
 /** Send flush rx command
  *
  * @param      handle  - pointer to FuriHalSpiHandle
diff --git a/lib/flipper_application/SConscript b/lib/flipper_application/SConscript
index 3a5e7f4db..9fbbf95d1 100644
--- a/lib/flipper_application/SConscript
+++ b/lib/flipper_application/SConscript
@@ -5,7 +5,7 @@ env.Append(
         "#/lib/flipper_application",
     ],
     SDK_HEADERS=[
-        File("#/lib/flipper_application/flipper_application.h"),
+        File("flipper_application.h"),
     ],
 )
 
diff --git a/lib/flipper_format/SConscript b/lib/flipper_format/SConscript
index 5e185678b..353da8035 100644
--- a/lib/flipper_format/SConscript
+++ b/lib/flipper_format/SConscript
@@ -5,8 +5,8 @@ env.Append(
         "#/lib/flipper_format",
     ],
     SDK_HEADERS=[
-        File("#/lib/flipper_format/flipper_format.h"),
-        File("#/lib/flipper_format/flipper_format_i.h"),
+        File("flipper_format.h"),
+        File("flipper_format_i.h"),
     ],
 )
 
diff --git a/lib/flipper_format/flipper_format_stream.c b/lib/flipper_format/flipper_format_stream.c
index 41934a3b1..9cce95d47 100644
--- a/lib/flipper_format/flipper_format_stream.c
+++ b/lib/flipper_format/flipper_format_stream.c
@@ -313,7 +313,7 @@ bool flipper_format_stream_write_value_line(Stream* stream, FlipperStreamWriteDa
                     furi_crash("Unknown FF type");
                 }
 
-                if((size_t)(i + 1) < write_data->data_size) {
+                if(((size_t)i + 1) < write_data->data_size) {
                     furi_string_cat(value, " ");
                 }
 
diff --git a/lib/infrared/SConscript b/lib/infrared/SConscript
index 36baca34e..9a1543f00 100644
--- a/lib/infrared/SConscript
+++ b/lib/infrared/SConscript
@@ -6,9 +6,9 @@ env.Append(
         "#/lib/infrared/worker",
     ],
     SDK_HEADERS=[
-        File("#/lib/infrared/worker/infrared_transmit.h"),
-        File("#/lib/infrared/worker/infrared_worker.h"),
-        File("#/lib/infrared/encoder_decoder/infrared.h"),
+        File("encoder_decoder/infrared.h"),
+        File("worker/infrared_worker.h"),
+        File("worker/infrared_transmit.h"),
     ],
 )
 
diff --git a/lib/infrared/encoder_decoder/common/infrared_common_decoder.c b/lib/infrared/encoder_decoder/common/infrared_common_decoder.c
index bff4c73db..7f1c3a4fd 100644
--- a/lib/infrared/encoder_decoder/common/infrared_common_decoder.c
+++ b/lib/infrared/encoder_decoder/common/infrared_common_decoder.c
@@ -85,8 +85,8 @@ static InfraredStatus infrared_common_decode_bits(InfraredCommonDecoder* decoder
         if(timings->min_split_time && !level) {
             if(timing > timings->min_split_time) {
                 /* long low timing - check if we're ready for any of protocol modification */
-                for(size_t i = 0; decoder->protocol->databit_len[i] &&
-                                  (i < COUNT_OF(decoder->protocol->databit_len));
+                for(size_t i = 0; i < COUNT_OF(decoder->protocol->databit_len) &&
+                                  decoder->protocol->databit_len[i];
                     ++i) {
                     if(decoder->protocol->databit_len[i] == decoder->databit_cnt) {
                         return InfraredStatusReady;
@@ -199,7 +199,7 @@ InfraredMessage* infrared_common_decoder_check_ready(InfraredCommonDecoder* deco
     bool found_length = false;
 
     for(size_t i = 0;
-        decoder->protocol->databit_len[i] && (i < COUNT_OF(decoder->protocol->databit_len));
+        i < COUNT_OF(decoder->protocol->databit_len) && decoder->protocol->databit_len[i];
         ++i) {
         if(decoder->protocol->databit_len[i] == decoder->databit_cnt) {
             found_length = true;
diff --git a/lib/infrared/encoder_decoder/common/infrared_common_protocol_defs.c b/lib/infrared/encoder_decoder/common/infrared_common_protocol_defs.c
index e8f7664a7..3dd26e9d8 100644
--- a/lib/infrared/encoder_decoder/common/infrared_common_protocol_defs.c
+++ b/lib/infrared/encoder_decoder/common/infrared_common_protocol_defs.c
@@ -115,3 +115,26 @@ const InfraredCommonProtocolSpec protocol_sirc = {
     .decode_repeat = NULL,
     .encode_repeat = infrared_encoder_sirc_encode_repeat,
 };
+
+const InfraredCommonProtocolSpec protocol_kaseikyo = {
+    .timings =
+        {
+            .preamble_mark = INFRARED_KASEIKYO_PREAMBLE_MARK,
+            .preamble_space = INFRARED_KASEIKYO_PREAMBLE_SPACE,
+            .bit1_mark = INFRARED_KASEIKYO_BIT1_MARK,
+            .bit1_space = INFRARED_KASEIKYO_BIT1_SPACE,
+            .bit0_mark = INFRARED_KASEIKYO_BIT0_MARK,
+            .bit0_space = INFRARED_KASEIKYO_BIT0_SPACE,
+            .preamble_tolerance = INFRARED_KASEIKYO_PREAMBLE_TOLERANCE,
+            .bit_tolerance = INFRARED_KASEIKYO_BIT_TOLERANCE,
+            .silence_time = INFRARED_KASEIKYO_SILENCE,
+            .min_split_time = INFRARED_KASEIKYO_MIN_SPLIT_TIME,
+        },
+    .databit_len[0] = 48,
+    .no_stop_bit = false,
+    .decode = infrared_common_decode_pdwm,
+    .encode = infrared_common_encode_pdwm,
+    .interpret = infrared_decoder_kaseikyo_interpret,
+    .decode_repeat = NULL,
+    .encode_repeat = NULL,
+};
diff --git a/lib/infrared/encoder_decoder/infrared.c b/lib/infrared/encoder_decoder/infrared.c
index 71bd6bb6d..2c5ef0fff 100644
--- a/lib/infrared/encoder_decoder/infrared.c
+++ b/lib/infrared/encoder_decoder/infrared.c
@@ -110,6 +110,20 @@ static const InfraredEncoderDecoder infrared_encoder_decoder[] = {
              .free = infrared_encoder_sirc_free},
         .get_protocol_spec = infrared_sirc_get_spec,
     },
+    {
+        .decoder =
+            {.alloc = infrared_decoder_kaseikyo_alloc,
+             .decode = infrared_decoder_kaseikyo_decode,
+             .reset = infrared_decoder_kaseikyo_reset,
+             .check_ready = infrared_decoder_kaseikyo_check_ready,
+             .free = infrared_decoder_kaseikyo_free},
+        .encoder =
+            {.alloc = infrared_encoder_kaseikyo_alloc,
+             .encode = infrared_encoder_kaseikyo_encode,
+             .reset = infrared_encoder_kaseikyo_reset,
+             .free = infrared_encoder_kaseikyo_free},
+        .get_protocol_spec = infrared_kaseikyo_get_spec,
+    },
 };
 
 static int infrared_find_index_by_protocol(InfraredProtocol protocol);
diff --git a/lib/infrared/encoder_decoder/infrared.h b/lib/infrared/encoder_decoder/infrared.h
index 945913000..086950f1e 100644
--- a/lib/infrared/encoder_decoder/infrared.h
+++ b/lib/infrared/encoder_decoder/infrared.h
@@ -31,6 +31,7 @@ typedef enum {
     InfraredProtocolSIRC,
     InfraredProtocolSIRC15,
     InfraredProtocolSIRC20,
+    InfraredProtocolKaseikyo,
     InfraredProtocolMAX,
 } InfraredProtocol;
 
diff --git a/lib/infrared/encoder_decoder/infrared_protocol_defs_i.h b/lib/infrared/encoder_decoder/infrared_protocol_defs_i.h
index 575961f13..6146f7b4e 100644
--- a/lib/infrared/encoder_decoder/infrared_protocol_defs_i.h
+++ b/lib/infrared/encoder_decoder/infrared_protocol_defs_i.h
@@ -267,3 +267,54 @@ InfraredStatus infrared_encoder_sirc_encode_repeat(
     bool* level);
 
 extern const InfraredCommonProtocolSpec protocol_sirc;
+
+/***************************************************************************************************
+*   Kaseikyo protocol description
+*   https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/src/ir_Kaseikyo.hpp
+****************************************************************************************************
+*     Preamble   Preamble      Pulse Distance/Width          Pause       Preamble   Preamble
+*       mark      space            Modulation             up to period    repeat     repeat
+*                                                                          mark       space
+*
+*        3360      1665               48 bit              ...130000        3456       1728
+*     __________          _ _ _ _  _  _  _ _ _  _  _ _ _                ___________
+* ____          __________ _ _ _ __ __ __ _ _ __ __ _ _ ________________           ___________
+*
+***************************************************************************************************/
+
+#define INFRARED_KASEIKYO_UNIT 432
+#define INFRARED_KASEIKYO_PREAMBLE_MARK (8 * INFRARED_KASEIKYO_UNIT)
+#define INFRARED_KASEIKYO_PREAMBLE_SPACE (4 * INFRARED_KASEIKYO_UNIT)
+#define INFRARED_KASEIKYO_BIT1_MARK INFRARED_KASEIKYO_UNIT
+#define INFRARED_KASEIKYO_BIT1_SPACE (3 * INFRARED_KASEIKYO_UNIT)
+#define INFRARED_KASEIKYO_BIT0_MARK INFRARED_KASEIKYO_UNIT
+#define INFRARED_KASEIKYO_BIT0_SPACE INFRARED_KASEIKYO_UNIT
+#define INFRARED_KASEIKYO_REPEAT_PERIOD 130000
+#define INFRARED_KASEIKYO_SILENCE INFRARED_KASEIKYO_REPEAT_PERIOD
+#define INFRARED_KASEIKYO_MIN_SPLIT_TIME INFRARED_KASEIKYO_REPEAT_PAUSE_MIN
+#define INFRARED_KASEIKYO_REPEAT_PAUSE_MIN 4000
+#define INFRARED_KASEIKYO_REPEAT_PAUSE_MAX 150000
+#define INFRARED_KASEIKYO_REPEAT_MARK INFRARED_KASEIKYO_PREAMBLE_MARK
+#define INFRARED_KASEIKYO_REPEAT_SPACE (INFRARED_KASEIKYO_REPEAT_PERIOD - 56000)
+#define INFRARED_KASEIKYO_PREAMBLE_TOLERANCE 200 // us
+#define INFRARED_KASEIKYO_BIT_TOLERANCE 120 // us
+
+void* infrared_decoder_kaseikyo_alloc(void);
+void infrared_decoder_kaseikyo_reset(void* decoder);
+void infrared_decoder_kaseikyo_free(void* decoder);
+InfraredMessage* infrared_decoder_kaseikyo_check_ready(void* decoder);
+InfraredMessage* infrared_decoder_kaseikyo_decode(void* decoder, bool level, uint32_t duration);
+void* infrared_encoder_kaseikyo_alloc(void);
+InfraredStatus
+    infrared_encoder_kaseikyo_encode(void* encoder_ptr, uint32_t* duration, bool* level);
+void infrared_encoder_kaseikyo_reset(void* encoder_ptr, const InfraredMessage* message);
+void infrared_encoder_kaseikyo_free(void* encoder_ptr);
+bool infrared_decoder_kaseikyo_interpret(InfraredCommonDecoder* decoder);
+InfraredStatus infrared_decoder_kaseikyo_decode_repeat(InfraredCommonDecoder* decoder);
+InfraredStatus infrared_encoder_kaseikyo_encode_repeat(
+    InfraredCommonEncoder* encoder,
+    uint32_t* duration,
+    bool* level);
+const InfraredProtocolSpecification* infrared_kaseikyo_get_spec(InfraredProtocol protocol);
+
+extern const InfraredCommonProtocolSpec protocol_kaseikyo;
diff --git a/lib/infrared/encoder_decoder/kaseikyo/infrared_decoder_kaseikyo.c b/lib/infrared/encoder_decoder/kaseikyo/infrared_decoder_kaseikyo.c
new file mode 100644
index 000000000..b8db81d7e
--- /dev/null
+++ b/lib/infrared/encoder_decoder/kaseikyo/infrared_decoder_kaseikyo.c
@@ -0,0 +1,54 @@
+#include "infrared.h"
+#include "infrared_protocol_defs_i.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include <furi.h>
+#include "../infrared_i.h"
+
+InfraredMessage* infrared_decoder_kaseikyo_check_ready(void* ctx) {
+    return infrared_common_decoder_check_ready(ctx);
+}
+
+bool infrared_decoder_kaseikyo_interpret(InfraredCommonDecoder* decoder) {
+    furi_assert(decoder);
+
+    bool result = false;
+    uint16_t vendor_id = ((uint16_t)(decoder->data[1]) << 8) | (uint16_t)decoder->data[0];
+    uint8_t vendor_parity = decoder->data[2] & 0x0f;
+    uint8_t genre1 = decoder->data[2] >> 4;
+    uint8_t genre2 = decoder->data[3] & 0x0f;
+    uint16_t data = (uint16_t)(decoder->data[3] >> 4) | ((uint16_t)(decoder->data[4] & 0x3f) << 4);
+    uint8_t id = decoder->data[4] >> 6;
+    uint8_t parity = decoder->data[5];
+
+    uint8_t vendor_parity_check = decoder->data[0] ^ decoder->data[1];
+    vendor_parity_check = (vendor_parity_check & 0xf) ^ (vendor_parity_check >> 4);
+    uint8_t parity_check = decoder->data[2] ^ decoder->data[3] ^ decoder->data[4];
+
+    if(vendor_parity == vendor_parity_check && parity == parity_check) {
+        decoder->message.command = (uint32_t)data;
+        decoder->message.address = ((uint32_t)id << 24) | ((uint32_t)vendor_id << 8) |
+                                   ((uint32_t)genre1 << 4) | (uint32_t)genre2;
+        decoder->message.protocol = InfraredProtocolKaseikyo;
+        decoder->message.repeat = false;
+        result = true;
+    }
+
+    return result;
+}
+
+void* infrared_decoder_kaseikyo_alloc(void) {
+    return infrared_common_decoder_alloc(&protocol_kaseikyo);
+}
+
+InfraredMessage* infrared_decoder_kaseikyo_decode(void* decoder, bool level, uint32_t duration) {
+    return infrared_common_decode(decoder, level, duration);
+}
+
+void infrared_decoder_kaseikyo_free(void* decoder) {
+    infrared_common_decoder_free(decoder);
+}
+
+void infrared_decoder_kaseikyo_reset(void* decoder) {
+    infrared_common_decoder_reset(decoder);
+}
diff --git a/lib/infrared/encoder_decoder/kaseikyo/infrared_encoder_kaseikyo.c b/lib/infrared/encoder_decoder/kaseikyo/infrared_encoder_kaseikyo.c
new file mode 100644
index 000000000..5814c7255
--- /dev/null
+++ b/lib/infrared/encoder_decoder/kaseikyo/infrared_encoder_kaseikyo.c
@@ -0,0 +1,45 @@
+#include <core/check.h>
+#include "common/infrared_common_i.h"
+#include <stdint.h>
+#include "../infrared_i.h"
+#include "infrared_protocol_defs_i.h"
+#include <furi.h>
+
+void infrared_encoder_kaseikyo_reset(void* encoder_ptr, const InfraredMessage* message) {
+    furi_assert(encoder_ptr);
+
+    InfraredCommonEncoder* encoder = encoder_ptr;
+    infrared_common_encoder_reset(encoder);
+
+    uint32_t address = message->address;
+    uint16_t command = message->command;
+
+    uint8_t id = (address >> 24) & 3;
+    uint16_t vendor_id = (address >> 8) & 0xffff;
+    uint8_t genre1 = (address >> 4) & 0xf;
+    uint8_t genre2 = address & 0xf;
+
+    encoder->data[0] = (uint8_t)(vendor_id & 0xff);
+    encoder->data[1] = (uint8_t)(vendor_id >> 8);
+    uint8_t vendor_parity = encoder->data[0] ^ encoder->data[1];
+    vendor_parity = (vendor_parity & 0xf) ^ (vendor_parity >> 4);
+    encoder->data[2] = (vendor_parity & 0xf) | (genre1 << 4);
+    encoder->data[3] = (genre2 & 0xf) | ((uint8_t)(command & 0xf) << 4);
+    encoder->data[4] = (id << 6) | (uint8_t)(command >> 4);
+    encoder->data[5] = encoder->data[2] ^ encoder->data[3] ^ encoder->data[4];
+
+    encoder->bits_to_encode = encoder->protocol->databit_len[0];
+}
+
+void* infrared_encoder_kaseikyo_alloc(void) {
+    return infrared_common_encoder_alloc(&protocol_kaseikyo);
+}
+
+void infrared_encoder_kaseikyo_free(void* encoder_ptr) {
+    infrared_common_encoder_free(encoder_ptr);
+}
+
+InfraredStatus
+    infrared_encoder_kaseikyo_encode(void* encoder_ptr, uint32_t* duration, bool* level) {
+    return infrared_common_encode(encoder_ptr, duration, level);
+}
diff --git a/lib/infrared/encoder_decoder/kaseikyo/infrared_kaseikyo_spec.c b/lib/infrared/encoder_decoder/kaseikyo/infrared_kaseikyo_spec.c
new file mode 100644
index 000000000..87c86c7b3
--- /dev/null
+++ b/lib/infrared/encoder_decoder/kaseikyo/infrared_kaseikyo_spec.c
@@ -0,0 +1,17 @@
+#include "../infrared_i.h"
+#include "infrared_protocol_defs_i.h"
+
+static const InfraredProtocolSpecification infrared_kaseikyo_protocol_specification = {
+    .name = "Kaseikyo",
+    .address_length = 26,
+    .command_length = 10,
+    .frequency = INFRARED_COMMON_CARRIER_FREQUENCY,
+    .duty_cycle = INFRARED_COMMON_DUTY_CYCLE,
+};
+
+const InfraredProtocolSpecification* infrared_kaseikyo_get_spec(InfraredProtocol protocol) {
+    if(protocol == InfraredProtocolKaseikyo)
+        return &infrared_kaseikyo_protocol_specification;
+    else
+        return NULL;
+}
diff --git a/lib/lfrfid/SConscript b/lib/lfrfid/SConscript
index 6177a9a50..69ea9d3c1 100644
--- a/lib/lfrfid/SConscript
+++ b/lib/lfrfid/SConscript
@@ -8,12 +8,12 @@ env.Append(
         "#/lib/lfrfid",
     ],
     SDK_HEADERS=[
-        File("#/lib/lfrfid/lfrfid_worker.h"),
-        File("#/lib/lfrfid/lfrfid_raw_worker.h"),
-        File("#/lib/lfrfid/lfrfid_raw_file.h"),
-        File("#/lib/lfrfid/lfrfid_dict_file.h"),
-        File("#/lib/lfrfid/tools/bit_lib.h"),
-        File("#/lib/lfrfid/protocols/lfrfid_protocols.h"),
+        File("lfrfid_worker.h"),
+        File("lfrfid_raw_worker.h"),
+        File("lfrfid_raw_file.h"),
+        File("lfrfid_dict_file.h"),
+        File("tools/bit_lib.h"),
+        File("protocols/lfrfid_protocols.h"),
     ],
 )
 
diff --git a/lib/lfrfid/lfrfid_worker.c b/lib/lfrfid/lfrfid_worker.c
index 8b4f8b6a9..f3e37fa3c 100644
--- a/lib/lfrfid/lfrfid_worker.c
+++ b/lib/lfrfid/lfrfid_worker.c
@@ -140,9 +140,8 @@ size_t lfrfid_worker_dict_get_data_size(LFRFIDWorker* worker, LFRFIDProtocol pro
 
 static int32_t lfrfid_worker_thread(void* thread_context) {
     LFRFIDWorker* worker = thread_context;
-    bool running = true;
 
-    while(running) {
+    while(true) {
         uint32_t flags = furi_thread_flags_wait(LFRFIDEventAll, FuriFlagWaitAny, FuriWaitForever);
         if(flags != FuriFlagErrorTimeout) {
             // stop thread
diff --git a/lib/libusb_stm32.scons b/lib/libusb_stm32.scons
index cb867fdbc..4838b7c50 100644
--- a/lib/libusb_stm32.scons
+++ b/lib/libusb_stm32.scons
@@ -7,6 +7,10 @@ env.Append(
     CPPDEFINES=[
         ("USB_PMASIZE", "0x400"),
     ],
+    SDK_HEADERS=env.GlobRecursive(
+        "*.h",
+        Dir("libusb_stm32/inc"),
+    ),
 )
 
 
diff --git a/lib/mbedtls.scons b/lib/mbedtls.scons
index b57221a49..79a4a2520 100644
--- a/lib/mbedtls.scons
+++ b/lib/mbedtls.scons
@@ -5,6 +5,10 @@ env.Append(
         "#/lib/mbedtls",
         "#/lib/mbedtls/include",
     ],
+    SDK_HEADERS=[
+        File("mbedtls/include/mbedtls/des.h"),
+        File("mbedtls/include/mbedtls/sha1.h"),
+    ],
 )
 
 
diff --git a/lib/misc.scons b/lib/misc.scons
index b7d8554b5..91ad276a0 100644
--- a/lib/misc.scons
+++ b/lib/misc.scons
@@ -13,7 +13,7 @@ env.Append(
         "PB_ENABLE_MALLOC",
     ],
     SDK_HEADERS=[
-        File("#/lib/micro-ecc/uECC.h"),
+        File("micro-ecc/uECC.h"),
     ],
 )
 
diff --git a/lib/nfc/SConscript b/lib/nfc/SConscript
index 657f3a9e5..c6b70a677 100644
--- a/lib/nfc/SConscript
+++ b/lib/nfc/SConscript
@@ -4,6 +4,9 @@ env.Append(
     CPPPATH=[
         "#/lib/nfc",
     ],
+    SDK_HEADERS=[
+        File("#/lib/nfc/nfc_device.h"),
+    ],
 )
 
 libenv = env.Clone(FW_LIB_NAME="nfc")
diff --git a/lib/nfc/nfc_device.h b/lib/nfc/nfc_device.h
index 6cac72c6b..c8e8517ae 100644
--- a/lib/nfc/nfc_device.h
+++ b/lib/nfc/nfc_device.h
@@ -12,6 +12,10 @@
 #include <lib/nfc/protocols/mifare_classic.h>
 #include <lib/nfc/protocols/mifare_desfire.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define NFC_DEV_NAME_MAX_LEN 22
 #define NFC_READER_DATA_MAX_SIZE 64
 #define NFC_DICT_KEY_BATCH_SIZE 50
@@ -101,3 +105,7 @@ bool nfc_device_delete(NfcDevice* dev, bool use_load_path);
 bool nfc_device_restore(NfcDevice* dev, bool use_load_path);
 
 void nfc_device_set_loading_callback(NfcDevice* dev, NfcLoadingCallback callback, void* context);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/nfc/nfc_worker.c b/lib/nfc/nfc_worker.c
index e1e379a06..5ce543636 100644
--- a/lib/nfc/nfc_worker.c
+++ b/lib/nfc/nfc_worker.c
@@ -70,12 +70,12 @@ void nfc_worker_start(
 
 void nfc_worker_stop(NfcWorker* nfc_worker) {
     furi_assert(nfc_worker);
-    if(nfc_worker->state == NfcWorkerStateBroken || nfc_worker->state == NfcWorkerStateReady) {
-        return;
+    furi_assert(nfc_worker->thread);
+    if(furi_thread_get_state(nfc_worker->thread) != FuriThreadStateStopped) {
+        furi_hal_nfc_stop();
+        nfc_worker_change_state(nfc_worker, NfcWorkerStateStop);
+        furi_thread_join(nfc_worker->thread);
     }
-    furi_hal_nfc_stop();
-    nfc_worker_change_state(nfc_worker, NfcWorkerStateStop);
-    furi_thread_join(nfc_worker->thread);
 }
 
 void nfc_worker_change_state(NfcWorker* nfc_worker, NfcWorkerState state) {
diff --git a/lib/nfc/nfc_worker.h b/lib/nfc/nfc_worker.h
index ce3a18241..ddee34c95 100644
--- a/lib/nfc/nfc_worker.h
+++ b/lib/nfc/nfc_worker.h
@@ -7,7 +7,6 @@ typedef struct NfcWorker NfcWorker;
 typedef enum {
     // Init states
     NfcWorkerStateNone,
-    NfcWorkerStateBroken,
     NfcWorkerStateReady,
     // Main worker states
     NfcWorkerStateRead,
diff --git a/lib/print/SConscript b/lib/print/SConscript
index d4a55ab84..f34c8152f 100644
--- a/lib/print/SConscript
+++ b/lib/print/SConscript
@@ -98,7 +98,7 @@ for wrapped_fn in wrapped_fn_list:
 
 env.Append(
     SDK_HEADERS=[
-        File("#/lib/print/wrappers.h"),
+        File("wrappers.h"),
     ],
 )
 
diff --git a/lib/print/printf_tiny.c b/lib/print/printf_tiny.c
index 0db11922d..6e47f6528 100644
--- a/lib/print/printf_tiny.c
+++ b/lib/print/printf_tiny.c
@@ -541,7 +541,7 @@ static size_t _etoa(
     exp2 = (int)(expval * 3.321928094887362 + 0.5);
     const double z = expval * 2.302585092994046 - exp2 * 0.6931471805599453;
     const double z2 = z * z;
-    conv.U = (uint64_t)(exp2 + 1023) << 52U;
+    conv.U = ((uint64_t)exp2 + 1023) << 52U;
     // compute exp(z) using continued fractions, see https://en.wikipedia.org/wiki/Exponential_function#Continued_fractions_for_ex
     conv.F *= 1 + 2 * z / (2 - z + (z2 / (6 + (z2 / (10 + z2 / 14)))));
     // correct for rounding errors
diff --git a/lib/subghz/SConscript b/lib/subghz/SConscript
index 39c04969b..8fbec94ad 100644
--- a/lib/subghz/SConscript
+++ b/lib/subghz/SConscript
@@ -5,20 +5,20 @@ env.Append(
         "#/lib/subghz",
     ],
     SDK_HEADERS=[
-        File("#/lib/subghz/environment.h"),
-        File("#/lib/subghz/receiver.h"),
-        File("#/lib/subghz/subghz_worker.h"),
-        File("#/lib/subghz/subghz_tx_rx_worker.h"),
-        File("#/lib/subghz/transmitter.h"),
-        File("#/lib/subghz/registry.h"),
-        File("#/lib/subghz/protocols/protocol_items.h"),
-        File("#/lib/subghz/protocols/raw.h"),
-        File("#/lib/subghz/blocks/const.h"),
-        File("#/lib/subghz/blocks/decoder.h"),
-        File("#/lib/subghz/blocks/encoder.h"),
-        File("#/lib/subghz/blocks/generic.h"),
-        File("#/lib/subghz/blocks/math.h"),
-        File("#/lib/subghz/subghz_setting.h"),
+        File("environment.h"),
+        File("receiver.h"),
+        File("subghz_worker.h"),
+        File("subghz_tx_rx_worker.h"),
+        File("transmitter.h"),
+        File("registry.h"),
+        File("protocols/protocol_items.h"),
+        File("protocols/raw.h"),
+        File("blocks/const.h"),
+        File("blocks/decoder.h"),
+        File("blocks/encoder.h"),
+        File("blocks/generic.h"),
+        File("blocks/math.h"),
+        File("subghz_setting.h"),
     ],
 )
 
diff --git a/lib/subghz/protocols/faac_slh.c b/lib/subghz/protocols/faac_slh.c
index 0533172c3..7572bd8ab 100644
--- a/lib/subghz/protocols/faac_slh.c
+++ b/lib/subghz/protocols/faac_slh.c
@@ -462,10 +462,7 @@ bool subghz_protocol_decoder_faac_slh_deserialize(void* context, FlipperFormat*
             FURI_LOG_E(TAG, "Wrong number of bits in key");
             break;
         }
-        if(!flipper_format_rewind(flipper_format)) {
-            FURI_LOG_E(TAG, "Rewind error");
-            break;
-        }
+
         uint8_t seed_data[sizeof(uint32_t)] = {0};
         for(size_t i = 0; i < sizeof(uint32_t); i++) {
             seed_data[sizeof(uint32_t) - i - 1] = (instance->generic.seed >> i * 8) & 0xFF;
@@ -476,6 +473,11 @@ bool subghz_protocol_decoder_faac_slh_deserialize(void* context, FlipperFormat*
         }
         instance->generic.seed = seed_data[0] << 24 | seed_data[1] << 16 | seed_data[2] << 8 |
                                  seed_data[3];
+
+        if(!flipper_format_rewind(flipper_format)) {
+            FURI_LOG_E(TAG, "Rewind error");
+            break;
+        }
         res = true;
     } while(false);
 
diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c
index 6887218d7..10993d706 100644
--- a/lib/subghz/protocols/keeloq.c
+++ b/lib/subghz/protocols/keeloq.c
@@ -371,15 +371,6 @@ bool subghz_protocol_encoder_keeloq_deserialize(void* context, FlipperFormat* fl
             break;
         }
 
-        // Read manufacturer from file
-        if(flipper_format_read_string(
-               flipper_format, "Manufacture", instance->manufacture_from_file)) {
-            instance->manufacture_name = furi_string_get_cstr(instance->manufacture_from_file);
-            mfname = furi_string_get_cstr(instance->manufacture_from_file);
-        } else {
-            FURI_LOG_D(TAG, "ENCODER: Missing Manufacture");
-        }
-
         uint8_t seed_data[sizeof(uint32_t)] = {0};
         for(size_t i = 0; i < sizeof(uint32_t); i++) {
             seed_data[sizeof(uint32_t) - i - 1] = (instance->generic.seed >> i * 8) & 0xFF;
@@ -390,6 +381,20 @@ bool subghz_protocol_encoder_keeloq_deserialize(void* context, FlipperFormat* fl
         instance->generic.seed = seed_data[0] << 24 | seed_data[1] << 16 | seed_data[2] << 8 |
                                  seed_data[3];
 
+        // Read manufacturer from file
+        if(flipper_format_read_string(
+               flipper_format, "Manufacture", instance->manufacture_from_file)) {
+            instance->manufacture_name = furi_string_get_cstr(instance->manufacture_from_file);
+            mfname = furi_string_get_cstr(instance->manufacture_from_file);
+        } else {
+            FURI_LOG_D(TAG, "ENCODER: Missing Manufacture");
+        }
+
+        if(!flipper_format_rewind(flipper_format)) {
+            FURI_LOG_E(TAG, "Rewind error");
+            break;
+        }
+
         subghz_protocol_keeloq_check_remote_controller(
             &instance->generic, instance->keystore, &instance->manufacture_name);
 
@@ -979,9 +984,22 @@ bool subghz_protocol_decoder_keeloq_serialize(
     subghz_protocol_keeloq_check_remote_controller(
         &instance->generic, instance->keystore, &instance->manufacture_name);
 
+    if(strcmp(instance->manufacture_name, "BFT") == 0) {
+        uint8_t seed_data[sizeof(uint32_t)] = {0};
+        for(size_t i = 0; i < sizeof(uint32_t); i++) {
+            seed_data[sizeof(uint32_t) - i - 1] = (instance->generic.seed >> i * 8) & 0xFF;
+        }
+        if(res && !flipper_format_write_hex(flipper_format, "Seed", seed_data, sizeof(uint32_t))) {
+            FURI_LOG_E(TAG, "DECODER Serialize: Unable to add Seed");
+            res = false;
+        }
+        instance->generic.seed = seed_data[0] << 24 | seed_data[1] << 16 | seed_data[2] << 8 |
+                                 seed_data[3];
+    }
+
     if(res && !flipper_format_write_string_cstr(
                   flipper_format, "Manufacture", instance->manufacture_name)) {
-        FURI_LOG_E(TAG, "Unable to add manufacture name");
+        FURI_LOG_E(TAG, "DECODER Serialize: Unable to add manufacture name");
         res = false;
     }
     return res;
@@ -1001,19 +1019,6 @@ bool subghz_protocol_decoder_keeloq_deserialize(void* context, FlipperFormat* fl
             FURI_LOG_E(TAG, "Wrong number of bits in key");
             break;
         }
-        if(!flipper_format_rewind(flipper_format)) {
-            FURI_LOG_E(TAG, "Rewind error");
-            break;
-        }
-
-        // Read manufacturer from file
-        if(flipper_format_read_string(
-               flipper_format, "Manufacture", instance->manufacture_from_file)) {
-            instance->manufacture_name = furi_string_get_cstr(instance->manufacture_from_file);
-            mfname = furi_string_get_cstr(instance->manufacture_from_file);
-        } else {
-            FURI_LOG_D(TAG, "DECODER: Missing Manufacture");
-        }
 
         uint8_t seed_data[sizeof(uint32_t)] = {0};
         for(size_t i = 0; i < sizeof(uint32_t); i++) {
@@ -1024,6 +1029,21 @@ bool subghz_protocol_decoder_keeloq_deserialize(void* context, FlipperFormat* fl
         }
         instance->generic.seed = seed_data[0] << 24 | seed_data[1] << 16 | seed_data[2] << 8 |
                                  seed_data[3];
+
+        // Read manufacturer from file
+        if(flipper_format_read_string(
+               flipper_format, "Manufacture", instance->manufacture_from_file)) {
+            instance->manufacture_name = furi_string_get_cstr(instance->manufacture_from_file);
+            mfname = furi_string_get_cstr(instance->manufacture_from_file);
+        } else {
+            FURI_LOG_D(TAG, "DECODER: Missing Manufacture");
+        }
+
+        if(!flipper_format_rewind(flipper_format)) {
+            FURI_LOG_E(TAG, "Rewind error");
+            break;
+        }
+
         res = true;
     } while(false);
 
diff --git a/lib/subghz/protocols/nice_flor_s.c b/lib/subghz/protocols/nice_flor_s.c
index c6bb8e040..bcc5c7466 100644
--- a/lib/subghz/protocols/nice_flor_s.c
+++ b/lib/subghz/protocols/nice_flor_s.c
@@ -92,7 +92,7 @@ void* subghz_protocol_encoder_nice_flor_s_alloc(SubGhzEnvironment* environment)
     instance->nice_flor_s_rainbow_table_file_name =
         subghz_environment_get_nice_flor_s_rainbow_table_file_name(environment);
     if(instance->nice_flor_s_rainbow_table_file_name) {
-        FURI_LOG_I(
+        FURI_LOG_D(
             TAG, "Loading rainbow table from %s", instance->nice_flor_s_rainbow_table_file_name);
     }
     instance->encoder.repeat = 10;
@@ -343,7 +343,7 @@ void* subghz_protocol_decoder_nice_flor_s_alloc(SubGhzEnvironment* environment)
     instance->nice_flor_s_rainbow_table_file_name =
         subghz_environment_get_nice_flor_s_rainbow_table_file_name(environment);
     if(instance->nice_flor_s_rainbow_table_file_name) {
-        FURI_LOG_I(
+        FURI_LOG_D(
             TAG, "Loading rainbow table from %s", instance->nice_flor_s_rainbow_table_file_name);
     }
     return instance;
diff --git a/lib/subghz/protocols/power_smart.c b/lib/subghz/protocols/power_smart.c
index 63ca78711..1e8d10e95 100644
--- a/lib/subghz/protocols/power_smart.c
+++ b/lib/subghz/protocols/power_smart.c
@@ -312,7 +312,6 @@ void subghz_protocol_decoder_power_smart_feed(
         if((instance->decoder.decode_data & POWER_SMART_PACKET_HEADER_MASK) ==
            POWER_SMART_PACKET_HEADER) {
             if(subghz_protocol_power_smart_chek_valid(instance->decoder.decode_data)) {
-                instance->decoder.decode_data = instance->decoder.decode_data;
                 instance->generic.data = instance->decoder.decode_data;
                 instance->generic.data_count_bit =
                     subghz_protocol_power_smart_const.min_count_bit_for_found;
diff --git a/lib/subghz/subghz_keystore.c b/lib/subghz/subghz_keystore.c
index 1b4b3b716..e06bd9796 100644
--- a/lib/subghz/subghz_keystore.c
+++ b/lib/subghz/subghz_keystore.c
@@ -464,7 +464,7 @@ bool subghz_keystore_raw_encrypted_save(
             }
             stream_write_cstring(output_stream, encrypted_line);
 
-        } while(ret > 0 && result);
+        } while(result);
 
         flipper_format_free(output_flipper_format);
 
diff --git a/lib/toolbox/SConscript b/lib/toolbox/SConscript
index d631431ee..d51e31826 100644
--- a/lib/toolbox/SConscript
+++ b/lib/toolbox/SConscript
@@ -8,23 +8,24 @@ env.Append(
         "#/lib/toolbox",
     ],
     SDK_HEADERS=[
-        File("#/lib/toolbox/manchester_decoder.h"),
-        File("#/lib/toolbox/manchester_encoder.h"),
-        File("#/lib/toolbox/path.h"),
-        File("#/lib/toolbox/random_name.h"),
-        File("#/lib/toolbox/hmac_sha256.h"),
-        File("#/lib/toolbox/crc32_calc.h"),
-        File("#/lib/toolbox/dir_walk.h"),
-        File("#/lib/toolbox/md5.h"),
-        File("#/lib/toolbox/args.h"),
-        File("#/lib/toolbox/saved_struct.h"),
-        File("#/lib/toolbox/version.h"),
-        File("#/lib/toolbox/tar/tar_archive.h"),
-        File("#/lib/toolbox/stream/stream.h"),
-        File("#/lib/toolbox/stream/file_stream.h"),
-        File("#/lib/toolbox/stream/string_stream.h"),
-        File("#/lib/toolbox/stream/buffered_file_stream.h"),
-        File("#/lib/toolbox/protocols/protocol_dict.h"),
+        File("value_index.h"),
+        File("manchester_decoder.h"),
+        File("manchester_encoder.h"),
+        File("path.h"),
+        File("random_name.h"),
+        File("hmac_sha256.h"),
+        File("crc32_calc.h"),
+        File("dir_walk.h"),
+        File("md5.h"),
+        File("args.h"),
+        File("saved_struct.h"),
+        File("version.h"),
+        File("tar/tar_archive.h"),
+        File("stream/stream.h"),
+        File("stream/file_stream.h"),
+        File("stream/string_stream.h"),
+        File("stream/buffered_file_stream.h"),
+        File("protocols/protocol_dict.h"),
     ],
 )
 
diff --git a/lib/toolbox/random_name.c b/lib/toolbox/random_name.c
index b5924c8db..ef8264edd 100644
--- a/lib/toolbox/random_name.c
+++ b/lib/toolbox/random_name.c
@@ -5,12 +5,6 @@
 #include <furi.h>
 
 void set_random_name(char* name, uint8_t max_name_size) {
-    static bool rand_generator_inited = false;
-
-    if(!rand_generator_inited) {
-        srand(DWT->CYCCNT);
-        rand_generator_inited = true;
-    }
     const char* prefix[] = {
         "super",
         "big",
diff --git a/scripts/fbt/elfmanifest.py b/scripts/fbt/elfmanifest.py
index 313a64c09..17bceddf4 100644
--- a/scripts/fbt/elfmanifest.py
+++ b/scripts/fbt/elfmanifest.py
@@ -5,6 +5,7 @@ import struct
 from dataclasses import dataclass, field
 
 from .appmanifest import FlipperApplication
+from flipper.assets.icon import file2image
 
 
 _MANIFEST_MAGIC = 0x52474448
@@ -53,8 +54,6 @@ def assemble_manifest_data(
 ):
     image_data = b""
     if app_manifest.fap_icon:
-        from flipper.assets.icon import file2image
-
         image = file2image(os.path.join(app_manifest._apppath, app_manifest.fap_icon))
         if (image.width, image.height) != (10, 10):
             raise ValueError(
diff --git a/scripts/fbt/sdk/cache.py b/scripts/fbt/sdk/cache.py
index 62d42798c..756c37827 100644
--- a/scripts/fbt/sdk/cache.py
+++ b/scripts/fbt/sdk/cache.py
@@ -89,6 +89,9 @@ class SdkCache:
         syms.update(map(lambda e: e.name, self.get_variables()))
         return syms
 
+    def get_disabled_names(self):
+        return set(map(lambda e: e.name, self.disabled_entries))
+
     def get_functions(self):
         return self._filter_enabled(self.sdk.functions)
 
diff --git a/scripts/fbt/util.py b/scripts/fbt/util.py
index baa4ddfee..b8e9c5928 100644
--- a/scripts/fbt/util.py
+++ b/scripts/fbt/util.py
@@ -1,11 +1,11 @@
 import SCons
 from SCons.Subst import quote_spaces
 from SCons.Errors import StopError
+from SCons.Node.FS import _my_normcase
 
 import re
 import os
-import random
-import string
+
 
 WINPATHSEP_RE = re.compile(r"\\([^\"'\\]|$)")
 
@@ -41,3 +41,20 @@ def link_dir(target_path, source_path, is_windows):
 
 def single_quote(arg_list):
     return " ".join(f"'{arg}'" if " " in arg else str(arg) for arg in arg_list)
+
+
+def extract_abs_dir(node):
+    if isinstance(node, SCons.Node.FS.EntryProxy):
+        node = node.get()
+
+    for repo_dir in node.get_all_rdirs():
+        if os.path.exists(repo_dir.abspath):
+            return repo_dir
+
+
+def extract_abs_dir_path(node):
+    abs_dir_node = extract_abs_dir(node)
+    if abs_dir_node is None:
+        raise StopError(f"Can't find absolute path for {node.name}")
+
+    return abs_dir_node.abspath
diff --git a/scripts/fbt_tools/compilation_db.py b/scripts/fbt_tools/compilation_db.py
new file mode 100644
index 000000000..17ff6aaa3
--- /dev/null
+++ b/scripts/fbt_tools/compilation_db.py
@@ -0,0 +1,278 @@
+"""
+Implements the ability for SCons to emit a compilation database for the MongoDB project. See
+http://clang.llvm.org/docs/JSONCompilationDatabase.html for details on what a compilation
+database is, and why you might want one. The only user visible entry point here is
+'env.CompilationDatabase'. This method takes an optional 'target' to name the file that
+should hold the compilation database, otherwise, the file defaults to compile_commands.json,
+which is the name that most clang tools search for by default.
+"""
+
+# Copyright 2020 MongoDB Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+import json
+import itertools
+import fnmatch
+import SCons
+
+from SCons.Tool.cxx import CXXSuffixes
+from SCons.Tool.cc import CSuffixes
+from SCons.Tool.asm import ASSuffixes, ASPPSuffixes
+
+# TODO: Is there a better way to do this than this global? Right now this exists so that the
+# emitter we add can record all of the things it emits, so that the scanner for the top level
+# compilation database can access the complete list, and also so that the writer has easy
+# access to write all of the files. But it seems clunky. How can the emitter and the scanner
+# communicate more gracefully?
+__COMPILATION_DB_ENTRIES = []
+
+
+# We make no effort to avoid rebuilding the entries. Someday, perhaps we could and even
+# integrate with the cache, but there doesn't seem to be much call for it.
+class __CompilationDbNode(SCons.Node.Python.Value):
+    def __init__(self, value):
+        SCons.Node.Python.Value.__init__(self, value)
+        self.Decider(changed_since_last_build_node)
+
+
+def changed_since_last_build_node(child, target, prev_ni, node):
+    """Dummy decider to force always building"""
+    return True
+
+
+def make_emit_compilation_DB_entry(comstr):
+    """
+    Effectively this creates a lambda function to capture:
+    * command line
+    * source
+    * target
+    :param comstr: unevaluated command line
+    :return: an emitter which has captured the above
+    """
+    user_action = SCons.Action.Action(comstr)
+
+    def emit_compilation_db_entry(target, source, env):
+        """
+        This emitter will be added to each c/c++ object build to capture the info needed
+        for clang tools
+        :param target: target node(s)
+        :param source: source node(s)
+        :param env: Environment for use building this node
+        :return: target(s), source(s)
+        """
+
+        dbtarget = __CompilationDbNode(source)
+
+        entry = env.__COMPILATIONDB_Entry(
+            target=dbtarget,
+            source=[],
+            __COMPILATIONDB_UOUTPUT=target,
+            __COMPILATIONDB_USOURCE=source,
+            __COMPILATIONDB_UACTION=user_action,
+            __COMPILATIONDB_ENV=env,
+        )
+
+        # TODO: Technically, these next two lines should not be required: it should be fine to
+        # cache the entries. However, they don't seem to update properly. Since they are quick
+        # to re-generate disable caching and sidestep this problem.
+        env.AlwaysBuild(entry)
+        env.NoCache(entry)
+
+        __COMPILATION_DB_ENTRIES.append(dbtarget)
+
+        return target, source
+
+    return emit_compilation_db_entry
+
+
+def compilation_db_entry_action(target, source, env, **kw):
+    """
+    Create a dictionary with evaluated command line, target, source
+    and store that info as an attribute on the target
+    (Which has been stored in __COMPILATION_DB_ENTRIES array
+    :param target: target node(s)
+    :param source: source node(s)
+    :param env: Environment for use building this node
+    :param kw:
+    :return: None
+    """
+
+    command = env["__COMPILATIONDB_UACTION"].strfunction(
+        target=env["__COMPILATIONDB_UOUTPUT"],
+        source=env["__COMPILATIONDB_USOURCE"],
+        env=env["__COMPILATIONDB_ENV"],
+    )
+
+    entry = {
+        "directory": env.Dir("#").abspath,
+        "command": command,
+        "file": env["__COMPILATIONDB_USOURCE"][0],
+        "output": env["__COMPILATIONDB_UOUTPUT"][0],
+    }
+
+    target[0].write(entry)
+
+
+def write_compilation_db(target, source, env):
+    entries = []
+
+    use_abspath = env["COMPILATIONDB_USE_ABSPATH"] in [True, 1, "True", "true"]
+    use_path_filter = env.subst("$COMPILATIONDB_PATH_FILTER")
+    use_srcpath_filter = env.subst("$COMPILATIONDB_SRCPATH_FILTER")
+
+    for s in __COMPILATION_DB_ENTRIES:
+        entry = s.read()
+        source_file = entry["file"]
+        output_file = entry["output"]
+
+        if source_file.rfile().srcnode().exists():
+            source_file = source_file.rfile().srcnode()
+
+        if use_abspath:
+            source_file = source_file.abspath
+            output_file = output_file.abspath
+        else:
+            source_file = source_file.path
+            output_file = output_file.path
+
+        # print("output_file, path_filter", output_file, use_path_filter)
+        if use_path_filter and not fnmatch.fnmatch(output_file, use_path_filter):
+            continue
+
+        if use_srcpath_filter and not fnmatch.fnmatch(source_file, use_srcpath_filter):
+            continue
+
+        path_entry = {
+            "directory": entry["directory"],
+            "command": entry["command"],
+            "file": source_file,
+            "output": output_file,
+        }
+
+        entries.append(path_entry)
+
+    with open(target[0].path, "w") as output_file:
+        json.dump(
+            entries, output_file, sort_keys=True, indent=4, separators=(",", ": ")
+        )
+
+
+def scan_compilation_db(node, env, path):
+    return __COMPILATION_DB_ENTRIES
+
+
+def compilation_db_emitter(target, source, env):
+    """fix up the source/targets"""
+
+    # Someone called env.CompilationDatabase('my_targetname.json')
+    if not target and len(source) == 1:
+        target = source
+
+    # Default target name is compilation_db.json
+    if not target:
+        target = [
+            "compile_commands.json",
+        ]
+
+    # No source should have been passed. Drop it.
+    if source:
+        source = []
+
+    return target, source
+
+
+def generate(env, **kwargs):
+    static_obj, shared_obj = SCons.Tool.createObjBuilders(env)
+
+    env.SetDefault(
+        COMPILATIONDB_COMSTR=kwargs.get(
+            "COMPILATIONDB_COMSTR", "Building compilation database $TARGET"
+        ),
+        COMPILATIONDB_USE_ABSPATH=False,
+        COMPILATIONDB_PATH_FILTER="",
+        COMPILATIONDB_SRCPATH_FILTER="",
+    )
+
+    components_by_suffix = itertools.chain(
+        itertools.product(
+            CSuffixes,
+            [
+                (static_obj, SCons.Defaults.StaticObjectEmitter, "$CCCOM"),
+                (shared_obj, SCons.Defaults.SharedObjectEmitter, "$SHCCCOM"),
+            ],
+        ),
+        itertools.product(
+            CXXSuffixes,
+            [
+                (static_obj, SCons.Defaults.StaticObjectEmitter, "$CXXCOM"),
+                (shared_obj, SCons.Defaults.SharedObjectEmitter, "$SHCXXCOM"),
+            ],
+        ),
+        itertools.product(
+            ASSuffixes,
+            [(static_obj, SCons.Defaults.StaticObjectEmitter, "$ASCOM")],
+            [(shared_obj, SCons.Defaults.SharedObjectEmitter, "$ASCOM")],
+        ),
+        itertools.product(
+            ASPPSuffixes,
+            [(static_obj, SCons.Defaults.StaticObjectEmitter, "$ASPPCOM")],
+            [(shared_obj, SCons.Defaults.SharedObjectEmitter, "$ASPPCOM")],
+        ),
+    )
+
+    for entry in components_by_suffix:
+        suffix = entry[0]
+        builder, base_emitter, command = entry[1]
+
+        # Assumes a dictionary emitter
+        emitter = builder.emitter.get(suffix, False)
+        if emitter:
+            # We may not have tools installed which initialize all or any of
+            # cxx, cc, or assembly. If not skip resetting the respective emitter.
+            builder.emitter[suffix] = SCons.Builder.ListEmitter(
+                [
+                    emitter,
+                    make_emit_compilation_DB_entry(command),
+                ]
+            )
+
+    env.Append(
+        BUILDERS={
+            "__COMPILATIONDB_Entry": SCons.Builder.Builder(
+                action=SCons.Action.Action(compilation_db_entry_action, None),
+            ),
+            "CompilationDatabase": SCons.Builder.Builder(
+                action=SCons.Action.Action(
+                    write_compilation_db, "$COMPILATIONDB_COMSTR"
+                ),
+                target_scanner=SCons.Scanner.Scanner(
+                    function=scan_compilation_db, node_class=None
+                ),
+                emitter=compilation_db_emitter,
+                suffix="json",
+            ),
+        }
+    )
+
+
+def exists(env):
+    return True
diff --git a/scripts/fbt_tools/crosscc.py b/scripts/fbt_tools/crosscc.py
index aacda58c6..dd5cd5319 100644
--- a/scripts/fbt_tools/crosscc.py
+++ b/scripts/fbt_tools/crosscc.py
@@ -37,6 +37,21 @@ def _get_tool_version(env, tool):
 
 
 def generate(env, **kw):
+    if not env.get("VERBOSE", False):
+        env.SetDefault(
+            CCCOMSTR="\tCC\t${SOURCE}",
+            CXXCOMSTR="\tCPP\t${SOURCE}",
+            ASCOMSTR="\tASM\t${SOURCE}",
+            ARCOMSTR="\tAR\t${TARGET}",
+            RANLIBCOMSTR="\tRANLIB\t${TARGET}",
+            LINKCOMSTR="\tLINK\t${TARGET}",
+            INSTALLSTR="\tINSTALL\t${TARGET}",
+            APPSCOMSTR="\tAPPS\t${TARGET}",
+            VERSIONCOMSTR="\tVERSION\t${TARGET}",
+            STRIPCOMSTR="\tSTRIP\t${TARGET}",
+            OBJDUMPCOMSTR="\tOBJDUMP\t${TARGET}",
+        )
+
     for orig_tool in (asm, gcc, gxx, ar, gnulink, strip, gdb, objdump):
         orig_tool.generate(env)
     env.SetDefault(
diff --git a/scripts/fbt_tools/fbt_apps.py b/scripts/fbt_tools/fbt_apps.py
index ef5e9b9d9..55e282017 100644
--- a/scripts/fbt_tools/fbt_apps.py
+++ b/scripts/fbt_tools/fbt_apps.py
@@ -2,7 +2,7 @@ from SCons.Builder import Builder
 from SCons.Action import Action
 from SCons.Warnings import warn, WarningOnByDefault
 import SCons
-import os.path
+from ansi.color import fg
 
 from fbt.appmanifest import (
     FlipperAppType,
@@ -16,21 +16,20 @@ from fbt.appmanifest import (
 #  AppBuildset env["APPBUILD"] - contains subset of apps, filtered for current config
 
 
-def LoadApplicationManifests(env):
-    appmgr = env["APPMGR"] = AppManager()
-    for app_dir, _ in env["APPDIRS"]:
-        app_dir_node = env.Dir("#").Dir(app_dir)
+def LoadAppManifest(env, entry):
+    try:
+        APP_MANIFEST_NAME = "application.fam"
+        manifest_glob = entry.glob(APP_MANIFEST_NAME)
+        if len(manifest_glob) == 0:
+            raise FlipperManifestException(
+                f"Folder {entry}: manifest {APP_MANIFEST_NAME} is missing"
+            )
 
-        for entry in app_dir_node.glob("*", ondisk=True, source=True):
-            if isinstance(entry, SCons.Node.FS.Dir) and not str(entry).startswith("."):
-                try:
-                    app_manifest_file_path = os.path.join(
-                        entry.abspath, "application.fam"
-                    )
-                    appmgr.load_manifest(app_manifest_file_path, entry)
-                    env.Append(PY_LINT_SOURCES=[app_manifest_file_path])
-                except FlipperManifestException as e:
-                    warn(WarningOnByDefault, str(e))
+        app_manifest_file_path = manifest_glob[0].rfile().abspath
+        env["APPMGR"].load_manifest(app_manifest_file_path, entry)
+        env.Append(PY_LINT_SOURCES=[app_manifest_file_path])
+    except FlipperManifestException as e:
+        warn(WarningOnByDefault, str(e))
 
 
 def PrepareApplicationsBuild(env):
@@ -46,12 +45,12 @@ def PrepareApplicationsBuild(env):
 
 def DumpApplicationConfig(target, source, env):
     print(f"Loaded {len(env['APPMGR'].known_apps)} app definitions.")
-    print("Firmware modules configuration:")
+    print(fg.boldgreen("Firmware modules configuration:"))
     for apptype in FlipperAppType:
         app_sublist = env["APPBUILD"].get_apps_of_type(apptype)
         if app_sublist:
             print(
-                f"{apptype.value}:\n\t",
+                fg.green(f"{apptype.value}:\n\t"),
                 ", ".join(app.appid for app in app_sublist),
             )
 
@@ -65,8 +64,11 @@ def build_apps_c(target, source, env):
 
 
 def generate(env):
-    env.AddMethod(LoadApplicationManifests)
+    env.AddMethod(LoadAppManifest)
     env.AddMethod(PrepareApplicationsBuild)
+    env.SetDefault(
+        APPMGR=AppManager(),
+    )
 
     env.Append(
         BUILDERS={
diff --git a/scripts/fbt_tools/fbt_assets.py b/scripts/fbt_tools/fbt_assets.py
index 4fa5353d0..e17487358 100644
--- a/scripts/fbt_tools/fbt_assets.py
+++ b/scripts/fbt_tools/fbt_assets.py
@@ -1,11 +1,10 @@
-import SCons
-
 from SCons.Builder import Builder
 from SCons.Action import Action
-from SCons.Node.FS import File
+from SCons.Errors import SConsEnvironmentError
 
 import os
 import subprocess
+from ansi.color import fg
 
 
 def icons_emitter(target, source, env):
@@ -13,7 +12,6 @@ def icons_emitter(target, source, env):
         target[0].File(env.subst("${ICON_FILE_NAME}.c")),
         target[0].File(env.subst("${ICON_FILE_NAME}.h")),
     ]
-    source = env.GlobRecursive("*.*", env["ICON_SRC_DIR"])
     return target, source
 
 
@@ -86,7 +84,7 @@ def proto_ver_generator(target, source, env):
         )
     except (subprocess.CalledProcessError, EnvironmentError) as e:
         # Not great, not terrible
-        print("Git: fetch failed")
+        print(fg.boldred("Git: fetch failed"))
 
     try:
         git_describe = _invoke_git(
@@ -94,10 +92,8 @@ def proto_ver_generator(target, source, env):
             source_dir=src_dir,
         )
     except (subprocess.CalledProcessError, EnvironmentError) as e:
-        print("Git: describe failed")
-        Exit("git error")
+        raise SConsEnvironmentError("Git: describe failed")
 
-    # print("describe=", git_describe)
     git_major, git_minor = git_describe.split(".")
     version_file_data = (
         "#pragma once",
@@ -116,7 +112,7 @@ def CompileIcons(env, target_dir, source_dir, *, icon_bundle_name="assets_icons"
 
     icons = env.IconBuilder(
         target_dir,
-        ICON_SRC_DIR=source_dir,
+        source_dir,
         ICON_FILE_NAME=icon_bundle_name,
     )
     env.Depends(icons, icons_src)
@@ -125,8 +121,8 @@ def CompileIcons(env, target_dir, source_dir, *, icon_bundle_name="assets_icons"
 
 def generate(env):
     env.SetDefault(
-        ASSETS_COMPILER="${ROOT_DIR.abspath}/scripts/assets.py",
-        NANOPB_COMPILER="${ROOT_DIR.abspath}/lib/nanopb/generator/nanopb_generator.py",
+        ASSETS_COMPILER="${FBT_SCRIPT_DIR}/assets.py",
+        NANOPB_COMPILER="${ROOT_DIR}/lib/nanopb/generator/nanopb_generator.py",
     )
     env.AddMethod(CompileIcons)
 
@@ -143,7 +139,7 @@ def generate(env):
         BUILDERS={
             "IconBuilder": Builder(
                 action=Action(
-                    '${PYTHON3} "${ASSETS_COMPILER}" icons ${ICON_SRC_DIR} ${TARGET.dir} --filename ${ICON_FILE_NAME}',
+                    '${PYTHON3} "${ASSETS_COMPILER}" icons "${ABSPATHGETTERFUNC(SOURCE)}" "${TARGET.dir}" --filename ${ICON_FILE_NAME}',
                     "${ICONSCOMSTR}",
                 ),
                 emitter=icons_emitter,
diff --git a/scripts/fbt_tools/fbt_debugopts.py b/scripts/fbt_tools/fbt_debugopts.py
index 0c0ce3d32..c3be5ca47 100644
--- a/scripts/fbt_tools/fbt_debugopts.py
+++ b/scripts/fbt_tools/fbt_debugopts.py
@@ -1,7 +1,6 @@
 from re import search
 
 from SCons.Errors import UserError
-from fbt_options import OPENOCD_OPTS
 
 
 def _get_device_serials(search_str="STLink"):
@@ -20,6 +19,9 @@ def GetDevices(env):
 
 def generate(env, **kw):
     env.AddMethod(GetDevices)
+    env.SetDefault(
+        FBT_DEBUG_DIR="${ROOT_DIR}/debug",
+    )
 
     if (adapter_serial := env.subst("$OPENOCD_ADAPTER_SERIAL")) != "auto":
         env.Append(
@@ -36,7 +38,7 @@ def generate(env, **kw):
 
     env.SetDefault(
         OPENOCD_GDB_PIPE=[
-            "|openocd -c 'gdb_port pipe; log_output debug/openocd.log' ${[SINGLEQUOTEFUNC(OPENOCD_OPTS)]}"
+            "|openocd -c 'gdb_port pipe; log_output ${FBT_DEBUG_DIR}/openocd.log' ${[SINGLEQUOTEFUNC(OPENOCD_OPTS)]}"
         ],
         GDBOPTS_BASE=[
             "-ex",
@@ -58,17 +60,19 @@ def generate(env, **kw):
         ],
         GDBPYOPTS=[
             "-ex",
-            "source debug/FreeRTOS/FreeRTOS.py",
+            "source ${FBT_DEBUG_DIR}/FreeRTOS/FreeRTOS.py",
             "-ex",
-            "source debug/flipperapps.py",
+            "source ${FBT_DEBUG_DIR}/flipperapps.py",
             "-ex",
-            "source debug/PyCortexMDebug/PyCortexMDebug.py",
+            "fap-set-debug-elf-root ${FBT_FAP_DEBUG_ELF_ROOT}",
+            "-ex",
+            "source ${FBT_DEBUG_DIR}/PyCortexMDebug/PyCortexMDebug.py",
             "-ex",
             "svd_load ${SVD_FILE}",
             "-ex",
             "compare-sections",
         ],
-        JFLASHPROJECT="${ROOT_DIR.abspath}/debug/fw.jflash",
+        JFLASHPROJECT="${FBT_DEBUG_DIR}/fw.jflash",
     )
 
 
diff --git a/scripts/fbt_tools/fbt_dist.py b/scripts/fbt_tools/fbt_dist.py
index 853013e9f..f0b443486 100644
--- a/scripts/fbt_tools/fbt_dist.py
+++ b/scripts/fbt_tools/fbt_dist.py
@@ -22,7 +22,7 @@ def GetProjetDirName(env, project=None):
 
 def create_fw_build_targets(env, configuration_name):
     flavor = GetProjetDirName(env, configuration_name)
-    build_dir = env.Dir("build").Dir(flavor).abspath
+    build_dir = env.Dir("build").Dir(flavor)
     return env.SConscript(
         "firmware.scons",
         variant_dir=build_dir,
@@ -103,7 +103,7 @@ def DistCommand(env, name, source, **kw):
     command = env.Command(
         target,
         source,
-        '@${PYTHON3} "${ROOT_DIR.abspath}/scripts/sconsdist.py" copy -p ${DIST_PROJECTS} -s "${DIST_SUFFIX}" ${DIST_EXTRA}',
+        '@${PYTHON3} "${DIST_SCRIPT}" copy -p ${DIST_PROJECTS} -s "${DIST_SUFFIX}" ${DIST_EXTRA}',
         **kw,
     )
     env.Pseudo(target)
@@ -121,6 +121,9 @@ def generate(env):
 
     env.SetDefault(
         COPRO_MCU_FAMILY="STM32WB5x",
+        SELFUPDATE_SCRIPT="${FBT_SCRIPT_DIR}/selfupdate.py",
+        DIST_SCRIPT="${FBT_SCRIPT_DIR}/sconsdist.py",
+        COPRO_ASSETS_SCRIPT="${FBT_SCRIPT_DIR}/assets.py",
     )
 
     env.Append(
@@ -128,7 +131,7 @@ def generate(env):
             "UsbInstall": Builder(
                 action=[
                     Action(
-                        '${PYTHON3} "${ROOT_DIR.abspath}/scripts/selfupdate.py" dist/${DIST_DIR}/f${TARGET_HW}-update-${DIST_SUFFIX}/update.fuf'
+                        '${PYTHON3} "${SELFUPDATE_SCRIPT}" ${UPDATE_BUNDLE_DIR}/update.fuf'
                     ),
                     Touch("${TARGET}"),
                 ]
@@ -136,7 +139,7 @@ def generate(env):
             "CoproBuilder": Builder(
                 action=Action(
                     [
-                        '${PYTHON3} "${ROOT_DIR.abspath}/scripts/assets.py" '
+                        '${PYTHON3} "${COPRO_ASSETS_SCRIPT}" '
                         "copro ${COPRO_CUBE_DIR} "
                         "${TARGET} ${COPRO_MCU_FAMILY} "
                         "--cube_ver=${COPRO_CUBE_VERSION} "
diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
index 38c943cc5..a4116e513 100644
--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -1,18 +1,33 @@
-import shutil
+from dataclasses import dataclass, field
+from typing import Optional
 from SCons.Builder import Builder
 from SCons.Action import Action
 from SCons.Errors import UserError
+from SCons.Node import NodeList
 import SCons.Warnings
 
-import os
-import pathlib
 from fbt.elfmanifest import assemble_manifest_data
 from fbt.appmanifest import FlipperApplication, FlipperManifestException
 from fbt.sdk.cache import SdkCache
+from fbt.util import extract_abs_dir_path
+
+import os
+import pathlib
 import itertools
+import shutil
+
 from ansi.color import fg
 
 
+@dataclass
+class FlipperExternalAppInfo:
+    app: FlipperApplication
+    compact: NodeList = field(default_factory=NodeList)
+    debug: NodeList = field(default_factory=NodeList)
+    validator: NodeList = field(default_factory=NodeList)
+    installer: NodeList = field(default_factory=NodeList)
+
+
 def BuildAppElf(env, app):
     ext_apps_work_dir = env.subst("$EXT_APPS_WORK_DIR")
     app_work_dir = os.path.join(ext_apps_work_dir, app.appid)
@@ -23,15 +38,7 @@ def BuildAppElf(env, app):
 
     app_alias = f"fap_{app.appid}"
 
-    # Deprecation stub
-    legacy_app_taget_name = f"{app_env['FIRMWARE_BUILD_CFG']}_{app.appid}"
-
-    def legacy_app_build_stub(**kw):
-        raise UserError(
-            f"Target name '{legacy_app_taget_name}' is deprecated, use '{app_alias}' instead"
-        )
-
-    app_env.PhonyTarget(legacy_app_taget_name, Action(legacy_app_build_stub, None))
+    app_artifacts = FlipperExternalAppInfo(app)
 
     externally_built_files = []
     if app.fap_extbuild:
@@ -50,11 +57,12 @@ def BuildAppElf(env, app):
             )
 
     if app.fap_icon_assets:
-        app_env.CompileIcons(
+        fap_icons = app_env.CompileIcons(
             app_env.Dir(app_work_dir),
             app._appdir.Dir(app.fap_icon_assets),
             icon_bundle_name=f"{app.appid}_icons",
         )
+        app_env.Alias("_fap_icons", fap_icons)
 
     private_libs = []
 
@@ -62,7 +70,7 @@ def BuildAppElf(env, app):
         lib_src_root_path = os.path.join(app_work_dir, "lib", lib_def.name)
         app_env.AppendUnique(
             CPPPATH=list(
-                app_env.Dir(lib_src_root_path).Dir(incpath).srcnode()
+                app_env.Dir(lib_src_root_path).Dir(incpath).srcnode().rfile().abspath
                 for incpath in lib_def.fap_include_paths
             ),
         )
@@ -82,7 +90,12 @@ def BuildAppElf(env, app):
                 *lib_def.cflags,
             ],
             CPPDEFINES=lib_def.cdefines,
-            CPPPATH=list(map(app._appdir.Dir, lib_def.cincludes)),
+            CPPPATH=list(
+                map(
+                    lambda cpath: extract_abs_dir_path(app._appdir.Dir(cpath)),
+                    lib_def.cincludes,
+                )
+            ),
         )
 
         lib = private_lib_env.StaticLibrary(
@@ -107,20 +120,22 @@ def BuildAppElf(env, app):
         CPPPATH=env.Dir(app_work_dir),
     )
 
-    app_elf_raw = app_env.Program(
+    app_artifacts.debug = app_env.Program(
         os.path.join(ext_apps_work_dir, f"{app.appid}_d"),
         app_sources,
         APP_ENTRY=app.entry_point,
     )
 
-    app_env.Clean(app_elf_raw, [*externally_built_files, app_env.Dir(app_work_dir)])
+    app_env.Clean(
+        app_artifacts.debug, [*externally_built_files, app_env.Dir(app_work_dir)]
+    )
 
-    app_elf_dump = app_env.ObjDump(app_elf_raw)
+    app_elf_dump = app_env.ObjDump(app_artifacts.debug)
     app_env.Alias(f"{app_alias}_list", app_elf_dump)
 
-    app_elf_augmented = app_env.EmbedAppMetadata(
+    app_artifacts.compact = app_env.EmbedAppMetadata(
         os.path.join(ext_apps_work_dir, app.appid),
-        app_elf_raw,
+        app_artifacts.debug,
         APP=app,
     )
 
@@ -131,19 +146,21 @@ def BuildAppElf(env, app):
     }
 
     app_env.Depends(
-        app_elf_augmented,
+        app_artifacts.compact,
         [app_env["SDK_DEFINITION"], app_env.Value(manifest_vals)],
     )
     if app.fap_icon:
         app_env.Depends(
-            app_elf_augmented,
+            app_artifacts.compact,
             app_env.File(f"{app._apppath}/{app.fap_icon}"),
         )
 
-    app_elf_import_validator = app_env.ValidateAppImports(app_elf_augmented)
-    app_env.AlwaysBuild(app_elf_import_validator)
-    app_env.Alias(app_alias, app_elf_import_validator)
-    return (app_elf_augmented, app_elf_raw, app_elf_import_validator)
+    app_artifacts.validator = app_env.ValidateAppImports(app_artifacts.compact)
+    app_env.AlwaysBuild(app_artifacts.validator)
+    app_env.Alias(app_alias, app_artifacts.validator)
+
+    env["EXT_APPS"][app.appid] = app_artifacts
+    return app_artifacts
 
 
 def prepare_app_metadata(target, source, env):
@@ -157,7 +174,6 @@ def prepare_app_metadata(target, source, env):
     app = env["APP"]
     meta_file_name = source[0].path + ".meta"
     with open(meta_file_name, "wb") as f:
-        # f.write(f"hello this is {app}")
         f.write(
             assemble_manifest_data(
                 app_manifest=app,
@@ -175,11 +191,17 @@ def validate_app_imports(target, source, env):
             app_syms.add(line.split()[0])
     unresolved_syms = app_syms - sdk_cache.get_valid_names()
     if unresolved_syms:
-        SCons.Warnings.warn(
-            SCons.Warnings.LinkWarning,
-            fg.brightyellow(f"{source[0].path}: app won't run. Unresolved symbols: ")
-            + fg.brightmagenta(f"{unresolved_syms}"),
-        )
+        warning_msg = fg.brightyellow(
+            f"{source[0].path}: app won't run. Unresolved symbols: "
+        ) + fg.brightmagenta(f"{unresolved_syms}")
+        disabled_api_syms = unresolved_syms.intersection(sdk_cache.get_disabled_names())
+        if disabled_api_syms:
+            warning_msg += (
+                fg.brightyellow(" (in API, but disabled: ")
+                + fg.brightmagenta(f"{disabled_api_syms}")
+                + fg.brightyellow(")")
+            )
+        SCons.Warnings.warn(SCons.Warnings.LinkWarning, warning_msg),
 
 
 def GetExtAppFromPath(env, app_dir):
@@ -201,26 +223,26 @@ def GetExtAppFromPath(env, app_dir):
     if not app:
         raise UserError(f"Failed to resolve application for given APPSRC={app_dir}")
 
-    app_elf = env["_extapps"]["compact"].get(app.appid, None)
-    if not app_elf:
+    app_artifacts = env["EXT_APPS"].get(app.appid, None)
+    if not app_artifacts:
         raise UserError(
             f"Application {app.appid} is not configured for building as external"
         )
 
-    app_validator = env["_extapps"]["validators"].get(app.appid, None)
-
-    return (app, app_elf[0], app_validator[0])
+    return app_artifacts
 
 
 def fap_dist_emitter(target, source, env):
     target_dir = target[0]
 
     target = []
-    for dist_entry in env["_extapps"]["dist"].values():
-        target.append(target_dir.Dir(dist_entry[0]).File(dist_entry[1][0].name))
-
-    for compact_entry in env["_extapps"]["compact"].values():
-        source.extend(compact_entry)
+    for _, app_artifacts in env["EXT_APPS"].items():
+        source.extend(app_artifacts.compact)
+        target.append(
+            target_dir.Dir(app_artifacts.app.fap_category).File(
+                app_artifacts.compact[0].name
+            )
+        )
 
     return (target, source)
 
@@ -236,8 +258,10 @@ def fap_dist_action(target, source, env):
 
 
 def generate(env, **kw):
-    env.SetDefault(EXT_APPS_WORK_DIR=kw.get("EXT_APPS_WORK_DIR"))
-
+    env.SetDefault(
+        EXT_APPS_WORK_DIR="${FBT_FAP_DEBUG_ELF_ROOT}",
+        APP_RUN_SCRIPT="${FBT_SCRIPT_DIR}/runfap.py",
+    )
     if not env["VERBOSE"]:
         env.SetDefault(
             FAPDISTCOMSTR="\tFAPDIST\t${TARGET}",
@@ -246,6 +270,10 @@ def generate(env, **kw):
             APPCHECK_COMSTR="\tAPPCHK\t${SOURCE}",
         )
 
+    env.SetDefault(
+        EXT_APPS={},  # appid -> FlipperExternalAppInfo
+    )
+
     env.AddMethod(BuildAppElf)
     env.AddMethod(GetExtAppFromPath)
     env.Append(
diff --git a/scripts/fbt_tools/fbt_sdk.py b/scripts/fbt_tools/fbt_sdk.py
index f1f55bdb8..c46346b65 100644
--- a/scripts/fbt_tools/fbt_sdk.py
+++ b/scripts/fbt_tools/fbt_sdk.py
@@ -46,7 +46,9 @@ def prebuild_sdk_emitter(target, source, env):
 def prebuild_sdk_create_origin_file(target, source, env):
     mega_file = env.subst("${TARGET}.c", target=target[0])
     with open(mega_file, "wt") as sdk_c:
-        sdk_c.write("\n".join(f"#include <{h.path}>" for h in env["SDK_HEADERS"]))
+        sdk_c.write(
+            "\n".join(f"#include <{h.srcnode().path}>" for h in env["SDK_HEADERS"])
+        )
 
 
 class SdkMeta:
@@ -62,18 +64,25 @@ class SdkMeta:
             "cc_args": self._wrap_scons_vars("$CCFLAGS $_CCCOMCOM"),
             "cpp_args": self._wrap_scons_vars("$CXXFLAGS $CCFLAGS $_CCCOMCOM"),
             "linker_args": self._wrap_scons_vars("$LINKFLAGS"),
-            "linker_script": self.env.subst("${LINKER_SCRIPT_PATH}"),
+            "linker_libs": self.env.subst("${LIBS}"),
+            "app_ep_subst": self.env.subst("${APP_ENTRY}"),
+            "sdk_path_subst": self.env.subst("${SDK_DIR_SUBST}"),
+            "hardware": self.env.subst("${TARGET_HW}"),
         }
         with open(json_manifest_path, "wt") as f:
             json.dump(meta_contents, f, indent=4)
 
     def _wrap_scons_vars(self, vars: str):
-        expanded_vars = self.env.subst(vars, target=Entry("dummy"))
+        expanded_vars = self.env.subst(
+            vars,
+            target=Entry("dummy"),
+        )
         return expanded_vars.replace("\\", "/")
 
 
 class SdkTreeBuilder:
     SDK_DIR_SUBST = "SDK_ROOT_DIR"
+    SDK_APP_EP_SUBST = "SDK_APP_EP_SUBST"
 
     def __init__(self, env, target, source) -> None:
         self.env = env
@@ -87,6 +96,11 @@ class SdkTreeBuilder:
         self.sdk_root_dir = target[0].Dir(".")
         self.sdk_deploy_dir = self.sdk_root_dir.Dir(self.target_sdk_dir_name)
 
+        self.sdk_env = self.env.Clone(
+            APP_ENTRY=self.SDK_APP_EP_SUBST,
+            SDK_DIR_SUBST=self.SDK_DIR_SUBST,
+        )
+
     def _parse_sdk_depends(self):
         deps_file = self.source[0]
         with open(deps_file.path, "rt") as deps_f:
@@ -95,38 +109,36 @@ class SdkTreeBuilder:
             self.header_depends = list(
                 filter(lambda fname: fname.endswith(".h"), depends.split()),
             )
-            self.header_depends.append(self.env.subst("${LINKER_SCRIPT_PATH}"))
-            self.header_depends.append(self.env.subst("${SDK_DEFINITION}"))
+            self.header_depends.append(self.sdk_env.subst("${LINKER_SCRIPT_PATH}"))
+            self.header_depends.append(self.sdk_env.subst("${SDK_DEFINITION}"))
             self.header_dirs = sorted(
                 set(map(os.path.normpath, map(os.path.dirname, self.header_depends)))
             )
 
     def _generate_sdk_meta(self):
-        filtered_paths = [self.target_sdk_dir_name]
+        filtered_paths = ["."]
         full_fw_paths = list(
             map(
                 os.path.normpath,
-                (self.env.Dir(inc_dir).relpath for inc_dir in self.env["CPPPATH"]),
+                (
+                    self.sdk_env.Dir(inc_dir).relpath
+                    for inc_dir in self.sdk_env["CPPPATH"]
+                ),
             )
         )
 
         sdk_dirs = ", ".join(f"'{dir}'" for dir in self.header_dirs)
         filtered_paths.extend(
-            map(
-                self.build_sdk_file_path,
-                filter(lambda path: path in sdk_dirs, full_fw_paths),
-            )
+            filter(lambda path: path in sdk_dirs, full_fw_paths),
         )
+        filtered_paths = list(map(self.build_sdk_file_path, filtered_paths))
 
-        sdk_env = self.env.Clone()
-        sdk_env.Replace(
+        self.sdk_env.Replace(
             CPPPATH=filtered_paths,
-            LINKER_SCRIPT=self.env.subst("${APP_LINKER_SCRIPT}"),
             ORIG_LINKER_SCRIPT_PATH=self.env["LINKER_SCRIPT_PATH"],
             LINKER_SCRIPT_PATH=self.build_sdk_file_path("${ORIG_LINKER_SCRIPT_PATH}"),
         )
-
-        meta = SdkMeta(sdk_env, self)
+        meta = SdkMeta(self.sdk_env, self)
         meta.save_to(self.target[0].path)
 
     def build_sdk_file_path(self, orig_path: str) -> str:
@@ -211,7 +223,7 @@ def validate_sdk_cache(source, target, env):
     current_sdk = SdkCollector()
     current_sdk.process_source_file_for_sdk(source[0].path)
     for h in env["SDK_HEADERS"]:
-        current_sdk.add_header_to_sdk(pathlib.Path(h.path).as_posix())
+        current_sdk.add_header_to_sdk(pathlib.Path(h.srcnode().path).as_posix())
 
     sdk_cache = SdkCache(target[0].path)
     sdk_cache.validate_api(current_sdk.get_api())
diff --git a/scripts/fbt_tools/fbt_version.py b/scripts/fbt_tools/fbt_version.py
index 909eea4f3..87497ca5f 100644
--- a/scripts/fbt_tools/fbt_version.py
+++ b/scripts/fbt_tools/fbt_version.py
@@ -12,11 +12,14 @@ def version_emitter(target, source, env):
 
 
 def generate(env):
+    env.SetDefault(
+        VERSION_SCRIPT="${FBT_SCRIPT_DIR}/version.py",
+    )
     env.Append(
         BUILDERS={
             "VersionBuilder": Builder(
                 action=Action(
-                    '${PYTHON3} "${ROOT_DIR.abspath}/scripts/version.py" generate -t ${TARGET_HW} -o ${TARGET.dir.posix} --dir "${ROOT_DIR}"',
+                    '${PYTHON3} "${VERSION_SCRIPT}" generate -t ${TARGET_HW} -o ${TARGET.dir.posix} --dir "${ROOT_DIR}"',
                     "${VERSIONCOMSTR}",
                 ),
                 emitter=version_emitter,
diff --git a/scripts/fbt_tools/fwbin.py b/scripts/fbt_tools/fwbin.py
index 67e0d6450..f510c2a60 100644
--- a/scripts/fbt_tools/fwbin.py
+++ b/scripts/fbt_tools/fwbin.py
@@ -8,7 +8,8 @@ __NM_ARM_BIN = "arm-none-eabi-nm"
 
 def generate(env):
     env.SetDefault(
-        BIN2DFU="${ROOT_DIR.abspath}/scripts/bin2dfu.py",
+        BIN2DFU="${FBT_SCRIPT_DIR}/bin2dfu.py",
+        BIN_SIZE_SCRIPT="${FBT_SCRIPT_DIR}/fwsize.py",
         OBJCOPY=__OBJCOPY_ARM_BIN,  # FIXME
         NM=__NM_ARM_BIN,  # FIXME
     )
diff --git a/scripts/flipper/app.py b/scripts/flipper/app.py
index 958356021..30630a5f9 100644
--- a/scripts/flipper/app.py
+++ b/scripts/flipper/app.py
@@ -1,6 +1,7 @@
 import logging
 import argparse
 import sys
+import colorlog
 
 
 class App:
@@ -10,7 +11,7 @@ class App:
         self.parser = argparse.ArgumentParser()
         self.parser.add_argument("-d", "--debug", action="store_true", help="Debug")
         # Logging
-        self.logger = logging.getLogger()
+        self.logger = colorlog.getLogger()
         # Application specific initialization
         self.init()
 
@@ -21,10 +22,17 @@ class App:
         self.log_level = logging.DEBUG if self.args.debug else logging.INFO
         self.logger.setLevel(self.log_level)
         if not self.logger.hasHandlers():
-            self.handler = logging.StreamHandler(sys.stdout)
+            self.handler = colorlog.StreamHandler(sys.stdout)
             self.handler.setLevel(self.log_level)
-            self.formatter = logging.Formatter(
-                "%(asctime)s [%(levelname)s] %(message)s"
+            self.formatter = colorlog.ColoredFormatter(
+                "%(log_color)s%(asctime)s [%(levelname)s] %(message)s",
+                log_colors={
+                    "DEBUG": "cyan",
+                    # "INFO": "white",
+                    "WARNING": "yellow",
+                    "ERROR": "red",
+                    "CRITICAL": "red,bg_white",
+                },
             )
             self.handler.setFormatter(self.formatter)
             self.logger.addHandler(self.handler)
diff --git a/scripts/requirements.txt b/scripts/requirements.txt
index 35cac7742..5b6fac5f7 100644
--- a/scripts/requirements.txt
+++ b/scripts/requirements.txt
@@ -1,7 +1,9 @@
-pyserial==3.5
+ansi==0.3.6
+black==22.6.0
+colorlog==6.7.0
 heatshrink2==0.11.0
 Pillow==9.1.1
-grpcio==1.47.0
-grpcio-tools==1.47.0
-protobuf==3.20.2
+protobuf==3.20.1
+pyserial==3.5
 python3-protobuf==2.5.0
+SCons==4.4.0
diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py
index 4cbea7bd9..0fa120d87 100644
--- a/scripts/sconsdist.py
+++ b/scripts/sconsdist.py
@@ -131,7 +131,9 @@ class Main(App):
             self.copy_single_project(project)
 
         self.logger.info(
-            fg.green(f"Firmware binaries can be found at:\n\t{self.output_dir_path}")
+            fg.boldgreen(
+                f"Firmware binaries can be found at:\n\t{self.output_dir_path}"
+            )
         )
 
         if self.args.version:
@@ -175,7 +177,7 @@ class Main(App):
 
             if (bundle_result := UpdateMain(no_exit=True)(bundle_args)) == 0:
                 self.logger.info(
-                    fg.green(
+                    fg.boldgreen(
                         f"Use this directory to self-update your Flipper:\n\t{bundle_dir}"
                     )
                 )
diff --git a/scripts/testing/await_flipper.py b/scripts/testing/await_flipper.py
old mode 100644
new mode 100755
diff --git a/scripts/testing/units.py b/scripts/testing/units.py
old mode 100644
new mode 100755
diff --git a/scripts/toolchain/fbtenv.cmd b/scripts/toolchain/fbtenv.cmd
index a11a3ccd5..44a2551f7 100644
--- a/scripts/toolchain/fbtenv.cmd
+++ b/scripts/toolchain/fbtenv.cmd
@@ -13,19 +13,22 @@ if not [%FBT_NOENV%] == [] (
     exit /b 0
 )
 
-set "FLIPPER_TOOLCHAIN_VERSION=16"
-set "FBT_TOOLCHAIN_ROOT=%FBT_ROOT%\toolchain\x86_64-windows"
+set "FLIPPER_TOOLCHAIN_VERSION=19"
 
+if [%FBT_TOOLCHAIN_ROOT%] == [] (
+    set "FBT_TOOLCHAIN_ROOT=%FBT_ROOT%\toolchain\x86_64-windows"
+)
 
 if not exist "%FBT_TOOLCHAIN_ROOT%" (
-    powershell -ExecutionPolicy Bypass -File "%FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1" "%flipper_toolchain_version%"
+    powershell -ExecutionPolicy Bypass -File "%FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1" "%flipper_toolchain_version%" "%FBT_TOOLCHAIN_ROOT%"
 )
 if not exist "%FBT_TOOLCHAIN_ROOT%\VERSION" (
-    powershell -ExecutionPolicy Bypass -File "%FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1" "%flipper_toolchain_version%"
+    powershell -ExecutionPolicy Bypass -File "%FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1" "%flipper_toolchain_version%" "%FBT_TOOLCHAIN_ROOT%"
 )
+
 set /p REAL_TOOLCHAIN_VERSION=<"%FBT_TOOLCHAIN_ROOT%\VERSION"
 if not "%REAL_TOOLCHAIN_VERSION%" == "%FLIPPER_TOOLCHAIN_VERSION%" (
-    powershell -ExecutionPolicy Bypass -File "%FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1" "%flipper_toolchain_version%"
+    powershell -ExecutionPolicy Bypass -File "%FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1" "%flipper_toolchain_version%" "%FBT_TOOLCHAIN_ROOT%"
 )
 
 
diff --git a/scripts/toolchain/fbtenv.sh b/scripts/toolchain/fbtenv.sh
index a2b292c65..8f633a8bc 100755
--- a/scripts/toolchain/fbtenv.sh
+++ b/scripts/toolchain/fbtenv.sh
@@ -5,7 +5,7 @@
 # public variables
 DEFAULT_SCRIPT_PATH="$(pwd -P)";
 SCRIPT_PATH="${SCRIPT_PATH:-$DEFAULT_SCRIPT_PATH}";
-FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"16"}";
+FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"19"}";
 FBT_TOOLCHAIN_PATH="${FBT_TOOLCHAIN_PATH:-$SCRIPT_PATH}";
 
 fbtenv_show_usage()
@@ -62,7 +62,7 @@ fbtenv_check_sourced()
         fbtenv_show_usage;
         return 1;
     fi
-    case ${0##*/} in dash|-dash|bash|-bash|ksh|-ksh|sh|-sh|*.sh|fbt)
+    case ${0##*/} in dash|-dash|bash|-bash|ksh|-ksh|sh|-sh|*.sh|fbt|ufbt)
         return 0;;
     esac
     fbtenv_show_usage;
@@ -76,8 +76,8 @@ fbtenv_chck_many_source()
             return 0;
         fi
     fi
-    echo "Warning! FBT environment script sourced more than once!";
-    echo "This may signal that you are making mistakes, please open a new shell!";
+    echo "Warning! FBT environment script was sourced more than once!";
+    echo "You might be doing things wrong, please open a new shell!";
     return 1;
 }
 
@@ -93,8 +93,8 @@ fbtenv_set_shell_prompt()
 
 fbtenv_check_script_path()
 {
-    if [ ! -x "$SCRIPT_PATH/fbt" ]; then
-        echo "Please source this script being into flipperzero-firmware root directory, or specify 'SCRIPT_PATH' manually";
+    if [ ! -x "$SCRIPT_PATH/fbt" ] && [ ! -x "$SCRIPT_PATH/ufbt" ] ; then
+        echo "Please source this script from [u]fbt root directory, or specify 'SCRIPT_PATH' variable manually";
         echo "Example:";
         printf "\tSCRIPT_PATH=lang/c/flipperzero-firmware source lang/c/flipperzero-firmware/scripts/fbtenv.sh\n";
         echo "If current directory is right, type 'unset SCRIPT_PATH' and try again"
@@ -108,7 +108,7 @@ fbtenv_get_kernel_type()
     SYS_TYPE="$(uname -s)";
     ARCH_TYPE="$(uname -m)";
     if [ "$ARCH_TYPE" != "x86_64" ] && [ "$SYS_TYPE" != "Darwin" ]; then
-        echo "Now we provide toolchain only for x86_64 arhitecture, sorry..";
+        echo "We only provide toolchain for x86_64 CPUs, sorry..";
         return 1;
     fi
     if [ "$SYS_TYPE" = "Darwin" ]; then
@@ -129,10 +129,10 @@ fbtenv_get_kernel_type()
             TOOLCHAIN_URL=$FBT_TOOLS_CUSTOM_LINK;
         fi
     elif echo "$SYS_TYPE" | grep -q "MINGW"; then
-        echo "In MinGW shell use \"fbt.cmd\" instead of \"fbt\"";
+        echo "In MinGW shell use \"[u]fbt.cmd\" instead of \"[u]fbt\"";
         return 1;
     else
-        echo "Your system is not recognized. Sorry.. Please report us your configuration.";
+        echo "Your system configuration is not supported. Sorry.. Please report us your configuration.";
         return 1;
     fi
     return 0;
@@ -152,7 +152,7 @@ fbtenv_check_rosetta()
 
 fbtenv_check_tar()
 {
-    printf "Checking tar..";
+    printf "Checking for tar..";
     if ! tar --version > /dev/null 2>&1; then
         echo "no";
         return 1;
@@ -163,7 +163,7 @@ fbtenv_check_tar()
 
 fbtenv_check_downloaded_toolchain()
 {
-    printf "Checking downloaded toolchain tgz..";
+    printf "Checking if downloaded toolchain tgz exists..";
     if [ ! -f "$FBT_TOOLCHAIN_PATH/toolchain/$TOOLCHAIN_TAR" ]; then
         echo "no";
         return 1;
@@ -214,7 +214,7 @@ fbtenv_unpack_toolchain()
 
 fbtenv_clearing()
 {
-    printf "Clearing..";
+    printf "Cleaning up..";
     if [ -n "${FBT_TOOLCHAIN_PATH:-""}" ]; then
         rm -rf "${FBT_TOOLCHAIN_PATH:?}/toolchain/"*.tar.gz;
         rm -rf "${FBT_TOOLCHAIN_PATH:?}/toolchain/"*.part;
diff --git a/scripts/toolchain/windows-toolchain-download.ps1 b/scripts/toolchain/windows-toolchain-download.ps1
index aaed89856..c96bb119c 100644
--- a/scripts/toolchain/windows-toolchain-download.ps1
+++ b/scripts/toolchain/windows-toolchain-download.ps1
@@ -1,34 +1,46 @@
 Set-StrictMode -Version 2.0
 $ErrorActionPreference = "Stop"
 [Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls"
-$repo_root = (Get-Item "$PSScriptRoot\..\..").FullName
+# TODO: fix
+$download_dir = (Get-Item "$PSScriptRoot\..\..").FullName
 $toolchain_version = $args[0]
-$toolchain_url = "https://update.flipperzero.one/builds/toolchain/gcc-arm-none-eabi-10.3-x86_64-windows-flipper-$toolchain_version.zip"
-$toolchain_zip = "gcc-arm-none-eabi-10.3-x86_64-windows-flipper-$toolchain_version.zip"
-$toolchain_dir = "gcc-arm-none-eabi-10.3-x86_64-windows-flipper"
+$toolchain_target_path = $args[1]
 
-if (Test-Path -LiteralPath "$repo_root\toolchain\x86_64-windows") {
+$toolchain_url = "https://update.flipperzero.one/builds/toolchain/gcc-arm-none-eabi-10.3-x86_64-windows-flipper-$toolchain_version.zip"
+$toolchain_dist_folder = "gcc-arm-none-eabi-10.3-x86_64-windows-flipper"
+$toolchain_zip = "$toolchain_dist_folder-$toolchain_version.zip"
+
+$toolchain_zip_temp_path = "$download_dir\$toolchain_zip"
+$toolchain_dist_temp_path = "$download_dir\$toolchain_dist_folder"
+
+if (Test-Path -LiteralPath "$toolchain_target_path") {
 	Write-Host -NoNewline "Removing old Windows toolchain.."
-	Remove-Item -LiteralPath "$repo_root\toolchain\x86_64-windows" -Force -Recurse
+	Remove-Item -LiteralPath "$toolchain_target_path" -Force -Recurse
 	Write-Host "done!"
 }
-if (!(Test-Path -Path "$repo_root\$toolchain_zip" -PathType Leaf)) {
+if (!(Test-Path -Path "$toolchain_zip_temp_path" -PathType Leaf)) {
     Write-Host -NoNewline "Downloading Windows toolchain.."
     $wc = New-Object net.webclient
-    $wc.Downloadfile("$toolchain_url", "$repo_root\$toolchain_zip")
+    $wc.Downloadfile("$toolchain_url", "$toolchain_zip_temp_path")
     Write-Host "done!"
 }
 
-if (!(Test-Path -LiteralPath "$repo_root\toolchain")) {
-    New-Item "$repo_root\toolchain" -ItemType Directory
+if (!(Test-Path -LiteralPath "$toolchain_target_path\..")) {
+    New-Item "$toolchain_target_path\.." -ItemType Directory -Force
 }
 
 Write-Host -NoNewline "Extracting Windows toolchain.."
+# This is faster than Expand-Archive
 Add-Type -Assembly "System.IO.Compression.Filesystem"
-[System.IO.Compression.ZipFile]::ExtractToDirectory("$repo_root\$toolchain_zip", "$repo_root\")
-Move-Item -Path "$repo_root\$toolchain_dir" -Destination "$repo_root\toolchain\x86_64-windows"
+[System.IO.Compression.ZipFile]::ExtractToDirectory("$toolchain_zip_temp_path", "$download_dir")
+# Expand-Archive -LiteralPath "$toolchain_zip_temp_path" -DestinationPath "$download_dir"
+
+Write-Host -NoNewline "moving.."
+Move-Item -LiteralPath "$toolchain_dist_temp_path" -Destination "$toolchain_target_path"
 Write-Host "done!"
 
 Write-Host -NoNewline "Cleaning up temporary files.."
-Remove-Item -LiteralPath "$repo_root\$toolchain_zip" -Force
+Remove-Item -LiteralPath "$toolchain_zip_temp_path" -Force
 Write-Host "done!"
+
+# dasdasd
\ No newline at end of file
diff --git a/site_scons/cc.scons b/site_scons/cc.scons
index c923b3872..1eb6a3376 100644
--- a/site_scons/cc.scons
+++ b/site_scons/cc.scons
@@ -30,10 +30,9 @@ ENV.AppendUnique(
         "-ffunction-sections",
         "-fsingle-precision-constant",
         "-fno-math-errno",
-        "-fstack-usage",
+        # Generates .su files with stack usage information
+        # "-fstack-usage",
         "-g",
-        # "-Wno-stringop-overread",
-        # "-Wno-stringop-overflow",
     ],
     CPPDEFINES=[
         "_GNU_SOURCE",
diff --git a/site_scons/commandline.scons b/site_scons/commandline.scons
index 8c52c4a7f..ca9c3628c 100644
--- a/site_scons/commandline.scons
+++ b/site_scons/commandline.scons
@@ -152,7 +152,7 @@ vars.AddVariables(
     PathVariable(
         "SVD_FILE",
         help="Path to SVD file",
-        validator=PathVariable.PathIsFile,
+        validator=PathVariable.PathAccept,
         default="",
     ),
     PathVariable(
diff --git a/site_scons/environ.scons b/site_scons/environ.scons
index 5074716da..128a667f1 100644
--- a/site_scons/environ.scons
+++ b/site_scons/environ.scons
@@ -1,5 +1,10 @@
 from SCons.Platform import TempFileMunge
-from fbt.util import tempfile_arg_esc_func, single_quote, wrap_tempfile
+from fbt.util import (
+    tempfile_arg_esc_func,
+    single_quote,
+    wrap_tempfile,
+    extract_abs_dir_path,
+)
 
 import os
 import multiprocessing
@@ -53,6 +58,12 @@ coreenv = VAR_ENV.Clone(
     MAXLINELENGTH=2048,
     PROGSUFFIX=".elf",
     ENV=forward_os_env,
+    SINGLEQUOTEFUNC=single_quote,
+    ABSPATHGETTERFUNC=extract_abs_dir_path,
+    # Setting up temp file parameters - to overcome command line length limits
+    TEMPFILEARGESCFUNC=tempfile_arg_esc_func,
+    ROOT_DIR=Dir("#"),
+    FBT_SCRIPT_DIR="${ROOT_DIR}/scripts",
 )
 
 # If DIST_SUFFIX is set in environment, is has precedence (set by CI)
@@ -61,24 +72,6 @@ if os_suffix := os.environ.get("DIST_SUFFIX", None):
         DIST_SUFFIX=os_suffix,
     )
 
-# print(coreenv.Dump())
-if not coreenv["VERBOSE"]:
-    coreenv.SetDefault(
-        CCCOMSTR="\tCC\t${SOURCE}",
-        CXXCOMSTR="\tCPP\t${SOURCE}",
-        ASCOMSTR="\tASM\t${SOURCE}",
-        ARCOMSTR="\tAR\t${TARGET}",
-        RANLIBCOMSTR="\tRANLIB\t${TARGET}",
-        LINKCOMSTR="\tLINK\t${TARGET}",
-        INSTALLSTR="\tINSTALL\t${TARGET}",
-        APPSCOMSTR="\tAPPS\t${TARGET}",
-        VERSIONCOMSTR="\tVERSION\t${TARGET}",
-        STRIPCOMSTR="\tSTRIP\t${TARGET}",
-        OBJDUMPCOMSTR="\tOBJDUMP\t${TARGET}",
-        # GDBCOMSTR="\tGDB\t${SOURCE}",
-        # GDBPYCOMSTR="\tGDB-PY\t${SOURCE}",
-    )
-
 # Default value for commandline options
 
 SetOption("num_jobs", multiprocessing.cpu_count())
@@ -91,12 +84,7 @@ SetOption("max_drift", 1)
 # Random task queue - to discover isses with build logic faster
 # SetOption("random", 1)
 
-
-# Setting up temp file parameters - to overcome command line length limits
-coreenv["TEMPFILEARGESCFUNC"] = tempfile_arg_esc_func
 wrap_tempfile(coreenv, "LINKCOM")
 wrap_tempfile(coreenv, "ARCOM")
 
-coreenv["SINGLEQUOTEFUNC"] = single_quote
-
 Return("coreenv")
diff --git a/site_scons/extapps.scons b/site_scons/extapps.scons
index 90d228e58..670d71fd0 100644
--- a/site_scons/extapps.scons
+++ b/site_scons/extapps.scons
@@ -1,22 +1,17 @@
+from dataclasses import dataclass, field
 from SCons.Errors import UserError
+from SCons.Node import NodeList
 
 
 Import("ENV")
 
-
 from fbt.appmanifest import FlipperAppType
 
-appenv = ENV.Clone(
+appenv = ENV["APPENV"] = ENV.Clone(
     tools=[
-        (
-            "fbt_extapps",
-            {
-                "EXT_APPS_WORK_DIR": ENV.subst(
-                    "${BUILD_DIR}/.extapps",
-                )
-            },
-        ),
+        "fbt_extapps",
         "fbt_assets",
+        "fbt_sdk",
     ]
 )
 
@@ -60,21 +55,11 @@ appenv.AppendUnique(
 )
 
 
-extapps = appenv["_extapps"] = {
-    "compact": {},
-    "debug": {},
-    "validators": {},
-    "dist": {},
-    "resources_dist": None,
-}
-
-
-def build_app_as_external(env, appdef):
-    compact_elf, debug_elf, validator = env.BuildAppElf(appdef)
-    extapps["compact"][appdef.appid] = compact_elf
-    extapps["debug"][appdef.appid] = debug_elf
-    extapps["validators"][appdef.appid] = validator
-    extapps["dist"][appdef.appid] = (appdef.fap_category, compact_elf)
+@dataclass
+class FlipperExtAppBuildArtifacts:
+    applications: dict = field(default_factory=dict)
+    resources_dist: NodeList = field(default_factory=NodeList)
+    sdk_tree: NodeList = field(default_factory=NodeList)
 
 
 apps_to_build_as_faps = [
@@ -84,41 +69,75 @@ apps_to_build_as_faps = [
 if appenv["DEBUG_TOOLS"]:
     apps_to_build_as_faps.append(FlipperAppType.DEBUG)
 
-for apptype in apps_to_build_as_faps:
-    for app in appenv["APPBUILD"].get_apps_of_type(apptype, True):
-        build_app_as_external(appenv, app)
+known_extapps = [
+    app
+    for apptype in apps_to_build_as_faps
+    for app in appenv["APPBUILD"].get_apps_of_type(apptype, True)
+]
 
 # Ugly access to global option
 if extra_app_list := GetOption("extra_ext_apps"):
-    for extra_app in extra_app_list.split(","):
-        build_app_as_external(appenv, appenv["APPMGR"].get(extra_app))
+    known_extapps.extend(map(appenv["APPMGR"].get, extra_app_list.split(",")))
+
+for app in known_extapps:
+    appenv.BuildAppElf(app)
 
 
 if appenv["FORCE"]:
-    appenv.AlwaysBuild(extapps["compact"].values())
+    appenv.AlwaysBuild(
+        list(app_artifact.compact for app_artifact in appenv["EXT_APPS"].values())
+    )
 
 
-# Deprecation stub
-def legacy_app_build_stub(**kw):
-    raise UserError(f"Target name 'firmware_extapps' is deprecated, use 'faps' instead")
+Alias(
+    "faps", list(app_artifact.validator for app_artifact in appenv["EXT_APPS"].values())
+)
 
-
-appenv.PhonyTarget("firmware_extapps", appenv.Action(legacy_app_build_stub, None))
-
-
-Alias("faps", extapps["compact"].values())
-Alias("faps", extapps["validators"].values())
-
-extapps["resources_dist"] = appenv.FapDist(appenv.Dir("#/assets/resources/apps"), [])
+extapps = FlipperExtAppBuildArtifacts()
+extapps.applications = appenv["EXT_APPS"]
+extapps.resources_dist = appenv.FapDist(appenv.Dir("#/assets/resources/apps"), [])
 
 if appsrc := appenv.subst("$APPSRC"):
-    app_manifest, fap_file, app_validator = appenv.GetExtAppFromPath(appsrc)
+    app_artifacts = appenv.GetExtAppFromPath(appsrc)
     appenv.PhonyTarget(
         "launch_app",
-        '${PYTHON3} scripts/runfap.py ${SOURCE} --fap_dst_dir "/ext/apps/${FAP_CATEGORY}"',
-        source=fap_file,
-        FAP_CATEGORY=app_manifest.fap_category,
+        '${PYTHON3} "${APP_RUN_SCRIPT}" "${SOURCE}" --fap_dst_dir "/ext/apps/${FAP_CATEGORY}"',
+        source=app_artifacts.compact,
+        FAP_CATEGORY=app_artifacts.app.fap_category,
     )
-    appenv.Alias("launch_app", app_validator)
+    appenv.Alias("launch_app", app_artifacts.validator)
+
+# SDK management
+
+sdk_origin_path = "${BUILD_DIR}/sdk_origin"
+sdk_source = appenv.SDKPrebuilder(
+    sdk_origin_path,
+    # Deps on root SDK headers and generated files
+    (appenv["SDK_HEADERS"], appenv["FW_ASSETS_HEADERS"]),
+)
+# Extra deps on headers included in deeper levels
+# Available on second and subsequent builds
+Depends(sdk_source, appenv.ProcessSdkDepends(f"{sdk_origin_path}.d"))
+
+appenv["SDK_DIR"] = appenv.Dir("${BUILD_DIR}/sdk")
+sdk_tree = appenv.SDKTree(appenv["SDK_DIR"], sdk_origin_path)
+# AlwaysBuild(sdk_tree)
+Alias("sdk_tree", sdk_tree)
+extapps.sdk_tree = sdk_tree
+
+sdk_apicheck = appenv.SDKSymUpdater(appenv["SDK_DEFINITION"], sdk_origin_path)
+Precious(sdk_apicheck)
+NoClean(sdk_apicheck)
+AlwaysBuild(sdk_apicheck)
+Alias("sdk_check", sdk_apicheck)
+
+sdk_apisyms = appenv.SDKSymGenerator(
+    "${BUILD_DIR}/assets/compiled/symbols.h", appenv["SDK_DEFINITION"]
+)
+Alias("api_syms", sdk_apisyms)
+
+if appenv["FORCE"]:
+    appenv.AlwaysBuild(sdk_source, sdk_tree, sdk_apicheck, sdk_apisyms)
+
 
 Return("extapps")