diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e02c931a..b72d9ea6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -42,10 +42,10 @@
 /applications/examples/example_thermo/ @skotopes @DrZlo13 @hedger @gsurkov
 
 # Firmware targets
-/firmware/ @skotopes @DrZlo13 @hedger @nminaylov
+/targets/ @skotopes @DrZlo13 @hedger @nminaylov
 
 # Assets
-/assets/resources/infrared/ @skotopes @DrZlo13 @hedger @gsurkov
+/applications/main/infrared/resources/ @skotopes @DrZlo13 @hedger @gsurkov
 
 # Documentation
 /documentation/ @skotopes @DrZlo13 @hedger @drunkbatya
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4c553506..38b1d7b6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
 
       - name: 'Checkout code'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           ref: ${{ github.event.pull_request.head.sha }}
@@ -51,11 +51,11 @@ jobs:
       - name: 'Check API versions for consistency between targets'
         run: |
           set -e
-          N_API_HEADER_SIGNATURES=`ls -1 firmware/targets/f*/api_symbols.csv | xargs -I {} sh -c "head -n2 {} | md5sum" | sort -u | wc -l`
+          N_API_HEADER_SIGNATURES=`ls -1 targets/f*/api_symbols.csv | xargs -I {} sh -c "head -n2 {} | md5sum" | sort -u | wc -l`
           if [ $N_API_HEADER_SIGNATURES != 1 ] ; then
             echo API versions aren\'t matching for available targets. Please update!
             echo API versions are:
-            head -n2 firmware/targets/f*/api_symbols.csv
+            head -n2 targets/f*/api_symbols.csv
             exit 1
           fi
 
@@ -76,7 +76,7 @@ jobs:
           mkdir artifacts map_analyser_files
           cp dist/${TARGET}-*/* artifacts/ || true
           tar czpf "artifacts/flipper-z-${TARGET}-resources-${SUFFIX}.tgz" \
-            -C assets resources
+            -C build/latest resources
           tar czpf "artifacts/flipper-z-${TARGET}-debugapps-${SUFFIX}.tgz" \
             -C dist/${TARGET}-*/apps/Debug .
           tar czpf "artifacts/flipper-z-${TARGET}-appsymbols-${SUFFIX}.tgz" \
diff --git a/.github/workflows/build_compact.yml b/.github/workflows/build_compact.yml
index c63be24a..f4527520 100644
--- a/.github/workflows/build_compact.yml
+++ b/.github/workflows/build_compact.yml
@@ -19,7 +19,7 @@ jobs:
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
 
       - name: 'Checkout code'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: false
@@ -46,7 +46,7 @@ jobs:
           echo "hw-target-code=$TARGET" >> $GITHUB_OUTPUT
 
       - name: Deploy uFBT with SDK
-        uses: flipperdevices/flipperzero-ufbt-action@v0.1.0
+        uses: flipperdevices/flipperzero-ufbt-action@v0.1
         with:
           task: setup
           sdk-file: ${{ steps.build-fw.outputs.sdk-file }}
diff --git a/.github/workflows/lint_and_submodule_check.yml b/.github/workflows/lint_and_submodule_check.yml
index d24422b7..3f4d8c79 100644
--- a/.github/workflows/lint_and_submodule_check.yml
+++ b/.github/workflows/lint_and_submodule_check.yml
@@ -16,14 +16,14 @@ jobs:
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
 
       - name: 'Checkout code'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 2
           ref: ${{ github.sha }}
 
       - name: 'Check protobuf branch'
         run: |
-          git submodule update --init
+          git submodule update --init;
           SUB_PATH="assets/protobuf";
           SUB_BRANCH="dev";
           SUB_COMMITS_MIN=40;
diff --git a/.github/workflows/merge_report.yml b/.github/workflows/merge_report.yml
index fedc4b87..90302ce1 100644
--- a/.github/workflows/merge_report.yml
+++ b/.github/workflows/merge_report.yml
@@ -16,7 +16,7 @@ jobs:
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
 
       - name: 'Checkout code'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           ref: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/pvs_studio.yml b/.github/workflows/pvs_studio.yml
index 4f650f1b..4527e292 100644
--- a/.github/workflows/pvs_studio.yml
+++ b/.github/workflows/pvs_studio.yml
@@ -21,7 +21,7 @@ jobs:
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
 
       - name: 'Checkout code'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           ref: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 2680f520..40f72bd0 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -17,7 +17,7 @@ jobs:
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           ref: ${{ github.event.pull_request.head.sha }}
@@ -32,7 +32,7 @@ jobs:
         if: success()
         timeout-minutes: 10
         run: |
-          ./fbt flash SWD_TRANSPORT_SERIAL=2A0906016415303030303032 LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1
+          ./fbt resources firmware_latest flash SWD_TRANSPORT_SERIAL=2A0906016415303030303032 LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1
 
       - name: 'Wait for flipper and format ext'
         id: format_ext
@@ -50,8 +50,8 @@ jobs:
         run: |
           source scripts/toolchain/fbtenv.sh
           python3 scripts/testing/await_flipper.py ${{steps.device.outputs.flipper}}
-          python3 scripts/storage.py -p ${{steps.device.outputs.flipper}} -f send assets/resources /ext
-          python3 scripts/storage.py -p ${{steps.device.outputs.flipper}} -f send assets/unit_tests /ext/unit_tests
+          rm -rf build/latest/resources/dolphin
+          python3 scripts/storage.py -p ${{steps.device.outputs.flipper}} -f send build/latest/resources /ext
           python3 scripts/power.py -p ${{steps.device.outputs.flipper}} reboot
           python3 scripts/testing/await_flipper.py ${{steps.device.outputs.flipper}}
 
diff --git a/.github/workflows/updater_test.yml b/.github/workflows/updater_test.yml
index 9987fdd3..b14b618a 100644
--- a/.github/workflows/updater_test.yml
+++ b/.github/workflows/updater_test.yml
@@ -17,7 +17,7 @@ jobs:
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: false
@@ -56,7 +56,7 @@ jobs:
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
 
       - name: 'Checkout latest release'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: failure()
         with:
           fetch-depth: 1
diff --git a/SConstruct b/SConstruct
index 36e06002..a2c5cd9e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -67,22 +67,22 @@ if GetOption("fullenv") or any(
     # Target for self-update package
     dist_basic_arguments = [
         "--bundlever",
-        '"${UPDATE_VERSION_STRING}"',
+        "${UPDATE_VERSION_STRING}",
     ]
     dist_radio_arguments = [
         "--radio",
-        '"${ROOT_DIR.abspath}/${COPRO_STACK_BIN_DIR}/${COPRO_STACK_BIN}"',
+        "${ROOT_DIR.abspath}/${COPRO_STACK_BIN_DIR}/${COPRO_STACK_BIN}",
         "--radiotype",
         "${COPRO_STACK_TYPE}",
         "${COPRO_DISCLAIMER}",
         "--obdata",
-        '"${ROOT_DIR.abspath}/${COPRO_OB_DATA}"',
+        "${ROOT_DIR.abspath}/${COPRO_OB_DATA}",
         "--stackversion",
         "${COPRO_CUBE_VERSION}",
     ]
     dist_resource_arguments = [
         "-r",
-        '"${ROOT_DIR.abspath}/assets/resources"',
+        firmware_env.subst("${RESOURCES_ROOT}"),
     ]
     dist_splash_arguments = (
         [
@@ -95,7 +95,7 @@ if GetOption("fullenv") or any(
 
     selfupdate_dist = distenv.DistCommand(
         "updater_package",
-        (distenv["DIST_DEPENDS"], firmware_env["FW_RESOURCES"]),
+        (distenv["DIST_DEPENDS"], firmware_env["FW_RESOURCES_MANIFEST"]),
         DIST_EXTRA=[
             *dist_basic_arguments,
             *dist_radio_arguments,
@@ -128,7 +128,8 @@ if GetOption("fullenv") or any(
 
     # Installation over USB & CLI
     usb_update_package = distenv.AddUsbFlashTarget(
-        "#build/usbinstall.flag", (firmware_env["FW_RESOURCES"], selfupdate_dist)
+        "#build/usbinstall.flag",
+        (firmware_env["FW_RESOURCES_MANIFEST"], selfupdate_dist),
     )
     distenv.Alias("flash_usb_full", usb_update_package)
 
@@ -166,17 +167,27 @@ Depends(
     list(app_artifact.validator for app_artifact in external_app_list),
 )
 Alias("fap_dist", fap_dist)
-# distenv.Default(fap_dist)
-
-distenv.Depends(firmware_env["FW_RESOURCES"], external_apps_artifacts.resources_dist)
 
 # Copy all faps to device
 
 fap_deploy = distenv.PhonyTarget(
     "fap_deploy",
-    "${PYTHON3} ${FBT_SCRIPT_DIR}/storage.py -p ${FLIP_PORT} send ${SOURCE} /ext/apps",
-    source=Dir("#/assets/resources/apps"),
+    Action(
+        [
+            [
+                "${PYTHON3}",
+                "${FBT_SCRIPT_DIR}/storage.py",
+                "-p",
+                "${FLIP_PORT}",
+                "send",
+                "${SOURCE}",
+                "/ext/apps",
+            ]
+        ]
+    ),
+    source=firmware_env.Dir(("${RESOURCES_ROOT}/apps")),
 )
+Depends(fap_deploy, firmware_env["FW_RESOURCES_MANIFEST"])
 
 
 # Target for bundling core2 package for qFlipper
@@ -252,7 +263,7 @@ distenv.PhonyTarget(
 distenv.PhonyTarget(
     "debug_other_blackmagic",
     "${GDBPYCOM}",
-    GDBOPTS="${GDBOPTS_BASE}  ${GDBOPTS_BLACKMAGIC}",
+    GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
     GDBREMOTE="${BLACKMAGIC_ADDR}",
     GDBPYOPTS=debug_other_opts,
 )
@@ -267,13 +278,13 @@ distenv.PhonyTarget(
 # Linter
 distenv.PhonyTarget(
     "lint",
-    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py check ${LINT_SOURCES}",
+    [["${PYTHON3}", "${FBT_SCRIPT_DIR}/lint.py", "check", "${LINT_SOURCES}"]],
     LINT_SOURCES=[n.srcnode() for n in firmware_env["LINT_SOURCES"]],
 )
 
 distenv.PhonyTarget(
     "format",
-    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py format ${LINT_SOURCES}",
+    [["${PYTHON3}", "${FBT_SCRIPT_DIR}/lint.py", "format", "${LINT_SOURCES}"]],
     LINT_SOURCES=[n.srcnode() for n in firmware_env["LINT_SOURCES"]],
 )
 
@@ -315,11 +326,13 @@ distenv.PhonyTarget(
 
 # Start Flipper CLI via PySerial's miniterm
 distenv.PhonyTarget(
-    "cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py  -p ${FLIP_PORT}"
+    "cli", [["${PYTHON3}", "${FBT_SCRIPT_DIR}/serial_cli.py", "-p", "${FLIP_PORT}"]]
 )
 
 # Update WiFi devboard firmware
-distenv.PhonyTarget("devboard_flash", "${PYTHON3} ${FBT_SCRIPT_DIR}/wifi_board.py")
+distenv.PhonyTarget(
+    "devboard_flash", [["${PYTHON3}", "${FBT_SCRIPT_DIR}/wifi_board.py"]]
+)
 
 
 # Find blackmagic probe
@@ -354,5 +367,5 @@ distenv.Alias("vscode_dist", vscode_dist)
 # Configure shell with build tools
 distenv.PhonyTarget(
     "env",
-    "@echo $( ${FBT_SCRIPT_DIR}/toolchain/fbtenv.sh $)",
+    "@echo $( ${FBT_SCRIPT_DIR.abspath}/toolchain/fbtenv.sh $)",
 )
diff --git a/applications/debug/accessor/application.fam b/applications/debug/accessor/application.fam
index 6b847271..65a6c866 100644
--- a/applications/debug/accessor/application.fam
+++ b/applications/debug/accessor/application.fam
@@ -4,7 +4,6 @@ App(
     apptype=FlipperAppType.DEBUG,
     targets=["f7"],
     entry_point="accessor_app",
-    cdefines=["APP_ACCESSOR"],
     requires=["gui"],
     stack_size=4 * 1024,
     order=40,
diff --git a/applications/debug/battery_test_app/application.fam b/applications/debug/battery_test_app/application.fam
index f97d1027..5f4acd83 100644
--- a/applications/debug/battery_test_app/application.fam
+++ b/applications/debug/battery_test_app/application.fam
@@ -3,7 +3,6 @@ App(
     name="Battery Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="battery_test_app",
-    cdefines=["APP_BATTERY_TEST"],
     requires=[
         "gui",
         "power",
diff --git a/applications/debug/blink_test/application.fam b/applications/debug/blink_test/application.fam
index c6a8a922..d7d873fb 100644
--- a/applications/debug/blink_test/application.fam
+++ b/applications/debug/blink_test/application.fam
@@ -3,7 +3,6 @@ App(
     name="Blink Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="blink_test_app",
-    cdefines=["APP_BLINK"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=10,
diff --git a/applications/debug/ccid_test/application.fam b/applications/debug/ccid_test/application.fam
index e0cbc8d8..ad907677 100644
--- a/applications/debug/ccid_test/application.fam
+++ b/applications/debug/ccid_test/application.fam
@@ -3,7 +3,6 @@ App(
     name="CCID Debug",
     apptype=FlipperAppType.DEBUG,
     entry_point="ccid_test_app",
-    cdefines=["CCID_TEST"],
     requires=[
         "gui",
     ],
diff --git a/applications/debug/crash_test/application.fam b/applications/debug/crash_test/application.fam
index 55f62f86..357efe66 100644
--- a/applications/debug/crash_test/application.fam
+++ b/applications/debug/crash_test/application.fam
@@ -3,7 +3,6 @@ App(
     name="Crash Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="crash_test_app",
-    cdefines=["APP_CRASH_TEST"],
     requires=["gui"],
     stack_size=1 * 1024,
     fap_category="Debug",
diff --git a/applications/debug/direct_draw/direct_draw.c b/applications/debug/direct_draw/direct_draw.c
index 71c65eab..63e03530 100644
--- a/applications/debug/direct_draw/direct_draw.c
+++ b/applications/debug/direct_draw/direct_draw.c
@@ -71,7 +71,7 @@ static void direct_draw_run(DirectDraw* instance) {
     size_t counter = 0;
     float fps = 0;
 
-    vTaskPrioritySet(furi_thread_get_current_id(), FuriThreadPriorityIdle);
+    furi_thread_set_current_priority(FuriThreadPriorityIdle);
 
     do {
         size_t elapsed = DWT->CYCCNT - start;
diff --git a/applications/debug/display_test/application.fam b/applications/debug/display_test/application.fam
index e8a00d2a..6a2d9c20 100644
--- a/applications/debug/display_test/application.fam
+++ b/applications/debug/display_test/application.fam
@@ -3,7 +3,6 @@ App(
     name="Display Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="display_test_app",
-    cdefines=["APP_DISPLAY_TEST"],
     requires=["gui"],
     fap_libs=["misc"],
     stack_size=1 * 1024,
diff --git a/applications/debug/file_browser_test/application.fam b/applications/debug/file_browser_test/application.fam
index 4a401a64..bb08ad2c 100644
--- a/applications/debug/file_browser_test/application.fam
+++ b/applications/debug/file_browser_test/application.fam
@@ -3,7 +3,6 @@ App(
     name="File Browser Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="file_browser_app",
-    cdefines=["APP_FILE_BROWSER_TEST"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=150,
diff --git a/applications/debug/keypad_test/application.fam b/applications/debug/keypad_test/application.fam
index 6859af26..90851950 100644
--- a/applications/debug/keypad_test/application.fam
+++ b/applications/debug/keypad_test/application.fam
@@ -3,7 +3,6 @@ App(
     name="Keypad Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="keypad_test_app",
-    cdefines=["APP_KEYPAD_TEST"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=30,
diff --git a/applications/debug/locale_test/application.fam b/applications/debug/locale_test/application.fam
index e46eeff5..d341122f 100644
--- a/applications/debug/locale_test/application.fam
+++ b/applications/debug/locale_test/application.fam
@@ -3,7 +3,6 @@ App(
     name="Locale Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="locale_test_app",
-    cdefines=["APP_LOCALE"],
     requires=["gui", "locale"],
     stack_size=2 * 1024,
     order=70,
diff --git a/applications/debug/rpc_debug_app/rpc_debug_app.c b/applications/debug/rpc_debug_app/rpc_debug_app.c
index 314be5e7..2a075638 100644
--- a/applications/debug/rpc_debug_app/rpc_debug_app.c
+++ b/applications/debug/rpc_debug_app/rpc_debug_app.c
@@ -21,22 +21,51 @@ static void rpc_debug_app_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(app->scene_manager);
 }
 
-static void rpc_debug_app_rpc_command_callback(RpcAppSystemEvent event, void* context) {
+static void
+    rpc_debug_app_format_hex(const uint8_t* data, size_t data_size, char* buf, size_t buf_size) {
+    if(data == NULL || data_size == 0) {
+        strncpy(buf, "<Data empty>", buf_size);
+        return;
+    }
+
+    const size_t byte_width = 3;
+    const size_t line_width = 7;
+
+    data_size = MIN(data_size, buf_size / (byte_width + 1));
+
+    for(size_t i = 0; i < data_size; ++i) {
+        char* p = buf + (i * byte_width);
+        char sep = !((i + 1) % line_width) ? '\n' : ' ';
+        snprintf(p, byte_width + 1, "%02X%c", data[i], sep);
+    }
+
+    buf[buf_size - 1] = '\0';
+}
+
+static void rpc_debug_app_rpc_command_callback(const RpcAppSystemEvent* event, void* context) {
     furi_assert(context);
     RpcDebugApp* app = context;
     furi_assert(app->rpc);
 
-    if(event == RpcAppEventSessionClose) {
+    if(event->type == RpcAppEventTypeSessionClose) {
         scene_manager_stop(app->scene_manager);
         view_dispatcher_stop(app->view_dispatcher);
         rpc_system_app_set_callback(app->rpc, NULL, NULL);
         app->rpc = NULL;
-    } else if(event == RpcAppEventAppExit) {
+    } else if(event->type == RpcAppEventTypeAppExit) {
         scene_manager_stop(app->scene_manager);
         view_dispatcher_stop(app->view_dispatcher);
-        rpc_system_app_confirm(app->rpc, RpcAppEventAppExit, true);
+        rpc_system_app_confirm(app->rpc, true);
+    } else if(event->type == RpcAppEventTypeDataExchange) {
+        furi_assert(event->data.type == RpcAppSystemEventDataTypeBytes);
+
+        rpc_debug_app_format_hex(
+            event->data.bytes.ptr, event->data.bytes.size, app->text_store, TEXT_STORE_SIZE);
+
+        view_dispatcher_send_custom_event(
+            app->view_dispatcher, RpcDebugAppCustomEventRpcDataExchange);
     } else {
-        rpc_system_app_confirm(app->rpc, event, false);
+        rpc_system_app_confirm(app->rpc, false);
     }
 }
 
diff --git a/applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_receive_data_exchange.c b/applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_receive_data_exchange.c
index 98bafff8..10d5e36f 100644
--- a/applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_receive_data_exchange.c
+++ b/applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_receive_data_exchange.c
@@ -1,40 +1,5 @@
 #include "../rpc_debug_app.h"
 
-static void rpc_debug_app_scene_start_format_hex(
-    const uint8_t* data,
-    size_t data_size,
-    char* buf,
-    size_t buf_size) {
-    furi_assert(data);
-    furi_assert(buf);
-
-    const size_t byte_width = 3;
-    const size_t line_width = 7;
-
-    data_size = MIN(data_size, buf_size / (byte_width + 1));
-
-    for(size_t i = 0; i < data_size; ++i) {
-        char* p = buf + (i * byte_width);
-        char sep = !((i + 1) % line_width) ? '\n' : ' ';
-        snprintf(p, byte_width + 1, "%02X%c", data[i], sep);
-    }
-
-    buf[buf_size - 1] = '\0';
-}
-
-static void rpc_debug_app_scene_receive_data_exchange_callback(
-    const uint8_t* data,
-    size_t data_size,
-    void* context) {
-    RpcDebugApp* app = context;
-    if(data) {
-        rpc_debug_app_scene_start_format_hex(data, data_size, app->text_store, TEXT_STORE_SIZE);
-    } else {
-        strncpy(app->text_store, "<Data empty>", TEXT_STORE_SIZE);
-    }
-    view_dispatcher_send_custom_event(app->view_dispatcher, RpcDebugAppCustomEventRpcDataExchange);
-}
-
 void rpc_debug_app_scene_receive_data_exchange_on_enter(void* context) {
     RpcDebugApp* app = context;
     strncpy(app->text_store, "Received data will appear here...", TEXT_STORE_SIZE);
@@ -42,8 +7,6 @@ void rpc_debug_app_scene_receive_data_exchange_on_enter(void* context) {
     text_box_set_text(app->text_box, app->text_store);
     text_box_set_font(app->text_box, TextBoxFontHex);
 
-    rpc_system_app_set_data_exchange_callback(
-        app->rpc, rpc_debug_app_scene_receive_data_exchange_callback, app);
     view_dispatcher_switch_to_view(app->view_dispatcher, RpcDebugAppViewTextBox);
 }
 
@@ -53,6 +16,7 @@ bool rpc_debug_app_scene_receive_data_exchange_on_event(void* context, SceneMana
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == RpcDebugAppCustomEventRpcDataExchange) {
+            rpc_system_app_confirm(app->rpc, true);
             notification_message(app->notifications, &sequence_blink_cyan_100);
             notification_message(app->notifications, &sequence_display_backlight_on);
             text_box_set_text(app->text_box, app->text_store);
@@ -66,5 +30,4 @@ bool rpc_debug_app_scene_receive_data_exchange_on_event(void* context, SceneMana
 void rpc_debug_app_scene_receive_data_exchange_on_exit(void* context) {
     RpcDebugApp* app = context;
     text_box_reset(app->text_box);
-    rpc_system_app_set_data_exchange_callback(app->rpc, NULL, NULL);
 }
diff --git a/applications/debug/text_box_test/application.fam b/applications/debug/text_box_test/application.fam
index 3e54df9c..823c21d0 100644
--- a/applications/debug/text_box_test/application.fam
+++ b/applications/debug/text_box_test/application.fam
@@ -3,7 +3,6 @@ App(
     name="Text Box Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="text_box_test_app",
-    cdefines=["APP_TEXT_BOX_TEST"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=140,
diff --git a/applications/debug/uart_echo/application.fam b/applications/debug/uart_echo/application.fam
index 8863a1a9..7b030bcf 100644
--- a/applications/debug/uart_echo/application.fam
+++ b/applications/debug/uart_echo/application.fam
@@ -3,7 +3,6 @@ App(
     name="UART Echo",
     apptype=FlipperAppType.DEBUG,
     entry_point="uart_echo_app",
-    cdefines=["APP_UART_ECHO"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=70,
diff --git a/applications/debug/unit_tests/application.fam b/applications/debug/unit_tests/application.fam
index ad9a278f..aa25dab2 100644
--- a/applications/debug/unit_tests/application.fam
+++ b/applications/debug/unit_tests/application.fam
@@ -5,6 +5,7 @@ App(
     cdefines=["APP_UNIT_TESTS"],
     requires=["system_settings"],
     provides=["delay_test"],
+    resources="resources",
     order=100,
 )
 
diff --git a/applications/debug/unit_tests/bt/bt_test.c b/applications/debug/unit_tests/bt/bt_test.c
index 2cbfd684..32cf6533 100644
--- a/applications/debug/unit_tests/bt/bt_test.c
+++ b/applications/debug/unit_tests/bt/bt_test.c
@@ -28,7 +28,7 @@ void bt_test_alloc() {
 }
 
 void bt_test_free() {
-    furi_assert(bt_test);
+    furi_check(bt_test);
     free(bt_test->nvm_ram_buff_ref);
     free(bt_test->nvm_ram_buff_dut);
     bt_keys_storage_free(bt_test->bt_keys_storage);
@@ -89,7 +89,7 @@ static void bt_test_keys_remove_test_file() {
 }
 
 MU_TEST(bt_test_keys_storage_serial_profile) {
-    furi_assert(bt_test);
+    furi_check(bt_test);
 
     bt_test_keys_remove_test_file();
     bt_test_keys_storage_profile();
diff --git a/applications/debug/unit_tests/furi/furi_record_test.c b/applications/debug/unit_tests/furi/furi_record_test.c
index 512ddfdc..236e1efc 100644
--- a/applications/debug/unit_tests/furi/furi_record_test.c
+++ b/applications/debug/unit_tests/furi/furi_record_test.c
@@ -3,18 +3,29 @@
 #include <furi.h>
 #include "../minunit.h"
 
-void test_furi_create_open() {
-    // 1. Create record
-    uint8_t test_data = 0;
-    furi_record_create("test/holding", (void*)&test_data);
+#define TEST_RECORD_NAME "test/holding"
 
-    // 2. Open it
-    void* record = furi_record_open("test/holding");
+void test_furi_create_open() {
+    // Test that record does not exist
+    mu_check(furi_record_exists(TEST_RECORD_NAME) == false);
+
+    // Create record
+    uint8_t test_data = 0;
+    furi_record_create(TEST_RECORD_NAME, (void*)&test_data);
+
+    // Test that record exists
+    mu_check(furi_record_exists(TEST_RECORD_NAME) == true);
+
+    // Open it
+    void* record = furi_record_open(TEST_RECORD_NAME);
     mu_assert_pointers_eq(record, &test_data);
 
-    // 3. Close it
-    furi_record_close("test/holding");
+    // Close it
+    furi_record_close(TEST_RECORD_NAME);
 
-    // 4. Clean up
-    furi_record_destroy("test/holding");
+    // Clean up
+    furi_record_destroy(TEST_RECORD_NAME);
+
+    // Test that record does not exist
+    mu_check(furi_record_exists(TEST_RECORD_NAME) == false);
 }
diff --git a/applications/debug/unit_tests/infrared/infrared_test.c b/applications/debug/unit_tests/infrared/infrared_test.c
index b2acad47..294c2da9 100644
--- a/applications/debug/unit_tests/infrared/infrared_test.c
+++ b/applications/debug/unit_tests/infrared/infrared_test.c
@@ -27,7 +27,7 @@ static void infrared_test_alloc() {
 }
 
 static void infrared_test_free() {
-    furi_assert(test);
+    furi_check(test);
     infrared_free_decoder(test->decoder_handler);
     infrared_free_encoder(test->encoder_handler);
     flipper_format_free(test->ff);
diff --git a/applications/debug/unit_tests/manifest/manifest.c b/applications/debug/unit_tests/manifest/manifest.c
index 0b24ad1e..19370b0e 100644
--- a/applications/debug/unit_tests/manifest/manifest.c
+++ b/applications/debug/unit_tests/manifest/manifest.c
@@ -22,7 +22,7 @@ MU_TEST(manifest_iteration_test) {
     ResourceManifestReader* manifest_reader = resource_manifest_reader_alloc(storage);
     do {
         // Open manifest file
-        if(!resource_manifest_reader_open(manifest_reader, EXT_PATH("unit_tests/Manifest"))) {
+        if(!resource_manifest_reader_open(manifest_reader, EXT_PATH("unit_tests/Manifest_test"))) {
             result = false;
             break;
         }
diff --git a/applications/debug/unit_tests/minunit.h b/applications/debug/unit_tests/minunit.h
index 69bfba6d..083db5a9 100644
--- a/applications/debug/unit_tests/minunit.h
+++ b/applications/debug/unit_tests/minunit.h
@@ -81,6 +81,7 @@ __attribute__((unused)) static void (*minunit_teardown)(void) = NULL;
 
 void minunit_print_progress(void);
 void minunit_print_fail(const char* error);
+void minunit_printf_warning(const char* format, ...);
 
 /*  Definitions */
 #define MU_TEST(method_name) static void method_name(void)
@@ -150,6 +151,10 @@ void minunit_print_fail(const char* error);
                        minunit_end_proc_timer - minunit_proc_timer);)
 #define MU_EXIT_CODE minunit_fail
 
+/* Warnings */
+#define mu_warn(message) \
+    MU__SAFE_BLOCK(minunit_printf_warning("%s:%d: %s", __FILE__, __LINE__, message);)
+
 /*  Assertions */
 #define mu_check(test)                       \
     MU__SAFE_BLOCK(                          \
diff --git a/applications/debug/unit_tests/nfc/nfc_test.c b/applications/debug/unit_tests/nfc/nfc_test.c
index e7406fab..0dcd0904 100644
--- a/applications/debug/unit_tests/nfc/nfc_test.c
+++ b/applications/debug/unit_tests/nfc/nfc_test.c
@@ -7,10 +7,10 @@
 #include <nfc/nfc_poller.h>
 #include <nfc/nfc_listener.h>
 #include <nfc/protocols/iso14443_3a/iso14443_3a.h>
-#include <nfc/protocols/iso14443_3a/iso14443_3a_poller_sync_api.h>
+#include <nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.h>
 #include <nfc/protocols/mf_ultralight/mf_ultralight.h>
-#include <nfc/protocols/mf_ultralight/mf_ultralight_poller_sync_api.h>
-#include <nfc/protocols/mf_classic/mf_classic_poller_sync_api.h>
+#include <nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.h>
+#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
 
 #include <nfc/helpers/nfc_dict.h>
 #include <nfc/nfc.h>
@@ -34,7 +34,7 @@ static void nfc_test_alloc() {
 }
 
 static void nfc_test_free() {
-    furi_assert(nfc_test);
+    furi_check(nfc_test);
 
     furi_record_close(RECORD_STORAGE);
     free(nfc_test);
@@ -182,8 +182,8 @@ MU_TEST(iso14443_3a_reader) {
 
     Iso14443_3aData iso14443_3a_poller_data = {};
     mu_assert(
-        iso14443_3a_poller_read(poller, &iso14443_3a_poller_data) == Iso14443_3aErrorNone,
-        "iso14443_3a_poller_read() failed");
+        iso14443_3a_poller_sync_read(poller, &iso14443_3a_poller_data) == Iso14443_3aErrorNone,
+        "iso14443_3a_poller_sync_read() failed");
 
     nfc_listener_stop(iso3_listener);
     mu_assert(
@@ -203,15 +203,26 @@ static void mf_ultralight_reader_test(const char* path) {
     NfcDevice* nfc_device = nfc_device_alloc();
     mu_assert(nfc_device_load(nfc_device, path), "nfc_device_load() failed\r\n");
 
-    NfcListener* mfu_listener = nfc_listener_alloc(
-        listener,
-        NfcProtocolMfUltralight,
-        nfc_device_get_data(nfc_device, NfcProtocolMfUltralight));
+    MfUltralightData* data =
+        (MfUltralightData*)nfc_device_get_data(nfc_device, NfcProtocolMfUltralight);
+
+    uint32_t features = mf_ultralight_get_feature_support_set(data->type);
+    bool pwd_supported =
+        mf_ultralight_support_feature(features, MfUltralightFeatureSupportPasswordAuth);
+    uint8_t pwd_num = mf_ultralight_get_pwd_page_num(data->type);
+    const uint8_t zero_pwd[4] = {0, 0, 0, 0};
+
+    if(pwd_supported && !memcmp(data->page[pwd_num].data, zero_pwd, sizeof(zero_pwd))) {
+        data->pages_read -= 2;
+    }
+
+    NfcListener* mfu_listener = nfc_listener_alloc(listener, NfcProtocolMfUltralight, data);
+
     nfc_listener_start(mfu_listener, NULL, NULL);
 
     MfUltralightData* mfu_data = mf_ultralight_alloc();
-    MfUltralightError error = mf_ultralight_poller_read_card(poller, mfu_data);
-    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_read_card() failed");
+    MfUltralightError error = mf_ultralight_poller_sync_read_card(poller, mfu_data);
+    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_sync_read_card() failed");
 
     nfc_listener_stop(mfu_listener);
     nfc_listener_free(mfu_listener);
@@ -259,8 +270,8 @@ MU_TEST(ntag_213_locked_reader) {
     nfc_listener_start(mfu_listener, NULL, NULL);
 
     MfUltralightData* mfu_data = mf_ultralight_alloc();
-    MfUltralightError error = mf_ultralight_poller_read_card(poller, mfu_data);
-    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_read_card() failed");
+    MfUltralightError error = mf_ultralight_poller_sync_read_card(poller, mfu_data);
+    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_sync_read_card() failed");
 
     nfc_listener_stop(mfu_listener);
     nfc_listener_free(mfu_listener);
@@ -297,8 +308,8 @@ static void mf_ultralight_write() {
     MfUltralightData* mfu_data = mf_ultralight_alloc();
 
     // Initial read
-    MfUltralightError error = mf_ultralight_poller_read_card(poller, mfu_data);
-    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_read_card() failed");
+    MfUltralightError error = mf_ultralight_poller_sync_read_card(poller, mfu_data);
+    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_sync_read_card() failed");
 
     mu_assert(
         mf_ultralight_is_equal(mfu_data, nfc_device_get_data(nfc_device, NfcProtocolMfUltralight)),
@@ -310,13 +321,13 @@ static void mf_ultralight_write() {
         FURI_LOG_D(TAG, "Writing page %d", i);
         furi_hal_random_fill_buf(page.data, sizeof(MfUltralightPage));
         mfu_data->page[i] = page;
-        error = mf_ultralight_poller_write_page(poller, i, &page);
-        mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_write_page() failed");
+        error = mf_ultralight_poller_sync_write_page(poller, i, &page);
+        mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_sync_write_page() failed");
     }
 
     // Verification read
-    error = mf_ultralight_poller_read_card(poller, mfu_data);
-    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_read_card() failed");
+    error = mf_ultralight_poller_sync_read_card(poller, mfu_data);
+    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_sync_read_card() failed");
 
     nfc_listener_stop(mfu_listener);
     const MfUltralightData* mfu_listener_data =
@@ -344,7 +355,7 @@ static void mf_classic_reader() {
     MfClassicBlock block = {};
     MfClassicKey key = {.data = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
 
-    mf_classic_poller_read_block(poller, 0, &key, MfClassicKeyTypeA, &block);
+    mf_classic_poller_sync_read_block(poller, 0, &key, MfClassicKeyTypeA, &block);
 
     nfc_listener_stop(mfc_listener);
     nfc_listener_free(mfc_listener);
@@ -372,8 +383,8 @@ static void mf_classic_write() {
     furi_hal_random_fill_buf(block_write.data, sizeof(MfClassicBlock));
     MfClassicKey key = {.data = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
 
-    mf_classic_poller_write_block(poller, 1, &key, MfClassicKeyTypeA, &block_write);
-    mf_classic_poller_read_block(poller, 1, &key, MfClassicKeyTypeA, &block_read);
+    mf_classic_poller_sync_write_block(poller, 1, &key, MfClassicKeyTypeA, &block_write);
+    mf_classic_poller_sync_read_block(poller, 1, &key, MfClassicKeyTypeA, &block_read);
 
     nfc_listener_stop(mfc_listener);
     nfc_listener_free(mfc_listener);
@@ -402,16 +413,18 @@ static void mf_classic_value_block() {
     mf_classic_value_to_block(value, 1, &block_write);
 
     MfClassicError error = MfClassicErrorNone;
-    error = mf_classic_poller_write_block(poller, 1, &key, MfClassicKeyTypeA, &block_write);
+    error = mf_classic_poller_sync_write_block(poller, 1, &key, MfClassicKeyTypeA, &block_write);
     mu_assert(error == MfClassicErrorNone, "Write failed");
 
     int32_t data = 200;
     int32_t new_value = 0;
-    error = mf_classic_poller_change_value(poller, 1, &key, MfClassicKeyTypeA, data, &new_value);
+    error =
+        mf_classic_poller_sync_change_value(poller, 1, &key, MfClassicKeyTypeA, data, &new_value);
     mu_assert(error == MfClassicErrorNone, "Value increment failed");
     mu_assert(new_value == value + data, "Value not match");
 
-    error = mf_classic_poller_change_value(poller, 1, &key, MfClassicKeyTypeA, -data, &new_value);
+    error =
+        mf_classic_poller_sync_change_value(poller, 1, &key, MfClassicKeyTypeA, -data, &new_value);
     mu_assert(error == MfClassicErrorNone, "Value decrement failed");
     mu_assert(new_value == value, "Value not match");
 
diff --git a/applications/debug/unit_tests/nfc/nfc_transport.c b/applications/debug/unit_tests/nfc/nfc_transport.c
index ee2657be..e2e313fd 100644
--- a/applications/debug/unit_tests/nfc/nfc_transport.c
+++ b/applications/debug/unit_tests/nfc/nfc_transport.c
@@ -122,7 +122,7 @@ Nfc* nfc_alloc() {
 }
 
 void nfc_free(Nfc* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     free(instance);
 }
@@ -165,9 +165,9 @@ NfcError nfc_iso14443a_listener_set_col_res_data(
     uint8_t uid_len,
     uint8_t* atqa,
     uint8_t sak) {
-    furi_assert(instance);
-    furi_assert(uid);
-    furi_assert(atqa);
+    furi_check(instance);
+    furi_check(uid);
+    furi_check(atqa);
 
     nfc_prepare_col_res_data(instance, uid, uid_len, atqa, sak);
 
@@ -176,7 +176,7 @@ NfcError nfc_iso14443a_listener_set_col_res_data(
 
 static int32_t nfc_worker_poller(void* context) {
     Nfc* instance = context;
-    furi_assert(instance->callback);
+    furi_check(instance->callback);
 
     instance->state = NfcStateReady;
     NfcCommand command = NfcCommandContinue;
@@ -196,7 +196,7 @@ static int32_t nfc_worker_poller(void* context) {
 }
 
 static void nfc_worker_listener_pass_col_res(Nfc* instance, uint8_t* rx_data, uint16_t rx_bits) {
-    furi_assert(instance->col_res_status != Iso14443_3aColResStatusDone);
+    furi_check(instance->col_res_status != Iso14443_3aColResStatusDone);
     BitBuffer* tx_buffer = bit_buffer_alloc(NFC_MAX_BUFFER_SIZE);
 
     bool processed = false;
@@ -255,7 +255,7 @@ static void nfc_worker_listener_pass_col_res(Nfc* instance, uint8_t* rx_data, ui
 
 static int32_t nfc_worker_listener(void* context) {
     Nfc* instance = context;
-    furi_assert(instance->callback);
+    furi_check(instance->callback);
 
     NfcMessage message = {};
 
@@ -295,17 +295,17 @@ static int32_t nfc_worker_listener(void* context) {
 }
 
 void nfc_start(Nfc* instance, NfcEventCallback callback, void* context) {
-    furi_assert(instance);
-    furi_assert(instance->worker_thread == NULL);
+    furi_check(instance);
+    furi_check(instance->worker_thread == NULL);
 
     if(instance->mode == NfcModeListener) {
-        furi_assert(listener_queue == NULL);
+        furi_check(listener_queue == NULL);
         // Check that poller didn't start
-        furi_assert(poller_queue == NULL);
+        furi_check(poller_queue == NULL);
     } else {
-        furi_assert(poller_queue == NULL);
+        furi_check(poller_queue == NULL);
         // Check that poller is started after listener
-        furi_assert(listener_queue);
+        furi_check(listener_queue);
     }
 
     instance->callback = callback;
@@ -334,8 +334,8 @@ void nfc_start(Nfc* instance, NfcEventCallback callback, void* context) {
 }
 
 void nfc_stop(Nfc* instance) {
-    furi_assert(instance);
-    furi_assert(instance->worker_thread);
+    furi_check(instance);
+    furi_check(instance->worker_thread);
 
     if(instance->mode == NfcModeListener) {
         NfcMessage message = {.type = NfcMessageTypeAbort};
@@ -361,10 +361,10 @@ void nfc_stop(Nfc* instance) {
 // Called from worker thread
 
 NfcError nfc_listener_tx(Nfc* instance, const BitBuffer* tx_buffer) {
-    furi_assert(instance);
-    furi_assert(poller_queue);
-    furi_assert(listener_queue);
-    furi_assert(tx_buffer);
+    furi_check(instance);
+    furi_check(poller_queue);
+    furi_check(listener_queue);
+    furi_check(tx_buffer);
 
     NfcMessage message = {};
     message.type = NfcMessageTypeTx;
@@ -382,11 +382,11 @@ NfcError nfc_iso14443a_listener_tx_custom_parity(Nfc* instance, const BitBuffer*
 
 NfcError
     nfc_poller_trx(Nfc* instance, const BitBuffer* tx_buffer, BitBuffer* rx_buffer, uint32_t fwt) {
-    furi_assert(instance);
-    furi_assert(tx_buffer);
-    furi_assert(rx_buffer);
-    furi_assert(poller_queue);
-    furi_assert(listener_queue);
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
+    furi_check(poller_queue);
+    furi_check(listener_queue);
     UNUSED(fwt);
 
     NfcError error = NfcErrorNone;
@@ -396,7 +396,7 @@ NfcError
     message.data.data_bits = bit_buffer_get_size(tx_buffer);
     bit_buffer_write_bytes(tx_buffer, message.data.data, bit_buffer_get_size_bytes(tx_buffer));
     // Tx
-    furi_assert(furi_message_queue_put(listener_queue, &message, FuriWaitForever) == FuriStatusOk);
+    furi_check(furi_message_queue_put(listener_queue, &message, FuriWaitForever) == FuriStatusOk);
     // Rx
     FuriStatus status = furi_message_queue_get(poller_queue, &message, 50);
 
diff --git a/assets/unit_tests/Manifest b/applications/debug/unit_tests/resources/unit_tests/Manifest_test
similarity index 100%
rename from assets/unit_tests/Manifest
rename to applications/debug/unit_tests/resources/unit_tests/Manifest_test
diff --git a/assets/unit_tests/infrared/test_kaseikyo.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_kaseikyo.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_kaseikyo.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_kaseikyo.irtest
diff --git a/assets/unit_tests/infrared/test_nec.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_nec.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_nec.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_nec.irtest
diff --git a/assets/unit_tests/infrared/test_nec42.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_nec42.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_nec42.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_nec42.irtest
diff --git a/assets/unit_tests/infrared/test_nec42ext.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_nec42ext.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_nec42ext.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_nec42ext.irtest
diff --git a/assets/unit_tests/infrared/test_necext.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_necext.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_necext.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_necext.irtest
diff --git a/assets/unit_tests/infrared/test_rc5.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_rc5.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_rc5.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_rc5.irtest
diff --git a/assets/unit_tests/infrared/test_rc5x.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_rc5x.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_rc5x.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_rc5x.irtest
diff --git a/assets/unit_tests/infrared/test_rc6.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_rc6.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_rc6.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_rc6.irtest
diff --git a/assets/unit_tests/infrared/test_rca.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_rca.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_rca.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_rca.irtest
diff --git a/assets/unit_tests/infrared/test_samsung32.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_samsung32.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_samsung32.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_samsung32.irtest
diff --git a/assets/unit_tests/infrared/test_sirc.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_sirc.irtest
similarity index 100%
rename from assets/unit_tests/infrared/test_sirc.irtest
rename to applications/debug/unit_tests/resources/unit_tests/infrared/test_sirc.irtest
diff --git a/assets/unit_tests/nfc/Ntag213_locked.nfc b/applications/debug/unit_tests/resources/unit_tests/nfc/Ntag213_locked.nfc
similarity index 100%
rename from assets/unit_tests/nfc/Ntag213_locked.nfc
rename to applications/debug/unit_tests/resources/unit_tests/nfc/Ntag213_locked.nfc
diff --git a/assets/unit_tests/nfc/Ntag215.nfc b/applications/debug/unit_tests/resources/unit_tests/nfc/Ntag215.nfc
similarity index 100%
rename from assets/unit_tests/nfc/Ntag215.nfc
rename to applications/debug/unit_tests/resources/unit_tests/nfc/Ntag215.nfc
diff --git a/assets/unit_tests/nfc/Ntag216.nfc b/applications/debug/unit_tests/resources/unit_tests/nfc/Ntag216.nfc
similarity index 100%
rename from assets/unit_tests/nfc/Ntag216.nfc
rename to applications/debug/unit_tests/resources/unit_tests/nfc/Ntag216.nfc
diff --git a/assets/unit_tests/nfc/Ultralight_11.nfc b/applications/debug/unit_tests/resources/unit_tests/nfc/Ultralight_11.nfc
similarity index 100%
rename from assets/unit_tests/nfc/Ultralight_11.nfc
rename to applications/debug/unit_tests/resources/unit_tests/nfc/Ultralight_11.nfc
diff --git a/assets/unit_tests/nfc/Ultralight_21.nfc b/applications/debug/unit_tests/resources/unit_tests/nfc/Ultralight_21.nfc
similarity index 100%
rename from assets/unit_tests/nfc/Ultralight_21.nfc
rename to applications/debug/unit_tests/resources/unit_tests/nfc/Ultralight_21.nfc
diff --git a/assets/unit_tests/nfc/nfc_nfca_signal_long.nfc b/applications/debug/unit_tests/resources/unit_tests/nfc/nfc_nfca_signal_long.nfc
similarity index 100%
rename from assets/unit_tests/nfc/nfc_nfca_signal_long.nfc
rename to applications/debug/unit_tests/resources/unit_tests/nfc/nfc_nfca_signal_long.nfc
diff --git a/assets/unit_tests/nfc/nfc_nfca_signal_short.nfc b/applications/debug/unit_tests/resources/unit_tests/nfc/nfc_nfca_signal_short.nfc
similarity index 100%
rename from assets/unit_tests/nfc/nfc_nfca_signal_short.nfc
rename to applications/debug/unit_tests/resources/unit_tests/nfc/nfc_nfca_signal_short.nfc
diff --git a/assets/unit_tests/storage/md5.txt b/applications/debug/unit_tests/resources/unit_tests/storage/md5.txt
similarity index 100%
rename from assets/unit_tests/storage/md5.txt
rename to applications/debug/unit_tests/resources/unit_tests/storage/md5.txt
diff --git a/assets/unit_tests/subghz/alutech_at_4n_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/alutech_at_4n_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/alutech_at_4n_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/alutech_at_4n_raw.sub
diff --git a/assets/unit_tests/subghz/ansonic.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/ansonic.sub
similarity index 100%
rename from assets/unit_tests/subghz/ansonic.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/ansonic.sub
diff --git a/assets/unit_tests/subghz/ansonic_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/ansonic_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/ansonic_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/ansonic_raw.sub
diff --git a/assets/unit_tests/subghz/bett.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/bett.sub
similarity index 100%
rename from assets/unit_tests/subghz/bett.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/bett.sub
diff --git a/assets/unit_tests/subghz/bett_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/bett_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/bett_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/bett_raw.sub
diff --git a/assets/unit_tests/subghz/came.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/came.sub
similarity index 100%
rename from assets/unit_tests/subghz/came.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/came.sub
diff --git a/assets/unit_tests/subghz/came_atomo_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/came_atomo_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/came_atomo_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/came_atomo_raw.sub
diff --git a/assets/unit_tests/subghz/came_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/came_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/came_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/came_raw.sub
diff --git a/assets/unit_tests/subghz/came_twee.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/came_twee.sub
similarity index 100%
rename from assets/unit_tests/subghz/came_twee.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/came_twee.sub
diff --git a/assets/unit_tests/subghz/came_twee_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/came_twee_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/came_twee_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/came_twee_raw.sub
diff --git a/assets/unit_tests/subghz/cenmax_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/cenmax_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/cenmax_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/cenmax_raw.sub
diff --git a/assets/unit_tests/subghz/clemsa.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/clemsa.sub
similarity index 100%
rename from assets/unit_tests/subghz/clemsa.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/clemsa.sub
diff --git a/assets/unit_tests/subghz/clemsa_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/clemsa_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/clemsa_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/clemsa_raw.sub
diff --git a/assets/unit_tests/subghz/doitrand.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/doitrand.sub
similarity index 100%
rename from assets/unit_tests/subghz/doitrand.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/doitrand.sub
diff --git a/assets/unit_tests/subghz/doitrand_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/doitrand_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/doitrand_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/doitrand_raw.sub
diff --git a/assets/unit_tests/subghz/doorhan.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/doorhan.sub
similarity index 100%
rename from assets/unit_tests/subghz/doorhan.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/doorhan.sub
diff --git a/assets/unit_tests/subghz/doorhan_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/doorhan_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/doorhan_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/doorhan_raw.sub
diff --git a/assets/unit_tests/subghz/dooya.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/dooya.sub
similarity index 100%
rename from assets/unit_tests/subghz/dooya.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/dooya.sub
diff --git a/assets/unit_tests/subghz/dooya_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/dooya_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/dooya_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/dooya_raw.sub
diff --git a/assets/unit_tests/subghz/faac_slh_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/faac_slh_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/faac_slh_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/faac_slh_raw.sub
diff --git a/assets/unit_tests/subghz/gate_tx.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/gate_tx.sub
similarity index 100%
rename from assets/unit_tests/subghz/gate_tx.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/gate_tx.sub
diff --git a/assets/unit_tests/subghz/gate_tx_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/gate_tx_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/gate_tx_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/gate_tx_raw.sub
diff --git a/assets/unit_tests/subghz/holtek.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/holtek.sub
similarity index 100%
rename from assets/unit_tests/subghz/holtek.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/holtek.sub
diff --git a/assets/unit_tests/subghz/holtek_ht12x.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/holtek_ht12x.sub
similarity index 100%
rename from assets/unit_tests/subghz/holtek_ht12x.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/holtek_ht12x.sub
diff --git a/assets/unit_tests/subghz/holtek_ht12x_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/holtek_ht12x_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/holtek_ht12x_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/holtek_ht12x_raw.sub
diff --git a/assets/unit_tests/subghz/holtek_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/holtek_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/holtek_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/holtek_raw.sub
diff --git a/assets/unit_tests/subghz/honeywell_wdb.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/honeywell_wdb.sub
similarity index 100%
rename from assets/unit_tests/subghz/honeywell_wdb.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/honeywell_wdb.sub
diff --git a/assets/unit_tests/subghz/honeywell_wdb_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/honeywell_wdb_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/honeywell_wdb_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/honeywell_wdb_raw.sub
diff --git a/assets/unit_tests/subghz/hormann_hsm_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/hormann_hsm_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/hormann_hsm_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/hormann_hsm_raw.sub
diff --git a/assets/unit_tests/subghz/ido_117_111_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/ido_117_111_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/ido_117_111_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/ido_117_111_raw.sub
diff --git a/assets/unit_tests/subghz/intertechno_v3.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/intertechno_v3.sub
similarity index 100%
rename from assets/unit_tests/subghz/intertechno_v3.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/intertechno_v3.sub
diff --git a/assets/unit_tests/subghz/intertechno_v3_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/intertechno_v3_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/intertechno_v3_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/intertechno_v3_raw.sub
diff --git a/assets/unit_tests/subghz/kia_seed_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/kia_seed_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/kia_seed_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/kia_seed_raw.sub
diff --git a/assets/unit_tests/subghz/kinggates_stylo4k_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/kinggates_stylo4k_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/kinggates_stylo4k_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/kinggates_stylo4k_raw.sub
diff --git a/assets/unit_tests/subghz/linear.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/linear.sub
similarity index 100%
rename from assets/unit_tests/subghz/linear.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/linear.sub
diff --git a/assets/unit_tests/subghz/linear_delta3.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/linear_delta3.sub
similarity index 100%
rename from assets/unit_tests/subghz/linear_delta3.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/linear_delta3.sub
diff --git a/assets/unit_tests/subghz/linear_delta3_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/linear_delta3_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/linear_delta3_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/linear_delta3_raw.sub
diff --git a/assets/unit_tests/subghz/linear_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/linear_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/linear_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/linear_raw.sub
diff --git a/assets/unit_tests/subghz/magellan.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/magellan.sub
similarity index 100%
rename from assets/unit_tests/subghz/magellan.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/magellan.sub
diff --git a/assets/unit_tests/subghz/magellan_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/magellan_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/magellan_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/magellan_raw.sub
diff --git a/assets/unit_tests/subghz/marantec.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/marantec.sub
similarity index 100%
rename from assets/unit_tests/subghz/marantec.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/marantec.sub
diff --git a/assets/unit_tests/subghz/marantec_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/marantec_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/marantec_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/marantec_raw.sub
diff --git a/applications/debug/unit_tests/resources/unit_tests/subghz/mastercode.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/mastercode.sub
new file mode 100644
index 00000000..f50abbfe
--- /dev/null
+++ b/applications/debug/unit_tests/resources/unit_tests/subghz/mastercode.sub
@@ -0,0 +1,7 @@
+Filetype: Flipper SubGhz Key File
+Version: 1
+Frequency: 433920000
+Preset: FuriHalSubGhzPresetOok270Async
+Protocol: Mastercode
+Bit: 36
+Key: 00 00 00 0B 7E 00 3C 08
diff --git a/applications/debug/unit_tests/resources/unit_tests/subghz/mastercode_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/mastercode_raw.sub
new file mode 100644
index 00000000..69d3f396
--- /dev/null
+++ b/applications/debug/unit_tests/resources/unit_tests/subghz/mastercode_raw.sub
@@ -0,0 +1,6 @@
+Filetype: Flipper SubGhz RAW File
+Version: 1
+Frequency: 433920000
+Preset: FuriHalSubGhzPresetOok270Async
+Protocol: RAW
+RAW_Data: 10389 -66 405095 -102 207 -106 1165 -130 963739 -1232 899 -2250 2003 -1190 2017 -1202 911 -2256 2021 -1162 2045 -1134 2047 -1164 2047 -1138 2031 -1180 2039 -1182 949 -2190 995 -2214 961 -2228 963 -2198 963 -2214 977 -2212 975 -2210 975 -2208 971 -2200 963 -2210 993 -2184 2075 -1130 2051 -1142 2055 -1136 2047 -1178 965 -2236 933 -2220 975 -2184 999 -2222 967 -2208 969 -2214 979 -2202 2027 -1156 975 -2242 943 -16080 2023 -1162 967 -2220 2057 -1114 2061 -1124 1007 -2242 2025 -1134 2055 -1168 2017 -1138 2075 -1134 2053 -1136 2075 -1130 979 -2214 979 -2174 999 -2182 1001 -2204 977 -2206 1003 -2188 979 -2176 999 -2182 1009 -2176 1009 -2176 1001 -2212 2029 -1116 2091 -1102 2109 -1092 2095 -1126 1001 -2150 1011 -2180 1011 -2180 1009 -2178 1009 -2172 1009 -2166 1001 -2198 2065 -1136 975 -2220 971 -16018 2097 -1166 951 -2240 2009 -1186 2011 -1160 979 -2208 2035 -1134 2053 -1138 2061 -1158 2045 -1152 2029 -1152 2051 -1166 963 -2188 993 -2222 951 -2214 963 -2220 965 -2212 979 -2212 977 -2180 1003 -2202 965 -2218 975 -2216 967 -2188 2061 -1124 2083 -1126 2071 -1130 2059 -1134 993 -2188 979 -2240 947 -2204 979 -2214 971 -2214 973 -2210 971 -2206 2053 -1130 979 -2216 969 -16056 2053 -1134 1001 -2224 2021 -1150 2051 -1154 953 -2240 2045 -1146 2023 -1168 2033 -1144 2065 -1146 2055 -1130 2071 -1160 961 -2192 973 -2190 1005 -2214 975 -2206 967 -2206 975 -2206 967 -2208 975 -2212 967 -2212 979 -2218 977 -2178 2063 -1156 2035 -1160 2061 -1126 2065 -1130 981 -2186 1003 -2210 977 -2208 973 -2202 977 -2200 965 -2248 943 -2206 2039 -1190 941 -48536 65 -7254 263 -68 363 -102 131 -232 263 -264 751 -230 225 -822 397 -634 231 -268 263 -134 267 -64 867 -132 305 -138 67 -100 331 -98 891 -66 455 -66 531 -100 299 -134 897 -98 693 -132 291 -132 333 -98 337 -68 331
diff --git a/assets/unit_tests/subghz/megacode.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/megacode.sub
similarity index 100%
rename from assets/unit_tests/subghz/megacode.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/megacode.sub
diff --git a/assets/unit_tests/subghz/megacode_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/megacode_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/megacode_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/megacode_raw.sub
diff --git a/assets/unit_tests/subghz/nero_radio_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/nero_radio_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/nero_radio_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/nero_radio_raw.sub
diff --git a/assets/unit_tests/subghz/nero_sketch_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/nero_sketch_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/nero_sketch_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/nero_sketch_raw.sub
diff --git a/assets/unit_tests/subghz/nice_flo.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/nice_flo.sub
similarity index 100%
rename from assets/unit_tests/subghz/nice_flo.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/nice_flo.sub
diff --git a/assets/unit_tests/subghz/nice_flo_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/nice_flo_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/nice_flo_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/nice_flo_raw.sub
diff --git a/assets/unit_tests/subghz/nice_flor_s_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/nice_flor_s_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/nice_flor_s_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/nice_flor_s_raw.sub
diff --git a/assets/unit_tests/subghz/nice_one_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/nice_one_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/nice_one_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/nice_one_raw.sub
diff --git a/assets/unit_tests/subghz/phoenix_v2.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/phoenix_v2.sub
similarity index 100%
rename from assets/unit_tests/subghz/phoenix_v2.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/phoenix_v2.sub
diff --git a/assets/unit_tests/subghz/phoenix_v2_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/phoenix_v2_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/phoenix_v2_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/phoenix_v2_raw.sub
diff --git a/assets/unit_tests/subghz/power_smart.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/power_smart.sub
similarity index 100%
rename from assets/unit_tests/subghz/power_smart.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/power_smart.sub
diff --git a/assets/unit_tests/subghz/power_smart_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/power_smart_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/power_smart_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/power_smart_raw.sub
diff --git a/assets/unit_tests/subghz/princeton.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/princeton.sub
similarity index 100%
rename from assets/unit_tests/subghz/princeton.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/princeton.sub
diff --git a/assets/unit_tests/subghz/princeton_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/princeton_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/princeton_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/princeton_raw.sub
diff --git a/assets/unit_tests/subghz/scher_khan_magic_code.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/scher_khan_magic_code.sub
similarity index 100%
rename from assets/unit_tests/subghz/scher_khan_magic_code.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/scher_khan_magic_code.sub
diff --git a/assets/unit_tests/subghz/security_pls_1_0.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/security_pls_1_0.sub
similarity index 100%
rename from assets/unit_tests/subghz/security_pls_1_0.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/security_pls_1_0.sub
diff --git a/assets/unit_tests/subghz/security_pls_1_0_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/security_pls_1_0_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/security_pls_1_0_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/security_pls_1_0_raw.sub
diff --git a/assets/unit_tests/subghz/security_pls_2_0.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/security_pls_2_0.sub
similarity index 100%
rename from assets/unit_tests/subghz/security_pls_2_0.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/security_pls_2_0.sub
diff --git a/assets/unit_tests/subghz/security_pls_2_0_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/security_pls_2_0_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/security_pls_2_0_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/security_pls_2_0_raw.sub
diff --git a/assets/unit_tests/subghz/smc5326.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/smc5326.sub
similarity index 100%
rename from assets/unit_tests/subghz/smc5326.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/smc5326.sub
diff --git a/assets/unit_tests/subghz/smc5326_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/smc5326_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/smc5326_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/smc5326_raw.sub
diff --git a/assets/unit_tests/subghz/somfy_keytis_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/somfy_keytis_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/somfy_keytis_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/somfy_keytis_raw.sub
diff --git a/assets/unit_tests/subghz/somfy_telis_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/somfy_telis_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/somfy_telis_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/somfy_telis_raw.sub
diff --git a/assets/unit_tests/subghz/test_random_raw.sub b/applications/debug/unit_tests/resources/unit_tests/subghz/test_random_raw.sub
similarity index 100%
rename from assets/unit_tests/subghz/test_random_raw.sub
rename to applications/debug/unit_tests/resources/unit_tests/subghz/test_random_raw.sub
diff --git a/applications/debug/unit_tests/rpc/rpc_test.c b/applications/debug/unit_tests/rpc/rpc_test.c
index 645e75e8..5659ba87 100644
--- a/applications/debug/unit_tests/rpc/rpc_test.c
+++ b/applications/debug/unit_tests/rpc/rpc_test.c
@@ -18,6 +18,8 @@
 #include <cli/cli.h>
 #include <loader/loader.h>
 #include <protobuf_version.h>
+
+#include <FreeRTOS.h>
 #include <semphr.h>
 
 LIST_DEF(MsgList, PB_Main, M_POD_OPLIST)
@@ -36,7 +38,7 @@ typedef struct {
     FuriStreamBuffer* output_stream;
     SemaphoreHandle_t close_session_semaphore;
     SemaphoreHandle_t terminate_semaphore;
-    TickType_t timeout;
+    uint32_t timeout;
 } RpcSessionContext;
 
 static RpcSessionContext rpc_session[TEST_RPC_SESSIONS];
@@ -544,7 +546,7 @@ static bool test_rpc_pb_stream_read(pb_istream_t* istream, pb_byte_t* buf, size_
     RpcSessionContext* session_context = istream->state;
     size_t bytes_received = 0;
 
-    TickType_t now = xTaskGetTickCount();
+    uint32_t now = furi_get_tick();
     int32_t time_left = session_context->timeout - now;
     time_left = MAX(time_left, 0);
     bytes_received =
@@ -688,7 +690,7 @@ static void test_rpc_decode_and_compare(MsgList_t expected_msg_list, uint8_t ses
     furi_check(!MsgList_empty_p(expected_msg_list));
     furi_check(session < TEST_RPC_SESSIONS);
 
-    rpc_session[session].timeout = xTaskGetTickCount() + MAX_RECEIVE_OUTPUT_TIMEOUT;
+    rpc_session[session].timeout = furi_get_tick() + MAX_RECEIVE_OUTPUT_TIMEOUT;
     pb_istream_t istream = {
         .callback = test_rpc_pb_stream_read,
         .state = &rpc_session[session],
@@ -712,7 +714,7 @@ static void test_rpc_decode_and_compare(MsgList_t expected_msg_list, uint8_t ses
             pb_release(&PB_Main_msg, &result);
         }
 
-    rpc_session[session].timeout = xTaskGetTickCount() + 50;
+    rpc_session[session].timeout = furi_get_tick() + 50;
     if(pb_decode_ex(&istream, &PB_Main_msg, &result, PB_DECODE_DELIMITED)) {
         mu_fail("decoded more than expected");
     }
diff --git a/applications/debug/unit_tests/storage/dirwalk_test.c b/applications/debug/unit_tests/storage/dirwalk_test.c
index e0842a7a..19ac336f 100644
--- a/applications/debug/unit_tests/storage/dirwalk_test.c
+++ b/applications/debug/unit_tests/storage/dirwalk_test.c
@@ -139,7 +139,7 @@ static bool write_file_13DA(Storage* storage, const char* path) {
     File* file = storage_file_alloc(storage);
     bool result = false;
     if(storage_file_open(file, path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
-        result = storage_file_write(file, "13DA", 4) == 4;
+        result = (storage_file_write(file, "13DA", 4) == 4);
     }
     storage_file_close(file);
     storage_file_free(file);
diff --git a/applications/debug/unit_tests/storage/storage_test.c b/applications/debug/unit_tests/storage/storage_test.c
index 13188e5e..5ea36935 100644
--- a/applications/debug/unit_tests/storage/storage_test.c
+++ b/applications/debug/unit_tests/storage/storage_test.c
@@ -115,6 +115,66 @@ MU_TEST(storage_file_open_close) {
     furi_record_close(RECORD_STORAGE);
 }
 
+static bool storage_file_read_write_test(File* file, uint8_t* data, size_t test_size) {
+    const char* filename = UNIT_TESTS_PATH("storage_chunk.test");
+
+    // fill with pattern
+    for(size_t i = 0; i < test_size; i++) {
+        data[i] = (i % 113);
+    }
+
+    bool result = false;
+    do {
+        if(!storage_file_open(file, filename, FSAM_WRITE, FSOM_CREATE_ALWAYS)) break;
+        if(test_size != storage_file_write(file, data, test_size)) break;
+        storage_file_close(file);
+
+        // reset data
+        memset(data, 0, test_size);
+
+        if(!storage_file_open(file, filename, FSAM_READ, FSOM_OPEN_EXISTING)) break;
+        if(test_size != storage_file_read(file, data, test_size)) break;
+        storage_file_close(file);
+
+        // check that data is correct
+        for(size_t i = 0; i < test_size; i++) {
+            if(data[i] != (i % 113)) {
+                break;
+            }
+        }
+
+        result = true;
+    } while(false);
+
+    return result;
+}
+
+MU_TEST(storage_file_read_write_64k) {
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    File* file = storage_file_alloc(storage);
+
+    size_t size_1k = 1024;
+    size_t size_64k = size_1k + size_1k * 63;
+    size_t size_65k = size_64k + size_1k;
+    size_t size_max = size_65k + 8;
+
+    size_t max_ram_block = memmgr_heap_get_max_free_block();
+
+    if(max_ram_block < size_max) {
+        mu_warn("Not enough RAM for >64k block test");
+    } else {
+        uint8_t* data = malloc(size_max);
+        mu_check(storage_file_read_write_test(file, data, size_1k));
+        mu_check(storage_file_read_write_test(file, data, size_64k));
+        mu_check(storage_file_read_write_test(file, data, size_65k));
+        mu_check(storage_file_read_write_test(file, data, size_max));
+        free(data);
+    }
+
+    storage_file_free(file);
+    furi_record_close(RECORD_STORAGE);
+}
+
 MU_TEST_SUITE(storage_file) {
     storage_file_open_lock_setup();
     MU_RUN_TEST(storage_file_open_close);
@@ -122,6 +182,10 @@ MU_TEST_SUITE(storage_file) {
     storage_file_open_lock_teardown();
 }
 
+MU_TEST_SUITE(storage_file_64k) {
+    MU_RUN_TEST(storage_file_read_write_64k);
+}
+
 MU_TEST(storage_dir_open_close) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     File* file;
@@ -640,6 +704,7 @@ MU_TEST_SUITE(test_md5_calc_suite) {
 
 int run_minunit_test_storage() {
     MU_RUN_SUITE(storage_file);
+    MU_RUN_SUITE(storage_file_64k);
     MU_RUN_SUITE(storage_dir);
     MU_RUN_SUITE(storage_rename);
     MU_RUN_SUITE(test_data_path);
diff --git a/applications/debug/unit_tests/subghz/subghz_test.c b/applications/debug/unit_tests/subghz/subghz_test.c
index 64e0591d..60c7abd0 100644
--- a/applications/debug/unit_tests/subghz/subghz_test.c
+++ b/applications/debug/unit_tests/subghz/subghz_test.c
@@ -326,6 +326,7 @@ bool subghz_hal_async_tx_test_run(SubGhzHalAsyncTxTestType type) {
     furi_hal_subghz_set_frequency_and_path(433920000);
 
     if(!furi_hal_subghz_start_async_tx(subghz_hal_async_tx_test_yield, &test)) {
+        mu_warn("SubGHZ transmission is prohibited");
         return false;
     }
 
@@ -654,6 +655,13 @@ MU_TEST(subghz_decoder_kinggates_stylo4k_test) {
         "Test decoder " SUBGHZ_PROTOCOL_KINGGATES_STYLO_4K_NAME " error\r\n");
 }
 
+MU_TEST(subghz_decoder_mastercode_test) {
+    mu_assert(
+        subghz_decoder_test(
+            EXT_PATH("unit_tests/subghz/mastercode_raw.sub"), SUBGHZ_PROTOCOL_MASTERCODE_NAME),
+        "Test decoder " SUBGHZ_PROTOCOL_MASTERCODE_NAME " error\r\n");
+}
+
 //test encoders
 MU_TEST(subghz_encoder_princeton_test) {
     mu_assert(
@@ -805,6 +813,12 @@ MU_TEST(subghz_encoder_dooya_test) {
         "Test encoder " SUBGHZ_PROTOCOL_DOOYA_NAME " error\r\n");
 }
 
+MU_TEST(subghz_encoder_mastercode_test) {
+    mu_assert(
+        subghz_encoder_test(EXT_PATH("unit_tests/subghz/mastercode.sub")),
+        "Test encoder " SUBGHZ_PROTOCOL_MASTERCODE_NAME " error\r\n");
+}
+
 MU_TEST(subghz_random_test) {
     mu_assert(subghz_decode_random_test(TEST_RANDOM_DIR_NAME), "Random test error\r\n");
 }
@@ -855,6 +869,7 @@ MU_TEST_SUITE(subghz) {
     MU_RUN_TEST(subghz_decoder_alutech_at_4n_test);
     MU_RUN_TEST(subghz_decoder_nice_one_test);
     MU_RUN_TEST(subghz_decoder_kinggates_stylo4k_test);
+    MU_RUN_TEST(subghz_decoder_mastercode_test);
 
     MU_RUN_TEST(subghz_encoder_princeton_test);
     MU_RUN_TEST(subghz_encoder_came_test);
@@ -881,6 +896,7 @@ MU_TEST_SUITE(subghz) {
     MU_RUN_TEST(subghz_encoder_smc5326_test);
     MU_RUN_TEST(subghz_encoder_holtek_ht12x_test);
     MU_RUN_TEST(subghz_encoder_dooya_test);
+    MU_RUN_TEST(subghz_encoder_mastercode_test);
 
     MU_RUN_TEST(subghz_random_test);
     subghz_test_deinit();
diff --git a/applications/debug/unit_tests/test_index.c b/applications/debug/unit_tests/test_index.c
index edaf950c..d7afaa3c 100644
--- a/applications/debug/unit_tests/test_index.c
+++ b/applications/debug/unit_tests/test_index.c
@@ -65,8 +65,8 @@ const UnitTest unit_tests[] = {
 void minunit_print_progress() {
     static const char progress[] = {'\\', '|', '/', '-'};
     static uint8_t progress_counter = 0;
-    static TickType_t last_tick = 0;
-    TickType_t current_tick = xTaskGetTickCount();
+    static uint32_t last_tick = 0;
+    uint32_t current_tick = furi_get_tick();
     if(current_tick - last_tick > 20) {
         last_tick = current_tick;
         printf("[%c]\033[3D", progress[++progress_counter % COUNT_OF(progress)]);
@@ -78,6 +78,16 @@ void minunit_print_fail(const char* str) {
     printf(_FURI_LOG_CLR_E "%s\r\n" _FURI_LOG_CLR_RESET, str);
 }
 
+void minunit_printf_warning(const char* format, ...) {
+    FuriString* str = furi_string_alloc();
+    va_list args;
+    va_start(args, format);
+    furi_string_vprintf(str, format, args);
+    va_end(args);
+    printf(_FURI_LOG_CLR_W "%s\r\n" _FURI_LOG_CLR_RESET, furi_string_get_cstr(str));
+    furi_string_free(str);
+}
+
 void unit_tests_cli(Cli* cli, FuriString* args, void* context) {
     UNUSED(cli);
     UNUSED(args);
diff --git a/applications/debug/usb_mouse/application.fam b/applications/debug/usb_mouse/application.fam
index 5c434004..7747613d 100644
--- a/applications/debug/usb_mouse/application.fam
+++ b/applications/debug/usb_mouse/application.fam
@@ -3,7 +3,6 @@ App(
     name="USB Mouse Demo",
     apptype=FlipperAppType.DEBUG,
     entry_point="usb_mouse_app",
-    cdefines=["APP_USB_MOUSE"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=60,
diff --git a/applications/debug/usb_test/application.fam b/applications/debug/usb_test/application.fam
index 27395c34..463bb4a2 100644
--- a/applications/debug/usb_test/application.fam
+++ b/applications/debug/usb_test/application.fam
@@ -3,7 +3,6 @@ App(
     name="USB Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="usb_test_app",
-    cdefines=["APP_USB_TEST"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=50,
diff --git a/applications/debug/vibro_test/application.fam b/applications/debug/vibro_test/application.fam
index f7115cc9..c35a7223 100644
--- a/applications/debug/vibro_test/application.fam
+++ b/applications/debug/vibro_test/application.fam
@@ -3,7 +3,6 @@ App(
     name="Vibro Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="vibro_test_app",
-    cdefines=["APP_VIBRO_TEST"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=20,
diff --git a/applications/examples/example_plugins/application.fam b/applications/examples/example_plugins/application.fam
index a6e3c207..d9a36da5 100644
--- a/applications/examples/example_plugins/application.fam
+++ b/applications/examples/example_plugins/application.fam
@@ -5,6 +5,7 @@ App(
     entry_point="example_plugins_app",
     stack_size=2 * 1024,
     fap_category="Examples",
+    sources=["*.c", "!plugin*.c"],
 )
 
 App(
@@ -21,6 +22,7 @@ App(
     apptype=FlipperAppType.PLUGIN,
     entry_point="example_plugin1_ep",
     requires=["example_plugins", "example_plugins_multi"],
+    sources=["plugin1.c"],
 )
 
 App(
@@ -28,4 +30,5 @@ App(
     apptype=FlipperAppType.PLUGIN,
     entry_point="example_plugin2_ep",
     requires=["example_plugins_multi"],
+    sources=["plugin2.c"],
 )
diff --git a/applications/examples/example_plugins_advanced/application.fam b/applications/examples/example_plugins_advanced/application.fam
index d40c0dde..0c7e3e3b 100644
--- a/applications/examples/example_plugins_advanced/application.fam
+++ b/applications/examples/example_plugins_advanced/application.fam
@@ -5,6 +5,7 @@ App(
     entry_point="example_advanced_plugins_app",
     stack_size=2 * 1024,
     fap_category="Examples",
+    sources=["*.c*", "!plugin*.c"],
 )
 
 App(
diff --git a/applications/main/archive/helpers/archive_favorites.c b/applications/main/archive/helpers/archive_favorites.c
index f395ee5a..682aa6b3 100644
--- a/applications/main/archive/helpers/archive_favorites.c
+++ b/applications/main/archive/helpers/archive_favorites.c
@@ -12,12 +12,12 @@ static bool archive_favorites_read_line(File* file, FuriString* str_result) {
     bool result = false;
 
     do {
-        uint16_t read_count = storage_file_read(file, buffer, ARCHIVE_FAV_FILE_BUF_LEN);
+        size_t read_count = storage_file_read(file, buffer, ARCHIVE_FAV_FILE_BUF_LEN);
         if(storage_file_get_error(file) != FSE_OK) {
             return false;
         }
 
-        for(uint16_t i = 0; i < read_count; i++) {
+        for(size_t i = 0; i < read_count; i++) {
             if(buffer[i] == '\n') {
                 uint32_t position = storage_file_tell(file);
                 if(storage_file_get_error(file) != FSE_OK) {
diff --git a/applications/main/bad_usb/application.fam b/applications/main/bad_usb/application.fam
index 5c42c9fa..9844e248 100644
--- a/applications/main/bad_usb/application.fam
+++ b/applications/main/bad_usb/application.fam
@@ -6,6 +6,7 @@ App(
     stack_size=2 * 1024,
     icon="A_BadUsb_14",
     order=70,
+    resources="resources",
     fap_libs=["assets"],
     fap_icon="icon.png",
     fap_category="USB",
diff --git a/assets/resources/badusb/Install_qFlipper_macOS.txt b/applications/main/bad_usb/resources/badusb/Install_qFlipper_macOS.txt
similarity index 100%
rename from assets/resources/badusb/Install_qFlipper_macOS.txt
rename to applications/main/bad_usb/resources/badusb/Install_qFlipper_macOS.txt
diff --git a/assets/resources/badusb/Install_qFlipper_windows.txt b/applications/main/bad_usb/resources/badusb/Install_qFlipper_windows.txt
similarity index 100%
rename from assets/resources/badusb/Install_qFlipper_windows.txt
rename to applications/main/bad_usb/resources/badusb/Install_qFlipper_windows.txt
diff --git a/assets/resources/badusb/assets/layouts/ba-BA.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/ba-BA.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/ba-BA.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/ba-BA.kl
diff --git a/assets/resources/badusb/assets/layouts/cz_CS.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/cz_CS.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/cz_CS.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/cz_CS.kl
diff --git a/assets/resources/badusb/assets/layouts/da-DA.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/da-DA.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/da-DA.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/da-DA.kl
diff --git a/assets/resources/badusb/assets/layouts/de-CH.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/de-CH.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/de-CH.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/de-CH.kl
diff --git a/assets/resources/badusb/assets/layouts/de-DE.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/de-DE.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/de-DE.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/de-DE.kl
diff --git a/assets/resources/badusb/assets/layouts/dvorak.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/dvorak.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/dvorak.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/dvorak.kl
diff --git a/assets/resources/badusb/assets/layouts/en-UK.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/en-UK.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/en-UK.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/en-UK.kl
diff --git a/assets/resources/badusb/assets/layouts/en-US.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/en-US.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/en-US.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/en-US.kl
diff --git a/assets/resources/badusb/assets/layouts/es-ES.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/es-ES.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/es-ES.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/es-ES.kl
diff --git a/assets/resources/badusb/assets/layouts/fr-BE.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/fr-BE.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/fr-BE.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/fr-BE.kl
diff --git a/assets/resources/badusb/assets/layouts/fr-CA.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/fr-CA.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/fr-CA.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/fr-CA.kl
diff --git a/assets/resources/badusb/assets/layouts/fr-CH.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/fr-CH.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/fr-CH.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/fr-CH.kl
diff --git a/assets/resources/badusb/assets/layouts/fr-FR-mac.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/fr-FR-mac.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/fr-FR-mac.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/fr-FR-mac.kl
diff --git a/assets/resources/badusb/assets/layouts/fr-FR.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/fr-FR.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/fr-FR.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/fr-FR.kl
diff --git a/assets/resources/badusb/assets/layouts/hr-HR.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/hr-HR.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/hr-HR.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/hr-HR.kl
diff --git a/assets/resources/badusb/assets/layouts/hu-HU.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/hu-HU.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/hu-HU.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/hu-HU.kl
diff --git a/assets/resources/badusb/assets/layouts/it-IT.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/it-IT.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/it-IT.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/it-IT.kl
diff --git a/assets/resources/badusb/assets/layouts/nb-NO.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/nb-NO.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/nb-NO.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/nb-NO.kl
diff --git a/assets/resources/badusb/assets/layouts/nl-NL.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/nl-NL.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/nl-NL.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/nl-NL.kl
diff --git a/assets/resources/badusb/assets/layouts/pt-BR.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/pt-BR.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/pt-BR.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/pt-BR.kl
diff --git a/assets/resources/badusb/assets/layouts/pt-PT.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/pt-PT.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/pt-PT.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/pt-PT.kl
diff --git a/assets/resources/badusb/assets/layouts/si-SI.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/si-SI.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/si-SI.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/si-SI.kl
diff --git a/assets/resources/badusb/assets/layouts/sk-SK.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/sk-SK.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/sk-SK.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/sk-SK.kl
diff --git a/assets/resources/badusb/assets/layouts/sv-SE.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/sv-SE.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/sv-SE.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/sv-SE.kl
diff --git a/assets/resources/badusb/assets/layouts/tr-TR.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/tr-TR.kl
similarity index 100%
rename from assets/resources/badusb/assets/layouts/tr-TR.kl
rename to applications/main/bad_usb/resources/badusb/assets/layouts/tr-TR.kl
diff --git a/assets/resources/badusb/demo_macos.txt b/applications/main/bad_usb/resources/badusb/demo_macos.txt
similarity index 100%
rename from assets/resources/badusb/demo_macos.txt
rename to applications/main/bad_usb/resources/badusb/demo_macos.txt
diff --git a/assets/resources/badusb/demo_windows.txt b/applications/main/bad_usb/resources/badusb/demo_windows.txt
similarity index 100%
rename from assets/resources/badusb/demo_windows.txt
rename to applications/main/bad_usb/resources/badusb/demo_windows.txt
diff --git a/applications/main/ibutton/application.fam b/applications/main/ibutton/application.fam
index a8faa629..01c02ec2 100644
--- a/applications/main/ibutton/application.fam
+++ b/applications/main/ibutton/application.fam
@@ -17,5 +17,6 @@ App(
     apptype=FlipperAppType.STARTUP,
     targets=["f7"],
     entry_point="ibutton_on_system_start",
+    sources=["ibutton_cli.c"],
     order=60,
 )
diff --git a/applications/main/ibutton/ibutton.c b/applications/main/ibutton/ibutton.c
index 76091809..afd51f7c 100644
--- a/applications/main/ibutton/ibutton.c
+++ b/applications/main/ibutton/ibutton.c
@@ -39,21 +39,23 @@ static void ibutton_make_app_folder(iButton* ibutton) {
     furi_record_close(RECORD_STORAGE);
 }
 
-static void ibutton_rpc_command_callback(RpcAppSystemEvent event, void* context) {
+static void ibutton_rpc_command_callback(const RpcAppSystemEvent* event, void* context) {
     furi_assert(context);
     iButton* ibutton = context;
 
-    if(event == RpcAppEventSessionClose) {
+    if(event->type == RpcAppEventTypeSessionClose) {
         view_dispatcher_send_custom_event(
             ibutton->view_dispatcher, iButtonCustomEventRpcSessionClose);
         rpc_system_app_set_callback(ibutton->rpc, NULL, NULL);
         ibutton->rpc = NULL;
-    } else if(event == RpcAppEventAppExit) {
+    } else if(event->type == RpcAppEventTypeAppExit) {
         view_dispatcher_send_custom_event(ibutton->view_dispatcher, iButtonCustomEventRpcExit);
-    } else if(event == RpcAppEventLoadFile) {
-        view_dispatcher_send_custom_event(ibutton->view_dispatcher, iButtonCustomEventRpcLoad);
+    } else if(event->type == RpcAppEventTypeLoadFile) {
+        furi_assert(event->data.type == RpcAppSystemEventDataTypeString);
+        furi_string_set(ibutton->file_path, event->data.string);
+        view_dispatcher_send_custom_event(ibutton->view_dispatcher, iButtonCustomEventRpcLoadFile);
     } else {
-        rpc_system_app_confirm(ibutton->rpc, event, false);
+        rpc_system_app_confirm(ibutton->rpc, false);
     }
 }
 
@@ -172,22 +174,21 @@ void ibutton_free(iButton* ibutton) {
     free(ibutton);
 }
 
-bool ibutton_load_key(iButton* ibutton) {
+bool ibutton_load_key(iButton* ibutton, bool show_error) {
     view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewLoading);
 
     const bool success = ibutton_protocols_load(
         ibutton->protocols, ibutton->key, furi_string_get_cstr(ibutton->file_path));
 
-    if(!success) {
-        dialog_message_show_storage_error(ibutton->dialogs, "Cannot load\nkey file");
-
-    } else {
+    if(success) {
         FuriString* tmp = furi_string_alloc();
 
         path_extract_filename(ibutton->file_path, tmp, true);
         strncpy(ibutton->key_name, furi_string_get_cstr(tmp), IBUTTON_KEY_NAME_SIZE);
 
         furi_string_free(tmp);
+    } else if(show_error) {
+        dialog_message_show_storage_error(ibutton->dialogs, "Cannot load\nkey file");
     }
 
     return success;
@@ -208,7 +209,7 @@ bool ibutton_select_and_load_key(iButton* ibutton) {
         if(!dialog_file_browser_show(
                ibutton->dialogs, ibutton->file_path, ibutton->file_path, &browser_options))
             break;
-        success = ibutton_load_key(ibutton);
+        success = ibutton_load_key(ibutton, true);
     } while(!success);
 
     return success;
@@ -281,7 +282,7 @@ int32_t ibutton_app(void* arg) {
 
         } else {
             furi_string_set(ibutton->file_path, (const char*)arg);
-            key_loaded = ibutton_load_key(ibutton);
+            key_loaded = ibutton_load_key(ibutton, true);
         }
     }
 
diff --git a/applications/main/ibutton/ibutton_custom_event.h b/applications/main/ibutton/ibutton_custom_event.h
index 28bcb94a..b0246d31 100644
--- a/applications/main/ibutton/ibutton_custom_event.h
+++ b/applications/main/ibutton/ibutton_custom_event.h
@@ -1,6 +1,6 @@
 #pragma once
 
-enum iButtonCustomEvent {
+typedef enum {
     // Reserve first 100 events for button types and indexes, starting from 0
     iButtonCustomEventReserved = 100,
 
@@ -10,8 +10,12 @@ enum iButtonCustomEvent {
     iButtonCustomEventByteEditResult,
     iButtonCustomEventWorkerEmulated,
     iButtonCustomEventWorkerRead,
+    iButtonCustomEventWorkerWriteOK,
+    iButtonCustomEventWorkerWriteSameKey,
+    iButtonCustomEventWorkerWriteNoDetect,
+    iButtonCustomEventWorkerWriteCannotWrite,
 
-    iButtonCustomEventRpcLoad,
+    iButtonCustomEventRpcLoadFile,
     iButtonCustomEventRpcExit,
     iButtonCustomEventRpcSessionClose,
-};
+} iButtonCustomEvent;
diff --git a/applications/main/ibutton/ibutton_i.h b/applications/main/ibutton/ibutton_i.h
index 077b1480..c6a35f88 100644
--- a/applications/main/ibutton/ibutton_i.h
+++ b/applications/main/ibutton/ibutton_i.h
@@ -90,7 +90,7 @@ typedef enum {
 } iButtonNotificationMessage;
 
 bool ibutton_select_and_load_key(iButton* ibutton);
-bool ibutton_load_key(iButton* ibutton);
+bool ibutton_load_key(iButton* ibutton, bool show_error);
 bool ibutton_save_key(iButton* ibutton);
 bool ibutton_delete_key(iButton* ibutton);
 void ibutton_reset_key(iButton* ibutton);
diff --git a/applications/main/ibutton/scenes/ibutton_scene_add_value.c b/applications/main/ibutton/scenes/ibutton_scene_add_value.c
index dc340771..71b85211 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_add_value.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_add_value.c
@@ -43,7 +43,7 @@ bool ibutton_scene_add_value_on_event(void* context, SceneManagerEvent event) {
     } else if(event.type == SceneManagerEventTypeBack) {
         // User cancelled editing, reload the key from storage
         if(scene_manager_has_previous_scene(scene_manager, iButtonSceneSavedKeyMenu)) {
-            if(!ibutton_load_key(ibutton)) {
+            if(!ibutton_load_key(ibutton, true)) {
                 consumed = scene_manager_search_and_switch_to_previous_scene(
                     scene_manager, iButtonSceneStart);
             }
diff --git a/applications/main/ibutton/scenes/ibutton_scene_rpc.c b/applications/main/ibutton/scenes/ibutton_scene_rpc.c
index 9205eb4b..f4f193a4 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_rpc.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_rpc.c
@@ -23,28 +23,23 @@ bool ibutton_scene_rpc_on_event(void* context, SceneManagerEvent event) {
     if(event.type == SceneManagerEventTypeCustom) {
         consumed = true;
 
-        if(event.event == iButtonCustomEventRpcLoad) {
+        if(event.event == iButtonCustomEventRpcLoadFile) {
             bool result = false;
-            const char* file_path = rpc_system_app_get_data(ibutton->rpc);
 
-            if(file_path && (furi_string_empty(ibutton->file_path))) {
-                furi_string_set(ibutton->file_path, file_path);
+            if(ibutton_load_key(ibutton, false)) {
+                popup_set_text(popup, ibutton->key_name, 82, 32, AlignCenter, AlignTop);
+                view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewPopup);
 
-                if(ibutton_load_key(ibutton)) {
-                    popup_set_text(popup, ibutton->key_name, 82, 32, AlignCenter, AlignTop);
-                    view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewPopup);
+                ibutton_notification_message(ibutton, iButtonNotificationMessageEmulateStart);
+                ibutton_worker_emulate_start(ibutton->worker, ibutton->key);
 
-                    ibutton_notification_message(ibutton, iButtonNotificationMessageEmulateStart);
-                    ibutton_worker_emulate_start(ibutton->worker, ibutton->key);
-
-                    result = true;
-                }
+                result = true;
             }
 
-            rpc_system_app_confirm(ibutton->rpc, RpcAppEventLoadFile, result);
+            rpc_system_app_confirm(ibutton->rpc, result);
 
         } else if(event.event == iButtonCustomEventRpcExit) {
-            rpc_system_app_confirm(ibutton->rpc, RpcAppEventAppExit, true);
+            rpc_system_app_confirm(ibutton->rpc, true);
             scene_manager_stop(ibutton->scene_manager);
             view_dispatcher_stop(ibutton->view_dispatcher);
 
diff --git a/applications/main/ibutton/scenes/ibutton_scene_write.c b/applications/main/ibutton/scenes/ibutton_scene_write.c
index 541aa1c5..63be6350 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_write.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_write.c
@@ -5,9 +5,26 @@ typedef enum {
     iButtonSceneWriteStateBlinkYellow,
 } iButtonSceneWriteState;
 
+static inline iButtonCustomEvent
+    ibutton_scene_write_to_custom_event(iButtonWorkerWriteResult result) {
+    switch(result) {
+    case iButtonWorkerWriteOK:
+        return iButtonCustomEventWorkerWriteOK;
+    case iButtonWorkerWriteSameKey:
+        return iButtonCustomEventWorkerWriteSameKey;
+    case iButtonWorkerWriteNoDetect:
+        return iButtonCustomEventWorkerWriteNoDetect;
+    case iButtonWorkerWriteCannotWrite:
+        return iButtonCustomEventWorkerWriteCannotWrite;
+    default:
+        furi_crash();
+    }
+}
+
 static void ibutton_scene_write_callback(void* context, iButtonWorkerWriteResult result) {
     iButton* ibutton = context;
-    view_dispatcher_send_custom_event(ibutton->view_dispatcher, result);
+    view_dispatcher_send_custom_event(
+        ibutton->view_dispatcher, ibutton_scene_write_to_custom_event(result));
 }
 
 void ibutton_scene_write_on_enter(void* context) {
@@ -61,16 +78,14 @@ bool ibutton_scene_write_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         consumed = true;
-        if((event.event == iButtonWorkerWriteOK) || (event.event == iButtonWorkerWriteSameKey)) {
+        if((event.event == iButtonCustomEventWorkerWriteOK) ||
+           (event.event == iButtonCustomEventWorkerWriteSameKey)) {
             scene_manager_next_scene(scene_manager, iButtonSceneWriteSuccess);
-        } else if(event.event == iButtonWorkerWriteNoDetect) {
+        } else if(event.event == iButtonCustomEventWorkerWriteNoDetect) {
             ibutton_notification_message(ibutton, iButtonNotificationMessageEmulateBlink);
-        } else if(event.event == iButtonWorkerWriteCannotWrite) {
+        } else if(event.event == iButtonCustomEventWorkerWriteCannotWrite) {
             ibutton_notification_message(ibutton, iButtonNotificationMessageYellowBlink);
         }
-
-    } else if(event.type == SceneManagerEventTypeTick) {
-        consumed = true;
     }
 
     return consumed;
diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam
index b78b088a..575bebbe 100644
--- a/applications/main/infrared/application.fam
+++ b/applications/main/infrared/application.fam
@@ -7,6 +7,8 @@ App(
     icon="A_Infrared_14",
     stack_size=3 * 1024,
     order=40,
+    sources=["*.c", "!infrared_cli.c"],
+    resources="resources",
     fap_libs=["assets"],
     fap_icon="icon.png",
     fap_category="Infrared",
@@ -17,5 +19,10 @@ App(
     apptype=FlipperAppType.STARTUP,
     targets=["f7"],
     entry_point="infrared_on_system_start",
+    sources=[
+        "infrared_cli.c",
+        "infrared_brute_force.c",
+        "infrared_signal.c",
+    ],
     order=20,
 )
diff --git a/applications/main/infrared/infrared.h b/applications/main/infrared/infrared.h
deleted file mode 100644
index e5eeb117..00000000
--- a/applications/main/infrared/infrared.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-typedef struct Infrared Infrared;
diff --git a/applications/main/infrared/infrared.c b/applications/main/infrared/infrared_app.c
similarity index 67%
rename from applications/main/infrared/infrared.c
rename to applications/main/infrared/infrared_app.c
index fcf45c25..645659bb 100644
--- a/applications/main/infrared/infrared.c
+++ b/applications/main/infrared/infrared_app.c
@@ -1,69 +1,85 @@
-#include "infrared_i.h"
+#include "infrared_app_i.h"
 
 #include <string.h>
+#include <toolbox/path.h>
 #include <dolphin/dolphin.h>
 
+#define TAG "InfraredApp"
+
 #define INFRARED_TX_MIN_INTERVAL_MS 50U
 
-static const NotificationSequence* infrared_notification_sequences[] = {
-    &sequence_success,
-    &sequence_set_only_green_255,
-    &sequence_reset_green,
-    &sequence_solid_yellow,
-    &sequence_reset_rgb,
-    &sequence_blink_start_cyan,
-    &sequence_blink_start_magenta,
-    &sequence_blink_stop,
+static const NotificationSequence*
+    infrared_notification_sequences[InfraredNotificationMessageCount] = {
+        &sequence_success,
+        &sequence_set_only_green_255,
+        &sequence_reset_green,
+        &sequence_solid_yellow,
+        &sequence_reset_rgb,
+        &sequence_blink_start_cyan,
+        &sequence_blink_start_magenta,
+        &sequence_blink_stop,
 };
 
-static void infrared_make_app_folder(Infrared* infrared) {
+static void infrared_make_app_folder(InfraredApp* infrared) {
     if(!storage_simply_mkdir(infrared->storage, INFRARED_APP_FOLDER)) {
-        dialog_message_show_storage_error(infrared->dialogs, "Cannot create\napp folder");
+        infrared_show_error_message(infrared, "Cannot create\napp folder");
     }
 }
 
 static bool infrared_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     return scene_manager_handle_custom_event(infrared->scene_manager, event);
 }
 
 static bool infrared_back_event_callback(void* context) {
     furi_assert(context);
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     return scene_manager_handle_back_event(infrared->scene_manager);
 }
 
 static void infrared_tick_event_callback(void* context) {
     furi_assert(context);
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     scene_manager_handle_tick_event(infrared->scene_manager);
 }
 
-static void infrared_rpc_command_callback(RpcAppSystemEvent event, void* context) {
+static void infrared_rpc_command_callback(const RpcAppSystemEvent* event, void* context) {
     furi_assert(context);
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     furi_assert(infrared->rpc_ctx);
 
-    if(event == RpcAppEventSessionClose) {
+    if(event->type == RpcAppEventTypeSessionClose) {
         view_dispatcher_send_custom_event(
             infrared->view_dispatcher, InfraredCustomEventTypeRpcSessionClose);
         rpc_system_app_set_callback(infrared->rpc_ctx, NULL, NULL);
         infrared->rpc_ctx = NULL;
-    } else if(event == RpcAppEventAppExit) {
+    } else if(event->type == RpcAppEventTypeAppExit) {
         view_dispatcher_send_custom_event(
             infrared->view_dispatcher, InfraredCustomEventTypeRpcExit);
-    } else if(event == RpcAppEventLoadFile) {
+    } else if(event->type == RpcAppEventTypeLoadFile) {
+        furi_assert(event->data.type == RpcAppSystemEventDataTypeString);
+        furi_string_set(infrared->file_path, event->data.string);
         view_dispatcher_send_custom_event(
-            infrared->view_dispatcher, InfraredCustomEventTypeRpcLoad);
-    } else if(event == RpcAppEventButtonPress) {
-        view_dispatcher_send_custom_event(
-            infrared->view_dispatcher, InfraredCustomEventTypeRpcButtonPress);
-    } else if(event == RpcAppEventButtonRelease) {
+            infrared->view_dispatcher, InfraredCustomEventTypeRpcLoadFile);
+    } else if(event->type == RpcAppEventTypeButtonPress) {
+        furi_assert(
+            event->data.type == RpcAppSystemEventDataTypeString ||
+            event->data.type == RpcAppSystemEventDataTypeInt32);
+        if(event->data.type == RpcAppSystemEventDataTypeString) {
+            furi_string_set(infrared->button_name, event->data.string);
+            view_dispatcher_send_custom_event(
+                infrared->view_dispatcher, InfraredCustomEventTypeRpcButtonPressName);
+        } else {
+            infrared->app_state.current_button_index = event->data.i32;
+            view_dispatcher_send_custom_event(
+                infrared->view_dispatcher, InfraredCustomEventTypeRpcButtonPressIndex);
+        }
+    } else if(event->type == RpcAppEventTypeButtonRelease) {
         view_dispatcher_send_custom_event(
             infrared->view_dispatcher, InfraredCustomEventTypeRpcButtonRelease);
     } else {
-        rpc_system_app_confirm(infrared->rpc_ctx, event, false);
+        rpc_system_app_confirm(infrared->rpc_ctx, false);
     }
 }
 
@@ -109,10 +125,11 @@ static void infrared_find_vacant_remote_name(FuriString* name, const char* path)
     furi_record_close(RECORD_STORAGE);
 }
 
-static Infrared* infrared_alloc() {
-    Infrared* infrared = malloc(sizeof(Infrared));
+static InfraredApp* infrared_alloc() {
+    InfraredApp* infrared = malloc(sizeof(InfraredApp));
 
     infrared->file_path = furi_string_alloc();
+    infrared->button_name = furi_string_alloc();
 
     InfraredAppState* app_state = &infrared->app_state;
     app_state->is_learning_new_remote = false;
@@ -139,7 +156,7 @@ static Infrared* infrared_alloc() {
 
     infrared->worker = infrared_worker_alloc();
     infrared->remote = infrared_remote_alloc();
-    infrared->received_signal = infrared_signal_alloc();
+    infrared->current_signal = infrared_signal_alloc();
     infrared->brute_force = infrared_brute_force_alloc();
 
     infrared->submenu = submenu_alloc();
@@ -184,7 +201,7 @@ static Infrared* infrared_alloc() {
     return infrared;
 }
 
-static void infrared_free(Infrared* infrared) {
+static void infrared_free(InfraredApp* infrared) {
     furi_assert(infrared);
     ViewDispatcher* view_dispatcher = infrared->view_dispatcher;
     InfraredAppState* app_state = &infrared->app_state;
@@ -229,7 +246,7 @@ static void infrared_free(Infrared* infrared) {
     scene_manager_free(infrared->scene_manager);
 
     infrared_brute_force_free(infrared->brute_force);
-    infrared_signal_free(infrared->received_signal);
+    infrared_signal_free(infrared->current_signal);
     infrared_remote_free(infrared->remote);
     infrared_worker_free(infrared->worker);
 
@@ -243,70 +260,67 @@ static void infrared_free(Infrared* infrared) {
     infrared->gui = NULL;
 
     furi_string_free(infrared->file_path);
+    furi_string_free(infrared->button_name);
 
     free(infrared);
 }
 
 bool infrared_add_remote_with_button(
-    Infrared* infrared,
+    const InfraredApp* infrared,
     const char* button_name,
-    InfraredSignal* signal) {
+    const InfraredSignal* signal) {
     InfraredRemote* remote = infrared->remote;
 
-    FuriString *new_name, *new_path;
-    new_name = furi_string_alloc_set(INFRARED_DEFAULT_REMOTE_NAME);
-    new_path = furi_string_alloc_set(INFRARED_APP_FOLDER);
+    FuriString* new_name = furi_string_alloc_set(INFRARED_DEFAULT_REMOTE_NAME);
+    FuriString* new_path = furi_string_alloc_set(INFRARED_APP_FOLDER);
 
     infrared_find_vacant_remote_name(new_name, furi_string_get_cstr(new_path));
     furi_string_cat_printf(
         new_path, "/%s%s", furi_string_get_cstr(new_name), INFRARED_APP_EXTENSION);
 
-    infrared_remote_reset(remote);
-    infrared_remote_set_name(remote, furi_string_get_cstr(new_name));
-    infrared_remote_set_path(remote, furi_string_get_cstr(new_path));
+    bool success = false;
+
+    do {
+        if(!infrared_remote_create(remote, furi_string_get_cstr(new_path))) break;
+        if(!infrared_remote_append_signal(remote, signal, button_name)) break;
+        success = true;
+    } while(false);
 
     furi_string_free(new_name);
     furi_string_free(new_path);
-    return infrared_remote_add_button(remote, button_name, signal);
+
+    return success;
 }
 
-bool infrared_rename_current_remote(Infrared* infrared, const char* name) {
+bool infrared_rename_current_remote(const InfraredApp* infrared, const char* new_name) {
     InfraredRemote* remote = infrared->remote;
-    const char* remote_path = infrared_remote_get_path(remote);
+    const char* old_path = infrared_remote_get_path(remote);
 
-    if(!strcmp(infrared_remote_get_name(remote), name)) {
+    if(!strcmp(infrared_remote_get_name(remote), new_name)) {
         return true;
     }
 
-    FuriString* new_name;
-    new_name = furi_string_alloc_set(name);
+    FuriString* new_name_fstr = furi_string_alloc_set(new_name);
+    FuriString* new_path_fstr = furi_string_alloc_set(old_path);
 
-    infrared_find_vacant_remote_name(new_name, remote_path);
+    infrared_find_vacant_remote_name(new_name_fstr, old_path);
 
-    FuriString* new_path;
-    new_path = furi_string_alloc_set(infrared_remote_get_path(remote));
-    if(furi_string_end_with(new_path, INFRARED_APP_EXTENSION)) {
-        size_t filename_start = furi_string_search_rchar(new_path, '/');
-        furi_string_left(new_path, filename_start);
+    if(furi_string_end_with(new_path_fstr, INFRARED_APP_EXTENSION)) {
+        path_extract_dirname(old_path, new_path_fstr);
     }
-    furi_string_cat_printf(
-        new_path, "/%s%s", furi_string_get_cstr(new_name), INFRARED_APP_EXTENSION);
 
-    Storage* storage = furi_record_open(RECORD_STORAGE);
+    path_append(new_path_fstr, furi_string_get_cstr(new_name_fstr));
+    furi_string_cat(new_path_fstr, INFRARED_APP_EXTENSION);
 
-    FS_Error status = storage_common_rename(
-        storage, infrared_remote_get_path(remote), furi_string_get_cstr(new_path));
-    infrared_remote_set_name(remote, furi_string_get_cstr(new_name));
-    infrared_remote_set_path(remote, furi_string_get_cstr(new_path));
+    const bool success = infrared_remote_rename(remote, furi_string_get_cstr(new_path_fstr));
 
-    furi_string_free(new_name);
-    furi_string_free(new_path);
+    furi_string_free(new_name_fstr);
+    furi_string_free(new_path_fstr);
 
-    furi_record_close(RECORD_STORAGE);
-    return (status == FSE_OK || status == FSE_EXIST);
+    return success;
 }
 
-void infrared_tx_start_signal(Infrared* infrared, InfraredSignal* signal) {
+void infrared_tx_start(InfraredApp* infrared) {
     if(infrared->app_state.is_transmitting) {
         return;
     }
@@ -317,12 +331,12 @@ void infrared_tx_start_signal(Infrared* infrared, InfraredSignal* signal) {
         return;
     }
 
-    if(infrared_signal_is_raw(signal)) {
-        InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
+    if(infrared_signal_is_raw(infrared->current_signal)) {
+        const InfraredRawSignal* raw = infrared_signal_get_raw_signal(infrared->current_signal);
         infrared_worker_set_raw_signal(
             infrared->worker, raw->timings, raw->timings_size, raw->frequency, raw->duty_cycle);
     } else {
-        InfraredMessage* message = infrared_signal_get_message(signal);
+        const InfraredMessage* message = infrared_signal_get_message(infrared->current_signal);
         infrared_worker_set_decoded_signal(infrared->worker, message);
     }
 
@@ -336,20 +350,20 @@ void infrared_tx_start_signal(Infrared* infrared, InfraredSignal* signal) {
     infrared->app_state.is_transmitting = true;
 }
 
-void infrared_tx_start_button_index(Infrared* infrared, size_t button_index) {
-    furi_assert(button_index < infrared_remote_get_button_count(infrared->remote));
+void infrared_tx_start_button_index(InfraredApp* infrared, size_t button_index) {
+    furi_assert(button_index < infrared_remote_get_signal_count(infrared->remote));
 
-    InfraredRemoteButton* button = infrared_remote_get_button(infrared->remote, button_index);
-    InfraredSignal* signal = infrared_remote_button_get_signal(button);
-
-    infrared_tx_start_signal(infrared, signal);
+    if(infrared_remote_load_signal(infrared->remote, infrared->current_signal, button_index)) {
+        infrared_tx_start(infrared);
+    } else {
+        infrared_show_error_message(
+            infrared,
+            "Failed to load\n\"%s\"",
+            infrared_remote_get_signal_name(infrared->remote, button_index));
+    }
 }
 
-void infrared_tx_start_received(Infrared* infrared) {
-    infrared_tx_start_signal(infrared, infrared->received_signal);
-}
-
-void infrared_tx_stop(Infrared* infrared) {
+void infrared_tx_stop(InfraredApp* infrared) {
     if(!infrared->app_state.is_transmitting) {
         return;
     }
@@ -363,53 +377,65 @@ void infrared_tx_stop(Infrared* infrared) {
     infrared->app_state.last_transmit_time = furi_get_tick();
 }
 
-void infrared_text_store_set(Infrared* infrared, uint32_t bank, const char* text, ...) {
+void infrared_text_store_set(InfraredApp* infrared, uint32_t bank, const char* fmt, ...) {
     va_list args;
-    va_start(args, text);
+    va_start(args, fmt);
 
-    vsnprintf(infrared->text_store[bank], INFRARED_TEXT_STORE_SIZE, text, args);
+    vsnprintf(infrared->text_store[bank], INFRARED_TEXT_STORE_SIZE, fmt, args);
 
     va_end(args);
 }
 
-void infrared_text_store_clear(Infrared* infrared, uint32_t bank) {
+void infrared_text_store_clear(InfraredApp* infrared, uint32_t bank) {
     memset(infrared->text_store[bank], 0, INFRARED_TEXT_STORE_SIZE + 1);
 }
 
-void infrared_play_notification_message(Infrared* infrared, uint32_t message) {
-    furi_assert(message < sizeof(infrared_notification_sequences) / sizeof(NotificationSequence*));
+void infrared_play_notification_message(
+    const InfraredApp* infrared,
+    InfraredNotificationMessage message) {
+    furi_assert(message < InfraredNotificationMessageCount);
     notification_message(infrared->notifications, infrared_notification_sequences[message]);
 }
 
-void infrared_show_loading_popup(Infrared* infrared, bool show) {
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
+void infrared_show_loading_popup(const InfraredApp* infrared, bool show) {
     ViewStack* view_stack = infrared->view_stack;
     Loading* loading = infrared->loading;
 
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_stack_add_view(view_stack, loading_get_view(loading));
     } else {
         view_stack_remove_view(view_stack, loading_get_view(loading));
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 
+void infrared_show_error_message(const InfraredApp* infrared, const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+
+    FuriString* message = furi_string_alloc_vprintf(fmt, args);
+    dialog_message_show_storage_error(infrared->dialogs, furi_string_get_cstr(message));
+
+    furi_string_free(message);
+    va_end(args);
+}
+
 void infrared_signal_received_callback(void* context, InfraredWorkerSignal* received_signal) {
     furi_assert(context);
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
 
     if(infrared_worker_signal_is_decoded(received_signal)) {
         infrared_signal_set_message(
-            infrared->received_signal, infrared_worker_get_decoded_signal(received_signal));
+            infrared->current_signal, infrared_worker_get_decoded_signal(received_signal));
     } else {
         const uint32_t* timings;
         size_t timings_size;
         infrared_worker_get_raw_signal(received_signal, &timings, &timings_size);
         infrared_signal_set_raw_signal(
-            infrared->received_signal,
+            infrared->current_signal,
             timings,
             timings_size,
             INFRARED_COMMON_CARRIER_FREQUENCY,
@@ -422,20 +448,20 @@ void infrared_signal_received_callback(void* context, InfraredWorkerSignal* rece
 
 void infrared_text_input_callback(void* context) {
     furi_assert(context);
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_dispatcher_send_custom_event(
         infrared->view_dispatcher, InfraredCustomEventTypeTextEditDone);
 }
 
 void infrared_popup_closed_callback(void* context) {
     furi_assert(context);
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_dispatcher_send_custom_event(
         infrared->view_dispatcher, InfraredCustomEventTypePopupClosed);
 }
 
 int32_t infrared_app(void* p) {
-    Infrared* infrared = infrared_alloc();
+    InfraredApp* infrared = infrared_alloc();
 
     infrared_make_app_folder(infrared);
 
@@ -451,13 +477,15 @@ int32_t infrared_app(void* p) {
             rpc_system_app_send_started(infrared->rpc_ctx);
             is_rpc_mode = true;
         } else {
-            furi_string_set(infrared->file_path, (const char*)p);
-            is_remote_loaded = infrared_remote_load(infrared->remote, infrared->file_path);
+            const char* file_path = (const char*)p;
+            is_remote_loaded = infrared_remote_load(infrared->remote, file_path);
+
             if(!is_remote_loaded) {
-                dialog_message_show_storage_error(
-                    infrared->dialogs, "Failed to load\nselected remote");
+                infrared_show_error_message(infrared, "Failed to load\n\"%s\"", file_path);
                 return -1;
             }
+
+            furi_string_set(infrared->file_path, file_path);
         }
     }
 
diff --git a/applications/main/infrared/infrared_app.h b/applications/main/infrared/infrared_app.h
new file mode 100644
index 00000000..a6f87402
--- /dev/null
+++ b/applications/main/infrared/infrared_app.h
@@ -0,0 +1,15 @@
+/**
+ * @file infrared_app.h
+ * @brief Infrared application - start here.
+ *
+ * @see infrared_app_i.h for the main application data structure and functions.
+ * @see infrared_signal.h for the infrared signal library - loading, storing and transmitting signals.
+ * @see infrared_remote.hl for the infrared remote library - loading, storing and manipulating remotes.
+ * @see infrared_brute_force.h for the infrared brute force - loading and transmitting multiple signals.
+ */
+#pragma once
+
+/**
+ * @brief InfraredApp opaque type declaration.
+ */
+typedef struct InfraredApp InfraredApp;
diff --git a/applications/main/infrared/infrared_app_i.h b/applications/main/infrared/infrared_app_i.h
new file mode 100644
index 00000000..c35d3fa4
--- /dev/null
+++ b/applications/main/infrared/infrared_app_i.h
@@ -0,0 +1,289 @@
+/**
+ * @file infrared_app_i.h
+ * @brief Main Infrared application types and functions.
+ */
+#pragma once
+
+#include <gui/gui.h>
+#include <gui/view.h>
+#include <assets_icons.h>
+#include <gui/view_stack.h>
+#include <gui/view_dispatcher.h>
+#include <gui/scene_manager.h>
+
+#include <gui/modules/popup.h>
+#include <gui/modules/loading.h>
+#include <gui/modules/submenu.h>
+#include <gui/modules/dialog_ex.h>
+#include <gui/modules/text_input.h>
+#include <gui/modules/button_menu.h>
+#include <gui/modules/button_panel.h>
+
+#include <storage/storage.h>
+#include <dialogs/dialogs.h>
+
+#include <notification/notification_messages.h>
+
+#include <infrared_worker.h>
+
+#include "infrared_app.h"
+#include "infrared_remote.h"
+#include "infrared_brute_force.h"
+#include "infrared_custom_event.h"
+
+#include "scenes/infrared_scene.h"
+#include "views/infrared_progress_view.h"
+#include "views/infrared_debug_view.h"
+#include "views/infrared_move_view.h"
+
+#include "rpc/rpc_app.h"
+
+#define INFRARED_FILE_NAME_SIZE 100
+#define INFRARED_TEXT_STORE_NUM 2
+#define INFRARED_TEXT_STORE_SIZE 128
+
+#define INFRARED_MAX_BUTTON_NAME_LENGTH 22
+#define INFRARED_MAX_REMOTE_NAME_LENGTH 22
+
+#define INFRARED_APP_FOLDER ANY_PATH("infrared")
+#define INFRARED_APP_EXTENSION ".ir"
+
+#define INFRARED_DEFAULT_REMOTE_NAME "Remote"
+#define INFRARED_LOG_TAG "InfraredApp"
+
+/**
+ * @brief Enumeration of invalid remote button indices.
+ */
+typedef enum {
+    InfraredButtonIndexNone = -1, /**< No button is currently selected. */
+} InfraredButtonIndex;
+
+/**
+ * @brief Enumeration of editing targets.
+ */
+typedef enum {
+    InfraredEditTargetNone, /**< No editing target is selected. */
+    InfraredEditTargetRemote, /**< Whole remote is selected as editing target. */
+    InfraredEditTargetButton, /**< Single button is selected as editing target. */
+} InfraredEditTarget;
+
+/**
+ * @brief Enumeration of editing modes.
+ */
+typedef enum {
+    InfraredEditModeNone, /**< No editing mode is selected. */
+    InfraredEditModeRename, /**< Rename mode is selected. */
+    InfraredEditModeDelete, /**< Delete mode is selected. */
+} InfraredEditMode;
+
+/**
+ * @brief Infrared application state type.
+ */
+typedef struct {
+    bool is_learning_new_remote; /**< Learning new remote or adding to an existing one. */
+    bool is_debug_enabled; /**< Whether to enable or disable debugging features. */
+    bool is_transmitting; /**< Whether a signal is currently being transmitted. */
+    InfraredEditTarget edit_target : 8; /**< Selected editing target (a remote or a button). */
+    InfraredEditMode edit_mode : 8; /**< Selected editing operation (rename or delete). */
+    int32_t current_button_index; /**< Selected button index (move destination). */
+    int32_t prev_button_index; /**< Previous button index (move source). */
+    uint32_t last_transmit_time; /**< Lat time a signal was transmitted. */
+} InfraredAppState;
+
+/**
+ * @brief Infrared application type.
+ */
+struct InfraredApp {
+    SceneManager* scene_manager; /**< Pointer to a SceneManager instance. */
+    ViewDispatcher* view_dispatcher; /**< Pointer to a ViewDispatcher instance. */
+
+    Gui* gui; /**< Pointer to a Gui instance. */
+    Storage* storage; /**< Pointer to a Storage instance. */
+    DialogsApp* dialogs; /**< Pointer to a DialogsApp instance. */
+    NotificationApp* notifications; /**< Pointer to a NotificationApp instance. */
+    InfraredWorker* worker; /**< Used to send or receive signals. */
+    InfraredRemote* remote; /**< Holds the currently loaded remote. */
+    InfraredSignal* current_signal; /**< Holds the currently loaded signal. */
+    InfraredBruteForce* brute_force; /**< Used for the Universal Remote feature. */
+
+    Submenu* submenu; /**< Standard view for displaying application menus. */
+    TextInput* text_input; /**< Standard view for receiving user text input. */
+    DialogEx* dialog_ex; /**< Standard view for displaying dialogs. */
+    ButtonMenu* button_menu; /**< Custom view for interacting with IR remotes. */
+    Popup* popup; /**< Standard view for displaying messages. */
+
+    ViewStack* view_stack; /**< Standard view for displaying stacked interfaces. */
+    InfraredDebugView* debug_view; /**< Custom view for displaying debug information. */
+    InfraredMoveView* move_view; /**< Custom view for rearranging buttons in a remote. */
+
+    ButtonPanel* button_panel; /**< Standard view for displaying control panels. */
+    Loading* loading; /**< Standard view for informing about long operations. */
+    InfraredProgressView* progress; /**< Custom view for showing brute force progress. */
+
+    FuriString* file_path; /**< Full path to the currently loaded file. */
+    FuriString* button_name; /** Name of the button requested in RPC mode. */
+    /** Arbitrary text storage for various inputs. */
+    char text_store[INFRARED_TEXT_STORE_NUM][INFRARED_TEXT_STORE_SIZE + 1];
+    InfraredAppState app_state; /**< Application state. */
+
+    void* rpc_ctx; /**< Pointer to the RPC context object. */
+};
+
+/**
+ * @brief Enumeration of all used view types.
+ */
+typedef enum {
+    InfraredViewSubmenu,
+    InfraredViewTextInput,
+    InfraredViewDialogEx,
+    InfraredViewButtonMenu,
+    InfraredViewPopup,
+    InfraredViewStack,
+    InfraredViewDebugView,
+    InfraredViewMove,
+} InfraredView;
+
+/**
+ * @brief Enumeration of all notification message types.
+ */
+typedef enum {
+    InfraredNotificationMessageSuccess, /**< Play a short happy tune. */
+    InfraredNotificationMessageGreenOn, /**< Turn green LED on. */
+    InfraredNotificationMessageGreenOff, /**< Turn green LED off. */
+    InfraredNotificationMessageYellowOn, /**< Turn yellow LED on. */
+    InfraredNotificationMessageYellowOff, /**< Turn yellow LED off. */
+    InfraredNotificationMessageBlinkStartRead, /**< Blink the LED to indicate receiver mode. */
+    InfraredNotificationMessageBlinkStartSend, /**< Blink the LED to indicate transmitter mode. */
+    InfraredNotificationMessageBlinkStop, /**< Stop blinking the LED. */
+    InfraredNotificationMessageCount, /**< Special value equal to the message type count. */
+} InfraredNotificationMessage;
+
+/**
+ * @brief Add a new remote with a single signal.
+ *
+ * The filename will be automatically generated depending on
+ * the names and number of other files in the infrared data directory.
+ *
+ * @param[in] infrared pointer to the application instance.
+ * @param[in] name pointer to a zero-terminated string containing the signal name.
+ * @param[in] signal pointer to the signal to be added.
+ * @return true if the remote was successfully created, false otherwise.
+ */
+bool infrared_add_remote_with_button(
+    const InfraredApp* infrared,
+    const char* name,
+    const InfraredSignal* signal);
+
+/**
+ * @brief Rename the currently loaded remote.
+ *
+ * @param[in] infrared pointer to the application instance.
+ * @param[in] new_name pointer to a zero-terminated string containing the new remote name.
+ * @return true if the remote was successfully renamed, false otherwise.
+ */
+bool infrared_rename_current_remote(const InfraredApp* infrared, const char* new_name);
+
+/**
+ * @brief Begin transmission of the currently loaded signal.
+ *
+ * The signal will be repeated indefinitely until stopped.
+ *
+ * @param[in,out] infrared pointer to the application instance.
+ */
+void infrared_tx_start(InfraredApp* infrared);
+
+/**
+ * @brief Load a signal under the given index and begin transmission.
+ *
+ * The signal will be repeated indefinitely until stopped.
+ *
+ * @param[in,out] infrared pointer to the application instance.
+ * @param[in] button_index index of the signal to be loaded.
+ * @returns true if the signal could be loaded, false otherwise.
+ */
+void infrared_tx_start_button_index(InfraredApp* infrared, size_t button_index);
+
+/**
+ * @brief Stop transmission of the currently loaded signal.
+ *
+ * @param[in,out] infrared pointer to the application instance.
+ */
+void infrared_tx_stop(InfraredApp* infrared);
+
+/**
+ * @brief Set the internal text store with formatted text.
+ *
+ * @param[in,out] infrared pointer to the application instance.
+ * @param[in] bank index of text store bank (0 or 1).
+ * @param[in] fmt pointer to a zero-terminated string containing the format text.
+ * @param[in] ... additional arguments.
+ */
+void infrared_text_store_set(InfraredApp* infrared, uint32_t bank, const char* fmt, ...)
+    _ATTRIBUTE((__format__(__printf__, 3, 4)));
+
+/**
+ * @brief Clear the internal text store.
+ *
+ * @param[in,out] infrared pointer to the application instance.
+ * @param[in] bank index of text store bank (0 or 1).
+ */
+void infrared_text_store_clear(InfraredApp* infrared, uint32_t bank);
+
+/**
+ * @brief Play a sound and/or blink the LED.
+ *
+ * @param[in] infrared pointer to the application instance.
+ * @param[in] message type of the message to play.
+ */
+void infrared_play_notification_message(
+    const InfraredApp* infrared,
+    InfraredNotificationMessage message);
+
+/**
+ * @brief Show a loading pop-up screen.
+ *
+ * In order for this to work, a Stack view must be currently active and
+ * the main view must be added to it.
+ *
+ * @param[in] infrared pointer to the application instance.
+ * @param[in] show whether to show or hide the pop-up.
+ */
+void infrared_show_loading_popup(const InfraredApp* infrared, bool show);
+
+/**
+ * @brief Show a formatted error messsage.
+ *
+ * @param[in] infrared pointer to the application instance.
+ * @param[in] fmt pointer to a zero-terminated string containing the format text.
+ * @param[in] ... additional arguments.
+ */
+void infrared_show_error_message(const InfraredApp* infrared, const char* fmt, ...)
+    _ATTRIBUTE((__format__(__printf__, 2, 3)));
+
+/**
+ * @brief Common received signal callback.
+ *
+ * Called when the worker has received a complete infrared signal.
+ *
+ * @param[in,out] context pointer to the user-specified context object.
+ * @param[in] received_signal pointer to the received signal.
+ */
+void infrared_signal_received_callback(void* context, InfraredWorkerSignal* received_signal);
+
+/**
+ * @brief Common text input callback.
+ *
+ * Called when the input has been accepted by the user.
+ *
+ * @param[in,out] context pointer to the user-specified context object.
+ */
+void infrared_text_input_callback(void* context);
+
+/**
+ * @brief Common popup close callback.
+ *
+ * Called when the popup has been closed either by the user or after a timeout.
+ *
+ * @param[in,out] context pointer to the user-specified context object.
+ */
+void infrared_popup_closed_callback(void* context);
diff --git a/applications/main/infrared/infrared_brute_force.c b/applications/main/infrared/infrared_brute_force.c
index 3ca5c409..373c7270 100644
--- a/applications/main/infrared/infrared_brute_force.c
+++ b/applications/main/infrared/infrared_brute_force.c
@@ -111,7 +111,7 @@ bool infrared_brute_force_start(
     return success;
 }
 
-bool infrared_brute_force_is_started(InfraredBruteForce* brute_force) {
+bool infrared_brute_force_is_started(const InfraredBruteForce* brute_force) {
     return brute_force->is_started;
 }
 
@@ -128,8 +128,10 @@ void infrared_brute_force_stop(InfraredBruteForce* brute_force) {
 
 bool infrared_brute_force_send_next(InfraredBruteForce* brute_force) {
     furi_assert(brute_force->is_started);
-    const bool success = infrared_signal_search_and_read(
-        brute_force->current_signal, brute_force->ff, brute_force->current_record_name);
+    const bool success = infrared_signal_search_by_name_and_read(
+        brute_force->current_signal,
+        brute_force->ff,
+        furi_string_get_cstr(brute_force->current_record_name));
     if(success) {
         infrared_signal_transmit(brute_force->current_signal);
     }
diff --git a/applications/main/infrared/infrared_brute_force.h b/applications/main/infrared/infrared_brute_force.h
index 042d1556..33677d2e 100644
--- a/applications/main/infrared/infrared_brute_force.h
+++ b/applications/main/infrared/infrared_brute_force.h
@@ -1,23 +1,110 @@
+/**
+ * @file infrared_brute_force.h
+ * @brief Infrared signal brute-forcing library.
+ *
+ * The BruteForce library is used to send large quantities of signals,
+ * sorted by a category. It is used to implement the Universal Remote
+ * feature.
+ */
 #pragma once
 
 #include <stdint.h>
 #include <stdbool.h>
 
+/**
+ * @brief InfraredBruteForce opaque type declaration.
+ */
 typedef struct InfraredBruteForce InfraredBruteForce;
 
+/**
+ * @brief Create a new InfraredBruteForce instance.
+ *
+ * @returns pointer to the created instance.
+ */
 InfraredBruteForce* infrared_brute_force_alloc();
+
+/**
+ * @brief Delete an InfraredBruteForce instance.
+ *
+ * @param[in,out] brute_force pointer to the instance to be deleted.
+ */
 void infrared_brute_force_free(InfraredBruteForce* brute_force);
+
+/**
+ * @brief Set an InfraredBruteForce instance to use a signal database contained in a file.
+ *
+ * @param[in,out] brute_force pointer to the instance to be configured.
+ * @param[in] db_filename pointer to a zero-terminated string containing a full path to the database file.
+ */
 void infrared_brute_force_set_db_filename(InfraredBruteForce* brute_force, const char* db_filename);
+
+/**
+ * @brief Build a signal dictionary from a previously set database file.
+ *
+ * This function must be called each time after setting the database via
+ * a infrared_brute_force_set_db_filename() call.
+ *
+ * @param[in,out] brute_force pointer to the instance to be updated.
+ * @returns true on success, false otherwise.
+ */
 bool infrared_brute_force_calculate_messages(InfraredBruteForce* brute_force);
+
+/**
+ * @brief Start transmitting signals from a category stored in an InfraredBruteForce's instance dictionary.
+ *
+ * @param[in,out] brute_force pointer to the instance to be started.
+ * @param[in] index index of the signal category in the dictionary.
+ * @returns true on success, false otherwise.
+ */
 bool infrared_brute_force_start(
     InfraredBruteForce* brute_force,
     uint32_t index,
     uint32_t* record_count);
-bool infrared_brute_force_is_started(InfraredBruteForce* brute_force);
+
+/**
+ * @brief Determine whether the transmission was started.
+ *
+ * @param[in] brute_force pointer to the instance to be tested.
+ * @returns true if transmission was started, false otherwise.
+ */
+bool infrared_brute_force_is_started(const InfraredBruteForce* brute_force);
+
+/**
+ * @brief Stop transmitting the signals.
+ *
+ * @param[in] brute_force pointer to the instance to be stopped.
+ */
 void infrared_brute_force_stop(InfraredBruteForce* brute_force);
+
+/**
+ * @brief Send the next signal from the chosen category.
+ *
+ * This function is called repeatedly until no more signals are left
+ * in the chosen signal category.
+ *
+ * @warning Transmission must be started first by calling infrared_brute_force_start()
+ * before calling this function.
+ *
+ * @param[in,out] brute_force pointer to the instance to be used.
+ * @returns true if the next signal existed and could be transmitted, false otherwise.
+ */
 bool infrared_brute_force_send_next(InfraredBruteForce* brute_force);
+
+/**
+ * @brief Add a signal category to an InfraredBruteForce instance's dictionary.
+ *
+ * @param[in,out] brute_force pointer to the instance to be updated.
+ * @param[in] index index of the category to be added.
+ * @param[in] name name of the category to be added.
+ */
 void infrared_brute_force_add_record(
     InfraredBruteForce* brute_force,
     uint32_t index,
     const char* name);
+
+/**
+ * @brief Reset an InfraredBruteForce instance.
+ *
+ * @param[in,out] brute_force pointer to the instance to be reset.
+ */
 void infrared_brute_force_reset(InfraredBruteForce* brute_force);
diff --git a/applications/main/infrared/infrared_cli.c b/applications/main/infrared/infrared_cli.c
index 54b5caba..c960ffa2 100644
--- a/applications/main/infrared/infrared_cli.c
+++ b/applications/main/infrared/infrared_cli.c
@@ -202,7 +202,7 @@ static bool
 }
 
 static bool infrared_cli_decode_raw_signal(
-    InfraredRawSignal* raw_signal,
+    const InfraredRawSignal* raw_signal,
     InfraredDecoderHandler* decoder,
     FlipperFormat* output_file,
     const char* signal_name) {
@@ -274,7 +274,7 @@ static bool infrared_cli_decode_file(FlipperFormat* input_file, FlipperFormat* o
                 continue;
             }
         }
-        InfraredRawSignal* raw_signal = infrared_signal_get_raw_signal(signal);
+        const InfraredRawSignal* raw_signal = infrared_signal_get_raw_signal(signal);
         printf(
             "Raw signal: %s, %zu samples\r\n",
             furi_string_get_cstr(tmp),
diff --git a/applications/main/infrared/infrared_custom_event.h b/applications/main/infrared/infrared_custom_event.h
index 09440dde..30bb0f72 100644
--- a/applications/main/infrared/infrared_custom_event.h
+++ b/applications/main/infrared/infrared_custom_event.h
@@ -15,9 +15,10 @@ enum InfraredCustomEventType {
     InfraredCustomEventTypeButtonSelected,
     InfraredCustomEventTypeBackPressed,
 
-    InfraredCustomEventTypeRpcLoad,
+    InfraredCustomEventTypeRpcLoadFile,
     InfraredCustomEventTypeRpcExit,
-    InfraredCustomEventTypeRpcButtonPress,
+    InfraredCustomEventTypeRpcButtonPressName,
+    InfraredCustomEventTypeRpcButtonPressIndex,
     InfraredCustomEventTypeRpcButtonRelease,
     InfraredCustomEventTypeRpcSessionClose,
 };
diff --git a/applications/main/infrared/infrared_i.h b/applications/main/infrared/infrared_i.h
deleted file mode 100644
index 6fb6a65c..00000000
--- a/applications/main/infrared/infrared_i.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#pragma once
-
-#include <gui/gui.h>
-#include <gui/view.h>
-#include <assets_icons.h>
-#include <gui/view_stack.h>
-#include <gui/view_dispatcher.h>
-#include <gui/scene_manager.h>
-
-#include <gui/modules/popup.h>
-#include <gui/modules/loading.h>
-#include <gui/modules/submenu.h>
-#include <gui/modules/dialog_ex.h>
-#include <gui/modules/text_input.h>
-#include <gui/modules/button_menu.h>
-#include <gui/modules/button_panel.h>
-
-#include <storage/storage.h>
-#include <dialogs/dialogs.h>
-
-#include <notification/notification_messages.h>
-
-#include <infrared_worker.h>
-
-#include "infrared.h"
-#include "infrared_remote.h"
-#include "infrared_brute_force.h"
-#include "infrared_custom_event.h"
-
-#include "scenes/infrared_scene.h"
-#include "views/infrared_progress_view.h"
-#include "views/infrared_debug_view.h"
-#include "views/infrared_move_view.h"
-
-#include "rpc/rpc_app.h"
-
-#define INFRARED_FILE_NAME_SIZE 100
-#define INFRARED_TEXT_STORE_NUM 2
-#define INFRARED_TEXT_STORE_SIZE 128
-
-#define INFRARED_MAX_BUTTON_NAME_LENGTH 22
-#define INFRARED_MAX_REMOTE_NAME_LENGTH 22
-
-#define INFRARED_APP_FOLDER ANY_PATH("infrared")
-#define INFRARED_APP_EXTENSION ".ir"
-
-#define INFRARED_DEFAULT_REMOTE_NAME "Remote"
-#define INFRARED_LOG_TAG "InfraredApp"
-
-typedef enum {
-    InfraredButtonIndexNone = -1,
-} InfraredButtonIndex;
-
-typedef enum {
-    InfraredEditTargetNone,
-    InfraredEditTargetRemote,
-    InfraredEditTargetButton,
-} InfraredEditTarget;
-
-typedef enum {
-    InfraredEditModeNone,
-    InfraredEditModeRename,
-    InfraredEditModeDelete,
-} InfraredEditMode;
-
-typedef struct {
-    bool is_learning_new_remote;
-    bool is_debug_enabled;
-    bool is_transmitting;
-    InfraredEditTarget edit_target : 8;
-    InfraredEditMode edit_mode : 8;
-    int32_t current_button_index;
-    int32_t current_button_index_move_orig;
-    uint32_t last_transmit_time;
-} InfraredAppState;
-
-struct Infrared {
-    SceneManager* scene_manager;
-    ViewDispatcher* view_dispatcher;
-
-    Gui* gui;
-    Storage* storage;
-    DialogsApp* dialogs;
-    NotificationApp* notifications;
-    InfraredWorker* worker;
-    InfraredRemote* remote;
-    InfraredSignal* received_signal;
-    InfraredBruteForce* brute_force;
-
-    Submenu* submenu;
-    TextInput* text_input;
-    DialogEx* dialog_ex;
-    ButtonMenu* button_menu;
-    Popup* popup;
-
-    ViewStack* view_stack;
-    InfraredDebugView* debug_view;
-    InfraredMoveView* move_view;
-
-    ButtonPanel* button_panel;
-    Loading* loading;
-    InfraredProgressView* progress;
-
-    FuriString* file_path;
-    char text_store[INFRARED_TEXT_STORE_NUM][INFRARED_TEXT_STORE_SIZE + 1];
-    InfraredAppState app_state;
-
-    void* rpc_ctx;
-};
-
-typedef enum {
-    InfraredViewSubmenu,
-    InfraredViewTextInput,
-    InfraredViewDialogEx,
-    InfraredViewButtonMenu,
-    InfraredViewPopup,
-    InfraredViewStack,
-    InfraredViewDebugView,
-    InfraredViewMove,
-} InfraredView;
-
-typedef enum {
-    InfraredNotificationMessageSuccess,
-    InfraredNotificationMessageGreenOn,
-    InfraredNotificationMessageGreenOff,
-    InfraredNotificationMessageYellowOn,
-    InfraredNotificationMessageYellowOff,
-    InfraredNotificationMessageBlinkStartRead,
-    InfraredNotificationMessageBlinkStartSend,
-    InfraredNotificationMessageBlinkStop,
-} InfraredNotificationMessage;
-
-bool infrared_add_remote_with_button(Infrared* infrared, const char* name, InfraredSignal* signal);
-bool infrared_rename_current_remote(Infrared* infrared, const char* name);
-void infrared_tx_start_signal(Infrared* infrared, InfraredSignal* signal);
-void infrared_tx_start_button_index(Infrared* infrared, size_t button_index);
-void infrared_tx_start_received(Infrared* infrared);
-void infrared_tx_stop(Infrared* infrared);
-void infrared_text_store_set(Infrared* infrared, uint32_t bank, const char* text, ...);
-void infrared_text_store_clear(Infrared* infrared, uint32_t bank);
-void infrared_play_notification_message(Infrared* infrared, uint32_t message);
-void infrared_show_loading_popup(Infrared* infrared, bool show);
-
-void infrared_signal_received_callback(void* context, InfraredWorkerSignal* received_signal);
-void infrared_text_input_callback(void* context);
-void infrared_popup_closed_callback(void* context);
diff --git a/applications/main/infrared/infrared_remote.c b/applications/main/infrared/infrared_remote.c
index 70d1b59e..cab241c1 100644
--- a/applications/main/infrared/infrared_remote.c
+++ b/applications/main/infrared/infrared_remote.c
@@ -1,197 +1,427 @@
 #include "infrared_remote.h"
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
 #include <m-array.h>
+
+#include <toolbox/m_cstr_dup.h>
 #include <toolbox/path.h>
 #include <storage/storage.h>
-#include <core/common_defines.h>
 
 #define TAG "InfraredRemote"
 
-ARRAY_DEF(InfraredButtonArray, InfraredRemoteButton*, M_PTR_OPLIST);
+#define INFRARED_FILE_HEADER "IR signals file"
+#define INFRARED_FILE_VERSION (1)
+
+ARRAY_DEF(StringArray, const char*, M_CSTR_DUP_OPLIST); //-V575
 
 struct InfraredRemote {
-    InfraredButtonArray_t buttons;
+    StringArray_t signal_names;
     FuriString* name;
     FuriString* path;
 };
 
-static void infrared_remote_clear_buttons(InfraredRemote* remote) {
-    InfraredButtonArray_it_t it;
-    for(InfraredButtonArray_it(it, remote->buttons); !InfraredButtonArray_end_p(it);
-        InfraredButtonArray_next(it)) {
-        infrared_remote_button_free(*InfraredButtonArray_cref(it));
-    }
-    InfraredButtonArray_reset(remote->buttons);
-}
+typedef struct {
+    InfraredRemote* remote;
+    FlipperFormat* ff_in;
+    FlipperFormat* ff_out;
+    FuriString* signal_name;
+    InfraredSignal* signal;
+    size_t signal_index;
+} InfraredBatch;
+
+typedef struct {
+    size_t signal_index;
+    const char* signal_name;
+    const InfraredSignal* signal;
+} InfraredBatchTarget;
+
+typedef bool (
+    *InfraredBatchCallback)(const InfraredBatch* batch, const InfraredBatchTarget* target);
 
 InfraredRemote* infrared_remote_alloc() {
     InfraredRemote* remote = malloc(sizeof(InfraredRemote));
-    InfraredButtonArray_init(remote->buttons);
+    StringArray_init(remote->signal_names);
     remote->name = furi_string_alloc();
     remote->path = furi_string_alloc();
     return remote;
 }
 
 void infrared_remote_free(InfraredRemote* remote) {
-    infrared_remote_clear_buttons(remote);
-    InfraredButtonArray_clear(remote->buttons);
+    StringArray_clear(remote->signal_names);
     furi_string_free(remote->path);
     furi_string_free(remote->name);
     free(remote);
 }
 
 void infrared_remote_reset(InfraredRemote* remote) {
-    infrared_remote_clear_buttons(remote);
+    StringArray_reset(remote->signal_names);
     furi_string_reset(remote->name);
     furi_string_reset(remote->path);
 }
 
-void infrared_remote_set_name(InfraredRemote* remote, const char* name) {
-    furi_string_set(remote->name, name);
-}
-
-const char* infrared_remote_get_name(InfraredRemote* remote) {
+const char* infrared_remote_get_name(const InfraredRemote* remote) {
     return furi_string_get_cstr(remote->name);
 }
 
-void infrared_remote_set_path(InfraredRemote* remote, const char* path) {
+static void infrared_remote_set_path(InfraredRemote* remote, const char* path) {
     furi_string_set(remote->path, path);
+    path_extract_filename(remote->path, remote->name, true);
 }
 
-const char* infrared_remote_get_path(InfraredRemote* remote) {
+const char* infrared_remote_get_path(const InfraredRemote* remote) {
     return furi_string_get_cstr(remote->path);
 }
 
-size_t infrared_remote_get_button_count(InfraredRemote* remote) {
-    return InfraredButtonArray_size(remote->buttons);
+size_t infrared_remote_get_signal_count(const InfraredRemote* remote) {
+    return StringArray_size(remote->signal_names);
 }
 
-InfraredRemoteButton* infrared_remote_get_button(InfraredRemote* remote, size_t index) {
-    furi_assert(index < InfraredButtonArray_size(remote->buttons));
-    return *InfraredButtonArray_get(remote->buttons, index);
+const char* infrared_remote_get_signal_name(const InfraredRemote* remote, size_t index) {
+    furi_assert(index < infrared_remote_get_signal_count(remote));
+    return *StringArray_cget(remote->signal_names, index);
 }
 
-bool infrared_remote_find_button_by_name(InfraredRemote* remote, const char* name, size_t* index) {
-    for(size_t i = 0; i < InfraredButtonArray_size(remote->buttons); i++) {
-        InfraredRemoteButton* button = *InfraredButtonArray_get(remote->buttons, i);
-        if(!strcmp(infrared_remote_button_get_name(button), name)) {
+bool infrared_remote_load_signal(
+    const InfraredRemote* remote,
+    InfraredSignal* signal,
+    size_t index) {
+    furi_assert(index < infrared_remote_get_signal_count(remote));
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    FlipperFormat* ff = flipper_format_buffered_file_alloc(storage);
+
+    bool success = false;
+
+    do {
+        const char* path = furi_string_get_cstr(remote->path);
+        if(!flipper_format_buffered_file_open_existing(ff, path)) break;
+
+        if(!infrared_signal_search_by_index_and_read(signal, ff, index)) {
+            const char* signal_name = infrared_remote_get_signal_name(remote, index);
+            FURI_LOG_E(TAG, "Failed to load signal '%s' from file '%s'", signal_name, path);
+            break;
+        }
+
+        success = true;
+    } while(false);
+
+    flipper_format_free(ff);
+    furi_record_close(RECORD_STORAGE);
+
+    return success;
+}
+
+bool infrared_remote_get_signal_index(
+    const InfraredRemote* remote,
+    const char* name,
+    size_t* index) {
+    uint32_t i = 0;
+    StringArray_it_t it;
+
+    for(StringArray_it(it, remote->signal_names); !StringArray_end_p(it);
+        StringArray_next(it), ++i) {
+        if(strcmp(*StringArray_cref(it), name) == 0) {
             *index = i;
             return true;
         }
     }
+
     return false;
 }
 
-bool infrared_remote_add_button(InfraredRemote* remote, const char* name, InfraredSignal* signal) {
-    InfraredRemoteButton* button = infrared_remote_button_alloc();
-    infrared_remote_button_set_name(button, name);
-    infrared_remote_button_set_signal(button, signal);
-    InfraredButtonArray_push_back(remote->buttons, button);
-    return infrared_remote_store(remote);
-}
-
-bool infrared_remote_rename_button(InfraredRemote* remote, const char* new_name, size_t index) {
-    furi_assert(index < InfraredButtonArray_size(remote->buttons));
-    InfraredRemoteButton* button = *InfraredButtonArray_get(remote->buttons, index);
-    infrared_remote_button_set_name(button, new_name);
-    return infrared_remote_store(remote);
-}
-
-bool infrared_remote_delete_button(InfraredRemote* remote, size_t index) {
-    furi_assert(index < InfraredButtonArray_size(remote->buttons));
-    InfraredRemoteButton* button;
-    InfraredButtonArray_pop_at(&button, remote->buttons, index);
-    infrared_remote_button_free(button);
-    return infrared_remote_store(remote);
-}
-
-void infrared_remote_move_button(InfraredRemote* remote, size_t index_orig, size_t index_dest) {
-    furi_assert(index_orig < InfraredButtonArray_size(remote->buttons));
-    furi_assert(index_dest < InfraredButtonArray_size(remote->buttons));
-
-    InfraredRemoteButton* button;
-    InfraredButtonArray_pop_at(&button, remote->buttons, index_orig);
-    InfraredButtonArray_push_at(remote->buttons, index_dest, button);
-}
-
-bool infrared_remote_store(InfraredRemote* remote) {
+bool infrared_remote_append_signal(
+    InfraredRemote* remote,
+    const InfraredSignal* signal,
+    const char* name) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FlipperFormat* ff = flipper_format_file_alloc(storage);
+
+    bool success = false;
     const char* path = furi_string_get_cstr(remote->path);
 
-    FURI_LOG_I(TAG, "store file: \'%s\'", path);
-
-    bool success = flipper_format_file_open_always(ff, path) &&
-                   flipper_format_write_header_cstr(ff, "IR signals file", 1);
-    if(success) {
-        InfraredButtonArray_it_t it;
-        for(InfraredButtonArray_it(it, remote->buttons); !InfraredButtonArray_end_p(it);
-            InfraredButtonArray_next(it)) {
-            InfraredRemoteButton* button = *InfraredButtonArray_cref(it);
-            success = infrared_signal_save(
-                infrared_remote_button_get_signal(button),
-                ff,
-                infrared_remote_button_get_name(button));
-            if(!success) {
-                break;
-            }
-        }
-    }
-
-    flipper_format_free(ff);
-    furi_record_close(RECORD_STORAGE);
-    return success;
-}
-
-bool infrared_remote_load(InfraredRemote* remote, FuriString* path) {
-    Storage* storage = furi_record_open(RECORD_STORAGE);
-    FlipperFormat* ff = flipper_format_buffered_file_alloc(storage);
-
-    FuriString* buf;
-    buf = furi_string_alloc();
-
-    FURI_LOG_I(TAG, "load file: \'%s\'", furi_string_get_cstr(path));
-    bool success = false;
-
     do {
-        if(!flipper_format_buffered_file_open_existing(ff, furi_string_get_cstr(path))) break;
-        uint32_t version;
-        if(!flipper_format_read_header(ff, buf, &version)) break;
-        if(!furi_string_equal(buf, "IR signals file") || (version != 1)) break;
+        if(!flipper_format_file_open_append(ff, path)) break;
+        if(!infrared_signal_save(signal, ff, name)) break;
 
-        path_extract_filename(path, buf, true);
-        infrared_remote_clear_buttons(remote);
-        infrared_remote_set_name(remote, furi_string_get_cstr(buf));
-        infrared_remote_set_path(remote, furi_string_get_cstr(path));
-
-        for(bool can_read = true; can_read;) {
-            InfraredRemoteButton* button = infrared_remote_button_alloc();
-            can_read = infrared_signal_read(infrared_remote_button_get_signal(button), ff, buf);
-            if(can_read) {
-                infrared_remote_button_set_name(button, furi_string_get_cstr(buf));
-                InfraredButtonArray_push_back(remote->buttons, button);
-            } else {
-                infrared_remote_button_free(button);
-            }
-        }
+        StringArray_push_back(remote->signal_names, name);
         success = true;
     } while(false);
 
-    furi_string_free(buf);
     flipper_format_free(ff);
     furi_record_close(RECORD_STORAGE);
+
+    return success;
+}
+
+static bool infrared_remote_batch_start(
+    InfraredRemote* remote,
+    InfraredBatchCallback batch_callback,
+    const InfraredBatchTarget* target) {
+    FuriString* tmp = furi_string_alloc();
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+
+    InfraredBatch batch_context = {
+        .remote = remote,
+        .ff_in = flipper_format_buffered_file_alloc(storage),
+        .ff_out = flipper_format_buffered_file_alloc(storage),
+        .signal_name = furi_string_alloc(),
+        .signal = infrared_signal_alloc(),
+        .signal_index = 0,
+    };
+
+    const char* path_in = furi_string_get_cstr(remote->path);
+    const char* path_out;
+
+    FS_Error status;
+
+    do {
+        furi_string_printf(tmp, "%s.temp%08x.swp", path_in, rand());
+        path_out = furi_string_get_cstr(tmp);
+        status = storage_common_stat(storage, path_out, NULL);
+    } while(status == FSE_OK || status == FSE_EXIST);
+
+    bool success = false;
+
+    do {
+        if(!flipper_format_buffered_file_open_existing(batch_context.ff_in, path_in)) break;
+        if(!flipper_format_buffered_file_open_always(batch_context.ff_out, path_out)) break;
+        if(!flipper_format_write_header_cstr(
+               batch_context.ff_out, INFRARED_FILE_HEADER, INFRARED_FILE_VERSION))
+            break;
+
+        const size_t signal_count = infrared_remote_get_signal_count(remote);
+
+        for(; batch_context.signal_index < signal_count; ++batch_context.signal_index) {
+            if(!infrared_signal_read(
+                   batch_context.signal, batch_context.ff_in, batch_context.signal_name))
+                break;
+            if(!batch_callback(&batch_context, target)) break;
+        }
+
+        if(batch_context.signal_index != signal_count) break;
+
+        if(!flipper_format_buffered_file_close(batch_context.ff_out)) break;
+        if(!flipper_format_buffered_file_close(batch_context.ff_in)) break;
+
+        const FS_Error status = storage_common_rename(storage, path_out, path_in);
+        success = (status == FSE_OK || status == FSE_EXIST);
+    } while(false);
+
+    infrared_signal_free(batch_context.signal);
+    furi_string_free(batch_context.signal_name);
+    flipper_format_free(batch_context.ff_out);
+    flipper_format_free(batch_context.ff_in);
+    furi_string_free(tmp);
+
+    furi_record_close(RECORD_STORAGE);
+
+    return success;
+}
+
+static bool infrared_remote_insert_signal_callback(
+    const InfraredBatch* batch,
+    const InfraredBatchTarget* target) {
+    // Insert a signal under the specified index
+    if(batch->signal_index == target->signal_index) {
+        if(!infrared_signal_save(target->signal, batch->ff_out, target->signal_name)) return false;
+        StringArray_push_at(
+            batch->remote->signal_names, target->signal_index, target->signal_name);
+    }
+
+    // Write the rest normally
+    return infrared_signal_save(
+        batch->signal, batch->ff_out, furi_string_get_cstr(batch->signal_name));
+}
+
+bool infrared_remote_insert_signal(
+    InfraredRemote* remote,
+    const InfraredSignal* signal,
+    const char* name,
+    size_t index) {
+    if(index >= infrared_remote_get_signal_count(remote)) {
+        return infrared_remote_append_signal(remote, signal, name);
+    }
+
+    const InfraredBatchTarget insert_target = {
+        .signal_index = index,
+        .signal_name = name,
+        .signal = signal,
+    };
+
+    return infrared_remote_batch_start(
+        remote, infrared_remote_insert_signal_callback, &insert_target);
+}
+
+static bool infrared_remote_rename_signal_callback(
+    const InfraredBatch* batch,
+    const InfraredBatchTarget* target) {
+    const char* signal_name;
+
+    if(batch->signal_index == target->signal_index) {
+        // Rename the signal at requested index
+        signal_name = target->signal_name;
+        StringArray_set_at(batch->remote->signal_names, batch->signal_index, signal_name);
+    } else {
+        // Use the original name otherwise
+        signal_name = furi_string_get_cstr(batch->signal_name);
+    }
+
+    return infrared_signal_save(batch->signal, batch->ff_out, signal_name);
+}
+
+bool infrared_remote_rename_signal(InfraredRemote* remote, size_t index, const char* new_name) {
+    furi_assert(index < infrared_remote_get_signal_count(remote));
+
+    const InfraredBatchTarget rename_target = {
+        .signal_index = index,
+        .signal_name = new_name,
+        .signal = NULL,
+    };
+
+    return infrared_remote_batch_start(
+        remote, infrared_remote_rename_signal_callback, &rename_target);
+}
+
+static bool infrared_remote_delete_signal_callback(
+    const InfraredBatch* batch,
+    const InfraredBatchTarget* target) {
+    if(batch->signal_index == target->signal_index) {
+        // Do not save the signal to be deleted, remove it from the signal name list instead
+        StringArray_remove_v(
+            batch->remote->signal_names, batch->signal_index, batch->signal_index + 1);
+    } else {
+        // Pass other signals through
+        return infrared_signal_save(
+            batch->signal, batch->ff_out, furi_string_get_cstr(batch->signal_name));
+    }
+
+    return true;
+}
+
+bool infrared_remote_delete_signal(InfraredRemote* remote, size_t index) {
+    furi_assert(index < infrared_remote_get_signal_count(remote));
+
+    const InfraredBatchTarget delete_target = {
+        .signal_index = index,
+        .signal_name = NULL,
+        .signal = NULL,
+    };
+
+    return infrared_remote_batch_start(
+        remote, infrared_remote_delete_signal_callback, &delete_target);
+}
+
+bool infrared_remote_move_signal(InfraredRemote* remote, size_t index, size_t new_index) {
+    const size_t signal_count = infrared_remote_get_signal_count(remote);
+    furi_assert(index < signal_count);
+    furi_assert(new_index < signal_count);
+
+    if(index == new_index) return true;
+
+    InfraredSignal* signal = infrared_signal_alloc();
+    char* signal_name = strdup(infrared_remote_get_signal_name(remote, index));
+
+    bool success = false;
+
+    do {
+        if(!infrared_remote_load_signal(remote, signal, index)) break;
+        if(!infrared_remote_delete_signal(remote, index)) break;
+        if(!infrared_remote_insert_signal(remote, signal, signal_name, new_index)) break;
+
+        success = true;
+    } while(false);
+
+    free(signal_name);
+    infrared_signal_free(signal);
+
+    return success;
+}
+
+bool infrared_remote_create(InfraredRemote* remote, const char* path) {
+    FURI_LOG_I(TAG, "Creating new file: '%s'", path);
+
+    infrared_remote_reset(remote);
+    infrared_remote_set_path(remote, path);
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    FlipperFormat* ff = flipper_format_file_alloc(storage);
+
+    bool success = false;
+
+    do {
+        if(!flipper_format_file_open_always(ff, path)) break;
+        if(!flipper_format_write_header_cstr(ff, INFRARED_FILE_HEADER, INFRARED_FILE_VERSION))
+            break;
+
+        success = true;
+    } while(false);
+
+    flipper_format_free(ff);
+    furi_record_close(RECORD_STORAGE);
+
+    return success;
+}
+
+bool infrared_remote_load(InfraredRemote* remote, const char* path) {
+    FURI_LOG_I(TAG, "Loading file: '%s'", path);
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    FlipperFormat* ff = flipper_format_buffered_file_alloc(storage);
+
+    FuriString* tmp = furi_string_alloc();
+    bool success = false;
+
+    do {
+        if(!flipper_format_buffered_file_open_existing(ff, path)) break;
+
+        uint32_t version;
+        if(!flipper_format_read_header(ff, tmp, &version)) break;
+
+        if(!furi_string_equal(tmp, INFRARED_FILE_HEADER) || (version != INFRARED_FILE_VERSION))
+            break;
+
+        infrared_remote_set_path(remote, path);
+        StringArray_reset(remote->signal_names);
+
+        while(infrared_signal_read_name(ff, tmp)) {
+            StringArray_push_back(remote->signal_names, furi_string_get_cstr(tmp));
+        }
+
+        success = true;
+    } while(false);
+
+    furi_string_free(tmp);
+    flipper_format_free(ff);
+    furi_record_close(RECORD_STORAGE);
+
+    return success;
+}
+
+bool infrared_remote_rename(InfraredRemote* remote, const char* new_path) {
+    const char* old_path = infrared_remote_get_path(remote);
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    const FS_Error status = storage_common_rename(storage, old_path, new_path);
+    furi_record_close(RECORD_STORAGE);
+
+    const bool success = (status == FSE_OK || status == FSE_EXIST);
+
+    if(success) {
+        infrared_remote_set_path(remote, new_path);
+    }
+
     return success;
 }
 
 bool infrared_remote_remove(InfraredRemote* remote) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
-
-    FS_Error status = storage_common_remove(storage, furi_string_get_cstr(remote->path));
-    infrared_remote_reset(remote);
-
+    const FS_Error status = storage_common_remove(storage, infrared_remote_get_path(remote));
     furi_record_close(RECORD_STORAGE);
-    return (status == FSE_OK || status == FSE_NOT_EXIST);
+
+    const bool success = (status == FSE_OK || status == FSE_NOT_EXIST);
+
+    if(success) {
+        infrared_remote_reset(remote);
+    }
+
+    return success;
 }
diff --git a/applications/main/infrared/infrared_remote.h b/applications/main/infrared/infrared_remote.h
index 47aa77e2..7477cd3b 100644
--- a/applications/main/infrared/infrared_remote.h
+++ b/applications/main/infrared/infrared_remote.h
@@ -1,30 +1,229 @@
+/**
+ * @file infrared_remote.h
+ * @brief Infrared remote library.
+ *
+ * An infrared remote contains zero or more infrared signals which
+ * have a (possibly non-unique) name each.
+ *
+ * The current implementation does load only the names into the memory,
+ * while the signals themselves are loaded on-demand one by one. In theory,
+ * this should allow for quite large remotes with relatively bulky signals.
+ */
 #pragma once
 
-#include <stdbool.h>
-
-#include "infrared_remote_button.h"
+#include "infrared_signal.h"
 
+/**
+ * @brief InfraredRemote opaque type declaration.
+ */
 typedef struct InfraredRemote InfraredRemote;
 
+/**
+ * @brief Create a new InfraredRemote instance.
+ *
+ * @returns pointer to the created instance.
+ */
 InfraredRemote* infrared_remote_alloc();
+
+/**
+ * @brief Delete an InfraredRemote instance.
+ *
+ * @param[in,out] remote pointer to the instance to be deleted.
+ */
 void infrared_remote_free(InfraredRemote* remote);
+
+/**
+ * @brief Reset an InfraredRemote instance.
+ *
+ * Resetting a remote clears its signal name list and
+ * the associated file path.
+ *
+ * @param[in,out] remote pointer to the instance to be deleted.
+ */
 void infrared_remote_reset(InfraredRemote* remote);
 
-void infrared_remote_set_name(InfraredRemote* remote, const char* name);
-const char* infrared_remote_get_name(InfraredRemote* remote);
+/**
+ * @brief Get an InfraredRemote instance's name.
+ *
+ * The name is deduced from the file path.
+ *
+ * The return value remains valid unless one of the following functions is called:
+ * - infrared_remote_reset()
+ * - infrared_remote_load()
+ * - infrared_remote_create()
+ *
+ * @param[in] remote pointer to the instance to be queried.
+ * @returns pointer to a zero-terminated string containing the name.
+ */
+const char* infrared_remote_get_name(const InfraredRemote* remote);
 
-void infrared_remote_set_path(InfraredRemote* remote, const char* path);
-const char* infrared_remote_get_path(InfraredRemote* remote);
+/**
+ * @brief Get an InfraredRemote instance's file path.
+ *
+ * Same return value validity considerations as infrared_remote_get_name().
+ *
+ * @param[in] remote pointer to the instance to be queried.
+ * @returns pointer to a zero-terminated string containing the path.
+ */
+const char* infrared_remote_get_path(const InfraredRemote* remote);
 
-size_t infrared_remote_get_button_count(InfraredRemote* remote);
-InfraredRemoteButton* infrared_remote_get_button(InfraredRemote* remote, size_t index);
-bool infrared_remote_find_button_by_name(InfraredRemote* remote, const char* name, size_t* index);
+/**
+ * @brief Get the number of signals listed in an InfraredRemote instance.
+ *
+ * @param[in] remote pointer to the instance to be queried.
+ * @returns number of signals, zero or more
+ */
+size_t infrared_remote_get_signal_count(const InfraredRemote* remote);
 
-bool infrared_remote_add_button(InfraredRemote* remote, const char* name, InfraredSignal* signal);
-bool infrared_remote_rename_button(InfraredRemote* remote, const char* new_name, size_t index);
-bool infrared_remote_delete_button(InfraredRemote* remote, size_t index);
-void infrared_remote_move_button(InfraredRemote* remote, size_t index_orig, size_t index_dest);
+/**
+ * @brief Get the name of a signal listed in an InfraredRemote instance.
+ *
+ * @param[in] remote pointer to the instance to be queried.
+ * @param[in] index index of the signal in question. Must be less than the total signal count.
+ */
+const char* infrared_remote_get_signal_name(const InfraredRemote* remote, size_t index);
 
-bool infrared_remote_store(InfraredRemote* remote);
-bool infrared_remote_load(InfraredRemote* remote, FuriString* path);
+/**
+ * @brief Get the index of a signal listed in an InfraredRemote instance by its name.
+ *
+ * @param[in] remote pointer to the instance to be queried.
+ * @param[in] name pointer to a zero-terminated string containig the name of the signal in question.
+ * @param[out] index pointer to the variable to hold the signal index.
+ * @returns true if a signal with the given name was found, false otherwise.
+ */
+bool infrared_remote_get_signal_index(
+    const InfraredRemote* remote,
+    const char* name,
+    size_t* index);
+
+/**
+ * @brief Load a signal listed in an InfraredRemote instance.
+ *
+ * As mentioned above, the signals are loaded on-demand. The user code must call this function
+ * each time it wants to interact with a new signal.
+ *
+ * @param[in] remote pointer to the instance to load from.
+ * @param[out] signal pointer to the signal to load into. Must be allocated.
+ * @param[in] index index of the signal to be loaded. Must be less than the total signal count.
+ * @return true if the signal was successfully loaded, false otherwise.
+ */
+bool infrared_remote_load_signal(
+    const InfraredRemote* remote,
+    InfraredSignal* signal,
+    size_t index);
+
+/**
+ * @brief Append a signal to the file associated with an InfraredRemote instance.
+ *
+ * The file path must be somehow initialised first by calling either infrared_remote_load() or
+ * infrared_remote_create(). As the name suggests, the signal will be put in the end of the file.
+ *
+ * @param[in,out] remote pointer to the instance to append to.
+ * @param[in] signal pointer to the signal to be appended.
+ * @param[in] name pointer to a zero-terminated string containing the name of the signal.
+ * @returns true if the signal was successfully appended, false otherwise.
+ */
+bool infrared_remote_append_signal(
+    InfraredRemote* remote,
+    const InfraredSignal* signal,
+    const char* name);
+
+/**
+ * @brief Insert a signal to the file associated with an InfraredRemote instance.
+ *
+ * Same behaviour as infrared_remote_append_signal(), but the user code can decide where to
+ * put the signal in the file.
+ *
+ * Index values equal to or greater than the total signal count will result in behaviour
+ * identical to infrared_remote_append_signal().
+ *
+ * @param[in,out] remote pointer to the instance to insert to.
+ * @param[in] signal pointer to the signal to be inserted.
+ * @param[in] name pointer to a zero-terminated string containing the name of the signal.
+ * @param[in] index the index under which the signal shall be inserted.
+ * @returns true if the signal was successfully inserted, false otherwise.
+ */
+bool infrared_remote_insert_signal(
+    InfraredRemote* remote,
+    const InfraredSignal* signal,
+    const char* name,
+    size_t index);
+
+/**
+ * @brief Rename a signal in the file associated with an InfraredRemote instance.
+ *
+ * Only changes the signal's name, but neither its position nor contents.
+ *
+ * @param[in,out] remote pointer to the instance to be modified.
+ * @param[in] index index of the signal to be renamed. Must be less than the total signal count.
+ * @param[in] new_name pointer to a zero-terminated string containig the signal's new name.
+ * @returns true if the signal was successfully renamed, false otherwise.
+ */
+bool infrared_remote_rename_signal(InfraredRemote* remote, size_t index, const char* new_name);
+
+/**
+ * @brief Change a signal's position in the file associated with an InfraredRemote instance.
+ *
+ * Only changes the signal's position (index), but neither its name nor contents.
+ *
+ * @param[in,out] remote pointer to the instance to be modified.
+ * @param[in] index index of the signal to be moved. Must be less than the total signal count.
+ * @param[in] new_index index of the signal to be moved. Must be less than the total signal count.
+ */
+bool infrared_remote_move_signal(InfraredRemote* remote, size_t index, size_t new_index);
+
+/**
+ * @brief Delete a signal in the file associated with an InfraredRemote instance.
+ *
+ * @param[in,out] remote pointer to the instance to be modified.
+ * @param[in] index index of the signal to be deleted. Must be less than the total signal count.
+ * @returns true if the signal was successfully deleted, false otherwise.
+ */
+bool infrared_remote_delete_signal(InfraredRemote* remote, size_t index);
+
+/**
+ * @brief Create a new file and associate it with an InfraredRemote instance.
+ *
+ * The instance will be reset and given a new empty file with just the header.
+ *
+ * @param[in,out] remote pointer to the instance to be assigned with a new file.
+ * @param[in] path pointer to a zero-terminated string containing the full file path.
+ * @returns true if the file was successfully created, false otherwise.
+ */
+bool infrared_remote_create(InfraredRemote* remote, const char* path);
+
+/**
+ * @brief Associate an InfraredRemote instance with a file and load the signal names from it.
+ *
+ * The instance will be reset and fill its signal name list from the given file.
+ * The file must already exist and be valid.
+ *
+ * @param[in,out] remote pointer to the instance to be assigned with an existing file.
+ * @param[in] path pointer to a zero-terminated string containing the full file path.
+ * @returns true if the file was successfully loaded, false otherwise.
+ */
+bool infrared_remote_load(InfraredRemote* remote, const char* path);
+
+/**
+ * @brief Rename the file associated with an InfraredRemote instance.
+ *
+ * Only renames the file, no signals are added, moved or deleted.
+ *
+ * @param[in,out] remote pointer to the instance to be modified.
+ * @param[in] new_path pointer to a zero-terminated string containing the new full file path.
+ * @returns true if the file was successfully renamed, false otherwise.
+ */
+bool infrared_remote_rename(InfraredRemote* remote, const char* new_path);
+
+/**
+ * @brief Remove the file associated with an InfraredRemote instance.
+ *
+ * This operation is irreversible and fully deletes the remote file
+ * from the underlying filesystem.
+ * After calling this function, the instance becomes invalid until
+ * infrared_remote_create() or infrared_remote_load() are successfully executed.
+ *
+ * @param[in,out] remote pointer to the instance to be modified.
+ * @returns true if the file was successfully removed, false otherwise.
+ */
 bool infrared_remote_remove(InfraredRemote* remote);
diff --git a/applications/main/infrared/infrared_remote_button.c b/applications/main/infrared/infrared_remote_button.c
deleted file mode 100644
index 1f6315ec..00000000
--- a/applications/main/infrared/infrared_remote_button.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "infrared_remote_button.h"
-
-#include <stdlib.h>
-
-struct InfraredRemoteButton {
-    FuriString* name;
-    InfraredSignal* signal;
-};
-
-InfraredRemoteButton* infrared_remote_button_alloc() {
-    InfraredRemoteButton* button = malloc(sizeof(InfraredRemoteButton));
-    button->name = furi_string_alloc();
-    button->signal = infrared_signal_alloc();
-    return button;
-}
-
-void infrared_remote_button_free(InfraredRemoteButton* button) {
-    furi_string_free(button->name);
-    infrared_signal_free(button->signal);
-    free(button);
-}
-
-void infrared_remote_button_set_name(InfraredRemoteButton* button, const char* name) {
-    furi_string_set(button->name, name);
-}
-
-const char* infrared_remote_button_get_name(InfraredRemoteButton* button) {
-    return furi_string_get_cstr(button->name);
-}
-
-void infrared_remote_button_set_signal(InfraredRemoteButton* button, InfraredSignal* signal) {
-    infrared_signal_set_signal(button->signal, signal);
-}
-
-InfraredSignal* infrared_remote_button_get_signal(InfraredRemoteButton* button) {
-    return button->signal;
-}
diff --git a/applications/main/infrared/infrared_remote_button.h b/applications/main/infrared/infrared_remote_button.h
deleted file mode 100644
index f25b759b..00000000
--- a/applications/main/infrared/infrared_remote_button.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "infrared_signal.h"
-
-typedef struct InfraredRemoteButton InfraredRemoteButton;
-
-InfraredRemoteButton* infrared_remote_button_alloc();
-void infrared_remote_button_free(InfraredRemoteButton* button);
-
-void infrared_remote_button_set_name(InfraredRemoteButton* button, const char* name);
-const char* infrared_remote_button_get_name(InfraredRemoteButton* button);
-
-void infrared_remote_button_set_signal(InfraredRemoteButton* button, InfraredSignal* signal);
-InfraredSignal* infrared_remote_button_get_signal(InfraredRemoteButton* button);
diff --git a/applications/main/infrared/infrared_signal.c b/applications/main/infrared/infrared_signal.c
index 9154dfbf..2b0d3479 100644
--- a/applications/main/infrared/infrared_signal.c
+++ b/applications/main/infrared/infrared_signal.c
@@ -8,6 +8,8 @@
 
 #define TAG "InfraredSignal"
 
+#define INFRARED_SIGNAL_NAME_KEY "name"
+
 struct InfraredSignal {
     bool is_raw;
     union {
@@ -24,7 +26,7 @@ static void infrared_signal_clear_timings(InfraredSignal* signal) {
     }
 }
 
-static bool infrared_signal_is_message_valid(InfraredMessage* message) {
+static bool infrared_signal_is_message_valid(const InfraredMessage* message) {
     if(!infrared_is_protocol_valid(message->protocol)) {
         FURI_LOG_E(TAG, "Unknown protocol");
         return false;
@@ -57,7 +59,7 @@ static bool infrared_signal_is_message_valid(InfraredMessage* message) {
     return true;
 }
 
-static bool infrared_signal_is_raw_valid(InfraredRawSignal* raw) {
+static bool infrared_signal_is_raw_valid(const InfraredRawSignal* raw) {
     if((raw->frequency > INFRARED_MAX_FREQUENCY) || (raw->frequency < INFRARED_MIN_FREQUENCY)) {
         FURI_LOG_E(
             TAG,
@@ -83,7 +85,8 @@ static bool infrared_signal_is_raw_valid(InfraredRawSignal* raw) {
     return true;
 }
 
-static inline bool infrared_signal_save_message(InfraredMessage* message, FlipperFormat* ff) {
+static inline bool
+    infrared_signal_save_message(const InfraredMessage* message, FlipperFormat* ff) {
     const char* protocol_name = infrared_get_protocol_name(message->protocol);
     return flipper_format_write_string_cstr(ff, "type", "parsed") &&
            flipper_format_write_string_cstr(ff, "protocol", protocol_name) &&
@@ -91,7 +94,7 @@ static inline bool infrared_signal_save_message(InfraredMessage* message, Flippe
            flipper_format_write_hex(ff, "command", (uint8_t*)&message->command, 4);
 }
 
-static inline bool infrared_signal_save_raw(InfraredRawSignal* raw, FlipperFormat* ff) {
+static inline bool infrared_signal_save_raw(const InfraredRawSignal* raw, FlipperFormat* ff) {
     furi_assert(raw->timings_size <= MAX_TIMINGS_AMOUNT);
     return flipper_format_write_string_cstr(ff, "type", "raw") &&
            flipper_format_write_uint32(ff, "frequency", &raw->frequency, 1) &&
@@ -180,11 +183,11 @@ void infrared_signal_free(InfraredSignal* signal) {
     free(signal);
 }
 
-bool infrared_signal_is_raw(InfraredSignal* signal) {
+bool infrared_signal_is_raw(const InfraredSignal* signal) {
     return signal->is_raw;
 }
 
-bool infrared_signal_is_valid(InfraredSignal* signal) {
+bool infrared_signal_is_valid(const InfraredSignal* signal) {
     return signal->is_raw ? infrared_signal_is_raw_valid(&signal->payload.raw) :
                             infrared_signal_is_message_valid(&signal->payload.message);
 }
@@ -218,7 +221,7 @@ void infrared_signal_set_raw_signal(
     memcpy(signal->payload.raw.timings, timings, timings_size * sizeof(uint32_t));
 }
 
-InfraredRawSignal* infrared_signal_get_raw_signal(InfraredSignal* signal) {
+const InfraredRawSignal* infrared_signal_get_raw_signal(const InfraredSignal* signal) {
     furi_assert(signal->is_raw);
     return &signal->payload.raw;
 }
@@ -230,14 +233,14 @@ void infrared_signal_set_message(InfraredSignal* signal, const InfraredMessage*
     signal->payload.message = *message;
 }
 
-InfraredMessage* infrared_signal_get_message(InfraredSignal* signal) {
+const InfraredMessage* infrared_signal_get_message(const InfraredSignal* signal) {
     furi_assert(!signal->is_raw);
     return &signal->payload.message;
 }
 
-bool infrared_signal_save(InfraredSignal* signal, FlipperFormat* ff, const char* name) {
+bool infrared_signal_save(const InfraredSignal* signal, FlipperFormat* ff, const char* name) {
     if(!flipper_format_write_comment_cstr(ff, "") ||
-       !flipper_format_write_string_cstr(ff, "name", name)) {
+       !flipper_format_write_string_cstr(ff, INFRARED_SIGNAL_NAME_KEY, name)) {
         return false;
     } else if(signal->is_raw) {
         return infrared_signal_save_raw(&signal->payload.raw, ff);
@@ -247,46 +250,61 @@ bool infrared_signal_save(InfraredSignal* signal, FlipperFormat* ff, const char*
 }
 
 bool infrared_signal_read(InfraredSignal* signal, FlipperFormat* ff, FuriString* name) {
-    FuriString* tmp = furi_string_alloc();
-
     bool success = false;
 
     do {
-        if(!flipper_format_read_string(ff, "name", tmp)) break;
-        furi_string_set(name, tmp);
+        if(!infrared_signal_read_name(ff, name)) break;
         if(!infrared_signal_read_body(signal, ff)) break;
-        success = true;
-    } while(0);
 
-    furi_string_free(tmp);
-    return success;
-}
-
-bool infrared_signal_search_and_read(
-    InfraredSignal* signal,
-    FlipperFormat* ff,
-    const FuriString* name) {
-    bool success = false;
-    FuriString* tmp = furi_string_alloc();
-
-    do {
-        bool is_name_found = false;
-        while(flipper_format_read_string(ff, "name", tmp)) {
-            is_name_found = furi_string_equal(name, tmp);
-            if(is_name_found) break;
-        }
-        if(!is_name_found) break; //-V547
-        if(!infrared_signal_read_body(signal, ff)) break; //-V779
-        success = true;
+        success = true; //-V779
     } while(false);
 
+    return success;
+}
+
+bool infrared_signal_read_name(FlipperFormat* ff, FuriString* name) {
+    return flipper_format_read_string(ff, INFRARED_SIGNAL_NAME_KEY, name);
+}
+
+bool infrared_signal_search_by_name_and_read(
+    InfraredSignal* signal,
+    FlipperFormat* ff,
+    const char* name) {
+    bool success = false;
+    FuriString* tmp = furi_string_alloc();
+
+    while(infrared_signal_read_name(ff, tmp)) {
+        if(furi_string_equal(tmp, name)) {
+            success = infrared_signal_read_body(signal, ff);
+            break;
+        }
+    }
+
     furi_string_free(tmp);
     return success;
 }
 
-void infrared_signal_transmit(InfraredSignal* signal) {
+bool infrared_signal_search_by_index_and_read(
+    InfraredSignal* signal,
+    FlipperFormat* ff,
+    size_t index) {
+    bool success = false;
+    FuriString* tmp = furi_string_alloc();
+
+    for(uint32_t i = 0; infrared_signal_read_name(ff, tmp); ++i) {
+        if(i == index) {
+            success = infrared_signal_read_body(signal, ff);
+            break;
+        }
+    }
+
+    furi_string_free(tmp);
+    return success;
+}
+
+void infrared_signal_transmit(const InfraredSignal* signal) {
     if(signal->is_raw) {
-        InfraredRawSignal* raw_signal = &signal->payload.raw;
+        const InfraredRawSignal* raw_signal = &signal->payload.raw;
         infrared_send_raw_ext(
             raw_signal->timings,
             raw_signal->timings_size,
@@ -294,7 +312,7 @@ void infrared_signal_transmit(InfraredSignal* signal) {
             raw_signal->frequency,
             raw_signal->duty_cycle);
     } else {
-        InfraredMessage* message = &signal->payload.message;
+        const InfraredMessage* message = &signal->payload.message;
         infrared_send(message, 1);
     }
 }
diff --git a/applications/main/infrared/infrared_signal.h b/applications/main/infrared/infrared_signal.h
index 29c66193..cfa4cfa9 100644
--- a/applications/main/infrared/infrared_signal.h
+++ b/applications/main/infrared/infrared_signal.h
@@ -1,45 +1,205 @@
+/**
+ * @file infrared_signal.h
+ * @brief Infrared signal library.
+ *
+ * Infrared signals may be of two types:
+ * - known to the infrared signal decoder, or *parsed* signals
+ * - the rest, or *raw* signals, which are treated merely as a set of timings.
+ */
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-
-#include <infrared.h>
 #include <flipper_format/flipper_format.h>
+#include <infrared/encoder_decoder/infrared.h>
 
+/**
+ * @brief InfraredSignal opaque type declaration.
+ */
 typedef struct InfraredSignal InfraredSignal;
 
+/**
+ * @brief Raw signal type definition.
+ *
+ * Measurement units used:
+ * - time: microseconds (uS)
+ * - frequency: Hertz (Hz)
+ * - duty_cycle: no units, fraction between 0 and 1.
+ */
 typedef struct {
-    size_t timings_size;
-    uint32_t* timings;
-    uint32_t frequency;
-    float duty_cycle;
+    size_t timings_size; /**< Number of elements in the timings array. */
+    uint32_t* timings; /**< Pointer to an array of timings describing the signal. */
+    uint32_t frequency; /**< Carrier frequency of the signal. */
+    float duty_cycle; /**< Duty cycle of the signal. */
 } InfraredRawSignal;
 
+/**
+ * @brief Create a new InfraredSignal instance.
+ *
+ * @returns pointer to the instance created.
+ */
 InfraredSignal* infrared_signal_alloc();
+
+/**
+ * @brief Delete an InfraredSignal instance.
+ *
+ * @param[in,out] signal pointer to the instance to be deleted.
+ */
 void infrared_signal_free(InfraredSignal* signal);
 
-bool infrared_signal_is_raw(InfraredSignal* signal);
-bool infrared_signal_is_valid(InfraredSignal* signal);
+/**
+ * @brief Test whether an InfraredSignal instance holds a raw signal.
+ *
+ * @param[in] signal pointer to the instance to be tested.
+ * @returns true if the instance holds a raw signal, false otherwise.
+ */
+bool infrared_signal_is_raw(const InfraredSignal* signal);
 
+/**
+ * @brief Test whether an InfraredSignal instance holds any signal.
+ *
+ * @param[in] signal pointer to the instance to be tested.
+ * @returns true if the instance holds raw signal, false otherwise.
+ */
+bool infrared_signal_is_valid(const InfraredSignal* signal);
+
+/**
+ * @brief Set an InfraredInstance to hold the signal from another one.
+ *
+ * Any instance's previous contents will be automatically deleted before
+ * copying the source instance's contents.
+ *
+ * @param[in,out] signal pointer to the destination instance.
+ * @param[in] other pointer to the source instance.
+ */
 void infrared_signal_set_signal(InfraredSignal* signal, const InfraredSignal* other);
 
+/**
+ * @brief Set an InfraredInstance to hold a raw signal.
+ *
+ * Any instance's previous contents will be automatically deleted before
+ * copying the raw signal.
+ *
+ * After this call, infrared_signal_is_raw() will return true.
+ *
+ * @param[in,out] signal pointer to the destination instance.
+ * @param[in] timings pointer to an array containing the raw signal timings.
+ * @param[in] timings_size number of elements in the timings array.
+ * @param[in] frequency signal carrier frequency, in Hertz.
+ * @param[in] duty_cycle signal duty cycle, fraction between 0 and 1.
+ */
 void infrared_signal_set_raw_signal(
     InfraredSignal* signal,
     const uint32_t* timings,
     size_t timings_size,
     uint32_t frequency,
     float duty_cycle);
-InfraredRawSignal* infrared_signal_get_raw_signal(InfraredSignal* signal);
 
+/**
+ * @brief Get the raw signal held by an InfraredSignal instance.
+ *
+ * @warning the instance MUST hold a *raw* signal, otherwise undefined behaviour will occur.
+ *
+ * @param[in] signal pointer to the instance to be queried.
+ * @returns pointer to the raw signal structure held by the instance.
+ */
+const InfraredRawSignal* infrared_signal_get_raw_signal(const InfraredSignal* signal);
+
+/**
+ * @brief Set an InfraredInstance to hold a parsed signal.
+ *
+ * Any instance's previous contents will be automatically deleted before
+ * copying the raw signal.
+ *
+ * After this call, infrared_signal_is_raw() will return false.
+ *
+ * @param[in,out] signal pointer to the destination instance.
+ * @param[in] message pointer to the message containing the parsed signal.
+ */
 void infrared_signal_set_message(InfraredSignal* signal, const InfraredMessage* message);
-InfraredMessage* infrared_signal_get_message(InfraredSignal* signal);
 
-bool infrared_signal_save(InfraredSignal* signal, FlipperFormat* ff, const char* name);
+/**
+ * @brief Get the parsed signal held by an InfraredSignal instance.
+ *
+ * @warning the instance MUST hold a *parsed* signal, otherwise undefined behaviour will occur.
+ *
+ * @param[in] signal pointer to the instance to be queried.
+ * @returns pointer to the parsed signal structure held by the instance.
+ */
+const InfraredMessage* infrared_signal_get_message(const InfraredSignal* signal);
+
+/**
+ * @brief Read a signal from a FlipperFormat file into an InfraredSignal instance.
+ *
+ * The file must be allocated and open prior to this call. The seek position determines
+ * which signal will be read (if there is more than one in the file). Calling this function
+ * repeatedly will result in all signals in the file to be read until no more are left.
+ *
+ * @param[in,out] signal pointer to the instance to be read into.
+ * @param[in,out] ff pointer to the FlipperFormat file instance to read from.
+ * @param[out] name pointer to the string to hold the signal name. Must be properly allocated.
+ * @returns true if a signal was successfully read, false otherwise (e.g. no more signals to read).
+ */
 bool infrared_signal_read(InfraredSignal* signal, FlipperFormat* ff, FuriString* name);
-bool infrared_signal_search_and_read(
+
+/**
+ * @brief Read a signal name from a FlipperFormat file.
+ *
+ * Same behaviour as infrared_signal_read(), but only the name is read.
+ *
+ * @param[in,out] ff pointer to the FlipperFormat file instance to read from.
+ * @param[out] name pointer to the string to hold the signal name. Must be properly allocated.
+ * @returns true if a signal name was successfully read, false otherwise (e.g. no more signals to read).
+ */
+bool infrared_signal_read_name(FlipperFormat* ff, FuriString* name);
+
+/**
+ * @brief Read a signal with a particular name from a FlipperFormat file into an InfraredSignal instance.
+ *
+ * This function will look for a signal with the given name and if found, attempt to read it.
+ * Same considerations apply as to infrared_signal_read().
+ *
+ * @param[in,out] signal pointer to the instance to be read into.
+ * @param[in,out] ff pointer to the FlipperFormat file instance to read from.
+ * @param[in] name pointer to a zero-terminated string containing the requested signal name.
+ * @returns true if a signal was found and successfully read, false otherwise (e.g. the signal was not found).
+ */
+bool infrared_signal_search_by_name_and_read(
     InfraredSignal* signal,
     FlipperFormat* ff,
-    const FuriString* name);
+    const char* name);
 
-void infrared_signal_transmit(InfraredSignal* signal);
+/**
+ * @brief Read a signal with a particular index from a FlipperFormat file into an InfraredSignal instance.
+ *
+ * This function will look for a signal with the given index and if found, attempt to read it.
+ * Same considerations apply as to infrared_signal_read().
+ *
+ * @param[in,out] signal pointer to the instance to be read into.
+ * @param[in,out] ff pointer to the FlipperFormat file instance to read from.
+ * @param[in] index the requested signal index.
+ * @returns true if a signal was found and successfully read, false otherwise (e.g. the signal was not found).
+ */
+bool infrared_signal_search_by_index_and_read(
+    InfraredSignal* signal,
+    FlipperFormat* ff,
+    size_t index);
+
+/**
+ * @brief Save a signal contained in an InfraredSignal instance to a FlipperFormat file.
+ *
+ * The file must be allocated and open prior to this call. Additionally, an appropriate header
+ * must be already written into the file.
+ *
+ * @param[in] signal pointer to the instance holding the signal to be saved.
+ * @param[in,out] ff pointer to the FlipperFormat file instance to write to.
+ * @param[in] name pointer to a zero-terminated string contating the name of the signal.
+ */
+bool infrared_signal_save(const InfraredSignal* signal, FlipperFormat* ff, const char* name);
+
+/**
+ * @brief Transmit a signal contained in an InfraredSignal instance.
+ *
+ * The transmission happens once per call using the built-in hardware (via HAL calls).
+ *
+ * @param[in] signal pointer to the instance holding the signal to be transmitted.
+ */
+void infrared_signal_transmit(const InfraredSignal* signal);
diff --git a/assets/resources/infrared/assets/ac.ir b/applications/main/infrared/resources/infrared/assets/ac.ir
similarity index 100%
rename from assets/resources/infrared/assets/ac.ir
rename to applications/main/infrared/resources/infrared/assets/ac.ir
diff --git a/assets/resources/infrared/assets/audio.ir b/applications/main/infrared/resources/infrared/assets/audio.ir
similarity index 100%
rename from assets/resources/infrared/assets/audio.ir
rename to applications/main/infrared/resources/infrared/assets/audio.ir
diff --git a/assets/resources/infrared/assets/projector.ir b/applications/main/infrared/resources/infrared/assets/projector.ir
similarity index 100%
rename from assets/resources/infrared/assets/projector.ir
rename to applications/main/infrared/resources/infrared/assets/projector.ir
diff --git a/assets/resources/infrared/assets/tv.ir b/applications/main/infrared/resources/infrared/assets/tv.ir
similarity index 100%
rename from assets/resources/infrared/assets/tv.ir
rename to applications/main/infrared/resources/infrared/assets/tv.ir
diff --git a/applications/main/infrared/scenes/common/infrared_scene_universal_common.c b/applications/main/infrared/scenes/common/infrared_scene_universal_common.c
index 96f28cc4..4967d195 100644
--- a/applications/main/infrared/scenes/common/infrared_scene_universal_common.c
+++ b/applications/main/infrared/scenes/common/infrared_scene_universal_common.c
@@ -1,20 +1,21 @@
-#include "../../infrared_i.h"
+#include "../../infrared_app_i.h"
 
 #include <dolphin/dolphin.h>
 
 void infrared_scene_universal_common_item_callback(void* context, uint32_t index) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     uint32_t event = infrared_custom_event_pack(InfraredCustomEventTypeButtonSelected, index);
     view_dispatcher_send_custom_event(infrared->view_dispatcher, event);
 }
 
 static void infrared_scene_universal_common_progress_back_callback(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     uint32_t event = infrared_custom_event_pack(InfraredCustomEventTypeBackPressed, -1);
     view_dispatcher_send_custom_event(infrared->view_dispatcher, event);
 }
 
-static void infrared_scene_universal_common_show_popup(Infrared* infrared, uint32_t record_count) {
+static void
+    infrared_scene_universal_common_show_popup(InfraredApp* infrared, uint32_t record_count) {
     ViewStack* view_stack = infrared->view_stack;
     InfraredProgressView* progress = infrared->progress;
     infrared_progress_view_set_progress_total(progress, record_count);
@@ -24,7 +25,7 @@ static void infrared_scene_universal_common_show_popup(Infrared* infrared, uint3
     infrared_play_notification_message(infrared, InfraredNotificationMessageBlinkStartSend);
 }
 
-static void infrared_scene_universal_common_hide_popup(Infrared* infrared) {
+static void infrared_scene_universal_common_hide_popup(InfraredApp* infrared) {
     ViewStack* view_stack = infrared->view_stack;
     InfraredProgressView* progress = infrared->progress;
     view_stack_remove_view(view_stack, infrared_progress_view_get_view(progress));
@@ -32,12 +33,12 @@ static void infrared_scene_universal_common_hide_popup(Infrared* infrared) {
 }
 
 void infrared_scene_universal_common_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_stack_add_view(infrared->view_stack, button_panel_get_view(infrared->button_panel));
 }
 
 bool infrared_scene_universal_common_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
     InfraredBruteForce* brute_force = infrared->brute_force;
     bool consumed = false;
@@ -84,7 +85,7 @@ bool infrared_scene_universal_common_on_event(void* context, SceneManagerEvent e
 }
 
 void infrared_scene_universal_common_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     ButtonPanel* button_panel = infrared->button_panel;
     view_stack_remove_view(infrared->view_stack, button_panel_get_view(button_panel));
     infrared_brute_force_reset(infrared->brute_force);
diff --git a/applications/main/infrared/scenes/infrared_scene_ask_back.c b/applications/main/infrared/scenes/infrared_scene_ask_back.c
index 77fc97f9..f97a38bb 100644
--- a/applications/main/infrared/scenes/infrared_scene_ask_back.c
+++ b/applications/main/infrared/scenes/infrared_scene_ask_back.c
@@ -1,12 +1,12 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 static void infrared_scene_dialog_result_callback(DialogExResult result, void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_dispatcher_send_custom_event(infrared->view_dispatcher, result);
 }
 
 void infrared_scene_ask_back_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     DialogEx* dialog_ex = infrared->dialog_ex;
 
     if(infrared->app_state.is_learning_new_remote) {
@@ -28,7 +28,7 @@ void infrared_scene_ask_back_on_enter(void* context) {
 }
 
 bool infrared_scene_ask_back_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
     bool consumed = false;
 
@@ -54,6 +54,6 @@ bool infrared_scene_ask_back_on_event(void* context, SceneManagerEvent event) {
 }
 
 void infrared_scene_ask_back_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     dialog_ex_reset(infrared->dialog_ex);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_ask_retry.c b/applications/main/infrared/scenes/infrared_scene_ask_retry.c
index 602e470c..365ed5c8 100644
--- a/applications/main/infrared/scenes/infrared_scene_ask_retry.c
+++ b/applications/main/infrared/scenes/infrared_scene_ask_retry.c
@@ -1,12 +1,12 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 static void infrared_scene_dialog_result_callback(DialogExResult result, void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_dispatcher_send_custom_event(infrared->view_dispatcher, result);
 }
 
 void infrared_scene_ask_retry_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     DialogEx* dialog_ex = infrared->dialog_ex;
 
     dialog_ex_set_header(dialog_ex, "Retry Reading?", 64, 11, AlignCenter, AlignTop);
@@ -23,7 +23,7 @@ void infrared_scene_ask_retry_on_enter(void* context) {
 }
 
 bool infrared_scene_ask_retry_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
     bool consumed = false;
 
@@ -43,6 +43,6 @@ bool infrared_scene_ask_retry_on_event(void* context, SceneManagerEvent event) {
 }
 
 void infrared_scene_ask_retry_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     dialog_ex_reset(infrared->dialog_ex);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_debug.c b/applications/main/infrared/scenes/infrared_scene_debug.c
index 20497869..adffbc83 100644
--- a/applications/main/infrared/scenes/infrared_scene_debug.c
+++ b/applications/main/infrared/scenes/infrared_scene_debug.c
@@ -1,7 +1,7 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 void infrared_scene_debug_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     InfraredWorker* worker = infrared->worker;
 
     infrared_worker_rx_set_received_signal_callback(
@@ -14,16 +14,16 @@ void infrared_scene_debug_on_enter(void* context) {
 }
 
 bool infrared_scene_debug_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == InfraredCustomEventTypeSignalReceived) {
             InfraredDebugView* debug_view = infrared->debug_view;
-            InfraredSignal* signal = infrared->received_signal;
+            InfraredSignal* signal = infrared->current_signal;
 
             if(infrared_signal_is_raw(signal)) {
-                InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
+                const InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
                 infrared_debug_view_set_text(debug_view, "RAW\n%d samples\n", raw->timings_size);
 
                 printf("RAW, %zu samples:\r\n", raw->timings_size);
@@ -33,7 +33,7 @@ bool infrared_scene_debug_on_event(void* context, SceneManagerEvent event) {
                 printf("\r\n");
 
             } else {
-                InfraredMessage* message = infrared_signal_get_message(signal);
+                const InfraredMessage* message = infrared_signal_get_message(signal);
                 infrared_debug_view_set_text(
                     debug_view,
                     "%s\nA:0x%0*lX\nC:0x%0*lX\n%s\n",
@@ -61,7 +61,7 @@ bool infrared_scene_debug_on_event(void* context, SceneManagerEvent event) {
 }
 
 void infrared_scene_debug_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     InfraredWorker* worker = infrared->worker;
     infrared_worker_rx_stop(worker);
     infrared_worker_rx_enable_blink_on_receiving(worker, false);
diff --git a/applications/main/infrared/scenes/infrared_scene_edit.c b/applications/main/infrared/scenes/infrared_scene_edit.c
index 02bba7a3..c22e9539 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit.c
@@ -1,4 +1,4 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 typedef enum {
     SubmenuIndexAddButton,
@@ -10,12 +10,12 @@ typedef enum {
 } SubmenuIndex;
 
 static void infrared_scene_edit_submenu_callback(void* context, uint32_t index) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_dispatcher_send_custom_event(infrared->view_dispatcher, index);
 }
 
 void infrared_scene_edit_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Submenu* submenu = infrared->submenu;
     SceneManager* scene_manager = infrared->scene_manager;
 
@@ -64,7 +64,7 @@ void infrared_scene_edit_on_enter(void* context) {
 }
 
 bool infrared_scene_edit_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
     bool consumed = false;
 
@@ -106,6 +106,6 @@ bool infrared_scene_edit_on_event(void* context, SceneManagerEvent event) {
 }
 
 void infrared_scene_edit_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     submenu_reset(infrared->submenu);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_button_select.c b/applications/main/infrared/scenes/infrared_scene_edit_button_select.c
index 5f5a1d8f..3fd59b57 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_button_select.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_button_select.c
@@ -1,12 +1,12 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 static void infrared_scene_edit_button_select_submenu_callback(void* context, uint32_t index) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_dispatcher_send_custom_event(infrared->view_dispatcher, index);
 }
 
 void infrared_scene_edit_button_select_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Submenu* submenu = infrared->submenu;
     InfraredRemote* remote = infrared->remote;
     InfraredAppState* app_state = &infrared->app_state;
@@ -16,16 +16,16 @@ void infrared_scene_edit_button_select_on_enter(void* context) {
                              "Delete Button:";
     submenu_set_header(submenu, header);
 
-    const size_t button_count = infrared_remote_get_button_count(remote);
+    const size_t button_count = infrared_remote_get_signal_count(remote);
     for(size_t i = 0; i < button_count; ++i) {
-        InfraredRemoteButton* button = infrared_remote_get_button(remote, i);
         submenu_add_item(
             submenu,
-            infrared_remote_button_get_name(button),
+            infrared_remote_get_signal_name(remote, i),
             i,
             infrared_scene_edit_button_select_submenu_callback,
             context);
     }
+
     if(button_count && app_state->current_button_index != InfraredButtonIndexNone) {
         submenu_set_selected_item(submenu, app_state->current_button_index);
         app_state->current_button_index = InfraredButtonIndexNone;
@@ -35,7 +35,7 @@ void infrared_scene_edit_button_select_on_enter(void* context) {
 }
 
 bool infrared_scene_edit_button_select_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     InfraredAppState* app_state = &infrared->app_state;
     SceneManager* scene_manager = infrared->scene_manager;
     bool consumed = false;
@@ -48,7 +48,7 @@ bool infrared_scene_edit_button_select_on_event(void* context, SceneManagerEvent
         } else if(edit_mode == InfraredEditModeDelete) {
             scene_manager_next_scene(scene_manager, InfraredSceneEditDelete);
         } else {
-            furi_assert(0);
+            furi_crash();
         }
         consumed = true;
     }
@@ -57,6 +57,6 @@ bool infrared_scene_edit_button_select_on_event(void* context, SceneManagerEvent
 }
 
 void infrared_scene_edit_button_select_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     submenu_reset(infrared->submenu);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_delete.c b/applications/main/infrared/scenes/infrared_scene_edit_delete.c
index 4dfc054f..0cb88efd 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_delete.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_delete.c
@@ -1,42 +1,49 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 static void
     infrared_scene_edit_delete_dialog_result_callback(DialogExResult result, void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_dispatcher_send_custom_event(infrared->view_dispatcher, result);
 }
 
 void infrared_scene_edit_delete_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     DialogEx* dialog_ex = infrared->dialog_ex;
     InfraredRemote* remote = infrared->remote;
 
     const InfraredEditTarget edit_target = infrared->app_state.edit_target;
     if(edit_target == InfraredEditTargetButton) {
-        int32_t current_button_index = infrared->app_state.current_button_index;
-        furi_assert(current_button_index != InfraredButtonIndexNone);
-
         dialog_ex_set_header(dialog_ex, "Delete Button?", 64, 0, AlignCenter, AlignTop);
-        InfraredRemoteButton* current_button =
-            infrared_remote_get_button(remote, current_button_index);
-        InfraredSignal* signal = infrared_remote_button_get_signal(current_button);
 
-        if(infrared_signal_is_raw(signal)) {
-            const InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
+        const int32_t current_button_index = infrared->app_state.current_button_index;
+        furi_check(current_button_index != InfraredButtonIndexNone);
+
+        if(!infrared_remote_load_signal(remote, infrared->current_signal, current_button_index)) {
+            infrared_show_error_message(
+                infrared,
+                "Failed to load\n\"%s\"",
+                infrared_remote_get_signal_name(remote, current_button_index));
+            scene_manager_previous_scene(infrared->scene_manager);
+            return;
+        }
+
+        if(infrared_signal_is_raw(infrared->current_signal)) {
+            const InfraredRawSignal* raw =
+                infrared_signal_get_raw_signal(infrared->current_signal);
             infrared_text_store_set(
                 infrared,
                 0,
-                "%s\nRAW\n%ld samples",
-                infrared_remote_button_get_name(current_button),
+                "%s\nRAW\n%zu samples",
+                infrared_remote_get_signal_name(remote, current_button_index),
                 raw->timings_size);
 
         } else {
-            const InfraredMessage* message = infrared_signal_get_message(signal);
+            const InfraredMessage* message = infrared_signal_get_message(infrared->current_signal);
             infrared_text_store_set(
                 infrared,
                 0,
                 "%s\n%s\nA=0x%0*lX C=0x%0*lX",
-                infrared_remote_button_get_name(current_button),
+                infrared_remote_get_signal_name(remote, current_button_index),
                 infrared_get_protocol_name(message->protocol),
                 ROUND_UP_TO(infrared_get_protocol_address_length(message->protocol), 4),
                 message->address,
@@ -49,11 +56,11 @@ void infrared_scene_edit_delete_on_enter(void* context) {
         infrared_text_store_set(
             infrared,
             0,
-            "%s\n with %lu buttons",
+            "%s\n with %zu buttons",
             infrared_remote_get_name(remote),
-            infrared_remote_get_button_count(remote));
+            infrared_remote_get_signal_count(remote));
     } else {
-        furi_assert(0);
+        furi_crash();
     }
 
     dialog_ex_set_text(dialog_ex, infrared->text_store[0], 64, 31, AlignCenter, AlignCenter);
@@ -63,11 +70,14 @@ void infrared_scene_edit_delete_on_enter(void* context) {
     dialog_ex_set_result_callback(dialog_ex, infrared_scene_edit_delete_dialog_result_callback);
     dialog_ex_set_context(dialog_ex, context);
 
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewDialogEx);
+    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationHorizontal);
+    view_stack_add_view(infrared->view_stack, dialog_ex_get_view(infrared->dialog_ex));
+
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
 }
 
 bool infrared_scene_edit_delete_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
     bool consumed = false;
 
@@ -83,18 +93,24 @@ bool infrared_scene_edit_delete_on_event(void* context, SceneManagerEvent event)
 
             if(edit_target == InfraredEditTargetButton) {
                 furi_assert(app_state->current_button_index != InfraredButtonIndexNone);
-                success = infrared_remote_delete_button(remote, app_state->current_button_index);
+                infrared_show_loading_popup(infrared, true);
+                success = infrared_remote_delete_signal(remote, app_state->current_button_index);
+                infrared_show_loading_popup(infrared, false);
                 app_state->current_button_index = InfraredButtonIndexNone;
             } else if(edit_target == InfraredEditTargetRemote) {
                 success = infrared_remote_remove(remote);
                 app_state->current_button_index = InfraredButtonIndexNone;
             } else {
-                furi_assert(0);
+                furi_crash();
             }
 
             if(success) {
                 scene_manager_next_scene(scene_manager, InfraredSceneEditDeleteDone);
             } else {
+                infrared_show_error_message(
+                    infrared,
+                    "Failed to\ndelete %s",
+                    edit_target == InfraredEditTargetButton ? "button" : "file");
                 const uint32_t possible_scenes[] = {InfraredSceneRemoteList, InfraredSceneStart};
                 scene_manager_search_and_switch_to_previous_scene_one_of(
                     scene_manager, possible_scenes, COUNT_OF(possible_scenes));
@@ -107,6 +123,6 @@ bool infrared_scene_edit_delete_on_event(void* context, SceneManagerEvent event)
 }
 
 void infrared_scene_edit_delete_on_exit(void* context) {
-    Infrared* infrared = context;
-    UNUSED(infrared);
+    InfraredApp* infrared = context;
+    view_stack_remove_view(infrared->view_stack, dialog_ex_get_view(infrared->dialog_ex));
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_delete_done.c b/applications/main/infrared/scenes/infrared_scene_edit_delete_done.c
index 49a299d2..9205db4c 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_delete_done.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_delete_done.c
@@ -1,7 +1,7 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 void infrared_scene_edit_delete_done_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Popup* popup = infrared->popup;
 
     popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62);
@@ -16,7 +16,7 @@ void infrared_scene_edit_delete_done_on_enter(void* context) {
 }
 
 bool infrared_scene_edit_delete_done_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
     bool consumed = false;
 
@@ -33,7 +33,7 @@ bool infrared_scene_edit_delete_done_on_event(void* context, SceneManagerEvent e
                     view_dispatcher_stop(infrared->view_dispatcher);
                 }
             } else {
-                furi_assert(0);
+                furi_crash();
             }
             consumed = true;
         }
@@ -43,6 +43,6 @@ bool infrared_scene_edit_delete_done_on_event(void* context, SceneManagerEvent e
 }
 
 void infrared_scene_edit_delete_done_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     UNUSED(infrared);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_move.c b/applications/main/infrared/scenes/infrared_scene_edit_move.c
index 370c352d..4959a831 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_move.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_move.c
@@ -1,44 +1,69 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
-static void infrared_scene_move_button(uint32_t index_old, uint32_t index_new, void* context) {
-    InfraredRemote* remote = context;
-    furi_assert(remote);
-    infrared_remote_move_button(remote, index_old, index_new);
-}
+static void infrared_scene_edit_move_button_callback(
+    uint32_t index_old,
+    uint32_t index_new,
+    void* context) {
+    InfraredApp* infrared = context;
+    furi_assert(infrared);
 
-static const char* infrared_scene_get_btn_name(uint32_t index, void* context) {
-    InfraredRemote* remote = context;
-    furi_assert(remote);
-    InfraredRemoteButton* button = infrared_remote_get_button(remote, index);
-    return (infrared_remote_button_get_name(button));
+    infrared->app_state.prev_button_index = index_old;
+    infrared->app_state.current_button_index = index_new;
+
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher, InfraredCustomEventTypeButtonSelected);
 }
 
 void infrared_scene_edit_move_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     InfraredRemote* remote = infrared->remote;
 
-    infrared_move_view_set_callback(infrared->move_view, infrared_scene_move_button);
+    for(size_t i = 0; i < infrared_remote_get_signal_count(remote); ++i) {
+        infrared_move_view_add_item(
+            infrared->move_view, infrared_remote_get_signal_name(remote, i));
+    }
 
-    uint32_t btn_count = infrared_remote_get_button_count(remote);
-    infrared_move_view_list_init(
-        infrared->move_view, btn_count, infrared_scene_get_btn_name, remote);
-    infrared_move_view_list_update(infrared->move_view);
+    infrared_move_view_set_callback(
+        infrared->move_view, infrared_scene_edit_move_button_callback, infrared);
 
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewMove);
+    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationHorizontal);
+    view_stack_add_view(infrared->view_stack, infrared_move_view_get_view(infrared->move_view));
+
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
 }
 
 bool infrared_scene_edit_move_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     bool consumed = false;
 
-    UNUSED(event);
-    UNUSED(infrared);
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == InfraredCustomEventTypeButtonSelected) {
+            infrared_show_loading_popup(infrared, true);
+            const bool button_moved = infrared_remote_move_signal(
+                infrared->remote,
+                infrared->app_state.prev_button_index,
+                infrared->app_state.current_button_index);
+            infrared_show_loading_popup(infrared, false);
+
+            if(!button_moved) {
+                infrared_show_error_message(
+                    infrared,
+                    "Failed to move\n\"%s\"",
+                    infrared_remote_get_signal_name(
+                        infrared->remote, infrared->app_state.current_button_index));
+                scene_manager_search_and_switch_to_previous_scene(
+                    infrared->scene_manager, InfraredSceneRemoteList);
+            }
+
+            consumed = true;
+        }
+    }
 
     return consumed;
 }
 
 void infrared_scene_edit_move_on_exit(void* context) {
-    Infrared* infrared = context;
-    InfraredRemote* remote = infrared->remote;
-    infrared_remote_store(remote);
+    InfraredApp* infrared = context;
+    view_stack_remove_view(infrared->view_stack, infrared_move_view_get_view(infrared->move_view));
+    infrared_move_view_reset(infrared->move_view);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_rename.c b/applications/main/infrared/scenes/infrared_scene_edit_rename.c
index a2199215..17869092 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_rename.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_rename.c
@@ -1,10 +1,10 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 #include <string.h>
 #include <toolbox/path.h>
 
 void infrared_scene_edit_rename_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     InfraredRemote* remote = infrared->remote;
     TextInput* text_input = infrared->text_input;
     size_t enter_name_length = 0;
@@ -14,14 +14,12 @@ void infrared_scene_edit_rename_on_enter(void* context) {
         text_input_set_header_text(text_input, "Name the button");
 
         const int32_t current_button_index = infrared->app_state.current_button_index;
-        furi_assert(current_button_index != InfraredButtonIndexNone);
+        furi_check(current_button_index != InfraredButtonIndexNone);
 
-        InfraredRemoteButton* current_button =
-            infrared_remote_get_button(remote, current_button_index);
         enter_name_length = INFRARED_MAX_BUTTON_NAME_LENGTH;
         strncpy(
             infrared->text_store[0],
-            infrared_remote_button_get_name(current_button),
+            infrared_remote_get_signal_name(remote, current_button_index),
             enter_name_length);
 
     } else if(edit_target == InfraredEditTargetRemote) {
@@ -44,7 +42,7 @@ void infrared_scene_edit_rename_on_enter(void* context) {
 
         furi_string_free(folder_path);
     } else {
-        furi_assert(0);
+        furi_crash();
     }
 
     text_input_set_result_callback(
@@ -55,11 +53,14 @@ void infrared_scene_edit_rename_on_enter(void* context) {
         enter_name_length,
         false);
 
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewTextInput);
+    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationHorizontal);
+    view_stack_add_view(infrared->view_stack, text_input_get_view(infrared->text_input));
+
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
 }
 
 bool infrared_scene_edit_rename_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     InfraredRemote* remote = infrared->remote;
     SceneManager* scene_manager = infrared->scene_manager;
     InfraredAppState* app_state = &infrared->app_state;
@@ -72,18 +73,24 @@ bool infrared_scene_edit_rename_on_event(void* context, SceneManagerEvent event)
             if(edit_target == InfraredEditTargetButton) {
                 const int32_t current_button_index = app_state->current_button_index;
                 furi_assert(current_button_index != InfraredButtonIndexNone);
-                success = infrared_remote_rename_button(
-                    remote, infrared->text_store[0], current_button_index);
+                infrared_show_loading_popup(infrared, true);
+                success = infrared_remote_rename_signal(
+                    remote, current_button_index, infrared->text_store[0]);
+                infrared_show_loading_popup(infrared, false);
                 app_state->current_button_index = InfraredButtonIndexNone;
             } else if(edit_target == InfraredEditTargetRemote) {
                 success = infrared_rename_current_remote(infrared, infrared->text_store[0]);
             } else {
-                furi_assert(0);
+                furi_crash();
             }
 
             if(success) {
                 scene_manager_next_scene(scene_manager, InfraredSceneEditRenameDone);
             } else {
+                infrared_show_error_message(
+                    infrared,
+                    "Failed to\nrename %s",
+                    edit_target == InfraredEditTargetButton ? "button" : "file");
                 scene_manager_search_and_switch_to_previous_scene(
                     scene_manager, InfraredSceneRemoteList);
             }
@@ -95,9 +102,11 @@ bool infrared_scene_edit_rename_on_event(void* context, SceneManagerEvent event)
 }
 
 void infrared_scene_edit_rename_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     TextInput* text_input = infrared->text_input;
 
+    view_stack_remove_view(infrared->view_stack, text_input_get_view(text_input));
+
     void* validator_context = text_input_get_validator_callback_context(text_input);
     text_input_set_validator(text_input, NULL, NULL);
 
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c b/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c
index 6c7096e1..35f51598 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c
@@ -1,7 +1,7 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 void infrared_scene_edit_rename_done_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Popup* popup = infrared->popup;
 
     popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59);
@@ -16,7 +16,7 @@ void infrared_scene_edit_rename_done_on_enter(void* context) {
 }
 
 bool infrared_scene_edit_rename_done_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
@@ -33,6 +33,6 @@ bool infrared_scene_edit_rename_done_on_event(void* context, SceneManagerEvent e
 }
 
 void infrared_scene_edit_rename_done_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     UNUSED(infrared);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_error_databases.c b/applications/main/infrared/scenes/infrared_scene_error_databases.c
index 4ed4dee5..f51f83f2 100644
--- a/applications/main/infrared/scenes/infrared_scene_error_databases.c
+++ b/applications/main/infrared/scenes/infrared_scene_error_databases.c
@@ -1,7 +1,7 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 void infrared_scene_error_databases_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Popup* popup = infrared->popup;
 
     popup_set_icon(popup, 5, 11, &I_SDQuestion_35x43);
@@ -16,7 +16,7 @@ void infrared_scene_error_databases_on_enter(void* context) {
 }
 
 bool infrared_scene_error_databases_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
@@ -31,7 +31,7 @@ bool infrared_scene_error_databases_on_event(void* context, SceneManagerEvent ev
 }
 
 void infrared_scene_error_databases_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     popup_reset(infrared->popup);
     infrared_play_notification_message(infrared, InfraredNotificationMessageYellowOff);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_learn.c b/applications/main/infrared/scenes/infrared_scene_learn.c
index 46646c6d..bcd0a2cd 100644
--- a/applications/main/infrared/scenes/infrared_scene_learn.c
+++ b/applications/main/infrared/scenes/infrared_scene_learn.c
@@ -1,8 +1,8 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 #include <dolphin/dolphin.h>
 
 void infrared_scene_learn_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Popup* popup = infrared->popup;
     InfraredWorker* worker = infrared->worker;
 
@@ -21,7 +21,7 @@ void infrared_scene_learn_on_enter(void* context) {
 }
 
 bool infrared_scene_learn_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
@@ -37,7 +37,7 @@ bool infrared_scene_learn_on_event(void* context, SceneManagerEvent event) {
 }
 
 void infrared_scene_learn_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Popup* popup = infrared->popup;
     infrared_worker_rx_set_received_signal_callback(infrared->worker, NULL, NULL);
     infrared_worker_rx_stop(infrared->worker);
diff --git a/applications/main/infrared/scenes/infrared_scene_learn_done.c b/applications/main/infrared/scenes/infrared_scene_learn_done.c
index 54b7da72..b4eb3833 100644
--- a/applications/main/infrared/scenes/infrared_scene_learn_done.c
+++ b/applications/main/infrared/scenes/infrared_scene_learn_done.c
@@ -1,7 +1,7 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 void infrared_scene_learn_done_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Popup* popup = infrared->popup;
 
     popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59);
@@ -21,7 +21,7 @@ void infrared_scene_learn_done_on_enter(void* context) {
 }
 
 bool infrared_scene_learn_done_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
@@ -38,7 +38,7 @@ bool infrared_scene_learn_done_on_event(void* context, SceneManagerEvent event)
 }
 
 void infrared_scene_learn_done_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     infrared->app_state.is_learning_new_remote = false;
     popup_set_header(infrared->popup, NULL, 0, 0, AlignLeft, AlignTop);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_learn_enter_name.c b/applications/main/infrared/scenes/infrared_scene_learn_enter_name.c
index 104a4cb7..be46a869 100644
--- a/applications/main/infrared/scenes/infrared_scene_learn_enter_name.c
+++ b/applications/main/infrared/scenes/infrared_scene_learn_enter_name.c
@@ -1,16 +1,16 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 #include <dolphin/dolphin.h>
 
 void infrared_scene_learn_enter_name_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     TextInput* text_input = infrared->text_input;
-    InfraredSignal* signal = infrared->received_signal;
+    InfraredSignal* signal = infrared->current_signal;
 
     if(infrared_signal_is_raw(signal)) {
-        InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
-        infrared_text_store_set(infrared, 0, "RAW_%d", raw->timings_size);
+        const InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
+        infrared_text_store_set(infrared, 0, "RAW_%zu", raw->timings_size);
     } else {
-        InfraredMessage* message = infrared_signal_get_message(signal);
+        const InfraredMessage* message = infrared_signal_get_message(signal);
         infrared_text_store_set(
             infrared,
             0,
@@ -28,31 +28,32 @@ void infrared_scene_learn_enter_name_on_enter(void* context) {
         infrared->text_store[0],
         INFRARED_MAX_BUTTON_NAME_LENGTH,
         true);
+
     view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewTextInput);
 }
 
 bool infrared_scene_learn_enter_name_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
-    InfraredSignal* signal = infrared->received_signal;
+    InfraredApp* infrared = context;
+    InfraredSignal* signal = infrared->current_signal;
     SceneManager* scene_manager = infrared->scene_manager;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == InfraredCustomEventTypeTextEditDone) {
-            bool success = false;
-            if(infrared->app_state.is_learning_new_remote) {
-                success =
-                    infrared_add_remote_with_button(infrared, infrared->text_store[0], signal);
-            } else {
-                success =
-                    infrared_remote_add_button(infrared->remote, infrared->text_store[0], signal);
-            }
+            const char* signal_name = infrared->text_store[0];
+            const bool success =
+                infrared->app_state.is_learning_new_remote ?
+                    infrared_add_remote_with_button(infrared, signal_name, signal) :
+                    infrared_remote_append_signal(infrared->remote, signal, signal_name);
 
             if(success) {
                 scene_manager_next_scene(scene_manager, InfraredSceneLearnDone);
                 dolphin_deed(DolphinDeedIrSave);
             } else {
-                dialog_message_show_storage_error(infrared->dialogs, "Failed to save file");
+                infrared_show_error_message(
+                    infrared,
+                    "Failed to\n%s",
+                    infrared->app_state.is_learning_new_remote ? "create file" : "add signal");
                 const uint32_t possible_scenes[] = {InfraredSceneRemoteList, InfraredSceneStart};
                 scene_manager_search_and_switch_to_previous_scene_one_of(
                     scene_manager, possible_scenes, COUNT_OF(possible_scenes));
@@ -65,6 +66,6 @@ bool infrared_scene_learn_enter_name_on_event(void* context, SceneManagerEvent e
 }
 
 void infrared_scene_learn_enter_name_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     UNUSED(infrared);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_learn_success.c b/applications/main/infrared/scenes/infrared_scene_learn_success.c
index 469d4de9..deb54bb5 100644
--- a/applications/main/infrared/scenes/infrared_scene_learn_success.c
+++ b/applications/main/infrared/scenes/infrared_scene_learn_success.c
@@ -1,26 +1,26 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 static void
     infrared_scene_learn_success_dialog_result_callback(DialogExResult result, void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_dispatcher_send_custom_event(infrared->view_dispatcher, result);
 }
 
 void infrared_scene_learn_success_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     DialogEx* dialog_ex = infrared->dialog_ex;
-    InfraredSignal* signal = infrared->received_signal;
+    InfraredSignal* signal = infrared->current_signal;
 
     infrared_play_notification_message(infrared, InfraredNotificationMessageGreenOn);
 
     if(infrared_signal_is_raw(signal)) {
-        InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
+        const InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
         dialog_ex_set_header(dialog_ex, "Unknown", 95, 10, AlignCenter, AlignCenter);
-        infrared_text_store_set(infrared, 0, "%d samples", raw->timings_size);
+        infrared_text_store_set(infrared, 0, "%zu samples", raw->timings_size);
         dialog_ex_set_text(dialog_ex, infrared->text_store[0], 75, 23, AlignLeft, AlignTop);
 
     } else {
-        InfraredMessage* message = infrared_signal_get_message(signal);
+        const InfraredMessage* message = infrared_signal_get_message(signal);
         uint8_t addr_digits =
             ROUND_UP_TO(infrared_get_protocol_address_length(message->protocol), 4);
         uint8_t cmd_digits =
@@ -56,7 +56,7 @@ void infrared_scene_learn_success_on_enter(void* context) {
 }
 
 bool infrared_scene_learn_success_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
     const bool is_transmitter_idle = !infrared->app_state.is_transmitting;
     bool consumed = false;
@@ -84,7 +84,7 @@ bool infrared_scene_learn_success_on_event(void* context, SceneManagerEvent even
             consumed = true;
         } else if(event.event == DialogExPressCenter) {
             infrared_play_notification_message(infrared, InfraredNotificationMessageGreenOff);
-            infrared_tx_start_received(infrared);
+            infrared_tx_start(infrared);
             consumed = true;
         } else if(event.event == DialogExReleaseCenter) {
             infrared_tx_stop(infrared);
@@ -96,7 +96,7 @@ bool infrared_scene_learn_success_on_event(void* context, SceneManagerEvent even
 }
 
 void infrared_scene_learn_success_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     dialog_ex_reset(infrared->dialog_ex);
     infrared_play_notification_message(infrared, InfraredNotificationMessageGreenOff);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_remote.c b/applications/main/infrared/scenes/infrared_scene_remote.c
index c1f5b662..6c1d1ec4 100644
--- a/applications/main/infrared/scenes/infrared_scene_remote.c
+++ b/applications/main/infrared/scenes/infrared_scene_remote.c
@@ -1,14 +1,14 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 typedef enum {
-    ButtonIndexPlus = -2,
+    ButtonIndexLearn = -2,
     ButtonIndexEdit = -1,
     ButtonIndexNA = 0,
 } ButtonIndex;
 
 static void
     infrared_scene_remote_button_menu_callback(void* context, int32_t index, InputType type) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
 
     uint16_t custom_type;
     if(type == InputTypePress) {
@@ -26,17 +26,15 @@ static void
 }
 
 void infrared_scene_remote_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     InfraredRemote* remote = infrared->remote;
     ButtonMenu* button_menu = infrared->button_menu;
     SceneManager* scene_manager = infrared->scene_manager;
 
-    size_t button_count = infrared_remote_get_button_count(remote);
-    for(size_t i = 0; i < button_count; ++i) {
-        InfraredRemoteButton* button = infrared_remote_get_button(remote, i);
+    for(size_t i = 0; i < infrared_remote_get_signal_count(remote); ++i) {
         button_menu_add_item(
             button_menu,
-            infrared_remote_button_get_name(button),
+            infrared_remote_get_signal_name(remote, i),
             i,
             infrared_scene_remote_button_menu_callback,
             ButtonMenuItemTypeCommon,
@@ -46,7 +44,7 @@ void infrared_scene_remote_on_enter(void* context) {
     button_menu_add_item(
         button_menu,
         "+",
-        ButtonIndexPlus,
+        ButtonIndexLearn,
         infrared_scene_remote_button_menu_callback,
         ButtonMenuItemTypeControl,
         context);
@@ -68,7 +66,7 @@ void infrared_scene_remote_on_enter(void* context) {
 }
 
 bool infrared_scene_remote_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
     const bool is_transmitter_idle = !infrared->app_state.is_transmitting;
     bool consumed = false;
@@ -97,7 +95,7 @@ bool infrared_scene_remote_on_event(void* context, SceneManagerEvent event) {
             if(is_transmitter_idle) {
                 scene_manager_set_scene_state(
                     scene_manager, InfraredSceneRemote, (unsigned)button_index);
-                if(button_index == ButtonIndexPlus) {
+                if(button_index == ButtonIndexLearn) {
                     infrared->app_state.is_learning_new_remote = false;
                     scene_manager_next_scene(scene_manager, InfraredSceneLearn);
                     consumed = true;
@@ -116,6 +114,6 @@ bool infrared_scene_remote_on_event(void* context, SceneManagerEvent event) {
 }
 
 void infrared_scene_remote_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     button_menu_reset(infrared->button_menu);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_remote_list.c b/applications/main/infrared/scenes/infrared_scene_remote_list.c
index 55f14416..2276e270 100644
--- a/applications/main/infrared/scenes/infrared_scene_remote_list.c
+++ b/applications/main/infrared/scenes/infrared_scene_remote_list.c
@@ -1,31 +1,34 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 void infrared_scene_remote_list_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
     ViewDispatcher* view_dispatcher = infrared->view_dispatcher;
 
+    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
+    view_dispatcher_switch_to_view(view_dispatcher, InfraredViewStack);
+
     DialogsFileBrowserOptions browser_options;
     dialog_file_browser_set_basic_options(&browser_options, INFRARED_APP_EXTENSION, &I_ir_10px);
     browser_options.base_path = INFRARED_APP_FOLDER;
 
-    bool success = dialog_file_browser_show(
-        infrared->dialogs, infrared->file_path, infrared->file_path, &browser_options);
-
-    if(success) {
-        view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
-        view_dispatcher_switch_to_view(view_dispatcher, InfraredViewStack);
+    while(dialog_file_browser_show(
+        infrared->dialogs, infrared->file_path, infrared->file_path, &browser_options)) {
+        const char* file_path = furi_string_get_cstr(infrared->file_path);
 
         infrared_show_loading_popup(infrared, true);
-        success = infrared_remote_load(infrared->remote, infrared->file_path);
+        const bool remote_loaded = infrared_remote_load(infrared->remote, file_path);
         infrared_show_loading_popup(infrared, false);
+
+        if(remote_loaded) {
+            scene_manager_next_scene(scene_manager, InfraredSceneRemote);
+            return;
+        } else {
+            infrared_show_error_message(infrared, "Failed to load\n\"%s\"", file_path);
+        }
     }
 
-    if(success) {
-        scene_manager_next_scene(scene_manager, InfraredSceneRemote);
-    } else {
-        scene_manager_previous_scene(scene_manager);
-    }
+    scene_manager_previous_scene(scene_manager);
 }
 
 bool infrared_scene_remote_list_on_event(void* context, SceneManagerEvent event) {
diff --git a/applications/main/infrared/scenes/infrared_scene_rpc.c b/applications/main/infrared/scenes/infrared_scene_rpc.c
index 04f17416..f3408fba 100644
--- a/applications/main/infrared/scenes/infrared_scene_rpc.c
+++ b/applications/main/infrared/scenes/infrared_scene_rpc.c
@@ -1,6 +1,8 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 #include <gui/canvas.h>
 
+#define TAG "InfraredApp"
+
 typedef enum {
     InfraredRpcStateIdle,
     InfraredRpcStateLoaded,
@@ -8,7 +10,7 @@ typedef enum {
 } InfraredRpcState;
 
 void infrared_scene_rpc_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Popup* popup = infrared->popup;
 
     popup_set_header(popup, "Infrared", 89, 42, AlignCenter, AlignBottom);
@@ -27,7 +29,7 @@ void infrared_scene_rpc_on_enter(void* context) {
 }
 
 bool infrared_scene_rpc_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
@@ -38,12 +40,11 @@ bool infrared_scene_rpc_on_event(void* context, SceneManagerEvent event) {
             view_dispatcher_stop(infrared->view_dispatcher);
         } else if(event.event == InfraredCustomEventTypePopupClosed) {
             view_dispatcher_stop(infrared->view_dispatcher);
-        } else if(event.event == InfraredCustomEventTypeRpcLoad) {
+        } else if(event.event == InfraredCustomEventTypeRpcLoadFile) {
             bool result = false;
-            const char* arg = rpc_system_app_get_data(infrared->rpc_ctx);
-            if(arg && (state == InfraredRpcStateIdle)) {
-                furi_string_set(infrared->file_path, arg);
-                result = infrared_remote_load(infrared->remote, infrared->file_path);
+            if(state == InfraredRpcStateIdle) {
+                result = infrared_remote_load(
+                    infrared->remote, furi_string_get_cstr(infrared->file_path));
                 if(result) {
                     scene_manager_set_scene_state(
                         infrared->scene_manager, InfraredSceneRpc, InfraredRpcStateLoaded);
@@ -55,20 +56,35 @@ bool infrared_scene_rpc_on_event(void* context, SceneManagerEvent event) {
             popup_set_text(
                 infrared->popup, infrared->text_store[0], 89, 44, AlignCenter, AlignTop);
 
-            rpc_system_app_confirm(infrared->rpc_ctx, RpcAppEventLoadFile, result);
-        } else if(event.event == InfraredCustomEventTypeRpcButtonPress) {
+            rpc_system_app_confirm(infrared->rpc_ctx, result);
+        } else if(
+            event.event == InfraredCustomEventTypeRpcButtonPressName ||
+            event.event == InfraredCustomEventTypeRpcButtonPressIndex) {
             bool result = false;
-            const char* arg = rpc_system_app_get_data(infrared->rpc_ctx);
-            if(arg && (state == InfraredRpcStateLoaded)) {
-                size_t button_index = 0;
-                if(infrared_remote_find_button_by_name(infrared->remote, arg, &button_index)) {
-                    infrared_tx_start_button_index(infrared, button_index);
-                    result = true;
+            if(state == InfraredRpcStateLoaded) {
+                if(event.event == InfraredCustomEventTypeRpcButtonPressName) {
+                    const char* button_name = furi_string_get_cstr(infrared->button_name);
+                    size_t index;
+                    const bool index_found =
+                        infrared_remote_get_signal_index(infrared->remote, button_name, &index);
+                    infrared->app_state.current_button_index =
+                        index_found ? (signed)index : InfraredButtonIndexNone;
+                    FURI_LOG_D(TAG, "Sending signal with name \"%s\"", button_name);
+                } else {
+                    FURI_LOG_D(
+                        TAG,
+                        "Sending signal with index \"%ld\"",
+                        infrared->app_state.current_button_index);
+                }
+                if(infrared->app_state.current_button_index != InfraredButtonIndexNone) {
+                    infrared_tx_start_button_index(
+                        infrared, infrared->app_state.current_button_index);
                     scene_manager_set_scene_state(
                         infrared->scene_manager, InfraredSceneRpc, InfraredRpcStateSending);
+                    result = true;
                 }
             }
-            rpc_system_app_confirm(infrared->rpc_ctx, RpcAppEventButtonRelease, result);
+            rpc_system_app_confirm(infrared->rpc_ctx, result);
         } else if(event.event == InfraredCustomEventTypeRpcButtonRelease) {
             bool result = false;
             if(state == InfraredRpcStateSending) {
@@ -77,11 +93,11 @@ bool infrared_scene_rpc_on_event(void* context, SceneManagerEvent event) {
                 scene_manager_set_scene_state(
                     infrared->scene_manager, InfraredSceneRpc, InfraredRpcStateLoaded);
             }
-            rpc_system_app_confirm(infrared->rpc_ctx, RpcAppEventButtonRelease, result);
+            rpc_system_app_confirm(infrared->rpc_ctx, result);
         } else if(event.event == InfraredCustomEventTypeRpcExit) {
             scene_manager_stop(infrared->scene_manager);
             view_dispatcher_stop(infrared->view_dispatcher);
-            rpc_system_app_confirm(infrared->rpc_ctx, RpcAppEventAppExit, true);
+            rpc_system_app_confirm(infrared->rpc_ctx, true);
         } else if(event.event == InfraredCustomEventTypeRpcSessionClose) {
             scene_manager_stop(infrared->scene_manager);
             view_dispatcher_stop(infrared->view_dispatcher);
@@ -91,7 +107,7 @@ bool infrared_scene_rpc_on_event(void* context, SceneManagerEvent event) {
 }
 
 void infrared_scene_rpc_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     if(scene_manager_get_scene_state(infrared->scene_manager, InfraredSceneRpc) ==
        InfraredRpcStateSending) {
         infrared_tx_stop(infrared);
diff --git a/applications/main/infrared/scenes/infrared_scene_start.c b/applications/main/infrared/scenes/infrared_scene_start.c
index c7df0f45..0e23bb7b 100644
--- a/applications/main/infrared/scenes/infrared_scene_start.c
+++ b/applications/main/infrared/scenes/infrared_scene_start.c
@@ -1,4 +1,4 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 enum SubmenuIndex {
     SubmenuIndexUniversalRemotes,
@@ -8,12 +8,12 @@ enum SubmenuIndex {
 };
 
 static void infrared_scene_start_submenu_callback(void* context, uint32_t index) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_dispatcher_send_custom_event(infrared->view_dispatcher, index);
 }
 
 void infrared_scene_start_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Submenu* submenu = infrared->submenu;
     SceneManager* scene_manager = infrared->scene_manager;
 
@@ -50,7 +50,7 @@ void infrared_scene_start_on_enter(void* context) {
 }
 
 bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
 
     bool consumed = false;
@@ -79,6 +79,6 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
 }
 
 void infrared_scene_start_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     submenu_reset(infrared->submenu);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_universal.c b/applications/main/infrared/scenes/infrared_scene_universal.c
index e09abde7..197478e3 100644
--- a/applications/main/infrared/scenes/infrared_scene_universal.c
+++ b/applications/main/infrared/scenes/infrared_scene_universal.c
@@ -1,4 +1,4 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 typedef enum {
     SubmenuIndexUniversalTV,
@@ -8,12 +8,12 @@ typedef enum {
 } SubmenuIndex;
 
 static void infrared_scene_universal_submenu_callback(void* context, uint32_t index) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     view_dispatcher_send_custom_event(infrared->view_dispatcher, index);
 }
 
 void infrared_scene_universal_on_enter(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     Submenu* submenu = infrared->submenu;
 
     submenu_add_item(
@@ -47,7 +47,7 @@ void infrared_scene_universal_on_enter(void* context) {
 }
 
 bool infrared_scene_universal_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     SceneManager* scene_manager = infrared->scene_manager;
     bool consumed = false;
 
@@ -72,6 +72,6 @@ bool infrared_scene_universal_on_event(void* context, SceneManagerEvent event) {
 }
 
 void infrared_scene_universal_on_exit(void* context) {
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     submenu_reset(infrared->submenu);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_universal_ac.c b/applications/main/infrared/scenes/infrared_scene_universal_ac.c
index 5f762d12..764a9518 100644
--- a/applications/main/infrared/scenes/infrared_scene_universal_ac.c
+++ b/applications/main/infrared/scenes/infrared_scene_universal_ac.c
@@ -1,11 +1,11 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 #include "common/infrared_scene_universal_common.h"
 
 void infrared_scene_universal_ac_on_enter(void* context) {
     infrared_scene_universal_common_on_enter(context);
 
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     ButtonPanel* button_panel = infrared->button_panel;
     InfraredBruteForce* brute_force = infrared->brute_force;
 
diff --git a/applications/main/infrared/scenes/infrared_scene_universal_audio.c b/applications/main/infrared/scenes/infrared_scene_universal_audio.c
index 3938b608..241a22bc 100644
--- a/applications/main/infrared/scenes/infrared_scene_universal_audio.c
+++ b/applications/main/infrared/scenes/infrared_scene_universal_audio.c
@@ -1,11 +1,11 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 #include "common/infrared_scene_universal_common.h"
 
 void infrared_scene_universal_audio_on_enter(void* context) {
     infrared_scene_universal_common_on_enter(context);
 
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     ButtonPanel* button_panel = infrared->button_panel;
     InfraredBruteForce* brute_force = infrared->brute_force;
 
diff --git a/applications/main/infrared/scenes/infrared_scene_universal_projector.c b/applications/main/infrared/scenes/infrared_scene_universal_projector.c
index 27ca46ea..d8520deb 100644
--- a/applications/main/infrared/scenes/infrared_scene_universal_projector.c
+++ b/applications/main/infrared/scenes/infrared_scene_universal_projector.c
@@ -1,11 +1,11 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 #include "common/infrared_scene_universal_common.h"
 
 void infrared_scene_universal_projector_on_enter(void* context) {
     infrared_scene_universal_common_on_enter(context);
 
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     ButtonPanel* button_panel = infrared->button_panel;
     InfraredBruteForce* brute_force = infrared->brute_force;
 
diff --git a/applications/main/infrared/scenes/infrared_scene_universal_tv.c b/applications/main/infrared/scenes/infrared_scene_universal_tv.c
index f2958d88..6031205f 100644
--- a/applications/main/infrared/scenes/infrared_scene_universal_tv.c
+++ b/applications/main/infrared/scenes/infrared_scene_universal_tv.c
@@ -1,11 +1,11 @@
-#include "../infrared_i.h"
+#include "../infrared_app_i.h"
 
 #include "common/infrared_scene_universal_common.h"
 
 void infrared_scene_universal_tv_on_enter(void* context) {
     infrared_scene_universal_common_on_enter(context);
 
-    Infrared* infrared = context;
+    InfraredApp* infrared = context;
     ButtonPanel* button_panel = infrared->button_panel;
     InfraredBruteForce* brute_force = infrared->brute_force;
 
diff --git a/applications/main/infrared/views/infrared_move_view.c b/applications/main/infrared/views/infrared_move_view.c
index d838a5f8..374a65a4 100644
--- a/applications/main/infrared/views/infrared_move_view.c
+++ b/applications/main/infrared/views/infrared_move_view.c
@@ -1,10 +1,11 @@
 #include "infrared_move_view.h"
 
+#include <m-array.h>
+
 #include <gui/canvas.h>
 #include <gui/elements.h>
 
-#include <stdlib.h>
-#include <string.h>
+#include <toolbox/m_cstr_dup.h>
 
 #define LIST_ITEMS 4U
 #define LIST_LINE_H 13U
@@ -13,42 +14,41 @@
 
 struct InfraredMoveView {
     View* view;
-    InfraredMoveCallback move_cb;
-    void* cb_context;
+    InfraredMoveCallback callback;
+    void* callback_context;
 };
 
-typedef struct {
-    const char** btn_names;
-    uint32_t btn_number;
-    int32_t list_offset;
-    int32_t item_idx;
-    bool is_moving;
+ARRAY_DEF(InfraredMoveViewItemArray, const char*, M_CSTR_DUP_OPLIST); //-V575
 
-    InfraredMoveGetItemCallback get_item_cb;
+typedef struct {
+    InfraredMoveViewItemArray_t labels;
+    int32_t list_offset;
+    int32_t current_idx;
+    int32_t start_idx;
+    bool is_moving;
 } InfraredMoveViewModel;
 
 static void infrared_move_view_draw_callback(Canvas* canvas, void* _model) {
     InfraredMoveViewModel* model = _model;
 
-    UNUSED(model);
-
     canvas_set_color(canvas, ColorBlack);
     canvas_set_font(canvas, FontPrimary);
     elements_multiline_text_aligned(
         canvas, canvas_width(canvas) / 2, 0, AlignCenter, AlignTop, "Select a button to move");
 
-    bool show_scrollbar = model->btn_number > LIST_ITEMS;
+    const size_t btn_number = InfraredMoveViewItemArray_size(model->labels);
+    const bool show_scrollbar = btn_number > LIST_ITEMS;
 
     canvas_set_font(canvas, FontSecondary);
 
-    for(uint32_t i = 0; i < MIN(model->btn_number, LIST_ITEMS); i++) {
-        int32_t idx = CLAMP((uint32_t)(i + model->list_offset), model->btn_number, 0u);
-        uint8_t x_offset = (model->is_moving && model->item_idx == idx) ? MOVE_X_OFFSET : 0;
+    for(uint32_t i = 0; i < MIN(btn_number, LIST_ITEMS); i++) {
+        int32_t idx = CLAMP((uint32_t)(i + model->list_offset), btn_number, 0U);
+        uint8_t x_offset = (model->is_moving && model->current_idx == idx) ? MOVE_X_OFFSET : 0;
         uint8_t y_offset = HEADER_H + i * LIST_LINE_H;
         uint8_t box_end_x = canvas_width(canvas) - (show_scrollbar ? 6 : 1);
 
         canvas_set_color(canvas, ColorBlack);
-        if(model->item_idx == idx) {
+        if(model->current_idx == idx) {
             canvas_draw_box(canvas, x_offset, y_offset, box_end_x - x_offset, LIST_LINE_H);
 
             canvas_set_color(canvas, ColorWhite);
@@ -60,7 +60,12 @@ static void infrared_move_view_draw_callback(Canvas* canvas, void* _model) {
             canvas_draw_dot(canvas, box_end_x - 1, y_offset + LIST_LINE_H - 1);
         }
         canvas_draw_str_aligned(
-            canvas, x_offset + 3, y_offset + 3, AlignLeft, AlignTop, model->btn_names[idx]);
+            canvas,
+            x_offset + 3,
+            y_offset + 3,
+            AlignLeft,
+            AlignTop,
+            *InfraredMoveViewItemArray_cget(model->labels, idx));
     }
 
     if(show_scrollbar) {
@@ -69,22 +74,22 @@ static void infrared_move_view_draw_callback(Canvas* canvas, void* _model) {
             canvas_width(canvas),
             HEADER_H,
             canvas_height(canvas) - HEADER_H,
-            model->item_idx,
-            model->btn_number);
+            model->current_idx,
+            btn_number);
     }
 }
 
 static void update_list_offset(InfraredMoveViewModel* model) {
-    int32_t bounds = model->btn_number > (LIST_ITEMS - 1) ? 2 : model->btn_number;
+    const size_t btn_number = InfraredMoveViewItemArray_size(model->labels);
+    const int32_t bounds = btn_number > (LIST_ITEMS - 1) ? 2 : btn_number;
 
-    if((model->btn_number > (LIST_ITEMS - 1)) &&
-       (model->item_idx >= ((int32_t)model->btn_number - 1))) {
-        model->list_offset = model->item_idx - (LIST_ITEMS - 1);
-    } else if(model->list_offset < model->item_idx - bounds) {
-        model->list_offset = CLAMP(
-            model->item_idx - (int32_t)(LIST_ITEMS - 2), (int32_t)model->btn_number - bounds, 0);
-    } else if(model->list_offset > model->item_idx - bounds) {
-        model->list_offset = CLAMP(model->item_idx - 1, (int32_t)model->btn_number - bounds, 0);
+    if((btn_number > (LIST_ITEMS - 1)) && (model->current_idx >= ((int32_t)btn_number - 1))) {
+        model->list_offset = model->current_idx - (LIST_ITEMS - 1);
+    } else if(model->list_offset < model->current_idx - bounds) {
+        model->list_offset =
+            CLAMP(model->current_idx - (int32_t)(LIST_ITEMS - 2), (int32_t)btn_number - bounds, 0);
+    } else if(model->list_offset > model->current_idx - bounds) {
+        model->list_offset = CLAMP(model->current_idx - 1, (int32_t)btn_number - bounds, 0);
     }
 }
 
@@ -95,117 +100,130 @@ static bool infrared_move_view_input_callback(InputEvent* event, void* context)
 
     if(((event->type == InputTypeShort || event->type == InputTypeRepeat)) &&
        ((event->key == InputKeyUp) || (event->key == InputKeyDown))) {
-        bool is_moving = false;
-        uint32_t index_old = 0;
-        uint32_t index_new = 0;
         with_view_model(
             move_view->view,
             InfraredMoveViewModel * model,
             {
-                is_moving = model->is_moving;
-                index_old = model->item_idx;
+                const size_t btn_number = InfraredMoveViewItemArray_size(model->labels);
+                const int32_t item_idx_prev = model->current_idx;
+
                 if(event->key == InputKeyUp) {
-                    if(model->item_idx <= 0) {
-                        model->item_idx = model->btn_number;
+                    if(model->current_idx <= 0) {
+                        model->current_idx = btn_number;
                     }
-                    model->item_idx--;
+                    model->current_idx--;
+
                 } else if(event->key == InputKeyDown) {
-                    model->item_idx++;
-                    if(model->item_idx >= (int32_t)(model->btn_number)) {
-                        model->item_idx = 0;
+                    model->current_idx++;
+                    if(model->current_idx >= (int32_t)(btn_number)) {
+                        model->current_idx = 0;
                     }
                 }
-                index_new = model->item_idx;
+
+                if(model->is_moving) {
+                    InfraredMoveViewItemArray_swap_at(
+                        model->labels, item_idx_prev, model->current_idx);
+                }
+
                 update_list_offset(model);
             },
-            !is_moving);
-        if((is_moving) && (move_view->move_cb)) {
-            move_view->move_cb(index_old, index_new, move_view->cb_context);
-            infrared_move_view_list_update(move_view);
-        }
-        consumed = true;
-    }
+            true);
 
-    if((event->key == InputKeyOk) && (event->type == InputTypeShort)) {
+        consumed = true;
+
+    } else if((event->key == InputKeyOk) && (event->type == InputTypeShort)) {
         with_view_model(
             move_view->view,
             InfraredMoveViewModel * model,
-            { model->is_moving = !(model->is_moving); },
+            {
+                if(!model->is_moving) {
+                    model->start_idx = model->current_idx;
+                } else if(move_view->callback) {
+                    move_view->callback(
+                        model->start_idx, model->current_idx, move_view->callback_context);
+                }
+                model->is_moving = !(model->is_moving);
+            },
             true);
+
         consumed = true;
+
+    } else if(event->key == InputKeyBack) {
+        with_view_model(
+            move_view->view,
+            InfraredMoveViewModel * model,
+            {
+                if(model->is_moving && move_view->callback) {
+                    move_view->callback(
+                        model->start_idx, model->current_idx, move_view->callback_context);
+                }
+                model->is_moving = false;
+            },
+            false);
+
+        // Not consuming, Back event is passed thru
     }
+
     return consumed;
 }
 
-static void infrared_move_view_on_exit(void* context) {
-    furi_assert(context);
-    InfraredMoveView* move_view = context;
-
-    with_view_model(
-        move_view->view,
-        InfraredMoveViewModel * model,
-        {
-            if(model->btn_names) {
-                free(model->btn_names);
-                model->btn_names = NULL;
-            }
-            model->btn_number = 0;
-            model->get_item_cb = NULL;
-        },
-        false);
-    move_view->cb_context = NULL;
-}
-
-void infrared_move_view_set_callback(InfraredMoveView* move_view, InfraredMoveCallback callback) {
-    furi_assert(move_view);
-    move_view->move_cb = callback;
-}
-
-void infrared_move_view_list_init(
+void infrared_move_view_set_callback(
     InfraredMoveView* move_view,
-    uint32_t item_count,
-    InfraredMoveGetItemCallback load_cb,
+    InfraredMoveCallback callback,
     void* context) {
     furi_assert(move_view);
-    move_view->cb_context = context;
-    with_view_model(
-        move_view->view,
-        InfraredMoveViewModel * model,
-        {
-            furi_assert(model->btn_names == NULL);
-            model->btn_names = malloc(sizeof(char*) * item_count);
-            model->btn_number = item_count;
-            model->get_item_cb = load_cb;
-        },
-        false);
+    move_view->callback = callback;
+    move_view->callback_context = context;
 }
 
-void infrared_move_view_list_update(InfraredMoveView* move_view) {
-    furi_assert(move_view);
+void infrared_move_view_add_item(InfraredMoveView* move_view, const char* label) {
+    with_view_model(
+        move_view->view,
+        InfraredMoveViewModel * model,
+        { InfraredMoveViewItemArray_push_back(model->labels, label); },
+        true);
+}
+
+void infrared_move_view_reset(InfraredMoveView* move_view) {
     with_view_model(
         move_view->view,
         InfraredMoveViewModel * model,
         {
-            for(uint32_t i = 0; i < model->btn_number; i++) {
-                if(!model->get_item_cb) break;
-                model->btn_names[i] = model->get_item_cb(i, move_view->cb_context);
-            }
+            InfraredMoveViewItemArray_reset(model->labels);
+            model->list_offset = 0;
+            model->start_idx = 0;
+            model->current_idx = 0;
+            model->is_moving = false;
         },
-        true);
+        false);
+    move_view->callback_context = NULL;
 }
 
 InfraredMoveView* infrared_move_view_alloc(void) {
     InfraredMoveView* move_view = malloc(sizeof(InfraredMoveView));
+
     move_view->view = view_alloc();
     view_allocate_model(move_view->view, ViewModelTypeLocking, sizeof(InfraredMoveViewModel));
     view_set_draw_callback(move_view->view, infrared_move_view_draw_callback);
     view_set_input_callback(move_view->view, infrared_move_view_input_callback);
-    view_set_exit_callback(move_view->view, infrared_move_view_on_exit);
     view_set_context(move_view->view, move_view);
+
+    with_view_model(
+        move_view->view,
+        InfraredMoveViewModel * model,
+        { InfraredMoveViewItemArray_init(model->labels); },
+        true);
+
     return move_view;
 }
 
 void infrared_move_view_free(InfraredMoveView* move_view) {
+    with_view_model(
+        move_view->view,
+        InfraredMoveViewModel * model,
+        { InfraredMoveViewItemArray_clear(model->labels); },
+        true);
+
     view_free(move_view->view);
     free(move_view);
 }
diff --git a/applications/main/infrared/views/infrared_move_view.h b/applications/main/infrared/views/infrared_move_view.h
index b9b0cd86..0ab15ce0 100644
--- a/applications/main/infrared/views/infrared_move_view.h
+++ b/applications/main/infrared/views/infrared_move_view.h
@@ -6,20 +6,17 @@ typedef struct InfraredMoveView InfraredMoveView;
 
 typedef void (*InfraredMoveCallback)(uint32_t index_old, uint32_t index_new, void* context);
 
-typedef const char* (*InfraredMoveGetItemCallback)(uint32_t index, void* context);
-
 InfraredMoveView* infrared_move_view_alloc(void);
 
 void infrared_move_view_free(InfraredMoveView* debug_view);
 
 View* infrared_move_view_get_view(InfraredMoveView* debug_view);
 
-void infrared_move_view_set_callback(InfraredMoveView* move_view, InfraredMoveCallback callback);
-
-void infrared_move_view_list_init(
+void infrared_move_view_set_callback(
     InfraredMoveView* move_view,
-    uint32_t item_count,
-    InfraredMoveGetItemCallback load_cb,
+    InfraredMoveCallback callback,
     void* context);
 
-void infrared_move_view_list_update(InfraredMoveView* move_view);
\ No newline at end of file
+void infrared_move_view_add_item(InfraredMoveView* move_view, const char* label);
+
+void infrared_move_view_reset(InfraredMoveView* move_view);
diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam
index cad07fbf..c067d786 100644
--- a/applications/main/lfrfid/application.fam
+++ b/applications/main/lfrfid/application.fam
@@ -17,5 +17,6 @@ App(
     targets=["f7"],
     apptype=FlipperAppType.STARTUP,
     entry_point="lfrfid_on_system_start",
+    sources=["lfrfid_cli.c"],
     order=50,
 )
diff --git a/applications/main/lfrfid/lfrfid.c b/applications/main/lfrfid/lfrfid.c
index 2bef08df..cd061386 100644
--- a/applications/main/lfrfid/lfrfid.c
+++ b/applications/main/lfrfid/lfrfid.c
@@ -13,21 +13,23 @@ static bool lfrfid_debug_back_event_callback(void* context) {
     return scene_manager_handle_back_event(app->scene_manager);
 }
 
-static void rpc_command_callback(RpcAppSystemEvent rpc_event, void* context) {
+static void rpc_command_callback(const RpcAppSystemEvent* event, void* context) {
     furi_assert(context);
     LfRfid* app = (LfRfid*)context;
 
-    if(rpc_event == RpcAppEventSessionClose) {
+    if(event->type == RpcAppEventTypeSessionClose) {
         view_dispatcher_send_custom_event(app->view_dispatcher, LfRfidEventRpcSessionClose);
         // Detach RPC
         rpc_system_app_set_callback(app->rpc_ctx, NULL, NULL);
         app->rpc_ctx = NULL;
-    } else if(rpc_event == RpcAppEventAppExit) {
+    } else if(event->type == RpcAppEventTypeAppExit) {
         view_dispatcher_send_custom_event(app->view_dispatcher, LfRfidEventExit);
-    } else if(rpc_event == RpcAppEventLoadFile) {
+    } else if(event->type == RpcAppEventTypeLoadFile) {
+        furi_assert(event->data.type == RpcAppSystemEventDataTypeString);
+        furi_string_set(app->file_path, event->data.string);
         view_dispatcher_send_custom_event(app->view_dispatcher, LfRfidEventRpcLoadFile);
     } else {
-        rpc_system_app_confirm(app->rpc_ctx, rpc_event, false);
+        rpc_system_app_confirm(app->rpc_ctx, false);
     }
 }
 
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c b/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c
index 156dd97a..906218d7 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c
@@ -24,17 +24,15 @@ bool lfrfid_scene_rpc_on_event(void* context, SceneManagerEvent event) {
     if(event.type == SceneManagerEventTypeCustom) {
         consumed = true;
         if(event.event == LfRfidEventExit) {
-            rpc_system_app_confirm(app->rpc_ctx, RpcAppEventAppExit, true);
+            rpc_system_app_confirm(app->rpc_ctx, true);
             scene_manager_stop(app->scene_manager);
             view_dispatcher_stop(app->view_dispatcher);
         } else if(event.event == LfRfidEventRpcSessionClose) {
             scene_manager_stop(app->scene_manager);
             view_dispatcher_stop(app->view_dispatcher);
         } else if(event.event == LfRfidEventRpcLoadFile) {
-            const char* arg = rpc_system_app_get_data(app->rpc_ctx);
             bool result = false;
-            if(arg && (app->rpc_state == LfRfidRpcStateIdle)) {
-                furi_string_set(app->file_path, arg);
+            if(app->rpc_state == LfRfidRpcStateIdle) {
                 if(lfrfid_load_key_data(app, app->file_path, false)) {
                     lfrfid_worker_start_thread(app->lfworker);
                     lfrfid_worker_emulate_start(app->lfworker, (LFRFIDProtocol)app->protocol_id);
@@ -48,7 +46,7 @@ bool lfrfid_scene_rpc_on_event(void* context, SceneManagerEvent event) {
                     result = true;
                 }
             }
-            rpc_system_app_confirm(app->rpc_ctx, RpcAppEventLoadFile, result);
+            rpc_system_app_confirm(app->rpc_ctx, result);
         }
     }
     return consumed;
diff --git a/applications/main/nfc/application.fam b/applications/main/nfc/application.fam
index 20ebd4ca..33a2011a 100644
--- a/applications/main/nfc/application.fam
+++ b/applications/main/nfc/application.fam
@@ -7,6 +7,12 @@ App(
     icon="A_NFC_14",
     stack_size=5 * 1024,
     order=30,
+    resources="resources",
+    sources=[
+        "*.c",
+        "!plugins",
+        "!nfc_cli.c",
+    ],
     fap_libs=["assets"],
     fap_icon="icon.png",
     fap_category="NFC",
@@ -20,6 +26,7 @@ App(
     entry_point="all_in_one_plugin_ep",
     targets=["f7"],
     requires=["nfc"],
+    sources=["plugins/supported_cards/all_in_one.c"],
 )
 
 App(
@@ -28,6 +35,7 @@ App(
     entry_point="opal_plugin_ep",
     targets=["f7"],
     requires=["nfc"],
+    sources=["plugins/supported_cards/opal.c"],
 )
 
 App(
@@ -36,6 +44,7 @@ App(
     entry_point="myki_plugin_ep",
     targets=["f7"],
     requires=["nfc"],
+    sources=["plugins/supported_cards/myki.c"],
 )
 
 App(
@@ -44,6 +53,7 @@ App(
     entry_point="troika_plugin_ep",
     targets=["f7"],
     requires=["nfc"],
+    sources=["plugins/supported_cards/troika.c"],
 )
 
 App(
@@ -52,6 +62,7 @@ App(
     entry_point="plantain_plugin_ep",
     targets=["f7"],
     requires=["nfc"],
+    sources=["plugins/supported_cards/plantain.c"],
 )
 
 App(
@@ -60,6 +71,7 @@ App(
     entry_point="two_cities_plugin_ep",
     targets=["f7"],
     requires=["nfc"],
+    sources=["plugins/supported_cards/two_cities.c"],
 )
 
 App(
@@ -67,5 +79,6 @@ App(
     targets=["f7"],
     apptype=FlipperAppType.STARTUP,
     entry_point="nfc_on_system_start",
+    sources=["nfc_cli.c"],
     order=30,
 )
diff --git a/applications/main/nfc/helpers/nfc_custom_event.h b/applications/main/nfc/helpers/nfc_custom_event.h
index 2a3b13e1..16fbc474 100644
--- a/applications/main/nfc/helpers/nfc_custom_event.h
+++ b/applications/main/nfc/helpers/nfc_custom_event.h
@@ -21,7 +21,7 @@ typedef enum {
     NfcCustomEventTextInputDone,
     NfcCustomEventDictAttackDone,
 
-    NfcCustomEventRpcLoad,
+    NfcCustomEventRpcLoadFile,
     NfcCustomEventRpcExit,
     NfcCustomEventRpcSessionClose,
 
diff --git a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
index bf6c0842..87fbe9f0 100644
--- a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
+++ b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
@@ -694,15 +694,17 @@ static bool nfc_protocol_support_scene_rpc_on_event(NfcApp* instance, SceneManag
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == NfcCustomEventRpcLoad && instance->rpc_state == NfcRpcStateIdle) {
-            furi_string_set(instance->file_path, rpc_system_app_get_data(instance->rpc_ctx));
-            const bool load_success = nfc_load_file(instance, instance->file_path, false);
-            if(load_success) {
-                nfc_protocol_support_scene_rpc_setup_ui_and_emulate(instance);
+        if(event.event == NfcCustomEventRpcLoadFile) {
+            bool success = false;
+            if(instance->rpc_state == NfcRpcStateIdle) {
+                if(nfc_load_file(instance, instance->file_path, false)) {
+                    nfc_protocol_support_scene_rpc_setup_ui_and_emulate(instance);
+                    success = true;
+                }
             }
-            rpc_system_app_confirm(instance->rpc_ctx, RpcAppEventLoadFile, load_success);
+            rpc_system_app_confirm(instance->rpc_ctx, success);
         } else if(event.event == NfcCustomEventRpcExit) {
-            rpc_system_app_confirm(instance->rpc_ctx, RpcAppEventAppExit, true);
+            rpc_system_app_confirm(instance->rpc_ctx, true);
             scene_manager_stop(instance->scene_manager);
             view_dispatcher_stop(instance->view_dispatcher);
         } else if(event.event == NfcCustomEventRpcSessionClose) {
diff --git a/applications/main/nfc/nfc_app.c b/applications/main/nfc/nfc_app.c
index fe680aa3..141a67e5 100644
--- a/applications/main/nfc/nfc_app.c
+++ b/applications/main/nfc/nfc_app.c
@@ -14,22 +14,24 @@ bool nfc_back_event_callback(void* context) {
     return scene_manager_handle_back_event(nfc->scene_manager);
 }
 
-static void nfc_app_rpc_command_callback(RpcAppSystemEvent rpc_event, void* context) {
+static void nfc_app_rpc_command_callback(const RpcAppSystemEvent* event, void* context) {
     furi_assert(context);
     NfcApp* nfc = (NfcApp*)context;
 
     furi_assert(nfc->rpc_ctx);
 
-    if(rpc_event == RpcAppEventSessionClose) {
+    if(event->type == RpcAppEventTypeSessionClose) {
         view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventRpcSessionClose);
         rpc_system_app_set_callback(nfc->rpc_ctx, NULL, NULL);
         nfc->rpc_ctx = NULL;
-    } else if(rpc_event == RpcAppEventAppExit) {
+    } else if(event->type == RpcAppEventTypeAppExit) {
         view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventRpcExit);
-    } else if(rpc_event == RpcAppEventLoadFile) {
-        view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventRpcLoad);
+    } else if(event->type == RpcAppEventTypeLoadFile) {
+        furi_assert(event->data.type == RpcAppSystemEventDataTypeString);
+        furi_string_set(nfc->file_path, event->data.string);
+        view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventRpcLoadFile);
     } else {
-        rpc_system_app_confirm(nfc->rpc_ctx, rpc_event, false);
+        rpc_system_app_confirm(nfc->rpc_ctx, false);
     }
 }
 
@@ -411,15 +413,14 @@ bool nfc_load_from_file_select(NfcApp* instance) {
 
 void nfc_show_loading_popup(void* context, bool show) {
     NfcApp* nfc = 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);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 
diff --git a/applications/main/nfc/plugins/supported_cards/plantain.c b/applications/main/nfc/plugins/supported_cards/plantain.c
index cb8c0093..a21e1cd4 100644
--- a/applications/main/nfc/plugins/supported_cards/plantain.c
+++ b/applications/main/nfc/plugins/supported_cards/plantain.c
@@ -4,7 +4,7 @@
 
 #include <nfc/nfc_device.h>
 #include <nfc/helpers/nfc_util.h>
-#include <nfc/protocols/mf_classic/mf_classic_poller_sync_api.h>
+#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
 
 #define TAG "Plantain"
 
@@ -91,7 +91,7 @@ static bool plantain_verify_type(Nfc* nfc, MfClassicType type) {
 
         MfClassicAuthContext auth_context;
         MfClassicError error =
-            mf_classic_poller_auth(nfc, block_num, &key, MfClassicKeyTypeA, &auth_context);
+            mf_classic_poller_sync_auth(nfc, block_num, &key, MfClassicKeyTypeA, &auth_context);
         if(error != MfClassicErrorNone) {
             FURI_LOG_D(TAG, "Failed to read block %u: %d", block_num, error);
             break;
@@ -119,7 +119,7 @@ static bool plantain_read(Nfc* nfc, NfcDevice* device) {
 
     do {
         MfClassicType type = MfClassicTypeMini;
-        MfClassicError error = mf_classic_poller_detect_type(nfc, &type);
+        MfClassicError error = mf_classic_poller_sync_detect_type(nfc, &type);
         if(error != MfClassicErrorNone) break;
 
         data->type = type;
@@ -134,7 +134,7 @@ static bool plantain_read(Nfc* nfc, NfcDevice* device) {
             FURI_BIT_SET(keys.key_b_mask, i);
         }
 
-        error = mf_classic_poller_read(nfc, &keys, data);
+        error = mf_classic_poller_sync_read(nfc, &keys, data);
         if(error != MfClassicErrorNone) {
             FURI_LOG_W(TAG, "Failed to read data");
             break;
diff --git a/applications/main/nfc/plugins/supported_cards/troika.c b/applications/main/nfc/plugins/supported_cards/troika.c
index d42b977c..7cf1e4dd 100644
--- a/applications/main/nfc/plugins/supported_cards/troika.c
+++ b/applications/main/nfc/plugins/supported_cards/troika.c
@@ -4,7 +4,7 @@
 
 #include <nfc/nfc_device.h>
 #include <nfc/helpers/nfc_util.h>
-#include <nfc/protocols/mf_classic/mf_classic_poller_sync_api.h>
+#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
 
 #define TAG "Troika"
 
@@ -91,7 +91,7 @@ static bool troika_verify_type(Nfc* nfc, MfClassicType type) {
 
         MfClassicAuthContext auth_context;
         MfClassicError error =
-            mf_classic_poller_auth(nfc, block_num, &key, MfClassicKeyTypeA, &auth_context);
+            mf_classic_poller_sync_auth(nfc, block_num, &key, MfClassicKeyTypeA, &auth_context);
         if(error != MfClassicErrorNone) {
             FURI_LOG_D(TAG, "Failed to read block %u: %d", block_num, error);
             break;
@@ -118,7 +118,7 @@ static bool troika_read(Nfc* nfc, NfcDevice* device) {
 
     do {
         MfClassicType type = MfClassicTypeMini;
-        MfClassicError error = mf_classic_poller_detect_type(nfc, &type);
+        MfClassicError error = mf_classic_poller_sync_detect_type(nfc, &type);
         if(error != MfClassicErrorNone) break;
 
         data->type = type;
@@ -136,7 +136,7 @@ static bool troika_read(Nfc* nfc, NfcDevice* device) {
             FURI_BIT_SET(keys.key_b_mask, i);
         }
 
-        error = mf_classic_poller_read(nfc, &keys, data);
+        error = mf_classic_poller_sync_read(nfc, &keys, data);
         if(error != MfClassicErrorNone) {
             FURI_LOG_W(TAG, "Failed to read data");
             break;
diff --git a/applications/main/nfc/plugins/supported_cards/two_cities.c b/applications/main/nfc/plugins/supported_cards/two_cities.c
index fb964103..1748d372 100644
--- a/applications/main/nfc/plugins/supported_cards/two_cities.c
+++ b/applications/main/nfc/plugins/supported_cards/two_cities.c
@@ -4,7 +4,7 @@
 
 #include <nfc/nfc_device.h>
 #include <nfc/helpers/nfc_util.h>
-#include <nfc/protocols/mf_classic/mf_classic_poller_sync_api.h>
+#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
 
 #define TAG "TwoCities"
 
@@ -49,7 +49,7 @@ bool two_cities_verify(Nfc* nfc) {
 
         MfClassicAuthContext auth_ctx = {};
         MfClassicError error =
-            mf_classic_poller_auth(nfc, block_num, &key, MfClassicKeyTypeA, &auth_ctx);
+            mf_classic_poller_sync_auth(nfc, block_num, &key, MfClassicKeyTypeA, &auth_ctx);
         if(error != MfClassicErrorNone) {
             FURI_LOG_D(TAG, "Failed to read block %u: %d", block_num, error);
             break;
@@ -72,7 +72,7 @@ static bool two_cities_read(Nfc* nfc, NfcDevice* device) {
 
     do {
         MfClassicType type = MfClassicTypeMini;
-        MfClassicError error = mf_classic_poller_detect_type(nfc, &type);
+        MfClassicError error = mf_classic_poller_sync_detect_type(nfc, &type);
         if(error != MfClassicErrorNone) break;
 
         data->type = type;
@@ -84,7 +84,7 @@ static bool two_cities_read(Nfc* nfc, NfcDevice* device) {
             FURI_BIT_SET(keys.key_b_mask, i);
         }
 
-        error = mf_classic_poller_read(nfc, &keys, data);
+        error = mf_classic_poller_sync_read(nfc, &keys, data);
         if(error != MfClassicErrorNone) {
             FURI_LOG_W(TAG, "Failed to read data");
             break;
diff --git a/assets/resources/nfc/assets/aid.nfc b/applications/main/nfc/resources/nfc/assets/aid.nfc
similarity index 100%
rename from assets/resources/nfc/assets/aid.nfc
rename to applications/main/nfc/resources/nfc/assets/aid.nfc
diff --git a/assets/resources/nfc/assets/country_code.nfc b/applications/main/nfc/resources/nfc/assets/country_code.nfc
similarity index 100%
rename from assets/resources/nfc/assets/country_code.nfc
rename to applications/main/nfc/resources/nfc/assets/country_code.nfc
diff --git a/assets/resources/nfc/assets/currency_code.nfc b/applications/main/nfc/resources/nfc/assets/currency_code.nfc
similarity index 100%
rename from assets/resources/nfc/assets/currency_code.nfc
rename to applications/main/nfc/resources/nfc/assets/currency_code.nfc
diff --git a/assets/resources/nfc/assets/mf_classic_dict.nfc b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
similarity index 100%
rename from assets/resources/nfc/assets/mf_classic_dict.nfc
rename to applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
diff --git a/applications/main/subghz/application.fam b/applications/main/subghz/application.fam
index 4f21cb6c..5f9f24dc 100644
--- a/applications/main/subghz/application.fam
+++ b/applications/main/subghz/application.fam
@@ -7,6 +7,12 @@ App(
     icon="A_Sub1ghz_14",
     stack_size=3 * 1024,
     order=10,
+    sources=[
+        "*.c",
+        "!subghz_cli.c",
+        "!helpers/subghz_chat.c",
+    ],
+    resources="resources",
     fap_libs=["assets", "hwdrivers"],
     fap_icon="icon.png",
     fap_category="Sub-GHz",
@@ -17,5 +23,6 @@ App(
     targets=["f7"],
     apptype=FlipperAppType.STARTUP,
     entry_point="subghz_on_system_start",
+    sources=["subghz_cli.c", "helpers/subghz_chat.c"],
     order=40,
 )
diff --git a/assets/resources/subghz/assets/alutech_at_4n b/applications/main/subghz/resources/subghz/assets/alutech_at_4n
similarity index 100%
rename from assets/resources/subghz/assets/alutech_at_4n
rename to applications/main/subghz/resources/subghz/assets/alutech_at_4n
diff --git a/assets/resources/subghz/assets/came_atomo b/applications/main/subghz/resources/subghz/assets/came_atomo
similarity index 100%
rename from assets/resources/subghz/assets/came_atomo
rename to applications/main/subghz/resources/subghz/assets/came_atomo
diff --git a/assets/resources/subghz/assets/keeloq_mfcodes b/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes
similarity index 100%
rename from assets/resources/subghz/assets/keeloq_mfcodes
rename to applications/main/subghz/resources/subghz/assets/keeloq_mfcodes
diff --git a/assets/resources/subghz/assets/keeloq_mfcodes_user.example b/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes_user.example
similarity index 100%
rename from assets/resources/subghz/assets/keeloq_mfcodes_user.example
rename to applications/main/subghz/resources/subghz/assets/keeloq_mfcodes_user.example
diff --git a/assets/resources/subghz/assets/nice_flor_s b/applications/main/subghz/resources/subghz/assets/nice_flor_s
similarity index 100%
rename from assets/resources/subghz/assets/nice_flor_s
rename to applications/main/subghz/resources/subghz/assets/nice_flor_s
diff --git a/assets/resources/subghz/assets/setting_user.example b/applications/main/subghz/resources/subghz/assets/setting_user.example
similarity index 100%
rename from assets/resources/subghz/assets/setting_user.example
rename to applications/main/subghz/resources/subghz/assets/setting_user.example
diff --git a/applications/main/subghz/scenes/subghz_scene_rpc.c b/applications/main/subghz/scenes/subghz_scene_rpc.c
index d4bf3e80..f8bf066d 100644
--- a/applications/main/subghz/scenes/subghz_scene_rpc.c
+++ b/applications/main/subghz/scenes/subghz_scene_rpc.c
@@ -33,13 +33,13 @@ bool subghz_scene_rpc_on_event(void* context, SceneManagerEvent event) {
         if(event.event == SubGhzCustomEventSceneExit) {
             scene_manager_stop(subghz->scene_manager);
             view_dispatcher_stop(subghz->view_dispatcher);
-            rpc_system_app_confirm(subghz->rpc_ctx, RpcAppEventAppExit, true);
+            rpc_system_app_confirm(subghz->rpc_ctx, true);
         } else if(event.event == SubGhzCustomEventSceneRpcSessionClose) {
             scene_manager_stop(subghz->scene_manager);
             view_dispatcher_stop(subghz->view_dispatcher);
         } else if(event.event == SubGhzCustomEventSceneRpcButtonPress) {
             bool result = false;
-            if((state == SubGhzRpcStateLoaded)) {
+            if(state == SubGhzRpcStateLoaded) {
                 switch(
                     subghz_txrx_tx_start(subghz->txrx, subghz_txrx_get_fff_data(subghz->txrx))) {
                 case SubGhzTxRxStartTxStateErrorOnlyRx:
@@ -61,7 +61,7 @@ bool subghz_scene_rpc_on_event(void* context, SceneManagerEvent event) {
                     break;
                 }
             }
-            rpc_system_app_confirm(subghz->rpc_ctx, RpcAppEventButtonPress, result);
+            rpc_system_app_confirm(subghz->rpc_ctx, result);
         } else if(event.event == SubGhzCustomEventSceneRpcButtonRelease) {
             bool result = false;
             if(state == SubGhzRpcStateTx) {
@@ -70,15 +70,13 @@ bool subghz_scene_rpc_on_event(void* context, SceneManagerEvent event) {
                 result = true;
             }
             state = SubGhzRpcStateIdle;
-            rpc_system_app_confirm(subghz->rpc_ctx, RpcAppEventButtonRelease, result);
+            rpc_system_app_confirm(subghz->rpc_ctx, result);
         } else if(event.event == SubGhzCustomEventSceneRpcLoad) {
             bool result = false;
-            const char* arg = rpc_system_app_get_data(subghz->rpc_ctx);
-            if(arg && (state == SubGhzRpcStateIdle)) {
-                if(subghz_key_load(subghz, arg, false)) {
+            if(state == SubGhzRpcStateIdle) {
+                if(subghz_key_load(subghz, furi_string_get_cstr(subghz->file_path), false)) {
                     scene_manager_set_scene_state(
                         subghz->scene_manager, SubGhzSceneRpc, SubGhzRpcStateLoaded);
-                    furi_string_set(subghz->file_path, arg);
                     result = true;
                     FuriString* file_name;
                     file_name = furi_string_alloc();
@@ -97,7 +95,7 @@ bool subghz_scene_rpc_on_event(void* context, SceneManagerEvent event) {
                     rpc_system_app_set_error_text(subghz->rpc_ctx, "Cannot parse file");
                 }
             }
-            rpc_system_app_confirm(subghz->rpc_ctx, RpcAppEventLoadFile, result);
+            rpc_system_app_confirm(subghz->rpc_ctx, result);
         }
     }
     return consumed;
diff --git a/applications/main/subghz/subghz.c b/applications/main/subghz/subghz.c
index e8148798..69a72e95 100644
--- a/applications/main/subghz/subghz.c
+++ b/applications/main/subghz/subghz.c
@@ -20,29 +20,31 @@ void subghz_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(subghz->scene_manager);
 }
 
-static void subghz_rpc_command_callback(RpcAppSystemEvent event, void* context) {
+static void subghz_rpc_command_callback(const RpcAppSystemEvent* event, void* context) {
     furi_assert(context);
     SubGhz* subghz = context;
 
     furi_assert(subghz->rpc_ctx);
 
-    if(event == RpcAppEventSessionClose) {
+    if(event->type == RpcAppEventTypeSessionClose) {
         view_dispatcher_send_custom_event(
             subghz->view_dispatcher, SubGhzCustomEventSceneRpcSessionClose);
         rpc_system_app_set_callback(subghz->rpc_ctx, NULL, NULL);
         subghz->rpc_ctx = NULL;
-    } else if(event == RpcAppEventAppExit) {
+    } else if(event->type == RpcAppEventTypeAppExit) {
         view_dispatcher_send_custom_event(subghz->view_dispatcher, SubGhzCustomEventSceneExit);
-    } else if(event == RpcAppEventLoadFile) {
+    } else if(event->type == RpcAppEventTypeLoadFile) {
+        furi_assert(event->data.type == RpcAppSystemEventDataTypeString);
+        furi_string_set(subghz->file_path, event->data.string);
         view_dispatcher_send_custom_event(subghz->view_dispatcher, SubGhzCustomEventSceneRpcLoad);
-    } else if(event == RpcAppEventButtonPress) {
+    } else if(event->type == RpcAppEventTypeButtonPress) {
         view_dispatcher_send_custom_event(
             subghz->view_dispatcher, SubGhzCustomEventSceneRpcButtonPress);
-    } else if(event == RpcAppEventButtonRelease) {
+    } else if(event->type == RpcAppEventTypeButtonRelease) {
         view_dispatcher_send_custom_event(
             subghz->view_dispatcher, SubGhzCustomEventSceneRpcButtonRelease);
     } else {
-        rpc_system_app_confirm(subghz->rpc_ctx, event, false);
+        rpc_system_app_confirm(subghz->rpc_ctx, false);
     }
 }
 
diff --git a/applications/main/subghz/subghz_cli.c b/applications/main/subghz/subghz_cli.c
index 0a7b5212..e1b5e868 100644
--- a/applications/main/subghz/subghz_cli.c
+++ b/applications/main/subghz/subghz_cli.c
@@ -946,7 +946,7 @@ static void subghz_cli_command(Cli* cli, FuriString* args, void* context) {
 static bool
     subghz_on_system_start_istream_read(pb_istream_t* istream, pb_byte_t* buf, size_t count) {
     File* file = istream->state;
-    uint16_t ret = storage_file_read(file, buf, count);
+    size_t ret = storage_file_read(file, buf, count);
     return (count == ret);
 }
 
diff --git a/applications/main/subghz/views/receiver.c b/applications/main/subghz/views/receiver.c
index e1014b81..23fa26c7 100644
--- a/applications/main/subghz/views/receiver.c
+++ b/applications/main/subghz/views/receiver.c
@@ -91,7 +91,7 @@ void subghz_view_receiver_set_lock(SubGhzViewReceiver* subghz_receiver, bool loc
             SubGhzViewReceiverModel * model,
             { model->bar_show = SubGhzViewReceiverBarShowLock; },
             true);
-        furi_timer_start(subghz_receiver->timer, pdMS_TO_TICKS(1000));
+        furi_timer_start(subghz_receiver->timer, 1000);
     } else {
         with_view_model(
             subghz_receiver->view,
@@ -316,7 +316,7 @@ bool subghz_view_receiver_input(InputEvent* event, void* context) {
             { model->bar_show = SubGhzViewReceiverBarShowToUnlockPress; },
             true);
         if(subghz_receiver->lock_count == 0) {
-            furi_timer_start(subghz_receiver->timer, pdMS_TO_TICKS(1000));
+            furi_timer_start(subghz_receiver->timer, 1000);
         }
         if(event->key == InputKeyBack && event->type == InputTypeShort) {
             subghz_receiver->lock_count++;
@@ -330,7 +330,7 @@ bool subghz_view_receiver_input(InputEvent* event, void* context) {
                 { model->bar_show = SubGhzViewReceiverBarShowUnlock; },
                 true);
             //subghz_receiver->lock = false;
-            furi_timer_start(subghz_receiver->timer, pdMS_TO_TICKS(650));
+            furi_timer_start(subghz_receiver->timer, 650);
         }
 
         return true;
diff --git a/applications/main/u2f/application.fam b/applications/main/u2f/application.fam
index 8167e627..bf41eb0f 100644
--- a/applications/main/u2f/application.fam
+++ b/applications/main/u2f/application.fam
@@ -6,6 +6,7 @@ App(
     stack_size=2 * 1024,
     icon="A_U2F_14",
     order=80,
+    resources="resources",
     fap_libs=["assets"],
     fap_category="USB",
     fap_icon="icon.png",
diff --git a/assets/resources/u2f/assets/cert.der b/applications/main/u2f/resources/u2f/assets/cert.der
similarity index 100%
rename from assets/resources/u2f/assets/cert.der
rename to applications/main/u2f/resources/u2f/assets/cert.der
diff --git a/assets/resources/u2f/assets/cert_key.u2f b/applications/main/u2f/resources/u2f/assets/cert_key.u2f
similarity index 100%
rename from assets/resources/u2f/assets/cert_key.u2f
rename to applications/main/u2f/resources/u2f/assets/cert_key.u2f
diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c
index f4c8f17a..44c0c228 100644
--- a/applications/services/desktop/animations/animation_manager.c
+++ b/applications/services/desktop/animations/animation_manager.c
@@ -2,7 +2,6 @@
 #include <stdint.h>
 #include <furi.h>
 #include <furi_hal.h>
-#include <portmacro.h>
 #include <dolphin/dolphin.h>
 #include <power/power_service/power.h>
 #include <storage/storage.h>
@@ -450,13 +449,13 @@ void animation_manager_unload_and_stall_animation(AnimationManager* animation_ma
         animation_manager->state = AnimationManagerStateFreezedIdle;
 
         animation_manager->freezed_animation_time_left =
-            xTimerGetExpiryTime(animation_manager->idle_animation_timer) - xTaskGetTickCount();
+            furi_timer_get_expire_time(animation_manager->idle_animation_timer) - furi_get_tick();
         if(animation_manager->freezed_animation_time_left < 0) {
             animation_manager->freezed_animation_time_left = 0;
         }
         furi_timer_stop(animation_manager->idle_animation_timer);
     } else {
-        furi_assert(0);
+        furi_crash();
     }
 
     FURI_LOG_I(
@@ -528,7 +527,7 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m
         }
     } else {
         /* Unknown state is an error. But not in release version.*/
-        furi_assert(0);
+        furi_crash();
     }
 
     /* if can't restore previous animation - select new */
@@ -564,7 +563,7 @@ static void animation_manager_switch_to_one_shot_view(AnimationManager* animatio
     } else if(stats.level == 2) {
         one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup2_128x64);
     } else {
-        furi_assert(0);
+        furi_crash();
     }
 }
 
diff --git a/applications/services/desktop/animations/animation_storage.c b/applications/services/desktop/animations/animation_storage.c
index 2c16cf72..c99cc7b5 100644
--- a/applications/services/desktop/animations/animation_storage.c
+++ b/applications/services/desktop/animations/animation_storage.c
@@ -304,7 +304,7 @@ static bool animation_storage_load_frames(
         if(file_info.size > max_filesize) {
             FURI_LOG_E(
                 TAG,
-                "Filesize %lld, max: %d (width %d, height %d)",
+                "Filesize %llu, max: %zu (width %u, height %u)",
                 file_info.size,
                 max_filesize,
                 width,
@@ -329,7 +329,7 @@ static bool animation_storage_load_frames(
     if(!frames_ok) {
         FURI_LOG_E(
             TAG,
-            "Load \'%s\' failed, %dx%d, size: %lld",
+            "Load \'%s\' failed, %ux%u, size: %llu",
             furi_string_get_cstr(filename),
             width,
             height,
diff --git a/applications/services/desktop/animations/views/bubble_animation_view.c b/applications/services/desktop/animations/views/bubble_animation_view.c
index 30a16508..9585b277 100644
--- a/applications/services/desktop/animations/views/bubble_animation_view.c
+++ b/applications/services/desktop/animations/views/bubble_animation_view.c
@@ -23,7 +23,7 @@ typedef struct {
     uint8_t active_bubbles;
     uint8_t passive_bubbles;
     uint8_t active_shift;
-    TickType_t active_ended_at;
+    uint32_t active_ended_at;
     Icon* freeze_frame;
 } BubbleAnimationViewModel;
 
@@ -154,7 +154,7 @@ static void bubble_animation_activate(BubbleAnimationView* view, bool force) {
     if(model->current != NULL) {
         if(!force) {
             if((model->active_ended_at + model->current->active_cooldown * 1000) >
-               xTaskGetTickCount()) {
+               furi_get_tick()) {
                 activate = false;
             } else if(model->active_shift) {
                 activate = false;
@@ -215,7 +215,7 @@ static void bubble_animation_next_frame(BubbleAnimationViewModel* model) {
             model->active_cycle = 0;
             model->current_frame = 0;
             model->current_bubble = bubble_animation_pick_bubble(model, false);
-            model->active_ended_at = xTaskGetTickCount();
+            model->active_ended_at = furi_get_tick();
         }
 
         if(model->current_bubble) {
@@ -355,7 +355,7 @@ void bubble_animation_view_set_animation(
     furi_assert(model);
     model->current = new_animation;
 
-    model->active_ended_at = xTaskGetTickCount() - (model->current->active_cooldown * 1000);
+    model->active_ended_at = furi_get_tick() - (model->current->active_cooldown * 1000);
     model->active_bubbles = 0;
     model->passive_bubbles = 0;
     for(int i = 0; i < new_animation->frame_bubble_sequences_count; ++i) {
diff --git a/applications/services/desktop/animations/views/one_shot_animation_view.c b/applications/services/desktop/animations/views/one_shot_animation_view.c
index 077f82d0..004fcde7 100644
--- a/applications/services/desktop/animations/views/one_shot_animation_view.c
+++ b/applications/services/desktop/animations/views/one_shot_animation_view.c
@@ -1,7 +1,6 @@
 
 #include "one_shot_animation_view.h"
 #include <furi.h>
-#include <portmacro.h>
 #include <gui/canvas.h>
 #include <gui/view.h>
 #include <gui/icon_i.h>
@@ -11,7 +10,7 @@ typedef void (*OneShotInteractCallback)(void*);
 
 struct OneShotView {
     View* view;
-    TimerHandle_t update_timer;
+    FuriTimer* update_timer;
     OneShotInteractCallback interact_callback;
     void* interact_callback_context;
 };
@@ -22,8 +21,8 @@ typedef struct {
     bool block_input;
 } OneShotViewModel;
 
-static void one_shot_view_update_timer_callback(TimerHandle_t xTimer) {
-    OneShotView* view = (void*)pvTimerGetTimerID(xTimer);
+static void one_shot_view_update_timer_callback(void* context) {
+    OneShotView* view = context;
 
     OneShotViewModel* model = view_get_model(view->view);
     if((model->index + 1) < model->icon->frame_count) {
@@ -81,7 +80,7 @@ OneShotView* one_shot_view_alloc(void) {
     OneShotView* view = malloc(sizeof(OneShotView));
     view->view = view_alloc();
     view->update_timer =
-        xTimerCreate(NULL, 1000, pdTRUE, view, one_shot_view_update_timer_callback);
+        furi_timer_alloc(one_shot_view_update_timer_callback, FuriTimerTypePeriodic, view);
 
     view_allocate_model(view->view, ViewModelTypeLocking, sizeof(OneShotViewModel));
     view_set_context(view->view, view);
@@ -94,7 +93,7 @@ OneShotView* one_shot_view_alloc(void) {
 void one_shot_view_free(OneShotView* view) {
     furi_assert(view);
 
-    xTimerDelete(view->update_timer, portMAX_DELAY);
+    furi_timer_free(view->update_timer);
     view_free(view->view);
     view->view = NULL;
     free(view);
@@ -120,7 +119,7 @@ void one_shot_view_start_animation(OneShotView* view, const Icon* icon) {
     model->icon = icon;
     model->block_input = true;
     view_commit_model(view->view, true);
-    xTimerChangePeriod(view->update_timer, 1000 / model->icon->frame_rate, portMAX_DELAY);
+    furi_timer_start(view->update_timer, 1000 / model->icon->frame_rate);
 }
 
 View* one_shot_view_get_view(OneShotView* view) {
diff --git a/applications/services/desktop/scenes/desktop_scene_locked.c b/applications/services/desktop/scenes/desktop_scene_locked.c
index bbed5600..034eedb8 100644
--- a/applications/services/desktop/scenes/desktop_scene_locked.c
+++ b/applications/services/desktop/scenes/desktop_scene_locked.c
@@ -3,7 +3,6 @@
 #include <gui/scene_manager.h>
 #include <gui/view_stack.h>
 #include <stdint.h>
-#include <portmacro.h>
 
 #include "../desktop.h"
 #include "../desktop_i.h"
diff --git a/applications/services/desktop/scenes/desktop_scene_pin_input.c b/applications/services/desktop/scenes/desktop_scene_pin_input.c
index e062c1b9..0e248def 100644
--- a/applications/services/desktop/scenes/desktop_scene_pin_input.c
+++ b/applications/services/desktop/scenes/desktop_scene_pin_input.c
@@ -3,7 +3,6 @@
 #include <gui/scene_manager.h>
 #include <gui/view_stack.h>
 #include <stdint.h>
-#include <portmacro.h>
 #include <notification/notification.h>
 #include <notification/notification_messages.h>
 
@@ -20,7 +19,7 @@
 #define INPUT_PIN_VIEW_TIMEOUT 15000
 
 typedef struct {
-    TimerHandle_t timer;
+    FuriTimer* timer;
 } DesktopScenePinInputState;
 
 static void desktop_scene_locked_light_red(bool value) {
@@ -33,17 +32,16 @@ static void desktop_scene_locked_light_red(bool value) {
     furi_record_close(RECORD_NOTIFICATION);
 }
 
-static void
-    desktop_scene_pin_input_set_timer(Desktop* desktop, bool enable, TickType_t new_period) {
+static void desktop_scene_pin_input_set_timer(Desktop* desktop, bool enable, uint32_t new_period) {
     furi_assert(desktop);
 
     DesktopScenePinInputState* state = (DesktopScenePinInputState*)scene_manager_get_scene_state(
         desktop->scene_manager, DesktopScenePinInput);
     furi_assert(state);
     if(enable) {
-        xTimerChangePeriod(state->timer, new_period, portMAX_DELAY);
+        furi_timer_start(state->timer, new_period);
     } else {
-        xTimerStop(state->timer, portMAX_DELAY);
+        furi_timer_stop(state->timer);
     }
 }
 
@@ -64,8 +62,8 @@ static void desktop_scene_pin_input_done_callback(const PinCode* pin_code, void*
     }
 }
 
-static void desktop_scene_pin_input_timer_callback(TimerHandle_t timer) {
-    Desktop* desktop = pvTimerGetTimerID(timer);
+static void desktop_scene_pin_input_timer_callback(void* context) {
+    Desktop* desktop = context;
 
     view_dispatcher_send_custom_event(
         desktop->view_dispatcher, DesktopPinInputEventResetWrongPinLabel);
@@ -84,7 +82,7 @@ void desktop_scene_pin_input_on_enter(void* context) {
 
     DesktopScenePinInputState* state = malloc(sizeof(DesktopScenePinInputState));
     state->timer =
-        xTimerCreate(NULL, 10000, pdFALSE, desktop, desktop_scene_pin_input_timer_callback);
+        furi_timer_alloc(desktop_scene_pin_input_timer_callback, FuriTimerTypeOnce, desktop);
     scene_manager_set_scene_state(desktop->scene_manager, DesktopScenePinInput, (uint32_t)state);
 
     desktop_view_pin_input_hide_pin(desktop->pin_input_view, true);
@@ -149,10 +147,7 @@ void desktop_scene_pin_input_on_exit(void* context) {
 
     DesktopScenePinInputState* state = (DesktopScenePinInputState*)scene_manager_get_scene_state(
         desktop->scene_manager, DesktopScenePinInput);
-    xTimerStop(state->timer, portMAX_DELAY);
-    while(xTimerIsTimerActive(state->timer)) {
-        furi_delay_tick(1);
-    }
-    xTimerDelete(state->timer, portMAX_DELAY);
+
+    furi_timer_free(state->timer);
     free(state);
 }
diff --git a/applications/services/desktop/scenes/desktop_scene_pin_timeout.c b/applications/services/desktop/scenes/desktop_scene_pin_timeout.c
index 2f009e7d..e3336ad7 100644
--- a/applications/services/desktop/scenes/desktop_scene_pin_timeout.c
+++ b/applications/services/desktop/scenes/desktop_scene_pin_timeout.c
@@ -1,6 +1,5 @@
 #include <furi.h>
 #include <FreeRTOS.h>
-#include <portmacro.h>
 #include <gui/scene_manager.h>
 
 #include "../desktop_i.h"
diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c
index f4790ebb..1ba8542b 100644
--- a/applications/services/desktop/views/desktop_view_lock_menu.c
+++ b/applications/services/desktop/views/desktop_view_lock_menu.c
@@ -60,13 +60,13 @@ void desktop_lock_menu_draw_callback(Canvas* canvas, void* model) {
             str = "Lock";
         } else if(i == DesktopLockMenuIndexStealth) {
             if(m->stealth_mode) {
-                str = "Sound Mode";
+                str = "Unmute";
             } else {
-                str = "Stealth Mode";
+                str = "Mute";
             }
         } else if(i == DesktopLockMenuIndexDummy) { //-V547
             if(m->dummy_mode) {
-                str = "Brainiac Mode";
+                str = "Default Mode";
             } else {
                 str = "Dummy Mode";
             }
diff --git a/applications/services/desktop/views/desktop_view_locked.c b/applications/services/desktop/views/desktop_view_locked.c
index 3cee2542..8df889dd 100644
--- a/applications/services/desktop/views/desktop_view_locked.c
+++ b/applications/services/desktop/views/desktop_view_locked.c
@@ -5,7 +5,6 @@
 #include <gui/icon.h>
 #include <gui/view.h>
 #include <assets_icons.h>
-#include <portmacro.h>
 
 #include <desktop/desktop_settings.h>
 #include "../desktop_i.h"
@@ -29,7 +28,7 @@ struct DesktopViewLocked {
     DesktopViewLockedCallback callback;
     void* context;
 
-    TimerHandle_t timer;
+    FuriTimer* timer;
     uint8_t lock_count;
     uint32_t lock_lastpress;
 };
@@ -58,8 +57,8 @@ void desktop_view_locked_set_callback(
     locked_view->context = context;
 }
 
-static void locked_view_timer_callback(TimerHandle_t timer) {
-    DesktopViewLocked* locked_view = pvTimerGetTimerID(timer);
+static void locked_view_timer_callback(void* context) {
+    DesktopViewLocked* locked_view = context;
     locked_view->callback(DesktopLockedEventUpdate, locked_view->context);
 }
 
@@ -90,7 +89,7 @@ static void desktop_view_locked_update_hint_icon_timeout(DesktopViewLocked* lock
         model->view_state = DesktopViewLockedStateLockedHintShown;
     }
     view_commit_model(locked_view->view, change_state);
-    xTimerChangePeriod(locked_view->timer, pdMS_TO_TICKS(LOCKED_HINT_TIMEOUT_MS), portMAX_DELAY);
+    furi_timer_start(locked_view->timer, LOCKED_HINT_TIMEOUT_MS);
 }
 
 void desktop_view_locked_update(DesktopViewLocked* locked_view) {
@@ -110,7 +109,7 @@ void desktop_view_locked_update(DesktopViewLocked* locked_view) {
     view_commit_model(locked_view->view, true);
 
     if(view_state != DesktopViewLockedStateDoorsClosing) {
-        xTimerStop(locked_view->timer, portMAX_DELAY);
+        furi_timer_stop(locked_view->timer);
     }
 }
 
@@ -148,7 +147,7 @@ static bool desktop_view_locked_input(InputEvent* event, void* context) {
     furi_assert(context);
 
     bool is_changed = false;
-    const uint32_t press_time = xTaskGetTickCount();
+    const uint32_t press_time = furi_get_tick();
     DesktopViewLocked* locked_view = context;
     DesktopViewLockedModel* model = view_get_model(locked_view->view);
     if(model->view_state == DesktopViewLockedStateUnlockedHintShown &&
@@ -196,7 +195,7 @@ DesktopViewLocked* desktop_view_locked_alloc() {
     DesktopViewLocked* locked_view = malloc(sizeof(DesktopViewLocked));
     locked_view->view = view_alloc();
     locked_view->timer =
-        xTimerCreate(NULL, 1000 / 16, pdTRUE, locked_view, locked_view_timer_callback);
+        furi_timer_alloc(locked_view_timer_callback, FuriTimerTypePeriodic, locked_view);
 
     view_allocate_model(locked_view->view, ViewModelTypeLocking, sizeof(DesktopViewLockedModel));
     view_set_context(locked_view->view, locked_view);
@@ -219,7 +218,7 @@ void desktop_view_locked_close_doors(DesktopViewLocked* locked_view) {
     model->view_state = DesktopViewLockedStateDoorsClosing;
     model->door_offset = DOOR_OFFSET_START;
     view_commit_model(locked_view->view, true);
-    xTimerChangePeriod(locked_view->timer, pdMS_TO_TICKS(DOOR_MOVING_INTERVAL_MS), portMAX_DELAY);
+    furi_timer_start(locked_view->timer, DOOR_MOVING_INTERVAL_MS);
 }
 
 void desktop_view_locked_lock(DesktopViewLocked* locked_view, bool pin_locked) {
@@ -236,7 +235,7 @@ void desktop_view_locked_unlock(DesktopViewLocked* locked_view) {
     model->view_state = DesktopViewLockedStateUnlockedHintShown;
     model->pin_locked = false;
     view_commit_model(locked_view->view, true);
-    xTimerChangePeriod(locked_view->timer, pdMS_TO_TICKS(UNLOCKED_HINT_TIMEOUT_MS), portMAX_DELAY);
+    furi_timer_start(locked_view->timer, UNLOCKED_HINT_TIMEOUT_MS);
 }
 
 bool desktop_view_locked_is_locked_hint_visible(DesktopViewLocked* locked_view) {
diff --git a/applications/services/desktop/views/desktop_view_main.c b/applications/services/desktop/views/desktop_view_main.c
index d323567e..5e16f608 100644
--- a/applications/services/desktop/views/desktop_view_main.c
+++ b/applications/services/desktop/views/desktop_view_main.c
@@ -13,14 +13,14 @@ struct DesktopMainView {
     View* view;
     DesktopMainViewCallback callback;
     void* context;
-    TimerHandle_t poweroff_timer;
+    FuriTimer* poweroff_timer;
     bool dummy_mode;
 };
 
 #define DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT 5000
 
-static void desktop_main_poweroff_timer_callback(TimerHandle_t timer) {
-    DesktopMainView* main_view = pvTimerGetTimerID(timer);
+static void desktop_main_poweroff_timer_callback(void* context) {
+    DesktopMainView* main_view = context;
     main_view->callback(DesktopMainEventOpenPowerOff, main_view->context);
 }
 
@@ -90,12 +90,9 @@ bool desktop_main_input_callback(InputEvent* event, void* context) {
 
     if(event->key == InputKeyBack) {
         if(event->type == InputTypePress) {
-            xTimerChangePeriod(
-                main_view->poweroff_timer,
-                pdMS_TO_TICKS(DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT),
-                portMAX_DELAY);
+            furi_timer_start(main_view->poweroff_timer, DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT);
         } else if(event->type == InputTypeRelease) {
-            xTimerStop(main_view->poweroff_timer, portMAX_DELAY);
+            furi_timer_stop(main_view->poweroff_timer);
         }
     }
 
@@ -109,12 +106,8 @@ DesktopMainView* desktop_main_alloc() {
     view_set_context(main_view->view, main_view);
     view_set_input_callback(main_view->view, desktop_main_input_callback);
 
-    main_view->poweroff_timer = xTimerCreate(
-        NULL,
-        pdMS_TO_TICKS(DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT),
-        pdFALSE,
-        main_view,
-        desktop_main_poweroff_timer_callback);
+    main_view->poweroff_timer =
+        furi_timer_alloc(desktop_main_poweroff_timer_callback, FuriTimerTypeOnce, main_view);
 
     return main_view;
 }
diff --git a/applications/services/desktop/views/desktop_view_pin_input.c b/applications/services/desktop/views/desktop_view_pin_input.c
index d3dadd7d..0894bb77 100644
--- a/applications/services/desktop/views/desktop_view_pin_input.c
+++ b/applications/services/desktop/views/desktop_view_pin_input.c
@@ -4,7 +4,6 @@
 #include <gui/elements.h>
 #include <assets_icons.h>
 #include <stdint.h>
-#include <portmacro.h>
 
 #include "desktop_view_pin_input.h"
 #include <desktop/desktop_settings.h>
@@ -21,7 +20,7 @@ struct DesktopViewPinInput {
     DesktopViewPinInputCallback timeout_callback;
     DesktopViewPinInputDoneCallback done_callback;
     void* context;
-    TimerHandle_t timer;
+    FuriTimer* timer;
 };
 
 typedef struct {
@@ -78,7 +77,7 @@ static bool desktop_view_pin_input_input(InputEvent* event, void* context) {
             }
             break;
         default:
-            furi_assert(0);
+            furi_crash();
             break;
         }
     }
@@ -90,7 +89,7 @@ static bool desktop_view_pin_input_input(InputEvent* event, void* context) {
         pin_input->back_callback(pin_input->context);
     }
 
-    xTimerStart(pin_input->timer, 0);
+    furi_timer_start(pin_input->timer, NO_ACTIVITY_TIMEOUT);
 
     return true;
 }
@@ -129,7 +128,7 @@ static void desktop_view_pin_input_draw_cells(Canvas* canvas, DesktopViewPinInpu
                     canvas_draw_icon_ex(canvas, x + 2, y + 3, &I_Pin_arrow_up_7x9, IconRotation90);
                     break;
                 default:
-                    furi_assert(0);
+                    furi_crash();
                     break;
                 }
             }
@@ -170,8 +169,8 @@ static void desktop_view_pin_input_draw(Canvas* canvas, void* context) {
     }
 }
 
-void desktop_view_pin_input_timer_callback(TimerHandle_t timer) {
-    DesktopViewPinInput* pin_input = pvTimerGetTimerID(timer);
+void desktop_view_pin_input_timer_callback(void* context) {
+    DesktopViewPinInput* pin_input = context;
 
     if(pin_input->timeout_callback) {
         pin_input->timeout_callback(pin_input->context);
@@ -180,12 +179,12 @@ void desktop_view_pin_input_timer_callback(TimerHandle_t timer) {
 
 static void desktop_view_pin_input_enter(void* context) {
     DesktopViewPinInput* pin_input = context;
-    xTimerStart(pin_input->timer, portMAX_DELAY);
+    furi_timer_start(pin_input->timer, NO_ACTIVITY_TIMEOUT);
 }
 
 static void desktop_view_pin_input_exit(void* context) {
     DesktopViewPinInput* pin_input = context;
-    xTimerStop(pin_input->timer, portMAX_DELAY);
+    furi_timer_stop(pin_input->timer);
 }
 
 DesktopViewPinInput* desktop_view_pin_input_alloc(void) {
@@ -195,12 +194,8 @@ DesktopViewPinInput* desktop_view_pin_input_alloc(void) {
     view_set_context(pin_input->view, pin_input);
     view_set_draw_callback(pin_input->view, desktop_view_pin_input_draw);
     view_set_input_callback(pin_input->view, desktop_view_pin_input_input);
-    pin_input->timer = xTimerCreate(
-        NULL,
-        pdMS_TO_TICKS(NO_ACTIVITY_TIMEOUT),
-        pdFALSE,
-        pin_input,
-        desktop_view_pin_input_timer_callback);
+    pin_input->timer =
+        furi_timer_alloc(desktop_view_pin_input_timer_callback, FuriTimerTypeOnce, pin_input);
     view_set_enter_callback(pin_input->view, desktop_view_pin_input_enter);
     view_set_exit_callback(pin_input->view, desktop_view_pin_input_exit);
 
@@ -216,11 +211,7 @@ DesktopViewPinInput* desktop_view_pin_input_alloc(void) {
 void desktop_view_pin_input_free(DesktopViewPinInput* pin_input) {
     furi_assert(pin_input);
 
-    xTimerStop(pin_input->timer, portMAX_DELAY);
-    while(xTimerIsTimerActive(pin_input->timer)) {
-        furi_delay_tick(1);
-    }
-    xTimerDelete(pin_input->timer, portMAX_DELAY);
+    furi_timer_free(pin_input->timer);
 
     view_free(pin_input->view);
     free(pin_input);
diff --git a/applications/services/desktop/views/desktop_view_pin_timeout.c b/applications/services/desktop/views/desktop_view_pin_timeout.c
index e64c264f..f24ecc8e 100644
--- a/applications/services/desktop/views/desktop_view_pin_timeout.c
+++ b/applications/services/desktop/views/desktop_view_pin_timeout.c
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <FreeRTOS.h>
-#include <portmacro.h>
 #include <projdefs.h>
 #include <input/input.h>
 #include <gui/canvas.h>
@@ -13,7 +12,7 @@
 
 struct DesktopViewPinTimeout {
     View* view;
-    TimerHandle_t timer;
+    FuriTimer* timer;
     DesktopViewPinTimeoutDoneCallback callback;
     void* context;
 };
@@ -32,8 +31,8 @@ void desktop_view_pin_timeout_set_callback(
     instance->context = context;
 }
 
-static void desktop_view_pin_timeout_timer_callback(TimerHandle_t timer) {
-    DesktopViewPinTimeout* instance = pvTimerGetTimerID(timer);
+static void desktop_view_pin_timeout_timer_callback(void* context) {
+    DesktopViewPinTimeout* instance = context;
     bool stop = false;
 
     DesktopViewPinTimeoutModel* model = view_get_model(instance->view);
@@ -45,7 +44,7 @@ static void desktop_view_pin_timeout_timer_callback(TimerHandle_t timer) {
     view_commit_model(instance->view, true);
 
     if(stop) {
-        xTimerStop(instance->timer, portMAX_DELAY);
+        furi_timer_stop(instance->timer);
         instance->callback(instance->context);
     }
 }
@@ -73,15 +72,15 @@ static void desktop_view_pin_timeout_draw(Canvas* canvas, void* _model) {
 
 void desktop_view_pin_timeout_free(DesktopViewPinTimeout* instance) {
     view_free(instance->view);
-    xTimerDelete(instance->timer, portMAX_DELAY);
+    furi_timer_free(instance->timer);
 
     free(instance);
 }
 
 DesktopViewPinTimeout* desktop_view_pin_timeout_alloc(void) {
     DesktopViewPinTimeout* instance = malloc(sizeof(DesktopViewPinTimeout));
-    instance->timer = xTimerCreate(
-        NULL, pdMS_TO_TICKS(1000), pdTRUE, instance, desktop_view_pin_timeout_timer_callback);
+    instance->timer =
+        furi_timer_alloc(desktop_view_pin_timeout_timer_callback, FuriTimerTypePeriodic, instance);
 
     instance->view = view_alloc();
     view_allocate_model(instance->view, ViewModelTypeLockFree, sizeof(DesktopViewPinTimeoutModel));
@@ -101,7 +100,7 @@ void desktop_view_pin_timeout_start(DesktopViewPinTimeout* instance, uint32_t ti
     model->time_left = time_left;
     view_commit_model(instance->view, true);
 
-    xTimerStart(instance->timer, portMAX_DELAY);
+    furi_timer_start(instance->timer, 1000);
 }
 
 View* desktop_view_pin_timeout_get_view(DesktopViewPinTimeout* instance) {
diff --git a/applications/services/dolphin/dolphin.c b/applications/services/dolphin/dolphin.c
index 579b400a..bef7c4a2 100644
--- a/applications/services/dolphin/dolphin.c
+++ b/applications/services/dolphin/dolphin.c
@@ -1,7 +1,6 @@
 #include "dolphin/dolphin.h"
 #include "dolphin/helpers/dolphin_state.h"
 #include "dolphin_i.h"
-#include "portmacro.h"
 #include "projdefs.h"
 #include <furi_hal.h>
 #include <stdint.h>
@@ -45,8 +44,8 @@ void dolphin_flush(Dolphin* dolphin) {
     dolphin_event_send_wait(dolphin, &event);
 }
 
-void dolphin_butthurt_timer_callback(TimerHandle_t xTimer) {
-    Dolphin* dolphin = pvTimerGetTimerID(xTimer);
+void dolphin_butthurt_timer_callback(void* context) {
+    Dolphin* dolphin = context;
     furi_assert(dolphin);
 
     DolphinEvent event;
@@ -54,8 +53,8 @@ void dolphin_butthurt_timer_callback(TimerHandle_t xTimer) {
     dolphin_event_send_async(dolphin, &event);
 }
 
-void dolphin_flush_timer_callback(TimerHandle_t xTimer) {
-    Dolphin* dolphin = pvTimerGetTimerID(xTimer);
+void dolphin_flush_timer_callback(void* context) {
+    Dolphin* dolphin = context;
     furi_assert(dolphin);
 
     DolphinEvent event;
@@ -63,11 +62,11 @@ void dolphin_flush_timer_callback(TimerHandle_t xTimer) {
     dolphin_event_send_async(dolphin, &event);
 }
 
-void dolphin_clear_limits_timer_callback(TimerHandle_t xTimer) {
-    Dolphin* dolphin = pvTimerGetTimerID(xTimer);
+void dolphin_clear_limits_timer_callback(void* context) {
+    Dolphin* dolphin = context;
     furi_assert(dolphin);
 
-    xTimerChangePeriod(dolphin->clear_limits_timer, HOURS_IN_TICKS(24), portMAX_DELAY);
+    furi_timer_start(dolphin->clear_limits_timer, HOURS_IN_TICKS(24));
 
     DolphinEvent event;
     event.type = DolphinEventTypeClearLimits;
@@ -80,12 +79,12 @@ Dolphin* dolphin_alloc() {
     dolphin->state = dolphin_state_alloc();
     dolphin->event_queue = furi_message_queue_alloc(8, sizeof(DolphinEvent));
     dolphin->pubsub = furi_pubsub_alloc();
-    dolphin->butthurt_timer = xTimerCreate(
-        NULL, HOURS_IN_TICKS(2 * 24), pdTRUE, dolphin, dolphin_butthurt_timer_callback);
+    dolphin->butthurt_timer =
+        furi_timer_alloc(dolphin_butthurt_timer_callback, FuriTimerTypePeriodic, dolphin);
     dolphin->flush_timer =
-        xTimerCreate(NULL, 30 * 1000, pdFALSE, dolphin, dolphin_flush_timer_callback);
-    dolphin->clear_limits_timer = xTimerCreate(
-        NULL, HOURS_IN_TICKS(24), pdTRUE, dolphin, dolphin_clear_limits_timer_callback);
+        furi_timer_alloc(dolphin_flush_timer_callback, FuriTimerTypeOnce, dolphin);
+    dolphin->clear_limits_timer =
+        furi_timer_alloc(dolphin_clear_limits_timer_callback, FuriTimerTypePeriodic, dolphin);
 
     return dolphin;
 }
@@ -125,14 +124,14 @@ FuriPubSub* dolphin_get_pubsub(Dolphin* dolphin) {
 
 static void dolphin_update_clear_limits_timer_period(Dolphin* dolphin) {
     furi_assert(dolphin);
-    TickType_t now_ticks = xTaskGetTickCount();
-    TickType_t timer_expires_at = xTimerGetExpiryTime(dolphin->clear_limits_timer);
+    uint32_t now_ticks = furi_get_tick();
+    uint32_t timer_expires_at = furi_timer_get_expire_time(dolphin->clear_limits_timer);
 
     if((timer_expires_at - now_ticks) > HOURS_IN_TICKS(0.1)) {
         FuriHalRtcDateTime date;
         furi_hal_rtc_get_datetime(&date);
-        TickType_t now_time_in_ms = ((date.hour * 60 + date.minute) * 60 + date.second) * 1000;
-        TickType_t time_to_clear_limits = 0;
+        uint32_t now_time_in_ms = ((date.hour * 60 + date.minute) * 60 + date.second) * 1000;
+        uint32_t time_to_clear_limits = 0;
 
         if(date.hour < 5) {
             time_to_clear_limits = HOURS_IN_TICKS(5) - now_time_in_ms;
@@ -140,7 +139,7 @@ static void dolphin_update_clear_limits_timer_period(Dolphin* dolphin) {
             time_to_clear_limits = HOURS_IN_TICKS(24 + 5) - now_time_in_ms;
         }
 
-        xTimerChangePeriod(dolphin->clear_limits_timer, time_to_clear_limits, portMAX_DELAY);
+        furi_timer_start(dolphin->clear_limits_timer, time_to_clear_limits);
     }
 }
 
@@ -156,9 +155,9 @@ int32_t dolphin_srv(void* p) {
     furi_record_create(RECORD_DOLPHIN, dolphin);
 
     dolphin_state_load(dolphin->state);
-    xTimerReset(dolphin->butthurt_timer, portMAX_DELAY);
+    furi_timer_restart(dolphin->butthurt_timer, HOURS_IN_TICKS(2 * 24));
     dolphin_update_clear_limits_timer_period(dolphin);
-    xTimerReset(dolphin->clear_limits_timer, portMAX_DELAY);
+    furi_timer_restart(dolphin->clear_limits_timer, HOURS_IN_TICKS(24));
 
     DolphinEvent event;
     while(1) {
@@ -168,8 +167,8 @@ int32_t dolphin_srv(void* p) {
                 dolphin_state_on_deed(dolphin->state, event.deed);
                 DolphinPubsubEvent event = DolphinPubsubEventUpdate;
                 furi_pubsub_publish(dolphin->pubsub, &event);
-                xTimerReset(dolphin->butthurt_timer, portMAX_DELAY);
-                xTimerReset(dolphin->flush_timer, portMAX_DELAY);
+                furi_timer_restart(dolphin->butthurt_timer, HOURS_IN_TICKS(2 * 24));
+                furi_timer_restart(dolphin->flush_timer, 30 * 1000);
             } else if(event.type == DolphinEventTypeStats) {
                 event.stats->icounter = dolphin->state->data.icounter;
                 event.stats->butthurt = dolphin->state->data.butthurt;
diff --git a/applications/services/dolphin/dolphin_i.h b/applications/services/dolphin/dolphin_i.h
index ceeff1e1..2d716c18 100644
--- a/applications/services/dolphin/dolphin_i.h
+++ b/applications/services/dolphin/dolphin_i.h
@@ -30,9 +30,9 @@ struct Dolphin {
     // Queue
     FuriMessageQueue* event_queue;
     FuriPubSub* pubsub;
-    TimerHandle_t butthurt_timer;
-    TimerHandle_t flush_timer;
-    TimerHandle_t clear_limits_timer;
+    FuriTimer* butthurt_timer;
+    FuriTimer* flush_timer;
+    FuriTimer* clear_limits_timer;
 };
 
 Dolphin* dolphin_alloc();
diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c
index 37edc5d3..85c05285 100644
--- a/applications/services/gui/canvas.c
+++ b/applications/services/gui/canvas.c
@@ -135,7 +135,7 @@ void canvas_set_font(Canvas* canvas, Font font) {
     } else if(font == FontBigNumbers) {
         u8g2_SetFont(&canvas->fb, u8g2_font_profont22_tn);
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -175,7 +175,7 @@ void canvas_draw_str_aligned(
         x -= (u8g2_GetStrWidth(&canvas->fb, str) / 2);
         break;
     default:
-        furi_crash(NULL);
+        furi_crash();
         break;
     }
 
@@ -189,7 +189,7 @@ void canvas_draw_str_aligned(
         y += (u8g2_GetAscent(&canvas->fb) / 2);
         break;
     default:
-        furi_crash(NULL);
+        furi_crash();
         break;
     }
 
@@ -530,7 +530,7 @@ void canvas_set_orientation(Canvas* canvas, CanvasOrientation orientation) {
             rotate_cb = U8G2_R1;
             break;
         default:
-            furi_assert(0);
+            furi_crash();
         }
 
         if(need_swap) FURI_SWAP(canvas->width, canvas->height);
diff --git a/applications/services/gui/elements.c b/applications/services/gui/elements.c
index a6ab84fb..e92c2433 100644
--- a/applications/services/gui/elements.c
+++ b/applications/services/gui/elements.c
@@ -232,7 +232,7 @@ static size_t
     } else if(horizontal == AlignRight) {
         px_left = x;
     } else {
-        furi_assert(0);
+        furi_crash();
     }
 
     if(len_px > px_left) {
diff --git a/applications/services/gui/icon_animation.c b/applications/services/gui/icon_animation.c
index b63d233f..a39ef2e2 100644
--- a/applications/services/gui/icon_animation.c
+++ b/applications/services/gui/icon_animation.c
@@ -15,7 +15,6 @@ IconAnimation* icon_animation_alloc(const Icon* icon) {
 void icon_animation_free(IconAnimation* instance) {
     furi_assert(instance);
     icon_animation_stop(instance);
-    while(xTimerIsTimerActive(instance->timer) == pdTRUE) furi_delay_tick(1);
     furi_timer_free(instance->timer);
     free(instance);
 }
@@ -67,10 +66,9 @@ void icon_animation_start(IconAnimation* instance) {
         instance->animating = true;
         furi_assert(instance->icon->frame_rate);
         furi_check(
-            xTimerChangePeriod(
+            furi_timer_start(
                 instance->timer,
-                (furi_kernel_get_tick_frequency() / instance->icon->frame_rate),
-                portMAX_DELAY) == pdPASS);
+                (furi_kernel_get_tick_frequency() / instance->icon->frame_rate)) == FuriStatusOk);
     }
 }
 
@@ -78,7 +76,7 @@ void icon_animation_stop(IconAnimation* instance) {
     furi_assert(instance);
     if(instance->animating) {
         instance->animating = false;
-        furi_check(xTimerStop(instance->timer, portMAX_DELAY) == pdPASS);
+        furi_timer_stop(instance->timer);
         instance->frame = 0;
     }
 }
diff --git a/applications/services/gui/modules/byte_input.c b/applications/services/gui/modules/byte_input.c
index 4846bbd8..e9cd78da 100644
--- a/applications/services/gui/modules/byte_input.c
+++ b/applications/services/gui/modules/byte_input.c
@@ -79,7 +79,7 @@ static uint8_t byte_input_get_row_size(uint8_t row_index) {
         row_size = COUNT_OF(keyboard_keys_row_2);
         break;
     default:
-        furi_crash(NULL);
+        furi_crash();
     }
 
     return row_size;
@@ -102,7 +102,7 @@ static const ByteInputKey* byte_input_get_row(uint8_t row_index) {
         row = keyboard_keys_row_2;
         break;
     default:
-        furi_crash(NULL);
+        furi_crash();
     }
 
     return row;
diff --git a/applications/services/gui/modules/popup.c b/applications/services/gui/modules/popup.c
index d75abb95..520efcee 100644
--- a/applications/services/gui/modules/popup.c
+++ b/applications/services/gui/modules/popup.c
@@ -98,7 +98,7 @@ void popup_start_timer(void* context) {
         if(timer_period == 0) timer_period = 1;
 
         if(furi_timer_start(popup->timer, timer_period) != FuriStatusOk) {
-            furi_assert(0);
+            furi_crash();
         };
     }
 }
diff --git a/applications/services/gui/modules/text_input.c b/applications/services/gui/modules/text_input.c
index 86b7bca1..50453cf2 100644
--- a/applications/services/gui/modules/text_input.c
+++ b/applications/services/gui/modules/text_input.c
@@ -101,7 +101,7 @@ static uint8_t get_row_size(uint8_t row_index) {
         row_size = COUNT_OF(keyboard_keys_row_3);
         break;
     default:
-        furi_crash(NULL);
+        furi_crash();
     }
 
     return row_size;
@@ -121,7 +121,7 @@ static const TextInputKey* get_row(uint8_t row_index) {
         row = keyboard_keys_row_3;
         break;
     default:
-        furi_crash(NULL);
+        furi_crash();
     }
 
     return row;
diff --git a/applications/services/gui/view.c b/applications/services/gui/view.c
index 07ae072a..316f5c61 100644
--- a/applications/services/gui/view.c
+++ b/applications/services/gui/view.c
@@ -82,7 +82,7 @@ void view_allocate_model(View* view, ViewModelType type, size_t size) {
         model->data = malloc(size);
         view->model = model;
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -99,7 +99,7 @@ void view_free_model(View* view) {
         free(model);
         view->model = NULL;
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
diff --git a/applications/services/gui/view_dispatcher.c b/applications/services/gui/view_dispatcher.c
index 0119abc2..87b07a87 100644
--- a/applications/services/gui/view_dispatcher.c
+++ b/applications/services/gui/view_dispatcher.c
@@ -207,7 +207,7 @@ void view_dispatcher_attach_to_gui(
     } else if(type == ViewDispatcherTypeFullscreen) {
         gui_add_view_port(gui, view_dispatcher->view_port, GuiLayerFullscreen);
     } else {
-        furi_check(NULL);
+        furi_crash();
     }
     view_dispatcher->gui = gui;
 }
diff --git a/applications/services/input/input.c b/applications/services/input/input.c
index 8da0a340..216aa39b 100644
--- a/applications/services/input/input.c
+++ b/applications/services/input/input.c
@@ -6,20 +6,6 @@
 
 static Input* input = NULL;
 
-inline static void input_timer_start(FuriTimer* timer_id, uint32_t ticks) {
-    TimerHandle_t hTimer = (TimerHandle_t)timer_id;
-    furi_check(xTimerChangePeriod(hTimer, ticks, portMAX_DELAY) == pdPASS);
-}
-
-inline static void input_timer_stop(FuriTimer* timer_id) {
-    TimerHandle_t hTimer = (TimerHandle_t)timer_id;
-    furi_check(xTimerStop(hTimer, portMAX_DELAY) == pdPASS);
-    // xTimerStop is not actually stopping timer,
-    // Instead it places stop event into timer queue
-    // This code ensures that timer is stopped
-    while(xTimerIsTimerActive(hTimer) == pdTRUE) furi_delay_tick(1);
-}
-
 void input_press_timer_callback(void* arg) {
     InputPinState* input_pin = arg;
     InputEvent event;
@@ -123,10 +109,12 @@ int32_t input_srv(void* p) {
                     input->counter++;
                     input->pin_states[i].counter = input->counter;
                     event.sequence_counter = input->pin_states[i].counter;
-                    input_timer_start(input->pin_states[i].press_timer, INPUT_PRESS_TICKS);
+                    furi_timer_start(input->pin_states[i].press_timer, INPUT_PRESS_TICKS);
                 } else {
                     event.sequence_counter = input->pin_states[i].counter;
-                    input_timer_stop(input->pin_states[i].press_timer);
+                    furi_timer_stop(input->pin_states[i].press_timer);
+                    while(furi_timer_is_running(input->pin_states[i].press_timer))
+                        furi_delay_tick(1);
                     if(input->pin_states[i].press_counter < INPUT_LONG_PRESS_COUNTS) {
                         event.type = InputTypeShort;
                         furi_pubsub_publish(input->event_pubsub, &event);
diff --git a/applications/services/loader/loader.c b/applications/services/loader/loader.c
index 53f70a1e..29ec86ac 100644
--- a/applications/services/loader/loader.c
+++ b/applications/services/loader/loader.c
@@ -179,7 +179,7 @@ static FlipperInternalApplication const* loader_find_application_by_name_in_list
     const FlipperInternalApplication* list,
     const uint32_t n_apps) {
     for(size_t i = 0; i < n_apps; i++) {
-        if(strcmp(name, list[i].name) == 0) {
+        if((strcmp(name, list[i].name) == 0) || (strcmp(name, list[i].appid) == 0)) {
             return &list[i];
         }
     }
diff --git a/applications/services/loader/loader.h b/applications/services/loader/loader.h
index 3da676e6..cca65628 100644
--- a/applications/services/loader/loader.h
+++ b/applications/services/loader/loader.h
@@ -29,7 +29,7 @@ typedef struct {
 /**
  * @brief Start application
  * @param[in] instance loader instance
- * @param[in] name application name
+ * @param[in] name application name or id
  * @param[in] args application arguments
  * @param[out] error_message detailed error message, can be NULL
  * @return LoaderStatus 
@@ -40,7 +40,7 @@ LoaderStatus
 /**
  * @brief Start application with GUI error message
  * @param[in] instance loader instance
- * @param[in] name application name
+ * @param[in] name application name or id
  * @param[in] args application arguments
  * @return LoaderStatus 
  */
diff --git a/applications/services/notification/notification_app.c b/applications/services/notification/notification_app.c
index 5769ced9..9baa738b 100644
--- a/applications/services/notification/notification_app.c
+++ b/applications/services/notification/notification_app.c
@@ -444,7 +444,7 @@ static bool notification_load_settings(NotificationApp* app) {
         storage_file_open(file, NOTIFICATION_SETTINGS_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
 
     if(fs_result) {
-        uint16_t bytes_count = storage_file_read(file, &settings, settings_size);
+        size_t bytes_count = storage_file_read(file, &settings, settings_size);
 
         if(bytes_count != settings_size) {
             fs_result = false;
@@ -488,7 +488,7 @@ static bool notification_save_settings(NotificationApp* app) {
         storage_file_open(file, NOTIFICATION_SETTINGS_PATH, FSAM_WRITE, FSOM_CREATE_ALWAYS);
 
     if(fs_result) {
-        uint16_t bytes_count = storage_file_write(file, &settings, settings_size);
+        size_t bytes_count = storage_file_write(file, &settings, settings_size);
 
         if(bytes_count != settings_size) {
             fs_result = false;
diff --git a/applications/services/rpc/rpc.c b/applications/services/rpc/rpc.c
index 3e9665ad..5880e7d9 100644
--- a/applications/services/rpc/rpc.c
+++ b/applications/services/rpc/rpc.c
@@ -6,7 +6,6 @@
 
 #include <storage.pb.h>
 #include <flipper.pb.h>
-#include <portmacro.h>
 
 #include <furi.h>
 
@@ -162,7 +161,7 @@ void rpc_session_set_terminated_callback(
  * odd: client sends close request and sends command after.
  */
 size_t
-    rpc_session_feed(RpcSession* session, uint8_t* encoded_bytes, size_t size, TickType_t timeout) {
+    rpc_session_feed(RpcSession* session, uint8_t* encoded_bytes, size_t size, uint32_t timeout) {
     furi_assert(session);
     furi_assert(encoded_bytes);
 
@@ -478,12 +477,15 @@ void rpc_send_and_release(RpcSession* session, PB_Main* message) {
 }
 
 void rpc_send_and_release_empty(RpcSession* session, uint32_t command_id, PB_CommandStatus status) {
+    furi_assert(session);
+
     PB_Main message = {
         .command_id = command_id,
         .command_status = status,
         .has_next = false,
         .which_content = PB_Main_empty_tag,
     };
+
     rpc_send_and_release(session, &message);
     pb_release(&PB_Main_msg, &message);
 }
diff --git a/applications/services/rpc/rpc.h b/applications/services/rpc/rpc.h
index d11fdc16..863bca35 100644
--- a/applications/services/rpc/rpc.h
+++ b/applications/services/rpc/rpc.h
@@ -124,7 +124,7 @@ void rpc_session_set_terminated_callback(
  *
  * @return              actually consumed bytes
  */
-size_t rpc_session_feed(RpcSession* session, uint8_t* buffer, size_t size, TickType_t timeout);
+size_t rpc_session_feed(RpcSession* session, uint8_t* buffer, size_t size, uint32_t timeout);
 
 /** Get available size of RPC buffer
  *
diff --git a/applications/services/rpc/rpc_app.c b/applications/services/rpc/rpc_app.c
index bf44ed2d..9af652da 100644
--- a/applications/services/rpc/rpc_app.c
+++ b/applications/services/rpc/rpc_app.c
@@ -10,49 +10,85 @@
 struct RpcAppSystem {
     RpcSession* session;
 
-    RpcAppSystemCallback app_callback;
-    void* app_context;
+    RpcAppSystemCallback callback;
+    void* callback_context;
 
-    RpcAppSystemDataExchangeCallback data_exchange_callback;
-    void* data_exchange_context;
+    uint32_t error_code;
+    char* error_text;
 
-    PB_Main* state_msg;
-    PB_Main* error_msg;
-
-    uint32_t last_id;
-    char* last_data;
+    uint32_t last_command_id;
+    RpcAppSystemEventType last_event_type;
 };
 
 #define RPC_SYSTEM_APP_TEMP_ARGS_SIZE 16
 
+static void rpc_system_app_send_state_response(
+    RpcAppSystem* rpc_app,
+    PB_App_AppState state,
+    const char* name) {
+    PB_Main* response = malloc(sizeof(PB_Main));
+
+    response->which_content = PB_Main_app_state_response_tag;
+    response->content.app_state_response.state = state;
+
+    FURI_LOG_D(TAG, "%s", name);
+    rpc_send(rpc_app->session, response);
+
+    free(response);
+}
+
+static void rpc_system_app_send_error_response(
+    RpcAppSystem* rpc_app,
+    uint32_t command_id,
+    PB_CommandStatus status,
+    const char* name) {
+    // Not describing all possible errors as only APP_NOT_RUNNING is used
+    const char* status_str = status == PB_CommandStatus_ERROR_APP_NOT_RUNNING ? "APP_NOT_RUNNING" :
+                                                                                "UNKNOWN";
+    FURI_LOG_E(TAG, "%s: %s, id %lu, status: %d", name, status_str, command_id, status);
+    rpc_send_and_release_empty(rpc_app->session, command_id, status);
+}
+
+static void rpc_system_app_set_last_command(
+    RpcAppSystem* rpc_app,
+    uint32_t command_id,
+    const RpcAppSystemEvent* event) {
+    furi_assert(rpc_app->last_command_id == 0);
+    furi_assert(rpc_app->last_event_type == RpcAppEventTypeInvalid);
+
+    rpc_app->last_command_id = command_id;
+    rpc_app->last_event_type = event->type;
+}
+
 static void rpc_system_app_start_process(const PB_Main* request, void* context) {
     furi_assert(request);
-    furi_assert(context);
-
     furi_assert(request->which_content == PB_Main_app_start_request_tag);
-    RpcAppSystem* rpc_app = context;
-    RpcSession* session = rpc_app->session;
-    rpc_system_app_error_reset(rpc_app);
-    furi_assert(session);
-    char args_temp[RPC_SYSTEM_APP_TEMP_ARGS_SIZE];
 
-    furi_assert(!rpc_app->last_id);
-    furi_assert(!rpc_app->last_data);
+    RpcAppSystem* rpc_app = context;
+    furi_assert(rpc_app);
+    furi_assert(rpc_app->last_command_id == 0);
+    furi_assert(rpc_app->last_event_type == RpcAppEventTypeInvalid);
 
     FURI_LOG_D(TAG, "StartProcess: id %lu", request->command_id);
 
-    PB_CommandStatus result;
-
     Loader* loader = furi_record_open(RECORD_LOADER);
     const char* app_name = request->content.app_start_request.name;
+
+    PB_CommandStatus result;
+
     if(app_name) {
+        rpc_system_app_error_reset(rpc_app);
+
+        char app_args_temp[RPC_SYSTEM_APP_TEMP_ARGS_SIZE];
         const char* app_args = request->content.app_start_request.args;
+
         if(app_args && strcmp(app_args, "RPC") == 0) {
             // If app is being started in RPC mode - pass RPC context via args string
-            snprintf(args_temp, RPC_SYSTEM_APP_TEMP_ARGS_SIZE, "RPC %08lX", (uint32_t)rpc_app);
-            app_args = args_temp;
+            snprintf(app_args_temp, RPC_SYSTEM_APP_TEMP_ARGS_SIZE, "RPC %08lX", (uint32_t)rpc_app);
+            app_args = app_args_temp;
         }
-        LoaderStatus status = loader_start(loader, app_name, app_args, NULL);
+
+        const LoaderStatus status = loader_start(loader, app_name, app_args, NULL);
         if(status == LoaderStatusErrorAppStarted) {
             result = PB_CommandStatus_ERROR_APP_SYSTEM_LOCKED;
         } else if(status == LoaderStatusErrorInternal) {
@@ -62,7 +98,7 @@ static void rpc_system_app_start_process(const PB_Main* request, void* context)
         } else if(status == LoaderStatusOk) {
             result = PB_CommandStatus_OK;
         } else {
-            furi_crash(NULL);
+            furi_crash();
         }
     } else {
         result = PB_CommandStatus_ERROR_INVALID_PARAMETERS;
@@ -71,266 +107,271 @@ static void rpc_system_app_start_process(const PB_Main* request, void* context)
     furi_record_close(RECORD_LOADER);
 
     FURI_LOG_D(TAG, "StartProcess: response id %lu, result %d", request->command_id, result);
-    rpc_send_and_release_empty(session, request->command_id, result);
+    rpc_send_and_release_empty(rpc_app->session, request->command_id, result);
 }
 
 static void rpc_system_app_lock_status_process(const PB_Main* request, void* context) {
     furi_assert(request);
-    furi_assert(context);
-
     furi_assert(request->which_content == PB_Main_app_lock_status_request_tag);
+
     RpcAppSystem* rpc_app = context;
+    furi_assert(rpc_app);
+
     rpc_system_app_error_reset(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
 
     FURI_LOG_D(TAG, "LockStatus");
 
+    PB_Main* response = malloc(sizeof(PB_Main));
+
+    response->command_id = request->command_id;
+    response->which_content = PB_Main_app_lock_status_response_tag;
+
     Loader* loader = furi_record_open(RECORD_LOADER);
-
-    PB_Main response = {
-        .has_next = false,
-        .command_status = PB_CommandStatus_OK,
-        .command_id = request->command_id,
-        .which_content = PB_Main_app_lock_status_response_tag,
-    };
-
-    response.content.app_lock_status_response.locked = loader_is_locked(loader);
-
+    response->content.app_lock_status_response.locked = loader_is_locked(loader);
     furi_record_close(RECORD_LOADER);
 
     FURI_LOG_D(TAG, "LockStatus: response");
-    rpc_send_and_release(session, &response);
-    pb_release(&PB_Main_msg, &response);
+    rpc_send_and_release(rpc_app->session, response);
+
+    free(response);
 }
 
 static void rpc_system_app_exit_request(const PB_Main* request, void* context) {
     furi_assert(request);
-    furi_assert(context);
-
     furi_assert(request->which_content == PB_Main_app_exit_request_tag);
+
     RpcAppSystem* rpc_app = context;
-    rpc_system_app_error_reset(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
+    furi_assert(rpc_app);
 
-    PB_CommandStatus status;
-
-    if(rpc_app->app_callback) {
+    if(rpc_app->callback) {
         FURI_LOG_D(TAG, "ExitRequest: id %lu", request->command_id);
-        furi_assert(!rpc_app->last_id);
-        furi_assert(!rpc_app->last_data);
-        rpc_app->last_id = request->command_id;
-        rpc_app->app_callback(RpcAppEventAppExit, rpc_app->app_context);
+
+        const RpcAppSystemEvent event = {
+            .type = RpcAppEventTypeAppExit,
+            .data =
+                {
+                    .type = RpcAppSystemEventDataTypeNone,
+                    {0},
+                },
+        };
+
+        rpc_system_app_error_reset(rpc_app);
+        rpc_system_app_set_last_command(rpc_app, request->command_id, &event);
+
+        rpc_app->callback(&event, rpc_app->callback_context);
+
     } else {
-        status = PB_CommandStatus_ERROR_APP_NOT_RUNNING;
-        FURI_LOG_E(
-            TAG, "ExitRequest: APP_NOT_RUNNING, id %lu, status: %d", request->command_id, status);
-        rpc_send_and_release_empty(session, request->command_id, status);
+        rpc_system_app_send_error_response(
+            rpc_app, request->command_id, PB_CommandStatus_ERROR_APP_NOT_RUNNING, "ExitRequest");
     }
 }
 
 static void rpc_system_app_load_file(const PB_Main* request, void* context) {
     furi_assert(request);
-    furi_assert(context);
-
     furi_assert(request->which_content == PB_Main_app_load_file_request_tag);
-    RpcAppSystem* rpc_app = context;
-    rpc_system_app_error_reset(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
 
-    PB_CommandStatus status;
-    if(rpc_app->app_callback) {
+    RpcAppSystem* rpc_app = context;
+    furi_assert(rpc_app);
+
+    if(rpc_app->callback) {
         FURI_LOG_D(TAG, "LoadFile: id %lu", request->command_id);
-        furi_assert(!rpc_app->last_id);
-        furi_assert(!rpc_app->last_data);
-        rpc_app->last_id = request->command_id;
-        rpc_app->last_data = strdup(request->content.app_load_file_request.path);
-        rpc_app->app_callback(RpcAppEventLoadFile, rpc_app->app_context);
+
+        const RpcAppSystemEvent event = {
+            .type = RpcAppEventTypeLoadFile,
+            .data =
+                {
+                    .type = RpcAppSystemEventDataTypeString,
+                    .string = request->content.app_load_file_request.path,
+                },
+        };
+
+        rpc_system_app_error_reset(rpc_app);
+        rpc_system_app_set_last_command(rpc_app, request->command_id, &event);
+
+        rpc_app->callback(&event, rpc_app->callback_context);
+
     } else {
-        status = PB_CommandStatus_ERROR_APP_NOT_RUNNING;
-        FURI_LOG_E(
-            TAG, "LoadFile: APP_NOT_RUNNING, id %lu, status: %d", request->command_id, status);
-        rpc_send_and_release_empty(session, request->command_id, status);
+        rpc_system_app_send_error_response(
+            rpc_app, request->command_id, PB_CommandStatus_ERROR_APP_NOT_RUNNING, "LoadFile");
     }
 }
 
 static void rpc_system_app_button_press(const PB_Main* request, void* context) {
     furi_assert(request);
-    furi_assert(context);
-
     furi_assert(request->which_content == PB_Main_app_button_press_request_tag);
-    RpcAppSystem* rpc_app = context;
-    rpc_system_app_error_reset(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
 
-    PB_CommandStatus status;
-    if(rpc_app->app_callback) {
+    RpcAppSystem* rpc_app = context;
+    furi_assert(rpc_app);
+
+    if(rpc_app->callback) {
         FURI_LOG_D(TAG, "ButtonPress");
-        furi_assert(!rpc_app->last_id);
-        furi_assert(!rpc_app->last_data);
-        rpc_app->last_id = request->command_id;
-        rpc_app->last_data = strdup(request->content.app_button_press_request.args);
-        rpc_app->app_callback(RpcAppEventButtonPress, rpc_app->app_context);
+
+        RpcAppSystemEvent event;
+        event.type = RpcAppEventTypeButtonPress;
+
+        if(strlen(request->content.app_button_press_request.args) != 0) {
+            event.data.type = RpcAppSystemEventDataTypeString;
+            event.data.string = request->content.app_button_press_request.args;
+        } else {
+            event.data.type = RpcAppSystemEventDataTypeInt32;
+            event.data.i32 = request->content.app_button_press_request.index;
+        }
+
+        rpc_system_app_error_reset(rpc_app);
+        rpc_system_app_set_last_command(rpc_app, request->command_id, &event);
+
+        rpc_app->callback(&event, rpc_app->callback_context);
+
     } else {
-        status = PB_CommandStatus_ERROR_APP_NOT_RUNNING;
-        FURI_LOG_E(
-            TAG, "ButtonPress: APP_NOT_RUNNING, id %lu, status: %d", request->command_id, status);
-        rpc_send_and_release_empty(session, request->command_id, status);
+        rpc_system_app_send_error_response(
+            rpc_app, request->command_id, PB_CommandStatus_ERROR_APP_NOT_RUNNING, "ButtonPress");
     }
 }
 
 static void rpc_system_app_button_release(const PB_Main* request, void* context) {
     furi_assert(request);
     furi_assert(request->which_content == PB_Main_app_button_release_request_tag);
-    furi_assert(context);
 
     RpcAppSystem* rpc_app = context;
-    rpc_system_app_error_reset(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
+    furi_assert(rpc_app);
 
-    PB_CommandStatus status;
-    if(rpc_app->app_callback) {
+    if(rpc_app->callback) {
         FURI_LOG_D(TAG, "ButtonRelease");
-        furi_assert(!rpc_app->last_id);
-        furi_assert(!rpc_app->last_data);
-        rpc_app->last_id = request->command_id;
-        rpc_app->app_callback(RpcAppEventButtonRelease, rpc_app->app_context);
+
+        const RpcAppSystemEvent event = {
+            .type = RpcAppEventTypeButtonRelease,
+            .data =
+                {
+                    .type = RpcAppSystemEventDataTypeNone,
+                    {0},
+                },
+        };
+
+        rpc_system_app_error_reset(rpc_app);
+        rpc_system_app_set_last_command(rpc_app, request->command_id, &event);
+
+        rpc_app->callback(&event, rpc_app->callback_context);
+
     } else {
-        status = PB_CommandStatus_ERROR_APP_NOT_RUNNING;
-        FURI_LOG_E(
-            TAG, "ButtonRelease: APP_NOT_RUNNING, id %lu, status: %d", request->command_id, status);
-        rpc_send_and_release_empty(session, request->command_id, status);
+        rpc_system_app_send_error_response(
+            rpc_app, request->command_id, PB_CommandStatus_ERROR_APP_NOT_RUNNING, "ButtonRelease");
     }
 }
 
 static void rpc_system_app_get_error_process(const PB_Main* request, void* context) {
     furi_assert(request);
     furi_assert(request->which_content == PB_Main_app_get_error_request_tag);
-    furi_assert(context);
 
     RpcAppSystem* rpc_app = context;
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
+    furi_assert(rpc_app);
 
-    rpc_app->error_msg->command_id = request->command_id;
+    PB_Main* response = malloc(sizeof(PB_Main));
+
+    response->command_id = request->command_id;
+    response->which_content = PB_Main_app_get_error_response_tag;
+    response->content.app_get_error_response.code = rpc_app->error_code;
+    response->content.app_get_error_response.text = rpc_app->error_text;
 
     FURI_LOG_D(TAG, "GetError");
-    rpc_send(session, rpc_app->error_msg);
+    rpc_send(rpc_app->session, response);
+
+    free(response);
 }
 
 static void rpc_system_app_data_exchange_process(const PB_Main* request, void* context) {
     furi_assert(request);
     furi_assert(request->which_content == PB_Main_app_data_exchange_request_tag);
-    furi_assert(context);
 
     RpcAppSystem* rpc_app = context;
-    rpc_system_app_error_reset(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
+    furi_assert(rpc_app);
 
-    PB_CommandStatus command_status;
-    pb_bytes_array_t* data = request->content.app_data_exchange_request.data;
+    if(rpc_app->callback) {
+        FURI_LOG_D(TAG, "DataExchange");
 
-    if(rpc_app->data_exchange_callback) {
-        uint8_t* data_bytes = NULL;
-        size_t data_size = 0;
-        if(data) {
-            data_bytes = data->bytes;
-            data_size = data->size;
-        }
-        rpc_app->data_exchange_callback(data_bytes, data_size, rpc_app->data_exchange_context);
-        command_status = PB_CommandStatus_OK;
+        const pb_bytes_array_t* data = request->content.app_data_exchange_request.data;
+
+        const RpcAppSystemEvent event = {
+            .type = RpcAppEventTypeDataExchange,
+            .data =
+                {
+                    .type = RpcAppSystemEventDataTypeBytes,
+                    .bytes =
+                        {
+                            .ptr = data ? data->bytes : NULL,
+                            .size = data ? data->size : 0,
+                        },
+                },
+        };
+
+        rpc_system_app_error_reset(rpc_app);
+        rpc_system_app_set_last_command(rpc_app, request->command_id, &event);
+
+        rpc_app->callback(&event, rpc_app->callback_context);
     } else {
-        command_status = PB_CommandStatus_ERROR_APP_CMD_ERROR;
+        rpc_system_app_send_error_response(
+            rpc_app, request->command_id, PB_CommandStatus_ERROR_APP_NOT_RUNNING, "DataExchange");
     }
-
-    FURI_LOG_D(TAG, "DataExchange");
-    rpc_send_and_release_empty(session, request->command_id, command_status);
 }
 
 void rpc_system_app_send_started(RpcAppSystem* rpc_app) {
     furi_assert(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
-
-    rpc_app->state_msg->content.app_state_response.state = PB_App_AppState_APP_STARTED;
-
-    FURI_LOG_D(TAG, "SendStarted");
-    rpc_send(session, rpc_app->state_msg);
+    rpc_system_app_send_state_response(rpc_app, PB_App_AppState_APP_STARTED, "SendStarted");
 }
 
 void rpc_system_app_send_exited(RpcAppSystem* rpc_app) {
     furi_assert(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
-
-    rpc_app->state_msg->content.app_state_response.state = PB_App_AppState_APP_CLOSED;
-
-    FURI_LOG_D(TAG, "SendExit");
-    rpc_send(session, rpc_app->state_msg);
+    rpc_system_app_send_state_response(rpc_app, PB_App_AppState_APP_CLOSED, "SendExit");
 }
 
-const char* rpc_system_app_get_data(RpcAppSystem* rpc_app) {
+void rpc_system_app_confirm(RpcAppSystem* rpc_app, bool result) {
     furi_assert(rpc_app);
-    furi_assert(rpc_app->last_data);
-    return rpc_app->last_data;
-}
+    furi_assert(rpc_app->last_command_id != 0);
+    /* Ensure that only commands of these types can be confirmed */
+    furi_assert(
+        rpc_app->last_event_type == RpcAppEventTypeAppExit ||
+        rpc_app->last_event_type == RpcAppEventTypeLoadFile ||
+        rpc_app->last_event_type == RpcAppEventTypeButtonPress ||
+        rpc_app->last_event_type == RpcAppEventTypeButtonRelease ||
+        rpc_app->last_event_type == RpcAppEventTypeDataExchange);
 
-void rpc_system_app_confirm(RpcAppSystem* rpc_app, RpcAppSystemEvent event, bool result) {
-    furi_assert(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
-    furi_assert(rpc_app->last_id);
+    const uint32_t last_command_id = rpc_app->last_command_id;
+    const RpcAppSystemEventType last_event_type = rpc_app->last_event_type;
 
-    PB_CommandStatus status = result ? PB_CommandStatus_OK : PB_CommandStatus_ERROR_APP_CMD_ERROR;
+    rpc_app->last_command_id = 0;
+    rpc_app->last_event_type = RpcAppEventTypeInvalid;
 
-    uint32_t last_id = 0;
-    switch(event) {
-    case RpcAppEventAppExit:
-    case RpcAppEventLoadFile:
-    case RpcAppEventButtonPress:
-    case RpcAppEventButtonRelease:
-        last_id = rpc_app->last_id;
-        rpc_app->last_id = 0;
-        if(rpc_app->last_data) {
-            free(rpc_app->last_data);
-            rpc_app->last_data = NULL;
-        }
-        FURI_LOG_D(TAG, "AppConfirm: event %d last_id %lu status %d", event, last_id, status);
-        rpc_send_and_release_empty(session, last_id, status);
-        break;
-    default:
-        furi_crash("RPC App state programming Error");
-        break;
-    }
+    const PB_CommandStatus status = result ? PB_CommandStatus_OK :
+                                             PB_CommandStatus_ERROR_APP_CMD_ERROR;
+    FURI_LOG_D(
+        TAG,
+        "AppConfirm: event %d last_id %lu status %d",
+        last_event_type,
+        last_command_id,
+        status);
+
+    rpc_send_and_release_empty(rpc_app->session, last_command_id, status);
 }
 
 void rpc_system_app_set_callback(RpcAppSystem* rpc_app, RpcAppSystemCallback callback, void* ctx) {
     furi_assert(rpc_app);
 
-    rpc_app->app_callback = callback;
-    rpc_app->app_context = ctx;
+    rpc_app->callback = callback;
+    rpc_app->callback_context = ctx;
 }
 
 void rpc_system_app_set_error_code(RpcAppSystem* rpc_app, uint32_t error_code) {
     furi_assert(rpc_app);
-    PB_App_GetErrorResponse* content = &rpc_app->error_msg->content.app_get_error_response;
-    content->code = error_code;
+    rpc_app->error_code = error_code;
 }
 
 void rpc_system_app_set_error_text(RpcAppSystem* rpc_app, const char* error_text) {
     furi_assert(rpc_app);
-    PB_App_GetErrorResponse* content = &rpc_app->error_msg->content.app_get_error_response;
 
-    if(content->text) {
-        free(content->text);
+    if(rpc_app->error_text) {
+        free(rpc_app->error_text);
     }
 
-    content->text = error_text ? strdup(error_text) : NULL;
+    rpc_app->error_text = error_text ? strdup(error_text) : NULL;
 }
 
 void rpc_system_app_error_reset(RpcAppSystem* rpc_app) {
@@ -340,29 +381,13 @@ void rpc_system_app_error_reset(RpcAppSystem* rpc_app) {
     rpc_system_app_set_error_text(rpc_app, NULL);
 }
 
-void rpc_system_app_set_data_exchange_callback(
-    RpcAppSystem* rpc_app,
-    RpcAppSystemDataExchangeCallback callback,
-    void* ctx) {
-    furi_assert(rpc_app);
-
-    rpc_app->data_exchange_callback = callback;
-    rpc_app->data_exchange_context = ctx;
-}
-
 void rpc_system_app_exchange_data(RpcAppSystem* rpc_app, const uint8_t* data, size_t data_size) {
     furi_assert(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
 
-    PB_Main message = {
-        .command_id = 0,
-        .command_status = PB_CommandStatus_OK,
-        .has_next = false,
-        .which_content = PB_Main_app_data_exchange_request_tag,
-    };
+    PB_Main* request = malloc(sizeof(PB_Main));
 
-    PB_App_DataExchangeRequest* content = &message.content.app_data_exchange_request;
+    request->which_content = PB_Main_app_data_exchange_request_tag;
+    PB_App_DataExchangeRequest* content = &request->content.app_data_exchange_request;
 
     if(data && data_size) {
         content->data = malloc(PB_BYTES_ARRAY_T_ALLOCSIZE(data_size));
@@ -372,7 +397,9 @@ void rpc_system_app_exchange_data(RpcAppSystem* rpc_app, const uint8_t* data, si
         content->data = NULL;
     }
 
-    rpc_send_and_release(session, &message);
+    rpc_send_and_release(rpc_app->session, request);
+
+    free(request);
 }
 
 void* rpc_system_app_alloc(RpcSession* session) {
@@ -381,18 +408,6 @@ void* rpc_system_app_alloc(RpcSession* session) {
     RpcAppSystem* rpc_app = malloc(sizeof(RpcAppSystem));
     rpc_app->session = session;
 
-    // App exit message
-    rpc_app->state_msg = malloc(sizeof(PB_Main));
-    rpc_app->state_msg->which_content = PB_Main_app_state_response_tag;
-    rpc_app->state_msg->command_status = PB_CommandStatus_OK;
-
-    // App error message
-    rpc_app->error_msg = malloc(sizeof(PB_Main));
-    rpc_app->error_msg->which_content = PB_Main_app_get_error_response_tag;
-    rpc_app->error_msg->command_status = PB_CommandStatus_OK;
-    rpc_app->error_msg->content.app_get_error_response.code = 0;
-    rpc_app->error_msg->content.app_get_error_response.text = NULL;
-
     RpcHandler rpc_handler = {
         .message_handler = NULL,
         .decode_submessage = NULL,
@@ -429,24 +444,24 @@ void* rpc_system_app_alloc(RpcSession* session) {
 void rpc_system_app_free(void* context) {
     RpcAppSystem* rpc_app = context;
     furi_assert(rpc_app);
-    RpcSession* session = rpc_app->session;
-    furi_assert(session);
+    furi_assert(rpc_app->session);
 
-    if(rpc_app->app_callback) {
-        rpc_app->app_callback(RpcAppEventSessionClose, rpc_app->app_context);
+    if(rpc_app->callback) {
+        const RpcAppSystemEvent event = {
+            .type = RpcAppEventTypeSessionClose,
+            .data =
+                {
+                    .type = RpcAppSystemEventDataTypeNone,
+                    {0},
+                },
+        };
+
+        rpc_app->callback(&event, rpc_app->callback_context);
     }
 
-    while(rpc_app->app_callback) {
+    while(rpc_app->callback) {
         furi_delay_tick(1);
     }
 
-    furi_assert(!rpc_app->data_exchange_callback);
-
-    if(rpc_app->last_data) free(rpc_app->last_data);
-
-    pb_release(&PB_Main_msg, rpc_app->error_msg);
-
-    free(rpc_app->error_msg);
-    free(rpc_app->state_msg);
     free(rpc_app);
 }
diff --git a/applications/services/rpc/rpc_app.h b/applications/services/rpc/rpc_app.h
index d5c6fee9..4ee5a24d 100644
--- a/applications/services/rpc/rpc_app.h
+++ b/applications/services/rpc/rpc_app.h
@@ -1,45 +1,213 @@
+/**
+ * @file rpc_app.h
+ * @brief Application RPC subsystem interface.
+ *
+ * The application RPC subsystem provides facilities for interacting with applications,
+ * such as starting/stopping, passing parameters, sending commands and exchanging arbitrary data.
+ *
+ * All commands are handled asynchronously via a user-settable callback.
+ *
+ * For a complete description of message types handled in this subsystem,
+ * see https://github.com/flipperdevices/flipperzero-protobuf/blob/dev/application.proto
+ */
 #pragma once
+
 #include "rpc.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/**
+ * @brief Enumeration of possible event data types.
+ */
 typedef enum {
-    RpcAppEventSessionClose,
-    RpcAppEventAppExit,
-    RpcAppEventLoadFile,
-    RpcAppEventButtonPress,
-    RpcAppEventButtonRelease,
+    RpcAppSystemEventDataTypeNone, /**< No data is provided by the event. */
+    RpcAppSystemEventDataTypeString, /**< Event data contains a zero-terminated string. */
+    RpcAppSystemEventDataTypeInt32, /**< Event data contains a signed 32-bit integer. */
+    RpcAppSystemEventDataTypeBytes, /**< Event data contains zero or more bytes. */
+} RpcAppSystemEventDataType;
+
+/**
+ * @brief Event data structure, containing the type and associated data.
+ *
+ * All below fields except for type are valid only if the respective type is set.
+ */
+typedef struct {
+    RpcAppSystemEventDataType
+        type; /**< Type of the data. The meaning of other fields depends on this one. */
+    union {
+        const char* string; /**< Pointer to a zero-terminated character string. */
+        int32_t i32; /**< Signed 32-bit integer value. */
+        struct {
+            const uint8_t* ptr; /**< Pointer to the byte array data. */
+            size_t size; /**< Size of the byte array, in bytes. */
+        } bytes; /**< Byte array of arbitrary length. */
+    };
+} RpcAppSystemEventData;
+
+/**
+ * @brief Enumeration of possible event types.
+ */
+typedef enum {
+    /**
+     * @brief Denotes an invalid state.
+     *
+     * An event of this type shall never be passed into the callback.
+     */
+    RpcAppEventTypeInvalid,
+    /**
+     * @brief The client side has closed the session.
+     *
+     * After receiving this event, the RPC context is no more valid.
+     */
+    RpcAppEventTypeSessionClose,
+    /**
+     * @brief The client has requested the application to exit.
+     *
+     * The application must exit after receiving this command.
+     */
+    RpcAppEventTypeAppExit,
+    /**
+     * @brief The client has requested the application to load a file.
+     *
+     * This command's meaning is application-specific, i.e. the application might or
+     * might not require additional commands after loading a file to do anything useful.
+     */
+    RpcAppEventTypeLoadFile,
+    /**
+     * @brief The client has informed the application that a button has been pressed.
+     *
+     * This command's meaning is application-specific, e.g. to select a part of the
+     * previously loaded file or to invoke a particular function within the application.
+     */
+    RpcAppEventTypeButtonPress,
+    /**
+     * @brief The client has informed the application that a button has been released.
+     *
+     * This command's meaning is application-specific, e.g. to cease
+     * all activities to be conducted while a button is being pressed.
+     */
+    RpcAppEventTypeButtonRelease,
+    /**
+     * @brief The client has sent a byte array of arbitrary size.
+     *
+     * This command's purpose is bi-directional exchange of arbitrary raw data.
+     * Useful for implementing higher-level protocols while using the RPC as a transport layer.
+     */
+    RpcAppEventTypeDataExchange,
+} RpcAppSystemEventType;
+
+/**
+ * @brief RPC application subsystem event structure.
+ */
+typedef struct {
+    RpcAppSystemEventType type; /**< Type of the event. */
+    RpcAppSystemEventData data; /**< Data associated with the event. */
 } RpcAppSystemEvent;
 
-typedef void (*RpcAppSystemCallback)(RpcAppSystemEvent event, void* context);
-typedef void (
-    *RpcAppSystemDataExchangeCallback)(const uint8_t* data, size_t data_size, void* context);
+/**
+ * @brief Callback function type.
+ *
+ * A function of this type must be passed to rpc_system_app_set_callback() by the user code.
+ *
+ * @warning The event pointer is valid ONLY inside the callback function.
+ *
+ * @param[in] event pointer to the event object. Valid only inside the callback function.
+ * @param[in,out] context pointer to the user-defined context object.
+ */
+typedef void (*RpcAppSystemCallback)(const RpcAppSystemEvent* event, void* context);
 
+/**
+ * @brief RPC application subsystem opaque type declaration.
+ */
 typedef struct RpcAppSystem RpcAppSystem;
 
-void rpc_system_app_set_callback(RpcAppSystem* rpc_app, RpcAppSystemCallback callback, void* ctx);
+/**
+ * @brief Set the callback function for use by an RpcAppSystem instance.
+ *
+ * @param[in,out] rpc_app pointer to the instance to be configured.
+ * @param[in] callback pointer to the function to be called upon message reception.
+ * @param[in,out] context pointer to the user-defined context object. Will be passed to the callback.
+ */
+void rpc_system_app_set_callback(
+    RpcAppSystem* rpc_app,
+    RpcAppSystemCallback callback,
+    void* context);
 
+/**
+ * @brief Send a notification that an RpcAppSystem instance has been started and is ready.
+ *
+ * Call this function once right after acquiring an RPC context and setting the callback.
+ *
+ * @param[in,out] rpc_app pointer to the instance to be used.
+ */
 void rpc_system_app_send_started(RpcAppSystem* rpc_app);
 
+/**
+ * @brief Send a notification that the application using an RpcAppSystem instance is about to exit.
+ *
+ * Call this function when the application is about to exit (usually in the *_free() function).
+ *
+ * @param[in,out] rpc_app pointer to the instance to be used.
+ */
 void rpc_system_app_send_exited(RpcAppSystem* rpc_app);
 
-const char* rpc_system_app_get_data(RpcAppSystem* rpc_app);
-
-void rpc_system_app_confirm(RpcAppSystem* rpc_app, RpcAppSystemEvent event, bool result);
+/**
+ * @brief Send a confirmation that the application using an RpcAppSystem instance has handled the event.
+ *
+ * An explicit confirmation is required for the following event types:
+ * - RpcAppEventTypeAppExit
+ * - RpcAppEventTypeLoadFile
+ * - RpcAppEventTypeButtonPress
+ * - RpcAppEventTypeButtonRelease
+ * - RpcAppEventTypeDataExchange
+ *
+ * Not confirming these events will result in a client-side timeout.
+ *
+ * @param[in,out] rpc_app pointer to the instance to be used.
+ * @param[in] result whether the command was successfully handled or not (true for success).
+ */
+void rpc_system_app_confirm(RpcAppSystem* rpc_app, bool result);
 
+/**
+ * @brief Set the error code stored in an RpcAppSystem instance.
+ *
+ * The error code can be retrieved by the client at any time by using the GetError request.
+ * The error code value has no meaning within the subsystem, i.e. it is only passed through to the client.
+ *
+ * @param[in,out] rpc_app pointer to the instance to be modified.
+ * @param[in] error_code arbitrary error code to be set.
+ */
 void rpc_system_app_set_error_code(RpcAppSystem* rpc_app, uint32_t error_code);
 
+/**
+ * @brief Set the error text stored in an RpcAppSystem instance.
+ *
+ * The error text can be retrieved by the client at any time by using the GetError request.
+ * The text has no meaning within the subsystem, i.e. it is only passed through to the client.
+ *
+ * @param[in,out] rpc_app pointer to the instance to be modified.
+ * @param[in] error_text Pointer to a zero-terminated string containing the error text.
+ */
 void rpc_system_app_set_error_text(RpcAppSystem* rpc_app, const char* error_text);
 
+/**
+ * @brief Reset the error code and text stored in an RpcAppSystem instance.
+ *
+ * Resets the error code to 0 and error text to "" (empty string).
+ *
+ * @param[in,out] rpc_app pointer to the instance to be reset.
+ */
 void rpc_system_app_error_reset(RpcAppSystem* rpc_app);
 
-void rpc_system_app_set_data_exchange_callback(
-    RpcAppSystem* rpc_app,
-    RpcAppSystemDataExchangeCallback callback,
-    void* ctx);
-
+/**
+ * @brief Send a byte array of arbitrary data to the client using an RpcAppSystem instance.
+ *
+ * @param[in,out] rpc_app pointer to the instance to be used.
+ * @param[in] data pointer to the data buffer to be sent.
+ * @param[in] data_size size of the data buffer, in bytes.
+ */
 void rpc_system_app_exchange_data(RpcAppSystem* rpc_app, const uint8_t* data, size_t data_size);
 
 #ifdef __cplusplus
diff --git a/applications/services/rpc/rpc_cli.c b/applications/services/rpc/rpc_cli.c
index f1c139b5..4612752a 100644
--- a/applications/services/rpc/rpc_cli.c
+++ b/applications/services/rpc/rpc_cli.c
@@ -2,7 +2,6 @@
 #include <furi.h>
 #include <rpc/rpc.h>
 #include <furi_hal.h>
-#include <semphr.h>
 
 #define TAG "RpcCli"
 
diff --git a/applications/services/rpc/rpc_storage.c b/applications/services/rpc/rpc_storage.c
index ee024b82..913d89f1 100644
--- a/applications/services/rpc/rpc_storage.c
+++ b/applications/services/rpc/rpc_storage.c
@@ -466,7 +466,7 @@ static void rpc_system_storage_write_process(const PB_Main* request, void* conte
            request->content.storage_write_request.file.data->size) {
             uint8_t* buffer = request->content.storage_write_request.file.data->bytes;
             size_t buffer_size = request->content.storage_write_request.file.data->size;
-            uint16_t written_size = storage_file_write(file, buffer, buffer_size);
+            size_t written_size = storage_file_write(file, buffer, buffer_size);
             fs_operation_success = (written_size == buffer_size);
         }
 
diff --git a/applications/services/storage/filesystem_api_internal.h b/applications/services/storage/filesystem_api_internal.h
index 967d3bb4..ba98b380 100644
--- a/applications/services/storage/filesystem_api_internal.h
+++ b/applications/services/storage/filesystem_api_internal.h
@@ -165,6 +165,13 @@ typedef struct {
  *      @param total_space pointer to total space value
  *      @param free_space pointer to free space value
  *      @return FS_Error error info
+ *
+ *  @var FS_Common_Api::equivalent_path
+ *      @brief Test whether two paths are equivalent (e.g differing case on a case-insensitive fs)
+ *      @param path1 first path to be compared
+ *      @param path2 second path to be compared
+ *      @param truncate if set to true, compare only up to the path1's length
+ *      @return true if path1 and path2 are considered equivalent
  */
 typedef struct {
     FS_Error (*const stat)(void* context, const char* path, FileInfo* fileinfo);
@@ -175,6 +182,7 @@ typedef struct {
         const char* fs_path,
         uint64_t* total_space,
         uint64_t* free_space);
+    bool (*const equivalent_path)(const char* path1, const char* path2);
 } FS_Common_Api;
 
 /** Full filesystem api structure */
diff --git a/applications/services/storage/storage.h b/applications/services/storage/storage.h
index 1abc8ed0..20a371fc 100644
--- a/applications/services/storage/storage.h
+++ b/applications/services/storage/storage.h
@@ -1,4 +1,9 @@
+/**
+ * @file storage.h
+ * @brief APIs for working with storages, directories and files.
+ */
 #pragma once
+
 #include <stdint.h>
 #include "filesystem_api_defines.h"
 #include "storage_sd_api.h"
@@ -23,43 +28,62 @@ extern "C" {
 
 typedef struct Storage Storage;
 
-/** Allocates and initializes a file descriptor
- * @return File*
+/**
+ * @brief Allocate and initialize a file instance.
+ *
+ * @param storage pointer to a storage API instance.
+ * @return pointer to the created instance.
  */
 File* storage_file_alloc(Storage* storage);
 
-/** Frees the file descriptor. Closes the file if it was open.
+/**
+ * @brief Free the file instance.
+ *
+ * If the file was open, calling this function will close it automatically.
+ * @param file pointer to the file instance to be freed.
  */
 void storage_file_free(File* file);
 
+/**
+ * @brief Enumeration of events emitted by the storage through the PubSub system.
+ */
 typedef enum {
-    StorageEventTypeCardMount,
-    StorageEventTypeCardUnmount,
-    StorageEventTypeCardMountError,
-    StorageEventTypeFileClose,
-    StorageEventTypeDirClose,
+    StorageEventTypeCardMount, /**< SD card was mounted. */
+    StorageEventTypeCardUnmount, /**< SD card was unmounted. */
+    StorageEventTypeCardMountError, /**< An error occurred during mounting of an SD card. */
+    StorageEventTypeFileClose, /**< A file was closed. */
+    StorageEventTypeDirClose, /**< A directory was closed. */
 } StorageEventType;
 
+/**
+ * @brief Storage event (passed to the PubSub callback).
+ */
 typedef struct {
-    StorageEventType type;
+    StorageEventType type; /**< Type of the event. */
 } StorageEvent;
 
 /**
- * Get storage pubsub.
+ * @brief Get the storage pubsub instance.
+ *
  * Storage will send StorageEvent messages.
- * @param storage 
- * @return FuriPubSub* 
+ *
+ * @param storage pointer to a storage API instance.
+ * @return pointer to the pubsub instance.
  */
 FuriPubSub* storage_get_pubsub(Storage* storage);
 
 /******************* File Functions *******************/
 
-/** Opens an existing file or create a new one.
- * @param file pointer to file object.
- * @param path path to file 
- * @param access_mode access mode from FS_AccessMode 
+/**
+ * @brief Open an existing file or create a new one.
+ *
+ * @warning The calling code MUST call storage_file_close() even if the open operation had failed.
+ *
+ * @param file pointer to the file instance to be opened.
+ * @param path pointer to a zero-terminated string containing the path to the file to be opened.
+ * @param access_mode access mode from FS_AccessMode.
  * @param open_mode open mode from FS_OpenMode 
- * @return success flag. You need to close the file even if the open operation failed.
+ * @return true if the file was successfully opened, false otherwise.
  */
 bool storage_file_open(
     File* file,
@@ -67,202 +91,267 @@ bool storage_file_open(
     FS_AccessMode access_mode,
     FS_OpenMode open_mode);
 
-/** Close the file.
- * @param file pointer to a file object, the file object will be freed.
- * @return success flag
+/**
+ * @brief Close the file.
+ *
+ * @param file pointer to the file instance to be closed.
+ * @return true if the file was successfully closed, false otherwise.
  */
 bool storage_file_close(File* file);
 
-/** Tells if the file is open
- * @param file pointer to a file object
- * @return bool true if file is open
+/**
+ * @brief Check whether the file is open.
+ *
+ * @param file pointer to the file instance in question.
+ * @return true if the file is open, false otherwise.
  */
 bool storage_file_is_open(File* file);
 
-/** Tells if the file is a directory
- * @param file pointer to a file object
- * @return bool true if file is a directory
+/**
+ * @brief Check whether a file instance represents a directory.
+ *
+ * @param file pointer to the file instance in question.
+ * @return true if the file instance represents a directory, false otherwise.
  */
 bool storage_file_is_dir(File* file);
 
-/** Reads bytes from a file into a buffer
- * @param file pointer to file object.
- * @param buff pointer to a buffer, for reading
- * @param bytes_to_read how many bytes to read. Must be less than or equal to the size of the buffer.
- * @return uint16_t how many bytes were actually read
+/**
+ * @brief Read bytes from a file into a buffer.
+ *
+ * @param file pointer to the file instance to read from.
+ * @param buff pointer to the buffer to be filled with read data.
+ * @param bytes_to_read number of bytes to read. Must be less than or equal to the size of the buffer.
+ * @return actual number of bytes read (may be fewer than requested).
  */
-uint16_t storage_file_read(File* file, void* buff, uint16_t bytes_to_read);
+size_t storage_file_read(File* file, void* buff, size_t bytes_to_read);
 
-/** Writes bytes from a buffer to a file
- * @param file pointer to file object.
- * @param buff pointer to buffer, for writing
- * @param bytes_to_write how many bytes to write. Must be less than or equal to the size of the buffer.
- * @return uint16_t how many bytes were actually written
+/**
+ * @brief Write bytes from a buffer to a file.
+ *
+ * @param file pointer to the file instance to write into.
+ * @param buff pointer to the buffer containing the data to be written.
+ * @param bytes_to_write number of bytes to write. Must be less than or equal to the size of the buffer.
+ * @return actual number of bytes written (may be fewer than requested).
  */
-uint16_t storage_file_write(File* file, const void* buff, uint16_t bytes_to_write);
+size_t storage_file_write(File* file, const void* buff, size_t bytes_to_write);
 
-/** Moves the r/w pointer 
- * @param file pointer to file object.
- * @param offset offset to move the r/w pointer
- * @param from_start set an offset from the start or from the current position
+/**
+ * @brief Change the current access position in a file.
+ *
+ * @param file pointer to the file instance in question.
+ * @param offset access position offset (meaning depends on from_start parameter).
+ * @param from_start if true, set the access position relative to the file start, otherwise relative to the current position.
  * @return success flag
  */
 bool storage_file_seek(File* file, uint32_t offset, bool from_start);
 
-/** Gets the position of the r/w pointer 
- * @param file pointer to file object.
- * @return uint64_t position of the r/w pointer 
+/**
+ * @brief Get the current access position.
+ *
+ * @param file pointer to the file instance in question.
+ * @return current access position.
  */
 uint64_t storage_file_tell(File* file);
 
-/** Truncates the file size to the current position of the r/w pointer
- * @param file pointer to file object.
- * @return bool success flag
+/**
+ * @brief Truncate the file size to the current access position.
+ *
+ * @param file pointer to the file instance to be truncated.
+ * @return true if the file was successfully truncated, false otherwise.
  */
 bool storage_file_truncate(File* file);
 
-/** Gets the size of the file
- * @param file pointer to file object.
- * @return uint64_t size of the file
+/**
+ * @brief Get the file size.
+ *
+ * @param file pointer to the file instance in question.
+ * @return size of the file, in bytes.
  */
 uint64_t storage_file_size(File* file);
 
-/** Writes file cache to storage
- * @param file pointer to file object.
- * @return bool success flag
+/**
+ * @brief Synchronise the file cache with the actual storage.
+ *
+ * @param file pointer to the file instance in question.
+ * @return true if the file was successfully synchronised, false otherwise.
  */
 bool storage_file_sync(File* file);
 
-/** Checks that the r/w pointer is at the end of the file
- * @param file pointer to file object.
- * @return bool success flag
+/**
+ * @brief Check whether the current access position is at the end of the file.
+ *
+ * @param file pointer to a file instance in question.
+ * @return bool true if the current access position is at the end of the file, false otherwise.
  */
 bool storage_file_eof(File* file);
 
 /**
- * @brief Check that file exists
+ * @brief Check whether a file exists.
  * 
- * @param storage 
- * @param path 
- * @return true if file exists
+ * @param storage pointer to a storage API instance.
+ * @param path pointer to a zero-terminated string containing the path to the file in question.
+ * @return true if the file exists, false otherwise.
  */
 bool storage_file_exists(Storage* storage, const char* path);
 
 /**
- * @brief Copy data from one opened file to another opened file
- * Size bytes will be copied from current position of source file to current position of destination file
+ * @brief Copy data from a source file to the destination file.
+ *
+ * Both files must be opened prior to calling this function.
+ *
+ * The requested amount of bytes will be copied from the current access position
+ * in the source file to the current access position in the destination file.
  * 
- * @param source source file
- * @param destination destination file
- * @param size size of data to copy
- * @return bool success flag
+ * @param source pointer to a source file instance.
+ * @param destination pointer to a destination file instance.
+ * @param size data size to be copied, in bytes.
+ * @return true if the data was successfully copied, false otherwise.
  */
-bool storage_file_copy_to_file(File* source, File* destination, uint32_t size);
+bool storage_file_copy_to_file(File* source, File* destination, size_t size);
 
-/******************* Dir Functions *******************/
+/******************* Directory Functions *******************/
 
-/** Opens a directory to get objects from it
- * @param app pointer to the api
- * @param file pointer to file object.
- * @param path path to directory
- * @return bool success flag. You need to close the directory even if the open operation failed.
+/**
+ * @brief Open a directory.
+ *
+ * Opening a directory is necessary to be able to read its contents with storage_dir_read().
+ *
+ * @warning The calling code MUST call storage_dir_close() even if the open operation had failed.
+ *
+ * @param file pointer to a file instance representing the directory in question.
+ * @param path pointer to a zero-terminated string containing the path of the directory in question.
+ * @return true if the directory was successfully opened, false otherwise.
  */
 bool storage_dir_open(File* file, const char* path);
 
-/** Close the directory. Also free file handle structure and point it to the NULL.
- * @param file pointer to a file object.
- * @return bool success flag
+/**
+ * @brief Close the directory.
+ *
+ * @param file pointer to a file instance representing the directory in question.
+ * @return true if the directory was successfully closed, false otherwise.
  */
 bool storage_dir_close(File* file);
 
-/** Reads the next object in the directory
- * @param file pointer to file object.
- * @param fileinfo pointer to the read FileInfo, may be NULL
- * @param name pointer to name buffer, may be NULL
- * @param name_length name buffer length
- * @return success flag (if the next object does not exist, it also returns false and sets the file error id to FSE_NOT_EXIST)
+/**
+ * @brief Get the next item in the directory.
+ *
+ * If the next object does not exist, this function returns false as well
+ * and sets the file error id to FSE_NOT_EXIST.
+ *
+ * @param file pointer to a file instance representing the directory in question.
+ * @param fileinfo pointer to the FileInfo structure to contain the info (may be NULL).
+ * @param name pointer to the buffer to contain the name (may be NULL).
+ * @param name_length maximum capacity of the name buffer, in bytes.
+ * @return true if the next item was successfully read, false otherwise.
  */
 bool storage_dir_read(File* file, FileInfo* fileinfo, char* name, uint16_t name_length);
 
-/** Rewinds the read pointer to first item in the directory
- * @param file pointer to file object.
- * @return bool success flag
+/**
+ * @brief Change the access position to first item in the directory.
+ *
+ * @param file pointer to a file instance representing the directory in question.
+ * @return true if the access position was successfully changed, false otherwise.
  */
 bool storage_dir_rewind(File* file);
 
 /**
- * @brief Check that dir exists
+ * @brief Check whether a directory exists.
  * 
- * @param storage 
- * @param path 
- * @return bool 
+ * @param storage pointer to a storage API instance.
+ * @param path pointer to a zero-terminated string containing the path of the directory in question.
+ * @return true if the directory exists, false otherwise.
  */
 bool storage_dir_exists(Storage* storage, const char* path);
 
 /******************* Common Functions *******************/
 
-/** Retrieves unix timestamp of last access
+/**
+ * @brief Get the last access time in UNIX format.
  *
- * @param      storage    The storage instance
- * @param      path       path to file/directory
- * @param      timestamp  the timestamp pointer
- *
- * @return     FS_Error operation result
+ * @param storage pointer to a storage API instance.
+ * @param path pointer to a zero-terminated string containing the path of the item in question.
+ * @param timestamp pointer to a value to contain the timestamp.
+ * @return FSE_OK if the timestamp has been successfully received, any other error code on failure.
  */
 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
- * @param fileinfo pointer to the read FileInfo, may be NULL
- * @return FS_Error operation result
+/**
+ * @brief Get information about a file or a directory.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param path pointer to a zero-terminated string containing the path of the item in question.
+ * @param fileinfo pointer to the FileInfo structure to contain the info (may be NULL).
+ * @return FSE_OK if the info has been successfully received, any other error code on failure.
  */
 FS_Error storage_common_stat(Storage* storage, const char* path, FileInfo* fileinfo);
 
-/** Removes a file/directory from the repository, the directory must be empty and the file/directory must not be open
- * @param app pointer to the api
- * @param path 
- * @return FS_Error operation result
+/**
+ * @brief Remove a file or a directory.
+ *
+ * The directory must be empty.
+ * The file or the directory must NOT be open.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param path pointer to a zero-terminated string containing the path of the item to be removed.
+ * @return FSE_OK if the file or directory has been successfully removed, any other error code on failure.
  */
 FS_Error storage_common_remove(Storage* storage, const char* path);
 
-/** Renames file/directory, file/directory must not be open. Will overwrite existing file.
- * @param app pointer to the api
- * @param old_path old path
- * @param new_path new path
- * @return FS_Error operation result
+/**
+ * @brief Rename a file or a directory.
+ *
+ * The file or the directory must NOT be open.
+ * Will overwrite the destination file if it already exists.
+ *
+ * Renaming a regular file to itself does nothing and always succeeds.
+ * Renaming a directory to itself or to a subdirectory of itself always fails.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param old_path pointer to a zero-terminated string containing the source path.
+ * @param new_path pointer to a zero-terminated string containing the destination path.
+ * @return FSE_OK if the file or directory has been successfully renamed, any other error code on failure.
  */
 FS_Error storage_common_rename(Storage* storage, const char* old_path, const char* new_path);
 
-/** Copy file, file must not be open
- * @param app pointer to the api
- * @param old_path old path
- * @param new_path new path
- * @return FS_Error operation result
+/**
+ * @brief Copy the file to a new location.
+ *
+ * The file must NOT be open at the time of calling this function.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param old_path pointer to a zero-terminated string containing the source path.
+ * @param new_path pointer to a zero-terminated string containing the destination path.
+ * @return FSE_OK if the file has been successfully copied, any other error code on failure.
  */
 FS_Error storage_common_copy(Storage* storage, const char* old_path, const char* new_path);
 
-/** Copy one folder contents into another with rename of all conflicting files
- * @param app pointer to the api
- * @param old_path old path
- * @param new_path new path
- * @return FS_Error operation result
+/**
+ * @brief Copy the contents of one directory into another and rename all conflicting files.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param old_path pointer to a zero-terminated string containing the source path.
+ * @param new_path pointer to a zero-terminated string containing the destination path.
+ * @return FSE_OK if the directories have been successfully merged, any other error code on failure.
  */
 FS_Error storage_common_merge(Storage* storage, const char* old_path, const char* new_path);
 
-/** Creates a directory
- * @param app pointer to the api
- * @param path directory path
- * @return FS_Error operation result
+/**
+ * @brief Create a directory.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param fs_path pointer to a zero-terminated string containing the directory path.
+ * @return FSE_OK if the directory has been successfully created, any other error code on failure.
  */
 FS_Error storage_common_mkdir(Storage* storage, const char* path);
 
-/** Gets general information about the storage
- * @param app pointer to the api
- * @param fs_path the path to the storage of interest
- * @param total_space pointer to total space record, will be filled
- * @param free_space pointer to free space record, will be filled
- * @return FS_Error operation result
+/**
+ * @brief Get the general information about the storage.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param fs_path pointer to a zero-terminated string containing the path to the storage question.
+ * @param total_space pointer to the value to contain the total capacity, in bytes.
+ * @param free_space pointer to the value to contain the available space, in bytes.
+ * @return FSE_OK if the information has been successfully received, any other error code on failure.
  */
 FS_Error storage_common_fs_info(
     Storage* storage,
@@ -271,150 +360,242 @@ FS_Error storage_common_fs_info(
     uint64_t* free_space);
 
 /**
- * @brief Parse aliases in path and replace them with real path
- * Also will create special folders if they are not exist
+ * @brief Parse aliases in a path and replace them with the real path.
+ *
+ * Necessary special directories will be created automatically if they did not exist.
  * 
- * @param storage 
- * @param path 
- * @return bool 
+ * @param storage pointer to a storage API instance.
+ * @param path pointer to a zero-terminated string containing the path in question.
+ * @return true if the path was successfully resolved, false otherwise.
  */
 void storage_common_resolve_path_and_ensure_app_directory(Storage* storage, FuriString* path);
 
 /**
- * @brief Move content of one folder to another, with rename of all conflicting files. 
- * Source folder will be deleted if the migration is successful.
+ * @brief Move the contents of source folder to destination one and rename all conflicting files.
+ *
+ * Source folder will be deleted if the migration was successful.
  * 
- * @param storage 
- * @param source 
- * @param dest 
- * @return FS_Error 
+ * @param storage pointer to a storage API instance.
+ * @param source pointer to a zero-terminated string containing the source path.
+ * @param dest pointer to a zero-terminated string containing the destination path.
+ * @return FSE_OK if the migration was successfull completed, any other error code on failure.
  */
 FS_Error storage_common_migrate(Storage* storage, const char* source, const char* dest);
 
 /**
- * @brief Check that file or dir exists
+ * @brief Check whether a file or a directory exists.
  * 
- * @param storage 
- * @param path 
- * @return bool 
+ * @param storage pointer to a storage API instance.
+ * @param path pointer to a zero-terminated string containing the path in question.
+ * @return true if a file or a directory exists, false otherwise.
  */
 bool storage_common_exists(Storage* storage, const char* path);
 
+/**
+ * @brief Check whether two paths are equivalent.
+ *
+ * This function will resolve aliases and apply filesystem-specific
+ * rules to determine whether the two given paths are equivalent.
+ *
+ * Examples:
+ * - /int/text and /ext/test -> false (Different storages),
+ * - /int/Test and /int/test -> false (Case-sensitive storage),
+ * - /ext/Test and /ext/test -> true (Case-insensitive storage).
+ *
+ * If the truncate parameter is set to true, the second path will be
+ * truncated to be no longer than the first one. It is useful to determine
+ * whether path2 is a subdirectory of path1.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param path1 pointer to a zero-terminated string containing the first path.
+ * @param path2 pointer to a zero-terminated string containing the second path.
+ * @param truncate whether to truncate path2 to be no longer than path1.
+ * @return true if paths are equivalent, false otherwise.
+ */
+bool storage_common_equivalent_path(
+    Storage* storage,
+    const char* path1,
+    const char* path2,
+    bool truncate);
+
 /******************* Error Functions *******************/
 
-/** Retrieves the error text from the error id
- * @param error_id error id
- * @return const char* error text
+/**
+ * @brief Get the textual description of a numeric error identifer.
+ *
+ * @param error_id numeric identifier of the error in question.
+ * @return pointer to a statically allocated zero-terminated string containing the respective error text.
  */
 const char* storage_error_get_desc(FS_Error error_id);
 
-/** Retrieves the error id from the file object
- * @param file pointer to file object. Pointer must not point to NULL. YOU CANNOT RETRIEVE THE ERROR ID IF THE FILE HAS BEEN CLOSED
- * @return FS_Error error id
+/**
+ * @brief Get the numeric error identifier from a file instance.
+ *
+ * @warning It is not possible to get the error identifier after the file has been closed.
+ *
+ * @param file pointer to the file instance in question (must NOT be NULL).
+ * @return numeric identifier of the last error associated with the file instance.
  */
 FS_Error storage_file_get_error(File* file);
 
-/** Retrieves the internal (storage-specific) error id from the file object
- * @param file pointer to file object. Pointer must not point to NULL. YOU CANNOT RETRIEVE THE INTERNAL ERROR ID IF THE FILE HAS BEEN CLOSED
- * @return FS_Error error id
+/**
+ * @brief Get the internal (storage-specific) numeric error identifier from a file instance.
+ *
+ * @warning It is not possible to get the internal error identifier after the file has been closed.
+ *
+ * @param file pointer to the file instance in question (must NOT be NULL).
+ * @return numeric identifier of the last internal error associated with the file instance.
  */
 int32_t storage_file_get_internal_error(File* file);
 
-/** Retrieves the error text from the file object
- * @param file pointer to file object. Pointer must not point to NULL. YOU CANNOT RETRIEVE THE ERROR TEXT IF THE FILE HAS BEEN CLOSED
- * @return const char* error text
+/**
+ * @brief Get the textual description of a the last error associated with a file instance.
+ *
+ * @warning It is not possible to get the error text after the file has been closed.
+ *
+ * @param file pointer to the file instance in question (must NOT be NULL).
+ * @return pointer to a statically allocated zero-terminated string containing the respective error text.
  */
 const char* storage_file_get_error_desc(File* file);
 
 /******************* SD Card Functions *******************/
 
-/** Formats SD Card
- * @param api pointer to the api
- * @return FS_Error operation result
+/**
+ * @brief Format the SD Card.
+ *
+ * @param storage pointer to a storage API instance.
+ * @return FSE_OK if the card was successfully formatted, any other error code on failure.
  */
-FS_Error storage_sd_format(Storage* api);
+FS_Error storage_sd_format(Storage* storage);
 
-/** Will unmount the SD card.
- * Will return FSE_NOT_READY if the SD card is not mounted.
- * Will return FSE_DENIED if there are open files on the SD card.
- * @param api pointer to the api
- * @return FS_Error operation result
+/**
+ * @brief Unmount the SD card.
+ *
+ * These return values have special meaning:
+ * - FSE_NOT_READY if the SD card is not mounted.
+ * - FSE_DENIED if there are open files on the SD card.
+ *
+ * @param storage pointer to a storage API instance.
+ * @return FSE_OK if the card was successfully formatted, any other error code on failure.
  */
-FS_Error storage_sd_unmount(Storage* api);
+FS_Error storage_sd_unmount(Storage* storage);
 
-/** Will mount the SD card
- * @param api pointer to the api
- * @return FS_Error operation result
+/**
+ * @brief Mount the SD card.
+ *
+ * @param storage pointer to a storage API instance.
+ * @return FSE_OK if the card was successfully mounted, any other error code on failure.
  */
-FS_Error storage_sd_mount(Storage* api);
+FS_Error storage_sd_mount(Storage* storage);
 
-/** Retrieves SD card information
- * @param api pointer to the api
- * @param info pointer to the info
- * @return FS_Error operation result
+/**
+ * @brief Get SD card information.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param info pointer to the info object to contain the requested information.
+ * @return FSE_OK if the info was successfully received, any other error code on failure.
  */
-FS_Error storage_sd_info(Storage* api, SDInfo* info);
+FS_Error storage_sd_info(Storage* storage, SDInfo* info);
 
-/** Retrieves SD card status
- * @param api pointer to the api
- * @return FS_Error operation result
+/**
+ * @brief Get SD card status.
+ *
+ * @param storage pointer to a storage API instance.
+ * @return storage status in the form of a numeric error identifier.
  */
-FS_Error storage_sd_status(Storage* api);
+FS_Error storage_sd_status(Storage* storage);
 
 /******************* Internal LFS Functions *******************/
 
 typedef void (*Storage_name_converter)(FuriString*);
 
-/** Backs up internal storage to a tar archive
- * @param api pointer to the api
- * @param dstmane destination archive path
- * @return FS_Error operation result
+/**
+ * @brief Back up the internal storage contents to a *.tar archive.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param dstname pointer to a zero-terminated string containing the archive file path.
+ * @return FSE_OK if the storage was successfully backed up, any other error code on failure.
  */
-FS_Error storage_int_backup(Storage* api, const char* dstname);
+FS_Error storage_int_backup(Storage* storage, const char* dstname);
 
-/** Restores internal storage from a tar archive
- * @param api pointer to the api
- * @param dstmane archive path
- * @param converter pointer to filename conversion function, may be NULL
- * @return FS_Error operation result
+/**
+ * @brief Restore the internal storage contents from a *.tar archive.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param dstname pointer to a zero-terminated string containing the archive file path.
+ * @param converter pointer to a filename conversion function (may be NULL).
+ * @return FSE_OK if the storage was successfully restored, any other error code on failure.
  */
 FS_Error storage_int_restore(Storage* api, const char* dstname, Storage_name_converter converter);
 
 /***************** Simplified Functions ******************/
 
 /**
- * Removes a file/directory, the directory must be empty and the file/directory must not be open
- * @param storage pointer to the api
- * @param path 
- * @return true on success or if file/dir is not exist
+ * @brief Remove a file or a directory.
+ *
+ * The following conditions must be met:
+ * - the directory must be empty.
+ * - the file or the directory must NOT be open.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param path pointer to a zero-terminated string containing the item path.
+ * @return true on success or if the item does not exist, false otherwise.
  */
 bool storage_simply_remove(Storage* storage, const char* path);
 
 /**
- * Recursively removes a file/directory, the directory can be not empty
- * @param storage pointer to the api
- * @param path
- * @return true on success or if file/dir is not exist
+ * @brief Recursively remove a file or a directory.
+ *
+ * Unlike storage_simply_remove(), the directory does not need to be empty.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param path pointer to a zero-terminated string containing the item path.
+ * @return true on success or if the item does not exist, false otherwise.
  */
 bool storage_simply_remove_recursive(Storage* storage, const char* path);
 
 /**
- * Creates a directory
- * @param storage 
- * @param path 
- * @return true on success or if directory is already exist
+ * @brief Create a directory.
+ *
+ * @param storage pointer to a storage API instance.
+ * @param path pointer to a zero-terminated string containing the directory path.
+ * @return true on success or if directory does already exist, false otherwise.
  */
 bool storage_simply_mkdir(Storage* storage, const char* path);
 
 /**
- * @brief Get next free filename.
+ * @brief Get the next free filename in a directory.
+ *
+ * Usage example:
+ * ```c
+ * FuriString* file_name = furi_string_alloc();
+ * Storage* storage = furi_record_open(RECORD_STORAGE);
+ *
+ * storage_get_next_filename(storage,
+ *     "/ext/test",
+ *     "cookies",
+ *     ".yum",
+ *     20);
+ *
+ * furi_record_close(RECORD_STORAGE);
+ *
+ * use_file_name(file_name);
+ *
+ * furi_string_free(file_name);
+ * ```
+ * Possible file_name values after calling storage_get_next_filename():
+ * "cookies", "cookies1", "cookies2", ... etc depending on whether any of
+ * these files have already existed in the directory.
+ *
+ * @note If the resulting next file name length is greater than set by the max_len
+ * parameter, the original filename will be returned instead.
  * 
- * @param storage
- * @param dirname 
- * @param filename 
- * @param fileextension 
- * @param nextfilename return name
- * @param max_len  max len name
+ * @param storage pointer to a storage API instance.
+ * @param dirname pointer to a zero-terminated string containing the directory path.
+ * @param filename pointer to a zero-terminated string containing the file name.
+ * @param fileextension pointer to a zero-terminated string containing the file extension.
+ * @param nextfilename pointer to a dynamic string containing the resulting file name.
+ * @param max_len maximum length of the new name.
  */
 void storage_get_next_filename(
     Storage* storage,
diff --git a/applications/services/storage/storage_cli.c b/applications/services/storage/storage_cli.c
index 74bcf2d9..2927022a 100644
--- a/applications/services/storage/storage_cli.c
+++ b/applications/services/storage/storage_cli.c
@@ -198,15 +198,15 @@ static void storage_cli_read(Cli* cli, FuriString* path) {
     File* file = storage_file_alloc(api);
 
     if(storage_file_open(file, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
-        const uint16_t buffer_size = 128;
-        uint16_t read_size = 0;
+        const size_t buffer_size = 128;
+        size_t read_size = 0;
         uint8_t* data = malloc(buffer_size);
 
         printf("Size: %lu\r\n", (uint32_t)storage_file_size(file));
 
         do {
             read_size = storage_file_read(file, data, buffer_size);
-            for(uint16_t i = 0; i < read_size; i++) {
+            for(size_t i = 0; i < read_size; i++) {
                 printf("%c", data[i]);
             }
         } while(read_size > 0);
@@ -227,7 +227,7 @@ static void storage_cli_write(Cli* cli, FuriString* path) {
     Storage* api = furi_record_open(RECORD_STORAGE);
     File* file = storage_file_alloc(api);
 
-    const uint16_t buffer_size = 512;
+    const size_t buffer_size = 512;
     uint8_t* buffer = malloc(buffer_size);
 
     if(storage_file_open(file, furi_string_get_cstr(path), FSAM_WRITE, FSOM_OPEN_APPEND)) {
@@ -239,10 +239,10 @@ static void storage_cli_write(Cli* cli, FuriString* path) {
             uint8_t symbol = cli_getc(cli);
 
             if(symbol == CliSymbolAsciiETX) {
-                uint16_t write_size = read_index % buffer_size;
+                size_t write_size = read_index % buffer_size;
 
                 if(write_size > 0) {
-                    uint16_t written_size = storage_file_write(file, buffer, write_size);
+                    size_t written_size = storage_file_write(file, buffer, write_size);
 
                     if(written_size != write_size) {
                         storage_cli_print_error(storage_file_get_error(file));
@@ -257,7 +257,7 @@ static void storage_cli_write(Cli* cli, FuriString* path) {
             read_index++;
 
             if(((read_index % buffer_size) == 0)) {
-                uint16_t written_size = storage_file_write(file, buffer, buffer_size);
+                size_t written_size = storage_file_write(file, buffer, buffer_size);
 
                 if(written_size != buffer_size) {
                     storage_cli_print_error(storage_file_get_error(file));
@@ -289,7 +289,7 @@ static void storage_cli_read_chunks(Cli* cli, FuriString* path, FuriString* args
     } else if(storage_file_open(file, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
         uint64_t file_size = storage_file_size(file);
 
-        printf("Size: %lu\r\n", (uint32_t)file_size);
+        printf("Size: %llu\r\n", file_size);
 
         if(buffer_size) {
             uint8_t* data = malloc(buffer_size);
@@ -297,8 +297,8 @@ static void storage_cli_read_chunks(Cli* cli, FuriString* path, FuriString* args
                 printf("\r\nReady?\r\n");
                 cli_getc(cli);
 
-                uint16_t read_size = storage_file_read(file, data, buffer_size);
-                for(uint16_t i = 0; i < read_size; i++) {
+                size_t read_size = storage_file_read(file, data, buffer_size);
+                for(size_t i = 0; i < read_size; i++) {
                     putchar(data[i]);
                 }
                 file_size -= read_size;
@@ -333,11 +333,9 @@ static void storage_cli_write_chunk(Cli* cli, FuriString* path, FuriString* args
             if(buffer_size) {
                 uint8_t* buffer = malloc(buffer_size);
 
-                for(uint32_t i = 0; i < buffer_size; i++) {
-                    buffer[i] = cli_getc(cli);
-                }
+                size_t read_bytes = cli_read(cli, buffer, buffer_size);
 
-                uint16_t written_size = storage_file_write(file, buffer, buffer_size);
+                size_t written_size = storage_file_write(file, buffer, read_bytes);
 
                 if(written_size != buffer_size) {
                     storage_cli_print_error(storage_file_get_error(file));
diff --git a/applications/services/storage/storage_external_api.c b/applications/services/storage/storage_external_api.c
index ed69b49a..66609034 100644
--- a/applications/services/storage/storage_external_api.c
+++ b/applications/services/storage/storage_external_api.c
@@ -139,7 +139,7 @@ bool storage_file_close(File* file) {
     return S_RETURN_BOOL;
 }
 
-uint16_t storage_file_read(File* file, void* buff, uint16_t bytes_to_read) {
+static uint16_t storage_file_read_underlying(File* file, void* buff, uint16_t bytes_to_read) {
     if(bytes_to_read == 0) {
         return 0;
     }
@@ -159,7 +159,8 @@ uint16_t storage_file_read(File* file, void* buff, uint16_t bytes_to_read) {
     return S_RETURN_UINT16;
 }
 
-uint16_t storage_file_write(File* file, const void* buff, uint16_t bytes_to_write) {
+static uint16_t
+    storage_file_write_underlying(File* file, const void* buff, uint16_t bytes_to_write) {
     if(bytes_to_write == 0) {
         return 0;
     }
@@ -179,6 +180,40 @@ uint16_t storage_file_write(File* file, const void* buff, uint16_t bytes_to_writ
     return S_RETURN_UINT16;
 }
 
+size_t storage_file_read(File* file, void* buff, size_t to_read) {
+    size_t total = 0;
+
+    const size_t max_chunk = UINT16_MAX;
+    do {
+        const size_t chunk = MIN((to_read - total), max_chunk);
+        size_t read = storage_file_read_underlying(file, buff + total, chunk);
+        total += read;
+
+        if(storage_file_get_error(file) != FSE_OK || read != chunk) {
+            break;
+        }
+    } while(total != to_read);
+
+    return total;
+}
+
+size_t storage_file_write(File* file, const void* buff, size_t to_write) {
+    size_t total = 0;
+
+    const size_t max_chunk = UINT16_MAX;
+    do {
+        const size_t chunk = MIN((to_write - total), max_chunk);
+        size_t written = storage_file_write_underlying(file, buff + total, chunk);
+        total += written;
+
+        if(storage_file_get_error(file) != FSE_OK || written != chunk) {
+            break;
+        }
+    } while(total != to_write);
+
+    return total;
+}
+
 bool storage_file_seek(File* file, uint32_t offset, bool from_start) {
     S_FILE_API_PROLOGUE;
     S_API_PROLOGUE;
@@ -252,7 +287,7 @@ bool storage_file_exists(Storage* storage, const char* path) {
     return exist;
 }
 
-bool storage_file_copy_to_file(File* source, File* destination, uint32_t size) {
+bool storage_file_copy_to_file(File* source, File* destination, size_t size) {
     uint8_t* buffer = malloc(FILE_BUFFER_SIZE);
 
     while(size) {
@@ -431,17 +466,22 @@ FS_Error storage_common_rename(Storage* storage, const char* old_path, const cha
         }
 
         if(storage_dir_exists(storage, old_path)) {
-            FuriString* dir_path = furi_string_alloc_set_str(old_path);
-            if(!furi_string_end_with_str(dir_path, "/")) {
-                furi_string_cat_str(dir_path, "/");
-            }
-            const char* dir_path_s = furi_string_get_cstr(dir_path);
-            if(strncmp(new_path, dir_path_s, strlen(dir_path_s)) == 0) {
+            // Cannot overwrite a file with a directory
+            if(storage_file_exists(storage, new_path)) {
                 error = FSE_INVALID_NAME;
-                furi_string_free(dir_path);
                 break;
             }
-            furi_string_free(dir_path);
+
+            // Cannot rename a directory to itself or to a nested directory
+            if(storage_common_equivalent_path(storage, old_path, new_path, true)) {
+                error = FSE_INVALID_NAME;
+                break;
+            }
+
+            // Renaming a regular file to itself does nothing and always succeeds
+        } else if(storage_common_equivalent_path(storage, old_path, new_path, false)) {
+            error = FSE_OK;
+            break;
         }
 
         if(storage_file_exists(storage, new_path)) {
@@ -742,6 +782,27 @@ bool storage_common_exists(Storage* storage, const char* path) {
     return storage_common_stat(storage, path, &file_info) == FSE_OK;
 }
 
+bool storage_common_equivalent_path(
+    Storage* storage,
+    const char* path1,
+    const char* path2,
+    bool truncate) {
+    S_API_PROLOGUE;
+
+    SAData data = {
+        .cequivpath = {
+            .path1 = path1,
+            .path2 = path2,
+            .truncate = truncate,
+            .thread_id = furi_thread_get_current_id(),
+        }};
+
+    S_API_MESSAGE(StorageCommandCommonEquivalentPath);
+    S_API_EPILOGUE;
+
+    return S_RETURN_BOOL;
+}
+
 /****************** ERROR ******************/
 
 const char* storage_error_get_desc(FS_Error error_id) {
diff --git a/applications/services/storage/storage_message.h b/applications/services/storage/storage_message.h
index 01bc2038..cd45906d 100644
--- a/applications/services/storage/storage_message.h
+++ b/applications/services/storage/storage_message.h
@@ -69,6 +69,13 @@ typedef struct {
     FuriThreadId thread_id;
 } SADataCResolvePath;
 
+typedef struct {
+    const char* path1;
+    const char* path2;
+    bool truncate;
+    FuriThreadId thread_id;
+} SADataCEquivPath;
+
 typedef struct {
     uint32_t id;
 } SADataError;
@@ -99,6 +106,7 @@ typedef union {
     SADataCStat cstat;
     SADataCFSInfo cfsinfo;
     SADataCResolvePath cresolvepath;
+    SADataCEquivPath cequivpath;
 
     SADataError error;
 
@@ -142,6 +150,7 @@ typedef enum {
     StorageCommandSDStatus,
     StorageCommandCommonResolvePath,
     StorageCommandSDMount,
+    StorageCommandCommonEquivalentPath,
 } StorageCommand;
 
 typedef struct {
diff --git a/applications/services/storage/storage_processing.c b/applications/services/storage/storage_processing.c
index 00126af6..9e96765b 100644
--- a/applications/services/storage/storage_processing.c
+++ b/applications/services/storage/storage_processing.c
@@ -98,6 +98,12 @@ static FS_Error storage_get_data(Storage* app, FuriString* path, StorageData** s
     }
 }
 
+static void storage_path_trim_trailing_slashes(FuriString* path) {
+    while(furi_string_end_with(path, "/")) {
+        furi_string_left(path, furi_string_size(path) - 1);
+    }
+}
+
 /******************* File Functions *******************/
 
 bool storage_process_file_open(
@@ -357,6 +363,8 @@ static FS_Error storage_process_common_remove(Storage* app, FuriString* path) {
     FS_Error ret = storage_get_data(app, path, &storage);
 
     do {
+        if(ret != FSE_OK) break;
+
         if(storage_path_already_open(path, storage)) {
             ret = FSE_ALREADY_OPEN;
             break;
@@ -398,6 +406,31 @@ static FS_Error storage_process_common_fs_info(
     return ret;
 }
 
+static bool
+    storage_process_common_equivalent_path(Storage* app, FuriString* path1, FuriString* path2) {
+    bool ret = false;
+
+    do {
+        const StorageType storage_type1 = storage_get_type_by_path(path1);
+        const StorageType storage_type2 = storage_get_type_by_path(path2);
+
+        // Paths on different storages are of course not equal
+        if(storage_type1 != storage_type2) break;
+
+        StorageData* storage;
+        const FS_Error status = storage_get_data(app, path1, &storage);
+
+        if(status != FSE_OK) break;
+
+        FS_CALL(
+            storage,
+            common.equivalent_path(furi_string_get_cstr(path1), furi_string_get_cstr(path2)));
+
+    } while(false);
+
+    return ret;
+}
+
 /****************** Raw SD API ******************/
 // TODO FL-3521: think about implementing a custom storage API to split that kind of api linkage
 #include "storages/storage_ext.h"
@@ -649,6 +682,23 @@ void storage_process_message_internal(Storage* app, StorageMessage* message) {
             app, message->data->cresolvepath.path, message->data->cresolvepath.thread_id, true);
         break;
 
+    case StorageCommandCommonEquivalentPath: {
+        FuriString* path1 = furi_string_alloc_set(message->data->cequivpath.path1);
+        FuriString* path2 = furi_string_alloc_set(message->data->cequivpath.path2);
+        storage_path_trim_trailing_slashes(path1);
+        storage_path_trim_trailing_slashes(path2);
+        storage_process_alias(app, path1, message->data->cequivpath.thread_id, false);
+        storage_process_alias(app, path2, message->data->cequivpath.thread_id, false);
+        if(message->data->cequivpath.truncate) {
+            furi_string_left(path2, furi_string_size(path1));
+        }
+        message->return_data->bool_value =
+            storage_process_common_equivalent_path(app, path1, path2);
+        furi_string_free(path1);
+        furi_string_free(path2);
+        break;
+    }
+
     // SD operations
     case StorageCommandSDFormat:
         message->return_data->error_value = storage_process_sd_format(app);
diff --git a/applications/services/storage/storages/storage_ext.c b/applications/services/storage/storages/storage_ext.c
index 4630d99e..7e617c0f 100644
--- a/applications/services/storage/storages/storage_ext.c
+++ b/applications/services/storage/storages/storage_ext.c
@@ -596,6 +596,16 @@ static FS_Error storage_ext_common_fs_info(
 #endif
 }
 
+static bool storage_ext_common_equivalent_path(const char* path1, const char* path2) {
+#ifdef FURI_RAM_EXEC
+    UNUSED(path1);
+    UNUSED(path2);
+    return false;
+#else
+    return strcasecmp(path1, path2) == 0;
+#endif
+}
+
 /******************* Init Storage *******************/
 static const FS_Api fs_api = {
     .file =
@@ -624,6 +634,7 @@ static const FS_Api fs_api = {
             .mkdir = storage_ext_common_mkdir,
             .remove = storage_ext_common_remove,
             .fs_info = storage_ext_common_fs_info,
+            .equivalent_path = storage_ext_common_equivalent_path,
         },
 };
 
diff --git a/applications/services/storage/storages/storage_int.c b/applications/services/storage/storages/storage_int.c
index 2534d47a..39b092c1 100644
--- a/applications/services/storage/storages/storage_int.c
+++ b/applications/services/storage/storages/storage_int.c
@@ -686,6 +686,10 @@ static FS_Error storage_int_common_fs_info(
     return storage_int_parse_error(result);
 }
 
+static bool storage_int_common_equivalent_path(const char* path1, const char* path2) {
+    return strcmp(path1, path2) == 0;
+}
+
 /******************* Init Storage *******************/
 static const FS_Api fs_api = {
     .file =
@@ -714,6 +718,7 @@ static const FS_Api fs_api = {
             .mkdir = storage_int_common_mkdir,
             .remove = storage_int_common_remove,
             .fs_info = storage_int_common_fs_info,
+            .equivalent_path = storage_int_common_equivalent_path,
         },
 };
 
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_auth.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_auth.c
index be2ee482..b73fe347 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_auth.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_auth.c
@@ -68,7 +68,7 @@ bool desktop_settings_scene_pin_auth_on_event(void* context, SceneManagerEvent e
             } else if(state == SCENE_STATE_PIN_AUTH_DISABLE) {
                 scene_manager_next_scene(app->scene_manager, DesktopSettingsAppScenePinDisable);
             } else {
-                furi_assert(0);
+                furi_crash();
             }
             consumed = true;
             break;
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_error.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_error.c
index 508992ce..1ba3c1b2 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_error.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_error.c
@@ -39,7 +39,7 @@ void desktop_settings_scene_pin_error_on_enter(void* context) {
     } else if(state == SCENE_STATE_PIN_ERROR_WRONG) {
         desktop_view_pin_input_set_label_primary(app->pin_input_view, 35, 8, "Wrong PIN!");
     } else {
-        furi_assert(0);
+        furi_crash();
     }
     desktop_view_pin_input_set_label_secondary(app->pin_input_view, 0, 8, NULL);
     desktop_view_pin_input_set_label_button(app->pin_input_view, "Retry");
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto.c
index ec128246..31eec387 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto.c
@@ -32,7 +32,7 @@ bool desktop_settings_scene_pin_setup_howto_on_event(void* context, SceneManager
             consumed = true;
             break;
         default:
-            furi_crash(NULL);
+            furi_crash();
         }
     }
     return consumed;
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto2.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto2.c
index 44b8e1bf..0ebf85c6 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto2.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto2.c
@@ -52,7 +52,7 @@ bool desktop_settings_scene_pin_setup_howto2_on_event(void* context, SceneManage
             break;
         }
         default:
-            furi_crash(NULL);
+            furi_crash();
         }
     }
     return consumed;
diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark.c b/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark.c
index 8359c00b..a5bf1b9d 100644
--- a/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark.c
+++ b/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark.c
@@ -44,7 +44,7 @@ static bool storage_settings_scene_bench_write(
 }
 
 static bool
-    storage_settings_scene_bench_read(Storage* api, uint16_t size, uint8_t* data, uint32_t* speed) {
+    storage_settings_scene_bench_read(Storage* api, size_t size, uint8_t* data, uint32_t* speed) {
     File* file = storage_file_alloc(api);
     bool result = true;
     *speed = -1;
@@ -82,7 +82,7 @@ static void storage_settings_scene_benchmark(StorageSettings* app) {
         bench_data[i] = (uint8_t)i;
     }
 
-    uint16_t bench_size[BENCH_COUNT] = {1, 8, 32, 256, 512, 1024};
+    size_t bench_size[BENCH_COUNT] = {1, 8, 32, 256, 512, 1024};
     uint32_t bench_w_speed[BENCH_COUNT] = {0, 0, 0, 0, 0, 0};
     uint32_t bench_r_speed[BENCH_COUNT] = {0, 0, 0, 0, 0, 0};
 
diff --git a/applications/system/hid_app/hid.c b/applications/system/hid_app/hid.c
index 6c4b928d..a42fc609 100644
--- a/applications/system/hid_app/hid.c
+++ b/applications/system/hid_app/hid.c
@@ -264,7 +264,7 @@ void hid_hal_keyboard_press(Hid* instance, uint16_t event) {
     } else if(instance->transport == HidTransportUsb) {
         furi_hal_hid_kb_press(event);
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -275,7 +275,7 @@ void hid_hal_keyboard_release(Hid* instance, uint16_t event) {
     } else if(instance->transport == HidTransportUsb) {
         furi_hal_hid_kb_release(event);
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -286,7 +286,7 @@ void hid_hal_keyboard_release_all(Hid* instance) {
     } else if(instance->transport == HidTransportUsb) {
         furi_hal_hid_kb_release_all();
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -297,7 +297,7 @@ void hid_hal_consumer_key_press(Hid* instance, uint16_t event) {
     } else if(instance->transport == HidTransportUsb) {
         furi_hal_hid_consumer_key_press(event);
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -308,7 +308,7 @@ void hid_hal_consumer_key_release(Hid* instance, uint16_t event) {
     } else if(instance->transport == HidTransportUsb) {
         furi_hal_hid_consumer_key_release(event);
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -319,7 +319,7 @@ void hid_hal_consumer_key_release_all(Hid* instance) {
     } else if(instance->transport == HidTransportUsb) {
         furi_hal_hid_kb_release_all();
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -330,7 +330,7 @@ void hid_hal_mouse_move(Hid* instance, int8_t dx, int8_t dy) {
     } else if(instance->transport == HidTransportUsb) {
         furi_hal_hid_mouse_move(dx, dy);
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -341,7 +341,7 @@ void hid_hal_mouse_scroll(Hid* instance, int8_t delta) {
     } else if(instance->transport == HidTransportUsb) {
         furi_hal_hid_mouse_scroll(delta);
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -352,7 +352,7 @@ void hid_hal_mouse_press(Hid* instance, uint16_t event) {
     } else if(instance->transport == HidTransportUsb) {
         furi_hal_hid_mouse_press(event);
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -363,7 +363,7 @@ void hid_hal_mouse_release(Hid* instance, uint16_t event) {
     } else if(instance->transport == HidTransportUsb) {
         furi_hal_hid_mouse_release(event);
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
@@ -375,7 +375,7 @@ void hid_hal_mouse_release_all(Hid* instance) {
         furi_hal_hid_mouse_release(HID_MOUSE_BTN_LEFT);
         furi_hal_hid_mouse_release(HID_MOUSE_BTN_RIGHT);
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 }
 
diff --git a/applications/system/snake_game/application.fam b/applications/system/snake_game/application.fam
index 9a99ebac..9e803f65 100644
--- a/applications/system/snake_game/application.fam
+++ b/applications/system/snake_game/application.fam
@@ -5,7 +5,6 @@ App(
     entry_point="snake_game_app",
     requires=["gui"],
     stack_size=1 * 1024,
-    targets=["f7"],
     fap_version="1.0",
     fap_description="Classic Snake Game",
     fap_icon="snake_10px.png",
diff --git a/applications/system/updater/updater.c b/applications/system/updater/updater.c
index e749f3ce..4c7fd29e 100644
--- a/applications/system/updater/updater.c
+++ b/applications/system/updater/updater.c
@@ -5,7 +5,6 @@
 #include <gui/view_dispatcher.h>
 #include <furi.h>
 #include <furi_hal.h>
-#include <portmacro.h>
 #include <stdint.h>
 
 static bool updater_custom_event_callback(void* context, uint32_t event) {
diff --git a/applications/system/updater/util/update_task_worker_flasher.c b/applications/system/updater/util/update_task_worker_flasher.c
index c5603199..1b4b0790 100644
--- a/applications/system/updater/util/update_task_worker_flasher.c
+++ b/applications/system/updater/util/update_task_worker_flasher.c
@@ -104,7 +104,7 @@ static bool update_task_write_stack_data(UpdateTask* update_task) {
 
     update_task_set_progress(update_task, UpdateTaskStageRadioWrite, 0);
     uint8_t* fw_block = malloc(FLASH_PAGE_SIZE);
-    uint16_t bytes_read = 0;
+    size_t bytes_read = 0;
     uint32_t element_offs = 0;
 
     while(element_offs < stack_size) {
diff --git a/assets/.gitignore b/assets/.gitignore
index a66a6eed..ca338d63 100644
--- a/assets/.gitignore
+++ b/assets/.gitignore
@@ -1,5 +1 @@
 /core2_firmware
-/resources/Manifest
-/resources/apps/*
-/resources/dolphin/*
-/resources/apps_data/**/*.fal
diff --git a/assets/ReadMe.md b/assets/ReadMe.md
index 2d493b4f..84310e73 100644
--- a/assets/ReadMe.md
+++ b/assets/ReadMe.md
@@ -32,10 +32,7 @@ Good starting point: https://docs.unrealengine.com/4.27/en-US/ProductionPipeline
 Don't include assets that you are not using, compiler is not going to strip unused assets.
 
 # Structure
-- `compiled`            - Output folder made for compiled assets, after building project, in `build` directory.
 - `dolphin`             - Dolphin game assets sources. Goes to `compiled` and `resources` folders in `build` directory.
 - `icons`               - Icons sources. Goes to `compiled` folder in `build` directory.
 - `protobuf`            - Protobuf sources. Goes to `compiled` folder in `build` directory.
-- `resources`           - Assets that is going to be provisioned to SD card.
 - `slideshow`           - One-time slideshows for desktop
-- `unit_tests`          - Some pre-defined signals for testing purposes.
diff --git a/assets/SConscript b/assets/SConscript
index 9bd27362..c10de78a 100644
--- a/assets/SConscript
+++ b/assets/SConscript
@@ -1,16 +1,16 @@
-from fbt.version import get_git_commit_unix_timestamp
-
 Import("env")
 
 assetsenv = env.Clone(
     tools=["fbt_assets"],
     FW_LIB_NAME="assets",
-    GIT_UNIX_TIMESTAMP=get_git_commit_unix_timestamp(),
+    ASSETS_WORK_DIR=env.Dir("compiled"),
+    ASSETS_SRC_DIR=env.Dir("#/assets"),
 )
 assetsenv.ApplyLibFlags()
 
 icons = assetsenv.CompileIcons(
-    assetsenv.Dir("compiled"), assetsenv.Dir("#/assets/icons")
+    assetsenv["ASSETS_WORK_DIR"],
+    assetsenv["ASSETS_SRC_DIR"].Dir("icons"),
 )
 assetsenv.Alias("icons", icons)
 
@@ -18,7 +18,7 @@ assetsenv.Alias("icons", icons)
 # Protobuf .proto -> .c + .h
 proto_src = assetsenv.Glob("protobuf/*.proto", source=True)
 proto_options = assetsenv.Glob("protobuf/*.options", source=True)
-proto = assetsenv.ProtoBuilder(assetsenv.Dir("compiled"), proto_src)
+proto = assetsenv.ProtoBuilder(assetsenv["ASSETS_WORK_DIR"], proto_src)
 assetsenv.Depends(proto, proto_options)
 # Precious(proto)
 assetsenv.Alias("proto", proto)
@@ -27,8 +27,8 @@ assetsenv.Alias("proto", proto)
 # Internal animations
 
 dolphin_internal = assetsenv.DolphinSymBuilder(
-    assetsenv.Dir("compiled"),
-    assetsenv.Dir("#/assets/dolphin"),
+    assetsenv["ASSETS_WORK_DIR"],
+    assetsenv["ASSETS_SRC_DIR"].Dir("dolphin"),
     DOLPHIN_RES_TYPE="internal",
 )
 assetsenv.Alias("dolphin_internal", dolphin_internal)
@@ -37,8 +37,8 @@ assetsenv.Alias("dolphin_internal", dolphin_internal)
 # Blocking animations
 
 dolphin_blocking = assetsenv.DolphinSymBuilder(
-    assetsenv.Dir("compiled"),
-    assetsenv.Dir("#/assets/dolphin"),
+    assetsenv["ASSETS_WORK_DIR"],
+    assetsenv["ASSETS_SRC_DIR"].Dir("dolphin"),
     DOLPHIN_RES_TYPE="blocking",
 )
 assetsenv.Alias("dolphin_blocking", dolphin_blocking)
@@ -46,8 +46,8 @@ assetsenv.Alias("dolphin_blocking", dolphin_blocking)
 
 # Protobuf version meta
 proto_ver = assetsenv.ProtoVerBuilder(
-    "compiled/protobuf_version.h",
-    "#/assets/protobuf/Changelog",
+    "${ASSETS_WORK_DIR}/protobuf_version.h",
+    assetsenv["ASSETS_SRC_DIR"].File("protobuf/Changelog"),
 )
 assetsenv.Depends(proto_ver, proto)
 assetsenv.Alias("proto_ver", proto_ver)
@@ -61,41 +61,19 @@ assetsenv.Install("${LIB_DIST_DIR}", assetslib)
 
 
 # Resources for SD card
-env.SetDefault(FW_RESOURCES=None)
 if assetsenv["IS_BASE_FIRMWARE"]:
+    dolphin_external_out_dir = assetsenv["ASSETS_WORK_DIR"].Dir("dolphin")
     # External dolphin animations
     dolphin_external = assetsenv.DolphinExtBuilder(
-        assetsenv.Dir("#/assets/resources/dolphin"),
-        assetsenv.Dir("#/assets/dolphin"),
+        dolphin_external_out_dir,
+        assetsenv["ASSETS_SRC_DIR"].Dir("dolphin"),
         DOLPHIN_RES_TYPE="external",
     )
     if assetsenv["FORCE"]:
         assetsenv.AlwaysBuild(dolphin_external)
     assetsenv.Alias("dolphin_ext", dolphin_external)
-    assetsenv.Clean(dolphin_external, assetsenv.Dir("#/assets/resources/dolphin"))
+    assetsenv.Clean(dolphin_external, dolphin_external_out_dir)
 
-    # Resources manifest
-    resources = assetsenv.Command(
-        "#/assets/resources/Manifest",
-        assetsenv.GlobRecursive(
-            "*",
-            assetsenv.Dir("resources").srcnode(),
-            exclude=["Manifest"],
-        ),
-        action=Action(
-            '${PYTHON3} "${ASSETS_COMPILER}" manifest "${TARGET.dir.posix}" --timestamp=${GIT_UNIX_TIMESTAMP}',
-            "${RESMANIFESTCOMSTR}",
-        ),
-    )
-    assetsenv.Precious(resources)
-    assetsenv.AlwaysBuild(resources)
-    assetsenv.Clean(
-        resources,
-        assetsenv.Dir("#/assets/resources/apps"),
-    )
-
-    # Exporting resources node to external environment
-    env.Replace(FW_RESOURCES=resources)
-    assetsenv.Alias("resources", resources)
+    env.Replace(DOLPHIN_EXTERNAL_OUT_DIR=dolphin_external_out_dir)
 
 Return("assetslib")
diff --git a/assets/protobuf b/assets/protobuf
index 327163d5..23ad19a7 160000
--- a/assets/protobuf
+++ b/assets/protobuf
@@ -1 +1 @@
-Subproject commit 327163d5867c7aa3051334c93ced718d15bfe4da
+Subproject commit 23ad19a756649ed9f6677b598e5361c5cce6847b
diff --git a/documentation/AppManifests.md b/documentation/AppManifests.md
index 72c15ad4..9afdccb0 100644
--- a/documentation/AppManifests.md
+++ b/documentation/AppManifests.md
@@ -32,7 +32,7 @@ Only two parameters are mandatory: **_appid_** and **_apptype_**. Others are opt
 - **name**: name displayed in menus.
 - **entry_point**: C function to be used as the application's entry point. Note that C++ function names are mangled, so you need to wrap them in `extern "C"` to use them as entry points.
 - **flags**: internal flags for system apps. Do not use.
-- **cdefines**: C preprocessor definitions to declare globally for other apps when the current application is included in the active build configuration.
+- **cdefines**: C preprocessor definitions to declare globally for other apps when the current application is included in the active build configuration. **For external applications**: specified definitions are used when building the application itself.
 - **requires**: list of application IDs to include in the build configuration when the current application is referenced in the list of applications to build.
 - **conflicts**: list of application IDs with which the current application conflicts. If any of them is found in the constructed application list, **`fbt`** will abort the firmware build process.
 - **provides**: functionally identical to **_requires_** field.
@@ -41,12 +41,13 @@ Only two parameters are mandatory: **_appid_** and **_apptype_**. Others are opt
 - **order**: order of an application within its group when sorting entries in it. The lower the order is, the closer to the start of the list the item is placed. _Used for ordering startup hooks and menu entries._
 - **sdk_headers**: list of C header files from this app's code to include in API definitions for external applications.
 - **targets**: list of strings and target names with which this application is compatible. If not specified, the application is built for all targets. The default value is `["all"]`.
+- **resources**: name of a folder within the application's source folder to be used for packacking SD card resources for this application. They will only be used if application is included in build configuration. The default value is `""`, meaning no resources are packaged.
 
 #### Parameters for external applications
 
 The following parameters are used only for [FAPs](./AppsOnSDCard.md):
 
-- **sources**: list of strings, file name masks used for gathering sources within the app folder. The default value of `["*.c*"]` includes C and C++ source files. Applications cannot use the `"lib"` folder for their own source code, as it is reserved for **fap_private_libs**.
+- **sources**: list of strings, file name masks used for gathering sources within the app folder. The default value of `["*.c*"]` includes C and C++ source files. Applications cannot use the `"lib"` folder for their own source code, as it is reserved for **fap_private_libs**. Paths starting with `"!"` are excluded from the list of sources. They can also include wildcard characters and directory names. For example, a value of `["*.c*", "!plugins"]` will include all C and C++ source files in the app folder except those in the `plugins` (and `lib`) folders. Paths with no wildcards (`*, ?`) are treated as full literal paths for both inclusion and exclusion.
 - **fap_version**: string, application version. The default value is "0.1". You can also use a tuple of 2 numbers in the form of (x,y) to specify the version. It is also possible to add more dot-separated parts to the version, like patch number, but only major and minor version numbers are stored in the built .fap.
 - **fap_icon**: name of a `.png` file, 1-bit color depth, 10x10px, to be embedded within `.fap` file.
 - **fap_libs**: list of extra libraries to link the application against. Provides access to extra functions that are not exported as a part of main firmware at the expense of increased `.fap` file size and RAM consumption.
diff --git a/documentation/AppsOnSDCard.md b/documentation/AppsOnSDCard.md
index f04793b4..3f6d51ac 100644
--- a/documentation/AppsOnSDCard.md
+++ b/documentation/AppsOnSDCard.md
@@ -61,7 +61,7 @@ The App Loader allocates memory for the application and copies it to RAM, proces
 
 ## API versioning
 
-Not all parts of firmware are available for external applications. A subset of available functions and variables is defined in the "api_symbols.csv" file, which is a part of the firmware target definition in the `firmware/targets/` directory.
+Not all parts of firmware are available for external applications. A subset of available functions and variables is defined in the "api_symbols.csv" file, which is a part of the firmware target definition in the `targets/` directory.
 
 **`fbt`** uses semantic versioning for the API. The major version is incremented when there are breaking changes in the API. The minor version is incremented when new features are added.
 
diff --git a/documentation/FuriCheck.md b/documentation/FuriCheck.md
new file mode 100644
index 00000000..02f3fc91
--- /dev/null
+++ b/documentation/FuriCheck.md
@@ -0,0 +1,40 @@
+# Run time checks and forced system crash
+
+The best way to protect system integrity is to reduce amount cases that we must handle and crash the system as early as possible.
+For that purpose we have bunch of helpers located in Furi Core check.h.
+
+## Couple notes before start
+
+- Definition of Crash - log event, save crash information in RTC and reboot the system.
+- Definition of Halt - log event, stall the system.
+- Debug and production builds behaves differently: debug build will never reset system in order to preserve state for debugging.
+- If you have debugger connected we will stop before reboot automatically.
+- All helpers accept optional MESSAGE_CSTR: it can be in RAM or Flash memory, but only messages from Flash will be shown after system reboot.
+- MESSAGE_CSTR can be NULL, but macros magic already doing it for you, so just don't.
+
+## `furi_assert(CONDITION)` or `furi_assert(CONDITION, MESSAGE_CSTR)`
+
+Assert condition in development environment and crash the system if CONDITION is false.
+
+- Should be used at development stage in apps and services
+- Keep in mind that release never contains this check
+- Keep in mind that libraries never contains this check by default, use `LIB_DEBUG=1` if you need it
+- Avoid putting function calls into CONDITION, since it may be omitted in some builds
+
+## `furi_check(CONDITION)` or `furi_check(CONDITION, MESSAGE_CSTR)`
+
+Always assert condition and crash the system if CONDITION is false.
+
+- Use it if you always need to check conditions
+
+## `furi_crash()` or `furi_crash(MESSAGE_CSTR)`
+
+Crash the system.
+
+- Use it to crash the system. For example: if abnormal condition detected.
+
+## `furi_halt()` or `furi_halt(MESSAGE_CSTR)`
+
+Halt the system.
+
+- We use it internally to shutdown flipper if poweroff is not possible.
diff --git a/documentation/HardwareTargets.md b/documentation/HardwareTargets.md
index 0c347483..b3213d4f 100644
--- a/documentation/HardwareTargets.md
+++ b/documentation/HardwareTargets.md
@@ -2,7 +2,7 @@
 
 Flipper's firmware is modular and supports different hardware configurations in a common code base. It encapsulates hardware-specific differences in `furi_hal`, board initialization code, linker files, SDK data and other information in a _target definition_.
 
-Target-specific files are placed in a single sub-folder in `firmware/targets`. It must contain a target definition file, `target.json`, and may contain other files if they are referenced by current target's definition. By default, `fbt` gathers all source files in target folder, unless they are explicitly excluded.
+Target-specific files are placed in a single sub-folder in `targets`. It must contain a target definition file, `target.json`, and may contain other files if they are referenced by current target's definition. By default, `fbt` gathers all source files in target folder, unless they are explicitly excluded.
 
 Targets can inherit most code parts from other targets, to reduce common code duplication.
 
diff --git a/documentation/UnitTests.md b/documentation/UnitTests.md
index 4717daa8..9352917c 100644
--- a/documentation/UnitTests.md
+++ b/documentation/UnitTests.md
@@ -15,10 +15,9 @@ Running existing unit tests is useful to ensure that the new code doesn't introd
 
 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 of your Flipper Zero's SD card.
-4. Launch the CLI session and run the `unit_tests` command.
+1. Compile the firmware with the tests enabled: `./fbt FIRMWARE_APP_SET=unit_tests updater_package`.
+2. Flash the firmware using your preferred method, including SD card resources (`build/latest/resources`).
+3. 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.
@@ -33,7 +32,7 @@ The common entry point for all tests is the [unit_tests](/applications/debug/uni
 
 #### 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.).
+Some unit tests require external data in order to function. These files (commonly called assets) reside in the [unit_tests](/applications/debug/unit_tests/resources/unit_tests) directory in their respective subdirectories. Asset files can be of any type (plain text, FlipperFormat (FFF), binary, etc.).
 
 ### Application-specific
 
@@ -42,10 +41,10 @@ Some unit tests require external data in order to function. These files (commonl
 Each infrared protocol has a corresponding set of unit tests, so it makes sense to implement one when adding support for a new protocol.
 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.
+1. Create a file named `test_<your_protocol_name>.irtest` in the [assets](/applications/debug/unit_tests/resources/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.
+4. Build and install firmware with resources, install it on your Flipper and run the tests to see if they pass.
 
 ##### Test data format
 
diff --git a/documentation/UniversalRemotes.md b/documentation/UniversalRemotes.md
index 325f640d..213709af 100644
--- a/documentation/UniversalRemotes.md
+++ b/documentation/UniversalRemotes.md
@@ -13,7 +13,7 @@ Each signal is recorded using the following algorithm:
 
 The signal names are self-explanatory. Remember to make sure that every recorded signal does what it's supposed to.
 
-If everything checks out, append these signals **to the end** of the [TV universal remote file](/assets/resources/infrared/assets/tv.ir).
+If everything checks out, append these signals **to the end** of the [TV universal remote file](/applications/main/infrared/resources/infrared/assets/tv.ir).
 
 ## Audio players
 
@@ -23,7 +23,7 @@ The signal names are self-explanatory.
 On many remotes, the `Play` button doubles as `Pause`. In this case, record it as `Play` omitting the `Pause`.
 Make sure that every signal does what it's supposed to.
 
-If everything checks out, append these signals **to the end** of the [audio player universal remote file](/assets/resources/infrared/assets/audio.ir).
+If everything checks out, append these signals **to the end** of the [audio player universal remote file](/applications/main/infrared/resources/infrared/assets/audio.ir).
 
 ## Projectors
 
@@ -67,7 +67,7 @@ Finally, record the `Off` signal:
 The resulting remote file should now contain 6 signals. You can omit any of them, but you then won't be able to use their functionality.
 Test the file against the actual device. Make sure that every signal does what it's supposed to.
 
-If everything checks out, append these signals **to the end** of the [A/C universal remote file](/assets/resources/infrared/assets/ac.ir).
+If everything checks out, append these signals **to the end** of the [A/C universal remote file](/applications/main/infrared/resources/infrared/assets/ac.ir).
 
 ## Final steps
 
diff --git a/documentation/file_formats/InfraredFileFormats.md b/documentation/file_formats/InfraredFileFormats.md
index c9b6a953..4d43bd5b 100644
--- a/documentation/file_formats/InfraredFileFormats.md
+++ b/documentation/file_formats/InfraredFileFormats.md
@@ -72,9 +72,9 @@ Known protocols are represented in the `parsed` form, whereas non-recognized sig
 
 ### Examples
 
-- [TV Universal Library](/assets/resources/infrared/assets/tv.ir)
-- [A/C Universal Library](/assets/resources/infrared/assets/ac.ir)
-- [Audio Universal Library](/assets/resources/infrared/assets/audio.ir)
+- [TV Universal Library](/applications/main/infrared/resources/infrared/assets/tv.ir)
+- [A/C Universal Library](/applications/main/infrared/resources/infrared/assets/ac.ir)
+- [Audio Universal Library](/applications/main/infrared/resources/infrared/assets/audio.ir)
 
 ### Description
 
@@ -92,7 +92,7 @@ See [Universal Remotes](/documentation/UniversalRemotes.md) for more information
 
 ### Examples
 
-See [Infrared Unit Tests](/assets/unit_tests/infrared/) for various examples.
+See [Infrared Unit Tests](/applications/debug/unit_tests/resources/unit_tests/infrared/) for various examples.
 
 ### Description
 
diff --git a/firmware.scons b/firmware.scons
index 82f775d7..004def9a 100644
--- a/firmware.scons
+++ b/firmware.scons
@@ -1,15 +1,10 @@
-from SCons.Errors import UserError
-from SCons.Node import FS
-
 import itertools
 
-from fbt_extra.util import (
-    should_gen_cdb_and_link_dir,
-    link_elf_dir_as_latest,
-)
-
 from fbt.sdk.cache import LazySdkVersionLoader
-
+from fbt.version import get_git_commit_unix_timestamp
+from fbt_extra.util import link_elf_dir_as_latest, should_gen_cdb_and_link_dir
+from SCons.Errors import UserError
+from SCons.Node import FS
 
 Import("ENV", "fw_build_meta")
 
@@ -22,12 +17,15 @@ env = ENV.Clone(
         "pvsstudio",
         "fbt_hwtarget",
         "fbt_envhooks",
+        "fbt_resources",
     ],
     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"],
     LIB_DIST_DIR=fw_build_meta["build_dir"].Dir("lib"),
+    RESOURCES_ROOT=fw_build_meta["build_dir"].Dir("resources"),
+    TARGETS_ROOT=Dir("#/targets"),
     LINT_SOURCES=[
         Dir("applications"),
     ],
@@ -37,7 +35,7 @@ env = ENV.Clone(
     CPPPATH=[
         "#/furi",
         *(f"#/{app_dir[0]}" for app_dir in ENV["APPDIRS"] if app_dir[1]),
-        "#/firmware/targets/furi_hal_include",
+        "#/targets/furi_hal_include",
     ],
     # Specific flags for building libraries - always do optimized builds
     FW_LIB_OPTS={
@@ -104,7 +102,7 @@ lib_targets = env.BuildModules(
     [
         "lib",
         "assets",
-        "firmware",
+        "targets",
         "furi",
     ],
 )
@@ -144,12 +142,22 @@ fwenv.PrepareApplicationsBuild()
 # Build external apps + configure SDK
 if env["IS_BASE_FIRMWARE"]:
     fwenv.SetDefault(FBT_FAP_DEBUG_ELF_ROOT=fwenv["BUILD_DIR"].Dir(".extapps"))
-    fwenv["FW_EXTAPPS"] = SConscript(
+    fw_extapps = fwenv["FW_EXTAPPS"] = SConscript(
         "site_scons/extapps.scons",
         exports={"ENV": fwenv},
     )
-    fw_artifacts.append(fwenv["FW_EXTAPPS"].sdk_tree)
+    fw_artifacts.append(fw_extapps.sdk_tree)
 
+    # Resources & manifest for SD card
+    manifest = fwenv.ManifestBuilder(
+        "${RESOURCES_ROOT}/Manifest",
+        GIT_UNIX_TIMESTAMP=get_git_commit_unix_timestamp(),
+        _EXTRA_DIST=[fwenv["DOLPHIN_EXTERNAL_OUT_DIR"]],
+    )
+    fwenv.Replace(FW_RESOURCES_MANIFEST=manifest)
+    fwenv.Alias("resources", manifest)
+
+    # API getter
     fwenv.Append(FBT_API_VERSION=LazySdkVersionLoader(fwenv.subst("$SDK_DEFINITION")))
     fwenv.PhonyTarget(
         "get_apiversion",
@@ -189,7 +197,7 @@ sources = [apps_c]
 # Gather sources only from app folders in current configuration
 sources.extend(
     itertools.chain.from_iterable(
-        fwenv.GlobRecursive(source_type, appdir.relpath, exclude=["lib"])
+        fwenv.GatherSources([source_type, "!lib"], appdir.relpath)
         for appdir, source_type in fwenv["APPBUILD"].get_builtin_app_folders()
     )
 )
@@ -211,7 +219,7 @@ AddPostAction(fwelf, fwenv["APPBUILD_DUMP"])
 AddPostAction(
     fwelf,
     Action(
-        '${PYTHON3} "${BIN_SIZE_SCRIPT}" elf ${TARGET}',
+        [["${PYTHON3}", "${BIN_SIZE_SCRIPT}", "elf", "${TARGET}"]],
         "Firmware size",
     ),
 )
@@ -221,7 +229,7 @@ fwhex = fwenv["FW_HEX"] = fwenv.HEXBuilder("${FIRMWARE_BUILD_CFG}")
 fwbin = fwenv["FW_BIN"] = fwenv.BINBuilder("${FIRMWARE_BUILD_CFG}")
 AddPostAction(
     fwbin,
-    Action('@${PYTHON3} "${BIN_SIZE_SCRIPT}" bin ${TARGET}'),
+    Action([["@${PYTHON3}", "${BIN_SIZE_SCRIPT}", "bin", "${TARGET}"]]),
 )
 
 fwdfu = fwenv["FW_DFU"] = fwenv.DFUBuilder("${FIRMWARE_BUILD_CFG}")
diff --git a/furi/core/base.h b/furi/core/base.h
index 29e87419..642ff2b6 100644
--- a/furi/core/base.h
+++ b/furi/core/base.h
@@ -2,6 +2,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <furi_config.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/furi/core/check.c b/furi/core/check.c
index 8888eddf..b56db656 100644
--- a/furi/core/check.c
+++ b/furi/core/check.c
@@ -55,8 +55,6 @@ PLACE_IN_SECTION("MB_MEM2") uint32_t __furi_check_registers[13] = {0};
                  : "memory");
 
 extern size_t xPortGetTotalHeapSize(void);
-extern size_t xPortGetFreeHeapSize(void);
-extern size_t xPortGetMinimumEverFreeHeapSize(void);
 
 static void __furi_put_uint32_as_text(uint32_t data) {
     char tmp_str[] = "-2147483648";
@@ -128,7 +126,7 @@ static void __furi_print_name(bool isr) {
     }
 }
 
-FURI_NORETURN void __furi_crash() {
+FURI_NORETURN void __furi_crash_implementation() {
     __disable_irq();
     GET_MESSAGE_AND_STORE_REGISTERS();
 
@@ -179,7 +177,7 @@ FURI_NORETURN void __furi_crash() {
     __builtin_unreachable();
 }
 
-FURI_NORETURN void __furi_halt() {
+FURI_NORETURN void __furi_halt_implementation() {
     __disable_irq();
     GET_MESSAGE_AND_STORE_REGISTERS();
 
diff --git a/furi/core/check.h b/furi/core/check.h
index 004422e8..2d5df4cf 100644
--- a/furi/core/check.h
+++ b/furi/core/check.h
@@ -28,39 +28,51 @@ extern "C" {
 #define __FURI_CHECK_MESSAGE_FLAG (0x02)
 
 /** Crash system */
-FURI_NORETURN void __furi_crash();
+FURI_NORETURN void __furi_crash_implementation();
 
 /** Halt system */
-FURI_NORETURN void __furi_halt();
+FURI_NORETURN void __furi_halt_implementation();
 
 /** Crash system with message. Show message after reboot. */
-#define furi_crash(message)                                   \
+#define __furi_crash(message)                                 \
     do {                                                      \
         register const void* r12 asm("r12") = (void*)message; \
         asm volatile("sukima%=:" : : "r"(r12));               \
-        __furi_crash();                                       \
+        __furi_crash_implementation();                        \
     } while(0)
 
+/** Crash system
+ *
+ * @param      optional  message (const char*)
+ */
+#define furi_crash(...) M_APPLY(__furi_crash, M_IF_EMPTY(__VA_ARGS__)((NULL), (__VA_ARGS__)))
+
 /** Halt system with message. */
-#define furi_halt(message)                                    \
+#define __furi_halt(message)                                  \
     do {                                                      \
         register const void* r12 asm("r12") = (void*)message; \
         asm volatile("sukima%=:" : : "r"(r12));               \
-        __furi_halt();                                        \
+        __furi_halt_implementation();                         \
     } while(0)
 
+/** Halt system
+ *
+ * @param      optional  message (const char*)
+ */
+#define furi_halt(...) M_APPLY(__furi_halt, M_IF_EMPTY(__VA_ARGS__)((NULL), (__VA_ARGS__)))
+
 /** Check condition and crash if check failed */
 #define __furi_check(__e, __m) \
     do {                       \
         if(!(__e)) {           \
-            furi_crash(__m);   \
+            __furi_crash(__m); \
         }                      \
     } while(0)
 
 /** Check condition and crash if failed
  *
  * @param      condition to check
- * @param      optional  message
+ * @param      optional  message (const char*)
  */
 #define furi_check(...) \
     M_APPLY(__furi_check, M_DEFAULT_ARGS(2, (__FURI_CHECK_MESSAGE_FLAG), __VA_ARGS__))
@@ -70,7 +82,7 @@ FURI_NORETURN void __furi_halt();
 #define __furi_assert(__e, __m) \
     do {                        \
         if(!(__e)) {            \
-            furi_crash(__m);    \
+            __furi_crash(__m);  \
         }                       \
     } while(0)
 #else
@@ -86,7 +98,7 @@ FURI_NORETURN void __furi_halt();
  * @warning    only will do check if firmware compiled in debug mode
  *
  * @param      condition to check
- * @param      optional  message
+ * @param      optional  message (const char*)
  */
 #define furi_assert(...) \
     M_APPLY(__furi_assert, M_DEFAULT_ARGS(2, (__FURI_ASSERT_MESSAGE_FLAG), __VA_ARGS__))
diff --git a/furi/core/common_defines.h b/furi/core/common_defines.h
index 5bd218d3..2b30c3b0 100644
--- a/furi/core/common_defines.h
+++ b/furi/core/common_defines.h
@@ -2,8 +2,6 @@
 
 #include "core_defines.h"
 #include <stdbool.h>
-#include <FreeRTOS.h>
-#include <task.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/furi/core/critical.c b/furi/core/critical.c
index 57fe2403..3bef2be3 100644
--- a/furi/core/critical.c
+++ b/furi/core/critical.c
@@ -1,5 +1,8 @@
 #include "common_defines.h"
 
+#include <FreeRTOS.h>
+#include <task.h>
+
 __FuriCriticalInfo __furi_critical_enter(void) {
     __FuriCriticalInfo info;
 
diff --git a/furi/core/event_flag.c b/furi/core/event_flag.c
index 9406a581..96b95918 100644
--- a/furi/core/event_flag.c
+++ b/furi/core/event_flag.c
@@ -2,6 +2,7 @@
 #include "common_defines.h"
 #include "check.h"
 
+#include <FreeRTOS.h>
 #include <event_groups.h>
 
 #define FURI_EVENT_FLAG_MAX_BITS_EVENT_GROUPS 24U
diff --git a/furi/core/kernel.c b/furi/core/kernel.c
index 7928ad11..89a50a9b 100644
--- a/furi/core/kernel.c
+++ b/furi/core/kernel.c
@@ -5,6 +5,9 @@
 
 #include <furi_hal.h>
 
+#include <FreeRTOS.h>
+#include <task.h>
+
 #include CMSIS_device_header
 
 bool furi_kernel_is_irq_or_masked() {
@@ -31,6 +34,10 @@ bool furi_kernel_is_irq_or_masked() {
     return (irq);
 }
 
+bool furi_kernel_is_running() {
+    return xTaskGetSchedulerState() != taskSCHEDULER_RUNNING;
+}
+
 int32_t furi_kernel_lock() {
     furi_assert(!furi_kernel_is_irq_or_masked());
 
diff --git a/furi/core/kernel.h b/furi/core/kernel.h
index 371f76c1..c962402e 100644
--- a/furi/core/kernel.h
+++ b/furi/core/kernel.h
@@ -27,6 +27,12 @@ extern "C" {
  */
 bool furi_kernel_is_irq_or_masked();
 
+/** Check if kernel is running
+ *
+ * @return     true if running, false otherwise
+ */
+bool furi_kernel_is_running();
+
 /** Lock kernel, pause process scheduling
  *
  * @warning This should never be called in interrupt request context.
diff --git a/furi/core/memmgr_heap.c b/furi/core/memmgr_heap.c
index b8baf9c7..a3e127c3 100644
--- a/furi/core/memmgr_heap.c
+++ b/furi/core/memmgr_heap.c
@@ -47,8 +47,8 @@ all the API functions to use the MPU wrappers.  That should only be done when
 task.h is included from an application file. */
 #define MPU_WRAPPERS_INCLUDED_FROM_API_FILE
 
-#include "FreeRTOS.h"
-#include "task.h"
+#include <FreeRTOS.h>
+#include <task.h>
 
 #undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE
 
diff --git a/furi/core/message_queue.c b/furi/core/message_queue.c
index ddf56f00..e20fa420 100644
--- a/furi/core/message_queue.c
+++ b/furi/core/message_queue.c
@@ -1,8 +1,9 @@
 #include "kernel.h"
 #include "message_queue.h"
+#include "check.h"
+
 #include <FreeRTOS.h>
 #include <queue.h>
-#include "check.h"
 
 FuriMessageQueue* furi_message_queue_alloc(uint32_t msg_count, uint32_t msg_size) {
     furi_assert((furi_kernel_is_irq_or_masked() == 0U) && (msg_count > 0U) && (msg_size > 0U));
diff --git a/furi/core/mutex.c b/furi/core/mutex.c
index 9fb964a1..8794e10d 100644
--- a/furi/core/mutex.c
+++ b/furi/core/mutex.c
@@ -2,6 +2,7 @@
 #include "check.h"
 #include "common_defines.h"
 
+#include <FreeRTOS.h>
 #include <semphr.h>
 
 FuriMutex* furi_mutex_alloc(FuriMutexType type) {
diff --git a/furi/core/semaphore.c b/furi/core/semaphore.c
index 8c99bfc5..1f1a0778 100644
--- a/furi/core/semaphore.c
+++ b/furi/core/semaphore.c
@@ -2,6 +2,7 @@
 #include "check.h"
 #include "common_defines.h"
 
+#include <FreeRTOS.h>
 #include <semphr.h>
 
 FuriSemaphore* furi_semaphore_alloc(uint32_t max_count, uint32_t initial_count) {
diff --git a/furi/core/stream_buffer.c b/furi/core/stream_buffer.c
index bf483948..a13d256b 100644
--- a/furi/core/stream_buffer.c
+++ b/furi/core/stream_buffer.c
@@ -2,6 +2,7 @@
 #include "check.h"
 #include "stream_buffer.h"
 #include "common_defines.h"
+
 #include <FreeRTOS.h>
 #include <FreeRTOS-Kernel/include/stream_buffer.h>
 
diff --git a/furi/core/thread.c b/furi/core/thread.c
index de50bde7..db4feeb4 100644
--- a/furi/core/thread.c
+++ b/furi/core/thread.c
@@ -7,11 +7,13 @@
 #include "mutex.h"
 #include "string.h"
 
-#include <task.h>
 #include "log.h"
 #include <furi_hal_rtc.h>
 #include <furi_hal_console.h>
 
+#include <FreeRTOS.h>
+#include <task.h>
+
 #define TAG "FuriThread"
 
 #define THREAD_NOTIFY_INDEX 1 // Index 0 is used for stream buffers
diff --git a/furi/core/thread.h b/furi/core/thread.h
index 692f2a10..44d66fb2 100644
--- a/furi/core/thread.h
+++ b/furi/core/thread.h
@@ -8,6 +8,9 @@
 #include "base.h"
 #include "common_defines.h"
 
+#include <stdint.h>
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -28,7 +31,8 @@ typedef enum {
     FuriThreadPriorityNormal = 16, /**< Normal */
     FuriThreadPriorityHigh = 17, /**< High */
     FuriThreadPriorityHighest = 18, /**< Highest */
-    FuriThreadPriorityIsr = (configMAX_PRIORITIES - 1), /**< Deferred ISR (highest possible) */
+    FuriThreadPriorityIsr =
+        (FURI_CONFIG_THREAD_MAX_PRIORITIES - 1), /**< Deferred ISR (highest possible) */
 } FuriThreadPriority;
 
 /** FuriThread anonymous structure */
diff --git a/furi/core/timer.c b/furi/core/timer.c
index 7743ffe7..027e4cf4 100644
--- a/furi/core/timer.c
+++ b/furi/core/timer.c
@@ -51,7 +51,7 @@ FuriTimer* furi_timer_alloc(FuriTimerCallback func, FuriTimerType type, void* co
     callb = (TimerCallback_t*)((uint32_t)callb | 1U);
     // TimerCallback function is always provided as a callback and is used to call application
     // specified function with its context both stored in structure callb.
-    hTimer = xTimerCreate(NULL, 1, reload, callb, TimerCallback);
+    hTimer = xTimerCreate(NULL, portMAX_DELAY, reload, callb, TimerCallback);
     furi_check(hTimer);
 
     /* Return timer ID */
@@ -83,6 +83,7 @@ void furi_timer_free(FuriTimer* instance) {
 FuriStatus furi_timer_start(FuriTimer* instance, uint32_t ticks) {
     furi_assert(!furi_kernel_is_irq_or_masked());
     furi_assert(instance);
+    furi_assert(ticks < portMAX_DELAY);
 
     TimerHandle_t hTimer = (TimerHandle_t)instance;
     FuriStatus stat;
@@ -97,22 +98,34 @@ FuriStatus furi_timer_start(FuriTimer* instance, uint32_t ticks) {
     return (stat);
 }
 
+FuriStatus furi_timer_restart(FuriTimer* instance, uint32_t ticks) {
+    furi_assert(!furi_kernel_is_irq_or_masked());
+    furi_assert(instance);
+    furi_assert(ticks < portMAX_DELAY);
+
+    TimerHandle_t hTimer = (TimerHandle_t)instance;
+    FuriStatus stat;
+
+    if(xTimerChangePeriod(hTimer, ticks, portMAX_DELAY) == pdPASS &&
+       xTimerReset(hTimer, portMAX_DELAY) == pdPASS) {
+        stat = FuriStatusOk;
+    } else {
+        stat = FuriStatusErrorResource;
+    }
+
+    /* Return execution status */
+    return (stat);
+}
+
 FuriStatus furi_timer_stop(FuriTimer* instance) {
     furi_assert(!furi_kernel_is_irq_or_masked());
     furi_assert(instance);
 
     TimerHandle_t hTimer = (TimerHandle_t)instance;
-    FuriStatus stat;
 
-    if(xTimerIsTimerActive(hTimer) == pdFALSE) {
-        stat = FuriStatusErrorResource;
-    } else {
-        furi_check(xTimerStop(hTimer, portMAX_DELAY) == pdPASS);
-        stat = FuriStatusOk;
-    }
+    furi_check(xTimerStop(hTimer, portMAX_DELAY) == pdPASS);
 
-    /* Return execution status */
-    return (stat);
+    return FuriStatusOk;
 }
 
 uint32_t furi_timer_is_running(FuriTimer* instance) {
@@ -125,6 +138,15 @@ uint32_t furi_timer_is_running(FuriTimer* instance) {
     return (uint32_t)xTimerIsTimerActive(hTimer);
 }
 
+uint32_t furi_timer_get_expire_time(FuriTimer* instance) {
+    furi_assert(!furi_kernel_is_irq_or_masked());
+    furi_assert(instance);
+
+    TimerHandle_t hTimer = (TimerHandle_t)instance;
+
+    return (uint32_t)xTimerGetExpiryTime(hTimer);
+}
+
 void furi_timer_pending_callback(FuriTimerPendigCallback callback, void* context, uint32_t arg) {
     BaseType_t ret = pdFAIL;
     if(furi_kernel_is_irq_or_masked()) {
@@ -133,4 +155,19 @@ void furi_timer_pending_callback(FuriTimerPendigCallback callback, void* context
         ret = xTimerPendFunctionCall(callback, context, arg, FuriWaitForever);
     }
     furi_check(ret == pdPASS);
+}
+
+void furi_timer_set_thread_priority(FuriTimerThreadPriority priority) {
+    furi_assert(!furi_kernel_is_irq_or_masked());
+
+    TaskHandle_t task_handle = xTimerGetTimerDaemonTaskHandle();
+    furi_check(task_handle); // Don't call this method before timer task start
+
+    if(priority == FuriTimerThreadPriorityNormal) {
+        vTaskPrioritySet(task_handle, configTIMER_TASK_PRIORITY);
+    } else if(priority == FuriTimerThreadPriorityElevated) {
+        vTaskPrioritySet(task_handle, configMAX_PRIORITIES - 1);
+    } else {
+        furi_crash();
+    }
 }
\ No newline at end of file
diff --git a/furi/core/timer.h b/furi/core/timer.h
index 3f43de5f..f8f40c56 100644
--- a/furi/core/timer.h
+++ b/furi/core/timer.h
@@ -32,15 +32,33 @@ FuriTimer* furi_timer_alloc(FuriTimerCallback func, FuriTimerType type, void* co
 void furi_timer_free(FuriTimer* instance);
 
 /** Start timer
+ *
+ * @warning    This is asynchronous call, real operation will happen as soon as
+ *             timer service process this request.
  *
  * @param      instance  The pointer to FuriTimer instance
- * @param[in]  ticks     The ticks
+ * @param[in]  ticks     The interval in ticks
  *
  * @return     The furi status.
  */
 FuriStatus furi_timer_start(FuriTimer* instance, uint32_t ticks);
 
+/** Restart timer with previous timeout value
+ *
+ * @warning    This is asynchronous call, real operation will happen as soon as
+ *             timer service process this request.
+ *
+ * @param      instance  The pointer to FuriTimer instance
+ * @param[in]  ticks     The interval in ticks
+ *
+ * @return     The furi status.
+ */
+FuriStatus furi_timer_restart(FuriTimer* instance, uint32_t ticks);
+
 /** Stop timer
+ *
+ * @warning    This is asynchronous call, real operation will happen as soon as
+ *             timer service process this request.
  *
  * @param      instance  The pointer to FuriTimer instance
  *
@@ -49,6 +67,10 @@ FuriStatus furi_timer_start(FuriTimer* instance, uint32_t ticks);
 FuriStatus furi_timer_stop(FuriTimer* instance);
 
 /** Is timer running
+ *
+ * @warning    This cal may and will return obsolete timer state if timer
+ *             commands are still in the queue. Please read FreeRTOS timer
+ *             documentation first.
  *
  * @param      instance  The pointer to FuriTimer instance
  *
@@ -56,10 +78,29 @@ FuriStatus furi_timer_stop(FuriTimer* instance);
  */
 uint32_t furi_timer_is_running(FuriTimer* instance);
 
+/** Get timer expire time
+ *
+ * @param      instance  The Timer instance
+ *
+ * @return     expire tick
+ */
+uint32_t furi_timer_get_expire_time(FuriTimer* instance);
+
 typedef void (*FuriTimerPendigCallback)(void* context, uint32_t arg);
 
 void furi_timer_pending_callback(FuriTimerPendigCallback callback, void* context, uint32_t arg);
 
+typedef enum {
+    FuriTimerThreadPriorityNormal, /**< Lower then other threads */
+    FuriTimerThreadPriorityElevated, /**< Same as other threads */
+} FuriTimerThreadPriority;
+
+/** Set Timer thread priority
+ *
+ * @param[in]  priority  The priority
+ */
+void furi_timer_set_thread_priority(FuriTimerThreadPriority priority);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/furi/flipper.c b/furi/flipper.c
index 8806ce27..b29424a9 100644
--- a/furi/flipper.c
+++ b/furi/flipper.c
@@ -5,6 +5,8 @@
 #include <furi_hal_memory.h>
 #include <furi_hal_rtc.h>
 
+#include <FreeRTOS.h>
+
 #define TAG "Flipper"
 
 static void flipper_print_version(const char* target, const Version* version) {
diff --git a/furi/furi.c b/furi/furi.c
index cc0e3f4f..6247e259 100644
--- a/furi/furi.c
+++ b/furi/furi.c
@@ -1,6 +1,8 @@
 #include "furi.h"
 #include <string.h>
-#include "queue.h"
+
+#include <FreeRTOS.h>
+#include <queue.h>
 
 void furi_init() {
     furi_assert(!furi_kernel_is_irq_or_masked());
diff --git a/furi/furi.h b/furi/furi.h
index b1299c9a..42250905 100644
--- a/furi/furi.h
+++ b/furi/furi.h
@@ -21,9 +21,6 @@
 
 #include <furi_hal_gpio.h>
 
-// FreeRTOS timer, REMOVE AFTER REFACTORING
-#include <timers.h>
-
 // Workaround for math.h leaking through HAL in older versions
 #include <math.h>
 
diff --git a/lib/drivers/SConscript b/lib/drivers/SConscript
index 103472cc..cf93d4bc 100644
--- a/lib/drivers/SConscript
+++ b/lib/drivers/SConscript
@@ -6,6 +6,8 @@ env.Append(
     ],
     SDK_HEADERS=[
         File("cc1101_regs.h"),
+        File("st25r3916_reg.h"),
+        File("st25r3916.h"),
     ],
 )
 
diff --git a/lib/flipper_application/elf/elf_file.c b/lib/flipper_application/elf/elf_file.c
index b2c9445f..8a78cca4 100644
--- a/lib/flipper_application/elf/elf_file.c
+++ b/lib/flipper_application/elf/elf_file.c
@@ -101,7 +101,7 @@ static bool elf_read_string_from_offset(ELFFile* elf, off_t offset, FuriString*
         buffer[ELF_NAME_BUFFER_LEN] = 0;
 
         while(true) {
-            uint16_t read = storage_file_read(elf->fd, buffer, ELF_NAME_BUFFER_LEN);
+            size_t read = storage_file_read(elf->fd, buffer, ELF_NAME_BUFFER_LEN);
             furi_string_cat(name, buffer);
             if(strlen(buffer) < ELF_NAME_BUFFER_LEN) {
                 result = true;
diff --git a/lib/flipper_application/plugins/plugin_manager.c b/lib/flipper_application/plugins/plugin_manager.c
index e2a7b83f..8f30ed13 100644
--- a/lib/flipper_application/plugins/plugin_manager.c
+++ b/lib/flipper_application/plugins/plugin_manager.c
@@ -66,7 +66,8 @@ PluginManagerError plugin_manager_load_single(PluginManager* manager, const char
 
         FlipperApplicationLoadStatus load_status = flipper_application_map_to_memory(lib);
         if(load_status != FlipperApplicationLoadStatusSuccess) {
-            FURI_LOG_E(TAG, "Failed to load module_demo_plugin1.fal");
+            FURI_LOG_E(TAG, "Failed to load %s", path);
+            error = PluginManagerErrorLoaderError;
             break;
         }
 
diff --git a/lib/ibutton/ibutton_protocols.c b/lib/ibutton/ibutton_protocols.c
index 75aa225e..df741267 100644
--- a/lib/ibutton/ibutton_protocols.c
+++ b/lib/ibutton/ibutton_protocols.c
@@ -48,7 +48,7 @@ static void ibutton_protocols_get_group_by_id(
             local_id -= ibutton_protocol_groups[i]->protocol_count;
         }
     }
-    furi_crash(NULL);
+    furi_crash();
 }
 
 iButtonProtocols* ibutton_protocols_alloc() {
diff --git a/lib/infrared/encoder_decoder/nec/infrared_encoder_nec.c b/lib/infrared/encoder_decoder/nec/infrared_encoder_nec.c
index 87f81514..47d8c3c6 100644
--- a/lib/infrared/encoder_decoder/nec/infrared_encoder_nec.c
+++ b/lib/infrared/encoder_decoder/nec/infrared_encoder_nec.c
@@ -48,7 +48,7 @@ void infrared_encoder_nec_reset(void* encoder_ptr, const InfraredMessage* messag
         *data2 = (message->command & 0xFFC0) >> 6;
         encoder->bits_to_encode = 42;
     } else {
-        furi_assert(0);
+        furi_crash();
     }
 }
 
diff --git a/lib/infrared/encoder_decoder/sirc/infrared_encoder_sirc.c b/lib/infrared/encoder_decoder/sirc/infrared_encoder_sirc.c
index 6adf2235..39c2eb16 100644
--- a/lib/infrared/encoder_decoder/sirc/infrared_encoder_sirc.c
+++ b/lib/infrared/encoder_decoder/sirc/infrared_encoder_sirc.c
@@ -23,7 +23,7 @@ void infrared_encoder_sirc_reset(void* encoder_ptr, const InfraredMessage* messa
         *data |= (message->address & 0x1FFF) << 7;
         encoder->bits_to_encode = 20;
     } else {
-        furi_assert(0);
+        furi_crash();
     }
 }
 
diff --git a/lib/infrared/worker/infrared_transmit.c b/lib/infrared/worker/infrared_transmit.c
index 113fb632..8f99c006 100644
--- a/lib/infrared/worker/infrared_transmit.c
+++ b/lib/infrared/worker/infrared_transmit.c
@@ -88,7 +88,7 @@ FuriHalInfraredTxGetDataState
             state = FuriHalInfraredTxGetDataStateDone;
         }
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 
     return state;
diff --git a/lib/infrared/worker/infrared_worker.c b/lib/infrared/worker/infrared_worker.c
index 46effd42..38392fc0 100644
--- a/lib/infrared/worker/infrared_worker.c
+++ b/lib/infrared/worker/infrared_worker.c
@@ -165,7 +165,7 @@ static int32_t infrared_worker_rx_thread(void* thread_context) {
     InfraredWorker* instance = thread_context;
     uint32_t events = 0;
     LevelDuration level_duration;
-    TickType_t last_blink_time = 0;
+    uint32_t last_blink_time = 0;
 
     while(1) {
         events = furi_thread_flags_wait(INFRARED_WORKER_ALL_RX_EVENTS, 0, FuriWaitForever);
@@ -173,8 +173,8 @@ static int32_t infrared_worker_rx_thread(void* thread_context) {
 
         if(events & INFRARED_WORKER_RX_RECEIVED) {
             if(!instance->rx.overrun && instance->blink_enable &&
-               ((xTaskGetTickCount() - last_blink_time) > 80)) {
-                last_blink_time = xTaskGetTickCount();
+               ((furi_get_tick() - last_blink_time) > 80)) {
+                last_blink_time = furi_get_tick();
                 notification_message(instance->notification, &sequence_blink_blue_10);
             }
             if(instance->signal.timings_cnt == 0)
@@ -367,10 +367,11 @@ static FuriHalInfraredTxGetDataState
         *duration = timing.duration;
         state = timing.state;
     } else {
-        furi_assert(0);
+        // Why bother if we crash anyway?..
         *level = 0;
         *duration = 100;
         state = FuriHalInfraredTxGetDataStateDone;
+        furi_crash();
     }
 
     uint32_t flags_set = furi_thread_flags_set(
@@ -414,7 +415,7 @@ static bool infrared_get_new_signal(InfraredWorker* instance) {
     } else if(response == InfraredWorkerGetSignalResponseStop) {
         new_signal_obtained = false;
     } else {
-        furi_assert(0);
+        furi_crash();
     }
 
     return new_signal_obtained;
@@ -443,9 +444,8 @@ static bool infrared_worker_tx_fill_buffer(InfraredWorker* instance) {
         }
 
         if(status == InfraredStatusError) {
-            furi_assert(0);
             new_data_available = false;
-            break;
+            furi_crash();
         } else if(status == InfraredStatusOk) {
             timing.state = FuriHalInfraredTxGetDataStateOk;
         } else if(status == InfraredStatusDone) {
@@ -456,7 +456,7 @@ static bool infrared_worker_tx_fill_buffer(InfraredWorker* instance) {
                 timing.state = FuriHalInfraredTxGetDataStateLastDone;
             }
         } else {
-            furi_assert(0);
+            furi_crash();
         }
         uint32_t written_size =
             furi_stream_buffer_send(instance->stream, &timing, sizeof(InfraredWorkerTiming), 0);
@@ -548,7 +548,7 @@ static int32_t infrared_worker_tx_thread(void* thread_context) {
 
             break;
         default:
-            furi_assert(0);
+            furi_crash();
             break;
         }
     }
diff --git a/lib/lfrfid/lfrfid_worker.c b/lib/lfrfid/lfrfid_worker.c
index cbc7b02e..ffaa8ee9 100644
--- a/lib/lfrfid/lfrfid_worker.c
+++ b/lib/lfrfid/lfrfid_worker.c
@@ -1,7 +1,7 @@
+#include "lfrfid_worker_i.h"
+
 #include <furi.h>
 #include <furi_hal.h>
-#include <atomic.h>
-#include "lfrfid_worker_i.h"
 
 typedef enum {
     LFRFIDEventStopThread = (1 << 0),
diff --git a/lib/music_worker/music_worker.c b/lib/music_worker/music_worker.c
index 61fc838f..279d1267 100644
--- a/lib/music_worker/music_worker.c
+++ b/lib/music_worker/music_worker.c
@@ -396,7 +396,7 @@ bool music_worker_load_rtttl_from_file(MusicWorker* instance, const char* file_p
             break;
         };
 
-        uint16_t ret = 0;
+        size_t ret = 0;
         do {
             uint8_t buffer[65] = {0};
             ret = storage_file_read(file, buffer, sizeof(buffer) - 1);
diff --git a/lib/nfc/SConscript b/lib/nfc/SConscript
index 6c55cf5d..605a8639 100644
--- a/lib/nfc/SConscript
+++ b/lib/nfc/SConscript
@@ -36,9 +36,9 @@ env.Append(
         File("protocols/mf_ultralight/mf_ultralight_listener.h"),
         File("protocols/mf_classic/mf_classic_listener.h"),
         # Sync API
-        File("protocols/iso14443_3a/iso14443_3a_poller_sync_api.h"),
-        File("protocols/mf_ultralight/mf_ultralight_poller_sync_api.h"),
-        File("protocols/mf_classic/mf_classic_poller_sync_api.h"),
+        File("protocols/iso14443_3a/iso14443_3a_poller_sync.h"),
+        File("protocols/mf_ultralight/mf_ultralight_poller_sync.h"),
+        File("protocols/mf_classic/mf_classic_poller_sync.h"),
         # Misc
         File("helpers/nfc_util.h"),
         File("helpers/iso14443_crc.h"),
diff --git a/lib/nfc/helpers/nfc_data_generator.c b/lib/nfc/helpers/nfc_data_generator.c
index 27830516..011f9f6d 100644
--- a/lib/nfc/helpers/nfc_data_generator.c
+++ b/lib/nfc/helpers/nfc_data_generator.c
@@ -28,6 +28,7 @@ static const uint8_t default_config_ntag_i2c[] = {0x01, 0x00, 0xF8, 0x48, 0x08,
 static void nfc_generate_mf_ul_uid(uint8_t* uid) {
     uid[0] = NXP_MANUFACTURER_ID;
     furi_hal_random_fill_buf(&uid[1], 6);
+    uid[3] |= 0x01; // To avoid forbidden 0x88 value
     // I'm not sure how this is generated, but the upper nybble always seems to be 8
     uid[6] &= 0x0F;
     uid[6] |= 0x80;
@@ -322,6 +323,7 @@ static void nfc_generate_ntag_i2c_plus_2k(NfcDevice* nfc_device) {
 static void nfc_generate_mf_classic_uid(uint8_t* uid, uint8_t length) {
     uid[0] = NXP_MANUFACTURER_ID;
     furi_hal_random_fill_buf(&uid[1], length - 1);
+    uid[3] |= 0x01; // To avoid forbidden 0x88 value
 }
 
 static void
diff --git a/lib/nfc/nfc_poller.c b/lib/nfc/nfc_poller.c
index ffe0318a..48be37d9 100644
--- a/lib/nfc/nfc_poller.c
+++ b/lib/nfc/nfc_poller.c
@@ -28,6 +28,9 @@ struct NfcPoller {
     NfcPollerList list;
     NfcPollerSessionState session_state;
     bool protocol_detected;
+
+    NfcGenericCallbackEx callback;
+    void* context;
 };
 
 static void nfc_poller_list_alloc(NfcPoller* instance) {
@@ -127,6 +130,75 @@ void nfc_poller_start(NfcPoller* instance, NfcGenericCallback callback, void* co
     nfc_start(instance->nfc, nfc_poller_start_callback, instance);
 }
 
+static NfcCommand nfc_poller_start_ex_tail_callback(NfcGenericEvent event, void* context) {
+    furi_assert(context);
+    furi_assert(event.protocol != NfcProtocolInvalid);
+
+    NfcPoller* instance = context;
+    NfcCommand command = NfcCommandContinue;
+
+    NfcGenericEventEx poller_event = {
+        .poller = instance->list.tail->poller,
+        .parent_event_data = event.event_data,
+    };
+
+    command = instance->callback(poller_event, instance->context);
+
+    return command;
+}
+
+static NfcCommand nfc_poller_start_ex_head_callback(NfcEvent event, void* context) {
+    furi_assert(context);
+
+    NfcCommand command = NfcCommandContinue;
+    NfcPoller* instance = context;
+
+    NfcProtocol parent_protocol = nfc_protocol_get_parent(instance->protocol);
+
+    if(parent_protocol == NfcProtocolInvalid) {
+        NfcGenericEventEx poller_event = {
+            .poller = instance->list.tail->poller,
+            .parent_event_data = &event,
+        };
+
+        command = instance->callback(poller_event, instance->context);
+    } else {
+        NfcGenericEvent poller_event = {
+            .protocol = NfcProtocolInvalid,
+            .instance = instance->nfc,
+            .event_data = &event,
+        };
+        NfcPollerListElement* head_poller = instance->list.head;
+        command = head_poller->poller_api->run(poller_event, head_poller->poller);
+    }
+
+    if(instance->session_state == NfcPollerSessionStateStopRequest) {
+        command = NfcCommandStop;
+    }
+
+    return command;
+}
+
+void nfc_poller_start_ex(NfcPoller* instance, NfcGenericCallbackEx callback, void* context) {
+    furi_assert(instance);
+    furi_assert(callback);
+    furi_assert(instance->session_state == NfcPollerSessionStateIdle);
+
+    instance->callback = callback;
+    instance->context = context;
+
+    NfcProtocol parent_protocol = nfc_protocol_get_parent(instance->protocol);
+    if(parent_protocol != NfcProtocolInvalid) {
+        NfcPollerListElement* iter = instance->list.head;
+        while(iter->protocol != parent_protocol) iter = iter->child;
+
+        iter->poller_api->set_callback(iter->poller, nfc_poller_start_ex_tail_callback, instance);
+    }
+
+    instance->session_state = NfcPollerSessionStateActive;
+    nfc_start(instance->nfc, nfc_poller_start_ex_head_callback, instance);
+}
+
 void nfc_poller_stop(NfcPoller* instance) {
     furi_assert(instance);
     furi_assert(instance->nfc);
diff --git a/lib/nfc/nfc_poller.h b/lib/nfc/nfc_poller.h
index 8ae01a8e..18fbfb38 100644
--- a/lib/nfc/nfc_poller.h
+++ b/lib/nfc/nfc_poller.h
@@ -26,6 +26,31 @@ extern "C" {
  */
 typedef struct NfcPoller NfcPoller;
 
+/**
+ * @brief Extended generic Nfc event type.
+ *
+ * An extended generic Nfc event contains protocol poller and it's parent protocol event data.
+ * If protocol has no parent, then events are produced by Nfc instance.
+ *
+ * The parent_event_data field is protocol-specific and should be cast to the appropriate type before use.
+ */
+typedef struct {
+    NfcGenericInstance* poller; /**< Pointer to the protocol poller. */
+    NfcGenericEventData*
+        parent_event_data /**< Pointer to the protocol's parent poller event data. */;
+} NfcGenericEventEx;
+
+/**
+ * @brief Extended generic Nfc event callback type.
+ *
+ * A function of this type must be passed as the callback parameter upon extended start of a poller.
+ *
+ * @param [in] event Nfc  extended generic event, passed by value, complete with protocol type and data.
+ * @param [in,out] context pointer to the user-specific context (set when starting a poller/listener instance).
+ * @returns the command which the event producer must execute.
+ */
+typedef NfcCommand (*NfcGenericCallbackEx)(NfcGenericEventEx event, void* context);
+
 /**
  * @brief Allocate an NfcPoller instance.
  *
@@ -57,6 +82,18 @@ void nfc_poller_free(NfcPoller* instance);
  */
 void nfc_poller_start(NfcPoller* instance, NfcGenericCallback callback, void* context);
 
+/**
+ * @brief Start an NfcPoller instance in extended mode.
+ *
+ * When nfc poller is started in extended mode, callback will be called with parent protocol events
+ * and protocol instance. This mode enables to make custom poller state machines.
+ *
+ * @param[in,out] instance pointer to the instance to be started.
+ * @param[in] callback pointer to a user-defined callback function which will receive events.
+ * @param[in] context pointer to a user-specific context (will be passed to the callback).
+ */
+void nfc_poller_start_ex(NfcPoller* instance, NfcGenericCallbackEx callback, void* context);
+
 /**
  * @brief Stop an NfcPoller instance.
  *
diff --git a/lib/nfc/protocols/felica/felica_poller.c b/lib/nfc/protocols/felica/felica_poller.c
index 3fc2affe..23b1604e 100644
--- a/lib/nfc/protocols/felica/felica_poller.c
+++ b/lib/nfc/protocols/felica/felica_poller.c
@@ -66,7 +66,7 @@ static NfcCommand felica_poller_run(NfcGenericEvent event, void* context) {
 
     if(nfc_event->type == NfcEventTypePollerReady) {
         if(instance->state != FelicaPollerStateActivated) {
-            FelicaError error = felica_poller_async_activate(instance, instance->data);
+            FelicaError error = felica_poller_activate(instance, instance->data);
             if(error == FelicaErrorNone) {
                 instance->felica_event.type = FelicaPollerEventTypeReady;
                 instance->felica_event_data.error = error;
@@ -100,7 +100,7 @@ static bool felica_poller_detect(NfcGenericEvent event, void* context) {
     furi_assert(instance->state == FelicaPollerStateIdle);
 
     if(nfc_event->type == NfcEventTypePollerReady) {
-        FelicaError error = felica_poller_async_activate(instance, instance->data);
+        FelicaError error = felica_poller_activate(instance, instance->data);
         protocol_detected = (error == FelicaErrorNone);
     }
 
diff --git a/lib/nfc/protocols/felica/felica_poller.h b/lib/nfc/protocols/felica/felica_poller.h
index 7d0c9525..45fd9a9a 100644
--- a/lib/nfc/protocols/felica/felica_poller.h
+++ b/lib/nfc/protocols/felica/felica_poller.h
@@ -9,22 +9,50 @@
 extern "C" {
 #endif
 
+/**
+ * @brief FelicaPoller opaque type definition.
+ */
 typedef struct FelicaPoller FelicaPoller;
 
+/**
+ * @brief Enumeration of possible Felica poller event types.
+ */
 typedef enum {
-    FelicaPollerEventTypeError,
-    FelicaPollerEventTypeReady,
+    FelicaPollerEventTypeError, /**< The card was activated by the poller. */
+    FelicaPollerEventTypeReady, /**< An error occured during activation procedure. */
 } FelicaPollerEventType;
 
-typedef struct {
-    FelicaError error;
+/**
+ * @brief Felica poller event data.
+ */
+typedef union {
+    FelicaError error; /**< Error code indicating card activation fail reason. */
 } FelicaPollerEventData;
 
+/**
+ * @brief FelicaPoller poller event structure.
+ *
+ * Upon emission of an event, an instance of this struct will be passed to the callback.
+ */
 typedef struct {
-    FelicaPollerEventType type;
-    FelicaPollerEventData* data;
+    FelicaPollerEventType type; /**< Type of emmitted event. */
+    FelicaPollerEventData* data; /**< Pointer to event specific data. */
 } FelicaPollerEvent;
 
+/**
+ * @brief Perform collision resolution procedure.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Perfoms the collision resolution procedure as defined in FeliCa standars. The data
+ * field will be filled with Felica data on success.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the Felica data structure to be filled.
+ * @return FelicaErrorNone on success, an error code on failure.
+ */
+FelicaError felica_poller_activate(FelicaPoller* instance, FelicaData* data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/felica/felica_poller_i.c b/lib/nfc/protocols/felica/felica_poller_i.c
index d8015fdf..bfbf150e 100644
--- a/lib/nfc/protocols/felica/felica_poller_i.c
+++ b/lib/nfc/protocols/felica/felica_poller_i.c
@@ -49,7 +49,7 @@ static FelicaError felica_poller_frame_exchange(
     return ret;
 }
 
-FelicaError felica_poller_async_polling(
+FelicaError felica_poller_polling(
     FelicaPoller* instance,
     const FelicaPollerPollingCommand* cmd,
     FelicaPollerPollingResponse* resp) {
@@ -93,7 +93,7 @@ FelicaError felica_poller_async_polling(
     return error;
 }
 
-FelicaError felica_poller_async_activate(FelicaPoller* instance, FelicaData* data) {
+FelicaError felica_poller_activate(FelicaPoller* instance, FelicaData* data) {
     furi_assert(instance);
 
     felica_reset(data);
@@ -112,7 +112,7 @@ FelicaError felica_poller_async_activate(FelicaPoller* instance, FelicaData* dat
         };
         FelicaPollerPollingResponse polling_resp = {};
 
-        ret = felica_poller_async_polling(instance, &polling_cmd, &polling_resp);
+        ret = felica_poller_polling(instance, &polling_cmd, &polling_resp);
 
         if(ret != FelicaErrorNone) {
             FURI_LOG_T(TAG, "Activation failed error: %d", ret);
diff --git a/lib/nfc/protocols/felica/felica_poller_i.h b/lib/nfc/protocols/felica/felica_poller_i.h
index e12f0147..3bd4d91f 100644
--- a/lib/nfc/protocols/felica/felica_poller_i.h
+++ b/lib/nfc/protocols/felica/felica_poller_i.h
@@ -48,13 +48,11 @@ typedef struct {
 
 const FelicaData* felica_poller_get_data(FelicaPoller* instance);
 
-FelicaError felica_poller_async_polling(
+FelicaError felica_poller_polling(
     FelicaPoller* instance,
     const FelicaPollerPollingCommand* cmd,
     FelicaPollerPollingResponse* resp);
 
-FelicaError felica_poller_async_activate(FelicaPoller* instance, FelicaData* data);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller.c b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller.c
index 880092c3..158250ac 100644
--- a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller.c
+++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller.c
@@ -72,7 +72,7 @@ static NfcCommand iso14443_3a_poller_run(NfcGenericEvent event, void* context) {
     if(nfc_event->type == NfcEventTypePollerReady) {
         if(instance->state != Iso14443_3aPollerStateActivated) {
             Iso14443_3aData data = {};
-            Iso14443_3aError error = iso14443_3a_poller_async_activate(instance, &data);
+            Iso14443_3aError error = iso14443_3a_poller_activate(instance, &data);
             if(error == Iso14443_3aErrorNone) {
                 instance->state = Iso14443_3aPollerStateActivated;
                 instance->iso14443_3a_event.type = Iso14443_3aPollerEventTypeReady;
@@ -111,7 +111,7 @@ static bool iso14443_3a_poller_detect(NfcGenericEvent event, void* context) {
     furi_assert(instance->state == Iso14443_3aPollerStateIdle);
 
     if(nfc_event->type == NfcEventTypePollerReady) {
-        Iso14443_3aError error = iso14443_3a_poller_async_activate(instance, NULL);
+        Iso14443_3aError error = iso14443_3a_poller_activate(instance, NULL);
         protocol_detected = (error == Iso14443_3aErrorNone);
     }
 
diff --git a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller.h b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller.h
index 385cd522..42e4b4bf 100644
--- a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller.h
+++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller.h
@@ -9,34 +9,137 @@
 extern "C" {
 #endif
 
+/**
+ * @brief Iso14443_3aPoller opaque type definition.
+ */
 typedef struct Iso14443_3aPoller Iso14443_3aPoller;
 
+/**
+ * @brief Enumeration of possible Iso14443_3a poller event types.
+ */
 typedef enum {
-    Iso14443_3aPollerEventTypeError,
-    Iso14443_3aPollerEventTypeReady,
+    Iso14443_3aPollerEventTypeError, /**< The card was activated by the poller. */
+    Iso14443_3aPollerEventTypeReady, /**< An error occured during activation procedure. */
 } Iso14443_3aPollerEventType;
 
-typedef struct {
-    Iso14443_3aError error;
+/**
+ * @brief Iso14443_3a poller event data.
+ */
+typedef union {
+    Iso14443_3aError error; /**< Error code indicating card activation fail reason. */
 } Iso14443_3aPollerEventData;
 
+/**
+ * @brief Iso14443_3a poller event structure.
+ *
+ * Upon emission of an event, an instance of this struct will be passed to the callback.
+ */
 typedef struct {
-    Iso14443_3aPollerEventType type;
-    Iso14443_3aPollerEventData* data;
+    Iso14443_3aPollerEventType type; /**< Type of emmitted event. */
+    Iso14443_3aPollerEventData* data; /**< Pointer to event specific data. */
 } Iso14443_3aPollerEvent;
 
+/**
+ * @brief Transmit and receive Iso14443_3a frames in poller mode.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * The rx_buffer will be filled with any data received as a response to data
+ * sent from tx_buffer, with a timeout defined by the fwt parameter.
+ *
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tx_buffer pointer to the buffer containing the data to be transmitted.
+ * @param[out] rx_buffer pointer to the buffer to be filled with received data.
+ * @param[in] fwt frame wait time (response timeout), in carrier cycles.
+ * @return Iso14443_3aErrorNone on success, an error code on failure.
+ */
 Iso14443_3aError iso14443_3a_poller_txrx(
     Iso14443_3aPoller* instance,
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer,
     uint32_t fwt);
 
+/**
+ * @brief Transmit and receive Iso14443_3a standard frames in poller mode.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * The rx_buffer will be filled with any data received as a response to data
+ * sent from tx_buffer, with a timeout defined by the fwt parameter.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tx_buffer pointer to the buffer containing the data to be transmitted.
+ * @param[out] rx_buffer pointer to the buffer to be filled with received data.
+ * @param[in] fwt frame wait time (response timeout), in carrier cycles.
+ * @return Iso14443_3aErrorNone on success, an error code on failure.
+ */
 Iso14443_3aError iso14443_3a_poller_send_standard_frame(
     Iso14443_3aPoller* instance,
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer,
     uint32_t fwt);
 
+/**
+ * @brief Transmit and receive Iso14443_3a frames with custom parity bits in poller mode.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * The rx_buffer will be filled with any data received as a response to data
+ * sent from tx_buffer, with a timeout defined by the fwt parameter.
+ *
+ * Custom parity bits must be set in the tx_buffer. The rx_buffer will contain
+ * the received data with the parity bits.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tx_buffer pointer to the buffer containing the data to be transmitted.
+ * @param[out] rx_buffer pointer to the buffer to be filled with received data.
+ * @param[in] fwt frame wait time (response timeout), in carrier cycles.
+ * @return Iso14443_3aErrorNone on success, an error code on failure.
+ */
+Iso14443_3aError iso14443_3a_poller_txrx_custom_parity(
+    Iso14443_3aPoller* instance,
+    const BitBuffer* tx_buffer,
+    BitBuffer* rx_buffer,
+    uint32_t fwt);
+
+/**
+ * @brief Checks presence of Iso14443_3a complient card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @return Iso14443_3aErrorNone if card is present, an error code otherwise.
+ */
+Iso14443_3aError iso14443_3a_poller_check_presence(Iso14443_3aPoller* instance);
+
+/**
+ * @brief Perform collision resolution procedure.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Perfoms the collision resolution procedure as defined in Iso14443-3a. The iso14443_3a_data
+ * field will be filled with Iso14443-3a data on success.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] iso14443_3a_data pointer to the Iso14443_3a data structure to be filled.
+ * @return Iso14443_3aErrorNone on success, an error code on failure.
+ */
+Iso14443_3aError
+    iso14443_3a_poller_activate(Iso14443_3aPoller* instance, Iso14443_3aData* iso14443_3a_data);
+
+/**
+ * @brief Send HALT command to the card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Halts card and changes internal Iso14443_3aPoller state to Idle.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @return Iso14443_3aErrorNone on success, an error code on failure.
+ */
+Iso14443_3aError iso14443_3a_poller_halt(Iso14443_3aPoller* instance);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.c b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.c
index 3434dc8e..2be88bc5 100644
--- a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.c
+++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.c
@@ -94,9 +94,8 @@ Iso14443_3aError iso14443_3a_poller_halt(Iso14443_3aPoller* instance) {
     return Iso14443_3aErrorNone;
 }
 
-Iso14443_3aError iso14443_3a_poller_async_activate(
-    Iso14443_3aPoller* instance,
-    Iso14443_3aData* iso14443_3a_data) {
+Iso14443_3aError
+    iso14443_3a_poller_activate(Iso14443_3aPoller* instance, Iso14443_3aData* iso14443_3a_data) {
     furi_assert(instance);
     furi_assert(instance->nfc);
     furi_assert(instance->tx_buffer);
diff --git a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.h b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.h
index 063ef155..764f1a6b 100644
--- a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.h
+++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.h
@@ -39,15 +39,9 @@ typedef enum {
     Iso14443_3aPollerStateActivated,
 } Iso14443_3aPollerState;
 
-typedef enum {
-    Iso14443_3aPollerConfigStateIdle,
-    Iso14443_3aPollerConfigStateDone,
-} Iso14443_3aPollerConfigState;
-
 struct Iso14443_3aPoller {
     Nfc* nfc;
     Iso14443_3aPollerState state;
-    Iso14443_3aPollerConfigState config_state;
     Iso14443_3aPollerColRes col_res;
     Iso14443_3aData* data;
     BitBuffer* tx_buffer;
@@ -62,20 +56,6 @@ struct Iso14443_3aPoller {
 
 const Iso14443_3aData* iso14443_3a_poller_get_data(Iso14443_3aPoller* instance);
 
-Iso14443_3aError iso14443_3a_poller_check_presence(Iso14443_3aPoller* instance);
-
-Iso14443_3aError iso14443_3a_poller_async_activate(
-    Iso14443_3aPoller* instance,
-    Iso14443_3aData* iso14443_3a_data);
-
-Iso14443_3aError iso14443_3a_poller_halt(Iso14443_3aPoller* instance);
-
-Iso14443_3aError iso14443_3a_poller_txrx_custom_parity(
-    Iso14443_3aPoller* instance,
-    const BitBuffer* tx_buffer,
-    BitBuffer* rx_buffer,
-    uint32_t fwt);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync_api.c b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c
similarity index 93%
rename from lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync_api.c
rename to lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c
index 2bab1a88..ea7a6ae1 100644
--- a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync_api.c
+++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c
@@ -1,4 +1,4 @@
-#include "iso14443_3a_poller_sync_api.h"
+#include "iso14443_3a_poller_sync.h"
 
 #include "iso14443_3a_poller_i.h"
 #include <nfc/nfc_poller.h>
@@ -34,7 +34,7 @@ NfcCommand iso14443_3a_poller_read_callback(NfcGenericEvent event, void* context
     return NfcCommandStop;
 }
 
-Iso14443_3aError iso14443_3a_poller_read(Nfc* nfc, Iso14443_3aData* iso14443_3a_data) {
+Iso14443_3aError iso14443_3a_poller_sync_read(Nfc* nfc, Iso14443_3aData* iso14443_3a_data) {
     furi_assert(nfc);
     furi_assert(iso14443_3a_data);
 
diff --git a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync_api.h b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.h
similarity index 58%
rename from lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync_api.h
rename to lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.h
index ed17ff43..72f084d1 100644
--- a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync_api.h
+++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.h
@@ -7,7 +7,7 @@
 extern "C" {
 #endif
 
-Iso14443_3aError iso14443_3a_poller_read(Nfc* nfc, Iso14443_3aData* iso14443_3a_data);
+Iso14443_3aError iso14443_3a_poller_sync_read(Nfc* nfc, Iso14443_3aData* iso14443_3a_data);
 
 #ifdef __cplusplus
 }
diff --git a/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller.c b/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller.c
index 9507f28c..f0c9b67a 100644
--- a/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller.c
+++ b/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller.c
@@ -70,7 +70,7 @@ static NfcCommand iso14443_3b_poller_run(NfcGenericEvent event, void* context) {
 
     if(nfc_event->type == NfcEventTypePollerReady) {
         if(instance->state != Iso14443_3bPollerStateActivated) {
-            Iso14443_3bError error = iso14443_3b_poller_async_activate(instance, instance->data);
+            Iso14443_3bError error = iso14443_3b_poller_activate(instance, instance->data);
             if(error == Iso14443_3bErrorNone) {
                 instance->iso14443_3b_event.type = Iso14443_3bPollerEventTypeReady;
                 instance->iso14443_3b_event_data.error = error;
@@ -104,7 +104,7 @@ static bool iso14443_3b_poller_detect(NfcGenericEvent event, void* context) {
     furi_assert(instance->state == Iso14443_3bPollerStateIdle);
 
     if(nfc_event->type == NfcEventTypePollerReady) {
-        Iso14443_3bError error = iso14443_3b_poller_async_activate(instance, instance->data);
+        Iso14443_3bError error = iso14443_3b_poller_activate(instance, instance->data);
         protocol_detected = (error == Iso14443_3bErrorNone);
     }
 
diff --git a/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller.h b/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller.h
index d25d9dbe..940903c1 100644
--- a/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller.h
+++ b/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller.h
@@ -9,22 +9,81 @@
 extern "C" {
 #endif
 
+/**
+ * @brief Iso14443_3bPoller opaque type definition.
+ */
 typedef struct Iso14443_3bPoller Iso14443_3bPoller;
 
+/**
+ * @brief Enumeration of possible Iso14443_3b poller event types.
+ */
 typedef enum {
-    Iso14443_3bPollerEventTypeError,
-    Iso14443_3bPollerEventTypeReady,
+    Iso14443_3bPollerEventTypeError, /**< The card was activated by the poller. */
+    Iso14443_3bPollerEventTypeReady, /**< An error occured during activation procedure. */
 } Iso14443_3bPollerEventType;
 
-typedef struct {
-    Iso14443_3bError error;
+/**
+ * @brief Iso14443_3b poller event data.
+ */
+typedef union {
+    Iso14443_3bError error; /**< Error code indicating card activation fail reason. */
 } Iso14443_3bPollerEventData;
 
+/**
+ * @brief Iso14443_3b poller event structure.
+ *
+ * Upon emission of an event, an instance of this struct will be passed to the callback.
+ */
 typedef struct {
-    Iso14443_3bPollerEventType type;
-    Iso14443_3bPollerEventData* data;
+    Iso14443_3bPollerEventType type; /**< Type of emmitted event. */
+    Iso14443_3bPollerEventData* data; /**< Pointer to event specific data. */
 } Iso14443_3bPollerEvent;
 
+/**
+ * @brief Transmit and receive Iso14443_3b frames in poller mode.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * The rx_buffer will be filled with any data received as a response to data
+ * sent from tx_buffer, with a timeout defined by the fwt parameter.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tx_buffer pointer to the buffer containing the data to be transmitted.
+ * @param[out] rx_buffer pointer to the buffer to be filled with received data.
+ * @param[in] fwt frame wait time (response timeout), in carrier cycles.
+ * @return Iso14443_3bErrorNone on success, an error code on failure.
+ */
+Iso14443_3bError iso14443_3b_poller_send_frame(
+    Iso14443_3bPoller* instance,
+    const BitBuffer* tx_buffer,
+    BitBuffer* rx_buffer);
+
+/**
+ * @brief Perform collision resolution procedure.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Perfoms the collision resolution procedure as defined in Iso14443-3b. The data
+ * field will be filled with Iso14443-3b data on success.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the Iso14443_3b data structure to be filled.
+ * @return Iso14443_3bErrorNone on success, an error code on failure.
+ */
+Iso14443_3bError iso14443_3b_poller_activate(Iso14443_3bPoller* instance, Iso14443_3bData* data);
+
+/**
+ * @brief Send HALT command to the card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Halts card and changes internal Iso14443_3bPoller state to Idle.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @return Iso14443_3bErrorNone on success, an error code on failure.
+ */
+Iso14443_3bError iso14443_3b_poller_halt(Iso14443_3bPoller* instance);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller_i.c b/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller_i.c
index 95668ccf..1ee5237c 100644
--- a/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller_i.c
+++ b/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller_i.c
@@ -21,7 +21,7 @@ static Iso14443_3bError iso14443_3b_poller_prepare_trx(Iso14443_3bPoller* instan
     furi_assert(instance);
 
     if(instance->state == Iso14443_3bPollerStateIdle) {
-        return iso14443_3b_poller_async_activate(instance, NULL);
+        return iso14443_3b_poller_activate(instance, NULL);
     }
 
     return Iso14443_3bErrorNone;
@@ -63,8 +63,7 @@ static Iso14443_3bError iso14443_3b_poller_frame_exchange(
     return ret;
 }
 
-Iso14443_3bError
-    iso14443_3b_poller_async_activate(Iso14443_3bPoller* instance, Iso14443_3bData* data) {
+Iso14443_3bError iso14443_3b_poller_activate(Iso14443_3bPoller* instance, Iso14443_3bData* data) {
     furi_assert(instance);
     furi_assert(instance->nfc);
 
diff --git a/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller_i.h b/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller_i.h
index 5821d637..2503c2e4 100644
--- a/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller_i.h
+++ b/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller_i.h
@@ -34,16 +34,6 @@ struct Iso14443_3bPoller {
 
 const Iso14443_3bData* iso14443_3b_poller_get_data(Iso14443_3bPoller* instance);
 
-Iso14443_3bError
-    iso14443_3b_poller_async_activate(Iso14443_3bPoller* instance, Iso14443_3bData* data);
-
-Iso14443_3bError iso14443_3b_poller_halt(Iso14443_3bPoller* instance);
-
-Iso14443_3bError iso14443_3b_poller_send_frame(
-    Iso14443_3bPoller* instance,
-    const BitBuffer* tx_buffer,
-    BitBuffer* rx_buffer);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso14443_4a/iso14443_4a.h b/lib/nfc/protocols/iso14443_4a/iso14443_4a.h
index 9580c140..df212152 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a.h
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a.h
@@ -2,6 +2,8 @@
 
 #include <nfc/protocols/iso14443_3a/iso14443_3a.h>
 
+#include <lib/toolbox/simple_array.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -28,7 +30,19 @@ typedef enum {
     Iso14443_4aFrameOptionCid,
 } Iso14443_4aFrameOption;
 
-typedef struct Iso14443_4aData Iso14443_4aData;
+typedef struct {
+    uint8_t tl;
+    uint8_t t0;
+    uint8_t ta_1;
+    uint8_t tb_1;
+    uint8_t tc_1;
+    SimpleArray* t1_tk;
+} Iso14443_4aAtsData;
+
+typedef struct {
+    Iso14443_3aData* iso14443_3a_data;
+    Iso14443_4aAtsData ats_data;
+} Iso14443_4aData;
 
 // Virtual methods
 
diff --git a/lib/nfc/protocols/iso14443_4a/iso14443_4a_i.h b/lib/nfc/protocols/iso14443_4a/iso14443_4a_i.h
index e45fb90c..e5483a6b 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a_i.h
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a_i.h
@@ -2,8 +2,6 @@
 
 #include "iso14443_4a.h"
 
-#include <lib/toolbox/simple_array.h>
-
 #define ISO14443_4A_CMD_READ_ATS (0xE0)
 
 // ATS bit definitions
@@ -23,20 +21,6 @@
 #define ISO14443_4A_ATS_TC1_NAD (1U << 0)
 #define ISO14443_4A_ATS_TC1_CID (1U << 1)
 
-typedef struct {
-    uint8_t tl;
-    uint8_t t0;
-    uint8_t ta_1;
-    uint8_t tb_1;
-    uint8_t tc_1;
-    SimpleArray* t1_tk;
-} Iso14443_4aAtsData;
-
-struct Iso14443_4aData {
-    Iso14443_3aData* iso14443_3a_data;
-    Iso14443_4aAtsData ats_data;
-};
-
 bool iso14443_4a_ats_parse(Iso14443_4aAtsData* data, const BitBuffer* buf);
 
 Iso14443_4aError iso14443_4a_process_error(Iso14443_3aError error);
diff --git a/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.c b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.c
index c07cc6b7..e20048b5 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.c
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.c
@@ -55,8 +55,7 @@ static NfcCommand iso14443_4a_poller_handler_idle(Iso14443_4aPoller* instance) {
 }
 
 static NfcCommand iso14443_4a_poller_handler_read_ats(Iso14443_4aPoller* instance) {
-    Iso14443_4aError error =
-        iso14443_4a_poller_async_read_ats(instance, &instance->data->ats_data);
+    Iso14443_4aError error = iso14443_4a_poller_read_ats(instance, &instance->data->ats_data);
     if(error == Iso14443_4aErrorNone) {
         FURI_LOG_D(TAG, "Read ATS success");
         instance->poller_state = Iso14443_4aPollerStateReady;
diff --git a/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.h b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.h
index b224299e..73eb6ef7 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.h
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.h
@@ -8,22 +8,80 @@
 extern "C" {
 #endif
 
+/**
+ * @brief Iso14443_4aPoller opaque type definition.
+ */
 typedef struct Iso14443_4aPoller Iso14443_4aPoller;
 
+/**
+ * @brief Enumeration of possible Iso14443_4a poller event types.
+ */
 typedef enum {
-    Iso14443_4aPollerEventTypeError,
-    Iso14443_4aPollerEventTypeReady,
+    Iso14443_4aPollerEventTypeError, /**< The card was activated by the poller. */
+    Iso14443_4aPollerEventTypeReady, /**< An error occured during activation procedure. */
 } Iso14443_4aPollerEventType;
 
-typedef struct {
-    Iso14443_4aError error;
+/**
+ * @brief Iso14443_4a poller event data.
+ */
+typedef union {
+    Iso14443_4aError error; /**< Error code indicating card activation fail reason. */
 } Iso14443_4aPollerEventData;
 
+/**
+ * @brief Iso14443_4a poller event structure.
+ *
+ * Upon emission of an event, an instance of this struct will be passed to the callback.
+ */
 typedef struct {
-    Iso14443_4aPollerEventType type;
-    Iso14443_4aPollerEventData* data;
+    Iso14443_4aPollerEventType type; /**< Type of emmitted event. */
+    Iso14443_4aPollerEventData* data; /**< Pointer to event specific data. */
 } Iso14443_4aPollerEvent;
 
+/**
+ * @brief Transmit and receive Iso14443_4a blocks in poller mode.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * The rx_buffer will be filled with any data received as a response to data
+ * sent from tx_buffer. The fwt parameter is calculated during activation procedure.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tx_buffer pointer to the buffer containing the data to be transmitted.
+ * @param[out] rx_buffer pointer to the buffer to be filled with received data.
+ * @return Iso14443_4aErrorNone on success, an error code on failure.
+ */
+Iso14443_4aError iso14443_4a_poller_send_block(
+    Iso14443_4aPoller* instance,
+    const BitBuffer* tx_buffer,
+    BitBuffer* rx_buffer);
+
+/**
+ * @brief Send HALT command to the card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Halts card and changes internal Iso14443_4aPoller state to Idle.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @return Iso14443_4aErrorNone on success, an error code on failure.
+ */
+Iso14443_4aError iso14443_4a_poller_halt(Iso14443_4aPoller* instance);
+
+/**
+ * @brief Read Answer To Select (ATS) from the card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Send Request Answer To Select (RATS) command to the card and parse the response.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the buffer to be filled with ATS data.
+ * @return Iso14443_4aErrorNone on success, an error code on failure.
+ */
+Iso14443_4aError
+    iso14443_4a_poller_read_ats(Iso14443_4aPoller* instance, Iso14443_4aAtsData* data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.c b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.c
index 7221e2aa..938e4e71 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.c
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.c
@@ -18,7 +18,7 @@ Iso14443_4aError iso14443_4a_poller_halt(Iso14443_4aPoller* instance) {
 }
 
 Iso14443_4aError
-    iso14443_4a_poller_async_read_ats(Iso14443_4aPoller* instance, Iso14443_4aAtsData* data) {
+    iso14443_4a_poller_read_ats(Iso14443_4aPoller* instance, Iso14443_4aAtsData* data) {
     furi_assert(instance);
 
     bit_buffer_reset(instance->tx_buffer);
diff --git a/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.h b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.h
index 1113d381..7aae852e 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.h
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.h
@@ -43,20 +43,8 @@ struct Iso14443_4aPoller {
     void* context;
 };
 
-Iso14443_4aError iso14443_4a_process_error(Iso14443_3aError error);
-
 const Iso14443_4aData* iso14443_4a_poller_get_data(Iso14443_4aPoller* instance);
 
-Iso14443_4aError iso14443_4a_poller_halt(Iso14443_4aPoller* instance);
-
-Iso14443_4aError
-    iso14443_4a_poller_async_read_ats(Iso14443_4aPoller* instance, Iso14443_4aAtsData* data);
-
-Iso14443_4aError iso14443_4a_poller_send_block(
-    Iso14443_4aPoller* instance,
-    const BitBuffer* tx_buffer,
-    BitBuffer* rx_buffer);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller.h b/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller.h
index e60090c0..03b288c0 100644
--- a/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller.h
+++ b/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller.h
@@ -8,22 +8,66 @@
 extern "C" {
 #endif
 
+/**
+ * @brief Iso14443_4bPoller opaque type definition.
+ */
 typedef struct Iso14443_4bPoller Iso14443_4bPoller;
 
+/**
+ * @brief Enumeration of possible Iso14443_4b poller event types.
+ */
 typedef enum {
-    Iso14443_4bPollerEventTypeError,
-    Iso14443_4bPollerEventTypeReady,
+    Iso14443_4bPollerEventTypeError, /**< The card was activated by the poller. */
+    Iso14443_4bPollerEventTypeReady, /**< An error occured during activation procedure. */
 } Iso14443_4bPollerEventType;
 
-typedef struct {
-    Iso14443_4bError error;
+/**
+ * @brief Iso14443_4b poller event data.
+ */
+typedef union {
+    Iso14443_4bError error; /**< Error code indicating card activation fail reason. */
 } Iso14443_4bPollerEventData;
 
+/**
+ * @brief Iso14443_4b poller event structure.
+ *
+ * Upon emission of an event, an instance of this struct will be passed to the callback.
+ */
 typedef struct {
-    Iso14443_4bPollerEventType type;
-    Iso14443_4bPollerEventData* data;
+    Iso14443_4bPollerEventType type; /**< Type of emmitted event. */
+    Iso14443_4bPollerEventData* data; /**< Pointer to event specific data. */
 } Iso14443_4bPollerEvent;
 
+/**
+ * @brief Transmit and receive Iso14443_4b blocks in poller mode.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * The rx_buffer will be filled with any data received as a response to data
+ * sent from tx_buffer. The fwt parameter is calculated during activation procedure.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tx_buffer pointer to the buffer containing the data to be transmitted.
+ * @param[out] rx_buffer pointer to the buffer to be filled with received data.
+ * @return Iso14443_4bErrorNone on success, an error code on failure.
+ */
+Iso14443_4bError iso14443_4b_poller_send_block(
+    Iso14443_4bPoller* instance,
+    const BitBuffer* tx_buffer,
+    BitBuffer* rx_buffer);
+
+/**
+ * @brief Send HALT command to the card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Halts card and changes internal Iso14443_4aPoller state to Idle.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @return Iso14443_4bErrorNone on success, an error code on failure.
+ */
+Iso14443_4bError iso14443_4b_poller_halt(Iso14443_4bPoller* instance);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller_i.h b/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller_i.h
index 4df00adc..fc9c2632 100644
--- a/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller_i.h
+++ b/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller_i.h
@@ -40,17 +40,8 @@ struct Iso14443_4bPoller {
     void* context;
 };
 
-Iso14443_4bError iso14443_4b_process_error(Iso14443_3bError error);
-
 const Iso14443_4bData* iso14443_4b_poller_get_data(Iso14443_4bPoller* instance);
 
-Iso14443_4bError iso14443_4b_poller_halt(Iso14443_4bPoller* instance);
-
-Iso14443_4bError iso14443_4b_poller_send_block(
-    Iso14443_4bPoller* instance,
-    const BitBuffer* tx_buffer,
-    BitBuffer* rx_buffer);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso15693_3/iso15693_3_poller.c b/lib/nfc/protocols/iso15693_3/iso15693_3_poller.c
index 9500e165..cf27b1f3 100644
--- a/lib/nfc/protocols/iso15693_3/iso15693_3_poller.c
+++ b/lib/nfc/protocols/iso15693_3/iso15693_3_poller.c
@@ -70,7 +70,7 @@ static NfcCommand iso15693_3_poller_run(NfcGenericEvent event, void* context) {
 
     if(nfc_event->type == NfcEventTypePollerReady) {
         if(instance->state != Iso15693_3PollerStateActivated) {
-            Iso15693_3Error error = iso15693_3_poller_async_activate(instance, instance->data);
+            Iso15693_3Error error = iso15693_3_poller_activate(instance, instance->data);
             if(error == Iso15693_3ErrorNone) {
                 instance->iso15693_3_event.type = Iso15693_3PollerEventTypeReady;
                 instance->iso15693_3_event_data.error = error;
@@ -105,7 +105,7 @@ static bool iso15693_3_poller_detect(NfcGenericEvent event, void* context) {
 
     if(nfc_event->type == NfcEventTypePollerReady) {
         uint8_t uid[ISO15693_3_UID_SIZE];
-        Iso15693_3Error error = iso15693_3_poller_async_inventory(instance, uid);
+        Iso15693_3Error error = iso15693_3_poller_inventory(instance, uid);
         protocol_detected = (error == Iso15693_3ErrorNone);
     }
 
diff --git a/lib/nfc/protocols/iso15693_3/iso15693_3_poller.h b/lib/nfc/protocols/iso15693_3/iso15693_3_poller.h
index 9d73242f..a187ceac 100644
--- a/lib/nfc/protocols/iso15693_3/iso15693_3_poller.h
+++ b/lib/nfc/protocols/iso15693_3/iso15693_3_poller.h
@@ -8,22 +8,142 @@
 extern "C" {
 #endif
 
+/**
+ * @brief Iso15693_3Poller opaque type definition.
+ */
 typedef struct Iso15693_3Poller Iso15693_3Poller;
 
+/**
+ * @brief Enumeration of possible Iso15693_3 poller event types.
+ */
 typedef enum {
-    Iso15693_3PollerEventTypeError,
-    Iso15693_3PollerEventTypeReady,
+    Iso15693_3PollerEventTypeError, /**< The card was activated by the poller. */
+    Iso15693_3PollerEventTypeReady, /**< An error occured during activation procedure. */
 } Iso15693_3PollerEventType;
 
-typedef struct {
-    Iso15693_3Error error;
+/**
+ * @brief Iso15693_3 poller event data.
+ */
+typedef union {
+    Iso15693_3Error error; /**< Error code indicating card activation fail reason. */
 } Iso15693_3PollerEventData;
 
+/**
+ * @brief Iso15693_3 poller event structure.
+ *
+ * Upon emission of an event, an instance of this struct will be passed to the callback.
+ */
 typedef struct {
-    Iso15693_3PollerEventType type;
-    Iso15693_3PollerEventData* data;
+    Iso15693_3PollerEventType type; /**< Type of emmitted event. */
+    Iso15693_3PollerEventData* data; /**< Pointer to event specific data. */
 } Iso15693_3PollerEvent;
 
+/**
+ * @brief Transmit and receive Iso15693_3 frames in poller mode.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * The rx_buffer will be filled with any data received as a response to data
+ * sent from tx_buffer, with a timeout defined by the fwt parameter.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tx_buffer pointer to the buffer containing the data to be transmitted.
+ * @param[out] rx_buffer pointer to the buffer to be filled with received data.
+ * @param[in] fwt frame wait time (response timeout), in carrier cycles.
+ * @return Iso15693_3ErrorNone on success, an error code on failure.
+ */
+Iso15693_3Error iso15693_3_poller_send_frame(
+    Iso15693_3Poller* instance,
+    const BitBuffer* tx_buffer,
+    BitBuffer* rx_buffer,
+    uint32_t fwt);
+
+/**
+ * @brief Perform activation procedure.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Perfoms the activation procedure as defined in Iso15693_3. The data
+ * field will be filled with Iso15693_3Data data on success.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the Iso15693_3 data structure to be filled.
+ * @return Iso15693_3ErrorNone on success, an error code on failure.
+ */
+Iso15693_3Error iso15693_3_poller_activate(Iso15693_3Poller* instance, Iso15693_3Data* data);
+
+/**
+ * @brief Send invertory command and parse response.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] uid pointer to the buffer to be filled with the UID.
+ * @return Iso15693_3ErrorNone on success, an error code on failure.
+ */
+Iso15693_3Error iso15693_3_poller_inventory(Iso15693_3Poller* instance, uint8_t* uid);
+
+/**
+ * @brief Send get system info command and parse response.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the Iso15693_3SystemInfo structure to be filled.
+ * @return Iso15693_3ErrorNone on success, an error code on failure.
+ */
+Iso15693_3Error
+    iso15693_3_poller_get_system_info(Iso15693_3Poller* instance, Iso15693_3SystemInfo* data);
+
+/**
+ * @brief Read Iso15693_3 block.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the buffer to be filled with the block data.
+ * @param[in] block_number block number to be read.
+ * @param[in] block_size size of the block to be read.
+ * @return Iso15693_3ErrorNone on success, an error code on failure.
+ */
+Iso15693_3Error iso15693_3_poller_read_block(
+    Iso15693_3Poller* instance,
+    uint8_t* data,
+    uint8_t block_number,
+    uint8_t block_size);
+
+/**
+ * @brief Read multiple Iso15693_3 blocks.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the buffer to be filled with the block data.
+ * @param[in] block_count number of blocks to be read.
+ * @param[in] block_size size of the blocks to be read.
+ * @return Iso15693_3ErrorNone on success, an error code on failure.
+ */
+Iso15693_3Error iso15693_3_poller_read_blocks(
+    Iso15693_3Poller* instance,
+    uint8_t* data,
+    uint16_t block_count,
+    uint8_t block_size);
+
+/**
+ * @brief Get Iso15693_3 block security status.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the buffer to be filled with the block security status.
+ * @param[in] block_count block security number to be read.
+ * @return Iso15693_3ErrorNone on success, an error code on failure.
+ */
+Iso15693_3Error iso15693_3_poller_get_blocks_security(
+    Iso15693_3Poller* instance,
+    uint8_t* data,
+    uint16_t block_count);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c b/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c
index 8b8d8cee..917f7dbb 100644
--- a/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c
+++ b/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c
@@ -36,7 +36,7 @@ static Iso15693_3Error iso15693_3_poller_prepare_trx(Iso15693_3Poller* instance)
     furi_assert(instance);
 
     if(instance->state == Iso15693_3PollerStateIdle) {
-        return iso15693_3_poller_async_activate(instance, NULL);
+        return iso15693_3_poller_activate(instance, NULL);
     }
 
     return Iso15693_3ErrorNone;
@@ -80,8 +80,7 @@ static Iso15693_3Error iso15693_3_poller_frame_exchange(
     return ret;
 }
 
-Iso15693_3Error
-    iso15693_3_poller_async_activate(Iso15693_3Poller* instance, Iso15693_3Data* data) {
+Iso15693_3Error iso15693_3_poller_activate(Iso15693_3Poller* instance, Iso15693_3Data* data) {
     furi_assert(instance);
     furi_assert(instance->nfc);
 
@@ -93,7 +92,7 @@ Iso15693_3Error
         instance->state = Iso15693_3PollerStateColResInProgress;
 
         // Inventory: Mandatory command
-        ret = iso15693_3_poller_async_inventory(instance, data->uid);
+        ret = iso15693_3_poller_inventory(instance, data->uid);
         if(ret != Iso15693_3ErrorNone) {
             instance->state = Iso15693_3PollerStateColResFailed;
             break;
@@ -103,7 +102,7 @@ Iso15693_3Error
 
         // Get system info: Optional command
         Iso15693_3SystemInfo* system_info = &data->system_info;
-        ret = iso15693_3_poller_async_get_system_info(instance, system_info);
+        ret = iso15693_3_poller_get_system_info(instance, system_info);
         if(ret != Iso15693_3ErrorNone) {
             ret = iso15693_3_poller_filter_error(ret);
             break;
@@ -111,7 +110,7 @@ Iso15693_3Error
 
         // Read blocks: Optional command
         simple_array_init(data->block_data, system_info->block_count * system_info->block_size);
-        ret = iso15693_3_poller_async_read_blocks(
+        ret = iso15693_3_poller_read_blocks(
             instance,
             simple_array_get_data(data->block_data),
             system_info->block_count,
@@ -124,7 +123,7 @@ Iso15693_3Error
         // Get block security status: Optional command
         simple_array_init(data->block_security, system_info->block_count);
 
-        ret = iso15693_3_poller_async_get_blocks_security(
+        ret = iso15693_3_poller_get_blocks_security(
             instance, simple_array_get_data(data->block_security), system_info->block_count);
         if(ret != Iso15693_3ErrorNone) {
             ret = iso15693_3_poller_filter_error(ret);
@@ -136,7 +135,7 @@ Iso15693_3Error
     return ret;
 }
 
-Iso15693_3Error iso15693_3_poller_async_inventory(Iso15693_3Poller* instance, uint8_t* uid) {
+Iso15693_3Error iso15693_3_poller_inventory(Iso15693_3Poller* instance, uint8_t* uid) {
     furi_assert(instance);
     furi_assert(instance->nfc);
     furi_assert(uid);
@@ -165,9 +164,8 @@ Iso15693_3Error iso15693_3_poller_async_inventory(Iso15693_3Poller* instance, ui
     return ret;
 }
 
-Iso15693_3Error iso15693_3_poller_async_get_system_info(
-    Iso15693_3Poller* instance,
-    Iso15693_3SystemInfo* data) {
+Iso15693_3Error
+    iso15693_3_poller_get_system_info(Iso15693_3Poller* instance, Iso15693_3SystemInfo* data) {
     furi_assert(instance);
     furi_assert(data);
 
@@ -193,7 +191,7 @@ Iso15693_3Error iso15693_3_poller_async_get_system_info(
     return ret;
 }
 
-Iso15693_3Error iso15693_3_poller_async_read_block(
+Iso15693_3Error iso15693_3_poller_read_block(
     Iso15693_3Poller* instance,
     uint8_t* data,
     uint8_t block_number,
@@ -222,7 +220,7 @@ Iso15693_3Error iso15693_3_poller_async_read_block(
     return ret;
 }
 
-Iso15693_3Error iso15693_3_poller_async_read_blocks(
+Iso15693_3Error iso15693_3_poller_read_blocks(
     Iso15693_3Poller* instance,
     uint8_t* data,
     uint16_t block_count,
@@ -235,14 +233,14 @@ Iso15693_3Error iso15693_3_poller_async_read_blocks(
     Iso15693_3Error ret = Iso15693_3ErrorNone;
 
     for(uint32_t i = 0; i < block_count; ++i) {
-        ret = iso15693_3_poller_async_read_block(instance, &data[block_size * i], i, block_size);
+        ret = iso15693_3_poller_read_block(instance, &data[block_size * i], i, block_size);
         if(ret != Iso15693_3ErrorNone) break;
     }
 
     return ret;
 }
 
-Iso15693_3Error iso15693_3_poller_async_get_blocks_security(
+Iso15693_3Error iso15693_3_poller_get_blocks_security(
     Iso15693_3Poller* instance,
     uint8_t* data,
     uint16_t block_count) {
diff --git a/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.h b/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.h
index 154ee684..346d0d72 100644
--- a/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.h
+++ b/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.h
@@ -35,36 +35,6 @@ struct Iso15693_3Poller {
 
 const Iso15693_3Data* iso15693_3_poller_get_data(Iso15693_3Poller* instance);
 
-Iso15693_3Error iso15693_3_poller_async_activate(Iso15693_3Poller* instance, Iso15693_3Data* data);
-
-Iso15693_3Error iso15693_3_poller_async_inventory(Iso15693_3Poller* instance, uint8_t* uid);
-
-Iso15693_3Error
-    iso15693_3_poller_async_get_system_info(Iso15693_3Poller* instance, Iso15693_3SystemInfo* data);
-
-Iso15693_3Error iso15693_3_poller_async_read_block(
-    Iso15693_3Poller* instance,
-    uint8_t* data,
-    uint8_t block_number,
-    uint8_t block_size);
-
-Iso15693_3Error iso15693_3_poller_async_read_blocks(
-    Iso15693_3Poller* instance,
-    uint8_t* data,
-    uint16_t block_count,
-    uint8_t block_size);
-
-Iso15693_3Error iso15693_3_poller_async_get_blocks_security(
-    Iso15693_3Poller* instance,
-    uint8_t* data,
-    uint16_t block_count);
-
-Iso15693_3Error iso15693_3_poller_send_frame(
-    Iso15693_3Poller* instance,
-    const BitBuffer* tx_buffer,
-    BitBuffer* rx_buffer,
-    uint32_t fwt);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/mf_classic/mf_classic_poller.c b/lib/nfc/protocols/mf_classic/mf_classic_poller.c
index 3eba6ee5..dbc32a1b 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic_poller.c
+++ b/lib/nfc/protocols/mf_classic/mf_classic_poller.c
@@ -85,7 +85,7 @@ NfcCommand mf_classic_poller_handler_detect_type(MfClassicPoller* instance) {
         iso14443_3a_copy(
             instance->data->iso14443_3a_data,
             iso14443_3a_poller_get_data(instance->iso14443_3a_poller));
-        MfClassicError error = mf_classic_async_get_nt(instance, 254, MfClassicKeyTypeA, NULL);
+        MfClassicError error = mf_classic_poller_get_nt(instance, 254, MfClassicKeyTypeA, NULL);
         if(error == MfClassicErrorNone) {
             instance->data->type = MfClassicType4k;
             instance->state = MfClassicPollerStateStart;
@@ -95,7 +95,7 @@ NfcCommand mf_classic_poller_handler_detect_type(MfClassicPoller* instance) {
             instance->current_type_check = MfClassicType1k;
         }
     } else if(instance->current_type_check == MfClassicType1k) {
-        MfClassicError error = mf_classic_async_get_nt(instance, 62, MfClassicKeyTypeA, NULL);
+        MfClassicError error = mf_classic_poller_get_nt(instance, 62, MfClassicKeyTypeA, NULL);
         if(error == MfClassicErrorNone) {
             instance->data->type = MfClassicType1k;
             FURI_LOG_D(TAG, "1K detected");
@@ -234,7 +234,7 @@ NfcCommand mf_classic_poller_handler_read_block(MfClassicPoller* instance) {
 
     do {
         // Authenticate to sector
-        error = mf_classic_async_auth(
+        error = mf_classic_poller_auth(
             instance, write_ctx->current_block, auth_key, write_ctx->key_type_read, NULL);
         if(error != MfClassicErrorNone) {
             FURI_LOG_D(TAG, "Failed to auth to block %d", write_ctx->current_block);
@@ -243,8 +243,8 @@ NfcCommand mf_classic_poller_handler_read_block(MfClassicPoller* instance) {
         }
 
         // Read block from tag
-        error =
-            mf_classic_async_read_block(instance, write_ctx->current_block, &write_ctx->tag_block);
+        error = mf_classic_poller_read_block(
+            instance, write_ctx->current_block, &write_ctx->tag_block);
         if(error != MfClassicErrorNone) {
             FURI_LOG_D(TAG, "Failed to read block %d", write_ctx->current_block);
             instance->state = MfClassicPollerStateFail;
@@ -252,11 +252,11 @@ NfcCommand mf_classic_poller_handler_read_block(MfClassicPoller* instance) {
         }
 
         if(write_ctx->is_value_block) {
-            mf_classic_async_halt(instance);
+            mf_classic_poller_halt(instance);
             instance->state = MfClassicPollerStateWriteValueBlock;
         } else {
             if(write_ctx->need_halt_before_write) {
-                mf_classic_async_halt(instance);
+                mf_classic_poller_halt(instance);
             }
             instance->state = MfClassicPollerStateWriteBlock;
         }
@@ -292,7 +292,7 @@ NfcCommand mf_classic_poller_handler_write_block(MfClassicPoller* instance) {
 
         // Reauth if necessary
         if(write_ctx->need_halt_before_write) {
-            error = mf_classic_async_auth(
+            error = mf_classic_poller_auth(
                 instance, write_ctx->current_block, auth_key, write_ctx->key_type_write, NULL);
             if(error != MfClassicErrorNone) {
                 FURI_LOG_D(
@@ -303,7 +303,7 @@ NfcCommand mf_classic_poller_handler_write_block(MfClassicPoller* instance) {
         }
 
         // Write block
-        error = mf_classic_async_write_block(
+        error = mf_classic_poller_write_block(
             instance,
             write_ctx->current_block,
             &instance->mfc_event_data.write_block_data.write_block);
@@ -315,7 +315,7 @@ NfcCommand mf_classic_poller_handler_write_block(MfClassicPoller* instance) {
 
     } while(false);
 
-    mf_classic_async_halt(instance);
+    mf_classic_poller_halt(instance);
     write_ctx->current_block++;
     instance->state = MfClassicPollerStateCheckWriteConditions;
 
@@ -403,18 +403,18 @@ NfcCommand mf_classic_poller_handler_write_value_block(MfClassicPoller* instance
                                                                    &write_ctx->sec_tr.key_b;
 
         MfClassicError error =
-            mf_classic_async_auth(instance, write_ctx->current_block, key, auth_key_type, NULL);
+            mf_classic_poller_auth(instance, write_ctx->current_block, key, auth_key_type, NULL);
         if(error != MfClassicErrorNone) break;
 
-        error = mf_classic_async_value_cmd(instance, write_ctx->current_block, value_cmd, diff);
+        error = mf_classic_poller_value_cmd(instance, write_ctx->current_block, value_cmd, diff);
         if(error != MfClassicErrorNone) break;
 
-        error = mf_classic_async_value_transfer(instance, write_ctx->current_block);
+        error = mf_classic_poller_value_transfer(instance, write_ctx->current_block);
         if(error != MfClassicErrorNone) break;
 
     } while(false);
 
-    mf_classic_async_halt(instance);
+    mf_classic_poller_halt(instance);
     write_ctx->is_value_block = false;
     write_ctx->current_block++;
     instance->state = MfClassicPollerStateCheckWriteConditions;
@@ -462,7 +462,7 @@ NfcCommand mf_classic_poller_handler_request_read_sector_blocks(MfClassicPoller*
                 sec_read_ctx->current_block,
                 sec_read_ctx->key_type == MfClassicKeyTypeA ? 'A' : 'B',
                 key);
-            error = mf_classic_async_auth(
+            error = mf_classic_poller_auth(
                 instance,
                 sec_read_ctx->current_block,
                 &sec_read_ctx->key,
@@ -481,7 +481,7 @@ NfcCommand mf_classic_poller_handler_request_read_sector_blocks(MfClassicPoller*
 
         FURI_LOG_D(TAG, "Reading block %d", sec_read_ctx->current_block);
         MfClassicBlock read_block = {};
-        error = mf_classic_async_read_block(instance, sec_read_ctx->current_block, &read_block);
+        error = mf_classic_poller_read_block(instance, sec_read_ctx->current_block, &read_block);
         if(error == MfClassicErrorNone) {
             mf_classic_set_block_read(instance->data, sec_read_ctx->current_block, &read_block);
             if(sec_read_ctx->key_type == MfClassicKeyTypeA) {
@@ -489,7 +489,7 @@ NfcCommand mf_classic_poller_handler_request_read_sector_blocks(MfClassicPoller*
                     instance, sec_read_ctx->current_block, &read_block);
             }
         } else {
-            mf_classic_async_halt(instance);
+            mf_classic_poller_halt(instance);
             sec_read_ctx->auth_passed = false;
         }
     } while(false);
@@ -497,7 +497,7 @@ NfcCommand mf_classic_poller_handler_request_read_sector_blocks(MfClassicPoller*
     uint8_t sec_tr_num = mf_classic_get_sector_trailer_num_by_sector(sec_read_ctx->current_sector);
     sec_read_ctx->current_block++;
     if(sec_read_ctx->current_block > sec_tr_num) {
-        mf_classic_async_halt(instance);
+        mf_classic_poller_halt(instance);
         instance->state = MfClassicPollerStateRequestReadSector;
     }
 
@@ -532,7 +532,7 @@ NfcCommand mf_classic_poller_handler_auth_a(MfClassicPoller* instance) {
         uint64_t key = nfc_util_bytes2num(dict_attack_ctx->current_key.data, sizeof(MfClassicKey));
         FURI_LOG_D(TAG, "Auth to block %d with key A: %06llx", block, key);
 
-        MfClassicError error = mf_classic_async_auth(
+        MfClassicError error = mf_classic_poller_auth(
             instance, block, &dict_attack_ctx->current_key, MfClassicKeyTypeA, NULL);
         if(error == MfClassicErrorNone) {
             FURI_LOG_I(TAG, "Key A found");
@@ -545,7 +545,7 @@ NfcCommand mf_classic_poller_handler_auth_a(MfClassicPoller* instance) {
             dict_attack_ctx->auth_passed = true;
             instance->state = MfClassicPollerStateReadSector;
         } else {
-            mf_classic_async_halt(instance);
+            mf_classic_poller_halt(instance);
             instance->state = MfClassicPollerStateAuthKeyB;
         }
     }
@@ -570,7 +570,7 @@ NfcCommand mf_classic_poller_handler_auth_b(MfClassicPoller* instance) {
         uint64_t key = nfc_util_bytes2num(dict_attack_ctx->current_key.data, sizeof(MfClassicKey));
         FURI_LOG_D(TAG, "Auth to block %d with key B: %06llx", block, key);
 
-        MfClassicError error = mf_classic_async_auth(
+        MfClassicError error = mf_classic_poller_auth(
             instance, block, &dict_attack_ctx->current_key, MfClassicKeyTypeB, NULL);
         if(error == MfClassicErrorNone) {
             FURI_LOG_I(TAG, "Key B found");
@@ -584,7 +584,7 @@ NfcCommand mf_classic_poller_handler_auth_b(MfClassicPoller* instance) {
             dict_attack_ctx->auth_passed = true;
             instance->state = MfClassicPollerStateReadSector;
         } else {
-            mf_classic_async_halt(instance);
+            mf_classic_poller_halt(instance);
             instance->state = MfClassicPollerStateRequestKey;
         }
     }
@@ -621,7 +621,7 @@ NfcCommand mf_classic_poller_handler_read_sector(MfClassicPoller* instance) {
         if(mf_classic_is_block_read(instance->data, block_num)) break;
 
         if(!dict_attack_ctx->auth_passed) {
-            error = mf_classic_async_auth(
+            error = mf_classic_poller_auth(
                 instance,
                 block_num,
                 &dict_attack_ctx->current_key,
@@ -635,10 +635,10 @@ NfcCommand mf_classic_poller_handler_read_sector(MfClassicPoller* instance) {
         }
 
         FURI_LOG_D(TAG, "Reading block %d", block_num);
-        error = mf_classic_async_read_block(instance, block_num, &block);
+        error = mf_classic_poller_read_block(instance, block_num, &block);
 
         if(error != MfClassicErrorNone) {
-            mf_classic_async_halt(instance);
+            mf_classic_poller_halt(instance);
             dict_attack_ctx->auth_passed = false;
             FURI_LOG_D(TAG, "Failed to read block %d", block_num);
         } else {
@@ -655,7 +655,7 @@ NfcCommand mf_classic_poller_handler_read_sector(MfClassicPoller* instance) {
     if(dict_attack_ctx->current_block > sec_tr_block_num) {
         mf_classic_poller_handle_data_update(instance);
 
-        mf_classic_async_halt(instance);
+        mf_classic_poller_halt(instance);
         dict_attack_ctx->auth_passed = false;
 
         if(dict_attack_ctx->current_sector == instance->sectors_total) {
@@ -713,7 +713,7 @@ NfcCommand mf_classic_poller_handler_key_reuse_auth_key_a(MfClassicPoller* insta
         uint64_t key = nfc_util_bytes2num(dict_attack_ctx->current_key.data, sizeof(MfClassicKey));
         FURI_LOG_D(TAG, "Key attack auth to block %d with key A: %06llx", block, key);
 
-        MfClassicError error = mf_classic_async_auth(
+        MfClassicError error = mf_classic_poller_auth(
             instance, block, &dict_attack_ctx->current_key, MfClassicKeyTypeA, NULL);
         if(error == MfClassicErrorNone) {
             FURI_LOG_I(TAG, "Key A found");
@@ -726,7 +726,7 @@ NfcCommand mf_classic_poller_handler_key_reuse_auth_key_a(MfClassicPoller* insta
             dict_attack_ctx->auth_passed = true;
             instance->state = MfClassicPollerStateKeyReuseReadSector;
         } else {
-            mf_classic_async_halt(instance);
+            mf_classic_poller_halt(instance);
             dict_attack_ctx->auth_passed = false;
             instance->state = MfClassicPollerStateKeyReuseStart;
         }
@@ -748,7 +748,7 @@ NfcCommand mf_classic_poller_handler_key_reuse_auth_key_b(MfClassicPoller* insta
         uint64_t key = nfc_util_bytes2num(dict_attack_ctx->current_key.data, sizeof(MfClassicKey));
         FURI_LOG_D(TAG, "Key attack auth to block %d with key B: %06llx", block, key);
 
-        MfClassicError error = mf_classic_async_auth(
+        MfClassicError error = mf_classic_poller_auth(
             instance, block, &dict_attack_ctx->current_key, MfClassicKeyTypeB, NULL);
         if(error == MfClassicErrorNone) {
             FURI_LOG_I(TAG, "Key B found");
@@ -762,7 +762,7 @@ NfcCommand mf_classic_poller_handler_key_reuse_auth_key_b(MfClassicPoller* insta
             dict_attack_ctx->auth_passed = true;
             instance->state = MfClassicPollerStateKeyReuseReadSector;
         } else {
-            mf_classic_async_halt(instance);
+            mf_classic_poller_halt(instance);
             dict_attack_ctx->auth_passed = false;
             instance->state = MfClassicPollerStateKeyReuseStart;
         }
@@ -783,7 +783,7 @@ NfcCommand mf_classic_poller_handler_key_reuse_read_sector(MfClassicPoller* inst
         if(mf_classic_is_block_read(instance->data, block_num)) break;
 
         if(!dict_attack_ctx->auth_passed) {
-            error = mf_classic_async_auth(
+            error = mf_classic_poller_auth(
                 instance,
                 block_num,
                 &dict_attack_ctx->current_key,
@@ -796,10 +796,10 @@ NfcCommand mf_classic_poller_handler_key_reuse_read_sector(MfClassicPoller* inst
         }
 
         FURI_LOG_D(TAG, "Reading block %d", block_num);
-        error = mf_classic_async_read_block(instance, block_num, &block);
+        error = mf_classic_poller_read_block(instance, block_num, &block);
 
         if(error != MfClassicErrorNone) {
-            mf_classic_async_halt(instance);
+            mf_classic_poller_halt(instance);
             dict_attack_ctx->auth_passed = false;
             FURI_LOG_D(TAG, "Failed to read block %d", block_num);
         } else {
@@ -814,7 +814,7 @@ NfcCommand mf_classic_poller_handler_key_reuse_read_sector(MfClassicPoller* inst
         mf_classic_get_sector_trailer_num_by_sector(dict_attack_ctx->reuse_key_sector);
     dict_attack_ctx->current_block++;
     if(dict_attack_ctx->current_block > sec_tr_block_num) {
-        mf_classic_async_halt(instance);
+        mf_classic_poller_halt(instance);
         dict_attack_ctx->auth_passed = false;
 
         mf_classic_poller_handle_data_update(instance);
diff --git a/lib/nfc/protocols/mf_classic/mf_classic_poller.h b/lib/nfc/protocols/mf_classic/mf_classic_poller.h
index da1f3c3d..f05a6800 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic_poller.h
+++ b/lib/nfc/protocols/mf_classic/mf_classic_poller.h
@@ -7,103 +7,274 @@
 extern "C" {
 #endif
 
+/**
+ * @brief MfClassicPoller opaque type definition.
+ */
 typedef struct MfClassicPoller MfClassicPoller;
 
+/**
+ * @brief Enumeration of possible MfClassic poller event types.
+ */
 typedef enum {
-    // Start event
-    MfClassicPollerEventTypeRequestMode,
+    MfClassicPollerEventTypeRequestMode, /**< Poller requests to fill the mode. */
 
-    // Read with key cache events
-    MfClassicPollerEventTypeRequestReadSector,
+    MfClassicPollerEventTypeRequestReadSector, /**< Poller requests data to read sector. */
 
-    // Write events
-    MfClassicPollerEventTypeRequestSectorTrailer,
-    MfClassicPollerEventTypeRequestWriteBlock,
+    MfClassicPollerEventTypeRequestSectorTrailer, /**< Poller requests sector trailer for writing block. */
+    MfClassicPollerEventTypeRequestWriteBlock, /**< Poller requests data to write block. */
 
-    // Dictionary attack events
-    MfClassicPollerEventTypeRequestKey,
-    MfClassicPollerEventTypeNextSector,
-    MfClassicPollerEventTypeDataUpdate,
-    MfClassicPollerEventTypeFoundKeyA,
-    MfClassicPollerEventTypeFoundKeyB,
-    MfClassicPollerEventTypeCardNotDetected,
-    MfClassicPollerEventTypeKeyAttackStart,
-    MfClassicPollerEventTypeKeyAttackStop,
-    MfClassicPollerEventTypeKeyAttackNextSector,
+    MfClassicPollerEventTypeRequestKey, /**< Poller requests key for sector authentication. */
+    MfClassicPollerEventTypeNextSector, /**< Poller switches to next sector during dictionary attack. */
+    MfClassicPollerEventTypeDataUpdate, /**< Poller updates data. */
+    MfClassicPollerEventTypeFoundKeyA, /**< Poller found key A. */
+    MfClassicPollerEventTypeFoundKeyB, /**< Poller found key B. */
+    MfClassicPollerEventTypeKeyAttackStart, /**< Poller starts key attack. */
+    MfClassicPollerEventTypeKeyAttackStop, /**< Poller stops key attack. */
+    MfClassicPollerEventTypeKeyAttackNextSector, /**< Poller switches to next sector during key attack. */
 
-    // Common events
-    MfClassicPollerEventTypeCardDetected,
-    MfClassicPollerEventTypeCardLost,
-    MfClassicPollerEventTypeSuccess,
-    MfClassicPollerEventTypeFail,
+    MfClassicPollerEventTypeCardDetected, /**< Poller detected card. */
+    MfClassicPollerEventTypeCardLost, /**< Poller lost card. */
+    MfClassicPollerEventTypeSuccess, /**< Poller succeeded. */
+    MfClassicPollerEventTypeFail, /**< Poller failed. */
 } MfClassicPollerEventType;
 
+/**
+ * @brief MfClassic poller mode.
+ */
 typedef enum {
-    MfClassicPollerModeRead,
-    MfClassicPollerModeWrite,
-    MfClassicPollerModeDictAttack,
+    MfClassicPollerModeRead, /**< Poller reading mode. */
+    MfClassicPollerModeWrite, /**< Poller writing mode. */
+    MfClassicPollerModeDictAttack, /**< Poller dictionary attack mode. */
 } MfClassicPollerMode;
 
+/**
+ * @brief MfClassic poller request mode event data.
+ *
+ * This instance of this structure must be filled on MfClassicPollerEventTypeRequestMode event.
+ */
 typedef struct {
-    MfClassicPollerMode mode;
-    const MfClassicData* data;
+    MfClassicPollerMode mode; /**< Mode to be used by poller. */
+    const MfClassicData* data; /**< Data to be used by poller. */
 } MfClassicPollerEventDataRequestMode;
 
+/**
+ * @brief MfClassic poller next sector event data.
+ *
+ * The instance of this structure is filled by poller and passed with
+ * MfClassicPollerEventTypeNextSector event.
+ */
 typedef struct {
-    uint8_t current_sector;
+    uint8_t current_sector; /**< Current sector number. */
 } MfClassicPollerEventDataDictAttackNextSector;
 
+/**
+ * @brief MfClassic poller update event data.
+ *
+ * The instance of this structure is filled by poller and passed with
+ * MfClassicPollerEventTypeDataUpdate event.
+ */
 typedef struct {
-    uint8_t sectors_read;
-    uint8_t keys_found;
-    uint8_t current_sector;
+    uint8_t sectors_read; /**< Number of sectors read. */
+    uint8_t keys_found; /**< Number of keys found. */
+    uint8_t current_sector; /**< Current sector number. */
 } MfClassicPollerEventDataUpdate;
 
+/**
+ * @brief MfClassic poller key request event data.
+ *
+ * The instance of this structure must be filled on MfClassicPollerEventTypeRequestKey event.
+ */
 typedef struct {
-    MfClassicKey key;
-    bool key_provided;
+    MfClassicKey key; /**< Key to be used by poller. */
+    bool key_provided; /**< Flag indicating if key is provided. */
 } MfClassicPollerEventDataKeyRequest;
 
+/**
+ * @brief MfClassic poller read sector request event data.
+ *
+ * The instance of this structure must be filled on MfClassicPollerEventTypeRequestReadSector event.
+ */
 typedef struct {
-    uint8_t sector_num;
-    MfClassicKey key;
-    MfClassicKeyType key_type;
-    bool key_provided;
+    uint8_t sector_num; /**< Sector number to be read. */
+    MfClassicKey key; /**< Key to be used by poller. */
+    MfClassicKeyType key_type; /**< Key type to be used by poller. */
+    bool key_provided; /**< Flag indicating if key is provided. */
 } MfClassicPollerEventDataReadSectorRequest;
 
+/**
+ * @brief MfClassic poller sector trailer request event data.
+ *
+ * The instance of this structure must be filled on MfClassicPollerEventTypeRequestSectorTrailer event.
+ */
 typedef struct {
-    uint8_t sector_num;
-    MfClassicBlock sector_trailer;
-    bool sector_trailer_provided;
+    uint8_t sector_num; /**< Sector number to be read. */
+    MfClassicBlock sector_trailer; /**< Sector trailer to be used by poller. */
+    bool sector_trailer_provided; /**< Flag indicating if sector trailer is provided. */
 } MfClassicPollerEventDataSectorTrailerRequest;
 
+/**
+ * @brief MfClassic poller write block request event data.
+ *
+ * The instance of this structure must be filled on MfClassicPollerEventTypeRequestWriteBlock event.
+ */
 typedef struct {
-    uint8_t block_num;
-    MfClassicBlock write_block;
-    bool write_block_provided;
+    uint8_t block_num; /**< Block number to be written. */
+    MfClassicBlock write_block; /**< Block to be written. */
+    bool write_block_provided; /**< Flag indicating if block is provided. */
 } MfClassicPollerEventDataWriteBlockRequest;
 
+/**
+ * @brief MfClassic poller key attack event data.
+ *
+ * The instance of this structure is filled by poller and passed with
+ * MfClassicPollerEventTypeKeyAttackNextSector event.
+ */
 typedef struct {
-    uint8_t current_sector;
+    uint8_t current_sector; /**< Current sector number. */
 } MfClassicPollerEventKeyAttackData;
 
+/**
+ * @brief MfClassic poller event data.
+ */
 typedef union {
-    MfClassicError error;
-    MfClassicPollerEventDataRequestMode poller_mode;
-    MfClassicPollerEventDataDictAttackNextSector next_sector_data;
-    MfClassicPollerEventDataKeyRequest key_request_data;
-    MfClassicPollerEventDataUpdate data_update;
-    MfClassicPollerEventDataReadSectorRequest read_sector_request_data;
-    MfClassicPollerEventKeyAttackData key_attack_data;
-    MfClassicPollerEventDataSectorTrailerRequest sec_tr_data;
-    MfClassicPollerEventDataWriteBlockRequest write_block_data;
+    MfClassicError error; /**< Error code on MfClassicPollerEventTypeFail event. */
+    MfClassicPollerEventDataRequestMode poller_mode; /**< Poller mode context. */
+    MfClassicPollerEventDataDictAttackNextSector next_sector_data; /**< Next sector context. */
+    MfClassicPollerEventDataKeyRequest key_request_data; /**< Key request context. */
+    MfClassicPollerEventDataUpdate data_update; /**< Data update context. */
+    MfClassicPollerEventDataReadSectorRequest
+        read_sector_request_data; /**< Read sector request context. */
+    MfClassicPollerEventKeyAttackData key_attack_data; /**< Key attack context. */
+    MfClassicPollerEventDataSectorTrailerRequest sec_tr_data; /**< Sector trailer request context. */
+    MfClassicPollerEventDataWriteBlockRequest write_block_data; /**< Write block request context. */
 } MfClassicPollerEventData;
 
+/**
+ * @brief MfClassic poller event.
+ *
+ * Upon emission of an event, an instance of this struct will be passed to the callback.
+ */
 typedef struct {
-    MfClassicPollerEventType type;
-    MfClassicPollerEventData* data;
+    MfClassicPollerEventType type; /**< Event type. */
+    MfClassicPollerEventData* data; /**< Pointer to event specific data. */
 } MfClassicPollerEvent;
 
+/**
+ * @brief Collect tag nonce during authentication.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Starts authentication procedure and collects tag nonce.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] block_num block number for authentication.
+ * @param[in] key_type key type to be used for authentication.
+ * @param[out] nt pointer to the MfClassicNt structure to be filled with nonce data.
+ * @return MfClassicErrorNone on success, an error code on failure.
+ */
+MfClassicError mf_classic_poller_get_nt(
+    MfClassicPoller* instance,
+    uint8_t block_num,
+    MfClassicKeyType key_type,
+    MfClassicNt* nt);
+
+/**
+ * @brief Perform authentication.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Perform authentication as specified in Mf Classic protocol. Initialize crypto state for futher
+ * communication with the tag.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] block_num block number for authentication.
+ * @param[in] key key to be used for authentication.
+ * @param[in] key_type key type to be used for authentication.
+ * @param[out] data pointer to MfClassicAuthContext structure to be filled with authentication data.
+ * @return MfClassicErrorNone on success, an error code on failure.
+ */
+MfClassicError mf_classic_poller_auth(
+    MfClassicPoller* instance,
+    uint8_t block_num,
+    MfClassicKey* key,
+    MfClassicKeyType key_type,
+    MfClassicAuthContext* data);
+
+/**
+ * @brief Halt the tag.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Halt the tag and reset crypto state of the poller.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @return MfClassicErrorNone on success, an error code on failure.
+ */
+MfClassicError mf_classic_poller_halt(MfClassicPoller* instance);
+
+/**
+ * @brief Read block from tag.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] block_num block number to be read.
+ * @param[out] data pointer to the MfClassicBlock structure to be filled with block data.
+ * @return MfClassicErrorNone on success, an error code on failure.
+ */
+MfClassicError mf_classic_poller_read_block(
+    MfClassicPoller* instance,
+    uint8_t block_num,
+    MfClassicBlock* data);
+
+/**
+ * @brief Write block to tag.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] block_num block number to be written.
+ * @param[in] data pointer to the MfClassicBlock structure to be written.
+ * @return MfClassicErrorNone on success, an error code on failure.
+ */
+MfClassicError mf_classic_poller_write_block(
+    MfClassicPoller* instance,
+    uint8_t block_num,
+    MfClassicBlock* data);
+
+/**
+ * @brief Perform value command on tag.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Perform Increment, Decrement or Restore command on tag. The result is stored in internal transfer
+ * block of the tag. Use mf_classic_poller_value_transfer to transfer the result to the tag.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] block_num block number to be used for value command.
+ * @param[in] cmd value command to be performed.
+ * @param[in] data value to be used for value command.
+ * @return MfClassicErrorNone on success, an error code on failure.
+ */
+MfClassicError mf_classic_poller_value_cmd(
+    MfClassicPoller* instance,
+    uint8_t block_num,
+    MfClassicValueCommand cmd,
+    int32_t data);
+
+/**
+ * @brief Transfer internal transfer block to tag.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Transfer internal transfer block to tag. The block is filled by mf_classic_poller_value_cmd.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] block_num block number to be used for value command.
+ * @return MfClassicErrorNone on success, an error code on failure.
+ */
+MfClassicError mf_classic_poller_value_transfer(MfClassicPoller* instance, uint8_t block_num);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/mf_classic/mf_classic_poller_i.c b/lib/nfc/protocols/mf_classic/mf_classic_poller_i.c
index 7eab4fe3..4b071815 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic_poller_i.c
+++ b/lib/nfc/protocols/mf_classic/mf_classic_poller_i.c
@@ -33,7 +33,7 @@ MfClassicError mf_classic_process_error(Iso14443_3aError error) {
     return ret;
 }
 
-MfClassicError mf_classic_async_get_nt(
+MfClassicError mf_classic_poller_get_nt(
     MfClassicPoller* instance,
     uint8_t block_num,
     MfClassicKeyType key_type,
@@ -69,7 +69,7 @@ MfClassicError mf_classic_async_get_nt(
     return ret;
 }
 
-MfClassicError mf_classic_async_auth(
+MfClassicError mf_classic_poller_auth(
     MfClassicPoller* instance,
     uint8_t block_num,
     MfClassicKey* key,
@@ -84,7 +84,7 @@ MfClassicError mf_classic_async_auth(
             iso14443_3a_poller_get_data(instance->iso14443_3a_poller));
 
         MfClassicNt nt = {};
-        ret = mf_classic_async_get_nt(instance, block_num, key_type, &nt);
+        ret = mf_classic_poller_get_nt(instance, block_num, key_type, &nt);
         if(ret != MfClassicErrorNone) break;
         if(data) {
             data->nt = nt;
@@ -130,7 +130,7 @@ MfClassicError mf_classic_async_auth(
     return ret;
 }
 
-MfClassicError mf_classic_async_halt(MfClassicPoller* instance) {
+MfClassicError mf_classic_poller_halt(MfClassicPoller* instance) {
     MfClassicError ret = MfClassicErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -158,7 +158,7 @@ MfClassicError mf_classic_async_halt(MfClassicPoller* instance) {
     return ret;
 }
 
-MfClassicError mf_classic_async_read_block(
+MfClassicError mf_classic_poller_read_block(
     MfClassicPoller* instance,
     uint8_t block_num,
     MfClassicBlock* data) {
@@ -204,7 +204,7 @@ MfClassicError mf_classic_async_read_block(
     return ret;
 }
 
-MfClassicError mf_classic_async_write_block(
+MfClassicError mf_classic_poller_write_block(
     MfClassicPoller* instance,
     uint8_t block_num,
     MfClassicBlock* data) {
@@ -275,7 +275,7 @@ MfClassicError mf_classic_async_write_block(
     return ret;
 }
 
-MfClassicError mf_classic_async_value_cmd(
+MfClassicError mf_classic_poller_value_cmd(
     MfClassicPoller* instance,
     uint8_t block_num,
     MfClassicValueCommand cmd,
@@ -345,7 +345,7 @@ MfClassicError mf_classic_async_value_cmd(
     return ret;
 }
 
-MfClassicError mf_classic_async_value_transfer(MfClassicPoller* instance, uint8_t block_num) {
+MfClassicError mf_classic_poller_value_transfer(MfClassicPoller* instance, uint8_t block_num) {
     MfClassicError ret = MfClassicErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
diff --git a/lib/nfc/protocols/mf_classic/mf_classic_poller_i.h b/lib/nfc/protocols/mf_classic/mf_classic_poller_i.h
index c6f4ccf7..0be42196 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic_poller_i.h
+++ b/lib/nfc/protocols/mf_classic/mf_classic_poller_i.h
@@ -169,37 +169,6 @@ MfClassicPoller* mf_classic_poller_alloc(Iso14443_3aPoller* iso14443_3a_poller);
 
 void mf_classic_poller_free(MfClassicPoller* instance);
 
-MfClassicError mf_classic_async_get_nt(
-    MfClassicPoller* instance,
-    uint8_t block_num,
-    MfClassicKeyType key_type,
-    MfClassicNt* nt);
-
-MfClassicError mf_classic_async_auth(
-    MfClassicPoller* instance,
-    uint8_t block_num,
-    MfClassicKey* key,
-    MfClassicKeyType key_type,
-    MfClassicAuthContext* data);
-
-MfClassicError mf_classic_async_halt(MfClassicPoller* instance);
-
-MfClassicError
-    mf_classic_async_read_block(MfClassicPoller* instance, uint8_t block_num, MfClassicBlock* data);
-
-MfClassicError mf_classic_async_write_block(
-    MfClassicPoller* instance,
-    uint8_t block_num,
-    MfClassicBlock* data);
-
-MfClassicError mf_classic_async_value_cmd(
-    MfClassicPoller* instance,
-    uint8_t block_num,
-    MfClassicValueCommand cmd,
-    int32_t data);
-
-MfClassicError mf_classic_async_value_transfer(MfClassicPoller* instance, uint8_t block_num);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/mf_classic/mf_classic_poller_sync_api.c b/lib/nfc/protocols/mf_classic/mf_classic_poller_sync.c
similarity index 88%
rename from lib/nfc/protocols/mf_classic/mf_classic_poller_sync_api.c
rename to lib/nfc/protocols/mf_classic/mf_classic_poller_sync.c
index 8b9fb69f..69954452 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic_poller_sync_api.c
+++ b/lib/nfc/protocols/mf_classic/mf_classic_poller_sync.c
@@ -1,3 +1,4 @@
+#include "mf_classic_poller_sync.h"
 #include "mf_classic_poller_i.h"
 
 #include <nfc/nfc_poller.h>
@@ -32,7 +33,7 @@ typedef MfClassicError (
 static MfClassicError mf_classic_poller_collect_nt_handler(
     MfClassicPoller* poller,
     MfClassicPollerContextData* data) {
-    return mf_classic_async_get_nt(
+    return mf_classic_poller_get_nt(
         poller,
         data->collect_nt_context.block,
         data->collect_nt_context.key_type,
@@ -41,7 +42,7 @@ static MfClassicError mf_classic_poller_collect_nt_handler(
 
 static MfClassicError
     mf_classic_poller_auth_handler(MfClassicPoller* poller, MfClassicPollerContextData* data) {
-    return mf_classic_async_auth(
+    return mf_classic_poller_auth(
         poller,
         data->auth_context.block_num,
         &data->auth_context.key,
@@ -55,7 +56,7 @@ static MfClassicError mf_classic_poller_read_block_handler(
     MfClassicError error = MfClassicErrorNone;
 
     do {
-        error = mf_classic_async_auth(
+        error = mf_classic_poller_auth(
             poller,
             data->read_block_context.block_num,
             &data->read_block_context.key,
@@ -63,11 +64,11 @@ static MfClassicError mf_classic_poller_read_block_handler(
             NULL);
         if(error != MfClassicErrorNone) break;
 
-        error = mf_classic_async_read_block(
+        error = mf_classic_poller_read_block(
             poller, data->read_block_context.block_num, &data->read_block_context.block);
         if(error != MfClassicErrorNone) break;
 
-        error = mf_classic_async_halt(poller);
+        error = mf_classic_poller_halt(poller);
         if(error != MfClassicErrorNone) break;
 
     } while(false);
@@ -81,7 +82,7 @@ static MfClassicError mf_classic_poller_write_block_handler(
     MfClassicError error = MfClassicErrorNone;
 
     do {
-        error = mf_classic_async_auth(
+        error = mf_classic_poller_auth(
             poller,
             data->read_block_context.block_num,
             &data->read_block_context.key,
@@ -89,11 +90,11 @@ static MfClassicError mf_classic_poller_write_block_handler(
             NULL);
         if(error != MfClassicErrorNone) break;
 
-        error = mf_classic_async_write_block(
+        error = mf_classic_poller_write_block(
             poller, data->write_block_context.block_num, &data->write_block_context.block);
         if(error != MfClassicErrorNone) break;
 
-        error = mf_classic_async_halt(poller);
+        error = mf_classic_poller_halt(poller);
         if(error != MfClassicErrorNone) break;
 
     } while(false);
@@ -107,7 +108,7 @@ static MfClassicError mf_classic_poller_read_value_handler(
     MfClassicError error = MfClassicErrorNone;
 
     do {
-        error = mf_classic_async_auth(
+        error = mf_classic_poller_auth(
             poller,
             data->read_value_context.block_num,
             &data->read_value_context.key,
@@ -116,7 +117,7 @@ static MfClassicError mf_classic_poller_read_value_handler(
         if(error != MfClassicErrorNone) break;
 
         MfClassicBlock block = {};
-        error = mf_classic_async_read_block(poller, data->read_value_context.block_num, &block);
+        error = mf_classic_poller_read_block(poller, data->read_value_context.block_num, &block);
         if(error != MfClassicErrorNone) break;
 
         if(!mf_classic_block_to_value(&block, &data->read_value_context.value, NULL)) {
@@ -124,7 +125,7 @@ static MfClassicError mf_classic_poller_read_value_handler(
             break;
         }
 
-        error = mf_classic_async_halt(poller);
+        error = mf_classic_poller_halt(poller);
         if(error != MfClassicErrorNone) break;
 
     } while(false);
@@ -138,7 +139,7 @@ static MfClassicError mf_classic_poller_change_value_handler(
     MfClassicError error = MfClassicErrorNone;
 
     do {
-        error = mf_classic_async_auth(
+        error = mf_classic_poller_auth(
             poller,
             data->change_value_context.block_num,
             &data->change_value_context.key,
@@ -146,21 +147,21 @@ static MfClassicError mf_classic_poller_change_value_handler(
             NULL);
         if(error != MfClassicErrorNone) break;
 
-        error = mf_classic_async_value_cmd(
+        error = mf_classic_poller_value_cmd(
             poller,
             data->change_value_context.block_num,
             data->change_value_context.value_cmd,
             data->change_value_context.data);
         if(error != MfClassicErrorNone) break;
 
-        error = mf_classic_async_value_transfer(poller, data->change_value_context.block_num);
+        error = mf_classic_poller_value_transfer(poller, data->change_value_context.block_num);
         if(error != MfClassicErrorNone) break;
 
         MfClassicBlock block = {};
-        error = mf_classic_async_read_block(poller, data->change_value_context.block_num, &block);
+        error = mf_classic_poller_read_block(poller, data->change_value_context.block_num, &block);
         if(error != MfClassicErrorNone) break;
 
-        error = mf_classic_async_halt(poller);
+        error = mf_classic_poller_halt(poller);
         if(error != MfClassicErrorNone) break;
 
         if(!mf_classic_block_to_value(&block, &data->change_value_context.new_value, NULL)) {
@@ -182,16 +183,14 @@ static const MfClassicPollerCmdHandler mf_classic_poller_cmd_handlers[MfClassicP
     [MfClassicPollerCmdTypeChangeValue] = mf_classic_poller_change_value_handler,
 };
 
-static NfcCommand mf_classic_poller_cmd_callback(NfcGenericEvent event, void* context) {
-    furi_assert(event.instance);
-    furi_assert(event.protocol == NfcProtocolIso14443_3a);
-    furi_assert(event.event_data);
+static NfcCommand mf_classic_poller_cmd_callback(NfcGenericEventEx event, void* context) {
+    furi_assert(event.poller);
+    furi_assert(event.parent_event_data);
     furi_assert(context);
 
     MfClassicPollerContext* poller_context = context;
-    Iso14443_3aPollerEvent* iso14443_3a_event = event.event_data;
-    Iso14443_3aPoller* iso14443_3a_poller = event.instance;
-    MfClassicPoller* mfc_poller = mf_classic_poller_alloc(iso14443_3a_poller);
+    Iso14443_3aPollerEvent* iso14443_3a_event = event.parent_event_data;
+    MfClassicPoller* mfc_poller = event.poller;
 
     if(iso14443_3a_event->type == Iso14443_3aPollerEventTypeReady) {
         poller_context->error = mf_classic_poller_cmd_handlers[poller_context->cmd_type](
@@ -202,8 +201,6 @@ static NfcCommand mf_classic_poller_cmd_callback(NfcGenericEvent event, void* co
 
     furi_thread_flags_set(poller_context->thread_id, MF_CLASSIC_POLLER_COMPLETE_EVENT);
 
-    mf_classic_poller_free(mfc_poller);
-
     return NfcCommandStop;
 }
 
@@ -212,8 +209,8 @@ static MfClassicError mf_classic_poller_cmd_execute(Nfc* nfc, MfClassicPollerCon
 
     poller_ctx->thread_id = furi_thread_get_current_id();
 
-    NfcPoller* poller = nfc_poller_alloc(nfc, NfcProtocolIso14443_3a);
-    nfc_poller_start(poller, mf_classic_poller_cmd_callback, poller_ctx);
+    NfcPoller* poller = nfc_poller_alloc(nfc, NfcProtocolMfClassic);
+    nfc_poller_start_ex(poller, mf_classic_poller_cmd_callback, poller_ctx);
     furi_thread_flags_wait(MF_CLASSIC_POLLER_COMPLETE_EVENT, FuriFlagWaitAny, FuriWaitForever);
     furi_thread_flags_clear(MF_CLASSIC_POLLER_COMPLETE_EVENT);
 
@@ -223,7 +220,7 @@ static MfClassicError mf_classic_poller_cmd_execute(Nfc* nfc, MfClassicPollerCon
     return poller_ctx->error;
 }
 
-MfClassicError mf_classic_poller_collect_nt(
+MfClassicError mf_classic_poller_sync_collect_nt(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKeyType key_type,
@@ -247,7 +244,7 @@ MfClassicError mf_classic_poller_collect_nt(
     return error;
 }
 
-MfClassicError mf_classic_poller_auth(
+MfClassicError mf_classic_poller_sync_auth(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKey* key,
@@ -274,7 +271,7 @@ MfClassicError mf_classic_poller_auth(
     return error;
 }
 
-MfClassicError mf_classic_poller_read_block(
+MfClassicError mf_classic_poller_sync_read_block(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKey* key,
@@ -300,7 +297,7 @@ MfClassicError mf_classic_poller_read_block(
     return error;
 }
 
-MfClassicError mf_classic_poller_write_block(
+MfClassicError mf_classic_poller_sync_write_block(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKey* key,
@@ -323,7 +320,7 @@ MfClassicError mf_classic_poller_write_block(
     return error;
 }
 
-MfClassicError mf_classic_poller_read_value(
+MfClassicError mf_classic_poller_sync_read_value(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKey* key,
@@ -349,7 +346,7 @@ MfClassicError mf_classic_poller_read_value(
     return error;
 }
 
-MfClassicError mf_classic_poller_change_value(
+MfClassicError mf_classic_poller_sync_change_value(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKey* key,
@@ -461,7 +458,7 @@ NfcCommand mf_classic_poller_read_callback(NfcGenericEvent event, void* context)
 }
 
 MfClassicError
-    mf_classic_poller_read(Nfc* nfc, const MfClassicDeviceKeys* keys, MfClassicData* data) {
+    mf_classic_poller_sync_read(Nfc* nfc, const MfClassicDeviceKeys* keys, MfClassicData* data) {
     furi_assert(nfc);
     furi_assert(keys);
     furi_assert(data);
@@ -498,7 +495,7 @@ MfClassicError
     return error;
 }
 
-MfClassicError mf_classic_poller_detect_type(Nfc* nfc, MfClassicType* type) {
+MfClassicError mf_classic_poller_sync_detect_type(Nfc* nfc, MfClassicType* type) {
     furi_assert(nfc);
     furi_assert(type);
 
@@ -512,7 +509,7 @@ MfClassicError mf_classic_poller_detect_type(Nfc* nfc, MfClassicType* type) {
 
     size_t i = 0;
     for(i = 0; i < COUNT_OF(mf_classic_verify_block); i++) {
-        error = mf_classic_poller_collect_nt(
+        error = mf_classic_poller_sync_collect_nt(
             nfc, mf_classic_verify_block[MfClassicTypeNum - i - 1], MfClassicKeyTypeA, NULL);
         if(error == MfClassicErrorNone) {
             *type = MfClassicTypeNum - i - 1;
diff --git a/lib/nfc/protocols/mf_classic/mf_classic_poller_sync_api.h b/lib/nfc/protocols/mf_classic/mf_classic_poller_sync.h
similarity index 64%
rename from lib/nfc/protocols/mf_classic/mf_classic_poller_sync_api.h
rename to lib/nfc/protocols/mf_classic/mf_classic_poller_sync.h
index 11db291b..d384e46e 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic_poller_sync_api.h
+++ b/lib/nfc/protocols/mf_classic/mf_classic_poller_sync.h
@@ -7,41 +7,41 @@
 extern "C" {
 #endif
 
-MfClassicError mf_classic_poller_collect_nt(
+MfClassicError mf_classic_poller_sync_collect_nt(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKeyType key_type,
     MfClassicNt* nt);
 
-MfClassicError mf_classic_poller_auth(
+MfClassicError mf_classic_poller_sync_auth(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKey* key,
     MfClassicKeyType key_type,
     MfClassicAuthContext* data);
 
-MfClassicError mf_classic_poller_read_block(
+MfClassicError mf_classic_poller_sync_read_block(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKey* key,
     MfClassicKeyType key_type,
     MfClassicBlock* data);
 
-MfClassicError mf_classic_poller_write_block(
+MfClassicError mf_classic_poller_sync_write_block(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKey* key,
     MfClassicKeyType key_type,
     MfClassicBlock* data);
 
-MfClassicError mf_classic_poller_read_value(
+MfClassicError mf_classic_poller_sync_read_value(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKey* key,
     MfClassicKeyType key_type,
     int32_t* value);
 
-MfClassicError mf_classic_poller_change_value(
+MfClassicError mf_classic_poller_sync_change_value(
     Nfc* nfc,
     uint8_t block_num,
     MfClassicKey* key,
@@ -49,10 +49,10 @@ MfClassicError mf_classic_poller_change_value(
     int32_t data,
     int32_t* new_value);
 
-MfClassicError mf_classic_poller_detect_type(Nfc* nfc, MfClassicType* type);
+MfClassicError mf_classic_poller_sync_detect_type(Nfc* nfc, MfClassicType* type);
 
 MfClassicError
-    mf_classic_poller_read(Nfc* nfc, const MfClassicDeviceKeys* keys, MfClassicData* data);
+    mf_classic_poller_sync_read(Nfc* nfc, const MfClassicDeviceKeys* keys, MfClassicData* data);
 
 #ifdef __cplusplus
 }
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_i.c b/lib/nfc/protocols/mf_desfire/mf_desfire_i.c
index 30313ae2..129dcdf5 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_i.c
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_i.c
@@ -201,7 +201,7 @@ bool mf_desfire_file_settings_parse(MfDesfireFileSettings* data, const BitBuffer
 
             data->value.lo_limit = layout.value.lo_limit;
             data->value.hi_limit = layout.value.hi_limit;
-            data->value.limited_credit_value = layout.value.hi_limit;
+            data->value.limited_credit_value = layout.value.limited_credit_value;
             data->value.limited_credit_enabled = layout.value.limited_credit_enabled;
 
         } else if(
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c
index 11db021d..5af033d4 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c
@@ -61,7 +61,7 @@ static NfcCommand mf_desfire_poller_handler_idle(MfDesfirePoller* instance) {
 }
 
 static NfcCommand mf_desfire_poller_handler_read_version(MfDesfirePoller* instance) {
-    instance->error = mf_desfire_poller_async_read_version(instance, &instance->data->version);
+    instance->error = mf_desfire_poller_read_version(instance, &instance->data->version);
     if(instance->error == MfDesfireErrorNone) {
         FURI_LOG_D(TAG, "Read version success");
         instance->state = MfDesfirePollerStateReadFreeMemory;
@@ -75,8 +75,7 @@ static NfcCommand mf_desfire_poller_handler_read_version(MfDesfirePoller* instan
 }
 
 static NfcCommand mf_desfire_poller_handler_read_free_memory(MfDesfirePoller* instance) {
-    instance->error =
-        mf_desfire_poller_async_read_free_memory(instance, &instance->data->free_memory);
+    instance->error = mf_desfire_poller_read_free_memory(instance, &instance->data->free_memory);
     if(instance->error == MfDesfireErrorNone) {
         FURI_LOG_D(TAG, "Read free memory success");
         instance->state = MfDesfirePollerStateReadMasterKeySettings;
@@ -91,7 +90,7 @@ static NfcCommand mf_desfire_poller_handler_read_free_memory(MfDesfirePoller* in
 
 static NfcCommand mf_desfire_poller_handler_read_master_key_settings(MfDesfirePoller* instance) {
     instance->error =
-        mf_desfire_poller_async_read_key_settings(instance, &instance->data->master_key_settings);
+        mf_desfire_poller_read_key_settings(instance, &instance->data->master_key_settings);
     if(instance->error == MfDesfireErrorNone) {
         FURI_LOG_D(TAG, "Read master key settings success");
         instance->state = MfDesfirePollerStateReadMasterKeyVersion;
@@ -105,7 +104,7 @@ static NfcCommand mf_desfire_poller_handler_read_master_key_settings(MfDesfirePo
 }
 
 static NfcCommand mf_desfire_poller_handler_read_master_key_version(MfDesfirePoller* instance) {
-    instance->error = mf_desfire_poller_async_read_key_versions(
+    instance->error = mf_desfire_poller_read_key_versions(
         instance,
         instance->data->master_key_versions,
         instance->data->master_key_settings.max_keys);
@@ -123,7 +122,7 @@ static NfcCommand mf_desfire_poller_handler_read_master_key_version(MfDesfirePol
 
 static NfcCommand mf_desfire_poller_handler_read_application_ids(MfDesfirePoller* instance) {
     instance->error =
-        mf_desfire_poller_async_read_application_ids(instance, instance->data->application_ids);
+        mf_desfire_poller_read_application_ids(instance, instance->data->application_ids);
     if(instance->error == MfDesfireErrorNone) {
         FURI_LOG_D(TAG, "Read application ids success");
         instance->state = MfDesfirePollerStateReadApplications;
@@ -137,7 +136,7 @@ static NfcCommand mf_desfire_poller_handler_read_application_ids(MfDesfirePoller
 }
 
 static NfcCommand mf_desfire_poller_handler_read_applications(MfDesfirePoller* instance) {
-    instance->error = mf_desfire_poller_async_read_applications(
+    instance->error = mf_desfire_poller_read_applications(
         instance, instance->data->application_ids, instance->data->applications);
     if(instance->error == MfDesfireErrorNone) {
         FURI_LOG_D(TAG, "Read applications success");
@@ -227,7 +226,7 @@ static bool mf_desfire_poller_detect(NfcGenericEvent event, void* context) {
 
     if(iso14443_4a_event->type == Iso14443_4aPollerEventTypeReady) {
         MfDesfireVersion version = {};
-        const MfDesfireError error = mf_desfire_poller_async_read_version(instance, &version);
+        const MfDesfireError error = mf_desfire_poller_read_version(instance, &version);
         protocol_detected = (error == MfDesfireErrorNone);
     }
 
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h
index 360b0508..6ef2f3f6 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h
@@ -8,24 +8,267 @@
 extern "C" {
 #endif
 
+/**
+ * @brief MfDesfirePoller opaque type definition.
+ */
 typedef struct MfDesfirePoller MfDesfirePoller;
 
+/**
+ * @brief Enumeration of possible MfDesfire poller event types.
+ */
 typedef enum {
-    MfDesfirePollerEventTypeReadSuccess,
-    MfDesfirePollerEventTypeReadFailed,
+    MfDesfirePollerEventTypeReadSuccess, /**< Card was read successfully. */
+    MfDesfirePollerEventTypeReadFailed, /**< Poller failed to read card. */
 } MfDesfirePollerEventType;
 
-typedef struct {
-    union {
-        MfDesfireError error;
-    };
+/**
+ * @brief MfDesfire poller event data.
+ */
+typedef union {
+    MfDesfireError error; /**< Error code indicating card reading fail reason. */
 } MfDesfirePollerEventData;
 
+/**
+ * @brief MfDesfire poller event structure.
+ *
+ * Upon emission of an event, an instance of this struct will be passed to the callback.
+ */
 typedef struct {
-    MfDesfirePollerEventType type;
-    MfDesfirePollerEventData* data;
+    MfDesfirePollerEventType type; /**< Type of emmitted event. */
+    MfDesfirePollerEventData* data; /**< Pointer to event specific data. */
 } MfDesfirePollerEvent;
 
+/**
+ * @brief Transmit and receive MfDesfire chunks in poller mode.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * The rx_buffer will be filled with any data received as a response to data
+ * sent from tx_buffer, with a timeout defined by the fwt parameter.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tx_buffer pointer to the buffer containing the data to be transmitted.
+ * @param[out] rx_buffer pointer to the buffer to be filled with received data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_send_chunks(
+    MfDesfirePoller* instance,
+    const BitBuffer* tx_buffer,
+    BitBuffer* rx_buffer);
+
+/**
+ * @brief Read MfDesfire card version.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the MfDesfireVersion structure to be filled with version data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_version(MfDesfirePoller* instance, MfDesfireVersion* data);
+
+/**
+ * @brief Read free memory available on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the MfDesfireFreeMemory structure to be filled with free memory data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError
+    mf_desfire_poller_read_free_memory(MfDesfirePoller* instance, MfDesfireFreeMemory* data);
+
+/**
+ * @brief Read key settings on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the MfDesfireKeySettings structure to be filled with key settings data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError
+    mf_desfire_poller_read_key_settings(MfDesfirePoller* instance, MfDesfireKeySettings* data);
+
+/**
+ * @brief Read key versions on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the SimpleArray structure to be filled with key versions data.
+ * @param[in] count number of key versions to read.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_key_versions(
+    MfDesfirePoller* instance,
+    SimpleArray* data,
+    uint32_t count);
+
+/**
+ * @brief Read applications IDs on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the SimpleArray structure to be filled with application ids data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError
+    mf_desfire_poller_read_application_ids(MfDesfirePoller* instance, SimpleArray* data);
+
+/**
+ * @brief Select application on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] id pointer to the MfDesfireApplicationId structure with application id to select.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_select_application(
+    MfDesfirePoller* instance,
+    const MfDesfireApplicationId* id);
+
+/**
+ * @brief Read file IDs for selected application on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the SimpleArray structure to be filled with file ids data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_file_ids(MfDesfirePoller* instance, SimpleArray* data);
+
+/**
+ * @brief Read file settings on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] id file id to read settings for.
+ * @param[out] data pointer to the MfDesfireFileSettings structure to be filled with file settings data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_file_settings(
+    MfDesfirePoller* instance,
+    MfDesfireFileId id,
+    MfDesfireFileSettings* data);
+
+/**
+ * @brief Read multiple file settings on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] file_ids pointer to the SimpleArray structure array with file ids to read settings for.
+ * @param[out] data pointer to the SimpleArray structure array to be filled with file settings data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_file_settings_multi(
+    MfDesfirePoller* instance,
+    const SimpleArray* file_ids,
+    SimpleArray* data);
+
+/**
+ * @brief Read file data on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] id file id to read data from.
+ * @param[in] offset offset in bytes to start reading from.
+ * @param[in] size number of bytes to read.
+ * @param[out] data pointer to the MfDesfireFileData structure to be filled with file data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_file_data(
+    MfDesfirePoller* instance,
+    MfDesfireFileId id,
+    uint32_t offset,
+    size_t size,
+    MfDesfireFileData* data);
+
+/**
+ * @brief Read file value on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] id file id to read value from.
+ * @param[out] data pointer to the MfDesfireFileData structure to be filled with file value.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_file_value(
+    MfDesfirePoller* instance,
+    MfDesfireFileId id,
+    MfDesfireFileData* data);
+
+/**
+ * @brief Read file records on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] id file id to read data from.
+ * @param[in] offset offset in bytes to start reading from.
+ * @param[in] size number of bytes to read.
+ * @param[out] data pointer to the MfDesfireFileData structure to be filled with file records data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_file_records(
+    MfDesfirePoller* instance,
+    MfDesfireFileId id,
+    uint32_t offset,
+    size_t size,
+    MfDesfireFileData* data);
+
+/**
+ * @brief Read data from multiple files on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] file_ids pointer to the SimpleArray structure array with files ids to read data from.
+ * @param[in] file_settings pointer to the SimpleArray structure array with files settings to read data from.
+ * @param[out] data pointer to the SimpleArray structure array to be filled with files data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_file_data_multi(
+    MfDesfirePoller* instance,
+    const SimpleArray* file_ids,
+    const SimpleArray* file_settings,
+    SimpleArray* data);
+
+/**
+ * @brief Read application data for selected application on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the MfDesfireApplication structure to be filled with application data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError
+    mf_desfire_poller_read_application(MfDesfirePoller* instance, MfDesfireApplication* data);
+
+/**
+ * @brief Read multiple applications data on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] app_ids pointer to the SimpleArray structure array with application ids to read data from.
+ * @param[out] data pointer to the SimpleArray structure array to be filled with applications data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_applications(
+    MfDesfirePoller* instance,
+    const SimpleArray* app_ids,
+    SimpleArray* data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c b/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
index 38ae2f46..0b2d8413 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
@@ -74,8 +74,7 @@ MfDesfireError mf_desfire_send_chunks(
     return error;
 }
 
-MfDesfireError
-    mf_desfire_poller_async_read_version(MfDesfirePoller* instance, MfDesfireVersion* data) {
+MfDesfireError mf_desfire_poller_read_version(MfDesfirePoller* instance, MfDesfireVersion* data) {
     furi_assert(instance);
 
     bit_buffer_reset(instance->input_buffer);
@@ -97,7 +96,7 @@ MfDesfireError
 }
 
 MfDesfireError
-    mf_desfire_poller_async_read_free_memory(MfDesfirePoller* instance, MfDesfireFreeMemory* data) {
+    mf_desfire_poller_read_free_memory(MfDesfirePoller* instance, MfDesfireFreeMemory* data) {
     furi_assert(instance);
 
     bit_buffer_reset(instance->input_buffer);
@@ -118,9 +117,8 @@ MfDesfireError
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_read_key_settings(
-    MfDesfirePoller* instance,
-    MfDesfireKeySettings* data) {
+MfDesfireError
+    mf_desfire_poller_read_key_settings(MfDesfirePoller* instance, MfDesfireKeySettings* data) {
     furi_assert(instance);
 
     bit_buffer_reset(instance->input_buffer);
@@ -141,7 +139,7 @@ MfDesfireError mf_desfire_poller_async_read_key_settings(
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_read_key_versions(
+MfDesfireError mf_desfire_poller_read_key_versions(
     MfDesfirePoller* instance,
     SimpleArray* data,
     uint32_t count) {
@@ -172,7 +170,7 @@ MfDesfireError mf_desfire_poller_async_read_key_versions(
 }
 
 MfDesfireError
-    mf_desfire_poller_async_read_application_ids(MfDesfirePoller* instance, SimpleArray* data) {
+    mf_desfire_poller_read_application_ids(MfDesfirePoller* instance, SimpleArray* data) {
     furi_assert(instance);
 
     bit_buffer_reset(instance->input_buffer);
@@ -203,7 +201,7 @@ MfDesfireError
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_select_application(
+MfDesfireError mf_desfire_poller_select_application(
     MfDesfirePoller* instance,
     const MfDesfireApplicationId* id) {
     furi_assert(instance);
@@ -219,8 +217,7 @@ MfDesfireError mf_desfire_poller_async_select_application(
     return error;
 }
 
-MfDesfireError
-    mf_desfire_poller_async_read_file_ids(MfDesfirePoller* instance, SimpleArray* data) {
+MfDesfireError mf_desfire_poller_read_file_ids(MfDesfirePoller* instance, SimpleArray* data) {
     furi_assert(instance);
 
     bit_buffer_reset(instance->input_buffer);
@@ -250,7 +247,7 @@ MfDesfireError
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_read_file_settings(
+MfDesfireError mf_desfire_poller_read_file_settings(
     MfDesfirePoller* instance,
     MfDesfireFileId id,
     MfDesfireFileSettings* data) {
@@ -275,7 +272,7 @@ MfDesfireError mf_desfire_poller_async_read_file_settings(
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_read_file_settings_multi(
+MfDesfireError mf_desfire_poller_read_file_settings_multi(
     MfDesfirePoller* instance,
     const SimpleArray* file_ids,
     SimpleArray* data) {
@@ -290,15 +287,14 @@ MfDesfireError mf_desfire_poller_async_read_file_settings_multi(
 
     for(uint32_t i = 0; i < file_id_count; ++i) {
         const MfDesfireFileId file_id = *(const MfDesfireFileId*)simple_array_cget(file_ids, i);
-        error = mf_desfire_poller_async_read_file_settings(
-            instance, file_id, simple_array_get(data, i));
+        error = mf_desfire_poller_read_file_settings(instance, file_id, simple_array_get(data, i));
         if(error != MfDesfireErrorNone) break;
     }
 
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_read_file_data(
+MfDesfireError mf_desfire_poller_read_file_data(
     MfDesfirePoller* instance,
     MfDesfireFileId id,
     uint32_t offset,
@@ -327,7 +323,7 @@ MfDesfireError mf_desfire_poller_async_read_file_data(
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_read_file_value(
+MfDesfireError mf_desfire_poller_read_file_value(
     MfDesfirePoller* instance,
     MfDesfireFileId id,
     MfDesfireFileData* data) {
@@ -352,7 +348,7 @@ MfDesfireError mf_desfire_poller_async_read_file_value(
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_read_file_records(
+MfDesfireError mf_desfire_poller_read_file_records(
     MfDesfirePoller* instance,
     MfDesfireFileId id,
     uint32_t offset,
@@ -381,7 +377,7 @@ MfDesfireError mf_desfire_poller_async_read_file_records(
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_read_file_data_multi(
+MfDesfireError mf_desfire_poller_read_file_data_multi(
     MfDesfirePoller* instance,
     const SimpleArray* file_ids,
     const SimpleArray* file_settings,
@@ -404,14 +400,14 @@ MfDesfireError mf_desfire_poller_async_read_file_data_multi(
         MfDesfireFileData* file_data = simple_array_get(data, i);
 
         if(file_type == MfDesfireFileTypeStandard || file_type == MfDesfireFileTypeBackup) {
-            error = mf_desfire_poller_async_read_file_data(
+            error = mf_desfire_poller_read_file_data(
                 instance, file_id, 0, file_settings_cur->data.size, file_data);
         } else if(file_type == MfDesfireFileTypeValue) {
-            error = mf_desfire_poller_async_read_file_value(instance, file_id, file_data);
+            error = mf_desfire_poller_read_file_value(instance, file_id, file_data);
         } else if(
             file_type == MfDesfireFileTypeLinearRecord ||
             file_type == MfDesfireFileTypeCyclicRecord) {
-            error = mf_desfire_poller_async_read_file_records(
+            error = mf_desfire_poller_read_file_records(
                 instance, file_id, 0, file_settings_cur->data.size, file_data);
         }
 
@@ -421,30 +417,29 @@ MfDesfireError mf_desfire_poller_async_read_file_data_multi(
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_read_application(
-    MfDesfirePoller* instance,
-    MfDesfireApplication* data) {
+MfDesfireError
+    mf_desfire_poller_read_application(MfDesfirePoller* instance, MfDesfireApplication* data) {
     furi_assert(instance);
     furi_assert(data);
 
     MfDesfireError error;
 
     do {
-        error = mf_desfire_poller_async_read_key_settings(instance, &data->key_settings);
+        error = mf_desfire_poller_read_key_settings(instance, &data->key_settings);
         if(error != MfDesfireErrorNone) break;
 
-        error = mf_desfire_poller_async_read_key_versions(
+        error = mf_desfire_poller_read_key_versions(
             instance, data->key_versions, data->key_settings.max_keys);
         if(error != MfDesfireErrorNone) break;
 
-        error = mf_desfire_poller_async_read_file_ids(instance, data->file_ids);
+        error = mf_desfire_poller_read_file_ids(instance, data->file_ids);
         if(error != MfDesfireErrorNone) break;
 
-        error = mf_desfire_poller_async_read_file_settings_multi(
+        error = mf_desfire_poller_read_file_settings_multi(
             instance, data->file_ids, data->file_settings);
         if(error != MfDesfireErrorNone) break;
 
-        error = mf_desfire_poller_async_read_file_data_multi(
+        error = mf_desfire_poller_read_file_data_multi(
             instance, data->file_ids, data->file_settings, data->file_data);
         if(error != MfDesfireErrorNone) break;
 
@@ -453,7 +448,7 @@ MfDesfireError mf_desfire_poller_async_read_application(
     return error;
 }
 
-MfDesfireError mf_desfire_poller_async_read_applications(
+MfDesfireError mf_desfire_poller_read_applications(
     MfDesfirePoller* instance,
     const SimpleArray* app_ids,
     SimpleArray* data) {
@@ -468,12 +463,11 @@ MfDesfireError mf_desfire_poller_async_read_applications(
 
     for(uint32_t i = 0; i < app_id_count; ++i) {
         do {
-            error = mf_desfire_poller_async_select_application(
-                instance, simple_array_cget(app_ids, i));
+            error = mf_desfire_poller_select_application(instance, simple_array_cget(app_ids, i));
             if(error != MfDesfireErrorNone) break;
 
             MfDesfireApplication* current_app = simple_array_get(data, i);
-            error = mf_desfire_poller_async_read_application(instance, current_app);
+            error = mf_desfire_poller_read_application(instance, current_app);
 
         } while(false);
     }
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.h b/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.h
index abc48d0e..1c80af36 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.h
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.h
@@ -49,78 +49,6 @@ MfDesfireError mf_desfire_process_error(Iso14443_4aError error);
 
 const MfDesfireData* mf_desfire_poller_get_data(MfDesfirePoller* instance);
 
-MfDesfireError mf_desfire_send_chunks(
-    MfDesfirePoller* instance,
-    const BitBuffer* tx_buffer,
-    BitBuffer* rx_buffer);
-
-MfDesfireError
-    mf_desfire_poller_async_read_version(MfDesfirePoller* instance, MfDesfireVersion* data);
-
-MfDesfireError
-    mf_desfire_poller_async_read_free_memory(MfDesfirePoller* instance, MfDesfireFreeMemory* data);
-
-MfDesfireError mf_desfire_poller_async_read_key_settings(
-    MfDesfirePoller* instance,
-    MfDesfireKeySettings* data);
-
-MfDesfireError mf_desfire_poller_async_read_key_versions(
-    MfDesfirePoller* instance,
-    SimpleArray* data,
-    uint32_t count);
-
-MfDesfireError
-    mf_desfire_poller_async_read_application_ids(MfDesfirePoller* instance, SimpleArray* data);
-
-MfDesfireError mf_desfire_poller_async_select_application(
-    MfDesfirePoller* instance,
-    const MfDesfireApplicationId* id);
-
-MfDesfireError mf_desfire_poller_async_read_file_ids(MfDesfirePoller* instance, SimpleArray* data);
-
-MfDesfireError mf_desfire_poller_async_read_file_settings(
-    MfDesfirePoller* instance,
-    MfDesfireFileId id,
-    MfDesfireFileSettings* data);
-
-MfDesfireError mf_desfire_poller_async_read_file_settings_multi(
-    MfDesfirePoller* instance,
-    const SimpleArray* file_ids,
-    SimpleArray* data);
-
-MfDesfireError mf_desfire_poller_async_read_file_data(
-    MfDesfirePoller* instance,
-    MfDesfireFileId id,
-    uint32_t offset,
-    size_t size,
-    MfDesfireFileData* data);
-
-MfDesfireError mf_desfire_poller_async_read_file_value(
-    MfDesfirePoller* instance,
-    MfDesfireFileId id,
-    MfDesfireFileData* data);
-
-MfDesfireError mf_desfire_poller_async_read_file_records(
-    MfDesfirePoller* instance,
-    MfDesfireFileId id,
-    uint32_t offset,
-    size_t size,
-    MfDesfireFileData* data);
-
-MfDesfireError mf_desfire_poller_async_read_file_data_multi(
-    MfDesfirePoller* instance,
-    const SimpleArray* file_ids,
-    const SimpleArray* file_settings,
-    SimpleArray* data);
-
-MfDesfireError
-    mf_desfire_poller_async_read_application(MfDesfirePoller* instance, MfDesfireApplication* data);
-
-MfDesfireError mf_desfire_poller_async_read_applications(
-    MfDesfirePoller* instance,
-    const SimpleArray* app_ids,
-    SimpleArray* data);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight_listener.c b/lib/nfc/protocols/mf_ultralight/mf_ultralight_listener.c
index 70c6f6de..5bef2a35 100644
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight_listener.c
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight_listener.c
@@ -122,7 +122,7 @@ static MfUltralightCommand
     uint16_t pages_total = instance->data->pages_total;
     MfUltralightCommand command = MfUltralightCommandNotProcessedNAK;
 
-    FURI_LOG_D(TAG, "CMD_READ: %d", start_page);
+    FURI_LOG_T(TAG, "CMD_READ: %d", start_page);
 
     do {
         bool do_i2c_check = mf_ultralight_is_i2c_tag(instance->data->type);
@@ -154,7 +154,7 @@ static MfUltralightCommand
 static MfUltralightCommand
     mf_ultralight_listener_fast_read_handler(MfUltralightListener* instance, BitBuffer* buffer) {
     MfUltralightCommand command = MfUltralightCommandNotProcessedSilent;
-    FURI_LOG_D(TAG, "CMD_FAST_READ");
+    FURI_LOG_T(TAG, "CMD_FAST_READ");
 
     do {
         if(!mf_ultralight_support_feature(instance->features, MfUltralightFeatureSupportFastRead))
@@ -206,7 +206,7 @@ static MfUltralightCommand
     uint16_t pages_total = instance->data->pages_total;
     MfUltralightCommand command = MfUltralightCommandNotProcessedNAK;
 
-    FURI_LOG_D(TAG, "CMD_WRITE");
+    FURI_LOG_T(TAG, "CMD_WRITE");
 
     do {
         bool do_i2c_check = mf_ultralight_is_i2c_tag(instance->data->type);
@@ -235,7 +235,7 @@ static MfUltralightCommand
 static MfUltralightCommand
     mf_ultralight_listener_fast_write_handler(MfUltralightListener* instance, BitBuffer* buffer) {
     MfUltralightCommand command = MfUltralightCommandNotProcessedSilent;
-    FURI_LOG_D(TAG, "CMD_FAST_WRITE");
+    FURI_LOG_T(TAG, "CMD_FAST_WRITE");
 
     do {
         if(!mf_ultralight_support_feature(instance->features, MfUltralightFeatureSupportFastWrite))
@@ -261,7 +261,7 @@ static MfUltralightCommand
     UNUSED(buffer);
     MfUltralightCommand command = MfUltralightCommandNotProcessedSilent;
 
-    FURI_LOG_D(TAG, "CMD_GET_VERSION");
+    FURI_LOG_T(TAG, "CMD_GET_VERSION");
 
     if(mf_ultralight_support_feature(instance->features, MfUltralightFeatureSupportReadVersion)) {
         bit_buffer_copy_bytes(
@@ -280,7 +280,7 @@ static MfUltralightCommand mf_ultralight_listener_read_signature_handler(
     UNUSED(buffer);
     MfUltralightCommand command = MfUltralightCommandNotProcessedSilent;
 
-    FURI_LOG_D(TAG, "CMD_READ_SIG");
+    FURI_LOG_T(TAG, "CMD_READ_SIG");
 
     if(mf_ultralight_support_feature(instance->features, MfUltralightFeatureSupportReadSignature)) {
         bit_buffer_copy_bytes(
@@ -297,7 +297,7 @@ static MfUltralightCommand
     mf_ultralight_listener_read_counter_handler(MfUltralightListener* instance, BitBuffer* buffer) {
     MfUltralightCommand command = MfUltralightCommandNotProcessedNAK;
 
-    FURI_LOG_D(TAG, "CMD_READ_CNT");
+    FURI_LOG_T(TAG, "CMD_READ_CNT");
 
     do {
         uint8_t counter_num = bit_buffer_get_byte(buffer, 1);
@@ -338,7 +338,7 @@ static MfUltralightCommand mf_ultralight_listener_increase_counter_handler(
     BitBuffer* buffer) {
     MfUltralightCommand command = MfUltralightCommandNotProcessedNAK;
 
-    FURI_LOG_D(TAG, "CMD_INCR_CNT");
+    FURI_LOG_T(TAG, "CMD_INCR_CNT");
 
     do {
         if(!mf_ultralight_support_feature(
@@ -374,7 +374,7 @@ static MfUltralightCommand mf_ultralight_listener_check_tearing_handler(
     BitBuffer* buffer) {
     MfUltralightCommand command = MfUltralightCommandNotProcessedNAK;
 
-    FURI_LOG_D(TAG, "CMD_CHECK_TEARING");
+    FURI_LOG_T(TAG, "CMD_CHECK_TEARING");
 
     do {
         uint8_t tearing_flag_num = bit_buffer_get_byte(buffer, 1);
@@ -410,7 +410,7 @@ static MfUltralightCommand
     MfUltralightCommand command = MfUltralightCommandNotProcessedSilent;
     UNUSED(instance);
     UNUSED(buffer);
-    FURI_LOG_D(TAG, "CMD_VCSL");
+    FURI_LOG_T(TAG, "CMD_VCSL");
     do {
         if(!mf_ultralight_support_feature(instance->features, MfUltralightFeatureSupportVcsl))
             break;
@@ -432,7 +432,7 @@ static MfUltralightCommand
     mf_ultralight_listener_auth_handler(MfUltralightListener* instance, BitBuffer* buffer) {
     MfUltralightCommand command = MfUltralightCommandNotProcessedNAK;
 
-    FURI_LOG_D(TAG, "CMD_AUTH");
+    FURI_LOG_T(TAG, "CMD_AUTH");
 
     do {
         if(!mf_ultralight_support_feature(
@@ -474,7 +474,7 @@ static MfUltralightCommand
 static MfUltralightCommand
     mf_ultralight_comp_write_handler_p2(MfUltralightListener* instance, BitBuffer* buffer) {
     MfUltralightCommand command = MfUltralightCommandNotProcessedNAK;
-    FURI_LOG_D(TAG, "CMD_CM_WR_2");
+    FURI_LOG_T(TAG, "CMD_CM_WR_2");
 
     do {
         if(bit_buffer_get_size_bytes(buffer) != 16) break;
@@ -492,7 +492,7 @@ static MfUltralightCommand
     mf_ultralight_comp_write_handler_p1(MfUltralightListener* instance, BitBuffer* buffer) {
     MfUltralightCommand command = MfUltralightCommandNotProcessedSilent;
 
-    FURI_LOG_D(TAG, "CMD_CM_WR_1");
+    FURI_LOG_T(TAG, "CMD_CM_WR_1");
 
     do {
         if(!mf_ultralight_support_feature(
@@ -532,7 +532,7 @@ static MfUltralightCommand
     MfUltralightCommand command = MfUltralightCommandNotProcessedNAK;
     UNUSED(instance);
     UNUSED(buffer);
-    FURI_LOG_D(TAG, "CMD_SEC_SEL_2");
+    FURI_LOG_T(TAG, "CMD_SEC_SEL_2");
 
     do {
         if(bit_buffer_get_size_bytes(buffer) != 4) break;
@@ -550,7 +550,7 @@ static MfUltralightCommand
     mf_ultralight_sector_select_handler_p1(MfUltralightListener* instance, BitBuffer* buffer) {
     MfUltralightCommand command = MfUltralightCommandNotProcessedNAK;
     UNUSED(buffer);
-    FURI_LOG_D(TAG, "CMD_SEC_SEL_1");
+    FURI_LOG_T(TAG, "CMD_SEC_SEL_1");
 
     do {
         if(!mf_ultralight_support_feature(
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller.c b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller.c
index bf0ced38..86ab68c8 100644
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller.c
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller.c
@@ -230,7 +230,7 @@ static NfcCommand mf_ultralight_poller_handler_idle(MfUltralightPoller* instance
 }
 
 static NfcCommand mf_ultralight_poller_handler_read_version(MfUltralightPoller* instance) {
-    instance->error = mf_ultralight_poller_async_read_version(instance, &instance->data->version);
+    instance->error = mf_ultralight_poller_read_version(instance, &instance->data->version);
     if(instance->error == MfUltralightErrorNone) {
         FURI_LOG_D(TAG, "Read version success");
         instance->data->type = mf_ultralight_get_type_by_version(&instance->data->version);
@@ -245,7 +245,7 @@ static NfcCommand mf_ultralight_poller_handler_read_version(MfUltralightPoller*
 }
 
 static NfcCommand mf_ultralight_poller_handler_check_ultralight_c(MfUltralightPoller* instance) {
-    instance->error = mf_ultralight_poller_async_authenticate(instance);
+    instance->error = mf_ultralight_poller_authenticate(instance);
     if(instance->error == MfUltralightErrorNone) {
         FURI_LOG_D(TAG, "Ultralight C detected");
         instance->data->type = MfUltralightTypeMfulC;
@@ -260,7 +260,7 @@ static NfcCommand mf_ultralight_poller_handler_check_ultralight_c(MfUltralightPo
 
 static NfcCommand mf_ultralight_poller_handler_check_ntag_203(MfUltralightPoller* instance) {
     MfUltralightPageReadCommandData data = {};
-    instance->error = mf_ultralight_poller_async_read_page(instance, 41, &data);
+    instance->error = mf_ultralight_poller_read_page(instance, 41, &data);
     if(instance->error == MfUltralightErrorNone) {
         FURI_LOG_D(TAG, "NTAG203 detected");
         instance->data->type = MfUltralightTypeNTAG203;
@@ -294,7 +294,7 @@ static NfcCommand mf_ultralight_poller_handler_read_signature(MfUltralightPoller
            instance->feature_set, MfUltralightFeatureSupportReadSignature)) {
         FURI_LOG_D(TAG, "Reading signature");
         instance->error =
-            mf_ultralight_poller_async_read_signature(instance, &instance->data->signature);
+            mf_ultralight_poller_read_signature(instance, &instance->data->signature);
         if(instance->error != MfUltralightErrorNone) {
             FURI_LOG_D(TAG, "Read signature failed");
             next_state = MfUltralightPollerStateReadFailed;
@@ -337,7 +337,7 @@ static NfcCommand mf_ultralight_poller_handler_read_counters(MfUltralightPoller*
         }
 
         FURI_LOG_D(TAG, "Reading counter %d", instance->counters_read);
-        instance->error = mf_ultralight_poller_async_read_counter(
+        instance->error = mf_ultralight_poller_read_counter(
             instance, instance->counters_read, &instance->data->counter[instance->counters_read]);
         if(instance->error != MfUltralightErrorNone) {
             FURI_LOG_D(TAG, "Failed to read %d counter", instance->counters_read);
@@ -363,7 +363,7 @@ static NfcCommand mf_ultralight_poller_handler_read_tearing_flags(MfUltralightPo
             if(single_counter) instance->tearing_flag_read = 2;
 
             FURI_LOG_D(TAG, "Reading tearing flag %d", instance->tearing_flag_read);
-            instance->error = mf_ultralight_poller_async_read_tearing_flag(
+            instance->error = mf_ultralight_poller_read_tearing_flag(
                 instance,
                 instance->tearing_flag_read,
                 &instance->data->tearing_flag[instance->tearing_flag_read]);
@@ -396,8 +396,7 @@ static NfcCommand mf_ultralight_poller_handler_auth(MfUltralightPoller* instance
             uint32_t pass = nfc_util_bytes2num(
                 instance->auth_context.password.data, sizeof(MfUltralightAuthPassword));
             FURI_LOG_D(TAG, "Trying to authenticate with password %08lX", pass);
-            instance->error =
-                mf_ultralight_poller_async_auth_pwd(instance, &instance->auth_context);
+            instance->error = mf_ultralight_poller_auth_pwd(instance, &instance->auth_context);
             if(instance->error == MfUltralightErrorNone) {
                 FURI_LOG_D(TAG, "Auth success");
                 instance->auth_context.auth_success = true;
@@ -428,13 +427,13 @@ static NfcCommand mf_ultralight_poller_handler_read_pages(MfUltralightPoller* in
         if(mf_ultralight_poller_ntag_i2c_addr_lin_to_tag(
                instance, start_page, &sector, &tag, &pages_left)) {
             instance->error =
-                mf_ultralight_poller_async_read_page_from_sector(instance, sector, tag, &data);
+                mf_ultralight_poller_read_page_from_sector(instance, sector, tag, &data);
         } else {
             FURI_LOG_D(TAG, "Failed to calculate sector and tag from %d page", start_page);
             instance->error = MfUltralightErrorProtocol;
         }
     } else {
-        instance->error = mf_ultralight_poller_async_read_page(instance, start_page, &data);
+        instance->error = mf_ultralight_poller_read_page(instance, start_page, &data);
     }
 
     if(instance->error == MfUltralightErrorNone) {
@@ -478,8 +477,7 @@ static NfcCommand mf_ultralight_poller_handler_try_default_pass(MfUltralightPoll
                 MF_ULTRALIGHT_DEFAULT_PASSWORD,
                 sizeof(MfUltralightAuthPassword),
                 instance->auth_context.password.data);
-            instance->error =
-                mf_ultralight_poller_async_auth_pwd(instance, &instance->auth_context);
+            instance->error = mf_ultralight_poller_auth_pwd(instance, &instance->auth_context);
             if(instance->error == MfUltralightErrorNone) {
                 FURI_LOG_D(TAG, "Default password detected");
                 nfc_util_num2bytes(
@@ -487,6 +485,7 @@ static NfcCommand mf_ultralight_poller_handler_try_default_pass(MfUltralightPoll
                     sizeof(MfUltralightAuthPassword),
                     config->password.data);
                 config->pack = instance->auth_context.pack;
+                instance->auth_context.auth_success = true;
             }
         }
 
@@ -496,6 +495,9 @@ static NfcCommand mf_ultralight_poller_handler_try_default_pass(MfUltralightPoll
             // original card
             config->auth0 = instance->pages_read;
             config->access.prot = true;
+        } else if(!instance->auth_context.auth_success) {
+            instance->pages_read -= 2;
+            instance->data->pages_read -= 2;
         }
     } while(false);
 
@@ -572,8 +574,7 @@ static bool mf_ultralight_poller_detect(NfcGenericEvent event, void* context) {
 
     if(iso14443_3a_event->type == Iso14443_3aPollerEventTypeReady) {
         MfUltralightPageReadCommandData read_page_cmd_data = {};
-        MfUltralightError error =
-            mf_ultralight_poller_async_read_page(instance, 0, &read_page_cmd_data);
+        MfUltralightError error = mf_ultralight_poller_read_page(instance, 0, &read_page_cmd_data);
         protocol_detected = (error == MfUltralightErrorNone);
         iso14443_3a_poller_halt(instance->iso14443_3a_poller);
     }
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller.h b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller.h
index 2d4ef33e..665d90cb 100644
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller.h
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller.h
@@ -7,35 +7,181 @@
 extern "C" {
 #endif
 
+/**
+ * @brief MfUltralightPoller opaque type definition.
+ */
 typedef struct MfUltralightPoller MfUltralightPoller;
 
+/**
+ * @brief Enumeration of possible MfUltralight poller event types.
+ */
 typedef enum {
-    MfUltralightPollerEventTypeAuthRequest,
-    MfUltralightPollerEventTypeAuthSuccess,
-    MfUltralightPollerEventTypeAuthFailed,
-    MfUltralightPollerEventTypeReadSuccess,
-    MfUltralightPollerEventTypeReadFailed,
+    MfUltralightPollerEventTypeAuthRequest, /**< Poller requests to fill authentication context. */
+    MfUltralightPollerEventTypeAuthSuccess, /**< Authentication succeeded. */
+    MfUltralightPollerEventTypeAuthFailed, /**< Authentication failed. */
+    MfUltralightPollerEventTypeReadSuccess, /**< Poller read card successfully. */
+    MfUltralightPollerEventTypeReadFailed, /**< Poller failed to read card. */
 } MfUltralightPollerEventType;
 
+/**
+ * @brief MfUltralight poller authentication context.
+ */
 typedef struct {
-    MfUltralightAuthPassword password;
-    MfUltralightAuthPack pack;
-    bool auth_success;
-    bool skip_auth;
+    MfUltralightAuthPassword password; /**< Password to be used for authentication. */
+    MfUltralightAuthPack pack; /**< Pack received on successfull authentication. */
+    bool auth_success; /**< Set to true if authentication succeeded, false otherwise. */
+    bool skip_auth; /**< Set to true if authentication should be skipped, false otherwise. */
 } MfUltralightPollerAuthContext;
 
-typedef struct {
-    union {
-        MfUltralightPollerAuthContext auth_context;
-        MfUltralightError error;
-    };
+/**
+ * @brief MfUltralight poller event data.
+ */
+typedef union {
+    MfUltralightPollerAuthContext auth_context; /**< Authentication context. */
+    MfUltralightError error; /**< Error code indicating reading fail reason. */
 } MfUltralightPollerEventData;
 
+/**
+ * @brief MfUltralight poller event structure.
+ *
+ * Upon emission of an event, an instance of this struct will be passed to the callback.
+ */
 typedef struct {
-    MfUltralightPollerEventType type;
-    MfUltralightPollerEventData* data;
+    MfUltralightPollerEventType type; /**< Type of emmitted event. */
+    MfUltralightPollerEventData* data; /**< Pointer to event specific data. */
 } MfUltralightPollerEvent;
 
+/**
+ * @brief Perform authentication with password.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in, out] data pointer to the authentication context.
+ * @return MfUltralightErrorNone on success, an error code on failure.
+ */
+MfUltralightError mf_ultralight_poller_auth_pwd(
+    MfUltralightPoller* instance,
+    MfUltralightPollerAuthContext* data);
+
+/**
+ * @brief Start authentication procedure.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * This function now is used only to identify Mf Ultralight C cards.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @return MfUltralightErrorNone if card supports authentication command, an error code on otherwise.
+ */
+MfUltralightError mf_ultralight_poller_authenticate(MfUltralightPoller* instance);
+
+/**
+ * @brief Read page from card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * Send read command and parse response. The response on this command is data of 4 pages starting
+ * from the page specified in the command.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] start_page page number to be read.
+ * @param[out] data pointer to the MfUltralightPageReadCommandData structure to be filled with page data.
+ * @return MfUltralightErrorNone on success, an error code on failure.
+ */
+MfUltralightError mf_ultralight_poller_read_page(
+    MfUltralightPoller* instance,
+    uint8_t start_page,
+    MfUltralightPageReadCommandData* data);
+
+/**
+ * @brief Read page from sector.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * This command should be used for NTAGI2C tags.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] sector sector number to be read.
+ * @param[in] tag tag number to be read.
+ * @param[out] data pointer to the MfUltralightPageReadCommandData structure to be filled with page data.
+ * @return MfUltralightErrorNone on success, an error code on failure.
+ */
+MfUltralightError mf_ultralight_poller_read_page_from_sector(
+    MfUltralightPoller* instance,
+    uint8_t sector,
+    uint8_t tag,
+    MfUltralightPageReadCommandData* data);
+
+/**
+ * @brief Write page to card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] page page number to be written.
+ * @param[in] data pointer to the MfUltralightPage structure to be written.
+ * @return MfUltralightErrorNone on success, an error code on failure.
+ */
+MfUltralightError mf_ultralight_poller_write_page(
+    MfUltralightPoller* instance,
+    uint8_t page,
+    const MfUltralightPage* data);
+
+/**
+ * @brief Read version from card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the MfUltralightVersion structure to be filled.
+ * @return MfUltralightErrorNone on success, an error code on failure.
+ */
+MfUltralightError
+    mf_ultralight_poller_read_version(MfUltralightPoller* instance, MfUltralightVersion* data);
+
+/**
+ * @brief Read signature from card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the MfUltralightSignature structure to be filled.
+ * @return MfUltralightErrorNone on success, an error code on failure.
+ */
+MfUltralightError
+    mf_ultralight_poller_read_signature(MfUltralightPoller* instance, MfUltralightSignature* data);
+
+/**
+ * @brief Read counter from card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] counter_num counter number to be read.
+ * @param[out] data pointer to the MfUltralightCounter structure to be filled.
+ * @return MfUltralightErrorNone on success, an error code on failure.
+ */
+MfUltralightError mf_ultralight_poller_read_counter(
+    MfUltralightPoller* instance,
+    uint8_t counter_num,
+    MfUltralightCounter* data);
+
+/**
+ * @brief Read tearing flag from card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tearing_falg_num tearing flag number to be read.
+ * @param[out] data pointer to the MfUltralightTearingFlag structure to be filled.
+ * @return MfUltralightErrorNone on success, an error code on failure.
+ */
+MfUltralightError mf_ultralight_poller_read_tearing_flag(
+    MfUltralightPoller* instance,
+    uint8_t tearing_falg_num,
+    MfUltralightTearingFlag* data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_i.c b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_i.c
index 795b03e6..2d88db3e 100644
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_i.c
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_i.c
@@ -30,7 +30,7 @@ MfUltralightError mf_ultralight_process_error(Iso14443_3aError error) {
     return ret;
 }
 
-MfUltralightError mf_ultralight_poller_async_auth_pwd(
+MfUltralightError mf_ultralight_poller_auth_pwd(
     MfUltralightPoller* instance,
     MfUltralightPollerAuthContext* data) {
     uint8_t auth_cmd[5] = {MF_ULTRALIGHT_CMD_PWD_AUTH}; //-V1009
@@ -59,7 +59,7 @@ MfUltralightError mf_ultralight_poller_async_auth_pwd(
     return ret;
 }
 
-MfUltralightError mf_ultralight_poller_async_authenticate(MfUltralightPoller* instance) {
+MfUltralightError mf_ultralight_poller_authenticate(MfUltralightPoller* instance) {
     uint8_t auth_cmd[2] = {MF_ULTRALIGHT_CMD_AUTH, 0x00};
     bit_buffer_copy_bytes(instance->tx_buffer, auth_cmd, sizeof(auth_cmd));
 
@@ -86,7 +86,7 @@ MfUltralightError mf_ultralight_poller_async_authenticate(MfUltralightPoller* in
     return ret;
 }
 
-MfUltralightError mf_ultralight_poller_async_read_page_from_sector(
+MfUltralightError mf_ultralight_poller_read_page_from_sector(
     MfUltralightPoller* instance,
     uint8_t sector,
     uint8_t tag,
@@ -122,13 +122,13 @@ MfUltralightError mf_ultralight_poller_async_read_page_from_sector(
             break;
         }
 
-        ret = mf_ultralight_poller_async_read_page(instance, tag, data);
+        ret = mf_ultralight_poller_read_page(instance, tag, data);
     } while(false);
 
     return ret;
 }
 
-MfUltralightError mf_ultralight_poller_async_read_page(
+MfUltralightError mf_ultralight_poller_read_page(
     MfUltralightPoller* instance,
     uint8_t start_page,
     MfUltralightPageReadCommandData* data) {
@@ -158,10 +158,10 @@ MfUltralightError mf_ultralight_poller_async_read_page(
     return ret;
 }
 
-MfUltralightError mf_ultralight_poller_async_write_page(
+MfUltralightError mf_ultralight_poller_write_page(
     MfUltralightPoller* instance,
     uint8_t page,
-    MfUltralightPage* data) {
+    const MfUltralightPage* data) {
     MfUltralightError ret = MfUltralightErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -191,9 +191,8 @@ MfUltralightError mf_ultralight_poller_async_write_page(
     return ret;
 }
 
-MfUltralightError mf_ultralight_poller_async_read_version(
-    MfUltralightPoller* instance,
-    MfUltralightVersion* data) {
+MfUltralightError
+    mf_ultralight_poller_read_version(MfUltralightPoller* instance, MfUltralightVersion* data) {
     MfUltralightError ret = MfUltralightErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -221,9 +220,8 @@ MfUltralightError mf_ultralight_poller_async_read_version(
     return ret;
 }
 
-MfUltralightError mf_ultralight_poller_async_read_signature(
-    MfUltralightPoller* instance,
-    MfUltralightSignature* data) {
+MfUltralightError
+    mf_ultralight_poller_read_signature(MfUltralightPoller* instance, MfUltralightSignature* data) {
     MfUltralightError ret = MfUltralightErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -249,7 +247,7 @@ MfUltralightError mf_ultralight_poller_async_read_signature(
     return ret;
 }
 
-MfUltralightError mf_ultralight_poller_async_read_counter(
+MfUltralightError mf_ultralight_poller_read_counter(
     MfUltralightPoller* instance,
     uint8_t counter_num,
     MfUltralightCounter* data) {
@@ -278,7 +276,7 @@ MfUltralightError mf_ultralight_poller_async_read_counter(
     return ret;
 }
 
-MfUltralightError mf_ultralight_poller_async_read_tearing_flag(
+MfUltralightError mf_ultralight_poller_read_tearing_flag(
     MfUltralightPoller* instance,
     uint8_t tearing_falg_num,
     MfUltralightTearingFlag* data) {
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_i.h b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_i.h
index 13490cf1..c89402b4 100644
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_i.h
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_i.h
@@ -103,46 +103,6 @@ bool mf_ultralight_poller_ntag_i2c_addr_lin_to_tag(
     uint8_t* tag,
     uint8_t* pages_left);
 
-MfUltralightError mf_ultralight_poller_async_auth_pwd(
-    MfUltralightPoller* instance,
-    MfUltralightPollerAuthContext* data);
-
-MfUltralightError mf_ultralight_poller_async_authenticate(MfUltralightPoller* instance);
-
-MfUltralightError mf_ultralight_poller_async_read_page(
-    MfUltralightPoller* instance,
-    uint8_t start_page,
-    MfUltralightPageReadCommandData* data);
-
-MfUltralightError mf_ultralight_poller_async_read_page_from_sector(
-    MfUltralightPoller* instance,
-    uint8_t sector,
-    uint8_t tag,
-    MfUltralightPageReadCommandData* data);
-
-MfUltralightError mf_ultralight_poller_async_write_page(
-    MfUltralightPoller* instance,
-    uint8_t page,
-    MfUltralightPage* data);
-
-MfUltralightError mf_ultralight_poller_async_read_version(
-    MfUltralightPoller* instance,
-    MfUltralightVersion* data);
-
-MfUltralightError mf_ultralight_poller_async_read_signature(
-    MfUltralightPoller* instance,
-    MfUltralightSignature* data);
-
-MfUltralightError mf_ultralight_poller_async_read_counter(
-    MfUltralightPoller* instance,
-    uint8_t counter_num,
-    MfUltralightCounter* data);
-
-MfUltralightError mf_ultralight_poller_async_read_tearing_flag(
-    MfUltralightPoller* instance,
-    uint8_t tearing_falg_num,
-    MfUltralightTearingFlag* data);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync_api.c b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.c
similarity index 83%
rename from lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync_api.c
rename to lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.c
index 739df597..c4833fac 100644
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync_api.c
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.c
@@ -1,3 +1,4 @@
+#include "mf_ultralight_poller_sync.h"
 #include "mf_ultralight_poller_i.h"
 
 #include <nfc/nfc_poller.h>
@@ -31,40 +32,39 @@ typedef MfUltralightError (*MfUltralightPollerCmdHandler)(
 MfUltralightError mf_ultralight_poller_read_page_handler(
     MfUltralightPoller* poller,
     MfUltralightPollerContextData* data) {
-    return mf_ultralight_poller_async_read_page(
-        poller, data->read_cmd.start_page, &data->read_cmd.data);
+    return mf_ultralight_poller_read_page(poller, data->read_cmd.start_page, &data->read_cmd.data);
 }
 
 MfUltralightError mf_ultralight_poller_write_page_handler(
     MfUltralightPoller* poller,
     MfUltralightPollerContextData* data) {
-    return mf_ultralight_poller_async_write_page(
+    return mf_ultralight_poller_write_page(
         poller, data->write_cmd.page_to_write, &data->write_cmd.page);
 }
 
 MfUltralightError mf_ultralight_poller_read_version_handler(
     MfUltralightPoller* poller,
     MfUltralightPollerContextData* data) {
-    return mf_ultralight_poller_async_read_version(poller, &data->version);
+    return mf_ultralight_poller_read_version(poller, &data->version);
 }
 
 MfUltralightError mf_ultralight_poller_read_signature_handler(
     MfUltralightPoller* poller,
     MfUltralightPollerContextData* data) {
-    return mf_ultralight_poller_async_read_signature(poller, &data->signature);
+    return mf_ultralight_poller_read_signature(poller, &data->signature);
 }
 
 MfUltralightError mf_ultralight_poller_read_counter_handler(
     MfUltralightPoller* poller,
     MfUltralightPollerContextData* data) {
-    return mf_ultralight_poller_async_read_counter(
+    return mf_ultralight_poller_read_counter(
         poller, data->counter_cmd.counter_num, &data->counter_cmd.data);
 }
 
 MfUltralightError mf_ultralight_poller_read_tearing_flag_handler(
     MfUltralightPoller* poller,
     MfUltralightPollerContextData* data) {
-    return mf_ultralight_poller_async_read_tearing_flag(
+    return mf_ultralight_poller_read_tearing_flag(
         poller, data->tearing_flag_cmd.tearing_flag_num, &data->tearing_flag_cmd.data);
 }
 
@@ -79,16 +79,14 @@ static const MfUltralightPollerCmdHandler
             mf_ultralight_poller_read_tearing_flag_handler,
 };
 
-static NfcCommand mf_ultralight_poller_cmd_callback(NfcGenericEvent event, void* context) {
-    furi_assert(event.instance);
-    furi_assert(event.protocol == NfcProtocolIso14443_3a);
-    furi_assert(event.event_data);
+static NfcCommand mf_ultralight_poller_cmd_callback(NfcGenericEventEx event, void* context) {
+    furi_assert(event.poller);
+    furi_assert(event.parent_event_data);
     furi_assert(context);
 
     MfUltralightPollerContext* poller_context = context;
-    Iso14443_3aPollerEvent* iso14443_3a_event = event.event_data;
-    Iso14443_3aPoller* iso14443_3a_poller = event.instance;
-    MfUltralightPoller* mfu_poller = mf_ultralight_poller_alloc(iso14443_3a_poller);
+    Iso14443_3aPollerEvent* iso14443_3a_event = event.parent_event_data;
+    MfUltralightPoller* mfu_poller = event.poller;
 
     if(iso14443_3a_event->type == Iso14443_3aPollerEventTypeReady) {
         poller_context->error = mf_ultralight_poller_cmd_handlers[poller_context->cmd_type](
@@ -99,8 +97,6 @@ static NfcCommand mf_ultralight_poller_cmd_callback(NfcGenericEvent event, void*
 
     furi_thread_flags_set(poller_context->thread_id, MF_ULTRALIGHT_POLLER_COMPLETE_EVENT);
 
-    mf_ultralight_poller_free(mfu_poller);
-
     return NfcCommandStop;
 }
 
@@ -110,8 +106,8 @@ static MfUltralightError
 
     poller_ctx->thread_id = furi_thread_get_current_id();
 
-    NfcPoller* poller = nfc_poller_alloc(nfc, NfcProtocolIso14443_3a);
-    nfc_poller_start(poller, mf_ultralight_poller_cmd_callback, poller_ctx);
+    NfcPoller* poller = nfc_poller_alloc(nfc, NfcProtocolMfUltralight);
+    nfc_poller_start_ex(poller, mf_ultralight_poller_cmd_callback, poller_ctx);
     furi_thread_flags_wait(MF_ULTRALIGHT_POLLER_COMPLETE_EVENT, FuriFlagWaitAny, FuriWaitForever);
     furi_thread_flags_clear(MF_ULTRALIGHT_POLLER_COMPLETE_EVENT);
 
@@ -121,7 +117,8 @@ static MfUltralightError
     return poller_ctx->error;
 }
 
-MfUltralightError mf_ultralight_poller_read_page(Nfc* nfc, uint16_t page, MfUltralightPage* data) {
+MfUltralightError
+    mf_ultralight_poller_sync_read_page(Nfc* nfc, uint16_t page, MfUltralightPage* data) {
     furi_assert(nfc);
     furi_assert(data);
 
@@ -140,7 +137,7 @@ MfUltralightError mf_ultralight_poller_read_page(Nfc* nfc, uint16_t page, MfUltr
 }
 
 MfUltralightError
-    mf_ultralight_poller_write_page(Nfc* nfc, uint16_t page, MfUltralightPage* data) {
+    mf_ultralight_poller_sync_write_page(Nfc* nfc, uint16_t page, MfUltralightPage* data) {
     furi_assert(nfc);
     furi_assert(data);
 
@@ -158,7 +155,7 @@ MfUltralightError
     return error;
 }
 
-MfUltralightError mf_ultralight_poller_read_version(Nfc* nfc, MfUltralightVersion* data) {
+MfUltralightError mf_ultralight_poller_sync_read_version(Nfc* nfc, MfUltralightVersion* data) {
     furi_assert(nfc);
     furi_assert(data);
 
@@ -175,7 +172,7 @@ MfUltralightError mf_ultralight_poller_read_version(Nfc* nfc, MfUltralightVersio
     return error;
 }
 
-MfUltralightError mf_ultralight_poller_read_signature(Nfc* nfc, MfUltralightSignature* data) {
+MfUltralightError mf_ultralight_poller_sync_read_signature(Nfc* nfc, MfUltralightSignature* data) {
     furi_assert(nfc);
     furi_assert(data);
 
@@ -192,8 +189,10 @@ MfUltralightError mf_ultralight_poller_read_signature(Nfc* nfc, MfUltralightSign
     return error;
 }
 
-MfUltralightError
-    mf_ultralight_poller_read_counter(Nfc* nfc, uint8_t counter_num, MfUltralightCounter* data) {
+MfUltralightError mf_ultralight_poller_sync_read_counter(
+    Nfc* nfc,
+    uint8_t counter_num,
+    MfUltralightCounter* data) {
     furi_assert(nfc);
     furi_assert(data);
 
@@ -211,7 +210,7 @@ MfUltralightError
     return error;
 }
 
-MfUltralightError mf_ultralight_poller_read_tearing_flag(
+MfUltralightError mf_ultralight_poller_sync_read_tearing_flag(
     Nfc* nfc,
     uint8_t flag_num,
     MfUltralightTearingFlag* data) {
@@ -261,7 +260,7 @@ static NfcCommand mf_ultralight_poller_read_callback(NfcGenericEvent event, void
     return command;
 }
 
-MfUltralightError mf_ultralight_poller_read_card(Nfc* nfc, MfUltralightData* data) {
+MfUltralightError mf_ultralight_poller_sync_read_card(Nfc* nfc, MfUltralightData* data) {
     furi_assert(nfc);
     furi_assert(data);
 
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.h b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.h
new file mode 100644
index 00000000..ac585aad
--- /dev/null
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "mf_ultralight.h"
+#include <nfc/nfc.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+MfUltralightError
+    mf_ultralight_poller_sync_read_page(Nfc* nfc, uint16_t page, MfUltralightPage* data);
+
+MfUltralightError
+    mf_ultralight_poller_sync_write_page(Nfc* nfc, uint16_t page, MfUltralightPage* data);
+
+MfUltralightError mf_ultralight_poller_sync_read_version(Nfc* nfc, MfUltralightVersion* data);
+
+MfUltralightError mf_ultralight_poller_sync_read_signature(Nfc* nfc, MfUltralightSignature* data);
+
+MfUltralightError mf_ultralight_poller_sync_read_counter(
+    Nfc* nfc,
+    uint8_t counter_num,
+    MfUltralightCounter* data);
+
+MfUltralightError mf_ultralight_poller_sync_read_tearing_flag(
+    Nfc* nfc,
+    uint8_t flag_num,
+    MfUltralightTearingFlag* data);
+
+MfUltralightError mf_ultralight_poller_sync_read_card(Nfc* nfc, MfUltralightData* data);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync_api.h b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync_api.h
deleted file mode 100644
index a0124ae0..00000000
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync_api.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "mf_ultralight.h"
-#include <nfc/nfc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-MfUltralightError mf_ultralight_poller_read_page(Nfc* nfc, uint16_t page, MfUltralightPage* data);
-
-MfUltralightError mf_ultralight_poller_write_page(Nfc* nfc, uint16_t page, MfUltralightPage* data);
-
-MfUltralightError mf_ultralight_poller_read_version(Nfc* nfc, MfUltralightVersion* data);
-
-MfUltralightError mf_ultralight_poller_read_signature(Nfc* nfc, MfUltralightSignature* data);
-
-MfUltralightError
-    mf_ultralight_poller_read_counter(Nfc* nfc, uint8_t counter_num, MfUltralightCounter* data);
-
-MfUltralightError mf_ultralight_poller_read_tearing_flag(
-    Nfc* nfc,
-    uint8_t flag_num,
-    MfUltralightTearingFlag* data);
-
-MfUltralightError mf_ultralight_poller_read_card(Nfc* nfc, MfUltralightData* data);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/lib/nfc/protocols/nfc_protocol.h b/lib/nfc/protocols/nfc_protocol.h
index 55aa8a58..ee634533 100644
--- a/lib/nfc/protocols/nfc_protocol.h
+++ b/lib/nfc/protocols/nfc_protocol.h
@@ -61,9 +61,9 @@
  *             |                                 |
  *             +- protocol_name_listener_defs.h  |
  *             |
- *             +- protocol_name_sync_api.h       |
+ *             +- protocol_name_sync.h           |
  *             |                                 |- add for synchronous API support
- *             +- protocol_name_sync_api.c       |
+ *             +- protocol_name_sync.c           |
  *             |
  * ```
  *
@@ -83,8 +83,8 @@
  * | protocol_name_listener.h      | Protocol-specific listener and associated functions declarations. Optional, needed for emulation support. |
  * | protocol_name_listener.c      | Implementation of functions declared in `protocol_name_listener.h`. Optional, needed for emulation support. |
  * | protocol_name_listener_defs.h | Declarations for use by the NfcListener library. See nfc_listener_base.h for more info. Optional, needed for emulation support. |
- * | protocol_name_sync_api.h      | Synchronous API declarations. (See below for sync API explanation). Optional.|
- * | protocol_name_sync_api.c      | Synchronous API implementation. Optional. |
+ * | protocol_name_sync.h          | Synchronous API declarations. (See below for sync API explanation). Optional.|
+ * | protocol_name_sync.c          | Synchronous API implementation. Optional. |
  *
  * ## 3 Implement the code
  *
@@ -145,7 +145,7 @@
  *    `protocol_name_poller_defs` structure under the appropriate index.
  * 5. (Optional) If emulation support was implemented, do the step 4, but for the listener.
  * 6. Add `protocol_name.h`, `protocol_name_poller.h`, and optionally, `protocol_name_listener.h`
- *    and `protocol_name_sync_api.h` into the `SDK_HEADERS` list in the SConscript file.
+ *    and `protocol_name_sync.h` into the `SDK_HEADERS` list in the SConscript file.
  *    This will export the protocol's types and functions for use by the applications.
  * 7. Done!
  *
diff --git a/lib/nfc/protocols/slix/slix_poller.c b/lib/nfc/protocols/slix/slix_poller.c
index 9731bfc6..46a17119 100644
--- a/lib/nfc/protocols/slix/slix_poller.c
+++ b/lib/nfc/protocols/slix/slix_poller.c
@@ -50,8 +50,7 @@ static NfcCommand slix_poller_handler_idle(SlixPoller* instance) {
 }
 
 static NfcCommand slix_poller_handler_get_nfc_system_info(SlixPoller* instance) {
-    instance->error =
-        slix_poller_async_get_nxp_system_info(instance, &instance->data->system_info);
+    instance->error = slix_poller_get_nxp_system_info(instance, &instance->data->system_info);
     if(instance->error == SlixErrorNone) {
         instance->poller_state = SlixPollerStateReadSignature;
     } else {
@@ -62,7 +61,7 @@ static NfcCommand slix_poller_handler_get_nfc_system_info(SlixPoller* instance)
 }
 
 static NfcCommand slix_poller_handler_read_signature(SlixPoller* instance) {
-    instance->error = slix_poller_async_read_signature(instance, &instance->data->signature);
+    instance->error = slix_poller_read_signature(instance, &instance->data->signature);
     if(instance->error == SlixErrorNone) {
         instance->poller_state = SlixPollerStateReady;
     } else {
@@ -141,7 +140,7 @@ static bool slix_poller_detect(NfcGenericEvent event, void* context) {
     if(iso15693_3_event->type == Iso15693_3PollerEventTypeReady) {
         if(slix_get_type(instance->data) < SlixTypeCount) {
             SlixSystemInfo system_info = {};
-            SlixError error = slix_poller_async_get_nxp_system_info(instance, &system_info);
+            SlixError error = slix_poller_get_nxp_system_info(instance, &system_info);
             protocol_detected = (error == SlixErrorNone);
         }
     }
diff --git a/lib/nfc/protocols/slix/slix_poller.h b/lib/nfc/protocols/slix/slix_poller.h
index f4c7214d..62d60be5 100644
--- a/lib/nfc/protocols/slix/slix_poller.h
+++ b/lib/nfc/protocols/slix/slix_poller.h
@@ -8,22 +8,78 @@
 extern "C" {
 #endif
 
+/**
+ * @brief SlixPoller opaque type definition.
+ */
 typedef struct SlixPoller SlixPoller;
 
+/**
+ * @brief Enumeration of possible Slix poller event types.
+ */
 typedef enum {
-    SlixPollerEventTypeError,
-    SlixPollerEventTypeReady,
+    SlixPollerEventTypeError, /**< An error occured while reading card. */
+    SlixPollerEventTypeReady, /**< The card was successfully read by the poller. */
 } SlixPollerEventType;
 
-typedef struct {
-    SlixError error;
+/**
+ * @brief Slixs poller event data.
+ */
+typedef union {
+    SlixError error; /**< Error code indicating card reaing fail reason. */
 } SlixPollerEventData;
 
+/**
+ * @brief Slix poller event structure.
+ *
+ * Upon emission of an event, an instance of this struct will be passed to the callback.
+ */
 typedef struct {
-    SlixPollerEventType type;
-    SlixPollerEventData* data;
+    SlixPollerEventType type; /**< Type of emmitted event. */
+    SlixPollerEventData* data; /**< Pointer to event specific data. */
 } SlixPollerEvent;
 
+/**
+ * @brief Transmit and receive Slix frames in poller mode.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * The rx_buffer will be filled with any data received as a response to data
+ * sent from tx_buffer, with a timeout defined by the fwt parameter.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tx_buffer pointer to the buffer containing the data to be transmitted.
+ * @param[out] rx_buffer pointer to the buffer to be filled with received data.
+ * @param[in] fwt frame wait time (response timeout), in carrier cycles.
+ * @return SlixErrorNone on success, an error code on failure.
+ */
+SlixError slix_poller_send_frame(
+    SlixPoller* instance,
+    const BitBuffer* tx_data,
+    BitBuffer* rx_data,
+    uint32_t fwt);
+
+/**
+ * @brief Send get nxp system info command and parse response.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the SlixSystemInfo structure to be filled.
+ * @return SlixErrorNone on success, an error code on failure.
+ */
+SlixError slix_poller_get_nxp_system_info(SlixPoller* instance, SlixSystemInfo* data);
+
+/**
+ * @brief Read signature from card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] data pointer to the SlixSignature structure to be filled.
+ * @return SlixErrorNone on success, an error code on failure.
+ */
+SlixError slix_poller_read_signature(SlixPoller* instance, SlixSignature* data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/slix/slix_poller_i.c b/lib/nfc/protocols/slix/slix_poller_i.c
index a36e7694..6d7bdf37 100644
--- a/lib/nfc/protocols/slix/slix_poller_i.c
+++ b/lib/nfc/protocols/slix/slix_poller_i.c
@@ -32,7 +32,7 @@ SlixError slix_poller_send_frame(
     return slix_process_iso15693_3_error(iso15693_3_error);
 }
 
-SlixError slix_poller_async_get_nxp_system_info(SlixPoller* instance, SlixSystemInfo* data) {
+SlixError slix_poller_get_nxp_system_info(SlixPoller* instance, SlixSystemInfo* data) {
     furi_assert(instance);
     furi_assert(data);
 
@@ -50,7 +50,7 @@ SlixError slix_poller_async_get_nxp_system_info(SlixPoller* instance, SlixSystem
     return error;
 }
 
-SlixError slix_poller_async_read_signature(SlixPoller* instance, SlixSignature* data) {
+SlixError slix_poller_read_signature(SlixPoller* instance, SlixSignature* data) {
     furi_assert(instance);
     furi_assert(data);
 
diff --git a/lib/nfc/protocols/slix/slix_poller_i.h b/lib/nfc/protocols/slix/slix_poller_i.h
index c6a8a3c3..1fda1a7d 100644
--- a/lib/nfc/protocols/slix/slix_poller_i.h
+++ b/lib/nfc/protocols/slix/slix_poller_i.h
@@ -33,16 +33,6 @@ struct SlixPoller {
     void* context;
 };
 
-SlixError slix_poller_send_frame(
-    SlixPoller* instance,
-    const BitBuffer* tx_data,
-    BitBuffer* rx_data,
-    uint32_t fwt);
-
-SlixError slix_poller_async_get_nxp_system_info(SlixPoller* instance, SlixSystemInfo* data);
-
-SlixError slix_poller_async_read_signature(SlixPoller* instance, SlixSignature* data);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/st25tb/st25tb_poller.c b/lib/nfc/protocols/st25tb/st25tb_poller.c
index df659a20..2bc5dd94 100644
--- a/lib/nfc/protocols/st25tb/st25tb_poller.c
+++ b/lib/nfc/protocols/st25tb/st25tb_poller.c
@@ -71,7 +71,7 @@ static NfcCommand st25tb_poller_run(NfcGenericEvent event, void* context) {
 
     if(nfc_event->type == NfcEventTypePollerReady) {
         if(instance->state != St25tbPollerStateActivated) {
-            St25tbError error = st25tb_poller_async_activate(instance, instance->data);
+            St25tbError error = st25tb_poller_activate(instance, instance->data);
 
             if(error == St25tbErrorNone) {
                 instance->st25tb_event.type = St25tbPollerEventTypeReady;
@@ -106,7 +106,7 @@ static bool st25tb_poller_detect(NfcGenericEvent event, void* context) {
     furi_assert(instance->state == St25tbPollerStateIdle);
 
     if(nfc_event->type == NfcEventTypePollerReady) {
-        St25tbError error = st25tb_poller_async_initiate(instance, NULL);
+        St25tbError error = st25tb_poller_initiate(instance, NULL);
         protocol_detected = (error == St25tbErrorNone);
     }
 
diff --git a/lib/nfc/protocols/st25tb/st25tb_poller.h b/lib/nfc/protocols/st25tb/st25tb_poller.h
index a521b6d5..d3b85e30 100644
--- a/lib/nfc/protocols/st25tb/st25tb_poller.h
+++ b/lib/nfc/protocols/st25tb/st25tb_poller.h
@@ -25,6 +25,23 @@ typedef struct {
     St25tbPollerEventData* data;
 } St25tbPollerEvent;
 
+St25tbError st25tb_poller_send_frame(
+    St25tbPoller* instance,
+    const BitBuffer* tx_buffer,
+    BitBuffer* rx_buffer,
+    uint32_t fwt);
+
+St25tbError st25tb_poller_initiate(St25tbPoller* instance, uint8_t* chip_id);
+
+St25tbError st25tb_poller_activate(St25tbPoller* instance, St25tbData* data);
+
+St25tbError st25tb_poller_get_uid(St25tbPoller* instance, uint8_t* uid);
+
+St25tbError
+    st25tb_poller_read_block(St25tbPoller* instance, uint32_t* block, uint8_t block_number);
+
+St25tbError st25tb_poller_halt(St25tbPoller* instance);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/st25tb/st25tb_poller_i.c b/lib/nfc/protocols/st25tb/st25tb_poller_i.c
index bcbc6938..76c9a8b1 100644
--- a/lib/nfc/protocols/st25tb/st25tb_poller_i.c
+++ b/lib/nfc/protocols/st25tb/st25tb_poller_i.c
@@ -22,7 +22,7 @@ static St25tbError st25tb_poller_prepare_trx(St25tbPoller* instance) {
     furi_assert(instance);
 
     if(instance->state == St25tbPollerStateIdle) {
-        return st25tb_poller_async_activate(instance, NULL);
+        return st25tb_poller_activate(instance, NULL);
     }
 
     return St25tbErrorNone;
@@ -85,7 +85,7 @@ St25tbType st25tb_get_type_from_uid(const uint8_t uid[ST25TB_UID_SIZE]) {
     }
 }
 
-St25tbError st25tb_poller_async_initiate(St25tbPoller* instance, uint8_t* chip_id) {
+St25tbError st25tb_poller_initiate(St25tbPoller* instance, uint8_t* chip_id) {
     // Send Initiate()
     furi_assert(instance);
     furi_assert(instance->nfc);
@@ -117,7 +117,7 @@ St25tbError st25tb_poller_async_initiate(St25tbPoller* instance, uint8_t* chip_i
     return ret;
 }
 
-St25tbError st25tb_poller_async_activate(St25tbPoller* instance, St25tbData* data) {
+St25tbError st25tb_poller_activate(St25tbPoller* instance, St25tbData* data) {
     furi_assert(instance);
     furi_assert(instance->nfc);
 
@@ -126,7 +126,7 @@ St25tbError st25tb_poller_async_activate(St25tbPoller* instance, St25tbData* dat
     St25tbError ret;
 
     do {
-        ret = st25tb_poller_async_initiate(instance, &data->chip_id);
+        ret = st25tb_poller_initiate(instance, &data->chip_id);
         if(ret != St25tbErrorNone) {
             break;
         }
@@ -162,7 +162,7 @@ St25tbError st25tb_poller_async_activate(St25tbPoller* instance, St25tbData* dat
         }
         instance->state = St25tbPollerStateActivated;
 
-        ret = st25tb_poller_async_get_uid(instance, data->uid);
+        ret = st25tb_poller_get_uid(instance, data->uid);
         if(ret != St25tbErrorNone) {
             instance->state = St25tbPollerStateActivationFailed;
             break;
@@ -171,7 +171,7 @@ St25tbError st25tb_poller_async_activate(St25tbPoller* instance, St25tbData* dat
 
         bool read_blocks = true;
         for(uint8_t i = 0; i < st25tb_get_block_count(data->type); i++) {
-            ret = st25tb_poller_async_read_block(instance, &data->blocks[i], i);
+            ret = st25tb_poller_read_block(instance, &data->blocks[i], i);
             if(ret != St25tbErrorNone) {
                 read_blocks = false;
                 break;
@@ -180,14 +180,13 @@ St25tbError st25tb_poller_async_activate(St25tbPoller* instance, St25tbData* dat
         if(!read_blocks) {
             break;
         }
-        ret = st25tb_poller_async_read_block(
-            instance, &data->system_otp_block, ST25TB_SYSTEM_OTP_BLOCK);
+        ret = st25tb_poller_read_block(instance, &data->system_otp_block, ST25TB_SYSTEM_OTP_BLOCK);
     } while(false);
 
     return ret;
 }
 
-St25tbError st25tb_poller_async_get_uid(St25tbPoller* instance, uint8_t uid[ST25TB_UID_SIZE]) {
+St25tbError st25tb_poller_get_uid(St25tbPoller* instance, uint8_t* uid) {
     furi_assert(instance);
     furi_assert(instance->nfc);
 
@@ -221,7 +220,7 @@ St25tbError st25tb_poller_async_get_uid(St25tbPoller* instance, uint8_t uid[ST25
 }
 
 St25tbError
-    st25tb_poller_async_read_block(St25tbPoller* instance, uint32_t* block, uint8_t block_number) {
+    st25tb_poller_read_block(St25tbPoller* instance, uint32_t* block, uint8_t block_number) {
     furi_assert(instance);
     furi_assert(instance->nfc);
     furi_assert(block);
diff --git a/lib/nfc/protocols/st25tb/st25tb_poller_i.h b/lib/nfc/protocols/st25tb/st25tb_poller_i.h
index 7f38f2d4..27218d7b 100644
--- a/lib/nfc/protocols/st25tb/st25tb_poller_i.h
+++ b/lib/nfc/protocols/st25tb/st25tb_poller_i.h
@@ -34,23 +34,6 @@ struct St25tbPoller {
 
 const St25tbData* st25tb_poller_get_data(St25tbPoller* instance);
 
-St25tbError st25tb_poller_async_initiate(St25tbPoller* instance, uint8_t* chip_id);
-
-St25tbError st25tb_poller_async_activate(St25tbPoller* instance, St25tbData* data);
-
-St25tbError st25tb_poller_async_get_uid(St25tbPoller* instance, uint8_t uid[ST25TB_UID_SIZE]);
-
-St25tbError
-    st25tb_poller_async_read_block(St25tbPoller* instance, uint32_t* block, uint8_t block_number);
-
-St25tbError st25tb_poller_halt(St25tbPoller* instance);
-
-St25tbError st25tb_poller_send_frame(
-    St25tbPoller* instance,
-    const BitBuffer* tx_buffer,
-    BitBuffer* rx_buffer,
-    uint32_t fwt);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/print/wrappers.h b/lib/print/wrappers.h
index b6f0f004..7c0d1f92 100644
--- a/lib/print/wrappers.h
+++ b/lib/print/wrappers.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -6,7 +8,6 @@
 extern "C" {
 #endif
 
-void _putchar(char character);
 int __wrap_printf(const char* format, ...);
 int __wrap_vsnprintf(char* str, size_t size, const char* format, va_list args);
 int __wrap_puts(const char* str);
diff --git a/lib/subghz/SConscript b/lib/subghz/SConscript
index 82c925c1..35850aa8 100644
--- a/lib/subghz/SConscript
+++ b/lib/subghz/SConscript
@@ -12,6 +12,7 @@ env.Append(
         File("subghz_tx_rx_worker.h"),
         File("transmitter.h"),
         File("protocols/raw.h"),
+        File("protocols/public_api.h"),
         File("blocks/const.h"),
         File("blocks/decoder.h"),
         File("blocks/encoder.h"),
diff --git a/lib/subghz/protocols/bin_raw.h b/lib/subghz/protocols/bin_raw.h
index 82775e57..26cc6ec3 100644
--- a/lib/subghz/protocols/bin_raw.h
+++ b/lib/subghz/protocols/bin_raw.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "base.h"
+#include "public_api.h"
 
 #define SUBGHZ_PROTOCOL_BIN_RAW_NAME "BinRAW"
 
@@ -80,10 +81,6 @@ void subghz_protocol_decoder_bin_raw_feed(void* context, bool level, uint32_t du
  */
 uint8_t subghz_protocol_decoder_bin_raw_get_hash_data(void* context);
 
-void subghz_protocol_decoder_bin_raw_data_input_rssi(
-    SubGhzProtocolDecoderBinRAW* instance,
-    float rssi);
-
 /**
  * Serialize data SubGhzProtocolDecoderBinRAW.
  * @param context Pointer to a SubGhzProtocolDecoderBinRAW instance
diff --git a/lib/subghz/protocols/keeloq.h b/lib/subghz/protocols/keeloq.h
index 59cd9cf9..4abd1441 100644
--- a/lib/subghz/protocols/keeloq.h
+++ b/lib/subghz/protocols/keeloq.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "base.h"
+#include "public_api.h"
 
 #define SUBGHZ_PROTOCOL_KEELOQ_NAME "KeeLoq"
 
@@ -24,26 +25,6 @@ void* subghz_protocol_encoder_keeloq_alloc(SubGhzEnvironment* environment);
  */
 void subghz_protocol_encoder_keeloq_free(void* context);
 
-/**
- * Key generation from simple data.
- * @param context Pointer to a SubGhzProtocolEncoderKeeloq instance
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param serial Serial number, 28 bit
- * @param btn Button number, 4 bit
- * @param cnt Container value, 16 bit
- * @param manufacture_name Name of manufacturer's key
- * @param preset Modulation, SubGhzRadioPreset
- * @return true On success
- */
-bool subghz_protocol_keeloq_create_data(
-    void* context,
-    FlipperFormat* flipper_format,
-    uint32_t serial,
-    uint8_t btn,
-    uint16_t cnt,
-    const char* manufacture_name,
-    SubGhzRadioPreset* preset);
-
 /**
  * Deserialize and generating an upload to send.
  * @param context Pointer to a SubGhzProtocolEncoderKeeloq instance
diff --git a/lib/subghz/protocols/mastercode.c b/lib/subghz/protocols/mastercode.c
new file mode 100644
index 00000000..54ad5bfa
--- /dev/null
+++ b/lib/subghz/protocols/mastercode.c
@@ -0,0 +1,360 @@
+#include "mastercode.h"
+
+#include "../blocks/const.h"
+#include "../blocks/decoder.h"
+#include "../blocks/encoder.h"
+#include "../blocks/generic.h"
+#include "../blocks/math.h"
+
+// protocol MASTERCODE Clemsa MV1/MV12
+#define TAG "SubGhzProtocolMastercode"
+
+#define DIP_P 0b11 //(+)
+#define DIP_O 0b10 //(0)
+#define DIP_N 0b00 //(-)
+
+#define DIP_PATTERN "%c%c%c%c%c%c%c%c"
+
+#define SHOW_DIP_P(dip, check_dip)                         \
+    ((((dip >> 0x0) & 0x3) == check_dip) ? '*' : '_'),     \
+        ((((dip >> 0x2) & 0x3) == check_dip) ? '*' : '_'), \
+        ((((dip >> 0x4) & 0x3) == check_dip) ? '*' : '_'), \
+        ((((dip >> 0x6) & 0x3) == check_dip) ? '*' : '_'), \
+        ((((dip >> 0x8) & 0x3) == check_dip) ? '*' : '_'), \
+        ((((dip >> 0xA) & 0x3) == check_dip) ? '*' : '_'), \
+        ((((dip >> 0xC) & 0x3) == check_dip) ? '*' : '_'), \
+        ((((dip >> 0xE) & 0x3) == check_dip) ? '*' : '_')
+
+static const SubGhzBlockConst subghz_protocol_mastercode_const = {
+    .te_short = 1072,
+    .te_long = 2145,
+    .te_delta = 150,
+    .min_count_bit_for_found = 36,
+};
+
+struct SubGhzProtocolDecoderMastercode {
+    SubGhzProtocolDecoderBase base;
+    SubGhzBlockDecoder decoder;
+    SubGhzBlockGeneric generic;
+};
+
+struct SubGhzProtocolEncoderMastercode {
+    SubGhzProtocolEncoderBase base;
+    SubGhzProtocolBlockEncoder encoder;
+    SubGhzBlockGeneric generic;
+};
+
+typedef enum {
+    MastercodeDecoderStepReset = 0,
+    MastercodeDecoderStepSaveDuration,
+    MastercodeDecoderStepCheckDuration,
+} MastercodeDecoderStep;
+
+const SubGhzProtocolDecoder subghz_protocol_mastercode_decoder = {
+    .alloc = subghz_protocol_decoder_mastercode_alloc,
+    .free = subghz_protocol_decoder_mastercode_free,
+
+    .feed = subghz_protocol_decoder_mastercode_feed,
+    .reset = subghz_protocol_decoder_mastercode_reset,
+
+    .get_hash_data = subghz_protocol_decoder_mastercode_get_hash_data,
+    .serialize = subghz_protocol_decoder_mastercode_serialize,
+    .deserialize = subghz_protocol_decoder_mastercode_deserialize,
+    .get_string = subghz_protocol_decoder_mastercode_get_string,
+};
+
+const SubGhzProtocolEncoder subghz_protocol_mastercode_encoder = {
+    .alloc = subghz_protocol_encoder_mastercode_alloc,
+    .free = subghz_protocol_encoder_mastercode_free,
+
+    .deserialize = subghz_protocol_encoder_mastercode_deserialize,
+    .stop = subghz_protocol_encoder_mastercode_stop,
+    .yield = subghz_protocol_encoder_mastercode_yield,
+};
+
+const SubGhzProtocol subghz_protocol_mastercode = {
+    .name = SUBGHZ_PROTOCOL_MASTERCODE_NAME,
+    .type = SubGhzProtocolTypeStatic,
+    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
+            SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send,
+
+    .decoder = &subghz_protocol_mastercode_decoder,
+    .encoder = &subghz_protocol_mastercode_encoder,
+};
+
+void* subghz_protocol_encoder_mastercode_alloc(SubGhzEnvironment* environment) {
+    UNUSED(environment);
+    SubGhzProtocolEncoderMastercode* instance = malloc(sizeof(SubGhzProtocolEncoderMastercode));
+
+    instance->base.protocol = &subghz_protocol_mastercode;
+    instance->generic.protocol_name = instance->base.protocol->name;
+
+    instance->encoder.repeat = 10;
+    instance->encoder.size_upload = 72;
+    instance->encoder.upload = malloc(instance->encoder.size_upload * sizeof(LevelDuration));
+    instance->encoder.is_running = false;
+    return instance;
+}
+
+void subghz_protocol_encoder_mastercode_free(void* context) {
+    furi_assert(context);
+    SubGhzProtocolEncoderMastercode* instance = context;
+    free(instance->encoder.upload);
+    free(instance);
+}
+
+/**
+ * Generating an upload from data.
+ * @param instance Pointer to a SubGhzProtocolEncoderMastercode instance
+ * @return true On success
+ */
+static bool
+    subghz_protocol_encoder_mastercode_get_upload(SubGhzProtocolEncoderMastercode* instance) {
+    furi_assert(instance);
+    size_t index = 0;
+    size_t size_upload = (instance->generic.data_count_bit * 2);
+    if(size_upload > instance->encoder.size_upload) {
+        FURI_LOG_E(TAG, "Size upload exceeds allocated encoder buffer.");
+        return false;
+    } else {
+        instance->encoder.size_upload = size_upload;
+    }
+
+    for(uint8_t i = instance->generic.data_count_bit; i > 1; i--) {
+        if(bit_read(instance->generic.data, i - 1)) {
+            //send bit 1
+            instance->encoder.upload[index++] =
+                level_duration_make(true, (uint32_t)subghz_protocol_mastercode_const.te_long);
+            instance->encoder.upload[index++] =
+                level_duration_make(false, (uint32_t)subghz_protocol_mastercode_const.te_short);
+        } else {
+            //send bit 0
+            instance->encoder.upload[index++] =
+                level_duration_make(true, (uint32_t)subghz_protocol_mastercode_const.te_short);
+            instance->encoder.upload[index++] =
+                level_duration_make(false, (uint32_t)subghz_protocol_mastercode_const.te_long);
+        }
+    }
+    if(bit_read(instance->generic.data, 0)) {
+        //send bit 1
+        instance->encoder.upload[index++] =
+            level_duration_make(true, (uint32_t)subghz_protocol_mastercode_const.te_long);
+        instance->encoder.upload[index++] = level_duration_make(
+            false,
+            (uint32_t)subghz_protocol_mastercode_const.te_short +
+                subghz_protocol_mastercode_const.te_short * 13);
+    } else {
+        //send bit 0
+        instance->encoder.upload[index++] =
+            level_duration_make(true, (uint32_t)subghz_protocol_mastercode_const.te_short);
+        instance->encoder.upload[index++] = level_duration_make(
+            false,
+            (uint32_t)subghz_protocol_mastercode_const.te_long +
+                subghz_protocol_mastercode_const.te_short * 13);
+    }
+    return true;
+}
+
+SubGhzProtocolStatus
+    subghz_protocol_encoder_mastercode_deserialize(void* context, FlipperFormat* flipper_format) {
+    furi_assert(context);
+    SubGhzProtocolEncoderMastercode* instance = context;
+    SubGhzProtocolStatus ret = SubGhzProtocolStatusError;
+    do {
+        ret = subghz_block_generic_deserialize_check_count_bit(
+            &instance->generic,
+            flipper_format,
+            subghz_protocol_mastercode_const.min_count_bit_for_found);
+        if(ret != SubGhzProtocolStatusOk) {
+            break;
+        }
+        //optional parameter parameter
+        flipper_format_read_uint32(
+            flipper_format, "Repeat", (uint32_t*)&instance->encoder.repeat, 1);
+
+        if(!subghz_protocol_encoder_mastercode_get_upload(instance)) {
+            ret = SubGhzProtocolStatusErrorEncoderGetUpload;
+            break;
+        }
+        instance->encoder.is_running = true;
+
+    } while(false);
+
+    return ret;
+}
+
+void subghz_protocol_encoder_mastercode_stop(void* context) {
+    SubGhzProtocolEncoderMastercode* instance = context;
+    instance->encoder.is_running = false;
+}
+
+LevelDuration subghz_protocol_encoder_mastercode_yield(void* context) {
+    SubGhzProtocolEncoderMastercode* instance = context;
+
+    if(instance->encoder.repeat == 0 || !instance->encoder.is_running) {
+        instance->encoder.is_running = false;
+        return level_duration_reset();
+    }
+
+    LevelDuration ret = instance->encoder.upload[instance->encoder.front];
+
+    if(++instance->encoder.front == instance->encoder.size_upload) {
+        instance->encoder.repeat--;
+        instance->encoder.front = 0;
+    }
+
+    return ret;
+}
+
+void* subghz_protocol_decoder_mastercode_alloc(SubGhzEnvironment* environment) {
+    UNUSED(environment);
+    SubGhzProtocolDecoderMastercode* instance = malloc(sizeof(SubGhzProtocolDecoderMastercode));
+    instance->base.protocol = &subghz_protocol_mastercode;
+    instance->generic.protocol_name = instance->base.protocol->name;
+    return instance;
+}
+
+void subghz_protocol_decoder_mastercode_free(void* context) {
+    furi_assert(context);
+    SubGhzProtocolDecoderMastercode* instance = context;
+    free(instance);
+}
+
+void subghz_protocol_decoder_mastercode_reset(void* context) {
+    furi_assert(context);
+    SubGhzProtocolDecoderMastercode* instance = context;
+    instance->decoder.parser_step = MastercodeDecoderStepReset;
+}
+
+void subghz_protocol_decoder_mastercode_feed(void* context, bool level, uint32_t duration) {
+    furi_assert(context);
+    SubGhzProtocolDecoderMastercode* instance = context;
+
+    switch(instance->decoder.parser_step) {
+    case MastercodeDecoderStepReset:
+        if((!level) && (DURATION_DIFF(duration, subghz_protocol_mastercode_const.te_short * 15) <
+                        subghz_protocol_mastercode_const.te_delta * 15)) {
+            instance->decoder.parser_step = MastercodeDecoderStepSaveDuration;
+            instance->decoder.decode_data = 0;
+            instance->decoder.decode_count_bit = 0;
+        }
+        break;
+
+    case MastercodeDecoderStepSaveDuration:
+        if(level) {
+            instance->decoder.te_last = duration;
+            instance->decoder.parser_step = MastercodeDecoderStepCheckDuration;
+        } else {
+            instance->decoder.parser_step = MastercodeDecoderStepReset;
+        }
+        break;
+
+    case MastercodeDecoderStepCheckDuration:
+        if(!level) {
+            if((DURATION_DIFF(
+                    instance->decoder.te_last, subghz_protocol_mastercode_const.te_short) <
+                subghz_protocol_mastercode_const.te_delta) &&
+               (DURATION_DIFF(duration, subghz_protocol_mastercode_const.te_long) <
+                subghz_protocol_mastercode_const.te_delta * 8)) {
+                subghz_protocol_blocks_add_bit(&instance->decoder, 0);
+                instance->decoder.parser_step = MastercodeDecoderStepSaveDuration;
+            } else if(
+                (DURATION_DIFF(
+                     instance->decoder.te_last, subghz_protocol_mastercode_const.te_long) <
+                 subghz_protocol_mastercode_const.te_delta * 8) &&
+                (DURATION_DIFF(duration, subghz_protocol_mastercode_const.te_short) <
+                 subghz_protocol_mastercode_const.te_delta)) {
+                subghz_protocol_blocks_add_bit(&instance->decoder, 1);
+                instance->decoder.parser_step = MastercodeDecoderStepSaveDuration;
+            } else if(
+                DURATION_DIFF(duration, subghz_protocol_mastercode_const.te_short * 15) <
+                subghz_protocol_mastercode_const.te_delta * 15) {
+                if((DURATION_DIFF(
+                        instance->decoder.te_last, subghz_protocol_mastercode_const.te_short) <
+                    subghz_protocol_mastercode_const.te_delta)) {
+                    subghz_protocol_blocks_add_bit(&instance->decoder, 0);
+                } else if((DURATION_DIFF(
+                               instance->decoder.te_last,
+                               subghz_protocol_mastercode_const.te_long) <
+                           subghz_protocol_mastercode_const.te_delta * 8)) {
+                    subghz_protocol_blocks_add_bit(&instance->decoder, 1);
+                } else {
+                    instance->decoder.parser_step = MastercodeDecoderStepReset;
+                }
+
+                if(instance->decoder.decode_count_bit ==
+                   subghz_protocol_mastercode_const.min_count_bit_for_found) {
+                    instance->generic.data = instance->decoder.decode_data;
+                    instance->generic.data_count_bit = instance->decoder.decode_count_bit;
+
+                    if(instance->base.callback)
+                        instance->base.callback(&instance->base, instance->base.context);
+                }
+                instance->decoder.parser_step = MastercodeDecoderStepSaveDuration;
+                instance->decoder.decode_data = 0;
+                instance->decoder.decode_count_bit = 0;
+
+            } else {
+                instance->decoder.parser_step = MastercodeDecoderStepReset;
+            }
+        } else {
+            instance->decoder.parser_step = MastercodeDecoderStepReset;
+        }
+        break;
+    }
+}
+
+/** 
+ * Analysis of received data
+ * @param instance Pointer to a SubGhzBlockGeneric* instance
+ */
+static void subghz_protocol_mastercode_check_remote_controller(SubGhzBlockGeneric* instance) {
+    instance->serial = (instance->data >> 4) & 0xFFFF;
+    instance->btn = (instance->data >> 2 & 0x03);
+}
+
+uint8_t subghz_protocol_decoder_mastercode_get_hash_data(void* context) {
+    furi_assert(context);
+    SubGhzProtocolDecoderMastercode* instance = context;
+    return subghz_protocol_blocks_get_hash_data(
+        &instance->decoder, (instance->decoder.decode_count_bit / 8) + 1);
+}
+
+SubGhzProtocolStatus subghz_protocol_decoder_mastercode_serialize(
+    void* context,
+    FlipperFormat* flipper_format,
+    SubGhzRadioPreset* preset) {
+    furi_assert(context);
+    SubGhzProtocolDecoderMastercode* instance = context;
+    return subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
+}
+
+SubGhzProtocolStatus
+    subghz_protocol_decoder_mastercode_deserialize(void* context, FlipperFormat* flipper_format) {
+    furi_assert(context);
+    SubGhzProtocolDecoderMastercode* instance = context;
+    return subghz_block_generic_deserialize_check_count_bit(
+        &instance->generic,
+        flipper_format,
+        subghz_protocol_mastercode_const.min_count_bit_for_found);
+}
+
+void subghz_protocol_decoder_mastercode_get_string(void* context, FuriString* output) {
+    furi_assert(context);
+    SubGhzProtocolDecoderMastercode* instance = context;
+    subghz_protocol_mastercode_check_remote_controller(&instance->generic);
+    furi_string_cat_printf(
+        output,
+        "%s %dbit\r\n"
+        "Key:%llX   Btn %X\r\n"
+        "  +:   " DIP_PATTERN "\r\n"
+        "  o:   " DIP_PATTERN "\r\n"
+        "  -:   " DIP_PATTERN "\r\n",
+        instance->generic.protocol_name,
+        instance->generic.data_count_bit,
+        (uint64_t)(instance->generic.data),
+        instance->generic.btn,
+        SHOW_DIP_P(instance->generic.serial, DIP_P),
+        SHOW_DIP_P(instance->generic.serial, DIP_O),
+        SHOW_DIP_P(instance->generic.serial, DIP_N));
+}
diff --git a/lib/subghz/protocols/mastercode.h b/lib/subghz/protocols/mastercode.h
new file mode 100644
index 00000000..c5c73db9
--- /dev/null
+++ b/lib/subghz/protocols/mastercode.h
@@ -0,0 +1,109 @@
+#pragma once
+
+#include "base.h"
+
+#define SUBGHZ_PROTOCOL_MASTERCODE_NAME "Mastercode"
+
+typedef struct SubGhzProtocolDecoderMastercode SubGhzProtocolDecoderMastercode;
+typedef struct SubGhzProtocolEncoderMastercode SubGhzProtocolEncoderMastercode;
+
+extern const SubGhzProtocolDecoder subghz_protocol_mastercode_decoder;
+extern const SubGhzProtocolEncoder subghz_protocol_mastercode_encoder;
+extern const SubGhzProtocol subghz_protocol_mastercode;
+
+/**
+ * Allocate SubGhzProtocolEncoderMastercode.
+ * @param environment Pointer to a SubGhzEnvironment instance
+ * @return SubGhzProtocolEncoderMastercode* pointer to a SubGhzProtocolEncoderMastercode instance
+ */
+void* subghz_protocol_encoder_mastercode_alloc(SubGhzEnvironment* environment);
+
+/**
+ * Free SubGhzProtocolEncoderMastercode.
+ * @param context Pointer to a SubGhzProtocolEncoderMastercode instance
+ */
+void subghz_protocol_encoder_mastercode_free(void* context);
+
+/**
+ * Deserialize and generating an upload to send.
+ * @param context Pointer to a SubGhzProtocolEncoderMastercode instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @return status
+ */
+SubGhzProtocolStatus
+    subghz_protocol_encoder_mastercode_deserialize(void* context, FlipperFormat* flipper_format);
+
+/**
+ * Forced transmission stop.
+ * @param context Pointer to a SubGhzProtocolEncoderMastercode instance
+ */
+void subghz_protocol_encoder_mastercode_stop(void* context);
+
+/**
+ * Getting the level and duration of the upload to be loaded into DMA.
+ * @param context Pointer to a SubGhzProtocolEncoderMastercode instance
+ * @return LevelDuration 
+ */
+LevelDuration subghz_protocol_encoder_mastercode_yield(void* context);
+
+/**
+ * Allocate SubGhzProtocolDecoderMastercode.
+ * @param environment Pointer to a SubGhzEnvironment instance
+ * @return SubGhzProtocolDecoderMastercode* pointer to a SubGhzProtocolDecoderMastercode instance
+ */
+void* subghz_protocol_decoder_mastercode_alloc(SubGhzEnvironment* environment);
+
+/**
+ * Free SubGhzProtocolDecoderMastercode.
+ * @param context Pointer to a SubGhzProtocolDecoderMastercode instance
+ */
+void subghz_protocol_decoder_mastercode_free(void* context);
+
+/**
+ * Reset decoder SubGhzProtocolDecoderMastercode.
+ * @param context Pointer to a SubGhzProtocolDecoderMastercode instance
+ */
+void subghz_protocol_decoder_mastercode_reset(void* context);
+
+/**
+ * Parse a raw sequence of levels and durations received from the air.
+ * @param context Pointer to a SubGhzProtocolDecoderMastercode instance
+ * @param level Signal level true-high false-low
+ * @param duration Duration of this level in, us
+ */
+void subghz_protocol_decoder_mastercode_feed(void* context, bool level, uint32_t duration);
+
+/**
+ * Getting the hash sum of the last randomly received parcel.
+ * @param context Pointer to a SubGhzProtocolDecoderMastercode instance
+ * @return hash Hash sum
+ */
+uint8_t subghz_protocol_decoder_mastercode_get_hash_data(void* context);
+
+/**
+ * Serialize data SubGhzProtocolDecoderMastercode.
+ * @param context Pointer to a SubGhzProtocolDecoderMastercode instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @param preset The modulation on which the signal was received, SubGhzRadioPreset
+ * @return status
+ */
+SubGhzProtocolStatus subghz_protocol_decoder_mastercode_serialize(
+    void* context,
+    FlipperFormat* flipper_format,
+    SubGhzRadioPreset* preset);
+
+/**
+ * Deserialize data SubGhzProtocolDecoderMastercode.
+ * @param context Pointer to a SubGhzProtocolDecoderMastercode instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @return status
+ */
+SubGhzProtocolStatus
+    subghz_protocol_decoder_mastercode_deserialize(void* context, FlipperFormat* flipper_format);
+
+/**
+ * Getting a textual representation of the received data.
+ * @param context Pointer to a SubGhzProtocolDecoderMastercode instance
+ * @param output Resulting text
+ */
+void subghz_protocol_decoder_mastercode_get_string(void* context, FuriString* output);
diff --git a/lib/subghz/protocols/protocol_items.c b/lib/subghz/protocols/protocol_items.c
index 74244c5f..472a354e 100644
--- a/lib/subghz/protocols/protocol_items.c
+++ b/lib/subghz/protocols/protocol_items.c
@@ -43,6 +43,7 @@ const SubGhzProtocol* subghz_protocol_registry_items[] = {
     &subghz_protocol_alutech_at_4n,
     &subghz_protocol_kinggates_stylo_4k,
     &subghz_protocol_bin_raw,
+    &subghz_protocol_mastercode,
 };
 
 const SubGhzProtocolRegistry subghz_protocol_registry = {
diff --git a/lib/subghz/protocols/protocol_items.h b/lib/subghz/protocols/protocol_items.h
index f1a28ac9..c5a090e9 100644
--- a/lib/subghz/protocols/protocol_items.h
+++ b/lib/subghz/protocols/protocol_items.h
@@ -44,3 +44,4 @@
 #include "alutech_at_4n.h"
 #include "kinggates_stylo_4k.h"
 #include "bin_raw.h"
+#include "mastercode.h"
diff --git a/lib/subghz/protocols/public_api.h b/lib/subghz/protocols/public_api.h
new file mode 100644
index 00000000..174f175c
--- /dev/null
+++ b/lib/subghz/protocols/public_api.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "../types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Key generation from simple data.
+ * @param context Pointer to a SubGhzProtocolEncoderSecPlus_v2 instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @param serial Serial number, 32 bit
+ * @param btn Button number, 8 bit
+ * @param cnt Container value, 28 bit
+ * @param manufacture_name Name of manufacturer's key
+ * @param preset Modulation, SubGhzRadioPreset
+ * @return true On success
+ */
+bool subghz_protocol_secplus_v2_create_data(
+    void* context,
+    FlipperFormat* flipper_format,
+    uint32_t serial,
+    uint8_t btn,
+    uint32_t cnt,
+    SubGhzRadioPreset* preset);
+
+/**
+ * Key generation from simple data.
+ * @param context Pointer to a SubGhzProtocolEncoderKeeloq instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @param serial Serial number, 28 bit
+ * @param btn Button number, 4 bit
+ * @param cnt Container value, 16 bit
+ * @param manufacture_name Name of manufacturer's key
+ * @param preset Modulation, SubGhzRadioPreset
+ * @return true On success
+ */
+bool subghz_protocol_keeloq_create_data(
+    void* context,
+    FlipperFormat* flipper_format,
+    uint32_t serial,
+    uint8_t btn,
+    uint16_t cnt,
+    const char* manufacture_name,
+    SubGhzRadioPreset* preset);
+
+typedef struct SubGhzProtocolDecoderBinRAW SubGhzProtocolDecoderBinRAW;
+
+void subghz_protocol_decoder_bin_raw_data_input_rssi(
+    SubGhzProtocolDecoderBinRAW* instance,
+    float rssi);
+
+/**
+ * Validation of fixed parts SubGhzProtocolDecoderSecPlus_v1.
+ * @param fixed fixed parts
+ * @return true On success
+ */
+bool subghz_protocol_secplus_v1_check_fixed(uint32_t fixed);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/subghz/protocols/secplus_v1.h b/lib/subghz/protocols/secplus_v1.h
index 3490f2ca..e01f8bcd 100644
--- a/lib/subghz/protocols/secplus_v1.h
+++ b/lib/subghz/protocols/secplus_v1.h
@@ -1,5 +1,7 @@
 #pragma once
+
 #include "base.h"
+#include "public_api.h"
 
 #define SUBGHZ_PROTOCOL_SECPLUS_V1_NAME "Security+ 1.0"
 
@@ -100,13 +102,6 @@ SubGhzProtocolStatus subghz_protocol_decoder_secplus_v1_serialize(
 SubGhzProtocolStatus
     subghz_protocol_decoder_secplus_v1_deserialize(void* context, FlipperFormat* flipper_format);
 
-/**
- * Validation of fixed parts SubGhzProtocolDecoderSecPlus_v1.
- * @param fixed fixed parts
- * @return true On success
- */
-bool subghz_protocol_secplus_v1_check_fixed(uint32_t fixed);
-
 /**
  * Getting a textual representation of the received data.
  * @param context Pointer to a SubGhzProtocolDecoderSecPlus_v1 instance
diff --git a/lib/subghz/protocols/secplus_v2.h b/lib/subghz/protocols/secplus_v2.h
index 0eea732a..9eb912a2 100644
--- a/lib/subghz/protocols/secplus_v2.h
+++ b/lib/subghz/protocols/secplus_v2.h
@@ -1,5 +1,7 @@
 #pragma once
+
 #include "base.h"
+#include "public_api.h"
 
 #define SUBGHZ_PROTOCOL_SECPLUS_V2_NAME "Security+ 2.0"
 
@@ -45,25 +47,6 @@ void subghz_protocol_encoder_secplus_v2_stop(void* context);
  */
 LevelDuration subghz_protocol_encoder_secplus_v2_yield(void* context);
 
-/**
- * Key generation from simple data.
- * @param context Pointer to a SubGhzProtocolEncoderSecPlus_v2 instance
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param serial Serial number, 32 bit
- * @param btn Button number, 8 bit
- * @param cnt Container value, 28 bit
- * @param manufacture_name Name of manufacturer's key
- * @param preset Modulation, SubGhzRadioPreset
- * @return true On success
- */
-bool subghz_protocol_secplus_v2_create_data(
-    void* context,
-    FlipperFormat* flipper_format,
-    uint32_t serial,
-    uint8_t btn,
-    uint32_t cnt,
-    SubGhzRadioPreset* preset);
-
 /**
  * Allocate SubGhzProtocolDecoderSecPlus_v2.
  * @param environment Pointer to a SubGhzEnvironment instance
diff --git a/lib/subghz/subghz_protocol_registry.h b/lib/subghz/subghz_protocol_registry.h
index 8e80071b..2dfa9ce8 100644
--- a/lib/subghz/subghz_protocol_registry.h
+++ b/lib/subghz/subghz_protocol_registry.h
@@ -10,29 +10,6 @@ extern const SubGhzProtocolRegistry subghz_protocol_registry;
 
 typedef struct SubGhzProtocolDecoderBinRAW SubGhzProtocolDecoderBinRAW;
 
-bool subghz_protocol_secplus_v2_create_data(
-    void* context,
-    FlipperFormat* flipper_format,
-    uint32_t serial,
-    uint8_t btn,
-    uint32_t cnt,
-    SubGhzRadioPreset* preset);
-
-bool subghz_protocol_keeloq_create_data(
-    void* context,
-    FlipperFormat* flipper_format,
-    uint32_t serial,
-    uint8_t btn,
-    uint16_t cnt,
-    const char* manufacture_name,
-    SubGhzRadioPreset* preset);
-
-void subghz_protocol_decoder_bin_raw_data_input_rssi(
-    SubGhzProtocolDecoderBinRAW* instance,
-    float rssi);
-
-bool subghz_protocol_secplus_v1_check_fixed(uint32_t fixed);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/toolbox/buffer_stream.c b/lib/toolbox/buffer_stream.c
index 37b2514e..e8cb334d 100644
--- a/lib/toolbox/buffer_stream.c
+++ b/lib/toolbox/buffer_stream.c
@@ -112,7 +112,7 @@ bool buffer_stream_send_from_isr(BufferStream* buffer_stream, const uint8_t* dat
     return result;
 }
 
-Buffer* buffer_stream_receive(BufferStream* buffer_stream, TickType_t timeout) {
+Buffer* buffer_stream_receive(BufferStream* buffer_stream, uint32_t timeout) {
     Buffer* buffer;
     size_t size =
         furi_stream_buffer_receive(buffer_stream->stream, &buffer, sizeof(Buffer*), timeout);
diff --git a/lib/toolbox/buffer_stream.h b/lib/toolbox/buffer_stream.h
index 9db54775..5c3dc0a3 100644
--- a/lib/toolbox/buffer_stream.h
+++ b/lib/toolbox/buffer_stream.h
@@ -69,7 +69,7 @@ bool buffer_stream_send_from_isr(BufferStream* buffer_stream, const uint8_t* dat
  * @param timeout 
  * @return Buffer* 
  */
-Buffer* buffer_stream_receive(BufferStream* buffer_stream, TickType_t timeout);
+Buffer* buffer_stream_receive(BufferStream* buffer_stream, uint32_t timeout);
 
 /**
  * @brief Get stream overrun count
diff --git a/lib/toolbox/crc32_calc.c b/lib/toolbox/crc32_calc.c
index c0cd169b..78295167 100644
--- a/lib/toolbox/crc32_calc.c
+++ b/lib/toolbox/crc32_calc.c
@@ -14,7 +14,7 @@ uint32_t crc32_calc_file(File* file, const FileCrcProgressCb progress_cb, void*
     uint32_t file_crc = 0;
 
     uint8_t* data_buffer = malloc(CRC_DATA_BUFFER_MAX_LEN);
-    uint16_t data_buffer_valid_len;
+    size_t data_buffer_valid_len;
 
     uint32_t file_size = storage_file_size(file);
 
diff --git a/lib/toolbox/md5_calc.c b/lib/toolbox/md5_calc.c
index b050295a..7f335a33 100644
--- a/lib/toolbox/md5_calc.c
+++ b/lib/toolbox/md5_calc.c
@@ -5,13 +5,13 @@ bool md5_calc_file(File* file, const char* path, unsigned char output[16], FS_Er
     bool result = storage_file_open(file, path, FSAM_READ, FSOM_OPEN_EXISTING);
 
     if(result) {
-        const uint16_t size_to_read = 512;
+        const size_t size_to_read = 512;
         uint8_t* data = malloc(size_to_read);
         md5_context* md5_ctx = malloc(sizeof(md5_context));
 
         md5_starts(md5_ctx);
         while(true) {
-            uint16_t read_size = storage_file_read(file, data, size_to_read);
+            size_t read_size = storage_file_read(file, data, size_to_read);
             if(read_size == 0) break;
             md5_update(md5_ctx, data, read_size);
         }
diff --git a/lib/toolbox/saved_struct.c b/lib/toolbox/saved_struct.c
index 02b73f21..2f1c09c8 100644
--- a/lib/toolbox/saved_struct.c
+++ b/lib/toolbox/saved_struct.c
@@ -46,7 +46,7 @@ bool saved_struct_save(const char* path, void* data, size_t size, uint8_t magic,
         header.flags = 0;
         header.timestamp = 0;
 
-        uint16_t bytes_count = storage_file_write(file, &header, sizeof(header));
+        size_t bytes_count = storage_file_write(file, &header, sizeof(header));
         bytes_count += storage_file_write(file, data, size);
 
         if(bytes_count != (size + sizeof(header))) {
@@ -79,7 +79,7 @@ bool saved_struct_load(const char* path, void* data, size_t size, uint8_t magic,
     }
 
     if(result) {
-        uint16_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
+        size_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
         bytes_count += storage_file_read(file, data_read, size);
 
         if(bytes_count != (sizeof(SavedStructHeader) + size)) {
@@ -146,7 +146,7 @@ bool saved_struct_get_payload_size(
             break;
         }
 
-        uint16_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
+        size_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
         if(bytes_count != sizeof(SavedStructHeader)) {
             FURI_LOG_E(TAG, "Failed to read header");
             break;
diff --git a/lib/toolbox/stream/file_stream.c b/lib/toolbox/stream/file_stream.c
index 095dce47..2b5348b3 100644
--- a/lib/toolbox/stream/file_stream.c
+++ b/lib/toolbox/stream/file_stream.c
@@ -134,31 +134,11 @@ static size_t file_stream_size(FileStream* stream) {
 }
 
 static size_t file_stream_write(FileStream* stream, const uint8_t* data, size_t size) {
-    // TODO FL-3545: cache
-    size_t need_to_write = size;
-    while(need_to_write > 0) {
-        uint16_t was_written =
-            storage_file_write(stream->file, data + (size - need_to_write), need_to_write);
-        need_to_write -= was_written;
-
-        if(was_written == 0) break;
-    }
-
-    return size - need_to_write;
+    return storage_file_write(stream->file, data, size);
 }
 
 static size_t file_stream_read(FileStream* stream, uint8_t* data, size_t size) {
-    // TODO FL-3545: cache
-    size_t need_to_read = size;
-    while(need_to_read > 0) {
-        uint16_t was_read =
-            storage_file_read(stream->file, data + (size - need_to_read), need_to_read);
-        need_to_read -= was_read;
-
-        if(was_read == 0) break;
-    }
-
-    return size - need_to_read;
+    return storage_file_read(stream->file, data, size);
 }
 
 static bool file_stream_delete_and_insert(
diff --git a/lib/update_util/dfu_file.c b/lib/update_util/dfu_file.c
index eef9f064..85b661e8 100644
--- a/lib/update_util/dfu_file.c
+++ b/lib/update_util/dfu_file.c
@@ -22,7 +22,7 @@ uint8_t dfu_file_validate_headers(File* dfuf, const DfuValidationParams* referen
 
     DfuPrefix dfu_prefix = {0};
     DfuSuffix dfu_suffix = {0};
-    uint16_t bytes_read = 0;
+    size_t bytes_read = 0;
 
     if(!storage_file_is_open(dfuf) || !storage_file_seek(dfuf, 0, true)) {
         return 0;
@@ -90,7 +90,7 @@ static DfuUpdateBlockResult dfu_file_perform_task_for_update_pages(
     }
 
     uint8_t* fw_block = malloc(FLASH_PAGE_SIZE);
-    uint16_t bytes_read = 0;
+    size_t bytes_read = 0;
     uint32_t element_offs = 0;
 
     while(element_offs < header->dwElementSize) {
@@ -125,7 +125,7 @@ static DfuUpdateBlockResult dfu_file_perform_task_for_update_pages(
 bool dfu_file_process_targets(const DfuUpdateTask* task, File* dfuf, const uint8_t n_targets) {
     TargetPrefix target_prefix = {0};
     ImageElementHeader image_element = {0};
-    uint16_t bytes_read = 0;
+    size_t bytes_read = 0;
 
     if(!storage_file_seek(dfuf, sizeof(DfuPrefix), true)) {
         return UpdateBlockResult_Failed;
diff --git a/lib/update_util/update_operation.c b/lib/update_util/update_operation.c
index 0cecfc01..39a7ea07 100644
--- a/lib/update_util/update_operation.c
+++ b/lib/update_util/update_operation.c
@@ -85,7 +85,7 @@ bool update_operation_get_current_package_manifest_path(Storage* storage, FuriSt
                    upd_file, UPDATE_FILE_POINTER_FN, FSAM_READ, FSOM_OPEN_EXISTING)) {
                 break;
             }
-            uint16_t bytes_read =
+            size_t bytes_read =
                 storage_file_read(upd_file, manifest_name_buffer, UPDATE_MANIFEST_MAX_PATH_LEN);
             if((bytes_read == 0) || (bytes_read == UPDATE_MANIFEST_MAX_PATH_LEN)) {
                 break;
diff --git a/scripts/ReadMe.md b/scripts/ReadMe.md
index a9feba11..359ce472 100644
--- a/scripts/ReadMe.md
+++ b/scripts/ReadMe.md
@@ -52,10 +52,10 @@ ob.py set
 
 # Assets delivery
 
-Run in the root folder of the repo:
+Build the firmware and run in the root folder of the repo:
 
 ```bash
-python scripts/storage.py -p <flipper_cli_port> send assets/resources /ext
+python scripts/storage.py -p <flipper_cli_port> send build/latest/resources /ext
 ```
 
 
diff --git a/scripts/assets.py b/scripts/assets.py
index bd8b38ae..1099f0c3 100755
--- a/scripts/assets.py
+++ b/scripts/assets.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import os
+import shutil
 
 from flipper.app import App
 from flipper.assets.icon import file2image
@@ -220,6 +221,7 @@ class Main(App):
         if not os.path.isdir(directory_path):
             self.logger.error(f'"{directory_path}" is not a directory')
             exit(255)
+
         manifest_file = os.path.join(directory_path, "Manifest")
         old_manifest = Manifest()
         if os.path.exists(manifest_file):
@@ -234,13 +236,15 @@ class Main(App):
         self.logger.info("Comparing new manifest with existing")
         only_in_old, changed, only_in_new = Manifest.compare(old_manifest, new_manifest)
         for record in only_in_old:
-            self.logger.info(f"Only in old: {record}")
+            self.logger.debug(f"Only in old: {record}")
         for record in changed:
             self.logger.info(f"Changed: {record}")
         for record in only_in_new:
-            self.logger.info(f"Only in new: {record}")
+            self.logger.debug(f"Only in new: {record}")
         if any((only_in_old, changed, only_in_new)):
-            self.logger.warning("Manifests are different, updating")
+            self.logger.info(
+                f"Manifest updated ({len(only_in_new)} new, {len(only_in_old)} removed, {len(changed)} changed)"
+            )
             new_manifest.save(manifest_file)
         else:
             self.logger.info("Manifest is up-to-date!")
diff --git a/scripts/fbt/appmanifest.py b/scripts/fbt/appmanifest.py
index 1a6cae9b..d32869b1 100644
--- a/scripts/fbt/appmanifest.py
+++ b/scripts/fbt/appmanifest.py
@@ -33,6 +33,8 @@ class FlipperAppType(Enum):
 @dataclass
 class FlipperApplication:
     APP_ID_REGEX: ClassVar[re.Pattern] = re.compile(r"^[a-z0-9_]+$")
+    PRIVATE_FIELD_PREFIX: ClassVar[str] = "_"
+    APP_MANIFEST_DEFAULT_NAME: ClassVar[str] = "application.fam"
 
     @dataclass
     class ExternallyBuiltFile:
@@ -48,8 +50,6 @@ class FlipperApplication:
         cdefines: List[str] = field(default_factory=list)
         cincludes: List[str] = field(default_factory=list)
 
-    PRIVATE_FIELD_PREFIX = "_"
-
     appid: str
     apptype: FlipperAppType
     name: Optional[str] = ""
@@ -64,6 +64,7 @@ class FlipperApplication:
     order: int = 0
     sdk_headers: List[str] = field(default_factory=list)
     targets: List[str] = field(default_factory=lambda: ["all"])
+    resources: Optional[str] = None
 
     # .fap-specific
     sources: List[str] = field(default_factory=lambda: ["*.c*"])
@@ -116,8 +117,10 @@ class FlipperApplication:
                 self.fap_version = tuple(int(v) for v in self.fap_version.split("."))
             except ValueError:
                 raise FlipperManifestException(
-                    f"Invalid version string '{self.fap_version}'. Must be in the form 'major.minor'"
+                    f"Invalid version '{self.fap_version}'. Must be in the form 'major.minor'"
                 )
+            if len(self.fap_version) < 2:
+                raise ValueError("Not enough version components")
 
 
 class AppManager:
@@ -154,11 +157,20 @@ class AppManager:
                 raise FlipperManifestException(
                     f"App {kw.get('appid')} cannot have fal_embedded set"
                 )
-        # Harmless - cdefines for external apps are meaningless
-        # if apptype == FlipperAppType.EXTERNAL and kw.get("cdefines"):
-        #     raise FlipperManifestException(
-        #         f"External app {kw.get('appid')} must not have 'cdefines' in manifest"
-        #     )
+
+        if apptype in AppBuildset.dist_app_types:
+            # For distributing .fap's resources, there's "fap_file_assets"
+            for app_property in ("resources",):
+                if kw.get(app_property):
+                    raise FlipperManifestException(
+                        f"App {kw.get('appid')} of type {apptype} cannot have '{app_property}' in manifest"
+                    )
+        else:
+            for app_property in ("fap_extbuild", "fap_private_libs", "fap_icon_assets"):
+                if kw.get(app_property):
+                    raise FlipperManifestException(
+                        f"App {kw.get('appid')} of type {apptype} must not have '{app_property}' in manifest"
+                    )
 
     def load_manifest(self, app_manifest_path: str, app_dir_node: object):
         if not os.path.exists(app_manifest_path):
@@ -239,12 +251,21 @@ class AppBuildset:
         FlipperAppType.SETTINGS,
         FlipperAppType.STARTUP,
     )
-    EXTERNAL_APP_TYPES = (
-        FlipperAppType.EXTERNAL,
-        FlipperAppType.MENUEXTERNAL,
-        FlipperAppType.PLUGIN,
-        FlipperAppType.DEBUG,
-    )
+    EXTERNAL_APP_TYPES_MAP = {
+        # AppType -> bool: true if always deploy, false if obey app set
+        FlipperAppType.EXTERNAL: True,
+        FlipperAppType.PLUGIN: True,
+        FlipperAppType.DEBUG: True,
+        FlipperAppType.MENUEXTERNAL: False,
+    }
+
+    @classmethod
+    @property
+    def dist_app_types(cls):
+        """Applications that are installed on SD card"""
+        return list(
+            entry[0] for entry in cls.EXTERNAL_APP_TYPES_MAP.items() if entry[1]
+        )
 
     @staticmethod
     def print_writer(message):
@@ -272,11 +293,15 @@ class AppBuildset:
         self._check_unsatisfied()  # unneeded?
         self._check_target_match()
         self._group_plugins()
-        self.apps = sorted(
+        self._apps = sorted(
             list(map(self.appmgr.get, self.appnames)),
             key=lambda app: app.appid,
         )
 
+    @property
+    def apps(self):
+        return list(self._apps)
+
     def _is_missing_dep(self, dep_name: str):
         return dep_name not in self.appnames
 
@@ -313,8 +338,8 @@ class AppBuildset:
     def _process_ext_apps(self):
         extapps = [
             app
-            for apptype in self.EXTERNAL_APP_TYPES
-            for app in self.get_apps_of_type(apptype, True)
+            for (apptype, global_lookup) in self.EXTERNAL_APP_TYPES_MAP.items()
+            for app in self.get_apps_of_type(apptype, global_lookup)
         ]
         extapps.extend(map(self.appmgr.get, self._extra_ext_appnames))
 
@@ -385,13 +410,13 @@ class AppBuildset:
 
     def get_apps_cdefs(self):
         cdefs = set()
-        for app in self.apps:
+        for app in self._apps:
             cdefs.update(app.cdefines)
         return sorted(list(cdefs))
 
     def get_sdk_headers(self):
         sdk_headers = []
-        for app in self.apps:
+        for app in self._apps:
             sdk_headers.extend(
                 [
                     src._appdir.File(header)
@@ -402,17 +427,21 @@ class AppBuildset:
         return sdk_headers
 
     def get_apps_of_type(self, apptype: FlipperAppType, all_known: bool = False):
+        """Looks up apps of given type in current app set. If all_known is true,
+        ignores app set and checks all loaded apps' manifests."""
         return sorted(
             filter(
                 lambda app: app.apptype == apptype,
-                self.appmgr.known_apps.values() if all_known else self.apps,
+                self.appmgr.known_apps.values()
+                if all_known
+                else map(self.appmgr.get, self.appnames),
             ),
             key=lambda app: app.order,
         )
 
     def get_builtin_apps(self):
         return list(
-            filter(lambda app: app.apptype in self.BUILTIN_APP_TYPES, self.apps)
+            filter(lambda app: app.apptype in self.BUILTIN_APP_TYPES, self._apps)
         )
 
     def get_builtin_app_folders(self):
@@ -423,96 +452,3 @@ class AppBuildset:
                 for source_type in app.sources
             )
         )
-
-
-class ApplicationsCGenerator:
-    APP_TYPE_MAP = {
-        FlipperAppType.SERVICE: ("FlipperInternalApplication", "FLIPPER_SERVICES"),
-        FlipperAppType.SYSTEM: ("FlipperInternalApplication", "FLIPPER_SYSTEM_APPS"),
-        FlipperAppType.APP: ("FlipperInternalApplication", "FLIPPER_APPS"),
-        FlipperAppType.DEBUG: ("FlipperInternalApplication", "FLIPPER_DEBUG_APPS"),
-        FlipperAppType.SETTINGS: (
-            "FlipperInternalApplication",
-            "FLIPPER_SETTINGS_APPS",
-        ),
-        FlipperAppType.STARTUP: (
-            "FlipperInternalOnStartHook",
-            "FLIPPER_ON_SYSTEM_START",
-        ),
-    }
-
-    APP_EXTERNAL_TYPE = (
-        "FlipperExternalApplication",
-        "FLIPPER_EXTERNAL_APPS",
-    )
-
-    def __init__(self, buildset: AppBuildset, autorun_app: str = ""):
-        self.buildset = buildset
-        self.autorun = autorun_app
-
-    def get_app_ep_forward(self, app: FlipperApplication):
-        if app.apptype == FlipperAppType.STARTUP:
-            return f"extern void {app.entry_point}();"
-        return f"extern int32_t {app.entry_point}(void* p);"
-
-    def get_app_descr(self, app: FlipperApplication):
-        if app.apptype == FlipperAppType.STARTUP:
-            return app.entry_point
-        return f"""
-    {{.app = {app.entry_point},
-     .name = "{app.name}",
-     .appid = "{app.appid}", 
-     .stack_size = {app.stack_size},
-     .icon = {f"&{app.icon}" if app.icon else "NULL"},
-     .flags = {'|'.join(f"FlipperInternalApplicationFlag{flag}" for flag in app.flags)} }}"""
-
-    def get_external_app_descr(self, app: FlipperApplication):
-        app_path = "/ext/apps"
-        if app.fap_category:
-            app_path += f"/{app.fap_category}"
-        app_path += f"/{app.appid}.fap"
-        return f"""
-    {{
-     .name = "{app.name}",
-     .icon = {f"&{app.icon}" if app.icon else "NULL"},
-     .path = "{app_path}" }}"""
-
-    def generate(self):
-        contents = [
-            '#include "applications.h"',
-            "#include <assets_icons.h>",
-            f'const char* FLIPPER_AUTORUN_APP_NAME = "{self.autorun}";',
-        ]
-        for apptype in self.APP_TYPE_MAP:
-            contents.extend(
-                map(self.get_app_ep_forward, self.buildset.get_apps_of_type(apptype))
-            )
-            entry_type, entry_block = self.APP_TYPE_MAP[apptype]
-            contents.append(f"const {entry_type} {entry_block}[] = {{")
-            contents.append(
-                ",\n".join(
-                    map(self.get_app_descr, self.buildset.get_apps_of_type(apptype))
-                )
-            )
-            contents.append("};")
-            contents.append(
-                f"const size_t {entry_block}_COUNT = COUNT_OF({entry_block});"
-            )
-
-        archive_app = self.buildset.get_apps_of_type(FlipperAppType.ARCHIVE)
-        if archive_app:
-            contents.extend(
-                [
-                    self.get_app_ep_forward(archive_app[0]),
-                    f"const FlipperInternalApplication FLIPPER_ARCHIVE = {self.get_app_descr(archive_app[0])};",
-                ]
-            )
-
-        entry_type, entry_block = self.APP_EXTERNAL_TYPE
-        external_apps = self.buildset.get_apps_of_type(FlipperAppType.MENUEXTERNAL)
-        contents.append(f"const {entry_type} {entry_block}[] = {{")
-        contents.append(",\n".join(map(self.get_external_app_descr, external_apps)))
-        contents.append("};")
-        contents.append(f"const size_t {entry_block}_COUNT = COUNT_OF({entry_block});")
-
-        return "\n".join(contents)
diff --git a/scripts/fbt_tools/fbt_apps.py b/scripts/fbt_tools/fbt_apps.py
index 9a071805..dadf6dc0 100644
--- a/scripts/fbt_tools/fbt_apps.py
+++ b/scripts/fbt_tools/fbt_apps.py
@@ -1,28 +1,126 @@
 from ansi.color import fg
 from fbt.appmanifest import (
-    ApplicationsCGenerator,
     AppManager,
+    AppBuildset,
+    FlipperApplication,
     FlipperAppType,
     FlipperManifestException,
 )
 from SCons.Action import Action
 from SCons.Builder import Builder
 from SCons.Errors import StopError
-from SCons.Warnings import WarningOnByDefault, warn
 from SCons.Script import GetOption
+from SCons.Warnings import WarningOnByDefault, warn
 
 # Adding objects for application management to env
 #  AppManager env["APPMGR"] - loads all manifests; manages list of known apps
 #  AppBuildset env["APPBUILD"] - contains subset of apps, filtered for current config
 
 
+class ApplicationsCGenerator:
+    APP_TYPE_MAP = {
+        FlipperAppType.SERVICE: ("FlipperInternalApplication", "FLIPPER_SERVICES"),
+        FlipperAppType.SYSTEM: ("FlipperInternalApplication", "FLIPPER_SYSTEM_APPS"),
+        FlipperAppType.APP: ("FlipperInternalApplication", "FLIPPER_APPS"),
+        FlipperAppType.DEBUG: ("FlipperInternalApplication", "FLIPPER_DEBUG_APPS"),
+        FlipperAppType.SETTINGS: (
+            "FlipperInternalApplication",
+            "FLIPPER_SETTINGS_APPS",
+        ),
+        FlipperAppType.STARTUP: (
+            "FlipperInternalOnStartHook",
+            "FLIPPER_ON_SYSTEM_START",
+        ),
+    }
+
+    APP_EXTERNAL_TYPE = (
+        "FlipperExternalApplication",
+        "FLIPPER_EXTERNAL_APPS",
+    )
+
+    def __init__(self, buildset: AppBuildset, autorun_app: str = ""):
+        self.buildset = buildset
+        self.autorun = autorun_app
+
+    def get_app_ep_forward(self, app: FlipperApplication):
+        if app.apptype == FlipperAppType.STARTUP:
+            return f"extern void {app.entry_point}();"
+        return f"extern int32_t {app.entry_point}(void* p);"
+
+    def get_app_descr(self, app: FlipperApplication):
+        if app.apptype == FlipperAppType.STARTUP:
+            return app.entry_point
+        return f"""
+    {{.app = {app.entry_point},
+     .name = "{app.name}",
+     .appid = "{app.appid}", 
+     .stack_size = {app.stack_size},
+     .icon = {f"&{app.icon}" if app.icon else "NULL"},
+     .flags = {'|'.join(f"FlipperInternalApplicationFlag{flag}" for flag in app.flags)} }}"""
+
+    def get_external_app_descr(self, app: FlipperApplication):
+        app_path = "/ext/apps"
+        if app.fap_category:
+            app_path += f"/{app.fap_category}"
+        app_path += f"/{app.appid}.fap"
+        return f"""
+    {{
+     .name = "{app.name}",
+     .icon = {f"&{app.icon}" if app.icon else "NULL"},
+     .path = "{app_path}" }}"""
+
+    def generate(self):
+        contents = [
+            '#include "applications.h"',
+            "#include <assets_icons.h>",
+            f'const char* FLIPPER_AUTORUN_APP_NAME = "{self.autorun}";',
+        ]
+        for apptype in self.APP_TYPE_MAP:
+            contents.extend(
+                map(self.get_app_ep_forward, self.buildset.get_apps_of_type(apptype))
+            )
+            entry_type, entry_block = self.APP_TYPE_MAP[apptype]
+            contents.append(f"const {entry_type} {entry_block}[] = {{")
+            contents.append(
+                ",\n".join(
+                    map(self.get_app_descr, self.buildset.get_apps_of_type(apptype))
+                )
+            )
+            contents.append("};")
+            contents.append(
+                f"const size_t {entry_block}_COUNT = COUNT_OF({entry_block});"
+            )
+
+        archive_app = self.buildset.get_apps_of_type(FlipperAppType.ARCHIVE)
+        if archive_app:
+            contents.extend(
+                [
+                    self.get_app_ep_forward(archive_app[0]),
+                    f"const FlipperInternalApplication FLIPPER_ARCHIVE = {self.get_app_descr(archive_app[0])};",
+                ]
+            )
+
+        entry_type, entry_block = self.APP_EXTERNAL_TYPE
+        external_apps = self.buildset.get_apps_of_type(FlipperAppType.MENUEXTERNAL)
+        contents.append(f"const {entry_type} {entry_block}[] = {{")
+        contents.append(",\n".join(map(self.get_external_app_descr, external_apps)))
+        contents.append("};")
+        contents.append(f"const size_t {entry_block}_COUNT = COUNT_OF({entry_block});")
+
+        return "\n".join(contents)
+
+
 def LoadAppManifest(env, entry):
     try:
-        APP_MANIFEST_NAME = "application.fam"
-        manifest_glob = entry.glob(APP_MANIFEST_NAME)
+        manifest_glob = entry.glob(FlipperApplication.APP_MANIFEST_DEFAULT_NAME)
         if len(manifest_glob) == 0:
+            try:
+                disk_node = next(filter(lambda d: d.exists(), entry.get_all_rdirs()))
+            except Exception:
+                disk_node = entry
+
             raise FlipperManifestException(
-                f"Folder {entry}: manifest {APP_MANIFEST_NAME} is missing"
+                f"App folder '{disk_node.abspath}': missing manifest ({FlipperApplication.APP_MANIFEST_DEFAULT_NAME})"
             )
 
         app_manifest_file_path = manifest_glob[0].rfile().abspath
diff --git a/scripts/fbt_tools/fbt_assets.py b/scripts/fbt_tools/fbt_assets.py
index d923c328..492a66b6 100644
--- a/scripts/fbt_tools/fbt_assets.py
+++ b/scripts/fbt_tools/fbt_assets.py
@@ -5,9 +5,10 @@ from ansi.color import fg
 from SCons.Action import Action
 from SCons.Builder import Builder
 from SCons.Errors import StopError
+from SCons.Node.FS import File
 
 
-def icons_emitter(target, source, env):
+def _icons_emitter(target, source, env):
     icons_src = env.GlobRecursive("*.png", env["ICON_SRC_DIR"])
     icons_src += env.GlobRecursive("**/frame_rate", env["ICON_SRC_DIR"])
 
@@ -18,7 +19,7 @@ def icons_emitter(target, source, env):
     return target, icons_src
 
 
-def proto_emitter(target, source, env):
+def _proto_emitter(target, source, env):
     target = []
     for src in source:
         basename = os.path.splitext(src.name)[0]
@@ -27,25 +28,26 @@ def proto_emitter(target, source, env):
     return target, source
 
 
-def dolphin_emitter(target, source, env):
+def _dolphin_emitter(target, source, env):
     res_root_dir = source[0].Dir(env["DOLPHIN_RES_TYPE"])
-    source = [res_root_dir]
+    source = list()
     source.extend(env.GlobRecursive("*.*", res_root_dir.srcnode()))
 
     target_base_dir = target[0]
     env.Replace(_DOLPHIN_OUT_DIR=target[0])
+    env.Replace(_DOLPHIN_SRC_DIR=res_root_dir)
 
     if env["DOLPHIN_RES_TYPE"] == "external":
         target = [target_base_dir.File("manifest.txt")]
         ## A detailed list of files to be generated
-        ## works better if we just leave target the folder
-        # target = []
+        # Not used ATM, becasuse it inflates the internal dependency graph too much
+        # Preserve original paths, do .png -> .bm conversion
         # target.extend(
         #     map(
         #         lambda node: target_base_dir.File(
         #             res_root_dir.rel_path(node).replace(".png", ".bm")
         #         ),
-        #         filter(lambda node: isinstance(node, SCons.Node.FS.File), source),
+        #         filter(lambda node: isinstance(node, File), source),
         #     )
         # )
     else:
@@ -55,7 +57,7 @@ def dolphin_emitter(target, source, env):
             target_base_dir.File(asset_basename + ".h"),
         ]
 
-    # Debug output
+    ## Debug output
     # print(
     #     f"Dolphin res type: {env['DOLPHIN_RES_TYPE']},\ntarget files:",
     #     list(f.path for f in target),
@@ -65,7 +67,7 @@ def dolphin_emitter(target, source, env):
     return target, source
 
 
-def _invoke_git(args, source_dir):
+def __invoke_git(args, source_dir):
     cmd = ["git"]
     cmd.extend(args)
     return (
@@ -75,25 +77,38 @@ def _invoke_git(args, source_dir):
     )
 
 
-def proto_ver_generator(target, source, env):
+def _proto_ver_generator(target, source, env):
     target_file = target[0]
     src_dir = source[0].dir.abspath
-    try:
-        _invoke_git(
-            ["fetch", "--tags"],
-            source_dir=src_dir,
-        )
-    except (subprocess.CalledProcessError, EnvironmentError):
-        # Not great, not terrible
-        print(fg.boldred("Git: fetch failed"))
 
-    try:
-        git_describe = _invoke_git(
-            ["describe", "--tags", "--abbrev=0"],
-            source_dir=src_dir,
-        )
-    except (subprocess.CalledProcessError, EnvironmentError):
-        raise StopError("Git: describe failed")
+    def fetch(unshallow=False):
+        git_args = ["fetch", "--tags"]
+        if unshallow:
+            git_args.append("--unshallow")
+
+        try:
+            __invoke_git(git_args, source_dir=src_dir)
+        except (subprocess.CalledProcessError, EnvironmentError):
+            # Not great, not terrible
+            print(fg.boldred("Git: fetch failed"))
+
+    def describe():
+        try:
+            return __invoke_git(
+                ["describe", "--tags", "--abbrev=0"],
+                source_dir=src_dir,
+            )
+        except (subprocess.CalledProcessError, EnvironmentError):
+            return None
+
+    fetch()
+    git_describe = describe()
+    if not git_describe:
+        fetch(unshallow=True)
+        git_describe = describe()
+
+    if not git_describe:
+        raise StopError("Failed to process git tags for protobuf versioning")
 
     git_major, git_minor = git_describe.split(".")
     version_file_data = (
@@ -127,7 +142,6 @@ def generate(env):
             ICONSCOMSTR="\tICONS\t${TARGET}",
             PROTOCOMSTR="\tPROTO\t${SOURCE}",
             DOLPHINCOMSTR="\tDOLPHIN\t${DOLPHIN_RES_TYPE}",
-            RESMANIFESTCOMSTR="\tMANIFEST\t${TARGET}",
             PBVERCOMSTR="\tPBVER\t${TARGET}",
         )
 
@@ -135,37 +149,74 @@ 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",
+                            "${ICON_SRC_DIR}",
+                            "${TARGET.dir}",
+                            "--filename",
+                            "${ICON_FILE_NAME}",
+                        ],
+                    ],
                     "${ICONSCOMSTR}",
                 ),
-                emitter=icons_emitter,
+                emitter=_icons_emitter,
             ),
             "ProtoBuilder": Builder(
                 action=Action(
-                    "${PYTHON3} ${NANOPB_COMPILER} -q -I${SOURCE.dir.posix} -D${TARGET.dir.posix} ${SOURCES.posix}",
+                    [
+                        [
+                            "${PYTHON3}",
+                            "${NANOPB_COMPILER}",
+                            "-q",
+                            "-I${SOURCE.dir.posix}",
+                            "-D${TARGET.dir.posix}",
+                            "${SOURCES.posix}",
+                        ],
+                    ],
                     "${PROTOCOMSTR}",
                 ),
-                emitter=proto_emitter,
+                emitter=_proto_emitter,
                 suffix=".pb.c",
                 src_suffix=".proto",
             ),
             "DolphinSymBuilder": Builder(
                 action=Action(
-                    "${PYTHON3} ${ASSETS_COMPILER} dolphin -s dolphin_${DOLPHIN_RES_TYPE} ${SOURCE} ${_DOLPHIN_OUT_DIR}",
+                    [
+                        [
+                            "${PYTHON3}",
+                            "${ASSETS_COMPILER}",
+                            "dolphin",
+                            "-s",
+                            "dolphin_${DOLPHIN_RES_TYPE}",
+                            "${_DOLPHIN_SRC_DIR}",
+                            "${_DOLPHIN_OUT_DIR}",
+                        ],
+                    ],
                     "${DOLPHINCOMSTR}",
                 ),
-                emitter=dolphin_emitter,
+                emitter=_dolphin_emitter,
             ),
             "DolphinExtBuilder": Builder(
                 action=Action(
-                    "${PYTHON3} ${ASSETS_COMPILER} dolphin ${SOURCE} ${_DOLPHIN_OUT_DIR}",
+                    [
+                        [
+                            "${PYTHON3}",
+                            "${ASSETS_COMPILER}",
+                            "dolphin",
+                            "${_DOLPHIN_SRC_DIR}",
+                            "${_DOLPHIN_OUT_DIR}",
+                        ],
+                    ],
                     "${DOLPHINCOMSTR}",
                 ),
-                emitter=dolphin_emitter,
+                emitter=_dolphin_emitter,
             ),
             "ProtoVerBuilder": Builder(
                 action=Action(
-                    proto_ver_generator,
+                    _proto_ver_generator,
                     "${PBVERCOMSTR}",
                 ),
             ),
diff --git a/scripts/fbt_tools/fbt_dist.py b/scripts/fbt_tools/fbt_dist.py
index fdf66c0a..bf586b8f 100644
--- a/scripts/fbt_tools/fbt_dist.py
+++ b/scripts/fbt_tools/fbt_dist.py
@@ -96,7 +96,21 @@ def DistCommand(env, name, source, **kw):
     command = env.Command(
         target,
         source,
-        '@${PYTHON3} "${DIST_SCRIPT}" copy -p ${DIST_PROJECTS} -s "${DIST_SUFFIX}" ${DIST_EXTRA}',
+        action=Action(
+            [
+                [
+                    "${PYTHON3}",
+                    "${DIST_SCRIPT}",
+                    "copy",
+                    "-p",
+                    "${DIST_PROJECTS}",
+                    "-s",
+                    "${DIST_SUFFIX}",
+                    "${DIST_EXTRA}",
+                ]
+            ],
+            "${DISTCOMSTR}",
+        ),
         **kw,
     )
     env.Pseudo(target)
@@ -106,7 +120,10 @@ def DistCommand(env, name, source, **kw):
 
 def generate(env):
     if not env["VERBOSE"]:
-        env.SetDefault(COPROCOMSTR="\tCOPRO\t${TARGET}")
+        env.SetDefault(
+            COPROCOMSTR="\tCOPRO\t${TARGET}",
+            DISTCOMSTR="\tDIST\t${TARGET}",
+        )
     env.AddMethod(AddFwProject)
     env.AddMethod(DistCommand)
     env.AddMethod(AddFwFlashTarget)
diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
index 963429f2..a7914c4f 100644
--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -1,7 +1,5 @@
 import itertools
-import os
 import pathlib
-import shutil
 from dataclasses import dataclass, field
 from typing import Dict, List, Optional
 
@@ -60,7 +58,8 @@ class AppBuilder:
         )
         self.app_env.Append(
             CPPDEFINES=[
-                ("FAP_VERSION", f'"{".".join(map(str, self.app.fap_version))}"')
+                ("FAP_VERSION", f'\\"{".".join(map(str, self.app.fap_version))}\\"'),
+                *self.app.cdefines,
             ],
         )
         self.app_env.VariantDir(self.app_work_dir, self.app._appdir, duplicate=False)
@@ -145,20 +144,14 @@ class AppBuilder:
             self.app._assets_dirs = [self.app._appdir.Dir(self.app.fap_file_assets)]
 
         self.app_env.Append(
-            LIBS=[*self.app.fap_libs, *self.private_libs],
-            CPPPATH=[self.app_work_dir, self.app._appdir],
+            LIBS=[*self.app.fap_libs, *self.private_libs, *self.app.fap_libs],
+            CPPPATH=[self.app_env.Dir(self.app_work_dir), self.app._appdir],
         )
 
-        app_sources = list(
-            itertools.chain.from_iterable(
-                self.app_env.GlobRecursive(
-                    source_type,
-                    self.app_work_dir,
-                    exclude="lib",
-                )
-                for source_type in self.app.sources
-            )
+        app_sources = self.app_env.GatherSources(
+            [self.app.sources, "!lib"], self.app_work_dir
         )
+
         if not app_sources:
             raise UserError(f"No source files found for {self.app.appid}")
 
@@ -290,7 +283,7 @@ def prepare_app_metadata(target, source, env):
         )
 
 
-def validate_app_imports(target, source, env):
+def _validate_app_imports(target, source, env):
     sdk_cache = SdkCache(env["SDK_DEFINITION"].path, load_version_only=False)
     app_syms = set()
     with open(target[0].path, "rt") as f:
@@ -342,35 +335,7 @@ def GetExtAppByIdOrPath(env, app_dir):
     return app_artifacts
 
 
-def resources_fap_dist_emitter(target, source, env):
-    # Initially we have a single target - target dir
-    # Here we inject pairs of (target, source) for each file
-    resources_root = target[0]
-
-    target = []
-    for app_artifacts in env["EXT_APPS"].values():
-        for _, dist_path in filter(
-            lambda dist_entry: dist_entry[0], app_artifacts.dist_entries
-        ):
-            source.append(app_artifacts.compact)
-            target.append(resources_root.File(dist_path))
-
-    assert len(target) == len(source)
-    return (target, source)
-
-
-def resources_fap_dist_action(target, source, env):
-    # FIXME: find a proper way to remove stale files
-    target_dir = env.Dir("${RESOURCES_ROOT}/apps")
-    shutil.rmtree(target_dir.path, ignore_errors=True)
-
-    # Iterate over pairs generated in emitter
-    for src, target in zip(source, target):
-        os.makedirs(os.path.dirname(target.path), exist_ok=True)
-        shutil.copy(src.path, target.path)
-
-
-def embed_app_metadata_emitter(target, source, env):
+def _embed_app_metadata_emitter(target, source, env):
     app = env["APP"]
 
     # Hack: change extension for fap libs
@@ -407,33 +372,52 @@ def generate_embed_app_metadata_actions(source, target, env, for_signature):
         Action(prepare_app_metadata, "$APPMETA_COMSTR"),
     ]
 
-    objcopy_str = (
-        "${OBJCOPY} "
-        "--remove-section .ARM.attributes "
-        "--add-section ${_FAP_META_SECTION}=${APP._section_fapmeta} "
-    )
+    objcopy_args = [
+        "${OBJCOPY}",
+        "--remove-section",
+        ".ARM.attributes",
+        "--add-section",
+        "${_FAP_META_SECTION}=${APP._section_fapmeta}",
+        "--set-section-flags",
+        "${_FAP_META_SECTION}=contents,noload,readonly,data",
+    ]
 
     if app._section_fapfileassets:
         actions.append(Action(prepare_app_file_assets, "$APPFILE_COMSTR"))
-        objcopy_str += (
-            "--add-section ${_FAP_FILEASSETS_SECTION}=${APP._section_fapfileassets} "
+        objcopy_args.extend(
+            (
+                "--add-section",
+                "${_FAP_FILEASSETS_SECTION}=${APP._section_fapfileassets}",
+                "--set-section-flags",
+                "${_FAP_FILEASSETS_SECTION}=contents,noload,readonly,data",
+            )
         )
 
-    objcopy_str += (
-        "--set-section-flags ${_FAP_META_SECTION}=contents,noload,readonly,data "
-        "--strip-debug --strip-unneeded "
-        "--add-gnu-debuglink=${SOURCE} "
-        "${SOURCES} ${TARGET}"
+    objcopy_args.extend(
+        (
+            "--strip-debug",
+            "--strip-unneeded",
+            "--add-gnu-debuglink=${SOURCE}",
+            "${SOURCES}",
+            "${TARGET}",
+        )
     )
 
     actions.extend(
         (
             Action(
-                objcopy_str,
+                [objcopy_args],
                 "$APPMETAEMBED_COMSTR",
             ),
             Action(
-                "${PYTHON3} ${FBT_SCRIPT_DIR}/fastfap.py ${TARGET} ${OBJCOPY}",
+                [
+                    [
+                        "${PYTHON3}",
+                        "${FBT_SCRIPT_DIR}/fastfap.py",
+                        "${TARGET}",
+                        "${OBJCOPY}",
+                    ]
+                ],
                 "$FASTFAP_COMSTR",
             ),
         )
@@ -489,7 +473,19 @@ def AddAppLaunchTarget(env, appname, launch_target_name):
     components = _gather_app_components(env, appname)
     target = env.PhonyTarget(
         launch_target_name,
-        '${PYTHON3} "${APP_RUN_SCRIPT}" -p ${FLIP_PORT} ${EXTRA_ARGS} -s ${SOURCES} -t ${FLIPPER_FILE_TARGETS}',
+        [
+            [
+                "${PYTHON3}",
+                "${APP_RUN_SCRIPT}",
+                "-p",
+                "${FLIP_PORT}",
+                "${EXTRA_ARGS}",
+                "-s",
+                "${SOURCES}",
+                "-t",
+                "${FLIPPER_FILE_TARGETS}",
+            ]
+        ],
         source=components.deploy_sources.values(),
         FLIPPER_FILE_TARGETS=components.deploy_sources.keys(),
         EXTRA_ARGS=components.extra_launch_args,
@@ -511,7 +507,6 @@ def generate(env, **kw):
     )
     if not env["VERBOSE"]:
         env.SetDefault(
-            FAPDISTCOMSTR="\tFAPDIST\t${TARGET}",
             APPMETA_COMSTR="\tAPPMETA\t${TARGET}",
             APPFILE_COMSTR="\tAPPFILE\t${TARGET}",
             APPMETAEMBED_COMSTR="\tFAP\t${TARGET}",
@@ -534,18 +529,11 @@ def generate(env, **kw):
 
     env.Append(
         BUILDERS={
-            "FapDist": Builder(
-                action=Action(
-                    resources_fap_dist_action,
-                    "$FAPDISTCOMSTR",
-                ),
-                emitter=resources_fap_dist_emitter,
-            ),
             "EmbedAppMetadata": Builder(
                 generator=generate_embed_app_metadata_actions,
                 suffix=".fap",
                 src_suffix=".elf",
-                emitter=embed_app_metadata_emitter,
+                emitter=_embed_app_metadata_emitter,
             ),
             "ValidateAppImports": Builder(
                 action=[
@@ -554,7 +542,7 @@ def generate(env, **kw):
                         None,  # "$APPDUMP_COMSTR",
                     ),
                     Action(
-                        validate_app_imports,
+                        _validate_app_imports,
                         "$APPCHECK_COMSTR",
                     ),
                 ],
diff --git a/scripts/fbt_tools/fbt_hwtarget.py b/scripts/fbt_tools/fbt_hwtarget.py
index 1831a698..67975ed0 100644
--- a/scripts/fbt_tools/fbt_hwtarget.py
+++ b/scripts/fbt_tools/fbt_hwtarget.py
@@ -2,9 +2,9 @@ import json
 
 
 class HardwareTargetLoader:
-    def __init__(self, env, target_scons_dir, target_id):
+    def __init__(self, env, root_target_scons_dir, target_id):
         self.env = env
-        self.target_scons_dir = target_scons_dir
+        self.all_targets_root_dir = root_target_scons_dir
         self.target_dir = self._getTargetDir(target_id)
         # self.target_id = target_id
         self.layered_target_dirs = []
@@ -23,7 +23,7 @@ class HardwareTargetLoader:
         self._processTargetDefinitions(target_id)
 
     def _getTargetDir(self, target_id):
-        return self.target_scons_dir.Dir(f"f{target_id}")
+        return self.all_targets_root_dir.Dir(f"f{target_id}")
 
     def _loadDescription(self, target_id):
         target_json_file = self._getTargetDir(target_id).File("target.json")
@@ -34,14 +34,14 @@ class HardwareTargetLoader:
             return vals
 
     def _processTargetDefinitions(self, target_id):
-        self.layered_target_dirs.append(f"targets/f{target_id}")
+        target_dir = self._getTargetDir(target_id)
+        self.layered_target_dirs.append(target_dir)
 
         config = self._loadDescription(target_id)
 
         for path_list in ("include_paths", "sdk_header_paths"):
             getattr(self, path_list).extend(
-                f"#/firmware/targets/f{target_id}/{p}"
-                for p in config.get(path_list, [])
+                target_dir.Dir(p) for p in config.get(path_list, [])
             )
 
         self.excluded_sources.extend(config.get("excluded_sources", []))
@@ -50,7 +50,7 @@ class HardwareTargetLoader:
 
         file_attrs = (
             # (name, use_src_node)
-            ("startup_script", False),
+            ("startup_script", True),
             ("linker_script_flash", True),
             ("linker_script_ram", True),
             ("linker_script_app", True),
@@ -59,9 +59,10 @@ class HardwareTargetLoader:
 
         for attr_name, use_src_node in file_attrs:
             if (val := config.get(attr_name)) and not getattr(self, attr_name):
-                node = self.env.File(f"firmware/targets/f{target_id}/{val}")
+                node = target_dir.File(val)
                 if use_src_node:
                     node = node.srcnode()
+                # print(f"Got node {node}, {node.path} for {attr_name}")
                 setattr(self, attr_name, node)
 
         for attr_name in ("linker_dependencies",):
@@ -84,8 +85,8 @@ class HardwareTargetLoader:
             )
             seen_filenames.update(f.name for f in accepted_sources)
             sources.extend(accepted_sources)
-        # print(f"Found {len(sources)} sources: {list(f.name for f in sources)}")
-        return sources
+        # print(f"Found {len(sources)} sources: {list(f.path for f in sources)}")
+        return list(f.get_path(self.all_targets_root_dir) for f in sources)
 
     def gatherSdkHeaders(self):
         sdk_headers = []
@@ -101,7 +102,7 @@ class HardwareTargetLoader:
 
 
 def ConfigureForTarget(env, target_id):
-    target_loader = HardwareTargetLoader(env, env.Dir("#/firmware/targets"), target_id)
+    target_loader = HardwareTargetLoader(env, env["TARGETS_ROOT"], target_id)
     env.Replace(
         TARGET_CFG=target_loader,
         SDK_DEFINITION=target_loader.sdk_symbols,
diff --git a/scripts/fbt_tools/fbt_resources.py b/scripts/fbt_tools/fbt_resources.py
new file mode 100644
index 00000000..4c3146ba
--- /dev/null
+++ b/scripts/fbt_tools/fbt_resources.py
@@ -0,0 +1,117 @@
+import os
+import shutil
+
+from SCons.Action import Action
+from SCons.Builder import Builder
+from SCons.Errors import StopError
+from SCons.Node.FS import Dir, File
+
+
+def __generate_resources_dist_entries(env):
+    src_target_entries = []
+
+    resources_root = env.Dir(env["RESOURCES_ROOT"])
+
+    for app_artifacts in env["FW_EXTAPPS"].application_map.values():
+        for _, dist_path in filter(
+            lambda dist_entry: dist_entry[0], app_artifacts.dist_entries
+        ):
+            src_target_entries.append(
+                (
+                    app_artifacts.compact,
+                    resources_root.File(dist_path),
+                )
+            )
+
+    # Deploy apps' resources too
+    for app in env["APPBUILD"].apps:
+        if not app.resources:
+            continue
+        apps_resource_dir = app._appdir.Dir(app.resources)
+        for res_file in env.GlobRecursive("*", apps_resource_dir):
+            if not isinstance(res_file, File):
+                continue
+            src_target_entries.append(
+                (
+                    res_file,
+                    resources_root.File(
+                        res_file.get_path(apps_resource_dir),
+                    ),
+                )
+            )
+
+    # Deploy other stuff from _EXTRA_DIST
+    for extra_dist in env["_EXTRA_DIST"]:
+        if isinstance(extra_dist, Dir):
+            src_target_entries.append(
+                (
+                    extra_dist,
+                    resources_root.Dir(extra_dist.name),
+                )
+            )
+        else:
+            raise StopError(f"Unsupported extra dist type: {type(extra_dist)}")
+
+    return src_target_entries
+
+
+def _resources_dist_emitter(target, source, env):
+    src_target_entries = __generate_resources_dist_entries(env)
+    source = list(map(lambda entry: entry[0], src_target_entries))
+    return (target, source)
+
+
+def _resources_dist_action(target, source, env):
+    dist_entries = __generate_resources_dist_entries(env)
+    assert len(dist_entries) == len(source)
+    shutil.rmtree(env.Dir(env["RESOURCES_ROOT"]).abspath, ignore_errors=True)
+    for src, target in dist_entries:
+        if isinstance(src, File):
+            os.makedirs(os.path.dirname(target.path), exist_ok=True)
+            shutil.copy(src.path, target.path)
+        elif isinstance(src, Dir):
+            shutil.copytree(src.path, target.path)
+        else:
+            raise StopError(f"Unsupported dist entry type: {type(src)}")
+
+
+def generate(env, **kw):
+    env.SetDefault(
+        ASSETS_COMPILER="${FBT_SCRIPT_DIR}/assets.py",
+    )
+
+    if not env["VERBOSE"]:
+        env.SetDefault(
+            RESOURCEDISTCOMSTR="\tRESDIST\t${RESOURCES_ROOT}",
+            RESMANIFESTCOMSTR="\tMANIFST\t${TARGET}",
+        )
+
+    env.Append(
+        BUILDERS={
+            "ManifestBuilder": Builder(
+                action=[
+                    Action(
+                        _resources_dist_action,
+                        "${RESOURCEDISTCOMSTR}",
+                    ),
+                    Action(
+                        [
+                            [
+                                "${PYTHON3}",
+                                "${ASSETS_COMPILER}",
+                                "manifest",
+                                "${TARGET.dir.posix}",
+                                "--timestamp=${GIT_UNIX_TIMESTAMP}",
+                            ]
+                        ],
+                        "${RESMANIFESTCOMSTR}",
+                    ),
+                ],
+                emitter=_resources_dist_emitter,
+            ),
+        }
+    )
+
+
+def exists(env):
+    return True
diff --git a/scripts/fbt_tools/fbt_sdk.py b/scripts/fbt_tools/fbt_sdk.py
index 2f7d6238..17acc8cf 100644
--- a/scripts/fbt_tools/fbt_sdk.py
+++ b/scripts/fbt_tools/fbt_sdk.py
@@ -37,13 +37,13 @@ def ProcessSdkDepends(env, filename):
     return depends
 
 
-def api_amalgam_emitter(target, source, env):
+def _api_amalgam_emitter(target, source, env):
     target.append(env.ChangeFileExtension(target[0], ".d"))
     target.append(env.ChangeFileExtension(target[0], ".i.c"))
     return target, source
 
 
-def api_amalgam_gen_origin_header(target, source, env):
+def _api_amalgam_gen_origin_header(target, source, env):
     mega_file = env.subst("${TARGET}.c", target=target[0])
     with open(mega_file, "wt") as sdk_c:
         sdk_c.write(
@@ -183,12 +183,12 @@ class SdkTreeBuilder:
         self._generate_sdk_meta()
 
 
-def deploy_sdk_header_tree_action(target, source, env):
+def _deploy_sdk_header_tree_action(target, source, env):
     sdk_tree = SdkTreeBuilder(env, target, source)
     return sdk_tree.deploy_action()
 
 
-def deploy_sdk_header_tree_emitter(target, source, env):
+def _deploy_sdk_header_tree_emitter(target, source, env):
     sdk_tree = SdkTreeBuilder(env, target, source)
     return sdk_tree.emitter(target, source, env)
 
@@ -227,7 +227,7 @@ def _check_sdk_is_up2date(sdk_cache: SdkCache):
         )
 
 
-def validate_api_cache(source, target, env):
+def _validate_api_cache(source, target, env):
     # print(f"Generating SDK for {source[0]} to {target[0]}")
     current_sdk = SdkCollector()
     current_sdk.process_source_file_for_sdk(source[0].path)
@@ -240,7 +240,7 @@ def validate_api_cache(source, target, env):
     _check_sdk_is_up2date(sdk_cache)
 
 
-def generate_api_table(source, target, env):
+def _generate_api_table(source, target, env):
     sdk_cache = SdkCache(source[0].path)
     _check_sdk_is_up2date(sdk_cache)
 
@@ -278,14 +278,27 @@ def generate(env, **kw):
     env.Append(
         BUILDERS={
             "ApiAmalgamator": Builder(
-                emitter=api_amalgam_emitter,
+                emitter=_api_amalgam_emitter,
                 action=[
                     Action(
-                        api_amalgam_gen_origin_header,
+                        _api_amalgam_gen_origin_header,
                         "$SDK_AMALGAMATE_HEADER_COMSTR",
                     ),
                     Action(
-                        "$CC -o $TARGET -E -P $CCFLAGS $_CCCOMCOM $SDK_PP_FLAGS -MMD ${TARGET}.c",
+                        [
+                            [
+                                "$CC",
+                                "-o",
+                                "$TARGET",
+                                "-E",
+                                "-P",
+                                "$CCFLAGS",
+                                "$_CCCOMCOM",
+                                "$SDK_PP_FLAGS",
+                                "-MMD",
+                                "${TARGET}.c",
+                            ]
+                        ],
                         "$SDK_AMALGAMATE_PP_COMSTR",
                     ),
                 ],
@@ -293,15 +306,15 @@ def generate(env, **kw):
             ),
             "SDKHeaderTreeExtractor": Builder(
                 action=Action(
-                    deploy_sdk_header_tree_action,
+                    _deploy_sdk_header_tree_action,
                     "$SDKTREE_COMSTR",
                 ),
-                emitter=deploy_sdk_header_tree_emitter,
+                emitter=_deploy_sdk_header_tree_emitter,
                 src_suffix=".d",
             ),
             "ApiTableValidator": Builder(
                 action=Action(
-                    validate_api_cache,
+                    _validate_api_cache,
                     "$SDKSYM_UPDATER_COMSTR",
                 ),
                 suffix=".csv",
@@ -309,7 +322,7 @@ def generate(env, **kw):
             ),
             "ApiSymbolTable": Builder(
                 action=Action(
-                    generate_api_table,
+                    _generate_api_table,
                     "$APITABLE_GENERATOR_COMSTR",
                 ),
                 suffix=".h",
diff --git a/scripts/fbt_tools/fbt_version.py b/scripts/fbt_tools/fbt_version.py
index aead13b2..e64167b3 100644
--- a/scripts/fbt_tools/fbt_version.py
+++ b/scripts/fbt_tools/fbt_version.py
@@ -2,7 +2,7 @@ from SCons.Action import Action
 from SCons.Builder import Builder
 
 
-def version_emitter(target, source, env):
+def _version_emitter(target, source, env):
     target_dir = target[0]
     target = [
         target_dir.File("version.inc.h"),
@@ -19,12 +19,24 @@ def generate(env):
         BUILDERS={
             "VersionBuilder": Builder(
                 action=Action(
-                    '${PYTHON3} "${VERSION_SCRIPT}" generate '
-                    "-t ${TARGET_HW} -fw-origin ${FIRMWARE_ORIGIN} "
-                    '-o ${TARGET.dir.posix} --dir "${ROOT_DIR}"',
-                    "${VERSIONCOMSTR}",
+                    [
+                        [
+                            "${PYTHON3}",
+                            "${VERSION_SCRIPT}",
+                            "generate",
+                            "-t",
+                            "${TARGET_HW}",
+                            "--fw-origin",
+                            "${FIRMWARE_ORIGIN}",
+                            "-o",
+                            "${TARGET.dir.posix}",
+                            "--dir",
+                            "${ROOT_DIR}",
+                            "${VERSIONCOMSTR}",
+                        ]
+                    ]
                 ),
-                emitter=version_emitter,
+                emitter=_version_emitter,
             ),
         }
     )
diff --git a/scripts/fbt_tools/fwbin.py b/scripts/fbt_tools/fwbin.py
index 06a435b6..860f83b1 100644
--- a/scripts/fbt_tools/fwbin.py
+++ b/scripts/fbt_tools/fwbin.py
@@ -25,7 +25,7 @@ def generate(env):
         BUILDERS={
             "HEXBuilder": Builder(
                 action=Action(
-                    '${OBJCOPY} -O ihex "${SOURCE}" "${TARGET}"',
+                    [["${OBJCOPY}", "-O", "ihex", "${SOURCE}", "${TARGET}"]],
                     "${HEXCOMSTR}",
                 ),
                 suffix=".hex",
@@ -33,7 +33,7 @@ def generate(env):
             ),
             "BINBuilder": Builder(
                 action=Action(
-                    '${OBJCOPY} -O binary -S "${SOURCE}" "${TARGET}"',
+                    [["${OBJCOPY}", "-O", "binary", "-S", "${SOURCE}", "${TARGET}"]],
                     "${BINCOMSTR}",
                 ),
                 suffix=".bin",
@@ -41,7 +41,20 @@ def generate(env):
             ),
             "DFUBuilder": Builder(
                 action=Action(
-                    '${PYTHON3} "${BIN2DFU}" -i "${SOURCE}" -o "${TARGET}" -a ${IMAGE_BASE_ADDRESS} -l "Flipper Zero F${TARGET_HW}"',
+                    [
+                        [
+                            "${PYTHON3}",
+                            "${BIN2DFU}",
+                            "-i",
+                            "${SOURCE}",
+                            "-o",
+                            "${TARGET}",
+                            "-a",
+                            "${IMAGE_BASE_ADDRESS}",
+                            "-l",
+                            "Flipper Zero F${TARGET_HW}",
+                        ]
+                    ],
                     "${DFUCOMSTR}",
                 ),
                 suffix=".dfu",
diff --git a/scripts/fbt_tools/jflash.py b/scripts/fbt_tools/jflash.py
index aea7279b..5eb9f2c1 100644
--- a/scripts/fbt_tools/jflash.py
+++ b/scripts/fbt_tools/jflash.py
@@ -1,5 +1,6 @@
 from SCons.Builder import Builder
 from SCons.Defaults import Touch
+from SCons.Action import Action
 
 
 def generate(env):
@@ -9,13 +10,21 @@ def generate(env):
             "-auto",
             "-exit",
         ],
-        JFLASHCOM="${JFLASH} -openprj${JFLASHPROJECT} -open${SOURCE},${JFLASHADDR} ${JFLASHFLAGS}",
     )
     env.Append(
         BUILDERS={
             "JFlash": Builder(
                 action=[
-                    "${JFLASHCOM}",
+                    Action(
+                        [
+                            [
+                                "${JFLASH}",
+                                "-openprj${JFLASHPROJECT}",
+                                "-open${SOURCE},${JFLASHADDR}",
+                                "${JFLASHFLAGS}",
+                            ]
+                        ]
+                    ),
                     Touch("${TARGET}"),
                 ],
             ),
diff --git a/scripts/fbt_tools/objdump.py b/scripts/fbt_tools/objdump.py
index 31f81764..e3dbc6d8 100644
--- a/scripts/fbt_tools/objdump.py
+++ b/scripts/fbt_tools/objdump.py
@@ -6,13 +6,12 @@ def generate(env):
     env.SetDefault(
         OBJDUMP="objdump",
         OBJDUMPFLAGS=[],
-        OBJDUMPCOM="$OBJDUMP $OBJDUMPFLAGS -S $SOURCES > $TARGET",
     )
     env.Append(
         BUILDERS={
             "ObjDump": Builder(
                 action=Action(
-                    "${OBJDUMPCOM}",
+                    [["$OBJDUMP", "$OBJDUMPFLAGS", "-S", "$SOURCES", ">", "$TARGET"]],
                     "${OBJDUMPCOMSTR}",
                 ),
                 suffix=".lst",
diff --git a/scripts/fbt_tools/openocd.py b/scripts/fbt_tools/openocd.py
index 157d798f..596f5f8a 100644
--- a/scripts/fbt_tools/openocd.py
+++ b/scripts/fbt_tools/openocd.py
@@ -5,6 +5,7 @@ from SCons.Defaults import Touch
 
 __OPENOCD_BIN = "openocd"
 
+# TODO: FL-3663: rework argument passing to lists
 _oocd_action = Action(
     "${OPENOCD} ${OPENOCD_OPTS} ${OPENOCD_COMMAND}",
     "${OPENOCDCOMSTR}",
diff --git a/scripts/fbt_tools/pvsstudio.py b/scripts/fbt_tools/pvsstudio.py
index 211f46ae..ecf9d4b0 100644
--- a/scripts/fbt_tools/pvsstudio.py
+++ b/scripts/fbt_tools/pvsstudio.py
@@ -17,7 +17,7 @@ def _set_browser_action(target, source, env):
         __no_browser = True
 
 
-def emit_pvsreport(target, source, env):
+def _emit_pvsreport(target, source, env):
     target_dir = env["REPORT_DIR"]
     if env["PLATFORM"] == "win32":
         # Report generator on Windows emits to a subfolder of given output folder
@@ -79,7 +79,17 @@ def generate(env):
         BUILDERS={
             "PVSCheck": Builder(
                 action=Action(
-                    '${PVSCHECKBIN} analyze ${PVSOPTIONS} -f "${SOURCE}" -o "${TARGET}"',
+                    [
+                        [
+                            "${PVSCHECKBIN}",
+                            "analyze",
+                            "${PVSOPTIONS}",
+                            "-f",
+                            "${SOURCE}",
+                            "-o",
+                            "${TARGET}",
+                        ]
+                    ],
                     "${PVSCHECKCOMSTR}",
                 ),
                 suffix=".log",
@@ -92,11 +102,21 @@ def generate(env):
                         # PlogConverter.exe and plog-converter have different behavior
                         Mkdir("${TARGET.dir}") if env["PLATFORM"] == "win32" else None,
                         Action(_set_browser_action, None),
-                        '${PVSCONVBIN} ${PVSCONVOPTIONS} "${SOURCE}" -o "${REPORT_DIR}"',
+                        Action(
+                            [
+                                [
+                                    "${PVSCONVBIN}",
+                                    "${PVSCONVOPTIONS}",
+                                    "${SOURCE}",
+                                    "-o",
+                                    "${REPORT_DIR}",
+                                ]
+                            ]
+                        ),
                     ],
                     "${PVSCONVCOMSTR}",
                 ),
-                emitter=emit_pvsreport,
+                emitter=_emit_pvsreport,
                 src_suffix=".log",
             ),
         }
diff --git a/scripts/fbt_tools/sconsrecursiveglob.py b/scripts/fbt_tools/sconsrecursiveglob.py
index e7eb8fb7..de64c76b 100644
--- a/scripts/fbt_tools/sconsrecursiveglob.py
+++ b/scripts/fbt_tools/sconsrecursiveglob.py
@@ -1,7 +1,9 @@
+import itertools
+
 import SCons
 from fbt.util import GLOB_FILE_EXCLUSION
-from SCons.Script import Flatten
 from SCons.Node.FS import has_glob_magic
+from SCons.Script import Flatten
 
 
 def GlobRecursive(env, pattern, node=".", exclude=[]):
@@ -23,12 +25,35 @@ def GlobRecursive(env, pattern, node=".", exclude=[]):
     # Otherwise, just assume that file at path exists
     else:
         results.append(node.File(pattern))
+    ## Debug
     # print(f"Glob result for {pattern} from {node}: {results}")
     return results
 
 
+def GatherSources(env, sources_list, node="."):
+    sources_list = list(set(Flatten(sources_list)))
+    include_sources = list(filter(lambda x: not x.startswith("!"), sources_list))
+    exclude_sources = list(x[1:] for x in sources_list if x.startswith("!"))
+    gathered_sources = list(
+        itertools.chain.from_iterable(
+            env.GlobRecursive(
+                source_type,
+                node,
+                exclude=exclude_sources,
+            )
+            for source_type in include_sources
+        )
+    )
+    ## Debug
+    # print(
+    #     f"Gathered sources for {sources_list} from {node}: {list(f.path for f in gathered_sources)}"
+    # )
+    return gathered_sources
+
+
 def generate(env):
     env.AddMethod(GlobRecursive)
+    env.AddMethod(GatherSources)
 
 
 def exists(env):
diff --git a/scripts/fbt_tools/strip.py b/scripts/fbt_tools/strip.py
index ee14fc18..39f3a620 100644
--- a/scripts/fbt_tools/strip.py
+++ b/scripts/fbt_tools/strip.py
@@ -6,13 +6,12 @@ def generate(env):
     env.SetDefault(
         STRIP="strip",
         STRIPFLAGS=[],
-        STRIPCOM="$STRIP $STRIPFLAGS $SOURCES -o $TARGET",
     )
     env.Append(
         BUILDERS={
             "ELFStripper": Builder(
                 action=Action(
-                    "${STRIPCOM}",
+                    [["$STRIP", "$STRIPFLAGS", "$SOURCES", "-o", "$TARGET"]],
                     "${STRIPCOMSTR}",
                 ),
                 suffix=".elf",
diff --git a/scripts/flipper/assets/dolphin.py b/scripts/flipper/assets/dolphin.py
index e9089a1b..cf98c825 100644
--- a/scripts/flipper/assets/dolphin.py
+++ b/scripts/flipper/assets/dolphin.py
@@ -55,7 +55,7 @@ class DolphinBubbleAnimation:
         if not os.path.isfile(meta_filename):
             raise Exception(f"Animation meta file doesn't exist: { meta_filename }")
 
-        self.logger.info(f"Loading meta from {meta_filename}")
+        self.logger.debug(f"Loading meta from {meta_filename}")
         file = FlipperFormatFile()
         file.load(meta_filename)
 
diff --git a/scripts/meta.py b/scripts/meta.py
deleted file mode 100755
index f47ef65f..00000000
--- a/scripts/meta.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-
-from flipper.app import App
-
-
-class Main(App):
-    def init(self):
-        self.subparsers = self.parser.add_subparsers(help="sub-command help")
-
-        # generate
-        self.parser_generate = self.subparsers.add_parser(
-            "generate", help="Generate JSON meta file"
-        )
-        self.parser_generate.add_argument("-p", dest="project", required=True)
-        self.parser_generate.add_argument(
-            "-DBUILD_DATE", dest="build_date", required=True
-        )
-        self.parser_generate.add_argument("-DGIT_COMMIT", dest="commit", required=True)
-        self.parser_generate.add_argument("-DGIT_BRANCH", dest="branch", required=True)
-        self.parser_generate.add_argument(
-            "-DTARGET", dest="target", type=int, required=True
-        )
-        self.parser_generate.set_defaults(func=self.generate)
-
-        # merge
-        self.parser_merge = self.subparsers.add_parser(
-            "merge", help="Merge JSON meta files"
-        )
-        self.parser_merge.add_argument(
-            "-i", dest="input", action="append", nargs="+", required=True
-        )
-        self.parser_merge.set_defaults(func=self.merge)
-
-    def generate(self):
-        meta = {}
-        for k, v in vars(self.args).items():
-            if k in ["project", "func", "debug"]:
-                continue
-            if isinstance(v, str):
-                v = v.strip('"')
-            meta[self.args.project + "_" + k] = v
-
-        print(json.dumps(meta, indent=4))
-        return 0
-
-    def merge(self):
-        full = {}
-        for path in self.args.input[0]:
-            with open(path, mode="r") as file:
-                dict = json.loads(file.read())
-                full.update(dict)
-
-        print(json.dumps(full, indent=4))
-        return 0
-
-
-if __name__ == "__main__":
-    Main()()
diff --git a/scripts/ufbt/SConstruct b/scripts/ufbt/SConstruct
index 98e6b638..46d66357 100644
--- a/scripts/ufbt/SConstruct
+++ b/scripts/ufbt/SConstruct
@@ -325,24 +325,26 @@ else:
 
 appenv.PhonyTarget(
     "cli",
-    '${PYTHON3} "${FBT_SCRIPT_DIR}/serial_cli.py" -p ${FLIP_PORT}',
+    [["${PYTHON3}", "${FBT_SCRIPT_DIR}/serial_cli.py", "-p", "${FLIP_PORT}"]],
 )
 
 # Update WiFi devboard firmware
-dist_env.PhonyTarget("devboard_flash", "${PYTHON3} ${FBT_SCRIPT_DIR}/wifi_board.py")
+dist_env.PhonyTarget(
+    "devboard_flash", [["${PYTHON3}", "${FBT_SCRIPT_DIR}/wifi_board.py"]]
+)
 
 # Linter
 
 dist_env.PhonyTarget(
     "lint",
-    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py check ${LINT_SOURCES}",
+    [["${PYTHON3}", "${FBT_SCRIPT_DIR}/lint.py", "check", "${LINT_SOURCES}"]],
     source=original_app_dir.File(".clang-format"),
     LINT_SOURCES=[original_app_dir],
 )
 
 dist_env.PhonyTarget(
     "format",
-    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py format ${LINT_SOURCES}",
+    [["${PYTHON3}", "${FBT_SCRIPT_DIR}/lint.py", "format", "${LINT_SOURCES}"]],
     source=original_app_dir.File(".clang-format"),
     LINT_SOURCES=[original_app_dir],
 )
@@ -455,7 +457,17 @@ if dolphin_src_dir.exists():
     )
     dist_env.PhonyTarget(
         "dolphin_ext",
-        '${PYTHON3} ${FBT_SCRIPT_DIR}/storage.py -p ${FLIP_PORT} send "${SOURCE}" /ext/dolphin',
+        [
+            [
+                "${PYTHON3}",
+                "${FBT_SCRIPT_DIR}/storage.py",
+                "-p",
+                "${FLIP_PORT}",
+                "send",
+                "${SOURCE}",
+                "/ext/dolphin",
+            ]
+        ],
         source=ufbt_build_dir.Dir("dolphin"),
     )
 else:
@@ -467,7 +479,7 @@ else:
 
 dist_env.PhonyTarget(
     "env",
-    "@echo $( ${FBT_SCRIPT_DIR}/toolchain/fbtenv.sh $)",
+    "@echo $( ${FBT_SCRIPT_DIR.abspath}/toolchain/fbtenv.sh $)",
 )
 
 dist_env.PostConfigureUfbtEnvionment()
diff --git a/scripts/ufbt/project_template/app_template/.github/workflows/build.yml b/scripts/ufbt/project_template/app_template/.github/workflows/build.yml
index c11ffc18..143847c4 100644
--- a/scripts/ufbt/project_template/app_template/.github/workflows/build.yml
+++ b/scripts/ufbt/project_template/app_template/.github/workflows/build.yml
@@ -27,9 +27,9 @@ jobs:
     name: 'ufbt: Build for ${{ matrix.name }}'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build with ufbt
-        uses: flipperdevices/flipperzero-ufbt-action@v0.1.1
+        uses: flipperdevices/flipperzero-ufbt-action@v0.1
         id: build-app
         with:
           sdk-channel: ${{ matrix.sdk-channel }}
diff --git a/scripts/version.py b/scripts/version.py
index e68f7b41..98b1b7e8 100755
--- a/scripts/version.py
+++ b/scripts/version.py
@@ -46,7 +46,7 @@ class GitVersion:
             )
         else:
             commit_date = datetime.strptime(
-                self._exec_git("log -1 --format=%cd").strip(),
+                self._exec_git("log -1 --format=%cd --date=default").strip(),
                 "%a %b %d %H:%M:%S %Y %z",
             )
 
@@ -101,7 +101,7 @@ class Main(App):
             required=True,
         )
         self.parser_generate.add_argument(
-            "-fw-origin",
+            "--fw-origin",
             dest="firmware_origin",
             type=str,
             help="firmware origin",
diff --git a/site_scons/environ.scons b/site_scons/environ.scons
index b638b101..74762cb1 100644
--- a/site_scons/environ.scons
+++ b/site_scons/environ.scons
@@ -27,6 +27,8 @@ variables_to_forward = [
     "PYTHONNOUSERSITE",
     "TMP",
     "TEMP",
+    # ccache
+    "CCACHE_DISABLE",
     # Colors for tools
     "TERM",
 ]
@@ -62,7 +64,7 @@ coreenv = VAR_ENV.Clone(
     # 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",
+    FBT_SCRIPT_DIR=Dir("#/scripts"),
 )
 
 # If DIST_SUFFIX is set in environment, is has precedence (set by CI)
diff --git a/site_scons/extapps.scons b/site_scons/extapps.scons
index f9227ed3..769b3eb1 100644
--- a/site_scons/extapps.scons
+++ b/site_scons/extapps.scons
@@ -14,7 +14,6 @@ appenv = ENV["APPENV"] = ENV.Clone(
         "fbt_assets",
         "fbt_sdk",
     ],
-    RESOURCES_ROOT=ENV.Dir("#/assets/resources"),
 )
 
 appenv.Replace(
@@ -56,7 +55,6 @@ appenv.AppendUnique(
 @dataclass
 class FlipperExtAppBuildArtifacts:
     application_map: dict = field(default_factory=dict)
-    resources_dist: NodeList = field(default_factory=NodeList)
     sdk_tree: NodeList = field(default_factory=NodeList)
 
 
@@ -78,8 +76,6 @@ Alias(
     list(app_artifact.validator for app_artifact in extapps.application_map.values()),
 )
 
-extapps.resources_dist = appenv.FapDist(appenv["RESOURCES_ROOT"], [])
-
 
 if appsrc := appenv.subst("$APPSRC"):
     launch_target = appenv.AddAppLaunchTarget(appsrc, "launch")
diff --git a/firmware/ReadMe.md b/targets/ReadMe.md
similarity index 100%
rename from firmware/ReadMe.md
rename to targets/ReadMe.md
diff --git a/firmware/SConscript b/targets/SConscript
similarity index 100%
rename from firmware/SConscript
rename to targets/SConscript
diff --git a/firmware/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv
similarity index 93%
rename from firmware/targets/f18/api_symbols.csv
rename to targets/f18/api_symbols.csv
index 4789d316..d861d851 100644
--- a/firmware/targets/f18/api_symbols.csv
+++ b/targets/f18/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,40.1,,
+Version,+,46.0,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -36,54 +36,11 @@ Header,+,applications/services/notification/notification_messages.h,,
 Header,+,applications/services/power/power_service/power.h,,
 Header,+,applications/services/rpc/rpc_app.h,,
 Header,+,applications/services/storage/storage.h,,
-Header,+,firmware/targets/f18/furi_hal/furi_hal_resources.h,,
-Header,+,firmware/targets/f18/furi_hal/furi_hal_spi_config.h,,
-Header,+,firmware/targets/f18/furi_hal/furi_hal_target_hw.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_bus.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_clock.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_console.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_dma.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_flash.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_gpio.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_i2c_config.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_i2c_types.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_idle_timer.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_interrupt.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_os.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_pwm.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_spi_types.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_uart.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_usb_cdc.h,,
-Header,+,firmware/targets/f7/platform_specific/intrinsic_export.h,,
-Header,+,firmware/targets/f7/platform_specific/math_wrapper.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_bt.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_bt_hid.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_bt_serial.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_cortex.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_crypto.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_debug.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_i2c.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_info.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_light.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_memory.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_mpu.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_power.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_random.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_region.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_rtc.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_sd.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_speaker.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_spi.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_usb.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_usb_ccid.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_usb_hid.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_usb_hid_u2f.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_version.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_vibro.h,,
 Header,+,lib/digital_signal/digital_sequence.h,,
 Header,+,lib/digital_signal/digital_signal.h,,
 Header,+,lib/drivers/cc1101_regs.h,,
+Header,+,lib/drivers/st25r3916.h,,
+Header,+,lib/drivers/st25r3916_reg.h,,
 Header,+,lib/flipper_application/api_hashtable/api_hashtable.h,,
 Header,+,lib/flipper_application/api_hashtable/compilesort.hpp,,
 Header,+,lib/flipper_application/flipper_application.h,,
@@ -194,6 +151,51 @@ 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,+,targets/f18/furi_hal/furi_hal_resources.h,,
+Header,+,targets/f18/furi_hal/furi_hal_spi_config.h,,
+Header,+,targets/f18/furi_hal/furi_hal_target_hw.h,,
+Header,+,targets/f7/furi_hal/furi_hal_bus.h,,
+Header,+,targets/f7/furi_hal/furi_hal_clock.h,,
+Header,+,targets/f7/furi_hal/furi_hal_console.h,,
+Header,+,targets/f7/furi_hal/furi_hal_dma.h,,
+Header,+,targets/f7/furi_hal/furi_hal_flash.h,,
+Header,+,targets/f7/furi_hal/furi_hal_gpio.h,,
+Header,+,targets/f7/furi_hal/furi_hal_i2c_config.h,,
+Header,+,targets/f7/furi_hal/furi_hal_i2c_types.h,,
+Header,+,targets/f7/furi_hal/furi_hal_idle_timer.h,,
+Header,+,targets/f7/furi_hal/furi_hal_interrupt.h,,
+Header,+,targets/f7/furi_hal/furi_hal_os.h,,
+Header,+,targets/f7/furi_hal/furi_hal_pwm.h,,
+Header,+,targets/f7/furi_hal/furi_hal_spi_types.h,,
+Header,+,targets/f7/furi_hal/furi_hal_uart.h,,
+Header,+,targets/f7/furi_hal/furi_hal_usb_cdc.h,,
+Header,+,targets/f7/platform_specific/intrinsic_export.h,,
+Header,+,targets/f7/platform_specific/math_wrapper.h,,
+Header,+,targets/furi_hal_include/furi_hal.h,,
+Header,+,targets/furi_hal_include/furi_hal_bt.h,,
+Header,+,targets/furi_hal_include/furi_hal_bt_hid.h,,
+Header,+,targets/furi_hal_include/furi_hal_bt_serial.h,,
+Header,+,targets/furi_hal_include/furi_hal_cortex.h,,
+Header,+,targets/furi_hal_include/furi_hal_crypto.h,,
+Header,+,targets/furi_hal_include/furi_hal_debug.h,,
+Header,+,targets/furi_hal_include/furi_hal_i2c.h,,
+Header,+,targets/furi_hal_include/furi_hal_info.h,,
+Header,+,targets/furi_hal_include/furi_hal_light.h,,
+Header,+,targets/furi_hal_include/furi_hal_memory.h,,
+Header,+,targets/furi_hal_include/furi_hal_mpu.h,,
+Header,+,targets/furi_hal_include/furi_hal_power.h,,
+Header,+,targets/furi_hal_include/furi_hal_random.h,,
+Header,+,targets/furi_hal_include/furi_hal_region.h,,
+Header,+,targets/furi_hal_include/furi_hal_rtc.h,,
+Header,+,targets/furi_hal_include/furi_hal_sd.h,,
+Header,+,targets/furi_hal_include/furi_hal_speaker.h,,
+Header,+,targets/furi_hal_include/furi_hal_spi.h,,
+Header,+,targets/furi_hal_include/furi_hal_usb.h,,
+Header,+,targets/furi_hal_include/furi_hal_usb_ccid.h,,
+Header,+,targets/furi_hal_include/furi_hal_usb_hid.h,,
+Header,+,targets/furi_hal_include/furi_hal_usb_hid_u2f.h,,
+Header,+,targets/furi_hal_include/furi_hal_version.h,,
+Header,+,targets/furi_hal_include/furi_hal_vibro.h,,
 Function,-,LL_ADC_CommonDeInit,ErrorStatus,ADC_Common_TypeDef*
 Function,-,LL_ADC_CommonInit,ErrorStatus,"ADC_Common_TypeDef*, const LL_ADC_CommonInitTypeDef*"
 Function,-,LL_ADC_CommonStructInit,void,LL_ADC_CommonInitTypeDef*
@@ -302,10 +304,10 @@ Function,-,__eprintf,void,"const char*, const char*, unsigned int, const char*"
 Function,+,__errno,int*,
 Function,-,__fpclassifyd,int,double
 Function,-,__fpclassifyf,int,float
-Function,+,__furi_crash,void,
+Function,+,__furi_crash_implementation,void,
 Function,+,__furi_critical_enter,__FuriCriticalInfo,
 Function,+,__furi_critical_exit,void,__FuriCriticalInfo
-Function,+,__furi_halt,void,
+Function,+,__furi_halt_implementation,void,
 Function,-,__getdelim,ssize_t,"char**, size_t*, int, FILE*"
 Function,-,__getline,ssize_t,"char**, size_t*, FILE*"
 Function,-,__isinfd,int,double
@@ -417,7 +419,6 @@ Function,-,_perror_r,void,"_reent*, const char*"
 Function,-,_printf_r,int,"_reent*, const char*, ..."
 Function,-,_putc_r,int,"_reent*, int, FILE*"
 Function,-,_putc_unlocked_r,int,"_reent*, int, FILE*"
-Function,-,_putchar,void,char
 Function,-,_putchar_r,int,"_reent*, int"
 Function,-,_putchar_unlocked_r,int,"_reent*, int"
 Function,-,_putenv_r,int,"_reent*, char*"
@@ -751,8 +752,6 @@ Function,-,dprintf,int,"int, const char*, ..."
 Function,-,drand48,double,
 Function,-,drem,double,"double, double"
 Function,-,dremf,float,"float, float"
-Function,-,eTaskConfirmSleepModeStatus,eSleepModeStatus,
-Function,-,eTaskGetState,eTaskState,TaskHandle_t
 Function,+,elements_bold_rounded_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
 Function,+,elements_bubble,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
 Function,+,elements_bubble_str,void,"Canvas*, uint8_t, uint8_t, const char*, Align, Align"
@@ -1342,6 +1341,7 @@ Function,+,furi_hal_vibro_on,void,_Bool
 Function,-,furi_init,void,
 Function,+,furi_kernel_get_tick_frequency,uint32_t,
 Function,+,furi_kernel_is_irq_or_masked,_Bool,
+Function,+,furi_kernel_is_running,_Bool,
 Function,+,furi_kernel_lock,int32_t,
 Function,+,furi_kernel_restore_lock,int32_t,int32_t
 Function,+,furi_kernel_unlock,int32_t,
@@ -1376,7 +1376,7 @@ Function,+,furi_pubsub_subscribe,FuriPubSubSubscription*,"FuriPubSub*, FuriPubSu
 Function,+,furi_pubsub_unsubscribe,void,"FuriPubSub*, FuriPubSubSubscription*"
 Function,+,furi_record_close,void,const char*
 Function,+,furi_record_create,void,"const char*, void*"
-Function,-,furi_record_destroy,_Bool,const char*
+Function,+,furi_record_destroy,_Bool,const char*
 Function,+,furi_record_exists,_Bool,const char*
 Function,-,furi_record_init,void,
 Function,+,furi_record_open,void*,const char*
@@ -1452,7 +1452,6 @@ Function,+,furi_string_utf8_push,void,"FuriString*, FuriStringUnicodeValue"
 Function,+,furi_string_vprintf,int,"FuriString*, const char[], va_list"
 Function,+,furi_thread_alloc,FuriThread*,
 Function,+,furi_thread_alloc_ex,FuriThread*,"const char*, uint32_t, FuriThreadCallback, void*"
-Function,+,furi_thread_catch,void,
 Function,-,furi_thread_disable_heap_trace,void,FuriThread*
 Function,+,furi_thread_enable_heap_trace,void,FuriThread*
 Function,+,furi_thread_enumerate,uint32_t,"FuriThreadId*, uint32_t"
@@ -1493,8 +1492,11 @@ Function,+,furi_thread_suspend,void,FuriThreadId
 Function,+,furi_thread_yield,void,
 Function,+,furi_timer_alloc,FuriTimer*,"FuriTimerCallback, FuriTimerType, void*"
 Function,+,furi_timer_free,void,FuriTimer*
+Function,+,furi_timer_get_expire_time,uint32_t,FuriTimer*
 Function,+,furi_timer_is_running,uint32_t,FuriTimer*
 Function,+,furi_timer_pending_callback,void,"FuriTimerPendigCallback, void*, uint32_t"
+Function,+,furi_timer_restart,FuriStatus,"FuriTimer*, uint32_t"
+Function,+,furi_timer_set_thread_priority,void,FuriTimerThreadPriority
 Function,+,furi_timer_start,FuriStatus,"FuriTimer*, uint32_t"
 Function,+,furi_timer_stop,FuriStatus,FuriTimer*
 Function,-,fwrite,size_t,"const void*, size_t, size_t, FILE*"
@@ -1838,8 +1840,6 @@ Function,+,pb_read,_Bool,"pb_istream_t*, pb_byte_t*, size_t"
 Function,+,pb_release,void,"const pb_msgdesc_t*, void*"
 Function,+,pb_skip_field,_Bool,"pb_istream_t*, pb_wire_type_t"
 Function,+,pb_write,_Bool,"pb_ostream_t*, const pb_byte_t*, size_t"
-Function,-,pcTaskGetName,char*,TaskHandle_t
-Function,-,pcTimerGetName,const char*,TimerHandle_t
 Function,-,pclose,int,FILE*
 Function,-,perror,void,const char*
 Function,+,plugin_manager_alloc,PluginManager*,"const char*, uint32_t, const ElfApiInterface*"
@@ -1914,12 +1914,6 @@ Function,-,putchar_unlocked,int,int
 Function,-,putenv,int,char*
 Function,-,puts,int,const char*
 Function,-,putw,int,"int, FILE*"
-Function,-,pvPortCalloc,void*,"size_t, size_t"
-Function,-,pvPortMalloc,void*,size_t
-Function,-,pvTaskGetThreadLocalStoragePointer,void*,"TaskHandle_t, BaseType_t"
-Function,-,pvTaskIncrementMutexHeldCount,TaskHandle_t,
-Function,-,pvTimerGetTimerID,void*,const TimerHandle_t
-Function,-,pxPortInitialiseStack,StackType_t*,"StackType_t*, TaskFunction_t, void*"
 Function,-,qsort,void,"void*, size_t, size_t, __compar_fn_t"
 Function,-,qsort_r,void,"void*, size_t, size_t, int (*)(const void*, const void*, void*), void*"
 Function,-,quick_exit,void,int
@@ -1949,7 +1943,7 @@ Function,-,round,double,double
 Function,+,roundf,float,float
 Function,-,roundl,long double,long double
 Function,+,rpc_session_close,void,RpcSession*
-Function,+,rpc_session_feed,size_t,"RpcSession*, uint8_t*, size_t, TickType_t"
+Function,+,rpc_session_feed,size_t,"RpcSession*, uint8_t*, size_t, uint32_t"
 Function,+,rpc_session_get_available_size,size_t,RpcSession*
 Function,+,rpc_session_get_owner,RpcOwner,RpcSession*
 Function,+,rpc_session_open,RpcSession*,"Rpc*, RpcOwner"
@@ -1958,14 +1952,12 @@ Function,+,rpc_session_set_close_callback,void,"RpcSession*, RpcSessionClosedCal
 Function,+,rpc_session_set_context,void,"RpcSession*, void*"
 Function,+,rpc_session_set_send_bytes_callback,void,"RpcSession*, RpcSendBytesCallback"
 Function,+,rpc_session_set_terminated_callback,void,"RpcSession*, RpcSessionTerminatedCallback"
-Function,+,rpc_system_app_confirm,void,"RpcAppSystem*, RpcAppSystemEvent, _Bool"
+Function,+,rpc_system_app_confirm,void,"RpcAppSystem*, _Bool"
 Function,+,rpc_system_app_error_reset,void,RpcAppSystem*
 Function,+,rpc_system_app_exchange_data,void,"RpcAppSystem*, const uint8_t*, size_t"
-Function,+,rpc_system_app_get_data,const char*,RpcAppSystem*
 Function,+,rpc_system_app_send_exited,void,RpcAppSystem*
 Function,+,rpc_system_app_send_started,void,RpcAppSystem*
 Function,+,rpc_system_app_set_callback,void,"RpcAppSystem*, RpcAppSystemCallback, void*"
-Function,+,rpc_system_app_set_data_exchange_callback,void,"RpcAppSystem*, RpcAppSystemDataExchangeCallback, void*"
 Function,+,rpc_system_app_set_error_code,void,"RpcAppSystem*, uint32_t"
 Function,+,rpc_system_app_set_error_text,void,"RpcAppSystem*, const char*"
 Function,-,rpmatch,int,const char*
@@ -2055,7 +2047,31 @@ Function,+,srand,void,unsigned
 Function,-,srand48,void,long
 Function,-,srandom,void,unsigned
 Function,+,sscanf,int,"const char*, const char*, ..."
+Function,+,st25r3916_change_reg_bits,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t, uint8_t"
+Function,+,st25r3916_change_test_reg_bits,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t, uint8_t"
+Function,+,st25r3916_check_reg,_Bool,"FuriHalSpiBusHandle*, uint8_t, uint8_t, uint8_t"
+Function,+,st25r3916_clear_reg_bits,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t"
+Function,+,st25r3916_direct_cmd,void,"FuriHalSpiBusHandle*, uint8_t"
+Function,+,st25r3916_get_irq,uint32_t,FuriHalSpiBusHandle*
+Function,+,st25r3916_mask_irq,void,"FuriHalSpiBusHandle*, uint32_t"
+Function,+,st25r3916_modify_reg,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t, uint8_t"
+Function,+,st25r3916_read_burst_regs,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t*, uint8_t"
+Function,+,st25r3916_read_fifo,_Bool,"FuriHalSpiBusHandle*, uint8_t*, size_t, size_t*"
+Function,+,st25r3916_read_pta_mem,void,"FuriHalSpiBusHandle*, uint8_t*, size_t"
+Function,+,st25r3916_read_reg,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t*"
+Function,+,st25r3916_read_test_reg,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t*"
+Function,+,st25r3916_reg_read_fifo,void,"FuriHalSpiBusHandle*, uint8_t*, size_t"
+Function,+,st25r3916_reg_write_fifo,void,"FuriHalSpiBusHandle*, const uint8_t*, size_t"
+Function,+,st25r3916_set_reg_bits,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t"
+Function,+,st25r3916_write_burst_regs,void,"FuriHalSpiBusHandle*, uint8_t, const uint8_t*, uint8_t"
+Function,+,st25r3916_write_fifo,void,"FuriHalSpiBusHandle*, const uint8_t*, size_t"
+Function,+,st25r3916_write_pta_mem,void,"FuriHalSpiBusHandle*, const uint8_t*, size_t"
+Function,+,st25r3916_write_ptf_mem,void,"FuriHalSpiBusHandle*, const uint8_t*, size_t"
+Function,+,st25r3916_write_pttsn_mem,void,"FuriHalSpiBusHandle*, uint8_t*, size_t"
+Function,+,st25r3916_write_reg,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t"
+Function,+,st25r3916_write_test_reg,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t"
 Function,+,storage_common_copy,FS_Error,"Storage*, const char*, const char*"
+Function,+,storage_common_equivalent_path,_Bool,"Storage*, const char*, const char*, _Bool"
 Function,+,storage_common_exists,_Bool,"Storage*, const char*"
 Function,+,storage_common_fs_info,FS_Error,"Storage*, const char*, uint64_t*, uint64_t*"
 Function,+,storage_common_merge,FS_Error,"Storage*, const char*, const char*"
@@ -2074,7 +2090,7 @@ Function,-,storage_dir_rewind,_Bool,File*
 Function,+,storage_error_get_desc,const char*,FS_Error
 Function,+,storage_file_alloc,File*,Storage*
 Function,+,storage_file_close,_Bool,File*
-Function,+,storage_file_copy_to_file,_Bool,"File*, File*, uint32_t"
+Function,+,storage_file_copy_to_file,_Bool,"File*, File*, size_t"
 Function,+,storage_file_eof,_Bool,File*
 Function,+,storage_file_exists,_Bool,"Storage*, const char*"
 Function,+,storage_file_free,void,File*
@@ -2084,13 +2100,13 @@ Function,-,storage_file_get_internal_error,int32_t,File*
 Function,+,storage_file_is_dir,_Bool,File*
 Function,+,storage_file_is_open,_Bool,File*
 Function,+,storage_file_open,_Bool,"File*, const char*, FS_AccessMode, FS_OpenMode"
-Function,+,storage_file_read,uint16_t,"File*, void*, uint16_t"
+Function,+,storage_file_read,size_t,"File*, void*, size_t"
 Function,+,storage_file_seek,_Bool,"File*, uint32_t, _Bool"
 Function,+,storage_file_size,uint64_t,File*
 Function,+,storage_file_sync,_Bool,File*
 Function,+,storage_file_tell,uint64_t,File*
 Function,+,storage_file_truncate,_Bool,File*
-Function,+,storage_file_write,uint16_t,"File*, const void*, uint16_t"
+Function,+,storage_file_write,size_t,"File*, const void*, size_t"
 Function,+,storage_get_next_filename,void,"Storage*, const char*, const char*, const char*, FuriString*, uint8_t"
 Function,+,storage_get_pubsub,FuriPubSub*,Storage*
 Function,+,storage_int_backup,FS_Error,"Storage*, const char*"
@@ -2281,67 +2297,10 @@ Function,-,uECC_sign_deterministic,int,"const uint8_t*, const uint8_t*, unsigned
 Function,-,uECC_valid_public_key,int,"const uint8_t*, uECC_Curve"
 Function,-,uECC_verify,int,"const uint8_t*, const uint8_t*, unsigned, const uint8_t*, uECC_Curve"
 Function,+,uint8_to_hex_chars,void,"const uint8_t*, uint8_t*, int"
-Function,-,ulTaskGenericNotifyTake,uint32_t,"UBaseType_t, BaseType_t, TickType_t"
-Function,-,ulTaskGenericNotifyValueClear,uint32_t,"TaskHandle_t, UBaseType_t, uint32_t"
-Function,-,ulTaskGetIdleRunTimeCounter,uint32_t,
-Function,-,ulTaskGetIdleRunTimePercent,uint32_t,
 Function,-,ungetc,int,"int, FILE*"
 Function,-,unsetenv,int,const char*
 Function,-,usbd_poll,void,usbd_device*
 Function,-,utoa,char*,"unsigned, char*, int"
-Function,-,uxListRemove,UBaseType_t,ListItem_t*
-Function,-,uxTaskGetNumberOfTasks,UBaseType_t,
-Function,-,uxTaskGetStackHighWaterMark,UBaseType_t,TaskHandle_t
-Function,-,uxTaskGetStackHighWaterMark2,uint16_t,TaskHandle_t
-Function,-,uxTaskGetSystemState,UBaseType_t,"TaskStatus_t*, const UBaseType_t, uint32_t*"
-Function,-,uxTaskGetTaskNumber,UBaseType_t,TaskHandle_t
-Function,-,uxTaskPriorityGet,UBaseType_t,const TaskHandle_t
-Function,-,uxTaskPriorityGetFromISR,UBaseType_t,const TaskHandle_t
-Function,-,uxTaskResetEventItemValue,TickType_t,
-Function,-,uxTimerGetReloadMode,UBaseType_t,TimerHandle_t
-Function,-,uxTimerGetTimerNumber,UBaseType_t,TimerHandle_t
-Function,-,vApplicationGetIdleTaskMemory,void,"StaticTask_t**, StackType_t**, uint32_t*"
-Function,-,vApplicationGetTimerTaskMemory,void,"StaticTask_t**, StackType_t**, uint32_t*"
-Function,-,vListInitialise,void,List_t*
-Function,-,vListInitialiseItem,void,ListItem_t*
-Function,-,vListInsert,void,"List_t*, ListItem_t*"
-Function,-,vListInsertEnd,void,"List_t*, ListItem_t*"
-Function,-,vPortDefineHeapRegions,void,const HeapRegion_t*
-Function,-,vPortEndScheduler,void,
-Function,+,vPortEnterCritical,void,
-Function,+,vPortExitCritical,void,
-Function,-,vPortFree,void,void*
-Function,-,vPortGetHeapStats,void,HeapStats_t*
-Function,-,vPortInitialiseBlocks,void,
-Function,-,vPortSuppressTicksAndSleep,void,TickType_t
-Function,-,vTaskAllocateMPURegions,void,"TaskHandle_t, const MemoryRegion_t*"
-Function,-,vTaskDelay,void,const TickType_t
-Function,-,vTaskDelete,void,TaskHandle_t
-Function,-,vTaskEndScheduler,void,
-Function,-,vTaskGenericNotifyGiveFromISR,void,"TaskHandle_t, UBaseType_t, BaseType_t*"
-Function,-,vTaskGetInfo,void,"TaskHandle_t, TaskStatus_t*, BaseType_t, eTaskState"
-Function,-,vTaskGetRunTimeStats,void,char*
-Function,-,vTaskInternalSetTimeOutState,void,TimeOut_t*
-Function,-,vTaskList,void,char*
-Function,-,vTaskMissedYield,void,
-Function,-,vTaskPlaceOnEventList,void,"List_t*, const TickType_t"
-Function,-,vTaskPlaceOnEventListRestricted,void,"List_t*, TickType_t, const BaseType_t"
-Function,-,vTaskPlaceOnUnorderedEventList,void,"List_t*, const TickType_t, const TickType_t"
-Function,-,vTaskPriorityDisinheritAfterTimeout,void,"const TaskHandle_t, UBaseType_t"
-Function,+,vTaskPrioritySet,void,"TaskHandle_t, UBaseType_t"
-Function,-,vTaskRemoveFromUnorderedEventList,void,"ListItem_t*, const TickType_t"
-Function,-,vTaskResume,void,TaskHandle_t
-Function,-,vTaskSetTaskNumber,void,"TaskHandle_t, const UBaseType_t"
-Function,-,vTaskSetThreadLocalStoragePointer,void,"TaskHandle_t, BaseType_t, void*"
-Function,-,vTaskSetTimeOutState,void,TimeOut_t*
-Function,-,vTaskStartScheduler,void,
-Function,-,vTaskStepTick,void,TickType_t
-Function,-,vTaskSuspend,void,TaskHandle_t
-Function,-,vTaskSuspendAll,void,
-Function,-,vTaskSwitchContext,void,
-Function,-,vTimerSetReloadMode,void,"TimerHandle_t, const BaseType_t"
-Function,-,vTimerSetTimerID,void,"TimerHandle_t, void*"
-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*
@@ -2456,43 +2415,6 @@ Function,+,widget_alloc,Widget*,
 Function,+,widget_free,void,Widget*
 Function,+,widget_get_view,View*,Widget*
 Function,+,widget_reset,void,Widget*
-Function,-,xPortGetFreeHeapSize,size_t,
-Function,-,xPortGetMinimumEverFreeHeapSize,size_t,
-Function,-,xPortStartScheduler,BaseType_t,
-Function,-,xTaskAbortDelay,BaseType_t,TaskHandle_t
-Function,-,xTaskCallApplicationTaskHook,BaseType_t,"TaskHandle_t, void*"
-Function,-,xTaskCatchUpTicks,BaseType_t,TickType_t
-Function,-,xTaskCheckForTimeOut,BaseType_t,"TimeOut_t*, TickType_t*"
-Function,-,xTaskCreate,BaseType_t,"TaskFunction_t, const char*, const uint16_t, void*, UBaseType_t, TaskHandle_t*"
-Function,-,xTaskCreateStatic,TaskHandle_t,"TaskFunction_t, const char*, const uint32_t, void*, UBaseType_t, StackType_t*, StaticTask_t*"
-Function,-,xTaskDelayUntil,BaseType_t,"TickType_t*, const TickType_t"
-Function,-,xTaskGenericNotify,BaseType_t,"TaskHandle_t, UBaseType_t, uint32_t, eNotifyAction, uint32_t*"
-Function,-,xTaskGenericNotifyFromISR,BaseType_t,"TaskHandle_t, UBaseType_t, uint32_t, eNotifyAction, uint32_t*, BaseType_t*"
-Function,-,xTaskGenericNotifyStateClear,BaseType_t,"TaskHandle_t, UBaseType_t"
-Function,-,xTaskGenericNotifyWait,BaseType_t,"UBaseType_t, uint32_t, uint32_t, uint32_t*, TickType_t"
-Function,-,xTaskGetCurrentTaskHandle,TaskHandle_t,
-Function,+,xTaskGetHandle,TaskHandle_t,const char*
-Function,-,xTaskGetIdleTaskHandle,TaskHandle_t,
-Function,+,xTaskGetSchedulerState,BaseType_t,
-Function,+,xTaskGetTickCount,TickType_t,
-Function,-,xTaskGetTickCountFromISR,TickType_t,
-Function,-,xTaskIncrementTick,BaseType_t,
-Function,-,xTaskPriorityDisinherit,BaseType_t,const TaskHandle_t
-Function,-,xTaskPriorityInherit,BaseType_t,const TaskHandle_t
-Function,-,xTaskRemoveFromEventList,BaseType_t,const List_t*
-Function,-,xTaskResumeAll,BaseType_t,
-Function,-,xTaskResumeFromISR,BaseType_t,TaskHandle_t
-Function,-,xTimerCreate,TimerHandle_t,"const char*, const TickType_t, const BaseType_t, void*, TimerCallbackFunction_t"
-Function,-,xTimerCreateStatic,TimerHandle_t,"const char*, const TickType_t, const BaseType_t, void*, TimerCallbackFunction_t, StaticTimer_t*"
-Function,-,xTimerCreateTimerTask,BaseType_t,
-Function,-,xTimerGenericCommand,BaseType_t,"TimerHandle_t, const BaseType_t, const TickType_t, BaseType_t*, const TickType_t"
-Function,-,xTimerGetExpiryTime,TickType_t,TimerHandle_t
-Function,-,xTimerGetPeriod,TickType_t,TimerHandle_t
-Function,-,xTimerGetReloadMode,BaseType_t,TimerHandle_t
-Function,-,xTimerGetTimerDaemonTaskHandle,TaskHandle_t,
-Function,-,xTimerIsTimerActive,BaseType_t,TimerHandle_t
-Function,-,xTimerPendFunctionCall,BaseType_t,"PendedFunction_t, void*, uint32_t, TickType_t"
-Function,-,xTimerPendFunctionCallFromISR,BaseType_t,"PendedFunction_t, void*, uint32_t, BaseType_t*"
 Function,-,y0,double,double
 Function,-,y0f,float,float
 Function,-,y1,double,double
diff --git a/firmware/targets/f18/furi_hal/furi_hal.c b/targets/f18/furi_hal/furi_hal.c
similarity index 100%
rename from firmware/targets/f18/furi_hal/furi_hal.c
rename to targets/f18/furi_hal/furi_hal.c
diff --git a/firmware/targets/f18/furi_hal/furi_hal_power_config.c b/targets/f18/furi_hal/furi_hal_power_config.c
similarity index 100%
rename from firmware/targets/f18/furi_hal/furi_hal_power_config.c
rename to targets/f18/furi_hal/furi_hal_power_config.c
diff --git a/firmware/targets/f18/furi_hal/furi_hal_resources.c b/targets/f18/furi_hal/furi_hal_resources.c
similarity index 100%
rename from firmware/targets/f18/furi_hal/furi_hal_resources.c
rename to targets/f18/furi_hal/furi_hal_resources.c
diff --git a/firmware/targets/f18/furi_hal/furi_hal_resources.h b/targets/f18/furi_hal/furi_hal_resources.h
similarity index 100%
rename from firmware/targets/f18/furi_hal/furi_hal_resources.h
rename to targets/f18/furi_hal/furi_hal_resources.h
diff --git a/firmware/targets/f18/furi_hal/furi_hal_spi_config.c b/targets/f18/furi_hal/furi_hal_spi_config.c
similarity index 100%
rename from firmware/targets/f18/furi_hal/furi_hal_spi_config.c
rename to targets/f18/furi_hal/furi_hal_spi_config.c
diff --git a/firmware/targets/f18/furi_hal/furi_hal_spi_config.h b/targets/f18/furi_hal/furi_hal_spi_config.h
similarity index 100%
rename from firmware/targets/f18/furi_hal/furi_hal_spi_config.h
rename to targets/f18/furi_hal/furi_hal_spi_config.h
diff --git a/firmware/targets/f18/furi_hal/furi_hal_target_hw.h b/targets/f18/furi_hal/furi_hal_target_hw.h
similarity index 100%
rename from firmware/targets/f18/furi_hal/furi_hal_target_hw.h
rename to targets/f18/furi_hal/furi_hal_target_hw.h
diff --git a/firmware/targets/f18/furi_hal/furi_hal_version_device.c b/targets/f18/furi_hal/furi_hal_version_device.c
similarity index 100%
rename from firmware/targets/f18/furi_hal/furi_hal_version_device.c
rename to targets/f18/furi_hal/furi_hal_version_device.c
diff --git a/firmware/targets/f18/target.json b/targets/f18/target.json
similarity index 100%
rename from firmware/targets/f18/target.json
rename to targets/f18/target.json
diff --git a/firmware/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
similarity index 94%
rename from firmware/targets/f7/api_symbols.csv
rename to targets/f7/api_symbols.csv
index 038a22ea..c50db0c7 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,40.1,,
+Version,+,46.0,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
@@ -37,59 +37,11 @@ Header,+,applications/services/notification/notification_messages.h,,
 Header,+,applications/services/power/power_service/power.h,,
 Header,+,applications/services/rpc/rpc_app.h,,
 Header,+,applications/services/storage/storage.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_bus.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_clock.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_console.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_dma.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_flash.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_gpio.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_i2c_config.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_i2c_types.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_ibutton.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_idle_timer.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_interrupt.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_os.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_pwm.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_resources.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_rfid.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_spi_config.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_spi_types.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_subghz.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_target_hw.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_uart.h,,
-Header,+,firmware/targets/f7/furi_hal/furi_hal_usb_cdc.h,,
-Header,+,firmware/targets/f7/platform_specific/intrinsic_export.h,,
-Header,+,firmware/targets/f7/platform_specific/math_wrapper.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_bt.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_bt_hid.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_bt_serial.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_cortex.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_crypto.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_debug.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_i2c.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_info.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_infrared.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_light.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_memory.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_mpu.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_nfc.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_power.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_random.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_region.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_rtc.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_sd.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_speaker.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_spi.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_usb.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_usb_ccid.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_usb_hid.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_usb_hid_u2f.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_version.h,,
-Header,+,firmware/targets/furi_hal_include/furi_hal_vibro.h,,
 Header,+,lib/digital_signal/digital_sequence.h,,
 Header,+,lib/digital_signal/digital_signal.h,,
 Header,+,lib/drivers/cc1101_regs.h,,
+Header,+,lib/drivers/st25r3916.h,,
+Header,+,lib/drivers/st25r3916_reg.h,,
 Header,+,lib/flipper_application/api_hashtable/api_hashtable.h,,
 Header,+,lib/flipper_application/api_hashtable/compilesort.hpp,,
 Header,+,lib/flipper_application/flipper_application.h,,
@@ -167,7 +119,7 @@ Header,+,lib/nfc/nfc_scanner.h,,
 Header,+,lib/nfc/protocols/iso14443_3a/iso14443_3a.h,,
 Header,+,lib/nfc/protocols/iso14443_3a/iso14443_3a_listener.h,,
 Header,+,lib/nfc/protocols/iso14443_3a/iso14443_3a_poller.h,,
-Header,+,lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync_api.h,,
+Header,+,lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.h,,
 Header,+,lib/nfc/protocols/iso14443_3b/iso14443_3b.h,,
 Header,+,lib/nfc/protocols/iso14443_3b/iso14443_3b_poller.h,,
 Header,+,lib/nfc/protocols/iso14443_4a/iso14443_4a.h,,
@@ -178,13 +130,13 @@ Header,+,lib/nfc/protocols/iso14443_4b/iso14443_4b_poller.h,,
 Header,+,lib/nfc/protocols/mf_classic/mf_classic.h,,
 Header,+,lib/nfc/protocols/mf_classic/mf_classic_listener.h,,
 Header,+,lib/nfc/protocols/mf_classic/mf_classic_poller.h,,
-Header,+,lib/nfc/protocols/mf_classic/mf_classic_poller_sync_api.h,,
+Header,+,lib/nfc/protocols/mf_classic/mf_classic_poller_sync.h,,
 Header,+,lib/nfc/protocols/mf_desfire/mf_desfire.h,,
 Header,+,lib/nfc/protocols/mf_desfire/mf_desfire_poller.h,,
 Header,+,lib/nfc/protocols/mf_ultralight/mf_ultralight.h,,
 Header,+,lib/nfc/protocols/mf_ultralight/mf_ultralight_listener.h,,
 Header,+,lib/nfc/protocols/mf_ultralight/mf_ultralight_poller.h,,
-Header,+,lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync_api.h,,
+Header,+,lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.h,,
 Header,+,lib/nfc/protocols/slix/slix.h,,
 Header,+,lib/nfc/protocols/st25tb/st25tb.h,,
 Header,+,lib/nfc/protocols/st25tb/st25tb_poller.h,,
@@ -229,6 +181,7 @@ Header,+,lib/subghz/blocks/math.h,,
 Header,+,lib/subghz/devices/cc1101_configs.h,,
 Header,+,lib/subghz/devices/cc1101_int/cc1101_int_interconnect.h,,
 Header,+,lib/subghz/environment.h,,
+Header,+,lib/subghz/protocols/public_api.h,,
 Header,+,lib/subghz/protocols/raw.h,,
 Header,+,lib/subghz/receiver.h,,
 Header,+,lib/subghz/registry.h,,
@@ -262,6 +215,56 @@ 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,+,targets/f7/furi_hal/furi_hal_bus.h,,
+Header,+,targets/f7/furi_hal/furi_hal_clock.h,,
+Header,+,targets/f7/furi_hal/furi_hal_console.h,,
+Header,+,targets/f7/furi_hal/furi_hal_dma.h,,
+Header,+,targets/f7/furi_hal/furi_hal_flash.h,,
+Header,+,targets/f7/furi_hal/furi_hal_gpio.h,,
+Header,+,targets/f7/furi_hal/furi_hal_i2c_config.h,,
+Header,+,targets/f7/furi_hal/furi_hal_i2c_types.h,,
+Header,+,targets/f7/furi_hal/furi_hal_ibutton.h,,
+Header,+,targets/f7/furi_hal/furi_hal_idle_timer.h,,
+Header,+,targets/f7/furi_hal/furi_hal_interrupt.h,,
+Header,+,targets/f7/furi_hal/furi_hal_os.h,,
+Header,+,targets/f7/furi_hal/furi_hal_pwm.h,,
+Header,+,targets/f7/furi_hal/furi_hal_resources.h,,
+Header,+,targets/f7/furi_hal/furi_hal_rfid.h,,
+Header,+,targets/f7/furi_hal/furi_hal_spi_config.h,,
+Header,+,targets/f7/furi_hal/furi_hal_spi_types.h,,
+Header,+,targets/f7/furi_hal/furi_hal_subghz.h,,
+Header,+,targets/f7/furi_hal/furi_hal_target_hw.h,,
+Header,+,targets/f7/furi_hal/furi_hal_uart.h,,
+Header,+,targets/f7/furi_hal/furi_hal_usb_cdc.h,,
+Header,+,targets/f7/platform_specific/intrinsic_export.h,,
+Header,+,targets/f7/platform_specific/math_wrapper.h,,
+Header,+,targets/furi_hal_include/furi_hal.h,,
+Header,+,targets/furi_hal_include/furi_hal_bt.h,,
+Header,+,targets/furi_hal_include/furi_hal_bt_hid.h,,
+Header,+,targets/furi_hal_include/furi_hal_bt_serial.h,,
+Header,+,targets/furi_hal_include/furi_hal_cortex.h,,
+Header,+,targets/furi_hal_include/furi_hal_crypto.h,,
+Header,+,targets/furi_hal_include/furi_hal_debug.h,,
+Header,+,targets/furi_hal_include/furi_hal_i2c.h,,
+Header,+,targets/furi_hal_include/furi_hal_info.h,,
+Header,+,targets/furi_hal_include/furi_hal_infrared.h,,
+Header,+,targets/furi_hal_include/furi_hal_light.h,,
+Header,+,targets/furi_hal_include/furi_hal_memory.h,,
+Header,+,targets/furi_hal_include/furi_hal_mpu.h,,
+Header,+,targets/furi_hal_include/furi_hal_nfc.h,,
+Header,+,targets/furi_hal_include/furi_hal_power.h,,
+Header,+,targets/furi_hal_include/furi_hal_random.h,,
+Header,+,targets/furi_hal_include/furi_hal_region.h,,
+Header,+,targets/furi_hal_include/furi_hal_rtc.h,,
+Header,+,targets/furi_hal_include/furi_hal_sd.h,,
+Header,+,targets/furi_hal_include/furi_hal_speaker.h,,
+Header,+,targets/furi_hal_include/furi_hal_spi.h,,
+Header,+,targets/furi_hal_include/furi_hal_usb.h,,
+Header,+,targets/furi_hal_include/furi_hal_usb_ccid.h,,
+Header,+,targets/furi_hal_include/furi_hal_usb_hid.h,,
+Header,+,targets/furi_hal_include/furi_hal_usb_hid_u2f.h,,
+Header,+,targets/furi_hal_include/furi_hal_version.h,,
+Header,+,targets/furi_hal_include/furi_hal_vibro.h,,
 Function,-,LL_ADC_CommonDeInit,ErrorStatus,ADC_Common_TypeDef*
 Function,-,LL_ADC_CommonInit,ErrorStatus,"ADC_Common_TypeDef*, const LL_ADC_CommonInitTypeDef*"
 Function,-,LL_ADC_CommonStructInit,void,LL_ADC_CommonInitTypeDef*
@@ -370,10 +373,10 @@ Function,-,__eprintf,void,"const char*, const char*, unsigned int, const char*"
 Function,+,__errno,int*,
 Function,-,__fpclassifyd,int,double
 Function,-,__fpclassifyf,int,float
-Function,+,__furi_crash,void,
+Function,+,__furi_crash_implementation,void,
 Function,+,__furi_critical_enter,__FuriCriticalInfo,
 Function,+,__furi_critical_exit,void,__FuriCriticalInfo
-Function,+,__furi_halt,void,
+Function,+,__furi_halt_implementation,void,
 Function,-,__getdelim,ssize_t,"char**, size_t*, int, FILE*"
 Function,-,__getline,ssize_t,"char**, size_t*, FILE*"
 Function,-,__isinfd,int,double
@@ -485,7 +488,6 @@ Function,-,_perror_r,void,"_reent*, const char*"
 Function,-,_printf_r,int,"_reent*, const char*, ..."
 Function,-,_putc_r,int,"_reent*, int, FILE*"
 Function,-,_putc_unlocked_r,int,"_reent*, int, FILE*"
-Function,-,_putchar,void,char
 Function,-,_putchar_r,int,"_reent*, int"
 Function,-,_putchar_unlocked_r,int,"_reent*, int"
 Function,-,_putenv_r,int,"_reent*, char*"
@@ -839,8 +841,6 @@ Function,-,dprintf,int,"int, const char*, ..."
 Function,-,drand48,double,
 Function,-,drem,double,"double, double"
 Function,-,dremf,float,"float, float"
-Function,-,eTaskConfirmSleepModeStatus,eSleepModeStatus,
-Function,-,eTaskGetState,eTaskState,TaskHandle_t
 Function,+,elements_bold_rounded_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
 Function,+,elements_bubble,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
 Function,+,elements_bubble_str,void,"Canvas*, uint8_t, uint8_t, const char*, Align, Align"
@@ -1536,6 +1536,7 @@ Function,+,furi_hal_vibro_on,void,_Bool
 Function,-,furi_init,void,
 Function,+,furi_kernel_get_tick_frequency,uint32_t,
 Function,+,furi_kernel_is_irq_or_masked,_Bool,
+Function,+,furi_kernel_is_running,_Bool,
 Function,+,furi_kernel_lock,int32_t,
 Function,+,furi_kernel_restore_lock,int32_t,int32_t
 Function,+,furi_kernel_unlock,int32_t,
@@ -1570,7 +1571,7 @@ Function,+,furi_pubsub_subscribe,FuriPubSubSubscription*,"FuriPubSub*, FuriPubSu
 Function,+,furi_pubsub_unsubscribe,void,"FuriPubSub*, FuriPubSubSubscription*"
 Function,+,furi_record_close,void,const char*
 Function,+,furi_record_create,void,"const char*, void*"
-Function,-,furi_record_destroy,_Bool,const char*
+Function,+,furi_record_destroy,_Bool,const char*
 Function,+,furi_record_exists,_Bool,const char*
 Function,-,furi_record_init,void,
 Function,+,furi_record_open,void*,const char*
@@ -1646,7 +1647,6 @@ Function,+,furi_string_utf8_push,void,"FuriString*, FuriStringUnicodeValue"
 Function,+,furi_string_vprintf,int,"FuriString*, const char[], va_list"
 Function,+,furi_thread_alloc,FuriThread*,
 Function,+,furi_thread_alloc_ex,FuriThread*,"const char*, uint32_t, FuriThreadCallback, void*"
-Function,+,furi_thread_catch,void,
 Function,-,furi_thread_disable_heap_trace,void,FuriThread*
 Function,+,furi_thread_enable_heap_trace,void,FuriThread*
 Function,+,furi_thread_enumerate,uint32_t,"FuriThreadId*, uint32_t"
@@ -1687,8 +1687,11 @@ Function,+,furi_thread_suspend,void,FuriThreadId
 Function,+,furi_thread_yield,void,
 Function,+,furi_timer_alloc,FuriTimer*,"FuriTimerCallback, FuriTimerType, void*"
 Function,+,furi_timer_free,void,FuriTimer*
+Function,+,furi_timer_get_expire_time,uint32_t,FuriTimer*
 Function,+,furi_timer_is_running,uint32_t,FuriTimer*
 Function,+,furi_timer_pending_callback,void,"FuriTimerPendigCallback, void*, uint32_t"
+Function,+,furi_timer_restart,FuriStatus,"FuriTimer*, uint32_t"
+Function,+,furi_timer_set_thread_priority,void,FuriTimerThreadPriority
 Function,+,furi_timer_start,FuriStatus,"FuriTimer*, uint32_t"
 Function,+,furi_timer_stop,FuriStatus,FuriTimer*
 Function,-,fwrite,size_t,"const void*, size_t, size_t, FILE*"
@@ -1860,9 +1863,13 @@ Function,+,iso14443_3a_get_sak,uint8_t,const Iso14443_3aData*
 Function,+,iso14443_3a_get_uid,const uint8_t*,"const Iso14443_3aData*, size_t*"
 Function,+,iso14443_3a_is_equal,_Bool,"const Iso14443_3aData*, const Iso14443_3aData*"
 Function,+,iso14443_3a_load,_Bool,"Iso14443_3aData*, FlipperFormat*, uint32_t"
-Function,+,iso14443_3a_poller_read,Iso14443_3aError,"Nfc*, Iso14443_3aData*"
+Function,+,iso14443_3a_poller_activate,Iso14443_3aError,"Iso14443_3aPoller*, Iso14443_3aData*"
+Function,+,iso14443_3a_poller_check_presence,Iso14443_3aError,Iso14443_3aPoller*
+Function,+,iso14443_3a_poller_halt,Iso14443_3aError,Iso14443_3aPoller*
 Function,+,iso14443_3a_poller_send_standard_frame,Iso14443_3aError,"Iso14443_3aPoller*, const BitBuffer*, BitBuffer*, uint32_t"
+Function,+,iso14443_3a_poller_sync_read,Iso14443_3aError,"Nfc*, Iso14443_3aData*"
 Function,+,iso14443_3a_poller_txrx,Iso14443_3aError,"Iso14443_3aPoller*, const BitBuffer*, BitBuffer*, uint32_t"
+Function,+,iso14443_3a_poller_txrx_custom_parity,Iso14443_3aError,"Iso14443_3aPoller*, const BitBuffer*, BitBuffer*, uint32_t"
 Function,+,iso14443_3a_reset,void,Iso14443_3aData*
 Function,+,iso14443_3a_save,_Bool,"const Iso14443_3aData*, FlipperFormat*"
 Function,+,iso14443_3a_set_atqa,void,"Iso14443_3aData*, const uint8_t[2]"
@@ -1881,6 +1888,9 @@ Function,+,iso14443_3b_get_fwt_fc_max,uint32_t,const Iso14443_3bData*
 Function,+,iso14443_3b_get_uid,const uint8_t*,"const Iso14443_3bData*, size_t*"
 Function,+,iso14443_3b_is_equal,_Bool,"const Iso14443_3bData*, const Iso14443_3bData*"
 Function,+,iso14443_3b_load,_Bool,"Iso14443_3bData*, FlipperFormat*, uint32_t"
+Function,+,iso14443_3b_poller_activate,Iso14443_3bError,"Iso14443_3bPoller*, Iso14443_3bData*"
+Function,+,iso14443_3b_poller_halt,Iso14443_3bError,Iso14443_3bPoller*
+Function,+,iso14443_3b_poller_send_frame,Iso14443_3bError,"Iso14443_3bPoller*, const BitBuffer*, BitBuffer*"
 Function,+,iso14443_3b_reset,void,Iso14443_3bData*
 Function,+,iso14443_3b_save,_Bool,"const Iso14443_3bData*, FlipperFormat*"
 Function,+,iso14443_3b_set_uid,_Bool,"Iso14443_3bData*, const uint8_t*, size_t"
@@ -1899,6 +1909,9 @@ Function,+,iso14443_4a_get_historical_bytes,const uint8_t*,"const Iso14443_4aDat
 Function,+,iso14443_4a_get_uid,const uint8_t*,"const Iso14443_4aData*, size_t*"
 Function,+,iso14443_4a_is_equal,_Bool,"const Iso14443_4aData*, const Iso14443_4aData*"
 Function,+,iso14443_4a_load,_Bool,"Iso14443_4aData*, FlipperFormat*, uint32_t"
+Function,+,iso14443_4a_poller_halt,Iso14443_4aError,Iso14443_4aPoller*
+Function,+,iso14443_4a_poller_read_ats,Iso14443_4aError,"Iso14443_4aPoller*, Iso14443_4aAtsData*"
+Function,+,iso14443_4a_poller_send_block,Iso14443_4aError,"Iso14443_4aPoller*, const BitBuffer*, BitBuffer*"
 Function,+,iso14443_4a_reset,void,Iso14443_4aData*
 Function,+,iso14443_4a_save,_Bool,"const Iso14443_4aData*, FlipperFormat*"
 Function,+,iso14443_4a_set_uid,_Bool,"Iso14443_4aData*, const uint8_t*, size_t"
@@ -1913,6 +1926,8 @@ Function,+,iso14443_4b_get_device_name,const char*,"const Iso14443_4bData*, NfcD
 Function,+,iso14443_4b_get_uid,const uint8_t*,"const Iso14443_4bData*, size_t*"
 Function,+,iso14443_4b_is_equal,_Bool,"const Iso14443_4bData*, const Iso14443_4bData*"
 Function,+,iso14443_4b_load,_Bool,"Iso14443_4bData*, FlipperFormat*, uint32_t"
+Function,+,iso14443_4b_poller_halt,Iso14443_4bError,Iso14443_4bPoller*
+Function,+,iso14443_4b_poller_send_block,Iso14443_4bError,"Iso14443_4bPoller*, const BitBuffer*, BitBuffer*"
 Function,+,iso14443_4b_reset,void,Iso14443_4bData*
 Function,+,iso14443_4b_save,_Bool,"const Iso14443_4bData*, FlipperFormat*"
 Function,+,iso14443_4b_set_uid,_Bool,"Iso14443_4bData*, const uint8_t*, size_t"
@@ -2140,14 +2155,21 @@ Function,+,mf_classic_is_sector_read,_Bool,"const MfClassicData*, uint8_t"
 Function,+,mf_classic_is_sector_trailer,_Bool,uint8_t
 Function,+,mf_classic_is_value_block,_Bool,"MfClassicSectorTrailer*, uint8_t"
 Function,+,mf_classic_load,_Bool,"MfClassicData*, FlipperFormat*, uint32_t"
-Function,+,mf_classic_poller_auth,MfClassicError,"Nfc*, uint8_t, MfClassicKey*, MfClassicKeyType, MfClassicAuthContext*"
-Function,+,mf_classic_poller_change_value,MfClassicError,"Nfc*, uint8_t, MfClassicKey*, MfClassicKeyType, int32_t, int32_t*"
-Function,+,mf_classic_poller_collect_nt,MfClassicError,"Nfc*, uint8_t, MfClassicKeyType, MfClassicNt*"
-Function,+,mf_classic_poller_detect_type,MfClassicError,"Nfc*, MfClassicType*"
-Function,+,mf_classic_poller_read,MfClassicError,"Nfc*, const MfClassicDeviceKeys*, MfClassicData*"
-Function,+,mf_classic_poller_read_block,MfClassicError,"Nfc*, uint8_t, MfClassicKey*, MfClassicKeyType, MfClassicBlock*"
-Function,+,mf_classic_poller_read_value,MfClassicError,"Nfc*, uint8_t, MfClassicKey*, MfClassicKeyType, int32_t*"
-Function,+,mf_classic_poller_write_block,MfClassicError,"Nfc*, uint8_t, MfClassicKey*, MfClassicKeyType, MfClassicBlock*"
+Function,+,mf_classic_poller_auth,MfClassicError,"MfClassicPoller*, uint8_t, MfClassicKey*, MfClassicKeyType, MfClassicAuthContext*"
+Function,+,mf_classic_poller_get_nt,MfClassicError,"MfClassicPoller*, uint8_t, MfClassicKeyType, MfClassicNt*"
+Function,+,mf_classic_poller_halt,MfClassicError,MfClassicPoller*
+Function,+,mf_classic_poller_read_block,MfClassicError,"MfClassicPoller*, uint8_t, MfClassicBlock*"
+Function,+,mf_classic_poller_sync_auth,MfClassicError,"Nfc*, uint8_t, MfClassicKey*, MfClassicKeyType, MfClassicAuthContext*"
+Function,+,mf_classic_poller_sync_change_value,MfClassicError,"Nfc*, uint8_t, MfClassicKey*, MfClassicKeyType, int32_t, int32_t*"
+Function,+,mf_classic_poller_sync_collect_nt,MfClassicError,"Nfc*, uint8_t, MfClassicKeyType, MfClassicNt*"
+Function,+,mf_classic_poller_sync_detect_type,MfClassicError,"Nfc*, MfClassicType*"
+Function,+,mf_classic_poller_sync_read,MfClassicError,"Nfc*, const MfClassicDeviceKeys*, MfClassicData*"
+Function,+,mf_classic_poller_sync_read_block,MfClassicError,"Nfc*, uint8_t, MfClassicKey*, MfClassicKeyType, MfClassicBlock*"
+Function,+,mf_classic_poller_sync_read_value,MfClassicError,"Nfc*, uint8_t, MfClassicKey*, MfClassicKeyType, int32_t*"
+Function,+,mf_classic_poller_sync_write_block,MfClassicError,"Nfc*, uint8_t, MfClassicKey*, MfClassicKeyType, MfClassicBlock*"
+Function,+,mf_classic_poller_value_cmd,MfClassicError,"MfClassicPoller*, uint8_t, MfClassicValueCommand, int32_t"
+Function,+,mf_classic_poller_value_transfer,MfClassicError,"MfClassicPoller*, uint8_t"
+Function,+,mf_classic_poller_write_block,MfClassicError,"MfClassicPoller*, uint8_t, MfClassicBlock*"
 Function,+,mf_classic_reset,void,MfClassicData*
 Function,+,mf_classic_save,_Bool,"const MfClassicData*, FlipperFormat*"
 Function,+,mf_classic_set_block_read,void,"MfClassicData*, uint8_t, MfClassicBlock*"
@@ -2167,8 +2189,24 @@ Function,+,mf_desfire_get_file_settings,const MfDesfireFileSettings*,"const MfDe
 Function,+,mf_desfire_get_uid,const uint8_t*,"const MfDesfireData*, size_t*"
 Function,+,mf_desfire_is_equal,_Bool,"const MfDesfireData*, const MfDesfireData*"
 Function,+,mf_desfire_load,_Bool,"MfDesfireData*, FlipperFormat*, uint32_t"
+Function,+,mf_desfire_poller_read_application,MfDesfireError,"MfDesfirePoller*, MfDesfireApplication*"
+Function,+,mf_desfire_poller_read_application_ids,MfDesfireError,"MfDesfirePoller*, SimpleArray*"
+Function,+,mf_desfire_poller_read_applications,MfDesfireError,"MfDesfirePoller*, const SimpleArray*, SimpleArray*"
+Function,+,mf_desfire_poller_read_file_data,MfDesfireError,"MfDesfirePoller*, MfDesfireFileId, uint32_t, size_t, MfDesfireFileData*"
+Function,+,mf_desfire_poller_read_file_data_multi,MfDesfireError,"MfDesfirePoller*, const SimpleArray*, const SimpleArray*, SimpleArray*"
+Function,+,mf_desfire_poller_read_file_ids,MfDesfireError,"MfDesfirePoller*, SimpleArray*"
+Function,+,mf_desfire_poller_read_file_records,MfDesfireError,"MfDesfirePoller*, MfDesfireFileId, uint32_t, size_t, MfDesfireFileData*"
+Function,+,mf_desfire_poller_read_file_settings,MfDesfireError,"MfDesfirePoller*, MfDesfireFileId, MfDesfireFileSettings*"
+Function,+,mf_desfire_poller_read_file_settings_multi,MfDesfireError,"MfDesfirePoller*, const SimpleArray*, SimpleArray*"
+Function,+,mf_desfire_poller_read_file_value,MfDesfireError,"MfDesfirePoller*, MfDesfireFileId, MfDesfireFileData*"
+Function,+,mf_desfire_poller_read_free_memory,MfDesfireError,"MfDesfirePoller*, MfDesfireFreeMemory*"
+Function,+,mf_desfire_poller_read_key_settings,MfDesfireError,"MfDesfirePoller*, MfDesfireKeySettings*"
+Function,+,mf_desfire_poller_read_key_versions,MfDesfireError,"MfDesfirePoller*, SimpleArray*, uint32_t"
+Function,+,mf_desfire_poller_read_version,MfDesfireError,"MfDesfirePoller*, MfDesfireVersion*"
+Function,+,mf_desfire_poller_select_application,MfDesfireError,"MfDesfirePoller*, const MfDesfireApplicationId*"
 Function,+,mf_desfire_reset,void,MfDesfireData*
 Function,+,mf_desfire_save,_Bool,"const MfDesfireData*, FlipperFormat*"
+Function,+,mf_desfire_send_chunks,MfDesfireError,"MfDesfirePoller*, const BitBuffer*, BitBuffer*"
 Function,+,mf_desfire_set_uid,_Bool,"MfDesfireData*, const uint8_t*, size_t"
 Function,+,mf_desfire_verify,_Bool,"MfDesfireData*, const FuriString*"
 Function,+,mf_ultralight_alloc,MfUltralightData*,
@@ -2189,13 +2227,22 @@ Function,+,mf_ultralight_is_counter_configured,_Bool,const MfUltralightData*
 Function,+,mf_ultralight_is_equal,_Bool,"const MfUltralightData*, const MfUltralightData*"
 Function,+,mf_ultralight_is_page_pwd_or_pack,_Bool,"MfUltralightType, uint16_t"
 Function,+,mf_ultralight_load,_Bool,"MfUltralightData*, FlipperFormat*, uint32_t"
-Function,+,mf_ultralight_poller_read_card,MfUltralightError,"Nfc*, MfUltralightData*"
-Function,+,mf_ultralight_poller_read_counter,MfUltralightError,"Nfc*, uint8_t, MfUltralightCounter*"
-Function,+,mf_ultralight_poller_read_page,MfUltralightError,"Nfc*, uint16_t, MfUltralightPage*"
-Function,+,mf_ultralight_poller_read_signature,MfUltralightError,"Nfc*, MfUltralightSignature*"
-Function,+,mf_ultralight_poller_read_tearing_flag,MfUltralightError,"Nfc*, uint8_t, MfUltralightTearingFlag*"
-Function,+,mf_ultralight_poller_read_version,MfUltralightError,"Nfc*, MfUltralightVersion*"
-Function,+,mf_ultralight_poller_write_page,MfUltralightError,"Nfc*, uint16_t, MfUltralightPage*"
+Function,+,mf_ultralight_poller_auth_pwd,MfUltralightError,"MfUltralightPoller*, MfUltralightPollerAuthContext*"
+Function,+,mf_ultralight_poller_authenticate,MfUltralightError,MfUltralightPoller*
+Function,+,mf_ultralight_poller_read_counter,MfUltralightError,"MfUltralightPoller*, uint8_t, MfUltralightCounter*"
+Function,+,mf_ultralight_poller_read_page,MfUltralightError,"MfUltralightPoller*, uint8_t, MfUltralightPageReadCommandData*"
+Function,+,mf_ultralight_poller_read_page_from_sector,MfUltralightError,"MfUltralightPoller*, uint8_t, uint8_t, MfUltralightPageReadCommandData*"
+Function,+,mf_ultralight_poller_read_signature,MfUltralightError,"MfUltralightPoller*, MfUltralightSignature*"
+Function,+,mf_ultralight_poller_read_tearing_flag,MfUltralightError,"MfUltralightPoller*, uint8_t, MfUltralightTearingFlag*"
+Function,+,mf_ultralight_poller_read_version,MfUltralightError,"MfUltralightPoller*, MfUltralightVersion*"
+Function,+,mf_ultralight_poller_sync_read_card,MfUltralightError,"Nfc*, MfUltralightData*"
+Function,+,mf_ultralight_poller_sync_read_counter,MfUltralightError,"Nfc*, uint8_t, MfUltralightCounter*"
+Function,+,mf_ultralight_poller_sync_read_page,MfUltralightError,"Nfc*, uint16_t, MfUltralightPage*"
+Function,+,mf_ultralight_poller_sync_read_signature,MfUltralightError,"Nfc*, MfUltralightSignature*"
+Function,+,mf_ultralight_poller_sync_read_tearing_flag,MfUltralightError,"Nfc*, uint8_t, MfUltralightTearingFlag*"
+Function,+,mf_ultralight_poller_sync_read_version,MfUltralightError,"Nfc*, MfUltralightVersion*"
+Function,+,mf_ultralight_poller_sync_write_page,MfUltralightError,"Nfc*, uint16_t, MfUltralightPage*"
+Function,+,mf_ultralight_poller_write_page,MfUltralightError,"MfUltralightPoller*, uint8_t, const MfUltralightPage*"
 Function,+,mf_ultralight_reset,void,MfUltralightData*
 Function,+,mf_ultralight_save,_Bool,"const MfUltralightData*, FlipperFormat*"
 Function,+,mf_ultralight_set_uid,_Bool,"MfUltralightData*, const uint8_t*, size_t"
@@ -2289,6 +2336,7 @@ Function,+,nfc_poller_free,void,NfcPoller*
 Function,+,nfc_poller_get_data,const NfcDeviceData*,const NfcPoller*
 Function,+,nfc_poller_get_protocol,NfcProtocol,const NfcPoller*
 Function,+,nfc_poller_start,void,"NfcPoller*, NfcGenericCallback, void*"
+Function,+,nfc_poller_start_ex,void,"NfcPoller*, NfcGenericCallbackEx, void*"
 Function,+,nfc_poller_stop,void,NfcPoller*
 Function,+,nfc_poller_trx,NfcError,"Nfc*, const BitBuffer*, BitBuffer*, uint32_t"
 Function,+,nfc_protocol_get_parent,NfcProtocol,NfcProtocol
@@ -2380,8 +2428,6 @@ Function,+,pb_read,_Bool,"pb_istream_t*, pb_byte_t*, size_t"
 Function,+,pb_release,void,"const pb_msgdesc_t*, void*"
 Function,+,pb_skip_field,_Bool,"pb_istream_t*, pb_wire_type_t"
 Function,+,pb_write,_Bool,"pb_ostream_t*, const pb_byte_t*, size_t"
-Function,-,pcTaskGetName,char*,TaskHandle_t
-Function,-,pcTimerGetName,const char*,TimerHandle_t
 Function,-,pclose,int,FILE*
 Function,-,perror,void,const char*
 Function,+,plugin_manager_alloc,PluginManager*,"const char*, uint32_t, const ElfApiInterface*"
@@ -2456,12 +2502,6 @@ Function,-,putchar_unlocked,int,int
 Function,-,putenv,int,char*
 Function,-,puts,int,const char*
 Function,-,putw,int,"int, FILE*"
-Function,-,pvPortCalloc,void*,"size_t, size_t"
-Function,-,pvPortMalloc,void*,size_t
-Function,-,pvTaskGetThreadLocalStoragePointer,void*,"TaskHandle_t, BaseType_t"
-Function,-,pvTaskIncrementMutexHeldCount,TaskHandle_t,
-Function,-,pvTimerGetTimerID,void*,const TimerHandle_t
-Function,-,pxPortInitialiseStack,StackType_t*,"StackType_t*, TaskFunction_t, void*"
 Function,-,qsort,void,"void*, size_t, size_t, __compar_fn_t"
 Function,-,qsort_r,void,"void*, size_t, size_t, int (*)(const void*, const void*, void*), void*"
 Function,-,quick_exit,void,int
@@ -2491,7 +2531,7 @@ Function,-,round,double,double
 Function,+,roundf,float,float
 Function,-,roundl,long double,long double
 Function,+,rpc_session_close,void,RpcSession*
-Function,+,rpc_session_feed,size_t,"RpcSession*, uint8_t*, size_t, TickType_t"
+Function,+,rpc_session_feed,size_t,"RpcSession*, uint8_t*, size_t, uint32_t"
 Function,+,rpc_session_get_available_size,size_t,RpcSession*
 Function,+,rpc_session_get_owner,RpcOwner,RpcSession*
 Function,+,rpc_session_open,RpcSession*,"Rpc*, RpcOwner"
@@ -2500,14 +2540,12 @@ Function,+,rpc_session_set_close_callback,void,"RpcSession*, RpcSessionClosedCal
 Function,+,rpc_session_set_context,void,"RpcSession*, void*"
 Function,+,rpc_session_set_send_bytes_callback,void,"RpcSession*, RpcSendBytesCallback"
 Function,+,rpc_session_set_terminated_callback,void,"RpcSession*, RpcSessionTerminatedCallback"
-Function,+,rpc_system_app_confirm,void,"RpcAppSystem*, RpcAppSystemEvent, _Bool"
+Function,+,rpc_system_app_confirm,void,"RpcAppSystem*, _Bool"
 Function,+,rpc_system_app_error_reset,void,RpcAppSystem*
 Function,+,rpc_system_app_exchange_data,void,"RpcAppSystem*, const uint8_t*, size_t"
-Function,+,rpc_system_app_get_data,const char*,RpcAppSystem*
 Function,+,rpc_system_app_send_exited,void,RpcAppSystem*
 Function,+,rpc_system_app_send_started,void,RpcAppSystem*
 Function,+,rpc_system_app_set_callback,void,"RpcAppSystem*, RpcAppSystemCallback, void*"
-Function,+,rpc_system_app_set_data_exchange_callback,void,"RpcAppSystem*, RpcAppSystemDataExchangeCallback, void*"
 Function,+,rpc_system_app_set_error_code,void,"RpcAppSystem*, uint32_t"
 Function,+,rpc_system_app_set_error_text,void,"RpcAppSystem*, const char*"
 Function,-,rpmatch,int,const char*
@@ -2617,6 +2655,29 @@ Function,+,srand,void,unsigned
 Function,-,srand48,void,long
 Function,-,srandom,void,unsigned
 Function,+,sscanf,int,"const char*, const char*, ..."
+Function,+,st25r3916_change_reg_bits,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t, uint8_t"
+Function,+,st25r3916_change_test_reg_bits,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t, uint8_t"
+Function,+,st25r3916_check_reg,_Bool,"FuriHalSpiBusHandle*, uint8_t, uint8_t, uint8_t"
+Function,+,st25r3916_clear_reg_bits,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t"
+Function,+,st25r3916_direct_cmd,void,"FuriHalSpiBusHandle*, uint8_t"
+Function,+,st25r3916_get_irq,uint32_t,FuriHalSpiBusHandle*
+Function,+,st25r3916_mask_irq,void,"FuriHalSpiBusHandle*, uint32_t"
+Function,+,st25r3916_modify_reg,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t, uint8_t"
+Function,+,st25r3916_read_burst_regs,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t*, uint8_t"
+Function,+,st25r3916_read_fifo,_Bool,"FuriHalSpiBusHandle*, uint8_t*, size_t, size_t*"
+Function,+,st25r3916_read_pta_mem,void,"FuriHalSpiBusHandle*, uint8_t*, size_t"
+Function,+,st25r3916_read_reg,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t*"
+Function,+,st25r3916_read_test_reg,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t*"
+Function,+,st25r3916_reg_read_fifo,void,"FuriHalSpiBusHandle*, uint8_t*, size_t"
+Function,+,st25r3916_reg_write_fifo,void,"FuriHalSpiBusHandle*, const uint8_t*, size_t"
+Function,+,st25r3916_set_reg_bits,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t"
+Function,+,st25r3916_write_burst_regs,void,"FuriHalSpiBusHandle*, uint8_t, const uint8_t*, uint8_t"
+Function,+,st25r3916_write_fifo,void,"FuriHalSpiBusHandle*, const uint8_t*, size_t"
+Function,+,st25r3916_write_pta_mem,void,"FuriHalSpiBusHandle*, const uint8_t*, size_t"
+Function,+,st25r3916_write_ptf_mem,void,"FuriHalSpiBusHandle*, const uint8_t*, size_t"
+Function,+,st25r3916_write_pttsn_mem,void,"FuriHalSpiBusHandle*, uint8_t*, size_t"
+Function,+,st25r3916_write_reg,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t"
+Function,+,st25r3916_write_test_reg,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t"
 Function,+,st25tb_alloc,St25tbData*,
 Function,+,st25tb_copy,void,"St25tbData*, const St25tbData*"
 Function,+,st25tb_free,void,St25tbData*
@@ -2626,11 +2687,18 @@ Function,+,st25tb_get_device_name,const char*,"const St25tbData*, NfcDeviceNameT
 Function,+,st25tb_get_uid,const uint8_t*,"const St25tbData*, size_t*"
 Function,+,st25tb_is_equal,_Bool,"const St25tbData*, const St25tbData*"
 Function,+,st25tb_load,_Bool,"St25tbData*, FlipperFormat*, uint32_t"
+Function,+,st25tb_poller_activate,St25tbError,"St25tbPoller*, St25tbData*"
+Function,+,st25tb_poller_get_uid,St25tbError,"St25tbPoller*, uint8_t*"
+Function,+,st25tb_poller_halt,St25tbError,St25tbPoller*
+Function,+,st25tb_poller_initiate,St25tbError,"St25tbPoller*, uint8_t*"
+Function,+,st25tb_poller_read_block,St25tbError,"St25tbPoller*, uint32_t*, uint8_t"
+Function,+,st25tb_poller_send_frame,St25tbError,"St25tbPoller*, const BitBuffer*, BitBuffer*, uint32_t"
 Function,+,st25tb_reset,void,St25tbData*
 Function,+,st25tb_save,_Bool,"const St25tbData*, FlipperFormat*"
 Function,+,st25tb_set_uid,_Bool,"St25tbData*, const uint8_t*, size_t"
 Function,+,st25tb_verify,_Bool,"St25tbData*, const FuriString*"
 Function,+,storage_common_copy,FS_Error,"Storage*, const char*, const char*"
+Function,+,storage_common_equivalent_path,_Bool,"Storage*, const char*, const char*, _Bool"
 Function,+,storage_common_exists,_Bool,"Storage*, const char*"
 Function,+,storage_common_fs_info,FS_Error,"Storage*, const char*, uint64_t*, uint64_t*"
 Function,+,storage_common_merge,FS_Error,"Storage*, const char*, const char*"
@@ -2649,7 +2717,7 @@ Function,-,storage_dir_rewind,_Bool,File*
 Function,+,storage_error_get_desc,const char*,FS_Error
 Function,+,storage_file_alloc,File*,Storage*
 Function,+,storage_file_close,_Bool,File*
-Function,+,storage_file_copy_to_file,_Bool,"File*, File*, uint32_t"
+Function,+,storage_file_copy_to_file,_Bool,"File*, File*, size_t"
 Function,+,storage_file_eof,_Bool,File*
 Function,+,storage_file_exists,_Bool,"Storage*, const char*"
 Function,+,storage_file_free,void,File*
@@ -2659,13 +2727,13 @@ Function,-,storage_file_get_internal_error,int32_t,File*
 Function,+,storage_file_is_dir,_Bool,File*
 Function,+,storage_file_is_open,_Bool,File*
 Function,+,storage_file_open,_Bool,"File*, const char*, FS_AccessMode, FS_OpenMode"
-Function,+,storage_file_read,uint16_t,"File*, void*, uint16_t"
+Function,+,storage_file_read,size_t,"File*, void*, size_t"
 Function,+,storage_file_seek,_Bool,"File*, uint32_t, _Bool"
 Function,+,storage_file_size,uint64_t,File*
 Function,+,storage_file_sync,_Bool,File*
 Function,+,storage_file_tell,uint64_t,File*
 Function,+,storage_file_truncate,_Bool,File*
-Function,+,storage_file_write,uint16_t,"File*, const void*, uint16_t"
+Function,+,storage_file_write,size_t,"File*, const void*, size_t"
 Function,+,storage_get_next_filename,void,"Storage*, const char*, const char*, const char*, FuriString*, uint8_t"
 Function,+,storage_get_pubsub,FuriPubSub*,Storage*
 Function,+,storage_int_backup,FS_Error,"Storage*, const char*"
@@ -3011,67 +3079,10 @@ Function,-,uECC_sign_deterministic,int,"const uint8_t*, const uint8_t*, unsigned
 Function,-,uECC_valid_public_key,int,"const uint8_t*, uECC_Curve"
 Function,-,uECC_verify,int,"const uint8_t*, const uint8_t*, unsigned, const uint8_t*, uECC_Curve"
 Function,+,uint8_to_hex_chars,void,"const uint8_t*, uint8_t*, int"
-Function,-,ulTaskGenericNotifyTake,uint32_t,"UBaseType_t, BaseType_t, TickType_t"
-Function,-,ulTaskGenericNotifyValueClear,uint32_t,"TaskHandle_t, UBaseType_t, uint32_t"
-Function,-,ulTaskGetIdleRunTimeCounter,uint32_t,
-Function,-,ulTaskGetIdleRunTimePercent,uint32_t,
 Function,-,ungetc,int,"int, FILE*"
 Function,-,unsetenv,int,const char*
 Function,-,usbd_poll,void,usbd_device*
 Function,-,utoa,char*,"unsigned, char*, int"
-Function,-,uxListRemove,UBaseType_t,ListItem_t*
-Function,-,uxTaskGetNumberOfTasks,UBaseType_t,
-Function,-,uxTaskGetStackHighWaterMark,UBaseType_t,TaskHandle_t
-Function,-,uxTaskGetStackHighWaterMark2,uint16_t,TaskHandle_t
-Function,-,uxTaskGetSystemState,UBaseType_t,"TaskStatus_t*, const UBaseType_t, uint32_t*"
-Function,-,uxTaskGetTaskNumber,UBaseType_t,TaskHandle_t
-Function,-,uxTaskPriorityGet,UBaseType_t,const TaskHandle_t
-Function,-,uxTaskPriorityGetFromISR,UBaseType_t,const TaskHandle_t
-Function,-,uxTaskResetEventItemValue,TickType_t,
-Function,-,uxTimerGetReloadMode,UBaseType_t,TimerHandle_t
-Function,-,uxTimerGetTimerNumber,UBaseType_t,TimerHandle_t
-Function,-,vApplicationGetIdleTaskMemory,void,"StaticTask_t**, StackType_t**, uint32_t*"
-Function,-,vApplicationGetTimerTaskMemory,void,"StaticTask_t**, StackType_t**, uint32_t*"
-Function,-,vListInitialise,void,List_t*
-Function,-,vListInitialiseItem,void,ListItem_t*
-Function,-,vListInsert,void,"List_t*, ListItem_t*"
-Function,-,vListInsertEnd,void,"List_t*, ListItem_t*"
-Function,-,vPortDefineHeapRegions,void,const HeapRegion_t*
-Function,-,vPortEndScheduler,void,
-Function,+,vPortEnterCritical,void,
-Function,+,vPortExitCritical,void,
-Function,-,vPortFree,void,void*
-Function,-,vPortGetHeapStats,void,HeapStats_t*
-Function,-,vPortInitialiseBlocks,void,
-Function,-,vPortSuppressTicksAndSleep,void,TickType_t
-Function,-,vTaskAllocateMPURegions,void,"TaskHandle_t, const MemoryRegion_t*"
-Function,-,vTaskDelay,void,const TickType_t
-Function,-,vTaskDelete,void,TaskHandle_t
-Function,-,vTaskEndScheduler,void,
-Function,-,vTaskGenericNotifyGiveFromISR,void,"TaskHandle_t, UBaseType_t, BaseType_t*"
-Function,-,vTaskGetInfo,void,"TaskHandle_t, TaskStatus_t*, BaseType_t, eTaskState"
-Function,-,vTaskGetRunTimeStats,void,char*
-Function,-,vTaskInternalSetTimeOutState,void,TimeOut_t*
-Function,-,vTaskList,void,char*
-Function,-,vTaskMissedYield,void,
-Function,-,vTaskPlaceOnEventList,void,"List_t*, const TickType_t"
-Function,-,vTaskPlaceOnEventListRestricted,void,"List_t*, TickType_t, const BaseType_t"
-Function,-,vTaskPlaceOnUnorderedEventList,void,"List_t*, const TickType_t, const TickType_t"
-Function,-,vTaskPriorityDisinheritAfterTimeout,void,"const TaskHandle_t, UBaseType_t"
-Function,+,vTaskPrioritySet,void,"TaskHandle_t, UBaseType_t"
-Function,-,vTaskRemoveFromUnorderedEventList,void,"ListItem_t*, const TickType_t"
-Function,-,vTaskResume,void,TaskHandle_t
-Function,-,vTaskSetTaskNumber,void,"TaskHandle_t, const UBaseType_t"
-Function,-,vTaskSetThreadLocalStoragePointer,void,"TaskHandle_t, BaseType_t, void*"
-Function,-,vTaskSetTimeOutState,void,TimeOut_t*
-Function,-,vTaskStartScheduler,void,
-Function,-,vTaskStepTick,void,TickType_t
-Function,-,vTaskSuspend,void,TaskHandle_t
-Function,-,vTaskSuspendAll,void,
-Function,-,vTaskSwitchContext,void,
-Function,-,vTimerSetReloadMode,void,"TimerHandle_t, const BaseType_t"
-Function,-,vTimerSetTimerID,void,"TimerHandle_t, void*"
-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*
@@ -3186,43 +3197,6 @@ Function,+,widget_alloc,Widget*,
 Function,+,widget_free,void,Widget*
 Function,+,widget_get_view,View*,Widget*
 Function,+,widget_reset,void,Widget*
-Function,-,xPortGetFreeHeapSize,size_t,
-Function,-,xPortGetMinimumEverFreeHeapSize,size_t,
-Function,-,xPortStartScheduler,BaseType_t,
-Function,-,xTaskAbortDelay,BaseType_t,TaskHandle_t
-Function,-,xTaskCallApplicationTaskHook,BaseType_t,"TaskHandle_t, void*"
-Function,-,xTaskCatchUpTicks,BaseType_t,TickType_t
-Function,-,xTaskCheckForTimeOut,BaseType_t,"TimeOut_t*, TickType_t*"
-Function,-,xTaskCreate,BaseType_t,"TaskFunction_t, const char*, const uint16_t, void*, UBaseType_t, TaskHandle_t*"
-Function,-,xTaskCreateStatic,TaskHandle_t,"TaskFunction_t, const char*, const uint32_t, void*, UBaseType_t, StackType_t*, StaticTask_t*"
-Function,-,xTaskDelayUntil,BaseType_t,"TickType_t*, const TickType_t"
-Function,-,xTaskGenericNotify,BaseType_t,"TaskHandle_t, UBaseType_t, uint32_t, eNotifyAction, uint32_t*"
-Function,-,xTaskGenericNotifyFromISR,BaseType_t,"TaskHandle_t, UBaseType_t, uint32_t, eNotifyAction, uint32_t*, BaseType_t*"
-Function,-,xTaskGenericNotifyStateClear,BaseType_t,"TaskHandle_t, UBaseType_t"
-Function,-,xTaskGenericNotifyWait,BaseType_t,"UBaseType_t, uint32_t, uint32_t, uint32_t*, TickType_t"
-Function,-,xTaskGetCurrentTaskHandle,TaskHandle_t,
-Function,+,xTaskGetHandle,TaskHandle_t,const char*
-Function,-,xTaskGetIdleTaskHandle,TaskHandle_t,
-Function,+,xTaskGetSchedulerState,BaseType_t,
-Function,+,xTaskGetTickCount,TickType_t,
-Function,-,xTaskGetTickCountFromISR,TickType_t,
-Function,-,xTaskIncrementTick,BaseType_t,
-Function,-,xTaskPriorityDisinherit,BaseType_t,const TaskHandle_t
-Function,-,xTaskPriorityInherit,BaseType_t,const TaskHandle_t
-Function,-,xTaskRemoveFromEventList,BaseType_t,const List_t*
-Function,-,xTaskResumeAll,BaseType_t,
-Function,-,xTaskResumeFromISR,BaseType_t,TaskHandle_t
-Function,-,xTimerCreate,TimerHandle_t,"const char*, const TickType_t, const BaseType_t, void*, TimerCallbackFunction_t"
-Function,-,xTimerCreateStatic,TimerHandle_t,"const char*, const TickType_t, const BaseType_t, void*, TimerCallbackFunction_t, StaticTimer_t*"
-Function,-,xTimerCreateTimerTask,BaseType_t,
-Function,-,xTimerGenericCommand,BaseType_t,"TimerHandle_t, const BaseType_t, const TickType_t, BaseType_t*, const TickType_t"
-Function,-,xTimerGetExpiryTime,TickType_t,TimerHandle_t
-Function,-,xTimerGetPeriod,TickType_t,TimerHandle_t
-Function,-,xTimerGetReloadMode,BaseType_t,TimerHandle_t
-Function,-,xTimerGetTimerDaemonTaskHandle,TaskHandle_t,
-Function,-,xTimerIsTimerActive,BaseType_t,TimerHandle_t
-Function,-,xTimerPendFunctionCall,BaseType_t,"PendedFunction_t, void*, uint32_t, TickType_t"
-Function,-,xTimerPendFunctionCallFromISR,BaseType_t,"PendedFunction_t, void*, uint32_t, BaseType_t*"
 Function,-,y0,double,double
 Function,-,y0f,float,float
 Function,-,y1,double,double
diff --git a/firmware/targets/f7/application_ext.ld b/targets/f7/application_ext.ld
similarity index 100%
rename from firmware/targets/f7/application_ext.ld
rename to targets/f7/application_ext.ld
diff --git a/firmware/targets/f7/ble_glue/app_common.h b/targets/f7/ble_glue/app_common.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/app_common.h
rename to targets/f7/ble_glue/app_common.h
diff --git a/firmware/targets/f7/ble_glue/app_conf.h b/targets/f7/ble_glue/app_conf.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/app_conf.h
rename to targets/f7/ble_glue/app_conf.h
diff --git a/firmware/targets/f7/ble_glue/app_debug.c b/targets/f7/ble_glue/app_debug.c
similarity index 100%
rename from firmware/targets/f7/ble_glue/app_debug.c
rename to targets/f7/ble_glue/app_debug.c
diff --git a/firmware/targets/f7/ble_glue/app_debug.h b/targets/f7/ble_glue/app_debug.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/app_debug.h
rename to targets/f7/ble_glue/app_debug.h
diff --git a/firmware/targets/f7/ble_glue/ble_app.c b/targets/f7/ble_glue/ble_app.c
similarity index 100%
rename from firmware/targets/f7/ble_glue/ble_app.c
rename to targets/f7/ble_glue/ble_app.c
diff --git a/firmware/targets/f7/ble_glue/ble_app.h b/targets/f7/ble_glue/ble_app.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/ble_app.h
rename to targets/f7/ble_glue/ble_app.h
diff --git a/firmware/targets/f7/ble_glue/ble_conf.h b/targets/f7/ble_glue/ble_conf.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/ble_conf.h
rename to targets/f7/ble_glue/ble_conf.h
diff --git a/firmware/targets/f7/ble_glue/ble_const.h b/targets/f7/ble_glue/ble_const.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/ble_const.h
rename to targets/f7/ble_glue/ble_const.h
diff --git a/firmware/targets/f7/ble_glue/ble_dbg_conf.h b/targets/f7/ble_glue/ble_dbg_conf.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/ble_dbg_conf.h
rename to targets/f7/ble_glue/ble_dbg_conf.h
diff --git a/firmware/targets/f7/ble_glue/ble_glue.c b/targets/f7/ble_glue/ble_glue.c
similarity index 100%
rename from firmware/targets/f7/ble_glue/ble_glue.c
rename to targets/f7/ble_glue/ble_glue.c
diff --git a/firmware/targets/f7/ble_glue/ble_glue.h b/targets/f7/ble_glue/ble_glue.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/ble_glue.h
rename to targets/f7/ble_glue/ble_glue.h
diff --git a/firmware/targets/f7/ble_glue/compiler.h b/targets/f7/ble_glue/compiler.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/compiler.h
rename to targets/f7/ble_glue/compiler.h
diff --git a/firmware/targets/f7/ble_glue/gap.c b/targets/f7/ble_glue/gap.c
similarity index 99%
rename from firmware/targets/f7/ble_glue/gap.c
rename to targets/f7/ble_glue/gap.c
index 360c1f6b..f0533567 100644
--- a/firmware/targets/f7/ble_glue/gap.c
+++ b/targets/f7/ble_glue/gap.c
@@ -532,8 +532,6 @@ void gap_thread_stop() {
         // Free resources
         furi_mutex_free(gap->state_mutex);
         furi_message_queue_free(gap->command_queue);
-        furi_timer_stop(gap->advertise_timer);
-        while(xTimerIsTimerActive(gap->advertise_timer) == pdTRUE) furi_delay_tick(1);
         furi_timer_free(gap->advertise_timer);
         free(gap);
         gap = NULL;
diff --git a/firmware/targets/f7/ble_glue/gap.h b/targets/f7/ble_glue/gap.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/gap.h
rename to targets/f7/ble_glue/gap.h
diff --git a/firmware/targets/f7/ble_glue/hsem_map.h b/targets/f7/ble_glue/hsem_map.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/hsem_map.h
rename to targets/f7/ble_glue/hsem_map.h
diff --git a/firmware/targets/f7/ble_glue/hw_ipcc.c b/targets/f7/ble_glue/hw_ipcc.c
similarity index 100%
rename from firmware/targets/f7/ble_glue/hw_ipcc.c
rename to targets/f7/ble_glue/hw_ipcc.c
diff --git a/firmware/targets/f7/ble_glue/osal.h b/targets/f7/ble_glue/osal.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/osal.h
rename to targets/f7/ble_glue/osal.h
diff --git a/firmware/targets/f7/ble_glue/services/battery_service.c b/targets/f7/ble_glue/services/battery_service.c
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/battery_service.c
rename to targets/f7/ble_glue/services/battery_service.c
diff --git a/firmware/targets/f7/ble_glue/services/battery_service.h b/targets/f7/ble_glue/services/battery_service.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/battery_service.h
rename to targets/f7/ble_glue/services/battery_service.h
diff --git a/firmware/targets/f7/ble_glue/services/dev_info_service.c b/targets/f7/ble_glue/services/dev_info_service.c
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/dev_info_service.c
rename to targets/f7/ble_glue/services/dev_info_service.c
diff --git a/firmware/targets/f7/ble_glue/services/dev_info_service.h b/targets/f7/ble_glue/services/dev_info_service.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/dev_info_service.h
rename to targets/f7/ble_glue/services/dev_info_service.h
diff --git a/firmware/targets/f7/ble_glue/services/dev_info_service_uuid.inc b/targets/f7/ble_glue/services/dev_info_service_uuid.inc
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/dev_info_service_uuid.inc
rename to targets/f7/ble_glue/services/dev_info_service_uuid.inc
diff --git a/firmware/targets/f7/ble_glue/services/gatt_char.c b/targets/f7/ble_glue/services/gatt_char.c
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/gatt_char.c
rename to targets/f7/ble_glue/services/gatt_char.c
diff --git a/firmware/targets/f7/ble_glue/services/gatt_char.h b/targets/f7/ble_glue/services/gatt_char.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/gatt_char.h
rename to targets/f7/ble_glue/services/gatt_char.h
diff --git a/firmware/targets/f7/ble_glue/services/hid_service.c b/targets/f7/ble_glue/services/hid_service.c
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/hid_service.c
rename to targets/f7/ble_glue/services/hid_service.c
diff --git a/firmware/targets/f7/ble_glue/services/hid_service.h b/targets/f7/ble_glue/services/hid_service.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/hid_service.h
rename to targets/f7/ble_glue/services/hid_service.h
diff --git a/firmware/targets/f7/ble_glue/services/serial_service.c b/targets/f7/ble_glue/services/serial_service.c
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/serial_service.c
rename to targets/f7/ble_glue/services/serial_service.c
diff --git a/firmware/targets/f7/ble_glue/services/serial_service.h b/targets/f7/ble_glue/services/serial_service.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/serial_service.h
rename to targets/f7/ble_glue/services/serial_service.h
diff --git a/firmware/targets/f7/ble_glue/services/serial_service_uuid.inc b/targets/f7/ble_glue/services/serial_service_uuid.inc
similarity index 100%
rename from firmware/targets/f7/ble_glue/services/serial_service_uuid.inc
rename to targets/f7/ble_glue/services/serial_service_uuid.inc
diff --git a/firmware/targets/f7/ble_glue/tl_dbg_conf.h b/targets/f7/ble_glue/tl_dbg_conf.h
similarity index 100%
rename from firmware/targets/f7/ble_glue/tl_dbg_conf.h
rename to targets/f7/ble_glue/tl_dbg_conf.h
diff --git a/firmware/targets/f7/fatfs/fatfs.c b/targets/f7/fatfs/fatfs.c
similarity index 100%
rename from firmware/targets/f7/fatfs/fatfs.c
rename to targets/f7/fatfs/fatfs.c
diff --git a/firmware/targets/f7/fatfs/fatfs.h b/targets/f7/fatfs/fatfs.h
similarity index 100%
rename from firmware/targets/f7/fatfs/fatfs.h
rename to targets/f7/fatfs/fatfs.h
diff --git a/firmware/targets/f7/fatfs/ffconf.h b/targets/f7/fatfs/ffconf.h
similarity index 100%
rename from firmware/targets/f7/fatfs/ffconf.h
rename to targets/f7/fatfs/ffconf.h
diff --git a/firmware/targets/f7/fatfs/sector_cache.c b/targets/f7/fatfs/sector_cache.c
similarity index 100%
rename from firmware/targets/f7/fatfs/sector_cache.c
rename to targets/f7/fatfs/sector_cache.c
diff --git a/firmware/targets/f7/fatfs/sector_cache.h b/targets/f7/fatfs/sector_cache.h
similarity index 100%
rename from firmware/targets/f7/fatfs/sector_cache.h
rename to targets/f7/fatfs/sector_cache.h
diff --git a/firmware/targets/f7/fatfs/user_diskio.c b/targets/f7/fatfs/user_diskio.c
similarity index 100%
rename from firmware/targets/f7/fatfs/user_diskio.c
rename to targets/f7/fatfs/user_diskio.c
diff --git a/firmware/targets/f7/fatfs/user_diskio.h b/targets/f7/fatfs/user_diskio.h
similarity index 100%
rename from firmware/targets/f7/fatfs/user_diskio.h
rename to targets/f7/fatfs/user_diskio.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal.c b/targets/f7/furi_hal/furi_hal.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal.c
rename to targets/f7/furi_hal/furi_hal.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_bt.c b/targets/f7/furi_hal/furi_hal_bt.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_bt.c
rename to targets/f7/furi_hal/furi_hal_bt.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_bt_hid.c b/targets/f7/furi_hal/furi_hal_bt_hid.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_bt_hid.c
rename to targets/f7/furi_hal/furi_hal_bt_hid.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_bt_serial.c b/targets/f7/furi_hal/furi_hal_bt_serial.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_bt_serial.c
rename to targets/f7/furi_hal/furi_hal_bt_serial.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_bus.c b/targets/f7/furi_hal/furi_hal_bus.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_bus.c
rename to targets/f7/furi_hal/furi_hal_bus.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_bus.h b/targets/f7/furi_hal/furi_hal_bus.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_bus.h
rename to targets/f7/furi_hal/furi_hal_bus.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_clock.c b/targets/f7/furi_hal/furi_hal_clock.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_clock.c
rename to targets/f7/furi_hal/furi_hal_clock.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_clock.h b/targets/f7/furi_hal/furi_hal_clock.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_clock.h
rename to targets/f7/furi_hal/furi_hal_clock.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_console.c b/targets/f7/furi_hal/furi_hal_console.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_console.c
rename to targets/f7/furi_hal/furi_hal_console.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_console.h b/targets/f7/furi_hal/furi_hal_console.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_console.h
rename to targets/f7/furi_hal/furi_hal_console.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_cortex.c b/targets/f7/furi_hal/furi_hal_cortex.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_cortex.c
rename to targets/f7/furi_hal/furi_hal_cortex.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_crypto.c b/targets/f7/furi_hal/furi_hal_crypto.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_crypto.c
rename to targets/f7/furi_hal/furi_hal_crypto.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_debug.c b/targets/f7/furi_hal/furi_hal_debug.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_debug.c
rename to targets/f7/furi_hal/furi_hal_debug.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_dma.c b/targets/f7/furi_hal/furi_hal_dma.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_dma.c
rename to targets/f7/furi_hal/furi_hal_dma.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_dma.h b/targets/f7/furi_hal/furi_hal_dma.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_dma.h
rename to targets/f7/furi_hal/furi_hal_dma.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_flash.c b/targets/f7/furi_hal/furi_hal_flash.c
similarity index 99%
rename from firmware/targets/f7/furi_hal/furi_hal_flash.c
rename to targets/f7/furi_hal/furi_hal_flash.c
index bc65b29e..7ac7a8bd 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_flash.c
+++ b/targets/f7/furi_hal/furi_hal_flash.c
@@ -11,6 +11,9 @@
 
 #include <hsem_map.h>
 
+#include <FreeRTOS.h>
+#include <task.h>
+
 #define TAG "FuriHalFlash"
 
 #define FURI_HAL_CRITICAL_MSG "Critical flash operation fail"
@@ -98,7 +101,7 @@ void furi_hal_flash_init() {
     // WRITE_REG(FLASH->SR, FLASH_SR_OPTVERR);
     /* Actually, reset all error flags on start */
     if(READ_BIT(FLASH->SR, FURI_HAL_FLASH_SR_ERRORS)) {
-        FURI_LOG_E(TAG, "FLASH->SR 0x%08lX", FLASH->SR);
+        FURI_LOG_W(TAG, "FLASH->SR 0x%08lX(Known ERRATA)", FLASH->SR);
         WRITE_REG(FLASH->SR, FURI_HAL_FLASH_SR_ERRORS);
     }
 }
diff --git a/firmware/targets/f7/furi_hal/furi_hal_flash.h b/targets/f7/furi_hal/furi_hal_flash.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_flash.h
rename to targets/f7/furi_hal/furi_hal_flash.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_gpio.c b/targets/f7/furi_hal/furi_hal_gpio.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_gpio.c
rename to targets/f7/furi_hal/furi_hal_gpio.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_gpio.h b/targets/f7/furi_hal/furi_hal_gpio.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_gpio.h
rename to targets/f7/furi_hal/furi_hal_gpio.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_i2c.c b/targets/f7/furi_hal/furi_hal_i2c.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_i2c.c
rename to targets/f7/furi_hal/furi_hal_i2c.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_i2c_config.c b/targets/f7/furi_hal/furi_hal_i2c_config.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_i2c_config.c
rename to targets/f7/furi_hal/furi_hal_i2c_config.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_i2c_config.h b/targets/f7/furi_hal/furi_hal_i2c_config.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_i2c_config.h
rename to targets/f7/furi_hal/furi_hal_i2c_config.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_i2c_types.h b/targets/f7/furi_hal/furi_hal_i2c_types.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_i2c_types.h
rename to targets/f7/furi_hal/furi_hal_i2c_types.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_ibutton.c b/targets/f7/furi_hal/furi_hal_ibutton.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_ibutton.c
rename to targets/f7/furi_hal/furi_hal_ibutton.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_ibutton.h b/targets/f7/furi_hal/furi_hal_ibutton.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_ibutton.h
rename to targets/f7/furi_hal/furi_hal_ibutton.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_idle_timer.h b/targets/f7/furi_hal/furi_hal_idle_timer.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_idle_timer.h
rename to targets/f7/furi_hal/furi_hal_idle_timer.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_info.c b/targets/f7/furi_hal/furi_hal_info.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_info.c
rename to targets/f7/furi_hal/furi_hal_info.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_infrared.c b/targets/f7/furi_hal/furi_hal_infrared.c
similarity index 99%
rename from firmware/targets/f7/furi_hal/furi_hal_infrared.c
rename to targets/f7/furi_hal/furi_hal_infrared.c
index d3e36c2b..3b20b6bc 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_infrared.c
+++ b/targets/f7/furi_hal/furi_hal_infrared.c
@@ -125,7 +125,7 @@ static void furi_hal_infrared_tim_rx_isr() {
             if(infrared_tim_rx.capture_callback)
                 infrared_tim_rx.capture_callback(infrared_tim_rx.capture_context, 1, duration);
         } else {
-            furi_assert(0);
+            furi_crash();
         }
     }
 
@@ -141,7 +141,7 @@ static void furi_hal_infrared_tim_rx_isr() {
             if(infrared_tim_rx.capture_callback)
                 infrared_tim_rx.capture_callback(infrared_tim_rx.capture_context, 0, duration);
         } else {
-            furi_assert(0);
+            furi_crash();
         }
     }
 }
@@ -254,7 +254,7 @@ static uint8_t furi_hal_infrared_get_current_dma_tx_buffer(void) {
     } else if(buffer_adr == (uint32_t)infrared_tim_tx.buffer[1].data) {
         buf_num = 1;
     } else {
-        furi_assert(0);
+        furi_crash();
     }
     return buf_num;
 }
@@ -263,7 +263,7 @@ static void furi_hal_infrared_tx_dma_polarity_isr() {
 #if INFRARED_DMA_CH1_CHANNEL == LL_DMA_CHANNEL_1
     if(LL_DMA_IsActiveFlag_TE1(INFRARED_DMA)) {
         LL_DMA_ClearFlag_TE1(INFRARED_DMA);
-        furi_crash(NULL);
+        furi_crash();
     }
     if(LL_DMA_IsActiveFlag_TC1(INFRARED_DMA) && LL_DMA_IsEnabledIT_TC(INFRARED_DMA_CH1_DEF)) {
         LL_DMA_ClearFlag_TC1(INFRARED_DMA);
@@ -285,7 +285,7 @@ static void furi_hal_infrared_tx_dma_isr() {
 #if INFRARED_DMA_CH2_CHANNEL == LL_DMA_CHANNEL_2
     if(LL_DMA_IsActiveFlag_TE2(INFRARED_DMA)) {
         LL_DMA_ClearFlag_TE2(INFRARED_DMA);
-        furi_crash(NULL);
+        furi_crash();
     }
     if(LL_DMA_IsActiveFlag_HT2(INFRARED_DMA) && LL_DMA_IsEnabledIT_HT(INFRARED_DMA_CH2_DEF)) {
         LL_DMA_ClearFlag_HT2(INFRARED_DMA);
@@ -303,7 +303,7 @@ static void furi_hal_infrared_tx_dma_isr() {
         } else if(furi_hal_infrared_state == InfraredStateAsyncTxStopReq) {
             /* fallthrough */
         } else {
-            furi_crash(NULL);
+            furi_crash();
         }
     }
     if(LL_DMA_IsActiveFlag_TC2(INFRARED_DMA) && LL_DMA_IsEnabledIT_TC(INFRARED_DMA_CH2_DEF)) {
@@ -596,7 +596,7 @@ static void furi_hal_infrared_async_tx_free_resources(void) {
 void furi_hal_infrared_async_tx_start(uint32_t freq, float duty_cycle) {
     if((duty_cycle > 1) || (duty_cycle <= 0) || (freq > INFRARED_MAX_FREQUENCY) ||
        (freq < INFRARED_MIN_FREQUENCY) || (infrared_tim_tx.data_callback == NULL)) {
-        furi_crash(NULL);
+        furi_crash();
     }
 
     furi_assert(furi_hal_infrared_state == InfraredStateIdle);
diff --git a/firmware/targets/f7/furi_hal/furi_hal_interrupt.c b/targets/f7/furi_hal/furi_hal_interrupt.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_interrupt.c
rename to targets/f7/furi_hal/furi_hal_interrupt.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_interrupt.h b/targets/f7/furi_hal/furi_hal_interrupt.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_interrupt.h
rename to targets/f7/furi_hal/furi_hal_interrupt.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_light.c b/targets/f7/furi_hal/furi_hal_light.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_light.c
rename to targets/f7/furi_hal/furi_hal_light.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_memory.c b/targets/f7/furi_hal/furi_hal_memory.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_memory.c
rename to targets/f7/furi_hal/furi_hal_memory.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_mpu.c b/targets/f7/furi_hal/furi_hal_mpu.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_mpu.c
rename to targets/f7/furi_hal/furi_hal_mpu.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc.c b/targets/f7/furi_hal/furi_hal_nfc.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_nfc.c
rename to targets/f7/furi_hal/furi_hal_nfc.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc_event.c b/targets/f7/furi_hal/furi_hal_nfc_event.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_nfc_event.c
rename to targets/f7/furi_hal/furi_hal_nfc_event.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc_felica.c b/targets/f7/furi_hal/furi_hal_nfc_felica.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_nfc_felica.c
rename to targets/f7/furi_hal/furi_hal_nfc_felica.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc_i.h b/targets/f7/furi_hal/furi_hal_nfc_i.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_nfc_i.h
rename to targets/f7/furi_hal/furi_hal_nfc_i.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc_irq.c b/targets/f7/furi_hal/furi_hal_nfc_irq.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_nfc_irq.c
rename to targets/f7/furi_hal/furi_hal_nfc_irq.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc_iso14443a.c b/targets/f7/furi_hal/furi_hal_nfc_iso14443a.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_nfc_iso14443a.c
rename to targets/f7/furi_hal/furi_hal_nfc_iso14443a.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc_iso14443b.c b/targets/f7/furi_hal/furi_hal_nfc_iso14443b.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_nfc_iso14443b.c
rename to targets/f7/furi_hal/furi_hal_nfc_iso14443b.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc_iso15693.c b/targets/f7/furi_hal/furi_hal_nfc_iso15693.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_nfc_iso15693.c
rename to targets/f7/furi_hal/furi_hal_nfc_iso15693.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc_tech_i.h b/targets/f7/furi_hal/furi_hal_nfc_tech_i.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_nfc_tech_i.h
rename to targets/f7/furi_hal/furi_hal_nfc_tech_i.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc_timer.c b/targets/f7/furi_hal/furi_hal_nfc_timer.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_nfc_timer.c
rename to targets/f7/furi_hal/furi_hal_nfc_timer.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_os.c b/targets/f7/furi_hal/furi_hal_os.c
similarity index 99%
rename from firmware/targets/f7/furi_hal/furi_hal_os.c
rename to targets/f7/furi_hal/furi_hal_os.c
index 046cf79d..ea835b95 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_os.c
+++ b/targets/f7/furi_hal/furi_hal_os.c
@@ -10,6 +10,9 @@
 
 #include <furi.h>
 
+#include <FreeRTOS.h>
+#include <task.h>
+
 #define TAG "FuriHalOs"
 
 #define FURI_HAL_IDLE_TIMER_CLK_HZ 32768
diff --git a/firmware/targets/f7/furi_hal/furi_hal_os.h b/targets/f7/furi_hal/furi_hal_os.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_os.h
rename to targets/f7/furi_hal/furi_hal_os.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_power.c b/targets/f7/furi_hal/furi_hal_power.c
similarity index 95%
rename from firmware/targets/f7/furi_hal/furi_hal_power.c
rename to targets/f7/furi_hal/furi_hal_power.c
index 0eb93e66..9e3a70da 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_power.c
+++ b/targets/f7/furi_hal/furi_hal_power.c
@@ -71,12 +71,37 @@ void furi_hal_power_init() {
 
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     // Find and init gauge
-    if(bq27220_init(&furi_hal_i2c_handle_power)) {
-        furi_hal_power.gauge_ok = bq27220_apply_data_memory(
-            &furi_hal_i2c_handle_power, furi_hal_power_gauge_data_memory);
+    size_t retry = 2;
+    while(retry > 0) {
+        furi_hal_power.gauge_ok = bq27220_init(&furi_hal_i2c_handle_power);
+        if(furi_hal_power.gauge_ok) {
+            furi_hal_power.gauge_ok = bq27220_apply_data_memory(
+                &furi_hal_i2c_handle_power, furi_hal_power_gauge_data_memory);
+        }
+        if(furi_hal_power.gauge_ok) {
+            break;
+        } else {
+            // Normal startup time is 250ms
+            // But if we try to access gauge at that stage it will become unresponsive
+            // 2 seconds timeout needed to restart communication
+            furi_delay_us(2020202);
+        }
+        retry--;
     }
     // Find and init charger
-    furi_hal_power.charger_ok = bq25896_init(&furi_hal_i2c_handle_power);
+    retry = 2;
+    while(retry > 0) {
+        furi_hal_power.charger_ok = bq25896_init(&furi_hal_i2c_handle_power);
+        if(furi_hal_power.charger_ok) {
+            break;
+        } else {
+            // Most likely I2C communication error
+            // 2 seconds should be enough for all chips on the line to timeout
+            // Also timing out here is very abnormal
+            furi_delay_us(2020202);
+        }
+        retry--;
+    }
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
 
     FURI_LOG_I(TAG, "Init OK");
@@ -459,10 +484,10 @@ void furi_hal_power_disable_external_3_3v() {
 }
 
 void furi_hal_power_suppress_charge_enter() {
-    vTaskSuspendAll();
+    FURI_CRITICAL_ENTER();
     bool disable_charging = furi_hal_power.suppress_charge == 0;
     furi_hal_power.suppress_charge++;
-    xTaskResumeAll();
+    FURI_CRITICAL_EXIT();
 
     if(disable_charging) {
         furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
@@ -472,10 +497,10 @@ void furi_hal_power_suppress_charge_enter() {
 }
 
 void furi_hal_power_suppress_charge_exit() {
-    vTaskSuspendAll();
+    FURI_CRITICAL_ENTER();
     furi_hal_power.suppress_charge--;
     bool enable_charging = furi_hal_power.suppress_charge == 0;
-    xTaskResumeAll();
+    FURI_CRITICAL_EXIT();
 
     if(enable_charging) {
         furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
diff --git a/firmware/targets/f7/furi_hal/furi_hal_power_config.c b/targets/f7/furi_hal/furi_hal_power_config.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_power_config.c
rename to targets/f7/furi_hal/furi_hal_power_config.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_pwm.c b/targets/f7/furi_hal/furi_hal_pwm.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_pwm.c
rename to targets/f7/furi_hal/furi_hal_pwm.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_pwm.h b/targets/f7/furi_hal/furi_hal_pwm.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_pwm.h
rename to targets/f7/furi_hal/furi_hal_pwm.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_random.c b/targets/f7/furi_hal/furi_hal_random.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_random.c
rename to targets/f7/furi_hal/furi_hal_random.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_region.c b/targets/f7/furi_hal/furi_hal_region.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_region.c
rename to targets/f7/furi_hal/furi_hal_region.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_resources.c b/targets/f7/furi_hal/furi_hal_resources.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_resources.c
rename to targets/f7/furi_hal/furi_hal_resources.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_resources.h b/targets/f7/furi_hal/furi_hal_resources.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_resources.h
rename to targets/f7/furi_hal/furi_hal_resources.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_rfid.c b/targets/f7/furi_hal/furi_hal_rfid.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_rfid.c
rename to targets/f7/furi_hal/furi_hal_rfid.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_rfid.h b/targets/f7/furi_hal/furi_hal_rfid.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_rfid.h
rename to targets/f7/furi_hal/furi_hal_rfid.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_rtc.c b/targets/f7/furi_hal/furi_hal_rtc.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_rtc.c
rename to targets/f7/furi_hal/furi_hal_rtc.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_sd.c b/targets/f7/furi_hal/furi_hal_sd.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_sd.c
rename to targets/f7/furi_hal/furi_hal_sd.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_speaker.c b/targets/f7/furi_hal/furi_hal_speaker.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_speaker.c
rename to targets/f7/furi_hal/furi_hal_speaker.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_spi.c b/targets/f7/furi_hal/furi_hal_spi.c
similarity index 99%
rename from firmware/targets/f7/furi_hal/furi_hal_spi.c
rename to targets/f7/furi_hal/furi_hal_spi.c
index a8884105..98ca71af 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_spi.c
+++ b/targets/f7/furi_hal/furi_hal_spi.c
@@ -200,7 +200,7 @@ bool furi_hal_spi_bus_trx_dma(
     furi_assert(size > 0);
 
     // If scheduler is not running, use blocking mode
-    if(xTaskGetSchedulerState() != taskSCHEDULER_RUNNING) {
+    if(furi_kernel_is_running()) {
         return furi_hal_spi_bus_trx(handle, tx_buffer, rx_buffer, size, timeout_ms);
     }
 
@@ -221,7 +221,7 @@ bool furi_hal_spi_bus_trx_dma(
         dma_rx_req = LL_DMAMUX_REQ_SPI2_RX;
         dma_tx_req = LL_DMAMUX_REQ_SPI2_TX;
     } else {
-        furi_crash(NULL);
+        furi_crash();
     }
 
     if(rx_buffer == NULL) {
diff --git a/firmware/targets/f7/furi_hal/furi_hal_spi_config.c b/targets/f7/furi_hal/furi_hal_spi_config.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_spi_config.c
rename to targets/f7/furi_hal/furi_hal_spi_config.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_spi_config.h b/targets/f7/furi_hal/furi_hal_spi_config.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_spi_config.h
rename to targets/f7/furi_hal/furi_hal_spi_config.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_spi_types.h b/targets/f7/furi_hal/furi_hal_spi_types.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_spi_types.h
rename to targets/f7/furi_hal/furi_hal_spi_types.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_subghz.c b/targets/f7/furi_hal/furi_hal_subghz.c
similarity index 92%
rename from firmware/targets/f7/furi_hal/furi_hal_subghz.c
rename to targets/f7/furi_hal/furi_hal_subghz.c
index ac71b5f6..a00ca7bf 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_subghz.c
+++ b/targets/f7/furi_hal/furi_hal_subghz.c
@@ -4,6 +4,7 @@
 #include <furi_hal_version.h>
 #include <furi_hal_rtc.h>
 #include <furi_hal_spi.h>
+#include <furi_hal_cortex.h>
 #include <furi_hal_interrupt.h>
 #include <furi_hal_resources.h>
 #include <furi_hal_bus.h>
@@ -29,7 +30,7 @@ static uint32_t furi_hal_subghz_debug_gpio_buff[2];
 /** SubGhz state */
 typedef enum {
     SubGhzStateInit, /**< Init pending */
-
+    SubGhzStateBroken, /**< Chip power-on self test failed */
     SubGhzStateIdle, /**< Idle, energy save mode */
 
     SubGhzStateAsyncRx, /**< Async RX started */
@@ -69,46 +70,67 @@ const GpioPin* furi_hal_subghz_get_data_gpio() {
 
 void furi_hal_subghz_init() {
     furi_assert(furi_hal_subghz.state == SubGhzStateInit);
-    furi_hal_subghz.state = SubGhzStateIdle;
+    furi_hal_subghz.state = SubGhzStateBroken;
 
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
-
+    do {
 #ifdef FURI_HAL_SUBGHZ_TX_GPIO
-    furi_hal_gpio_init(&FURI_HAL_SUBGHZ_TX_GPIO, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
+        furi_hal_gpio_init(
+            &FURI_HAL_SUBGHZ_TX_GPIO, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
 #endif
 
-    // Reset
-    furi_hal_gpio_init(&gpio_cc1101_g0, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
-    cc1101_reset(&furi_hal_spi_bus_handle_subghz);
-    cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_IOCFG0, CC1101IocfgHighImpedance);
+        // Reset
+        furi_hal_gpio_init(&gpio_cc1101_g0, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
+        cc1101_reset(&furi_hal_spi_bus_handle_subghz);
+        cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_IOCFG0, CC1101IocfgHighImpedance);
 
-    // Prepare GD0 for power on self test
-    furi_hal_gpio_init(&gpio_cc1101_g0, GpioModeInput, GpioPullNo, GpioSpeedLow);
+        // Prepare GD0 for power on self test
+        furi_hal_gpio_init(&gpio_cc1101_g0, GpioModeInput, GpioPullNo, GpioSpeedLow);
 
-    // GD0 low
-    cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_IOCFG0, CC1101IocfgHW);
-    while(furi_hal_gpio_read(&gpio_cc1101_g0) != false)
-        ;
+        // GD0 low
+        FuriHalCortexTimer timeout = furi_hal_cortex_timer_get(10000);
+        cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_IOCFG0, CC1101IocfgHW);
+        while(furi_hal_gpio_read(&gpio_cc1101_g0) != false &&
+              !furi_hal_cortex_timer_is_expired(timeout))
+            ;
 
-    // GD0 high
-    cc1101_write_reg(
-        &furi_hal_spi_bus_handle_subghz, CC1101_IOCFG0, CC1101IocfgHW | CC1101_IOCFG_INV);
-    while(furi_hal_gpio_read(&gpio_cc1101_g0) != true)
-        ;
+        if(furi_hal_gpio_read(&gpio_cc1101_g0) != false) {
+            break;
+        }
 
-    // Reset GD0 to floating state
-    cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_IOCFG0, CC1101IocfgHighImpedance);
-    furi_hal_gpio_init(&gpio_cc1101_g0, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
+        // GD0 high
+        timeout = furi_hal_cortex_timer_get(10000);
+        cc1101_write_reg(
+            &furi_hal_spi_bus_handle_subghz, CC1101_IOCFG0, CC1101IocfgHW | CC1101_IOCFG_INV);
+        while(furi_hal_gpio_read(&gpio_cc1101_g0) != true &&
+              !furi_hal_cortex_timer_is_expired(timeout))
+            ;
 
-    // RF switches
-    furi_hal_gpio_init(&gpio_rf_sw_0, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
-    cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_IOCFG2, CC1101IocfgHW);
+        if(furi_hal_gpio_read(&gpio_cc1101_g0) != true) {
+            break;
+        }
 
-    // Go to sleep
-    cc1101_shutdown(&furi_hal_spi_bus_handle_subghz);
+        // Reset GD0 to floating state
+        cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_IOCFG0, CC1101IocfgHighImpedance);
+        furi_hal_gpio_init(&gpio_cc1101_g0, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
+
+        // RF switches
+        furi_hal_gpio_init(&gpio_rf_sw_0, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
+        cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_IOCFG2, CC1101IocfgHW);
+
+        // Go to sleep
+        cc1101_shutdown(&furi_hal_spi_bus_handle_subghz);
+
+        furi_hal_subghz.state = SubGhzStateIdle;
+    } while(false);
 
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
-    FURI_LOG_I(TAG, "Init OK");
+
+    if(furi_hal_subghz.state == SubGhzStateIdle) {
+        FURI_LOG_I(TAG, "Init OK");
+    } else {
+        FURI_LOG_E(TAG, "Init Fail");
+    }
 }
 
 void furi_hal_subghz_sleep() {
@@ -604,7 +626,7 @@ static void furi_hal_subghz_async_tx_timer_isr() {
                 furi_hal_gpio_init(&gpio_cc1101_g0, GpioModeInput, GpioPullDown, GpioSpeedLow);
                 LL_TIM_DisableCounter(TIM2);
             } else {
-                furi_crash(NULL);
+                furi_crash();
             }
         }
     }
diff --git a/firmware/targets/f7/furi_hal/furi_hal_subghz.h b/targets/f7/furi_hal/furi_hal_subghz.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_subghz.h
rename to targets/f7/furi_hal/furi_hal_subghz.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_target_hw.h b/targets/f7/furi_hal/furi_hal_target_hw.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_target_hw.h
rename to targets/f7/furi_hal/furi_hal_target_hw.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_uart.c b/targets/f7/furi_hal/furi_hal_uart.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_uart.c
rename to targets/f7/furi_hal/furi_hal_uart.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_uart.h b/targets/f7/furi_hal/furi_hal_uart.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_uart.h
rename to targets/f7/furi_hal/furi_hal_uart.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_usb.c b/targets/f7/furi_hal/furi_hal_usb.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_usb.c
rename to targets/f7/furi_hal/furi_hal_usb.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_usb_ccid.c b/targets/f7/furi_hal/furi_hal_usb_ccid.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_usb_ccid.c
rename to targets/f7/furi_hal/furi_hal_usb_ccid.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_usb_cdc.c b/targets/f7/furi_hal/furi_hal_usb_cdc.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_usb_cdc.c
rename to targets/f7/furi_hal/furi_hal_usb_cdc.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_usb_cdc.h b/targets/f7/furi_hal/furi_hal_usb_cdc.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_usb_cdc.h
rename to targets/f7/furi_hal/furi_hal_usb_cdc.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_usb_hid.c b/targets/f7/furi_hal/furi_hal_usb_hid.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_usb_hid.c
rename to targets/f7/furi_hal/furi_hal_usb_hid.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_usb_i.h b/targets/f7/furi_hal/furi_hal_usb_i.h
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_usb_i.h
rename to targets/f7/furi_hal/furi_hal_usb_i.h
diff --git a/firmware/targets/f7/furi_hal/furi_hal_usb_u2f.c b/targets/f7/furi_hal/furi_hal_usb_u2f.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_usb_u2f.c
rename to targets/f7/furi_hal/furi_hal_usb_u2f.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_version.c b/targets/f7/furi_hal/furi_hal_version.c
similarity index 99%
rename from firmware/targets/f7/furi_hal/furi_hal_version.c
rename to targets/f7/furi_hal/furi_hal_version.c
index 859a8c39..e4364a51 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_version.c
+++ b/targets/f7/furi_hal/furi_hal_version.c
@@ -187,7 +187,7 @@ void furi_hal_version_init() {
         furi_hal_version_load_otp_v2();
         break;
     default:
-        furi_crash(NULL);
+        furi_crash();
     }
 
     furi_hal_rtc_set_register(FuriHalRtcRegisterVersion, (uint32_t)version_get());
diff --git a/firmware/targets/f7/furi_hal/furi_hal_version_device.c b/targets/f7/furi_hal/furi_hal_version_device.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_version_device.c
rename to targets/f7/furi_hal/furi_hal_version_device.c
diff --git a/firmware/targets/f7/furi_hal/furi_hal_vibro.c b/targets/f7/furi_hal/furi_hal_vibro.c
similarity index 100%
rename from firmware/targets/f7/furi_hal/furi_hal_vibro.c
rename to targets/f7/furi_hal/furi_hal_vibro.c
diff --git a/firmware/targets/f7/inc/FreeRTOSConfig.h b/targets/f7/inc/FreeRTOSConfig.h
similarity index 99%
rename from firmware/targets/f7/inc/FreeRTOSConfig.h
rename to targets/f7/inc/FreeRTOSConfig.h
index 024d43a6..3bc57f8f 100644
--- a/firmware/targets/f7/inc/FreeRTOSConfig.h
+++ b/targets/f7/inc/FreeRTOSConfig.h
@@ -3,13 +3,14 @@
 #if defined(__ICCARM__) || defined(__CC_ARM) || defined(__GNUC__)
 #include <stdint.h>
 #pragma GCC diagnostic ignored "-Wredundant-decls"
-extern uint32_t SystemCoreClock;
 #endif
 
 #ifndef CMSIS_device_header
 #define CMSIS_device_header "stm32wbxx.h"
 #endif /* CMSIS_device_header */
 
+#include CMSIS_device_header
+
 #define configENABLE_FPU 1
 #define configENABLE_MPU 0
 
diff --git a/firmware/targets/f7/inc/alt_boot.h b/targets/f7/inc/alt_boot.h
similarity index 100%
rename from firmware/targets/f7/inc/alt_boot.h
rename to targets/f7/inc/alt_boot.h
diff --git a/targets/f7/inc/furi_config.h b/targets/f7/inc/furi_config.h
new file mode 100644
index 00000000..c935611a
--- /dev/null
+++ b/targets/f7/inc/furi_config.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define FURI_CONFIG_THREAD_MAX_PRIORITIES (32)
\ No newline at end of file
diff --git a/firmware/targets/f7/inc/stm32.h b/targets/f7/inc/stm32.h
similarity index 100%
rename from firmware/targets/f7/inc/stm32.h
rename to targets/f7/inc/stm32.h
diff --git a/firmware/targets/f7/inc/stm32_assert.h b/targets/f7/inc/stm32_assert.h
similarity index 100%
rename from firmware/targets/f7/inc/stm32_assert.h
rename to targets/f7/inc/stm32_assert.h
diff --git a/firmware/targets/f7/platform_specific/intrinsic_export.h b/targets/f7/platform_specific/intrinsic_export.h
similarity index 100%
rename from firmware/targets/f7/platform_specific/intrinsic_export.h
rename to targets/f7/platform_specific/intrinsic_export.h
diff --git a/firmware/targets/f7/platform_specific/math_wrapper.h b/targets/f7/platform_specific/math_wrapper.h
similarity index 100%
rename from firmware/targets/f7/platform_specific/math_wrapper.h
rename to targets/f7/platform_specific/math_wrapper.h
diff --git a/firmware/targets/f7/src/dfu.c b/targets/f7/src/dfu.c
similarity index 100%
rename from firmware/targets/f7/src/dfu.c
rename to targets/f7/src/dfu.c
diff --git a/firmware/targets/f7/src/main.c b/targets/f7/src/main.c
similarity index 98%
rename from firmware/targets/f7/src/main.c
rename to targets/f7/src/main.c
index 2c353f52..ca705fe5 100644
--- a/firmware/targets/f7/src/main.c
+++ b/targets/f7/src/main.c
@@ -2,7 +2,6 @@
 #include <furi_hal.h>
 #include <flipper.h>
 #include <alt_boot.h>
-#include <semphr.h>
 #include <update_util/update_operation.h>
 
 #define TAG "Main"
diff --git a/firmware/targets/f7/src/recovery.c b/targets/f7/src/recovery.c
similarity index 100%
rename from firmware/targets/f7/src/recovery.c
rename to targets/f7/src/recovery.c
diff --git a/firmware/targets/f7/src/system_stm32wbxx.c b/targets/f7/src/system_stm32wbxx.c
similarity index 100%
rename from firmware/targets/f7/src/system_stm32wbxx.c
rename to targets/f7/src/system_stm32wbxx.c
diff --git a/firmware/targets/f7/src/update.c b/targets/f7/src/update.c
similarity index 100%
rename from firmware/targets/f7/src/update.c
rename to targets/f7/src/update.c
diff --git a/firmware/targets/f7/startup_stm32wb55xx_cm4.s b/targets/f7/startup_stm32wb55xx_cm4.s
similarity index 100%
rename from firmware/targets/f7/startup_stm32wb55xx_cm4.s
rename to targets/f7/startup_stm32wb55xx_cm4.s
diff --git a/firmware/targets/f7/stm32wb55xx_flash.ld b/targets/f7/stm32wb55xx_flash.ld
similarity index 100%
rename from firmware/targets/f7/stm32wb55xx_flash.ld
rename to targets/f7/stm32wb55xx_flash.ld
diff --git a/firmware/targets/f7/stm32wb55xx_ram_fw.ld b/targets/f7/stm32wb55xx_ram_fw.ld
similarity index 100%
rename from firmware/targets/f7/stm32wb55xx_ram_fw.ld
rename to targets/f7/stm32wb55xx_ram_fw.ld
diff --git a/firmware/targets/f7/target.json b/targets/f7/target.json
similarity index 100%
rename from firmware/targets/f7/target.json
rename to targets/f7/target.json
diff --git a/firmware/targets/furi_hal_include/furi_hal.h b/targets/furi_hal_include/furi_hal.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal.h
rename to targets/furi_hal_include/furi_hal.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_bt.h b/targets/furi_hal_include/furi_hal_bt.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_bt.h
rename to targets/furi_hal_include/furi_hal_bt.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_bt_hid.h b/targets/furi_hal_include/furi_hal_bt_hid.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_bt_hid.h
rename to targets/furi_hal_include/furi_hal_bt_hid.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_bt_serial.h b/targets/furi_hal_include/furi_hal_bt_serial.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_bt_serial.h
rename to targets/furi_hal_include/furi_hal_bt_serial.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_cortex.h b/targets/furi_hal_include/furi_hal_cortex.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_cortex.h
rename to targets/furi_hal_include/furi_hal_cortex.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_crypto.h b/targets/furi_hal_include/furi_hal_crypto.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_crypto.h
rename to targets/furi_hal_include/furi_hal_crypto.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_debug.h b/targets/furi_hal_include/furi_hal_debug.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_debug.h
rename to targets/furi_hal_include/furi_hal_debug.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_i2c.h b/targets/furi_hal_include/furi_hal_i2c.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_i2c.h
rename to targets/furi_hal_include/furi_hal_i2c.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_info.h b/targets/furi_hal_include/furi_hal_info.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_info.h
rename to targets/furi_hal_include/furi_hal_info.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_infrared.h b/targets/furi_hal_include/furi_hal_infrared.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_infrared.h
rename to targets/furi_hal_include/furi_hal_infrared.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_light.h b/targets/furi_hal_include/furi_hal_light.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_light.h
rename to targets/furi_hal_include/furi_hal_light.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_memory.h b/targets/furi_hal_include/furi_hal_memory.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_memory.h
rename to targets/furi_hal_include/furi_hal_memory.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_mpu.h b/targets/furi_hal_include/furi_hal_mpu.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_mpu.h
rename to targets/furi_hal_include/furi_hal_mpu.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_nfc.h b/targets/furi_hal_include/furi_hal_nfc.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_nfc.h
rename to targets/furi_hal_include/furi_hal_nfc.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_power.h b/targets/furi_hal_include/furi_hal_power.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_power.h
rename to targets/furi_hal_include/furi_hal_power.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_random.h b/targets/furi_hal_include/furi_hal_random.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_random.h
rename to targets/furi_hal_include/furi_hal_random.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_region.h b/targets/furi_hal_include/furi_hal_region.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_region.h
rename to targets/furi_hal_include/furi_hal_region.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_rtc.h b/targets/furi_hal_include/furi_hal_rtc.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_rtc.h
rename to targets/furi_hal_include/furi_hal_rtc.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_sd.h b/targets/furi_hal_include/furi_hal_sd.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_sd.h
rename to targets/furi_hal_include/furi_hal_sd.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_speaker.h b/targets/furi_hal_include/furi_hal_speaker.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_speaker.h
rename to targets/furi_hal_include/furi_hal_speaker.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_spi.h b/targets/furi_hal_include/furi_hal_spi.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_spi.h
rename to targets/furi_hal_include/furi_hal_spi.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_usb.h b/targets/furi_hal_include/furi_hal_usb.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_usb.h
rename to targets/furi_hal_include/furi_hal_usb.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_usb_ccid.h b/targets/furi_hal_include/furi_hal_usb_ccid.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_usb_ccid.h
rename to targets/furi_hal_include/furi_hal_usb_ccid.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_usb_hid.h b/targets/furi_hal_include/furi_hal_usb_hid.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_usb_hid.h
rename to targets/furi_hal_include/furi_hal_usb_hid.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_usb_hid_u2f.h b/targets/furi_hal_include/furi_hal_usb_hid_u2f.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_usb_hid_u2f.h
rename to targets/furi_hal_include/furi_hal_usb_hid_u2f.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_version.h b/targets/furi_hal_include/furi_hal_version.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_version.h
rename to targets/furi_hal_include/furi_hal_version.h
diff --git a/firmware/targets/furi_hal_include/furi_hal_vibro.h b/targets/furi_hal_include/furi_hal_vibro.h
similarity index 100%
rename from firmware/targets/furi_hal_include/furi_hal_vibro.h
rename to targets/furi_hal_include/furi_hal_vibro.h