diff --git a/applications/debug/direct_draw/direct_draw.c b/applications/debug/direct_draw/direct_draw.c
index 71c65eab135..63e03530a7a 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/unit_tests/rpc/rpc_test.c b/applications/debug/unit_tests/rpc/rpc_test.c
index 645e75e8448..5659ba877df 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/test_index.c b/applications/debug/unit_tests/test_index.c
index edaf950c54b..7c1b6b44477 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)]);
diff --git a/applications/main/infrared/infrared_app.c b/applications/main/infrared/infrared_app.c
index e29eda30fb4..7abb4e4eb61 100644
--- a/applications/main/infrared/infrared_app.c
+++ b/applications/main/infrared/infrared_app.c
@@ -384,18 +384,17 @@ void infrared_play_notification_message(
 }
 
 void infrared_show_loading_popup(const InfraredApp* infrared, bool show) {
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
     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);
     }
 }
 
diff --git a/applications/main/nfc/nfc_app.c b/applications/main/nfc/nfc_app.c
index fe680aa32df..9e0de8891bb 100644
--- a/applications/main/nfc/nfc_app.c
+++ b/applications/main/nfc/nfc_app.c
@@ -411,15 +411,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/subghz/views/receiver.c b/applications/main/subghz/views/receiver.c
index e1014b81109..23fa26c772c 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/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c
index 873fb6aa2c4..44c0c228c4e 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,7 +449,7 @@ 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;
         }
diff --git a/applications/services/desktop/animations/animation_storage.c b/applications/services/desktop/animations/animation_storage.c
index 2c16cf726da..c99cc7b5d09 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 30a165087bb..9585b2771e0 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 077f82d092e..004fcde7b56 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 bbed5600151..034eedb8ace 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 e062c1b97d2..0e248def604 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 2f009e7d2aa..e3336ad76d6 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_locked.c b/applications/services/desktop/views/desktop_view_locked.c
index 3cee25425ef..8df889dddd3 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 d323567e792..5e16f60862a 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 93bbffedc6f..0894bb776f4 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 {
@@ -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;
 }
@@ -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 e64c264ffde..f24ecc8ead3 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 579b400ad01..5b526ed3a69 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_stop(dolphin->butthurt_timer);
     dolphin_update_clear_limits_timer_period(dolphin);
-    xTimerReset(dolphin->clear_limits_timer, portMAX_DELAY);
+    furi_timer_stop(dolphin->clear_limits_timer);
 
     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);
+                furi_timer_restart(dolphin->flush_timer);
             } 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 ceeff1e1a9a..2d716c18138 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/icon_animation.c b/applications/services/gui/icon_animation.c
index b63d233f3d5..a39ef2e254e 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/input/input.c b/applications/services/input/input.c
index 8da0a340033..216aa39b2e6 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/rpc/rpc.c b/applications/services/rpc/rpc.c
index 3e9665ad8da..826f2225376 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);
 
diff --git a/applications/services/rpc/rpc.h b/applications/services/rpc/rpc.h
index d11fdc16244..863bca355b4 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_cli.c b/applications/services/rpc/rpc_cli.c
index f1c139b5f93..4612752a83c 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/system/updater/updater.c b/applications/system/updater/updater.c
index e749f3ce6e6..4c7fd29e9cf 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/furi/core/base.h b/furi/core/base.h
index 29e87419200..642ff2b6cda 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 ea1de71425d..b56db656379 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";
diff --git a/furi/core/common_defines.h b/furi/core/common_defines.h
index 5bd218d3576..2b30c3b06da 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 57fe2403be7..3bef2be38e0 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 9406a581f7b..96b9591877e 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 7928ad11c38..89a50a9b52f 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 371f76c1f78..c962402efd6 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 b8baf9c7c62..a3e127c3c1b 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 ddf56f00640..e20fa420a08 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 9fb964a1e53..8794e10dc39 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 8c99bfc541f..1f1a07780cd 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 bf483948be6..a13d256b110 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 de50bde7a47..db4feeb4e16 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 692f2a10083..44d66fb21a2 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 7743ffe7018..0a89b892017 100644
--- a/furi/core/timer.c
+++ b/furi/core/timer.c
@@ -97,6 +97,23 @@ FuriStatus furi_timer_start(FuriTimer* instance, uint32_t ticks) {
     return (stat);
 }
 
+FuriStatus furi_timer_restart(FuriTimer* instance) {
+    furi_assert(!furi_kernel_is_irq_or_masked());
+    furi_assert(instance);
+
+    TimerHandle_t hTimer = (TimerHandle_t)instance;
+    FuriStatus stat;
+
+    if(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);
@@ -125,6 +142,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 +159,17 @@ 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 = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
+
+    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 3f43de5fd9f..47b44c71a64 100644
--- a/furi/core/timer.h
+++ b/furi/core/timer.h
@@ -40,6 +40,14 @@ void furi_timer_free(FuriTimer* instance);
  */
 FuriStatus furi_timer_start(FuriTimer* instance, uint32_t ticks);
 
+/** Restart timer with previous timeout value
+ *
+ * @param      instance  The pointer to FuriTimer instance
+ *
+ * @return     The furi status.
+ */
+FuriStatus furi_timer_restart(FuriTimer* instance);
+
 /** Stop timer
  *
  * @param      instance  The pointer to FuriTimer instance
@@ -56,10 +64,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 8806ce27fb3..b29424a9f4f 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 cc0e3f4f12f..6247e259fb9 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 b1299c9a952..422509055f7 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/infrared/worker/infrared_worker.c b/lib/infrared/worker/infrared_worker.c
index 5e3257e2604..38392fc06ed 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)
diff --git a/lib/lfrfid/lfrfid_worker.c b/lib/lfrfid/lfrfid_worker.c
index cbc7b02e37e..ffaa8ee925f 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/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.h b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.h
index 1113d381c2b..ce878cb40ae 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.h
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.h
@@ -43,8 +43,6 @@ 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);
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 4df00adcf10..bd55c618820 100644
--- a/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller_i.h
+++ b/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller_i.h
@@ -40,8 +40,6 @@ 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);
diff --git a/lib/print/wrappers.h b/lib/print/wrappers.h
index b6f0f004b65..7c0d1f92ebe 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 82c925c1a31..35850aa83e8 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 82775e57593..26cc6ec3a20 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 59cd9cf986f..4abd14413be 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/public_api.h b/lib/subghz/protocols/public_api.h
new file mode 100644
index 00000000000..174f175cdfa
--- /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 3490f2ca540..e01f8bcdaa4 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 0eea732af15..9eb912a27e1 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 8e80071b518..2dfa9ce8b6c 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 37b2514ef3d..e8cb334d51c 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 9db54775322..5c3dc0a3403 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/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv
index cb62b40c40b..3a2abc9b654 100644
--- a/targets/f18/api_symbols.csv
+++ b/targets/f18/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,41.0,,
+Version,+,43.2,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -417,7 +417,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 +750,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 +1339,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,
@@ -1452,7 +1450,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 +1490,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*
+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 +1838,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 +1912,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 +1941,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"
@@ -2281,67 +2273,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 +2391,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/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
index 9d9c1a01b37..0f81f119114 100644
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,41.0,,
+Version,+,43.2,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
@@ -179,6 +179,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,,
@@ -485,7 +486,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 +839,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 +1534,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,
@@ -1646,7 +1645,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 +1685,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*
+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*"
@@ -2380,8 +2381,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 +2455,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 +2484,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"
@@ -3011,67 +3004,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 +3122,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/targets/f7/ble_glue/gap.c b/targets/f7/ble_glue/gap.c
index 360c1f6b684..f0533567eae 100644
--- a/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/targets/f7/furi_hal/furi_hal_flash.c b/targets/f7/furi_hal/furi_hal_flash.c
index bc65b29eb61..284d48bf53d 100644
--- a/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"
diff --git a/targets/f7/furi_hal/furi_hal_os.c b/targets/f7/furi_hal/furi_hal_os.c
index 046cf79dc1d..ea835b95fbe 100644
--- a/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/targets/f7/furi_hal/furi_hal_power.c b/targets/f7/furi_hal/furi_hal_power.c
index 0eb93e664bd..119dee81f92 100644
--- a/targets/f7/furi_hal/furi_hal_power.c
+++ b/targets/f7/furi_hal/furi_hal_power.c
@@ -459,10 +459,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 +472,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/targets/f7/furi_hal/furi_hal_spi.c b/targets/f7/furi_hal/furi_hal_spi.c
index 5c33760ea1c..98ca71af357 100644
--- a/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);
     }
 
diff --git a/targets/f7/inc/FreeRTOSConfig.h b/targets/f7/inc/FreeRTOSConfig.h
index 024d43a6de8..3bc57f8f3be 100644
--- a/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/targets/f7/inc/furi_config.h b/targets/f7/inc/furi_config.h
new file mode 100644
index 00000000000..c935611ab7b
--- /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/targets/f7/src/main.c b/targets/f7/src/main.c
index 2c353f52b20..ca705fe5e42 100644
--- a/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"