diff --git a/.ci_files/anims_ofw.txt b/.ci_files/anims_ofw.txt
index a061c48ce..c0e1741a0 100644
--- a/.ci_files/anims_ofw.txt
+++ b/.ci_files/anims_ofw.txt
@@ -69,7 +69,7 @@ Min butthurt: 0
 Max butthurt: 9
 Min level: 1
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L1_Painting_128x64
 Min butthurt: 0
@@ -85,26 +85,33 @@ Min level: 1
 Max level: 3
 Weight: 3
 
+Name: L1_Senpai_128x64
+Min butthurt: 0
+Max butthurt: 5
+Min level: 1
+Max level: 3
+Weight: 3
+
 Name: L1_Kaiju_128x64
 Min butthurt: 0
 Max butthurt: 10
 Min level: 1
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L1_My_dude_128x64
 Min butthurt: 0
 Max butthurt: 8
 Min level: 1
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L2_Wake_up_128x64
 Min butthurt: 0
 Max butthurt: 12
 Min level: 2
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L2_Furippa2_128x64
 Min butthurt: 0
@@ -132,7 +139,7 @@ Min butthurt: 0
 Max butthurt: 8
 Min level: 2
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L3_Furippa3_128x64
 Min butthurt: 0
@@ -155,30 +162,30 @@ Min level: 3
 Max level: 3
 Weight: 3
 
-Name: L1_Senpai_128x64
-Min butthurt: 0
-Max butthurt: 5
-Min level: 1
-Max level: 3
-Weight: 4
-
 Name: L1_Sad_song_128x64
 Min butthurt: 8
 Max butthurt: 13
 Min level: 1
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L2_Coding_in_the_shell_128x64
 Min butthurt: 0
 Max butthurt: 12
 Min level: 2
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L2_Secret_door_128x64
 Min butthurt: 0
 Max butthurt: 12
 Min level: 2
 Max level: 3
-Weight: 4
+Weight: 3
+
+Name: L3_Freedom_2_dolphins_128x64
+Min butthurt: 0
+Max butthurt: 12
+Min level: 3
+Max level: 3
+Weight: 5
diff --git a/.ci_files/rgb.patch b/.ci_files/rgb.patch
index a9908125f..b5895d9c1 100644
--- a/.ci_files/rgb.patch
+++ b/.ci_files/rgb.patch
@@ -527,7 +527,7 @@ index 0000000..572e1df
 +
 +void SK6805_update(void) {
 +    SK6805_init();
-+    furi_kernel_lock();
++    FURI_CRITICAL_ENTER();
 +    uint32_t end;
 +    /* Последовательная отправка цветов светодиодов */
 +    for(uint8_t lednumber = 0; lednumber < SK6805_LED_COUNT; lednumber++) {
@@ -567,7 +567,7 @@ index 0000000..572e1df
 +            }
 +        }
 +    }
-+    furi_kernel_unlock();
++    FURI_CRITICAL_EXIT();
 +}
 diff --git a/lib/drivers/SK6805.h b/lib/drivers/SK6805.h
 new file mode 100644
@@ -637,9 +637,9 @@ index 83e1603..45798ca 100644
  #include <stdint.h>
 +#include <applications/settings/notification_settings/rgb_backlight.h>
  
- #define LED_CURRENT_RED 50
- #define LED_CURRENT_GREEN 50
-@@ -31,22 +32,21 @@ void furi_hal_light_init() {
+ #define LED_CURRENT_RED (50u)
+ #define LED_CURRENT_GREEN (50u)
+@@ -31,22 +32,21 @@ void furi_hal_light_init(void) {
  }
  
  void furi_hal_light_set(Light light, uint8_t value) {
diff --git a/.pvsconfig b/.pvsconfig
index 49c63ad73..b6001ca5c 100644
--- a/.pvsconfig
+++ b/.pvsconfig
@@ -1,10 +1,10 @@
 # MLib macros we can't do much about.
 //-V:M_LET:1048,1044
 //-V:M_EACH:1048,1044
-//-V:ARRAY_DEF:760,747,568,776,729,712,654
-//-V:LIST_DEF:760,747,568,712,729,654,776
+//-V:ARRAY_DEF:760,747,568,776,729,712,654,1103
+//-V:LIST_DEF:760,747,568,712,729,654,776,1103
 //-V:BPTREE_DEF2:779,1086,557,773,512
-//-V:DICT_DEF2:779,524,776,760,1044,1001,729,590,568,747,685
+//-V:DICT_DEF2:779,524,776,760,1044,1001,729,590,568,747,685,1103
 //-V:ALGO_DEF:1048,747,1044
 //-V:TUPLE_DEF2:524,590,1001,760
 
@@ -42,8 +42,5 @@
 # Model-related warnings
 //-V:with_view_model:1044,1048
 
-# Functions that always return the same error code
-//-V:picopass_device_decrypt:1048
-
 # Examples
 //V_EXCLUDE_PATH applications/examples/
\ No newline at end of file
diff --git a/.vscode/ReadMe.md b/.vscode/ReadMe.md
index 5aed0435c..c7fc69f78 100644
--- a/.vscode/ReadMe.md
+++ b/.vscode/ReadMe.md
@@ -1,4 +1,4 @@
-# Visual Studio Code workspace for Flipper Zero
+# Visual Studio Code workspace for Flipper Zero {#vscode}
 
 ## Setup
 
diff --git a/.vscode/example/settings.json b/.vscode/example/settings.json
index 00da3af2f..a59194901 100644
--- a/.vscode/example/settings.json
+++ b/.vscode/example/settings.json
@@ -14,7 +14,7 @@
         "*.scons": "python",
         "SConscript": "python",
         "SConstruct": "python",
-        "*.fam": "python",
+        "*.fam": "python"
     },
     "clangd.arguments": [
         // We might be able to tighten this a bit more to only include the correct toolchain.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6dab2eaa..9206f1b13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,58 +1,54 @@
 ## New changes
-* NFC: **Fixed stuck Saved success screen**
-* NFC: **Fixed crash when reading mifare classic tag then going to add manually menu and adding NFC-A tag**
-* NFC: Fixed EMV txs render
-* NFC/LFRFID: Don't Stop emulation after 5 mins to avoid antenna damage if debug is ON (by @Leptopt1los)
-* LFRFID: Fixed T5577 custom password input (by @Leptopt1los)
-* OFW PR 3410: lfrfid/em4100: added support for different bit rates - by @Mrkvak (RF/32 full support, RF/16 support without reading (16clk removed for now))
-* OFW PR 3412: Fixed MyKey LockID - by @zProAle
-<br>----<br>
-**Changes from 070 release:**<br>
-* NFC: **EMV parser** added (by @Leptopt1los and @wosk | PR #700)
-* NFC: Metromoney parser balance fix (by @Leptopt1los | PR #699)
-* NFC/LFRFID: Stop emulation after 5 mins to avoid antenna damage (by @Leptopt1los)
-* Archive: Fix two filebrowser bugs
-* SubGHz: **Programming mode for Dea Mio** (right arrow button)
-* SubGHz: **Keeloq fix emulation for multiple systems and extend add manually support** for 2 of them (Dea Mio, Genius Bravo, GSN, Normstahl)
-* SubGHz: Fixed hopper state when entering Read via Freq analyzer
-* SubGHz: Raw erase fixes (by @Willy-JL)
-* SubGHz: Subghz save files with receive time (by @Willy-JL)
-* NFC: Fix NFC V dumps with v3 (pre refactor saves) crashing at info page
-* NFC: Zolotaya Korona Online parser added (by @Leptopt1los)
-* NFC: Add NFC **NDEF parser** (by @Willy-JL)
-* LF RFID: **Write T5577 with random and custom password** added (clear password via Extra actions) (by @Leptopt1los)
-* SubGHz: Update honeywell protocol (by @Willy-JL)
-* System: More contrast values for replacement displays (up to +8 or -8)
-* USB/BLE HID: Add macOS Music app volume control
+* NFC: CharlieCard parser (by @zacharyweiss)
+* SubGHz: Add Manually - Sommer FM fixes
+* SubGHz: Enabled tx-rx state on unused gpio pin by default (**external amp option was removed and is enabled by default now**)
+* SubGHz: **Status output !TX/RX on the GDO2 CC1101 pin** (by @quen0n | PR #742)
+* SubGHz: Reworked saved settings (by @xMasterX and @Willy-JL)
+* Desktop: Fixes for animation unload (by @Willy-JL)
+* Misc: Added `void` due to `-Wstrict-prototypes`
+* Misc: Some code cleanup and proper log levels in nfc parsers
+* Infrared: Allow external apps to use infrared settings (by @Willy-JL)
+* JS & HAL: Various fixes and FURI_HAL_RANDOM_MAX define added (by @Willy-JL)
+* JS: **BadUSB layout support** (by @Willy-JL)
+* JS: Module `widget` and path globals (by @jamisonderek)
+* Apps: NFC Magic - **Gen2 writing support, Gen4 NTAG password and PACK fixes** (by @Astrrra)
+* Apps: MFKey - **fixed crashes** (by @noproto)
 * Apps: **Check out Apps updates by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
-* OFW PR 3384: NFC: Display unread Mifare Classic bytes as question marks - by @TollyH
-* OFW PR 3396: NFC: **fix application opening from browser** - by @RebornedBrain (+ fix for leftover issues)
-* OFW PR 3382: NFC UI refactor - by @RebornedBrain
-* OFW PR 3391: Rework more info scene for Ultralight cards - by @RebornedBrain
-* OFW PR 3401: it-IT-mac layout - by @nminaylov
-* OFW: Fix expansion protocol crash when fed lots of garbage
-* OFW: 0.98.0-rc various fixes
-* OFW: RFID CLI: better usage
-* OFW: **Mf DESFire fixes**
-* OFW: NFC UI refactor
-* OFW: **Expansion module protocol** (+ expansion settings read and store in ram by @Willy-JL) 
-* OFW: Bugfix: Strip last parity bit from decoded FDX-B data
-* OFW: FuriHal: interrupt priorities and documentation
-* OFW: FuriHal: **UART refactoring**
-* OFW: SubGhz: add `subghz tx_from_file` CLI cmd, major TX flow refactoring, various improvements and bug fixes
-* OFW: Furi_hal_rtc: new function
-* OFW: NFC UI refactor 
-* OFW: assets: checking limits on image size; ufbt: cdb target
-* OFW: NFC: system dict skip when user dict is skipped fix (replaces our fix)
-* OFW: FuriHal: fix start duration furi_hal_subghz_async_tx
-* OFW: NFC: parsers minor cleanup
-* OFW: NFC Ntag success write freeze when not saved card
-* OFW: ufbt: fixed generated project paths on Windows 
+* OFW: **Felica poller** (NFC-F)
+* OFW: Desktop/Loader: Unload animations before loading FAPs
+* OFW: JS Documentation
+* OFW: **Update radio stack to v1.19.0**
+* OFW: **Move crypto1 to helpers, add it to the public API**
+* OFW: Explain RNG differences, add FURI_HAL_RANDOM_MAX
+* OFW: Furi: Add "out of memory" and "malloc(0)" crash messages
+* OFW: IR: Fix crash on duty_cycle=1
+* OFW: **Desktop: ensure that animation is unloaded before app start (fixes some out of memory crashes)**
+* OFW: Hide unlock with reader for MFU-C 
+* OFW: fbt: fixed missing FBT_FAP_DEBUG_ELF_ROOT to dist env
+* OFW: fbt: added -Wstrict-prototypes for main firmware
+* OFW: Mifare Ultralight naming fix 
+* OFW: IR: Remember OTG state
+* OFW: Bad USB: fix crash when selecting a keyboard layout
+* OFW: L1_Mods animation update : adding VGM visual 
+* OFW: RFID Improvements 
+* OFW: Fixed plugins and UI 
+* OFW: **NFC: Fix mf desfire detect**
+* OFW: infrared_transmit.h was missing `#pragma once`
+* OFW: Show the wrong PIN Attempt count on the login screen
+* OFW: SavedStruct: Introduce saved_struct_get_metadata
+* OFW: JS CLI command
+* OFW: Add ChromeOS Bad USB demo
+* OFW: **Configurable Infrared TX output** (previous UL version is replaced with OFW version, new features added "AutoDetect" and saving settings)
+* OFW: BadUSB: BLE, media keys, Fn/Globe key commands
+* OFW: NFC: Slix privacy password reveal ->(was included in previous UL release) and **Desfire detect fix**
+* OFW: github: additional pre-upload checks for doxygen workflow
+* OFW: NFC UI fixes
+* OFW: Gui: unicode support, new canvas API
+* OFW: **Api Symbols: replace asserts with checks**
 <br><br>
 #### Known NFC post-refactor regressions list: 
 - Mifare Mini clones reading is broken (original mini working fine) (OFW)
-- Option to unlock Slix-L (NFC V) with preset or custom password was removed with refactoring (OFW)
-- NFC CLI was removed with refactoring (OFW)
+- NFC CLI was removed with refactoring (OFW) (will be back soon)
 - Current list of affected apps: https://github.com/xMasterX/all-the-plugins/tree/dev/apps_broken_by_last_refactors
 - Also in app **Enhanced Sub-GHz Chat** - NFC part was temporarily removed to make app usable, NFC part of the app requires remaking it with new nfc stack
 
@@ -70,13 +66,14 @@
 |cloudtips|only RU payments accepted|https://pay.cloudtips.ru/p/7b3e9d65|
 |YooMoney|only RU payments accepted|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
 |USDT|(TRC20)|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
-|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
 |ETH|(BSC/ERC20-Tokens)|`darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)|
 |BTC||`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
+|SOL|(Solana/Tokens)|`DSgwouAEgu8iP5yr7EHHDqMNYWZxAqXWsTEeqCAXGLj8`|
 |DOGE||`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
 |LTC||`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
+|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
 |XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
-|TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|
+|TON||`UQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmsxa`|
 
 #### Thanks to our sponsors who supported project in the past and special thanks to sponsors who supports us on regular basis:
 ClaraCrazy, Pathfinder [Count Zero cDc], callmezimbra, Quen0n, MERRON, grvpvl (lvpvrg), art_col, ThurstonWaffles, Moneron, UterGrooll, LUCFER, Northpirate, zloepuzo, T.Rat, Alexey B., ionelife, ...
diff --git a/ReadMe.md b/ReadMe.md
index be41a8c1c..1567936bd 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,6 +1,6 @@
 <h3 align="center">
 <a href="https://github.com/DarkFlippers/unleashed-firmware">
-<img src="https://user-images.githubusercontent.com/10697207/186202043-26947e28-b1cc-459a-8f20-ffcc7fc0c71c.png" align="center" alt="fzCUSTOM" border="0">
+<img src="https://user-images.githubusercontent.com/10697207/186202043-26947e28-b1cc-459a-8f20-ffcc7fc0c71c.png" align="center" alt="Unleashed Firmware Logo" border="0">
 </a>
 </h3>
 <div align="center" id="badges">
@@ -20,15 +20,15 @@
 
 ### Welcome to the Flipper Zero Unleashed Firmware repo! 
 
-#### **This firmware is a fork from** [flipperdevices/flipperzero-firmware](https://github.com/flipperdevices/flipperzero-firmware)
+#### **This firmware is a fork from original (OFW) firmware** [flipperdevices/flipperzero-firmware](https://github.com/flipperdevices/flipperzero-firmware)
 
 <br>
 
-### Most stable custom firmware focused on new features and improvements of original firmware components, with almost no UI changes
+### Most stable custom firmware focused on new features and improvements of original firmware components, keeping compatibility with original firmware API and Apps
 
 <br>
 
-##### This software is for experimental purposes only and is not meant for any illegal activity/purposes. <br> We do not condone illegal activity and strongly encourage keeping transmissions to legal/valid uses allowed by law. <br> Also, this software is made without any support from Flipper Devices and is in no way related to the official devs. 
+##### This software is for experimental purposes only and is not meant for any illegal activity/purposes. <br> We do not condone illegal activity and strongly encourage keeping transmissions to legal/valid uses allowed by law. <br> Also, this software is made without any support from Flipper Devices and is in no way related to the official team. 
 
 
 <br>
@@ -36,7 +36,7 @@
 ## FAQ (frequently asked questions)
 [Follow this link to find answers to most asked questions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/FAQ.md)
 
-## Dev builds (unstable)
+## Dev builds (unstable) (built automatically from dev branch)
 - https://dev.unleashedflip.com/
 - https://t.me/kotnehleb
 ## Releases in Telegram
@@ -45,19 +45,20 @@
 # What's changed
 - **Sub-GHz** *lib & hal*
 	- Regional TX restrictions removed
-	- Extra Sub-GHz frequencies
+	- Extra Sub-GHz frequencies added
 	- Frequency range can be extended in settings file (Warning: It can damage Flipper's hardware)
 	- Many rolling code [protocols](https://github.com/DarkFlippers/unleashed-firmware#current-modified-and-new-sub-ghz-protocols-list) now have the ability to save & send captured signals
 	- FAAC SLH (Spa) & BFT Mitto (keeloq secure with seed) manual creation
 	- External CC1101 module support [(by quen0n)](https://github.com/DarkFlippers/unleashed-firmware/pull/307)
 - **Sub-GHz** *Main App*
-	- Save last used frequency [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
+	- Save last used settings [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
 	- New frequency analyzer [(by ClusterM)](https://github.com/DarkFlippers/unleashed-firmware/pull/43)
 	- Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
 	- Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79)
 	- New option to use timestamps + protocol name when you saving file, instead of random name or timestamp only - Enable in `Radio Settings -> Protocol Names = ON`
 	- Read mode UI improvements (shows time when signal was received) (by @wosk)
 	- External CC1101 module support (Hardware SPI used)
+	- External CC1101 module amplifier control (or LED control) support (enabled by default)
 	- **Hold right in received signal list to delete selected signal**
 	- **Custom buttons for Keeloq / Alutech AT4N / Nice Flor S / Somfy Telis / Security+ 2.0 / CAME Atomo** - now you can use arrow buttons to send signal with different button code
 	-   `Add manually` menu extended with new protocols
@@ -75,12 +76,11 @@
 	- Recompiled IR TV Universal Remote for ALL buttons
 	- Universal remotes for Projectors, Fans, A/Cs and Audio(soundbars, etc.) -> Also always updated and verified by our team
 	- Infrared -> `RCA` Protocol
-	- Infrared -> Debug TX PIN output settings
+	- Infrared -> External IR modules support (with autodetect by OFW)
 - **NFC/RFID/iButton**
-	* LFRFID/iButton Fuzzer plugins
-	* Extra Mifare Classic keys
+	* LFRFID and iButton Fuzzer plugins
+	* Extra Mifare Classic keys in system dict
 	* EMV Protocol + Public data parser (by @Leptopt1los and @wosk)
-	* NFC/LFRFID - Stop emulation after 5 mins to avoid antenna damage (by @Leptopt1los)
 	* NFC `Add manually` -> Mifare Classic with custom UID
 	* NFC parsers: Umarsh, Zolotaya Korona, Kazan, Metromoney, Moscow Social Card, Troika (reworked) and [many others](https://github.com/DarkFlippers/unleashed-firmware/tree/dev/applications/main/nfc/plugins/supported_cards) (by @Leptopt1los and @assasinfil)
 - **Quality of life & other features**
@@ -91,7 +91,7 @@
 	- Battery percentage display with different styles `Settings -> Desktop -> Battery View`
 	- More games in Dummy Mode -> click or hold any of arrow buttons
 	- Lock device with pin(or regular lock if pin not set) by holding UP button on main screen [(by an4tur0r)](https://github.com/DarkFlippers/unleashed-firmware/pull/107)
-	- **BadBT** plugin (BT version of BadKB) [(by Willy-JL, ClaraCrazy, XFW contributors)](https://github.com/ClaraCrazy/Flipper-Xtreme/tree/dev/applications/main/bad_kb) - (See in Applications->Tools) - (aka BadUSB via Bluetooth)
+	- **BadKB** plugin [(by Willy-JL, ClaraCrazy, XFW contributors)](https://github.com/Flipper-XFW/Xtreme-Firmware/tree/dev/applications/main/bad_kb) - (See in Applications->Tools) - (aka BadUSB via Bluetooth)
 	- BadUSB -> Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout)
 	- Custom community plugins and games added + all known working apps can be downloaded in extra pack in every release
 	- Other small fixes and changes throughout
@@ -100,16 +100,16 @@
 Also check the [changelog in releases](https://github.com/DarkFlippers/unleashed-firmware/releases) for latest updates!
 
 ### Current modified and new Sub-GHz protocols list:
-Thanks to Official team (to their SubGHz Developer, Skorp) for implementing decoders for these protocols in OFW.
+Thanks to Official team (to their SubGHz Developer, Skorp) for implementing support (decoder + encoder / or decode only) for these protocols in OFW.
 
 Keeloq [Not ALL systems supported for decode or emulation!] - [Supported manufacturers list](https://pastes.io/raw/unuj9bhe4m)
 
-Encoders or sending made by @xMasterX:
-- Nero Radio 57bit (+ 56bit encoder improvements)
-- CAME 12bit/24bit encoder fixes (Fixes now merged in OFW)
+Encoders or emulation support made by @xMasterX:
+- Nero Radio 57bit (+ 56bit support)
+- CAME 12bit/24bit encoder fixes (Fixes are now merged in OFW)
 - Keeloq: Dea Mio, Genius Bravo, GSN, HCS101, AN-Motors, JCM Tech, MHouse, Nice Smilo, DTM Neo, FAAC RC,XT, Mutancode, Normstahl, Beninca + Allmatic, Stilmatic, CAME Space, Aprimatic (model TR and similar), Centurion Nova (thanks Carlos !)
 
-Encoders or sending made by @Eng1n33r(first implementation in Q2 2022) & @xMasterX (current version):
+Encoders or emulation made by @Eng1n33r(first implementation in Q2 2022) and @xMasterX (current version):
 - CAME Atomo -> Update! check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
 - Nice Flor S -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
 - FAAC SLH (Spa) -> Update!!! Check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
@@ -117,7 +117,7 @@ Encoders or sending made by @Eng1n33r(first implementation in Q2 2022) & @xMaste
 - Star Line
 - Security+ v1 & v2 (encoders was made in OFW)
 
-Encoders made by @assasinfil & @xMasterX:
+Encoders made by @assasinfil and @xMasterX:
 - Somfy Telis -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
 - Somfy Keytis
 - KingGates Stylo 4k
@@ -126,10 +126,9 @@ Encoders made by @assasinfil & @xMasterX:
 
 ## Please support development of the project
 The majority of this project is developed and maintained by me, @xMasterX.
-I'm unemployed, and the only income I receive is from your donations.
 Our team is small and the guys are working on this project as much as they can solely based on the enthusiasm they have for this project and the community.
-- @Leptopt1los - NFC, RFID, IR Assets (only ACs), Plugins, and many other things
-- @gid9798 - SubGHz, Plugins, many other things
+- @Leptopt1los - NFC, RFID, Plugins, and many other things
+- @gid9798 - SubGHz, Plugins, many other things - currently offline :( 
 - @assasinfil - SubGHz protocols, NFC parsers
 - @Svaarich - UI design and animations
 - @amec0e - Infrared assets
@@ -146,13 +145,14 @@ You can support us by using links or addresses below:
 |cloudtips|only RU payments accepted|https://pay.cloudtips.ru/p/7b3e9d65|
 |YooMoney|only RU payments accepted|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
 |USDT|(TRC20)|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
-|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
 |ETH|(BSC/ERC20-Tokens)|`darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)|
 |BTC||`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
+|SOL|(Solana/Tokens)|`DSgwouAEgu8iP5yr7EHHDqMNYWZxAqXWsTEeqCAXGLj8`|
 |DOGE||`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
 |LTC||`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
+|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
 |XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
-|TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|
+|TON||`UQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmsxa`|
 
 ## Community apps included
 
@@ -168,6 +168,8 @@ See full list and sources here: [xMasterX/all-the-plugins](https://github.com/xM
 ## [How to install](/documentation/HowToInstall.md) - [versions info](/CHANGELOG.md#recommended-update-option---web-updater): `n`,` `,`e`...
 ## Firmware & Development
 
+### - **Developer Documentation** - [developer.flipper.net](https://developer.flipper.net/flipperzero/doxygen)
+
 ### - **[How to build](/documentation/HowToBuild.md#how-to-build-by-yourself) | [Project-structure](#project-structure)**
 
 ### - **CLion IDE** - How to setup workspace for flipper firmware development [by Savely Krasovsky](https://krasovs.ky/2022/11/01/flipper-zero-clion.html)
@@ -246,6 +248,8 @@ See full list and sources here: [xMasterX/all-the-plugins](https://github.com/xM
 * Official Docs: [docs.flipper.net](https://docs.flipper.net/)
 * Official Forum: [forum.flipperzero.one](https://forum.flipperzero.one/)
 
+* Update! Developer Documentation [developer.flipper.net](https://developer.flipper.net/flipperzero/doxygen)
+
 # Project structure
 
 - `applications`    - Applications and services used in firmware
diff --git a/SConstruct b/SConstruct
index a2f40763e..268472a7c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -7,7 +7,7 @@
 # construction of certain targets behind command-line options.
 
 import os
-from fbt.util import path_as_posix
+from fbt.util import open_browser_action
 
 DefaultEnvironment(tools=[])
 
@@ -42,6 +42,7 @@ distenv = coreenv.Clone(
         "openocd",
         "blackmagic",
         "jflash",
+        "doxygen",
     ],
     ENV=os.environ,
     UPDATE_BUNDLE_DIR="dist/${DIST_DIR}/f${TARGET_HW}-update-${DIST_SUFFIX}",
@@ -66,6 +67,7 @@ if GetOption("fullenv") or any(
 
     # Target for self-update package
     dist_basic_arguments = [
+        "${ARGS}",
         "--bundlever",
         "${UPDATE_VERSION_STRING}",
     ]
@@ -182,6 +184,7 @@ fap_deploy = distenv.PhonyTarget(
                 "send",
                 "${SOURCE}",
                 "/ext/apps",
+                "${ARGS}",
             ]
         ]
     ),
@@ -208,7 +211,7 @@ distenv.Alias("jflash", firmware_jflash)
 
 distenv.PhonyTarget(
     "gdb_trace_all",
-    "$GDB $GDBOPTS $SOURCES $GDBFLASH",
+    [["${GDB}", "${GDBOPTS}", "${SOURCES}", "${GDBFLASH}"]],
     source=firmware_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE}",
     GDBREMOTE="${OPENOCD_GDB_PIPE}",
@@ -227,7 +230,7 @@ firmware_debug = distenv.PhonyTarget(
     source=firmware_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE}",
     GDBREMOTE="${OPENOCD_GDB_PIPE}",
-    FBT_FAP_DEBUG_ELF_ROOT=path_as_posix(firmware_env.subst("$FBT_FAP_DEBUG_ELF_ROOT")),
+    FBT_FAP_DEBUG_ELF_ROOT=firmware_env["FBT_FAP_DEBUG_ELF_ROOT"],
 )
 distenv.Depends(firmware_debug, firmware_flash)
 
@@ -237,7 +240,7 @@ distenv.PhonyTarget(
     source=firmware_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
     GDBREMOTE="${BLACKMAGIC_ADDR}",
-    FBT_FAP_DEBUG_ELF_ROOT=path_as_posix(firmware_env.subst("$FBT_FAP_DEBUG_ELF_ROOT")),
+    FBT_FAP_DEBUG_ELF_ROOT=firmware_env["FBT_FAP_DEBUG_ELF_ROOT"],
 )
 
 # Debug alien elf
@@ -272,19 +275,35 @@ distenv.PhonyTarget(
 # Just start OpenOCD
 distenv.PhonyTarget(
     "openocd",
-    "${OPENOCDCOM}",
+    [["${OPENOCDCOM}", "${ARGS}"]],
 )
 
 # Linter
 distenv.PhonyTarget(
     "lint",
-    [["${PYTHON3}", "${FBT_SCRIPT_DIR}/lint.py", "check", "${LINT_SOURCES}"]],
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/lint.py",
+            "check",
+            "${LINT_SOURCES}",
+            "${ARGS}",
+        ]
+    ],
     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}",
+            "${ARGS}",
+        ]
+    ],
     LINT_SOURCES=[n.srcnode() for n in firmware_env["LINT_SOURCES"]],
 )
 
@@ -307,7 +326,16 @@ firmware_env.Append(
 )
 
 
-black_commandline = "@${PYTHON3} -m black ${PY_BLACK_ARGS} ${PY_LINT_SOURCES}"
+black_commandline = [
+    [
+        "@${PYTHON3}",
+        "-m",
+        "black",
+        "${PY_BLACK_ARGS}",
+        "${PY_LINT_SOURCES}",
+        "${ARGS}",
+    ]
+]
 black_base_args = [
     "--include",
     '"(\\.scons|\\.py|SConscript|SConstruct|\\.fam)$"',
@@ -333,12 +361,28 @@ 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}",
+            "${ARGS}",
+        ]
+    ],
 )
 
-# Update WiFi devboard firmware
+# Update WiFi devboard firmware with release channel
 distenv.PhonyTarget(
-    "devboard_flash", [["${PYTHON3}", "${FBT_SCRIPT_DIR}/wifi_board.py"]]
+    "devboard_flash",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/wifi_board.py",
+            "${ARGS}",
+        ]
+    ],
 )
 
 
@@ -353,7 +397,7 @@ distenv.PhonyTarget(
 distenv.PhonyTarget(
     "get_stlink",
     distenv.Action(
-        lambda **kw: distenv.GetDevices(),
+        lambda **_: distenv.GetDevices(),
         None,
     ),
 )
@@ -376,3 +420,18 @@ distenv.PhonyTarget(
     "env",
     "@echo $( ${FBT_SCRIPT_DIR.abspath}/toolchain/fbtenv.sh $)",
 )
+
+doxy_build = distenv.DoxyBuild(
+    "documentation/doxygen/build/html/index.html",
+    "documentation/doxygen/Doxyfile-awesome.cfg",
+    doxy_env_variables={
+        "DOXY_SRC_ROOT": Dir(".").abspath,
+        "DOXY_BUILD_DIR": Dir("documentation/doxygen/build").abspath,
+        "DOXY_CONFIG_DIR": "documentation/doxygen",
+    },
+)
+distenv.Alias("doxygen", doxy_build)
+distenv.AlwaysBuild(doxy_build)
+
+# Open generated documentation in browser
+distenv.PhonyTarget("doxy", open_browser_action, source=doxy_build)
diff --git a/applications/debug/accessor/accessor_app.h b/applications/debug/accessor/accessor_app.h
index 2afd796d5..bfd5c06e1 100644
--- a/applications/debug/accessor/accessor_app.h
+++ b/applications/debug/accessor/accessor_app.h
@@ -11,29 +11,29 @@ class AccessorApp {
 public:
     void run(void);
 
-    AccessorApp();
-    ~AccessorApp();
+    AccessorApp(void);
+    ~AccessorApp(void);
 
     enum class Scene : uint8_t {
         Exit,
         Start,
     };
 
-    AccessorAppViewManager* get_view_manager();
+    AccessorAppViewManager* get_view_manager(void);
     void switch_to_next_scene(Scene index);
     void search_and_switch_to_previous_scene(std::initializer_list<Scene> scenes_list);
     bool switch_to_previous_scene(uint8_t count = 1);
-    Scene get_previous_scene();
+    Scene get_previous_scene(void);
 
-    void notify_green_blink();
-    void notify_success();
+    void notify_green_blink(void);
+    void notify_success(void);
 
-    char* get_text_store();
-    uint8_t get_text_store_size();
+    char* get_text_store(void);
+    uint8_t get_text_store_size(void);
     void set_text_store(const char* text...);
 
-    WIEGAND* get_wiegand();
-    OneWireHost* get_one_wire();
+    WIEGAND* get_wiegand(void);
+    OneWireHost* get_one_wire(void);
 
 private:
     std::list<Scene> previous_scenes_list = {Scene::Exit};
diff --git a/applications/debug/accessor/accessor_view_manager.h b/applications/debug/accessor/accessor_view_manager.h
index 8cd437797..66e54e41c 100644
--- a/applications/debug/accessor/accessor_view_manager.h
+++ b/applications/debug/accessor/accessor_view_manager.h
@@ -15,16 +15,16 @@ public:
 
     FuriMessageQueue* event_queue;
 
-    AccessorAppViewManager();
-    ~AccessorAppViewManager();
+    AccessorAppViewManager(void);
+    ~AccessorAppViewManager(void);
 
     void switch_to(ViewType type);
 
     void receive_event(AccessorEvent* event);
     void send_event(AccessorEvent* event);
 
-    Submenu* get_submenu();
-    Popup* get_popup();
+    Submenu* get_submenu(void);
+    Popup* get_popup(void);
 
 private:
     ViewDispatcher* view_dispatcher;
diff --git a/applications/debug/accessor/helpers/wiegand.h b/applications/debug/accessor/helpers/wiegand.h
index be80f94cd..1e1ab6bc8 100644
--- a/applications/debug/accessor/helpers/wiegand.h
+++ b/applications/debug/accessor/helpers/wiegand.h
@@ -2,19 +2,19 @@
 
 class WIEGAND {
 public:
-    WIEGAND();
-    void begin();
-    void end();
-    bool available();
-    unsigned long getCode();
-    unsigned long getCodeHigh();
-    int getWiegandType();
+    WIEGAND(void);
+    void begin(void);
+    void end(void);
+    bool available(void);
+    unsigned long getCode(void);
+    unsigned long getCodeHigh(void);
+    int getWiegandType(void);
 
-    static void ReadD0();
-    static void ReadD1();
+    static void ReadD0(void);
+    static void ReadD1(void);
 
 private:
-    static bool DoWiegandConversion();
+    static bool DoWiegandConversion(void);
     static unsigned long
         GetCardId(unsigned long* codehigh, unsigned long* codelow, char bitlength);
 
diff --git a/applications/debug/battery_test_app/battery_test_app.c b/applications/debug/battery_test_app/battery_test_app.c
index 82c814ef4..5f9934e77 100644
--- a/applications/debug/battery_test_app/battery_test_app.c
+++ b/applications/debug/battery_test_app/battery_test_app.c
@@ -32,7 +32,7 @@ static void battery_test_battery_info_update_model(void* context) {
     notification_message(app->notifications, &sequence_display_backlight_on);
 }
 
-BatteryTestApp* battery_test_alloc() {
+BatteryTestApp* battery_test_alloc(void) {
     BatteryTestApp* app = malloc(sizeof(BatteryTestApp));
 
     // Records
diff --git a/applications/debug/battery_test_app/views/battery_info.c b/applications/debug/battery_test_app/views/battery_info.c
index 5353a2e2a..4b5dcd627 100644
--- a/applications/debug/battery_test_app/views/battery_info.c
+++ b/applications/debug/battery_test_app/views/battery_info.c
@@ -116,7 +116,7 @@ static void battery_info_draw_callback(Canvas* canvas, void* context) {
     draw_stat(canvas, 104, 42, &I_Health_16x16, health);
 }
 
-BatteryInfo* battery_info_alloc() {
+BatteryInfo* battery_info_alloc(void) {
     BatteryInfo* battery_info = malloc(sizeof(BatteryInfo));
     battery_info->view = view_alloc();
     view_set_context(battery_info->view, battery_info);
diff --git a/applications/debug/battery_test_app/views/battery_info.h b/applications/debug/battery_test_app/views/battery_info.h
index 7bfacf69e..403caac4b 100644
--- a/applications/debug/battery_test_app/views/battery_info.h
+++ b/applications/debug/battery_test_app/views/battery_info.h
@@ -14,7 +14,7 @@ typedef struct {
     uint8_t health;
 } BatteryInfoModel;
 
-BatteryInfo* battery_info_alloc();
+BatteryInfo* battery_info_alloc(void);
 
 void battery_info_free(BatteryInfo* battery_info);
 
diff --git a/applications/debug/bt_debug_app/bt_debug_app.c b/applications/debug/bt_debug_app/bt_debug_app.c
index bf13f6570..109feee60 100644
--- a/applications/debug/bt_debug_app/bt_debug_app.c
+++ b/applications/debug/bt_debug_app/bt_debug_app.c
@@ -28,7 +28,7 @@ uint32_t bt_debug_start_view(void* context) {
     return BtDebugAppViewSubmenu;
 }
 
-BtDebugApp* bt_debug_app_alloc() {
+BtDebugApp* bt_debug_app_alloc(void) {
     BtDebugApp* app = malloc(sizeof(BtDebugApp));
 
     // Gui
diff --git a/applications/debug/bt_debug_app/views/bt_carrier_test.c b/applications/debug/bt_debug_app/views/bt_carrier_test.c
index 8e2240495..23066434b 100644
--- a/applications/debug/bt_debug_app/views/bt_carrier_test.c
+++ b/applications/debug/bt_debug_app/views/bt_carrier_test.c
@@ -129,7 +129,7 @@ static void bt_test_carrier_timer_callback(void* context) {
     }
 }
 
-BtCarrierTest* bt_carrier_test_alloc() {
+BtCarrierTest* bt_carrier_test_alloc(void) {
     BtCarrierTest* bt_carrier_test = malloc(sizeof(BtCarrierTest));
     bt_carrier_test->bt_test = bt_test_alloc();
     bt_test_set_context(bt_carrier_test->bt_test, bt_carrier_test);
diff --git a/applications/debug/bt_debug_app/views/bt_carrier_test.h b/applications/debug/bt_debug_app/views/bt_carrier_test.h
index 51a400890..07fedccc1 100644
--- a/applications/debug/bt_debug_app/views/bt_carrier_test.h
+++ b/applications/debug/bt_debug_app/views/bt_carrier_test.h
@@ -3,7 +3,7 @@
 
 typedef struct BtCarrierTest BtCarrierTest;
 
-BtCarrierTest* bt_carrier_test_alloc();
+BtCarrierTest* bt_carrier_test_alloc(void);
 
 void bt_carrier_test_free(BtCarrierTest* bt_carrier_test);
 
diff --git a/applications/debug/bt_debug_app/views/bt_packet_test.c b/applications/debug/bt_debug_app/views/bt_packet_test.c
index 8a56a3003..c30c6b5d2 100644
--- a/applications/debug/bt_debug_app/views/bt_packet_test.c
+++ b/applications/debug/bt_debug_app/views/bt_packet_test.c
@@ -97,7 +97,7 @@ static void bt_test_packet_timer_callback(void* context) {
     }
 }
 
-BtPacketTest* bt_packet_test_alloc() {
+BtPacketTest* bt_packet_test_alloc(void) {
     BtPacketTest* bt_packet_test = malloc(sizeof(BtPacketTest));
     bt_packet_test->bt_test = bt_test_alloc();
     bt_test_set_context(bt_packet_test->bt_test, bt_packet_test);
diff --git a/applications/debug/bt_debug_app/views/bt_packet_test.h b/applications/debug/bt_debug_app/views/bt_packet_test.h
index 8ea449b21..e31af3218 100644
--- a/applications/debug/bt_debug_app/views/bt_packet_test.h
+++ b/applications/debug/bt_debug_app/views/bt_packet_test.h
@@ -3,7 +3,7 @@
 
 typedef struct BtPacketTest BtPacketTest;
 
-BtPacketTest* bt_packet_test_alloc();
+BtPacketTest* bt_packet_test_alloc(void);
 
 void bt_packet_test_free(BtPacketTest* bt_packet_test);
 
diff --git a/applications/debug/bt_debug_app/views/bt_test.c b/applications/debug/bt_debug_app/views/bt_test.c
index cd52b8650..792ebfd8f 100644
--- a/applications/debug/bt_debug_app/views/bt_test.c
+++ b/applications/debug/bt_debug_app/views/bt_test.c
@@ -305,7 +305,7 @@ void bt_test_process_back(BtTest* bt_test) {
     }
 }
 
-BtTest* bt_test_alloc() {
+BtTest* bt_test_alloc(void) {
     BtTest* bt_test = malloc(sizeof(BtTest));
     bt_test->view = view_alloc();
     view_set_context(bt_test->view, bt_test);
diff --git a/applications/debug/bt_debug_app/views/bt_test.h b/applications/debug/bt_debug_app/views/bt_test.h
index 2d738cbd0..9d5ea26ec 100644
--- a/applications/debug/bt_debug_app/views/bt_test.h
+++ b/applications/debug/bt_debug_app/views/bt_test.h
@@ -12,7 +12,7 @@ typedef void (*BtTestBackCallback)(void* context);
 typedef struct BtTestParam BtTestParam;
 typedef void (*BtTestParamChangeCallback)(BtTestParam* param);
 
-BtTest* bt_test_alloc();
+BtTest* bt_test_alloc(void);
 
 void bt_test_free(BtTest* bt_test);
 
diff --git a/applications/debug/ccid_test/ccid_test_app.c b/applications/debug/ccid_test/ccid_test_app.c
index 3d7fba39d..50b356696 100644
--- a/applications/debug/ccid_test/ccid_test_app.c
+++ b/applications/debug/ccid_test/ccid_test_app.c
@@ -90,7 +90,7 @@ uint32_t ccid_test_exit(void* context) {
     return VIEW_NONE;
 }
 
-CcidTestApp* ccid_test_app_alloc() {
+CcidTestApp* ccid_test_app_alloc(void) {
     CcidTestApp* app = malloc(sizeof(CcidTestApp));
 
     // Gui
diff --git a/applications/debug/crash_test/crash_test.c b/applications/debug/crash_test/crash_test.c
index 92f1668be..ae0074fe1 100644
--- a/applications/debug/crash_test/crash_test.c
+++ b/applications/debug/crash_test/crash_test.c
@@ -50,7 +50,7 @@ static void crash_test_submenu_callback(void* context, uint32_t index) {
         furi_halt("Crash test: furi_halt");
         break;
     default:
-        furi_crash("Programming error");
+        furi_crash();
     }
 }
 
@@ -59,7 +59,7 @@ static uint32_t crash_test_exit_callback(void* context) {
     return VIEW_NONE;
 }
 
-CrashTest* crash_test_alloc() {
+CrashTest* crash_test_alloc(void) {
     CrashTest* instance = malloc(sizeof(CrashTest));
 
     View* view = NULL;
diff --git a/applications/debug/direct_draw/direct_draw.c b/applications/debug/direct_draw/direct_draw.c
index 63e03530a..bc1e55459 100644
--- a/applications/debug/direct_draw/direct_draw.c
+++ b/applications/debug/direct_draw/direct_draw.c
@@ -26,7 +26,7 @@ static void gui_input_events_callback(const void* value, void* ctx) {
     }
 }
 
-static DirectDraw* direct_draw_alloc() {
+static DirectDraw* direct_draw_alloc(void) {
     DirectDraw* instance = malloc(sizeof(DirectDraw));
 
     instance->input = furi_record_open(RECORD_INPUT_EVENTS);
diff --git a/applications/debug/display_test/display_test.c b/applications/debug/display_test/display_test.c
index 8065a23a1..ac1b6c65d 100644
--- a/applications/debug/display_test/display_test.c
+++ b/applications/debug/display_test/display_test.c
@@ -121,7 +121,7 @@ static void display_config_set_contrast(VariableItem* item) {
     display_test_reload_config(instance);
 }
 
-DisplayTest* display_test_alloc() {
+DisplayTest* display_test_alloc(void) {
     DisplayTest* instance = malloc(sizeof(DisplayTest));
 
     View* view = NULL;
diff --git a/applications/debug/display_test/view_display_test.c b/applications/debug/display_test/view_display_test.c
index b47c74c6c..d4fe433ef 100644
--- a/applications/debug/display_test/view_display_test.c
+++ b/applications/debug/display_test/view_display_test.c
@@ -154,7 +154,7 @@ static void view_display_test_timer_callback(void* context) {
         instance->view, ViewDisplayTestModel * model, { model->counter++; }, true);
 }
 
-ViewDisplayTest* view_display_test_alloc() {
+ViewDisplayTest* view_display_test_alloc(void) {
     ViewDisplayTest* instance = malloc(sizeof(ViewDisplayTest));
 
     instance->view = view_alloc();
diff --git a/applications/debug/display_test/view_display_test.h b/applications/debug/display_test/view_display_test.h
index cafa142a8..ca78e5ffe 100644
--- a/applications/debug/display_test/view_display_test.h
+++ b/applications/debug/display_test/view_display_test.h
@@ -5,7 +5,7 @@
 
 typedef struct ViewDisplayTest ViewDisplayTest;
 
-ViewDisplayTest* view_display_test_alloc();
+ViewDisplayTest* view_display_test_alloc(void);
 
 void view_display_test_free(ViewDisplayTest* instance);
 
diff --git a/applications/debug/expansion_test/expansion_test.c b/applications/debug/expansion_test/expansion_test.c
index a0b8b42e8..fc7fb1894 100644
--- a/applications/debug/expansion_test/expansion_test.c
+++ b/applications/debug/expansion_test/expansion_test.c
@@ -81,7 +81,7 @@ static void expansion_test_app_serial_rx_callback(
     }
 }
 
-static ExpansionTestApp* expansion_test_app_alloc() {
+static ExpansionTestApp* expansion_test_app_alloc(void) {
     ExpansionTestApp* instance = malloc(sizeof(ExpansionTestApp));
     instance->buf = furi_stream_buffer_alloc(RECEIVE_BUFFER_SIZE, 1);
     return instance;
diff --git a/applications/debug/lfrfid_debug/lfrfid_debug.c b/applications/debug/lfrfid_debug/lfrfid_debug.c
index 63d66b68b..8776f8b7a 100644
--- a/applications/debug/lfrfid_debug/lfrfid_debug.c
+++ b/applications/debug/lfrfid_debug/lfrfid_debug.c
@@ -12,7 +12,7 @@ static bool lfrfid_debug_back_event_callback(void* context) {
     return scene_manager_handle_back_event(app->scene_manager);
 }
 
-static LfRfidDebug* lfrfid_debug_alloc() {
+static LfRfidDebug* lfrfid_debug_alloc(void) {
     LfRfidDebug* app = malloc(sizeof(LfRfidDebug));
 
     app->view_dispatcher = view_dispatcher_alloc();
diff --git a/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.c b/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.c
index 9e48a7e27..6b9501e5b 100644
--- a/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.c
+++ b/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.c
@@ -170,7 +170,7 @@ static bool lfrfid_debug_view_tune_input_callback(InputEvent* event, void* conte
     return consumed;
 }
 
-LfRfidTuneView* lfrfid_debug_view_tune_alloc() {
+LfRfidTuneView* lfrfid_debug_view_tune_alloc(void) {
     LfRfidTuneView* tune_view = malloc(sizeof(LfRfidTuneView));
     tune_view->view = view_alloc();
     view_set_context(tune_view->view, tune_view);
diff --git a/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.h b/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.h
index be54b63f9..a0ee4cbf5 100644
--- a/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.h
+++ b/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.h
@@ -3,7 +3,7 @@
 
 typedef struct LfRfidTuneView LfRfidTuneView;
 
-LfRfidTuneView* lfrfid_debug_view_tune_alloc();
+LfRfidTuneView* lfrfid_debug_view_tune_alloc(void);
 
 void lfrfid_debug_view_tune_free(LfRfidTuneView* tune_view);
 
diff --git a/applications/debug/locale_test/locale_test.c b/applications/debug/locale_test/locale_test.c
index a7cbd52f8..1ca077db1 100644
--- a/applications/debug/locale_test/locale_test.c
+++ b/applications/debug/locale_test/locale_test.c
@@ -53,7 +53,7 @@ static uint32_t locale_test_exit(void* context) {
     return VIEW_NONE;
 }
 
-static LocaleTestApp* locale_test_alloc() {
+static LocaleTestApp* locale_test_alloc(void) {
     LocaleTestApp* app = malloc(sizeof(LocaleTestApp));
 
     // Gui
diff --git a/applications/debug/rpc_debug_app/rpc_debug_app.c b/applications/debug/rpc_debug_app/rpc_debug_app.c
index 2a0756383..5e53c221e 100644
--- a/applications/debug/rpc_debug_app/rpc_debug_app.c
+++ b/applications/debug/rpc_debug_app/rpc_debug_app.c
@@ -83,7 +83,7 @@ static bool rpc_debug_app_rpc_init_rpc(RpcDebugApp* app, const char* args) {
     return ret;
 }
 
-static RpcDebugApp* rpc_debug_app_alloc() {
+static RpcDebugApp* rpc_debug_app_alloc(void) {
     RpcDebugApp* app = malloc(sizeof(RpcDebugApp));
 
     app->gui = furi_record_open(RECORD_GUI);
diff --git a/applications/debug/speaker_debug/speaker_debug.c b/applications/debug/speaker_debug/speaker_debug.c
index e01d5b8ec..82a6fbc77 100644
--- a/applications/debug/speaker_debug/speaker_debug.c
+++ b/applications/debug/speaker_debug/speaker_debug.c
@@ -21,7 +21,7 @@ typedef struct {
     Cli* cli;
 } SpeakerDebugApp;
 
-static SpeakerDebugApp* speaker_app_alloc() {
+static SpeakerDebugApp* speaker_app_alloc(void) {
     SpeakerDebugApp* app = (SpeakerDebugApp*)malloc(sizeof(SpeakerDebugApp));
     app->music_worker = music_worker_alloc();
     app->message_queue = furi_message_queue_alloc(8, sizeof(SpeakerDebugAppMessage));
diff --git a/applications/debug/subghz_test/protocol/princeton_for_testing.c b/applications/debug/subghz_test/protocol/princeton_for_testing.c
index 334a8241b..70f323937 100644
--- a/applications/debug/subghz_test/protocol/princeton_for_testing.c
+++ b/applications/debug/subghz_test/protocol/princeton_for_testing.c
@@ -38,7 +38,7 @@ typedef enum {
     PrincetonDecoderStepCheckDuration,
 } PrincetonDecoderStep;
 
-SubGhzEncoderPrinceton* subghz_encoder_princeton_for_testing_alloc() {
+SubGhzEncoderPrinceton* subghz_encoder_princeton_for_testing_alloc(void) {
     SubGhzEncoderPrinceton* instance = malloc(sizeof(SubGhzEncoderPrinceton));
     return instance;
 }
diff --git a/applications/debug/subghz_test/protocol/princeton_for_testing.h b/applications/debug/subghz_test/protocol/princeton_for_testing.h
index 7b4201d38..281cb148b 100644
--- a/applications/debug/subghz_test/protocol/princeton_for_testing.h
+++ b/applications/debug/subghz_test/protocol/princeton_for_testing.h
@@ -15,7 +15,7 @@ typedef void (*SubGhzDecoderPrincetonCallback)(SubGhzDecoderPrinceton* parser, v
  * Allocate SubGhzEncoderPrinceton
  * @return pointer to SubGhzEncoderPrinceton instance
  */
-SubGhzEncoderPrinceton* subghz_encoder_princeton_for_testing_alloc();
+SubGhzEncoderPrinceton* subghz_encoder_princeton_for_testing_alloc(void);
 
 /** 
  * Free SubGhzEncoderPrinceton instance
@@ -69,7 +69,7 @@ LevelDuration subghz_encoder_princeton_for_testing_yield(void* context);
  * Allocate SubGhzDecoderPrinceton
  * @return SubGhzDecoderPrinceton* 
  */
-SubGhzDecoderPrinceton* subghz_decoder_princeton_for_testing_alloc();
+SubGhzDecoderPrinceton* subghz_decoder_princeton_for_testing_alloc(void);
 
 /** 
  * Free SubGhzDecoderPrinceton
diff --git a/applications/debug/subghz_test/scenes/subghz_test_scene_show_only_rx.c b/applications/debug/subghz_test/scenes/subghz_test_scene_show_only_rx.c
index 3d5a54355..d8eade41d 100644
--- a/applications/debug/subghz_test/scenes/subghz_test_scene_show_only_rx.c
+++ b/applications/debug/subghz_test/scenes/subghz_test_scene_show_only_rx.c
@@ -12,7 +12,7 @@ void subghz_test_scene_show_only_rx_on_enter(void* context) {
     // Setup view
     Popup* popup = app->popup;
 
-    const char* header_text = "Transmission is blocked";
+    const char* header_text = "Transmission is Blocked";
     const char* message_text = "Transmission on\nthis frequency is\nrestricted in\nyour region";
     if(!furi_hal_region_is_provisioned()) {
         header_text = "Firmware update needed";
diff --git a/applications/debug/subghz_test/subghz_test_app.c b/applications/debug/subghz_test/subghz_test_app.c
index 704941fb2..6eba864f6 100644
--- a/applications/debug/subghz_test/subghz_test_app.c
+++ b/applications/debug/subghz_test/subghz_test_app.c
@@ -21,7 +21,7 @@ static void subghz_test_app_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(app->scene_manager);
 }
 
-SubGhzTestApp* subghz_test_app_alloc() {
+SubGhzTestApp* subghz_test_app_alloc(void) {
     SubGhzTestApp* app = malloc(sizeof(SubGhzTestApp));
 
     // GUI
diff --git a/applications/debug/subghz_test/views/subghz_test_carrier.c b/applications/debug/subghz_test/views/subghz_test_carrier.c
index ec64e2d9b..b6b4530ae 100644
--- a/applications/debug/subghz_test/views/subghz_test_carrier.c
+++ b/applications/debug/subghz_test/views/subghz_test_carrier.c
@@ -219,7 +219,7 @@ void subghz_test_carrier_rssi_timer_callback(void* context) {
         false);
 }
 
-SubGhzTestCarrier* subghz_test_carrier_alloc() {
+SubGhzTestCarrier* subghz_test_carrier_alloc(void) {
     SubGhzTestCarrier* subghz_test_carrier = malloc(sizeof(SubGhzTestCarrier));
 
     // View allocation and configuration
diff --git a/applications/debug/subghz_test/views/subghz_test_carrier.h b/applications/debug/subghz_test/views/subghz_test_carrier.h
index d171d19f4..0ba8bc8a2 100644
--- a/applications/debug/subghz_test/views/subghz_test_carrier.h
+++ b/applications/debug/subghz_test/views/subghz_test_carrier.h
@@ -16,7 +16,7 @@ void subghz_test_carrier_set_callback(
     SubGhzTestCarrierCallback callback,
     void* context);
 
-SubGhzTestCarrier* subghz_test_carrier_alloc();
+SubGhzTestCarrier* subghz_test_carrier_alloc(void);
 
 void subghz_test_carrier_free(SubGhzTestCarrier* subghz_test_carrier);
 
diff --git a/applications/debug/subghz_test/views/subghz_test_packet.c b/applications/debug/subghz_test/views/subghz_test_packet.c
index 1f3458296..d50f10ad4 100644
--- a/applications/debug/subghz_test/views/subghz_test_packet.c
+++ b/applications/debug/subghz_test/views/subghz_test_packet.c
@@ -236,7 +236,7 @@ void subghz_test_packet_exit(void* context) {
     furi_hal_subghz_sleep();
 }
 
-SubGhzTestPacket* subghz_test_packet_alloc() {
+SubGhzTestPacket* subghz_test_packet_alloc(void) {
     SubGhzTestPacket* instance = malloc(sizeof(SubGhzTestPacket));
 
     // View allocation and configuration
diff --git a/applications/debug/subghz_test/views/subghz_test_packet.h b/applications/debug/subghz_test/views/subghz_test_packet.h
index f384cf4fe..3a8204f1f 100644
--- a/applications/debug/subghz_test/views/subghz_test_packet.h
+++ b/applications/debug/subghz_test/views/subghz_test_packet.h
@@ -15,7 +15,7 @@ void subghz_test_packet_set_callback(
     SubGhzTestPacketCallback callback,
     void* context);
 
-SubGhzTestPacket* subghz_test_packet_alloc();
+SubGhzTestPacket* subghz_test_packet_alloc(void);
 
 void subghz_test_packet_free(SubGhzTestPacket* subghz_test_packet);
 
diff --git a/applications/debug/subghz_test/views/subghz_test_static.c b/applications/debug/subghz_test/views/subghz_test_static.c
index 6764fd5ca..22ad662c5 100644
--- a/applications/debug/subghz_test/views/subghz_test_static.c
+++ b/applications/debug/subghz_test/views/subghz_test_static.c
@@ -164,7 +164,7 @@ void subghz_test_static_exit(void* context) {
     furi_hal_subghz_sleep();
 }
 
-SubGhzTestStatic* subghz_test_static_alloc() {
+SubGhzTestStatic* subghz_test_static_alloc(void) {
     SubGhzTestStatic* instance = malloc(sizeof(SubGhzTestStatic));
 
     // View allocation and configuration
diff --git a/applications/debug/subghz_test/views/subghz_test_static.h b/applications/debug/subghz_test/views/subghz_test_static.h
index 902036431..3bb6156f7 100644
--- a/applications/debug/subghz_test/views/subghz_test_static.h
+++ b/applications/debug/subghz_test/views/subghz_test_static.h
@@ -15,7 +15,7 @@ void subghz_test_static_set_callback(
     SubGhzTestStaticCallback callback,
     void* context);
 
-SubGhzTestStatic* subghz_test_static_alloc();
+SubGhzTestStatic* subghz_test_static_alloc(void);
 
 void subghz_test_static_free(SubGhzTestStatic* subghz_static);
 
diff --git a/applications/debug/uart_echo/uart_echo.c b/applications/debug/uart_echo/uart_echo.c
index 0291c9e79..9c65910a0 100644
--- a/applications/debug/uart_echo/uart_echo.c
+++ b/applications/debug/uart_echo/uart_echo.c
@@ -283,13 +283,14 @@ static UartEchoApp* uart_echo_app_alloc(uint32_t baudrate) {
 static void uart_echo_app_free(UartEchoApp* app) {
     furi_assert(app);
 
+    furi_hal_serial_async_rx_stop(app->serial_handle);
+    furi_hal_serial_deinit(app->serial_handle);
+    furi_hal_serial_control_release(app->serial_handle);
+
     furi_thread_flags_set(furi_thread_get_id(app->worker_thread), WorkerEventStop);
     furi_thread_join(app->worker_thread);
     furi_thread_free(app->worker_thread);
 
-    furi_hal_serial_deinit(app->serial_handle);
-    furi_hal_serial_control_release(app->serial_handle);
-
     // Free views
     view_dispatcher_remove_view(app->view_dispatcher, 0);
 
diff --git a/applications/debug/unit_tests/bit_lib/bit_lib_test.c b/applications/debug/unit_tests/bit_lib/bit_lib_test.c
index 42b494413..239a3b562 100644
--- a/applications/debug/unit_tests/bit_lib/bit_lib_test.c
+++ b/applications/debug/unit_tests/bit_lib/bit_lib_test.c
@@ -734,7 +734,7 @@ MU_TEST_SUITE(test_bit_lib) {
     MU_RUN_TEST(test_bit_lib_bytes_to_num_bcd);
 }
 
-int run_minunit_test_bit_lib() {
+int run_minunit_test_bit_lib(void) {
     MU_RUN_SUITE(test_bit_lib);
     return MU_EXIT_CODE;
 }
\ No newline at end of file
diff --git a/applications/debug/unit_tests/bt/bt_test.c b/applications/debug/unit_tests/bt/bt_test.c
index 32cf6533f..a09b9894b 100644
--- a/applications/debug/unit_tests/bt/bt_test.c
+++ b/applications/debug/unit_tests/bt/bt_test.c
@@ -17,7 +17,7 @@ typedef struct {
 
 BtTest* bt_test = NULL;
 
-void bt_test_alloc() {
+void bt_test_alloc(void) {
     bt_test = malloc(sizeof(BtTest));
     bt_test->storage = furi_record_open(RECORD_STORAGE);
     bt_test->nvm_ram_buff_dut = malloc(BT_TEST_NVM_RAM_BUFF_SIZE);
@@ -27,7 +27,7 @@ void bt_test_alloc() {
         bt_test->bt_keys_storage, bt_test->nvm_ram_buff_dut, BT_TEST_NVM_RAM_BUFF_SIZE);
 }
 
-void bt_test_free() {
+void bt_test_free(void) {
     furi_check(bt_test);
     free(bt_test->nvm_ram_buff_ref);
     free(bt_test->nvm_ram_buff_dut);
@@ -37,7 +37,7 @@ void bt_test_free() {
     bt_test = NULL;
 }
 
-static void bt_test_keys_storage_profile() {
+static void bt_test_keys_storage_profile(void) {
     // Emulate nvm change on initial connection
     const int nvm_change_size_on_connection = 88;
     for(size_t i = 0; i < nvm_change_size_on_connection; i++) {
@@ -82,7 +82,7 @@ static void bt_test_keys_storage_profile() {
         "Wrong buffer loaded");
 }
 
-static void bt_test_keys_remove_test_file() {
+static void bt_test_keys_remove_test_file(void) {
     mu_assert(
         storage_simply_remove(bt_test->storage, BT_TEST_KEY_STORAGE_FILE_PATH),
         "Can't remove test file");
@@ -104,7 +104,7 @@ MU_TEST_SUITE(test_bt) {
     bt_test_free();
 }
 
-int run_minunit_test_bt() {
+int run_minunit_test_bt(void) {
     MU_RUN_SUITE(test_bt);
     return MU_EXIT_CODE;
 }
diff --git a/applications/debug/unit_tests/datetimelib/datetimelib_test.c b/applications/debug/unit_tests/datetimelib/datetimelib_test.c
index 42bc7dbed..c171a4413 100644
--- a/applications/debug/unit_tests/datetimelib/datetimelib_test.c
+++ b/applications/debug/unit_tests/datetimelib/datetimelib_test.c
@@ -112,7 +112,7 @@ MU_TEST_SUITE(test_datetime_validate_datetime) {
 
 MU_TEST(test_datetime_timestamp_to_datetime_min) {
     uint32_t test_value = 0;
-    DateTime min_datetime_expected = {0, 0, 0, 1, 1, 1970, 0};
+    DateTime min_datetime_expected = {0, 0, 0, 1, 1, 1970, 4};
 
     DateTime result = {0};
     datetime_timestamp_to_datetime(test_value, &result);
@@ -122,7 +122,7 @@ MU_TEST(test_datetime_timestamp_to_datetime_min) {
 
 MU_TEST(test_datetime_timestamp_to_datetime_max) {
     uint32_t test_value = UINT32_MAX;
-    DateTime max_datetime_expected = {6, 28, 15, 7, 2, 2106, 0};
+    DateTime max_datetime_expected = {6, 28, 15, 7, 2, 2106, 7};
 
     DateTime result = {0};
     datetime_timestamp_to_datetime(test_value, &result);
@@ -141,10 +141,26 @@ MU_TEST(test_datetime_timestamp_to_datetime_to_timestamp) {
     mu_assert_int_eq(test_value, result);
 }
 
+MU_TEST(test_datetime_timestamp_to_datetime_weekday) {
+    uint32_t test_value = 1709748421; // Wed Mar 06 18:07:01 2024 UTC
+
+    DateTime datetime = {0};
+    datetime_timestamp_to_datetime(test_value, &datetime);
+
+    mu_assert_int_eq(datetime.hour, 18);
+    mu_assert_int_eq(datetime.minute, 7);
+    mu_assert_int_eq(datetime.second, 1);
+    mu_assert_int_eq(datetime.day, 6);
+    mu_assert_int_eq(datetime.month, 3);
+    mu_assert_int_eq(datetime.weekday, 3);
+    mu_assert_int_eq(datetime.year, 2024);
+}
+
 MU_TEST_SUITE(test_datetime_timestamp_to_datetime_suite) {
     MU_RUN_TEST(test_datetime_timestamp_to_datetime_min);
     MU_RUN_TEST(test_datetime_timestamp_to_datetime_max);
     MU_RUN_TEST(test_datetime_timestamp_to_datetime_to_timestamp);
+    MU_RUN_TEST(test_datetime_timestamp_to_datetime_weekday);
 }
 
 MU_TEST(test_datetime_datetime_to_timestamp_min) {
@@ -166,7 +182,7 @@ MU_TEST_SUITE(test_datetime_datetime_to_timestamp_suite) {
     MU_RUN_TEST(test_datetime_datetime_to_timestamp_max);
 }
 
-int run_minunit_test_datetime() {
+int run_minunit_test_datetime(void) {
     MU_RUN_SUITE(test_datetime_timestamp_to_datetime_suite);
     MU_RUN_SUITE(test_datetime_datetime_to_timestamp_suite);
     MU_RUN_SUITE(test_datetime_validate_datetime);
diff --git a/applications/debug/unit_tests/dialogs/dialogs_file_browser_options.c b/applications/debug/unit_tests/dialogs/dialogs_file_browser_options.c
index 2d5bad4c8..657b933df 100644
--- a/applications/debug/unit_tests/dialogs/dialogs_file_browser_options.c
+++ b/applications/debug/unit_tests/dialogs/dialogs_file_browser_options.c
@@ -25,7 +25,7 @@ MU_TEST_SUITE(dialogs_file_browser_options) {
     MU_RUN_TEST(test_dialog_file_browser_set_basic_options_should_init_all_fields);
 }
 
-int run_minunit_test_dialogs_file_browser_options() {
+int run_minunit_test_dialogs_file_browser_options(void) {
     MU_RUN_SUITE(dialogs_file_browser_options);
 
     return MU_EXIT_CODE;
diff --git a/applications/debug/unit_tests/expansion/expansion_test.c b/applications/debug/unit_tests/expansion/expansion_test.c
index 50fe1b9f4..c6a143ed3 100644
--- a/applications/debug/unit_tests/expansion/expansion_test.c
+++ b/applications/debug/unit_tests/expansion/expansion_test.c
@@ -194,7 +194,7 @@ MU_TEST_SUITE(test_expansion_suite) {
     MU_RUN_TEST(test_expansion_garbage_input);
 }
 
-int run_minunit_test_expansion() {
+int run_minunit_test_expansion(void) {
     MU_RUN_SUITE(test_expansion_suite);
     return MU_EXIT_CODE;
 }
diff --git a/applications/debug/unit_tests/flipper_format/flipper_format_string_test.c b/applications/debug/unit_tests/flipper_format/flipper_format_string_test.c
index 920a22a43..99bb5dda5 100644
--- a/applications/debug/unit_tests/flipper_format/flipper_format_string_test.c
+++ b/applications/debug/unit_tests/flipper_format/flipper_format_string_test.c
@@ -331,7 +331,7 @@ MU_TEST_SUITE(flipper_format_string_suite) {
     MU_RUN_TEST(flipper_format_file_test);
 }
 
-int run_minunit_test_flipper_format_string() {
+int run_minunit_test_flipper_format_string(void) {
     MU_RUN_SUITE(flipper_format_string_suite);
     return MU_EXIT_CODE;
 }
diff --git a/applications/debug/unit_tests/flipper_format/flipper_format_test.c b/applications/debug/unit_tests/flipper_format/flipper_format_test.c
index 012e905b6..471055fb0 100644
--- a/applications/debug/unit_tests/flipper_format/flipper_format_test.c
+++ b/applications/debug/unit_tests/flipper_format/flipper_format_test.c
@@ -103,14 +103,14 @@ static bool storage_write_string(const char* path, const char* data) {
     return result;
 }
 
-static void tests_setup() {
+static void tests_setup(void) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     mu_assert(storage_simply_remove_recursive(storage, TEST_DIR_NAME), "Cannot clean data");
     mu_assert(storage_simply_mkdir(storage, TEST_DIR_NAME), "Cannot create dir");
     furi_record_close(RECORD_STORAGE);
 }
 
-static void tests_teardown() {
+static void tests_teardown(void) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     mu_assert(storage_simply_remove_recursive(storage, TEST_DIR_NAME), "Cannot clean data");
     furi_record_close(RECORD_STORAGE);
@@ -545,7 +545,7 @@ MU_TEST_SUITE(flipper_format) {
     tests_teardown();
 }
 
-int run_minunit_test_flipper_format() {
+int run_minunit_test_flipper_format(void) {
     MU_RUN_SUITE(flipper_format);
     return MU_EXIT_CODE;
 }
diff --git a/applications/debug/unit_tests/float_tools/float_tools_test.c b/applications/debug/unit_tests/float_tools/float_tools_test.c
index fc5b4ecfd..91ac46937 100644
--- a/applications/debug/unit_tests/float_tools/float_tools_test.c
+++ b/applications/debug/unit_tests/float_tools/float_tools_test.c
@@ -54,7 +54,7 @@ MU_TEST_SUITE(float_tools_suite) {
     MU_RUN_TEST(float_tools_equal_test);
 }
 
-int run_minunit_test_float_tools() {
+int run_minunit_test_float_tools(void) {
     MU_RUN_SUITE(float_tools_suite);
     return MU_EXIT_CODE;
 }
diff --git a/applications/debug/unit_tests/furi/furi_memmgr_test.c b/applications/debug/unit_tests/furi/furi_memmgr_test.c
index 9012eed78..01e2c17f6 100644
--- a/applications/debug/unit_tests/furi/furi_memmgr_test.c
+++ b/applications/debug/unit_tests/furi/furi_memmgr_test.c
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-void test_furi_memmgr() {
+void test_furi_memmgr(void) {
     void* ptr;
 
     // allocate memory case
diff --git a/applications/debug/unit_tests/furi/furi_pubsub_test.c b/applications/debug/unit_tests/furi/furi_pubsub_test.c
index ddaeb746d..8925ff42e 100644
--- a/applications/debug/unit_tests/furi/furi_pubsub_test.c
+++ b/applications/debug/unit_tests/furi/furi_pubsub_test.c
@@ -15,7 +15,7 @@ void test_pubsub_handler(const void* arg, void* ctx) {
     pubsub_context_value = *(uint32_t*)ctx;
 }
 
-void test_furi_pubsub() {
+void test_furi_pubsub(void) {
     FuriPubSub* test_pubsub = NULL;
     FuriPubSubSubscription* test_pubsub_subscription = NULL;
 
diff --git a/applications/debug/unit_tests/furi/furi_record_test.c b/applications/debug/unit_tests/furi/furi_record_test.c
index 236e1efc5..10a5a8393 100644
--- a/applications/debug/unit_tests/furi/furi_record_test.c
+++ b/applications/debug/unit_tests/furi/furi_record_test.c
@@ -5,7 +5,7 @@
 
 #define TEST_RECORD_NAME "test/holding"
 
-void test_furi_create_open() {
+void test_furi_create_open(void) {
     // Test that record does not exist
     mu_check(furi_record_exists(TEST_RECORD_NAME) == false);
 
diff --git a/applications/debug/unit_tests/furi/furi_string_test.c b/applications/debug/unit_tests/furi/furi_string_test.c
index 6cbcc0dcc..853076b67 100644
--- a/applications/debug/unit_tests/furi/furi_string_test.c
+++ b/applications/debug/unit_tests/furi/furi_string_test.c
@@ -462,7 +462,7 @@ MU_TEST_SUITE(test_suite) {
     MU_RUN_TEST(mu_test_furi_string_utf8);
 }
 
-int run_minunit_test_furi_string() {
+int run_minunit_test_furi_string(void) {
     MU_RUN_SUITE(test_suite);
 
     return MU_EXIT_CODE;
diff --git a/applications/debug/unit_tests/furi/furi_test.c b/applications/debug/unit_tests/furi/furi_test.c
index 33ec5fd01..e287f9927 100644
--- a/applications/debug/unit_tests/furi/furi_test.c
+++ b/applications/debug/unit_tests/furi/furi_test.c
@@ -4,11 +4,11 @@
 #include "../minunit.h"
 
 // v2 tests
-void test_furi_create_open();
-void test_furi_concurrent_access();
-void test_furi_pubsub();
+void test_furi_create_open(void);
+void test_furi_concurrent_access(void);
+void test_furi_pubsub(void);
 
-void test_furi_memmgr();
+void test_furi_memmgr(void);
 
 static int foo = 0;
 
@@ -50,7 +50,7 @@ MU_TEST_SUITE(test_suite) {
     MU_RUN_TEST(mu_test_furi_memmgr);
 }
 
-int run_minunit_test_furi() {
+int run_minunit_test_furi(void) {
     MU_RUN_SUITE(test_suite);
 
     return MU_EXIT_CODE;
diff --git a/applications/debug/unit_tests/furi_hal/furi_hal_crypto_tests.c b/applications/debug/unit_tests/furi_hal/furi_hal_crypto_tests.c
index b06d51130..c2bd6c5f8 100644
--- a/applications/debug/unit_tests/furi_hal/furi_hal_crypto_tests.c
+++ b/applications/debug/unit_tests/furi_hal/furi_hal_crypto_tests.c
@@ -409,16 +409,16 @@ static const uint8_t tv_gcm_tag_4[16] = {
     0x1B,
 };
 
-static void furi_hal_crypto_ctr_setup() {
+static void furi_hal_crypto_ctr_setup(void) {
 }
 
-static void furi_hal_crypto_ctr_teardown() {
+static void furi_hal_crypto_ctr_teardown(void) {
 }
 
-static void furi_hal_crypto_gcm_setup() {
+static void furi_hal_crypto_gcm_setup(void) {
 }
 
-static void furi_hal_crypto_gcm_teardown() {
+static void furi_hal_crypto_gcm_teardown(void) {
 }
 
 MU_TEST(furi_hal_crypto_ctr_1) {
@@ -595,7 +595,7 @@ MU_TEST_SUITE(furi_hal_crypto_gcm_test) {
     MU_RUN_TEST(furi_hal_crypto_gcm_4);
 }
 
-int run_minunit_test_furi_hal_crypto() {
+int run_minunit_test_furi_hal_crypto(void) {
     MU_RUN_SUITE(furi_hal_crypto_ctr_test);
     MU_RUN_SUITE(furi_hal_crypto_gcm_test);
     return MU_EXIT_CODE;
diff --git a/applications/debug/unit_tests/furi_hal/furi_hal_tests.c b/applications/debug/unit_tests/furi_hal/furi_hal_tests.c
index a75615d0c..0c5cec8a6 100644
--- a/applications/debug/unit_tests/furi_hal/furi_hal_tests.c
+++ b/applications/debug/unit_tests/furi_hal/furi_hal_tests.c
@@ -14,19 +14,19 @@
 #define EEPROM_PAGE_SIZE 16
 #define EEPROM_WRITE_DELAY_MS 6
 
-static void furi_hal_i2c_int_setup() {
+static void furi_hal_i2c_int_setup(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
 }
 
-static void furi_hal_i2c_int_teardown() {
+static void furi_hal_i2c_int_teardown(void) {
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
 }
 
-static void furi_hal_i2c_ext_setup() {
+static void furi_hal_i2c_ext_setup(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_external);
 }
 
-static void furi_hal_i2c_ext_teardown() {
+static void furi_hal_i2c_ext_teardown(void) {
     furi_hal_i2c_release(&furi_hal_i2c_handle_external);
 }
 
@@ -227,7 +227,7 @@ MU_TEST_SUITE(furi_hal_i2c_ext_suite) {
     MU_RUN_TEST(furi_hal_i2c_ext_eeprom);
 }
 
-int run_minunit_test_furi_hal() {
+int run_minunit_test_furi_hal(void) {
     MU_RUN_SUITE(furi_hal_i2c_int_suite);
     MU_RUN_SUITE(furi_hal_i2c_ext_suite);
     return MU_EXIT_CODE;
diff --git a/applications/debug/unit_tests/infrared/infrared_test.c b/applications/debug/unit_tests/infrared/infrared_test.c
index 294c2da9a..4442fedb3 100644
--- a/applications/debug/unit_tests/infrared/infrared_test.c
+++ b/applications/debug/unit_tests/infrared/infrared_test.c
@@ -17,7 +17,7 @@ typedef struct {
 
 static InfraredTest* test;
 
-static void infrared_test_alloc() {
+static void infrared_test_alloc(void) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     test = malloc(sizeof(InfraredTest));
     test->decoder_handler = infrared_alloc_decoder();
@@ -26,7 +26,7 @@ static void infrared_test_alloc() {
     test->file_path = furi_string_alloc();
 }
 
-static void infrared_test_free() {
+static void infrared_test_free(void) {
     furi_check(test);
     infrared_free_decoder(test->decoder_handler);
     infrared_free_encoder(test->encoder_handler);
@@ -426,53 +426,53 @@ MU_TEST(infrared_test_decoder_mixed) {
     infrared_test_run_decoder(InfraredProtocolSIRC, 3);
     infrared_test_run_decoder(InfraredProtocolKaseikyo, 1);
     infrared_test_run_decoder(InfraredProtocolRCA, 1);
+    infrared_test_run_decoder(InfraredProtocolPioneer, 6);
 }
 
 MU_TEST(infrared_test_decoder_nec) {
-    infrared_test_run_decoder(InfraredProtocolNEC, 1);
-    infrared_test_run_decoder(InfraredProtocolNEC, 2);
-    infrared_test_run_decoder(InfraredProtocolNEC, 3);
+    for(uint32_t i = 1; i <= 3; ++i) {
+        infrared_test_run_decoder(InfraredProtocolNEC, i);
+    }
 }
 
 MU_TEST(infrared_test_decoder_unexpected_end_in_sequence) {
-    infrared_test_run_decoder(InfraredProtocolNEC, 1);
-    infrared_test_run_decoder(InfraredProtocolNEC, 1);
-    infrared_test_run_decoder(InfraredProtocolNEC, 2);
-    infrared_test_run_decoder(InfraredProtocolNEC, 2);
+    for(uint32_t i = 1; i <= 2; ++i) {
+        infrared_test_run_decoder(InfraredProtocolNEC, i);
+        infrared_test_run_decoder(InfraredProtocolNEC, i);
+    }
 }
 
 MU_TEST(infrared_test_decoder_necext1) {
-    infrared_test_run_decoder(InfraredProtocolNECext, 1);
-    infrared_test_run_decoder(InfraredProtocolNECext, 1);
+    for(uint32_t i = 0; i < 2; ++i) {
+        UNUSED(i);
+        infrared_test_run_decoder(InfraredProtocolNECext, 1);
+    }
 }
 
 MU_TEST(infrared_test_decoder_long_packets_with_nec_start) {
-    infrared_test_run_decoder(InfraredProtocolNEC42ext, 1);
-    infrared_test_run_decoder(InfraredProtocolNEC42ext, 2);
+    for(uint32_t i = 1; i <= 2; ++i) {
+        infrared_test_run_decoder(InfraredProtocolNEC42ext, i);
+    }
 }
 
 MU_TEST(infrared_test_encoder_sirc) {
-    infrared_test_run_encoder(InfraredProtocolSIRC, 1);
-    infrared_test_run_encoder(InfraredProtocolSIRC, 2);
+    for(uint32_t i = 1; i <= 2; ++i) {
+        infrared_test_run_encoder(InfraredProtocolSIRC, i);
+    }
 }
 
 MU_TEST(infrared_test_decoder_sirc) {
-    infrared_test_run_decoder(InfraredProtocolSIRC, 3);
-    infrared_test_run_decoder(InfraredProtocolSIRC, 1);
-    infrared_test_run_decoder(InfraredProtocolSIRC, 2);
-    infrared_test_run_decoder(InfraredProtocolSIRC, 4);
-    infrared_test_run_decoder(InfraredProtocolSIRC, 5);
+    for(uint32_t i = 1; i <= 5; ++i) {
+        infrared_test_run_decoder(InfraredProtocolSIRC, 5);
+    }
 }
 
 MU_TEST(infrared_test_decoder_rc5) {
     infrared_test_run_decoder(InfraredProtocolRC5X, 1);
-    infrared_test_run_decoder(InfraredProtocolRC5, 1);
-    infrared_test_run_decoder(InfraredProtocolRC5, 2);
-    infrared_test_run_decoder(InfraredProtocolRC5, 3);
-    infrared_test_run_decoder(InfraredProtocolRC5, 4);
-    infrared_test_run_decoder(InfraredProtocolRC5, 5);
-    infrared_test_run_decoder(InfraredProtocolRC5, 6);
-    infrared_test_run_decoder(InfraredProtocolRC5, 7);
+
+    for(uint32_t i = 1; i <= 7; ++i) {
+        infrared_test_run_decoder(InfraredProtocolRC5, i);
+    }
 }
 
 MU_TEST(infrared_test_encoder_rc5x) {
@@ -492,21 +492,21 @@ MU_TEST(infrared_test_encoder_rc6) {
 }
 
 MU_TEST(infrared_test_decoder_kaseikyo) {
-    infrared_test_run_decoder(InfraredProtocolKaseikyo, 1);
-    infrared_test_run_decoder(InfraredProtocolKaseikyo, 2);
-    infrared_test_run_decoder(InfraredProtocolKaseikyo, 3);
-    infrared_test_run_decoder(InfraredProtocolKaseikyo, 4);
-    infrared_test_run_decoder(InfraredProtocolKaseikyo, 5);
-    infrared_test_run_decoder(InfraredProtocolKaseikyo, 6);
+    for(uint32_t i = 1; i <= 6; ++i) {
+        infrared_test_run_decoder(InfraredProtocolKaseikyo, i);
+    }
 }
 
 MU_TEST(infrared_test_decoder_rca) {
-    infrared_test_run_decoder(InfraredProtocolRCA, 1);
-    infrared_test_run_decoder(InfraredProtocolRCA, 2);
-    infrared_test_run_decoder(InfraredProtocolRCA, 3);
-    infrared_test_run_decoder(InfraredProtocolRCA, 4);
-    infrared_test_run_decoder(InfraredProtocolRCA, 5);
-    infrared_test_run_decoder(InfraredProtocolRCA, 6);
+    for(uint32_t i = 1; i <= 6; ++i) {
+        infrared_test_run_decoder(InfraredProtocolRCA, i);
+    }
+}
+
+MU_TEST(infrared_test_decoder_pioneer) {
+    for(uint32_t i = 1; i <= 11; ++i) {
+        infrared_test_run_decoder(InfraredProtocolPioneer, i);
+    }
 }
 
 MU_TEST(infrared_test_encoder_decoder_all) {
@@ -520,6 +520,7 @@ MU_TEST(infrared_test_encoder_decoder_all) {
     infrared_test_run_encoder_decoder(InfraredProtocolSIRC, 1);
     infrared_test_run_encoder_decoder(InfraredProtocolKaseikyo, 1);
     infrared_test_run_encoder_decoder(InfraredProtocolRCA, 1);
+    infrared_test_run_encoder_decoder(InfraredProtocolPioneer, 1);
 }
 
 MU_TEST_SUITE(infrared_test) {
@@ -539,11 +540,12 @@ MU_TEST_SUITE(infrared_test) {
     MU_RUN_TEST(infrared_test_decoder_necext1);
     MU_RUN_TEST(infrared_test_decoder_kaseikyo);
     MU_RUN_TEST(infrared_test_decoder_rca);
+    MU_RUN_TEST(infrared_test_decoder_pioneer);
     MU_RUN_TEST(infrared_test_decoder_mixed);
     MU_RUN_TEST(infrared_test_encoder_decoder_all);
 }
 
-int run_minunit_test_infrared() {
+int run_minunit_test_infrared(void) {
     MU_RUN_SUITE(infrared_test);
     return MU_EXIT_CODE;
 }
diff --git a/applications/debug/unit_tests/lfrfid/lfrfid_protocols.c b/applications/debug/unit_tests/lfrfid/lfrfid_protocols.c
index d5c2433ba..6a7dbab9c 100644
--- a/applications/debug/unit_tests/lfrfid/lfrfid_protocols.c
+++ b/applications/debug/unit_tests/lfrfid/lfrfid_protocols.c
@@ -547,7 +547,7 @@ MU_TEST_SUITE(test_lfrfid_protocols_suite) {
     MU_RUN_TEST(test_lfrfid_protocol_fdxb_emulate_simple);
 }
 
-int run_minunit_test_lfrfid_protocols() {
+int run_minunit_test_lfrfid_protocols(void) {
     MU_RUN_SUITE(test_lfrfid_protocols_suite);
     return MU_EXIT_CODE;
 }
\ No newline at end of file
diff --git a/applications/debug/unit_tests/manifest/manifest.c b/applications/debug/unit_tests/manifest/manifest.c
index 19370b0e1..e8ac93d7c 100644
--- a/applications/debug/unit_tests/manifest/manifest.c
+++ b/applications/debug/unit_tests/manifest/manifest.c
@@ -69,7 +69,7 @@ MU_TEST_SUITE(manifest_suite) {
     MU_RUN_TEST(manifest_iteration_test);
 }
 
-int run_minunit_test_manifest() {
+int run_minunit_test_manifest(void) {
     MU_RUN_SUITE(manifest_suite);
     return MU_EXIT_CODE;
 }
\ No newline at end of file
diff --git a/applications/debug/unit_tests/nfc/nfc_test.c b/applications/debug/unit_tests/nfc/nfc_test.c
index 29b9e80d9..4b6503b72 100644
--- a/applications/debug/unit_tests/nfc/nfc_test.c
+++ b/applications/debug/unit_tests/nfc/nfc_test.c
@@ -28,12 +28,12 @@ typedef struct {
 
 static NfcTest* nfc_test = NULL;
 
-static void nfc_test_alloc() {
+static void nfc_test_alloc(void) {
     nfc_test = malloc(sizeof(NfcTest));
     nfc_test->storage = furi_record_open(RECORD_STORAGE);
 }
 
-static void nfc_test_free() {
+static void nfc_test_free(void) {
     furi_check(nfc_test);
 
     furi_record_close(RECORD_STORAGE);
@@ -292,7 +292,7 @@ MU_TEST(ntag_213_locked_reader) {
     nfc_free(poller);
 }
 
-static void mf_ultralight_write() {
+static void mf_ultralight_write(void) {
     Nfc* poller = nfc_alloc();
     Nfc* listener = nfc_alloc();
 
@@ -342,7 +342,7 @@ static void mf_ultralight_write() {
     nfc_free(poller);
 }
 
-static void mf_classic_reader() {
+static void mf_classic_reader(void) {
     Nfc* poller = nfc_alloc();
     Nfc* listener = nfc_alloc();
 
@@ -368,7 +368,7 @@ static void mf_classic_reader() {
     nfc_free(poller);
 }
 
-static void mf_classic_write() {
+static void mf_classic_write(void) {
     Nfc* poller = nfc_alloc();
     Nfc* listener = nfc_alloc();
 
@@ -396,7 +396,7 @@ static void mf_classic_write() {
     nfc_free(poller);
 }
 
-static void mf_classic_value_block() {
+static void mf_classic_value_block(void) {
     Nfc* poller = nfc_alloc();
     Nfc* listener = nfc_alloc();
 
@@ -548,7 +548,7 @@ MU_TEST_SUITE(nfc) {
     nfc_test_free();
 }
 
-int run_minunit_test_nfc() {
+int run_minunit_test_nfc(void) {
     MU_RUN_SUITE(nfc);
     return MU_EXIT_CODE;
 }
diff --git a/applications/debug/unit_tests/nfc/nfc_transport.c b/applications/debug/unit_tests/nfc/nfc_transport.c
index e9f4e2134..6886ef66d 100644
--- a/applications/debug/unit_tests/nfc/nfc_transport.c
+++ b/applications/debug/unit_tests/nfc/nfc_transport.c
@@ -115,7 +115,7 @@ static void nfc_prepare_col_res_data(
     }
 }
 
-Nfc* nfc_alloc() {
+Nfc* nfc_alloc(void) {
     Nfc* instance = malloc(sizeof(Nfc));
 
     return instance;
diff --git a/applications/debug/unit_tests/power/power_test.c b/applications/debug/unit_tests/power/power_test.c
index a9b66b221..03e0ad269 100644
--- a/applications/debug/unit_tests/power/power_test.c
+++ b/applications/debug/unit_tests/power/power_test.c
@@ -63,7 +63,7 @@ MU_TEST_SUITE(test_power_suite) {
     power_test_deinit();
 }
 
-int run_minunit_test_power() {
+int run_minunit_test_power(void) {
     MU_RUN_SUITE(test_power_suite);
     return MU_EXIT_CODE;
 }
diff --git a/applications/debug/unit_tests/protocol_dict/protocol_dict_test.c b/applications/debug/unit_tests/protocol_dict/protocol_dict_test.c
index 73e77ec90..6ecaa1a52 100644
--- a/applications/debug/unit_tests/protocol_dict/protocol_dict_test.c
+++ b/applications/debug/unit_tests/protocol_dict/protocol_dict_test.c
@@ -18,7 +18,7 @@ typedef struct {
 
 static const uint32_t protocol_0_decoder_result = 0xDEADBEEF;
 
-static void* protocol_0_alloc() {
+static void* protocol_0_alloc(void) {
     void* data = malloc(sizeof(Protocol0Data));
     return data;
 }
@@ -63,7 +63,7 @@ typedef struct {
 
 static const uint64_t protocol_1_decoder_result = 0x1234567890ABCDEF;
 
-static void* protocol_1_alloc() {
+static void* protocol_1_alloc(void) {
     void* data = malloc(sizeof(Protocol1Data));
     return data;
 }
@@ -216,7 +216,7 @@ MU_TEST_SUITE(test_protocol_dict_suite) {
     MU_RUN_TEST(test_protocol_dict);
 }
 
-int run_minunit_test_protocol_dict() {
+int run_minunit_test_protocol_dict(void) {
     MU_RUN_SUITE(test_protocol_dict_suite);
     return MU_EXIT_CODE;
 }
\ No newline at end of file
diff --git a/applications/debug/unit_tests/resources/unit_tests/infrared/test_pioneer.irtest b/applications/debug/unit_tests/resources/unit_tests/infrared/test_pioneer.irtest
new file mode 100644
index 000000000..f05b33eec
--- /dev/null
+++ b/applications/debug/unit_tests/resources/unit_tests/infrared/test_pioneer.irtest
@@ -0,0 +1,205 @@
+Filetype: IR tests file
+Version: 1
+#
+name: decoder_input1
+type: raw
+data: 25557 8437 4188 571 1538 595 1514 567 1542 570 1539 573 501 565 1544 568 506 571 1539 573 501 565 509 568 508 569 506 571 1538 574 501 565 1543 569 506 571 504 573 1536 566 1544 568 506 592 1517 574 1535 567 507 570 505 572 1537 575 500 566 508 600 1509 572 503 574 501 565 1544 568 1540 593
+#
+name: decoder_expected1
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AF 00 00 00
+command: 36 00 00 00
+repeat: false
+#
+name: decoder_input2
+type: raw
+data: 25609 8444 4152 564 1568 544 1565 547 1561 541 1568 544 530 547 1536 566 510 567 1567 545 529 548 526 540 535 542 508 569 1539 573 527 539 1543 569 506 571 504 573 1561 541 508 569 507 570 1538 564 1545 567 507 570 505 572 1537 565 509 568 1541 571 1538 564 511 566 509 568 1539 573 1537 596
+#
+name: decoder_expected2
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AF 00 00 00
+command: 32 00 00 00
+repeat: false
+#
+name: decoder_input3
+type: raw
+data: 25582 8448 4176 571 1537 565 1544 568 1540 572 1537 575 500 566 1542 570 505 572 1537 575 500 566 508 569 506 571 504 573 1536 565 510 567 1542 570 504 573 1536 566 1543 569 506 571 504 573 1536 566 1543 569 506 571 504 573 502 575 500 566 1542 570 1539 573 502 575 500 566 1542 570 1540 572
+#
+name: decoder_expected3
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AF 00 00 00
+command: 33 00 00 00
+repeat: false
+#
+name: decoder_input4
+type: raw
+data: 25594 8443 4181 568 1542 570 505 572 1538 564 1545 567 508 569 1540 572 504 573 1536 566 510 567 1542 571 505 572 504 573 1562 540 510 567 1543 570 506 571 504 573 503 574 501 565 510 567 509 568 507 570 1539 573 502 565 1545 568 1542 571 1539 573 1536 566 1544 569 1541 572 503 574 1537 565
+#
+name: decoder_expected4
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 40 00 00 00
+repeat: false
+#
+name: decoder_input5
+type: raw
+data: 25556 8475 4150 597 1512 600 476 601 1509 603 1506 595 480 597 1512 600 476 601 1508 594 482 595 1515 597 478 599 477 600 1510 602 473 604 1506 595 480 597 1513 599 476 601 475 602 474 603 472 594 482 595 1514 598 477 600 476 601 1508 594 1516 596 1513 599 1510 602 1507 595 480 597 1513 599
+#
+name: decoder_expected5
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 41 00 00 00
+repeat: false
+#
+name: decoder_input6
+type: raw
+data: 25567 8471 4155 604 1506 596 480 597 1513 599 1510 603 473 594 1515 597 478 599 1511 602 474 603 1507 595 480 597 479 598 1511 602 474 603 1506 596 480 597 478 599 1511 602 474 603 472 594 481 596 479 598 1512 601 474 603 1506 596 479 598 1511 602 1508 594 1515 598 1512 600 475 602 1507 595
+#
+name: decoder_expected6
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 42 00 00 00
+repeat: false
+#
+name: decoder_input7
+type: raw
+data: 25584 8444 4180 569 1541 572 504 573 1536 566 1544 569 507 570 1539 574 501 566 1569 596 455 570 1540 573 502 575 501 565 1544 569 507 570 1565 548 503 574 1535 567 1543 570 506 571 529 548 502 565 511 566 1543 601 475 571 504 573 503 574 1536 566 1543 570 1539 574 1536 566 509 568 1541 572
+#
+name: decoder_expected7
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 43 00 00 00
+repeat: false
+#
+name: decoder_input8
+type: raw
+data: 25562 8445 4181 568 1543 570 505 572 1538 575 1535 567 508 569 1539 573 503 595 1514 567 508 600 1509 572 503 595 481 596 1513 568 507 601 1508 573 502 575 501 566 1543 570 506 571 504 573 1536 566 510 567 508 600 475 571 1539 573 502 575 1534 568 1542 571 505 572 1537 575 1534 568 1542 571
+#
+name: decoder_expected8
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 12 00 00 00
+repeat: false
+#
+name: decoder_input9
+type: raw
+data: 25558 8470 4152 597 1513 600 476 601 1508 594 1515 598 478 599 1509 593 483 594 1515 598 478 599 1510 603 474 592 482 595 1514 599 477 600 1509 593 483 594 481 596 1513 600 476 601 1508 594 1515 598 478 599 476 601 474 593 1517 596 479 598 1512 601 474 603 472 594 1515 598 1511 602 1508 594
+#
+name: decoder_expected9
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 1A 00 00 00
+repeat: false
+#
+name: decoder_input10
+type: raw
+data: 25587 8442 4179 601 1507 595 481 565 1544 600 1509 593 482 595 1513 568 507 570 1539 594 481 565 1544 600 476 570 505 593 1516 597 479 598 1511 591 484 593 481 575 1534 600 476 570 1539 595 480 597 478 599 476 570 505 593 1517 564 511 597 1511 602 474 572 1537 597 1513 600 1509 572 1537 565
+#
+name: decoder_expected10
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 0A 00 00 00
+repeat: false
+#
+name: decoder_input11
+type: raw
+data: 25554 8474 4149 600 1510 603 472 594 1515 597 1512 601 475 602 1507 595 480 597 1513 599 475 602 1508 594 481 596 479 598 1512 601 474 603 1506 596 479 598 1512 601 1508 594 481 596 1513 599 476 601 474 603 472 594 481 596 480 597 478 599 1510 603 473 593 1515 597 1512 601 1509 603 1506 596
+#
+name: decoder_expected11
+type: parsed_array
+count: 1
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 0B 00 00 00
+repeat: false
+#
+name: encoder_decoder_input1
+type: parsed_array
+count: 11
+#
+protocol: Pioneer
+address: AF 00 00 00
+command: 36 00 00 00
+repeat: false
+#
+protocol: Pioneer
+address: AF 00 00 00
+command: 32 00 00 00
+repeat: false
+#
+protocol: Pioneer
+address: AF 00 00 00
+command: 33 00 00 00
+repeat: false
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 40 00 00 00
+repeat: false
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 41 00 00 00
+repeat: false
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 42 00 00 00
+repeat: false
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 43 00 00 00
+repeat: false
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 12 00 00 00
+repeat: false
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 1A 00 00 00
+repeat: false
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 0A 00 00 00
+repeat: false
+#
+protocol: Pioneer
+address: AD 00 00 00
+command: 0B 00 00 00
+repeat: false
+#
diff --git a/applications/debug/unit_tests/rpc/rpc_test.c b/applications/debug/unit_tests/rpc/rpc_test.c
index 3faf61572..cd692d69d 100644
--- a/applications/debug/unit_tests/rpc/rpc_test.c
+++ b/applications/debug/unit_tests/rpc/rpc_test.c
@@ -1840,7 +1840,7 @@ MU_TEST_SUITE(test_rpc_session) {
     furi_record_close(RECORD_STORAGE);
 }
 
-int run_minunit_test_rpc() {
+int run_minunit_test_rpc(void) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     if(storage_sd_status(storage) != FSE_OK) {
         FURI_LOG_E(TAG, "SD card not mounted - skip storage tests");
diff --git a/applications/debug/unit_tests/storage/dirwalk_test.c b/applications/debug/unit_tests/storage/dirwalk_test.c
index 19ac336ff..415ec7dd4 100644
--- a/applications/debug/unit_tests/storage/dirwalk_test.c
+++ b/applications/debug/unit_tests/storage/dirwalk_test.c
@@ -266,7 +266,7 @@ MU_TEST_SUITE(test_dirwalk_suite) {
     furi_record_close(RECORD_STORAGE);
 }
 
-int run_minunit_test_dirwalk() {
+int run_minunit_test_dirwalk(void) {
     MU_RUN_SUITE(test_dirwalk_suite);
     return MU_EXIT_CODE;
 }
\ No newline at end of file
diff --git a/applications/debug/unit_tests/storage/storage_test.c b/applications/debug/unit_tests/storage/storage_test.c
index 5ea36935b..e4361f06c 100644
--- a/applications/debug/unit_tests/storage/storage_test.c
+++ b/applications/debug/unit_tests/storage/storage_test.c
@@ -36,7 +36,7 @@ static bool storage_file_create(Storage* storage, const char* path, const char*
     return result;
 }
 
-static void storage_file_open_lock_setup() {
+static void storage_file_open_lock_setup(void) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     File* file = storage_file_alloc(storage);
     storage_simply_remove(storage, STORAGE_LOCKED_FILE);
@@ -47,7 +47,7 @@ static void storage_file_open_lock_setup() {
     furi_record_close(RECORD_STORAGE);
 }
 
-static void storage_file_open_lock_teardown() {
+static void storage_file_open_lock_teardown(void) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     mu_check(storage_simply_remove(storage, STORAGE_LOCKED_FILE));
     furi_record_close(RECORD_STORAGE);
@@ -702,7 +702,7 @@ MU_TEST_SUITE(test_md5_calc_suite) {
     MU_RUN_TEST(test_md5_calc);
 }
 
-int run_minunit_test_storage() {
+int run_minunit_test_storage(void) {
     MU_RUN_SUITE(storage_file);
     MU_RUN_SUITE(storage_file_64k);
     MU_RUN_SUITE(storage_dir);
diff --git a/applications/debug/unit_tests/stream/stream_test.c b/applications/debug/unit_tests/stream/stream_test.c
index 2fa3b21a2..3e31773b4 100644
--- a/applications/debug/unit_tests/stream/stream_test.c
+++ b/applications/debug/unit_tests/stream/stream_test.c
@@ -526,7 +526,7 @@ MU_TEST_SUITE(stream_suite) {
     MU_RUN_TEST(stream_buffered_large_file_test);
 }
 
-int run_minunit_test_stream() {
+int run_minunit_test_stream(void) {
     MU_RUN_SUITE(stream_suite);
     return MU_EXIT_CODE;
 }
diff --git a/applications/debug/unit_tests/subghz/subghz_test.c b/applications/debug/unit_tests/subghz/subghz_test.c
index 0e6509b62..adb8b4965 100644
--- a/applications/debug/unit_tests/subghz/subghz_test.c
+++ b/applications/debug/unit_tests/subghz/subghz_test.c
@@ -312,7 +312,7 @@ static LevelDuration subghz_hal_async_tx_test_yield(void* context) {
             furi_crash("Yield after reset");
         }
     } else {
-        furi_crash("Programming error");
+        furi_crash();
     }
 }
 
@@ -902,7 +902,7 @@ MU_TEST_SUITE(subghz) {
     subghz_test_deinit();
 }
 
-int run_minunit_test_subghz() {
+int run_minunit_test_subghz(void) {
     MU_RUN_SUITE(subghz);
     return MU_EXIT_CODE;
 }
diff --git a/applications/debug/unit_tests/test_index.c b/applications/debug/unit_tests/test_index.c
index 60132a161..5d0282bd7 100644
--- a/applications/debug/unit_tests/test_index.c
+++ b/applications/debug/unit_tests/test_index.c
@@ -8,31 +8,31 @@
 
 #define TAG "UnitTests"
 
-int run_minunit_test_furi();
-int run_minunit_test_furi_hal();
-int run_minunit_test_furi_hal_crypto();
-int run_minunit_test_furi_string();
-int run_minunit_test_infrared();
-int run_minunit_test_rpc();
-int run_minunit_test_manifest();
-int run_minunit_test_flipper_format();
-int run_minunit_test_flipper_format_string();
-int run_minunit_test_stream();
-int run_minunit_test_storage();
-int run_minunit_test_subghz();
-int run_minunit_test_dirwalk();
-int run_minunit_test_power();
-int run_minunit_test_protocol_dict();
-int run_minunit_test_lfrfid_protocols();
-int run_minunit_test_nfc();
-int run_minunit_test_bit_lib();
-int run_minunit_test_datetime();
-int run_minunit_test_float_tools();
-int run_minunit_test_bt();
-int run_minunit_test_dialogs_file_browser_options();
-int run_minunit_test_expansion();
+int run_minunit_test_furi(void);
+int run_minunit_test_furi_hal(void);
+int run_minunit_test_furi_hal_crypto(void);
+int run_minunit_test_furi_string(void);
+int run_minunit_test_infrared(void);
+int run_minunit_test_rpc(void);
+int run_minunit_test_manifest(void);
+int run_minunit_test_flipper_format(void);
+int run_minunit_test_flipper_format_string(void);
+int run_minunit_test_stream(void);
+int run_minunit_test_storage(void);
+int run_minunit_test_subghz(void);
+int run_minunit_test_dirwalk(void);
+int run_minunit_test_power(void);
+int run_minunit_test_protocol_dict(void);
+int run_minunit_test_lfrfid_protocols(void);
+int run_minunit_test_nfc(void);
+int run_minunit_test_bit_lib(void);
+int run_minunit_test_datetime(void);
+int run_minunit_test_float_tools(void);
+int run_minunit_test_bt(void);
+int run_minunit_test_dialogs_file_browser_options(void);
+int run_minunit_test_expansion(void);
 
-typedef int (*UnitTestEntry)();
+typedef int (*UnitTestEntry)(void);
 
 typedef struct {
     const char* name;
@@ -66,7 +66,7 @@ const UnitTest unit_tests[] = {
     {.name = "expansion", .entry = run_minunit_test_expansion},
 };
 
-void minunit_print_progress() {
+void minunit_print_progress(void) {
     static const char progress[] = {'\\', '|', '/', '-'};
     static uint8_t progress_counter = 0;
     static uint32_t last_tick = 0;
@@ -157,7 +157,7 @@ void unit_tests_cli(Cli* cli, FuriString* args, void* context) {
     furi_record_close(RECORD_LOADER);
 }
 
-void unit_tests_on_system_start() {
+void unit_tests_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
 
diff --git a/applications/debug/unit_tests/varint/varint_test.c b/applications/debug/unit_tests/varint/varint_test.c
index 8faab1368..ac444013d 100644
--- a/applications/debug/unit_tests/varint/varint_test.c
+++ b/applications/debug/unit_tests/varint/varint_test.c
@@ -82,7 +82,7 @@ MU_TEST_SUITE(test_varint_suite) {
     MU_RUN_TEST(test_varint_rand_i);
 }
 
-int run_minunit_test_varint() {
+int run_minunit_test_varint(void) {
     MU_RUN_SUITE(test_varint_suite);
     return MU_EXIT_CODE;
 }
\ No newline at end of file
diff --git a/applications/debug/usb_test/usb_test.c b/applications/debug/usb_test/usb_test.c
index ed86c37a8..ddec9d9b0 100644
--- a/applications/debug/usb_test/usb_test.c
+++ b/applications/debug/usb_test/usb_test.c
@@ -55,7 +55,7 @@ uint32_t usb_test_exit(void* context) {
     return VIEW_NONE;
 }
 
-UsbTestApp* usb_test_app_alloc() {
+UsbTestApp* usb_test_app_alloc(void) {
     UsbTestApp* app = malloc(sizeof(UsbTestApp));
 
     // Gui
diff --git a/applications/drivers/subghz/cc1101_ext/cc1101_ext.c b/applications/drivers/subghz/cc1101_ext/cc1101_ext.c
index 5c67579cc..f77842a3a 100644
--- a/applications/drivers/subghz/cc1101_ext/cc1101_ext.c
+++ b/applications/drivers/subghz/cc1101_ext/cc1101_ext.c
@@ -98,7 +98,7 @@ typedef struct {
 
 static SubGhzDeviceCC1101Ext* subghz_device_cc1101_ext = NULL;
 
-static bool subghz_device_cc1101_ext_check_init() {
+static bool subghz_device_cc1101_ext_check_init(void) {
     furi_assert(subghz_device_cc1101_ext->state == SubGhzDeviceCC1101ExtStateInit);
     subghz_device_cc1101_ext->state = SubGhzDeviceCC1101ExtStateIdle;
 
@@ -182,6 +182,14 @@ static bool subghz_device_cc1101_ext_check_init() {
         furi_hal_gpio_init(
             subghz_device_cc1101_ext->g0_pin, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 
+        // Reset GDO2 (!TX/RX) to floating state
+        cc1101_status = cc1101_write_reg(
+            subghz_device_cc1101_ext->spi_bus_handle, CC1101_IOCFG2, CC1101IocfgHighImpedance);
+        if(cc1101_status.CHIP_RDYn != 0) {
+            //timeout or error
+            break;
+        }
+
         // Go to sleep
         cc1101_status = cc1101_shutdown(subghz_device_cc1101_ext->spi_bus_handle);
         if(cc1101_status.CHIP_RDYn != 0) {
@@ -232,7 +240,7 @@ bool subghz_device_cc1101_ext_alloc(SubGhzDeviceConf* conf) {
     return subghz_device_cc1101_ext_check_init();
 }
 
-void subghz_device_cc1101_ext_free() {
+void subghz_device_cc1101_ext_free(void) {
     furi_assert(subghz_device_cc1101_ext != NULL);
 
     furi_hal_spi_bus_handle_deinit(subghz_device_cc1101_ext->spi_bus_handle);
@@ -248,11 +256,11 @@ void subghz_device_cc1101_ext_set_async_mirror_pin(const GpioPin* pin) {
     subghz_device_cc1101_ext->async_mirror_pin = pin;
 }
 
-const GpioPin* subghz_device_cc1101_ext_get_data_gpio() {
+const GpioPin* subghz_device_cc1101_ext_get_data_gpio(void) {
     return subghz_device_cc1101_ext->g0_pin;
 }
 
-bool subghz_device_cc1101_ext_is_connect() {
+bool subghz_device_cc1101_ext_is_connect(void) {
     bool ret = false;
 
     if(subghz_device_cc1101_ext == NULL) { // not initialized
@@ -268,7 +276,7 @@ bool subghz_device_cc1101_ext_is_connect() {
     return ret;
 }
 
-void subghz_device_cc1101_ext_sleep() {
+void subghz_device_cc1101_ext_sleep(void) {
     furi_assert(subghz_device_cc1101_ext->state == SubGhzDeviceCC1101ExtStateIdle);
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
 
@@ -283,7 +291,7 @@ void subghz_device_cc1101_ext_sleep() {
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
 }
 
-void subghz_device_cc1101_ext_dump_state() {
+void subghz_device_cc1101_ext_dump_state(void) {
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     printf(
         "[subghz_device_cc1101_ext] cc1101 chip %d, version %d\r\n",
@@ -348,19 +356,19 @@ void subghz_device_cc1101_ext_write_packet(const uint8_t* data, uint8_t size) {
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
 }
 
-void subghz_device_cc1101_ext_flush_rx() {
+void subghz_device_cc1101_ext_flush_rx(void) {
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     cc1101_flush_rx(subghz_device_cc1101_ext->spi_bus_handle);
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
 }
 
-void subghz_device_cc1101_ext_flush_tx() {
+void subghz_device_cc1101_ext_flush_tx(void) {
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     cc1101_flush_tx(subghz_device_cc1101_ext->spi_bus_handle);
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
 }
 
-bool subghz_device_cc1101_ext_rx_pipe_not_empty() {
+bool subghz_device_cc1101_ext_rx_pipe_not_empty(void) {
     CC1101RxBytes status[1];
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     cc1101_read_reg(
@@ -376,7 +384,7 @@ bool subghz_device_cc1101_ext_rx_pipe_not_empty() {
     }
 }
 
-bool subghz_device_cc1101_ext_is_rx_data_crc_valid() {
+bool subghz_device_cc1101_ext_is_rx_data_crc_valid(void) {
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     uint8_t data[1];
     cc1101_read_reg(
@@ -395,14 +403,14 @@ void subghz_device_cc1101_ext_read_packet(uint8_t* data, uint8_t* size) {
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
 }
 
-void subghz_device_cc1101_ext_shutdown() {
+void subghz_device_cc1101_ext_shutdown(void) {
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     // Reset and shutdown
     cc1101_shutdown(subghz_device_cc1101_ext->spi_bus_handle);
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
 }
 
-void subghz_device_cc1101_ext_reset() {
+void subghz_device_cc1101_ext_reset(void) {
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     furi_hal_gpio_init(subghz_device_cc1101_ext->g0_pin, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
     cc1101_switch_to_idle(subghz_device_cc1101_ext->spi_bus_handle);
@@ -410,40 +418,52 @@ void subghz_device_cc1101_ext_reset() {
     // Warning: push pull cc1101 clock output on GD0
     cc1101_write_reg(
         subghz_device_cc1101_ext->spi_bus_handle, CC1101_IOCFG0, CC1101IocfgHighImpedance);
+    // Reset GDO2 (!TX/RX) to floating state
+    cc1101_write_reg(
+        subghz_device_cc1101_ext->spi_bus_handle, CC1101_IOCFG2, CC1101IocfgHighImpedance);
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
 }
 
-void subghz_device_cc1101_ext_idle() {
+void subghz_device_cc1101_ext_idle(void) {
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     cc1101_switch_to_idle(subghz_device_cc1101_ext->spi_bus_handle);
     //waiting for the chip to switch to IDLE mode
     furi_check(cc1101_wait_status_state(
         subghz_device_cc1101_ext->spi_bus_handle, CC1101StateIDLE, 10000));
+    // Reset GDO2 (!TX/RX) to floating state
+    cc1101_write_reg(
+        subghz_device_cc1101_ext->spi_bus_handle, CC1101_IOCFG2, CC1101IocfgHighImpedance);
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
     if(subghz_device_cc1101_ext->power_amp) {
         furi_hal_gpio_write(SUBGHZ_DEVICE_CC1101_EXT_E07_AMP_GPIO, 0);
     }
 }
 
-void subghz_device_cc1101_ext_rx() {
+void subghz_device_cc1101_ext_rx(void) {
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     cc1101_switch_to_rx(subghz_device_cc1101_ext->spi_bus_handle);
     //waiting for the chip to switch to Rx mode
     furi_check(
         cc1101_wait_status_state(subghz_device_cc1101_ext->spi_bus_handle, CC1101StateRX, 10000));
+    // Go GDO2 (!TX/RX) to high (RX state)
+    cc1101_write_reg(
+        subghz_device_cc1101_ext->spi_bus_handle, CC1101_IOCFG2, CC1101IocfgHW | CC1101_IOCFG_INV);
+
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
     if(subghz_device_cc1101_ext->power_amp) {
         furi_hal_gpio_write(SUBGHZ_DEVICE_CC1101_EXT_E07_AMP_GPIO, 0);
     }
 }
 
-bool subghz_device_cc1101_ext_tx() {
+bool subghz_device_cc1101_ext_tx(void) {
     if(subghz_device_cc1101_ext->regulation != SubGhzDeviceCC1101ExtRegulationTxRx) return false;
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     cc1101_switch_to_tx(subghz_device_cc1101_ext->spi_bus_handle);
     //waiting for the chip to switch to Tx mode
     furi_check(
         cc1101_wait_status_state(subghz_device_cc1101_ext->spi_bus_handle, CC1101StateTX, 10000));
+    // Go GDO2 (!TX/RX) to low (TX state)
+    cc1101_write_reg(subghz_device_cc1101_ext->spi_bus_handle, CC1101_IOCFG2, CC1101IocfgHW);
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
     if(subghz_device_cc1101_ext->power_amp) {
         furi_hal_gpio_write(SUBGHZ_DEVICE_CC1101_EXT_E07_AMP_GPIO, 1);
@@ -451,7 +471,7 @@ bool subghz_device_cc1101_ext_tx() {
     return true;
 }
 
-float subghz_device_cc1101_ext_get_rssi() {
+float subghz_device_cc1101_ext_get_rssi(void) {
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     int32_t rssi_dec = cc1101_get_rssi(subghz_device_cc1101_ext->spi_bus_handle);
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
@@ -466,7 +486,7 @@ float subghz_device_cc1101_ext_get_rssi() {
     return rssi;
 }
 
-uint8_t subghz_device_cc1101_ext_get_lqi() {
+uint8_t subghz_device_cc1101_ext_get_lqi(void) {
     furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);
     uint8_t data[1];
     cc1101_read_reg(
@@ -525,7 +545,7 @@ uint32_t subghz_device_cc1101_ext_set_frequency(uint32_t value) {
     return real_frequency;
 }
 
-static bool subghz_device_cc1101_ext_start_debug() {
+static bool subghz_device_cc1101_ext_start_debug(void) {
     bool ret = false;
     if(subghz_device_cc1101_ext->async_mirror_pin != NULL) {
         furi_hal_gpio_init(
@@ -538,7 +558,7 @@ static bool subghz_device_cc1101_ext_start_debug() {
     return ret;
 }
 
-static bool subghz_device_cc1101_ext_stop_debug() {
+static bool subghz_device_cc1101_ext_stop_debug(void) {
     bool ret = false;
     if(subghz_device_cc1101_ext->async_mirror_pin != NULL) {
         furi_hal_gpio_init(
@@ -620,7 +640,7 @@ void subghz_device_cc1101_ext_start_async_rx(
     subghz_device_cc1101_ext->async_rx.capture_delta_duration = 0;
 }
 
-void subghz_device_cc1101_ext_stop_async_rx() {
+void subghz_device_cc1101_ext_stop_async_rx(void) {
     furi_assert(subghz_device_cc1101_ext->state == SubGhzDeviceCC1101ExtStateAsyncRx);
     subghz_device_cc1101_ext->state = SubGhzDeviceCC1101ExtStateIdle;
 
@@ -858,13 +878,13 @@ bool subghz_device_cc1101_ext_start_async_tx(SubGhzDeviceCC1101ExtCallback callb
     return true;
 }
 
-bool subghz_device_cc1101_ext_is_async_tx_complete() {
+bool subghz_device_cc1101_ext_is_async_tx_complete(void) {
     return (
         (subghz_device_cc1101_ext->state == SubGhzDeviceCC1101ExtStateAsyncTx) &&
         (LL_TIM_GetAutoReload(TIM17) == 0));
 }
 
-void subghz_device_cc1101_ext_stop_async_tx() {
+void subghz_device_cc1101_ext_stop_async_tx(void) {
     furi_assert(subghz_device_cc1101_ext->state == SubGhzDeviceCC1101ExtStateAsyncTx);
 
     // Shutdown radio
diff --git a/applications/drivers/subghz/cc1101_ext/cc1101_ext.h b/applications/drivers/subghz/cc1101_ext/cc1101_ext.h
index 130402f8e..0832de8ac 100644
--- a/applications/drivers/subghz/cc1101_ext/cc1101_ext.h
+++ b/applications/drivers/subghz/cc1101_ext/cc1101_ext.h
@@ -1,6 +1,6 @@
 /**
- * @file furi_hal_subghz.h
- * SubGhz HAL API
+ * @file cc1101_ext.h
+ * @brief External CC1101 transceiver access API.
  */
 
 #pragma once
@@ -29,7 +29,7 @@ void subghz_device_cc1101_ext_set_async_mirror_pin(const GpioPin* pin);
  *
  * @return     pointer to the gpio pin structure
  */
-const GpioPin* subghz_device_cc1101_ext_get_data_gpio();
+const GpioPin* subghz_device_cc1101_ext_get_data_gpio(void);
 
 /** Initialize device
  *
@@ -39,21 +39,21 @@ bool subghz_device_cc1101_ext_alloc(SubGhzDeviceConf* conf);
 
 /** Deinitialize device
  */
-void subghz_device_cc1101_ext_free();
+void subghz_device_cc1101_ext_free(void);
 
 /** Check and switch to power save mode Used by internal API-HAL
  * initialization routine Can be used to reinitialize device to safe state and
  * send it to sleep
  */
-bool subghz_device_cc1101_ext_is_connect();
+bool subghz_device_cc1101_ext_is_connect(void);
 
 /** Send device to sleep mode
  */
-void subghz_device_cc1101_ext_sleep();
+void subghz_device_cc1101_ext_sleep(void);
 
 /** Dump info to stdout
  */
-void subghz_device_cc1101_ext_dump_state();
+void subghz_device_cc1101_ext_dump_state(void);
 
 /** Load custom registers from preset
  *
@@ -84,13 +84,13 @@ void subghz_device_cc1101_ext_write_packet(const uint8_t* data, uint8_t size);
  *
  * @return     true if not empty
  */
-bool subghz_device_cc1101_ext_rx_pipe_not_empty();
+bool subghz_device_cc1101_ext_rx_pipe_not_empty(void);
 
 /** Check if received data crc is valid
  *
  * @return     true if valid
  */
-bool subghz_device_cc1101_ext_is_rx_data_crc_valid();
+bool subghz_device_cc1101_ext_is_rx_data_crc_valid(void);
 
 /** Read packet from FIFO
  *
@@ -101,47 +101,47 @@ void subghz_device_cc1101_ext_read_packet(uint8_t* data, uint8_t* size);
 
 /** Flush rx FIFO buffer
  */
-void subghz_device_cc1101_ext_flush_rx();
+void subghz_device_cc1101_ext_flush_rx(void);
 
 /** Flush tx FIFO buffer
  */
-void subghz_device_cc1101_ext_flush_tx();
+void subghz_device_cc1101_ext_flush_tx(void);
 
 /** Shutdown Issue SPWD command
  * @warning    registers content will be lost
  */
-void subghz_device_cc1101_ext_shutdown();
+void subghz_device_cc1101_ext_shutdown(void);
 
 /** Reset Issue reset command
  * @warning    registers content will be lost
  */
-void subghz_device_cc1101_ext_reset();
+void subghz_device_cc1101_ext_reset(void);
 
 /** Switch to Idle
  */
-void subghz_device_cc1101_ext_idle();
+void subghz_device_cc1101_ext_idle(void);
 
 /** Switch to Receive
  */
-void subghz_device_cc1101_ext_rx();
+void subghz_device_cc1101_ext_rx(void);
 
 /** Switch to Transmit
  *
  * @return     true if the transfer is allowed by belonging to the region
  */
-bool subghz_device_cc1101_ext_tx();
+bool subghz_device_cc1101_ext_tx(void);
 
 /** Get RSSI value in dBm
  *
  * @return     RSSI value
  */
-float subghz_device_cc1101_ext_get_rssi();
+float subghz_device_cc1101_ext_get_rssi(void);
 
 /** Get LQI
  *
  * @return     LQI value
  */
-uint8_t subghz_device_cc1101_ext_get_lqi();
+uint8_t subghz_device_cc1101_ext_get_lqi(void);
 
 /** Check if frequency is in valid range
  *
@@ -175,7 +175,7 @@ void subghz_device_cc1101_ext_start_async_rx(
 
 /** Disable signal timings capture Resets GPIO and TIM2
  */
-void subghz_device_cc1101_ext_stop_async_rx();
+void subghz_device_cc1101_ext_stop_async_rx(void);
 
 /** Async TX callback type
  * @param      context  callback context
@@ -196,11 +196,11 @@ bool subghz_device_cc1101_ext_start_async_tx(SubGhzDeviceCC1101ExtCallback callb
  *
  * @return     true if TX complete
  */
-bool subghz_device_cc1101_ext_is_async_tx_complete();
+bool subghz_device_cc1101_ext_is_async_tx_complete(void);
 
 /** Stop async transmission and cleanup resources Resets GPIO, TIM2, and DMA1
  */
-void subghz_device_cc1101_ext_stop_async_tx();
+void subghz_device_cc1101_ext_stop_async_tx(void);
 
 #ifdef __cplusplus
 }
diff --git a/applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.c b/applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.c
index 1f1193154..68f2b8aff 100644
--- a/applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.c
+++ b/applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.c
@@ -105,6 +105,6 @@ static const FlipperAppPluginDescriptor subghz_device_cc1101_ext_descriptor = {
     .entry_point = &subghz_device_cc1101_ext,
 };
 
-const FlipperAppPluginDescriptor* subghz_device_cc1101_ext_ep() {
+const FlipperAppPluginDescriptor* subghz_device_cc1101_ext_ep(void) {
     return &subghz_device_cc1101_ext_descriptor;
 }
\ No newline at end of file
diff --git a/applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h b/applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h
index cf1ff3ee0..3fcee45d5 100644
--- a/applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h
+++ b/applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h
@@ -5,4 +5,4 @@
 
 typedef struct SubGhzDeviceCC1101Ext SubGhzDeviceCC1101Ext;
 
-const FlipperAppPluginDescriptor* subghz_device_cc1101_ext_ep();
+const FlipperAppPluginDescriptor* subghz_device_cc1101_ext_ep(void);
diff --git a/applications/examples/example_apps_assets/README.md b/applications/examples/example_apps_assets/README.md
index 024c0877b..bf7e63e42 100644
--- a/applications/examples/example_apps_assets/README.md
+++ b/applications/examples/example_apps_assets/README.md
@@ -1,7 +1,11 @@
-# Apps Assets folder Example
+# Apps Assets folder Example {#example_app_assets}
 
 This example shows how to use the Apps Assets folder to store data that is not part of the application itself, but is required for its operation, and that data is provided with the application.
 
+## Source code
+
+Source code for this example can be found [here](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/applications/examples/example_apps_assets).
+
 ## What is the Apps Assets Folder?
 
 The **Apps Assets** folder is a folder where external applications unpack their assets.
diff --git a/applications/examples/example_apps_assets/example_apps_assets.c b/applications/examples/example_apps_assets/example_apps_assets.c
index 2c2cc8a87..dae81a8da 100644
--- a/applications/examples/example_apps_assets/example_apps_assets.c
+++ b/applications/examples/example_apps_assets/example_apps_assets.c
@@ -1,3 +1,7 @@
+/**
+ * @file example_apps_assets.c
+ * @brief Application assets example.
+ */
 #include <furi.h>
 #include <storage/storage.h>
 #include <toolbox/stream/stream.h>
diff --git a/applications/examples/example_apps_data/README.md b/applications/examples/example_apps_data/README.md
index 0e51daf18..fb7617547 100644
--- a/applications/examples/example_apps_data/README.md
+++ b/applications/examples/example_apps_data/README.md
@@ -1,7 +1,11 @@
-# Apps Data folder Example
+# Apps Data folder Example {#example_app_data}
 
 This example demonstrates how to utilize the Apps Data folder to store data that is not part of the app itself, such as user data, configuration files, and so forth.
 
+## Source code
+
+Source code for this example can be found [here](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/applications/examples/example_apps_data).
+
 ## What is the Apps Data Folder?
 
 The **Apps Data** folder is a folder used to store data for external apps that are not part of the main firmware. 
diff --git a/applications/examples/example_apps_data/example_apps_data.c b/applications/examples/example_apps_data/example_apps_data.c
index 7a297b01c..f40d526c9 100644
--- a/applications/examples/example_apps_data/example_apps_data.c
+++ b/applications/examples/example_apps_data/example_apps_data.c
@@ -1,3 +1,7 @@
+/**
+ * @file example_apps_data.c
+ * @brief Application data example.
+ */
 #include <furi.h>
 #include <storage/storage.h>
 
diff --git a/applications/examples/example_ble_beacon/ble_beacon_app.c b/applications/examples/example_ble_beacon/ble_beacon_app.c
index 20e3e307a..af2133602 100644
--- a/applications/examples/example_ble_beacon/ble_beacon_app.c
+++ b/applications/examples/example_ble_beacon/ble_beacon_app.c
@@ -57,7 +57,7 @@ static void ble_beacon_app_restore_beacon_state(BleBeaconApp* app) {
     app->beacon_data_len = furi_hal_bt_extra_beacon_get_data(app->beacon_data);
 }
 
-static BleBeaconApp* ble_beacon_app_alloc() {
+static BleBeaconApp* ble_beacon_app_alloc(void) {
     BleBeaconApp* app = malloc(sizeof(BleBeaconApp));
 
     app->gui = furi_record_open(RECORD_GUI);
diff --git a/applications/examples/example_ble_beacon/ble_beacon_app.h b/applications/examples/example_ble_beacon/ble_beacon_app.h
index 563bd5bed..61c8c56d1 100644
--- a/applications/examples/example_ble_beacon/ble_beacon_app.h
+++ b/applications/examples/example_ble_beacon/ble_beacon_app.h
@@ -1,3 +1,7 @@
+/**
+ * @file ble_beacon_app.h
+ * @brief BLE beacon example.
+ */
 #pragma once
 
 #include "extra_beacon.h"
diff --git a/applications/examples/example_custom_font/example_custom_font.c b/applications/examples/example_custom_font/example_custom_font.c
index 15eeb5f02..405db46e3 100644
--- a/applications/examples/example_custom_font/example_custom_font.c
+++ b/applications/examples/example_custom_font/example_custom_font.c
@@ -1,3 +1,7 @@
+/**
+ * @file example_custom_font.c
+ * @brief Custom font example.
+ */
 #include <furi.h>
 #include <furi_hal.h>
 
@@ -7,35 +11,62 @@
 //This arrays contains the font itself. You can use any u8g2 font you want
 
 /*
-Fontname: -Raccoon-Fixed4x6-Medium-R-Normal--6-60-75-75-P-40-ISO10646-1
-Copyright: 
-Glyphs: 95/203
-BBX Build Mode: 0
+  Fontname: -Misc-Fixed-Medium-R-Normal--6-60-75-75-C-40-ISO10646-1
+  Copyright: Public domain font.  Share and enjoy.
+  Glyphs: 191/919
+  BBX Build Mode: 0
 */
-const uint8_t u8g2_font_tom_thumb_4x6_tr[725] =
-    "_\0\2\2\2\3\3\4\4\3\6\0\377\5\377\5\0\0\352\1\330\2\270 \5\340\315\0!\6\265\310"
-    "\254\0\42\6\213\313$\25#\10\227\310\244\241\206\12$\10\227\310\215\70b\2%\10\227\310d\324F\1"
-    "&\10\227\310(\65R\22'\5\251\313\10(\6\266\310\251\62)\10\226\310\304\224\24\0*\6\217\312\244"
-    "\16+\7\217\311\245\225\0,\6\212\310)\0-\5\207\312\14.\5\245\310\4/\7\227\310Ve\4\60"
-    "\7\227\310-k\1\61\6\226\310\255\6\62\10\227\310h\220\312\1\63\11\227\310h\220\62X\0\64\10\227"
-    "\310$\65b\1\65\10\227\310\214\250\301\2\66\10\227\310\315\221F\0\67\10\227\310\314TF\0\70\10\227"
-    "\310\214\64\324\10\71\10\227\310\214\64\342\2:\6\255\311\244\0;\7\222\310e\240\0<\10\227\310\246\32"
-    "d\20=\6\217\311l\60>\11\227\310d\220A*\1\77\10\227\310\314\224a\2@\10\227\310UC\3"
-    "\1A\10\227\310UC\251\0B\10\227\310\250\264\322\2C\7\227\310\315\32\10D\10\227\310\250d-\0"
-    "E\10\227\310\214\70\342\0F\10\227\310\214\70b\4G\10\227\310\315\221\222\0H\10\227\310$\65\224\12"
-    "I\7\227\310\254X\15J\7\227\310\226\252\2K\10\227\310$\265\222\12L\7\227\310\304\346\0M\10\227"
-    "\310\244\61\224\12N\10\227\310\244q\250\0O\7\227\310UV\5P\10\227\310\250\264b\4Q\10\227\310"
-    "Uj$\1R\10\227\310\250\64V\1S\10\227\310m\220\301\2T\7\227\310\254\330\2U\7\227\310$"
-    "W\22V\10\227\310$\253L\0W\10\227\310$\65\206\12X\10\227\310$\325R\1Y\10\227\310$U"
-    "V\0Z\7\227\310\314T\16[\7\227\310\214X\16\134\10\217\311d\220A\0]\7\227\310\314r\4^"
-    "\5\213\313\65_\5\207\310\14`\6\212\313\304\0a\7\223\310\310\65\2b\10\227\310D\225\324\2c\7"
-    "\223\310\315\14\4d\10\227\310\246\245\222\0e\6\223\310\235\2f\10\227\310\246\264b\2g\10\227\307\35"
-    "\61%\0h\10\227\310D\225\254\0i\6\265\310\244\1j\10\233\307f\30U\5k\10\227\310\304\264T"
-    "\1l\7\227\310\310\326\0m\7\223\310<R\0n\7\223\310\250d\5o\7\223\310U\252\2p\10\227"
-    "\307\250\244V\4q\10\227\307-\225d\0r\6\223\310\315\22s\10\223\310\215\70\22\0t\10\227\310\245"
-    "\25\243\0u\7\223\310$+\11v\10\223\310$\65R\2w\7\223\310\244q\4x\7\223\310\244\62\25"
-    "y\11\227\307$\225dJ\0z\7\223\310\254\221\6{\10\227\310\251\32D\1|\6\265\310(\1}\11"
-    "\227\310\310\14RR\0~\6\213\313\215\4\0\0\0\4\377\377\0";
+const uint8_t u8g2_font_4x6_t_cyrillic[] =
+    "\277\0\2\2\3\3\2\4\4\4\6\0\377\5\377\5\377\0\356\1\334\2\301 \5\200\315\0!\6\351\310"
+    "\254\0\42\6\223\313$\25#\12\254\310\244\64T\32*\1$\11\263\307\245\241\301H\11%\10\253\310d"
+    "\324F\1&\11\254\310\305\24\253\230\2'\5\321\313\10(\7\362\307\251f\0)\10\262\307\304T)\0"
+    "*\7\253\310\244j\65+\10\253\310\305\264b\2,\6\222\307)\0-\5\213\312\14.\5\311\310\4/"
+    "\7\253\310Ve\4\60\10\253\310UCU\0\61\7\253\310%Y\15\62\7\253\310\65S\32\63\10\253\310"
+    "\314\224\301\2\64\10\253\310$\65b\1\65\10\253\310\214\250\301\2\66\7\253\310M\325\2\67\10\253\310\314"
+    "TF\0\70\7\253\310\255\326\2\71\7\253\310\265\344\2:\6\341\310\304\0;\7\252\307e\250\0<\10"
+    "\253\310\246\32d\20=\6\233\311l\60>\11\253\310d\220A*\1\77\11\253\310h\220\62L\0@\7"
+    "\253\310-\33\10A\10\253\310UC\251\0B\10\253\310\250\264\322\2C\10\253\310U\62U\0D\10\253"
+    "\310\250d-\0E\10\253\310\214\250\342\0F\10\253\310\214\250b\4G\10\253\310\315\244\222\0H\10\253"
+    "\310$\65\224\12I\7\253\310\254X\15J\7\253\310\226\252\2K\10\253\310$\265\222\12L\7\253\310\304"
+    "\346\0M\10\253\310\244\61\224\12N\10\253\310\252\241$\0O\7\253\310UV\5P\10\253\310\250\264b"
+    "\4Q\10\263\307UV\15\2R\10\253\310\250\264\222\12S\10\253\310m\220\301\2T\7\253\310\254\330\2"
+    "U\7\253\310$\327\10V\10\253\310$k\244\4W\10\253\310$\65\206\12X\10\253\310$\325R\1Y"
+    "\10\253\310$UV\0Z\7\253\310\314T\16[\6\352\310\254J\134\11\253\310\304\14\62\210\1]\6\252"
+    "\310\250j^\5\223\313\65_\5\213\307\14`\6\322\313\304\0a\7\243\310-\225\4b\10\253\310D\225"
+    "\324\2c\7\243\310\315\14\4d\10\253\310\246\245\222\0e\6\243\310USf\10\253\310\246\264b\2g"
+    "\10\253\307\255$\27\0h\10\253\310D\225\254\0i\10\253\310e$\323\0j\10\263\307fX.\0k"
+    "\10\253\310\304\264\222\12l\7\253\310\310\326\0m\10\243\310\244\241T\0n\7\243\310\250d\5o\7\243"
+    "\310U\252\2p\10\253\307\250\264b\4q\10\253\307-\225d\0r\10\243\310\244\25#\0s\10\243\310"
+    "\215\14\26\0t\10\253\310\245\25\63\10u\7\243\310$+\11v\7\243\310$\253\2w\10\243\310$\65"
+    "T\0x\7\243\310\244\62\25y\10\253\307$\225\344\2z\7\243\310\314\224\6{\10\263\307\246$k\20"
+    "|\6\351\310\14\1}\11\263\307d\20UL\21~\7\224\313%\225\0\0\0\0\4\377\377\4\1\11\253"
+    "\310\244\261\342\0\4\2\11\253\310\214\250\222\12\4\3\10\253\310\16Y\2\4\4\11\253\310M\225\201\0\4"
+    "\5\11\253\310m\220\301\2\4\6\10\253\310\254X\15\4\7\11\253\310\244\221b\32\4\10\10\253\310\226\252"
+    "\2\4\11\11\254\310L\325Z\2\4\12\11\254\310\244\326JK\4\13\11\253\310\250\250\222\12\4\14\10\253"
+    "\310\312\264\12\4\16\11\263\307\244\32u\2\4\17\11\263\307$\327H\11\4\20\11\253\310UC\251\0\4"
+    "\21\11\253\310\214\250\322\2\4\22\11\253\310\250\264\322\2\4\23\10\253\310\214\330\4\4\24\11\263\307\254\245"
+    "\206\12\4\25\11\253\310\214\250\342\0\4\26\12\253\310\244\221\322H\1\4\27\12\253\310h\220\62X\0\4"
+    "\30\11\253\310\304\64T\14\4\31\11\263\307\315\64T\14\4\32\11\253\310$\265\222\12\4\33\10\253\310-"
+    "W\0\4\34\11\253\310\244\241\254\0\4\35\11\253\310$\65\224\12\4\36\10\253\310UV\5\4\37\10\253"
+    "\310\214\344\12\4 \11\253\310\250\264b\4\4!\11\253\310U\62U\0\4\42\10\253\310\254\330\2\4#"
+    "\11\263\307$\253L\21\4$\12\253\310\245\221FJ\0\4%\11\253\310$\325R\1\4&\10\253\310$"
+    "\327\10\4'\11\253\310$\225d\1\4(\11\253\310$\65\216\0\4)\12\264\307\244\326#\203\0\4*"
+    "\13\254\310h\220\201LI\1\4+\12\254\310D\271\324H\1\4,\11\253\310\304\250\322\2\4-\11\253"
+    "\310h\220\344\2\4.\12\254\310\244\244.\225\0\4/\11\253\310\255\264T\0\4\60\10\243\310-\225\4"
+    "\4\61\11\253\310\315\221*\0\4\62\11\243\310\14\225\26\0\4\63\10\243\310\214X\2\4\64\11\253\307-"
+    "\65T\0\4\65\7\243\310US\4\66\11\244\310$S%\1\4\67\11\243\310\254\14\26\0\4\70\11\243"
+    "\310\244\61T\0\4\71\11\253\310\244\326P\1\4:\10\243\310$\265\12\4;\7\243\310-+\4<\11"
+    "\243\310\244\241T\0\4=\11\243\310\244\241T\0\4>\10\243\310U\252\2\4\77\10\243\310\214d\5\4"
+    "@\11\253\307\250\264b\4\4A\10\243\310\315\14\4\4B\10\243\310\254X\1\4C\11\253\307$\225\344"
+    "\2\4D\12\263\307\305\224T\231\0\4E\10\243\310\244\62\25\4F\11\253\307$k\304\0\4G\11\243"
+    "\310$\225d\0\4H\10\243\310\244q\4\4I\11\254\307\244\364\310 \4J\12\244\310h SR\0"
+    "\4K\11\244\310\304\245F\12\4L\11\243\310D\225\26\0\4M\10\243\310H\271\0\4N\12\244\310\244"
+    "\244\226J\0\4O\10\243\310\255\264\2\4Q\10\253\310\244\326\24\4R\11\263\307D\25U\31\4S\11"
+    "\253\310\246\64b\4\4T\11\243\310\215\224\201\0\4U\11\243\310\215\14\26\0\4V\11\253\310e$\323"
+    "\0\4W\11\253\310\244\14d\32\4X\11\263\307fX.\0\4Y\10\244\310\251\326\22\4Z\11\244\310"
+    "\244\264\322\22\4[\11\253\310D\25U\1\4\134\10\253\310\312\264\12\4^\11\263\307\244\32u\2\4_"
+    "\11\253\307$k\244\4\4\220\10\253\310\16Y\2\4\221\10\243\310\16\31\1\4\222\11\253\310\251\264b\2"
+    "\4\223\11\243\310\251\264\22\0\0";
 
 // Screen is 128x64 px
 static void app_draw_callback(Canvas* canvas, void* ctx) {
@@ -43,10 +74,11 @@ static void app_draw_callback(Canvas* canvas, void* ctx) {
 
     canvas_clear(canvas);
 
-    canvas_set_custom_u8g2_font(canvas, u8g2_font_tom_thumb_4x6_tr);
+    canvas_set_custom_u8g2_font(canvas, u8g2_font_4x6_t_cyrillic);
 
     canvas_draw_str(canvas, 0, 6, "This is a tiny custom font");
     canvas_draw_str(canvas, 0, 12, "012345.?! ,:;\"\'@#$%");
+    canvas_draw_str(canvas, 0, 18, "И немного юникода");
 }
 
 static void app_input_callback(InputEvent* input_event, void* ctx) {
diff --git a/applications/examples/example_images/ReadMe.md b/applications/examples/example_images/ReadMe.md
index d884a0a97..bf5795008 100644
--- a/applications/examples/example_images/ReadMe.md
+++ b/applications/examples/example_images/ReadMe.md
@@ -1,11 +1,21 @@
-# Application icons
+# Application icons {#example_app_images}
+
+## Source code
+
+Source code for this example can be found [here](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/applications/examples/example_images).
+
+## General principle
+
 To use icons, do the following:
-* add a line to the application manifest: `fap_icon_assets="folder"`, where `folder` points to the folder where your icons are located
-* add `#include "application_id_icons.h"` to the application code, where `application_id` is the appid from the manifest
-* every icon in the folder will be available as a `I_icon_name` variable, where `icon_name` is the name of the icon file without the extension
+
+* Add a line to the application manifest: `fap_icon_assets="folder"`, where `folder` points to the folder where your icons are located
+* Add `#include "application_id_icons.h"` to the application code, where `application_id` is the appid from the manifest
+* Every icon in the folder will be available as a `I_icon_name` variable, where `icon_name` is the name of the icon file without the extension
 
 ## Example
+
 We have an application with the following manifest:
+
 ```
 App(
     appid="example_images",
@@ -17,6 +27,7 @@ App(
 So the icons are in the `images` folder and will be available in the generated `example_images_icons.h` file.
 
 The example code is located in `example_images_main.c` and contains the following line:
+
 ```
 #include "example_images_icons.h"
 ```
diff --git a/applications/examples/example_images/example_images.c b/applications/examples/example_images/example_images.c
index b00818cd6..ba9a354f6 100644
--- a/applications/examples/example_images/example_images.c
+++ b/applications/examples/example_images/example_images.c
@@ -1,3 +1,7 @@
+/**
+ * @file example_images.c
+ * @brief Custom images example.
+ */
 #include <furi.h>
 #include <furi_hal.h>
 
@@ -9,7 +13,7 @@
 #include "example_images_icons.h"
 
 typedef struct {
-    uint8_t x, y;
+    int32_t x, y;
 } ImagePosition;
 
 static ImagePosition image_position = {.x = 0, .y = 0};
@@ -19,7 +23,7 @@ static void app_draw_callback(Canvas* canvas, void* ctx) {
     UNUSED(ctx);
 
     canvas_clear(canvas);
-    canvas_draw_icon(canvas, image_position.x % 128, image_position.y % 64, &I_dolphin_71x25);
+    canvas_draw_icon(canvas, image_position.x, image_position.y, &I_dolphin_71x25);
 }
 
 static void app_input_callback(InputEvent* input_event, void* ctx) {
diff --git a/applications/examples/example_plugins/example_plugins.c b/applications/examples/example_plugins/example_plugins.c
index 7e71e0d2e..4f2150884 100644
--- a/applications/examples/example_plugins/example_plugins.c
+++ b/applications/examples/example_plugins/example_plugins.c
@@ -1,5 +1,7 @@
-/* 
- * An example of a plugin host application.
+/**
+ * @file example_plugins.c
+ * @brief Plugin host application example.
+ *
  * Loads a single plugin and calls its methods.
  */
 
diff --git a/applications/examples/example_plugins/example_plugins_multi.c b/applications/examples/example_plugins/example_plugins_multi.c
index 3525b39ea..40abff561 100644
--- a/applications/examples/example_plugins/example_plugins_multi.c
+++ b/applications/examples/example_plugins/example_plugins_multi.c
@@ -1,5 +1,7 @@
-/*
- * An example of an advanced plugin host application.
+/**
+ * @file example_plugins_multi.c
+ * @brief Advanced plugin host application example.
+ *
  * It uses PluginManager to load all plugins from a directory
  */
 
diff --git a/applications/examples/example_plugins/plugin1.c b/applications/examples/example_plugins/plugin1.c
index 156219353..05036d252 100644
--- a/applications/examples/example_plugins/plugin1.c
+++ b/applications/examples/example_plugins/plugin1.c
@@ -1,10 +1,15 @@
-/* A simple plugin implementing example_plugins application's plugin interface */
+/**
+ * @file plugin1.c
+ * @brief Plugin example 1.
+ *
+ * A simple plugin implementing example_plugins application's plugin interface
+ */
 
 #include "plugin_interface.h"
 
 #include <flipper_application/flipper_application.h>
 
-static int example_plugin1_method1() {
+static int example_plugin1_method1(void) {
     return 42;
 }
 
@@ -27,6 +32,6 @@ static const FlipperAppPluginDescriptor example_plugin1_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* example_plugin1_ep() {
+const FlipperAppPluginDescriptor* example_plugin1_ep(void) {
     return &example_plugin1_descriptor;
 }
diff --git a/applications/examples/example_plugins/plugin2.c b/applications/examples/example_plugins/plugin2.c
index 0b774dad2..bff170dde 100644
--- a/applications/examples/example_plugins/plugin2.c
+++ b/applications/examples/example_plugins/plugin2.c
@@ -1,10 +1,15 @@
-/* Second plugin implementing example_plugins application's plugin interface */
+/**
+ * @file plugin2.c
+ * @brief Plugin example 2.
+ *
+ * Second plugin implementing example_plugins application's plugin interface
+ */
 
 #include "plugin_interface.h"
 
 #include <flipper_application/flipper_application.h>
 
-static int example_plugin2_method1() {
+static int example_plugin2_method1(void) {
     return 1337;
 }
 
@@ -27,6 +32,6 @@ static const FlipperAppPluginDescriptor example_plugin2_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor */
-const FlipperAppPluginDescriptor* example_plugin2_ep() {
+const FlipperAppPluginDescriptor* example_plugin2_ep(void) {
     return &example_plugin2_descriptor;
 }
diff --git a/applications/examples/example_plugins/plugin_interface.h b/applications/examples/example_plugins/plugin_interface.h
index 25d95d294..fadb9089f 100644
--- a/applications/examples/example_plugins/plugin_interface.h
+++ b/applications/examples/example_plugins/plugin_interface.h
@@ -1,12 +1,16 @@
+/**
+ * @file plugin_interface.h
+ * @brief Example plugin interface.
+ *
+ * Common interface between a plugin and host application
+ */
 #pragma once
 
-/* Common interface between a plugin and host application */
-
 #define PLUGIN_APP_ID "example_plugins"
 #define PLUGIN_API_VERSION 1
 
 typedef struct {
     const char* name;
-    int (*method1)();
+    int (*method1)(void);
     int (*method2)(int, int);
 } ExamplePlugin;
diff --git a/applications/examples/example_plugins_advanced/app_api.c b/applications/examples/example_plugins_advanced/app_api.c
index 42b3a1860..4f314f4ce 100644
--- a/applications/examples/example_plugins_advanced/app_api.c
+++ b/applications/examples/example_plugins_advanced/app_api.c
@@ -8,7 +8,7 @@ void app_api_accumulator_set(uint32_t value) {
     accumulator = value;
 }
 
-uint32_t app_api_accumulator_get() {
+uint32_t app_api_accumulator_get(void) {
     return accumulator;
 }
 
diff --git a/applications/examples/example_plugins_advanced/app_api.h b/applications/examples/example_plugins_advanced/app_api.h
index 7035b79f5..df80455d7 100644
--- a/applications/examples/example_plugins_advanced/app_api.h
+++ b/applications/examples/example_plugins_advanced/app_api.h
@@ -1,9 +1,12 @@
-#pragma once
-
-/* 
+/**
+ * @file app_api.h
+ * @brief Application API example.
+ *
  * This file contains an API that is internally implemented by the application
  * It is also exposed to plugins to allow them to use the application's API.
  */
+#pragma once
+
 #include <stdint.h>
 
 #ifdef __cplusplus
@@ -12,7 +15,7 @@ extern "C" {
 
 void app_api_accumulator_set(uint32_t value);
 
-uint32_t app_api_accumulator_get();
+uint32_t app_api_accumulator_get(void);
 
 void app_api_accumulator_add(uint32_t value);
 
diff --git a/applications/examples/example_plugins_advanced/plugin1.c b/applications/examples/example_plugins_advanced/plugin1.c
index bf0ab50b4..e45122d95 100644
--- a/applications/examples/example_plugins_advanced/plugin1.c
+++ b/applications/examples/example_plugins_advanced/plugin1.c
@@ -1,4 +1,7 @@
-/*
+/**
+ * @file plugin1.c
+ * @brief Plugin example 1.
+ *
  * This plugin uses both firmware's API interface and private application headers.
  * It can be loaded by a plugin manager that uses CompoundApiInterface,
  * which combines both interfaces.
@@ -15,7 +18,7 @@ static void advanced_plugin1_method1(int arg1) {
     app_api_accumulator_add(arg1);
 }
 
-static void advanced_plugin1_method2() {
+static void advanced_plugin1_method2(void) {
     /* Accumulator value is stored inside host application */
     FURI_LOG_I("TEST", "Plugin 1, accumulator: %lu", app_api_accumulator_get());
 }
@@ -35,6 +38,6 @@ static const FlipperAppPluginDescriptor advanced_plugin1_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor */
-const FlipperAppPluginDescriptor* advanced_plugin1_ep() {
+const FlipperAppPluginDescriptor* advanced_plugin1_ep(void) {
     return &advanced_plugin1_descriptor;
 }
diff --git a/applications/examples/example_plugins_advanced/plugin2.c b/applications/examples/example_plugins_advanced/plugin2.c
index f0b2f726d..efc8db478 100644
--- a/applications/examples/example_plugins_advanced/plugin2.c
+++ b/applications/examples/example_plugins_advanced/plugin2.c
@@ -1,4 +1,7 @@
-/*
+/**
+ * @file plugin2.c
+ * @brief Plugin example 2.
+ *
  * This plugin uses both firmware's API interface and private application headers.
  * It can be loaded by a plugin manager that uses CompoundApiInterface,
  * which combines both interfaces.
@@ -15,7 +18,7 @@ static void advanced_plugin2_method1(int arg1) {
     app_api_accumulator_mul(arg1);
 }
 
-static void advanced_plugin2_method2() {
+static void advanced_plugin2_method2(void) {
     /* Accumulator value is stored inside host application */
     FURI_LOG_I("TEST", "Plugin 2, accumulator: %lu", app_api_accumulator_get());
 }
@@ -35,6 +38,6 @@ static const FlipperAppPluginDescriptor advanced_plugin2_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor */
-const FlipperAppPluginDescriptor* advanced_plugin2_ep() {
+const FlipperAppPluginDescriptor* advanced_plugin2_ep(void) {
     return &advanced_plugin2_descriptor;
 }
diff --git a/applications/examples/example_plugins_advanced/plugin_interface.h b/applications/examples/example_plugins_advanced/plugin_interface.h
index d99b335ff..4cef7567b 100644
--- a/applications/examples/example_plugins_advanced/plugin_interface.h
+++ b/applications/examples/example_plugins_advanced/plugin_interface.h
@@ -1,12 +1,16 @@
+/**
+ * @file plugin_interface.h
+ * @brief Example plugin interface.
+ *
+ * Common interface between a plugin and host application
+ */
 #pragma once
 
-/* Common interface between a plugin and host application */
-
 #define PLUGIN_APP_ID "example_plugins_advanced"
 #define PLUGIN_API_VERSION 1
 
 typedef struct {
     const char* name;
     void (*method1)(int);
-    void (*method2)();
+    void (*method2)(void);
 } AdvancedPlugin;
diff --git a/applications/examples/example_thermo/README.md b/applications/examples/example_thermo/README.md
index d298de643..4af2e6043 100644
--- a/applications/examples/example_thermo/README.md
+++ b/applications/examples/example_thermo/README.md
@@ -1,8 +1,14 @@
-# 1-Wire Thermometer
+# 1-Wire Thermometer {#example_thermo}
+
 This example application demonstrates the use of the 1-Wire library with a DS18B20 thermometer. 
 It also covers basic GUI, input handling, threads and localisation.
 
+## Source code
+
+Source code for this example can be found [here](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/applications/examples/example_thermo).
+
 ## Electrical connections
+
 Before launching the application, connect the sensor to Flipper's external GPIO according to the table below:
 | DS18B20 | Flipper |
 | :-----: | :-----: |
@@ -15,12 +21,14 @@ Before launching the application, connect the sensor to Flipper's external GPIO
 *NOTE 2*: For any other pin than 17, connect an external 4.7k pull-up resistor to pin 9.
 
 ## Launching the application
+
 In order to launch this demo, follow the steps below:
 1. Make sure your Flipper has an SD card installed.
 2. Connect your Flipper to the computer via a USB cable.
 3. Run `./fbt launch APPSRC=example_thermo` in your terminal emulator of choice.
 
 ## Changing the data pin
+
 It is possible to use other GPIO pin as a 1-Wire data pin. In order to change it, set the `THERMO_GPIO_PIN` macro to any of the options listed below:
 
 ```c
diff --git a/applications/examples/example_thermo/example_thermo.c b/applications/examples/example_thermo/example_thermo.c
index 5abd963a1..dafe56886 100644
--- a/applications/examples/example_thermo/example_thermo.c
+++ b/applications/examples/example_thermo/example_thermo.c
@@ -1,4 +1,7 @@
-/*
+/**
+ * @file example_thermo.c
+ * @brief 1-Wire thermometer example.
+ *
  * This file contains an example application that reads and displays
  * the temperature from a DS18B20 1-wire thermometer.
  *
@@ -312,7 +315,7 @@ static void example_thermo_run(ExampleThermoContext* context) {
 /******************** Initialisation & startup *****************************/
 
 /* Allocate the memory and initialise the variables */
-static ExampleThermoContext* example_thermo_context_alloc() {
+static ExampleThermoContext* example_thermo_context_alloc(void) {
     ExampleThermoContext* context = malloc(sizeof(ExampleThermoContext));
 
     context->view_port = view_port_alloc();
diff --git a/applications/main/archive/archive.c b/applications/main/archive/archive.c
index 066fcab05..7f01b2f75 100644
--- a/applications/main/archive/archive.c
+++ b/applications/main/archive/archive.c
@@ -18,7 +18,7 @@ static void archive_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(archive->scene_manager);
 }
 
-static ArchiveApp* archive_alloc() {
+ArchiveApp* archive_alloc(void) {
     ArchiveApp* archive = malloc(sizeof(ArchiveApp));
 
     archive->fav_move_str = furi_string_alloc();
diff --git a/applications/main/archive/helpers/archive_favorites.c b/applications/main/archive/helpers/archive_favorites.c
index 682aa6b38..351d68c1d 100644
--- a/applications/main/archive/helpers/archive_favorites.c
+++ b/applications/main/archive/helpers/archive_favorites.c
@@ -79,7 +79,7 @@ uint16_t archive_favorites_count(void* context) {
     return lines;
 }
 
-static bool archive_favourites_rescan() {
+static bool archive_favourites_rescan(void) {
     FuriString* buffer;
     buffer = furi_string_alloc();
     Storage* storage = furi_record_open(RECORD_STORAGE);
diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c
index f6a379276..ff96d4b13 100644
--- a/applications/main/archive/scenes/archive_scene_browser.c
+++ b/applications/main/archive/scenes/archive_scene_browser.c
@@ -246,6 +246,7 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
             break;
         case ArchiveBrowserEventFileMenuDelete:
             if(archive_get_tab(browser) != ArchiveTabFavorites) {
+                archive_show_file_menu(browser, false);
                 scene_manager_set_scene_state(
                     archive->scene_manager, ArchiveAppSceneBrowser, SCENE_STATE_NEED_REFRESH);
                 scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneDelete);
diff --git a/applications/main/archive/scenes/archive_scene_delete.c b/applications/main/archive/scenes/archive_scene_delete.c
index c2f2ddad5..b23fae574 100644
--- a/applications/main/archive/scenes/archive_scene_delete.c
+++ b/applications/main/archive/scenes/archive_scene_delete.c
@@ -26,6 +26,12 @@ void archive_scene_delete_on_enter(void* context) {
     filename = furi_string_alloc();
 
     ArchiveFile_t* current = archive_get_current_file(app->browser);
+
+    FuriString* filename_no_ext = furi_string_alloc();
+    path_extract_filename(current->path, filename_no_ext, true);
+    strlcpy(app->text_store, furi_string_get_cstr(filename_no_ext), MAX_NAME_LEN);
+    furi_string_free(filename_no_ext);
+
     path_extract_filename(current->path, filename, false);
 
     char delete_str[64];
diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c
index 6e3e8c5ce..d1eed91a0 100644
--- a/applications/main/archive/views/archive_browser_view.c
+++ b/applications/main/archive/views/archive_browser_view.c
@@ -687,7 +687,7 @@ static void browser_view_exit(void* context) {
     furi_timer_stop(browser->scroll_timer);
 }
 
-ArchiveBrowserView* browser_alloc() {
+ArchiveBrowserView* browser_alloc(void) {
     ArchiveBrowserView* browser = malloc(sizeof(ArchiveBrowserView));
     browser->view = view_alloc();
     view_allocate_model(browser->view, ViewModelTypeLocking, sizeof(ArchiveBrowserViewModel));
diff --git a/applications/main/archive/views/archive_browser_view.h b/applications/main/archive/views/archive_browser_view.h
index 5541ba9fe..87d029664 100644
--- a/applications/main/archive/views/archive_browser_view.h
+++ b/applications/main/archive/views/archive_browser_view.h
@@ -126,8 +126,7 @@ void archive_browser_set_callback(
 
 View* archive_browser_get_view(ArchiveBrowserView* browser);
 
-ArchiveBrowserView* browser_alloc();
-
+ArchiveBrowserView* browser_alloc(void);
 void browser_free(ArchiveBrowserView* browser);
 
 void archive_browser_clipboard_set_mode(ArchiveBrowserView* browser, uint8_t mode);
diff --git a/applications/main/bad_usb/application.fam b/applications/main/bad_usb/application.fam
index 9844e248d..8d3909fcc 100644
--- a/applications/main/bad_usb/application.fam
+++ b/applications/main/bad_usb/application.fam
@@ -7,7 +7,7 @@ App(
     icon="A_BadUsb_14",
     order=70,
     resources="resources",
-    fap_libs=["assets"],
+    fap_libs=["assets", "ble_profile"],
     fap_icon="icon.png",
     fap_category="USB",
 )
diff --git a/applications/main/bad_usb/bad_usb_app.c b/applications/main/bad_usb/bad_usb_app.c
index ea97c4487..0cf7f1924 100644
--- a/applications/main/bad_usb/bad_usb_app.c
+++ b/applications/main/bad_usb/bad_usb_app.c
@@ -1,11 +1,14 @@
 #include "bad_usb_app_i.h"
-#include "bad_usb_settings_filename.h"
 #include <furi.h>
 #include <furi_hal.h>
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
+#include <flipper_format/flipper_format.h>
 
-#define BAD_USB_SETTINGS_PATH BAD_USB_APP_BASE_FOLDER "/" BAD_USB_SETTINGS_FILE_NAME
+#define BAD_USB_SETTINGS_PATH BAD_USB_APP_BASE_FOLDER "/.badusb.settings"
+#define BAD_USB_SETTINGS_FILE_TYPE "Flipper BadUSB Settings File"
+#define BAD_USB_SETTINGS_VERSION 1
+#define BAD_USB_SETTINGS_DEFAULT_LAYOUT BAD_USB_APP_PATH_LAYOUT_FOLDER "/en-US.kl"
 
 static bool bad_usb_app_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
@@ -26,46 +29,69 @@ static void bad_usb_app_tick_event_callback(void* context) {
 }
 
 static void bad_usb_load_settings(BadUsbApp* app) {
-    File* settings_file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
-    if(storage_file_open(settings_file, BAD_USB_SETTINGS_PATH, FSAM_READ, FSOM_OPEN_EXISTING)) {
-        char chr;
-        while((storage_file_read(settings_file, &chr, 1) == 1) &&
-              !storage_file_eof(settings_file) && !isspace(chr)) {
-            furi_string_push_back(app->keyboard_layout, chr);
-        }
-    } else {
-        furi_string_reset(app->keyboard_layout);
-    }
-    storage_file_close(settings_file);
-    storage_file_free(settings_file);
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    FlipperFormat* fff = flipper_format_file_alloc(storage);
+    bool state = false;
+
+    FuriString* temp_str = furi_string_alloc();
+    uint32_t version = 0;
+    uint32_t interface = 0;
+
+    if(flipper_format_file_open_existing(fff, BAD_USB_SETTINGS_PATH)) {
+        do {
+            if(!flipper_format_read_header(fff, temp_str, &version)) break;
+            if((strcmp(furi_string_get_cstr(temp_str), BAD_USB_SETTINGS_FILE_TYPE) != 0) ||
+               (version != BAD_USB_SETTINGS_VERSION))
+                break;
+
+            if(!flipper_format_read_string(fff, "layout", temp_str)) break;
+            if(!flipper_format_read_uint32(fff, "interface", &interface, 1)) break;
+            if(interface > BadUsbHidInterfaceBle) break;
+
+            state = true;
+        } while(0);
+    }
+    flipper_format_free(fff);
+    furi_record_close(RECORD_STORAGE);
+
+    if(state) {
+        furi_string_set(app->keyboard_layout, temp_str);
+        app->interface = interface;
 
-    if(!furi_string_empty(app->keyboard_layout)) {
         Storage* fs_api = furi_record_open(RECORD_STORAGE);
         FileInfo layout_file_info;
         FS_Error file_check_err = storage_common_stat(
             fs_api, furi_string_get_cstr(app->keyboard_layout), &layout_file_info);
         furi_record_close(RECORD_STORAGE);
-        if(file_check_err != FSE_OK) {
-            furi_string_reset(app->keyboard_layout);
-            return;
-        }
-        if(layout_file_info.size != 256) {
-            furi_string_reset(app->keyboard_layout);
+        if((file_check_err != FSE_OK) || (layout_file_info.size != 256)) {
+            furi_string_set(app->keyboard_layout, BAD_USB_SETTINGS_DEFAULT_LAYOUT);
         }
+    } else {
+        furi_string_set(app->keyboard_layout, BAD_USB_SETTINGS_DEFAULT_LAYOUT);
+        app->interface = BadUsbHidInterfaceUsb;
     }
+
+    furi_string_free(temp_str);
 }
 
 static void bad_usb_save_settings(BadUsbApp* app) {
-    File* settings_file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
-    if(storage_file_open(settings_file, BAD_USB_SETTINGS_PATH, FSAM_WRITE, FSOM_OPEN_ALWAYS)) {
-        storage_file_write(
-            settings_file,
-            furi_string_get_cstr(app->keyboard_layout),
-            furi_string_size(app->keyboard_layout));
-        storage_file_write(settings_file, "\n", 1);
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    FlipperFormat* fff = flipper_format_file_alloc(storage);
+
+    if(flipper_format_file_open_always(fff, BAD_USB_SETTINGS_PATH)) {
+        do {
+            if(!flipper_format_write_header_cstr(
+                   fff, BAD_USB_SETTINGS_FILE_TYPE, BAD_USB_SETTINGS_VERSION))
+                break;
+            if(!flipper_format_write_string(fff, "layout", app->keyboard_layout)) break;
+            uint32_t interface_id = app->interface;
+            if(!flipper_format_write_uint32(fff, "interface", (const uint32_t*)&interface_id, 1))
+                break;
+        } while(0);
     }
-    storage_file_close(settings_file);
-    storage_file_free(settings_file);
+
+    flipper_format_free(fff);
+    furi_record_close(RECORD_STORAGE);
 }
 
 BadUsbApp* bad_usb_app_alloc(char* arg) {
@@ -103,13 +129,15 @@ BadUsbApp* bad_usb_app_alloc(char* arg) {
     view_dispatcher_add_view(
         app->view_dispatcher, BadUsbAppViewError, widget_get_view(app->widget));
 
-    app->submenu = submenu_alloc();
+    app->var_item_list = variable_item_list_alloc();
     view_dispatcher_add_view(
-        app->view_dispatcher, BadUsbAppViewConfig, submenu_get_view(app->submenu));
+        app->view_dispatcher,
+        BadUsbAppViewConfig,
+        variable_item_list_get_view(app->var_item_list));
 
-    app->bad_usb_view = bad_usb_alloc();
+    app->bad_usb_view = bad_usb_view_alloc();
     view_dispatcher_add_view(
-        app->view_dispatcher, BadUsbAppViewWork, bad_usb_get_view(app->bad_usb_view));
+        app->view_dispatcher, BadUsbAppViewWork, bad_usb_view_get_view(app->bad_usb_view));
 
     view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
 
@@ -122,8 +150,6 @@ BadUsbApp* bad_usb_app_alloc(char* arg) {
         furi_check(furi_hal_usb_set_config(NULL, NULL));
 
         if(!furi_string_empty(app->file_path)) {
-            app->bad_usb_script = bad_usb_script_open(app->file_path);
-            bad_usb_script_set_keyboard_layout(app->bad_usb_script, app->keyboard_layout);
             scene_manager_next_scene(app->scene_manager, BadUsbSceneWork);
         } else {
             furi_string_set(app->file_path, BAD_USB_APP_BASE_FOLDER);
@@ -144,15 +170,15 @@ void bad_usb_app_free(BadUsbApp* app) {
 
     // Views
     view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewWork);
-    bad_usb_free(app->bad_usb_view);
+    bad_usb_view_free(app->bad_usb_view);
 
     // Custom Widget
     view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewError);
     widget_free(app->widget);
 
-    // Submenu
+    // Config menu
     view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewConfig);
-    submenu_free(app->submenu);
+    variable_item_list_free(app->var_item_list);
 
     // View dispatcher
     view_dispatcher_free(app->view_dispatcher);
diff --git a/applications/main/bad_usb/bad_usb_app_i.h b/applications/main/bad_usb/bad_usb_app_i.h
index cf1c02ebc..cb54d94e9 100644
--- a/applications/main/bad_usb/bad_usb_app_i.h
+++ b/applications/main/bad_usb/bad_usb_app_i.h
@@ -3,12 +3,12 @@
 #include "bad_usb_app.h"
 #include "scenes/bad_usb_scene.h"
 #include "helpers/ducky_script.h"
+#include "helpers/bad_usb_hid.h"
 
 #include <gui/gui.h>
 #include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
-#include <gui/modules/submenu.h>
 #include <dialogs/dialogs.h>
 #include <notification/notification_messages.h>
 #include <gui/modules/variable_item_list.h>
@@ -16,7 +16,7 @@
 #include "views/bad_usb_view.h"
 #include <furi_hal_usb.h>
 
-#define BAD_USB_APP_BASE_FOLDER ANY_PATH("badusb")
+#define BAD_USB_APP_BASE_FOLDER EXT_PATH("badusb")
 #define BAD_USB_APP_PATH_LAYOUT_FOLDER BAD_USB_APP_BASE_FOLDER "/assets/layouts"
 #define BAD_USB_APP_SCRIPT_EXTENSION ".txt"
 #define BAD_USB_APP_LAYOUT_EXTENSION ".kl"
@@ -33,7 +33,7 @@ struct BadUsbApp {
     NotificationApp* notifications;
     DialogsApp* dialogs;
     Widget* widget;
-    Submenu* submenu;
+    VariableItemList* var_item_list;
 
     BadUsbAppError error;
     FuriString* file_path;
@@ -41,6 +41,7 @@ struct BadUsbApp {
     BadUsb* bad_usb_view;
     BadUsbScript* bad_usb_script;
 
+    BadUsbHidInterface interface;
     FuriHalUsbInterface* usb_if_prev;
 };
 
diff --git a/applications/main/bad_usb/bad_usb_settings_filename.h b/applications/main/bad_usb/bad_usb_settings_filename.h
deleted file mode 100644
index 12ba8f31c..000000000
--- a/applications/main/bad_usb/bad_usb_settings_filename.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define BAD_USB_SETTINGS_FILE_NAME ".badusb.settings"
diff --git a/applications/main/bad_usb/helpers/bad_usb_hid.c b/applications/main/bad_usb/helpers/bad_usb_hid.c
new file mode 100644
index 000000000..289e3ae8c
--- /dev/null
+++ b/applications/main/bad_usb/helpers/bad_usb_hid.c
@@ -0,0 +1,226 @@
+#include "bad_usb_hid.h"
+#include <extra_profiles/hid_profile.h>
+#include <bt/bt_service/bt.h>
+#include <storage/storage.h>
+
+#define TAG "BadUSB HID"
+
+#define HID_BT_KEYS_STORAGE_NAME ".bt_hid.keys"
+
+void* hid_usb_init(FuriHalUsbHidConfig* hid_cfg) {
+    furi_check(furi_hal_usb_set_config(&usb_hid, hid_cfg));
+    return NULL;
+}
+
+void hid_usb_deinit(void* inst) {
+    UNUSED(inst);
+    furi_check(furi_hal_usb_set_config(NULL, NULL));
+}
+
+void hid_usb_set_state_callback(void* inst, HidStateCallback cb, void* context) {
+    UNUSED(inst);
+    furi_hal_hid_set_state_callback(cb, context);
+}
+
+bool hid_usb_is_connected(void* inst) {
+    UNUSED(inst);
+    return furi_hal_hid_is_connected();
+}
+
+bool hid_usb_kb_press(void* inst, uint16_t button) {
+    UNUSED(inst);
+    return furi_hal_hid_kb_press(button);
+}
+
+bool hid_usb_kb_release(void* inst, uint16_t button) {
+    UNUSED(inst);
+    return furi_hal_hid_kb_release(button);
+}
+
+bool hid_usb_consumer_press(void* inst, uint16_t button) {
+    UNUSED(inst);
+    return furi_hal_hid_consumer_key_press(button);
+}
+
+bool hid_usb_consumer_release(void* inst, uint16_t button) {
+    UNUSED(inst);
+    return furi_hal_hid_consumer_key_release(button);
+}
+
+bool hid_usb_release_all(void* inst) {
+    UNUSED(inst);
+    bool state = furi_hal_hid_kb_release_all();
+    state &= furi_hal_hid_consumer_key_release_all();
+    return state;
+}
+
+uint8_t hid_usb_get_led_state(void* inst) {
+    UNUSED(inst);
+    return furi_hal_hid_get_led_state();
+}
+
+static const BadUsbHidApi hid_api_usb = {
+    .init = hid_usb_init,
+    .deinit = hid_usb_deinit,
+    .set_state_callback = hid_usb_set_state_callback,
+    .is_connected = hid_usb_is_connected,
+
+    .kb_press = hid_usb_kb_press,
+    .kb_release = hid_usb_kb_release,
+    .consumer_press = hid_usb_consumer_press,
+    .consumer_release = hid_usb_consumer_release,
+    .release_all = hid_usb_release_all,
+    .get_led_state = hid_usb_get_led_state,
+};
+
+typedef struct {
+    Bt* bt;
+    FuriHalBleProfileBase* profile;
+    HidStateCallback state_callback;
+    void* callback_context;
+    bool is_connected;
+} BleHidInstance;
+
+static const BleProfileHidParams ble_hid_params = {
+    .device_name_prefix = "BadUSB",
+    .mac_xor = 0x0002,
+};
+
+static void hid_ble_connection_status_callback(BtStatus status, void* context) {
+    furi_assert(context);
+    BleHidInstance* ble_hid = context;
+    ble_hid->is_connected = (status == BtStatusConnected);
+    if(ble_hid->state_callback) {
+        ble_hid->state_callback(ble_hid->is_connected, ble_hid->callback_context);
+    }
+}
+
+void* hid_ble_init(FuriHalUsbHidConfig* hid_cfg) {
+    UNUSED(hid_cfg);
+    BleHidInstance* ble_hid = malloc(sizeof(BleHidInstance));
+    ble_hid->bt = furi_record_open(RECORD_BT);
+    bt_disconnect(ble_hid->bt);
+
+    // Wait 2nd core to update nvm storage
+    furi_delay_ms(200);
+
+    bt_keys_storage_set_storage_path(ble_hid->bt, APP_DATA_PATH(HID_BT_KEYS_STORAGE_NAME));
+
+    ble_hid->profile = bt_profile_start(ble_hid->bt, ble_profile_hid, (void*)&ble_hid_params);
+    furi_check(ble_hid->profile);
+
+    furi_hal_bt_start_advertising();
+
+    bt_set_status_changed_callback(ble_hid->bt, hid_ble_connection_status_callback, ble_hid);
+
+    return ble_hid;
+}
+
+void hid_ble_deinit(void* inst) {
+    BleHidInstance* ble_hid = inst;
+    furi_assert(ble_hid);
+
+    bt_set_status_changed_callback(ble_hid->bt, NULL, NULL);
+    bt_disconnect(ble_hid->bt);
+
+    // Wait 2nd core to update nvm storage
+    furi_delay_ms(200);
+    bt_keys_storage_set_default_path(ble_hid->bt);
+
+    furi_check(bt_profile_restore_default(ble_hid->bt));
+    furi_record_close(RECORD_BT);
+    free(ble_hid);
+}
+
+void hid_ble_set_state_callback(void* inst, HidStateCallback cb, void* context) {
+    BleHidInstance* ble_hid = inst;
+    furi_assert(ble_hid);
+    ble_hid->state_callback = cb;
+    ble_hid->callback_context = context;
+}
+
+bool hid_ble_is_connected(void* inst) {
+    BleHidInstance* ble_hid = inst;
+    furi_assert(ble_hid);
+    return ble_hid->is_connected;
+}
+
+bool hid_ble_kb_press(void* inst, uint16_t button) {
+    BleHidInstance* ble_hid = inst;
+    furi_assert(ble_hid);
+    return ble_profile_hid_kb_press(ble_hid->profile, button);
+}
+
+bool hid_ble_kb_release(void* inst, uint16_t button) {
+    BleHidInstance* ble_hid = inst;
+    furi_assert(ble_hid);
+    return ble_profile_hid_kb_release(ble_hid->profile, button);
+}
+
+bool hid_ble_consumer_press(void* inst, uint16_t button) {
+    BleHidInstance* ble_hid = inst;
+    furi_assert(ble_hid);
+    return ble_profile_hid_consumer_key_press(ble_hid->profile, button);
+}
+
+bool hid_ble_consumer_release(void* inst, uint16_t button) {
+    BleHidInstance* ble_hid = inst;
+    furi_assert(ble_hid);
+    return ble_profile_hid_consumer_key_release(ble_hid->profile, button);
+}
+
+bool hid_ble_release_all(void* inst) {
+    BleHidInstance* ble_hid = inst;
+    furi_assert(ble_hid);
+    bool state = ble_profile_hid_kb_release_all(ble_hid->profile);
+    state &= ble_profile_hid_consumer_key_release_all(ble_hid->profile);
+    return state;
+}
+
+uint8_t hid_ble_get_led_state(void* inst) {
+    UNUSED(inst);
+    FURI_LOG_W(TAG, "hid_ble_get_led_state not implemented");
+    return 0;
+}
+
+static const BadUsbHidApi hid_api_ble = {
+    .init = hid_ble_init,
+    .deinit = hid_ble_deinit,
+    .set_state_callback = hid_ble_set_state_callback,
+    .is_connected = hid_ble_is_connected,
+
+    .kb_press = hid_ble_kb_press,
+    .kb_release = hid_ble_kb_release,
+    .consumer_press = hid_ble_consumer_press,
+    .consumer_release = hid_ble_consumer_release,
+    .release_all = hid_ble_release_all,
+    .get_led_state = hid_ble_get_led_state,
+};
+
+const BadUsbHidApi* bad_usb_hid_get_interface(BadUsbHidInterface interface) {
+    if(interface == BadUsbHidInterfaceUsb) {
+        return &hid_api_usb;
+    } else {
+        return &hid_api_ble;
+    }
+}
+
+void bad_usb_hid_ble_remove_pairing(void) {
+    Bt* bt = furi_record_open(RECORD_BT);
+    bt_disconnect(bt);
+
+    // Wait 2nd core to update nvm storage
+    furi_delay_ms(200);
+
+    furi_hal_bt_stop_advertising();
+
+    bt_keys_storage_set_storage_path(bt, APP_DATA_PATH(HID_BT_KEYS_STORAGE_NAME));
+    bt_forget_bonded_devices(bt);
+
+    // Wait 2nd core to update nvm storage
+    furi_delay_ms(200);
+    bt_keys_storage_set_default_path(bt);
+
+    furi_check(bt_profile_restore_default(bt));
+    furi_record_close(RECORD_BT);
+}
\ No newline at end of file
diff --git a/applications/main/bad_usb/helpers/bad_usb_hid.h b/applications/main/bad_usb/helpers/bad_usb_hid.h
new file mode 100644
index 000000000..71d3a58e7
--- /dev/null
+++ b/applications/main/bad_usb/helpers/bad_usb_hid.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <furi.h>
+#include <furi_hal.h>
+
+typedef enum {
+    BadUsbHidInterfaceUsb,
+    BadUsbHidInterfaceBle,
+} BadUsbHidInterface;
+
+typedef struct {
+    void* (*init)(FuriHalUsbHidConfig* hid_cfg);
+    void (*deinit)(void* inst);
+    void (*set_state_callback)(void* inst, HidStateCallback cb, void* context);
+    bool (*is_connected)(void* inst);
+
+    bool (*kb_press)(void* inst, uint16_t button);
+    bool (*kb_release)(void* inst, uint16_t button);
+    bool (*consumer_press)(void* inst, uint16_t button);
+    bool (*consumer_release)(void* inst, uint16_t button);
+    bool (*release_all)(void* inst);
+    uint8_t (*get_led_state)(void* inst);
+} BadUsbHidApi;
+
+const BadUsbHidApi* bad_usb_hid_get_interface(BadUsbHidInterface interface);
+
+void bad_usb_hid_ble_remove_pairing(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/applications/main/bad_usb/helpers/ducky_script.c b/applications/main/bad_usb/helpers/ducky_script.c
index 0d8c77c01..e1bd44169 100644
--- a/applications/main/bad_usb/helpers/ducky_script.c
+++ b/applications/main/bad_usb/helpers/ducky_script.c
@@ -3,7 +3,6 @@
 #include <gui/gui.h>
 #include <input/input.h>
 #include <lib/toolbox/args.h>
-#include <furi_hal_usb_hid.h>
 #include <storage/storage.h>
 #include "ducky_script.h"
 #include "ducky_script_i.h"
@@ -71,39 +70,40 @@ bool ducky_get_number(const char* param, uint32_t* val) {
     return false;
 }
 
-void ducky_numlock_on() {
-    if((furi_hal_hid_get_led_state() & HID_KB_LED_NUM) == 0) {
-        furi_hal_hid_kb_press(HID_KEYBOARD_LOCK_NUM_LOCK);
-        furi_hal_hid_kb_release(HID_KEYBOARD_LOCK_NUM_LOCK);
+void ducky_numlock_on(BadUsbScript* bad_usb) {
+    if((bad_usb->hid->get_led_state(bad_usb->hid_inst) & HID_KB_LED_NUM) == 0) {
+        bad_usb->hid->kb_press(bad_usb->hid_inst, HID_KEYBOARD_LOCK_NUM_LOCK);
+        bad_usb->hid->kb_release(bad_usb->hid_inst, HID_KEYBOARD_LOCK_NUM_LOCK);
     }
 }
-bool ducky_numpad_press(const char num) {
+
+bool ducky_numpad_press(BadUsbScript* bad_usb, const char num) {
     if((num < '0') || (num > '9')) return false;
 
     uint16_t key = numpad_keys[num - '0'];
-    furi_hal_hid_kb_press(key);
-    furi_hal_hid_kb_release(key);
+    bad_usb->hid->kb_press(bad_usb->hid_inst, key);
+    bad_usb->hid->kb_release(bad_usb->hid_inst, key);
 
     return true;
 }
 
-bool ducky_altchar(const char* charcode) {
+bool ducky_altchar(BadUsbScript* bad_usb, const char* charcode) {
     uint8_t i = 0;
     bool state = false;
 
-    furi_hal_hid_kb_press(KEY_MOD_LEFT_ALT);
+    bad_usb->hid->kb_press(bad_usb->hid_inst, KEY_MOD_LEFT_ALT);
 
     while(!ducky_is_line_end(charcode[i])) {
-        state = ducky_numpad_press(charcode[i]);
+        state = ducky_numpad_press(bad_usb, charcode[i]);
         if(state == false) break;
         i++;
     }
 
-    furi_hal_hid_kb_release(KEY_MOD_LEFT_ALT);
+    bad_usb->hid->kb_release(bad_usb->hid_inst, KEY_MOD_LEFT_ALT);
     return state;
 }
 
-bool ducky_altstring(const char* param) {
+bool ducky_altstring(BadUsbScript* bad_usb, const char* param) {
     uint32_t i = 0;
     bool state = false;
 
@@ -116,7 +116,7 @@ bool ducky_altstring(const char* param) {
         char temp_str[4];
         snprintf(temp_str, 4, "%u", param[i]);
 
-        state = ducky_altchar(temp_str);
+        state = ducky_altchar(bad_usb, temp_str);
         if(state == false) break;
         i++;
     }
@@ -140,12 +140,12 @@ bool ducky_string(BadUsbScript* bad_usb, const char* param) {
         if(param[i] != '\n') {
             uint16_t keycode = BADUSB_ASCII_TO_KEY(bad_usb, param[i]);
             if(keycode != HID_KEYBOARD_NONE) {
-                furi_hal_hid_kb_press(keycode);
-                furi_hal_hid_kb_release(keycode);
+                bad_usb->hid->kb_press(bad_usb->hid_inst, keycode);
+                bad_usb->hid->kb_release(bad_usb->hid_inst, keycode);
             }
         } else {
-            furi_hal_hid_kb_press(HID_KEYBOARD_RETURN);
-            furi_hal_hid_kb_release(HID_KEYBOARD_RETURN);
+            bad_usb->hid->kb_press(bad_usb->hid_inst, HID_KEYBOARD_RETURN);
+            bad_usb->hid->kb_release(bad_usb->hid_inst, HID_KEYBOARD_RETURN);
         }
         i++;
     }
@@ -163,12 +163,12 @@ static bool ducky_string_next(BadUsbScript* bad_usb) {
     if(print_char != '\n') {
         uint16_t keycode = BADUSB_ASCII_TO_KEY(bad_usb, print_char);
         if(keycode != HID_KEYBOARD_NONE) {
-            furi_hal_hid_kb_press(keycode);
-            furi_hal_hid_kb_release(keycode);
+            bad_usb->hid->kb_press(bad_usb->hid_inst, keycode);
+            bad_usb->hid->kb_release(bad_usb->hid_inst, keycode);
         }
     } else {
-        furi_hal_hid_kb_press(HID_KEYBOARD_RETURN);
-        furi_hal_hid_kb_release(HID_KEYBOARD_RETURN);
+        bad_usb->hid->kb_press(bad_usb->hid_inst, HID_KEYBOARD_RETURN);
+        bad_usb->hid->kb_release(bad_usb->hid_inst, HID_KEYBOARD_RETURN);
     }
 
     bad_usb->string_print_pos++;
@@ -205,8 +205,8 @@ static int32_t ducky_parse_line(BadUsbScript* bad_usb, FuriString* line) {
             key |= ducky_get_keycode(bad_usb, line_tmp + offset, true);
         }
     }
-    furi_hal_hid_kb_press(key);
-    furi_hal_hid_kb_release(key);
+    bad_usb->hid->kb_press(bad_usb->hid_inst, key);
+    bad_usb->hid->kb_release(bad_usb->hid_inst, key);
     return 0;
 }
 
@@ -235,6 +235,17 @@ static bool ducky_set_usb_id(BadUsbScript* bad_usb, const char* line) {
     return false;
 }
 
+static void bad_usb_hid_state_callback(bool state, void* context) {
+    furi_assert(context);
+    BadUsbScript* bad_usb = context;
+
+    if(state == true) {
+        furi_thread_flags_set(furi_thread_get_id(bad_usb->thread), WorkerEvtConnect);
+    } else {
+        furi_thread_flags_set(furi_thread_get_id(bad_usb->thread), WorkerEvtDisconnect);
+    }
+}
+
 static bool ducky_script_preload(BadUsbScript* bad_usb, File* script_file) {
     uint8_t ret = 0;
     uint32_t line_len = 0;
@@ -269,10 +280,11 @@ static bool ducky_script_preload(BadUsbScript* bad_usb, File* script_file) {
     }
 
     if(id_set) {
-        furi_check(furi_hal_usb_set_config(&usb_hid, &bad_usb->hid_cfg));
+        bad_usb->hid_inst = bad_usb->hid->init(&bad_usb->hid_cfg);
     } else {
-        furi_check(furi_hal_usb_set_config(&usb_hid, NULL));
+        bad_usb->hid_inst = bad_usb->hid->init(NULL);
     }
+    bad_usb->hid->set_state_callback(bad_usb->hid_inst, bad_usb_hid_state_callback, bad_usb);
 
     storage_file_seek(script_file, 0, true);
     furi_string_reset(bad_usb->line);
@@ -349,17 +361,6 @@ static int32_t ducky_script_execute_next(BadUsbScript* bad_usb, File* script_fil
     return 0;
 }
 
-static void bad_usb_hid_state_callback(bool state, void* context) {
-    furi_assert(context);
-    BadUsbScript* bad_usb = context;
-
-    if(state == true) {
-        furi_thread_flags_set(furi_thread_get_id(bad_usb->thread), WorkerEvtConnect);
-    } else {
-        furi_thread_flags_set(furi_thread_get_id(bad_usb->thread), WorkerEvtDisconnect);
-    }
-}
-
 static uint32_t bad_usb_flags_get(uint32_t flags_mask, uint32_t timeout) {
     uint32_t flags = furi_thread_flags_get();
     furi_check((flags & FuriFlagError) == 0);
@@ -386,8 +387,6 @@ static int32_t bad_usb_worker(void* context) {
     bad_usb->line_prev = furi_string_alloc();
     bad_usb->string_print = furi_string_alloc();
 
-    furi_hal_hid_set_state_callback(bad_usb_hid_state_callback, bad_usb);
-
     while(1) {
         if(worker_state == BadUsbStateInit) { // State: initialization
             if(storage_file_open(
@@ -396,7 +395,7 @@ static int32_t bad_usb_worker(void* context) {
                    FSAM_READ,
                    FSOM_OPEN_EXISTING)) {
                 if((ducky_script_preload(bad_usb, script_file)) && (bad_usb->st.line_nb > 0)) {
-                    if(furi_hal_hid_is_connected()) {
+                    if(bad_usb->hid->is_connected(bad_usb->hid_inst)) {
                         worker_state = BadUsbStateIdle; // Ready to run
                     } else {
                         worker_state = BadUsbStateNotConnected; // USB not connected
@@ -412,7 +411,8 @@ static int32_t bad_usb_worker(void* context) {
 
         } else if(worker_state == BadUsbStateNotConnected) { // State: USB not connected
             uint32_t flags = bad_usb_flags_get(
-                WorkerEvtEnd | WorkerEvtConnect | WorkerEvtStartStop, FuriWaitForever);
+                WorkerEvtEnd | WorkerEvtConnect | WorkerEvtDisconnect | WorkerEvtStartStop,
+                FuriWaitForever);
 
             if(flags & WorkerEvtEnd) {
                 break;
@@ -436,6 +436,7 @@ static int32_t bad_usb_worker(void* context) {
                 bad_usb->st.line_cur = 0;
                 bad_usb->defdelay = 0;
                 bad_usb->stringdelay = 0;
+                bad_usb->defstringdelay = 0;
                 bad_usb->repeat_cnt = 0;
                 bad_usb->key_hold_nb = 0;
                 bad_usb->file_end = false;
@@ -459,6 +460,7 @@ static int32_t bad_usb_worker(void* context) {
                 bad_usb->st.line_cur = 0;
                 bad_usb->defdelay = 0;
                 bad_usb->stringdelay = 0;
+                bad_usb->defstringdelay = 0;
                 bad_usb->repeat_cnt = 0;
                 bad_usb->file_end = false;
                 storage_file_seek(script_file, 0, true);
@@ -492,10 +494,10 @@ static int32_t bad_usb_worker(void* context) {
                     break;
                 } else if(flags & WorkerEvtStartStop) {
                     worker_state = BadUsbStateIdle; // Stop executing script
-                    furi_hal_hid_kb_release_all();
+                    bad_usb->hid->release_all(bad_usb->hid_inst);
                 } else if(flags & WorkerEvtDisconnect) {
                     worker_state = BadUsbStateNotConnected; // USB disconnected
-                    furi_hal_hid_kb_release_all();
+                    bad_usb->hid->release_all(bad_usb->hid_inst);
                 } else if(flags & WorkerEvtPauseResume) {
                     pause_state = BadUsbStateRunning;
                     worker_state = BadUsbStatePaused; // Pause
@@ -515,12 +517,12 @@ static int32_t bad_usb_worker(void* context) {
                     delay_val = 0;
                     worker_state = BadUsbStateScriptError;
                     bad_usb->st.state = worker_state;
-                    furi_hal_hid_kb_release_all();
+                    bad_usb->hid->release_all(bad_usb->hid_inst);
                 } else if(delay_val == SCRIPT_STATE_END) { // End of script
                     delay_val = 0;
                     worker_state = BadUsbStateIdle;
                     bad_usb->st.state = BadUsbStateDone;
-                    furi_hal_hid_kb_release_all();
+                    bad_usb->hid->release_all(bad_usb->hid_inst);
                     continue;
                 } else if(delay_val == SCRIPT_STATE_STRING_START) { // Start printing string with delays
                     delay_val = bad_usb->defdelay;
@@ -548,7 +550,7 @@ static int32_t bad_usb_worker(void* context) {
                     worker_state = BadUsbStateRunning;
                 } else if(flags & WorkerEvtDisconnect) {
                     worker_state = BadUsbStateNotConnected; // USB disconnected
-                    furi_hal_hid_kb_release_all();
+                    bad_usb->hid->release_all(bad_usb->hid_inst);
                 }
                 bad_usb->st.state = worker_state;
                 continue;
@@ -563,11 +565,11 @@ static int32_t bad_usb_worker(void* context) {
                 } else if(flags & WorkerEvtStartStop) {
                     worker_state = BadUsbStateIdle; // Stop executing script
                     bad_usb->st.state = worker_state;
-                    furi_hal_hid_kb_release_all();
+                    bad_usb->hid->release_all(bad_usb->hid_inst);
                 } else if(flags & WorkerEvtDisconnect) {
                     worker_state = BadUsbStateNotConnected; // USB disconnected
                     bad_usb->st.state = worker_state;
-                    furi_hal_hid_kb_release_all();
+                    bad_usb->hid->release_all(bad_usb->hid_inst);
                 } else if(flags & WorkerEvtPauseResume) {
                     if(pause_state == BadUsbStateRunning) {
                         if(delay_val > 0) {
@@ -586,19 +588,21 @@ static int32_t bad_usb_worker(void* context) {
                 continue;
             }
         } else if(worker_state == BadUsbStateStringDelay) { // State: print string with delays
+            uint32_t delay = (bad_usb->stringdelay == 0) ? bad_usb->defstringdelay :
+                                                           bad_usb->stringdelay;
             uint32_t flags = bad_usb_flags_get(
                 WorkerEvtEnd | WorkerEvtStartStop | WorkerEvtPauseResume | WorkerEvtDisconnect,
-                bad_usb->stringdelay);
+                delay);
 
             if(!(flags & FuriFlagError)) {
                 if(flags & WorkerEvtEnd) {
                     break;
                 } else if(flags & WorkerEvtStartStop) {
                     worker_state = BadUsbStateIdle; // Stop executing script
-                    furi_hal_hid_kb_release_all();
+                    bad_usb->hid->release_all(bad_usb->hid_inst);
                 } else if(flags & WorkerEvtDisconnect) {
                     worker_state = BadUsbStateNotConnected; // USB disconnected
-                    furi_hal_hid_kb_release_all();
+                    bad_usb->hid->release_all(bad_usb->hid_inst);
                 } else if(flags & WorkerEvtPauseResume) {
                     pause_state = BadUsbStateStringDelay;
                     worker_state = BadUsbStatePaused; // Pause
@@ -628,7 +632,8 @@ static int32_t bad_usb_worker(void* context) {
         }
     }
 
-    furi_hal_hid_set_state_callback(NULL, NULL);
+    bad_usb->hid->set_state_callback(bad_usb->hid_inst, NULL, NULL);
+    bad_usb->hid->deinit(bad_usb->hid_inst);
 
     storage_file_close(script_file);
     storage_file_free(script_file);
@@ -647,7 +652,7 @@ static void bad_usb_script_set_default_keyboard_layout(BadUsbScript* bad_usb) {
     memcpy(bad_usb->layout, hid_asciimap, MIN(sizeof(hid_asciimap), sizeof(bad_usb->layout)));
 }
 
-BadUsbScript* bad_usb_script_open(FuriString* file_path) {
+BadUsbScript* bad_usb_script_open(FuriString* file_path, BadUsbHidInterface interface) {
     furi_assert(file_path);
 
     BadUsbScript* bad_usb = malloc(sizeof(BadUsbScript));
@@ -657,6 +662,7 @@ BadUsbScript* bad_usb_script_open(FuriString* file_path) {
 
     bad_usb->st.state = BadUsbStateInit;
     bad_usb->st.error[0] = '\0';
+    bad_usb->hid = bad_usb_hid_get_interface(interface);
 
     bad_usb->thread = furi_thread_alloc_ex("BadUsbWorker", 2048, bad_usb_worker, bad_usb);
     furi_thread_start(bad_usb->thread);
diff --git a/applications/main/bad_usb/helpers/ducky_script.h b/applications/main/bad_usb/helpers/ducky_script.h
index dca61ed4e..9519623f6 100644
--- a/applications/main/bad_usb/helpers/ducky_script.h
+++ b/applications/main/bad_usb/helpers/ducky_script.h
@@ -6,6 +6,7 @@ extern "C" {
 
 #include <furi.h>
 #include <furi_hal.h>
+#include "bad_usb_hid.h"
 
 typedef enum {
     BadUsbStateInit,
@@ -33,7 +34,7 @@ typedef struct {
 
 typedef struct BadUsbScript BadUsbScript;
 
-BadUsbScript* bad_usb_script_open(FuriString* file_path);
+BadUsbScript* bad_usb_script_open(FuriString* file_path, BadUsbHidInterface interface);
 
 void bad_usb_script_close(BadUsbScript* bad_usb);
 
diff --git a/applications/main/bad_usb/helpers/ducky_script_commands.c b/applications/main/bad_usb/helpers/ducky_script_commands.c
index a5bc7c8cf..7f9a48fb2 100644
--- a/applications/main/bad_usb/helpers/ducky_script_commands.c
+++ b/applications/main/bad_usb/helpers/ducky_script_commands.c
@@ -1,5 +1,4 @@
 #include <furi_hal.h>
-#include <furi_hal_usb_hid.h>
 #include "ducky_script.h"
 #include "ducky_script_i.h"
 
@@ -46,6 +45,17 @@ static int32_t ducky_fnc_strdelay(BadUsbScript* bad_usb, const char* line, int32
     return 0;
 }
 
+static int32_t ducky_fnc_defstrdelay(BadUsbScript* bad_usb, const char* line, int32_t param) {
+    UNUSED(param);
+
+    line = &line[ducky_get_command_len(line) + 1];
+    bool state = ducky_get_number(line, &bad_usb->defstringdelay);
+    if(!state) {
+        return ducky_error(bad_usb, "Invalid number %s", line);
+    }
+    return 0;
+}
+
 static int32_t ducky_fnc_string(BadUsbScript* bad_usb, const char* line, int32_t param) {
     line = &line[ducky_get_command_len(line) + 1];
     furi_string_set_str(bad_usb->string_print, line);
@@ -53,7 +63,8 @@ static int32_t ducky_fnc_string(BadUsbScript* bad_usb, const char* line, int32_t
         furi_string_cat(bad_usb->string_print, "\n");
     }
 
-    if(bad_usb->stringdelay == 0) { // stringdelay not set - run command immediately
+    if(bad_usb->stringdelay == 0 &&
+       bad_usb->defstringdelay == 0) { // stringdelay not set - run command immediately
         bool state = ducky_string(bad_usb, furi_string_get_cstr(bad_usb->string_print));
         if(!state) {
             return ducky_error(bad_usb, "Invalid string %s", line);
@@ -81,9 +92,9 @@ static int32_t ducky_fnc_sysrq(BadUsbScript* bad_usb, const char* line, int32_t
 
     line = &line[ducky_get_command_len(line) + 1];
     uint16_t key = ducky_get_keycode(bad_usb, line, true);
-    furi_hal_hid_kb_press(KEY_MOD_LEFT_ALT | HID_KEYBOARD_PRINT_SCREEN);
-    furi_hal_hid_kb_press(key);
-    furi_hal_hid_kb_release_all();
+    bad_usb->hid->kb_press(bad_usb->hid_inst, KEY_MOD_LEFT_ALT | HID_KEYBOARD_PRINT_SCREEN);
+    bad_usb->hid->kb_press(bad_usb->hid_inst, key);
+    bad_usb->hid->release_all(bad_usb->hid_inst);
     return 0;
 }
 
@@ -91,8 +102,8 @@ static int32_t ducky_fnc_altchar(BadUsbScript* bad_usb, const char* line, int32_
     UNUSED(param);
 
     line = &line[ducky_get_command_len(line) + 1];
-    ducky_numlock_on();
-    bool state = ducky_altchar(line);
+    ducky_numlock_on(bad_usb);
+    bool state = ducky_altchar(bad_usb, line);
     if(!state) {
         return ducky_error(bad_usb, "Invalid altchar %s", line);
     }
@@ -103,8 +114,8 @@ static int32_t ducky_fnc_altstring(BadUsbScript* bad_usb, const char* line, int3
     UNUSED(param);
 
     line = &line[ducky_get_command_len(line) + 1];
-    ducky_numlock_on();
-    bool state = ducky_altstring(line);
+    ducky_numlock_on(bad_usb);
+    bool state = ducky_altstring(bad_usb, line);
     if(!state) {
         return ducky_error(bad_usb, "Invalid altstring %s", line);
     }
@@ -123,7 +134,7 @@ static int32_t ducky_fnc_hold(BadUsbScript* bad_usb, const char* line, int32_t p
     if(bad_usb->key_hold_nb > (HID_KB_MAX_KEYS - 1)) {
         return ducky_error(bad_usb, "Too many keys are hold");
     }
-    furi_hal_hid_kb_press(key);
+    bad_usb->hid->kb_press(bad_usb->hid_inst, key);
     return 0;
 }
 
@@ -139,7 +150,36 @@ static int32_t ducky_fnc_release(BadUsbScript* bad_usb, const char* line, int32_
         return ducky_error(bad_usb, "No keys are hold");
     }
     bad_usb->key_hold_nb--;
-    furi_hal_hid_kb_release(key);
+    bad_usb->hid->kb_release(bad_usb->hid_inst, key);
+    return 0;
+}
+
+static int32_t ducky_fnc_media(BadUsbScript* bad_usb, const char* line, int32_t param) {
+    UNUSED(param);
+
+    line = &line[ducky_get_command_len(line) + 1];
+    uint16_t key = ducky_get_media_keycode_by_name(line);
+    if(key == HID_CONSUMER_UNASSIGNED) {
+        return ducky_error(bad_usb, "No keycode defined for %s", line);
+    }
+    bad_usb->hid->consumer_press(bad_usb->hid_inst, key);
+    bad_usb->hid->consumer_release(bad_usb->hid_inst, key);
+    return 0;
+}
+
+static int32_t ducky_fnc_globe(BadUsbScript* bad_usb, const char* line, int32_t param) {
+    UNUSED(param);
+
+    line = &line[ducky_get_command_len(line) + 1];
+    uint16_t key = ducky_get_keycode(bad_usb, line, true);
+    if(key == HID_KEYBOARD_NONE) {
+        return ducky_error(bad_usb, "No keycode defined for %s", line);
+    }
+
+    bad_usb->hid->consumer_press(bad_usb->hid_inst, HID_CONSUMER_FN_GLOBE);
+    bad_usb->hid->kb_press(bad_usb->hid_inst, key);
+    bad_usb->hid->kb_release(bad_usb->hid_inst, key);
+    bad_usb->hid->consumer_release(bad_usb->hid_inst, HID_CONSUMER_FN_GLOBE);
     return 0;
 }
 
@@ -161,6 +201,8 @@ static const DuckyCmd ducky_commands[] = {
     {"DEFAULTDELAY", ducky_fnc_defdelay, -1},
     {"STRINGDELAY", ducky_fnc_strdelay, -1},
     {"STRING_DELAY", ducky_fnc_strdelay, -1},
+    {"DEFAULT_STRING_DELAY", ducky_fnc_defstrdelay, -1},
+    {"DEFAULTSTRINGDELAY", ducky_fnc_defstrdelay, -1},
     {"REPEAT", ducky_fnc_repeat, -1},
     {"SYSRQ", ducky_fnc_sysrq, -1},
     {"ALTCHAR", ducky_fnc_altchar, -1},
@@ -169,6 +211,8 @@ static const DuckyCmd ducky_commands[] = {
     {"HOLD", ducky_fnc_hold, -1},
     {"RELEASE", ducky_fnc_release, -1},
     {"WAIT_FOR_BUTTON_PRESS", ducky_fnc_waitforbutton, -1},
+    {"MEDIA", ducky_fnc_media, -1},
+    {"GLOBE", ducky_fnc_globe, -1},
 };
 
 #define TAG "BadUsb"
diff --git a/applications/main/bad_usb/helpers/ducky_script_i.h b/applications/main/bad_usb/helpers/ducky_script_i.h
index 84c7ef9de..bbafdccb6 100644
--- a/applications/main/bad_usb/helpers/ducky_script_i.h
+++ b/applications/main/bad_usb/helpers/ducky_script_i.h
@@ -7,6 +7,7 @@ extern "C" {
 #include <furi.h>
 #include <furi_hal.h>
 #include "ducky_script.h"
+#include "bad_usb_hid.h"
 
 #define SCRIPT_STATE_ERROR (-1)
 #define SCRIPT_STATE_END (-2)
@@ -19,6 +20,8 @@ extern "C" {
 
 struct BadUsbScript {
     FuriHalUsbHidConfig hid_cfg;
+    const BadUsbHidApi* hid;
+    void* hid_inst;
     FuriThread* thread;
     BadUsbState st;
 
@@ -30,6 +33,7 @@ struct BadUsbScript {
 
     uint32_t defdelay;
     uint32_t stringdelay;
+    uint32_t defstringdelay;
     uint16_t layout[128];
 
     FuriString* line;
@@ -49,15 +53,17 @@ bool ducky_is_line_end(const char chr);
 
 uint16_t ducky_get_keycode_by_name(const char* param);
 
+uint16_t ducky_get_media_keycode_by_name(const char* param);
+
 bool ducky_get_number(const char* param, uint32_t* val);
 
-void ducky_numlock_on(void);
+void ducky_numlock_on(BadUsbScript* bad_usb);
 
-bool ducky_numpad_press(const char num);
+bool ducky_numpad_press(BadUsbScript* bad_usb, const char num);
 
-bool ducky_altchar(const char* charcode);
+bool ducky_altchar(BadUsbScript* bad_usb, const char* charcode);
 
-bool ducky_altstring(const char* param);
+bool ducky_altstring(BadUsbScript* bad_usb, const char* param);
 
 bool ducky_string(BadUsbScript* bad_usb, const char* param);
 
diff --git a/applications/main/bad_usb/helpers/ducky_script_keycodes.c b/applications/main/bad_usb/helpers/ducky_script_keycodes.c
index da2fc22f7..290618c13 100644
--- a/applications/main/bad_usb/helpers/ducky_script_keycodes.c
+++ b/applications/main/bad_usb/helpers/ducky_script_keycodes.c
@@ -1,5 +1,4 @@
 #include <furi_hal.h>
-#include <furi_hal_usb_hid.h>
 #include "ducky_script_i.h"
 
 typedef struct {
@@ -64,6 +63,49 @@ static const DuckyKey ducky_keys[] = {
     {"F10", HID_KEYBOARD_F10},
     {"F11", HID_KEYBOARD_F11},
     {"F12", HID_KEYBOARD_F12},
+    {"F13", HID_KEYBOARD_F13},
+    {"F14", HID_KEYBOARD_F14},
+    {"F15", HID_KEYBOARD_F15},
+    {"F16", HID_KEYBOARD_F16},
+    {"F17", HID_KEYBOARD_F17},
+    {"F18", HID_KEYBOARD_F18},
+    {"F19", HID_KEYBOARD_F19},
+    {"F20", HID_KEYBOARD_F20},
+    {"F21", HID_KEYBOARD_F21},
+    {"F22", HID_KEYBOARD_F22},
+    {"F23", HID_KEYBOARD_F23},
+    {"F24", HID_KEYBOARD_F24},
+};
+
+static const DuckyKey ducky_media_keys[] = {
+    {"POWER", HID_CONSUMER_POWER},
+    {"REBOOT", HID_CONSUMER_RESET},
+    {"SLEEP", HID_CONSUMER_SLEEP},
+    {"LOGOFF", HID_CONSUMER_AL_LOGOFF},
+
+    {"EXIT", HID_CONSUMER_AC_EXIT},
+    {"HOME", HID_CONSUMER_AC_HOME},
+    {"BACK", HID_CONSUMER_AC_BACK},
+    {"FORWARD", HID_CONSUMER_AC_FORWARD},
+    {"REFRESH", HID_CONSUMER_AC_REFRESH},
+
+    {"SNAPSHOT", HID_CONSUMER_SNAPSHOT},
+
+    {"PLAY", HID_CONSUMER_PLAY},
+    {"PAUSE", HID_CONSUMER_PAUSE},
+    {"PLAY_PAUSE", HID_CONSUMER_PLAY_PAUSE},
+    {"NEXT_TRACK", HID_CONSUMER_SCAN_NEXT_TRACK},
+    {"PREV_TRACK", HID_CONSUMER_SCAN_PREVIOUS_TRACK},
+    {"STOP", HID_CONSUMER_STOP},
+    {"EJECT", HID_CONSUMER_EJECT},
+
+    {"MUTE", HID_CONSUMER_MUTE},
+    {"VOLUME_UP", HID_CONSUMER_VOLUME_INCREMENT},
+    {"VOLUME_DOWN", HID_CONSUMER_VOLUME_DECREMENT},
+
+    {"FN", HID_CONSUMER_FN_GLOBE},
+    {"BRIGHT_UP", HID_CONSUMER_BRIGHTNESS_INCREMENT},
+    {"BRIGHT_DOWN", HID_CONSUMER_BRIGHTNESS_DECREMENT},
 };
 
 uint16_t ducky_get_keycode_by_name(const char* param) {
@@ -77,3 +119,15 @@ uint16_t ducky_get_keycode_by_name(const char* param) {
 
     return HID_KEYBOARD_NONE;
 }
+
+uint16_t ducky_get_media_keycode_by_name(const char* param) {
+    for(size_t i = 0; i < COUNT_OF(ducky_media_keys); i++) {
+        size_t key_cmd_len = strlen(ducky_media_keys[i].name);
+        if((strncmp(param, ducky_media_keys[i].name, key_cmd_len) == 0) &&
+           (ducky_is_line_end(param[key_cmd_len]))) {
+            return ducky_media_keys[i].keycode;
+        }
+    }
+
+    return HID_CONSUMER_UNASSIGNED;
+}
diff --git a/applications/main/bad_usb/resources/badusb/demo_chromeos.txt b/applications/main/bad_usb/resources/badusb/demo_chromeos.txt
new file mode 100644
index 000000000..c5f675fb3
--- /dev/null
+++ b/applications/main/bad_usb/resources/badusb/demo_chromeos.txt
@@ -0,0 +1,80 @@
+REM This is BadUSB demo script for ChromeOS by kowalski7cc
+
+REM Open a new tab
+CTRL t
+REM wait for some slower chromebooks
+DELAY 1000
+REM Open an empty editable page
+DEFAULT_DELAY 50
+STRING data:text/html, <html contenteditable autofocus><style>body{font-family:monospace;}
+ENTER
+DELAY 500
+
+STRING Hello World!
+ENTER
+
+REM Copy-Paste previous string
+UP
+HOME
+SHIFT DOWN
+CTRL c
+RIGHT
+CTRL v
+CTRL v
+
+
+STRING =
+REPEAT 59
+ENTER
+ENTER
+
+STRING               _.-------.._                    -,
+ENTER
+HOME
+STRING           .-"```"--..,,_/ /`-,               -,  \ 
+ENTER
+HOME
+STRING        .:"          /:/  /'\  \     ,_...,  `. |  |
+ENTER
+HOME
+STRING       /       ,----/:/  /`\ _\~`_-"`     _;
+ENTER
+HOME
+STRING      '      / /`"""'\ \ \.~`_-'      ,-"'/ 
+ENTER
+HOME
+STRING     |      | |  0    | | .-'      ,/`  /
+ENTER
+HOME
+STRING    |    ,..\ \     ,.-"`       ,/`    /
+ENTER
+HOME
+STRING   ;    :    `/`""\`           ,/--==,/-----,
+ENTER
+HOME
+STRING   |    `-...|        -.___-Z:_______J...---;
+ENTER
+HOME
+STRING   :         `                           _-'
+ENTER
+HOME
+STRING  _L_  _     ___  ___  ___  ___  ____--"`
+ENTER
+HOME
+STRING | __|| |   |_ _|| _ \| _ \| __|| _ \ 
+ENTER
+HOME
+STRING | _| | |__  | | |  _/|  _/| _| |   / 
+ENTER
+HOME
+STRING |_|  |____||___||_|  |_|  |___||_|_\ 
+ENTER
+HOME
+ENTER
+
+STRING Flipper Zero BadUSB feature is compatible with USB Rubber Ducky script format
+ENTER
+STRING More information about script syntax can be found here:
+ENTER
+STRING https://github.com/flipperdevices/flipperzero-firmware/blob/dev/documentation/file_formats/BadUsbScriptFormat.md
+ENTER
diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_config.c b/applications/main/bad_usb/scenes/bad_usb_scene_config.c
index 5477c5e80..d5f6fce23 100644
--- a/applications/main/bad_usb/scenes/bad_usb_scene_config.c
+++ b/applications/main/bad_usb/scenes/bad_usb_scene_config.c
@@ -1,29 +1,62 @@
 #include "../bad_usb_app_i.h"
 #include "furi_hal_power.h"
-#include "furi_hal_usb.h"
 
 enum SubmenuIndex {
-    SubmenuIndexKeyboardLayout,
+    ConfigIndexKeyboardLayout,
+    ConfigIndexInterface,
+    ConfigIndexBleUnpair,
 };
 
-void bad_usb_scene_config_submenu_callback(void* context, uint32_t index) {
+const char* const interface_mode_text[2] = {
+    "USB",
+    "BLE",
+};
+
+void bad_usb_scene_config_select_callback(void* context, uint32_t index) {
     BadUsbApp* bad_usb = context;
-    view_dispatcher_send_custom_event(bad_usb->view_dispatcher, index);
+    if(index != ConfigIndexInterface) {
+        view_dispatcher_send_custom_event(bad_usb->view_dispatcher, index);
+    }
+}
+
+void bad_usb_scene_config_interface_callback(VariableItem* item) {
+    BadUsbApp* bad_usb = variable_item_get_context(item);
+    furi_assert(bad_usb);
+    uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, interface_mode_text[index]);
+    bad_usb->interface = index;
+
+    view_dispatcher_send_custom_event(bad_usb->view_dispatcher, ConfigIndexInterface);
+}
+
+static void draw_menu(BadUsbApp* bad_usb) {
+    VariableItemList* var_item_list = bad_usb->var_item_list;
+
+    variable_item_list_reset(var_item_list);
+
+    variable_item_list_add(var_item_list, "Keyboard Layout (global)", 0, NULL, NULL);
+
+    VariableItem* item = variable_item_list_add(
+        var_item_list, "Interface", 2, bad_usb_scene_config_interface_callback, bad_usb);
+    if(bad_usb->interface == BadUsbHidInterfaceUsb) {
+        variable_item_set_current_value_index(item, 0);
+        variable_item_set_current_value_text(item, interface_mode_text[0]);
+    } else {
+        variable_item_set_current_value_index(item, 1);
+        variable_item_set_current_value_text(item, interface_mode_text[1]);
+        variable_item_list_add(var_item_list, "Remove Pairing", 0, NULL, NULL);
+    }
 }
 
 void bad_usb_scene_config_on_enter(void* context) {
     BadUsbApp* bad_usb = context;
-    Submenu* submenu = bad_usb->submenu;
+    VariableItemList* var_item_list = bad_usb->var_item_list;
 
-    submenu_add_item(
-        submenu,
-        "Keyboard Layout (global)",
-        SubmenuIndexKeyboardLayout,
-        bad_usb_scene_config_submenu_callback,
-        bad_usb);
-
-    submenu_set_selected_item(
-        submenu, scene_manager_get_scene_state(bad_usb->scene_manager, BadUsbSceneConfig));
+    variable_item_list_set_enter_callback(
+        var_item_list, bad_usb_scene_config_select_callback, bad_usb);
+    draw_menu(bad_usb);
+    variable_item_list_set_selected_item(var_item_list, 0);
 
     view_dispatcher_switch_to_view(bad_usb->view_dispatcher, BadUsbAppViewConfig);
 }
@@ -33,10 +66,13 @@ bool bad_usb_scene_config_on_event(void* context, SceneManagerEvent event) {
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
-        scene_manager_set_scene_state(bad_usb->scene_manager, BadUsbSceneConfig, event.event);
         consumed = true;
-        if(event.event == SubmenuIndexKeyboardLayout) {
+        if(event.event == ConfigIndexKeyboardLayout) {
             scene_manager_next_scene(bad_usb->scene_manager, BadUsbSceneConfigLayout);
+        } else if(event.event == ConfigIndexInterface) {
+            draw_menu(bad_usb);
+        } else if(event.event == ConfigIndexBleUnpair) {
+            bad_usb_hid_ble_remove_pairing();
         } else {
             furi_crash("Unknown key type");
         }
@@ -47,7 +83,7 @@ bool bad_usb_scene_config_on_event(void* context, SceneManagerEvent event) {
 
 void bad_usb_scene_config_on_exit(void* context) {
     BadUsbApp* bad_usb = context;
-    Submenu* submenu = bad_usb->submenu;
+    VariableItemList* var_item_list = bad_usb->var_item_list;
 
-    submenu_reset(submenu);
+    variable_item_list_reset(var_item_list);
 }
diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_config_layout.c b/applications/main/bad_usb/scenes/bad_usb_scene_config_layout.c
index 5d70b801b..a5d0df94c 100644
--- a/applications/main/bad_usb/scenes/bad_usb_scene_config_layout.c
+++ b/applications/main/bad_usb/scenes/bad_usb_scene_config_layout.c
@@ -1,6 +1,5 @@
 #include "../bad_usb_app_i.h"
 #include "furi_hal_power.h"
-#include "furi_hal_usb.h"
 #include <storage/storage.h>
 
 static bool bad_usb_layout_select(BadUsbApp* bad_usb) {
@@ -32,7 +31,6 @@ void bad_usb_scene_config_layout_on_enter(void* context) {
     BadUsbApp* bad_usb = context;
 
     if(bad_usb_layout_select(bad_usb)) {
-        bad_usb_script_set_keyboard_layout(bad_usb->bad_usb_script, bad_usb->keyboard_layout);
         scene_manager_search_and_switch_to_previous_scene(bad_usb->scene_manager, BadUsbSceneWork);
     } else {
         scene_manager_previous_scene(bad_usb->scene_manager);
diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_error.c b/applications/main/bad_usb/scenes/bad_usb_scene_error.c
index abd7b38b9..9d3a44f12 100644
--- a/applications/main/bad_usb/scenes/bad_usb_scene_error.c
+++ b/applications/main/bad_usb/scenes/bad_usb_scene_error.c
@@ -32,7 +32,7 @@ void bad_usb_scene_error_on_enter(void* context) {
     } else if(app->error == BadUsbAppErrorCloseRpc) {
         widget_add_icon_element(app->widget, 78, 0, &I_ActiveConnection_50x64);
         widget_add_string_multiline_element(
-            app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nis active!");
+            app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nIs Active!");
         widget_add_string_multiline_element(
             app->widget,
             3,
diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c b/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c
index d6f05a1ed..5e2c3f14b 100644
--- a/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c
+++ b/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c
@@ -1,6 +1,5 @@
 #include "../bad_usb_app_i.h"
 #include <furi_hal_power.h>
-#include <furi_hal_usb.h>
 #include <storage/storage.h>
 
 static bool bad_usb_file_select(BadUsbApp* bad_usb) {
@@ -28,9 +27,6 @@ void bad_usb_scene_file_select_on_enter(void* context) {
     }
 
     if(bad_usb_file_select(bad_usb)) {
-        bad_usb->bad_usb_script = bad_usb_script_open(bad_usb->file_path);
-        bad_usb_script_set_keyboard_layout(bad_usb->bad_usb_script, bad_usb->keyboard_layout);
-
         scene_manager_next_scene(bad_usb->scene_manager, BadUsbSceneWork);
     } else {
         view_dispatcher_stop(bad_usb->view_dispatcher);
diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_work.c b/applications/main/bad_usb/scenes/bad_usb_scene_work.c
index ad33a124d..0a383f029 100644
--- a/applications/main/bad_usb/scenes/bad_usb_scene_work.c
+++ b/applications/main/bad_usb/scenes/bad_usb_scene_work.c
@@ -16,7 +16,10 @@ bool bad_usb_scene_work_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == InputKeyLeft) {
-            if(bad_usb_is_idle_state(app->bad_usb_view)) {
+            if(bad_usb_view_is_idle_state(app->bad_usb_view)) {
+                bad_usb_script_close(app->bad_usb_script);
+                app->bad_usb_script = NULL;
+
                 scene_manager_next_scene(app->scene_manager, BadUsbSceneConfig);
             }
             consumed = true;
@@ -28,7 +31,7 @@ bool bad_usb_scene_work_on_event(void* context, SceneManagerEvent event) {
             consumed = true;
         }
     } else if(event.type == SceneManagerEventTypeTick) {
-        bad_usb_set_state(app->bad_usb_view, bad_usb_script_get_state(app->bad_usb_script));
+        bad_usb_view_set_state(app->bad_usb_view, bad_usb_script_get_state(app->bad_usb_script));
     }
     return consumed;
 }
@@ -36,21 +39,24 @@ bool bad_usb_scene_work_on_event(void* context, SceneManagerEvent event) {
 void bad_usb_scene_work_on_enter(void* context) {
     BadUsbApp* app = context;
 
+    app->bad_usb_script = bad_usb_script_open(app->file_path, app->interface);
+    bad_usb_script_set_keyboard_layout(app->bad_usb_script, app->keyboard_layout);
+
     FuriString* file_name;
     file_name = furi_string_alloc();
     path_extract_filename(app->file_path, file_name, true);
-    bad_usb_set_file_name(app->bad_usb_view, furi_string_get_cstr(file_name));
+    bad_usb_view_set_file_name(app->bad_usb_view, furi_string_get_cstr(file_name));
     furi_string_free(file_name);
 
     FuriString* layout;
     layout = furi_string_alloc();
     path_extract_filename(app->keyboard_layout, layout, true);
-    bad_usb_set_layout(app->bad_usb_view, furi_string_get_cstr(layout));
+    bad_usb_view_set_layout(app->bad_usb_view, furi_string_get_cstr(layout));
     furi_string_free(layout);
 
-    bad_usb_set_state(app->bad_usb_view, bad_usb_script_get_state(app->bad_usb_script));
+    bad_usb_view_set_state(app->bad_usb_view, bad_usb_script_get_state(app->bad_usb_script));
 
-    bad_usb_set_button_callback(app->bad_usb_view, bad_usb_scene_work_button_callback, app);
+    bad_usb_view_set_button_callback(app->bad_usb_view, bad_usb_scene_work_button_callback, app);
     view_dispatcher_switch_to_view(app->view_dispatcher, BadUsbAppViewWork);
 }
 
diff --git a/applications/main/bad_usb/views/bad_usb_view.c b/applications/main/bad_usb/views/bad_usb_view.c
index 588b260c4..728f84348 100644
--- a/applications/main/bad_usb/views/bad_usb_view.c
+++ b/applications/main/bad_usb/views/bad_usb_view.c
@@ -66,7 +66,7 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) {
         canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
         canvas_set_font(canvas, FontPrimary);
         canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Connect");
-        canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "to USB");
+        canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "to device");
     } else if(state == BadUsbStateWillRun) {
         canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
         canvas_set_font(canvas, FontPrimary);
@@ -193,7 +193,7 @@ static bool bad_usb_input_callback(InputEvent* event, void* context) {
     return consumed;
 }
 
-BadUsb* bad_usb_alloc() {
+BadUsb* bad_usb_view_alloc(void) {
     BadUsb* bad_usb = malloc(sizeof(BadUsb));
 
     bad_usb->view = view_alloc();
@@ -205,18 +205,21 @@ BadUsb* bad_usb_alloc() {
     return bad_usb;
 }
 
-void bad_usb_free(BadUsb* bad_usb) {
+void bad_usb_view_free(BadUsb* bad_usb) {
     furi_assert(bad_usb);
     view_free(bad_usb->view);
     free(bad_usb);
 }
 
-View* bad_usb_get_view(BadUsb* bad_usb) {
+View* bad_usb_view_get_view(BadUsb* bad_usb) {
     furi_assert(bad_usb);
     return bad_usb->view;
 }
 
-void bad_usb_set_button_callback(BadUsb* bad_usb, BadUsbButtonCallback callback, void* context) {
+void bad_usb_view_set_button_callback(
+    BadUsb* bad_usb,
+    BadUsbButtonCallback callback,
+    void* context) {
     furi_assert(bad_usb);
     furi_assert(callback);
     with_view_model(
@@ -230,7 +233,7 @@ void bad_usb_set_button_callback(BadUsb* bad_usb, BadUsbButtonCallback callback,
         true);
 }
 
-void bad_usb_set_file_name(BadUsb* bad_usb, const char* name) {
+void bad_usb_view_set_file_name(BadUsb* bad_usb, const char* name) {
     furi_assert(name);
     with_view_model(
         bad_usb->view,
@@ -239,7 +242,7 @@ void bad_usb_set_file_name(BadUsb* bad_usb, const char* name) {
         true);
 }
 
-void bad_usb_set_layout(BadUsb* bad_usb, const char* layout) {
+void bad_usb_view_set_layout(BadUsb* bad_usb, const char* layout) {
     furi_assert(layout);
     with_view_model(
         bad_usb->view,
@@ -248,7 +251,7 @@ void bad_usb_set_layout(BadUsb* bad_usb, const char* layout) {
         true);
 }
 
-void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st) {
+void bad_usb_view_set_state(BadUsb* bad_usb, BadUsbState* st) {
     furi_assert(st);
     with_view_model(
         bad_usb->view,
@@ -263,7 +266,7 @@ void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st) {
         true);
 }
 
-bool bad_usb_is_idle_state(BadUsb* bad_usb) {
+bool bad_usb_view_is_idle_state(BadUsb* bad_usb) {
     bool is_idle = false;
     with_view_model(
         bad_usb->view,
diff --git a/applications/main/bad_usb/views/bad_usb_view.h b/applications/main/bad_usb/views/bad_usb_view.h
index 6210835f0..45f13d650 100644
--- a/applications/main/bad_usb/views/bad_usb_view.h
+++ b/applications/main/bad_usb/views/bad_usb_view.h
@@ -6,18 +6,21 @@
 typedef struct BadUsb BadUsb;
 typedef void (*BadUsbButtonCallback)(InputKey key, void* context);
 
-BadUsb* bad_usb_alloc();
+BadUsb* bad_usb_view_alloc(void);
 
-void bad_usb_free(BadUsb* bad_usb);
+void bad_usb_view_free(BadUsb* bad_usb);
 
-View* bad_usb_get_view(BadUsb* bad_usb);
+View* bad_usb_view_get_view(BadUsb* bad_usb);
 
-void bad_usb_set_button_callback(BadUsb* bad_usb, BadUsbButtonCallback callback, void* context);
+void bad_usb_view_set_button_callback(
+    BadUsb* bad_usb,
+    BadUsbButtonCallback callback,
+    void* context);
 
-void bad_usb_set_file_name(BadUsb* bad_usb, const char* name);
+void bad_usb_view_set_file_name(BadUsb* bad_usb, const char* name);
 
-void bad_usb_set_layout(BadUsb* bad_usb, const char* layout);
+void bad_usb_view_set_layout(BadUsb* bad_usb, const char* layout);
 
-void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st);
+void bad_usb_view_set_state(BadUsb* bad_usb, BadUsbState* st);
 
-bool bad_usb_is_idle_state(BadUsb* bad_usb);
+bool bad_usb_view_is_idle_state(BadUsb* bad_usb);
diff --git a/applications/main/gpio/gpio_app.c b/applications/main/gpio/gpio_app.c
index 06d377d39..217423ecc 100644
--- a/applications/main/gpio/gpio_app.c
+++ b/applications/main/gpio/gpio_app.c
@@ -21,7 +21,7 @@ static void gpio_app_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(app->scene_manager);
 }
 
-GpioApp* gpio_app_alloc() {
+GpioApp* gpio_app_alloc(void) {
     GpioApp* app = malloc(sizeof(GpioApp));
 
     app->expansion = furi_record_open(RECORD_EXPANSION);
diff --git a/applications/main/gpio/gpio_items.c b/applications/main/gpio/gpio_items.c
index 746abe032..f4267695b 100644
--- a/applications/main/gpio/gpio_items.c
+++ b/applications/main/gpio/gpio_items.c
@@ -7,7 +7,7 @@ struct GPIOItems {
     size_t count;
 };
 
-GPIOItems* gpio_items_alloc() {
+GPIOItems* gpio_items_alloc(void) {
     GPIOItems* items = malloc(sizeof(GPIOItems));
 
     items->count = 0;
diff --git a/applications/main/gpio/gpio_items.h b/applications/main/gpio/gpio_items.h
index 68afbe693..717b29915 100644
--- a/applications/main/gpio/gpio_items.h
+++ b/applications/main/gpio/gpio_items.h
@@ -8,7 +8,7 @@ extern "C" {
 
 typedef struct GPIOItems GPIOItems;
 
-GPIOItems* gpio_items_alloc();
+GPIOItems* gpio_items_alloc(void);
 
 void gpio_items_free(GPIOItems* items);
 
diff --git a/applications/main/gpio/scenes/gpio_scene_usb_uart_close_rpc.c b/applications/main/gpio/scenes/gpio_scene_usb_uart_close_rpc.c
index 2cb53cab2..59ba101f6 100644
--- a/applications/main/gpio/scenes/gpio_scene_usb_uart_close_rpc.c
+++ b/applications/main/gpio/scenes/gpio_scene_usb_uart_close_rpc.c
@@ -6,7 +6,7 @@ void gpio_scene_usb_uart_close_rpc_on_enter(void* context) {
 
     widget_add_icon_element(app->widget, 78, 0, &I_ActiveConnection_50x64);
     widget_add_string_multiline_element(
-        app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nis active!");
+        app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nIs Active!");
     widget_add_string_multiline_element(
         app->widget,
         3,
diff --git a/applications/main/gpio/views/gpio_usb_uart.c b/applications/main/gpio/views/gpio_usb_uart.c
index 3234309a2..f3d047d67 100644
--- a/applications/main/gpio/views/gpio_usb_uart.c
+++ b/applications/main/gpio/views/gpio_usb_uart.c
@@ -101,7 +101,7 @@ static bool gpio_usb_uart_input_callback(InputEvent* event, void* context) {
     return consumed;
 }
 
-GpioUsbUart* gpio_usb_uart_alloc() {
+GpioUsbUart* gpio_usb_uart_alloc(void) {
     GpioUsbUart* usb_uart = malloc(sizeof(GpioUsbUart));
 
     usb_uart->view = view_alloc();
diff --git a/applications/main/gpio/views/gpio_usb_uart.h b/applications/main/gpio/views/gpio_usb_uart.h
index 854b51f8d..531121f2b 100644
--- a/applications/main/gpio/views/gpio_usb_uart.h
+++ b/applications/main/gpio/views/gpio_usb_uart.h
@@ -7,7 +7,7 @@
 typedef struct GpioUsbUart GpioUsbUart;
 typedef void (*GpioUsbUartCallback)(GpioCustomEvent event, void* context);
 
-GpioUsbUart* gpio_usb_uart_alloc();
+GpioUsbUart* gpio_usb_uart_alloc(void);
 
 void gpio_usb_uart_free(GpioUsbUart* usb_uart);
 
diff --git a/applications/main/ibutton/ibutton.c b/applications/main/ibutton/ibutton.c
index afd51f7c9..b6e8a20cf 100644
--- a/applications/main/ibutton/ibutton.c
+++ b/applications/main/ibutton/ibutton.c
@@ -77,7 +77,7 @@ void ibutton_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(ibutton->scene_manager);
 }
 
-iButton* ibutton_alloc() {
+iButton* ibutton_alloc(void) {
     iButton* ibutton = malloc(sizeof(iButton));
 
     ibutton->file_path = furi_string_alloc();
diff --git a/applications/main/ibutton/ibutton_cli.c b/applications/main/ibutton/ibutton_cli.c
index 54bc808b5..98ef30801 100644
--- a/applications/main/ibutton/ibutton_cli.c
+++ b/applications/main/ibutton/ibutton_cli.c
@@ -11,7 +11,7 @@
 static void ibutton_cli(Cli* cli, FuriString* args, void* context);
 
 // app cli function
-void ibutton_on_system_start() {
+void ibutton_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
     cli_add_command(cli, "ikey", CliCommandFlagDefault, ibutton_cli, cli);
@@ -21,7 +21,7 @@ void ibutton_on_system_start() {
 #endif
 }
 
-static void ibutton_cli_print_usage() {
+static void ibutton_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("ikey read\r\n");
     printf("ikey emulate <key_type> <key_data>\r\n");
diff --git a/applications/main/ibutton/scenes/ibutton_scene_save_name.c b/applications/main/ibutton/scenes/ibutton_scene_save_name.c
index e6236dc35..f48ae60d3 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_save_name.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_save_name.c
@@ -17,7 +17,7 @@ void ibutton_scene_save_name_on_enter(void* context) {
     const bool is_new_file = furi_string_empty(ibutton->file_path);
 
     if(is_new_file) {
-        name_generator_make_auto(
+        name_generator_make_auto_basic(
             ibutton->key_name, IBUTTON_KEY_NAME_SIZE, IBUTTON_APP_FILENAME_PREFIX);
     }
 
diff --git a/applications/main/infrared/infrared_app.c b/applications/main/infrared/infrared_app.c
index 6af3e7c92..346e5e640 100644
--- a/applications/main/infrared/infrared_app.c
+++ b/applications/main/infrared/infrared_app.c
@@ -1,12 +1,16 @@
 #include "infrared_app_i.h"
 
+#include <furi_hal_power.h>
+
 #include <string.h>
 #include <toolbox/path.h>
+#include <toolbox/saved_struct.h>
 #include <dolphin/dolphin.h>
 
 #define TAG "InfraredApp"
 
-#define INFRARED_TX_MIN_INTERVAL_MS 50U
+#define INFRARED_TX_MIN_INTERVAL_MS (50U)
+#define INFRARED_TASK_STACK_SIZE (2048UL)
 
 static const NotificationSequence*
     infrared_notification_sequences[InfraredNotificationMessageCount] = {
@@ -125,9 +129,11 @@ static void infrared_find_vacant_remote_name(FuriString* name, const char* path)
     furi_record_close(RECORD_STORAGE);
 }
 
-static InfraredApp* infrared_alloc() {
+static InfraredApp* infrared_alloc(void) {
     InfraredApp* infrared = malloc(sizeof(InfraredApp));
 
+    infrared->task_thread =
+        furi_thread_alloc_ex("InfraredTask", INFRARED_TASK_STACK_SIZE, NULL, infrared);
     infrared->file_path = furi_string_alloc();
     infrared->button_name = furi_string_alloc();
 
@@ -171,12 +177,6 @@ static InfraredApp* infrared_alloc() {
     view_dispatcher_add_view(
         view_dispatcher, InfraredViewDialogEx, dialog_ex_get_view(infrared->dialog_ex));
 
-    infrared->variable_item_list = variable_item_list_alloc();
-    view_dispatcher_add_view(
-        infrared->view_dispatcher,
-        InfraredViewVariableItemList,
-        variable_item_list_get_view(infrared->variable_item_list));
-
     infrared->button_menu = button_menu_alloc();
     view_dispatcher_add_view(
         view_dispatcher, InfraredViewButtonMenu, button_menu_get_view(infrared->button_menu));
@@ -184,6 +184,12 @@ static InfraredApp* infrared_alloc() {
     infrared->popup = popup_alloc();
     view_dispatcher_add_view(view_dispatcher, InfraredViewPopup, popup_get_view(infrared->popup));
 
+    infrared->var_item_list = variable_item_list_alloc();
+    view_dispatcher_add_view(
+        view_dispatcher,
+        InfraredViewVariableList,
+        variable_item_list_get_view(infrared->var_item_list));
+
     infrared->view_stack = view_stack_alloc();
     view_dispatcher_add_view(
         view_dispatcher, InfraredViewStack, view_stack_get_view(infrared->view_stack));
@@ -192,6 +198,10 @@ static InfraredApp* infrared_alloc() {
     view_dispatcher_add_view(
         view_dispatcher, InfraredViewMove, infrared_move_view_get_view(infrared->move_view));
 
+    infrared->loading = loading_alloc();
+    view_dispatcher_add_view(
+        view_dispatcher, InfraredViewLoading, loading_get_view(infrared->loading));
+
     if(app_state->is_debug_enabled) {
         infrared->debug_view = infrared_debug_view_alloc();
         view_dispatcher_add_view(
@@ -201,7 +211,6 @@ static InfraredApp* infrared_alloc() {
     }
 
     infrared->button_panel = button_panel_alloc();
-    infrared->loading = loading_alloc();
     infrared->progress = infrared_progress_view_alloc();
 
     return infrared;
@@ -209,6 +218,10 @@ static InfraredApp* infrared_alloc() {
 
 static void infrared_free(InfraredApp* infrared) {
     furi_assert(infrared);
+
+    furi_thread_join(infrared->task_thread);
+    furi_thread_free(infrared->task_thread);
+
     ViewDispatcher* view_dispatcher = infrared->view_dispatcher;
     InfraredAppState* app_state = &infrared->app_state;
 
@@ -227,28 +240,30 @@ static void infrared_free(InfraredApp* infrared) {
     view_dispatcher_remove_view(view_dispatcher, InfraredViewDialogEx);
     dialog_ex_free(infrared->dialog_ex);
 
-    view_dispatcher_remove_view(infrared->view_dispatcher, InfraredViewVariableItemList);
-    variable_item_list_free(infrared->variable_item_list);
-
     view_dispatcher_remove_view(view_dispatcher, InfraredViewButtonMenu);
     button_menu_free(infrared->button_menu);
 
     view_dispatcher_remove_view(view_dispatcher, InfraredViewPopup);
     popup_free(infrared->popup);
 
+    view_dispatcher_remove_view(view_dispatcher, InfraredViewVariableList);
+    variable_item_list_free(infrared->var_item_list);
+
     view_dispatcher_remove_view(view_dispatcher, InfraredViewStack);
     view_stack_free(infrared->view_stack);
 
     view_dispatcher_remove_view(view_dispatcher, InfraredViewMove);
     infrared_move_view_free(infrared->move_view);
 
+    view_dispatcher_remove_view(view_dispatcher, InfraredViewLoading);
+    loading_free(infrared->loading);
+
     if(app_state->is_debug_enabled) {
         view_dispatcher_remove_view(view_dispatcher, InfraredViewDebugView);
         infrared_debug_view_free(infrared->debug_view);
     }
 
     button_panel_free(infrared->button_panel);
-    loading_free(infrared->loading);
     infrared_progress_view_free(infrared->progress);
 
     view_dispatcher_free(view_dispatcher);
@@ -386,6 +401,17 @@ void infrared_tx_stop(InfraredApp* infrared) {
     infrared->app_state.last_transmit_time = furi_get_tick();
 }
 
+void infrared_blocking_task_start(InfraredApp* infrared, FuriThreadCallback callback) {
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewLoading);
+    furi_thread_set_callback(infrared->task_thread, callback);
+    furi_thread_start(infrared->task_thread);
+}
+
+bool infrared_blocking_task_finalize(InfraredApp* infrared) {
+    furi_thread_join(infrared->task_thread);
+    return furi_thread_get_return_code(infrared->task_thread);
+}
+
 void infrared_text_store_set(InfraredApp* infrared, uint32_t bank, const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
@@ -406,21 +432,6 @@ void infrared_play_notification_message(
     notification_message(infrared->notifications, infrared_notification_sequences[message]);
 }
 
-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
-        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
-        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
-    }
-}
-
 void infrared_show_error_message(const InfraredApp* infrared, const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
@@ -432,6 +443,64 @@ void infrared_show_error_message(const InfraredApp* infrared, const char* fmt, .
     va_end(args);
 }
 
+void infrared_set_tx_pin(InfraredApp* infrared, FuriHalInfraredTxPin tx_pin) {
+    if(tx_pin < FuriHalInfraredTxPinMax) {
+        furi_hal_infrared_set_tx_output(tx_pin);
+    } else {
+        FuriHalInfraredTxPin tx_pin_detected = furi_hal_infrared_detect_tx_output();
+        furi_hal_infrared_set_tx_output(tx_pin_detected);
+        if(tx_pin_detected != FuriHalInfraredTxPinInternal) {
+            infrared_enable_otg(infrared, true);
+        }
+    }
+
+    infrared->app_state.tx_pin = tx_pin;
+}
+
+void infrared_enable_otg(InfraredApp* infrared, bool enable) {
+    if(enable) {
+        furi_hal_power_enable_otg();
+    } else {
+        furi_hal_power_disable_otg();
+    }
+    infrared->app_state.is_otg_enabled = enable;
+}
+
+static void infrared_load_settings(InfraredApp* infrared) {
+    InfraredSettings settings = {0};
+
+    if(!saved_struct_load(
+           INFRARED_SETTINGS_PATH,
+           &settings,
+           sizeof(InfraredSettings),
+           INFRARED_SETTINGS_MAGIC,
+           INFRARED_SETTINGS_VERSION)) {
+        FURI_LOG_D(TAG, "Failed to load settings, using defaults");
+        infrared_save_settings(infrared);
+    }
+
+    infrared_set_tx_pin(infrared, settings.tx_pin);
+    if(settings.tx_pin < FuriHalInfraredTxPinMax) {
+        infrared_enable_otg(infrared, settings.otg_enabled);
+    }
+}
+
+void infrared_save_settings(InfraredApp* infrared) {
+    InfraredSettings settings = {
+        .tx_pin = infrared->app_state.tx_pin,
+        .otg_enabled = infrared->app_state.is_otg_enabled,
+    };
+
+    if(!saved_struct_save(
+           INFRARED_SETTINGS_PATH,
+           &settings,
+           sizeof(InfraredSettings),
+           INFRARED_SETTINGS_MAGIC,
+           INFRARED_SETTINGS_VERSION)) {
+        FURI_LOG_E(TAG, "Failed to save settings");
+    }
+}
+
 void infrared_signal_received_callback(void* context, InfraredWorkerSignal* received_signal) {
     furi_assert(context);
     InfraredApp* infrared = context;
@@ -472,6 +541,7 @@ void infrared_popup_closed_callback(void* context) {
 int32_t infrared_app(void* p) {
     InfraredApp* infrared = infrared_alloc();
 
+    infrared_load_settings(infrared);
     infrared_make_app_folder(infrared);
 
     bool is_remote_loaded = false;
@@ -514,6 +584,9 @@ int32_t infrared_app(void* p) {
 
     view_dispatcher_run(infrared->view_dispatcher);
 
+    infrared_set_tx_pin(infrared, FuriHalInfraredTxPinInternal);
+    infrared_enable_otg(infrared, false);
     infrared_free(infrared);
+
     return 0;
 }
diff --git a/applications/main/infrared/infrared_app.h b/applications/main/infrared/infrared_app.h
index a6f87402a..6b7b8821a 100644
--- a/applications/main/infrared/infrared_app.h
+++ b/applications/main/infrared/infrared_app.h
@@ -13,3 +13,15 @@
  * @brief InfraredApp opaque type declaration.
  */
 typedef struct InfraredApp InfraredApp;
+
+#include <storage/storage.h>
+#include <furi_hal_infrared.h>
+
+#define INFRARED_SETTINGS_PATH EXT_PATH("infrared/.infrared.settings")
+#define INFRARED_SETTINGS_VERSION (1)
+#define INFRARED_SETTINGS_MAGIC (0x1F)
+
+typedef struct {
+    FuriHalInfraredTxPin tx_pin;
+    bool otg_enabled;
+} InfraredSettings;
diff --git a/applications/main/infrared/infrared_app_i.h b/applications/main/infrared/infrared_app_i.h
index 87cc00668..1635fa0dc 100644
--- a/applications/main/infrared/infrared_app_i.h
+++ b/applications/main/infrared/infrared_app_i.h
@@ -4,6 +4,8 @@
  */
 #pragma once
 
+#include <furi_hal_infrared.h>
+
 #include <gui/gui.h>
 #include <gui/view.h>
 #include <assets_icons.h>
@@ -20,12 +22,12 @@
 #include <gui/modules/button_panel.h>
 #include <gui/modules/variable_item_list.h>
 
+#include <rpc/rpc_app.h>
 #include <storage/storage.h>
 #include <dialogs/dialogs.h>
 
 #include <notification/notification_messages.h>
-
-#include <infrared_worker.h>
+#include <infrared/worker/infrared_worker.h>
 
 #include "infrared_app.h"
 #include "infrared_remote.h"
@@ -37,8 +39,6 @@
 #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
@@ -84,11 +84,13 @@ 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. */
+    bool is_otg_enabled; /**< Whether OTG power (external 5V) is enabled. */
     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. */
+    FuriHalInfraredTxPin tx_pin;
 } InfraredAppState;
 
 /**
@@ -112,7 +114,7 @@ struct InfraredApp {
     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. */
-    VariableItemList* variable_item_list;
+    VariableItemList* var_item_list; /**< Standard view for displaying menus of choice items. */
 
     ViewStack* view_stack; /**< Standard view for displaying stacked interfaces. */
     InfraredDebugView* debug_view; /**< Custom view for displaying debug information. */
@@ -122,6 +124,7 @@ struct InfraredApp {
     Loading* loading; /**< Standard view for informing about long operations. */
     InfraredProgressView* progress; /**< Custom view for showing brute force progress. */
 
+    FuriThread* task_thread; /**< Pointer to a FuriThread instance for concurrent tasks. */
     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. */
@@ -140,10 +143,11 @@ typedef enum {
     InfraredViewDialogEx,
     InfraredViewButtonMenu,
     InfraredViewPopup,
+    InfraredViewVariableList,
     InfraredViewStack,
     InfraredViewDebugView,
     InfraredViewMove,
-    InfraredViewVariableItemList,
+    InfraredViewLoading,
 } InfraredView;
 
 /**
@@ -213,6 +217,29 @@ void infrared_tx_start_button_index(InfraredApp* infrared, size_t button_index);
  */
 void infrared_tx_stop(InfraredApp* infrared);
 
+/**
+ * @brief Start a blocking task in a separate thread.
+ *
+ * Before starting a blocking task, the current view will be replaced
+ * with a busy animation. All subsequent user input will be ignored.
+ *
+ * @param[in,out] infrared pointer to the application instance.
+ * @param[in] callback pointer to the function to be run in the thread.
+ */
+void infrared_blocking_task_start(InfraredApp* infrared, FuriThreadCallback callback);
+
+/**
+ * @brief Wait for a blocking task to finish and get the result.
+ *
+ * The busy animation shown during the infrared_blocking_task_start() call
+ * will NOT be hidden and WILL remain on screen. If another view is needed
+ * (e.g. to display the results), the caller code MUST set it explicitly.
+ *
+ * @param[in,out] infrared pointer to the application instance.
+ * @return true if the blocking task finished successfully, false otherwise.
+ */
+bool infrared_blocking_task_finalize(InfraredApp* infrared);
+
 /**
  * @brief Set the internal text store with formatted text.
  *
@@ -242,17 +269,6 @@ 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.
  *
@@ -263,6 +279,32 @@ void infrared_show_loading_popup(const InfraredApp* infrared, bool show);
 void infrared_show_error_message(const InfraredApp* infrared, const char* fmt, ...)
     _ATTRIBUTE((__format__(__printf__, 2, 3)));
 
+/**
+ * @brief Set which pin will be used to transmit infrared signals.
+ *
+ * Setting tx_pin to InfraredTxPinInternal will enable transmission via
+ * the built-in infrared LEDs.
+ *
+ * @param[in] infrared pointer to the application instance.
+ * @param[in] tx_pin pin to be used for signal transmission.
+ */
+void infrared_set_tx_pin(InfraredApp* infrared, FuriHalInfraredTxPin tx_pin);
+
+/**
+ * @brief Enable or disable 5V at the GPIO pin 1.
+ *
+ * @param[in] infrared pointer to the application instance.
+ * @param[in] enable boolean value corresponding to OTG state (true = enable, false = disable)
+ */
+void infrared_enable_otg(InfraredApp* infrared, bool enable);
+
+/**
+ * @brief Save current settings to a file.
+ *
+ * @param[in] infrared pointer to the application instance.
+ */
+void infrared_save_settings(InfraredApp* infrared);
+
 /**
  * @brief Common received signal callback.
  *
diff --git a/applications/main/infrared/infrared_brute_force.c b/applications/main/infrared/infrared_brute_force.c
index b941a4760..b28918489 100644
--- a/applications/main/infrared/infrared_brute_force.c
+++ b/applications/main/infrared/infrared_brute_force.c
@@ -27,7 +27,7 @@ struct InfraredBruteForce {
     bool is_started;
 };
 
-InfraredBruteForce* infrared_brute_force_alloc() {
+InfraredBruteForce* infrared_brute_force_alloc(void) {
     InfraredBruteForce* brute_force = malloc(sizeof(InfraredBruteForce));
     brute_force->ff = NULL;
     brute_force->db_filename = NULL;
diff --git a/applications/main/infrared/infrared_brute_force.h b/applications/main/infrared/infrared_brute_force.h
index 33677d2ec..8eda08a63 100644
--- a/applications/main/infrared/infrared_brute_force.h
+++ b/applications/main/infrared/infrared_brute_force.h
@@ -21,7 +21,7 @@ typedef struct InfraredBruteForce InfraredBruteForce;
  *
  * @returns pointer to the created instance.
  */
-InfraredBruteForce* infrared_brute_force_alloc();
+InfraredBruteForce* infrared_brute_force_alloc(void);
 
 /**
  * @brief Delete an InfraredBruteForce instance.
diff --git a/applications/main/infrared/infrared_cli.c b/applications/main/infrared/infrared_cli.c
index c960ffa28..123fe78d5 100644
--- a/applications/main/infrared/infrared_cli.c
+++ b/applications/main/infrared/infrared_cli.c
@@ -10,8 +10,10 @@
 #include "infrared_signal.h"
 #include "infrared_brute_force.h"
 
-#define INFRARED_CLI_BUF_SIZE 10
-#define INFRARED_ASSETS_FOLDER "infrared/assets"
+#define INFRARED_CLI_BUF_SIZE (10U)
+#define INFRARED_CLI_FILE_NAME_SIZE (256U)
+#define INFRARED_FILE_EXTENSION ".ir"
+#define INFRARED_ASSETS_FOLDER EXT_PATH("infrared/assets")
 #define INFRARED_BRUTE_FORCE_DUMMY_INDEX 0
 
 DICT_DEF2(dict_signals, FuriString*, FURI_STRING_OPLIST, int, M_DEFAULT_OPLIST)
@@ -66,6 +68,37 @@ static void signal_received_callback(void* context, InfraredWorkerSignal* receiv
     }
 }
 
+static void infrared_cli_print_universal_remotes(void) {
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    File* dir = storage_file_alloc(storage);
+
+    do {
+        if(!storage_dir_open(dir, INFRARED_ASSETS_FOLDER)) break;
+
+        FileInfo file_info;
+        char file_name[INFRARED_CLI_FILE_NAME_SIZE];
+
+        while(storage_dir_read(dir, &file_info, file_name, sizeof(file_name))) {
+            if(file_info.flags & FSF_DIRECTORY) {
+                continue;
+            }
+
+            char* file_ext = strstr(file_name, INFRARED_FILE_EXTENSION);
+            if((file_ext == NULL) || (strcmp(file_ext, INFRARED_FILE_EXTENSION) != 0)) {
+                continue;
+            }
+
+            *file_ext = '\0';
+            printf("%s ", file_name);
+        }
+
+        printf("\r\n");
+    } while(false);
+
+    storage_file_free(dir);
+    furi_record_close(RECORD_STORAGE);
+}
+
 static void infrared_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("\tir rx [raw]\r\n");
@@ -85,8 +118,9 @@ static void infrared_cli_print_usage(void) {
     printf("\tir decode <input_file> [<output_file>]\r\n");
     printf("\tir universal <remote_name> <signal_name>\r\n");
     printf("\tir universal list <remote_name>\r\n");
-    // TODO FL-3496: Do not hardcode universal remote names
-    printf("\tAvailable universal remotes: tv audio ac projector\r\n");
+    printf("\tAvailable universal remotes: ");
+
+    infrared_cli_print_universal_remotes();
 }
 
 static void infrared_cli_start_ir_rx(Cli* cli, FuriString* args) {
@@ -211,7 +245,6 @@ static bool infrared_cli_decode_raw_signal(
 
     size_t i;
     for(i = 0; i < raw_signal->timings_size; ++i) {
-        // TODO FL-3523: Any infrared_check_decoder_ready() magic?
         const InfraredMessage* message = infrared_decode(decoder, level, raw_signal->timings[i]);
 
         if(message) {
@@ -365,7 +398,10 @@ static void infrared_cli_list_remote_signals(FuriString* remote_name) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FlipperFormat* ff = flipper_format_buffered_file_alloc(storage);
     FuriString* remote_path = furi_string_alloc_printf(
-        "%s/%s.ir", EXT_PATH(INFRARED_ASSETS_FOLDER), furi_string_get_cstr(remote_name));
+        "%s/%s%s",
+        INFRARED_ASSETS_FOLDER,
+        furi_string_get_cstr(remote_name),
+        INFRARED_FILE_EXTENSION);
 
     do {
         if(!flipper_format_buffered_file_open_existing(ff, furi_string_get_cstr(remote_path))) {
@@ -413,7 +449,7 @@ static void
     infrared_cli_brute_force_signals(Cli* cli, FuriString* remote_name, FuriString* signal_name) {
     InfraredBruteForce* brute_force = infrared_brute_force_alloc();
     FuriString* remote_path = furi_string_alloc_printf(
-        "%s/%s.ir", EXT_PATH(INFRARED_ASSETS_FOLDER), furi_string_get_cstr(remote_name));
+        "%s/%s.ir", INFRARED_ASSETS_FOLDER, furi_string_get_cstr(remote_name));
 
     infrared_brute_force_set_db_filename(brute_force, furi_string_get_cstr(remote_path));
     infrared_brute_force_add_record(
@@ -508,7 +544,7 @@ static void infrared_cli_start_ir(Cli* cli, FuriString* args, void* context) {
 
     furi_string_free(command);
 }
-void infrared_on_system_start() {
+void infrared_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = (Cli*)furi_record_open(RECORD_CLI);
     cli_add_command(cli, "ir", CliCommandFlagDefault, infrared_cli_start_ir, NULL);
diff --git a/applications/main/infrared/infrared_custom_event.h b/applications/main/infrared/infrared_custom_event.h
index 30bb0f729..02d9a276f 100644
--- a/applications/main/infrared/infrared_custom_event.h
+++ b/applications/main/infrared/infrared_custom_event.h
@@ -14,6 +14,7 @@ enum InfraredCustomEventType {
     InfraredCustomEventTypePopupClosed,
     InfraredCustomEventTypeButtonSelected,
     InfraredCustomEventTypeBackPressed,
+    InfraredCustomEventTypeTaskFinished,
 
     InfraredCustomEventTypeRpcLoadFile,
     InfraredCustomEventTypeRpcExit,
@@ -21,6 +22,9 @@ enum InfraredCustomEventType {
     InfraredCustomEventTypeRpcButtonPressIndex,
     InfraredCustomEventTypeRpcButtonRelease,
     InfraredCustomEventTypeRpcSessionClose,
+
+    InfraredCustomEventTypeGpioTxPinChanged,
+    InfraredCustomEventTypeGpioOtgChanged,
 };
 
 #pragma pack(push, 1)
diff --git a/applications/main/infrared/infrared_remote.c b/applications/main/infrared/infrared_remote.c
index cab241c12..c574d75c7 100644
--- a/applications/main/infrared/infrared_remote.c
+++ b/applications/main/infrared/infrared_remote.c
@@ -37,7 +37,7 @@ typedef struct {
 typedef bool (
     *InfraredBatchCallback)(const InfraredBatch* batch, const InfraredBatchTarget* target);
 
-InfraredRemote* infrared_remote_alloc() {
+InfraredRemote* infrared_remote_alloc(void) {
     InfraredRemote* remote = malloc(sizeof(InfraredRemote));
     StringArray_init(remote->signal_names);
     remote->name = furi_string_alloc();
diff --git a/applications/main/infrared/infrared_remote.h b/applications/main/infrared/infrared_remote.h
index 7477cd3b5..4604a25ef 100644
--- a/applications/main/infrared/infrared_remote.h
+++ b/applications/main/infrared/infrared_remote.h
@@ -23,7 +23,7 @@ typedef struct InfraredRemote InfraredRemote;
  *
  * @returns pointer to the created instance.
  */
-InfraredRemote* infrared_remote_alloc();
+InfraredRemote* infrared_remote_alloc(void);
 
 /**
  * @brief Delete an InfraredRemote instance.
diff --git a/applications/main/infrared/infrared_signal.c b/applications/main/infrared/infrared_signal.c
index eac8bc7d6..c27afb027 100644
--- a/applications/main/infrared/infrared_signal.c
+++ b/applications/main/infrared/infrared_signal.c
@@ -201,7 +201,7 @@ bool infrared_signal_read_body(InfraredSignal* signal, FlipperFormat* ff) {
     return success;
 }
 
-InfraredSignal* infrared_signal_alloc() {
+InfraredSignal* infrared_signal_alloc(void) {
     InfraredSignal* signal = malloc(sizeof(InfraredSignal));
 
     signal->is_raw = false;
diff --git a/applications/main/infrared/infrared_signal.h b/applications/main/infrared/infrared_signal.h
index 69b677f23..dcfde6e72 100644
--- a/applications/main/infrared/infrared_signal.h
+++ b/applications/main/infrared/infrared_signal.h
@@ -36,7 +36,7 @@ typedef struct {
  *
  * @returns pointer to the instance created.
  */
-InfraredSignal* infrared_signal_alloc();
+InfraredSignal* infrared_signal_alloc(void);
 
 /**
  * @brief Delete an InfraredSignal instance.
diff --git a/applications/main/infrared/resources/infrared/assets/ac.ir b/applications/main/infrared/resources/infrared/assets/ac.ir
index c26d282c4..38db599b2 100644
--- a/applications/main/infrared/resources/infrared/assets/ac.ir
+++ b/applications/main/infrared/resources/infrared/assets/ac.ir
@@ -1,43 +1,43 @@
 Filetype: IR library file
 Version: 1
-# Last Updated 16th Aug, 2023
-# Last Checked 16th Aug, 2023
+# Last Updated 21st Feb, 2024
+# Last Checked 21st Feb, 2024
 #
 # Model: Electrolux EACM-16 HP/N3
 name: Off
 type: raw
 frequency: 38000
-duty_cycle: 0.33
+duty_cycle: 0.330000
 data: 502 3436 510 475 509 476 508 477 507 477 507 479 505 480 504 480 504 490 504 481 502 482 501 483 563 420 511 474 510 475 509 476 508 485 561 423 508 476 508 477 507 478 506 479 505 480 504 481 503 517 508 476 508 478 506 479 505 479 505 481 503 483 521 1456 501 498 507 479 505 480 504 481 503 482 501 483 563 421 562 422 509 499 506 479 505 480 504 481 503 482 502 484 510 1451 506 479 505 1542 562 1396 509 471 502 476 508 469 504 3425 511
 #
 name: Dh
 type: raw
 frequency: 38000
-duty_cycle: 0.33
+duty_cycle: 0.330000
 data: 507 3430 506 479 505 480 504 481 503 481 503 483 501 485 509 1453 504 1465 503 482 502 483 511 473 500 485 509 476 508 477 507 478 506 487 507 477 507 478 506 479 505 480 504 482 502 483 501 484 500 523 503 482 502 484 500 485 509 476 508 476 508 478 506 1456 501 501 504 482 502 483 501 484 500 485 509 476 508 477 507 1455 502 509 506 479 505 1457 500 485 509 476 508 1454 503 482 502 483 501 568 499 1459 509 1450 507 471 502 474 510 3421 505
 #
 name: Cool_hi
 type: raw
 frequency: 38000
-duty_cycle: 0.33
+duty_cycle: 0.330000
 data: 504 3433 503 482 502 484 510 474 510 475 509 476 508 478 506 1456 564 1405 510 475 509 476 508 502 482 477 507 478 506 479 505 480 504 489 505 480 504 481 503 482 502 483 511 473 511 474 510 475 509 509 506 479 505 480 504 481 503 482 512 473 511 474 510 476 508 1469 509 475 509 476 508 477 507 478 506 479 505 480 504 481 503 505 510 475 509 502 482 503 481 504 480 505 478 507 477 1459 509 560 507 1451 506 473 511 493 480 1450 507 3422 503
 #
 name: Cool_lo
 type: raw
 frequency: 38000
-duty_cycle: 0.33
+duty_cycle: 0.330000
 data: 525 3615 530 506 561 474 562 474 562 473 563 473 531 505 562 1502 528 1542 562 474 562 474 530 505 531 504 532 504 532 504 616 419 533 510 589 447 526 509 527 509 527 509 527 508 528 508 528 507 529 542 525 510 526 509 527 509 527 509 527 508 528 508 528 1535 527 524 533 503 533 503 533 502 534 502 534 502 534 501 535 501 525 534 533 502 534 502 534 501 535 502 534 1529 533 503 533 503 533 587 533 497 528 501 524 1536 526 501 524 3609 526
 #
 name: Heat_hi
 type: raw
 frequency: 38000
-duty_cycle: 0.33
+duty_cycle: 0.330000
 data: 531 3406 530 455 529 456 528 457 537 447 537 448 535 450 534 1429 528 1442 536 448 536 449 534 451 532 452 532 453 530 454 530 455 529 464 530 454 529 456 528 457 537 448 536 449 535 450 533 451 533 490 535 449 534 450 534 451 533 452 532 453 531 455 529 1433 534 1443 535 449 535 450 534 452 531 453 530 454 530 455 529 456 538 472 532 452 532 454 530 1433 535 1427 530 1432 536 1427 530 1431 537 1511 530 448 536 1422 535 1423 534 1422 535 3395 530
 #
 name: Heat_lo
 type: raw
 frequency: 38000
-duty_cycle: 0.33
+duty_cycle: 0.330000
 data: 506 3430 506 478 506 479 505 480 504 481 503 482 502 484 500 1463 505 1465 503 482 502 483 501 484 500 485 509 476 508 477 507 478 506 486 508 477 507 478 506 479 505 480 504 481 503 482 502 483 500 523 502 482 502 483 501 484 500 485 509 476 508 478 506 1455 502 498 507 478 506 479 505 481 503 482 501 483 500 484 500 485 509 500 505 481 502 482 502 1461 507 1455 502 1459 509 476 508 477 507 563 504 1453 504 1454 503 1454 503 1453 504 3426 499
 #
 # Model: Hisense Generic
@@ -959,3 +959,65 @@ type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 664 17757 3057 8901 528 469 550 1434 556 465 553 440 529 465 554 439 555 439 555 438 555 440 553 1435 552 443 550 470 524 1466 522 472 522 472 521 1467 523 1466 549 1440 549 1440 548 1440 548 445 549 445 549 445 549 446 548 470 524 471 523 471 523 471 523 472 522 472 522 473 522 472 523 472 548 446 549 445 550 445 548 446 548 446 548 446 548 446 548 447 547 470 524 471 523 471 523 471 523 471 523 474 519 474 521 474 521 473 522 473 546 447 547 1441 548 1442 546 1442 547 1442 546 2947 3023 8935 522 1466 522 472 522 498 496 498 495 499 496 498 496 498 521 473 522 471 523 1466 522 471 523 471 522 1466 523 471 523 1467 522 1467 522 1467 521 1493 495 1494 496 1493 521 473 522 472 522 471 523 472 522 471 523 472 522 472 522 472 522 472 522 472 522 472 522 472 522 473 521 499 495 499 495 499 495 499 496 498 522 473 522 472 523 471 522 472 522 472 522 472 522 472 522 472 522 472 522 473 521 473 521 473 521 473 521 499 495 500 494 500 495 499 496 498 522 2947 3023 8937 521 1468 520 473 521 473 521 473 521 473 521 473 521 473 521 474 520 474 520 1470 518 500 494 500 494 500 494 500 494 1494 521 1468 521 473 521 1468 520 1468 520 1469 520 1469 520 1470 518 1495 493 1496 493 1495 494 500 519 475 520 474 520 1469 519 1469 520 1469 519 474 520 474 520 475 519 477 517 500 494 1496 493 1496 493 1496 493 500 495 1495 519 475 518 475 519 475 518 476 518 475 519 1470 519 500 494 500 494 501 493 501 493 501 493 1499 490 1497 493 1497 492 1496 518
+#
+name: Heat_hi
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 148 110377 9082 4422 707 499 706 500 704 1603 703 1606 701 505 700 507 699 506 700 507 699 506 700 1607 700 1608 700 1609 699 506 699 507 699 506 699 507 699 507 699 506 700 507 699 507 699 507 699 1608 699 1607 699 507 699 507 699 507 699 507 699 507 699 1609 699 507 699 1608 699 507 699 507 699 1609 699 507 699 19940 700 506 700 506 699 507 699 507 699 506 700 506 700 507 699 507 699 507 700 507 699 506 699 507 699 507 699 507 699 507 699 507 699 507 699 507 699 507 698 507 700 507 699 507 699 507 699 507 699 507 699 508 698 508 698 507 699 507 699 508 698 1610 699 508 698
+#
+name: Cool_hi
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 315 101050 3094 3056 3093 4437 580 1648 572 534 576 1649 582 525 574 530 580 1646 574 1653 578 529 570 534 576 529 571 534 576 529 570 1655 576 1651 580 527 572 532 578 1647 573 1654 577 1651 580 526 573 531 579 526 573 531 579 526 573 531 579 526 573 531 579 526 573 531 579 525 574 531 579 525 574 531 579 1646 574 532 578 526 573 531 579 526 573 531 579 526 573 1652 579 527 572 1653 578 528 571 534 576 528 571 533 577 528 571 533 577 528 572 533 577 528 572 532 578 527 572 532 578 527 572 532 578 526 573 1652 579 527 572 532 578 527 572 532 578 527 572 532 578 526 573 531 579 526 573 531 579 526 573 531 579 525 574 530 580 525 574 530 580 525 574 530 580 524 575 529 581 524 575 529 571 534 576 528 571 533 577 528 571 533 577 528 571 533 577 527 572 532 578 527 572 532 578 526 573 531 579 526 573 531 579 525 574 531 579 525 574 530 580 525 574 1650 581 525 574 1651 580 1647 573 533 577 527 572 1653 578 528 572 1654 577 1650 581 1646 574 71637 254
+#
+name: Cool_lo
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 284 19161 3098 3053 3096 4435 572 1656 575 532 578 1648 572 534 576 530 570 1682 549 1652 579 527 572 534 576 1649 571 1656 575 1652 579 1649 571 1656 575 531 579 527 572 1653 578 1649 571 1656 575 531 579 527 572 532 578 527 572 533 577 527 572 533 577 527 573 532 578 527 572 532 578 527 573 532 578 527 572 1652 579 527 572 533 577 528 571 533 577 528 571 533 577 1648 572 533 577 1649 571 535 575 530 569 536 574 531 569 536 574 530 569 536 574 530 570 535 575 530 570 535 575 530 569 535 575 530 569 535 575 1649 571 535 575 531 568 536 574 531 568 536 574 531 568 536 574 531 569 536 574 530 569 536 574 530 569 535 575 530 569 535 575 530 569 535 575 530 570 535 575 529 570 534 576 529 570 534 576 529 570 534 576 528 571 534 576 528 571 534 576 528 571 534 576 528 571 534 576 528 571 533 577 528 571 533 577 528 572 533 577 528 571 533 577 528 572 1652 579 527 572 1653 578 529 570 534 576 529 570 535 575 529 570 1654 577 1677 554 1673 547
+#
+name: Cool_lo
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 301 132136 5036 2167 337 1766 361 689 358 692 366 684 363 1770 357 692 366 684 363 718 329 690 357 1776 361 687 360 1773 364 1767 360 689 358 1775 362 1769 357 1774 363 1768 359 1773 364 684 363 718 329 1773 364 684 363 718 329 691 356 694 364 716 331 719 328 1775 362 1769 358 1774 363 1768 359 1772 365 714 333 1770 357 1774 363 716 331 719 328 722 336 715 332 718 329 721 326 724 334 716 331 719 328 722 336 715 332 718 329 1773 364 1767 360 1772 354 1777 360 719 328 721 326 725 333 717 330 29455 5036 2139 354 1777 360 688 359 691 367 714 333 1770 356 692 366 684 363 687 360 690 357 1776 361 688 359 1773 364 1768 359 689 358 1775 362 1769 357 1774 363 1768 359 1773 364 684 363 687 360 1773 364 685 362 688 359 691 356 694 364 686 361 689 358 692 366 685 362 688 359 691 356 1777 360 1771 355 693 365 685 362 1771 355 693 365 1768 359 1773 364 1767 360 689 358 692 366 685 362 1771 355 1775 362 687 360 690 357 1775 362 687 360 690 357 693 365 716 331 689 358 1774 363 686 361 689 358 692 366 685 362 688 359 691 356 694 364 686 361 689 358 692 366 685 362 688 359 691 356 694 364 686 361 689 358 692 366 685 362 1771 355 693 365 1768 358 1773 364 684 363 687 360 690 357 693 365 1768 359 690 357 1776 361 688 359 691 356 694 364 686 361 689 358 692 366 685 362 1770 356 693 365 685 362 688 359 691 356 1777 360 1771 355 693 365 686 361 689 358 692 366 685 362 1770 356
+#
+# Model: Fujitsu ASYG24KMTB
+#
+name: Dh
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3302 1639 405 423 407 420 410 1234 405 421 409 1210 440 387 432 420 410 417 413 1231 408 1238 412 388 431 422 408 392 438 1233 406 1238 412 389 430 396 434 419 411 390 440 413 406 394 436 391 439 388 431 421 409 417 413 414 405 421 409 392 438 1233 406 421 409 417 413 414 405 395 435 418 412 388 432 421 409 1236 414 387 432 420 410 390 440 388 431 1213 437 1208 431 1239 411 1234 405 1213 437 1208 431 1214 436 1235 415 386 433 420 410 1234 405 422 408 418 412 389 431 396 434 1211 439 388 432 422 408 418 412 1233 406 1238 412 415 404 422 408 1237 413 388 432 422 408 1236 414 1205 434 1210 440 1205 434 392 438 390 440 1231 408 392 438 415 404 396 434 392 438 415 404 422 408 419 411 416 414 412 407 394 436 417 413 414 405 421 409 417 413 1232 407 419 411 390 440 1204 435 418 412 415 415 412 407 419 411 1208 431 421 409 418 412 388 432 421 409 392 438 415 404 395 435 1211 439 388 432 1213 437 416 414 386 433 1212 438 415 404 396 434 392 438 416 414 413 406 420 410 417 413 1231 409 418 412 389 430 1240 410 391 439 1205 434 420 410 390 440 387 432 420 410 417 413
+# 
+name: Cool_hi
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3293 1649 405 396 434 419 411 1207 432 395 435 1236 414 413 406 394 436 417 413 1232 407 1212 438 415 404 396 434 419 411 1234 405 1239 411 417 413 414 405 421 409 419 411 389 430 423 407 393 437 416 414 387 432 394 436 417 413 388 431 421 409 1236 414 387 432 421 409 418 412 414 405 422 408 418 412 415 404 1240 410 391 439 414 405 421 409 419 411 1234 405 1239 411 1208 431 1239 411 1235 404 1214 436 1210 440 1205 434 419 411 416 414 1204 435 418 412 415 404 396 434 393 437 1235 404 396 434 420 410 416 414 1231 408 1210 440 387 432 421 409 1235 415 414 405 395 435 418 412 1232 407 420 410 1208 431 422 408 1237 413 415 404 396 434 419 411 416 414 413 406 420 410 417 413 414 405 421 409 418 412 415 404 422 408 419 411 416 414 413 406 1238 412 415 404 422 408 1237 413 414 405 421 409 418 412 416 414 1231 408 418 412 415 404 422 408 419 411 416 414 413 406 420 410 1235 404 423 407 420 410 1234 405 422 408 1210 440 414 405 421 409 392 438 415 404 422 408 420 410 417 413 1231 408 419 411 416 414 413 406 1237 413 415 404 1239 411 417 413 1232 407 420 410 417 413
+# 
+name: Cool_lo
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3302 1614 440 414 405 421 409 1235 414 413 406 1238 411 415 404 422 408 419 411 1234 405 1240 409 418 412 415 404 422 408 1237 412 1232 407 420 410 417 413 414 405 422 408 419 411 416 414 413 406 420 410 417 413 414 405 421 409 418 412 415 404 1239 410 418 412 415 404 422 408 419 411 416 414 413 406 420 410 1234 405 422 408 419 411 416 414 414 405 1239 411 1207 432 1239 410 1235 414 1230 409 1236 413 1232 407 1237 412 415 415 412 407 1237 412 414 405 422 408 419 411 416 414 1231 408 419 411 416 414 413 406 1238 411 1206 433 421 409 418 412 1206 433 421 409 418 412 1206 433 1238 412 1207 432 1213 436 390 440 1232 407 420 410 417 413 414 405 421 409 418 412 415 404 422 408 419 411 416 414 413 406 421 409 418 412 415 404 422 408 419 411 1233 406 421 409 418 412 1232 407 420 410 418 412 389 430 422 408 1210 440 414 405 395 435 418 412 415 404 423 407 420 410 416 414 414 405 422 408 418 412 415 404 1240 409 1235 414 413 406 420 410 417 413 414 405 422 408 419 411 416 414 1231 408 418 412 415 404 1240 409 1209 440 387 432 1212 437 1234 405 1214 435 1209 440 1204 435
+# 
+name: Heat_hi
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3301 1615 439 415 404 422 408 1210 439 414 405 1239 410 416 414 414 405 395 435 1209 440 1205 434 419 411 417 413 414 405 1212 437 1207 432 422 408 419 411 416 414 414 405 421 409 418 412 415 404 422 408 393 437 416 414 413 406 420 410 417 413 1205 434 420 410 417 413 414 405 421 409 418 412 415 404 422 408 1210 439 414 405 422 408 419 411 417 413 1205 434 1236 413 1206 433 1211 438 1207 432 1212 437 1209 440 1204 435 418 412 415 415 1204 435 418 412 415 404 422 408 419 411 1208 441 412 407 420 410 417 413 1205 434 1237 412 414 405 422 408 1210 439 415 404 396 434 419 411 1207 432 1213 436 417 413 1205 434 420 410 417 413 1231 408 419 411 416 414 413 406 421 409 418 412 414 405 422 408 419 411 415 404 424 406 421 409 418 412 415 404 1239 410 417 413 414 405 1239 410 416 414 413 406 422 408 419 411 1233 406 421 409 418 412 415 404 423 407 419 411 416 414 413 406 1238 411 416 414 413 406 421 409 1235 414 1230 409 418 412 415 415 412 407 420 410 417 413 414 405 422 408 1236 413 413 406 421 409 1235 414 1204 435 1210 439 1206 433 1212 437 1207 432 395 435 1236 413
+# 
+name: Heat_lo
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3295 1646 408 420 410 390 440 1205 434 393 437 1234 405 421 409 419 411 415 415 1230 409 1210 440 414 405 421 409 418 412 1233 406 1212 437 416 414 413 406 394 436 418 412 415 404 422 408 393 437 416 414 413 406 420 410 417 413 414 405 421 409 1236 413 414 405 421 409 418 412 415 404 423 407 419 411 416 414 1231 408 418 412 415 415 412 407 421 409 1235 414 1204 435 1209 441 1205 434 1210 440 1205 434 1212 437 1207 432 395 435 419 411 1233 406 421 409 418 412 415 404 422 408 1238 411 415 404 396 434 419 411 1234 405 1239 410 417 413 414 405 1213 436 417 413 414 405 1213 436 1235 404 1214 435 1209 441 413 406 421 409 418 412 1206 433 394 436 418 412 388 431 422 408 419 411 415 415 386 433 420 410 418 412 414 405 422 408 419 411 389 430 1241 408 418 412 415 404 1240 409 417 413 414 405 395 435 419 411 1233 406 395 435 418 412 415 404 422 408 419 411 416 414 413 406 421 409 1236 413 413 406 394 436 1235 414 1230 409 418 412 415 404 422 408 420 410 417 413 414 405 421 409 1236 413 413 406 420 410 417 413 1232 407 1237 412 416 414 1230 409 1236 413 1205 434 1210 439
+# 
+name: Off
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3302 1640 404 423 407 420 410 1212 437 390 440 1234 405 395 435 392 438 415 415 1207 432 1242 407 420 410 391 439 414 405 1243 406 1241 408 392 438 415 415 386 433 393 437 390 440 414 405 396 434 419 411 389 441 412 407 420 410 390 440 387 432 1242 407 393 437 390 440 414 405 395 435 392 438 389 430 396 434 1240 409 417 413 414 405 395 435 419 411 1237 412 389 430 396 434 393 437 416 414 387 432 394 436 1212 437 389 441 1234 405 1217 432 1241 408 1213 436 1212 437 1210 439
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 4967d1956..9bdcdc4a8 100644
--- a/applications/main/infrared/scenes/common/infrared_scene_universal_common.c
+++ b/applications/main/infrared/scenes/common/infrared_scene_universal_common.c
@@ -32,9 +32,23 @@ static void infrared_scene_universal_common_hide_popup(InfraredApp* infrared) {
     infrared_play_notification_message(infrared, InfraredNotificationMessageBlinkStop);
 }
 
+static int32_t infrared_scene_universal_common_task_callback(void* context) {
+    InfraredApp* infrared = context;
+    const bool success = infrared_brute_force_calculate_messages(infrared->brute_force);
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher,
+        infrared_custom_event_pack(InfraredCustomEventTypeTaskFinished, 0));
+
+    return success;
+}
+
 void infrared_scene_universal_common_on_enter(void* context) {
     InfraredApp* infrared = context;
+    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
     view_stack_add_view(infrared->view_stack, button_panel_get_view(infrared->button_panel));
+
+    // Load universal remote data in background
+    infrared_blocking_task_start(infrared, infrared_scene_universal_common_task_callback);
 }
 
 bool infrared_scene_universal_common_on_event(void* context, SceneManagerEvent event) {
@@ -58,26 +72,36 @@ bool infrared_scene_universal_common_on_event(void* context, SceneManagerEvent e
             if(infrared_custom_event_get_type(event.event) == InfraredCustomEventTypeBackPressed) {
                 infrared_brute_force_stop(brute_force);
                 infrared_scene_universal_common_hide_popup(infrared);
-                consumed = true;
             }
+            consumed = true;
         }
     } else {
         if(event.type == SceneManagerEventTypeBack) {
             scene_manager_previous_scene(scene_manager);
             consumed = true;
         } else if(event.type == SceneManagerEventTypeCustom) {
-            if(infrared_custom_event_get_type(event.event) ==
-               InfraredCustomEventTypeButtonSelected) {
+            uint16_t event_type;
+            int16_t event_value;
+            infrared_custom_event_unpack(event.event, &event_type, &event_value);
+
+            if(event_type == InfraredCustomEventTypeButtonSelected) {
                 uint32_t record_count;
-                if(infrared_brute_force_start(
-                       brute_force, infrared_custom_event_get_value(event.event), &record_count)) {
+                if(infrared_brute_force_start(brute_force, event_value, &record_count)) {
                     dolphin_deed(DolphinDeedIrSend);
                     infrared_scene_universal_common_show_popup(infrared, record_count);
                 } else {
                     scene_manager_next_scene(scene_manager, InfraredSceneErrorDatabases);
                 }
-                consumed = true;
+            } else if(event_type == InfraredCustomEventTypeTaskFinished) {
+                const bool task_success = infrared_blocking_task_finalize(infrared);
+
+                if(!task_success) {
+                    scene_manager_next_scene(infrared->scene_manager, InfraredSceneErrorDatabases);
+                } else {
+                    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
+                }
             }
+            consumed = true;
         }
     }
 
diff --git a/applications/main/infrared/scenes/infrared_scene_config.h b/applications/main/infrared/scenes/infrared_scene_config.h
index 40b22a7ef..3be8e4743 100644
--- a/applications/main/infrared/scenes/infrared_scene_config.h
+++ b/applications/main/infrared/scenes/infrared_scene_config.h
@@ -20,7 +20,7 @@ ADD_SCENE(infrared, universal_ac, UniversalAC)
 ADD_SCENE(infrared, universal_fan, UniversalFan)
 ADD_SCENE(infrared, universal_audio, UniversalAudio)
 ADD_SCENE(infrared, universal_projector, UniversalProjector)
+ADD_SCENE(infrared, gpio_settings, GpioSettings)
 ADD_SCENE(infrared, debug, Debug)
 ADD_SCENE(infrared, error_databases, ErrorDatabases)
-ADD_SCENE(infrared, debug_settings, DebugSettings)
 ADD_SCENE(infrared, rpc, Rpc)
diff --git a/applications/main/infrared/scenes/infrared_scene_debug_settings.c b/applications/main/infrared/scenes/infrared_scene_debug_settings.c
deleted file mode 100644
index badfd172a..000000000
--- a/applications/main/infrared/scenes/infrared_scene_debug_settings.c
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "../infrared_app_i.h"
-#include <furi_hal_infrared.h>
-
-uint8_t value_index_ir;
-
-#define DEB_PINS_COUNT (sizeof(infrared_debug_cfg_variables_text) / sizeof(char* const))
-const char* const infrared_debug_cfg_variables_text[] = {
-    "Internal",
-    "2 (A7)",
-};
-
-static void infrared_scene_debug_settings_changed(VariableItem* item) {
-    InfraredApp* infrared = variable_item_get_context(item);
-    value_index_ir = variable_item_get_current_value_index(item);
-    UNUSED(infrared);
-
-    variable_item_set_current_value_text(item, infrared_debug_cfg_variables_text[value_index_ir]);
-
-    furi_hal_infrared_set_debug_out(value_index_ir);
-}
-
-static void infrared_scene_debug_settings_power_changed(VariableItem* item) {
-    bool value = variable_item_get_current_value_index(item);
-    if(value) {
-        for(int i = 0; i < 5 && !furi_hal_power_is_otg_enabled(); i++) {
-            furi_hal_power_enable_otg();
-            furi_delay_ms(10);
-        }
-    } else {
-        if(furi_hal_power_is_otg_enabled()) {
-            furi_hal_power_disable_otg();
-        }
-    }
-    variable_item_set_current_value_text(item, value ? "ON" : "OFF");
-}
-
-static void infrared_debug_settings_start_var_list_enter_callback(void* context, uint32_t index) {
-    InfraredApp* infrared = context;
-    view_dispatcher_send_custom_event(infrared->view_dispatcher, index);
-}
-
-void infrared_scene_debug_settings_on_enter(void* context) {
-    InfraredApp* infrared = context;
-
-    VariableItemList* variable_item_list = infrared->variable_item_list;
-
-    value_index_ir = furi_hal_infrared_get_debug_out_status();
-    VariableItem* item = variable_item_list_add(
-        variable_item_list,
-        "Send signal to",
-        DEB_PINS_COUNT,
-        infrared_scene_debug_settings_changed,
-        infrared);
-
-    variable_item_list_set_enter_callback(
-        variable_item_list, infrared_debug_settings_start_var_list_enter_callback, infrared);
-
-    variable_item_set_current_value_index(item, value_index_ir);
-    variable_item_set_current_value_text(item, infrared_debug_cfg_variables_text[value_index_ir]);
-
-    item = variable_item_list_add(
-        variable_item_list,
-        "Ext Module 5v",
-        2,
-        infrared_scene_debug_settings_power_changed,
-        infrared);
-    bool enabled = furi_hal_power_is_otg_enabled();
-    variable_item_set_current_value_index(item, enabled);
-    variable_item_set_current_value_text(item, enabled ? "ON" : "OFF");
-
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewVariableItemList);
-}
-
-bool infrared_scene_debug_settings_on_event(void* context, SceneManagerEvent event) {
-    InfraredApp* infrared = context;
-    UNUSED(infrared);
-    UNUSED(event);
-
-    return false;
-}
-
-void infrared_scene_debug_settings_on_exit(void* context) {
-    InfraredApp* infrared = context;
-    variable_item_list_reset(infrared->variable_item_list);
-}
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_delete.c b/applications/main/infrared/scenes/infrared_scene_edit_delete.c
index 0cb88efdb..90a2633d3 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_delete.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_delete.c
@@ -6,12 +6,33 @@ static void
     view_dispatcher_send_custom_event(infrared->view_dispatcher, result);
 }
 
+static int32_t infrared_scene_edit_delete_task_callback(void* context) {
+    InfraredApp* infrared = context;
+    InfraredAppState* app_state = &infrared->app_state;
+    const InfraredEditTarget edit_target = app_state->edit_target;
+
+    bool success;
+    if(edit_target == InfraredEditTargetButton) {
+        furi_assert(app_state->current_button_index != InfraredButtonIndexNone);
+        success = infrared_remote_delete_signal(infrared->remote, app_state->current_button_index);
+    } else if(edit_target == InfraredEditTargetRemote) {
+        success = infrared_remote_remove(infrared->remote);
+    } else {
+        furi_crash();
+    }
+
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher, InfraredCustomEventTypeTaskFinished);
+
+    return success;
+}
+
 void infrared_scene_edit_delete_on_enter(void* 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) {
         dialog_ex_set_header(dialog_ex, "Delete Button?", 64, 0, AlignCenter, AlignTop);
 
@@ -70,10 +91,7 @@ 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_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);
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewDialogEx);
 }
 
 bool infrared_scene_edit_delete_on_event(void* context, SceneManagerEvent event) {
@@ -84,39 +102,30 @@ bool infrared_scene_edit_delete_on_event(void* context, SceneManagerEvent event)
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == DialogExResultLeft) {
             scene_manager_previous_scene(scene_manager);
-            consumed = true;
         } else if(event.event == DialogExResultRight) {
-            bool success = false;
-            InfraredRemote* remote = infrared->remote;
+            // Delete a button or a remote in a separate thread
+            infrared_blocking_task_start(infrared, infrared_scene_edit_delete_task_callback);
+
+        } else if(event.event == InfraredCustomEventTypeTaskFinished) {
+            const bool task_success = infrared_blocking_task_finalize(infrared);
+
             InfraredAppState* app_state = &infrared->app_state;
-            const InfraredEditTarget edit_target = app_state->edit_target;
 
-            if(edit_target == InfraredEditTargetButton) {
-                furi_assert(app_state->current_button_index != InfraredButtonIndexNone);
-                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_crash();
-            }
-
-            if(success) {
+            if(task_success) {
                 scene_manager_next_scene(scene_manager, InfraredSceneEditDeleteDone);
             } else {
-                infrared_show_error_message(
-                    infrared,
-                    "Failed to\ndelete %s",
-                    edit_target == InfraredEditTargetButton ? "button" : "file");
+                const char* edit_target_text =
+                    app_state->edit_target == InfraredEditTargetButton ? "button" : "file";
+                infrared_show_error_message(infrared, "Failed to\ndelete %s", edit_target_text);
+
                 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));
             }
-            consumed = true;
+
+            app_state->current_button_index = InfraredButtonIndexNone;
         }
+        consumed = true;
     }
 
     return consumed;
@@ -124,5 +133,5 @@ bool infrared_scene_edit_delete_on_event(void* context, SceneManagerEvent event)
 
 void infrared_scene_edit_delete_on_exit(void* context) {
     InfraredApp* infrared = context;
-    view_stack_remove_view(infrared->view_stack, dialog_ex_get_view(infrared->dialog_ex));
+    dialog_ex_reset(infrared->dialog_ex);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_move.c b/applications/main/infrared/scenes/infrared_scene_edit_move.c
index 4959a8310..fcac1fc15 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_move.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_move.c
@@ -1,5 +1,17 @@
 #include "../infrared_app_i.h"
 
+static int32_t infrared_scene_edit_move_task_callback(void* context) {
+    InfraredApp* infrared = context;
+    const bool success = infrared_remote_move_signal(
+        infrared->remote,
+        infrared->app_state.prev_button_index,
+        infrared->app_state.current_button_index);
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher, InfraredCustomEventTypeTaskFinished);
+
+    return success;
+}
+
 static void infrared_scene_edit_move_button_callback(
     uint32_t index_old,
     uint32_t index_new,
@@ -26,10 +38,7 @@ void infrared_scene_edit_move_on_enter(void* context) {
     infrared_move_view_set_callback(
         infrared->move_view, infrared_scene_edit_move_button_callback, infrared);
 
-    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);
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewMove);
 }
 
 bool infrared_scene_edit_move_on_event(void* context, SceneManagerEvent event) {
@@ -38,25 +47,23 @@ bool infrared_scene_edit_move_on_event(void* context, SceneManagerEvent event) {
 
     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);
+            // Move the button in a separate thread
+            infrared_blocking_task_start(infrared, infrared_scene_edit_move_task_callback);
 
-            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));
+        } else if(event.event == InfraredCustomEventTypeTaskFinished) {
+            const bool task_success = infrared_blocking_task_finalize(infrared);
+
+            if(!task_success) {
+                const char* signal_name = infrared_remote_get_signal_name(
+                    infrared->remote, infrared->app_state.current_button_index);
+                infrared_show_error_message(infrared, "Failed to move\n\"%s\"", signal_name);
                 scene_manager_search_and_switch_to_previous_scene(
                     infrared->scene_manager, InfraredSceneRemoteList);
+            } else {
+                view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewMove);
             }
-
-            consumed = true;
         }
+        consumed = true;
     }
 
     return consumed;
@@ -64,6 +71,5 @@ bool infrared_scene_edit_move_on_event(void* context, SceneManagerEvent event) {
 
 void infrared_scene_edit_move_on_exit(void* context) {
     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 178690926..a546ad6e5 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_rename.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_rename.c
@@ -3,6 +3,28 @@
 #include <string.h>
 #include <toolbox/path.h>
 
+static int32_t infrared_scene_edit_rename_task_callback(void* context) {
+    InfraredApp* infrared = context;
+    InfraredAppState* app_state = &infrared->app_state;
+    const InfraredEditTarget edit_target = app_state->edit_target;
+
+    bool success;
+    if(edit_target == InfraredEditTargetButton) {
+        furi_assert(app_state->current_button_index != InfraredButtonIndexNone);
+        success = infrared_remote_rename_signal(
+            infrared->remote, app_state->current_button_index, infrared->text_store[0]);
+    } else if(edit_target == InfraredEditTargetRemote) {
+        success = infrared_rename_current_remote(infrared, infrared->text_store[0]);
+    } else {
+        furi_crash();
+    }
+
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher, InfraredCustomEventTypeTaskFinished);
+
+    return success;
+}
+
 void infrared_scene_edit_rename_on_enter(void* context) {
     InfraredApp* infrared = context;
     InfraredRemote* remote = infrared->remote;
@@ -53,49 +75,36 @@ void infrared_scene_edit_rename_on_enter(void* context) {
         enter_name_length,
         false);
 
-    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);
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewTextInput);
 }
 
 bool infrared_scene_edit_rename_on_event(void* context, SceneManagerEvent event) {
     InfraredApp* infrared = context;
-    InfraredRemote* remote = infrared->remote;
     SceneManager* scene_manager = infrared->scene_manager;
-    InfraredAppState* app_state = &infrared->app_state;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == InfraredCustomEventTypeTextEditDone) {
-            bool success = false;
-            const InfraredEditTarget edit_target = app_state->edit_target;
-            if(edit_target == InfraredEditTargetButton) {
-                const int32_t current_button_index = app_state->current_button_index;
-                furi_assert(current_button_index != InfraredButtonIndexNone);
-                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_crash();
-            }
+            // Rename a button or a remote in a separate thread
+            infrared_blocking_task_start(infrared, infrared_scene_edit_rename_task_callback);
 
-            if(success) {
+        } else if(event.event == InfraredCustomEventTypeTaskFinished) {
+            const bool task_success = infrared_blocking_task_finalize(infrared);
+            InfraredAppState* app_state = &infrared->app_state;
+
+            if(task_success) {
                 scene_manager_next_scene(scene_manager, InfraredSceneEditRenameDone);
             } else {
-                infrared_show_error_message(
-                    infrared,
-                    "Failed to\nrename %s",
-                    edit_target == InfraredEditTargetButton ? "button" : "file");
+                const char* edit_target_text =
+                    app_state->edit_target == InfraredEditTargetButton ? "button" : "file";
+                infrared_show_error_message(infrared, "Failed to\nrename %s", edit_target_text);
                 scene_manager_search_and_switch_to_previous_scene(
                     scene_manager, InfraredSceneRemoteList);
             }
-            consumed = true;
+
+            app_state->current_button_index = InfraredButtonIndexNone;
         }
+        consumed = true;
     }
 
     return consumed;
@@ -105,12 +114,10 @@ void infrared_scene_edit_rename_on_exit(void* 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);
-
+    ValidatorIsFile* validator_context = text_input_get_validator_callback_context(text_input);
     if(validator_context) {
-        validator_is_file_free((ValidatorIsFile*)validator_context);
+        validator_is_file_free(validator_context);
     }
+
+    text_input_reset(text_input);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_gpio_settings.c b/applications/main/infrared/scenes/infrared_scene_gpio_settings.c
new file mode 100644
index 000000000..07782c08b
--- /dev/null
+++ b/applications/main/infrared/scenes/infrared_scene_gpio_settings.c
@@ -0,0 +1,102 @@
+#include "../infrared_app_i.h"
+
+static const char* infrared_scene_gpio_settings_pin_text[] = {
+    "Flipper",
+    "2 (A7)",
+    "Detect",
+};
+
+static const char* infrared_scene_gpio_settings_otg_text[] = {
+    "OFF",
+    "ON",
+};
+
+static void infrared_scene_gpio_settings_pin_change_callback(VariableItem* item) {
+    InfraredApp* infrared = variable_item_get_context(item);
+    const uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, infrared_scene_gpio_settings_pin_text[index]);
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher,
+        infrared_custom_event_pack(InfraredCustomEventTypeGpioTxPinChanged, index));
+}
+
+static void infrared_scene_gpio_settings_otg_change_callback(VariableItem* item) {
+    InfraredApp* infrared = variable_item_get_context(item);
+    const uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, infrared_scene_gpio_settings_otg_text[index]);
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher,
+        infrared_custom_event_pack(InfraredCustomEventTypeGpioOtgChanged, index));
+}
+
+static void infrared_scene_gpio_settings_init(InfraredApp* infrared) {
+    VariableItemList* var_item_list = infrared->var_item_list;
+    VariableItem* item;
+    uint8_t value_index;
+
+    item = variable_item_list_add(
+        var_item_list,
+        "Signal Output",
+        COUNT_OF(infrared_scene_gpio_settings_pin_text),
+        infrared_scene_gpio_settings_pin_change_callback,
+        infrared);
+
+    value_index = infrared->app_state.tx_pin;
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, infrared_scene_gpio_settings_pin_text[value_index]);
+
+    item = variable_item_list_add(
+        var_item_list,
+        "5V on GPIO",
+        COUNT_OF(infrared_scene_gpio_settings_otg_text),
+        infrared_scene_gpio_settings_otg_change_callback,
+        infrared);
+
+    if(infrared->app_state.tx_pin < FuriHalInfraredTxPinMax) {
+        value_index = infrared->app_state.is_otg_enabled;
+        variable_item_set_current_value_index(item, value_index);
+        variable_item_set_current_value_text(
+            item, infrared_scene_gpio_settings_otg_text[value_index]);
+    } else {
+        variable_item_set_values_count(item, 1);
+        variable_item_set_current_value_index(item, 0);
+        variable_item_set_current_value_text(item, "Auto");
+    }
+}
+
+void infrared_scene_gpio_settings_on_enter(void* context) {
+    InfraredApp* infrared = context;
+    infrared_scene_gpio_settings_init(infrared);
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewVariableList);
+}
+
+bool infrared_scene_gpio_settings_on_event(void* context, SceneManagerEvent event) {
+    bool consumed = false;
+
+    InfraredApp* infrared = context;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        const uint16_t custom_event_type = infrared_custom_event_get_type(event.event);
+        const uint16_t custom_event_value = infrared_custom_event_get_value(event.event);
+
+        if(custom_event_type == InfraredCustomEventTypeGpioTxPinChanged) {
+            infrared_set_tx_pin(infrared, custom_event_value);
+            variable_item_list_reset(infrared->var_item_list);
+            infrared_scene_gpio_settings_init(infrared);
+        } else if(custom_event_type == InfraredCustomEventTypeGpioOtgChanged) {
+            infrared_enable_otg(infrared, custom_event_value);
+        }
+
+        consumed = true;
+    }
+
+    return consumed;
+}
+
+void infrared_scene_gpio_settings_on_exit(void* context) {
+    InfraredApp* infrared = context;
+    variable_item_list_reset(infrared->var_item_list);
+    infrared_save_settings(infrared);
+}
diff --git a/applications/main/infrared/scenes/infrared_scene_learn_done.c b/applications/main/infrared/scenes/infrared_scene_learn_done.c
index a0c605b0b..6fcb44110 100644
--- a/applications/main/infrared/scenes/infrared_scene_learn_done.c
+++ b/applications/main/infrared/scenes/infrared_scene_learn_done.c
@@ -6,7 +6,7 @@ void infrared_scene_learn_done_on_enter(void* context) {
 
     if(infrared->app_state.is_learning_new_remote) {
         popup_set_icon(popup, 48, 6, &I_DolphinDone_80x58);
-        popup_set_header(popup, "New remote\ncreated!", 0, 0, AlignLeft, AlignTop);
+        popup_set_header(popup, "Success!", 10, 12, AlignLeft, AlignTop);
     } else {
         popup_set_icon(popup, 36, 5, &I_DolphinSaved_92x58);
         popup_set_header(popup, "Saved", 15, 19, AlignLeft, AlignBottom);
diff --git a/applications/main/infrared/scenes/infrared_scene_remote_list.c b/applications/main/infrared/scenes/infrared_scene_remote_list.c
index 2276e270a..9c880ac2f 100644
--- a/applications/main/infrared/scenes/infrared_scene_remote_list.c
+++ b/applications/main/infrared/scenes/infrared_scene_remote_list.c
@@ -1,41 +1,56 @@
 #include "../infrared_app_i.h"
 
-void infrared_scene_remote_list_on_enter(void* context) {
+static int32_t infrared_scene_remote_list_task_callback(void* 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);
+    const bool success =
+        infrared_remote_load(infrared->remote, furi_string_get_cstr(infrared->file_path));
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher, InfraredCustomEventTypeTaskFinished);
+    return success;
+}
 
+static void infrared_scene_remote_list_select_and_load(InfraredApp* infrared) {
     DialogsFileBrowserOptions browser_options;
     dialog_file_browser_set_basic_options(&browser_options, INFRARED_APP_EXTENSION, &I_ir_10px);
     browser_options.base_path = INFRARED_APP_FOLDER;
 
-    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);
+    const bool file_selected = dialog_file_browser_show(
+        infrared->dialogs, infrared->file_path, infrared->file_path, &browser_options);
 
-        infrared_show_loading_popup(infrared, true);
-        const bool remote_loaded = infrared_remote_load(infrared->remote, file_path);
-        infrared_show_loading_popup(infrared, false);
+    if(file_selected) {
+        // Load the remote in a separate thread
+        infrared_blocking_task_start(infrared, infrared_scene_remote_list_task_callback);
 
-        if(remote_loaded) {
-            scene_manager_next_scene(scene_manager, InfraredSceneRemote);
-            return;
-        } else {
-            infrared_show_error_message(infrared, "Failed to load\n\"%s\"", file_path);
-        }
+    } else {
+        scene_manager_previous_scene(infrared->scene_manager);
     }
+}
 
-    scene_manager_previous_scene(scene_manager);
+void infrared_scene_remote_list_on_enter(void* context) {
+    InfraredApp* infrared = context;
+    infrared_scene_remote_list_select_and_load(infrared);
 }
 
 bool infrared_scene_remote_list_on_event(void* context, SceneManagerEvent event) {
-    UNUSED(context);
-    UNUSED(event);
+    InfraredApp* infrared = context;
+
     bool consumed = false;
 
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == InfraredCustomEventTypeTaskFinished) {
+            const bool task_success = infrared_blocking_task_finalize(infrared);
+
+            if(task_success) {
+                scene_manager_next_scene(infrared->scene_manager, InfraredSceneRemote);
+            } else {
+                infrared_show_error_message(
+                    infrared, "Failed to load\n\"%s\"", furi_string_get_cstr(infrared->file_path));
+                infrared_scene_remote_list_select_and_load(infrared);
+            }
+        }
+        consumed = true;
+    }
+
     return consumed;
 }
 
diff --git a/applications/main/infrared/scenes/infrared_scene_rpc.c b/applications/main/infrared/scenes/infrared_scene_rpc.c
index f3408fba4..4c263a117 100644
--- a/applications/main/infrared/scenes/infrared_scene_rpc.c
+++ b/applications/main/infrared/scenes/infrared_scene_rpc.c
@@ -9,6 +9,15 @@ typedef enum {
     InfraredRpcStateSending,
 } InfraredRpcState;
 
+static int32_t infrared_scene_rpc_task_callback(void* context) {
+    InfraredApp* infrared = context;
+    const bool success =
+        infrared_remote_load(infrared->remote, furi_string_get_cstr(infrared->file_path));
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher, InfraredCustomEventTypeTaskFinished);
+    return success;
+}
+
 void infrared_scene_rpc_on_enter(void* context) {
     InfraredApp* infrared = context;
     Popup* popup = infrared->popup;
@@ -22,9 +31,7 @@ void infrared_scene_rpc_on_enter(void* context) {
     popup_set_callback(popup, infrared_popup_closed_callback);
 
     view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewPopup);
-
     scene_manager_set_scene_state(infrared->scene_manager, InfraredSceneRpc, InfraredRpcStateIdle);
-
     notification_message(infrared->notifications, &sequence_display_backlight_on);
 }
 
@@ -33,76 +40,89 @@ bool infrared_scene_rpc_on_event(void* context, SceneManagerEvent event) {
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
-        consumed = true;
-        InfraredRpcState state =
+        InfraredAppState* app_state = &infrared->app_state;
+        InfraredRpcState rpc_state =
             scene_manager_get_scene_state(infrared->scene_manager, InfraredSceneRpc);
-        if(event.event == InfraredCustomEventTypeBackPressed) {
-            view_dispatcher_stop(infrared->view_dispatcher);
-        } else if(event.event == InfraredCustomEventTypePopupClosed) {
-            view_dispatcher_stop(infrared->view_dispatcher);
-        } else if(event.event == InfraredCustomEventTypeRpcLoadFile) {
-            bool result = false;
-            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);
-                }
-            }
-            const char* remote_name = infrared_remote_get_name(infrared->remote);
 
-            infrared_text_store_set(infrared, 0, "loaded\n%s", remote_name);
+        if(event.event == InfraredCustomEventTypeRpcLoadFile) {
+            if(rpc_state == InfraredRpcStateIdle) {
+                // Load the remote in a separate thread
+                infrared_blocking_task_start(infrared, infrared_scene_rpc_task_callback);
+            }
+
+        } else if(event.event == InfraredCustomEventTypeTaskFinished) {
+            const bool task_success = infrared_blocking_task_finalize(infrared);
+
+            if(task_success) {
+                const char* remote_name = infrared_remote_get_name(infrared->remote);
+                infrared_text_store_set(infrared, 0, "loaded\n%s", remote_name);
+                scene_manager_set_scene_state(
+                    infrared->scene_manager, InfraredSceneRpc, InfraredRpcStateLoaded);
+
+            } else {
+                infrared_text_store_set(
+                    infrared, 0, "failed to load\n%s", furi_string_get_cstr(infrared->file_path));
+            }
+
             popup_set_text(
                 infrared->popup, infrared->text_store[0], 89, 44, AlignCenter, AlignTop);
+            view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewPopup);
+
+            rpc_system_app_confirm(infrared->rpc_ctx, task_success);
 
-            rpc_system_app_confirm(infrared->rpc_ctx, result);
         } else if(
             event.event == InfraredCustomEventTypeRpcButtonPressName ||
             event.event == InfraredCustomEventTypeRpcButtonPressIndex) {
             bool result = false;
-            if(state == InfraredRpcStateLoaded) {
+            if(rpc_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;
+                    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);
+                        TAG, "Sending signal with index \"%ld\"", 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);
+                    infrared_tx_start_button_index(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, result);
+
         } else if(event.event == InfraredCustomEventTypeRpcButtonRelease) {
             bool result = false;
-            if(state == InfraredRpcStateSending) {
+
+            if(rpc_state == InfraredRpcStateSending) {
                 infrared_tx_stop(infrared);
                 result = true;
                 scene_manager_set_scene_state(
                     infrared->scene_manager, InfraredSceneRpc, InfraredRpcStateLoaded);
             }
+
             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, true);
-        } else if(event.event == InfraredCustomEventTypeRpcSessionClose) {
+
+        } else if(
+            event.event == InfraredCustomEventTypeRpcExit ||
+            event.event == InfraredCustomEventTypeRpcSessionClose ||
+            event.event == InfraredCustomEventTypePopupClosed) {
             scene_manager_stop(infrared->scene_manager);
             view_dispatcher_stop(infrared->view_dispatcher);
+
+            if(event.event == InfraredCustomEventTypeRpcExit) {
+                rpc_system_app_confirm(infrared->rpc_ctx, true);
+            }
         }
+
+        consumed = true;
     }
+
     return consumed;
 }
 
@@ -112,5 +132,6 @@ void infrared_scene_rpc_on_exit(void* context) {
        InfraredRpcStateSending) {
         infrared_tx_stop(infrared);
     }
+
     popup_reset(infrared->popup);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_start.c b/applications/main/infrared/scenes/infrared_scene_start.c
index c27be304e..314f4865e 100644
--- a/applications/main/infrared/scenes/infrared_scene_start.c
+++ b/applications/main/infrared/scenes/infrared_scene_start.c
@@ -4,7 +4,7 @@ enum SubmenuIndex {
     SubmenuIndexUniversalRemotes,
     SubmenuIndexLearnNewRemote,
     SubmenuIndexSavedRemotes,
-    SubmenuIndexDebugSettings,
+    SubmenuIndexGpioSettings,
     SubmenuIndexLearnNewRemoteRaw,
     SubmenuIndexDebug
 };
@@ -40,7 +40,7 @@ void infrared_scene_start_on_enter(void* context) {
     submenu_add_item(
         submenu,
         "GPIO Settings",
-        SubmenuIndexDebugSettings,
+        SubmenuIndexGpioSettings,
         infrared_scene_start_submenu_callback,
         infrared);
 
@@ -78,7 +78,6 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
         scene_manager_set_scene_state(scene_manager, InfraredSceneStart, submenu_index);
         if(submenu_index == SubmenuIndexUniversalRemotes) {
             scene_manager_next_scene(scene_manager, InfraredSceneUniversal);
-            consumed = true;
         } else if(
             submenu_index == SubmenuIndexLearnNewRemote ||
             submenu_index == SubmenuIndexLearnNewRemoteRaw) {
@@ -89,18 +88,16 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
 
             infrared->app_state.is_learning_new_remote = true;
             scene_manager_next_scene(scene_manager, InfraredSceneLearn);
-            consumed = true;
         } else if(submenu_index == SubmenuIndexSavedRemotes) {
             furi_string_set(infrared->file_path, INFRARED_APP_FOLDER);
             scene_manager_next_scene(scene_manager, InfraredSceneRemoteList);
-            consumed = true;
+        } else if(submenu_index == SubmenuIndexGpioSettings) {
+            scene_manager_next_scene(scene_manager, InfraredSceneGpioSettings);
         } else if(submenu_index == SubmenuIndexDebug) {
             scene_manager_next_scene(scene_manager, InfraredSceneDebug);
-            consumed = true;
-        } else if(submenu_index == SubmenuIndexDebugSettings) {
-            scene_manager_next_scene(scene_manager, InfraredSceneDebugSettings);
-            consumed = true;
         }
+
+        consumed = true;
     }
 
     return consumed;
diff --git a/applications/main/infrared/scenes/infrared_scene_universal_ac.c b/applications/main/infrared/scenes/infrared_scene_universal_ac.c
index 764a95189..b82bcc1f9 100644
--- a/applications/main/infrared/scenes/infrared_scene_universal_ac.c
+++ b/applications/main/infrared/scenes/infrared_scene_universal_ac.c
@@ -3,8 +3,6 @@
 #include "common/infrared_scene_universal_common.h"
 
 void infrared_scene_universal_ac_on_enter(void* context) {
-    infrared_scene_universal_common_on_enter(context);
-
     InfraredApp* infrared = context;
     ButtonPanel* button_panel = infrared->button_panel;
     InfraredBruteForce* brute_force = infrared->brute_force;
@@ -122,16 +120,7 @@ void infrared_scene_universal_ac_on_enter(void* context) {
 
     button_panel_add_label(button_panel, 4, 10, FontPrimary, "AC remote");
 
-    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
-
-    infrared_show_loading_popup(infrared, true);
-    bool success = infrared_brute_force_calculate_messages(brute_force);
-    infrared_show_loading_popup(infrared, false);
-
-    if(!success) {
-        scene_manager_next_scene(infrared->scene_manager, InfraredSceneErrorDatabases);
-    }
+    infrared_scene_universal_common_on_enter(context);
 }
 
 bool infrared_scene_universal_ac_on_event(void* context, SceneManagerEvent event) {
diff --git a/applications/main/infrared/scenes/infrared_scene_universal_audio.c b/applications/main/infrared/scenes/infrared_scene_universal_audio.c
index 241a22bcb..a15b2ce99 100644
--- a/applications/main/infrared/scenes/infrared_scene_universal_audio.c
+++ b/applications/main/infrared/scenes/infrared_scene_universal_audio.c
@@ -3,8 +3,6 @@
 #include "common/infrared_scene_universal_common.h"
 
 void infrared_scene_universal_audio_on_enter(void* context) {
-    infrared_scene_universal_common_on_enter(context);
-
     InfraredApp* infrared = context;
     ButtonPanel* button_panel = infrared->button_panel;
     InfraredBruteForce* brute_force = infrared->brute_force;
@@ -119,16 +117,7 @@ void infrared_scene_universal_audio_on_enter(void* context) {
     button_panel_add_label(button_panel, 1, 10, FontPrimary, "Mus. remote");
     button_panel_add_icon(button_panel, 34, 56, &I_vol_ac_text_30x30);
 
-    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
-
-    infrared_show_loading_popup(infrared, true);
-    bool success = infrared_brute_force_calculate_messages(brute_force);
-    infrared_show_loading_popup(infrared, false);
-
-    if(!success) {
-        scene_manager_next_scene(infrared->scene_manager, InfraredSceneErrorDatabases);
-    }
+    infrared_scene_universal_common_on_enter(context);
 }
 
 bool infrared_scene_universal_audio_on_event(void* context, SceneManagerEvent event) {
diff --git a/applications/main/infrared/scenes/infrared_scene_universal_fan.c b/applications/main/infrared/scenes/infrared_scene_universal_fan.c
index 9074b5508..5fdea5a0a 100644
--- a/applications/main/infrared/scenes/infrared_scene_universal_fan.c
+++ b/applications/main/infrared/scenes/infrared_scene_universal_fan.c
@@ -3,8 +3,6 @@
 #include "common/infrared_scene_universal_common.h"
 
 void infrared_scene_universal_fan_on_enter(void* context) {
-    infrared_scene_universal_common_on_enter(context);
-
     InfraredApp* infrared = context;
     ButtonPanel* button_panel = infrared->button_panel;
     InfraredBruteForce* brute_force = infrared->brute_force;
@@ -97,16 +95,7 @@ void infrared_scene_universal_fan_on_enter(void* context) {
     button_panel_add_label(button_panel, 5, 11, FontPrimary, "Fan remote");
     button_panel_add_icon(button_panel, 34, 68, &I_speed_text_30x30);
 
-    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
-
-    infrared_show_loading_popup(infrared, true);
-    bool success = infrared_brute_force_calculate_messages(brute_force);
-    infrared_show_loading_popup(infrared, false);
-
-    if(!success) {
-        scene_manager_next_scene(infrared->scene_manager, InfraredSceneErrorDatabases);
-    }
+    infrared_scene_universal_common_on_enter(context);
 }
 
 bool infrared_scene_universal_fan_on_event(void* context, SceneManagerEvent event) {
diff --git a/applications/main/infrared/scenes/infrared_scene_universal_projector.c b/applications/main/infrared/scenes/infrared_scene_universal_projector.c
index f874d62e2..19bcfd9be 100644
--- a/applications/main/infrared/scenes/infrared_scene_universal_projector.c
+++ b/applications/main/infrared/scenes/infrared_scene_universal_projector.c
@@ -3,8 +3,6 @@
 #include "common/infrared_scene_universal_common.h"
 
 void infrared_scene_universal_projector_on_enter(void* context) {
-    infrared_scene_universal_common_on_enter(context);
-
     InfraredApp* infrared = context;
     ButtonPanel* button_panel = infrared->button_panel;
     InfraredBruteForce* brute_force = infrared->brute_force;
@@ -94,16 +92,7 @@ void infrared_scene_universal_projector_on_enter(void* context) {
     button_panel_add_label(button_panel, 3, 11, FontPrimary, "Proj. remote");
     button_panel_add_icon(button_panel, 34, 68, &I_vol_ac_text_30x30);
 
-    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
-
-    infrared_show_loading_popup(infrared, true);
-    bool success = infrared_brute_force_calculate_messages(brute_force);
-    infrared_show_loading_popup(infrared, false);
-
-    if(!success) {
-        scene_manager_next_scene(infrared->scene_manager, InfraredSceneErrorDatabases);
-    }
+    infrared_scene_universal_common_on_enter(context);
 }
 
 bool infrared_scene_universal_projector_on_event(void* context, SceneManagerEvent event) {
diff --git a/applications/main/infrared/scenes/infrared_scene_universal_tv.c b/applications/main/infrared/scenes/infrared_scene_universal_tv.c
index 6031205f5..16633e29c 100644
--- a/applications/main/infrared/scenes/infrared_scene_universal_tv.c
+++ b/applications/main/infrared/scenes/infrared_scene_universal_tv.c
@@ -3,8 +3,6 @@
 #include "common/infrared_scene_universal_common.h"
 
 void infrared_scene_universal_tv_on_enter(void* context) {
-    infrared_scene_universal_common_on_enter(context);
-
     InfraredApp* infrared = context;
     ButtonPanel* button_panel = infrared->button_panel;
     InfraredBruteForce* brute_force = infrared->brute_force;
@@ -95,16 +93,7 @@ void infrared_scene_universal_tv_on_enter(void* context) {
 
     button_panel_add_label(button_panel, 5, 10, FontPrimary, "TV remote");
 
-    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
-
-    infrared_show_loading_popup(infrared, true);
-    bool success = infrared_brute_force_calculate_messages(brute_force);
-    infrared_show_loading_popup(infrared, false);
-
-    if(!success) {
-        scene_manager_next_scene(infrared->scene_manager, InfraredSceneErrorDatabases);
-    }
+    infrared_scene_universal_common_on_enter(context);
 }
 
 bool infrared_scene_universal_tv_on_event(void* context, SceneManagerEvent event) {
diff --git a/applications/main/infrared/views/infrared_debug_view.c b/applications/main/infrared/views/infrared_debug_view.c
index ec0896281..4eb58434c 100644
--- a/applications/main/infrared/views/infrared_debug_view.c
+++ b/applications/main/infrared/views/infrared_debug_view.c
@@ -30,7 +30,7 @@ static void infrared_debug_view_draw_callback(Canvas* canvas, void* model) {
     }
 }
 
-InfraredDebugView* infrared_debug_view_alloc() {
+InfraredDebugView* infrared_debug_view_alloc(void) {
     InfraredDebugView* debug_view = malloc(sizeof(InfraredDebugView));
     debug_view->view = view_alloc();
     view_allocate_model(debug_view->view, ViewModelTypeLocking, sizeof(InfraredDebugViewModel));
diff --git a/applications/main/infrared/views/infrared_debug_view.h b/applications/main/infrared/views/infrared_debug_view.h
index 722850f8d..29cb0ff2d 100644
--- a/applications/main/infrared/views/infrared_debug_view.h
+++ b/applications/main/infrared/views/infrared_debug_view.h
@@ -4,7 +4,7 @@
 
 typedef struct InfraredDebugView InfraredDebugView;
 
-InfraredDebugView* infrared_debug_view_alloc();
+InfraredDebugView* infrared_debug_view_alloc(void);
 void infrared_debug_view_free(InfraredDebugView* debug_view);
 
 View* infrared_debug_view_get_view(InfraredDebugView* debug_view);
diff --git a/applications/main/infrared/views/infrared_move_view.c b/applications/main/infrared/views/infrared_move_view.c
index 374a65a44..5635d8a74 100644
--- a/applications/main/infrared/views/infrared_move_view.c
+++ b/applications/main/infrared/views/infrared_move_view.c
@@ -34,7 +34,7 @@ static void infrared_move_view_draw_callback(Canvas* canvas, void* _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");
+        canvas, canvas_width(canvas) / 2, 0, AlignCenter, AlignTop, "Select a Button to Move");
 
     const size_t btn_number = InfraredMoveViewItemArray_size(model->labels);
     const bool show_scrollbar = btn_number > LIST_ITEMS;
diff --git a/applications/main/infrared/views/infrared_progress_view.h b/applications/main/infrared/views/infrared_progress_view.h
index 4f3c3a875..9d1f70e91 100644
--- a/applications/main/infrared/views/infrared_progress_view.h
+++ b/applications/main/infrared/views/infrared_progress_view.h
@@ -20,7 +20,7 @@ typedef void (*InfraredProgressViewBackCallback)(void*);
  *
  * @retval new allocated instance
  */
-InfraredProgressView* infrared_progress_view_alloc();
+InfraredProgressView* infrared_progress_view_alloc(void);
 
 /** Free previously allocated Progress view module instance
  *
diff --git a/applications/main/lfrfid/lfrfid.c b/applications/main/lfrfid/lfrfid.c
index bd64c7906..7fc6cf6b0 100644
--- a/applications/main/lfrfid/lfrfid.c
+++ b/applications/main/lfrfid/lfrfid.c
@@ -57,7 +57,7 @@ static void rpc_command_callback(const RpcAppSystemEvent* event, void* context)
     }
 }
 
-static LfRfid* lfrfid_alloc() {
+static LfRfid* lfrfid_alloc(void) {
     LfRfid* lfrfid = malloc(sizeof(LfRfid));
 
     lfrfid->storage = furi_record_open(RECORD_STORAGE);
diff --git a/applications/main/lfrfid/lfrfid_cli.c b/applications/main/lfrfid/lfrfid_cli.c
index af340008a..2101670fa 100644
--- a/applications/main/lfrfid/lfrfid_cli.c
+++ b/applications/main/lfrfid/lfrfid_cli.c
@@ -17,13 +17,13 @@
 static void lfrfid_cli(Cli* cli, FuriString* args, void* context);
 
 // app cli function
-void lfrfid_on_system_start() {
+void lfrfid_on_system_start(void) {
     Cli* cli = furi_record_open(RECORD_CLI);
     cli_add_command(cli, "rfid", CliCommandFlagDefault, lfrfid_cli, NULL);
     furi_record_close(RECORD_CLI);
 }
 
-static void lfrfid_cli_print_usage() {
+static void lfrfid_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("rfid read <optional: normal | indala>         - read in ASK/PSK mode\r\n");
     printf("rfid <write | emulate> <key_type> <key_data>  - write or emulate a card\r\n");
diff --git a/applications/main/lfrfid/lfrfid_i.h b/applications/main/lfrfid/lfrfid_i.h
index cff2c6cc4..7a05e9e91 100644
--- a/applications/main/lfrfid/lfrfid_i.h
+++ b/applications/main/lfrfid/lfrfid_i.h
@@ -124,6 +124,13 @@ typedef enum {
     LfRfidViewRead,
 } LfRfidView;
 
+typedef enum {
+    LfRfidMenuIndexRead,
+    LfRfidMenuIndexSaved,
+    LfRfidMenuIndexAddManually,
+    LfRfidMenuIndexExtraActions,
+} LfRfidMenuIndex;
+
 bool lfrfid_save_key(LfRfid* app);
 
 bool lfrfid_load_key_from_file_select(LfRfid* app);
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_delete_confirm.c b/applications/main/lfrfid/scenes/lfrfid_scene_delete_confirm.c
index b7702e269..17d024d36 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_delete_confirm.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_delete_confirm.c
@@ -1,45 +1,50 @@
 #include "../lfrfid_i.h"
 
+#define LFRFID_SCENE_DELETE_MAX_HEX_WIDTH (7UL)
+
 void lfrfid_scene_delete_confirm_on_enter(void* context) {
     LfRfid* app = context;
     Widget* widget = app->widget;
 
-    FuriString* tmp_string;
-    tmp_string = furi_string_alloc();
+    FuriString* display_text = furi_string_alloc_printf(
+        "\e#Delete %s?\e#\n"
+        "Hex: ",
+        furi_string_get_cstr(app->file_name));
 
-    widget_add_button_element(widget, GuiButtonTypeLeft, "Back", lfrfid_widget_callback, app);
-    widget_add_button_element(widget, GuiButtonTypeRight, "Delete", lfrfid_widget_callback, app);
+    const size_t data_size = protocol_dict_get_data_size(app->dict, app->protocol_id);
+    uint8_t* data = malloc(data_size);
 
-    furi_string_printf(tmp_string, "Delete %s?", furi_string_get_cstr(app->file_name));
-    widget_add_string_element(
-        widget, 64, 0, AlignCenter, AlignTop, FontPrimary, furi_string_get_cstr(tmp_string));
+    protocol_dict_get_data(app->dict, app->protocol_id, data, data_size);
 
-    furi_string_reset(tmp_string);
-    size_t size = protocol_dict_get_data_size(app->dict, app->protocol_id);
-    uint8_t* data = (uint8_t*)malloc(size);
-    protocol_dict_get_data(app->dict, app->protocol_id, data, size);
-    for(uint8_t i = 0; i < MIN(size, (size_t)8); i++) {
-        if(i != 0) {
-            furi_string_cat_printf(tmp_string, " ");
+    for(size_t i = 0; i < data_size; i++) {
+        if(i == LFRFID_SCENE_DELETE_MAX_HEX_WIDTH) {
+            furi_string_cat(display_text, " ...");
+            break;
         }
 
-        furi_string_cat_printf(tmp_string, "%02X", data[i]);
+        furi_string_cat_printf(display_text, "%s%02X", i != 0 ? " " : "", data[i]);
     }
+
+    furi_string_push_back(display_text, '\n');
+
     free(data);
 
-    widget_add_string_element(
-        widget, 64, 19, AlignCenter, AlignTop, FontSecondary, furi_string_get_cstr(tmp_string));
-    widget_add_string_element(
-        widget,
-        64,
-        49,
-        AlignCenter,
-        AlignBottom,
-        FontSecondary,
-        protocol_dict_get_name(app->dict, app->protocol_id));
+    const char* protocol = protocol_dict_get_name(app->dict, app->protocol_id);
+    const char* manufacturer = protocol_dict_get_manufacturer(app->dict, app->protocol_id);
+
+    if(strcasecmp(protocol, manufacturer) != 0 && strcasecmp(manufacturer, "N/A") != 0) {
+        furi_string_cat_printf(display_text, "%s ", manufacturer);
+    }
+
+    furi_string_cat(display_text, protocol);
+
+    widget_add_text_box_element(
+        widget, 0, 0, 128, 64, AlignCenter, AlignTop, furi_string_get_cstr(display_text), true);
+    widget_add_button_element(widget, GuiButtonTypeLeft, "Cancel", lfrfid_widget_callback, app);
+    widget_add_button_element(widget, GuiButtonTypeRight, "Delete", lfrfid_widget_callback, app);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
-    furi_string_free(tmp_string);
+    furi_string_free(display_text);
 }
 
 bool lfrfid_scene_delete_confirm_on_event(void* context, SceneManagerEvent event) {
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c
index abb173a73..9c9b39d3d 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c
@@ -18,10 +18,9 @@ bool lfrfid_scene_delete_success_on_event(void* context, SceneManagerEvent event
     LfRfid* app = context;
     bool consumed = false;
 
-    if((event.type == SceneManagerEventTypeBack) ||
-       ((event.type == SceneManagerEventTypeCustom) && (event.event == LfRfidEventPopupClosed))) {
-        scene_manager_search_and_switch_to_previous_scene(
-            app->scene_manager, LfRfidSceneSelectKey);
+    if(event.type == SceneManagerEventTypeBack || event.type == SceneManagerEventTypeCustom) {
+        // Always return to SceneSelectKey from here
+        scene_manager_search_and_switch_to_another_scene(app->scene_manager, LfRfidSceneSelectKey);
         consumed = true;
     }
 
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c b/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c
index dc3918994..049c24d00 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c
@@ -2,27 +2,28 @@
 
 void lfrfid_scene_emulate_on_enter(void* context) {
     LfRfid* app = context;
-    Popup* popup = app->popup;
+    Widget* widget = app->widget;
 
-    popup_set_header(popup, "Emulating", 89, 30, AlignCenter, AlignTop);
-    if(!furi_string_empty(app->file_name)) {
-        popup_set_text(popup, furi_string_get_cstr(app->file_name), 89, 43, AlignCenter, AlignTop);
+    FuriString* display_text = furi_string_alloc_set("\e#Emulating\e#\n");
+
+    if(furi_string_empty(app->file_name)) {
+        furi_string_cat(display_text, "Unsaved\n");
+        furi_string_cat(display_text, protocol_dict_get_name(app->dict, app->protocol_id));
     } else {
-        popup_set_text(
-            popup,
-            protocol_dict_get_name(app->dict, app->protocol_id),
-            89,
-            43,
-            AlignCenter,
-            AlignTop);
+        furi_string_cat(display_text, app->file_name);
     }
-    popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
+
+    widget_add_icon_element(widget, 0, 0, &I_NFC_dolphin_emulation_51x64);
+    widget_add_text_box_element(
+        widget, 55, 16, 67, 48, AlignCenter, AlignTop, furi_string_get_cstr(display_text), true);
+
+    furi_string_free(display_text);
 
     lfrfid_worker_start_thread(app->lfworker);
     lfrfid_worker_emulate_start(app->lfworker, (LFRFIDProtocol)app->protocol_id);
     notification_message(app->notifications, &sequence_blink_start_magenta);
 
-    view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
+    view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
 }
 
 bool lfrfid_scene_emulate_on_event(void* context, SceneManagerEvent event) {
@@ -35,7 +36,7 @@ bool lfrfid_scene_emulate_on_event(void* context, SceneManagerEvent event) {
 void lfrfid_scene_emulate_on_exit(void* context) {
     LfRfid* app = context;
     notification_message(app->notifications, &sequence_blink_stop);
-    popup_reset(app->popup);
+    widget_reset(app->widget);
     lfrfid_worker_stop(app->lfworker);
     lfrfid_worker_stop_thread(app->lfworker);
 }
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_exit_confirm.c b/applications/main/lfrfid/scenes/lfrfid_scene_exit_confirm.c
index e8ab481c6..55f02d740 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_exit_confirm.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_exit_confirm.c
@@ -7,9 +7,9 @@ void lfrfid_scene_exit_confirm_on_enter(void* context) {
     widget_add_button_element(widget, GuiButtonTypeLeft, "Exit", lfrfid_widget_callback, app);
     widget_add_button_element(widget, GuiButtonTypeRight, "Stay", lfrfid_widget_callback, app);
     widget_add_string_element(
-        widget, 64, 19, AlignCenter, AlignBottom, FontPrimary, "Exit to RFID Menu?");
+        widget, 64, 0, AlignCenter, AlignTop, FontPrimary, "Exit to RFID Menu?");
     widget_add_string_element(
-        widget, 64, 31, AlignCenter, AlignBottom, FontSecondary, "All unsaved data will be lost!");
+        widget, 64, 13, AlignCenter, AlignTop, FontSecondary, "All unsaved data will be lost");
 
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
 }
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c b/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c
index db4458236..46472ec2a 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c
@@ -92,6 +92,9 @@ bool lfrfid_scene_extra_actions_on_event(void* context, SceneManagerEvent event)
             consumed = true;
         }
         scene_manager_set_scene_state(app->scene_manager, LfRfidSceneExtraActions, event.event);
+
+    } else if(event.type == SceneManagerEventTypeBack) {
+        scene_manager_set_scene_state(app->scene_manager, LfRfidSceneExtraActions, 0);
     }
 
     return consumed;
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_raw_info.c b/applications/main/lfrfid/scenes/lfrfid_scene_raw_info.c
index f403c1f38..ba85c6ca1 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_raw_info.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_raw_info.c
@@ -4,37 +4,39 @@ void lfrfid_scene_raw_info_on_enter(void* context) {
     LfRfid* app = context;
     Widget* widget = app->widget;
 
-    // FuriString* tmp_string;
-    // tmp_string = furi_string_alloc();
-
-    bool sd_exist = storage_sd_status(app->storage) == FSE_OK;
-    if(!sd_exist) {
-        widget_add_icon_element(widget, 0, 0, &I_SDQuestion_35x43);
-        widget_add_string_multiline_element(
-            widget,
-            81,
-            4,
-            AlignCenter,
-            AlignTop,
-            FontSecondary,
-            "No SD card found.\nThis function will not\nwork without\nSD card.");
-
-        widget_add_button_element(widget, GuiButtonTypeLeft, "Back", lfrfid_widget_callback, app);
-    } else {
+    if(storage_sd_status(app->storage) != FSE_OK) {
+        widget_add_icon_element(widget, 83, 22, &I_WarningDolphinFlip_45x42);
+        widget_add_string_element(
+            widget, 64, 0, AlignCenter, AlignTop, FontPrimary, "No SD Card!");
         widget_add_string_multiline_element(
             widget,
             0,
-            1,
+            13,
             AlignLeft,
             AlignTop,
             FontSecondary,
-            "RAW RFID data reader\n1) Put the Flipper on your card\n2) Press OK\n3) Wait until data is read");
+            "Insert an SD card\n"
+            "to use this function");
+
+    } else {
+        widget_add_text_box_element(
+            widget,
+            0,
+            0,
+            128,
+            64,
+            AlignLeft,
+            AlignTop,
+            "\e#RAW RFID Data Reader\e#\n"
+            "1. Hold card next to Flipper\n"
+            "2. Press OK\n"
+            "3. Wait until data is read",
+            false);
 
         widget_add_button_element(widget, GuiButtonTypeCenter, "OK", lfrfid_widget_callback, app);
     }
 
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
-    //furi_string_free(tmp_string);
 }
 
 bool lfrfid_scene_raw_info_on_event(void* context, SceneManagerEvent event) {
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c b/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c
index b2c7c364e..b86b86b21 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c
@@ -1,6 +1,6 @@
 #include "../lfrfid_i.h"
 
-#define RAW_READ_TIME 5000
+#define RAW_READ_TIME_MS (5000UL)
 
 typedef struct {
     FuriString* string_file_name;
@@ -29,24 +29,28 @@ void lfrfid_scene_raw_read_on_enter(void* context) {
     LfRfid* app = context;
     Popup* popup = app->popup;
 
-    LfRfidReadRawState* state = malloc(sizeof(LfRfidReadRawState));
-    scene_manager_set_scene_state(app->scene_manager, LfRfidSceneRawRead, (uint32_t)state);
-    state->string_file_name = furi_string_alloc();
+    popup_set_icon(popup, 0, 0, &I_NFC_dolphin_emulation_51x64);
+    popup_set_header(popup, "Reading ASK", 91, 16, AlignCenter, AlignTop);
+    popup_set_text(popup, "Don't move\nfor 5 sec.", 91, 29, AlignCenter, AlignTop);
 
-    popup_set_icon(popup, 0, 3, &I_RFIDDolphinReceive_97x61);
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
-    lfrfid_worker_start_thread(app->lfworker);
-    lfrfid_make_app_folder(app);
 
+    LfRfidReadRawState* state = malloc(sizeof(LfRfidReadRawState));
+    state->string_file_name = furi_string_alloc();
     state->timer = furi_timer_alloc(timer_callback, FuriTimerTypeOnce, app);
-    furi_timer_start(state->timer, RAW_READ_TIME);
+
+    scene_manager_set_scene_state(app->scene_manager, LfRfidSceneRawRead, (uint32_t)state);
+
     furi_string_printf(
         state->string_file_name,
         "%s/%s%s",
         LFRFID_SD_FOLDER,
         furi_string_get_cstr(app->raw_file_name),
         LFRFID_APP_RAW_ASK_EXTENSION);
-    popup_set_header(popup, "Reading\nRAW RFID\nASK", 89, 30, AlignCenter, AlignTop);
+
+    lfrfid_make_app_folder(app);
+
+    lfrfid_worker_start_thread(app->lfworker);
     lfrfid_worker_read_raw_start(
         app->lfworker,
         furi_string_get_cstr(state->string_file_name),
@@ -54,6 +58,7 @@ void lfrfid_scene_raw_read_on_enter(void* context) {
         lfrfid_read_callback,
         app);
 
+    furi_timer_start(state->timer, RAW_READ_TIME_MS);
     notification_message(app->notifications, &sequence_blink_start_cyan);
 
     state->is_psk = false;
@@ -70,41 +75,53 @@ bool lfrfid_scene_raw_read_on_event(void* context, SceneManagerEvent event) {
     furi_assert(state);
 
     if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == LfRfidEventReadError) {
-            consumed = true;
-            state->error = true;
-            popup_set_header(
-                popup, "Reading\nRAW RFID\nFile error", 89, 30, AlignCenter, AlignTop);
-            notification_message(app->notifications, &sequence_blink_start_red);
+        if(event.event == LfRfidEventReadError || event.event == LfRfidEventReadOverrun) {
             furi_timer_stop(state->timer);
+
+            popup_set_icon(popup, 83, 22, &I_WarningDolphinFlip_45x42);
+            popup_set_header(popup, "RAW Reading error!", 64, 0, AlignCenter, AlignTop);
+            popup_set_text(
+                popup, "This may be\ncaused by SD\ncard issues", 0, 13, AlignLeft, AlignTop);
+
+            notification_message(app->notifications, &sequence_blink_start_red);
+            state->error = true;
+
         } else if(event.event == LfRfidEventReadDone) {
-            consumed = true;
             if(!state->error) {
                 if(state->is_psk) {
                     notification_message(app->notifications, &sequence_success);
                     scene_manager_next_scene(app->scene_manager, LfRfidSceneRawSuccess);
+
                 } else {
-                    popup_set_header(
-                        popup, "Reading\nRAW RFID\nPSK", 89, 30, AlignCenter, AlignTop);
-                    notification_message(app->notifications, &sequence_blink_start_yellow);
                     lfrfid_worker_stop(app->lfworker);
+                    lfrfid_worker_stop_thread(app->lfworker);
+
+                    state->is_psk = true;
+
                     furi_string_printf(
                         state->string_file_name,
                         "%s/%s%s",
                         LFRFID_SD_FOLDER,
                         furi_string_get_cstr(app->raw_file_name),
                         LFRFID_APP_RAW_PSK_EXTENSION);
+
+                    lfrfid_worker_start_thread(app->lfworker);
                     lfrfid_worker_read_raw_start(
                         app->lfworker,
                         furi_string_get_cstr(state->string_file_name),
                         LFRFIDWorkerReadTypePSKOnly,
                         lfrfid_read_callback,
                         app);
-                    furi_timer_start(state->timer, RAW_READ_TIME);
-                    state->is_psk = true;
+
+                    furi_timer_start(state->timer, RAW_READ_TIME_MS);
+
+                    popup_set_header(popup, "Reading PSK", 91, 16, AlignCenter, AlignTop);
+                    notification_message(app->notifications, &sequence_blink_start_yellow);
                 }
             }
         }
+
+        consumed = true;
     }
 
     return consumed;
@@ -115,12 +132,13 @@ void lfrfid_scene_raw_read_on_exit(void* context) {
     LfRfidReadRawState* state =
         (LfRfidReadRawState*)scene_manager_get_scene_state(app->scene_manager, LfRfidSceneRawRead);
 
-    notification_message(app->notifications, &sequence_blink_stop);
-    popup_reset(app->popup);
     lfrfid_worker_stop(app->lfworker);
     lfrfid_worker_stop_thread(app->lfworker);
-    furi_timer_free(state->timer);
 
+    furi_timer_free(state->timer);
     furi_string_free(state->string_file_name);
     free(state);
+
+    popup_reset(app->popup);
+    notification_message(app->notifications, &sequence_blink_stop);
 }
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_raw_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_raw_success.c
index 09a005298..3fca9e3f1 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_raw_success.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_raw_success.c
@@ -4,16 +4,20 @@ void lfrfid_scene_raw_success_on_enter(void* context) {
     LfRfid* app = context;
     Widget* widget = app->widget;
 
-    widget_add_button_element(widget, GuiButtonTypeCenter, "OK", lfrfid_widget_callback, app);
-
-    widget_add_string_multiline_element(
+    widget_add_text_box_element(
         widget,
         0,
-        1,
+        0,
+        128,
+        64,
         AlignLeft,
         AlignTop,
-        FontSecondary,
-        "RAW RFID read success!\nNow you can analyze files\nOr send them to developers");
+        "\e#RAW RFID Read Success\e#\n"
+        "Now you can analyze files or\n"
+        "send them to developers",
+        false);
+
+    widget_add_button_element(widget, GuiButtonTypeCenter, "OK", lfrfid_widget_callback, app);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
 }
@@ -24,12 +28,16 @@ bool lfrfid_scene_raw_success_on_event(void* context, SceneManagerEvent event) {
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
-        consumed = true;
         if(event.event == GuiButtonTypeCenter) {
             scene_manager_search_and_switch_to_previous_scene(
                 scene_manager, LfRfidSceneExtraActions);
         }
+        consumed = true;
+
+    } else if(event.type == SceneManagerEventTypeBack) {
+        consumed = true;
     }
+
     return consumed;
 }
 
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_read_key_menu.c b/applications/main/lfrfid/scenes/lfrfid_scene_read_key_menu.c
index 36f0d6d93..22b083c76 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_read_key_menu.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_read_key_menu.c
@@ -48,6 +48,9 @@ bool lfrfid_scene_read_key_menu_on_event(void* context, SceneManagerEvent event)
             consumed = true;
         }
         scene_manager_set_scene_state(app->scene_manager, LfRfidSceneReadKeyMenu, event.event);
+
+    } else if(event.type == SceneManagerEventTypeBack) {
+        scene_manager_set_scene_state(app->scene_manager, LfRfidSceneReadKeyMenu, 0);
     }
 
     return consumed;
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_read_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_read_success.c
index b3b60b5ee..b0e373ea5 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_read_success.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_read_success.c
@@ -1,56 +1,57 @@
 #include "../lfrfid_i.h"
 
+#define LFRFID_SCENE_READ_SUCCESS_MAX_HEX_WIDTH (7UL)
+
 void lfrfid_scene_read_success_on_enter(void* context) {
     LfRfid* app = context;
     Widget* widget = app->widget;
+    FuriString* display_text = furi_string_alloc();
 
-    FuriString* tmp_string;
-    tmp_string = furi_string_alloc();
+    const char* protocol = protocol_dict_get_name(app->dict, app->protocol_id);
+    const char* manufacturer = protocol_dict_get_manufacturer(app->dict, app->protocol_id);
 
-    widget_add_button_element(widget, GuiButtonTypeLeft, "Retry", lfrfid_widget_callback, app);
-    widget_add_button_element(widget, GuiButtonTypeRight, "More", lfrfid_widget_callback, app);
-
-    furi_string_printf(
-        tmp_string,
-        "%s[%s]",
-        protocol_dict_get_name(app->dict, app->protocol_id),
-        protocol_dict_get_manufacturer(app->dict, app->protocol_id));
-
-    widget_add_string_element(
-        widget, 16, 3, AlignLeft, AlignTop, FontPrimary, furi_string_get_cstr(tmp_string));
-
-    furi_string_reset(tmp_string);
-    size_t size = protocol_dict_get_data_size(app->dict, app->protocol_id);
-    uint8_t* data = (uint8_t*)malloc(size);
-    protocol_dict_get_data(app->dict, app->protocol_id, data, size);
-    for(uint8_t i = 0; i < size; i++) {
-        if(i >= 9) {
-            furi_string_cat_printf(tmp_string, "..");
-            break;
-        } else {
-            if(i != 0) {
-                furi_string_cat_printf(tmp_string, ":");
-            }
-            furi_string_cat_printf(tmp_string, "%02X", data[i]);
-        }
+    if(strcasecmp(protocol, manufacturer) != 0 && strcasecmp(manufacturer, "N/A") != 0) {
+        furi_string_printf(display_text, "\e#%s %s\e#", manufacturer, protocol);
+    } else {
+        furi_string_printf(display_text, "\e#%s\e#", protocol);
     }
+    widget_add_text_box_element(
+        widget, 16, 2, 112, 14, AlignLeft, AlignTop, furi_string_get_cstr(display_text), true);
+
+    furi_string_set(display_text, "Hex: ");
+
+    const size_t data_size = protocol_dict_get_data_size(app->dict, app->protocol_id);
+    uint8_t* data = malloc(data_size);
+
+    protocol_dict_get_data(app->dict, app->protocol_id, data, data_size);
+
+    for(size_t i = 0; i < data_size; i++) {
+        if(i == LFRFID_SCENE_READ_SUCCESS_MAX_HEX_WIDTH) {
+            furi_string_cat(display_text, " ...");
+            break;
+        }
+
+        furi_string_cat_printf(display_text, "%s%02X", i != 0 ? " " : "", data[i]);
+    }
+
     free(data);
 
-    FuriString* render_data;
-    render_data = furi_string_alloc();
-    protocol_dict_render_brief_data(app->dict, render_data, app->protocol_id);
-    furi_string_cat_printf(tmp_string, "\r\n%s", furi_string_get_cstr(render_data));
-    furi_string_free(render_data);
+    FuriString* rendered_data = furi_string_alloc();
+    protocol_dict_render_brief_data(app->dict, rendered_data, app->protocol_id);
+    furi_string_cat_printf(display_text, "\n%s", furi_string_get_cstr(rendered_data));
+    furi_string_free(rendered_data);
 
-    widget_add_string_multiline_element(
-        widget, 0, 16, AlignLeft, AlignTop, FontSecondary, furi_string_get_cstr(tmp_string));
+    widget_add_text_box_element(
+        widget, 0, 16, 128, 52, AlignLeft, AlignTop, furi_string_get_cstr(display_text), true);
+    widget_add_button_element(widget, GuiButtonTypeLeft, "Retry", lfrfid_widget_callback, app);
+    widget_add_button_element(widget, GuiButtonTypeRight, "More", lfrfid_widget_callback, app);
 
     widget_add_icon_element(app->widget, 0, 0, &I_RFIDSmallChip_14x14);
 
     notification_message_block(app->notifications, &sequence_set_green_255);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
-    furi_string_free(tmp_string);
+    furi_string_free(display_text);
 }
 
 bool lfrfid_scene_read_success_on_event(void* context, SceneManagerEvent event) {
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_retry_confirm.c b/applications/main/lfrfid/scenes/lfrfid_scene_retry_confirm.c
index ddac3e8ba..41ff9afed 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_retry_confirm.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_retry_confirm.c
@@ -4,12 +4,11 @@ void lfrfid_scene_retry_confirm_on_enter(void* context) {
     LfRfid* app = context;
     Widget* widget = app->widget;
 
-    widget_add_button_element(widget, GuiButtonTypeLeft, "Exit", lfrfid_widget_callback, app);
+    widget_add_button_element(widget, GuiButtonTypeLeft, "Retry", lfrfid_widget_callback, app);
     widget_add_button_element(widget, GuiButtonTypeRight, "Stay", lfrfid_widget_callback, app);
+    widget_add_string_element(widget, 64, 0, AlignCenter, AlignTop, FontPrimary, "Retry Reading?");
     widget_add_string_element(
-        widget, 64, 19, AlignCenter, AlignBottom, FontPrimary, "Retry Reading?");
-    widget_add_string_element(
-        widget, 64, 29, AlignCenter, AlignBottom, FontSecondary, "All unsaved data will be lost!");
+        widget, 64, 13, AlignCenter, AlignTop, FontSecondary, "All unsaved data will be lost");
 
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
 }
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_save_name.c b/applications/main/lfrfid/scenes/lfrfid_scene_save_name.c
index 3a38e213d..b8747a9c1 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_save_name.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_save_name.c
@@ -12,7 +12,7 @@ void lfrfid_scene_save_name_on_enter(void* context) {
     if(key_name_is_empty) {
         furi_string_set(app->file_path, LFRFID_APP_FOLDER);
 
-        name_generator_make_auto(
+        name_generator_make_auto_basic(
             app->text_store, LFRFID_TEXT_STORE_SIZE, LFRFID_APP_FILENAME_PREFIX);
 
         furi_string_set(folder_path, LFRFID_APP_FOLDER);
@@ -30,7 +30,7 @@ void lfrfid_scene_save_name_on_enter(void* context) {
         LFRFID_KEY_NAME_SIZE,
         key_name_is_empty);
 
-    FURI_LOG_I("", "%s %s", furi_string_get_cstr(folder_path), app->text_store);
+    FURI_LOG_D("", "%s %s", furi_string_get_cstr(folder_path), app->text_store);
 
     ValidatorIsFile* validator_is_file = validator_is_file_alloc_init(
         furi_string_get_cstr(folder_path),
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c
index 2f5d5ae9f..4eb21e942 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c
@@ -21,16 +21,9 @@ bool lfrfid_scene_save_success_on_event(void* context, SceneManagerEvent event)
     LfRfid* app = context;
     bool consumed = false;
 
-    const uint32_t prev_scenes[] = {LfRfidSceneReadKeyMenu, LfRfidSceneSelectKey};
-
-    if((event.type == SceneManagerEventTypeBack) ||
-       ((event.type == SceneManagerEventTypeCustom) && (event.event == LfRfidEventPopupClosed))) {
-        bool result = scene_manager_search_and_switch_to_previous_scene_one_of(
-            app->scene_manager, prev_scenes, COUNT_OF(prev_scenes));
-        if(!result) {
-            scene_manager_search_and_switch_to_another_scene(
-                app->scene_manager, LfRfidSceneSelectKey);
-        }
+    if(event.type == SceneManagerEventTypeBack || event.type == SceneManagerEventTypeCustom) {
+        // Always return to SceneSelectKey from here
+        scene_manager_search_and_switch_to_another_scene(app->scene_manager, LfRfidSceneSelectKey);
         consumed = true;
     }
 
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_saved_info.c b/applications/main/lfrfid/scenes/lfrfid_scene_saved_info.c
index c901629c3..a057b7a71 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_saved_info.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_saved_info.c
@@ -4,38 +4,42 @@ void lfrfid_scene_saved_info_on_enter(void* context) {
     LfRfid* app = context;
     Widget* widget = app->widget;
 
-    FuriString* tmp_string;
-    tmp_string = furi_string_alloc();
+    FuriString* display_text = furi_string_alloc();
 
-    furi_string_printf(
-        tmp_string,
-        "%s [%s]\r\n",
-        furi_string_get_cstr(app->file_name),
-        protocol_dict_get_name(app->dict, app->protocol_id));
+    furi_string_printf(display_text, "Name: %s\n", furi_string_get_cstr(app->file_name));
 
-    size_t size = protocol_dict_get_data_size(app->dict, app->protocol_id);
-    uint8_t* data = (uint8_t*)malloc(size);
-    protocol_dict_get_data(app->dict, app->protocol_id, data, size);
-    for(uint8_t i = 0; i < size; i++) {
-        if(i != 0) {
-            furi_string_cat_printf(tmp_string, ":");
-        }
+    const char* protocol = protocol_dict_get_name(app->dict, app->protocol_id);
+    const char* manufacturer = protocol_dict_get_manufacturer(app->dict, app->protocol_id);
 
-        furi_string_cat_printf(tmp_string, "%02X", data[i]);
+    if(strcasecmp(protocol, manufacturer) != 0 && strcasecmp(manufacturer, "N/A") != 0) {
+        furi_string_cat_printf(display_text, "\e#%s %s", manufacturer, protocol);
+    } else {
+        furi_string_cat_printf(display_text, "\e#%s", protocol);
     }
+
+    furi_string_cat(display_text, "\nHex: ");
+
+    const size_t data_size = protocol_dict_get_data_size(app->dict, app->protocol_id);
+    uint8_t* data = malloc(data_size);
+
+    protocol_dict_get_data(app->dict, app->protocol_id, data, data_size);
+
+    for(size_t i = 0; i < data_size; i++) {
+        furi_string_cat_printf(display_text, "%s%02X", i != 0 ? " " : "", data[i]);
+    }
+
     free(data);
 
-    FuriString* render_data;
-    render_data = furi_string_alloc();
-    protocol_dict_render_data(app->dict, render_data, app->protocol_id);
-    furi_string_cat_printf(tmp_string, "\r\n%s", furi_string_get_cstr(render_data));
-    furi_string_free(render_data);
+    FuriString* rendered_data;
+    rendered_data = furi_string_alloc();
+    protocol_dict_render_data(app->dict, rendered_data, app->protocol_id);
+    furi_string_cat_printf(display_text, "\n%s", furi_string_get_cstr(rendered_data));
+    furi_string_free(rendered_data);
 
-    widget_add_string_multiline_element(
-        widget, 0, 1, AlignLeft, AlignTop, FontSecondary, furi_string_get_cstr(tmp_string));
+    widget_add_text_scroll_element(widget, 0, 0, 128, 64, furi_string_get_cstr(display_text));
 
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
-    furi_string_free(tmp_string);
+    furi_string_free(display_text);
 }
 
 bool lfrfid_scene_saved_info_on_event(void* context, SceneManagerEvent event) {
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_saved_key_menu.c b/applications/main/lfrfid/scenes/lfrfid_scene_saved_key_menu.c
index 482783fa4..6e3ab4c53 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_saved_key_menu.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_saved_key_menu.c
@@ -71,6 +71,9 @@ bool lfrfid_scene_saved_key_menu_on_event(void* context, SceneManagerEvent event
             consumed = true;
         }
         scene_manager_set_scene_state(app->scene_manager, LfRfidSceneSavedKeyMenu, event.event);
+
+    } else if(event.type == SceneManagerEventTypeBack) {
+        scene_manager_set_scene_state(app->scene_manager, LfRfidSceneSavedKeyMenu, 0);
     }
 
     return consumed;
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_select_key.c b/applications/main/lfrfid/scenes/lfrfid_scene_select_key.c
index 2a9cc1c63..505985c26 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_select_key.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_select_key.c
@@ -6,7 +6,9 @@ void lfrfid_scene_select_key_on_enter(void* context) {
     if(lfrfid_load_key_from_file_select(app)) {
         scene_manager_next_scene(app->scene_manager, LfRfidSceneSavedKeyMenu);
     } else {
-        scene_manager_previous_scene(app->scene_manager);
+        // Always select "Saved" menu item when returning from this scene
+        scene_manager_set_scene_state(app->scene_manager, LfRfidSceneStart, LfRfidMenuIndexSaved);
+        scene_manager_search_and_switch_to_previous_scene(app->scene_manager, LfRfidSceneStart);
     }
 }
 
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_start.c b/applications/main/lfrfid/scenes/lfrfid_scene_start.c
index 8a01fc707..5d0e6112a 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_start.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_start.c
@@ -1,13 +1,6 @@
 #include "../lfrfid_i.h"
 #include <dolphin/dolphin.h>
 
-typedef enum {
-    SubmenuIndexRead,
-    SubmenuIndexSaved,
-    SubmenuIndexAddManually,
-    SubmenuIndexExtraActions,
-} SubmenuIndex;
-
 static void lfrfid_scene_start_submenu_callback(void* context, uint32_t index) {
     LfRfid* app = context;
 
@@ -18,15 +11,20 @@ void lfrfid_scene_start_on_enter(void* context) {
     LfRfid* app = context;
     Submenu* submenu = app->submenu;
 
-    submenu_add_item(submenu, "Read", SubmenuIndexRead, lfrfid_scene_start_submenu_callback, app);
     submenu_add_item(
-        submenu, "Saved", SubmenuIndexSaved, lfrfid_scene_start_submenu_callback, app);
+        submenu, "Read", LfRfidMenuIndexRead, lfrfid_scene_start_submenu_callback, app);
     submenu_add_item(
-        submenu, "Add Manually", SubmenuIndexAddManually, lfrfid_scene_start_submenu_callback, app);
+        submenu, "Saved", LfRfidMenuIndexSaved, lfrfid_scene_start_submenu_callback, app);
+    submenu_add_item(
+        submenu,
+        "Add Manually",
+        LfRfidMenuIndexAddManually,
+        lfrfid_scene_start_submenu_callback,
+        app);
     submenu_add_item(
         submenu,
         "Extra Actions",
-        SubmenuIndexExtraActions,
+        LfRfidMenuIndexExtraActions,
         lfrfid_scene_start_submenu_callback,
         app);
 
@@ -46,26 +44,28 @@ bool lfrfid_scene_start_on_event(void* context, SceneManagerEvent event) {
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == SubmenuIndexRead) {
-            scene_manager_set_scene_state(app->scene_manager, LfRfidSceneStart, SubmenuIndexRead);
+        if(event.event == LfRfidMenuIndexRead) {
+            scene_manager_set_scene_state(
+                app->scene_manager, LfRfidSceneStart, LfRfidMenuIndexRead);
             scene_manager_next_scene(app->scene_manager, LfRfidSceneRead);
             dolphin_deed(DolphinDeedRfidRead);
             consumed = true;
-        } else if(event.event == SubmenuIndexSaved) {
+        } else if(event.event == LfRfidMenuIndexSaved) {
             // Like in the other apps, explicitly save the scene state
             // in each branch in case the user cancels loading a file.
-            scene_manager_set_scene_state(app->scene_manager, LfRfidSceneStart, SubmenuIndexSaved);
+            scene_manager_set_scene_state(
+                app->scene_manager, LfRfidSceneStart, LfRfidMenuIndexSaved);
             furi_string_set(app->file_path, LFRFID_APP_FOLDER);
             scene_manager_next_scene(app->scene_manager, LfRfidSceneSelectKey);
             consumed = true;
-        } else if(event.event == SubmenuIndexAddManually) {
+        } else if(event.event == LfRfidMenuIndexAddManually) {
             scene_manager_set_scene_state(
-                app->scene_manager, LfRfidSceneStart, SubmenuIndexAddManually);
+                app->scene_manager, LfRfidSceneStart, LfRfidMenuIndexAddManually);
             scene_manager_next_scene(app->scene_manager, LfRfidSceneSaveType);
             consumed = true;
-        } else if(event.event == SubmenuIndexExtraActions) {
+        } else if(event.event == LfRfidMenuIndexExtraActions) {
             scene_manager_set_scene_state(
-                app->scene_manager, LfRfidSceneStart, SubmenuIndexExtraActions);
+                app->scene_manager, LfRfidSceneStart, LfRfidMenuIndexExtraActions);
             scene_manager_next_scene(app->scene_manager, LfRfidSceneExtraActions);
             consumed = true;
         }
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_write.c b/applications/main/lfrfid/scenes/lfrfid_scene_write.c
index f6e762e4d..55973d09d 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_write.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_write.c
@@ -21,19 +21,19 @@ void lfrfid_scene_write_on_enter(void* context) {
     LfRfid* app = context;
     Popup* popup = app->popup;
 
-    popup_set_header(popup, "Writing", 89, 30, AlignCenter, AlignTop);
+    popup_set_icon(popup, 0, 8, &I_NFC_manual_60x50);
+    popup_set_header(popup, "Writing", 94, 16, AlignCenter, AlignTop);
+
     if(!furi_string_empty(app->file_name)) {
-        popup_set_text(popup, furi_string_get_cstr(app->file_name), 89, 43, AlignCenter, AlignTop);
+        popup_set_text(popup, furi_string_get_cstr(app->file_name), 94, 29, AlignCenter, AlignTop);
     } else {
-        popup_set_text(
-            popup,
-            protocol_dict_get_name(app->dict, app->protocol_id),
-            89,
-            43,
-            AlignCenter,
-            AlignTop);
+        snprintf(
+            app->text_store,
+            LFRFID_TEXT_STORE_SIZE,
+            "Unsaved\n%s",
+            protocol_dict_get_name(app->dict, app->protocol_id));
+        popup_set_text(popup, app->text_store, 94, 29, AlignCenter, AlignTop);
     }
-    popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
 
@@ -66,12 +66,14 @@ bool lfrfid_scene_write_on_event(void* context, SceneManagerEvent event) {
             (event.event == LfRfidEventWriteFobCannotBeWritten) ||
             (event.event == LfRfidEventWriteTooLongToWrite)) {
             popup_set_icon(popup, 83, 22, &I_WarningDolphinFlip_45x42);
-            popup_set_header(popup, "Still trying to write...", 64, 3, AlignCenter, AlignTop);
+            popup_set_header(popup, "Still Trying to Write...", 64, 0, AlignCenter, AlignTop);
             popup_set_text(
                 popup,
-                "Make sure this\ncard is writable\nand not\nprotected.",
-                3,
-                17,
+                "Make sure this\n"
+                "card is writable\n"
+                "and not protected",
+                0,
+                13,
                 AlignLeft,
                 AlignTop);
             notification_message(app->notifications, &sequence_blink_start_yellow);
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c
index 78ba48137..cc407bdcc 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c
@@ -19,12 +19,12 @@ bool lfrfid_scene_write_success_on_event(void* context, SceneManagerEvent event)
     LfRfid* app = context;
     bool consumed = false;
 
-    const uint32_t prev_scenes[] = {LfRfidSceneReadKeyMenu, LfRfidSceneSelectKey};
-
-    if((event.type == SceneManagerEventTypeBack) ||
-       ((event.type == SceneManagerEventTypeCustom) && (event.event == LfRfidEventPopupClosed))) {
-        scene_manager_search_and_switch_to_previous_scene_one_of(
-            app->scene_manager, prev_scenes, COUNT_OF(prev_scenes));
+    if(event.type == SceneManagerEventTypeBack || event.type == SceneManagerEventTypeCustom) {
+        if(!scene_manager_search_and_switch_to_previous_scene(
+               app->scene_manager, LfRfidSceneReadKeyMenu)) {
+            scene_manager_search_and_switch_to_another_scene(
+                app->scene_manager, LfRfidSceneSelectKey);
+        }
         consumed = true;
     }
 
diff --git a/applications/main/lfrfid/views/lfrfid_view_read.c b/applications/main/lfrfid/views/lfrfid_view_read.c
index 094afb617..a1c859af9 100644
--- a/applications/main/lfrfid/views/lfrfid_view_read.c
+++ b/applications/main/lfrfid/views/lfrfid_view_read.c
@@ -66,7 +66,7 @@ void lfrfid_view_read_exit(void* context) {
         read_view->view, LfRfidReadViewModel * model, { icon_animation_stop(model->icon); }, false);
 }
 
-LfRfidReadView* lfrfid_view_read_alloc() {
+LfRfidReadView* lfrfid_view_read_alloc(void) {
     LfRfidReadView* read_view = malloc(sizeof(LfRfidReadView));
     read_view->view = view_alloc();
     view_set_context(read_view->view, read_view);
diff --git a/applications/main/lfrfid/views/lfrfid_view_read.h b/applications/main/lfrfid/views/lfrfid_view_read.h
index 55bb1f230..f647ac354 100644
--- a/applications/main/lfrfid/views/lfrfid_view_read.h
+++ b/applications/main/lfrfid/views/lfrfid_view_read.h
@@ -10,7 +10,7 @@ typedef enum {
 
 typedef struct LfRfidReadView LfRfidReadView;
 
-LfRfidReadView* lfrfid_view_read_alloc();
+LfRfidReadView* lfrfid_view_read_alloc(void);
 
 void lfrfid_view_read_free(LfRfidReadView* read_view);
 
diff --git a/applications/main/nfc/api/mosgortrans/mosgortrans_util.c b/applications/main/nfc/api/mosgortrans/mosgortrans_util.c
new file mode 100644
index 000000000..ef1e18f8d
--- /dev/null
+++ b/applications/main/nfc/api/mosgortrans/mosgortrans_util.c
@@ -0,0 +1,1308 @@
+#include "mosgortrans_util.h"
+
+#define TAG "Mosgortrans"
+
+void from_days_to_datetime(uint32_t days, DateTime* datetime, uint16_t start_year) {
+    uint32_t timestamp = days * 24 * 60 * 60;
+    DateTime start_datetime = {0};
+    start_datetime.year = start_year - 1;
+    start_datetime.month = 12;
+    start_datetime.day = 31;
+    timestamp += datetime_datetime_to_timestamp(&start_datetime);
+    datetime_timestamp_to_datetime(timestamp, datetime);
+}
+
+void from_minutes_to_datetime(uint32_t minutes, DateTime* datetime, uint16_t start_year) {
+    uint32_t timestamp = minutes * 60;
+    DateTime start_datetime = {0};
+    start_datetime.year = start_year - 1;
+    start_datetime.month = 12;
+    start_datetime.day = 31;
+    timestamp += datetime_datetime_to_timestamp(&start_datetime);
+    datetime_timestamp_to_datetime(timestamp, datetime);
+}
+
+void from_seconds_to_datetime(uint32_t seconds, DateTime* datetime, uint16_t start_year) {
+    uint32_t timestamp = seconds;
+    DateTime start_datetime = {0};
+    start_datetime.year = start_year - 1;
+    start_datetime.month = 12;
+    start_datetime.day = 31;
+    timestamp += datetime_datetime_to_timestamp(&start_datetime);
+    datetime_timestamp_to_datetime(timestamp, datetime);
+}
+
+typedef struct {
+    uint16_t view; //101
+    uint16_t type; //102
+    uint8_t layout; //111
+    uint8_t layout2; //112
+    uint16_t blank_type; //121
+    uint16_t type_of_extended; //122
+    uint8_t extended; //123
+    uint8_t benefit_code; //124
+    uint32_t number; //201
+    uint16_t use_before_date; //202
+    uint16_t use_before_date2; //202.2
+    uint16_t use_with_date; //205
+    uint8_t requires_activation; //301
+    uint16_t activate_during; //302
+    uint16_t extension_counter; //304
+    uint8_t blocked; //303
+    uint32_t valid_from_date; //311
+    uint16_t valid_to_date; //312
+    uint8_t valid_for_days; //313
+    uint32_t valid_for_minutes; //314
+    uint16_t valid_for_time; //316
+    uint16_t valid_for_time2; //316.2
+    uint32_t valid_to_time; //317
+    uint16_t remaining_trips; //321
+    uint8_t remaining_trips1; //321.1
+    uint32_t remaining_funds; //322
+    uint16_t total_trips; //331
+    uint16_t start_trip_date; //402
+    uint16_t start_trip_time; //403
+    uint32_t start_trip_neg_minutes; //404
+    uint32_t start_trip_minutes; //405
+    uint8_t start_trip_seconds; //406
+    uint8_t minutes_pass; //412
+    uint8_t passage_5_minutes; //413
+    uint8_t metro_ride_with; //414
+    uint8_t transport_type; //421
+    uint8_t transport_type_flag; //421.0
+    uint8_t transport_type1; //421.1
+    uint8_t transport_type2; //421.2
+    uint8_t transport_type3; //421.3
+    uint8_t transport_type4; //421.4
+    uint16_t validator; //422
+    uint8_t validator1; //422.1
+    uint16_t validator2; //422.2
+    uint16_t route; //424
+    uint8_t passage_in_metro; //431
+    uint8_t transfer_in_metro; //432
+    uint8_t passages_ground_transport; //433
+    uint8_t fare_trip; //441
+    uint16_t crc16; //501.1
+    uint16_t crc16_2; //501.2
+    uint32_t hash; //502
+    uint16_t hash1; //502.1
+    uint32_t hash2; //502.2
+    uint8_t geozone_a; //GeoZoneA
+    uint8_t geozone_b; //GeoZoneB
+    uint8_t company; //Company
+    uint8_t units; //Units
+    uint64_t rfu1; //rfu1
+    uint16_t rfu2; //rfu2
+    uint32_t rfu3; //rfu3
+    uint8_t rfu4; //rfu4
+    uint8_t rfu5; //rfu5
+    uint8_t write_enabled; //write_enabled
+    uint32_t tech_code; //TechCode
+    uint8_t interval; //Interval
+    uint16_t app_code1; //AppCode1
+    uint16_t app_code2; //AppCode2
+    uint16_t app_code3; //AppCode3
+    uint16_t app_code4; //AppCode4
+    uint16_t type1; //Type1
+    uint16_t type2; //Type2
+    uint16_t type3; //Type3
+    uint16_t type4; //Type4
+    uint8_t zoo; //zoo
+} BlockData;
+
+void parse_layout_2(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 0x38, 16); //202
+    data_block->benefit_code = bit_lib_get_bits(block->data, 0x48, 8); //124
+    data_block->rfu1 = bit_lib_get_bits_32(block->data, 0x50, 32); //rfu1
+    data_block->crc16 = bit_lib_get_bits_16(block->data, 0x70, 16); //501.1
+    data_block->blocked = bit_lib_get_bits(block->data, 0x80, 1); //303
+    data_block->start_trip_time = bit_lib_get_bits_16(block->data, 0x81, 12); //403
+    data_block->start_trip_date = bit_lib_get_bits_16(block->data, 0x8D, 16); //402
+    data_block->valid_from_date = bit_lib_get_bits_16(block->data, 0x9D, 16); //311
+    data_block->valid_to_date = bit_lib_get_bits_16(block->data, 0xAD, 16); //312
+    data_block->start_trip_seconds = bit_lib_get_bits(block->data, 0xDB, 6); //406
+    data_block->transport_type1 = bit_lib_get_bits(block->data, 0xC3, 2); //421.1
+    data_block->transport_type2 = bit_lib_get_bits(block->data, 0xC5, 2); //421.2
+    data_block->transport_type3 = bit_lib_get_bits(block->data, 0xC7, 2); //421.3
+    data_block->transport_type4 = bit_lib_get_bits(block->data, 0xC9, 2); //421.4
+    data_block->use_with_date = bit_lib_get_bits_16(block->data, 0xBD, 16); //205
+    data_block->route = bit_lib_get_bits(block->data, 0xCD, 1); //424
+    data_block->validator1 = bit_lib_get_bits_16(block->data, 0xCE, 15); //422.1
+    data_block->validator = bit_lib_get_bits_16(block->data, 0xCD, 16);
+    data_block->total_trips = bit_lib_get_bits_16(block->data, 0xDD, 16); //331
+    data_block->write_enabled = bit_lib_get_bits(block->data, 0xED, 1); //write_enabled
+    data_block->rfu2 = bit_lib_get_bits(block->data, 0xEE, 2); //rfu2
+    data_block->crc16_2 = bit_lib_get_bits_16(block->data, 0xF0, 16); //501.2
+}
+
+void parse_layout_6(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 0x38, 16); //202
+    data_block->geozone_a = bit_lib_get_bits(block->data, 0x48, 4); //GeoZoneA
+    data_block->geozone_b = bit_lib_get_bits(block->data, 0x4C, 4); //GeoZoneB
+    data_block->blank_type = bit_lib_get_bits_16(block->data, 0x50, 10); //121
+    data_block->type_of_extended = bit_lib_get_bits_16(block->data, 0x5A, 10); //122
+    data_block->rfu1 = bit_lib_get_bits_16(block->data, 0x64, 12); //rfu1
+    data_block->crc16 = bit_lib_get_bits_16(block->data, 0x70, 16); //501.1
+    data_block->blocked = bit_lib_get_bits(block->data, 0x80, 1); //303
+    data_block->start_trip_time = bit_lib_get_bits_16(block->data, 0x81, 12); //403
+    data_block->start_trip_date = bit_lib_get_bits_16(block->data, 0x8D, 16); //402
+    data_block->valid_from_date = bit_lib_get_bits_16(block->data, 0x9D, 16); //311
+    data_block->valid_to_date = bit_lib_get_bits_16(block->data, 0xAD, 16); //312
+    data_block->company = bit_lib_get_bits(block->data, 0xBD, 4); //Company
+    data_block->validator1 = bit_lib_get_bits(block->data, 0xC1, 4); //422.1
+    data_block->remaining_trips = bit_lib_get_bits_16(block->data, 0xC5, 10); //321
+    data_block->units = bit_lib_get_bits(block->data, 0xCF, 6); //Units
+    data_block->validator2 = bit_lib_get_bits_16(block->data, 0xD5, 10); //422.2
+    data_block->total_trips = bit_lib_get_bits_16(block->data, 0xDF, 16); //331
+    data_block->extended = bit_lib_get_bits(block->data, 0xEF, 1); //123
+    data_block->crc16_2 = bit_lib_get_bits_16(block->data, 0xF0, 16); //501.2
+}
+
+void parse_layout_8(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 0x38, 16); //202
+    data_block->rfu1 = bit_lib_get_bits_64(block->data, 0x48, 56); //rfu1
+    data_block->valid_from_date = bit_lib_get_bits_16(block->data, 0x80, 16); //311
+    data_block->valid_for_days = bit_lib_get_bits(block->data, 0x90, 8); //313
+    data_block->requires_activation = bit_lib_get_bits(block->data, 0x98, 1); //301
+    data_block->rfu2 = bit_lib_get_bits(block->data, 0x99, 7); //rfu2
+    data_block->remaining_trips1 = bit_lib_get_bits(block->data, 0xA0, 8); //321.1
+    data_block->remaining_trips = bit_lib_get_bits(block->data, 0xA8, 8); //321
+    data_block->validator1 = bit_lib_get_bits(block->data, 0xB0, 2); //422.1
+    data_block->validator = bit_lib_get_bits_16(block->data, 0xB1, 15); //422
+    data_block->hash = bit_lib_get_bits_32(block->data, 0xC0, 32); //502
+    data_block->rfu3 = bit_lib_get_bits_32(block->data, 0xE0, 32); //rfu3
+}
+
+void parse_layout_A(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->valid_from_date = bit_lib_get_bits_16(block->data, 0x40, 12); //311
+    data_block->valid_for_minutes = bit_lib_get_bits_32(block->data, 0x4C, 19); //314
+    data_block->requires_activation = bit_lib_get_bits(block->data, 0x5F, 1); //301
+    data_block->start_trip_minutes = bit_lib_get_bits_32(block->data, 0x60, 19); //405
+    data_block->minutes_pass = bit_lib_get_bits(block->data, 0x77, 7); //412
+    data_block->transport_type_flag = bit_lib_get_bits(block->data, 0x7E, 2); //421.0
+    data_block->remaining_trips = bit_lib_get_bits(block->data, 0x80, 8); //321
+    data_block->validator = bit_lib_get_bits_16(block->data, 0x88, 16); //422
+    data_block->transport_type1 = bit_lib_get_bits(block->data, 0x98, 2); //421.1
+    data_block->transport_type2 = bit_lib_get_bits(block->data, 0x9A, 2); //421.2
+    data_block->transport_type3 = bit_lib_get_bits(block->data, 0x9C, 2); //421.3
+    data_block->transport_type4 = bit_lib_get_bits(block->data, 0x9E, 2); //421.4
+    data_block->hash = bit_lib_get_bits_32(block->data, 0xC0, 32); //502
+}
+
+void parse_layout_C(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 0x38, 16); //202
+    data_block->rfu1 = bit_lib_get_bits_64(block->data, 0x48, 56); //rfu1
+    data_block->valid_from_date = bit_lib_get_bits_16(block->data, 0x80, 16); //311
+    data_block->valid_for_days = bit_lib_get_bits(block->data, 0x90, 8); //313
+    data_block->requires_activation = bit_lib_get_bits(block->data, 0x98, 1); //301
+    data_block->rfu2 = bit_lib_get_bits_16(block->data, 0x99, 13); //rfu2
+    data_block->remaining_trips = bit_lib_get_bits_16(block->data, 0xA6, 10); //321
+    data_block->validator = bit_lib_get_bits_16(block->data, 0xB0, 16); //422
+    data_block->hash = bit_lib_get_bits_32(block->data, 0xC0, 32); //502
+    data_block->start_trip_date = bit_lib_get_bits_16(block->data, 0xE0, 16); //402
+    data_block->start_trip_time = bit_lib_get_bits_16(block->data, 0xF0, 11); //403
+    data_block->transport_type = bit_lib_get_bits(block->data, 0xFB, 2); //421
+    data_block->rfu3 = bit_lib_get_bits(block->data, 0xFD, 2); //rfu3
+    data_block->transfer_in_metro = bit_lib_get_bits(block->data, 0xFF, 1); //432
+}
+
+void parse_layout_D(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->rfu1 = bit_lib_get_bits(block->data, 0x38, 8); //rfu1
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 0x40, 16); //202
+    data_block->valid_for_time = bit_lib_get_bits_16(block->data, 0x50, 11); //316
+    data_block->rfu2 = bit_lib_get_bits(block->data, 0x5B, 5); //rfu2
+    data_block->use_before_date2 = bit_lib_get_bits_16(block->data, 0x60, 16); //202.2
+    data_block->valid_for_time2 = bit_lib_get_bits_16(block->data, 0x70, 11); //316.2
+    data_block->rfu3 = bit_lib_get_bits(block->data, 0x7B, 5); //rfu3
+    data_block->valid_from_date = bit_lib_get_bits_16(block->data, 0x80, 16); //311
+    data_block->valid_for_days = bit_lib_get_bits(block->data, 0x90, 8); //313
+    data_block->requires_activation = bit_lib_get_bits(block->data, 0x98, 1); //301
+    data_block->rfu4 = bit_lib_get_bits(block->data, 0x99, 2); //rfu4
+    data_block->passage_5_minutes = bit_lib_get_bits(block->data, 0x9B, 5); //413
+    data_block->transport_type1 = bit_lib_get_bits(block->data, 0xA0, 2); //421.1
+    data_block->passage_in_metro = bit_lib_get_bits(block->data, 0xA2, 1); //431
+    data_block->passages_ground_transport = bit_lib_get_bits(block->data, 0xA3, 3); //433
+    data_block->remaining_trips = bit_lib_get_bits_16(block->data, 0xA6, 10); //321
+    data_block->validator = bit_lib_get_bits_16(block->data, 0xB0, 16); //422
+    data_block->hash = bit_lib_get_bits_32(block->data, 0xC0, 32); //502
+    data_block->start_trip_date = bit_lib_get_bits_16(block->data, 0xE0, 16); //402
+    data_block->start_trip_time = bit_lib_get_bits_16(block->data, 0xF0, 11); //403
+    data_block->transport_type2 = bit_lib_get_bits(block->data, 0xFB, 2); //421.2
+    data_block->rfu5 = bit_lib_get_bits(block->data, 0xFD, 2); //rfu5
+    data_block->transfer_in_metro = bit_lib_get_bits(block->data, 0xFF, 1); //432
+}
+
+void parse_layout_E1(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->layout2 = bit_lib_get_bits(block->data, 0x38, 5); //112
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 0x3D, 16); //202
+    data_block->blank_type = bit_lib_get_bits_16(block->data, 0x4D, 10); //121
+    data_block->validator = bit_lib_get_bits_16(block->data, 0x80, 16); //422
+    data_block->start_trip_date = bit_lib_get_bits_16(block->data, 0x90, 16); //402
+    data_block->start_trip_time = bit_lib_get_bits_16(block->data, 0xA0, 11); //403
+    data_block->transport_type1 = bit_lib_get_bits(block->data, 0xAB, 2); //421.1
+    data_block->transport_type2 = bit_lib_get_bits(block->data, 0xAD, 2); //421.2
+    data_block->transfer_in_metro = bit_lib_get_bits(block->data, 0xB1, 1); //432
+    data_block->passage_in_metro = bit_lib_get_bits(block->data, 0xB2, 1); //431
+    data_block->passages_ground_transport = bit_lib_get_bits(block->data, 0xB3, 3); //433
+    data_block->minutes_pass = bit_lib_get_bits(block->data, 0xB9, 8); //412
+    data_block->remaining_funds = bit_lib_get_bits_32(block->data, 0xC4, 19); //322
+    data_block->fare_trip = bit_lib_get_bits(block->data, 0xD7, 2); //441
+    data_block->blocked = bit_lib_get_bits(block->data, 0x9D, 1); //303
+    data_block->zoo = bit_lib_get_bits(block->data, 0xDA, 1); //zoo
+    data_block->hash = bit_lib_get_bits_32(block->data, 0xE0, 32); //502
+}
+
+void parse_layout_E2(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->layout2 = bit_lib_get_bits(block->data, 0x38, 5); //112
+    data_block->type_of_extended = bit_lib_get_bits_16(block->data, 0x3D, 10); //122
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 0x47, 16); //202
+    data_block->blank_type = bit_lib_get_bits_16(block->data, 0x57, 10); //121
+    data_block->valid_from_date = bit_lib_get_bits_16(block->data, 0x61, 16); //311
+    data_block->activate_during = bit_lib_get_bits_16(block->data, 0x71, 9); //302
+    data_block->valid_for_minutes = bit_lib_get_bits_32(block->data, 0x83, 20); //314
+    data_block->minutes_pass = bit_lib_get_bits(block->data, 0x9A, 8); //412
+    data_block->transport_type = bit_lib_get_bits(block->data, 0xA3, 2); //421
+    data_block->passage_in_metro = bit_lib_get_bits(block->data, 0xA5, 1); //431
+    data_block->transfer_in_metro = bit_lib_get_bits(block->data, 0xA6, 1); //432
+    data_block->remaining_trips = bit_lib_get_bits_16(block->data, 0xA7, 10); //321
+    data_block->validator = bit_lib_get_bits_16(block->data, 0xB1, 16); //422
+    data_block->start_trip_neg_minutes = bit_lib_get_bits_32(block->data, 0xC4, 20); //404
+    data_block->requires_activation = bit_lib_get_bits(block->data, 0xD8, 1); //301
+    data_block->blocked = bit_lib_get_bits(block->data, 0xD9, 1); //303
+    data_block->extended = bit_lib_get_bits(block->data, 0xDA, 1); //123
+    data_block->hash = bit_lib_get_bits_32(block->data, 0xE0, 32); //502
+}
+
+void parse_layout_E3(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->layout2 = bit_lib_get_bits(block->data, 0x38, 5); //112
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 61, 16); //202
+    data_block->blank_type = bit_lib_get_bits_16(block->data, 0x4D, 10); //121
+    data_block->remaining_funds = bit_lib_get_bits_32(block->data, 0xBC, 22); //322
+    data_block->hash = bit_lib_get_bits_32(block->data, 224, 32); //502
+    data_block->validator = bit_lib_get_bits_16(block->data, 0x80, 16); //422
+    data_block->start_trip_minutes = bit_lib_get_bits_32(block->data, 0x90, 23); //405
+    data_block->fare_trip = bit_lib_get_bits(block->data, 0xD2, 2); //441
+    data_block->minutes_pass = bit_lib_get_bits(block->data, 0xAB, 7); //412
+    data_block->transport_type_flag = bit_lib_get_bits(block->data, 0xB2, 2); //421.0
+    data_block->transport_type1 = bit_lib_get_bits(block->data, 0xB4, 2); //421.1
+    data_block->transport_type2 = bit_lib_get_bits(block->data, 0xB6, 2); //421.2
+    data_block->transport_type3 = bit_lib_get_bits(block->data, 0xB8, 2); //421.3
+    data_block->transport_type4 = bit_lib_get_bits(block->data, 0xBA, 2); //421.4
+    data_block->blocked = bit_lib_get_bits(block->data, 0xD4, 1); //303
+}
+
+void parse_layout_E4(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->layout2 = bit_lib_get_bits(block->data, 0x38, 5); //112
+    data_block->type_of_extended = bit_lib_get_bits_16(block->data, 0x3D, 10); //122
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 0x47, 13); //202
+    data_block->blank_type = bit_lib_get_bits_16(block->data, 0x54, 10); //121
+    data_block->valid_from_date = bit_lib_get_bits_16(block->data, 0x5E, 13); //311
+    data_block->activate_during = bit_lib_get_bits_16(block->data, 0x6B, 9); //302
+    data_block->extension_counter = bit_lib_get_bits_16(block->data, 0x74, 10); //304
+    data_block->valid_for_minutes = bit_lib_get_bits_32(block->data, 0x80, 20); //314
+    data_block->minutes_pass = bit_lib_get_bits(block->data, 0x98, 7); //412
+    data_block->transport_type_flag = bit_lib_get_bits(block->data, 0x9F, 2); //421.0
+    data_block->transport_type1 = bit_lib_get_bits(block->data, 0xA1, 2); //421.1
+    data_block->transport_type2 = bit_lib_get_bits(block->data, 0xA3, 2); //421.2
+    data_block->transport_type3 = bit_lib_get_bits(block->data, 0xA5, 2); //421.3
+    data_block->transport_type4 = bit_lib_get_bits(block->data, 0xA7, 2); //421.4
+    data_block->remaining_trips = bit_lib_get_bits_16(block->data, 0xA9, 10); //321
+    data_block->validator = bit_lib_get_bits_16(block->data, 0xB3, 16); //422
+    data_block->start_trip_neg_minutes = bit_lib_get_bits_32(block->data, 0xC3, 20); //404
+    data_block->requires_activation = bit_lib_get_bits(block->data, 0xD7, 1); //301
+    data_block->blocked = bit_lib_get_bits(block->data, 0xD8, 1); //303
+    data_block->extended = bit_lib_get_bits(block->data, 0xD9, 1); //123
+    data_block->hash = bit_lib_get_bits_32(block->data, 0xE0, 32); //502
+}
+
+void parse_layout_E5(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->layout2 = bit_lib_get_bits(block->data, 0x38, 5); //112
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 0x3D, 13); //202
+    data_block->blank_type = bit_lib_get_bits_16(block->data, 0x4A, 10); //121
+    data_block->valid_to_time = bit_lib_get_bits_32(block->data, 0x54, 23); //317
+    data_block->extension_counter = bit_lib_get_bits_16(block->data, 0x6B, 10); //304
+    data_block->start_trip_minutes = bit_lib_get_bits_32(block->data, 0x80, 23); //405
+    data_block->metro_ride_with = bit_lib_get_bits(block->data, 0x97, 7); //414
+    data_block->minutes_pass = bit_lib_get_bits(block->data, 0x9E, 7); //412
+    data_block->remaining_funds = bit_lib_get_bits_32(block->data, 0xA7, 19); //322
+    data_block->validator = bit_lib_get_bits_16(block->data, 0xBA, 16); //422
+    data_block->blocked = bit_lib_get_bits(block->data, 0xCA, 1); //303
+    data_block->route = bit_lib_get_bits_16(block->data, 0xCC, 12); //424
+    data_block->passages_ground_transport = bit_lib_get_bits(block->data, 0xD8, 7); //433
+    data_block->hash = bit_lib_get_bits_32(block->data, 0xE0, 32); //502
+}
+
+void parse_layout_E6(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->layout2 = bit_lib_get_bits(block->data, 0x38, 5); //112
+    data_block->type_of_extended = bit_lib_get_bits_16(block->data, 0x3D, 10); //122
+    data_block->use_before_date = bit_lib_get_bits_16(block->data, 0x47, 13); //202
+    data_block->blank_type = bit_lib_get_bits_16(block->data, 0x54, 10); //121
+    data_block->valid_from_date = bit_lib_get_bits_32(block->data, 0x5E, 23); //311
+    data_block->extension_counter = bit_lib_get_bits_16(block->data, 0x75, 10); //304
+    data_block->valid_for_minutes = bit_lib_get_bits_32(block->data, 0x80, 20); //314
+    data_block->start_trip_neg_minutes = bit_lib_get_bits_32(block->data, 0x94, 20); //404
+    data_block->metro_ride_with = bit_lib_get_bits(block->data, 0xA8, 7); //414
+    data_block->minutes_pass = bit_lib_get_bits(block->data, 0xAF, 7); //412
+    data_block->remaining_trips = bit_lib_get_bits(block->data, 0xB6, 7); //321
+    data_block->validator = bit_lib_get_bits_16(block->data, 0xBD, 16); //422
+    data_block->blocked = bit_lib_get_bits(block->data, 0xCD, 1); //303
+    data_block->extended = bit_lib_get_bits(block->data, 0xCE, 1); //123
+    data_block->route = bit_lib_get_bits_16(block->data, 0xD4, 12); //424
+    data_block->hash = bit_lib_get_bits_32(block->data, 0xE0, 32); //502
+}
+
+void parse_layout_FCB(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->tech_code = bit_lib_get_bits_32(block->data, 0x38, 10); //tech_code
+    data_block->valid_from_date = bit_lib_get_bits_16(block->data, 0x42, 16); //311
+    data_block->valid_to_date = bit_lib_get_bits_16(block->data, 0x52, 16); //312
+    data_block->interval = bit_lib_get_bits(block->data, 0x62, 4); //interval
+    data_block->app_code1 = bit_lib_get_bits_16(block->data, 0x66, 10); //app_code1
+    data_block->hash1 = bit_lib_get_bits_16(block->data, 0x70, 16); //502.1
+    data_block->type1 = bit_lib_get_bits_16(block->data, 0x80, 10); //type1
+    data_block->app_code2 = bit_lib_get_bits_16(block->data, 0x8A, 10); //app_code2
+    data_block->type2 = bit_lib_get_bits_16(block->data, 0x94, 10); //type2
+    data_block->app_code3 = bit_lib_get_bits_16(block->data, 0x9E, 10); //app_code3
+    data_block->type3 = bit_lib_get_bits_16(block->data, 0xA8, 10); //type3
+    data_block->app_code4 = bit_lib_get_bits_16(block->data, 0xB2, 10); //app_code4
+    data_block->type4 = bit_lib_get_bits_16(block->data, 0xBC, 10); //type4
+    data_block->hash2 = bit_lib_get_bits_32(block->data, 0xE0, 32); //502.2
+}
+
+void parse_layout_F0B(BlockData* data_block, const MfClassicBlock* block) {
+    data_block->view = bit_lib_get_bits_16(block->data, 0x00, 10); //101
+    data_block->type = bit_lib_get_bits_16(block->data, 0x0A, 10); //102
+    data_block->number = bit_lib_get_bits_32(block->data, 0x14, 32); //201
+    data_block->layout = bit_lib_get_bits(block->data, 0x34, 4); //111
+    data_block->tech_code = bit_lib_get_bits_32(block->data, 0x38, 10); //tech_code
+    data_block->valid_from_date = bit_lib_get_bits_16(block->data, 0x42, 16); //311
+    data_block->valid_to_date = bit_lib_get_bits_16(block->data, 0x52, 16); //312
+    data_block->hash1 = bit_lib_get_bits_32(block->data, 0x70, 16); //502.1
+}
+
+void parse_transport_type(BlockData* data_block, FuriString* transport) {
+    switch(data_block->transport_type_flag) {
+    case 1:
+        uint8_t transport_type =
+            (data_block->transport_type1 || data_block->transport_type2 ||
+             data_block->transport_type3 || data_block->transport_type4);
+        switch(transport_type) {
+        case 1:
+            furi_string_cat(transport, "Metro");
+            break;
+        case 2:
+            furi_string_cat(transport, "Monorail");
+            break;
+        case 3:
+            furi_string_cat(transport, "MCC");
+            break;
+        default:
+            furi_string_cat(transport, "Unknown");
+            break;
+        }
+        break;
+    case 2:
+        furi_string_cat(transport, "Ground");
+        break;
+    default:
+        furi_string_cat(transport, "");
+        break;
+    }
+}
+
+bool mosgortrans_parse_transport_block(const MfClassicBlock* block, FuriString* result) {
+    BlockData data_block = {};
+    const uint16_t valid_departments[] = {0x106, 0x108, 0x10A, 0x10E, 0x110, 0x117};
+    uint16_t transport_department = bit_lib_get_bits_16(block->data, 0, 10);
+    if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
+        furi_string_cat_printf(result, "Transport department: %x\n", transport_department);
+    }
+    bool department_valid = false;
+    for(uint8_t i = 0; i < 6; i++) {
+        if(transport_department == valid_departments[i]) {
+            department_valid = true;
+            break;
+        }
+    }
+    if(!department_valid) {
+        return false;
+    }
+    FURI_LOG_D(TAG, "Transport department: %x", transport_department);
+    uint16_t layout_type = bit_lib_get_bits_16(block->data, 52, 4);
+    if(layout_type == 0xE) {
+        layout_type = bit_lib_get_bits_16(block->data, 52, 9);
+    } else if(layout_type == 0xF) {
+        layout_type = bit_lib_get_bits_16(block->data, 52, 14);
+    }
+    if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
+        furi_string_cat_printf(result, "Layout: %x\n", layout_type);
+    }
+    FURI_LOG_D(TAG, "Layout type %x", layout_type);
+    switch(layout_type) {
+    case 0x02: {
+        parse_layout_2(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Use before: %02d.%02d.%04d\n",
+            card_use_before_date_s.day,
+            card_use_before_date_s.month,
+            card_use_before_date_s.year);
+
+        if(data_block.valid_from_date == 0 || data_block.valid_to_date == 0) {
+            furi_string_cat(result, "\e#No ticket\n");
+            return true;
+        }
+        //remaining_trips
+        furi_string_cat_printf(result, "Trips: %d\n", data_block.total_trips);
+        //valid_from_date
+        DateTime card_valid_from_date_s = {0};
+        from_days_to_datetime(data_block.valid_from_date, &card_valid_from_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_valid_from_date_s.day,
+            card_valid_from_date_s.month,
+            card_valid_from_date_s.year);
+        //valid_to_date
+        DateTime card_valid_to_date_s = {0};
+        from_days_to_datetime(data_block.valid_to_date, &card_valid_to_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid to: %02d.%02d.%04d\n",
+            card_valid_to_date_s.day,
+            card_valid_to_date_s.month,
+            card_valid_to_date_s.year);
+        //trip_number
+        furi_string_cat_printf(result, "Trips: %d\n", data_block.total_trips);
+        //trip_from
+        DateTime card_start_trip_minutes_s = {0};
+        from_seconds_to_datetime(
+            data_block.start_trip_date * 24 * 60 * 60 + data_block.start_trip_time * 60 +
+                data_block.start_trip_seconds,
+            &card_start_trip_minutes_s,
+            1992);
+        furi_string_cat_printf(
+            result,
+            "Trip from: %02d.%02d.%04d %02d:%02d",
+            card_start_trip_minutes_s.day,
+            card_start_trip_minutes_s.month,
+            card_start_trip_minutes_s.year,
+            card_start_trip_minutes_s.hour,
+            card_start_trip_minutes_s.minute);
+        break;
+    }
+    case 0x06: {
+        parse_layout_6(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Use before: %02d.%02d.%04d\n",
+            card_use_before_date_s.day,
+            card_use_before_date_s.month,
+            card_use_before_date_s.year);
+        //remaining_trips
+        furi_string_cat_printf(result, "Trips left: %d\n", data_block.remaining_trips);
+        //valid_from_date
+        DateTime card_valid_from_date_s = {0};
+        from_days_to_datetime(data_block.valid_from_date, &card_valid_from_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_valid_from_date_s.day,
+            card_valid_from_date_s.month,
+            card_valid_from_date_s.year);
+        //valid_to_date
+        DateTime card_valid_to_date_s = {0};
+        from_days_to_datetime(data_block.valid_to_date, &card_valid_to_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid to: %02d.%02d.%04d\n",
+            card_valid_to_date_s.day,
+            card_valid_to_date_s.month,
+            card_valid_to_date_s.year);
+        //trip_number
+        furi_string_cat_printf(result, "Trips: %d\n", data_block.total_trips);
+        //trip_from
+        DateTime card_start_trip_minutes_s = {0};
+        from_minutes_to_datetime(
+            (data_block.start_trip_date) * 24 * 60 + data_block.start_trip_time,
+            &card_start_trip_minutes_s,
+            1992);
+        furi_string_cat_printf(
+            result,
+            "Trip from: %02d.%02d.%04d %02d:%02d\n",
+            card_start_trip_minutes_s.day,
+            card_start_trip_minutes_s.month,
+            card_start_trip_minutes_s.year,
+            card_start_trip_minutes_s.hour,
+            card_start_trip_minutes_s.minute);
+        //validator
+        furi_string_cat_printf(
+            result, "Validator: %05d", data_block.validator1 * 1024 + data_block.validator2);
+        break;
+    }
+    case 0x08: {
+        parse_layout_8(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 1992);
+        //remaining_trips
+        furi_string_cat_printf(result, "Trips left: %d\n", data_block.remaining_trips);
+        //valid_from_date
+        DateTime card_valid_from_date_s = {0};
+        from_days_to_datetime(data_block.valid_from_date, &card_valid_from_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_valid_from_date_s.day,
+            card_valid_from_date_s.month,
+            card_valid_from_date_s.year);
+        //valid_to_date
+        DateTime card_valid_to_date_s = {0};
+        from_days_to_datetime(
+            data_block.valid_from_date + data_block.valid_for_days, &card_valid_to_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid to: %02d.%02d.%04d\n",
+            card_valid_to_date_s.day,
+            card_valid_to_date_s.month,
+            card_valid_to_date_s.year);
+        break;
+    }
+    case 0x0A: {
+        parse_layout_A(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 2016);
+        furi_string_cat_printf(
+            result,
+            "Use before: %02d.%02d.%04d\n",
+            card_use_before_date_s.day,
+            card_use_before_date_s.month,
+            card_use_before_date_s.year);
+        //remaining_trips
+        furi_string_cat_printf(result, "Trips left: %d\n", data_block.remaining_trips);
+        //valid_from_date
+        DateTime card_valid_from_date_s = {0};
+        from_days_to_datetime(data_block.valid_from_date, &card_valid_from_date_s, 2016);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_valid_from_date_s.day,
+            card_valid_from_date_s.month,
+            card_valid_from_date_s.year);
+        //valid_to_date
+        DateTime card_valid_to_date_s = {0};
+        from_minutes_to_datetime(
+            data_block.valid_from_date * 24 * 60 + data_block.valid_for_minutes - 1,
+            &card_valid_to_date_s,
+            2016);
+        furi_string_cat_printf(
+            result,
+            "Valid to: %02d.%02d.%04d\n",
+            card_valid_to_date_s.day,
+            card_valid_to_date_s.month,
+            card_valid_to_date_s.year);
+        //trip_from
+        if(data_block.start_trip_minutes) {
+            DateTime card_start_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.valid_from_date * 24 * 60 + data_block.start_trip_minutes,
+                &card_start_trip_minutes_s,
+                2016);
+            furi_string_cat_printf(
+                result,
+                "Trip from: %02d.%02d.%04d %02d:%02d\n",
+                card_start_trip_minutes_s.day,
+                card_start_trip_minutes_s.month,
+                card_start_trip_minutes_s.year,
+                card_start_trip_minutes_s.hour,
+                card_start_trip_minutes_s.minute);
+        }
+        //trip_switch
+        if(data_block.minutes_pass) {
+            DateTime card_start_switch_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.valid_from_date * 24 * 60 + data_block.start_trip_minutes +
+                    data_block.minutes_pass,
+                &card_start_switch_trip_minutes_s,
+                2016);
+            furi_string_cat_printf(
+                result,
+                "Trip switch: %02d.%02d.%04d %02d:%02d\n",
+                card_start_switch_trip_minutes_s.day,
+                card_start_switch_trip_minutes_s.month,
+                card_start_switch_trip_minutes_s.year,
+                card_start_switch_trip_minutes_s.hour,
+                card_start_switch_trip_minutes_s.minute);
+        }
+        //transport
+        FuriString* transport = furi_string_alloc();
+        parse_transport_type(&data_block, transport);
+        furi_string_cat_printf(result, "Transport: %s\n", furi_string_get_cstr(transport));
+        //validator
+        if(data_block.validator) {
+            furi_string_cat_printf(result, "Validator: %05d\n", data_block.validator);
+        }
+        furi_string_free(transport);
+        break;
+    }
+    case 0x0C: {
+        parse_layout_C(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 1992);
+        //remaining_trips
+        furi_string_cat_printf(result, "Trips left: %d\n", data_block.remaining_trips);
+        //valid_from_date
+        DateTime card_valid_from_date_s = {0};
+        from_days_to_datetime(data_block.valid_from_date, &card_valid_from_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_valid_from_date_s.day,
+            card_valid_from_date_s.month,
+            card_valid_from_date_s.year);
+        //valid_to_date
+        DateTime card_valid_to_date_s = {0};
+        from_days_to_datetime(
+            data_block.valid_from_date + data_block.valid_for_days, &card_valid_to_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid to: %02d.%02d.%04d\n",
+            card_valid_to_date_s.day,
+            card_valid_to_date_s.month,
+            card_valid_to_date_s.year);
+        //remaining_trips
+        furi_string_cat_printf(result, "Trips left: %d\n", data_block.remaining_trips);
+        //trip_from
+        if(data_block.start_trip_date) {
+            DateTime card_start_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.start_trip_date * 24 * 60 + data_block.start_trip_time,
+                &card_start_trip_minutes_s,
+                1992);
+        }
+        //validator
+        if(data_block.validator) {
+            furi_string_cat_printf(result, "Validator: %05d", data_block.validator);
+        }
+        break;
+    }
+    case 0x0D: {
+        parse_layout_D(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Use before: %02d.%02d.%04d\n",
+            card_use_before_date_s.day,
+            card_use_before_date_s.month,
+            card_use_before_date_s.year);
+        //remaining_trips
+        furi_string_cat_printf(result, "Trips left: %d\n", data_block.remaining_trips);
+        //valid_from_date
+        DateTime card_valid_from_date_s = {0};
+        from_days_to_datetime(data_block.valid_from_date, &card_valid_from_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_valid_from_date_s.day,
+            card_valid_from_date_s.month,
+            card_valid_from_date_s.year);
+        //valid_to_date
+        DateTime card_valid_to_date_s = {0};
+        from_days_to_datetime(
+            data_block.valid_from_date + data_block.valid_for_days, &card_valid_to_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid to: %02d.%02d.%04d\n",
+            card_valid_to_date_s.day,
+            card_valid_to_date_s.month,
+            card_valid_to_date_s.year);
+        //trip_from
+        if(data_block.start_trip_date) {
+            DateTime card_start_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.start_trip_date * 24 * 60 + data_block.start_trip_time,
+                &card_start_trip_minutes_s,
+                1992);
+        }
+        //trip_switch
+        if(data_block.passage_5_minutes) {
+            DateTime card_start_switch_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.start_trip_date * 24 * 60 + data_block.start_trip_time +
+                    data_block.passage_5_minutes,
+                &card_start_switch_trip_minutes_s,
+                1992);
+        }
+        //validator
+        if(data_block.validator) {
+            furi_string_cat_printf(result, "Validator: %05d", data_block.validator);
+        }
+        break;
+    }
+    case 0xE1:
+    case 0x1C1: {
+        parse_layout_E1(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Use before: %02d.%02d.%04d\n",
+            card_use_before_date_s.day,
+            card_use_before_date_s.month,
+            card_use_before_date_s.year);
+        //remaining_funds
+        furi_string_cat_printf(result, "Balance: %ld rub\n", data_block.remaining_funds / 100);
+        //trip_from
+        if(data_block.start_trip_date) {
+            DateTime card_start_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.start_trip_date * 24 * 60 + data_block.start_trip_time,
+                &card_start_trip_minutes_s,
+                1992);
+            furi_string_cat_printf(
+                result,
+                "Trip from: %02d.%02d.%04d %02d:%02d\n",
+                card_start_trip_minutes_s.day,
+                card_start_trip_minutes_s.month,
+                card_start_trip_minutes_s.year,
+                card_start_trip_minutes_s.hour,
+                card_start_trip_minutes_s.minute);
+        }
+        //transport
+        FuriString* transport = furi_string_alloc();
+        switch(data_block.transport_type1) {
+        case 1:
+            switch(data_block.transport_type2) {
+            case 1:
+                furi_string_cat(transport, "Metro");
+                break;
+            case 2:
+                furi_string_cat(transport, "Monorail");
+                break;
+            default:
+                furi_string_cat(transport, "Unknown");
+                break;
+            }
+            break;
+        case 2:
+            furi_string_cat(transport, "Ground");
+            break;
+        case 3:
+            furi_string_cat(transport, "MCC");
+            break;
+        default:
+            furi_string_cat(transport, "");
+            break;
+        }
+        furi_string_cat_printf(result, "Transport: %s\n", furi_string_get_cstr(transport));
+        //validator
+        if(data_block.validator) {
+            furi_string_cat_printf(result, "Validator: %05d", data_block.validator);
+        }
+        furi_string_free(transport);
+        break;
+    }
+    case 0xE2:
+    case 0x1C2: {
+        parse_layout_E2(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Use before: %02d.%02d.%04d\n",
+            card_use_before_date_s.day,
+            card_use_before_date_s.month,
+            card_use_before_date_s.year);
+        //remaining_trips
+        furi_string_cat_printf(result, "Trips left: %d\n", data_block.remaining_trips);
+        //valid_from_date
+        DateTime card_valid_from_date_s = {0};
+        from_days_to_datetime(data_block.valid_from_date, &card_valid_from_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_valid_from_date_s.day,
+            card_valid_from_date_s.month,
+            card_valid_from_date_s.year);
+        //valid_to_date
+        if(data_block.activate_during) {
+            DateTime card_valid_to_date_s = {0};
+            from_days_to_datetime(
+                data_block.valid_from_date + data_block.activate_during,
+                &card_valid_to_date_s,
+                1992);
+            furi_string_cat_printf(
+                result,
+                "Valid to: %02d.%02d.%04d\n",
+                card_valid_to_date_s.day,
+                card_valid_to_date_s.month,
+                card_valid_to_date_s.year);
+        } else {
+            DateTime card_valid_to_date_s = {0};
+            from_minutes_to_datetime(
+                data_block.valid_from_date * 24 * 60 + data_block.valid_for_minutes - 1,
+                &card_valid_to_date_s,
+                1992);
+            furi_string_cat_printf(
+                result,
+                "Valid to: %02d.%02d.%04d\n",
+                card_valid_to_date_s.day,
+                card_valid_to_date_s.month,
+                card_valid_to_date_s.year);
+        }
+        //trip_from
+        if(data_block.start_trip_neg_minutes) {
+            DateTime card_start_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.valid_to_date * 24 * 60 + data_block.valid_for_minutes -
+                    data_block.start_trip_neg_minutes,
+                &card_start_trip_minutes_s,
+                1992); //-time
+            furi_string_cat_printf(
+                result,
+                "Trip from: %02d.%02d.%04d %02d:%02d\n",
+                card_start_trip_minutes_s.day,
+                card_start_trip_minutes_s.month,
+                card_start_trip_minutes_s.year,
+                card_start_trip_minutes_s.hour,
+                card_start_trip_minutes_s.minute);
+        }
+        //trip_switch
+        if(data_block.minutes_pass) {
+            DateTime card_start_switch_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.valid_from_date * 24 * 60 + data_block.valid_for_minutes -
+                    data_block.start_trip_neg_minutes + data_block.minutes_pass,
+                &card_start_switch_trip_minutes_s,
+                1992);
+            furi_string_cat_printf(
+                result,
+                "Trip switch: %02d.%02d.%04d %02d:%02d\n",
+                card_start_switch_trip_minutes_s.day,
+                card_start_switch_trip_minutes_s.month,
+                card_start_switch_trip_minutes_s.year,
+                card_start_switch_trip_minutes_s.hour,
+                card_start_switch_trip_minutes_s.minute);
+        }
+        //transport
+        FuriString* transport = furi_string_alloc();
+        switch(data_block.transport_type) {
+        case 1:
+            furi_string_cat(transport, "Metro");
+            break;
+        case 2:
+            furi_string_cat(transport, "Monorail");
+            break;
+        case 3:
+            furi_string_cat(transport, "Ground");
+            break;
+        default:
+            furi_string_cat(transport, "Unknown");
+            break;
+        }
+        //validator
+        if(data_block.validator) {
+            furi_string_cat_printf(result, "Validator: %05d", data_block.validator);
+        }
+        furi_string_free(transport);
+        break;
+    }
+    case 0xE3:
+    case 0x1C3: {
+        parse_layout_E3(&data_block, block);
+        // number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        // use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Use before: %02d.%02d.%04d\n",
+            card_use_before_date_s.day,
+            card_use_before_date_s.month,
+            card_use_before_date_s.year);
+        // remaining_funds
+        furi_string_cat_printf(result, "Balance: %lu rub\n", data_block.remaining_funds);
+        // start_trip_minutes
+        DateTime card_start_trip_minutes_s = {0};
+        from_minutes_to_datetime(data_block.start_trip_minutes, &card_start_trip_minutes_s, 2016);
+        furi_string_cat_printf(
+            result,
+            "Trip from: %02d.%02d.%04d %02d:%02d\n",
+            card_start_trip_minutes_s.day,
+            card_start_trip_minutes_s.month,
+            card_start_trip_minutes_s.year,
+            card_start_trip_minutes_s.hour,
+            card_start_trip_minutes_s.minute);
+        // transport
+        FuriString* transport = furi_string_alloc();
+        parse_transport_type(&data_block, transport);
+        furi_string_cat_printf(result, "Transport: %s\n", furi_string_get_cstr(transport));
+        // validator
+        furi_string_cat_printf(result, "Validator: %05d\n", data_block.validator);
+        // fare
+        FuriString* fare = furi_string_alloc();
+        switch(data_block.fare_trip) {
+        case 0:
+            furi_string_cat(fare, "");
+            break;
+        case 1:
+            furi_string_cat(fare, "Single");
+            break;
+        case 2:
+            furi_string_cat(fare, "90 minutes");
+            break;
+        default:
+            furi_string_cat(fare, "Unknown");
+            break;
+        }
+        furi_string_cat_printf(result, "Fare: %s", furi_string_get_cstr(fare));
+        furi_string_free(fare);
+        furi_string_free(transport);
+        break;
+    }
+    case 0xE4:
+    case 0x1C4: {
+        parse_layout_E4(&data_block, block);
+
+        // number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        // use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 2016);
+        furi_string_cat_printf(
+            result,
+            "Use before: %02d.%02d.%04d\n",
+            card_use_before_date_s.day,
+            card_use_before_date_s.month,
+            card_use_before_date_s.year);
+        // remaining_funds
+        furi_string_cat_printf(result, "Balance: %lu rub\n", data_block.remaining_funds);
+        // valid_from_date
+        DateTime card_use_from_date_s = {0};
+        from_days_to_datetime(data_block.valid_from_date, &card_use_from_date_s, 2016);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_use_from_date_s.day,
+            card_use_from_date_s.month,
+            card_use_from_date_s.year);
+        // valid_to_date
+        DateTime card_use_to_date_s = {0};
+        if(data_block.requires_activation) {
+            from_days_to_datetime(
+                data_block.valid_from_date + data_block.activate_during,
+                &card_use_to_date_s,
+                2016);
+        } else {
+            from_minutes_to_datetime(
+                data_block.valid_from_date * 24 * 60 + data_block.valid_for_minutes - 1,
+                &card_use_to_date_s,
+                2016);
+        }
+
+        furi_string_cat_printf(
+            result,
+            "Valid to: %02d.%02d.%04d\n",
+            card_use_to_date_s.day,
+            card_use_to_date_s.month,
+            card_use_to_date_s.year);
+        // trip_number
+        // furi_string_cat_printf(result, "Trips left: %d", data_block.remaining_trips);
+        // trip_from
+        DateTime card_start_trip_minutes_s = {0};
+        from_minutes_to_datetime(
+            data_block.valid_from_date * 24 * 60 + data_block.valid_for_minutes -
+                data_block.start_trip_neg_minutes,
+            &card_start_trip_minutes_s,
+            2016);
+        //transport
+        FuriString* transport = furi_string_alloc();
+        parse_transport_type(&data_block, transport);
+        furi_string_cat_printf(result, "Transport: %s\n", furi_string_get_cstr(transport));
+        // validator
+        if(data_block.validator) {
+            furi_string_cat_printf(result, "Validator: %05d", data_block.validator);
+        }
+        furi_string_free(transport);
+        break;
+    }
+    case 0xE5:
+    case 0x1C5: {
+        parse_layout_E5(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 2019);
+        furi_string_cat_printf(
+            result,
+            "Use before: %02d.%02d.%04d\n",
+            card_use_before_date_s.day,
+            card_use_before_date_s.month,
+            card_use_before_date_s.year);
+        //remaining_funds
+        furi_string_cat_printf(result, "Balance: %ld rub\n", data_block.remaining_funds / 100);
+        //start_trip_minutes
+        if(data_block.start_trip_minutes) {
+            DateTime card_start_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.start_trip_minutes, &card_start_trip_minutes_s, 2019);
+            furi_string_cat_printf(
+                result,
+                "Trip from: %02d.%02d.%04d %02d:%02d\n",
+                card_start_trip_minutes_s.day,
+                card_start_trip_minutes_s.month,
+                card_start_trip_minutes_s.year,
+                card_start_trip_minutes_s.hour,
+                card_start_trip_minutes_s.minute);
+        }
+        //start_m_trip_minutes
+        if(data_block.metro_ride_with) {
+            DateTime card_start_m_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.start_trip_minutes + data_block.metro_ride_with,
+                &card_start_m_trip_minutes_s,
+                2019);
+            furi_string_cat_printf(
+                result,
+                "(M) from: %02d.%02d.%04d %02d:%02d\n",
+                card_start_m_trip_minutes_s.day,
+                card_start_m_trip_minutes_s.month,
+                card_start_m_trip_minutes_s.year,
+                card_start_m_trip_minutes_s.hour,
+                card_start_m_trip_minutes_s.minute);
+        }
+        if(data_block.minutes_pass) {
+            DateTime card_start_change_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.start_trip_minutes + data_block.minutes_pass,
+                &card_start_change_trip_minutes_s,
+                2019);
+            furi_string_cat_printf(
+                result,
+                "Trip edit: %02d.%02d.%04d %02d:%02d\n",
+                card_start_change_trip_minutes_s.day,
+                card_start_change_trip_minutes_s.month,
+                card_start_change_trip_minutes_s.year,
+                card_start_change_trip_minutes_s.hour,
+                card_start_change_trip_minutes_s.minute);
+        }
+        //transport
+        //validator
+        if(data_block.validator) {
+            furi_string_cat_printf(result, "Validator: %05d", data_block.validator);
+        }
+        break;
+    }
+    case 0xE6:
+    case 0x1C6: {
+        parse_layout_E6(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //use_before_date
+        DateTime card_use_before_date_s = {0};
+        from_days_to_datetime(data_block.use_before_date, &card_use_before_date_s, 2019);
+        furi_string_cat_printf(
+            result,
+            "Use before: %02d.%02d.%04d\n",
+            card_use_before_date_s.day,
+            card_use_before_date_s.month,
+            card_use_before_date_s.year);
+        //remaining_trips
+        furi_string_cat_printf(result, "Trips left: %d\n", data_block.remaining_trips);
+        //valid_from_date
+        DateTime card_use_from_date_s = {0};
+        from_minutes_to_datetime(data_block.valid_from_date, &card_use_from_date_s, 2019);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_use_from_date_s.day,
+            card_use_from_date_s.month,
+            card_use_from_date_s.year);
+        //valid_to_date
+        DateTime card_use_to_date_s = {0};
+        from_minutes_to_datetime(
+            data_block.valid_from_date + data_block.valid_for_minutes - 1,
+            &card_use_to_date_s,
+            2019);
+        furi_string_cat_printf(
+            result,
+            "Valid to: %02d.%02d.%04d\n",
+            card_use_to_date_s.day,
+            card_use_to_date_s.month,
+            card_use_to_date_s.year);
+        //start_trip_minutes
+        if(data_block.start_trip_neg_minutes) {
+            DateTime card_start_trip_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.valid_from_date + data_block.valid_for_minutes -
+                    data_block.start_trip_neg_minutes,
+                &card_start_trip_minutes_s,
+                2019); //-time
+            furi_string_cat_printf(
+                result,
+                "Trip from: %02d.%02d.%04d %02d:%02d\n",
+                card_start_trip_minutes_s.day,
+                card_start_trip_minutes_s.month,
+                card_start_trip_minutes_s.year,
+                card_start_trip_minutes_s.hour,
+                card_start_trip_minutes_s.minute);
+        }
+        //start_trip_m_minutes
+        if(data_block.metro_ride_with) {
+            DateTime card_start_trip_m_minutes_s = {0};
+            from_minutes_to_datetime(
+                data_block.valid_from_date + data_block.valid_for_minutes -
+                    data_block.start_trip_neg_minutes + data_block.metro_ride_with,
+                &card_start_trip_m_minutes_s,
+                2019);
+            furi_string_cat_printf(
+                result,
+                "(M) from: %02d.%02d.%04d %02d:%02d\n",
+                card_start_trip_m_minutes_s.day,
+                card_start_trip_m_minutes_s.month,
+                card_start_trip_m_minutes_s.year,
+                card_start_trip_m_minutes_s.hour,
+                card_start_trip_m_minutes_s.minute);
+        }
+        //transport
+        //validator
+        if(data_block.validator) {
+            furi_string_cat_printf(result, "Validator: %05d", data_block.validator);
+        }
+        break;
+    }
+    case 0x3CCB: {
+        parse_layout_FCB(&data_block, block);
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //valid_from_date
+        DateTime card_use_from_date_s = {0};
+        from_days_to_datetime(data_block.valid_from_date, &card_use_from_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_use_from_date_s.day,
+            card_use_from_date_s.month,
+            card_use_from_date_s.year);
+        //valid_to_date
+        DateTime card_use_to_date_s = {0};
+        from_days_to_datetime(data_block.valid_to_date, &card_use_to_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid to: %02d.%02d.%04d",
+            card_use_to_date_s.day,
+            card_use_to_date_s.month,
+            card_use_to_date_s.year);
+        break;
+    }
+    case 0x3C0B: {
+        //number
+        furi_string_cat_printf(result, "Number: %010lu\n", data_block.number);
+        //valid_from_date
+        DateTime card_use_from_date_s = {0};
+        from_days_to_datetime(data_block.valid_from_date, &card_use_from_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid from: %02d.%02d.%04d\n",
+            card_use_from_date_s.day,
+            card_use_from_date_s.month,
+            card_use_from_date_s.year);
+        //valid_to_date
+        DateTime card_use_to_date_s = {0};
+        from_days_to_datetime(data_block.valid_to_date, &card_use_to_date_s, 1992);
+        furi_string_cat_printf(
+            result,
+            "Valid to: %02d.%02d.%04d",
+            card_use_to_date_s.day,
+            card_use_to_date_s.month,
+            card_use_to_date_s.year);
+        break;
+    }
+    default:
+        result = NULL;
+        return false;
+    }
+
+    return true;
+}
diff --git a/applications/main/nfc/api/mosgortrans/mosgortrans_util.h b/applications/main/nfc/api/mosgortrans/mosgortrans_util.h
new file mode 100644
index 000000000..e5da8ddeb
--- /dev/null
+++ b/applications/main/nfc/api/mosgortrans/mosgortrans_util.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <bit_lib.h>
+#include <datetime.h>
+#include <furi/core/string.h>
+#include <nfc/protocols/mf_classic/mf_classic.h>
+#include <furi_hal_rtc.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool mosgortrans_parse_transport_block(const MfClassicBlock* block, FuriString* result);
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/applications/main/nfc/api/nfc_app_api_table_i.h b/applications/main/nfc/api/nfc_app_api_table_i.h
index 08bff072e..bf0e926ee 100644
--- a/applications/main/nfc/api/nfc_app_api_table_i.h
+++ b/applications/main/nfc/api/nfc_app_api_table_i.h
@@ -1,4 +1,5 @@
 #include "gallagher/gallagher_util.h"
+#include "mosgortrans/mosgortrans_util.h"
 
 /* 
  * A list of app's private functions and objects to expose for plugins.
@@ -10,4 +11,8 @@ static constexpr auto nfc_app_api_table = sort(create_array_t<sym_entry>(
         gallagher_deobfuscate_and_parse_credential,
         void,
         (GallagherCredential * credential, const uint8_t* cardholder_data_obfuscated)),
-    API_VARIABLE(GALLAGHER_CARDAX_ASCII, const uint8_t*)));
+    API_VARIABLE(GALLAGHER_CARDAX_ASCII, const uint8_t*),
+    API_METHOD(
+        mosgortrans_parse_transport_block,
+        bool,
+        (const MfClassicBlock* block, FuriString* result))));
diff --git a/applications/main/nfc/application.fam b/applications/main/nfc/application.fam
index 4c7d20a63..2b4b906d6 100644
--- a/applications/main/nfc/application.fam
+++ b/applications/main/nfc/application.fam
@@ -128,6 +128,15 @@ App(
     sources=["plugins/supported_cards/metromoney.c"],
 )
 
+App(
+    appid="charliecard_parser",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="charliecard_plugin_ep",
+    targets=["f7"],
+    requires=["nfc"],
+    sources=["plugins/supported_cards/charliecard.c"],
+)
+
 App(
     appid="kazan_parser",
     apptype=FlipperAppType.PLUGIN,
@@ -146,6 +155,15 @@ App(
     sources=["plugins/supported_cards/aime.c"],
 )
 
+App(
+    appid="bip_parser",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="bip_plugin_ep",
+    targets=["f7"],
+    requires=["nfc"],
+    sources=["plugins/supported_cards/bip.c"],
+)
+
 App(
     appid="saflok_parser",
     apptype=FlipperAppType.PLUGIN,
@@ -223,7 +241,7 @@ App(
     apptype=FlipperAppType.PLUGIN,
     entry_point="emv_plugin_ep",
     targets=["f7"],
-    requires=["nfc", "storage"],
+    requires=["nfc"],
     sources=["plugins/supported_cards/emv.c", "helpers/nfc_emv_parser.c"],
 )
 
diff --git a/applications/main/nfc/helpers/felica_auth.c b/applications/main/nfc/helpers/felica_auth.c
new file mode 100644
index 000000000..a8cd0929b
--- /dev/null
+++ b/applications/main/nfc/helpers/felica_auth.c
@@ -0,0 +1,21 @@
+#include "felica_auth.h"
+
+FelicaAuthenticationContext* felica_auth_alloc() {
+    FelicaAuthenticationContext* instance = malloc(sizeof(FelicaAuthenticationContext));
+    memset(instance->card_key.data, 0, FELICA_DATA_BLOCK_SIZE);
+    instance->skip_auth = true;
+    return instance;
+}
+
+void felica_auth_free(FelicaAuthenticationContext* instance) {
+    furi_assert(instance);
+    free(instance);
+}
+
+void felica_auth_reset(FelicaAuthenticationContext* instance) {
+    furi_assert(instance);
+    memset(instance->card_key.data, 0, FELICA_DATA_BLOCK_SIZE);
+    instance->skip_auth = true;
+    instance->auth_status.external = 0;
+    instance->auth_status.internal = 0;
+}
\ No newline at end of file
diff --git a/applications/main/nfc/helpers/felica_auth.h b/applications/main/nfc/helpers/felica_auth.h
new file mode 100644
index 000000000..3d99f1f9c
--- /dev/null
+++ b/applications/main/nfc/helpers/felica_auth.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <lib/nfc/protocols/felica/felica.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+FelicaAuthenticationContext* felica_auth_alloc();
+
+void felica_auth_free(FelicaAuthenticationContext* instance);
+
+void felica_auth_reset(FelicaAuthenticationContext* instance);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/applications/main/nfc/helpers/mf_classic_key_cache.c b/applications/main/nfc/helpers/mf_classic_key_cache.c
index 5127e6452..2c1141e9c 100644
--- a/applications/main/nfc/helpers/mf_classic_key_cache.c
+++ b/applications/main/nfc/helpers/mf_classic_key_cache.c
@@ -23,7 +23,7 @@ static void nfc_get_key_cache_file_path(const uint8_t* uid, size_t uid_len, Furi
     furi_string_cat_printf(path, "%s", NFC_APP_KEYS_EXTENSION);
 }
 
-MfClassicKeyCache* mf_classic_key_cache_alloc() {
+MfClassicKeyCache* mf_classic_key_cache_alloc(void) {
     MfClassicKeyCache* instance = malloc(sizeof(MfClassicKeyCache));
 
     return instance;
diff --git a/applications/main/nfc/helpers/mf_classic_key_cache.h b/applications/main/nfc/helpers/mf_classic_key_cache.h
index 407c6e28b..b09f4526b 100644
--- a/applications/main/nfc/helpers/mf_classic_key_cache.h
+++ b/applications/main/nfc/helpers/mf_classic_key_cache.h
@@ -8,7 +8,7 @@ extern "C" {
 
 typedef struct MfClassicKeyCache MfClassicKeyCache;
 
-MfClassicKeyCache* mf_classic_key_cache_alloc();
+MfClassicKeyCache* mf_classic_key_cache_alloc(void);
 
 void mf_classic_key_cache_free(MfClassicKeyCache* instance);
 
diff --git a/applications/main/nfc/helpers/mf_ultralight_auth.c b/applications/main/nfc/helpers/mf_ultralight_auth.c
index 5e0c67887..d954c1f7e 100644
--- a/applications/main/nfc/helpers/mf_ultralight_auth.c
+++ b/applications/main/nfc/helpers/mf_ultralight_auth.c
@@ -3,7 +3,7 @@
 #include <furi.h>
 #include <mbedtls/sha1.h>
 
-MfUltralightAuth* mf_ultralight_auth_alloc() {
+MfUltralightAuth* mf_ultralight_auth_alloc(void) {
     MfUltralightAuth* instance = malloc(sizeof(MfUltralightAuth));
 
     return instance;
diff --git a/applications/main/nfc/helpers/mf_ultralight_auth.h b/applications/main/nfc/helpers/mf_ultralight_auth.h
index 2ddfcafe1..51267b3ea 100644
--- a/applications/main/nfc/helpers/mf_ultralight_auth.h
+++ b/applications/main/nfc/helpers/mf_ultralight_auth.h
@@ -20,7 +20,7 @@ typedef struct {
     MfUltralightAuthPack pack;
 } MfUltralightAuth;
 
-MfUltralightAuth* mf_ultralight_auth_alloc();
+MfUltralightAuth* mf_ultralight_auth_alloc(void);
 
 void mf_ultralight_auth_free(MfUltralightAuth* instance);
 
diff --git a/applications/main/nfc/helpers/nfc_supported_cards.c b/applications/main/nfc/helpers/nfc_supported_cards.c
index f5668b506..1e0e7ba6b 100644
--- a/applications/main/nfc/helpers/nfc_supported_cards.c
+++ b/applications/main/nfc/helpers/nfc_supported_cards.c
@@ -53,7 +53,7 @@ struct NfcSupportedCards {
     NfcSupportedCardsLoadContext* load_context;
 };
 
-NfcSupportedCards* nfc_supported_cards_alloc() {
+NfcSupportedCards* nfc_supported_cards_alloc(void) {
     NfcSupportedCards* instance = malloc(sizeof(NfcSupportedCards));
 
     instance->api_resolver = composite_api_resolver_alloc();
@@ -81,7 +81,7 @@ void nfc_supported_cards_free(NfcSupportedCards* instance) {
     free(instance);
 }
 
-static NfcSupportedCardsLoadContext* nfc_supported_cards_load_context_alloc() {
+static NfcSupportedCardsLoadContext* nfc_supported_cards_load_context_alloc(void) {
     NfcSupportedCardsLoadContext* instance = malloc(sizeof(NfcSupportedCardsLoadContext));
 
     instance->storage = furi_record_open(RECORD_STORAGE);
diff --git a/applications/main/nfc/helpers/nfc_supported_cards.h b/applications/main/nfc/helpers/nfc_supported_cards.h
index 7778c6f22..5eaee360a 100644
--- a/applications/main/nfc/helpers/nfc_supported_cards.h
+++ b/applications/main/nfc/helpers/nfc_supported_cards.h
@@ -25,7 +25,7 @@ typedef struct NfcSupportedCards NfcSupportedCards;
  *
  * @return pointer to allocated NfcSupportedCards instance.
  */
-NfcSupportedCards* nfc_supported_cards_alloc();
+NfcSupportedCards* nfc_supported_cards_alloc(void);
 
 /**
  * @brief Delete an NfcSupportedCards instance
diff --git a/applications/main/nfc/helpers/protocol_support/felica/felica.c b/applications/main/nfc/helpers/protocol_support/felica/felica.c
index affa33b86..b0660f3e6 100644
--- a/applications/main/nfc/helpers/protocol_support/felica/felica.c
+++ b/applications/main/nfc/helpers/protocol_support/felica/felica.c
@@ -7,6 +7,11 @@
 
 #include "../nfc_protocol_support_common.h"
 #include "../nfc_protocol_support_gui_common.h"
+#include "../nfc_protocol_support_unlock_helper.h"
+
+enum {
+    SubmenuIndexUnlock = SubmenuIndexCommonMax,
+};
 
 static void nfc_scene_info_on_enter_felica(NfcApp* instance) {
     const NfcDevice* device = instance->nfc_device;
@@ -18,6 +23,35 @@ static void nfc_scene_info_on_enter_felica(NfcApp* instance) {
         temp_str, "\e#%s\n", nfc_device_get_name(device, NfcDeviceNameTypeFull));
     nfc_render_felica_info(data, NfcProtocolFormatTypeFull, temp_str);
 
+    widget_add_text_scroll_element(
+        instance->widget, 0, 0, 128, 48, furi_string_get_cstr(temp_str));
+
+    widget_add_button_element(
+        instance->widget,
+        GuiButtonTypeRight,
+        "More",
+        nfc_protocol_support_common_widget_callback,
+        instance);
+    furi_string_free(temp_str);
+}
+
+static bool nfc_scene_info_on_event_felica(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == GuiButtonTypeRight) {
+        scene_manager_next_scene(instance->scene_manager, NfcSceneMoreInfo);
+        return true;
+    }
+
+    return false;
+}
+
+static void nfc_scene_more_info_on_enter_felica(NfcApp* instance) {
+    const NfcDevice* device = instance->nfc_device;
+    const FelicaData* data = nfc_device_get_data(device, NfcProtocolFelica);
+
+    FuriString* temp_str = furi_string_alloc();
+
+    nfc_render_felica_dump(data, temp_str);
+
     widget_add_text_scroll_element(
         instance->widget, 0, 0, 128, 64, furi_string_get_cstr(temp_str));
 
@@ -29,29 +63,75 @@ static NfcCommand nfc_scene_read_poller_callback_felica(NfcGenericEvent event, v
 
     NfcApp* instance = context;
     const FelicaPollerEvent* felica_event = event.event_data;
+    NfcCommand command = NfcCommandContinue;
 
     if(felica_event->type == FelicaPollerEventTypeReady) {
         nfc_device_set_data(
             instance->nfc_device, NfcProtocolFelica, nfc_poller_get_data(instance->poller));
         view_dispatcher_send_custom_event(instance->view_dispatcher, NfcCustomEventPollerSuccess);
-        return NfcCommandStop;
+        command = NfcCommandStop;
+    } else if(
+        felica_event->type == FelicaPollerEventTypeError ||
+        felica_event->type == FelicaPollerEventTypeIncomplete) {
+        nfc_device_set_data(
+            instance->nfc_device, NfcProtocolFelica, nfc_poller_get_data(instance->poller));
+        view_dispatcher_send_custom_event(
+            instance->view_dispatcher, NfcCustomEventPollerIncomplete);
+        command = NfcCommandStop;
+    } else if(felica_event->type == FelicaPollerEventTypeRequestAuthContext) {
+        view_dispatcher_send_custom_event(instance->view_dispatcher, NfcCustomEventCardDetected);
+        FelicaAuthenticationContext* ctx = felica_event->data->auth_context;
+        ctx->skip_auth = instance->felica_auth->skip_auth;
+        memcpy(ctx->card_key.data, instance->felica_auth->card_key.data, FELICA_DATA_BLOCK_SIZE);
     }
 
-    return NfcCommandContinue;
+    return command;
 }
 
 static void nfc_scene_read_on_enter_felica(NfcApp* instance) {
+    nfc_unlock_helper_setup_from_state(instance);
     nfc_poller_start(instance->poller, nfc_scene_read_poller_callback_felica, instance);
 }
 
+bool nfc_scene_read_on_event_felica(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == NfcCustomEventCardDetected) {
+            nfc_unlock_helper_card_detected_handler(instance);
+        } else if(event.event == NfcCustomEventPollerIncomplete) {
+            notification_message(instance->notifications, &sequence_semi_success);
+            scene_manager_next_scene(instance->scene_manager, NfcSceneReadSuccess);
+            dolphin_deed(DolphinDeedNfcReadSuccess);
+        }
+    }
+    return true;
+}
+
 static void nfc_scene_read_success_on_enter_felica(NfcApp* instance) {
     const NfcDevice* device = instance->nfc_device;
     const FelicaData* data = nfc_device_get_data(device, NfcProtocolFelica);
 
     FuriString* temp_str = furi_string_alloc();
-    furi_string_cat_printf(
-        temp_str, "\e#%s\n", nfc_device_get_name(device, NfcDeviceNameTypeFull));
-    nfc_render_felica_info(data, NfcProtocolFormatTypeShort, temp_str);
+
+    if(!scene_manager_has_previous_scene(instance->scene_manager, NfcSceneFelicaUnlockWarn)) {
+        furi_string_cat_printf(
+            temp_str, "\e#%s\n", nfc_device_get_name(device, NfcDeviceNameTypeFull));
+        nfc_render_felica_info(data, NfcProtocolFormatTypeShort, temp_str);
+    } else {
+        bool all_unlocked = data->blocks_read == data->blocks_total;
+        furi_string_cat_printf(
+            temp_str,
+            "\e#%s\n",
+            all_unlocked ? "All Blocks Are Unlocked" : "Some Blocks Are Locked");
+        nfc_render_felica_idm(data, NfcProtocolFormatTypeShort, temp_str);
+        uint8_t* ck_data = instance->felica_auth->card_key.data;
+        furi_string_cat_printf(temp_str, "Key:");
+        for(uint8_t i = 0; i < 7; i++) {
+            furi_string_cat_printf(temp_str, " %02X", ck_data[i]);
+            if(i == 6) furi_string_cat_printf(temp_str, "...");
+        }
+        nfc_render_felica_blocks_count(data, temp_str, false);
+    }
+    felica_auth_reset(instance->felica_auth);
 
     widget_add_text_scroll_element(
         instance->widget, 0, 0, 128, 52, furi_string_get_cstr(temp_str));
@@ -74,23 +154,50 @@ static void nfc_scene_emulate_on_enter_felica(NfcApp* instance) {
     nfc_listener_start(instance->listener, NULL, NULL);
 }
 
+static void nfc_scene_read_menu_on_enter_felica(NfcApp* instance) {
+    const FelicaData* data = nfc_device_get_data(instance->nfc_device, NfcProtocolFelica);
+    if(data->blocks_read != data->blocks_total) {
+        submenu_add_item(
+            instance->submenu,
+            "Unlock",
+            SubmenuIndexUnlock,
+            nfc_protocol_support_common_submenu_callback,
+            instance);
+    }
+}
+
+static bool nfc_scene_read_menu_on_event_felica(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == SubmenuIndexUnlock) {
+            scene_manager_next_scene(instance->scene_manager, NfcSceneFelicaKeyInput);
+            return true;
+        }
+    }
+    return false;
+}
+
 const NfcProtocolSupportBase nfc_protocol_support_felica = {
     .features = NfcProtocolFeatureEmulateUid,
 
     .scene_info =
         {
             .on_enter = nfc_scene_info_on_enter_felica,
+            .on_event = nfc_scene_info_on_event_felica,
+        },
+    .scene_more_info =
+        {
+            .on_enter = nfc_scene_more_info_on_enter_felica,
             .on_event = nfc_protocol_support_common_on_event_empty,
         },
     .scene_read =
         {
             .on_enter = nfc_scene_read_on_enter_felica,
-            .on_event = nfc_protocol_support_common_on_event_empty,
+            .on_event = nfc_scene_read_on_event_felica,
         },
     .scene_read_menu =
         {
-            .on_enter = nfc_protocol_support_common_on_enter_empty,
-            .on_event = nfc_protocol_support_common_on_event_empty,
+            .on_enter = nfc_scene_read_menu_on_enter_felica,
+            .on_event = nfc_scene_read_menu_on_event_felica,
         },
     .scene_read_success =
         {
diff --git a/applications/main/nfc/helpers/protocol_support/felica/felica_render.c b/applications/main/nfc/helpers/protocol_support/felica/felica_render.c
index 3142b2c6d..6c57fb24b 100644
--- a/applications/main/nfc/helpers/protocol_support/felica/felica_render.c
+++ b/applications/main/nfc/helpers/protocol_support/felica/felica_render.c
@@ -1,19 +1,107 @@
 #include "felica_render.h"
 
+void nfc_render_felica_blocks_count(
+    const FelicaData* data,
+    FuriString* str,
+    bool render_auth_notification) {
+    furi_string_cat_printf(str, "\nBlocks Read: %u/%u", data->blocks_read, data->blocks_total);
+    if(render_auth_notification && data->blocks_read != data->blocks_total) {
+        furi_string_cat_printf(str, "\nAuth-protected blocks!");
+    }
+}
+
+void nfc_render_felica_idm(
+    const FelicaData* data,
+    NfcProtocolFormatType format_type,
+    FuriString* str) {
+    furi_string_cat_printf(str, (format_type == NfcProtocolFormatTypeFull) ? "IDm:\n" : "IDm:");
+
+    for(size_t i = 0; i < FELICA_IDM_SIZE; i++) {
+        furi_string_cat_printf(
+            str,
+            (format_type == NfcProtocolFormatTypeFull) ? "%02X " : " %02X",
+            data->idm.data[i]);
+    }
+}
+
 void nfc_render_felica_info(
     const FelicaData* data,
     NfcProtocolFormatType format_type,
     FuriString* str) {
-    furi_string_cat_printf(str, "IDm:");
-
-    for(size_t i = 0; i < FELICA_IDM_SIZE; i++) {
-        furi_string_cat_printf(str, " %02X", data->idm.data[i]);
+    if(format_type == NfcProtocolFormatTypeFull) {
+        furi_string_cat_printf(str, "Tech: JIS X 6319-4,\nISO 18092 [NFC-F]\n");
     }
 
+    nfc_render_felica_idm(data, format_type, str);
+
     if(format_type == NfcProtocolFormatTypeFull) {
-        furi_string_cat_printf(str, "\nPMm:");
+        furi_string_cat_printf(str, "\nPMm:\n");
         for(size_t i = 0; i < FELICA_PMM_SIZE; ++i) {
-            furi_string_cat_printf(str, " %02X", data->pmm.data[i]);
+            furi_string_cat_printf(str, "%02X ", data->pmm.data[i]);
         }
     }
+    nfc_render_felica_blocks_count(data, str, true);
+}
+
+static void nfc_render_felica_block_name(
+    const char* name,
+    FuriString* str,
+    uint8_t prefix_separator_cnt,
+    uint8_t suffix_separator_cnt) {
+    for(uint8_t i = 0; i < prefix_separator_cnt; i++) {
+        furi_string_cat_printf(str, ":");
+    }
+    furi_string_cat_printf(str, "[ %s ]", name);
+    for(uint8_t i = 0; i < suffix_separator_cnt; i++) {
+        furi_string_cat_printf(str, ":");
+    }
+}
+
+static void nfc_render_felica_block_data(const FelicaBlock* block, FuriString* str) {
+    furi_string_cat_printf(str, "\nSF1=%02X; SF2=%02X\n", block->SF1, block->SF2);
+    for(size_t j = 0; j < FELICA_DATA_BLOCK_SIZE; j++) {
+        if((j != 0) && (j % 8 == 0)) furi_string_cat_printf(str, "\n");
+        furi_string_cat_printf(str, "%02X ", block->data[j]);
+    }
+    furi_string_cat_printf(str, "\n");
+}
+
+static void nfc_render_felica_block(
+    const FelicaBlock* block,
+    FuriString* str,
+    const char* name,
+    uint8_t prefix_separator_cnt,
+    uint8_t suffix_separator_cnt) {
+    nfc_render_felica_block_name(name, str, prefix_separator_cnt, suffix_separator_cnt);
+    nfc_render_felica_block_data(block, str);
+}
+
+void nfc_render_felica_dump(const FelicaData* data, FuriString* str) {
+    FuriString* name = furi_string_alloc();
+    for(size_t i = 0; i < 14; i++) {
+        furi_string_printf(name, "S_PAD%d", i);
+        uint8_t suf_cnt = 18;
+        if(i == 1) {
+            suf_cnt = 19;
+        } else if((i == 10) || (i == 12) || (i == 13)) {
+            suf_cnt = 16;
+        }
+        nfc_render_felica_block(
+            &data->data.fs.spad[i], str, furi_string_get_cstr(name), 20, suf_cnt);
+    }
+    furi_string_free(name);
+    nfc_render_felica_block(&data->data.fs.reg, str, "REG", 23, 23);
+    nfc_render_felica_block(&data->data.fs.rc, str, "RC", 25, 25);
+    nfc_render_felica_block(&data->data.fs.mac, str, "MAC", 23, 23);
+    nfc_render_felica_block(&data->data.fs.id, str, "ID", 25, 25);
+    nfc_render_felica_block(&data->data.fs.d_id, str, "D_ID", 22, 24);
+    nfc_render_felica_block(&data->data.fs.ser_c, str, "SER_C", 20, 21);
+    nfc_render_felica_block(&data->data.fs.sys_c, str, "SYS_C", 20, 21);
+    nfc_render_felica_block(&data->data.fs.ckv, str, "CKV", 23, 23);
+    nfc_render_felica_block(&data->data.fs.ck, str, "CK", 25, 25);
+    nfc_render_felica_block(&data->data.fs.mc, str, "MC", 25, 24);
+    nfc_render_felica_block(&data->data.fs.wcnt, str, "WCNT", 22, 20);
+    nfc_render_felica_block(&data->data.fs.mac_a, str, "MAC_A", 20, 20);
+    nfc_render_felica_block(&data->data.fs.state, str, "STATE", 20, 21);
+    nfc_render_felica_block(&data->data.fs.crc_check, str, "CRC_CHCK", 15, 17);
 }
diff --git a/applications/main/nfc/helpers/protocol_support/felica/felica_render.h b/applications/main/nfc/helpers/protocol_support/felica/felica_render.h
index 6d9816fc6..3d32e8d14 100644
--- a/applications/main/nfc/helpers/protocol_support/felica/felica_render.h
+++ b/applications/main/nfc/helpers/protocol_support/felica/felica_render.h
@@ -4,7 +4,19 @@
 
 #include "../nfc_protocol_support_render_common.h"
 
+void nfc_render_felica_blocks_count(
+    const FelicaData* data,
+    FuriString* str,
+    bool render_auth_notification);
+
 void nfc_render_felica_info(
     const FelicaData* data,
     NfcProtocolFormatType format_type,
     FuriString* str);
+
+void nfc_render_felica_dump(const FelicaData* data, FuriString* str);
+
+void nfc_render_felica_idm(
+    const FelicaData* data,
+    NfcProtocolFormatType format_type,
+    FuriString* str);
\ No newline at end of file
diff --git a/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c b/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c
index eb6911df7..cd16374bc 100644
--- a/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c
+++ b/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c
@@ -8,6 +8,7 @@
 
 #include "../nfc_protocol_support_common.h"
 #include "../nfc_protocol_support_gui_common.h"
+#include "../nfc_protocol_support_unlock_helper.h"
 
 enum {
     SubmenuIndexUnlock = SubmenuIndexCommonMax,
@@ -30,6 +31,8 @@ static void nfc_scene_info_on_enter_mf_ultralight(NfcApp* instance) {
 
     furi_string_cat_printf(
         temp_str, "\e#%s\n", nfc_device_get_name(device, NfcDeviceNameTypeFull));
+    furi_string_replace(temp_str, "Mifare", "MIFARE");
+
     nfc_render_mf_ultralight_info(data, NfcProtocolFormatTypeFull, temp_str);
 
     widget_add_text_scroll_element(
@@ -155,48 +158,15 @@ static NfcCommand
     return NfcCommandContinue;
 }
 
-enum {
-    NfcSceneMfUltralightReadMenuStateCardSearch,
-    NfcSceneMfUltralightReadMenuStateCardFound,
-};
-
-static void nfc_scene_read_setup_view(NfcApp* instance) {
-    Popup* popup = instance->popup;
-    popup_reset(popup);
-    uint32_t state = scene_manager_get_scene_state(instance->scene_manager, NfcSceneRead);
-
-    if(state == NfcSceneMfUltralightReadMenuStateCardSearch) {
-        popup_set_icon(instance->popup, 0, 8, &I_NFC_manual_60x50);
-        popup_set_header(instance->popup, "Unlocking", 97, 15, AlignCenter, AlignTop);
-        popup_set_text(
-            instance->popup, "Apply card to\nFlipper's back", 97, 27, AlignCenter, AlignTop);
-    } else {
-        popup_set_header(instance->popup, "Don't move", 85, 27, AlignCenter, AlignTop);
-        popup_set_icon(instance->popup, 12, 20, &A_Loading_24);
-    }
-
-    view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewPopup);
-}
-
 static void nfc_scene_read_on_enter_mf_ultralight(NfcApp* instance) {
-    bool unlocking =
-        scene_manager_has_previous_scene(instance->scene_manager, NfcSceneMfUltralightUnlockWarn);
-
-    uint32_t state = unlocking ? NfcSceneMfUltralightReadMenuStateCardSearch :
-                                 NfcSceneMfUltralightReadMenuStateCardFound;
-
-    scene_manager_set_scene_state(instance->scene_manager, NfcSceneRead, state);
-
-    nfc_scene_read_setup_view(instance);
+    nfc_unlock_helper_setup_from_state(instance);
     nfc_poller_start(instance->poller, nfc_scene_read_poller_callback_mf_ultralight, instance);
 }
 
 bool nfc_scene_read_on_event_mf_ultralight(NfcApp* instance, SceneManagerEvent event) {
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == NfcCustomEventCardDetected) {
-            scene_manager_set_scene_state(
-                instance->scene_manager, NfcSceneRead, NfcSceneMfUltralightReadMenuStateCardFound);
-            nfc_scene_read_setup_view(instance);
+            nfc_unlock_helper_card_detected_handler(instance);
         } else if((event.event == NfcCustomEventPollerIncomplete)) {
             notification_message(instance->notifications, &sequence_semi_success);
             scene_manager_next_scene(instance->scene_manager, NfcSceneReadSuccess);
@@ -245,6 +215,8 @@ static void nfc_scene_read_success_on_enter_mf_ultralight(NfcApp* instance) {
         furi_string_cat_printf(
             temp_str, "\e#%s\n", nfc_device_get_name(device, NfcDeviceNameTypeFull));
 
+        furi_string_replace(temp_str, "Mifare", "MIFARE");
+
         nfc_render_mf_ultralight_info(data, NfcProtocolFormatTypeShort, temp_str);
     }
 
diff --git a/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight_render.c b/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight_render.c
index 1bc508adc..c4ad67ff8 100644
--- a/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight_render.c
+++ b/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight_render.c
@@ -11,7 +11,11 @@ static void nfc_render_mf_ultralight_pages_count(const MfUltralightData* data, F
 
 void nfc_render_mf_ultralight_pwd_pack(const MfUltralightData* data, FuriString* str) {
     bool all_pages = mf_ultralight_is_all_data_read(data);
-    furi_string_cat_printf(str, "\e#%s pages unlocked!", all_pages ? "All" : "Not all");
+    if(all_pages) {
+        furi_string_cat_printf(str, "\e#All Pages Are Unlocked!");
+    } else {
+        furi_string_cat_printf(str, "\e#Some Pages Are Locked!");
+    }
 
     MfUltralightConfigPages* config;
     mf_ultralight_get_config_page(data, &config);
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 bf562bf58..d7adf9d80 100644
--- a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
+++ b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
@@ -481,7 +481,7 @@ static void nfc_protocol_support_scene_save_name_on_enter(NfcApp* instance) {
     bool name_is_empty = furi_string_empty(instance->file_name);
     if(name_is_empty) {
         furi_string_set(instance->file_path, NFC_APP_FOLDER);
-        name_generator_make_auto(
+        name_generator_make_auto_basic(
             instance->text_store, NFC_TEXT_STORE_SIZE, NFC_APP_FILENAME_PREFIX);
         furi_string_set(folder_path, NFC_APP_FOLDER);
     } else {
@@ -604,7 +604,7 @@ static void nfc_protocol_support_scene_emulate_on_enter(NfcApp* instance) {
     }
 
     widget_add_text_box_element(
-        widget, 56, 33, 71, 25, AlignCenter, AlignTop, furi_string_get_cstr(temp_str), false);
+        widget, 50, 33, 78, 31, AlignCenter, AlignTop, furi_string_get_cstr(temp_str), false);
 
     furi_string_free(temp_str);
 
diff --git a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support_unlock_helper.c b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support_unlock_helper.c
new file mode 100644
index 000000000..f1d504d24
--- /dev/null
+++ b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support_unlock_helper.c
@@ -0,0 +1,38 @@
+#include "nfc_protocol_support_unlock_helper.h"
+
+static void nfc_scene_read_setup_view(NfcApp* instance) {
+    Popup* popup = instance->popup;
+    popup_reset(popup);
+    uint32_t state = scene_manager_get_scene_state(instance->scene_manager, NfcSceneRead);
+
+    if(state == NfcSceneReadMenuStateCardSearch) {
+        popup_set_icon(instance->popup, 0, 8, &I_NFC_manual_60x50);
+        popup_set_header(instance->popup, "Unlocking", 97, 15, AlignCenter, AlignTop);
+        popup_set_text(
+            instance->popup, "Hold card next\nto Flipper's back", 94, 27, AlignCenter, AlignTop);
+    } else {
+        popup_set_header(instance->popup, "Don't move", 85, 27, AlignCenter, AlignTop);
+        popup_set_icon(instance->popup, 12, 20, &A_Loading_24);
+    }
+
+    view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewPopup);
+}
+
+void nfc_unlock_helper_setup_from_state(NfcApp* instance) {
+    bool unlocking =
+        scene_manager_has_previous_scene(
+            instance->scene_manager, NfcSceneMfUltralightUnlockWarn) ||
+        scene_manager_has_previous_scene(instance->scene_manager, NfcSceneFelicaUnlockWarn);
+
+    uint32_t state = unlocking ? NfcSceneReadMenuStateCardSearch : NfcSceneReadMenuStateCardFound;
+
+    scene_manager_set_scene_state(instance->scene_manager, NfcSceneRead, state);
+
+    nfc_scene_read_setup_view(instance);
+}
+
+void nfc_unlock_helper_card_detected_handler(NfcApp* instance) {
+    scene_manager_set_scene_state(
+        instance->scene_manager, NfcSceneRead, NfcSceneReadMenuStateCardFound);
+    nfc_scene_read_setup_view(instance);
+}
\ No newline at end of file
diff --git a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support_unlock_helper.h b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support_unlock_helper.h
new file mode 100644
index 000000000..65da33240
--- /dev/null
+++ b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support_unlock_helper.h
@@ -0,0 +1,9 @@
+#include "nfc/nfc_app_i.h"
+
+typedef enum {
+    NfcSceneReadMenuStateCardSearch,
+    NfcSceneReadMenuStateCardFound,
+} NfcSceneUnlockReadState;
+
+void nfc_unlock_helper_setup_from_state(NfcApp* instance);
+void nfc_unlock_helper_card_detected_handler(NfcApp* instance);
\ No newline at end of file
diff --git a/applications/main/nfc/helpers/protocol_support/st25tb/st25tb_render.c b/applications/main/nfc/helpers/protocol_support/st25tb/st25tb_render.c
index e3a0f3c50..0b5cb08d8 100644
--- a/applications/main/nfc/helpers/protocol_support/st25tb/st25tb_render.c
+++ b/applications/main/nfc/helpers/protocol_support/st25tb/st25tb_render.c
@@ -1,22 +1,28 @@
 #include "st25tb_render.h"
 #include <nfc/protocols/st25tb/st25tb.h>
+#include <machine/endian.h>
 
 void nfc_render_st25tb_info(
     const St25tbData* data,
     NfcProtocolFormatType format_type,
     FuriString* str) {
-    furi_string_cat_printf(str, "UID");
+    furi_string_cat_printf(str, "UID:");
 
     for(size_t i = 0; i < ST25TB_UID_SIZE; i++) {
         furi_string_cat_printf(str, " %02X", data->uid[i]);
     }
 
     if(format_type == NfcProtocolFormatTypeFull) {
-        furi_string_cat_printf(str, "\nSys. OTP: %08lX", data->system_otp_block);
-        furi_string_cat_printf(str, "\nBlocks:");
+        furi_string_cat_printf(
+            str, "\nSys. OTP: %08lX", (uint32_t)__bswap32(data->system_otp_block));
+        furi_string_cat_printf(str, "\n::::::::::::::::::::::[Blocks]::::::::::::::::::::::");
         for(size_t i = 0; i < st25tb_get_block_count(data->type); i += 2) {
             furi_string_cat_printf(
-                str, "\n %02X   %08lX  %08lX", i, data->blocks[i], data->blocks[i + 1]);
+                str,
+                "\n %02X   %08lX  %08lX",
+                i,
+                (uint32_t)__bswap32(data->blocks[i]),
+                (uint32_t)__bswap32(data->blocks[i + 1]));
         }
     }
 }
diff --git a/applications/main/nfc/helpers/slix_unlock.c b/applications/main/nfc/helpers/slix_unlock.c
index 931ec1790..d2306777e 100644
--- a/applications/main/nfc/helpers/slix_unlock.c
+++ b/applications/main/nfc/helpers/slix_unlock.c
@@ -13,7 +13,7 @@ struct SlixUnlock {
 
 static const SlixPassword tonie_box_pass_arr[] = {0x5B6EFD7F, 0x0F0F0F0F};
 
-SlixUnlock* slix_unlock_alloc() {
+SlixUnlock* slix_unlock_alloc(void) {
     SlixUnlock* instance = malloc(sizeof(SlixUnlock));
 
     return instance;
diff --git a/applications/main/nfc/helpers/slix_unlock.h b/applications/main/nfc/helpers/slix_unlock.h
index c378891e4..b5cd30c62 100644
--- a/applications/main/nfc/helpers/slix_unlock.h
+++ b/applications/main/nfc/helpers/slix_unlock.h
@@ -13,7 +13,7 @@ typedef enum {
 
 typedef struct SlixUnlock SlixUnlock;
 
-SlixUnlock* slix_unlock_alloc();
+SlixUnlock* slix_unlock_alloc(void);
 
 void slix_unlock_free(SlixUnlock* instance);
 
diff --git a/applications/main/nfc/nfc_app.c b/applications/main/nfc/nfc_app.c
index 8120268e0..d0557de2a 100644
--- a/applications/main/nfc/nfc_app.c
+++ b/applications/main/nfc/nfc_app.c
@@ -36,7 +36,7 @@ static void nfc_app_rpc_command_callback(const RpcAppSystemEvent* event, void* c
     }
 }
 
-NfcApp* nfc_app_alloc() {
+NfcApp* nfc_app_alloc(void) {
     NfcApp* instance = malloc(sizeof(NfcApp));
 
     instance->view_dispatcher = view_dispatcher_alloc();
@@ -50,6 +50,7 @@ NfcApp* nfc_app_alloc() {
 
     instance->nfc = nfc_alloc();
 
+    instance->felica_auth = felica_auth_alloc();
     instance->mf_ul_auth = mf_ultralight_auth_alloc();
     instance->slix_unlock = slix_unlock_alloc();
     instance->mfc_key_cache = mf_classic_key_cache_alloc();
@@ -141,6 +142,7 @@ void nfc_app_free(NfcApp* instance) {
 
     nfc_free(instance->nfc);
 
+    felica_auth_free(instance->felica_auth);
     mf_ultralight_auth_free(instance->mf_ul_auth);
     slix_unlock_free(instance->slix_unlock);
     mf_classic_key_cache_free(instance->mfc_key_cache);
@@ -453,11 +455,11 @@ void nfc_append_filename_string_when_present(NfcApp* instance, FuriString* strin
     furi_assert(string);
 
     if(!furi_string_empty(instance->file_name)) {
-        furi_string_cat_printf(string, "Name:%s\n", furi_string_get_cstr(instance->file_name));
+        furi_string_cat_printf(string, "Name: %s\n", furi_string_get_cstr(instance->file_name));
     }
 }
 
-static bool nfc_is_hal_ready() {
+static bool nfc_is_hal_ready(void) {
     if(furi_hal_nfc_is_hal_ready() != FuriHalNfcErrorNone) {
         // No connection to the chip, show an error screen
         DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
diff --git a/applications/main/nfc/nfc_app_i.h b/applications/main/nfc/nfc_app_i.h
index 62426be7b..4c8fba2f8 100644
--- a/applications/main/nfc/nfc_app_i.h
+++ b/applications/main/nfc/nfc_app_i.h
@@ -33,6 +33,7 @@
 #include "helpers/nfc_emv_parser.h"
 #include "helpers/mf_classic_key_cache.h"
 #include "helpers/nfc_supported_cards.h"
+#include "helpers/felica_auth.h"
 #include "helpers/slix_unlock.h"
 
 #include <dialogs/dialogs.h>
@@ -130,6 +131,7 @@ struct NfcApp {
     NfcScanner* scanner;
     NfcListener* listener;
 
+    FelicaAuthenticationContext* felica_auth;
     MfUltralightAuth* mf_ul_auth;
     SlixUnlock* slix_unlock;
     NfcMfClassicDictAttackContext nfc_dict_context;
diff --git a/applications/main/nfc/nfc_cli.c b/applications/main/nfc/nfc_cli.c
index b5a40b122..90ac26d7c 100644
--- a/applications/main/nfc/nfc_cli.c
+++ b/applications/main/nfc/nfc_cli.c
@@ -8,7 +8,7 @@
 
 #define FLAG_EVENT (1 << 10)
 
-static void nfc_cli_print_usage() {
+static void nfc_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("nfc <cmd>\r\n");
     printf("Cmd list:\r\n");
@@ -63,7 +63,7 @@ static void nfc_cli(Cli* cli, FuriString* args, void* context) {
     furi_string_free(cmd);
 }
 
-void nfc_on_system_start() {
+void nfc_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
     cli_add_command(cli, "nfc", CliCommandFlagDefault, nfc_cli, NULL);
diff --git a/applications/main/nfc/plugins/supported_cards/aime.c b/applications/main/nfc/plugins/supported_cards/aime.c
index c4cd6d8bc..a4a04b2db 100644
--- a/applications/main/nfc/plugins/supported_cards/aime.c
+++ b/applications/main/nfc/plugins/supported_cards/aime.c
@@ -163,6 +163,6 @@ static const FlipperAppPluginDescriptor aime_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* aime_plugin_ep() {
+const FlipperAppPluginDescriptor* aime_plugin_ep(void) {
     return &aime_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/all_in_one.c b/applications/main/nfc/plugins/supported_cards/all_in_one.c
index 1378629e2..f85d7ad2e 100644
--- a/applications/main/nfc/plugins/supported_cards/all_in_one.c
+++ b/applications/main/nfc/plugins/supported_cards/all_in_one.c
@@ -20,8 +20,8 @@ static AllInOneLayoutType all_in_one_get_layout(const MfUltralightData* data) {
     const uint8_t layout_byte = data->page[5].data[2];
     const uint8_t layout_half_byte = data->page[5].data[2] & 0x0F;
 
-    FURI_LOG_I(TAG, "Layout byte: %02x", layout_byte);
-    FURI_LOG_I(TAG, "Layout half-byte: %02x", layout_half_byte);
+    FURI_LOG_D(TAG, "Layout byte: %02x", layout_byte);
+    FURI_LOG_D(TAG, "Layout half-byte: %02x", layout_half_byte);
 
     switch(layout_half_byte) {
     // If it is A, the layout type is a type A layout
@@ -32,7 +32,7 @@ static AllInOneLayoutType all_in_one_get_layout(const MfUltralightData* data) {
     case 0x02:
         return AllInOneLayoutType2;
     default:
-        FURI_LOG_I(TAG, "Unknown layout type: %d", layout_half_byte);
+        FURI_LOG_E(TAG, "Unknown layout type: %d", layout_half_byte);
         return AllInOneLayoutTypeUnknown;
     }
 }
@@ -47,7 +47,7 @@ static bool all_in_one_parse(const NfcDevice* device, FuriString* parsed_data) {
 
     do {
         if(data->page[4].data[0] != 0x45 || data->page[4].data[1] != 0xD9) {
-            FURI_LOG_I(TAG, "Pass not verified");
+            FURI_LOG_E(TAG, "Pass not verified");
             break;
         }
 
@@ -63,7 +63,7 @@ static bool all_in_one_parse(const NfcDevice* device, FuriString* parsed_data) {
             // If the layout is D, the ride count is stored in the second byte of page 9
             ride_count = data->page[9].data[1];
         } else {
-            FURI_LOG_I(TAG, "Unknown layout: %d", layout_type);
+            FURI_LOG_E(TAG, "Unknown layout: %d", layout_type);
             ride_count = 137;
         }
 
@@ -102,6 +102,6 @@ static const FlipperAppPluginDescriptor all_in_one_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* all_in_one_plugin_ep() {
+const FlipperAppPluginDescriptor* all_in_one_plugin_ep(void) {
     return &all_in_one_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/bip.c b/applications/main/nfc/plugins/supported_cards/bip.c
new file mode 100644
index 000000000..43acd0947
--- /dev/null
+++ b/applications/main/nfc/plugins/supported_cards/bip.c
@@ -0,0 +1,347 @@
+#include "nfc_supported_card_plugin.h"
+#include <flipper_application.h>
+
+#include "protocols/mf_classic/mf_classic.h"
+#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
+
+#include <bit_lib.h>
+#include <locale/locale.h>
+
+#define TAG "Bip"
+
+#define BIP_CARD_ID_SECTOR_NUMBER (0)
+#define BIP_BALANCE_SECTOR_NUMBER (8)
+#define BIP_TRIP_TIME_WINDOW_SECTOR_NUMBER (5)
+#define BIP_LAST_TOP_UPS_SECTOR_NUMBER (10)
+#define BIP_TRIPS_INFO_SECTOR_NUMBER (11)
+
+typedef struct {
+    DateTime datetime;
+    uint16_t amount;
+} BipTransaction;
+
+typedef struct {
+    uint64_t a;
+    uint64_t b;
+} MfClassicKeyPair;
+
+static const MfClassicKeyPair bip_1k_keys[] = {
+    {.a = 0x3a42f33af429, .b = 0x1fc235ac1309},
+    {.a = 0x6338a371c0ed, .b = 0x243f160918d1},
+    {.a = 0xf124c2578ad0, .b = 0x9afc42372af1},
+    {.a = 0x32ac3b90ac13, .b = 0x682d401abb09},
+    {.a = 0x4ad1e273eaf1, .b = 0x067db45454a9},
+    {.a = 0xe2c42591368a, .b = 0x15fc4c7613fe},
+    {.a = 0x2a3c347a1200, .b = 0x68d30288910a},
+    {.a = 0x16f3d5ab1139, .b = 0xf59a36a2546d},
+    {.a = 0x937a4fff3011, .b = 0x64e3c10394c2},
+    {.a = 0x35c3d2caee88, .b = 0xb736412614af},
+    {.a = 0x693143f10368, .b = 0x324f5df65310},
+    {.a = 0xa3f97428dd01, .b = 0x643fb6de2217},
+    {.a = 0x63f17a449af0, .b = 0x82f435dedf01},
+    {.a = 0xc4652c54261c, .b = 0x0263de1278f3},
+    {.a = 0xd49e2826664f, .b = 0x51284c3686a6},
+    {.a = 0x3df14c8000a1, .b = 0x6a470d54127c},
+};
+
+static void bip_parse_datetime(const MfClassicBlock* block, DateTime* parsed_data) {
+    furi_assert(block);
+    furi_assert(parsed_data);
+
+    parsed_data->day = (((block->data[1] << 8) + block->data[0]) >> 6) & 0x1f;
+    parsed_data->month = (((block->data[1] << 8) + block->data[0]) >> 11) & 0xf;
+    parsed_data->year = 2000 + ((((block->data[2] << 8) + block->data[1]) >> 7) & 0x1f);
+    parsed_data->hour = (((block->data[3] << 8) + block->data[2]) >> 4) & 0x1f;
+    parsed_data->minute = (((block->data[3] << 8) + block->data[2]) >> 9) & 0x3f;
+    parsed_data->second = (((block->data[4] << 8) + block->data[3]) >> 7) & 0x3f;
+}
+
+static void bip_print_datetime(const DateTime* datetime, FuriString* str) {
+    furi_assert(datetime);
+    furi_assert(str);
+
+    LocaleDateFormat date_format = locale_get_date_format();
+    const char* separator = (date_format == LocaleDateFormatDMY) ? "." : "/";
+
+    FuriString* date_str = furi_string_alloc();
+    locale_format_date(date_str, datetime, date_format, separator);
+
+    FuriString* time_str = furi_string_alloc();
+    locale_format_time(time_str, datetime, locale_get_time_format(), true);
+
+    furi_string_cat_printf(
+        str, "%s %s", furi_string_get_cstr(date_str), furi_string_get_cstr(time_str));
+
+    furi_string_free(date_str);
+    furi_string_free(time_str);
+}
+
+static int datetime_cmp(const DateTime* dt_1, const DateTime* dt_2) {
+    furi_assert(dt_1);
+    furi_assert(dt_2);
+
+    if(dt_1->year != dt_2->year) {
+        return dt_1->year - dt_2->year;
+    }
+    if(dt_1->month != dt_2->month) {
+        return dt_1->month - dt_2->month;
+    }
+    if(dt_1->day != dt_2->day) {
+        return dt_1->day - dt_2->day;
+    }
+    if(dt_1->hour != dt_2->hour) {
+        return dt_1->hour - dt_2->hour;
+    }
+    if(dt_1->minute != dt_2->minute) {
+        return dt_1->minute - dt_2->minute;
+    }
+    if(dt_1->second != dt_2->second) {
+        return dt_1->second - dt_2->second;
+    }
+    return 0;
+}
+
+static bool is_bip_block_empty(const MfClassicBlock* block) {
+    furi_assert(block);
+    // check if all but last byte are zero (last is checksum)
+    for(size_t i = 0; i < sizeof(block->data) - 1; i++) {
+        if(block->data[i] != 0) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool bip_verify(Nfc* nfc) {
+    bool verified = false;
+
+    do {
+        const uint8_t verify_sector = 0;
+        uint8_t block_num = mf_classic_get_first_block_num_of_sector(verify_sector);
+        FURI_LOG_D(TAG, "Verifying sector %u", verify_sector);
+
+        MfClassicKey key = {};
+        bit_lib_num_to_bytes_be(bip_1k_keys[0].a, COUNT_OF(key.data), key.data);
+
+        MfClassicAuthContext auth_ctx = {};
+        MfClassicError error =
+            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;
+        }
+
+        verified = true;
+    } while(false);
+
+    return verified;
+}
+
+static bool bip_read(Nfc* nfc, NfcDevice* device) {
+    furi_assert(nfc);
+    furi_assert(device);
+
+    bool is_read = false;
+
+    MfClassicData* data = mf_classic_alloc();
+    nfc_device_copy_data(device, NfcProtocolMfClassic, data);
+
+    do {
+        MfClassicType type = MfClassicTypeMini;
+        MfClassicError error = mf_classic_poller_sync_detect_type(nfc, &type);
+        if(error != MfClassicErrorNone) break;
+
+        data->type = type;
+        if(type != MfClassicType1k) break;
+
+        MfClassicDeviceKeys keys = {
+            .key_a_mask = 0,
+            .key_b_mask = 0,
+        };
+        for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
+            bit_lib_num_to_bytes_be(bip_1k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
+            FURI_BIT_SET(keys.key_a_mask, i);
+            bit_lib_num_to_bytes_be(bip_1k_keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);
+            FURI_BIT_SET(keys.key_b_mask, i);
+        }
+
+        error = mf_classic_poller_sync_read(nfc, &keys, data);
+        if(error == MfClassicErrorNotPresent) {
+            FURI_LOG_W(TAG, "Failed to read data");
+            break;
+        }
+
+        nfc_device_set_data(device, NfcProtocolMfClassic, data);
+
+        is_read = (error == MfClassicErrorNone);
+    } while(false);
+
+    mf_classic_free(data);
+
+    return is_read;
+}
+
+static bool bip_parse(const NfcDevice* device, FuriString* parsed_data) {
+    furi_assert(device);
+    furi_assert(parsed_data);
+
+    struct {
+        uint32_t card_id;
+        uint16_t balance;
+        uint16_t flags;
+        DateTime trip_time_window;
+        BipTransaction top_ups[3];
+        BipTransaction charges[3];
+    } bip_data = {0};
+
+    const MfClassicData* data = nfc_device_get_data(device, NfcProtocolMfClassic);
+
+    bool parsed = false;
+
+    do {
+        // verify sector 0 key A
+        MfClassicSectorTrailer* sec_tr = mf_classic_get_sector_trailer_by_sector(data, 0);
+
+        if(data->type != MfClassicType1k) break;
+
+        uint64_t key = bit_lib_bytes_to_num_be(sec_tr->key_a.data, 6);
+        if(key != bip_1k_keys[0].a) {
+            break;
+        }
+
+        // verify sector 0 key B
+        key = bit_lib_bytes_to_num_be(sec_tr->key_b.data, 6);
+        if(key != bip_1k_keys[0].b) {
+            break;
+        }
+
+        // Get Card ID, little-endian 4 bytes at sector 0 block 1, bytes 4-7
+        const uint8_t card_id_start_block_num =
+            mf_classic_get_first_block_num_of_sector(BIP_CARD_ID_SECTOR_NUMBER);
+        const uint8_t* block_start_ptr = &data->block[card_id_start_block_num + 1].data[0];
+
+        bip_data.card_id = bit_lib_bytes_to_num_le(block_start_ptr + 4, 4);
+
+        // Get balance, little-endian 2 bytes at sector 8 block 1, bytes 0-1
+        const uint8_t balance_start_block_num =
+            mf_classic_get_first_block_num_of_sector(BIP_BALANCE_SECTOR_NUMBER);
+        block_start_ptr = &data->block[balance_start_block_num + 1].data[0];
+
+        bip_data.balance = bit_lib_bytes_to_num_le(block_start_ptr, 2);
+
+        // Get balance flags (negative balance, etc.), little-endian 2 bytes at sector 8 block 1, bytes 2-3
+        bip_data.flags = bit_lib_bytes_to_num_le(block_start_ptr + 2, 2);
+
+        // Get trip time window, proprietary format, at sector 5 block 1, bytes 0-7
+        const uint8_t trip_time_window_start_block_num =
+            mf_classic_get_first_block_num_of_sector(BIP_TRIP_TIME_WINDOW_SECTOR_NUMBER);
+        const MfClassicBlock* trip_window_block_ptr =
+            &data->block[trip_time_window_start_block_num + 1];
+
+        bip_parse_datetime(trip_window_block_ptr, &bip_data.trip_time_window);
+
+        // Last 3 top-ups: sector 10, ring-buffer of 3 blocks, timestamp in bytes 0-7, amount in bytes 9-10
+        const uint8_t top_ups_start_block_num =
+            mf_classic_get_first_block_num_of_sector(BIP_LAST_TOP_UPS_SECTOR_NUMBER);
+        for(size_t i = 0; i < 3; i++) {
+            const MfClassicBlock* block = &data->block[top_ups_start_block_num + i];
+
+            if(is_bip_block_empty(block)) continue;
+
+            BipTransaction* top_up = &bip_data.top_ups[i];
+            bip_parse_datetime(block, &top_up->datetime);
+
+            top_up->amount = bit_lib_bytes_to_num_le(&block->data[9], 2) >> 2;
+        }
+
+        // Last 3 charges (i.e. trips), sector 11, ring-buffer of 3 blocks, timestamp in bytes 0-7, amount in bytes 10-11
+        const uint8_t trips_start_block_num =
+            mf_classic_get_first_block_num_of_sector(BIP_TRIPS_INFO_SECTOR_NUMBER);
+        for(size_t i = 0; i < 3; i++) {
+            const MfClassicBlock* block = &data->block[trips_start_block_num + i];
+
+            if(is_bip_block_empty(block)) continue;
+
+            BipTransaction* charge = &bip_data.charges[i];
+            bip_parse_datetime(block, &charge->datetime);
+
+            charge->amount = bit_lib_bytes_to_num_le(&block->data[10], 2) >> 2;
+        }
+
+        // All data is now parsed and stored in bip_data, now print it
+
+        // Print basic info
+        furi_string_printf(
+            parsed_data,
+            "\e#Tarjeta Bip!\n"
+            "Card Number: %lu\n"
+            "Balance: $%hu (flags %hu)\n"
+            "Current Trip Window Ends:\n  @",
+            bip_data.card_id,
+            bip_data.balance,
+            bip_data.flags);
+
+        bip_print_datetime(&bip_data.trip_time_window, parsed_data);
+
+        // Find newest top-up
+        size_t newest_top_up = 0;
+        for(size_t i = 1; i < 3; i++) {
+            const DateTime* newest = &bip_data.top_ups[newest_top_up].datetime;
+            const DateTime* current = &bip_data.top_ups[i].datetime;
+            if(datetime_cmp(current, newest) > 0) {
+                newest_top_up = i;
+            }
+        }
+
+        // Print top-ups, newest first
+        furi_string_cat_printf(parsed_data, "\n\e#Last Top-ups");
+        for(size_t i = 0; i < 3; i++) {
+            const BipTransaction* top_up = &bip_data.top_ups[(3u + newest_top_up - i) % 3];
+            furi_string_cat_printf(parsed_data, "\n+$%d\n  @", top_up->amount);
+            bip_print_datetime(&top_up->datetime, parsed_data);
+        }
+
+        // Find newest charge
+        size_t newest_charge = 0;
+        for(size_t i = 1; i < 3; i++) {
+            const DateTime* newest = &bip_data.charges[newest_charge].datetime;
+            const DateTime* current = &bip_data.charges[i].datetime;
+            if(datetime_cmp(current, newest) > 0) {
+                newest_charge = i;
+            }
+        }
+
+        // Print charges
+        furi_string_cat_printf(parsed_data, "\n\e#Last Charges (Trips)");
+        for(size_t i = 0; i < 3; i++) {
+            const BipTransaction* charge = &bip_data.charges[(3u + newest_charge - i) % 3];
+            furi_string_cat_printf(parsed_data, "\n-$%d\n  @", charge->amount);
+            bip_print_datetime(&charge->datetime, parsed_data);
+        }
+
+        parsed = true;
+    } while(false);
+
+    return parsed;
+}
+
+/* Actual implementation of app<>plugin interface */
+static const NfcSupportedCardsPlugin bip_plugin = {
+    .protocol = NfcProtocolMfClassic,
+    .verify = bip_verify,
+    .read = bip_read,
+    .parse = bip_parse,
+};
+
+/* Plugin descriptor to comply with basic plugin specification */
+static const FlipperAppPluginDescriptor bip_plugin_descriptor = {
+    .appid = NFC_SUPPORTED_CARD_PLUGIN_APP_ID,
+    .ep_api_version = NFC_SUPPORTED_CARD_PLUGIN_API_VERSION,
+    .entry_point = &bip_plugin,
+};
+
+/* Plugin entry point - must return a pointer to const descriptor  */
+const FlipperAppPluginDescriptor* bip_plugin_ep(void) {
+    return &bip_plugin_descriptor;
+}
diff --git a/applications/main/nfc/plugins/supported_cards/charliecard.c b/applications/main/nfc/plugins/supported_cards/charliecard.c
new file mode 100644
index 000000000..9880ca3ad
--- /dev/null
+++ b/applications/main/nfc/plugins/supported_cards/charliecard.c
@@ -0,0 +1,1276 @@
+/*
+ * Parser for MBTA CharlieCard (Boston, MA, USA).
+ *
+ * Copyright 2024 Zachary Weiss <me@zachary.ws>
+ * 
+ * Public security research on the MBTA's fare system stretches back to 2008,
+ * starting with Russel Ryan, Zack Anderson, and Alessandro Chiesa's 
+ * "Anatomy of a Subway Hack", for which they were famously issued a gag order. 
+ * A thorough history of research & researchers deserving of credit is 
+ * detailed by @bobbyrsec in his 2022 blog post (& presentation):
+ * "Operation Charlie: Hacking the MBTA CharlieCard from 2008 to Present" 
+ * https://medium.com/@bobbyrsec/operation-charlie-hacking-the-mbta-charliecard-from-2008-to-present-24ea9f0aaa38
+ * 
+ * Fare gate IDs, card types, and general assistance courtesy of the
+ * minds behind DEFCON 31's "Boston Infinite Money Glitch" presentation:
+ * — Matthew Harris; mattyharris.net <matty@mattyharris.net>
+ * — Zachary Bertocchi; zackbertocchi.com <zach@zachbertocci.com>
+ * — Scott Campbell; josephscottcampbell.com <scott@josephscottcampbell.com>
+ * — Noah Gibson; <noahgibson06@proton.me>
+ * Talk available at: https://www.youtube.com/watch?v=1JT_lTfK69Q
+ * 
+ * TODOs:
+ * — Reverse engineer passes (sectors 4 & 5?), impl.
+ * — Infer transaction flag meanings
+ * — Infer remaining unknown bytes in the balance sectors (2 & 3)
+ * — Improve string output formatting, esp. of transaction log
+ * — Mapping of buses to garages, and subsequently, route subsets via 
+ *   http://roster.transithistory.org/ data
+ * — Mapping of stations to lines
+ * — Add'l data fields for side of station fare gates are on? Some stations
+ *   separate inbound & outbound sides, so direction could be inferred
+ *   from gates used.
+ * — Continually gather data on fare gate ID mappings, update as collected;
+ *   check locations this might be scrapable / inferrable from:
+ *   [X] MBTA GTFS spec (https://www.mbta.com/developers/gtfs) features & IDs 
+ *       seem too-coarse-grained & uncorrelated
+ *   [X] MBTA ArcGIS (https://mbta-massdot.opendata.arcgis.com/) & Tableau 
+ *       (https://public.tableau.com/app/profile/mbta.office.of.performance.management.and.innovation/vizzes) 
+ *       files don't seem to have anything of that resolution (only down to ridership by station)
+ *   [X] (skim of) MBTA public GitHub (https://github.com/mbta) repos make no reference to fare-gate-level data
+ *   [X] (skim of) MBTA public engineering docs (https://www.mbta.com/engineering) unfruitful;
+ *       Closest mention spotted is 2014 "Ridership and Service Statistics" 
+ *       (https://cdn.mbta.com/sites/default/files/fmcb-meeting-docs/reports-policies/2014-07-mbta-bluebook-ed14.pdf)
+ *       where on pg.40, "Equipment at Stations" is enumerated, and fare gates counts are given,
+ *       listed as "AFC Gates" (presumably standing for "Automated Fare Collection")
+ *   [X] Josiah Zachery criminal trial public evidence — convicted partially on 
+ *       data on his CharlieCard, appeals partially on basis of legality of this search.
+ *       Prev. court case (gag order mentioned in preamble) leaked some data in the files
+ *       entered into evidence. Seemingly did not happen here; fare gate IDs unmentioned,
+ *       only ever the nature of stored/saved data and methods of retrieval.
+ *       Appelate case dockets 2019-P-0401, SJC-12952, SJ-2017-0390 
+ *       (https://www.ma-appellatecourts.org/party)
+ *       Trial court indictment 04/02/2015, Case# 1584CR10265 @Suffolk County Criminal Superior Court 
+ *       (https://www.masscourts.org/eservices/home.page.16)
+ *   [ ] FOIA / public records request? 
+ *       (https://massachusettsdot.mycusthelp.com/WEBAPP/_rs/(S(tbcygdlm0oojy35p1wv0y2y5))/supporthome.aspx)
+ *   [X] MBTA data blog? (https://www.massdottracker.com/datablog/)
+ *   [ ] MassDOT developers Google group? (https://groups.google.com/g/massdotdevelopers)
+ *       [X] preexisting posts
+ *       [ ] ask directly?
+ *   [ ] Other?
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "nfc_supported_card_plugin.h"
+#include <flipper_application.h>
+
+#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
+
+#include <bit_lib.h>
+#include <datetime.h>
+#include <furi_hal.h>
+#include <locale/locale.h>
+
+#define TAG "CharlieCard"
+
+// starts Wednesday 2003/1/1 @ midnight
+#define CHARLIE_EPOCH          \
+    (DateTime) {               \
+        0, 0, 0, 1, 1, 2003, 4 \
+    }
+// timestep is one minute
+#define CHARLIE_TIME_DELTA_SECS 60
+#define CHARLIE_END_VALID_DELTA_SECS 60 * 8
+#define CHARLIE_N_TRANSACTION_HISTORY 10
+#define CHARLIE_N_PASSES 4
+
+typedef struct {
+    uint64_t a;
+    uint64_t b;
+} MfClassicKeyPair;
+
+// always from the same set of keys (cf. default keys dict for list w/o multiplicity)
+// we only care about the data in the first half of the sectors
+// second half sectors keys seemingly change position sometimes across cards?
+// no data stored there, but might want to impl some custom read function
+// accounting for this such that reading is faster (else it seems to fall back on dict
+// approach for remaining keys)...
+static const MfClassicKeyPair charliecard_1k_keys[] = {
+    {.a = 0x3060206F5B0A, .b = 0xF1B9F5669CC8},
+    {.a = 0x5EC39B022F2B, .b = 0xF662248E7E89},
+    {.a = 0x5EC39B022F2B, .b = 0xF662248E7E89},
+    {.a = 0x5EC39B022F2B, .b = 0xF662248E7E89},
+    {.a = 0x5EC39B022F2B, .b = 0xF662248E7E89},
+    {.a = 0x5EC39B022F2B, .b = 0xF662248E7E89},
+    {.a = 0x5EC39B022F2B, .b = 0xF662248E7E89},
+    {.a = 0x5EC39B022F2B, .b = 0xF662248E7E89},
+    {.a = 0x3A09594C8587, .b = 0x62387B8D250D},
+    {.a = 0xF238D78FF48F, .b = 0x9DC282D46217},
+    {.a = 0xAFD0BA94D624, .b = 0x92EE4DC87191},
+    {.a = 0xB35A0E4ACC09, .b = 0x756EF55E2507},
+    {.a = 0x447AB7FD5A6B, .b = 0x932B9CB730EF},
+    {.a = 0x1F1A0A111B5B, .b = 0xAD9E0A1CA2F7},
+    {.a = 0xD58023BA2BDC, .b = 0x62CED42A6D87},
+    {.a = 0x2548A443DF28, .b = 0x2ED3B15E7C0F},
+};
+
+typedef struct {
+    uint16_t dollars;
+    uint8_t cents;
+} Money;
+
+#define FARE_BUS \
+    (Money) {    \
+        1, 70    \
+    }
+#define FARE_SUB \
+    (Money) {    \
+        2, 40    \
+    }
+
+typedef struct {
+    DateTime date;
+    uint16_t gate;
+    uint8_t g_flag;
+    Money fare;
+    uint16_t f_flag;
+} Transaction;
+
+typedef struct {
+    bool valid;
+    uint16_t pre;
+    uint16_t post;
+    DateTime date;
+} Pass;
+
+typedef struct {
+    uint16_t n_uses;
+    uint8_t active_balance_sector;
+} CounterSector;
+
+typedef struct {
+    Money balance;
+    uint16_t type;
+    DateTime issued;
+    DateTime end_validity;
+} BalanceSector;
+
+// IdMapping approach borrowed from Jeremy Cooper's 'clipper.c'
+typedef struct {
+    uint16_t id;
+    const char* name;
+} IdMapping;
+
+// this should be a complete accounting of types, (1 and 7 day pass types maybe missing?)
+static const IdMapping charliecard_types[] = {
+    // Regular card types
+    {.id = 367, .name = "Adult"},
+    {.id = 366, .name = "SV Adult"},
+    {.id = 418, .name = "Student"},
+    {.id = 419, .name = "Senior"},
+    {.id = 420, .name = "TAP"},
+    {.id = 417, .name = "Blind"},
+    {.id = 426, .name = "Child"},
+    {.id = 410, .name = "Employee ID Without Passback"},
+    {.id = 414, .name = "Employee ID With Passback"},
+    {.id = 415, .name = "Retiree"},
+    {.id = 416, .name = "Police/Fire"},
+
+    // Passes
+    {.id = 135, .name = "30 Day Local Bus Pass"},
+    {.id = 136, .name = "30 Day Inner Express Bus Pass"},
+    {.id = 137, .name = "30 Day Outer Express Bus Pass"},
+    {.id = 138, .name = "30 Day LinkPass"},
+    {.id = 139, .name = "30 Day Senior LinkPass"},
+    {.id = 148, .name = "30 Day TAP LinkPass"},
+    {.id = 150, .name = "Monthly Student LinkPass"},
+    {.id = 424, .name = "Monthly TAP LinkPass"},
+    {.id = 425, .name = "Monthly Senior LinkPass"},
+    {.id = 421, .name = "Senior TAP/Permit"},
+    {.id = 422, .name = "Senior TAP/Permit 30 Days"},
+
+    // Commuter rail passes
+    {.id = 166, .name = "30 Day Commuter Rail Zone 1A Pass"},
+    {.id = 167, .name = "30 Day Commuter Rail Zone 1 Pass"},
+    {.id = 168, .name = "30 Day Commuter Rail Zone 2 Pass"},
+    {.id = 169, .name = "30 Day Commuter Rail Zone 3 Pass"},
+    {.id = 170, .name = "30 Day Commuter Rail Zone 4 Pass"},
+    {.id = 171, .name = "30 Day Commuter Rail Zone 5 Pass"},
+    {.id = 172, .name = "30 Day Commuter Rail Zone 6 Pass"},
+    {.id = 173, .name = "30 Day Commuter Rail Zone 7 Pass"},
+    {.id = 174, .name = "30 Day Commuter Rail Zone 8 Pass"},
+    {.id = 175, .name = "30 Day Interzone 1 Pass"},
+    {.id = 176, .name = "30 Day Interzone 2 Pass"},
+    {.id = 177, .name = "30 Day Interzone 3 Pass"},
+    {.id = 178, .name = "30 Day Interzone 4 Pass"},
+    {.id = 179, .name = "30 Day Interzone 5 Pass"},
+    {.id = 180, .name = "30 Day Interzone 6 Pass"},
+    {.id = 181, .name = "30 Day Interzone 7 Pass"},
+    {.id = 182, .name = "30 Day Interzone 8 Pass"},
+
+    {.id = 140, .name = "One Way Interzone Adult 1 Zone"},
+    {.id = 141, .name = "One Way Interzone Adult 2 Zones"},
+    {.id = 142, .name = "One Way Interzone Adult 3 Zones"},
+    {.id = 143, .name = "One Way Interzone Adult 4 Zones"},
+    {.id = 144, .name = "One Way Interzone Adult 5 Zones"},
+    {.id = 145, .name = "One Way Interzone Adult 6 Zones"},
+    {.id = 146, .name = "One Way Interzone Adult 7 Zones"},
+    {.id = 147, .name = "One Way Interzone Adult 8 Zones"},
+
+    {.id = 428, .name = "One Way Half Fare Zone 1"},
+    {.id = 429, .name = "One Way Half Fare Zone 2"},
+    {.id = 430, .name = "One Way Half Fare Zone 3"},
+    {.id = 431, .name = "One Way Half Fare Zone 4"},
+    {.id = 432, .name = "One Way Half Fare Zone 5"},
+    {.id = 433, .name = "One Way Half Fare Zone 6"},
+    {.id = 434, .name = "One Way Half Fare Zone 7"},
+    {.id = 435, .name = "One Way Half Fare Zone 8"},
+    {.id = 436, .name = "One Way Interzone Half Fare 1 Zone"},
+    {.id = 437, .name = "One Way Interzone Half Fare 2 Zones"},
+    {.id = 438, .name = "One Way Interzone Half Fare 3 Zones"},
+    {.id = 439, .name = "One Way Interzone Half Fare 4 Zones"},
+    {.id = 440, .name = "One Way Interzone Half Fare 5 Zones"},
+    {.id = 441, .name = "One Way Interzone Half Fare 6 Zones"},
+    {.id = 442, .name = "One Way Interzone Half Fare 7 Zones"},
+    {.id = 443, .name = "One Way Interzone Half Fare 8 Zones"},
+
+    {.id = 509, .name = "Group Interzone 1 Zones"},
+    {.id = 510, .name = "Group Interzone 2 Zones"},
+    {.id = 511, .name = "Group Interzone 3 Zones"},
+    {.id = 512, .name = "Group Interzone 4 Zones"},
+    {.id = 513, .name = "Group Interzone 5 Zones"},
+    {.id = 514, .name = "Group Interzone 6 Zones"},
+    {.id = 515, .name = "Group Interzone 7 Zones"},
+    {.id = 516, .name = "Group Interzone 8 Zones"},
+
+    {.id = 952, .name = "Zone 1 Student Monthly Pass"},
+    {.id = 953, .name = "Zone 2 Student Monthly Pass"},
+    {.id = 954, .name = "Zone 3 Student Monthly Pass"},
+    {.id = 955, .name = "Zone 4 Student Monthly Pass"},
+    {.id = 956, .name = "Zone 5 Student Monthly Pass"},
+    {.id = 957, .name = "Zone 6 Student Monthly Pass"},
+    {.id = 958, .name = "Zone 7 Student Monthly Pass"},
+    {.id = 959, .name = "Zone 8 Student Monthly Pass"},
+    {.id = 960, .name = "Zone 9 Student Monthly Pass"},
+    {.id = 961, .name = "Zone 10 Student Monthly Pass"},
+
+    {.id = 963, .name = "Interzone 1 Zone Student Monthly Pass"},
+    {.id = 964, .name = "Interzone 2 Zone Student Monthly Pass"},
+    {.id = 965, .name = "Interzone 3 Zone Student Monthly Pass"},
+    {.id = 966, .name = "Interzone 4 Zone Student Monthly Pass"},
+    {.id = 967, .name = "Interzone 5 Zone Student Monthly Pass"},
+    {.id = 968, .name = "Interzone 6 Zone Student Monthly Pass"},
+    {.id = 969, .name = "Interzone 7 Zone Student Monthly Pass"},
+    {.id = 970, .name = "Interzone 8 Zone Student Monthly Pass"},
+    {.id = 971, .name = "Interzone 9 Zone Student Monthly Pass"},
+    {.id = 972, .name = "Interzone 10 Zone Student Monthly Pass"},
+};
+static const size_t kNumTypes = COUNT_OF(charliecard_types);
+
+// Incomplete, and subject to change
+// Only covers Orange & Blue line stations
+// Gathered manually, and provided courtesy of, DEFCON31 researchers
+// as cited above.
+static const IdMapping charliecard_fare_gate_ids[] = {
+    // Davis
+    {.id = 6766, .name = "Davis"},
+    {.id = 6767, .name = "Davis"},
+    {.id = 6768, .name = "Davis"},
+    {.id = 6769, .name = "Davis"},
+    {.id = 6770, .name = "Davis"},
+    {.id = 6771, .name = "Davis"},
+    {.id = 6772, .name = "Davis"},
+    {.id = 2167, .name = "Davis"},
+    {.id = 7020, .name = "Davis"},
+    // Porter
+    {.id = 6781, .name = "Porter"},
+    {.id = 6780, .name = "Porter"},
+    {.id = 6779, .name = "Porter"},
+    {.id = 6778, .name = "Porter"},
+    {.id = 6777, .name = "Porter"},
+    {.id = 6776, .name = "Porter"},
+    {.id = 6775, .name = "Porter"},
+    {.id = 2168, .name = "Porter"},
+    {.id = 7021, .name = "Porter"},
+    {.id = 6782, .name = "Porter"},
+    // Oak Grove
+    {.id = 6640, .name = "Oak Grove"},
+    {.id = 6641, .name = "Oak Grove"},
+    {.id = 6639, .name = "Oak Grove"},
+    {.id = 2036, .name = "Oak Grove"},
+    {.id = 6642, .name = "Oak Grove"},
+    {.id = 6979, .name = "Oak Grove"},
+    // Downtown Crossing
+    {.id = 2091, .name = "Downtown Crossing"},
+    {.id = 6995, .name = "Downtown Crossing"},
+    {.id = 6699, .name = "Downtown Crossing"},
+    {.id = 6700, .name = "Downtown Crossing"},
+    {.id = 1926, .name = "Downtown Crossing"},
+    {.id = 2084, .name = "Downtown Crossing"},
+    {.id = 6994, .name = "Downtown Crossing"},
+    {.id = 6695, .name = "Downtown Crossing"},
+    {.id = 6694, .name = "Downtown Crossing"},
+    {.id = 6696, .name = "Downtown Crossing"},
+    {.id = 2336, .name = "Downtown Crossing"},
+    {.id = 1056, .name = "Downtown Crossing"},
+    {.id = 6814, .name = "Downtown Crossing"},
+    {.id = 6813, .name = "Downtown Crossing"},
+    {.id = 2212, .name = "Downtown Crossing"},
+    {.id = 7038, .name = "Downtown Crossing"},
+    // State
+    {.id = 7092, .name = "State"},
+    {.id = 1844, .name = "State"},
+    {.id = 6689, .name = "State"},
+    {.id = 6988, .name = "State"},
+    {.id = 6991, .name = "State"},
+    {.id = 2083, .name = "State"},
+    {.id = 6688, .name = "State"},
+    {.id = 6687, .name = "State"},
+    {.id = 6686, .name = "State"},
+    {.id = 2078, .name = "State"},
+    {.id = 6987, .name = "State"},
+    {.id = 7090, .name = "State"},
+    {.id = 1842, .name = "State"},
+    // Haymarket
+    {.id = 6684, .name = "Haymarket"},
+    {.id = 6683, .name = "Haymarket"},
+    {.id = 6682, .name = "Haymarket"},
+    {.id = 6681, .name = "Haymarket"},
+    {.id = 2073, .name = "Haymarket"},
+    {.id = 7074, .name = "Haymarket"},
+    {.id = 6883, .name = "Haymarket"},
+    {.id = 6884, .name = "Haymarket"},
+    {.id = 6885, .name = "Haymarket"},
+    {.id = 6886, .name = "Haymarket"},
+    {.id = 2303, .name = "Haymarket"},
+    {.id = 6986, .name = "Haymarket"},
+    // North Station
+    {.id = 6985, .name = "North Station"},
+    {.id = 2063, .name = "North Station"},
+    {.id = 6671, .name = "North Station"},
+    {.id = 6672, .name = "North Station"},
+    {.id = 6673, .name = "North Station"},
+    {.id = 6674, .name = "North Station"},
+    {.id = 6675, .name = "North Station"},
+    {.id = 6676, .name = "North Station"},
+    {.id = 6677, .name = "North Station"},
+    {.id = 6678, .name = "North Station"},
+    {.id = 6984, .name = "North Station"},
+    {.id = 2062, .name = "North Station"},
+    {.id = 6668, .name = "North Station"},
+    {.id = 6667, .name = "North Station"},
+    {.id = 6666, .name = "North Station"},
+    {.id = 6665, .name = "North Station"},
+    {.id = 6664, .name = "North Station"},
+    // Sullivan Square
+    {.id = 6654, .name = "Sullivan Square"},
+    {.id = 6655, .name = "Sullivan Square"},
+    {.id = 6656, .name = "Sullivan Square"},
+    {.id = 6657, .name = "Sullivan Square"},
+    {.id = 6658, .name = "Sullivan Square"},
+    {.id = 6659, .name = "Sullivan Square"},
+    {.id = 2053, .name = "Sullivan Square"},
+    {.id = 6982, .name = "Sullivan Square"},
+    // Community College
+    {.id = 6661, .name = "Community College"},
+    {.id = 6662, .name = "Community College"},
+    {.id = 2056, .name = "Community College"},
+    {.id = 6983, .name = "Community College"},
+    // Assembly
+    {.id = 3876, .name = "Assembly"},
+    {.id = 3875, .name = "Assembly"},
+    {.id = 6957, .name = "Assembly"},
+    {.id = 6956, .name = "Assembly"},
+    {.id = 6955, .name = "Assembly"},
+    {.id = 6954, .name = "Assembly"},
+    {.id = 6953, .name = "Assembly"},
+    {.id = 7101, .name = "Assembly"},
+    {.id = 3873, .name = "Assembly"},
+    {.id = 3872, .name = "Assembly"},
+    // Wellington
+    {.id = 6981, .name = "Wellington"},
+    {.id = 2042, .name = "Wellington"},
+    {.id = 6650, .name = "Wellington"},
+    {.id = 6651, .name = "Wellington"},
+    {.id = 6652, .name = "Wellington"},
+    {.id = 6653, .name = "Wellington"},
+    // Malden
+    {.id = 6980, .name = "Malden Center"},
+    {.id = 2037, .name = "Malden Center"},
+    {.id = 6645, .name = "Malden Center"},
+    {.id = 6646, .name = "Malden Center"},
+    {.id = 6647, .name = "Malden Center"},
+    {.id = 6648, .name = "Malden Center"},
+    // Chinatown
+    {.id = 6704, .name = "Chinatown"},
+    {.id = 6705, .name = "Chinatown"},
+    {.id = 2099, .name = "Chinatown"},
+    {.id = 7003, .name = "Chinatown"},
+    {.id = 7002, .name = "Chinatown"},
+    {.id = 2096, .name = "Chinatown"},
+    {.id = 6702, .name = "Chinatown"},
+    {.id = 6701, .name = "Chinatown"},
+    // Tufts Medical Center
+    {.id = 6707, .name = "Tufts Medical Center"},
+    {.id = 6708, .name = "Tufts Medical Center"},
+    {.id = 6709, .name = "Tufts Medical Center"},
+    {.id = 6710, .name = "Tufts Medical Center"},
+    {.id = 6711, .name = "Tufts Medical Center"},
+    {.id = 2105, .name = "Tufts Medical Center"},
+    {.id = 7004, .name = "Tufts Medical Center"},
+    {.id = 1941, .name = "Tufts Medical Center"},
+    {.id = 7006, .name = "Tufts Medical Center"},
+    // Back Bay
+    {.id = 7007, .name = "Back Bay"},
+    {.id = 1480, .name = "Back Bay"},
+    {.id = 6714, .name = "Back Bay"},
+    {.id = 6715, .name = "Back Bay"},
+    {.id = 6716, .name = "Back Bay"},
+    {.id = 6717, .name = "Back Bay"},
+    {.id = 6718, .name = "Back Bay"},
+    {.id = 6719, .name = "Back Bay"},
+    {.id = 6720, .name = "Back Bay"},
+    {.id = 1801, .name = "Back Bay"},
+    {.id = 7009, .name = "Back Bay"},
+    // Massachusetts Avenue
+    {.id = 7010, .name = "Massachusetts Avenue"},
+    {.id = 2118, .name = "Massachusetts Avenue"},
+    {.id = 6724, .name = "Massachusetts Avenue"},
+    {.id = 6723, .name = "Massachusetts Avenue"},
+    {.id = 6722, .name = "Massachusetts Avenue"},
+    {.id = 6721, .name = "Massachusetts Avenue"},
+    // Ruggles
+    {.id = 6726, .name = "Ruggles"},
+    {.id = 6727, .name = "Ruggles"},
+    {.id = 6728, .name = "Ruggles"},
+    {.id = 2122, .name = "Ruggles"},
+    {.id = 2123, .name = "Ruggles"},
+    {.id = 2124, .name = "Ruggles"},
+    {.id = 1804, .name = "Ruggles"},
+    // Roxbury Crossing
+    {.id = 6737, .name = "Roxbury Crossing"},
+    {.id = 6736, .name = "Roxbury Crossing"},
+    {.id = 6735, .name = "Roxbury Crossing"},
+    {.id = 6734, .name = "Roxbury Crossing"},
+    {.id = 6733, .name = "Roxbury Crossing"},
+    {.id = 2125, .name = "Roxbury Crossing"},
+    {.id = 7012, .name = "Roxbury Crossing"},
+    // Jackson Square
+    {.id = 6741, .name = "Jackson Square"},
+    {.id = 6740, .name = "Jackson Square"},
+    {.id = 6739, .name = "Jackson Square"},
+    {.id = 2131, .name = "Jackson Square"},
+    {.id = 7013, .name = "Jackson Square"},
+    {.id = 7014, .name = "Jackson Square"},
+    {.id = 2135, .name = "Jackson Square"},
+    {.id = 6743, .name = "Jackson Square"},
+    {.id = 6744, .name = "Jackson Square"},
+    {.id = 6745, .name = "Jackson Square"},
+    // Green Street
+    {.id = 6746, .name = "Green Street"},
+    {.id = 6747, .name = "Green Street"},
+    {.id = 6748, .name = "Green Street"},
+    {.id = 2142, .name = "Green Street"},
+    {.id = 7015, .name = "Green Street"},
+    // Forest Hills
+    {.id = 6750, .name = "Forest Hills"},
+    {.id = 6751, .name = "Forest Hills"},
+    {.id = 6752, .name = "Forest Hills"},
+    {.id = 6753, .name = "Forest Hills"},
+    {.id = 6754, .name = "Forest Hills"},
+    {.id = 6755, .name = "Forest Hills"},
+    {.id = 2150, .name = "Forest Hills"},
+    {.id = 7016, .name = "Forest Hills"},
+    {.id = 6950, .name = "Forest Hills"},
+    {.id = 6951, .name = "Forest Hills"},
+    {.id = 604, .name = "Forest Hills"},
+    {.id = 7096, .name = "Forest Hills"},
+    // South Station
+    {.id = 7039, .name = "South Station"},
+    {.id = 2215, .name = "South Station"},
+    {.id = 6816, .name = "South Station"},
+    {.id = 6817, .name = "South Station"},
+    {.id = 6818, .name = "South Station"},
+    {.id = 6819, .name = "South Station"},
+    {.id = 6820, .name = "South Station"},
+    {.id = 6821, .name = "South Station"},
+    {.id = 6822, .name = "South Station"},
+    {.id = 6823, .name = "South Station"},
+    {.id = 7040, .name = "South Station"},
+    {.id = 2228, .name = "South Station"},
+    {.id = 6827, .name = "South Station"},
+    {.id = 6826, .name = "South Station"},
+    {.id = 6825, .name = "South Station"},
+    {.id = 6824, .name = "South Station"},
+    // Courthouse
+    {.id = 6929, .name = "Courthouse"},
+    {.id = 2357, .name = "Courthouse"},
+    {.id = 7079, .name = "Courthouse"},
+    {.id = 6933, .name = "Courthouse"},
+    {.id = 6932, .name = "Courthouse"},
+    {.id = 2358, .name = "Courthouse"},
+    {.id = 6792, .name = "Courthouse"},
+    // Bowdoin
+    {.id = 6937, .name = "Bowdoin"},
+    {.id = 2367, .name = "Bowdoin"},
+    {.id = 7085, .name = "Bowdoin"},
+    // Government Center
+    {.id = 6963, .name = "Government Center"},
+    {.id = 6962, .name = "Government Center"},
+    {.id = 6961, .name = "Government Center"},
+    {.id = 6960, .name = "Government Center"},
+    {.id = 6959, .name = "Government Center"},
+    {.id = 6958, .name = "Government Center"},
+    {.id = 5298, .name = "Government Center"},
+    // Aquarium
+    {.id = 6609, .name = "Aquarium"},
+    {.id = 6608, .name = "Aquarium"},
+    {.id = 1877, .name = "Aquarium"},
+    {.id = 6965, .name = "Aquarium"},
+    {.id = 6610, .name = "Aquarium"},
+    {.id = 1880, .name = "Aquarium"},
+    {.id = 1871, .name = "Aquarium"},
+    {.id = 6966, .name = "Aquarium"},
+    // Maverick
+    {.id = 7088, .name = "Maverick"},
+    {.id = 6944, .name = "Maverick"},
+    {.id = 4384, .name = "Maverick"},
+    {.id = 6946, .name = "Maverick"},
+    {.id = 6947, .name = "Maverick"},
+    {.id = 6948, .name = "Maverick"},
+    {.id = 6949, .name = "Maverick"},
+    {.id = 1840, .name = "Maverick"},
+    {.id = 7083, .name = "Maverick"},
+    // Airport
+    {.id = 6613, .name = "Airport"},
+    {.id = 6612, .name = "Airport"},
+    {.id = 6611, .name = "Airport"},
+    {.id = 6968, .name = "Airport"},
+    {.id = 2009, .name = "Airport"},
+    {.id = 6616, .name = "Airport"},
+    {.id = 6615, .name = "Airport"},
+    {.id = 6614, .name = "Airport"},
+    {.id = 6970, .name = "Airport"},
+    {.id = 1847, .name = "Airport"},
+    // Wood Island
+    {.id = 6618, .name = "Wood Island"},
+    {.id = 6619, .name = "Wood Island"},
+    {.id = 2010, .name = "Wood Island"},
+    {.id = 6971, .name = "Wood Island"},
+    // Orient Heights
+    {.id = 6621, .name = "Orient Heights"},
+    {.id = 6622, .name = "Orient Heights"},
+    {.id = 6623, .name = "Orient Heights"},
+    {.id = 2014, .name = "Orient Heights"},
+    {.id = 6972, .name = "Orient Heights"},
+    {.id = 6974, .name = "Orient Heights"},
+    {.id = 1868, .name = "Orient Heights"},
+    // Suffolk Downs
+    {.id = 6625, .name = "Suffolk Downs"},
+    {.id = 6626, .name = "Suffolk Downs"},
+    {.id = 2017, .name = "Suffolk Downs"},
+    {.id = 6975, .name = "Suffolk Downs"},
+    // Beachmont
+    {.id = 6628, .name = "Beachmont"},
+    {.id = 6629, .name = "Beachmont"},
+    {.id = 6630, .name = "Beachmont"},
+    {.id = 2021, .name = "Beachmont"},
+    {.id = 6976, .name = "Beachmont"},
+    // Revere Beach
+    {.id = 6632, .name = "Revere Beach"},
+    {.id = 6633, .name = "Revere Beach"},
+    {.id = 2024, .name = "Revere Beach"},
+    {.id = 6977, .name = "Revere Beach"},
+    // Wonderland
+    {.id = 6638, .name = "Wonderland"},
+    {.id = 6637, .name = "Wonderland"},
+    {.id = 6636, .name = "Wonderland"},
+    {.id = 2025, .name = "Wonderland"},
+    {.id = 6978, .name = "Wonderland"},
+};
+static const size_t kNumFareGateIds = COUNT_OF(charliecard_fare_gate_ids);
+
+// **********************************************************
+// ********************* MISC HELPERS ***********************
+// **********************************************************
+
+static const uint8_t*
+    pos_to_ptr(const MfClassicData* data, uint8_t sector_num, uint8_t block_num, uint8_t byte_num) {
+    // returns pointer to specified sector/block/byte of MFClassic card data
+    uint8_t block_offset = mf_classic_get_first_block_num_of_sector(sector_num);
+    return &data->block[block_offset + block_num].data[byte_num];
+}
+
+static uint64_t pos_to_num(
+    const MfClassicData* data,
+    uint8_t sector_num,
+    uint8_t block_num,
+    uint8_t byte_num,
+    uint8_t byte_len) {
+    // returns numeric values at specified card location, for given byte length.
+    // assumes big endian.
+    return bit_lib_bytes_to_num_be(pos_to_ptr(data, sector_num, block_num, byte_num), byte_len);
+}
+
+static DateTime dt_delta(DateTime dt, uint64_t delta_secs) {
+    // returns shifted DateTime, from initial DateTime and time offset in seconds
+    DateTime dt_shifted = {0};
+    datetime_timestamp_to_datetime(datetime_datetime_to_timestamp(&dt) + delta_secs, &dt_shifted);
+
+    return dt_shifted;
+}
+
+static bool dt_ge(DateTime dt1, DateTime dt2) {
+    // compares two DateTimes
+    return datetime_datetime_to_timestamp(&dt1) >= datetime_datetime_to_timestamp(&dt2);
+}
+
+static bool dt_eq(DateTime dt1, DateTime dt2) {
+    // compares two DateTimes
+    return datetime_datetime_to_timestamp(&dt1) == datetime_datetime_to_timestamp(&dt2);
+}
+
+static bool get_map_item(uint16_t id, const IdMapping* map, size_t sz, const char** out) {
+    // code borrowed from Jeremy Cooper's 'clipper.c'. Used as follows:
+    // const char* s; if(!get_map_item(_,_,_,&s)) {s="Default str";}
+    // TODO: change to furistring out?
+    for(size_t i = 0; i < sz; i++) {
+        if(map[i].id == id) {
+            *out = map[i].name;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+uint32_t time_now() {
+    return furi_hal_rtc_get_timestamp();
+}
+
+static bool is_debug() {
+    return furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug);
+}
+
+// **********************************************************
+// ******************** FIELD PARSING ***********************
+// **********************************************************
+
+static Money money_parse(
+    const MfClassicData* data,
+    uint8_t sector_num,
+    uint8_t block_num,
+    uint8_t byte_num) {
+    // CharlieCards store all money values in two bytes as half-cents
+    // bitmask removes sign/flag, bitshift converts half-cents to cents, div & mod yield dollars & cents
+    uint16_t amt = (pos_to_num(data, sector_num, block_num, byte_num, 2) & 0x7FFF) >> 1;
+    return (Money){amt / 100, amt % 100};
+}
+
+static DateTime
+    date_parse(const MfClassicData* data, uint8_t sector_num, uint8_t block_num, uint8_t byte_num) {
+    // Dates are 3 bytes, in minutes since 2003/1/1 ("CHARLIE_EPOCH")
+    uint32_t ts_charlie = pos_to_num(data, sector_num, block_num, byte_num, 3);
+    return dt_delta(CHARLIE_EPOCH, ts_charlie * CHARLIE_TIME_DELTA_SECS);
+}
+
+static DateTime end_validity_parse(
+    const MfClassicData* data,
+    uint8_t sector_num,
+    uint8_t block_num,
+    uint8_t byte_num) {
+    // End validity field is weird; shares first byte with another variable (the card type field),
+    // occupying the last 5 bits (and subsequent two bytes), hence bitmask
+    uint32_t ts_charlie_ev = pos_to_num(data, sector_num, block_num, byte_num, 3) & 0x1FFFFF;
+
+    // additionally, instead of minute deltas, is in 8 minute increments
+    // relative to CHARLIE_EPOCH (2003/1/1), per DEFCON31 researcher's work
+    return dt_delta(CHARLIE_EPOCH, ts_charlie_ev * CHARLIE_END_VALID_DELTA_SECS);
+}
+
+static Pass
+    pass_parse(const MfClassicData* data, uint8_t sector_num, uint8_t block_num, uint8_t byte_num) {
+    // WIP; testing only. Speculating it may be structured as follows
+    // Sub-byte field divisions not drawn to scale, see code for exact bit offsets
+    //
+    //       0    1    2    3    4    5
+    //       +----.----.----.----+----.----+
+    //       |  uk1  |   date    |   uk2   |
+    //       +----.----.----.----+----.----+
+    //
+    // "Blank" entries are as follows:
+    //       0    1    2    3    4    5
+    //       +----.----.----.----.----.----+
+    //       | 00   20   00   00   00   00 |
+    //       +----.----.----.----.----.----+
+    //
+    // even when not blank, uk1 LSB seems to always be set to 1...
+    // the sole bit set to 1 on the blank entry seems to divide
+    // the uk1 and date fields, and is always set to 1 regardless
+    // same is true of type & end-validity split found in balance sector
+    //
+    // likely fields incl
+    // — type #,
+    // — a secondary date field (eg start/end, end validity or normal format)
+    // — ID of FVM from which the pass was loaded
+
+    // check for empty, if so, return struct filled w/ 0s
+    // (incl "valid" field: hence, "valid" is false-y)
+    if(pos_to_num(data, sector_num, block_num, byte_num, 6) == 0x002000000000) {
+        return (Pass){0};
+    }
+
+    // const DateTime start = date_parse(data, sector_num, block_num, byte_num + 1);
+
+    const uint16_t pre = pos_to_num(data, sector_num, block_num, byte_num, 2) >> 6;
+    const uint16_t post = (pos_to_num(data, sector_num, block_num, byte_num + 4, 2) >> 2) & 0x3ff;
+
+    // these values make sense for a date, but implied position of type
+    // before end validity, as seen in balance sector, doesn't seem
+    // to produce sensible values
+    const DateTime date = end_validity_parse(data, sector_num, block_num, byte_num + 1);
+
+    // DateTime start = date_parse(data, sector_num, block_num, byte_num);
+    // uint16_t type = 0; // pos_to_num(data, sector_num, block_num, byte_num + 3, 2) >> 6;
+
+    return (Pass){true, pre, post, date};
+}
+
+static Transaction
+    transaction_parse(const MfClassicData* data, uint8_t sector, uint8_t block, uint8_t byte) {
+    // This function parses individual transactions. Each transaction packs 7 bytes, stored as follows:
+    //
+    //       0    1    2    3    4    5    6
+    //       +----.----.----+----.--+-+----.----+
+    //       |     date     |   loc |f|   amt   |
+    //       +----.----.----+----.--+-+----.----+
+    //
+    // Where date is in the typical format, loc represents the fare gate tapped, and amt is the fare amount.
+    // Amount appears to contain some flag bits, however, it is unclear what precisely their function is.
+    //
+    // Gate ID ("loc") is only the first 13 bits of 0x3:0x5, the final three bits appear to be flags ("f").
+    // Least significant flag bit seems to indicate:
+    // — When f & 1 == 1, fare (the amount by which balance is decremented)
+    // — When f & 1 == 0, refill (the amount by which balance is incremented)
+    // MSB (sign bit) of amt seems to serve the same role, just inverted, ie
+    // — When amt & 0x8000 == 0, fare
+    // — When amt & 0x8000 == 0x8000, refill
+    // Only contradiction between the two observed is on cards w/ passes;
+    // MSB of amt seems to be set for every transaction when (remaining bits of) amt is 0 on a card w/ a pass
+    // Hence, using f's LSB as method for inferring fare v. refill
+    //
+    // Remaining unknown bits:
+    // — f & 0b100; seems to be set on fares where the card has a pass, and amt is 0
+    // — f & 0b010
+    // — amt & 1; does not seem to correspond with card type, last transaction, first transaction, refill v. fare, etc
+
+    const DateTime date = date_parse(data, sector, block, byte);
+    const uint16_t gate = pos_to_num(data, sector, block, byte + 3, 2) >> 3;
+    const uint8_t g_flag = pos_to_num(data, sector, block, byte + 3, 2) & 0b111;
+    const Money fare = money_parse(data, sector, block, byte + 5);
+    const uint16_t f_flag = pos_to_num(data, sector, block, byte + 5, 2) & 0x8001;
+    return (Transaction){date, gate, g_flag, fare, f_flag};
+}
+
+// **********************************************************
+// ******************* SECTOR PARSING ***********************
+// **********************************************************
+
+static uint32_t mfg_sector_parse(const MfClassicData* data) {
+    // Manufacturer data (Sector 0)
+    //
+    //       0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+    //       +----.----.----.----+----+----.----.----.----+----+----.----.----.----.----+----+
+    // 0x000 |        UID        | rc | 88   04   00   C8 | uk | 00   20   00   00   00 | uk |
+    //       +----.----.----.----+----+----.----.----.----+----+----.----.----.----.----+----+
+    // 0x010 | 4E   0F   04   10   04   10   04   10   04   10   04   10   04   10   04   10 |
+    //       +----.----.----.----.----.----.----.----.----.----.----.----.----.----.----.----+
+    // 0x020 |                               ...  00   00  ...                               |
+    //       +----.----.----.----.----.----.----.----.----.----.----.----.----.----.----.----+
+    //
+    // rc := "redundancy check" (lrc / bcc)
+    // uk := "unknown"
+
+    size_t uid_len = 0;
+    const uint8_t* uid = mf_classic_get_uid(data, &uid_len);
+    const uint32_t card_number = bit_lib_bytes_to_num_be(uid, 4);
+
+    return card_number;
+}
+
+static CounterSector counter_sector_parse(const MfClassicData* data) {
+    // Trip/transaction counters (Sector 1)
+    //
+    //       0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+    //       +----.----.----.----.----.----.----.----.----.----.----.----.----.----.----.----+
+    // 0x040 | 04   10   23   45   66   77                  ...  00   00  ...                |
+    //       +----.----+----+----.----.----.----.----.----.----.----.----.----.----.----.----+
+    // 0x050 |  uses1  | uk |                     ...  00   00  ...                          |
+    //       +----.----+----+----.----.----.----.----.----.----.----.----.----.----.----.----+
+    // 0x060 |  uses2  | uk |                     ...  00   00  ...                          |
+    //       +----.----+----+----.----.----.----.----.----.----.----.----.----.----.----.----+
+    //
+    // uk := "unknown"; if nonzero, seems to only occupy the first 4 bits (ie, uk & 0xF0 == uk),
+    //        with the remaining 4 zero
+
+    // Card has two sectors (2 & 3) containing balance data, with two
+    // corresponding trip counters in 0x50:0x51 & 0x60:0x61 (sector 1, byte 0:1 of blocks 1 & 2).
+
+    // The *lower* of the two values *minus one* is the true use count,
+    // and corresponds to the active balance sector,
+    // (0x50 counter lower -> sector 2 active, 0x60 counter lower -> 3 active)
+    // per DEFCON31 researcher's findings
+
+    const uint16_t n_uses1 = pos_to_num(data, 1, 1, 0, 2);
+    const uint16_t n_uses2 = pos_to_num(data, 1, 2, 0, 2);
+
+    const bool is_sec2_active = n_uses1 <= n_uses2;
+    const uint8_t active_sector = is_sec2_active ? 2 : 3;
+    const uint16_t n_uses = (is_sec2_active ? n_uses1 : n_uses2) - 1;
+
+    return (CounterSector){n_uses, active_sector};
+}
+
+static BalanceSector balance_sector_parse(const MfClassicData* data, uint8_t active_sector) {
+    // Balance & misc card info (Sector 2 or 3)
+    //
+    //       0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+    //       +----+----.----.----+----.----+----.----.----+----.----+----.----+----+----.----+
+    // 0x080 | 11 |   date last  | loc last| date issued  | 65   00 | unknown | 00 |   crc   | 0x0C0
+    //       +----+----.----.----+----+----+----+----+----+----.----+----.----+----+----.----+
+    // 0x090 | type |end validity| uk | balance | 00 |           unknown           |   crc   | 0x0D0
+    //       +----.----.----.----+----+----.----+----+----.----.----.----.----.----+----.----+
+    // 0x0A0 |      20             ...  00   00  ...             04                |   crc   | 0x0E0
+    //       +----.----.----.----.----.----.----.----.----.----.----.----.----.----+----.----+
+    //
+    // "Active" balance sector alternates between 2 and 3
+    // Last trip/transaction info in balance sector ("date last" & "loc last")
+    // is also included in transaction log, hence don't bother to read here
+    //
+    // Inactive balance sector represent the transaction N-1 version
+    // (where active sector represents data from transaction N).
+
+    const DateTime issued = date_parse(data, active_sector, 0, 6);
+    const DateTime end_validity = end_validity_parse(data, active_sector, 1, 1);
+    // Card type data stored in the first 10bits of block 1
+    // (0x90 or 0xD0 depending on active sector)
+    // bitshift (2bytes = 16 bits) by 6bits for just first 10bits
+    const uint16_t type = pos_to_num(data, active_sector, 1, 0, 2) >> 6;
+    const Money bal = money_parse(data, active_sector, 1, 5);
+
+    return (BalanceSector){bal, type, issued, end_validity};
+}
+
+static Pass* passes_parse(const MfClassicData* data) {
+    // Passes, speculative (Sectors 4 &/or 5)
+    //
+    //       0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+    //       +----.----.----.----.----.----+----+----.----.----.----.----.----+----+----.----+
+    // 0x100 |           pass0/2?          | 00 |           pass1/3?          | 00 |   crc   | 0x140
+    //       +----.----.----.----.----.----+----+----.----.----.----.----.----+----+----.----+
+    // 0x110 |                          ...  00   00  ...                          |   crc   | 0x150
+    //       +----.----.----.----.----.----.----.----.----.----.----.----.----.----+----.----+
+    // 0x120 |                ...  00  ...                  05                     |   crc   | 0x160
+    //       +----.----.----.----.----.----.----.----.----.----.----.----.----.----+----.----+
+    //
+    // WIP. Read in all speculative passes into array
+    // 4 separate fields? active vs inactive sector for 2 passes?
+    // something else entirely?
+
+    Pass* passes = malloc(sizeof(Pass) * CHARLIE_N_PASSES);
+
+    for(size_t i = 0; i < CHARLIE_N_PASSES; i++) {
+        passes[i] = pass_parse(data, 4 + (i / 2), 0, (i % 2) * 7);
+    }
+
+    return passes;
+}
+
+static Transaction* transactions_parse(const MfClassicData* data) {
+    // Transaction history (Sectors 6–7)
+    //
+    //       0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+    //       +----.----.----.----.----.----.----+----.----.----.----.----.----.----+----.----+
+    // 0x180 |           transaction0           |           transaction1           |   crc   |
+    //       +----.----.----.----.----.----.----+----.----.----.----.----.----.----+----.----+
+    //  ...                   ...                                ...                   ...
+    //       +----.----.----.----.----.----.----+----.----.----.----.----.----.----+----.----+
+    // 0x1D0 |           transaction8           |           transaction9           |   crc   |
+    //       +----.----.----.----.----.----.----+----.----.----.----.----.----.----+----.----+
+    // 0x1E0 |                          ...  00   00  ...                          |   crc   |
+    //       +----.----.----.----.----.----.----.----.----.----.----.----.----.----+----.----+
+    //
+    // Transactions are not sorted, rather, appear to get overwritten
+    // sequentially. (eg, sorted modulo array rotation)
+
+    Transaction* transactions = malloc(sizeof(Transaction) * CHARLIE_N_TRANSACTION_HISTORY);
+
+    // Parse each transaction field using some modular math magic to get the offsets:
+    // move from sector 6 -> 7 after the first 6 transactions
+    // move a block within a given sector every 2 transactions, reset every 3 blocks (as sector has changed)
+    // alternate between a start byte of 0 and 7 with every iteration
+    for(size_t i = 0; i < CHARLIE_N_TRANSACTION_HISTORY; i++) {
+        transactions[i] = transaction_parse(data, 6 + (i / 6), (i / 2) % 3, (i % 2) * 7);
+    }
+
+    // Iterate through the array to find the maximum (newest) date value
+    int max_idx = 0;
+    for(int i = 1; i < CHARLIE_N_TRANSACTION_HISTORY; i++) {
+        if(dt_ge(transactions[i].date, transactions[max_idx].date)) {
+            max_idx = i;
+        }
+    }
+
+    // Sort by rotating
+    for(int r = 0; r < (max_idx + 1); r++) {
+        // Store the first element
+        Transaction temp = transactions[0];
+        // Shift elements to the left
+        for(int i = 0; i < CHARLIE_N_TRANSACTION_HISTORY - 1; i++) {
+            transactions[i] = transactions[i + 1];
+        }
+        // Move the first element to the last
+        transactions[CHARLIE_N_TRANSACTION_HISTORY - 1] = temp;
+    }
+
+    // Reverse order, such that newest is first, oldest last
+    for(int i = 0; i < CHARLIE_N_TRANSACTION_HISTORY / 2; i++) {
+        // Swap elements at index i and size - i - 1
+        Transaction temp = transactions[i];
+        transactions[i] = transactions[CHARLIE_N_TRANSACTION_HISTORY - i - 1];
+        transactions[CHARLIE_N_TRANSACTION_HISTORY - i - 1] = temp;
+    }
+
+    return transactions;
+}
+
+/*
+static DateTime expiry(DateTime iss) {
+    // Per Metrodroid CharlieCard parser (https://github.com/metrodroid/metrodroid/blob/master/src/commonMain/kotlin/au/id/micolous/metrodroid/transit/charlie/CharlieCardTransitData.kt)
+    // Expiry not explicitly stored in card data; rather, calculated from date of issue
+    // Cards were first issued in 2006, expired in 5 years, w/ no printed expiry date
+    // Cards issued after 2011 expire in 10 years
+    //
+    // Per DEFCON31 researcher's work (cited above):
+    // Student cards last one school year and expire at the end of August the following year
+    // Pre-2011 issued cards expire in 7 years, not 5 as claimed by Metrodroid
+    // Post-2011 expire in 10 years, less one day
+    // Redundant function given the existance of the end validity field?
+    // Any important distinctions between the two?
+    
+
+    // perhaps additionally clipping to 2030-12-__ in anticipation of upcoming system migration?
+    // need to get a new card to confirm.
+
+    // TODO add card type logic for student card expiry
+    DateTime exp;
+    if(iss.year < 2011) {
+        // add 7 years; assumes average year of 8766 hrs (to account for leap years)
+        // may be off by a few hours as a result
+        exp = dt_delta(iss, 7 * 8766 * 60 * 60);
+    } else {
+        // add 10 years, subtract a day. Same assumption as above
+        exp = dt_delta(iss, ((10 * 8766) - 24) * 60 * 60);
+    }
+
+    return exp;
+}
+
+static bool expired(DateTime expiry, DateTime last_transaction) {
+    // if a card has sat unused for >2 years, expired (verify this claim?)
+    // else expired if current date > expiry date
+
+    uint32_t ts_exp = datetime_datetime_to_timestamp(&expiry);
+    uint32_t ts_last = datetime_datetime_to_timestamp(&last_transaction);
+    uint32_t ts_now = time_now();
+
+    return (ts_exp <= ts_now) | ((ts_now - ts_last) >= (2 * 365 * 24 * 60 * 60));
+}
+*/
+
+// **********************************************************
+// ****************** STRING FORMATTING *********************
+// **********************************************************
+
+void locale_format_dt_cat(FuriString* out, const DateTime* dt) {
+    // helper to print datetimes
+    FuriString* s = furi_string_alloc();
+
+    LocaleDateFormat date_format = locale_get_date_format();
+    const char* separator = (date_format == LocaleDateFormatDMY) ? "." : "/";
+    locale_format_date(s, dt, date_format, separator);
+    furi_string_cat(out, s);
+    locale_format_time(s, dt, locale_get_time_format(), false);
+    furi_string_cat_printf(out, "  ");
+    furi_string_cat(out, s);
+
+    furi_string_free(s);
+}
+
+void type_format_cat(FuriString* out, uint16_t type) {
+    const char* s;
+    if(!get_map_item(type, charliecard_types, kNumTypes, &s)) {
+        s = "";
+        furi_string_cat_printf(out, "Unknown-%u", type);
+    }
+
+    furi_string_cat_str(out, s);
+}
+
+void pass_format_cat(FuriString* out, Pass pass) {
+    furi_string_cat_printf(out, "\n-Pre: %b", pass.pre);
+    // type_format_cat(out, pass.type);
+    furi_string_cat_printf(out, "\n-Post: ");
+    type_format_cat(out, pass.post);
+    // locale_format_dt_cat(out, &pass.start);
+    furi_string_cat_printf(out, "\n-Date: ");
+    locale_format_dt_cat(out, &pass.date);
+}
+
+void passes_format_cat(FuriString* out, Pass* passes) {
+    // only print passes if DEBUG on
+    if(!is_debug()) {
+        return;
+    }
+
+    // only print if there is at least 1 valid pass to print
+    bool any_valid = false;
+    for(size_t i = 0; i < CHARLIE_N_PASSES; i++) {
+        any_valid |= passes[i].valid;
+    }
+    if(!any_valid) {
+        return;
+    }
+
+    furi_string_cat_printf(out, "\nPasses (DEBUG / WIP):");
+    for(size_t i = 0; i < CHARLIE_N_PASSES; i++) {
+        if(passes[i].valid) {
+            furi_string_cat_printf(out, "\nPass %u", i + 1);
+            pass_format_cat(out, passes[i]);
+            furi_string_cat_printf(out, "\n");
+        }
+    }
+}
+
+void money_format_cat(FuriString* out, Money money) {
+    furi_string_cat_printf(out, "$%u.%02u", money.dollars, money.cents);
+}
+
+void transaction_format_cat(FuriString* out, Transaction transaction) {
+    const char* sep = "   ";
+    const char* sta;
+
+    locale_format_dt_cat(out, &transaction.date);
+    furi_string_cat_printf(out, "\n%s", !!(transaction.g_flag & 0x1) ? "-" : "+");
+    money_format_cat(out, transaction.fare);
+    if(!!(transaction.g_flag & 0x1) && (transaction.fare.dollars == FARE_BUS.dollars) &&
+       (transaction.fare.cents == FARE_BUS.cents)) {
+        // if not a refill, and the fare amount is equal to bus fare (any better approach? flag bits for modality?)
+        // format for bus — supposedly some correlation between gate ID & bus #, haven't investigated
+        furi_string_cat_printf(out, "%s#%u", sep, transaction.gate);
+    } else if(get_map_item(transaction.gate, charliecard_fare_gate_ids, kNumFareGateIds, &sta)) {
+        // station found in fare gate ID map, append station name
+        furi_string_cat_str(out, sep);
+        furi_string_cat_str(out, sta);
+    } else {
+        // no found station in fare gate ID map & not a bus, just print ID w/o add'l info
+        furi_string_cat_printf(out, "%s#%u", sep, transaction.gate);
+    }
+    // print flags for debugging purposes
+    if(is_debug()) {
+        furi_string_cat_printf(out, "%s%x%s%x", sep, transaction.g_flag, sep, transaction.f_flag);
+    }
+}
+
+void transactions_format_cat(FuriString* out, Transaction* transactions) {
+    furi_string_cat_printf(out, "\nTransactions:");
+    for(size_t i = 0; i < CHARLIE_N_TRANSACTION_HISTORY; i++) {
+        furi_string_cat_printf(out, "\n");
+        transaction_format_cat(out, transactions[i]);
+        furi_string_cat_printf(out, "\n");
+    }
+}
+
+// **********************************************************
+// **************** NFC PLUGIN BOILERPLATE ******************
+// **********************************************************
+
+static bool charliecard_parse(const NfcDevice* device, FuriString* parsed_data) {
+    furi_assert(device);
+
+    const MfClassicData* data = nfc_device_get_data(device, NfcProtocolMfClassic);
+
+    bool parsed = false;
+
+    do {
+        // Verify card type
+        if(data->type != MfClassicType1k) break;
+
+        // Verify key
+        // arbitrary sector in the main data portion
+        const uint8_t verify_sector = 3;
+        const MfClassicSectorTrailer* sec_tr =
+            mf_classic_get_sector_trailer_by_sector(data, verify_sector);
+
+        const uint64_t key_a =
+            bit_lib_bytes_to_num_be(sec_tr->key_a.data, COUNT_OF(sec_tr->key_a.data));
+        const uint64_t key_b =
+            bit_lib_bytes_to_num_be(sec_tr->key_b.data, COUNT_OF(sec_tr->key_b.data));
+        if(key_a != charliecard_1k_keys[verify_sector].a) break;
+        if(key_b != charliecard_1k_keys[verify_sector].b) break;
+
+        // parse card data
+        const uint32_t card_number = mfg_sector_parse(data);
+        const CounterSector counter_sector = counter_sector_parse(data);
+        const BalanceSector balance_sector =
+            balance_sector_parse(data, counter_sector.active_balance_sector);
+        Pass* passes = passes_parse(data);
+        Transaction* transactions = transactions_parse(data);
+
+        // print/append card data
+        furi_string_cat_printf(parsed_data, "\e#CharlieCard");
+        furi_string_cat_printf(parsed_data, "\nSerial: 5-%lu", card_number);
+
+        // Type and balance 0 on some (Perq) cards
+        // (ie no "main" type / balance / end validity,
+        //  essentially only pass & trip info)
+        // skip/change formatting for that case?
+        furi_string_cat_printf(parsed_data, "\nBal: ");
+        money_format_cat(parsed_data, balance_sector.balance);
+
+        furi_string_cat_printf(parsed_data, "\nType: ");
+        type_format_cat(parsed_data, balance_sector.type);
+
+        furi_string_cat_printf(parsed_data, "\nTrip Count: %u", counter_sector.n_uses);
+
+        furi_string_cat_printf(parsed_data, "\nIssued: ");
+        locale_format_dt_cat(parsed_data, &balance_sector.issued);
+
+        if(!dt_eq(balance_sector.end_validity, CHARLIE_EPOCH) &
+           dt_ge(balance_sector.end_validity, balance_sector.issued)) {
+            // sometimes (seen on Perq cards) end validity field is all 0
+            // When this is the case, calc'd end validity is equal to CHARLIE_EPOCH).
+            // Only print if not 0, & end validity after issuance date
+            furi_string_cat_printf(parsed_data, "\nExpiry: ");
+            locale_format_dt_cat(parsed_data, &balance_sector.end_validity);
+        }
+
+        // const DateTime last = date_parse(data, active_sector, 0, 1);
+        // furi_string_cat_printf(parsed_data, "\nExpired: %s", expired(e_v, last) ? "Yes" : "No");
+
+        transactions_format_cat(parsed_data, transactions);
+        free(transactions);
+
+        passes_format_cat(parsed_data, passes);
+        free(passes);
+
+        parsed = true;
+    } while(false);
+
+    return parsed;
+}
+
+static bool charliecard_verify(Nfc* nfc) {
+    bool verified = false;
+
+    do {
+        const uint8_t verify_sector = 1;
+        const uint8_t verify_block = mf_classic_get_first_block_num_of_sector(verify_sector) + 1;
+        FURI_LOG_D(TAG, "Verifying sector %u", verify_sector);
+
+        MfClassicKey key = {0};
+        bit_lib_num_to_bytes_be(
+            charliecard_1k_keys[verify_sector].a, COUNT_OF(key.data), key.data);
+
+        MfClassicAuthContext auth_context;
+        MfClassicError error =
+            mf_classic_poller_sync_auth(nfc, verify_block, &key, MfClassicKeyTypeA, &auth_context);
+        if(error != MfClassicErrorNone) {
+            FURI_LOG_D(TAG, "Failed to read block %u: %d", verify_block, error);
+            break;
+        }
+
+        verified = true;
+    } while(false);
+
+    return verified;
+}
+
+static bool charliecard_read(Nfc* nfc, NfcDevice* device) {
+    furi_assert(nfc);
+    furi_assert(device);
+
+    bool is_read = false;
+
+    MfClassicData* data = mf_classic_alloc();
+    nfc_device_copy_data(device, NfcProtocolMfClassic, data);
+
+    do {
+        MfClassicType type = MfClassicTypeMini;
+        MfClassicError error = mf_classic_poller_sync_detect_type(nfc, &type);
+        if(error != MfClassicErrorNone) break;
+
+        data->type = type;
+        if(type != MfClassicType1k) break;
+
+        MfClassicDeviceKeys keys = {
+            .key_a_mask = 0,
+            .key_b_mask = 0,
+        };
+        for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
+            bit_lib_num_to_bytes_be(
+                charliecard_1k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
+            FURI_BIT_SET(keys.key_a_mask, i);
+            bit_lib_num_to_bytes_be(
+                charliecard_1k_keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);
+            FURI_BIT_SET(keys.key_b_mask, i);
+        }
+
+        error = mf_classic_poller_sync_read(nfc, &keys, data);
+        if(error == MfClassicErrorNotPresent) {
+            FURI_LOG_W(TAG, "Failed to read data");
+            break;
+        }
+
+        nfc_device_set_data(device, NfcProtocolMfClassic, data);
+
+        is_read = (error == MfClassicErrorNone);
+    } while(false);
+
+    mf_classic_free(data);
+
+    return is_read;
+}
+
+/* Actual implementation of app<>plugin interface */
+static const NfcSupportedCardsPlugin charliecard_plugin = {
+    .protocol = NfcProtocolMfClassic,
+    .verify = charliecard_verify,
+    .read = charliecard_read,
+    .parse = charliecard_parse,
+};
+
+/* Plugin descriptor to comply with basic plugin specification */
+static const FlipperAppPluginDescriptor charliecard_plugin_descriptor = {
+    .appid = NFC_SUPPORTED_CARD_PLUGIN_APP_ID,
+    .ep_api_version = NFC_SUPPORTED_CARD_PLUGIN_API_VERSION,
+    .entry_point = &charliecard_plugin,
+};
+
+/* Plugin entry point - must return a pointer to const descriptor  */
+const FlipperAppPluginDescriptor* charliecard_plugin_ep(void) {
+    return &charliecard_plugin_descriptor;
+}
diff --git a/applications/main/nfc/plugins/supported_cards/clipper.c b/applications/main/nfc/plugins/supported_cards/clipper.c
index 860c1c72e..739d714e9 100644
--- a/applications/main/nfc/plugins/supported_cards/clipper.c
+++ b/applications/main/nfc/plugins/supported_cards/clipper.c
@@ -565,6 +565,6 @@ static const FlipperAppPluginDescriptor clipper_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* clipper_plugin_ep() {
+const FlipperAppPluginDescriptor* clipper_plugin_ep(void) {
     return &clipper_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/gallagher.c b/applications/main/nfc/plugins/supported_cards/gallagher.c
index 869d74563..4a634296a 100644
--- a/applications/main/nfc/plugins/supported_cards/gallagher.c
+++ b/applications/main/nfc/plugins/supported_cards/gallagher.c
@@ -82,6 +82,6 @@ static const FlipperAppPluginDescriptor gallagher_plugin_descriptor = {
 };
 
 /* Plugin entry point */
-const FlipperAppPluginDescriptor* gallagher_plugin_ep() {
+const FlipperAppPluginDescriptor* gallagher_plugin_ep(void) {
     return &gallagher_plugin_descriptor;
 }
\ No newline at end of file
diff --git a/applications/main/nfc/plugins/supported_cards/hi.c b/applications/main/nfc/plugins/supported_cards/hi.c
index 4ab66ddd2..da616c1e1 100644
--- a/applications/main/nfc/plugins/supported_cards/hi.c
+++ b/applications/main/nfc/plugins/supported_cards/hi.c
@@ -221,6 +221,6 @@ static const FlipperAppPluginDescriptor hi_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* hi_plugin_ep() {
+const FlipperAppPluginDescriptor* hi_plugin_ep(void) {
     return &hi_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/hid.c b/applications/main/nfc/plugins/supported_cards/hid.c
index 39ab66351..601351d2d 100644
--- a/applications/main/nfc/plugins/supported_cards/hid.c
+++ b/applications/main/nfc/plugins/supported_cards/hid.c
@@ -147,6 +147,6 @@ static const FlipperAppPluginDescriptor hid_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* hid_plugin_ep() {
+const FlipperAppPluginDescriptor* hid_plugin_ep(void) {
     return &hid_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/itso.c b/applications/main/nfc/plugins/supported_cards/itso.c
index a5b8b43ad..92dbbd7b6 100644
--- a/applications/main/nfc/plugins/supported_cards/itso.c
+++ b/applications/main/nfc/plugins/supported_cards/itso.c
@@ -120,6 +120,6 @@ static const FlipperAppPluginDescriptor itso_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* itso_plugin_ep() {
+const FlipperAppPluginDescriptor* itso_plugin_ep(void) {
     return &itso_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/microel.c b/applications/main/nfc/plugins/supported_cards/microel.c
index 91e5b2286..2dc8cd3eb 100644
--- a/applications/main/nfc/plugins/supported_cards/microel.c
+++ b/applications/main/nfc/plugins/supported_cards/microel.c
@@ -226,6 +226,6 @@ static const FlipperAppPluginDescriptor microel_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* microel_plugin_ep() {
+const FlipperAppPluginDescriptor* microel_plugin_ep(void) {
     return &microel_plugin_descriptor;
 }
\ No newline at end of file
diff --git a/applications/main/nfc/plugins/supported_cards/mizip.c b/applications/main/nfc/plugins/supported_cards/mizip.c
index dc5705059..d29901d2e 100644
--- a/applications/main/nfc/plugins/supported_cards/mizip.c
+++ b/applications/main/nfc/plugins/supported_cards/mizip.c
@@ -252,6 +252,6 @@ static const FlipperAppPluginDescriptor mizip_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* mizip_plugin_ep() {
+const FlipperAppPluginDescriptor* mizip_plugin_ep(void) {
     return &mizip_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/mykey.c b/applications/main/nfc/plugins/supported_cards/mykey.c
index 70b9fa6a9..40a647b32 100644
--- a/applications/main/nfc/plugins/supported_cards/mykey.c
+++ b/applications/main/nfc/plugins/supported_cards/mykey.c
@@ -86,11 +86,10 @@ static bool mykey_parse(const NfcDevice* device, FuriString* parsed_data) {
 
     bool is_blank = mykey_is_blank(data);
     furi_string_cat_printf(parsed_data, "Serial#: %08lX\n", (uint32_t)__bswap32(data->blocks[7]));
-    furi_string_cat_printf(parsed_data, "Blank: %s\n", is_blank ? "yes" : "no");
-    furi_string_cat_printf(parsed_data, "LockID: %s\n", mykey_has_lockid(data) ? "maybe" : "no");
-
     furi_string_cat_printf(
-        parsed_data, "Prod. date: %02X/%02X/%04X", mfg_day, mfg_month, mfg_year);
+        parsed_data, "Prod. date: %02X/%02X/%04X\n", mfg_day, mfg_month, mfg_year);
+    furi_string_cat_printf(parsed_data, "Blank: %s\n", is_blank ? "yes" : "no");
+    furi_string_cat_printf(parsed_data, "LockID: %s", mykey_has_lockid(data) ? "maybe" : "no");
 
     if(!is_blank) {
         furi_string_cat_printf(
@@ -153,6 +152,6 @@ static const FlipperAppPluginDescriptor mykey_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* mykey_plugin_ep() {
+const FlipperAppPluginDescriptor* mykey_plugin_ep(void) {
     return &mykey_plugin_descriptor;
 }
\ No newline at end of file
diff --git a/applications/main/nfc/plugins/supported_cards/myki.c b/applications/main/nfc/plugins/supported_cards/myki.c
index 4da5d30af..ff886bc75 100644
--- a/applications/main/nfc/plugins/supported_cards/myki.c
+++ b/applications/main/nfc/plugins/supported_cards/myki.c
@@ -73,7 +73,7 @@ static bool myki_parse(const NfcDevice* device, FuriString* parsed_data) {
         // Stored card number doesn't include check digit
         card_number += myki_calculate_luhn(card_number);
 
-        furi_string_set(parsed_data, "\e#myki\n");
+        furi_string_set(parsed_data, "\e#myki\nNo.: ");
 
         // Stylise card number according to the physical card
         char card_string[20];
@@ -111,6 +111,6 @@ static const FlipperAppPluginDescriptor myki_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* myki_plugin_ep() {
+const FlipperAppPluginDescriptor* myki_plugin_ep(void) {
     return &myki_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/opal.c b/applications/main/nfc/plugins/supported_cards/opal.c
index d83e908f1..dc451e72c 100644
--- a/applications/main/nfc/plugins/supported_cards/opal.c
+++ b/applications/main/nfc/plugins/supported_cards/opal.c
@@ -170,7 +170,7 @@ static bool opal_parse(const NfcDevice* device, FuriString* parsed_data) {
 
         furi_string_printf(
             parsed_data,
-            "\e#Opal: $%s%ld.%02hu\n3085 22%02hhu %04hu %03hu%01hhu\n%s, %s\n",
+            "\e#Opal: $%s%ld.%02hu\nNo.: 3085 22%02hhu %04hu %03hu%01hhu\n%s, %s\n",
             sign,
             balance_dollars,
             balance_cents,
@@ -228,6 +228,6 @@ static const FlipperAppPluginDescriptor opal_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* opal_plugin_ep() {
+const FlipperAppPluginDescriptor* opal_plugin_ep(void) {
     return &opal_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/plantain.c b/applications/main/nfc/plugins/supported_cards/plantain.c
index ebdc902e8..b1d2a5164 100644
--- a/applications/main/nfc/plugins/supported_cards/plantain.c
+++ b/applications/main/nfc/plugins/supported_cards/plantain.c
@@ -191,7 +191,7 @@ static bool plantain_parse(const NfcDevice* device, FuriString* parsed_data) {
         }
 
         furi_string_printf(
-            parsed_data, "\e#Plantain\nN:%llu-\nBalance:%lu\n", card_number, balance);
+            parsed_data, "\e#Plantain\nNo.: %llu?\nBalance:%lu\n", card_number, balance);
         parsed = true;
     } while(false);
 
@@ -214,6 +214,6 @@ static const FlipperAppPluginDescriptor plantain_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* plantain_plugin_ep() {
+const FlipperAppPluginDescriptor* plantain_plugin_ep(void) {
     return &plantain_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/social_moscow.c b/applications/main/nfc/plugins/supported_cards/social_moscow.c
index 805c77732..55ca6a1ec 100644
--- a/applications/main/nfc/plugins/supported_cards/social_moscow.c
+++ b/applications/main/nfc/plugins/supported_cards/social_moscow.c
@@ -84,7 +84,7 @@ void from_minutes_to_datetime(uint32_t minutes, DateTime* datetime, uint16_t sta
 bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
     uint16_t transport_departament = bit_lib_get_bits_16(block->data, 0, 10);
 
-    FURI_LOG_I(TAG, "Transport departament: %x", transport_departament);
+    FURI_LOG_D(TAG, "Transport departament: %x", transport_departament);
 
     uint16_t layout_type = bit_lib_get_bits_16(block->data, 52, 4);
     if(layout_type == 0xE) {
@@ -93,7 +93,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
         layout_type = bit_lib_get_bits_16(block->data, 52, 14);
     }
 
-    FURI_LOG_I(TAG, "Layout type %x", layout_type);
+    FURI_LOG_D(TAG, "Layout type %x", layout_type);
 
     uint16_t card_view = 0;
     uint16_t card_type = 0;
diff --git a/applications/main/nfc/plugins/supported_cards/troika.c b/applications/main/nfc/plugins/supported_cards/troika.c
index 0ce076b47..84e92d3e0 100644
--- a/applications/main/nfc/plugins/supported_cards/troika.c
+++ b/applications/main/nfc/plugins/supported_cards/troika.c
@@ -1,10 +1,13 @@
 #include "nfc_supported_card_plugin.h"
-#include <flipper_application.h>
+#include <core/check.h>
 
+#include <flipper_application/flipper_application.h>
+
+#include <nfc/nfc_device.h>
+#include <bit_lib/bit_lib.h>
 #include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
-
-#include <bit_lib.h>
-#include <datetime.h>
+#include "../../api/mosgortrans/mosgortrans_util.h"
+#include "furi_hal_rtc.h"
 
 #define TAG "Troika"
 
@@ -38,1005 +41,48 @@ static const MfClassicKeyPair troika_1k_keys[] = {
 };
 
 static const MfClassicKeyPair troika_4k_keys[] = {
-    {.a = 0xa0a1a2a3a4a5, .b = 0xfbf225dc5d58}, {.a = 0xa82607b01c0d, .b = 0x2910989b6880},
-    {.a = 0x2aa05ed1856f, .b = 0xeaac88e5dc99}, {.a = 0x2aa05ed1856f, .b = 0xeaac88e5dc99},
-    {.a = 0x73068f118c13, .b = 0x2b7f3253fac5}, {.a = 0xfbc2793d540b, .b = 0xd3a297dc2698},
-    {.a = 0x2aa05ed1856f, .b = 0xeaac88e5dc99}, {.a = 0xae3d65a3dad4, .b = 0x0f1c63013dbb},
-    {.a = 0xa73f5dc1d333, .b = 0xe35173494a81}, {.a = 0x69a32f1c2f19, .b = 0x6b8bd9860763},
-    {.a = 0x9becdf3d9273, .b = 0xf8493407799d}, {.a = 0x08b386463229, .b = 0x5efbaecef46b},
-    {.a = 0xcd4c61c26e3d, .b = 0x31c7610de3b0}, {.a = 0xa82607b01c0d, .b = 0x2910989b6880},
-    {.a = 0x0e8f64340ba4, .b = 0x4acec1205d75}, {.a = 0x2aa05ed1856f, .b = 0xeaac88e5dc99},
-    {.a = 0x6b02733bb6ec, .b = 0x7038cd25c408}, {.a = 0x403d706ba880, .b = 0xb39d19a280df},
-    {.a = 0xc11f4597efb5, .b = 0x70d901648cb9}, {.a = 0x0db520c78c1c, .b = 0x73e5b9d9d3a4},
-    {.a = 0x3ebce0925b2f, .b = 0x372cc880f216}, {.a = 0x16a27af45407, .b = 0x9868925175ba},
-    {.a = 0xaba208516740, .b = 0xce26ecb95252}, {.a = 0xcd64e567abcd, .b = 0x8f79c4fd8a01},
-    {.a = 0x764cd061f1e6, .b = 0xa74332f74994}, {.a = 0x1cc219e9fec1, .b = 0xb90de525ceb6},
-    {.a = 0x2fe3cb83ea43, .b = 0xfba88f109b32}, {.a = 0x07894ffec1d6, .b = 0xefcb0e689db3},
-    {.a = 0x04c297b91308, .b = 0xc8454c154cb5}, {.a = 0x7a38e3511a38, .b = 0xab16584c972a},
-    {.a = 0x7545df809202, .b = 0xecf751084a80}, {.a = 0x5125974cd391, .b = 0xd3eafb5df46d},
-    {.a = 0x7a86aa203788, .b = 0xe41242278ca2}, {.a = 0xafcef64c9913, .b = 0x9db96dca4324},
-    {.a = 0x04eaa462f70b, .b = 0xac17b93e2fae}, {.a = 0xe734c210f27e, .b = 0x29ba8c3e9fda},
-    {.a = 0xd5524f591eed, .b = 0x5daf42861b4d}, {.a = 0xe4821a377b75, .b = 0xe8709e486465},
-    {.a = 0x518dc6eea089, .b = 0x97c64ac98ca4}, {.a = 0xbb52f8cce07f, .b = 0x6b6119752c70},
+    {.a = 0xEC29806D9738, .b = 0xFBF225DC5D58}, //1
+    {.a = 0xA0A1A2A3A4A5, .b = 0x7DE02A7F6025}, //2
+    {.a = 0x2AA05ED1856F, .b = 0xEAAC88E5DC99}, //3
+    {.a = 0x2AA05ED1856F, .b = 0xEAAC88E5DC99}, //4
+    {.a = 0x73068F118C13, .b = 0x2B7F3253FAC5}, //5
+    {.a = 0xFBC2793D540B, .b = 0xD3A297DC2698}, //6
+    {.a = 0x2AA05ED1856F, .b = 0xEAAC88E5DC99}, //7
+    {.a = 0xAE3D65A3DAD4, .b = 0x0F1C63013DBA}, //8
+    {.a = 0xA73F5DC1D333, .b = 0xE35173494A81}, //9
+    {.a = 0x69A32F1C2F19, .b = 0x6B8BD9860763}, //10
+    {.a = 0x9BECDF3D9273, .b = 0xF8493407799D}, //11
+    {.a = 0x08B386463229, .b = 0x5EFBAECEF46B}, //12
+    {.a = 0xCD4C61C26E3D, .b = 0x31C7610DE3B0}, //13
+    {.a = 0xA82607B01C0D, .b = 0x2910989B6880}, //14
+    {.a = 0x0E8F64340BA4, .b = 0x4ACEC1205D75}, //15
+    {.a = 0x2AA05ED1856F, .b = 0xEAAC88E5DC99}, //16
+    {.a = 0x6B02733BB6EC, .b = 0x7038CD25C408}, //17
+    {.a = 0x403D706BA880, .b = 0xB39D19A280DF}, //18
+    {.a = 0xC11F4597EFB5, .b = 0x70D901648CB9}, //19
+    {.a = 0x0DB520C78C1C, .b = 0x73E5B9D9D3A4}, //20
+    {.a = 0x3EBCE0925B2F, .b = 0x372CC880F216}, //21
+    {.a = 0x16A27AF45407, .b = 0x9868925175BA}, //22
+    {.a = 0xABA208516740, .b = 0xCE26ECB95252}, //23
+    {.a = 0xCD64E567ABCD, .b = 0x8F79C4FD8A01}, //24
+    {.a = 0x764CD061F1E6, .b = 0xA74332F74994}, //25
+    {.a = 0x1CC219E9FEC1, .b = 0xB90DE525CEB6}, //26
+    {.a = 0x2FE3CB83EA43, .b = 0xFBA88F109B32}, //27
+    {.a = 0x07894FFEC1D6, .b = 0xEFCB0E689DB3}, //28
+    {.a = 0x04C297B91308, .b = 0xC8454C154CB5}, //29
+    {.a = 0x7A38E3511A38, .b = 0xAB16584C972A}, //30
+    {.a = 0x7545DF809202, .b = 0xECF751084A80}, //31
+    {.a = 0x5125974CD391, .b = 0xD3EAFB5DF46D}, //32
+    {.a = 0x7A86AA203788, .b = 0xE41242278CA2}, //33
+    {.a = 0xAFCEF64C9913, .b = 0x9DB96DCA4324}, //34
+    {.a = 0x04EAA462F70B, .b = 0xAC17B93E2FAE}, //35
+    {.a = 0xE734C210F27E, .b = 0x29BA8C3E9FDA}, //36
+    {.a = 0xD5524F591EED, .b = 0x5DAF42861B4D}, //37
+    {.a = 0xE4821A377B75, .b = 0xE8709E486465}, //38
+    {.a = 0x518DC6EEA089, .b = 0x97C64AC98CA4}, //39
+    {.a = 0xBB52F8CCE07F, .b = 0x6B6119752C70}, //40
 };
 
-#define TOPBIT(X) (1 << ((X)-1))
-
-void from_days_to_datetime(uint16_t days, DateTime* datetime, uint16_t start_year) {
-    uint32_t timestamp = days * 24 * 60 * 60;
-    DateTime start_datetime = {0};
-    start_datetime.year = start_year - 1;
-    start_datetime.month = 12;
-    start_datetime.day = 31;
-    timestamp += datetime_datetime_to_timestamp(&start_datetime);
-    datetime_timestamp_to_datetime(timestamp, datetime);
-}
-
-void from_minutes_to_datetime(uint32_t minutes, DateTime* datetime, uint16_t start_year) {
-    uint32_t timestamp = minutes * 60;
-    DateTime start_datetime = {0};
-    start_datetime.year = start_year - 1;
-    start_datetime.month = 12;
-    start_datetime.day = 31;
-    timestamp += datetime_datetime_to_timestamp(&start_datetime);
-    datetime_timestamp_to_datetime(timestamp, datetime);
-}
-
-bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
-    uint16_t transport_departament = bit_lib_get_bits_16(block->data, 0, 10);
-
-    FURI_LOG_I(TAG, "Transport departament: %x", transport_departament);
-
-    uint16_t layout_type = bit_lib_get_bits_16(block->data, 52, 4);
-    if(layout_type == 0xE) {
-        layout_type = bit_lib_get_bits_16(block->data, 52, 9);
-    } else if(layout_type == 0xF) {
-        layout_type = bit_lib_get_bits_16(block->data, 52, 14);
-    }
-
-    FURI_LOG_I(TAG, "Layout type %x", layout_type);
-
-    uint16_t card_view = 0;
-    uint16_t card_type = 0;
-    uint32_t card_number = 0;
-    uint8_t card_layout = 0;
-    uint8_t card_layout2 = 0;
-    uint16_t card_use_before_date = 0;
-    uint16_t card_blank_type = 0;
-    uint32_t card_start_trip_minutes = 0;
-    uint8_t card_minutes_pass = 0;
-    uint32_t card_remaining_funds = 0;
-    uint16_t card_validator = 0;
-    uint8_t card_blocked = 0;
-    uint32_t card_hash = 0;
-
-    switch(layout_type) {
-    case 0x02: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        card_use_before_date = bit_lib_get_bits_16(block->data, 56, 16); //202
-        uint8_t card_benefit_code = bit_lib_get_bits(block->data, 72, 8); //124
-        uint32_t card_rfu1 = bit_lib_get_bits_32(block->data, 80, 32); //rfu1
-        uint16_t card_crc16 = bit_lib_get_bits_16(block->data, 112, 16); //501.1
-        card_blocked = bit_lib_get_bits(block->data, 128, 1); //303
-        uint16_t card_start_trip_time = bit_lib_get_bits_16(block->data, 177, 12); //403
-        uint16_t card_start_trip_date = bit_lib_get_bits_16(block->data, 189, 16); //402
-        uint16_t card_valid_from_date = bit_lib_get_bits_16(block->data, 157, 16); //311
-        uint16_t card_valid_by_date = bit_lib_get_bits_16(block->data, 173, 16); //312
-        uint8_t card_start_trip_seconds = bit_lib_get_bits(block->data, 189, 6); //406
-        uint8_t card_transport_type1 = bit_lib_get_bits(block->data, 180, 2); //421.1
-        uint8_t card_transport_type2 = bit_lib_get_bits(block->data, 182, 2); //421.2
-        uint8_t card_transport_type3 = bit_lib_get_bits(block->data, 184, 2); //421.3
-        uint8_t card_transport_type4 = bit_lib_get_bits(block->data, 186, 2); //421.4
-        uint16_t card_use_with_date = bit_lib_get_bits_16(block->data, 189, 16); //205
-        uint8_t card_route = bit_lib_get_bits(block->data, 205, 1); //424
-        uint16_t card_validator1 = bit_lib_get_bits_16(block->data, 206, 15); //422.1
-        card_validator = bit_lib_get_bits_16(block->data, 205, 16); //422
-        uint16_t card_total_trips = bit_lib_get_bits_16(block->data, 221, 16); //331
-        uint8_t card_write_enabled = bit_lib_get_bits(block->data, 237, 1); //write_enabled
-        uint8_t card_rfu2 = bit_lib_get_bits(block->data, 238, 2); //rfu2
-        uint16_t card_crc16_2 = bit_lib_get_bits_16(block->data, 240, 16); //501.2
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %lx %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x",
-            card_view,
-            card_type,
-            card_number,
-            card_use_before_date,
-            card_benefit_code,
-            card_rfu1,
-            card_crc16,
-            card_blocked,
-            card_start_trip_time,
-            card_start_trip_date,
-            card_valid_from_date,
-            card_valid_by_date,
-            card_start_trip_seconds,
-            card_transport_type1,
-            card_transport_type2,
-            card_transport_type3,
-            card_transport_type4,
-            card_use_with_date,
-            card_route,
-            card_validator1,
-            card_validator,
-            card_total_trips,
-            card_write_enabled,
-            card_rfu2,
-            card_crc16_2);
-        if(card_valid_by_date == 0) {
-            return false;
-        }
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_valid_by_date, &card_use_before_date_s, 1992);
-
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(
-            (card_start_trip_date) * 24 * 60 + card_start_trip_time,
-            &card_start_trip_minutes_s,
-            1992);
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nTrips: %d\nTrip from: %02d.%02d.%04d %02d:%02d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_total_trips,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_validator);
-        break;
-    }
-    case 0x06: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        card_use_before_date = bit_lib_get_bits_16(block->data, 56, 16); //202
-        uint8_t card_geozone_a = bit_lib_get_bits(block->data, 72, 4); //GeoZoneA
-        uint8_t card_geozone_b = bit_lib_get_bits(block->data, 76, 4); //GeoZoneB
-        card_blank_type = bit_lib_get_bits_16(block->data, 80, 10); //121.
-        uint16_t card_type_of_extended = bit_lib_get_bits_16(block->data, 90, 10); //122
-        uint32_t card_rfu1 = bit_lib_get_bits_16(block->data, 100, 12); //rfu1
-        uint16_t card_crc16 = bit_lib_get_bits_16(block->data, 112, 16); //501.1
-        card_blocked = bit_lib_get_bits(block->data, 128, 1); //303
-        uint16_t card_start_trip_time = bit_lib_get_bits_16(block->data, 129, 12); //403
-        uint16_t card_start_trip_date = bit_lib_get_bits_16(block->data, 141, 16); //402
-        uint16_t card_valid_from_date = bit_lib_get_bits_16(block->data, 157, 16); //311
-        uint16_t card_valid_by_date = bit_lib_get_bits_16(block->data, 173, 16); //312
-        uint16_t card_company = bit_lib_get_bits(block->data, 189, 4); //Company
-        uint8_t card_validator1 = bit_lib_get_bits(block->data, 193, 4); //422.1
-        uint16_t card_remaining_trips = bit_lib_get_bits_16(block->data, 197, 10); //321
-        uint8_t card_units = bit_lib_get_bits(block->data, 207, 6); //Units
-        uint16_t card_validator2 = bit_lib_get_bits_16(block->data, 213, 10); //422.2
-        uint16_t card_total_trips = bit_lib_get_bits_16(block->data, 223, 16); //331
-        uint8_t card_extended = bit_lib_get_bits(block->data, 239, 1); //123
-        uint16_t card_crc16_2 = bit_lib_get_bits_16(block->data, 240, 16); //501.2
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %x %x %x %lx %x %x %x %x %x %x %x %x %x %x %x %x %x %x",
-            card_view,
-            card_type,
-            card_number,
-            card_use_before_date,
-            card_geozone_a,
-            card_geozone_b,
-            card_blank_type,
-            card_type_of_extended,
-            card_rfu1,
-            card_crc16,
-            card_blocked,
-            card_start_trip_time,
-            card_start_trip_date,
-            card_valid_from_date,
-            card_valid_by_date,
-            card_company,
-            card_validator1,
-            card_remaining_trips,
-            card_units,
-            card_validator2,
-            card_total_trips,
-            card_extended,
-            card_crc16_2);
-        card_validator = card_validator1 * 1024 + card_validator2;
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_valid_by_date, &card_use_before_date_s, 1992);
-
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(
-            (card_start_trip_date) * 24 * 60 + card_start_trip_time,
-            &card_start_trip_minutes_s,
-            1992);
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nTrips left: %d of %d\nTrip from: %02d.%02d.%04d %02d:%02d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_remaining_trips,
-            card_total_trips,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_validator);
-        break;
-    }
-    case 0x08: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        card_use_before_date = bit_lib_get_bits_16(block->data, 56, 16); //202
-        uint64_t card_rfu1 = bit_lib_get_bits_64(block->data, 72, 56); //rfu1
-        uint16_t card_valid_from_date = bit_lib_get_bits_16(block->data, 128, 16); //311
-        uint8_t card_valid_for_days = bit_lib_get_bits(block->data, 144, 8); //313
-        uint8_t card_requires_activation = bit_lib_get_bits(block->data, 152, 1); //301
-        uint8_t card_rfu2 = bit_lib_get_bits(block->data, 153, 7); //rfu2
-        uint8_t card_remaining_trips1 = bit_lib_get_bits(block->data, 160, 8); //321.1
-        uint8_t card_remaining_trips = bit_lib_get_bits(block->data, 168, 8); //321
-        uint8_t card_validator1 = bit_lib_get_bits(block->data, 193, 2); //422.1
-        uint16_t card_validator = bit_lib_get_bits_16(block->data, 177, 15); //422
-        card_hash = bit_lib_get_bits_32(block->data, 192, 32); //502
-        uint32_t card_rfu3 = bit_lib_get_bits_32(block->data, 224, 32); //rfu3
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %llx %x %x %x %x %x %x %x %x %lx %x %lx",
-            card_view,
-            card_type,
-            card_number,
-            card_use_before_date,
-            card_rfu1,
-            card_valid_from_date,
-            card_valid_for_days,
-            card_requires_activation,
-            card_rfu2,
-            card_remaining_trips1,
-            card_remaining_trips,
-            card_validator1,
-            card_validator,
-            card_hash,
-            card_valid_from_date,
-            card_rfu3);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992);
-
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nTrips left: %d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_remaining_trips,
-            card_validator);
-        break;
-    }
-    case 0x0A: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        uint16_t card_valid_from_date = bit_lib_get_bits_16(block->data, 64, 12); //311
-        uint32_t card_valid_for_minutes = bit_lib_get_bits_32(block->data, 76, 19); //314
-        uint8_t card_requires_activation = bit_lib_get_bits(block->data, 95, 1); //301
-        card_start_trip_minutes = bit_lib_get_bits_32(block->data, 96, 19); //405
-        card_minutes_pass = bit_lib_get_bits(block->data, 119, 7); //412
-        uint8_t card_transport_type_flag = bit_lib_get_bits(block->data, 126, 2); //421.0
-        uint8_t card_remaining_trips = bit_lib_get_bits(block->data, 128, 8); //321
-        uint16_t card_validator = bit_lib_get_bits_16(block->data, 136, 16); //422
-        uint8_t card_transport_type1 = bit_lib_get_bits(block->data, 152, 2); //421.1
-        uint8_t card_transport_type2 = bit_lib_get_bits(block->data, 154, 2); //421.2
-        uint8_t card_transport_type3 = bit_lib_get_bits(block->data, 156, 2); //421.3
-        uint8_t card_transport_type4 = bit_lib_get_bits(block->data, 158, 2); //421.4
-        card_hash = bit_lib_get_bits_32(block->data, 192, 32); //502
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %lx %x %lx %x %x %x %x %x %x %x %x %lx",
-            card_view,
-            card_type,
-            card_number,
-            card_use_before_date,
-            card_valid_from_date,
-            card_valid_for_minutes,
-            card_requires_activation,
-            card_start_trip_minutes,
-            card_minutes_pass,
-            card_transport_type_flag,
-            card_remaining_trips,
-            card_validator,
-            card_transport_type1,
-            card_transport_type2,
-            card_transport_type3,
-            card_transport_type4,
-            card_hash);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 2016);
-
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(card_start_trip_minutes, &card_start_trip_minutes_s, 2016);
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nTrip from: %02d.%02d.%04d %02d:%02d\nTrips left: %d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_remaining_trips,
-            card_validator);
-        break;
-    }
-    case 0x0C: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        card_use_before_date = bit_lib_get_bits_16(block->data, 56, 16); //202
-        uint64_t card_rfu1 = bit_lib_get_bits_64(block->data, 72, 56); //rfu1
-        uint16_t card_valid_from_date = bit_lib_get_bits_16(block->data, 128, 16); //311
-        uint8_t card_valid_for_days = bit_lib_get_bits(block->data, 144, 8); //313
-        uint8_t card_requires_activation = bit_lib_get_bits(block->data, 152, 1); //301
-        uint16_t card_rfu2 = bit_lib_get_bits_16(block->data, 153, 13); //rfu2
-        uint16_t card_remaining_trips = bit_lib_get_bits_16(block->data, 166, 10); //321
-        uint16_t card_validator = bit_lib_get_bits_16(block->data, 176, 16); //422
-        card_hash = bit_lib_get_bits_32(block->data, 192, 32); //502
-        uint16_t card_start_trip_date = bit_lib_get_bits_16(block->data, 224, 16); //402
-        uint16_t card_start_trip_time = bit_lib_get_bits_16(block->data, 240, 11); //403
-        uint8_t card_transport_type = bit_lib_get_bits(block->data, 251, 2); //421
-        uint8_t card_rfu3 = bit_lib_get_bits(block->data, 253, 2); //rfu3
-        uint8_t card_transfer_in_metro = bit_lib_get_bits(block->data, 255, 1); //432
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %llx %x %x %x %x %x %x %x %x %x %x %x",
-            card_view,
-            card_type,
-            card_number,
-            card_use_before_date,
-            card_rfu1,
-            card_valid_from_date,
-            card_valid_for_days,
-            card_requires_activation,
-            card_rfu2,
-            card_remaining_trips,
-            card_validator,
-            card_start_trip_date,
-            card_start_trip_time,
-            card_transport_type,
-            card_rfu3,
-            card_transfer_in_metro);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992);
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(
-            (card_start_trip_date) * 24 * 60 + card_start_trip_time,
-            &card_start_trip_minutes_s,
-            1992);
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nTrip from: %02d.%02d.%04d %02d:%02d\nTrips left: %d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_remaining_trips,
-            card_validator);
-        break;
-    }
-    case 0x0D: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        uint8_t card_rfu1 = bit_lib_get_bits(block->data, 56, 8); //rfu1
-        card_use_before_date = bit_lib_get_bits_16(block->data, 64, 16); //202
-        uint16_t card_valid_for_time = bit_lib_get_bits_16(block->data, 80, 11); //316
-        uint8_t card_rfu2 = bit_lib_get_bits(block->data, 91, 5); //rfu2
-        uint16_t card_use_before_date2 = bit_lib_get_bits_16(block->data, 96, 16); //202.2
-        uint16_t card_valid_for_time2 = bit_lib_get_bits_16(block->data, 123, 11); //316.2
-        uint8_t card_rfu3 = bit_lib_get_bits(block->data, 123, 5); //rfu3
-        uint16_t card_valid_from_date = bit_lib_get_bits_16(block->data, 128, 16); //311
-        uint8_t card_valid_for_days = bit_lib_get_bits(block->data, 144, 8); //313
-        uint8_t card_requires_activation = bit_lib_get_bits(block->data, 152, 1); //301
-        uint8_t card_rfu4 = bit_lib_get_bits(block->data, 153, 2); //rfu4
-        uint8_t card_passage_5_minutes = bit_lib_get_bits(block->data, 155, 5); //413
-        uint8_t card_transport_type1 = bit_lib_get_bits(block->data, 160, 2); //421.1
-        uint8_t card_passage_in_metro = bit_lib_get_bits(block->data, 162, 1); //431
-        uint8_t card_passages_ground_transport = bit_lib_get_bits(block->data, 163, 3); //433
-        uint16_t card_remaining_trips = bit_lib_get_bits_16(block->data, 166, 10); //321
-        uint16_t card_validator = bit_lib_get_bits_16(block->data, 176, 16); //422
-        card_hash = bit_lib_get_bits_32(block->data, 192, 32); //502
-        uint16_t card_start_trip_date = bit_lib_get_bits_16(block->data, 224, 16); //402
-        uint16_t card_start_trip_time = bit_lib_get_bits_16(block->data, 240, 11); //403
-        uint8_t card_transport_type2 = bit_lib_get_bits(block->data, 251, 2); //421.2
-        uint8_t card_rfu5 = bit_lib_get_bits(block->data, 253, 2); //rfu5
-        uint8_t card_transfer_in_metro = bit_lib_get_bits(block->data, 255, 1); //432
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x",
-            card_view,
-            card_type,
-            card_number,
-            card_layout,
-            card_rfu1,
-            card_use_before_date,
-            card_valid_for_time,
-            card_rfu2,
-            card_use_before_date2,
-            card_valid_for_time2,
-            card_rfu3,
-            card_valid_from_date,
-            card_valid_for_days,
-            card_requires_activation,
-            card_rfu4,
-            card_passage_5_minutes,
-            card_transport_type1,
-            card_passage_in_metro,
-            card_passages_ground_transport,
-            card_remaining_trips,
-            card_validator,
-            card_start_trip_date,
-            card_start_trip_time,
-            card_transport_type2,
-            card_rfu5,
-            card_transfer_in_metro);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992);
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(
-            (card_start_trip_date) * 24 * 60 + card_start_trip_time,
-            &card_start_trip_minutes_s,
-            1992);
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nTrip from: %02d.%02d.%04d %02d:%02d\nTrips left: %d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_remaining_trips,
-            card_validator);
-        break;
-    }
-    case 0x1C1: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        card_layout2 = bit_lib_get_bits(block->data, 56, 5); //112
-        card_use_before_date = bit_lib_get_bits_16(block->data, 61, 16); //202.
-        card_blank_type = bit_lib_get_bits_16(block->data, 77, 10); //121.
-        card_validator = bit_lib_get_bits_16(block->data, 128, 16); //422
-        uint16_t card_start_trip_date = bit_lib_get_bits_16(block->data, 144, 16); //402
-        uint16_t card_start_trip_time = bit_lib_get_bits_16(block->data, 160, 11); //403
-        uint8_t card_transport_type1 = bit_lib_get_bits(block->data, 171, 2); //421.1
-        uint8_t card_transport_type2 = bit_lib_get_bits(block->data, 173, 2); //421.2
-        uint8_t card_transfer_in_metro = bit_lib_get_bits(block->data, 177, 1); //432
-        uint8_t card_passage_in_metro = bit_lib_get_bits(block->data, 178, 1); //431
-        uint8_t card_passages_ground_transport = bit_lib_get_bits(block->data, 179, 3); //433
-        card_minutes_pass = bit_lib_get_bits(block->data, 185, 8); //412.
-        card_remaining_funds = bit_lib_get_bits_32(block->data, 196, 19) / 100; //322
-        uint8_t card_fare_trip = bit_lib_get_bits(block->data, 215, 2); //441
-        card_blocked = bit_lib_get_bits(block->data, 202, 1); //303
-        uint8_t card_zoo = bit_lib_get_bits(block->data, 218, 1); //zoo
-        card_hash = bit_lib_get_bits_32(block->data, 224, 32); //502
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %x %x %x %x %x %x %x %x %x %x %x %lx %x %x %x %lx",
-            card_view,
-            card_type,
-            card_number,
-            card_layout,
-            card_layout2,
-            card_use_before_date,
-            card_blank_type,
-            card_validator,
-            card_start_trip_date,
-            card_start_trip_time,
-            card_transport_type1,
-            card_transport_type2,
-            card_transfer_in_metro,
-            card_passage_in_metro,
-            card_passages_ground_transport,
-            card_minutes_pass,
-            card_remaining_funds,
-            card_fare_trip,
-            card_blocked,
-            card_zoo,
-            card_hash);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992);
-
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(card_start_trip_minutes, &card_start_trip_minutes_s, 1992);
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nTrip from: %02d.%02d.%04d %02d:%02d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_validator);
-        break;
-    }
-    case 0x1C2: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        card_layout2 = bit_lib_get_bits(block->data, 56, 5); //112
-        uint16_t card_type_of_extended = bit_lib_get_bits_16(block->data, 61, 10); //122
-        card_use_before_date = bit_lib_get_bits_16(block->data, 71, 16); //202.
-        card_blank_type = bit_lib_get_bits_16(block->data, 87, 10); //121.
-        uint16_t card_valid_to_date = bit_lib_get_bits_16(block->data, 97, 16); //311
-        uint16_t card_activate_during = bit_lib_get_bits_16(block->data, 113, 9); //302
-        uint32_t card_valid_for_minutes = bit_lib_get_bits_32(block->data, 131, 20); //314
-        card_minutes_pass = bit_lib_get_bits(block->data, 154, 8); //412.
-        uint8_t card_transport_type = bit_lib_get_bits(block->data, 163, 2); //421
-        uint8_t card_passage_in_metro = bit_lib_get_bits(block->data, 165, 1); //431
-        uint8_t card_transfer_in_metro = bit_lib_get_bits(block->data, 166, 1); //432
-        uint16_t card_remaining_trips = bit_lib_get_bits_16(block->data, 167, 10); //321
-        card_validator = bit_lib_get_bits_16(block->data, 177, 16); //422
-        uint32_t card_start_trip_neg_minutes = bit_lib_get_bits_32(block->data, 196, 20); //404
-        uint8_t card_requires_activation = bit_lib_get_bits(block->data, 216, 1); //301
-        card_blocked = bit_lib_get_bits(block->data, 217, 1); //303
-        uint8_t card_extended = bit_lib_get_bits(block->data, 218, 1); //123
-        card_hash = bit_lib_get_bits_32(block->data, 224, 32); //502
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %x %x %x %x %x %lx %x %x %x %x %x %x %lx %x %x %x %lx",
-            card_view,
-            card_type,
-            card_number,
-            card_layout,
-            card_layout2,
-            card_type_of_extended,
-            card_use_before_date,
-            card_blank_type,
-            card_valid_to_date,
-            card_activate_during,
-            card_valid_for_minutes,
-            card_minutes_pass,
-            card_transport_type,
-            card_passage_in_metro,
-            card_transfer_in_metro,
-            card_remaining_trips,
-            card_validator,
-            card_start_trip_neg_minutes,
-            card_requires_activation,
-            card_blocked,
-            card_extended,
-            card_hash);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 2016);
-
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(
-            (card_valid_to_date) * 24 * 60 + card_valid_for_minutes - card_start_trip_neg_minutes,
-            &card_start_trip_minutes_s,
-            2016); //-time
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nTrip from: %02d.%02d.%04d %02d:%02d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_validator);
-        break;
-    }
-    case 0x1C3: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        card_layout2 = bit_lib_get_bits(block->data, 56, 5); //112
-        card_use_before_date = bit_lib_get_bits_16(block->data, 61, 16); //202
-        card_blank_type = bit_lib_get_bits_16(block->data, 77, 10); //121
-        card_remaining_funds = bit_lib_get_bits_32(block->data, 188, 22) / 100; //322
-        card_hash = bit_lib_get_bits_32(block->data, 224, 32); //502
-        card_validator = bit_lib_get_bits_16(block->data, 128, 16); //422
-        card_start_trip_minutes = bit_lib_get_bits_32(block->data, 144, 23); //405
-        uint8_t card_fare_trip = bit_lib_get_bits(block->data, 210, 2); //441
-        card_minutes_pass = bit_lib_get_bits(block->data, 171, 7); //412
-        uint8_t card_transport_type_flag = bit_lib_get_bits(block->data, 178, 2); //421.0
-        uint8_t card_transport_type1 = bit_lib_get_bits(block->data, 180, 2); //421.1
-        uint8_t card_transport_type2 = bit_lib_get_bits(block->data, 182, 2); //421.2
-        uint8_t card_transport_type3 = bit_lib_get_bits(block->data, 184, 2); //421.3
-        uint8_t card_transport_type4 = bit_lib_get_bits(block->data, 186, 2); //421.4
-        card_blocked = bit_lib_get_bits(block->data, 212, 1); //303
-        FURI_LOG_D(
-            TAG,
-            "Card view: %x, type: %x, number: %lx, layout: %x, layout2: %x, use before date: %x, blank type: %x, remaining funds: %lx, hash: %lx, validator: %x, start trip minutes: %lx, fare trip: %x, minutes pass: %x, transport type flag: %x, transport type1: %x, transport type2: %x, transport type3: %x, transport type4: %x, blocked: %x",
-            card_view,
-            card_type,
-            card_number,
-            card_layout,
-            card_layout2,
-            card_use_before_date,
-            card_blank_type,
-            card_remaining_funds,
-            card_hash,
-            card_validator,
-            card_start_trip_minutes,
-            card_fare_trip,
-            card_minutes_pass,
-            card_transport_type_flag,
-            card_transport_type1,
-            card_transport_type2,
-            card_transport_type3,
-            card_transport_type4,
-            card_blocked);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992);
-
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(card_start_trip_minutes, &card_start_trip_minutes_s, 2016);
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nBalance: %ld rub\nTrip from: %02d.%02d.%04d %02d:%02d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_remaining_funds,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_validator);
-        break;
-    }
-    case 0x1C4: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        card_layout2 = bit_lib_get_bits(block->data, 56, 5); //112
-        uint16_t card_type_of_extended = bit_lib_get_bits_16(block->data, 61, 10); //122
-        card_use_before_date = bit_lib_get_bits_16(block->data, 71, 13); //202.
-        card_blank_type = bit_lib_get_bits_16(block->data, 84, 10); //121.
-        uint16_t card_valid_to_date = bit_lib_get_bits_16(block->data, 94, 13); //311
-        uint16_t card_activate_during = bit_lib_get_bits_16(block->data, 107, 9); //302
-        uint16_t card_extension_counter = bit_lib_get_bits_16(block->data, 116, 10); //304
-        uint32_t card_valid_for_minutes = bit_lib_get_bits_32(block->data, 128, 20); //314
-        card_minutes_pass = bit_lib_get_bits(block->data, 158, 7); //412.
-        uint8_t card_transport_type_flag = bit_lib_get_bits(block->data, 178, 2); //421.0
-        uint8_t card_transport_type1 = bit_lib_get_bits(block->data, 180, 2); //421.1
-        uint8_t card_transport_type2 = bit_lib_get_bits(block->data, 182, 2); //421.2
-        uint8_t card_transport_type3 = bit_lib_get_bits(block->data, 184, 2); //421.3
-        uint8_t card_transport_type4 = bit_lib_get_bits(block->data, 186, 2); //421.4
-        uint16_t card_remaining_trips = bit_lib_get_bits_16(block->data, 169, 10); //321
-        card_validator = bit_lib_get_bits_16(block->data, 179, 16); //422
-        uint32_t card_start_trip_neg_minutes = bit_lib_get_bits_32(block->data, 195, 20); //404
-        uint8_t card_requires_activation = bit_lib_get_bits(block->data, 215, 1); //301
-        card_blocked = bit_lib_get_bits(block->data, 216, 1); //303
-        uint8_t card_extended = bit_lib_get_bits(block->data, 217, 1); //123
-        card_hash = bit_lib_get_bits_32(block->data, 224, 32); //502
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %x %x %x %x %x %x %lx %x %x %x %x %x %x %x %x %lx %x %x %x %lx",
-            card_view,
-            card_type,
-            card_number,
-            card_layout,
-            card_layout2,
-            card_type_of_extended,
-            card_use_before_date,
-            card_blank_type,
-            card_valid_to_date,
-            card_activate_during,
-            card_extension_counter,
-            card_valid_for_minutes,
-            card_minutes_pass,
-            card_transport_type_flag,
-            card_transport_type1,
-            card_transport_type2,
-            card_transport_type3,
-            card_transport_type4,
-            card_remaining_trips,
-            card_validator,
-            card_start_trip_neg_minutes,
-            card_requires_activation,
-            card_blocked,
-            card_extended,
-            card_hash);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 2016);
-
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(
-            (card_use_before_date + 1) * 24 * 60 + card_valid_for_minutes -
-                card_start_trip_neg_minutes,
-            &card_start_trip_minutes_s,
-            2011); //-time
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nTrip from: %02d.%02d.%04d %02d:%02d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_validator);
-        break;
-    }
-    case 0x1C5: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        card_layout2 = bit_lib_get_bits(block->data, 56, 5); //112
-        card_use_before_date = bit_lib_get_bits_16(block->data, 61, 13); //202.
-        card_blank_type = bit_lib_get_bits_16(block->data, 74, 10); //121.
-        uint32_t card_valid_to_time = bit_lib_get_bits_32(block->data, 84, 23); //317
-        uint16_t card_extension_counter = bit_lib_get_bits_16(block->data, 107, 10); //304
-        card_start_trip_minutes = bit_lib_get_bits_32(block->data, 128, 23); //405
-        uint8_t card_metro_ride_with = bit_lib_get_bits(block->data, 151, 7); //414
-        card_minutes_pass = bit_lib_get_bits(block->data, 158, 7); //412.
-        card_remaining_funds = bit_lib_get_bits_32(block->data, 167, 19) / 100; //322
-        card_validator = bit_lib_get_bits_16(block->data, 186, 16); //422
-        card_blocked = bit_lib_get_bits(block->data, 202, 1); //303
-        uint16_t card_route = bit_lib_get_bits_16(block->data, 204, 12); //424
-        uint8_t card_passages_ground_transport = bit_lib_get_bits(block->data, 216, 7); //433
-        card_hash = bit_lib_get_bits_32(block->data, 224, 32); //502
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %x %x %lx %x %lx %x %x %lx %x %x %x %x %lx",
-            card_view,
-            card_type,
-            card_number,
-            card_layout,
-            card_layout2,
-            card_use_before_date,
-            card_blank_type,
-            card_valid_to_time,
-            card_extension_counter,
-            card_start_trip_minutes,
-            card_metro_ride_with,
-            card_minutes_pass,
-            card_remaining_funds,
-            card_validator,
-            card_blocked,
-            card_route,
-            card_passages_ground_transport,
-            card_hash);
-        DateTime card_use_before_date_s = {0};
-
-        from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 2019);
-
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(card_start_trip_minutes, &card_start_trip_minutes_s, 2019);
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nBalance: %ld rub\nTrip from: %02d.%02d.%04d %02d:%02d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_remaining_funds,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_validator);
-        break;
-    }
-    case 0x1C6: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        card_layout2 = bit_lib_get_bits(block->data, 56, 5); //112
-        uint16_t card_type_of_extended = bit_lib_get_bits_16(block->data, 61, 10); //122
-        card_use_before_date = bit_lib_get_bits_16(block->data, 71, 13); //202.
-        card_blank_type = bit_lib_get_bits_16(block->data, 84, 10); //121.
-        uint32_t card_valid_from_date = bit_lib_get_bits_32(block->data, 94, 23); //311
-        uint16_t card_extension_counter = bit_lib_get_bits_16(block->data, 117, 10); //304
-        uint32_t card_valid_for_minutes = bit_lib_get_bits_32(block->data, 128, 20); //314
-        uint32_t card_start_trip_neg_minutes = bit_lib_get_bits_32(block->data, 148, 20); //404
-        uint8_t card_metro_ride_with = bit_lib_get_bits(block->data, 168, 7); //414
-        card_minutes_pass = bit_lib_get_bits(block->data, 175, 7); //412.
-        uint16_t card_remaining_trips = bit_lib_get_bits_16(block->data, 182, 7); //321
-        card_validator = bit_lib_get_bits_16(block->data, 189, 16); //422
-        card_blocked = bit_lib_get_bits(block->data, 205, 1); //303
-        uint8_t card_extended = bit_lib_get_bits(block->data, 206, 1); //123
-        uint16_t card_route = bit_lib_get_bits_16(block->data, 212, 12); //424
-        card_hash = bit_lib_get_bits_32(block->data, 224, 32); //502
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %x %x %x %lx %x %lx %lx %x %x %x %x %x %x %x %lx",
-            card_view,
-            card_type,
-            card_number,
-            card_layout,
-            card_layout2,
-            card_type_of_extended,
-            card_use_before_date,
-            card_blank_type,
-            card_valid_from_date,
-            card_extension_counter,
-            card_valid_for_minutes,
-            card_start_trip_neg_minutes,
-            card_metro_ride_with,
-            card_minutes_pass,
-            card_remaining_trips,
-            card_validator,
-            card_blocked,
-            card_extended,
-            card_route,
-            card_hash);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 2019);
-
-        DateTime card_start_trip_minutes_s = {0};
-        from_minutes_to_datetime(
-            card_valid_from_date + card_valid_for_minutes - card_start_trip_neg_minutes,
-            &card_start_trip_minutes_s,
-            2019); //-time
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nTrip from: %02d.%02d.%04d %02d:%02d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_start_trip_minutes_s.day,
-            card_start_trip_minutes_s.month,
-            card_start_trip_minutes_s.year,
-            card_start_trip_minutes_s.hour,
-            card_start_trip_minutes_s.minute,
-            card_validator);
-        break;
-    }
-    case 0x3CCB: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        uint16_t card_tech_code = bit_lib_get_bits_32(block->data, 56, 10); //tech_code
-        uint16_t card_valid_to_minutes = bit_lib_get_bits_16(block->data, 66, 16); //311
-        uint16_t card_valid_by_date = bit_lib_get_bits_16(block->data, 82, 16); //312
-        uint8_t card_interval = bit_lib_get_bits(block->data, 98, 4); //interval
-        uint16_t card_app_code1 = bit_lib_get_bits_16(block->data, 102, 16); //app_code1
-        uint16_t card_hash1 = bit_lib_get_bits_16(block->data, 112, 16); //502.1
-        uint16_t card_type1 = bit_lib_get_bits_16(block->data, 128, 10); //type1
-        uint16_t card_app_code2 = bit_lib_get_bits_16(block->data, 138, 10); //app_code2
-        uint16_t card_type2 = bit_lib_get_bits_16(block->data, 148, 10); //type2
-        uint16_t card_app_code3 = bit_lib_get_bits_16(block->data, 158, 10); //app_code3
-        uint16_t card_type3 = bit_lib_get_bits_16(block->data, 148, 10); //type3
-        uint16_t card_app_code4 = bit_lib_get_bits_16(block->data, 168, 10); //app_code4
-        uint16_t card_type4 = bit_lib_get_bits_16(block->data, 178, 10); //type4
-        card_hash = bit_lib_get_bits_32(block->data, 224, 32); //502.2
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %lx",
-            card_view,
-            card_type,
-            card_number,
-            card_layout,
-            card_tech_code,
-            card_use_before_date,
-            card_blank_type,
-            card_valid_to_minutes,
-            card_valid_by_date,
-            card_interval,
-            card_app_code1,
-            card_hash1,
-            card_type1,
-            card_app_code2,
-            card_type2,
-            card_app_code3,
-            card_type3,
-            card_app_code4,
-            card_type4,
-            card_hash);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_valid_by_date, &card_use_before_date_s, 1992);
-
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_validator);
-        break;
-    }
-    case 0x3C0B: {
-        card_view = bit_lib_get_bits_16(block->data, 0, 10); //101
-        card_type = bit_lib_get_bits_16(block->data, 10, 10); //102
-        card_number = bit_lib_get_bits_32(block->data, 20, 32); //201
-        card_layout = bit_lib_get_bits(block->data, 52, 4); //111
-        uint16_t card_tech_code = bit_lib_get_bits_32(block->data, 56, 10); //tech_code
-        uint16_t card_valid_to_minutes = bit_lib_get_bits_16(block->data, 66, 16); //311
-        uint16_t card_valid_by_date = bit_lib_get_bits_16(block->data, 82, 16); //312
-        uint16_t card_hash = bit_lib_get_bits_16(block->data, 112, 16); //502.1
-
-        FURI_LOG_D(
-            TAG,
-            "%x %x %lx %x %x %x %x %x %x %x",
-            card_view,
-            card_type,
-            card_number,
-            card_layout,
-            card_tech_code,
-            card_use_before_date,
-            card_blank_type,
-            card_valid_to_minutes,
-            card_valid_by_date,
-            card_hash);
-        DateTime card_use_before_date_s = {0};
-        from_days_to_datetime(card_valid_by_date, &card_use_before_date_s, 1992);
-
-        furi_string_printf(
-            result,
-            "Number: %010lu\nValid for: %02d.%02d.%04d\nValidator: %05d",
-            card_number,
-            card_use_before_date_s.day,
-            card_use_before_date_s.month,
-            card_use_before_date_s.year,
-            card_validator);
-        break;
-    }
-    default:
-        return false;
-    }
-
-    return true;
-}
-
 static bool troika_get_card_config(TroikaCardConfig* config, MfClassicType type) {
     bool success = true;
 
@@ -1044,7 +90,7 @@ static bool troika_get_card_config(TroikaCardConfig* config, MfClassicType type)
         config->data_sector = 11;
         config->keys = troika_1k_keys;
     } else if(type == MfClassicType4k) {
-        config->data_sector = 11;
+        config->data_sector = 8; // Further testing needed
         config->keys = troika_4k_keys;
     } else {
         success = false;
@@ -1152,24 +198,30 @@ static bool troika_parse(const NfcDevice* device, FuriString* parsed_data) {
         FuriString* metro_result = furi_string_alloc();
         FuriString* ground_result = furi_string_alloc();
         FuriString* tat_result = furi_string_alloc();
-        bool result1 = parse_transport_block(&data->block[32], metro_result);
-        bool result2 = parse_transport_block(&data->block[28], ground_result);
-        bool result3 = parse_transport_block(&data->block[16], tat_result);
+
+        bool result1 = mosgortrans_parse_transport_block(&data->block[32], metro_result);
+        bool result2 = mosgortrans_parse_transport_block(&data->block[28], ground_result);
+        bool result3 = mosgortrans_parse_transport_block(&data->block[16], tat_result);
+
         furi_string_cat_printf(parsed_data, "\e#Troyka card\n");
         if(result1) {
             furi_string_cat_printf(
                 parsed_data, "\e#Metro\n%s\n", furi_string_get_cstr(metro_result));
         }
+
         if(result2) {
             furi_string_cat_printf(
                 parsed_data, "\e#Ediniy\n%s\n", furi_string_get_cstr(ground_result));
         }
+
         if(result3) {
             furi_string_cat_printf(parsed_data, "\e#TAT\n%s\n", furi_string_get_cstr(tat_result));
         }
+
         furi_string_free(tat_result);
         furi_string_free(ground_result);
         furi_string_free(metro_result);
+
         parsed = result1 || result2 || result3;
     } while(false);
 
@@ -1192,6 +244,6 @@ static const FlipperAppPluginDescriptor troika_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* troika_plugin_ep() {
+const FlipperAppPluginDescriptor* troika_plugin_ep(void) {
     return &troika_plugin_descriptor;
 }
\ No newline at end of file
diff --git a/applications/main/nfc/plugins/supported_cards/two_cities.c b/applications/main/nfc/plugins/supported_cards/two_cities.c
index c957a9c43..2f92030d9 100644
--- a/applications/main/nfc/plugins/supported_cards/two_cities.c
+++ b/applications/main/nfc/plugins/supported_cards/two_cities.c
@@ -157,7 +157,7 @@ static bool two_cities_parse(const NfcDevice* device, FuriString* parsed_data) {
 
         furi_string_printf(
             parsed_data,
-            "\e#Troika+Plantain\nPN: %llu-\nPB: %lu rur.\nTN: %lu\nTB: %u rur.\n",
+            "\e#Troika+Plantain\nPN: %llu?\nPB: %lu rur.\nTN: %lu\nTB: %u rur.\n",
             card_number,
             balance,
             troika_number,
@@ -185,6 +185,6 @@ static const FlipperAppPluginDescriptor two_cities_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* two_cities_plugin_ep() {
+const FlipperAppPluginDescriptor* two_cities_plugin_ep(void) {
     return &two_cities_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/umarsh.c b/applications/main/nfc/plugins/supported_cards/umarsh.c
index 7a84a835c..a6dc5450c 100644
--- a/applications/main/nfc/plugins/supported_cards/umarsh.c
+++ b/applications/main/nfc/plugins/supported_cards/umarsh.c
@@ -151,6 +151,6 @@ static const FlipperAppPluginDescriptor umarsh_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* umarsh_plugin_ep() {
+const FlipperAppPluginDescriptor* umarsh_plugin_ep(void) {
     return &umarsh_plugin_descriptor;
 }
diff --git a/applications/main/nfc/plugins/supported_cards/washcity.c b/applications/main/nfc/plugins/supported_cards/washcity.c
index e4610fb94..fe7abd32d 100644
--- a/applications/main/nfc/plugins/supported_cards/washcity.c
+++ b/applications/main/nfc/plugins/supported_cards/washcity.c
@@ -55,20 +55,20 @@ static bool washcity_verify(Nfc* nfc) {
     bool verified = false;
 
     do {
-        const uint8_t ticket_sector_number = 0;
-        const uint8_t ticket_block_number =
-            mf_classic_get_first_block_num_of_sector(ticket_sector_number) + 1;
-        FURI_LOG_D(TAG, "Verifying sector %u", ticket_sector_number);
+        const uint8_t verify_sector_number = 1;
+        const uint8_t verify_block_number =
+            mf_classic_get_first_block_num_of_sector(verify_sector_number);
+        FURI_LOG_D(TAG, "Verifying sector %u", verify_sector_number);
 
         MfClassicKey key = {0};
         bit_lib_num_to_bytes_be(
-            washcity_1k_keys[ticket_sector_number].a, COUNT_OF(key.data), key.data);
+            washcity_1k_keys[verify_sector_number].a, COUNT_OF(key.data), key.data);
 
         MfClassicAuthContext auth_context;
         MfClassicError error = mf_classic_poller_sync_auth(
-            nfc, ticket_block_number, &key, MfClassicKeyTypeA, &auth_context);
+            nfc, verify_block_number, &key, MfClassicKeyTypeA, &auth_context);
         if(error != MfClassicErrorNone) {
-            FURI_LOG_D(TAG, "Failed to read block %u: %d", ticket_block_number, error);
+            FURI_LOG_D(TAG, "Failed to read block %u: %d", verify_block_number, error);
             break;
         }
 
@@ -190,6 +190,6 @@ static const FlipperAppPluginDescriptor washcity_plugin_descriptor = {
 };
 
 /* Plugin entry point - must return a pointer to const descriptor  */
-const FlipperAppPluginDescriptor* washcity_plugin_ep() {
+const FlipperAppPluginDescriptor* washcity_plugin_ep(void) {
     return &washcity_plugin_descriptor;
 }
\ No newline at end of file
diff --git a/applications/main/nfc/scenes/nfc_scene_config.h b/applications/main/nfc/scenes/nfc_scene_config.h
index 94d845fa3..2457fb156 100644
--- a/applications/main/nfc/scenes/nfc_scene_config.h
+++ b/applications/main/nfc/scenes/nfc_scene_config.h
@@ -33,6 +33,8 @@ ADD_SCENE(nfc, mf_ultralight_unlock_menu, MfUltralightUnlockMenu)
 ADD_SCENE(nfc, mf_ultralight_unlock_warn, MfUltralightUnlockWarn)
 ADD_SCENE(nfc, mf_ultralight_key_input, MfUltralightKeyInput)
 ADD_SCENE(nfc, mf_ultralight_capture_pass, MfUltralightCapturePass)
+ADD_SCENE(nfc, felica_key_input, FelicaKeyInput)
+ADD_SCENE(nfc, felica_unlock_warn, FelicaUnlockWarn)
 
 ADD_SCENE(nfc, mf_desfire_more_info, MfDesfireMoreInfo)
 ADD_SCENE(nfc, mf_desfire_app, MfDesfireApp)
@@ -45,10 +47,11 @@ ADD_SCENE(nfc, mf_classic_mfkey_nonces_info, MfClassicMfkeyNoncesInfo)
 ADD_SCENE(nfc, mf_classic_mfkey_complete, MfClassicMfkeyComplete)
 ADD_SCENE(nfc, mf_classic_update_initial, MfClassicUpdateInitial)
 ADD_SCENE(nfc, mf_classic_update_initial_success, MfClassicUpdateInitialSuccess)
+ADD_SCENE(nfc, mf_classic_update_initial_wrong_card, MfClassicUpdateInitialWrongCard)
 ADD_SCENE(nfc, mf_classic_write_initial, MfClassicWriteInitial)
 ADD_SCENE(nfc, mf_classic_write_initial_success, MfClassicWriteInitialSuccess)
 ADD_SCENE(nfc, mf_classic_write_initial_fail, MfClassicWriteInitialFail)
-ADD_SCENE(nfc, mf_classic_wrong_card, MfClassicWrongCard)
+ADD_SCENE(nfc, mf_classic_write_initial_wrong_card, MfClassicWriteInitialWrongCard)
 
 ADD_SCENE(nfc, mf_classic_keys, MfClassicKeys)
 ADD_SCENE(nfc, mf_classic_keys_list, MfClassicKeysList)
diff --git a/applications/main/nfc/scenes/nfc_scene_detect.c b/applications/main/nfc/scenes/nfc_scene_detect.c
index 34c552aba..3ef153657 100644
--- a/applications/main/nfc/scenes/nfc_scene_detect.c
+++ b/applications/main/nfc/scenes/nfc_scene_detect.c
@@ -19,7 +19,7 @@ void nfc_scene_detect_on_enter(void* context) {
     popup_reset(instance->popup);
     popup_set_header(instance->popup, "Reading", 97, 15, AlignCenter, AlignTop);
     popup_set_text(
-        instance->popup, "Apply card to\nFlipper's back", 97, 27, AlignCenter, AlignTop);
+        instance->popup, "Hold card next\nto Flipper's back", 94, 27, AlignCenter, AlignTop);
     popup_set_icon(instance->popup, 0, 8, &I_NFC_manual_60x50);
     view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewPopup);
 
diff --git a/applications/main/nfc/scenes/nfc_scene_felica_key_input.c b/applications/main/nfc/scenes/nfc_scene_felica_key_input.c
new file mode 100644
index 000000000..b04f12dae
--- /dev/null
+++ b/applications/main/nfc/scenes/nfc_scene_felica_key_input.c
@@ -0,0 +1,46 @@
+#include "../nfc_app_i.h"
+
+void nfc_scene_felica_key_input_byte_input_callback(void* context) {
+    NfcApp* nfc = context;
+
+    view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventByteInputDone);
+}
+
+void nfc_scene_felica_key_input_on_enter(void* context) {
+    NfcApp* nfc = context;
+
+    // Setup view
+    ByteInput* byte_input = nfc->byte_input;
+    byte_input_set_header_text(byte_input, "Enter key in hex");
+    byte_input_set_result_callback(
+        byte_input,
+        nfc_scene_felica_key_input_byte_input_callback,
+        NULL,
+        nfc,
+        nfc->felica_auth->card_key.data,
+        FELICA_DATA_BLOCK_SIZE);
+    view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewByteInput);
+}
+
+bool nfc_scene_felica_key_input_on_event(void* context, SceneManagerEvent event) {
+    NfcApp* nfc = context;
+    UNUSED(event);
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == NfcCustomEventByteInputDone) {
+            nfc->felica_auth->skip_auth = false;
+            scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaUnlockWarn);
+            consumed = true;
+        }
+    }
+    return consumed;
+}
+
+void nfc_scene_felica_key_input_on_exit(void* context) {
+    NfcApp* nfc = context;
+
+    // Clear view
+    byte_input_set_result_callback(nfc->byte_input, NULL, NULL, NULL, NULL, 0);
+    byte_input_set_header_text(nfc->byte_input, "");
+}
diff --git a/applications/main/nfc/scenes/nfc_scene_felica_unlock_warn.c b/applications/main/nfc/scenes/nfc_scene_felica_unlock_warn.c
new file mode 100644
index 000000000..15b61dfa5
--- /dev/null
+++ b/applications/main/nfc/scenes/nfc_scene_felica_unlock_warn.c
@@ -0,0 +1,59 @@
+#include "../nfc_app_i.h"
+
+void nfc_scene_felica_unlock_warn_dialog_callback(DialogExResult result, void* context) {
+    NfcApp* nfc = context;
+
+    view_dispatcher_send_custom_event(nfc->view_dispatcher, result);
+}
+
+void nfc_scene_felica_unlock_warn_on_enter(void* context) {
+    NfcApp* nfc = context;
+
+    const char* message = "Risky Action!";
+    DialogEx* dialog_ex = nfc->dialog_ex;
+    dialog_ex_set_context(dialog_ex, nfc);
+    dialog_ex_set_result_callback(dialog_ex, nfc_scene_felica_unlock_warn_dialog_callback);
+
+    dialog_ex_set_header(dialog_ex, message, 64, 0, AlignCenter, AlignTop);
+
+    FuriString* str = furi_string_alloc();
+    furi_string_cat_printf(str, "Unlock with key: ");
+    for(uint8_t i = 0; i < FELICA_DATA_BLOCK_SIZE; i++)
+        furi_string_cat_printf(str, "%02X ", nfc->felica_auth->card_key.data[i]);
+    furi_string_cat_printf(str, "?");
+
+    nfc_text_store_set(nfc, furi_string_get_cstr(str));
+    furi_string_free(str);
+
+    dialog_ex_set_text(dialog_ex, nfc->text_store, 0, 12, AlignLeft, AlignTop);
+
+    dialog_ex_set_left_button_text(dialog_ex, "Cancel");
+    dialog_ex_set_right_button_text(dialog_ex, "Unlock");
+
+    view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewDialogEx);
+}
+
+bool nfc_scene_felica_unlock_warn_on_event(void* context, SceneManagerEvent event) {
+    NfcApp* nfc = context;
+    UNUSED(event);
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == DialogExResultRight) {
+            nfc->felica_auth->skip_auth = false;
+            scene_manager_next_scene(nfc->scene_manager, NfcSceneRead);
+            consumed = true;
+        } else if(event.event == DialogExResultLeft) {
+            scene_manager_previous_scene(nfc->scene_manager);
+            consumed = true;
+        }
+    }
+    return consumed;
+}
+
+void nfc_scene_felica_unlock_warn_on_exit(void* context) {
+    NfcApp* nfc = context;
+
+    dialog_ex_reset(nfc->dialog_ex);
+    nfc_text_store_clear(nfc);
+}
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_keys_warn_duplicate.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_keys_warn_duplicate.c
index c3fb92bee..675463ec9 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_keys_warn_duplicate.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_keys_warn_duplicate.c
@@ -12,7 +12,7 @@ void nfc_scene_mf_classic_keys_warn_duplicate_on_enter(void* context) {
     // Setup view
     Popup* popup = instance->popup;
     popup_set_icon(popup, 83, 22, &I_WarningDolphinFlip_45x42);
-    popup_set_header(popup, "Key already exists!", 64, 3, AlignCenter, AlignTop);
+    popup_set_header(popup, "Key Already Exists!", 64, 3, AlignCenter, AlignTop);
     popup_set_text(
         popup,
         "Please enter a\n"
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_mfkey_complete.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_mfkey_complete.c
index eb0aa7c3a..d5033789a 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_mfkey_complete.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_mfkey_complete.c
@@ -14,7 +14,7 @@ void nfc_scene_mf_classic_mfkey_complete_on_enter(void* context) {
     NfcApp* instance = context;
 
     widget_add_string_element(
-        instance->widget, 64, 0, AlignCenter, AlignTop, FontPrimary, "Complete!");
+        instance->widget, 64, 0, AlignCenter, AlignTop, FontPrimary, "Completed!");
     widget_add_string_multiline_element(
         instance->widget,
         64,
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c
index 961afdf53..7c76260b4 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c
@@ -61,7 +61,7 @@ static void nfc_scene_mf_classic_update_initial_setup_view(NfcApp* instance) {
 
     if(state == NfcSceneMfClassicUpdateInitialStateCardSearch) {
         popup_set_text(
-            instance->popup, "Apply the initial\ncard only", 128, 32, AlignRight, AlignCenter);
+            instance->popup, "Use the source\ncard only", 128, 32, AlignRight, AlignCenter);
         popup_set_icon(instance->popup, 0, 8, &I_NFC_manual_60x50);
     } else {
         popup_set_header(popup, "Updating\nDon't move...", 52, 32, AlignLeft, AlignCenter);
@@ -111,14 +111,16 @@ bool nfc_scene_mf_classic_update_initial_on_event(void* context, SceneManagerEve
             nfc_scene_mf_classic_update_initial_setup_view(instance);
             consumed = true;
         } else if(event.event == NfcCustomEventWrongCard) {
-            scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicWrongCard);
+            scene_manager_next_scene(
+                instance->scene_manager, NfcSceneMfClassicUpdateInitialWrongCard);
             consumed = true;
         } else if(event.event == NfcCustomEventWorkerExit) {
             if(nfc_save_shadow_file(instance)) {
                 scene_manager_next_scene(
                     instance->scene_manager, NfcSceneMfClassicUpdateInitialSuccess);
             } else {
-                scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicWrongCard);
+                scene_manager_next_scene(
+                    instance->scene_manager, NfcSceneMfClassicUpdateInitialWrongCard);
                 consumed = true;
             }
         }
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial_wrong_card.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial_wrong_card.c
new file mode 100644
index 000000000..c2c36c74f
--- /dev/null
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial_wrong_card.c
@@ -0,0 +1,58 @@
+#include "../nfc_app_i.h"
+
+void nfc_scene_mf_classic_update_initial_wrong_card_widget_callback(
+    GuiButtonType result,
+    InputType type,
+    void* context) {
+    NfcApp* instance = context;
+    if(type == InputTypeShort) {
+        view_dispatcher_send_custom_event(instance->view_dispatcher, result);
+    }
+}
+
+void nfc_scene_mf_classic_update_initial_wrong_card_on_enter(void* context) {
+    NfcApp* instance = context;
+    Widget* widget = instance->widget;
+
+    notification_message(instance->notifications, &sequence_error);
+
+    widget_add_icon_element(widget, 83, 22, &I_WarningDolphinFlip_45x42);
+    widget_add_string_element(widget, 3, 4, AlignLeft, AlignTop, FontPrimary, "Wrong Card!");
+    widget_add_string_multiline_element(
+        widget,
+        4,
+        17,
+        AlignLeft,
+        AlignTop,
+        FontSecondary,
+        "Data management\nis only possible\nwith source card");
+    widget_add_button_element(
+        widget,
+        GuiButtonTypeLeft,
+        "Retry",
+        nfc_scene_mf_classic_update_initial_wrong_card_widget_callback,
+        instance);
+
+    // Setup and start worker
+    view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewWidget);
+}
+
+bool nfc_scene_mf_classic_update_initial_wrong_card_on_event(
+    void* context,
+    SceneManagerEvent event) {
+    NfcApp* instance = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == GuiButtonTypeLeft) {
+            consumed = scene_manager_previous_scene(instance->scene_manager);
+        }
+    }
+    return consumed;
+}
+
+void nfc_scene_mf_classic_update_initial_wrong_card_on_exit(void* context) {
+    NfcApp* instance = context;
+
+    widget_reset(instance->widget);
+}
\ No newline at end of file
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_write_initial.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_write_initial.c
index da576a276..12e7ba1ec 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_write_initial.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_write_initial.c
@@ -67,7 +67,7 @@ static void nfc_scene_mf_classic_write_initial_setup_view(NfcApp* instance) {
     if(state == NfcSceneMfClassicWriteInitialStateCardSearch) {
         popup_set_header(instance->popup, "Writing", 95, 20, AlignCenter, AlignCenter);
         popup_set_text(
-            instance->popup, "Apply the initial\ncard only", 95, 38, AlignCenter, AlignCenter);
+            instance->popup, "Use the source\ncard only", 95, 38, AlignCenter, AlignCenter);
         popup_set_icon(instance->popup, 0, 8, &I_NFC_manual_60x50);
     } else {
         popup_set_header(popup, "Writing\nDon't move...", 52, 32, AlignLeft, AlignCenter);
@@ -115,7 +115,8 @@ bool nfc_scene_mf_classic_write_initial_on_event(void* context, SceneManagerEven
             nfc_scene_mf_classic_write_initial_setup_view(instance);
             consumed = true;
         } else if(event.event == NfcCustomEventWrongCard) {
-            scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicWrongCard);
+            scene_manager_next_scene(
+                instance->scene_manager, NfcSceneMfClassicWriteInitialWrongCard);
             consumed = true;
         } else if(event.event == NfcCustomEventPollerSuccess) {
             scene_manager_next_scene(
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_wrong_card.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_write_initial_wrong_card.c
similarity index 69%
rename from applications/main/nfc/scenes/nfc_scene_mf_classic_wrong_card.c
rename to applications/main/nfc/scenes/nfc_scene_mf_classic_write_initial_wrong_card.c
index a879985bc..3f92ebfd3 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_wrong_card.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_write_initial_wrong_card.c
@@ -1,6 +1,6 @@
 #include "../nfc_app_i.h"
 
-void nfc_scene_mf_classic_wrong_card_widget_callback(
+void nfc_scene_mf_classic_write_initial_wrong_card_widget_callback(
     GuiButtonType result,
     InputType type,
     void* context) {
@@ -10,7 +10,7 @@ void nfc_scene_mf_classic_wrong_card_widget_callback(
     }
 }
 
-void nfc_scene_mf_classic_wrong_card_on_enter(void* context) {
+void nfc_scene_mf_classic_write_initial_wrong_card_on_enter(void* context) {
     NfcApp* instance = context;
     Widget* widget = instance->widget;
 
@@ -18,7 +18,7 @@ void nfc_scene_mf_classic_wrong_card_on_enter(void* context) {
 
     widget_add_icon_element(widget, 83, 22, &I_WarningDolphinFlip_45x42);
     widget_add_string_element(
-        widget, 3, 4, AlignLeft, AlignTop, FontPrimary, "This is wrong card");
+        widget, 3, 4, AlignLeft, AlignTop, FontPrimary, "Use The Source Card!");
     widget_add_string_multiline_element(
         widget,
         4,
@@ -26,19 +26,19 @@ void nfc_scene_mf_classic_wrong_card_on_enter(void* context) {
         AlignLeft,
         AlignTop,
         FontSecondary,
-        "Data management\nis only possible\nwith initial card");
+        "Go to NFC Magic\napp if you want to\nwrite blanks");
     widget_add_button_element(
         widget,
         GuiButtonTypeLeft,
         "Retry",
-        nfc_scene_mf_classic_wrong_card_widget_callback,
+        nfc_scene_mf_classic_write_initial_wrong_card_widget_callback,
         instance);
 
     // Setup and start worker
     view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewWidget);
 }
 
-bool nfc_scene_mf_classic_wrong_card_on_event(void* context, SceneManagerEvent event) {
+bool nfc_scene_mf_classic_write_initial_wrong_card_on_event(void* context, SceneManagerEvent event) {
     NfcApp* instance = context;
     bool consumed = false;
 
@@ -50,7 +50,7 @@ bool nfc_scene_mf_classic_wrong_card_on_event(void* context, SceneManagerEvent e
     return consumed;
 }
 
-void nfc_scene_mf_classic_wrong_card_on_exit(void* context) {
+void nfc_scene_mf_classic_write_initial_wrong_card_on_exit(void* context) {
     NfcApp* instance = context;
 
     widget_reset(instance->widget);
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_menu.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_menu.c
index 4d97040ee..a23e4b306 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_menu.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_menu.c
@@ -20,12 +20,17 @@ void nfc_scene_mf_ultralight_unlock_menu_on_enter(void* context) {
     uint32_t state =
         scene_manager_get_scene_state(nfc->scene_manager, NfcSceneMfUltralightUnlockMenu);
     if(nfc_device_get_protocol(nfc->nfc_device) == NfcProtocolMfUltralight) {
-        submenu_add_item(
-            submenu,
-            "Unlock With Reader",
-            SubmenuIndexMfUlUnlockMenuReader,
-            nfc_scene_mf_ultralight_unlock_menu_submenu_callback,
-            nfc);
+        const MfUltralightData* mfu_data =
+            nfc_device_get_data(nfc->nfc_device, NfcProtocolMfUltralight);
+        // Hide for MFU-C since it uses 3DES
+        if(mfu_data->type != MfUltralightTypeMfulC) {
+            submenu_add_item(
+                submenu,
+                "Unlock With Reader",
+                SubmenuIndexMfUlUnlockMenuReader,
+                nfc_scene_mf_ultralight_unlock_menu_submenu_callback,
+                nfc);
+        }
     }
     submenu_add_item(
         submenu,
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_warn.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_warn.c
index db5fd945f..4df8a6289 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_warn.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_warn.c
@@ -22,14 +22,14 @@ void nfc_scene_mf_ultralight_unlock_warn_on_enter(void* context) {
         for(size_t i = 0; i < sizeof(nfc->mf_ul_auth->password.data); i++) {
             furi_string_cat_printf(password_str, "%02X ", nfc->mf_ul_auth->password.data[i]);
         }
-        furi_string_cat_str(password_str, "?\nCaution, a wrong password\ncan block the card!");
+        furi_string_cat_str(password_str, "\nWarning: incorrect password\nwill block the card!");
         nfc_text_store_set(nfc, furi_string_get_cstr(password_str));
         furi_string_free(password_str);
 
-        const char* message = (type == MfUltralightAuthTypeReader) ? "Password captured!" :
-                                                                     "Risky function!";
+        const char* message = (type == MfUltralightAuthTypeReader) ? "Password Captured!" :
+                                                                     "Risky Action!";
         dialog_ex_set_header(dialog_ex, message, 64, 0, AlignCenter, AlignTop);
-        dialog_ex_set_text(dialog_ex, nfc->text_store, 64, 12, AlignCenter, AlignTop);
+        dialog_ex_set_text(dialog_ex, nfc->text_store, 64, 10, AlignCenter, AlignTop);
         dialog_ex_set_left_button_text(dialog_ex, "Cancel");
         dialog_ex_set_right_button_text(dialog_ex, "Continue");
 
@@ -37,7 +37,7 @@ void nfc_scene_mf_ultralight_unlock_warn_on_enter(void* context) {
             notification_message(nfc->notifications, &sequence_set_green_255);
         }
     } else {
-        dialog_ex_set_header(dialog_ex, "Risky function!", 64, 4, AlignCenter, AlignTop);
+        dialog_ex_set_header(dialog_ex, "Risky action!", 64, 4, AlignCenter, AlignTop);
         dialog_ex_set_text(
             dialog_ex, "Wrong password\ncan block your\ncard.", 4, 18, AlignLeft, AlignTop);
         dialog_ex_set_icon(dialog_ex, 83, 22, &I_WarningDolphinFlip_45x42);
diff --git a/applications/main/nfc/scenes/nfc_scene_select_protocol.c b/applications/main/nfc/scenes/nfc_scene_select_protocol.c
index 52b2664ec..af644035e 100644
--- a/applications/main/nfc/scenes/nfc_scene_select_protocol.c
+++ b/applications/main/nfc/scenes/nfc_scene_select_protocol.c
@@ -57,6 +57,11 @@ bool nfc_scene_select_protocol_on_event(void* context, SceneManagerEvent event)
         scene_manager_set_scene_state(
             instance->scene_manager, NfcSceneSelectProtocol, event.event);
         consumed = true;
+    } else if(event.type == SceneManagerEventTypeBack) {
+        if(scene_manager_has_previous_scene(instance->scene_manager, NfcSceneDetect)) {
+            consumed = scene_manager_search_and_switch_to_previous_scene(
+                instance->scene_manager, NfcSceneStart);
+        }
     }
     return consumed;
 }
diff --git a/applications/main/nfc/scenes/nfc_scene_slix_unlock.c b/applications/main/nfc/scenes/nfc_scene_slix_unlock.c
index b01876e06..ae725ce67 100644
--- a/applications/main/nfc/scenes/nfc_scene_slix_unlock.c
+++ b/applications/main/nfc/scenes/nfc_scene_slix_unlock.c
@@ -32,7 +32,7 @@ void nfc_scene_slix_unlock_on_enter(void* context) {
     popup_set_icon(instance->popup, 0, 8, &I_NFC_manual_60x50);
     popup_set_header(instance->popup, "Unlocking", 97, 15, AlignCenter, AlignTop);
     popup_set_text(
-        instance->popup, "Apply card to\nFlipper's back", 97, 27, AlignCenter, AlignTop);
+        instance->popup, "Hold card next\nto Flipper's back", 94, 27, AlignCenter, AlignTop);
     view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewPopup);
 
     instance->poller = nfc_poller_alloc(instance->nfc, NfcProtocolSlix);
diff --git a/applications/main/nfc/views/detect_reader.c b/applications/main/nfc/views/detect_reader.c
index 4d7b324e0..132416d9a 100644
--- a/applications/main/nfc/views/detect_reader.c
+++ b/applications/main/nfc/views/detect_reader.c
@@ -86,7 +86,7 @@ static bool detect_reader_input_callback(InputEvent* event, void* context) {
     return consumed;
 }
 
-DetectReader* detect_reader_alloc() {
+DetectReader* detect_reader_alloc(void) {
     DetectReader* detect_reader = malloc(sizeof(DetectReader));
     detect_reader->view = view_alloc();
     view_allocate_model(detect_reader->view, ViewModelTypeLocking, sizeof(DetectReaderViewModel));
diff --git a/applications/main/nfc/views/detect_reader.h b/applications/main/nfc/views/detect_reader.h
index 6481216b4..eda3d4ca3 100644
--- a/applications/main/nfc/views/detect_reader.h
+++ b/applications/main/nfc/views/detect_reader.h
@@ -14,7 +14,7 @@ typedef enum {
 
 typedef void (*DetectReaderDoneCallback)(void* context);
 
-DetectReader* detect_reader_alloc();
+DetectReader* detect_reader_alloc(void);
 
 void detect_reader_free(DetectReader* detect_reader);
 
diff --git a/applications/main/nfc/views/dict_attack.c b/applications/main/nfc/views/dict_attack.c
index ce8679088..14298a6aa 100644
--- a/applications/main/nfc/views/dict_attack.c
+++ b/applications/main/nfc/views/dict_attack.c
@@ -92,7 +92,7 @@ static bool dict_attack_input_callback(InputEvent* event, void* context) {
     return consumed;
 }
 
-DictAttack* dict_attack_alloc() {
+DictAttack* dict_attack_alloc(void) {
     DictAttack* instance = malloc(sizeof(DictAttack));
     instance->view = view_alloc();
     view_allocate_model(instance->view, ViewModelTypeLocking, sizeof(DictAttackViewModel));
diff --git a/applications/main/nfc/views/dict_attack.h b/applications/main/nfc/views/dict_attack.h
index 54a0220fe..30f3b3c44 100644
--- a/applications/main/nfc/views/dict_attack.h
+++ b/applications/main/nfc/views/dict_attack.h
@@ -15,7 +15,7 @@ typedef enum {
 
 typedef void (*DictAttackCallback)(DictAttackEvent event, void* context);
 
-DictAttack* dict_attack_alloc();
+DictAttack* dict_attack_alloc(void);
 
 void dict_attack_free(DictAttack* instance);
 
diff --git a/applications/main/onewire/onewire_cli.c b/applications/main/onewire/onewire_cli.c
index 5f6cdc670..19e584217 100644
--- a/applications/main/onewire/onewire_cli.c
+++ b/applications/main/onewire/onewire_cli.c
@@ -8,7 +8,7 @@
 
 static void onewire_cli(Cli* cli, FuriString* args, void* context);
 
-void onewire_on_system_start() {
+void onewire_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
     cli_add_command(cli, "onewire", CliCommandFlagDefault, onewire_cli, cli);
@@ -18,7 +18,7 @@ void onewire_on_system_start() {
 #endif
 }
 
-static void onewire_cli_print_usage() {
+static void onewire_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("onewire search\r\n");
 };
diff --git a/applications/main/subghz/helpers/subghz_txrx.c b/applications/main/subghz/helpers/subghz_txrx.c
index e173eab3c..bf63491c3 100644
--- a/applications/main/subghz/helpers/subghz_txrx.c
+++ b/applications/main/subghz/helpers/subghz_txrx.c
@@ -22,7 +22,7 @@ static void subghz_txrx_radio_device_power_off(SubGhzTxRx* instance) {
     if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
 }
 
-SubGhzTxRx* subghz_txrx_alloc() {
+SubGhzTxRx* subghz_txrx_alloc(void) {
     SubGhzTxRx* instance = malloc(sizeof(SubGhzTxRx));
     instance->setting = subghz_setting_alloc();
     subghz_setting_load(instance->setting, EXT_PATH("subghz/assets/setting_user"));
diff --git a/applications/main/subghz/helpers/subghz_txrx.h b/applications/main/subghz/helpers/subghz_txrx.h
index a0f9f3055..a380e4875 100644
--- a/applications/main/subghz/helpers/subghz_txrx.h
+++ b/applications/main/subghz/helpers/subghz_txrx.h
@@ -24,7 +24,7 @@ typedef enum {
  * 
  * @return SubGhzTxRx* pointer to SubGhzTxRx
  */
-SubGhzTxRx* subghz_txrx_alloc();
+SubGhzTxRx* subghz_txrx_alloc(void);
 
 /**
  * Free SubGhzTxRx
diff --git a/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c b/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
index 308f6dbb3..434304024 100644
--- a/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
+++ b/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
@@ -60,9 +60,6 @@ bool subghz_scene_frequency_analyzer_on_event(void* context, SceneManagerEvent e
                 subghz_frequency_analyzer_get_frequency_to_save(subghz->subghz_frequency_analyzer);
             if(frequency > 0) {
                 subghz->last_settings->frequency = frequency;
-#ifdef FURI_DEBUG
-                subghz_last_settings_log(subghz->last_settings);
-#endif
                 // Disable Hopping before opening the receiver scene!
                 if(subghz->last_settings->enable_hopping) {
                     subghz->last_settings->enable_hopping = false;
@@ -73,9 +70,6 @@ bool subghz_scene_frequency_analyzer_on_event(void* context, SceneManagerEvent e
             return true;
         } else if(event.event == SubGhzCustomEventViewFreqAnalOkLong) {
             // Don't need to save, we already saved on short event
-#ifdef FURI_DEBUG
-            FURI_LOG_W(TAG, "Goto next scene!");
-#endif
             //scene_manager_set_scene_state(subghz->scene_manager, SubGhzSceneStart, 10);
             scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReceiver);
             return true;
diff --git a/applications/main/subghz/scenes/subghz_scene_radio_settings.c b/applications/main/subghz/scenes/subghz_scene_radio_settings.c
index ec4fee4a1..ac1675d01 100644
--- a/applications/main/subghz/scenes/subghz_scene_radio_settings.c
+++ b/applications/main/subghz/scenes/subghz_scene_radio_settings.c
@@ -20,12 +20,6 @@ const char* const timestamp_names_text[TIMESTAMP_NAMES_COUNT] = {
     "ON",
 };
 
-#define EXT_MOD_POWER_AMP_COUNT 2
-const char* const ext_mod_power_amp_text[EXT_MOD_POWER_AMP_COUNT] = {
-    "OFF",
-    "ON",
-};
-
 #define DEBUG_P_COUNT 2
 const char* const debug_pin_text[DEBUG_P_COUNT] = {
     "OFF",
@@ -94,34 +88,13 @@ static void subghz_scene_receiver_config_set_debug_counter(VariableItem* item) {
     furi_hal_subghz_set_rolling_counter_mult(debug_counter_val[index]);
 }
 
-static void subghz_scene_reciever_config_set_ext_mod_power_amp_text(VariableItem* item) {
-    SubGhz* subghz = variable_item_get_context(item);
-    uint8_t index = variable_item_get_current_value_index(item);
-
-    variable_item_set_current_value_text(item, ext_mod_power_amp_text[index]);
-
-    subghz->last_settings->external_module_power_amp = index == 1;
-
-    // Set globally in furi hal
-    furi_hal_subghz_set_ext_power_amp(subghz->last_settings->external_module_power_amp);
-
-    subghz_last_settings_save(subghz->last_settings);
-
-    // reinit external device
-    const SubGhzRadioDeviceType current = subghz_txrx_radio_device_get(subghz->txrx);
-    if(current != SubGhzRadioDeviceTypeInternal) {
-        subghz_txrx_radio_device_set(subghz->txrx, SubGhzRadioDeviceTypeInternal);
-        subghz_txrx_radio_device_set(subghz->txrx, current);
-    }
-}
-
 static void subghz_scene_receiver_config_set_timestamp_file_names(VariableItem* item) {
     SubGhz* subghz = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
 
     variable_item_set_current_value_text(item, timestamp_names_text[index]);
 
-    subghz->last_settings->timestamp_file_names = (index == 1);
+    subghz->last_settings->protocol_file_names = (index == 1);
     subghz_last_settings_save(subghz->last_settings);
 }
 
@@ -147,23 +120,13 @@ void subghz_scene_radio_settings_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, radio_device_text[value_index]);
 
-    item = variable_item_list_add(
-        variable_item_list,
-        "Ext Power Amp",
-        EXT_MOD_POWER_AMP_COUNT,
-        subghz_scene_reciever_config_set_ext_mod_power_amp_text,
-        subghz);
-    value_index = subghz->last_settings->external_module_power_amp ? 1 : 0;
-    variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, ext_mod_power_amp_text[value_index]);
-
     item = variable_item_list_add(
         variable_item_list,
         "Protocol Names",
         TIMESTAMP_NAMES_COUNT,
         subghz_scene_receiver_config_set_timestamp_file_names,
         subghz);
-    value_index = subghz->last_settings->timestamp_file_names;
+    value_index = subghz->last_settings->protocol_file_names;
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, timestamp_names_text[value_index]);
 
diff --git a/applications/main/subghz/scenes/subghz_scene_read_raw.c b/applications/main/subghz/scenes/subghz_scene_read_raw.c
index b6ae9f9dc..2727fa347 100644
--- a/applications/main/subghz/scenes/subghz_scene_read_raw.c
+++ b/applications/main/subghz/scenes/subghz_scene_read_raw.c
@@ -104,14 +104,13 @@ void subghz_scene_read_raw_on_enter(void* context) {
 
     if(subghz_rx_key_state_get(subghz) != SubGhzRxKeyStateBack) {
         subghz_rx_key_state_set(subghz, SubGhzRxKeyStateIDLE);
-#if SUBGHZ_LAST_SETTING_SAVE_PRESET
+
         if(furi_string_empty(file_name)) {
             subghz_txrx_set_preset_internal(
                 subghz->txrx,
                 subghz->last_settings->frequency,
                 subghz->last_settings->preset_index);
         }
-#endif
     }
     subghz_scene_read_raw_update_statusbar(subghz);
 
diff --git a/applications/main/subghz/scenes/subghz_scene_receiver.c b/applications/main/subghz/scenes/subghz_scene_receiver.c
index 118a8bc1c..23ac44222 100644
--- a/applications/main/subghz/scenes/subghz_scene_receiver.c
+++ b/applications/main/subghz/scenes/subghz_scene_receiver.c
@@ -164,12 +164,8 @@ void subghz_scene_receiver_on_enter(void* context) {
     FuriString* item_time = furi_string_alloc();
 
     if(subghz_rx_key_state_get(subghz) == SubGhzRxKeyStateIDLE) {
-#if SUBGHZ_LAST_SETTING_SAVE_PRESET
         subghz_txrx_set_preset_internal(
             subghz->txrx, subghz->last_settings->frequency, subghz->last_settings->preset_index);
-#else
-        subghz_txrx_set_default_preset(subghz->txrx, subghz->last_settings->frequency);
-#endif
 
         subghz->filter = subghz->last_settings->filter;
         subghz_txrx_receiver_set_filter(subghz->txrx, subghz->filter);
diff --git a/applications/main/subghz/scenes/subghz_scene_receiver_config.c b/applications/main/subghz/scenes/subghz_scene_receiver_config.c
index f98b33b4f..f937e80b9 100644
--- a/applications/main/subghz/scenes/subghz_scene_receiver_config.c
+++ b/applications/main/subghz/scenes/subghz_scene_receiver_config.c
@@ -301,14 +301,11 @@ static void subghz_scene_receiver_config_var_list_enter_callback(void* context,
             subghz->view_dispatcher, SubGhzCustomEventSceneSettingLock);
     } else if(index == SubGhzSettingIndexResetToDefault) {
         // Reset all values to default state!
-#if SUBGHZ_LAST_SETTING_SAVE_PRESET
         subghz_txrx_set_preset_internal(
             subghz->txrx,
             SUBGHZ_LAST_SETTING_DEFAULT_FREQUENCY,
             SUBGHZ_LAST_SETTING_DEFAULT_PRESET);
-#else
-        subghz_txrx_set_default_preset(subghz->txrx, SUBGHZ_LAST_SETTING_DEFAULT_FREQUENCY);
-#endif
+
         SubGhzSetting* setting = subghz_txrx_get_setting(subghz->txrx);
         SubGhzRadioPreset preset = subghz_txrx_get_preset(subghz->txrx);
         const char* preset_name = furi_string_get_cstr(preset.name);
@@ -333,9 +330,7 @@ static void subghz_scene_receiver_config_var_list_enter_callback(void* context,
 
         variable_item_list_set_selected_item(subghz->variable_item_list, default_index);
         variable_item_list_reset(subghz->variable_item_list);
-#ifdef FURI_DEBUG
-        subghz_last_settings_log(subghz->last_settings);
-#endif
+
         subghz_last_settings_save(subghz->last_settings);
 
         view_dispatcher_send_custom_event(
@@ -556,9 +551,7 @@ void subghz_scene_receiver_config_on_exit(void* context) {
     SubGhz* subghz = context;
     variable_item_list_set_selected_item(subghz->variable_item_list, 0);
     variable_item_list_reset(subghz->variable_item_list);
-#ifdef FURI_DEBUG
-    subghz_last_settings_log(subghz->last_settings);
-#endif
+
     subghz_last_settings_save(subghz->last_settings);
     scene_manager_set_scene_state(
         subghz->scene_manager, SubGhzSceneReadRAW, SubGhzCustomEventManagerNoSet);
diff --git a/applications/main/subghz/scenes/subghz_scene_save_name.c b/applications/main/subghz/scenes/subghz_scene_save_name.c
index 0b2a25959..b94f4430b 100644
--- a/applications/main/subghz/scenes/subghz_scene_save_name.c
+++ b/applications/main/subghz/scenes/subghz_scene_save_name.c
@@ -32,7 +32,7 @@ void subghz_scene_save_name_on_enter(void* context) {
         if(decoder_result != 0x0) {
             if(decoder_result != NULL) {
                 if(strlen(decoder_result->protocol->name) != 0 &&
-                   subghz->last_settings->timestamp_file_names) {
+                   subghz->last_settings->protocol_file_names) {
                     if(!scene_manager_has_previous_scene(
                            subghz->scene_manager, SubGhzSceneSetType)) {
                         name_generator_make_auto_datetime(
diff --git a/applications/main/subghz/scenes/subghz_scene_set_cnt.c b/applications/main/subghz/scenes/subghz_scene_set_cnt.c
index 4952c2b14..b202d6d91 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_cnt.c
+++ b/applications/main/subghz/scenes/subghz_scene_set_cnt.c
@@ -18,7 +18,7 @@ void subghz_scene_set_cnt_on_enter(void* context) {
 
     switch(state) {
     case SetTypeBFTClone:
-        byte_input_set_header_text(byte_input, "Enter COUNTER in Hex");
+        byte_input_set_header_text(byte_input, "Enter COUNTER in hex");
         byte_input_set_result_callback(
             byte_input,
             subghz_scene_set_cnt_byte_input_callback,
@@ -29,7 +29,7 @@ void subghz_scene_set_cnt_on_enter(void* context) {
         break;
     case SetTypeFaacSLH_Manual_433:
     case SetTypeFaacSLH_Manual_868:
-        byte_input_set_header_text(byte_input, "Enter COUNTER in Hex 20 bits");
+        byte_input_set_header_text(byte_input, "Enter COUNTER in hex 20 bits");
         byte_input_set_result_callback(
             byte_input,
             subghz_scene_set_cnt_byte_input_callback,
diff --git a/applications/main/subghz/scenes/subghz_scene_set_fix.c b/applications/main/subghz/scenes/subghz_scene_set_fix.c
index b58f39ddd..7564fb24d 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_fix.c
+++ b/applications/main/subghz/scenes/subghz_scene_set_fix.c
@@ -13,7 +13,7 @@ void subghz_scene_set_fix_on_enter(void* context) {
 
     // Setup view
     ByteInput* byte_input = subghz->byte_input;
-    byte_input_set_header_text(byte_input, "Enter FIX in Hex");
+    byte_input_set_header_text(byte_input, "Enter FIX in hex");
     byte_input_set_result_callback(
         byte_input,
         subghz_scene_set_fix_byte_input_callback,
diff --git a/applications/main/subghz/scenes/subghz_scene_set_seed.c b/applications/main/subghz/scenes/subghz_scene_set_seed.c
index a22daf919..c8301745f 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_seed.c
+++ b/applications/main/subghz/scenes/subghz_scene_set_seed.c
@@ -14,7 +14,7 @@ void subghz_scene_set_seed_on_enter(void* context) {
 
     // Setup view
     ByteInput* byte_input = subghz->byte_input;
-    byte_input_set_header_text(byte_input, "Enter SEED in Hex");
+    byte_input_set_header_text(byte_input, "Enter SEED in hex");
     byte_input_set_result_callback(
         byte_input,
         subghz_scene_set_seed_byte_input_callback,
diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c
index 90b30f076..b88e449b1 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_type.c
+++ b/applications/main/subghz/scenes/subghz_scene_set_type.c
@@ -445,8 +445,8 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 .type = GenKeeloq,
                 .mod = "FM476",
                 .freq = 434420000,
-                .keeloq.serial = key & 0x0FFFFFFF,
-                .keeloq.btn = 0x04,
+                .keeloq.serial = (key & 0x0000FFFF) | 0x07150000,
+                .keeloq.btn = 0x02,
                 .keeloq.cnt = 0x03,
                 .keeloq.manuf = "Sommer(fsk476)"};
             break;
@@ -455,8 +455,8 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 .type = GenKeeloq,
                 .mod = "FM476",
                 .freq = 868800000,
-                .keeloq.serial = key & 0x0FFFFFFF,
-                .keeloq.btn = 0x04,
+                .keeloq.serial = (key & 0x0000FFFF) | 0x07150000,
+                .keeloq.btn = 0x02,
                 .keeloq.cnt = 0x03,
                 .keeloq.manuf = "Sommer(fsk476)"};
             break;
diff --git a/applications/main/subghz/subghz.c b/applications/main/subghz/subghz.c
index 8eb7eec99..c4169530d 100644
--- a/applications/main/subghz/subghz.c
+++ b/applications/main/subghz/subghz.c
@@ -202,16 +202,9 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
     subghz->last_settings = subghz_last_settings_alloc();
     size_t preset_count = subghz_setting_get_preset_count(setting);
     subghz_last_settings_load(subghz->last_settings, preset_count);
-#ifdef FURI_DEBUG
-    subghz_last_settings_log(subghz->last_settings);
-#endif
     if(!alloc_for_tx_only) {
-#if SUBGHZ_LAST_SETTING_SAVE_PRESET
         subghz_txrx_set_preset_internal(
             subghz->txrx, subghz->last_settings->frequency, subghz->last_settings->preset_index);
-#else
-        subghz_txrx_set_default_preset(subghz->txrx, subghz->last_settings->frequency);
-#endif
         subghz->history = subghz_history_alloc();
     }
 
diff --git a/applications/main/subghz/subghz_cli.c b/applications/main/subghz/subghz_cli.c
index 23b9c7d4c..598db5146 100644
--- a/applications/main/subghz/subghz_cli.c
+++ b/applications/main/subghz/subghz_cli.c
@@ -32,7 +32,7 @@
 
 #define TAG "SubGhzCli"
 
-static void subghz_cli_radio_device_power_on() {
+static void subghz_cli_radio_device_power_on(void) {
     uint8_t attempts = 5;
     while(--attempts > 0) {
         if(furi_hal_power_enable_otg()) break;
@@ -47,7 +47,7 @@ static void subghz_cli_radio_device_power_on() {
     }
 }
 
-static void subghz_cli_radio_device_power_off() {
+static void subghz_cli_radio_device_power_off(void) {
     if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
 }
 
@@ -833,7 +833,7 @@ void subghz_cli_command_tx_from_file(Cli* cli, FuriString* args, void* context)
     subghz_environment_free(environment);
 }
 
-static void subghz_cli_command_print_usage() {
+static void subghz_cli_command_print_usage(void) {
     printf("Usage:\r\n");
     printf("subghz <cmd> <args>\r\n");
     printf("Cmd list:\r\n");
@@ -1196,7 +1196,7 @@ static void subghz_cli_command(Cli* cli, FuriString* args, void* context) {
     furi_string_free(cmd);
 }
 
-void subghz_on_system_start() {
+void subghz_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
 
diff --git a/applications/main/subghz/subghz_cli.h b/applications/main/subghz/subghz_cli.h
index 14b97e1ed..f6388218f 100644
--- a/applications/main/subghz/subghz_cli.h
+++ b/applications/main/subghz/subghz_cli.h
@@ -2,4 +2,4 @@
 
 #include <cli/cli.h>
 
-void subghz_on_system_start();
+void subghz_on_system_start(void);
diff --git a/applications/main/subghz/subghz_dangerous_freq.c b/applications/main/subghz/subghz_dangerous_freq.c
index 9722d28b6..699c42754 100644
--- a/applications/main/subghz/subghz_dangerous_freq.c
+++ b/applications/main/subghz/subghz_dangerous_freq.c
@@ -27,9 +27,6 @@ void subghz_dangerous_freq() {
     SubGhzLastSettings* last_settings = subghz_last_settings_alloc();
     subghz_last_settings_load(last_settings, 0);
 
-    // Set globally in furi hal
-    furi_hal_subghz_set_ext_power_amp(last_settings->external_module_power_amp);
-
     subghz_last_settings_free(last_settings);
 
     furi_record_close(RECORD_STORAGE);
diff --git a/applications/main/subghz/subghz_last_settings.c b/applications/main/subghz/subghz_last_settings.c
index 5dd2680e2..09d5821a5 100644
--- a/applications/main/subghz/subghz_last_settings.c
+++ b/applications/main/subghz/subghz_last_settings.c
@@ -4,17 +4,14 @@
 #define TAG "SubGhzLastSettings"
 
 #define SUBGHZ_LAST_SETTING_FILE_TYPE "Flipper SubGhz Last Setting File"
-#define SUBGHZ_LAST_SETTING_FILE_VERSION 1
+#define SUBGHZ_LAST_SETTING_FILE_VERSION 3
 #define SUBGHZ_LAST_SETTINGS_PATH EXT_PATH("subghz/assets/last_subghz.settings")
 
 #define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY "Frequency"
 #define SUBGHZ_LAST_SETTING_FIELD_PRESET "Preset" // AKA Modulation
 #define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_FEEDBACK_LEVEL "FeedbackLevel"
 #define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_TRIGGER "FATrigger"
-#define SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_ENABLED "External"
-#define SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER "ExtPower"
-#define SUBGHZ_LAST_SETTING_FIELD_TIMESTAMP_FILE_NAMES "TimestampNames"
-#define SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER_AMP "ExtPowerAmp"
+#define SUBGHZ_LAST_SETTING_FIELD_PROTOCOL_FILE_NAMES "ProtocolNames"
 #define SUBGHZ_LAST_SETTING_FIELD_HOPPING_ENABLE "Hopping"
 #define SUBGHZ_LAST_SETTING_FIELD_IGNORE_FILTER "IgnoreFilter"
 #define SUBGHZ_LAST_SETTING_FIELD_FILTER "Filter"
@@ -34,167 +31,113 @@ void subghz_last_settings_free(SubGhzLastSettings* instance) {
 void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count) {
     furi_assert(instance);
 
+    // Default values (all others set to 0, if read from file fails these are used)
+    instance->frequency = SUBGHZ_LAST_SETTING_DEFAULT_FREQUENCY;
+    instance->preset_index = SUBGHZ_LAST_SETTING_DEFAULT_PRESET;
+    instance->frequency_analyzer_feedback_level =
+        SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_FEEDBACK_LEVEL;
+    instance->frequency_analyzer_trigger = SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_TRIGGER;
+    // See bin_raw_value in scenes/subghz_scene_receiver_config.c
+    instance->filter = SubGhzProtocolFlag_Decodable;
+    instance->rssi = SUBGHZ_RAW_THRESHOLD_MIN;
+
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FlipperFormat* fff_data_file = flipper_format_file_alloc(storage);
 
-    uint32_t temp_frequency = 0;
-    uint32_t temp_frequency_analyzer_feedback_level = 0;
-    float temp_frequency_analyzer_trigger = 0;
-    bool temp_external_module_enabled = false;
-    bool temp_external_module_power_5v_disable = false;
-    bool temp_external_module_power_amp = false;
-    bool temp_timestamp_file_names = false;
-    bool temp_enable_hopping = false;
-    bool temp_delete_old_sig = false;
-    uint32_t temp_ignore_filter = 0;
-    uint32_t temp_filter = 0;
-    float temp_rssi = 0;
-    uint32_t temp_preset = 0;
+    FuriString* temp_str = furi_string_alloc();
+    uint32_t config_version = 0;
 
-    bool preset_was_read = false;
-    bool rssi_was_read = false;
-    bool filter_was_read = false;
-    bool ignore_filter_was_read = false;
-    bool frequency_analyzer_feedback_level_was_read = false;
-    bool frequency_analyzer_trigger_was_read = false;
-
-    if(FSE_OK == storage_sd_status(storage) && SUBGHZ_LAST_SETTINGS_PATH &&
+    if(FSE_OK == storage_sd_status(storage) &&
        flipper_format_file_open_existing(fff_data_file, SUBGHZ_LAST_SETTINGS_PATH)) {
-        preset_was_read = flipper_format_read_uint32(
-            fff_data_file, SUBGHZ_LAST_SETTING_FIELD_PRESET, (uint32_t*)&temp_preset, 1);
-        flipper_format_read_uint32(
-            fff_data_file, SUBGHZ_LAST_SETTING_FIELD_FREQUENCY, (uint32_t*)&temp_frequency, 1);
-        frequency_analyzer_feedback_level_was_read = flipper_format_read_uint32(
-            fff_data_file,
-            SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_FEEDBACK_LEVEL,
-            (uint32_t*)&temp_frequency_analyzer_feedback_level,
-            1);
-        frequency_analyzer_trigger_was_read = flipper_format_read_float(
-            fff_data_file,
-            SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_TRIGGER,
-            (float*)&temp_frequency_analyzer_trigger,
-            1);
-        flipper_format_read_bool(
-            fff_data_file,
-            SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_ENABLED,
-            (bool*)&temp_external_module_enabled,
-            1);
-        flipper_format_read_bool(
-            fff_data_file,
-            SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER,
-            (bool*)&temp_external_module_power_5v_disable,
-            1);
-        flipper_format_read_bool(
-            fff_data_file,
-            SUBGHZ_LAST_SETTING_FIELD_TIMESTAMP_FILE_NAMES,
-            (bool*)&temp_timestamp_file_names,
-            1);
-        flipper_format_read_bool(
-            fff_data_file,
-            SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER_AMP,
-            (bool*)&temp_external_module_power_amp,
-            1);
-        flipper_format_read_bool(
-            fff_data_file,
-            SUBGHZ_LAST_SETTING_FIELD_HOPPING_ENABLE,
-            (bool*)&temp_enable_hopping,
-            1);
-        rssi_was_read = flipper_format_read_float(
-            fff_data_file, SUBGHZ_LAST_SETTING_FIELD_RSSI_THRESHOLD, (float*)&temp_rssi, 1);
-        ignore_filter_was_read = flipper_format_read_uint32(
-            fff_data_file,
-            SUBGHZ_LAST_SETTING_FIELD_IGNORE_FILTER,
-            (uint32_t*)&temp_ignore_filter,
-            1);
-        filter_was_read = flipper_format_read_uint32(
-            fff_data_file, SUBGHZ_LAST_SETTING_FIELD_FILTER, (uint32_t*)&temp_filter, 1);
-        flipper_format_read_bool(
-            fff_data_file, SUBGHZ_LAST_SETTING_FIELD_DELETE_OLD, (bool*)&temp_delete_old_sig, 1);
+        do {
+            if(!flipper_format_read_header(fff_data_file, temp_str, &config_version)) break;
+            if((strcmp(furi_string_get_cstr(temp_str), SUBGHZ_LAST_SETTING_FILE_TYPE) != 0) ||
+               (config_version != SUBGHZ_LAST_SETTING_FILE_VERSION)) {
+                break;
+            }
+
+            if(!flipper_format_read_uint32(
+                   fff_data_file, SUBGHZ_LAST_SETTING_FIELD_FREQUENCY, &instance->frequency, 1)) {
+                flipper_format_rewind(fff_data_file);
+            }
+            if(!flipper_format_read_uint32(
+                   fff_data_file, SUBGHZ_LAST_SETTING_FIELD_PRESET, &instance->preset_index, 1)) {
+                flipper_format_rewind(fff_data_file);
+            }
+            if(!flipper_format_read_uint32(
+                   fff_data_file,
+                   SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_FEEDBACK_LEVEL,
+                   &instance->frequency_analyzer_feedback_level,
+                   1)) {
+                flipper_format_rewind(fff_data_file);
+            }
+            if(!flipper_format_read_float(
+                   fff_data_file,
+                   SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_TRIGGER,
+                   &instance->frequency_analyzer_trigger,
+                   1)) {
+                flipper_format_rewind(fff_data_file);
+            }
+            if(!flipper_format_read_bool(
+                   fff_data_file,
+                   SUBGHZ_LAST_SETTING_FIELD_PROTOCOL_FILE_NAMES,
+                   &instance->protocol_file_names,
+                   1)) {
+                flipper_format_rewind(fff_data_file);
+            }
+            if(!flipper_format_read_bool(
+                   fff_data_file,
+                   SUBGHZ_LAST_SETTING_FIELD_HOPPING_ENABLE,
+                   &instance->enable_hopping,
+                   1)) {
+                flipper_format_rewind(fff_data_file);
+            }
+            if(!flipper_format_read_uint32(
+                   fff_data_file,
+                   SUBGHZ_LAST_SETTING_FIELD_IGNORE_FILTER,
+                   &instance->ignore_filter,
+                   1)) {
+                flipper_format_rewind(fff_data_file);
+            }
+            if(!flipper_format_read_uint32(
+                   fff_data_file, SUBGHZ_LAST_SETTING_FIELD_FILTER, &instance->filter, 1)) {
+                flipper_format_rewind(fff_data_file);
+            }
+            if(!flipper_format_read_float(
+                   fff_data_file, SUBGHZ_LAST_SETTING_FIELD_RSSI_THRESHOLD, &instance->rssi, 1)) {
+                flipper_format_rewind(fff_data_file);
+            }
+            if(!flipper_format_read_bool(
+                   fff_data_file,
+                   SUBGHZ_LAST_SETTING_FIELD_DELETE_OLD,
+                   &instance->delete_old_signals,
+                   1)) {
+                flipper_format_rewind(fff_data_file);
+            }
+
+        } while(0);
     } else {
         FURI_LOG_E(TAG, "Error open file %s", SUBGHZ_LAST_SETTINGS_PATH);
     }
 
-    if(temp_frequency == 0 || !furi_hal_subghz_is_tx_allowed(temp_frequency)) {
-        FURI_LOG_W(TAG, "Last used frequency not found or can't be used!");
-
-        instance->frequency = SUBGHZ_LAST_SETTING_DEFAULT_FREQUENCY;
-        instance->preset_index = SUBGHZ_LAST_SETTING_DEFAULT_PRESET;
-        instance->frequency_analyzer_feedback_level =
-            SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_FEEDBACK_LEVEL;
-        instance->frequency_analyzer_trigger = SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_TRIGGER;
-        instance->external_module_enabled = false;
-        instance->timestamp_file_names = false;
-        instance->external_module_power_amp = false;
-        instance->enable_hopping = false;
-        instance->delete_old_signals = false;
-        instance->ignore_filter = 0x00;
-        // See bin_raw_value in applications/main/subghz/scenes/subghz_scene_receiver_config.c
-        instance->filter = SubGhzProtocolFlag_Decodable;
-        instance->rssi = SUBGHZ_RAW_THRESHOLD_MIN;
-    } else {
-        instance->frequency = temp_frequency;
-        instance->frequency_analyzer_feedback_level =
-            frequency_analyzer_feedback_level_was_read ?
-                temp_frequency_analyzer_feedback_level :
-                SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_FEEDBACK_LEVEL;
-
-        instance->frequency_analyzer_trigger = frequency_analyzer_trigger_was_read ?
-                                                   temp_frequency_analyzer_trigger :
-                                                   SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_TRIGGER;
-
-        if(!preset_was_read) {
-            FURI_LOG_W(TAG, "Preset was not read. Set default");
-            instance->preset_index = SUBGHZ_LAST_SETTING_DEFAULT_PRESET;
-        } else if(temp_preset > (uint32_t)preset_count - 1) {
-            FURI_LOG_W(
-                TAG,
-                "Last used preset out of range. Preset to set: %ld, Max index: %ld. Set default",
-                temp_preset,
-                (uint32_t)preset_count - 1);
-            instance->preset_index = SUBGHZ_LAST_SETTING_DEFAULT_PRESET;
-        } else {
-            instance->preset_index = temp_preset;
-        }
-        instance->external_module_enabled = temp_external_module_enabled;
-
-        instance->external_module_power_5v_disable = temp_external_module_power_5v_disable;
-
-        instance->timestamp_file_names = temp_timestamp_file_names;
-
-        instance->delete_old_signals = temp_delete_old_sig;
-
-        // External power amp CC1101
-        instance->external_module_power_amp = temp_external_module_power_amp;
-
-        instance->rssi = rssi_was_read ? temp_rssi : SUBGHZ_RAW_THRESHOLD_MIN;
-        instance->enable_hopping = temp_enable_hopping;
-        instance->ignore_filter = ignore_filter_was_read ? temp_ignore_filter : 0x00;
-#if SUBGHZ_LAST_SETTING_SAVE_BIN_RAW
-        instance->filter = filter_was_read ? temp_filter : SubGhzProtocolFlag_Decodable;
-#else
-        if(filter_was_read) {
-            instance->filter = temp_filter != SubGhzProtocolFlag_Decodable ?
-                                   SubGhzProtocolFlag_Decodable :
-                                   temp_filter;
-        } else {
-            instance->filter = SubGhzProtocolFlag_Decodable;
-        }
-#endif
-        // Set globally in furi hal
-        furi_hal_subghz_set_ext_power_amp(instance->external_module_power_amp);
-    }
+    furi_string_free(temp_str);
 
     flipper_format_file_close(fff_data_file);
     flipper_format_free(fff_data_file);
     furi_record_close(RECORD_STORAGE);
+
+    if(instance->frequency == 0 || !furi_hal_subghz_is_tx_allowed(instance->frequency)) {
+        instance->frequency = SUBGHZ_LAST_SETTING_DEFAULT_FREQUENCY;
+    }
+
+    if(instance->preset_index > (uint32_t)preset_count - 1) {
+        instance->preset_index = SUBGHZ_LAST_SETTING_DEFAULT_PRESET;
+    }
 }
 
 bool subghz_last_settings_save(SubGhzLastSettings* instance) {
     furi_assert(instance);
 
-#if SUBGHZ_LAST_SETTING_SAVE_BIN_RAW != true
-    instance->filter = SubGhzProtocolFlag_Decodable;
-#endif
     bool saved = false;
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FlipperFormat* file = flipper_format_file_alloc(storage);
@@ -211,76 +154,56 @@ bool subghz_last_settings_save(SubGhzLastSettings* instance) {
         if(!flipper_format_write_header_cstr(
                file, SUBGHZ_LAST_SETTING_FILE_TYPE, SUBGHZ_LAST_SETTING_FILE_VERSION))
             break;
-        if(!flipper_format_insert_or_update_uint32(
-               file, SUBGHZ_LAST_SETTING_FIELD_PRESET, &instance->preset_index, 1)) {
-            break;
-        }
-        if(!flipper_format_insert_or_update_uint32(
+        if(!flipper_format_write_uint32(
                file, SUBGHZ_LAST_SETTING_FIELD_FREQUENCY, &instance->frequency, 1)) {
             break;
         }
-        if(!flipper_format_insert_or_update_uint32(
+        if(!flipper_format_write_uint32(
+               file, SUBGHZ_LAST_SETTING_FIELD_PRESET, &instance->preset_index, 1)) {
+            break;
+        }
+        if(!flipper_format_write_uint32(
                file,
                SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_FEEDBACK_LEVEL,
                &instance->frequency_analyzer_feedback_level,
                1)) {
             break;
         }
-        if(!flipper_format_insert_or_update_float(
+        if(!flipper_format_write_float(
                file,
                SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_TRIGGER,
                &instance->frequency_analyzer_trigger,
                1)) {
             break;
         }
-        if(!flipper_format_insert_or_update_bool(
+        if(!flipper_format_write_bool(
                file,
-               SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_ENABLED,
-               &instance->external_module_enabled,
+               SUBGHZ_LAST_SETTING_FIELD_PROTOCOL_FILE_NAMES,
+               &instance->protocol_file_names,
                1)) {
             break;
         }
-        if(!flipper_format_insert_or_update_bool(
-               file,
-               SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER,
-               &instance->external_module_power_5v_disable,
-               1)) {
-            break;
-        }
-        if(!flipper_format_insert_or_update_bool(
-               file,
-               SUBGHZ_LAST_SETTING_FIELD_TIMESTAMP_FILE_NAMES,
-               &instance->timestamp_file_names,
-               1)) {
-            break;
-        }
-        if(!flipper_format_insert_or_update_bool(
-               file,
-               SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER_AMP,
-               &instance->external_module_power_amp,
-               1)) {
-            break;
-        }
-        if(!flipper_format_insert_or_update_bool(
+        if(!flipper_format_write_bool(
                file, SUBGHZ_LAST_SETTING_FIELD_HOPPING_ENABLE, &instance->enable_hopping, 1)) {
             break;
         }
-        if(!flipper_format_insert_or_update_float(
-               file, SUBGHZ_LAST_SETTING_FIELD_RSSI_THRESHOLD, &instance->rssi, 1)) {
-            break;
-        }
-        if(!flipper_format_insert_or_update_uint32(
+        if(!flipper_format_write_uint32(
                file, SUBGHZ_LAST_SETTING_FIELD_IGNORE_FILTER, &instance->ignore_filter, 1)) {
             break;
         }
-        if(!flipper_format_insert_or_update_uint32(
+        if(!flipper_format_write_uint32(
                file, SUBGHZ_LAST_SETTING_FIELD_FILTER, &instance->filter, 1)) {
             break;
         }
-        if(!flipper_format_insert_or_update_bool(
+        if(!flipper_format_write_float(
+               file, SUBGHZ_LAST_SETTING_FIELD_RSSI_THRESHOLD, &instance->rssi, 1)) {
+            break;
+        }
+        if(!flipper_format_write_bool(
                file, SUBGHZ_LAST_SETTING_FIELD_DELETE_OLD, &instance->delete_old_signals, 1)) {
             break;
         }
+
         saved = true;
     } while(0);
 
@@ -294,45 +217,3 @@ bool subghz_last_settings_save(SubGhzLastSettings* instance) {
 
     return saved;
 }
-
-const char* LOG_ON = "ON";
-const char* LOG_OFF = "OFF";
-
-static inline const char*
-    subghz_last_settings_log_filter_get_index(uint32_t filter, uint32_t flag) {
-    return READ_BIT(filter, flag) > 0 ? LOG_ON : LOG_OFF;
-}
-
-static inline const char* bool_to_char(bool value) {
-    return value ? LOG_ON : LOG_OFF;
-}
-
-void subghz_last_settings_log(SubGhzLastSettings* instance) {
-    furi_assert(instance);
-
-    FURI_LOG_I(
-        TAG,
-        "Frequency: %03ld.%02ld, FeedbackLevel: %ld, FATrigger: %.2f, External: %s, ExtPower: %s, TimestampNames: %s, ExtPowerAmp: %s,\n"
-        "Hopping: %s,\nPreset: %ld, RSSI: %.2f, "
-        "Starline: %s, Cars: %s, Magellan: %s, NiceFloR-S: %s, BinRAW: %s",
-        instance->frequency / 1000000 % 1000,
-        instance->frequency / 10000 % 100,
-        instance->frequency_analyzer_feedback_level,
-        (double)instance->frequency_analyzer_trigger,
-        bool_to_char(instance->external_module_enabled),
-        bool_to_char(instance->external_module_power_5v_disable),
-        bool_to_char(instance->timestamp_file_names),
-        bool_to_char(instance->external_module_power_amp),
-        bool_to_char(instance->enable_hopping),
-        instance->preset_index,
-        (double)instance->rssi,
-        subghz_last_settings_log_filter_get_index(
-            instance->ignore_filter, SubGhzProtocolFlag_StarLine),
-        subghz_last_settings_log_filter_get_index(
-            instance->ignore_filter, SubGhzProtocolFlag_AutoAlarms),
-        subghz_last_settings_log_filter_get_index(
-            instance->ignore_filter, SubGhzProtocolFlag_Magellan),
-        subghz_last_settings_log_filter_get_index(
-            instance->ignore_filter, SubGhzProtocolFlag_NiceFlorS),
-        subghz_last_settings_log_filter_get_index(instance->filter, SubGhzProtocolFlag_BinRAW));
-}
diff --git a/applications/main/subghz/subghz_last_settings.h b/applications/main/subghz/subghz_last_settings.h
index 74dded4b7..2b18861ff 100644
--- a/applications/main/subghz/subghz_last_settings.h
+++ b/applications/main/subghz/subghz_last_settings.h
@@ -7,8 +7,6 @@
 #include <lib/subghz/types.h>
 
 #define SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_TRIGGER (-93.0f)
-#define SUBGHZ_LAST_SETTING_SAVE_BIN_RAW true
-#define SUBGHZ_LAST_SETTING_SAVE_PRESET true
 // 1 = "AM650"
 // "AM270", "AM650", "FM238", "FM476",
 #define SUBGHZ_LAST_SETTING_DEFAULT_PRESET 1
@@ -20,12 +18,7 @@ typedef struct {
     uint32_t preset_index; // AKA Modulation
     uint32_t frequency_analyzer_feedback_level;
     float frequency_analyzer_trigger;
-    // TODO not using but saved so as not to change the version
-    bool external_module_enabled;
-    bool external_module_power_5v_disable;
-    bool external_module_power_amp;
-    // saved so as not to change the version
-    bool timestamp_file_names;
+    bool protocol_file_names;
     bool enable_hopping;
     uint32_t ignore_filter;
     uint32_t filter;
@@ -40,5 +33,3 @@ void subghz_last_settings_free(SubGhzLastSettings* instance);
 void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count);
 
 bool subghz_last_settings_save(SubGhzLastSettings* instance);
-
-void subghz_last_settings_log(SubGhzLastSettings* instance);
diff --git a/applications/main/subghz/views/receiver.c b/applications/main/subghz/views/receiver.c
index 88e3c31e4..5f9119353 100644
--- a/applications/main/subghz/views/receiver.c
+++ b/applications/main/subghz/views/receiver.c
@@ -571,7 +571,7 @@ void subghz_view_receiver_exit(void* context) {
     furi_timer_stop(subghz_receiver->flip_time_timer);
 }
 
-SubGhzViewReceiver* subghz_view_receiver_alloc() {
+SubGhzViewReceiver* subghz_view_receiver_alloc(void) {
     SubGhzViewReceiver* subghz_receiver = malloc(sizeof(SubGhzViewReceiver));
 
     // View allocation and configuration
diff --git a/applications/main/subghz/views/receiver.h b/applications/main/subghz/views/receiver.h
index f28ed1304..a2e23379e 100644
--- a/applications/main/subghz/views/receiver.h
+++ b/applications/main/subghz/views/receiver.h
@@ -21,7 +21,7 @@ void subghz_view_receiver_set_callback(
     SubGhzViewReceiverCallback callback,
     void* context);
 
-SubGhzViewReceiver* subghz_view_receiver_alloc();
+SubGhzViewReceiver* subghz_view_receiver_alloc(void);
 
 void subghz_view_receiver_free(SubGhzViewReceiver* subghz_receiver);
 
diff --git a/applications/main/subghz/views/subghz_frequency_analyzer.c b/applications/main/subghz/views/subghz_frequency_analyzer.c
index bc472f233..f16a38d3e 100644
--- a/applications/main/subghz/views/subghz_frequency_analyzer.c
+++ b/applications/main/subghz/views/subghz_frequency_analyzer.c
@@ -228,9 +228,7 @@ uint32_t subghz_frequency_find_correct(uint32_t input) {
     uint32_t prev_freq = 0;
     uint32_t current = 0;
     uint32_t result = 0;
-#ifdef FURI_DEBUG
-    FURI_LOG_D(TAG, "input: %ld", input);
-#endif
+
     for(size_t i = 0; i < sizeof(subghz_frequency_list); i++) {
         current = subghz_frequency_list[i];
         if(current == input) {
@@ -281,7 +279,7 @@ bool subghz_frequency_analyzer_input(InputEvent* event, void* context) {
             break;
         }
         subghz_frequency_analyzer_worker_set_trigger_level(instance->worker, trigger_level);
-        FURI_LOG_I(TAG, "trigger = %.1f", (double)trigger_level);
+        FURI_LOG_D(TAG, "trigger = %.1f", (double)trigger_level);
         need_redraw = true;
     } else if(event->type == InputTypePress && event->key == InputKeyUp) {
         if(instance->feedback_level == 0) {
@@ -289,9 +287,7 @@ bool subghz_frequency_analyzer_input(InputEvent* event, void* context) {
         } else {
             instance->feedback_level--;
         }
-#ifdef FURI_DEBUG
-        FURI_LOG_D(TAG, "feedback_level = %d", instance->feedback_level);
-#endif
+
         need_redraw = true;
     } else if(
         ((event->type == InputTypePress) || (event->type == InputTypeRepeat)) &&
@@ -324,13 +320,6 @@ bool subghz_frequency_analyzer_input(InputEvent* event, void* context) {
                     }
                     if(frequency_candidate > 0 &&
                        frequency_candidate != model->frequency_to_save) {
-#ifdef FURI_DEBUG
-                        FURI_LOG_D(
-                            TAG,
-                            "frequency_to_save: %ld, candidate: %ld",
-                            model->frequency_to_save,
-                            frequency_candidate);
-#endif
                         model->frequency_to_save = frequency_candidate;
                         updated = true;
                     }
@@ -372,24 +361,12 @@ bool subghz_frequency_analyzer_input(InputEvent* event, void* context) {
             },
             true);
 
-#ifdef FURI_DEBUG
-        FURI_LOG_I(
-            TAG,
-            "updated: %d, long: %d, type: %d",
-            updated,
-            (event->type == InputTypeLong),
-            event->type);
-#endif
-
         if(updated) {
             instance->callback(SubGhzCustomEventViewFreqAnalOkShort, instance->context);
         }
 
         // First device receive short, then when user release button we get long
         if(event->type == InputTypeLong && frequency_to_save > 0) {
-#ifdef FURI_DEBUG
-            FURI_LOG_I(TAG, "Long press!");
-#endif
             // Stop worker
             if(subghz_frequency_analyzer_worker_is_running(instance->worker)) {
                 subghz_frequency_analyzer_worker_stop(instance->worker);
diff --git a/applications/main/subghz/views/transmitter.c b/applications/main/subghz/views/transmitter.c
index f75bbc661..3b705beed 100644
--- a/applications/main/subghz/views/transmitter.c
+++ b/applications/main/subghz/views/transmitter.c
@@ -228,7 +228,7 @@ void subghz_view_transmitter_exit(void* context) {
     furi_assert(context);
 }
 
-SubGhzViewTransmitter* subghz_view_transmitter_alloc() {
+SubGhzViewTransmitter* subghz_view_transmitter_alloc(void) {
     SubGhzViewTransmitter* subghz_transmitter = malloc(sizeof(SubGhzViewTransmitter));
 
     // View allocation and configuration
diff --git a/applications/main/subghz/views/transmitter.h b/applications/main/subghz/views/transmitter.h
index 19da3145c..7fa51a65d 100644
--- a/applications/main/subghz/views/transmitter.h
+++ b/applications/main/subghz/views/transmitter.h
@@ -17,7 +17,7 @@ void subghz_view_transmitter_set_radio_device_type(
     SubGhzViewTransmitter* subghz_transmitter,
     SubGhzRadioDeviceType device_type);
 
-SubGhzViewTransmitter* subghz_view_transmitter_alloc();
+SubGhzViewTransmitter* subghz_view_transmitter_alloc(void);
 
 void subghz_view_transmitter_free(SubGhzViewTransmitter* subghz_transmitter);
 
diff --git a/applications/main/subghz_remote b/applications/main/subghz_remote
index 2ea0fac18..73ca3f2ac 160000
--- a/applications/main/subghz_remote
+++ b/applications/main/subghz_remote
@@ -1 +1 @@
-Subproject commit 2ea0fac1857f27fdbcff236ce375c82038e381b7
+Subproject commit 73ca3f2ac02e313004aa3a724f2f8a0e4646ad10
diff --git a/applications/main/u2f/scenes/u2f_scene_error.c b/applications/main/u2f/scenes/u2f_scene_error.c
index e10e9c098..98ce38d76 100644
--- a/applications/main/u2f/scenes/u2f_scene_error.c
+++ b/applications/main/u2f/scenes/u2f_scene_error.c
@@ -27,7 +27,7 @@ void u2f_scene_error_on_enter(void* context) {
     } else if(app->error == U2fAppErrorCloseRpc) {
         widget_add_icon_element(app->widget, 78, 0, &I_ActiveConnection_50x64);
         widget_add_string_multiline_element(
-            app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nis active!");
+            app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nIs Active!");
         widget_add_string_multiline_element(
             app->widget,
             3,
diff --git a/applications/main/u2f/u2f.c b/applications/main/u2f/u2f.c
index 3bdafe918..2a2e91f21 100644
--- a/applications/main/u2f/u2f.c
+++ b/applications/main/u2f/u2f.c
@@ -108,7 +108,7 @@ static int u2f_uecc_random_cb(void* context, uint8_t* dest, unsigned size) {
     return 0;
 }
 
-U2fData* u2f_alloc() {
+U2fData* u2f_alloc(void) {
     return malloc(sizeof(U2fData));
 }
 
diff --git a/applications/main/u2f/u2f.h b/applications/main/u2f/u2f.h
index dcd7c3ff2..8f28d5f67 100644
--- a/applications/main/u2f/u2f.h
+++ b/applications/main/u2f/u2f.h
@@ -20,7 +20,7 @@ typedef struct U2fData U2fData;
 
 typedef void (*U2fEvtCallback)(U2fNotifyEvent evt, void* context);
 
-U2fData* u2f_alloc();
+U2fData* u2f_alloc(void);
 
 bool u2f_init(U2fData* instance);
 
diff --git a/applications/main/u2f/u2f_app.c b/applications/main/u2f/u2f_app.c
index 216481976..68966390a 100644
--- a/applications/main/u2f/u2f_app.c
+++ b/applications/main/u2f/u2f_app.c
@@ -21,7 +21,7 @@ static void u2f_app_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(app->scene_manager);
 }
 
-U2fApp* u2f_app_alloc() {
+U2fApp* u2f_app_alloc(void) {
     U2fApp* app = malloc(sizeof(U2fApp));
 
     app->gui = furi_record_open(RECORD_GUI);
diff --git a/applications/main/u2f/u2f_data.c b/applications/main/u2f/u2f_data.c
index cb9c4c294..c6451757b 100644
--- a/applications/main/u2f/u2f_data.c
+++ b/applications/main/u2f/u2f_data.c
@@ -67,7 +67,7 @@ bool u2f_data_check(bool cert_only) {
     return state;
 }
 
-bool u2f_data_cert_check() {
+bool u2f_data_cert_check(void) {
     bool state = false;
     Storage* fs_api = furi_record_open(RECORD_STORAGE);
     File* file = storage_file_alloc(fs_api);
diff --git a/applications/main/u2f/u2f_data.h b/applications/main/u2f/u2f_data.h
index 8d3923464..9c04bf386 100644
--- a/applications/main/u2f/u2f_data.h
+++ b/applications/main/u2f/u2f_data.h
@@ -8,7 +8,7 @@ extern "C" {
 
 bool u2f_data_check(bool cert_only);
 
-bool u2f_data_cert_check();
+bool u2f_data_cert_check(void);
 
 uint32_t u2f_data_cert_load(uint8_t* cert);
 
diff --git a/applications/main/u2f/views/u2f_view.c b/applications/main/u2f/views/u2f_view.c
index bf220ca2c..bdbe8bcec 100644
--- a/applications/main/u2f/views/u2f_view.c
+++ b/applications/main/u2f/views/u2f_view.c
@@ -59,7 +59,7 @@ static bool u2f_view_input_callback(InputEvent* event, void* context) {
     return consumed;
 }
 
-U2fView* u2f_view_alloc() {
+U2fView* u2f_view_alloc(void) {
     U2fView* u2f = malloc(sizeof(U2fView));
 
     u2f->view = view_alloc();
diff --git a/applications/main/u2f/views/u2f_view.h b/applications/main/u2f/views/u2f_view.h
index 5da3279a4..b0ec1c5e3 100644
--- a/applications/main/u2f/views/u2f_view.h
+++ b/applications/main/u2f/views/u2f_view.h
@@ -14,7 +14,7 @@ typedef enum {
     U2fMsgError,
 } U2fViewMsg;
 
-U2fView* u2f_view_alloc();
+U2fView* u2f_view_alloc(void);
 
 void u2f_view_free(U2fView* u2f);
 
diff --git a/applications/services/bt/bt_cli.c b/applications/services/bt/bt_cli.c
index e8ba215bf..7505c424d 100644
--- a/applications/services/bt/bt_cli.c
+++ b/applications/services/bt/bt_cli.c
@@ -165,7 +165,7 @@ static void bt_cli_command_packet_rx(Cli* cli, FuriString* args, void* context)
     } while(false);
 }
 
-static void bt_cli_print_usage() {
+static void bt_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("bt <cmd> <args>\r\n");
     printf("Cmd list:\r\n");
@@ -227,7 +227,7 @@ static void bt_cli(Cli* cli, FuriString* args, void* context) {
     furi_record_close(RECORD_BT);
 }
 
-void bt_on_system_start() {
+void bt_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
     cli_add_command(cli, RECORD_BT, CliCommandFlagDefault, bt_cli, NULL);
diff --git a/applications/services/bt/bt_service/bt.c b/applications/services/bt/bt_service/bt.c
index 0315a4eaf..6d7a5c5f0 100644
--- a/applications/services/bt/bt_service/bt.c
+++ b/applications/services/bt/bt_service/bt.c
@@ -138,7 +138,7 @@ static void bt_battery_level_changed_callback(const void* _event, void* context)
     }
 }
 
-Bt* bt_alloc() {
+Bt* bt_alloc(void) {
     Bt* bt = malloc(sizeof(Bt));
     // Init default maximum packet size
     bt->max_packet_size = BLE_PROFILE_SERIAL_PACKET_SIZE_MAX;
diff --git a/applications/services/bt/bt_service/bt_api.c b/applications/services/bt/bt_service/bt_api.c
index ab5d20128..f0e792d42 100644
--- a/applications/services/bt/bt_service/bt_api.c
+++ b/applications/services/bt/bt_service/bt_api.c
@@ -5,7 +5,7 @@ FuriHalBleProfileBase* bt_profile_start(
     Bt* bt,
     const FuriHalBleProfileTemplate* profile_template,
     FuriHalBleProfileParams params) {
-    furi_assert(bt);
+    furi_check(bt);
 
     // Send message
     FuriHalBleProfileBase* profile_instance = NULL;
@@ -32,7 +32,7 @@ bool bt_profile_restore_default(Bt* bt) {
 }
 
 void bt_disconnect(Bt* bt) {
-    furi_assert(bt);
+    furi_check(bt);
 
     // Send message
     BtMessage message = {.lock = api_lock_alloc_locked(), .type = BtMessageTypeDisconnect};
@@ -43,23 +43,23 @@ void bt_disconnect(Bt* bt) {
 }
 
 void bt_set_status_changed_callback(Bt* bt, BtStatusChangedCallback callback, void* context) {
-    furi_assert(bt);
+    furi_check(bt);
 
     bt->status_changed_cb = callback;
     bt->status_changed_ctx = context;
 }
 
 void bt_forget_bonded_devices(Bt* bt) {
-    furi_assert(bt);
+    furi_check(bt);
     BtMessage message = {.type = BtMessageTypeForgetBondedDevices};
     furi_check(
         furi_message_queue_put(bt->message_queue, &message, FuriWaitForever) == FuriStatusOk);
 }
 
 void bt_keys_storage_set_storage_path(Bt* bt, const char* keys_storage_path) {
-    furi_assert(bt);
-    furi_assert(bt->keys_storage);
-    furi_assert(keys_storage_path);
+    furi_check(bt);
+    furi_check(bt->keys_storage);
+    furi_check(keys_storage_path);
 
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FuriString* path = furi_string_alloc_set(keys_storage_path);
@@ -72,8 +72,8 @@ void bt_keys_storage_set_storage_path(Bt* bt, const char* keys_storage_path) {
 }
 
 void bt_keys_storage_set_default_path(Bt* bt) {
-    furi_assert(bt);
-    furi_assert(bt->keys_storage);
+    furi_check(bt);
+    furi_check(bt->keys_storage);
 
     bt_keys_storage_set_file_path(bt->keys_storage, BT_KEYS_STORAGE_PATH);
 }
diff --git a/applications/services/bt/bt_service/bt_keys_storage.c b/applications/services/bt/bt_service/bt_keys_storage.c
index 215f19a89..cf06d663b 100644
--- a/applications/services/bt/bt_service/bt_keys_storage.c
+++ b/applications/services/bt/bt_service/bt_keys_storage.c
@@ -72,16 +72,19 @@ bool bt_keys_storage_load(BtKeysStorage* instance) {
     bool loaded = false;
     do {
         // Get payload size
+        uint8_t magic = 0, version = 0;
         size_t payload_size = 0;
-        if(!saved_struct_get_payload_size(
-               furi_string_get_cstr(instance->file_path),
-               BT_KEYS_STORAGE_MAGIC,
-               BT_KEYS_STORAGE_VERSION,
-               &payload_size)) {
+        if(!saved_struct_get_metadata(
+               furi_string_get_cstr(instance->file_path), &magic, &version, &payload_size)) {
             FURI_LOG_E(TAG, "Failed to read payload size");
             break;
         }
 
+        if(magic != BT_KEYS_STORAGE_MAGIC || version != BT_KEYS_STORAGE_VERSION) {
+            FURI_LOG_E(TAG, "Saved data version is mismatched");
+            break;
+        }
+
         if(payload_size > instance->nvm_sram_buff_size) {
             FURI_LOG_E(TAG, "Saved data doesn't fit ram buffer");
             break;
diff --git a/applications/services/bt/bt_settings.c b/applications/services/bt/bt_settings.c
index 1eaf6c7d7..8a505f9e3 100644
--- a/applications/services/bt/bt_settings.c
+++ b/applications/services/bt/bt_settings.c
@@ -15,7 +15,7 @@ bool bt_settings_load(BtSettings* bt_settings) {
         BT_SETTINGS_PATH, bt_settings, sizeof(BtSettings), BT_SETTINGS_MAGIC, BT_SETTINGS_VERSION);
 }
 
-bool bt_settings_save(BtSettings* bt_settings) {
+bool bt_settings_save(const BtSettings* bt_settings) {
     furi_assert(bt_settings);
 
     return saved_struct_save(
diff --git a/applications/services/bt/bt_settings.h b/applications/services/bt/bt_settings.h
index 9ed8be89c..da43e1498 100644
--- a/applications/services/bt/bt_settings.h
+++ b/applications/services/bt/bt_settings.h
@@ -15,7 +15,7 @@ typedef struct {
 
 bool bt_settings_load(BtSettings* bt_settings);
 
-bool bt_settings_save(BtSettings* bt_settings);
+bool bt_settings_save(const BtSettings* bt_settings);
 
 #ifdef __cplusplus
 }
diff --git a/applications/services/cli/cli.c b/applications/services/cli/cli.c
index 41e658df1..7ba704219 100644
--- a/applications/services/cli/cli.c
+++ b/applications/services/cli/cli.c
@@ -8,7 +8,7 @@
 
 #define CLI_INPUT_LEN_LIMIT 256
 
-Cli* cli_alloc() {
+Cli* cli_alloc(void) {
     Cli* cli = malloc(sizeof(Cli));
 
     CliCommandTree_init(cli->commands);
@@ -27,14 +27,14 @@ Cli* cli_alloc() {
 }
 
 void cli_putc(Cli* cli, char c) {
-    furi_assert(cli);
+    furi_check(cli);
     if(cli->session != NULL) {
         cli->session->tx((uint8_t*)&c, 1);
     }
 }
 
 char cli_getc(Cli* cli) {
-    furi_assert(cli);
+    furi_check(cli);
     char c = 0;
     if(cli->session != NULL) {
         if(cli->session->rx((uint8_t*)&c, 1, FuriWaitForever) == 0) {
@@ -49,14 +49,14 @@ char cli_getc(Cli* cli) {
 }
 
 void cli_write(Cli* cli, const uint8_t* buffer, size_t size) {
-    furi_assert(cli);
+    furi_check(cli);
     if(cli->session != NULL) {
         cli->session->tx(buffer, size);
     }
 }
 
 size_t cli_read(Cli* cli, uint8_t* buffer, size_t size) {
-    furi_assert(cli);
+    furi_check(cli);
     if(cli->session != NULL) {
         return cli->session->rx(buffer, size, FuriWaitForever);
     } else {
@@ -65,7 +65,7 @@ size_t cli_read(Cli* cli, uint8_t* buffer, size_t size) {
 }
 
 size_t cli_read_timeout(Cli* cli, uint8_t* buffer, size_t size, uint32_t timeout) {
-    furi_assert(cli);
+    furi_check(cli);
     if(cli->session != NULL) {
         return cli->session->rx(buffer, size, timeout);
     } else {
@@ -74,7 +74,7 @@ size_t cli_read_timeout(Cli* cli, uint8_t* buffer, size_t size, uint32_t timeout
 }
 
 bool cli_is_connected(Cli* cli) {
-    furi_assert(cli);
+    furi_check(cli);
     if(cli->session != NULL) {
         return (cli->session->is_connected());
     }
@@ -82,7 +82,7 @@ bool cli_is_connected(Cli* cli) {
 }
 
 bool cli_cmd_interrupt_received(Cli* cli) {
-    furi_assert(cli);
+    furi_check(cli);
     char c = '\0';
     if(cli_is_connected(cli)) {
         if(cli->session->rx((uint8_t*)&c, 1, 0) == 1) {
@@ -95,14 +95,14 @@ bool cli_cmd_interrupt_received(Cli* cli) {
 }
 
 void cli_print_usage(const char* cmd, const char* usage, const char* arg) {
-    furi_assert(cmd);
-    furi_assert(arg);
-    furi_assert(usage);
+    furi_check(cmd);
+    furi_check(arg);
+    furi_check(usage);
 
     printf("%s: illegal option -- %s\r\nusage: %s %s", cmd, arg, cmd, usage);
 }
 
-void cli_motd() {
+void cli_motd(void) {
     printf("\r\n"
            "              _.-------.._                    -,\r\n"
            "          .-\"```\"--..,,_/ /`-,               -,  \\ \r\n"
@@ -385,6 +385,7 @@ void cli_add_command(
     CliCommandFlag flags,
     CliCallback callback,
     void* context) {
+    furi_check(cli);
     FuriString* name_str;
     name_str = furi_string_alloc_set(name);
     furi_string_trim(name_str);
@@ -407,6 +408,7 @@ void cli_add_command(
 }
 
 void cli_delete_command(Cli* cli, const char* name) {
+    furi_check(cli);
     FuriString* name_str;
     name_str = furi_string_alloc_set(name);
     furi_string_trim(name_str);
@@ -424,7 +426,7 @@ void cli_delete_command(Cli* cli, const char* name) {
 }
 
 void cli_session_open(Cli* cli, void* session) {
-    furi_assert(cli);
+    furi_check(cli);
 
     furi_check(furi_mutex_acquire(cli->mutex, FuriWaitForever) == FuriStatusOk);
     cli->session = session;
@@ -439,7 +441,7 @@ void cli_session_open(Cli* cli, void* session) {
 }
 
 void cli_session_close(Cli* cli) {
-    furi_assert(cli);
+    furi_check(cli);
 
     furi_check(furi_mutex_acquire(cli->mutex, FuriWaitForever) == FuriStatusOk);
     if(cli->session != NULL) {
diff --git a/applications/services/cli/cli.h b/applications/services/cli/cli.h
index 09f54f056..bb84670a7 100644
--- a/applications/services/cli/cli.h
+++ b/applications/services/cli/cli.h
@@ -121,7 +121,7 @@ char cli_getc(Cli* cli);
 
 /** New line Send new ine sequence
  */
-void cli_nl();
+void cli_nl(Cli* cli);
 
 void cli_session_open(Cli* cli, void* session);
 
diff --git a/applications/services/cli/cli_command_gpio.c b/applications/services/cli/cli_command_gpio.c
index 67511a194..010a7dfbe 100644
--- a/applications/services/cli/cli_command_gpio.c
+++ b/applications/services/cli/cli_command_gpio.c
@@ -4,7 +4,7 @@
 #include <furi_hal.h>
 #include <lib/toolbox/args.h>
 
-void cli_command_gpio_print_usage() {
+void cli_command_gpio_print_usage(void) {
     printf("Usage:\r\n");
     printf("gpio <cmd> <args>\r\n");
     printf("Cmd list:\r\n");
diff --git a/applications/services/cli/cli_commands.c b/applications/services/cli/cli_commands.c
index a01ce173a..b1dfa3b73 100644
--- a/applications/services/cli/cli_commands.c
+++ b/applications/services/cli/cli_commands.c
@@ -83,7 +83,7 @@ void cli_command_help(Cli* cli, FuriString* args, void* context) {
     };
 
     if(furi_string_size(args) > 0) {
-        cli_nl();
+        cli_nl(cli);
         printf("`");
         printf("%s", furi_string_get_cstr(args));
         printf("` command not found");
@@ -282,7 +282,7 @@ void cli_command_sysctl_heap_track(Cli* cli, FuriString* args, void* context) {
     }
 }
 
-void cli_command_sysctl_print_usage() {
+void cli_command_sysctl_print_usage(void) {
     printf("Usage:\r\n");
     printf("sysctl <cmd> <args>\r\n");
     printf("Cmd list:\r\n");
diff --git a/applications/services/cli/cli_i.h b/applications/services/cli/cli_i.h
index 858cd0c8f..8a82d9619 100644
--- a/applications/services/cli/cli_i.h
+++ b/applications/services/cli/cli_i.h
@@ -54,7 +54,7 @@ struct Cli {
     size_t cursor_position;
 };
 
-Cli* cli_alloc();
+Cli* cli_alloc(void);
 
 void cli_reset(Cli* cli);
 
diff --git a/applications/services/cli/cli_vcp.c b/applications/services/cli/cli_vcp.c
index 454c99d7a..58c5c887f 100644
--- a/applications/services/cli/cli_vcp.c
+++ b/applications/services/cli/cli_vcp.c
@@ -64,7 +64,7 @@ static CliVcp* vcp = NULL;
 static const uint8_t ascii_soh = 0x01;
 static const uint8_t ascii_eot = 0x04;
 
-static void cli_vcp_init() {
+static void cli_vcp_init(void) {
     if(vcp == NULL) {
         vcp = malloc(sizeof(CliVcp));
         vcp->tx_stream = furi_stream_buffer_alloc(VCP_TX_BUF_SIZE, 1);
@@ -80,7 +80,7 @@ static void cli_vcp_init() {
     FURI_LOG_I(TAG, "Init OK");
 }
 
-static void cli_vcp_deinit() {
+static void cli_vcp_deinit(void) {
     furi_thread_flags_set(furi_thread_get_id(vcp->thread), VcpEvtStop);
     furi_thread_join(vcp->thread);
     furi_thread_free(vcp->thread);
diff --git a/applications/services/crypto/crypto_cli.c b/applications/services/crypto/crypto_cli.c
index bfd2003e1..1fc19e48b 100644
--- a/applications/services/crypto/crypto_cli.c
+++ b/applications/services/crypto/crypto_cli.c
@@ -4,7 +4,7 @@
 #include <lib/toolbox/args.h>
 #include <cli/cli.h>
 
-void crypto_cli_print_usage() {
+void crypto_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("crypto <cmd> <args>\r\n");
     printf("Cmd list:\r\n");
@@ -316,7 +316,7 @@ static void crypto_cli(Cli* cli, FuriString* args, void* context) {
     furi_string_free(cmd);
 }
 
-void crypto_on_system_start() {
+void crypto_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
     cli_add_command(cli, "crypto", CliCommandFlagDefault, crypto_cli, NULL);
diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 9d26d473e..a0f64990f 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -32,12 +32,16 @@ static void desktop_loader_callback(const void* message, void* context) {
     Desktop* desktop = context;
     const LoaderEvent* event = message;
 
-    if(event->type == LoaderEventTypeApplicationStarted) {
+    if(event->type == LoaderEventTypeApplicationBeforeLoad) {
         view_dispatcher_send_custom_event(desktop->view_dispatcher, DesktopGlobalBeforeAppStarted);
-    } else if(event->type == LoaderEventTypeApplicationStopped) {
+        furi_check(furi_semaphore_acquire(desktop->animation_semaphore, 3000) == FuriStatusOk);
+    } else if(
+        event->type == LoaderEventTypeApplicationLoadFailed ||
+        event->type == LoaderEventTypeApplicationStopped) {
         view_dispatcher_send_custom_event(desktop->view_dispatcher, DesktopGlobalAfterAppFinished);
     }
 }
+
 static void desktop_lock_icon_draw_callback(Canvas* canvas, void* context) {
     UNUSED(context);
     furi_assert(canvas);
@@ -120,8 +124,11 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
 
     switch(event) {
     case DesktopGlobalBeforeAppStarted:
-        animation_manager_unload_and_stall_animation(desktop->animation_manager);
+        if(animation_manager_is_animation_loaded(desktop->animation_manager)) {
+            animation_manager_unload_and_stall_animation(desktop->animation_manager);
+        }
         desktop_auto_lock_inhibit(desktop);
+        furi_semaphore_release(desktop->animation_semaphore);
         return true;
     case DesktopGlobalAfterAppFinished:
         animation_manager_load_and_continue_animation(desktop->animation_manager);
@@ -268,9 +275,10 @@ void desktop_set_stealth_mode_state(Desktop* desktop, bool enabled) {
     desktop->in_transition = false;
 }
 
-Desktop* desktop_alloc() {
+Desktop* desktop_alloc(void) {
     Desktop* desktop = malloc(sizeof(Desktop));
 
+    desktop->animation_semaphore = furi_semaphore_alloc(1, 0);
     desktop->animation_manager = animation_manager_alloc();
     desktop->gui = furi_record_open(RECORD_GUI);
     desktop->scene_thread = furi_thread_alloc();
diff --git a/applications/services/desktop/desktop_i.h b/applications/services/desktop/desktop_i.h
index bb495c920..c0b29f922 100644
--- a/applications/services/desktop/desktop_i.h
+++ b/applications/services/desktop/desktop_i.h
@@ -80,9 +80,11 @@ struct Desktop {
     bool time_format_12 : 1; // 1 - 12 hour, 0 - 24H
 
     bool in_transition : 1;
+
+    FuriSemaphore* animation_semaphore;
 };
 
-Desktop* desktop_alloc();
+Desktop* desktop_alloc(void);
 
 void desktop_free(Desktop* desktop);
 void desktop_lock(Desktop* desktop);
diff --git a/applications/services/desktop/helpers/pin.c b/applications/services/desktop/helpers/pin.c
index 8a79a1fb8..374b569f0 100644
--- a/applications/services/desktop/helpers/pin.c
+++ b/applications/services/desktop/helpers/pin.c
@@ -42,13 +42,13 @@ static const uint8_t desktop_helpers_fails_timeout[] = {
     /* +60 for every next fail */
 };
 
-void desktop_pin_lock_error_notify() {
+void desktop_pin_lock_error_notify(void) {
     NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
     notification_message(notification, &sequence_pin_fail);
     furi_record_close(RECORD_NOTIFICATION);
 }
 
-uint32_t desktop_pin_lock_get_fail_timeout() {
+uint32_t desktop_pin_lock_get_fail_timeout(void) {
     uint32_t pin_fails = furi_hal_rtc_get_pin_fails();
     uint32_t pin_timeout = 0;
     uint32_t max_index = COUNT_OF(desktop_helpers_fails_timeout) - 1;
diff --git a/applications/services/desktop/helpers/pin.h b/applications/services/desktop/helpers/pin.h
index e5410723e..23d16b0aa 100644
--- a/applications/services/desktop/helpers/pin.h
+++ b/applications/services/desktop/helpers/pin.h
@@ -4,8 +4,8 @@
 #include "../desktop.h"
 #include <desktop/desktop_settings.h>
 
-void desktop_pin_lock_error_notify();
+void desktop_pin_lock_error_notify(void);
 
-uint32_t desktop_pin_lock_get_fail_timeout();
+uint32_t desktop_pin_lock_get_fail_timeout(void);
 
 bool desktop_pin_compare(const PinCode* pin_code1, const PinCode* pin_code2);
diff --git a/applications/services/desktop/helpers/slideshow.c b/applications/services/desktop/helpers/slideshow.c
index a8e132779..efd02c4bc 100644
--- a/applications/services/desktop/helpers/slideshow.c
+++ b/applications/services/desktop/helpers/slideshow.c
@@ -33,7 +33,7 @@ _Static_assert(sizeof(SlideshowFrameHeader) == 2, "Incorrect SlideshowFrameHeade
 
 #pragma pack(pop)
 
-Slideshow* slideshow_alloc() {
+Slideshow* slideshow_alloc(void) {
     Slideshow* ret = malloc(sizeof(Slideshow));
     ret->loaded = false;
     return ret;
diff --git a/applications/services/desktop/helpers/slideshow.h b/applications/services/desktop/helpers/slideshow.h
index 9083e0dcf..cd4d2334f 100644
--- a/applications/services/desktop/helpers/slideshow.h
+++ b/applications/services/desktop/helpers/slideshow.h
@@ -4,7 +4,7 @@
 
 typedef struct Slideshow Slideshow;
 
-Slideshow* slideshow_alloc();
+Slideshow* slideshow_alloc(void);
 
 void slideshow_free(Slideshow* slideshow);
 bool slideshow_load(Slideshow* slideshow, const char* fspath);
diff --git a/applications/services/desktop/scenes/desktop_scene_main.c b/applications/services/desktop/scenes/desktop_scene_main.c
index 877ef5307..d6c334d7e 100644
--- a/applications/services/desktop/scenes/desktop_scene_main.c
+++ b/applications/services/desktop/scenes/desktop_scene_main.c
@@ -68,27 +68,25 @@ static inline bool desktop_scene_main_check_none(const char* str) {
 static void desktop_scene_main_open_app_or_profile(Desktop* desktop, FavoriteApp* application) {
     bool load_ok = false;
     if(strlen(application->name_or_path) > 0) {
-        if(desktop_scene_main_check_none(application->name_or_path)) {
-            // skip loading
-            load_ok = true;
-        } else if(
-            loader_start(desktop->loader, application->name_or_path, NULL, NULL) ==
-            LoaderStatusOk) {
-            load_ok = true;
+        if(!desktop_scene_main_check_none(application->name_or_path)) {
+            // Load app
+            loader_start_detached_with_gui_error(desktop->loader, application->name_or_path, NULL);
         }
+        load_ok = true;
     }
+    // In case of "default" setting
     if(!load_ok) {
-        loader_start(desktop->loader, "Passport", NULL, NULL);
+        loader_start_detached_with_gui_error(desktop->loader, "Passport", NULL);
     }
 }
 
 static void desktop_scene_main_start_favorite(Desktop* desktop, FavoriteApp* application) {
     if(strlen(application->name_or_path) > 0) {
         if(!desktop_scene_main_check_none(application->name_or_path)) {
-            loader_start_with_gui_error(desktop->loader, application->name_or_path, NULL);
+            loader_start_detached_with_gui_error(desktop->loader, application->name_or_path, NULL);
         }
     } else {
-        loader_start(desktop->loader, LOADER_APPLICATIONS_NAME, NULL, NULL);
+        loader_start_detached_with_gui_error(desktop->loader, LOADER_APPLICATIONS_NAME, NULL);
     }
 }
 
@@ -152,7 +150,7 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
             break;
 
         case DesktopMainEventOpenPowerOff: {
-            loader_start(desktop->loader, "Power", "off", NULL);
+            loader_start_detached_with_gui_error(desktop->loader, "Power", "off");
             consumed = true;
             break;
         }
diff --git a/applications/services/desktop/scenes/desktop_scene_pin_input.c b/applications/services/desktop/scenes/desktop_scene_pin_input.c
index a21c59e38..f6de987bf 100644
--- a/applications/services/desktop/scenes/desktop_scene_pin_input.c
+++ b/applications/services/desktop/scenes/desktop_scene_pin_input.c
@@ -20,6 +20,7 @@
 
 typedef struct {
     FuriTimer* timer;
+    FuriString* enter_pin_string;
 } DesktopScenePinInputState;
 
 static void desktop_scene_locked_light_red(bool value) {
@@ -69,6 +70,18 @@ static void desktop_scene_pin_input_timer_callback(void* context) {
         desktop->view_dispatcher, DesktopPinInputEventResetWrongPinLabel);
 }
 
+static void
+    desktop_scene_pin_input_update_wrong_count(DesktopScenePinInputState* state, Desktop* desktop) {
+    uint32_t attempts = furi_hal_rtc_get_pin_fails();
+    if(attempts > 0) {
+        furi_string_printf(state->enter_pin_string, "Wrong Attempts: %lu", attempts);
+        desktop_view_pin_input_set_label_tertiary(
+            desktop->pin_input_view, 64, 60, furi_string_get_cstr(state->enter_pin_string));
+    } else {
+        desktop_view_pin_input_set_label_tertiary(desktop->pin_input_view, 64, 60, NULL);
+    }
+}
+
 void desktop_scene_pin_input_on_enter(void* context) {
     Desktop* desktop = (Desktop*)context;
 
@@ -81,6 +94,7 @@ void desktop_scene_pin_input_on_enter(void* context) {
         desktop->pin_input_view, desktop_scene_pin_input_done_callback);
 
     DesktopScenePinInputState* state = malloc(sizeof(DesktopScenePinInputState));
+    state->enter_pin_string = furi_string_alloc();
     state->timer =
         furi_timer_alloc(desktop_scene_pin_input_timer_callback, FuriTimerTypeOnce, desktop);
     scene_manager_set_scene_state(desktop->scene_manager, DesktopScenePinInput, (uint32_t)state);
@@ -88,6 +102,7 @@ void desktop_scene_pin_input_on_enter(void* context) {
     desktop_view_pin_input_hide_pin(desktop->pin_input_view, true);
     desktop_view_pin_input_set_label_button(desktop->pin_input_view, "OK");
     desktop_view_pin_input_set_label_secondary(desktop->pin_input_view, 44, 25, "Enter PIN:");
+    desktop_scene_pin_input_update_wrong_count(state, desktop);
     desktop_view_pin_input_set_pin_position(desktop->pin_input_view, 64, 37);
     desktop_view_pin_input_reset_pin(desktop->pin_input_view);
 
@@ -98,7 +113,8 @@ bool desktop_scene_pin_input_on_event(void* context, SceneManagerEvent event) {
     Desktop* desktop = (Desktop*)context;
     bool consumed = false;
     uint32_t pin_timeout = 0;
-
+    DesktopScenePinInputState* state = (DesktopScenePinInputState*)scene_manager_get_scene_state(
+        desktop->scene_manager, DesktopScenePinInput);
     if(event.type == SceneManagerEventTypeCustom) {
         switch(event.event) {
         case DesktopPinInputEventUnlockFailed:
@@ -114,6 +130,7 @@ bool desktop_scene_pin_input_on_event(void* context, SceneManagerEvent event) {
                 desktop_view_pin_input_set_label_secondary(
                     desktop->pin_input_view, 25, 25, "Wrong PIN try again:");
                 desktop_scene_pin_input_set_timer(desktop, true, WRONG_PIN_HEADER_TIMEOUT);
+                desktop_scene_pin_input_update_wrong_count(state, desktop);
                 desktop_view_pin_input_reset_pin(desktop->pin_input_view);
             }
             consumed = true;
@@ -123,6 +140,7 @@ bool desktop_scene_pin_input_on_event(void* context, SceneManagerEvent event) {
             desktop_view_pin_input_set_label_primary(desktop->pin_input_view, 0, 0, NULL);
             desktop_view_pin_input_set_label_secondary(
                 desktop->pin_input_view, 44, 25, "Enter PIN:");
+            desktop_scene_pin_input_update_wrong_count(state, desktop);
             consumed = true;
             break;
         case DesktopPinInputEventUnlocked:
@@ -150,5 +168,6 @@ void desktop_scene_pin_input_on_exit(void* context) {
         desktop->scene_manager, DesktopScenePinInput);
 
     furi_timer_free(state->timer);
+    furi_string_free(state->enter_pin_string);
     free(state);
 }
diff --git a/applications/services/desktop/views/desktop_view_debug.c b/applications/services/desktop/views/desktop_view_debug.c
index fef2356ba..fe9d9e161 100644
--- a/applications/services/desktop/views/desktop_view_debug.c
+++ b/applications/services/desktop/views/desktop_view_debug.c
@@ -117,7 +117,7 @@ void desktop_debug_timer(void* context) {
     view_commit_model(debug_view->view, true);
 }
 
-DesktopDebugView* desktop_debug_alloc() {
+DesktopDebugView* desktop_debug_alloc(void) {
     DesktopDebugView* debug_view = malloc(sizeof(DesktopDebugView));
     debug_view->view = view_alloc();
     debug_view->timer = furi_timer_alloc(desktop_debug_timer, FuriTimerTypePeriodic, debug_view);
diff --git a/applications/services/desktop/views/desktop_view_debug.h b/applications/services/desktop/views/desktop_view_debug.h
index fea0c22a0..c594002af 100644
--- a/applications/services/desktop/views/desktop_view_debug.h
+++ b/applications/services/desktop/views/desktop_view_debug.h
@@ -22,6 +22,6 @@ void desktop_debug_set_callback(
 
 View* desktop_debug_get_view(DesktopDebugView* debug_view);
 
-DesktopDebugView* desktop_debug_alloc();
+DesktopDebugView* desktop_debug_alloc(void);
 
 void desktop_debug_free(DesktopDebugView* debug_view);
diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c
index 4665e5e15..83f7ee501 100644
--- a/applications/services/desktop/views/desktop_view_lock_menu.c
+++ b/applications/services/desktop/views/desktop_view_lock_menu.c
@@ -149,7 +149,7 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) {
     return consumed;
 }
 
-DesktopLockMenuView* desktop_lock_menu_alloc() {
+DesktopLockMenuView* desktop_lock_menu_alloc(void) {
     DesktopLockMenuView* lock_menu = malloc(sizeof(DesktopLockMenuView));
     lock_menu->view = view_alloc();
     view_allocate_model(lock_menu->view, ViewModelTypeLocking, sizeof(DesktopLockMenuViewModel));
diff --git a/applications/services/desktop/views/desktop_view_lock_menu.h b/applications/services/desktop/views/desktop_view_lock_menu.h
index 8ac3a7273..a44e6b132 100644
--- a/applications/services/desktop/views/desktop_view_lock_menu.h
+++ b/applications/services/desktop/views/desktop_view_lock_menu.h
@@ -30,5 +30,5 @@ View* desktop_lock_menu_get_view(DesktopLockMenuView* lock_menu);
 void desktop_lock_menu_set_dummy_mode_state(DesktopLockMenuView* lock_menu, bool dummy_mode);
 void desktop_lock_menu_set_stealth_mode_state(DesktopLockMenuView* lock_menu, bool stealth_mode);
 void desktop_lock_menu_set_idx(DesktopLockMenuView* lock_menu, uint8_t idx);
-DesktopLockMenuView* desktop_lock_menu_alloc();
+DesktopLockMenuView* desktop_lock_menu_alloc(void);
 void desktop_lock_menu_free(DesktopLockMenuView* lock_menu);
diff --git a/applications/services/desktop/views/desktop_view_locked.c b/applications/services/desktop/views/desktop_view_locked.c
index 97feb3c12..53c86d810 100644
--- a/applications/services/desktop/views/desktop_view_locked.c
+++ b/applications/services/desktop/views/desktop_view_locked.c
@@ -14,14 +14,14 @@
 #define LOCKED_HINT_TIMEOUT_MS (1000)
 #define UNLOCKED_HINT_TIMEOUT_MS (2000)
 
-#define DOOR_OFFSET_START -55
-#define DOOR_OFFSET_END 0
+#define DOOR_OFFSET_START (-55)
+#define DOOR_OFFSET_END (0)
 
-#define DOOR_L_FINAL_POS 0
-#define DOOR_R_FINAL_POS 60
+#define DOOR_L_FINAL_POS (0)
+#define DOOR_R_FINAL_POS (60)
 
-#define UNLOCK_CNT 3
-#define UNLOCK_RST_TIMEOUT 600
+#define UNLOCK_CNT (3)
+#define UNLOCK_RST_TIMEOUT (600)
 
 struct DesktopViewLocked {
     View* view;
@@ -63,10 +63,10 @@ static void locked_view_timer_callback(void* context) {
 }
 
 static void desktop_view_locked_doors_draw(Canvas* canvas, DesktopViewLockedModel* model) {
-    int8_t offset = model->door_offset;
-    uint8_t door_left_x = DOOR_L_FINAL_POS + offset;
-    uint8_t door_right_x = DOOR_R_FINAL_POS - offset;
-    uint8_t height = icon_get_height(&I_DoorLeft_70x55);
+    int32_t offset = model->door_offset;
+    int32_t door_left_x = DOOR_L_FINAL_POS + offset;
+    int32_t door_right_x = DOOR_R_FINAL_POS - offset;
+    size_t height = icon_get_height(&I_DoorLeft_70x55);
     canvas_draw_icon(canvas, door_left_x, canvas_height(canvas) - height, &I_DoorLeft_70x55);
     canvas_draw_icon(canvas, door_right_x, canvas_height(canvas) - height, &I_DoorRight_70x55);
 }
@@ -191,7 +191,7 @@ static bool desktop_view_locked_input(InputEvent* event, void* context) {
     return true;
 }
 
-DesktopViewLocked* desktop_view_locked_alloc() {
+DesktopViewLocked* desktop_view_locked_alloc(void) {
     DesktopViewLocked* locked_view = malloc(sizeof(DesktopViewLocked));
     locked_view->view = view_alloc();
     locked_view->timer =
diff --git a/applications/services/desktop/views/desktop_view_locked.h b/applications/services/desktop/views/desktop_view_locked.h
index ea065e398..233cc8d5d 100644
--- a/applications/services/desktop/views/desktop_view_locked.h
+++ b/applications/services/desktop/views/desktop_view_locked.h
@@ -14,7 +14,7 @@ void desktop_view_locked_set_callback(
     void* context);
 void desktop_view_locked_update(DesktopViewLocked* locked_view);
 View* desktop_view_locked_get_view(DesktopViewLocked* locked_view);
-DesktopViewLocked* desktop_view_locked_alloc();
+DesktopViewLocked* desktop_view_locked_alloc(void);
 void desktop_view_locked_free(DesktopViewLocked* locked_view);
 void desktop_view_locked_lock(DesktopViewLocked* locked_view, bool pin_locked);
 void desktop_view_locked_unlock(DesktopViewLocked* locked_view);
diff --git a/applications/services/desktop/views/desktop_view_main.c b/applications/services/desktop/views/desktop_view_main.c
index ace0674e1..ac84cc5d9 100644
--- a/applications/services/desktop/views/desktop_view_main.c
+++ b/applications/services/desktop/views/desktop_view_main.c
@@ -119,7 +119,7 @@ bool desktop_main_input_callback(InputEvent* event, void* context) {
     return true;
 }
 
-DesktopMainView* desktop_main_alloc() {
+DesktopMainView* desktop_main_alloc(void) {
     DesktopMainView* main_view = malloc(sizeof(DesktopMainView));
 
     main_view->view = view_alloc();
diff --git a/applications/services/desktop/views/desktop_view_main.h b/applications/services/desktop/views/desktop_view_main.h
index b5492b1be..755d6b2af 100644
--- a/applications/services/desktop/views/desktop_view_main.h
+++ b/applications/services/desktop/views/desktop_view_main.h
@@ -14,5 +14,5 @@ void desktop_main_set_callback(
 
 View* desktop_main_get_view(DesktopMainView* main_view);
 void desktop_main_set_dummy_mode_state(DesktopMainView* main_view, bool dummy_mode);
-DesktopMainView* desktop_main_alloc();
+DesktopMainView* desktop_main_alloc(void);
 void desktop_main_free(DesktopMainView* 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 0894bb776..c859b9b02 100644
--- a/applications/services/desktop/views/desktop_view_pin_input.c
+++ b/applications/services/desktop/views/desktop_view_pin_input.c
@@ -35,6 +35,9 @@ typedef struct {
     const char* secondary_str;
     uint8_t secondary_str_x;
     uint8_t secondary_str_y;
+    const char* tertiary_str;
+    uint8_t tertiary_str_x;
+    uint8_t tertiary_str_y;
     const char* button_label;
 } DesktopViewPinInputModel;
 
@@ -167,6 +170,17 @@ static void desktop_view_pin_input_draw(Canvas* canvas, void* context) {
         canvas_draw_str(
             canvas, model->secondary_str_x, model->secondary_str_y, model->secondary_str);
     }
+
+    if(model->tertiary_str && model->pin.length == 0) {
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str_aligned(
+            canvas,
+            model->tertiary_str_x,
+            model->tertiary_str_y,
+            AlignCenter,
+            AlignBottom,
+            model->tertiary_str);
+    }
 }
 
 void desktop_view_pin_input_timer_callback(void* context) {
@@ -294,6 +308,20 @@ void desktop_view_pin_input_set_label_secondary(
     view_commit_model(pin_input->view, true);
 }
 
+void desktop_view_pin_input_set_label_tertiary(
+    DesktopViewPinInput* pin_input,
+    uint8_t x,
+    uint8_t y,
+    const char* label) {
+    furi_assert(pin_input);
+
+    DesktopViewPinInputModel* model = view_get_model(pin_input->view);
+    model->tertiary_str = label;
+    model->tertiary_str_x = x;
+    model->tertiary_str_y = y;
+    view_commit_model(pin_input->view, true);
+}
+
 void desktop_view_pin_input_set_pin_position(DesktopViewPinInput* pin_input, uint8_t x, uint8_t y) {
     furi_assert(pin_input);
 
diff --git a/applications/services/desktop/views/desktop_view_pin_input.h b/applications/services/desktop/views/desktop_view_pin_input.h
index 40eee4cc9..c430aff9f 100644
--- a/applications/services/desktop/views/desktop_view_pin_input.h
+++ b/applications/services/desktop/views/desktop_view_pin_input.h
@@ -24,6 +24,11 @@ void desktop_view_pin_input_set_label_secondary(
     uint8_t x,
     uint8_t y,
     const char* label);
+void desktop_view_pin_input_set_label_tertiary(
+    DesktopViewPinInput* pin_input,
+    uint8_t x,
+    uint8_t y,
+    const char* label);
 void desktop_view_pin_input_set_pin_position(DesktopViewPinInput* pin_input, uint8_t x, uint8_t y);
 View* desktop_view_pin_input_get_view(DesktopViewPinInput*);
 void desktop_view_pin_input_set_done_callback(
diff --git a/applications/services/desktop/views/desktop_view_slideshow.c b/applications/services/desktop/views/desktop_view_slideshow.c
index e528d6878..db7c69811 100644
--- a/applications/services/desktop/views/desktop_view_slideshow.c
+++ b/applications/services/desktop/views/desktop_view_slideshow.c
@@ -105,7 +105,7 @@ static void desktop_view_slideshow_exit(void* context) {
     view_commit_model(instance->view, false);
 }
 
-DesktopSlideshowView* desktop_view_slideshow_alloc() {
+DesktopSlideshowView* desktop_view_slideshow_alloc(void) {
     DesktopSlideshowView* instance = malloc(sizeof(DesktopSlideshowView));
     instance->view = view_alloc();
     view_allocate_model(instance->view, ViewModelTypeLocking, sizeof(DesktopSlideshowViewModel));
diff --git a/applications/services/desktop/views/desktop_view_slideshow.h b/applications/services/desktop/views/desktop_view_slideshow.h
index 624cbf007..b9e610c62 100644
--- a/applications/services/desktop/views/desktop_view_slideshow.h
+++ b/applications/services/desktop/views/desktop_view_slideshow.h
@@ -11,7 +11,7 @@ typedef struct DesktopSlideshowView DesktopSlideshowView;
 
 typedef void (*DesktopSlideshowViewCallback)(DesktopEvent event, void* context);
 
-DesktopSlideshowView* desktop_view_slideshow_alloc();
+DesktopSlideshowView* desktop_view_slideshow_alloc(void);
 
 void desktop_view_slideshow_free(DesktopSlideshowView* main_view);
 
diff --git a/applications/services/dialogs/dialogs.c b/applications/services/dialogs/dialogs.c
index 10c08a991..ec1289d5b 100644
--- a/applications/services/dialogs/dialogs.c
+++ b/applications/services/dialogs/dialogs.c
@@ -8,6 +8,7 @@ void dialog_file_browser_set_basic_options(
     DialogsFileBrowserOptions* options,
     const char* extension,
     const Icon* icon) {
+    furi_check(options);
     options->extension = extension;
     options->base_path = NULL;
     options->skip_assets = true;
@@ -18,7 +19,7 @@ void dialog_file_browser_set_basic_options(
     options->item_loader_context = NULL;
 }
 
-static DialogsApp* dialogs_app_alloc() {
+static DialogsApp* dialogs_app_alloc(void) {
     DialogsApp* app = malloc(sizeof(DialogsApp));
     app->message_queue = furi_message_queue_alloc(8, sizeof(DialogsAppMessage));
 
diff --git a/applications/services/dialogs/dialogs.h b/applications/services/dialogs/dialogs.h
index 39b15c67c..b8beddc5e 100644
--- a/applications/services/dialogs/dialogs.h
+++ b/applications/services/dialogs/dialogs.h
@@ -87,7 +87,7 @@ typedef struct DialogMessage DialogMessage;
  * Allocate and fill message
  * @return DialogMessage* 
  */
-DialogMessage* dialog_message_alloc();
+DialogMessage* dialog_message_alloc(void);
 
 /**
  * Free message struct
diff --git a/applications/services/dialogs/dialogs_api.c b/applications/services/dialogs/dialogs_api.c
index 4723a1f91..73d1d876a 100644
--- a/applications/services/dialogs/dialogs_api.c
+++ b/applications/services/dialogs/dialogs_api.c
@@ -65,6 +65,8 @@ bool dialog_file_browser_show(
 /****************** Message ******************/
 
 DialogMessageButton dialog_message_show(DialogsApp* context, const DialogMessage* dialog_message) {
+    furi_check(context);
+
     FuriApiLock lock = api_lock_alloc_locked();
     furi_check(lock != NULL);
 
@@ -91,6 +93,8 @@ DialogMessageButton dialog_message_show(DialogsApp* context, const DialogMessage
 /****************** Storage error ******************/
 
 void dialog_message_show_storage_error(DialogsApp* context, const char* error_text) {
+    furi_check(context);
+
     DialogMessage* message = dialog_message_alloc();
     dialog_message_set_text(message, error_text, 88, 32, AlignCenter, AlignCenter);
     dialog_message_set_icon(message, &I_SDQuestion_35x43, 5, 6);
diff --git a/applications/services/dialogs/dialogs_module_message.c b/applications/services/dialogs/dialogs_module_message.c
index 879ba9baa..69d28c405 100644
--- a/applications/services/dialogs/dialogs_module_message.c
+++ b/applications/services/dialogs/dialogs_module_message.c
@@ -101,12 +101,13 @@ DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDa
     return ret;
 }
 
-DialogMessage* dialog_message_alloc() {
+DialogMessage* dialog_message_alloc(void) {
     DialogMessage* message = malloc(sizeof(DialogMessage));
     return message;
 }
 
 void dialog_message_free(DialogMessage* message) {
+    furi_check(message);
     free(message);
 }
 
@@ -117,6 +118,8 @@ void dialog_message_set_text(
     uint8_t y,
     Align horizontal,
     Align vertical) {
+    furi_check(message);
+
     message->dialog_text = text;
     message->dialog_text_x = x;
     message->dialog_text_y = y;
@@ -131,6 +134,8 @@ void dialog_message_set_header(
     uint8_t y,
     Align horizontal,
     Align vertical) {
+    furi_check(message);
+
     message->header_text = text;
     message->header_text_x = x;
     message->header_text_y = y;
@@ -139,6 +144,8 @@ void dialog_message_set_header(
 }
 
 void dialog_message_set_icon(DialogMessage* message, const Icon* icon, uint8_t x, uint8_t y) {
+    furi_check(message);
+
     message->icon = icon;
     message->icon_x = x;
     message->icon_y = y;
@@ -149,6 +156,8 @@ void dialog_message_set_buttons(
     const char* left,
     const char* center,
     const char* right) {
+    furi_check(message);
+
     message->left_button_text = left;
     message->center_button_text = center;
     message->right_button_text = right;
diff --git a/applications/services/dolphin/dolphin.c b/applications/services/dolphin/dolphin.c
index e81101ba5..5f3d5cb28 100644
--- a/applications/services/dolphin/dolphin.c
+++ b/applications/services/dolphin/dolphin.c
@@ -22,7 +22,7 @@ void dolphin_deed(DolphinDeed deed) {
 }
 
 DolphinStats dolphin_stats(Dolphin* dolphin) {
-    furi_assert(dolphin);
+    furi_check(dolphin);
 
     DolphinStats stats;
     DolphinEvent event;
@@ -36,7 +36,7 @@ DolphinStats dolphin_stats(Dolphin* dolphin) {
 }
 
 void dolphin_flush(Dolphin* dolphin) {
-    furi_assert(dolphin);
+    furi_check(dolphin);
 
     DolphinEvent event;
     event.type = DolphinEventTypeFlush;
@@ -73,7 +73,7 @@ void dolphin_clear_limits_timer_callback(void* context) {
     dolphin_event_send_async(dolphin, &event);
 }
 
-Dolphin* dolphin_alloc() {
+Dolphin* dolphin_alloc(void) {
     Dolphin* dolphin = malloc(sizeof(Dolphin));
 
     dolphin->state = dolphin_state_alloc();
@@ -119,6 +119,7 @@ void dolphin_event_release(Dolphin* dolphin, DolphinEvent* event) {
 }
 
 FuriPubSub* dolphin_get_pubsub(Dolphin* dolphin) {
+    furi_check(dolphin);
     return dolphin->pubsub;
 }
 
@@ -201,6 +202,8 @@ int32_t dolphin_srv(void* p) {
 }
 
 void dolphin_upgrade_level(Dolphin* dolphin) {
+    furi_check(dolphin);
+
     dolphin_state_increase_level(dolphin->state);
     dolphin_flush(dolphin);
 }
diff --git a/applications/services/dolphin/dolphin_i.h b/applications/services/dolphin/dolphin_i.h
index 2d716c181..666e03942 100644
--- a/applications/services/dolphin/dolphin_i.h
+++ b/applications/services/dolphin/dolphin_i.h
@@ -35,7 +35,7 @@ struct Dolphin {
     FuriTimer* clear_limits_timer;
 };
 
-Dolphin* dolphin_alloc();
+Dolphin* dolphin_alloc(void);
 
 void dolphin_event_send_async(Dolphin* dolphin, DolphinEvent* event);
 
diff --git a/applications/services/dolphin/helpers/dolphin_state.c b/applications/services/dolphin/helpers/dolphin_state.c
index 842d6b715..55c2286d9 100644
--- a/applications/services/dolphin/helpers/dolphin_state.c
+++ b/applications/services/dolphin/helpers/dolphin_state.c
@@ -19,7 +19,7 @@
 #define BUTTHURT_MAX 14
 #define BUTTHURT_MIN 0
 
-DolphinState* dolphin_state_alloc() {
+DolphinState* dolphin_state_alloc(void) {
     return malloc(sizeof(DolphinState));
 }
 
@@ -73,7 +73,7 @@ bool dolphin_state_load(DolphinState* dolphin_state) {
     return success;
 }
 
-uint64_t dolphin_state_timestamp() {
+uint64_t dolphin_state_timestamp(void) {
     DateTime datetime;
     furi_hal_rtc_get_datetime(&datetime);
     return datetime_datetime_to_timestamp(&datetime);
diff --git a/applications/services/dolphin/helpers/dolphin_state.h b/applications/services/dolphin/helpers/dolphin_state.h
index 3e02fb872..a8d8406be 100644
--- a/applications/services/dolphin/helpers/dolphin_state.h
+++ b/applications/services/dolphin/helpers/dolphin_state.h
@@ -21,7 +21,7 @@ struct DolphinState {
     bool dirty;
 };
 
-DolphinState* dolphin_state_alloc();
+DolphinState* dolphin_state_alloc(void);
 
 void dolphin_state_free(DolphinState* dolphin_state);
 
@@ -31,7 +31,7 @@ bool dolphin_state_load(DolphinState* dolphin_state);
 
 void dolphin_state_clear_limits(DolphinState* dolphin_state);
 
-uint64_t dolphin_state_timestamp();
+uint64_t dolphin_state_timestamp(void);
 
 void dolphin_state_on_deed(DolphinState* dolphin_state, DolphinDeed deed);
 
diff --git a/applications/services/expansion/expansion.c b/applications/services/expansion/expansion.c
index 5b834b48d..9b0b31cf7 100644
--- a/applications/services/expansion/expansion.c
+++ b/applications/services/expansion/expansion.c
@@ -18,6 +18,7 @@ typedef enum {
     ExpansionStateDisabled,
     ExpansionStateEnabled,
     ExpansionStateRunning,
+    ExpansionStateConnectionEstablished,
 } ExpansionState;
 
 typedef enum {
@@ -26,10 +27,15 @@ typedef enum {
     ExpansionMessageTypeSetListenSerial,
     ExpansionMessageTypeModuleConnected,
     ExpansionMessageTypeModuleDisconnected,
+    ExpansionMessageTypeConnectionEstablished,
+    ExpansionMessageTypeIsConnected,
 } ExpansionMessageType;
 
 typedef union {
-    FuriHalSerialId serial_id;
+    union {
+        FuriHalSerialId serial_id;
+        bool* is_connected;
+    };
 } ExpansionMessageData;
 
 typedef struct {
@@ -68,13 +74,21 @@ static void expansion_detect_callback(void* context) {
     UNUSED(status);
 }
 
-static void expansion_worker_callback(void* context) {
+static void expansion_worker_callback(void* context, ExpansionWorkerCallbackReason reason) {
     furi_assert(context);
     Expansion* instance = context;
 
-    ExpansionMessage message = {
-        .type = ExpansionMessageTypeModuleDisconnected,
-        .api_lock = NULL, // Not locking the API here to avoid a deadlock
+    ExpansionMessage message;
+    switch(reason) {
+    case ExpansionWorkerCallbackReasonExit:
+        message.type = ExpansionMessageTypeModuleDisconnected;
+        message.api_lock = NULL; // Not locking the API here to avoid a deadlock
+        break;
+
+    case ExpansionWorkerCallbackReasonConnected:
+        message.type = ExpansionMessageTypeConnectionEstablished;
+        message.api_lock = api_lock_alloc_locked();
+        break;
     };
 
     const FuriStatus status = furi_message_queue_put(instance->queue, &message, FuriWaitForever);
@@ -105,7 +119,9 @@ static void
 
     if(instance->state == ExpansionStateDisabled) {
         return;
-    } else if(instance->state == ExpansionStateRunning) {
+    } else if(
+        instance->state == ExpansionStateRunning ||
+        instance->state == ExpansionStateConnectionEstablished) {
         expansion_worker_stop(instance->worker);
         expansion_worker_free(instance->worker);
     } else {
@@ -122,7 +138,8 @@ static void expansion_control_handler_set_listen_serial(
     const ExpansionMessageData* data) {
     furi_check(data->serial_id < FuriHalSerialIdMax);
 
-    if(instance->state == ExpansionStateRunning) {
+    if(instance->state == ExpansionStateRunning ||
+       instance->state == ExpansionStateConnectionEstablished) {
         expansion_worker_stop(instance->worker);
         expansion_worker_free(instance->worker);
 
@@ -160,7 +177,8 @@ static void expansion_control_handler_module_disconnected(
     Expansion* instance,
     const ExpansionMessageData* data) {
     UNUSED(data);
-    if(instance->state != ExpansionStateRunning) {
+    if(instance->state != ExpansionStateRunning &&
+       instance->state != ExpansionStateConnectionEstablished) {
         return;
     }
 
@@ -170,6 +188,23 @@ static void expansion_control_handler_module_disconnected(
         instance->serial_id, expansion_detect_callback, instance);
 }
 
+static void expansion_control_handler_connection_established(
+    Expansion* instance,
+    const ExpansionMessageData* data) {
+    UNUSED(data);
+    if(instance->state != ExpansionStateRunning &&
+       instance->state != ExpansionStateConnectionEstablished) {
+        return;
+    }
+
+    instance->state = ExpansionStateConnectionEstablished;
+}
+
+static void
+    expansion_control_handler_is_connected(Expansion* instance, const ExpansionMessageData* data) {
+    *data->is_connected = instance->state == ExpansionStateConnectionEstablished;
+}
+
 typedef void (*ExpansionControlHandler)(Expansion*, const ExpansionMessageData*);
 
 static const ExpansionControlHandler expansion_control_handlers[] = {
@@ -178,6 +213,8 @@ static const ExpansionControlHandler expansion_control_handlers[] = {
     [ExpansionMessageTypeSetListenSerial] = expansion_control_handler_set_listen_serial,
     [ExpansionMessageTypeModuleConnected] = expansion_control_handler_module_connected,
     [ExpansionMessageTypeModuleDisconnected] = expansion_control_handler_module_disconnected,
+    [ExpansionMessageTypeConnectionEstablished] = expansion_control_handler_connection_established,
+    [ExpansionMessageTypeIsConnected] = expansion_control_handler_is_connected,
 };
 
 static int32_t expansion_control(void* context) {
@@ -201,7 +238,7 @@ static int32_t expansion_control(void* context) {
     return 0;
 }
 
-static Expansion* expansion_alloc() {
+static Expansion* expansion_alloc(void) {
     Expansion* instance = malloc(sizeof(Expansion));
 
     instance->queue =
@@ -249,6 +286,22 @@ void expansion_disable(Expansion* instance) {
     api_lock_wait_unlock_and_free(message.api_lock);
 }
 
+bool expansion_is_connected(Expansion* instance) {
+    furi_check(instance);
+    bool is_connected;
+
+    ExpansionMessage message = {
+        .type = ExpansionMessageTypeIsConnected,
+        .data.is_connected = &is_connected,
+        .api_lock = api_lock_alloc_locked(),
+    };
+
+    furi_message_queue_put(instance->queue, &message, FuriWaitForever);
+    api_lock_wait_unlock_and_free(message.api_lock);
+
+    return is_connected;
+}
+
 void expansion_set_listen_serial(Expansion* instance, FuriHalSerialId serial_id) {
     furi_check(instance);
     furi_check(serial_id < FuriHalSerialIdMax);
diff --git a/applications/services/expansion/expansion.h b/applications/services/expansion/expansion.h
index e169b3c15..1b0879b1e 100644
--- a/applications/services/expansion/expansion.h
+++ b/applications/services/expansion/expansion.h
@@ -50,6 +50,15 @@ void expansion_enable(Expansion* instance);
  */
 void expansion_disable(Expansion* instance);
 
+/**
+ * @brief Check if an expansion module is connected.
+ *
+ * @param[in,out] instance pointer to the Expansion instance.
+ *
+ * @returns true if the module is connected and initialized, false otherwise.
+ */
+bool expansion_is_connected(Expansion* instance);
+
 /**
  * @brief Enable support for expansion modules on designated serial port.
  *
diff --git a/applications/services/expansion/expansion_settings.c b/applications/services/expansion/expansion_settings.c
index f350e2c56..c953e9dec 100644
--- a/applications/services/expansion/expansion_settings.c
+++ b/applications/services/expansion/expansion_settings.c
@@ -23,7 +23,7 @@ bool expansion_settings_load(ExpansionSettings* settings) {
     return true;
 }
 
-bool expansion_settings_save(ExpansionSettings* settings) {
+bool expansion_settings_save(const ExpansionSettings* settings) {
     furi_assert(settings);
     return saved_struct_save(
         EXPANSION_SETTINGS_PATH,
diff --git a/applications/services/expansion/expansion_settings.h b/applications/services/expansion/expansion_settings.h
index e7663f1b9..38e9f8d02 100644
--- a/applications/services/expansion/expansion_settings.h
+++ b/applications/services/expansion/expansion_settings.h
@@ -36,7 +36,7 @@ bool expansion_settings_load(ExpansionSettings* settings);
  * @param[in] settings pointer to an ExpansionSettings instance to save settings from.
  * @returns true if the settings were successfully saved, false otherwise.
  */
-bool expansion_settings_save(ExpansionSettings* settings);
+bool expansion_settings_save(const ExpansionSettings* settings);
 
 #ifdef __cplusplus
 }
diff --git a/applications/services/expansion/expansion_worker.c b/applications/services/expansion/expansion_worker.c
index fd92063d2..4047212eb 100644
--- a/applications/services/expansion/expansion_worker.c
+++ b/applications/services/expansion/expansion_worker.c
@@ -223,6 +223,7 @@ static bool expansion_worker_handle_state_handshake(
 
         if(furi_hal_serial_is_baud_rate_supported(instance->serial_handle, baud_rate)) {
             instance->state = ExpansionWorkerStateConnected;
+            instance->callback(instance->cb_context, ExpansionWorkerCallbackReasonConnected);
             // Send response at previous baud rate
             if(!expansion_worker_send_status_response(instance, ExpansionFrameErrorNone)) break;
             furi_hal_serial_set_br(instance->serial_handle, baud_rate);
@@ -351,7 +352,7 @@ static int32_t expansion_worker(void* context) {
 
     // Do not invoke worker callback on user-requested exit
     if((instance->exit_reason != ExpansionWorkerExitReasonUser) && (instance->callback != NULL)) {
-        instance->callback(instance->cb_context);
+        instance->callback(instance->cb_context, ExpansionWorkerCallbackReasonExit);
     }
 
     return 0;
diff --git a/applications/services/expansion/expansion_worker.h b/applications/services/expansion/expansion_worker.h
index 761f79c1d..faab2887f 100644
--- a/applications/services/expansion/expansion_worker.h
+++ b/applications/services/expansion/expansion_worker.h
@@ -17,14 +17,20 @@
  */
 typedef struct ExpansionWorker ExpansionWorker;
 
+typedef enum {
+    ExpansionWorkerCallbackReasonExit,
+    ExpansionWorkerCallbackReasonConnected,
+} ExpansionWorkerCallbackReason;
+
 /**
  * @brief Worker callback type.
  *
  * @see expansion_worker_set_callback()
  *
  * @param[in,out] context pointer to a user-defined object.
+ * @param[in] reason reason for the callback.
  */
-typedef void (*ExpansionWorkerCallback)(void* context);
+typedef void (*ExpansionWorkerCallback)(void* context, ExpansionWorkerCallbackReason reason);
 
 /**
  * @brief Create an expansion worker instance.
diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c
index 65a766543..a4932225e 100644
--- a/applications/services/gui/canvas.c
+++ b/applications/services/gui/canvas.c
@@ -14,7 +14,7 @@ const CanvasFontParameters canvas_font_params[FontTotalNumber] = {
     [FontBatteryPercent] = {.leading_default = 11, .leading_min = 9, .height = 6, .descender = 0},
 };
 
-Canvas* canvas_init() {
+Canvas* canvas_init(void) {
     Canvas* canvas = malloc(sizeof(Canvas));
     canvas->compress_icon = compress_icon_alloc();
 
@@ -40,7 +40,7 @@ Canvas* canvas_init() {
 }
 
 void canvas_free(Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     compress_icon_free(canvas->compress_icon);
     CanvasCallbackPairArray_clear(canvas->canvas_callback_pair);
     furi_mutex_free(canvas->mutex);
@@ -58,7 +58,7 @@ static void canvas_unlock(Canvas* canvas) {
 }
 
 void canvas_reset(Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
 
     canvas_clear(canvas);
 
@@ -68,7 +68,7 @@ void canvas_reset(Canvas* canvas) {
 }
 
 void canvas_commit(Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_SendBuffer(&canvas->fb);
 
     // Iterate over callbacks
@@ -85,41 +85,41 @@ void canvas_commit(Canvas* canvas) {
 }
 
 uint8_t* canvas_get_buffer(Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     return u8g2_GetBufferPtr(&canvas->fb);
 }
 
 size_t canvas_get_buffer_size(const Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     return u8g2_GetBufferTileWidth(&canvas->fb) * u8g2_GetBufferTileHeight(&canvas->fb) * 8;
 }
 
 void canvas_frame_set(
     Canvas* canvas,
-    uint8_t offset_x,
-    uint8_t offset_y,
-    uint8_t width,
-    uint8_t height) {
-    furi_assert(canvas);
+    int32_t offset_x,
+    int32_t offset_y,
+    size_t width,
+    size_t height) {
+    furi_check(canvas);
     canvas->offset_x = offset_x;
     canvas->offset_y = offset_y;
     canvas->width = width;
     canvas->height = height;
 }
 
-uint8_t canvas_width(const Canvas* canvas) {
-    furi_assert(canvas);
+size_t canvas_width(const Canvas* canvas) {
+    furi_check(canvas);
     return canvas->width;
 }
 
-uint8_t canvas_height(const Canvas* canvas) {
-    furi_assert(canvas);
+size_t canvas_height(const Canvas* canvas) {
+    furi_check(canvas);
     return canvas->height;
 }
 
-uint8_t canvas_current_font_height(const Canvas* canvas) {
-    furi_assert(canvas);
-    uint8_t font_height = u8g2_GetMaxCharHeight(&canvas->fb);
+size_t canvas_current_font_height(const Canvas* canvas) {
+    furi_check(canvas);
+    size_t font_height = u8g2_GetMaxCharHeight(&canvas->fb);
 
     if(canvas->fb.font == u8g2_font_haxrcorp4089_tr) {
         font_height += 1;
@@ -128,29 +128,29 @@ uint8_t canvas_current_font_height(const Canvas* canvas) {
     return font_height;
 }
 
-uint8_t canvas_current_font_width(const Canvas* canvas) {
+size_t canvas_current_font_width(const Canvas* canvas) {
     furi_assert(canvas);
-    return (uint8_t)u8g2_GetMaxCharWidth(&canvas->fb);
+    return (size_t)u8g2_GetMaxCharWidth(&canvas->fb);
 }
 
 const CanvasFontParameters* canvas_get_font_params(const Canvas* canvas, Font font) {
-    furi_assert(canvas);
-    furi_assert(font < FontTotalNumber);
+    furi_check(canvas);
+    furi_check(font < FontTotalNumber);
     return &canvas_font_params[font];
 }
 
 void canvas_clear(Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_ClearBuffer(&canvas->fb);
 }
 
 void canvas_set_color(Canvas* canvas, Color color) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_SetDrawColor(&canvas->fb, color);
 }
 
 void canvas_set_font_direction(Canvas* canvas, CanvasDirection dir) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_SetFontDirection(&canvas->fb, dir);
 }
 
@@ -159,7 +159,7 @@ void canvas_invert_color(Canvas* canvas) {
 }
 
 void canvas_set_font(Canvas* canvas, Font font) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_SetFontMode(&canvas->fb, 1);
     if(font == FontPrimary) {
         u8g2_SetFont(&canvas->fb, u8g2_font_helvB08_tr);
@@ -177,27 +177,27 @@ void canvas_set_font(Canvas* canvas, Font font) {
 }
 
 void canvas_set_custom_u8g2_font(Canvas* canvas, const uint8_t* font) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_SetFontMode(&canvas->fb, 1);
     u8g2_SetFont(&canvas->fb, font);
 }
 
-void canvas_draw_str(Canvas* canvas, uint8_t x, uint8_t y, const char* str) {
-    furi_assert(canvas);
+void canvas_draw_str(Canvas* canvas, int32_t x, int32_t y, const char* str) {
+    furi_check(canvas);
     if(!str) return;
     x += canvas->offset_x;
     y += canvas->offset_y;
-    u8g2_DrawStr(&canvas->fb, x, y, str);
+    u8g2_DrawUTF8(&canvas->fb, x, y, str);
 }
 
 void canvas_draw_str_aligned(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
+    int32_t x,
+    int32_t y,
     Align horizontal,
     Align vertical,
     const char* str) {
-    furi_assert(canvas);
+    furi_check(canvas);
     if(!str) return;
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -206,10 +206,10 @@ void canvas_draw_str_aligned(
     case AlignLeft:
         break;
     case AlignRight:
-        x -= u8g2_GetStrWidth(&canvas->fb, str);
+        x -= u8g2_GetUTF8Width(&canvas->fb, str);
         break;
     case AlignCenter:
-        x -= (u8g2_GetStrWidth(&canvas->fb, str) / 2);
+        x -= (u8g2_GetUTF8Width(&canvas->fb, str) / 2);
         break;
     default:
         furi_crash();
@@ -230,28 +230,28 @@ void canvas_draw_str_aligned(
         break;
     }
 
-    u8g2_DrawStr(&canvas->fb, x, y, str);
+    u8g2_DrawUTF8(&canvas->fb, x, y, str);
 }
 
 uint16_t canvas_string_width(Canvas* canvas, const char* str) {
-    furi_assert(canvas);
+    furi_check(canvas);
     if(!str) return 0;
-    return u8g2_GetStrWidth(&canvas->fb, str);
+    return u8g2_GetUTF8Width(&canvas->fb, str);
 }
 
-uint8_t canvas_glyph_width(Canvas* canvas, uint16_t symbol) {
-    furi_assert(canvas);
+size_t canvas_glyph_width(Canvas* canvas, uint16_t symbol) {
+    furi_check(canvas);
     return u8g2_GetGlyphWidth(&canvas->fb, symbol);
 }
 
 void canvas_draw_bitmap(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height,
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
     const uint8_t* compressed_bitmap_data) {
-    furi_assert(canvas);
+    furi_check(canvas);
 
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -262,11 +262,11 @@ void canvas_draw_bitmap(
 
 void canvas_draw_icon_animation(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
+    int32_t x,
+    int32_t y,
     IconAnimation* icon_animation) {
-    furi_assert(canvas);
-    furi_assert(icon_animation);
+    furi_check(canvas);
+    furi_check(icon_animation);
 
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -358,32 +358,28 @@ static void canvas_draw_u8g2_bitmap_int(
 
 void canvas_draw_u8g2_bitmap(
     u8g2_t* u8g2,
-    u8g2_uint_t x,
-    u8g2_uint_t y,
-    u8g2_uint_t w,
-    u8g2_uint_t h,
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
     const uint8_t* bitmap,
     IconRotation rotation) {
-    u8g2_uint_t blen;
-    blen = w;
-    blen += 7;
-    blen >>= 3;
 #ifdef U8G2_WITH_INTERSECTION
-    if(u8g2_IsIntersection(u8g2, x, y, x + w, y + h) == 0) return;
+    if(u8g2_IsIntersection(u8g2, x, y, x + width, y + height) == 0) return;
 #endif /* U8G2_WITH_INTERSECTION */
 
     switch(rotation) {
     case IconRotation0:
-        canvas_draw_u8g2_bitmap_int(u8g2, x, y, w, h, 0, 0, bitmap);
+        canvas_draw_u8g2_bitmap_int(u8g2, x, y, width, height, 0, 0, bitmap);
         break;
     case IconRotation90:
-        canvas_draw_u8g2_bitmap_int(u8g2, x, y, w, h, 0, 1, bitmap);
+        canvas_draw_u8g2_bitmap_int(u8g2, x, y, width, height, 0, 1, bitmap);
         break;
     case IconRotation180:
-        canvas_draw_u8g2_bitmap_int(u8g2, x, y, w, h, 1, 0, bitmap);
+        canvas_draw_u8g2_bitmap_int(u8g2, x, y, width, height, 1, 0, bitmap);
         break;
     case IconRotation270:
-        canvas_draw_u8g2_bitmap_int(u8g2, x, y, w, h, 1, 1, bitmap);
+        canvas_draw_u8g2_bitmap_int(u8g2, x, y, width, height, 1, 1, bitmap);
         break;
     default:
         break;
@@ -392,12 +388,12 @@ void canvas_draw_u8g2_bitmap(
 
 void canvas_draw_icon_ex(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
+    int32_t x,
+    int32_t y,
     const Icon* icon,
     IconRotation rotation) {
-    furi_assert(canvas);
-    furi_assert(icon);
+    furi_check(canvas);
+    furi_check(icon);
 
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -407,9 +403,9 @@ void canvas_draw_icon_ex(
         &canvas->fb, x, y, icon_get_width(icon), icon_get_height(icon), icon_data, rotation);
 }
 
-void canvas_draw_icon(Canvas* canvas, uint8_t x, uint8_t y, const Icon* icon) {
-    furi_assert(canvas);
-    furi_assert(icon);
+void canvas_draw_icon(Canvas* canvas, int32_t x, int32_t y, const Icon* icon) {
+    furi_check(canvas);
+    furi_check(icon);
 
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -419,15 +415,15 @@ void canvas_draw_icon(Canvas* canvas, uint8_t x, uint8_t y, const Icon* icon) {
         &canvas->fb, x, y, icon_get_width(icon), icon_get_height(icon), icon_data, IconRotation0);
 }
 
-void canvas_draw_dot(Canvas* canvas, uint8_t x, uint8_t y) {
-    furi_assert(canvas);
+void canvas_draw_dot(Canvas* canvas, int32_t x, int32_t y) {
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawPixel(&canvas->fb, x, y);
 }
 
-void canvas_draw_box(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
-    furi_assert(canvas);
+void canvas_draw_box(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height) {
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawBox(&canvas->fb, x, y, width, height);
@@ -435,19 +431,19 @@ void canvas_draw_box(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_
 
 void canvas_draw_rbox(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height,
-    uint8_t radius) {
-    furi_assert(canvas);
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
+    size_t radius) {
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawRBox(&canvas->fb, x, y, width, height, radius);
 }
 
-void canvas_draw_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
-    furi_assert(canvas);
+void canvas_draw_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height) {
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawFrame(&canvas->fb, x, y, width, height);
@@ -455,19 +451,19 @@ void canvas_draw_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint
 
 void canvas_draw_rframe(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height,
-    uint8_t radius) {
-    furi_assert(canvas);
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
+    size_t radius) {
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawRFrame(&canvas->fb, x, y, width, height, radius);
 }
 
-void canvas_draw_line(Canvas* canvas, uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2) {
-    furi_assert(canvas);
+void canvas_draw_line(Canvas* canvas, int32_t x1, int32_t y1, int32_t x2, int32_t y2) {
+    furi_check(canvas);
     x1 += canvas->offset_x;
     y1 += canvas->offset_y;
     x2 += canvas->offset_x;
@@ -475,15 +471,15 @@ void canvas_draw_line(Canvas* canvas, uint8_t x1, uint8_t y1, uint8_t x2, uint8_
     u8g2_DrawLine(&canvas->fb, x1, y1, x2, y2);
 }
 
-void canvas_draw_circle(Canvas* canvas, uint8_t x, uint8_t y, uint8_t radius) {
-    furi_assert(canvas);
+void canvas_draw_circle(Canvas* canvas, int32_t x, int32_t y, size_t radius) {
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawCircle(&canvas->fb, x, y, radius, U8G2_DRAW_ALL);
 }
 
-void canvas_draw_disc(Canvas* canvas, uint8_t x, uint8_t y, uint8_t radius) {
-    furi_assert(canvas);
+void canvas_draw_disc(Canvas* canvas, int32_t x, int32_t y, size_t radius) {
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawDisc(&canvas->fb, x, y, radius, U8G2_DRAW_ALL);
@@ -491,12 +487,12 @@ void canvas_draw_disc(Canvas* canvas, uint8_t x, uint8_t y, uint8_t radius) {
 
 void canvas_draw_triangle(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t base,
-    uint8_t height,
+    int32_t x,
+    int32_t y,
+    size_t base,
+    size_t height,
     CanvasDirection dir) {
-    furi_assert(canvas);
+    furi_check(canvas);
     if(dir == CanvasDirectionBottomToTop) {
         canvas_draw_line(canvas, x - base / 2, y, x + base / 2, y);
         canvas_draw_line(canvas, x - base / 2, y, x, y - height + 1);
@@ -518,19 +514,19 @@ void canvas_draw_triangle(
 
 void canvas_draw_xbm(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t w,
-    uint8_t h,
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
     const uint8_t* bitmap) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
-    canvas_draw_u8g2_bitmap(&canvas->fb, x, y, w, h, bitmap, IconRotation0);
+    canvas_draw_u8g2_bitmap(&canvas->fb, x, y, width, height, bitmap, IconRotation0);
 }
 
-void canvas_draw_glyph(Canvas* canvas, uint8_t x, uint8_t y, uint16_t ch) {
-    furi_assert(canvas);
+void canvas_draw_glyph(Canvas* canvas, int32_t x, int32_t y, uint16_t ch) {
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawGlyph(&canvas->fb, x, y, ch);
@@ -558,7 +554,7 @@ void canvas_set_bitmap_mode(Canvas* canvas, bool alpha) {
 }
 
 void canvas_set_orientation(Canvas* canvas, CanvasOrientation orientation) {
-    furi_assert(canvas);
+    furi_check(canvas);
     const u8g2_cb_t* rotate_cb = NULL;
     bool need_swap = false;
     if(canvas->orientation != orientation) {
@@ -598,12 +594,12 @@ CanvasOrientation canvas_get_orientation(const Canvas* canvas) {
 }
 
 void canvas_add_framebuffer_callback(Canvas* canvas, CanvasCommitCallback callback, void* context) {
-    furi_assert(canvas);
+    furi_check(canvas);
 
     const CanvasCallbackPair p = {callback, context};
 
     canvas_lock(canvas);
-    furi_assert(!CanvasCallbackPairArray_count(canvas->canvas_callback_pair, p));
+    furi_check(!CanvasCallbackPairArray_count(canvas->canvas_callback_pair, p));
     CanvasCallbackPairArray_push_back(canvas->canvas_callback_pair, p);
     canvas_unlock(canvas);
 }
@@ -612,12 +608,12 @@ void canvas_remove_framebuffer_callback(
     Canvas* canvas,
     CanvasCommitCallback callback,
     void* context) {
-    furi_assert(canvas);
+    furi_check(canvas);
 
     const CanvasCallbackPair p = {callback, context};
 
     canvas_lock(canvas);
-    furi_assert(CanvasCallbackPairArray_count(canvas->canvas_callback_pair, p) == 1);
+    furi_check(CanvasCallbackPairArray_count(canvas->canvas_callback_pair, p) == 1);
     CanvasCallbackPairArray_remove_val(canvas->canvas_callback_pair, p);
     canvas_unlock(canvas);
-}
\ No newline at end of file
+}
diff --git a/applications/services/gui/canvas.h b/applications/services/gui/canvas.h
index bda730ff2..a58be130d 100644
--- a/applications/services/gui/canvas.h
+++ b/applications/services/gui/canvas.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <stddef.h>
 #include <gui/icon_animation.h>
 #include <gui/icon.h>
 
@@ -102,7 +103,7 @@ void canvas_commit(Canvas* canvas);
  *
  * @return     width in pixels.
  */
-uint8_t canvas_width(const Canvas* canvas);
+size_t canvas_width(const Canvas* canvas);
 
 /** Get Canvas height
  *
@@ -110,7 +111,7 @@ uint8_t canvas_width(const Canvas* canvas);
  *
  * @return     height in pixels.
  */
-uint8_t canvas_height(const Canvas* canvas);
+size_t canvas_height(const Canvas* canvas);
 
 /** Get current font height
  *
@@ -118,7 +119,7 @@ uint8_t canvas_height(const Canvas* canvas);
  *
  * @return     height in pixels.
  */
-uint8_t canvas_current_font_height(const Canvas* canvas);
+size_t canvas_current_font_height(const Canvas* canvas);
 
 /** Get current font width
  *
@@ -126,7 +127,7 @@ uint8_t canvas_current_font_height(const Canvas* canvas);
  *
  * @return     width in pixels.
  */
-uint8_t canvas_current_font_width(const Canvas* canvas);
+size_t canvas_current_font_width(const Canvas* canvas);
 
 /** Get font parameters
  *
@@ -150,8 +151,7 @@ void canvas_clear(Canvas* canvas);
  */
 void canvas_set_color(Canvas* canvas, Color color);
 
-/** Set font swap
- * Argument String Rotation Description
+/** Set font swap Argument String Rotation Description
  *
  * @param      canvas  Canvas instance
  * @param      dir     Direction font
@@ -185,7 +185,7 @@ void canvas_set_custom_u8g2_font(Canvas* canvas, const uint8_t* font);
  * @param      y       anchor point y coordinate
  * @param      str     C-string
  */
-void canvas_draw_str(Canvas* canvas, uint8_t x, uint8_t y, const char* str);
+void canvas_draw_str(Canvas* canvas, int32_t x, int32_t y, const char* str);
 
 /** Draw aligned string defined by x, y.
  *
@@ -201,8 +201,8 @@ void canvas_draw_str(Canvas* canvas, uint8_t x, uint8_t y, const char* str);
  */
 void canvas_draw_str_aligned(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
+    int32_t x,
+    int32_t y,
     Align horizontal,
     Align vertical,
     const char* str);
@@ -223,38 +223,37 @@ uint16_t canvas_string_width(Canvas* canvas, const char* str);
  *
  * @return     width in pixels
  */
-uint8_t canvas_glyph_width(Canvas* canvas, uint16_t symbol);
+size_t canvas_glyph_width(Canvas* canvas, uint16_t symbol);
 
 /** Draw bitmap picture at position defined by x,y.
  *
- * @param      canvas                   Canvas instance
- * @param      x                        x coordinate
- * @param      y                        y coordinate
- * @param      width                    width of bitmap
- * @param      height                   height of bitmap
- * @param      compressed_bitmap_data   compressed bitmap data
+ * @param      canvas                  Canvas instance
+ * @param      x                       x coordinate
+ * @param      y                       y coordinate
+ * @param      width                   width of bitmap
+ * @param      height                  height of bitmap
+ * @param      compressed_bitmap_data  compressed bitmap data
  */
 void canvas_draw_bitmap(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height,
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
     const uint8_t* compressed_bitmap_data);
 
 /** Draw icon at position defined by x,y with rotation and flip.
  *
- * @param      canvas   Canvas instance
- * @param      x        x coordinate
- * @param      y        y coordinate
- * @param      icon     Icon instance
- * @param      flip     IconFlip
- * @param      rotation IconRotation
+ * @param      canvas    Canvas instance
+ * @param      x         x coordinate
+ * @param      y         y coordinate
+ * @param      icon      Icon instance
+ * @param      rotation  IconRotation
  */
 void canvas_draw_icon_ex(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
+    int32_t x,
+    int32_t y,
     const Icon* icon,
     IconRotation rotation);
 
@@ -267,8 +266,8 @@ void canvas_draw_icon_ex(
  */
 void canvas_draw_icon_animation(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
+    int32_t x,
+    int32_t y,
     IconAnimation* icon_animation);
 
 /** Draw icon at position defined by x,y.
@@ -278,23 +277,23 @@ void canvas_draw_icon_animation(
  * @param      y       y coordinate
  * @param      icon    Icon instance
  */
-void canvas_draw_icon(Canvas* canvas, uint8_t x, uint8_t y, const Icon* icon);
+void canvas_draw_icon(Canvas* canvas, int32_t x, int32_t y, const Icon* icon);
 
 /** Draw XBM bitmap
  *
  * @param      canvas  Canvas instance
  * @param      x       x coordinate
  * @param      y       y coordinate
- * @param      w       bitmap width
- * @param      h       bitmap height
+ * @param[in]  width   bitmap width
+ * @param[in]  height  bitmap height
  * @param      bitmap  pointer to XBM bitmap data
  */
 void canvas_draw_xbm(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t w,
-    uint8_t h,
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
     const uint8_t* bitmap);
 
 /** Draw dot at x,y
@@ -303,7 +302,7 @@ void canvas_draw_xbm(
  * @param      x       x coordinate
  * @param      y       y coordinate
  */
-void canvas_draw_dot(Canvas* canvas, uint8_t x, uint8_t y);
+void canvas_draw_dot(Canvas* canvas, int32_t x, int32_t y);
 
 /** Draw box of width, height at x,y
  *
@@ -313,7 +312,7 @@ void canvas_draw_dot(Canvas* canvas, uint8_t x, uint8_t y);
  * @param      width   box width
  * @param      height  box height
  */
-void canvas_draw_box(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height);
+void canvas_draw_box(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height);
 
 /** Draw frame of width, height at x,y
  *
@@ -323,7 +322,7 @@ void canvas_draw_box(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_
  * @param      width   frame width
  * @param      height  frame height
  */
-void canvas_draw_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height);
+void canvas_draw_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height);
 
 /** Draw line from x1,y1 to x2,y2
  *
@@ -333,41 +332,42 @@ void canvas_draw_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint
  * @param      x2      x2 coordinate
  * @param      y2      y2 coordinate
  */
-void canvas_draw_line(Canvas* canvas, uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2);
+void canvas_draw_line(Canvas* canvas, int32_t x1, int32_t y1, int32_t x2, int32_t y2);
 
 /** Draw circle at x,y with radius r
  *
  * @param      canvas  Canvas instance
  * @param      x       x coordinate
  * @param      y       y coordinate
- * @param      r       radius
+ * @param      radius  radius
  */
-void canvas_draw_circle(Canvas* canvas, uint8_t x, uint8_t y, uint8_t r);
+void canvas_draw_circle(Canvas* canvas, int32_t x, int32_t y, size_t radius);
 
 /** Draw disc at x,y with radius r
  *
  * @param      canvas  Canvas instance
  * @param      x       x coordinate
  * @param      y       y coordinate
- * @param      r       radius
+ * @param      radius  radius
  */
-void canvas_draw_disc(Canvas* canvas, uint8_t x, uint8_t y, uint8_t r);
+void canvas_draw_disc(Canvas* canvas, int32_t x, int32_t y, size_t radius);
 
-/** Draw triangle with given base and height lengths and their intersection coordinate
+/** Draw triangle with given base and height lengths and their intersection
+ * coordinate
  *
- * @param       canvas  Canvas instance
- * @param       x       x coordinate of base and height intersection
- * @param       y       y coordinate of base and height intersection
- * @param       base    length of triangle side
- * @param       height  length of triangle height
- * @param       dir     CanvasDirection triangle orientation
+ * @param      canvas  Canvas instance
+ * @param      x       x coordinate of base and height intersection
+ * @param      y       y coordinate of base and height intersection
+ * @param      base    length of triangle side
+ * @param      height  length of triangle height
+ * @param      dir     CanvasDirection triangle orientation
  */
 void canvas_draw_triangle(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t base,
-    uint8_t height,
+    int32_t x,
+    int32_t y,
+    size_t base,
+    size_t height,
     CanvasDirection dir);
 
 /** Draw glyph
@@ -377,7 +377,7 @@ void canvas_draw_triangle(
  * @param      y       y coordinate
  * @param      ch      character
  */
-void canvas_draw_glyph(Canvas* canvas, uint8_t x, uint8_t y, uint16_t ch);
+void canvas_draw_glyph(Canvas* canvas, int32_t x, int32_t y, uint16_t ch);
 
 /** Set transparency mode
  *
@@ -397,11 +397,11 @@ void canvas_set_bitmap_mode(Canvas* canvas, bool alpha);
  */
 void canvas_draw_rframe(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height,
-    uint8_t radius);
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
+    size_t radius);
 
 /** Draw rounded-corner box of width, height at x,y, with round value radius
  *
@@ -414,11 +414,11 @@ void canvas_draw_rframe(
  */
 void canvas_draw_rbox(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height,
-    uint8_t radius);
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
+    size_t radius);
 
 void canvas_draw_icon_bitmap(
     Canvas* canvas,
diff --git a/applications/services/gui/canvas_i.h b/applications/services/gui/canvas_i.h
index 0982830c9..c204b970f 100644
--- a/applications/services/gui/canvas_i.h
+++ b/applications/services/gui/canvas_i.h
@@ -38,10 +38,10 @@ ALGO_DEF(CanvasCallbackPairArray, CanvasCallbackPairArray_t);
 struct Canvas {
     u8g2_t fb;
     CanvasOrientation orientation;
-    uint8_t offset_x;
-    uint8_t offset_y;
-    uint8_t width;
-    uint8_t height;
+    size_t offset_x;
+    size_t offset_y;
+    size_t width;
+    size_t height;
     CompressIcon* compress_icon;
     CanvasCallbackPairArray_t canvas_callback_pair;
     FuriMutex* mutex;
@@ -51,7 +51,7 @@ struct Canvas {
  *
  * @return     Canvas instance
  */
-Canvas* canvas_init();
+Canvas* canvas_init(void);
 
 /** Free canvas memory
  *
@@ -85,10 +85,10 @@ size_t canvas_get_buffer_size(const Canvas* canvas);
  */
 void canvas_frame_set(
     Canvas* canvas,
-    uint8_t offset_x,
-    uint8_t offset_y,
-    uint8_t width,
-    uint8_t height);
+    int32_t offset_x,
+    int32_t offset_y,
+    size_t width,
+    size_t height);
 
 /** Set canvas orientation
  *
@@ -107,7 +107,7 @@ CanvasOrientation canvas_get_orientation(const Canvas* canvas);
 
 /** Draw a u8g2 bitmap
  *
- * @param      canvas   Canvas instance
+ * @param      u8g2     u8g2 instance
  * @param      x        x coordinate
  * @param      y        y coordinate
  * @param      width    width
@@ -117,10 +117,10 @@ CanvasOrientation canvas_get_orientation(const Canvas* canvas);
  */
 void canvas_draw_u8g2_bitmap(
     u8g2_t* u8g2,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height,
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
     const uint8_t* bitmap,
     IconRotation rotation);
 
diff --git a/applications/services/gui/elements.c b/applications/services/gui/elements.c
index f35c36aed..758e15cfd 100644
--- a/applications/services/gui/elements.c
+++ b/applications/services/gui/elements.c
@@ -17,50 +17,50 @@
 #include <stdbool.h>
 
 typedef struct {
-    uint8_t x;
-    uint8_t y;
-    uint8_t leading_min;
-    uint8_t leading_default;
-    uint8_t height;
-    uint8_t descender;
-    uint8_t len;
+    int32_t x;
+    int32_t y;
+    int32_t leading_min;
+    int32_t leading_default;
+    size_t height;
+    size_t descender;
+    size_t len;
     const char* text;
 } ElementTextBoxLine;
 
-void elements_progress_bar(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, float progress) {
-    furi_assert(canvas);
-    furi_assert((progress >= 0) && (progress <= 1.0));
-    uint8_t height = 9;
+void elements_progress_bar(Canvas* canvas, int32_t x, int32_t y, size_t width, float progress) {
+    furi_check(canvas);
+    furi_check((progress >= 0.0f) && (progress <= 1.0f));
+    size_t height = 9;
 
-    uint8_t progress_length = roundf(progress * (width - 2));
+    float progress_width = roundf(progress * (width - 2));
 
     canvas_set_color(canvas, ColorWhite);
     canvas_draw_box(canvas, x + 1, y + 1, width - 2, height - 2);
     canvas_set_color(canvas, ColorBlack);
     canvas_draw_rframe(canvas, x, y, width, height, 3);
 
-    canvas_draw_box(canvas, x + 1, y + 1, progress_length, height - 2);
+    canvas_draw_box(canvas, x + 1, y + 1, progress_width, height - 2);
 }
 
 void elements_progress_bar_with_text(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
+    int32_t x,
+    int32_t y,
+    size_t width,
     float progress,
     const char* text) {
-    furi_assert(canvas);
-    furi_assert((progress >= 0.0f) && (progress <= 1.0f));
-    uint8_t height = 11;
+    furi_check(canvas);
+    furi_check((progress >= 0.0f) && (progress <= 1.0f));
+    size_t height = 11;
 
-    uint8_t progress_length = roundf(progress * (width - 2));
+    float progress_width = roundf(progress * (width - 2));
 
     canvas_set_color(canvas, ColorWhite);
     canvas_draw_box(canvas, x + 1, y + 1, width - 2, height - 2);
     canvas_set_color(canvas, ColorBlack);
     canvas_draw_rframe(canvas, x, y, width, height, 3);
 
-    canvas_draw_box(canvas, x + 1, y + 1, progress_length, height - 2);
+    canvas_draw_box(canvas, x + 1, y + 1, progress_width, height - 2);
 
     canvas_set_color(canvas, ColorXOR);
     canvas_set_font(canvas, FontSecondary);
@@ -69,20 +69,23 @@ void elements_progress_bar_with_text(
 
 void elements_scrollbar_pos(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t height,
-    uint16_t pos,
-    uint16_t total) {
-    furi_assert(canvas);
+    int32_t x,
+    int32_t y,
+    size_t height,
+    size_t pos,
+    size_t total) {
+    furi_check(canvas);
+
     // prevent overflows
     canvas_set_color(canvas, ColorWhite);
     canvas_draw_box(canvas, x - 3, y, 3, height);
+
     // dot line
     canvas_set_color(canvas, ColorBlack);
-    for(uint8_t i = y; i < height + y; i += 2) {
+    for(int32_t i = y; i < (int32_t)height + y; i += 2) {
         canvas_draw_dot(canvas, x - 2, i);
     }
+
     // Position block
     if(total) {
         float block_h = ((float)height) / total;
@@ -90,19 +93,22 @@ void elements_scrollbar_pos(
     }
 }
 
-void elements_scrollbar(Canvas* canvas, uint16_t pos, uint16_t total) {
-    furi_assert(canvas);
+void elements_scrollbar(Canvas* canvas, size_t pos, size_t total) {
+    furi_check(canvas);
+
+    size_t width = canvas_width(canvas);
+    size_t height = canvas_height(canvas);
 
-    uint8_t width = canvas_width(canvas);
-    uint8_t height = canvas_height(canvas);
     // prevent overflows
     canvas_set_color(canvas, ColorWhite);
     canvas_draw_box(canvas, width - 3, 0, 3, height);
+
     // dot line
     canvas_set_color(canvas, ColorBlack);
-    for(uint8_t i = 0; i < height; i += 2) {
+    for(size_t i = 0; i < height; i += 2) {
         canvas_draw_dot(canvas, width - 2, i);
     }
+
     // Position block
     if(total) {
         float block_h = ((float)height) / total;
@@ -110,8 +116,8 @@ void elements_scrollbar(Canvas* canvas, uint16_t pos, uint16_t total) {
     }
 }
 
-void elements_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
-    furi_assert(canvas);
+void elements_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height) {
+    furi_check(canvas);
 
     canvas_draw_line(canvas, x + 2, y, x + width - 2, y);
     canvas_draw_line(canvas, x + 1, y + height - 1, x + width, y + height - 1);
@@ -125,18 +131,20 @@ void elements_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t
 }
 
 void elements_button_left(Canvas* canvas, const char* str) {
-    const uint8_t button_height = 12;
-    const uint8_t vertical_offset = 3;
-    const uint8_t horizontal_offset = 3;
-    const uint8_t string_width = canvas_string_width(canvas, str);
-    const Icon* icon = &I_ButtonLeft_4x7;
-    const uint8_t icon_h_offset = 3;
-    const uint8_t icon_width_with_offset = icon->width + icon_h_offset;
-    const uint8_t icon_v_offset = icon->height + vertical_offset;
-    const uint8_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset;
+    furi_check(canvas);
 
-    const uint8_t x = 0;
-    const uint8_t y = canvas_height(canvas);
+    const size_t button_height = 12;
+    const size_t vertical_offset = 3;
+    const size_t horizontal_offset = 3;
+    const size_t string_width = canvas_string_width(canvas, str);
+    const Icon* icon = &I_ButtonLeft_4x7;
+    const int32_t icon_h_offset = 3;
+    const int32_t icon_width_with_offset = icon->width + icon_h_offset;
+    const int32_t icon_v_offset = icon->height + vertical_offset;
+    const size_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset;
+
+    const int32_t x = 0;
+    const int32_t y = canvas_height(canvas);
 
     canvas_draw_box(canvas, x, y - button_height, button_width, button_height);
     canvas_draw_line(canvas, x + button_width + 0, y, x + button_width + 0, y - button_height + 0);
@@ -151,18 +159,20 @@ void elements_button_left(Canvas* canvas, const char* str) {
 }
 
 void elements_button_right(Canvas* canvas, const char* str) {
-    const uint8_t button_height = 12;
-    const uint8_t vertical_offset = 3;
-    const uint8_t horizontal_offset = 3;
-    const uint8_t string_width = canvas_string_width(canvas, str);
-    const Icon* icon = &I_ButtonRight_4x7;
-    const uint8_t icon_h_offset = 3;
-    const uint8_t icon_width_with_offset = icon->width + icon_h_offset;
-    const uint8_t icon_v_offset = icon->height + vertical_offset;
-    const uint8_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset;
+    furi_check(canvas);
 
-    const uint8_t x = canvas_width(canvas);
-    const uint8_t y = canvas_height(canvas);
+    const size_t button_height = 12;
+    const size_t vertical_offset = 3;
+    const size_t horizontal_offset = 3;
+    const size_t string_width = canvas_string_width(canvas, str);
+    const Icon* icon = &I_ButtonRight_4x7;
+    const int32_t icon_h_offset = 3;
+    const int32_t icon_width_with_offset = icon->width + icon_h_offset;
+    const int32_t icon_v_offset = icon->height + vertical_offset;
+    const size_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset;
+
+    const int32_t x = canvas_width(canvas);
+    const int32_t y = canvas_height(canvas);
 
     canvas_draw_box(canvas, x - button_width, y - button_height, button_width, button_height);
     canvas_draw_line(canvas, x - button_width - 1, y, x - button_width - 1, y - button_height + 0);
@@ -177,18 +187,20 @@ void elements_button_right(Canvas* canvas, const char* str) {
 }
 
 void elements_button_center(Canvas* canvas, const char* str) {
-    const uint8_t button_height = 12;
-    const uint8_t vertical_offset = 3;
-    const uint8_t horizontal_offset = 1;
-    const uint8_t string_width = canvas_string_width(canvas, str);
-    const Icon* icon = &I_ButtonCenter_7x7;
-    const uint8_t icon_h_offset = 3;
-    const uint8_t icon_width_with_offset = icon->width + icon_h_offset;
-    const uint8_t icon_v_offset = icon->height + vertical_offset;
-    const uint8_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset;
+    furi_check(canvas);
 
-    const uint8_t x = (canvas_width(canvas) - button_width) / 2;
-    const uint8_t y = canvas_height(canvas);
+    const size_t button_height = 12;
+    const size_t vertical_offset = 3;
+    const size_t horizontal_offset = 1;
+    const size_t string_width = canvas_string_width(canvas, str);
+    const Icon* icon = &I_ButtonCenter_7x7;
+    const int32_t icon_h_offset = 3;
+    const int32_t icon_width_with_offset = icon->width + icon_h_offset;
+    const int32_t icon_v_offset = icon->height + vertical_offset;
+    const size_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset;
+
+    const int32_t x = (canvas_width(canvas) - button_width) / 2;
+    const int32_t y = canvas_height(canvas);
 
     canvas_draw_box(canvas, x, y - button_height, button_width, button_height);
 
@@ -208,7 +220,7 @@ void elements_button_center(Canvas* canvas, const char* str) {
 }
 
 static size_t
-    elements_get_max_chars_to_fit(Canvas* canvas, Align horizontal, const char* text, uint8_t x) {
+    elements_get_max_chars_to_fit(Canvas* canvas, Align horizontal, const char* text, int32_t x) {
     const char* end = strchr(text, '\n');
     if(end == NULL) {
         end = text + strlen(text);
@@ -219,10 +231,10 @@ static size_t
     furi_string_left(str, text_size);
     size_t result = 0;
 
-    uint16_t len_px = canvas_string_width(canvas, furi_string_get_cstr(str));
-    uint8_t px_left = 0;
+    size_t len_px = canvas_string_width(canvas, furi_string_get_cstr(str));
+    size_t px_left = 0;
     if(horizontal == AlignCenter) {
-        if(x > (canvas_width(canvas) / 2)) {
+        if(x > (int32_t)(canvas_width(canvas) / 2)) {
             px_left = (canvas_width(canvas) - x) * 2;
         } else {
             px_left = x * 2;
@@ -255,16 +267,16 @@ static size_t
 
 void elements_multiline_text_aligned(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
+    int32_t x,
+    int32_t y,
     Align horizontal,
     Align vertical,
     const char* text) {
-    furi_assert(canvas);
-    furi_assert(text);
+    furi_check(canvas);
+    furi_check(text);
 
-    uint8_t lines_count = 0;
-    uint8_t font_height = canvas_current_font_height(canvas);
+    size_t lines_count = 0;
+    size_t font_height = canvas_current_font_height(canvas);
     FuriString* line;
 
     /* go through text line by line and count lines */
@@ -296,7 +308,7 @@ void elements_multiline_text_aligned(
         canvas_draw_str_aligned(canvas, x, y, horizontal, vertical, furi_string_get_cstr(line));
         furi_string_free(line);
         y += font_height;
-        if(y > canvas_height(canvas)) {
+        if(y > (int32_t)canvas_height(canvas)) {
             break;
         }
 
@@ -305,11 +317,11 @@ void elements_multiline_text_aligned(
     }
 }
 
-void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, const char* text) {
-    furi_assert(canvas);
-    furi_assert(text);
+void elements_multiline_text(Canvas* canvas, int32_t x, int32_t y, const char* text) {
+    furi_check(canvas);
+    furi_check(text);
 
-    uint8_t font_height = canvas_current_font_height(canvas);
+    size_t font_height = canvas_current_font_height(canvas);
     FuriString* str;
     str = furi_string_alloc();
     const char* start = text;
@@ -328,58 +340,54 @@ void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, const char* t
     furi_string_free(str);
 }
 
-void elements_multiline_text_framed(Canvas* canvas, uint8_t x, uint8_t y, const char* text) {
-    furi_assert(canvas);
-    furi_assert(text);
+void elements_multiline_text_framed(Canvas* canvas, int32_t x, int32_t y, const char* text) {
+    furi_check(canvas);
+    furi_check(text);
+
+    size_t font_height = canvas_current_font_height(canvas);
+    size_t str_width = canvas_string_width(canvas, text);
 
-    uint8_t font_y = canvas_current_font_height(canvas);
-    uint16_t str_width = canvas_string_width(canvas, text);
     // count \n's
-    uint8_t lines = 1;
+    size_t lines = 1;
     const char* t = text;
     while(*t != '\0') {
         if(*t == '\n') {
             lines++;
-            uint16_t temp_width = canvas_string_width(canvas, t + 1);
+            size_t temp_width = canvas_string_width(canvas, t + 1);
             str_width = temp_width > str_width ? temp_width : str_width;
         }
         t++;
     }
 
     canvas_set_color(canvas, ColorWhite);
-    canvas_draw_box(canvas, x, y - font_y, str_width + 8, font_y * lines + 4);
+    canvas_draw_box(canvas, x, y - font_height, str_width + 8, font_height * lines + 4);
     canvas_set_color(canvas, ColorBlack);
     elements_multiline_text(canvas, x + 4, y - 1, text);
-    elements_frame(canvas, x, y - font_y, str_width + 8, font_y * lines + 4);
+    elements_frame(canvas, x, y - font_height, str_width + 8, font_height * lines + 4);
 }
 
 void elements_slightly_rounded_frame(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height) {
-    furi_assert(canvas);
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height) {
+    furi_check(canvas);
     canvas_draw_rframe(canvas, x, y, width, height, 1);
 }
 
 void elements_slightly_rounded_box(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height) {
-    furi_assert(canvas);
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height) {
+    furi_check(canvas);
     canvas_draw_rbox(canvas, x, y, width, height, 1);
 }
 
-void elements_bold_rounded_frame(
-    Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height) {
-    furi_assert(canvas);
+void elements_bold_rounded_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height) {
+    furi_check(canvas);
 
     canvas_set_color(canvas, ColorWhite);
     canvas_draw_box(canvas, x + 2, y + 2, width - 3, height - 3);
@@ -414,10 +422,10 @@ void elements_bold_rounded_frame(
     canvas_draw_dot(canvas, x + width - 2, y + height - 3);
 }
 
-void elements_bubble(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
-    furi_assert(canvas);
+void elements_bubble(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height) {
+    furi_check(canvas);
     canvas_draw_rframe(canvas, x + 4, y, width, height, 3);
-    uint8_t y_corner = y + height * 2 / 3;
+    int32_t y_corner = y + height * 2 / 3;
     canvas_draw_line(canvas, x, y_corner, x + 4, y_corner - 4);
     canvas_draw_line(canvas, x, y_corner, x + 4, y_corner + 4);
     canvas_set_color(canvas, ColorWhite);
@@ -427,45 +435,46 @@ void elements_bubble(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_
 
 void elements_bubble_str(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
+    int32_t x,
+    int32_t y,
     const char* text,
     Align horizontal,
     Align vertical) {
-    furi_assert(canvas);
-    furi_assert(text);
+    furi_check(canvas);
+    furi_check(text);
+
+    size_t font_height = canvas_current_font_height(canvas);
+    size_t str_width = canvas_string_width(canvas, text);
 
-    uint8_t font_y = canvas_current_font_height(canvas);
-    uint16_t str_width = canvas_string_width(canvas, text);
     // count \n's
-    uint8_t lines = 1;
+    size_t lines = 1;
     const char* t = text;
     while(*t != '\0') {
         if(*t == '\n') {
             lines++;
-            uint16_t temp_width = canvas_string_width(canvas, t + 1);
+            size_t temp_width = canvas_string_width(canvas, t + 1);
             str_width = temp_width > str_width ? temp_width : str_width;
         }
         t++;
     }
 
-    uint8_t frame_x = x;
-    uint8_t frame_y = y;
-    uint8_t frame_width = str_width + 8;
-    uint8_t frame_height = font_y * lines + 4;
+    int32_t frame_x = x;
+    int32_t frame_y = y;
+    size_t frame_width = str_width + 8;
+    size_t frame_height = font_height * lines + 4;
 
     canvas_set_color(canvas, ColorWhite);
     canvas_draw_box(canvas, frame_x + 1, frame_y + 1, frame_width - 2, frame_height - 2);
     canvas_set_color(canvas, ColorBlack);
     canvas_draw_rframe(canvas, frame_x, frame_y, frame_width, frame_height, 1);
-    elements_multiline_text(canvas, x + 4, y - 1 + font_y, text);
+    elements_multiline_text(canvas, x + 4, y - 1 + font_height, text);
 
-    uint8_t x1 = 0;
-    uint8_t x2 = 0;
-    uint8_t x3 = 0;
-    uint8_t y1 = 0;
-    uint8_t y2 = 0;
-    uint8_t y3 = 0;
+    int32_t x1 = 0;
+    int32_t x2 = 0;
+    int32_t x3 = 0;
+    int32_t y1 = 0;
+    int32_t y2 = 0;
+    int32_t y3 = 0;
     if((horizontal == AlignLeft) && (vertical == AlignTop)) {
         x1 = frame_x;
         y1 = frame_y;
@@ -559,11 +568,11 @@ void elements_bubble_str(
     canvas_draw_line(canvas, x2, y2, x3, y3);
 }
 
-void elements_string_fit_width(Canvas* canvas, FuriString* string, uint8_t width) {
-    furi_assert(canvas);
-    furi_assert(string);
+void elements_string_fit_width(Canvas* canvas, FuriString* string, size_t width) {
+    furi_check(canvas);
+    furi_check(string);
 
-    uint16_t len_px = canvas_string_width(canvas, furi_string_get_cstr(string));
+    size_t len_px = canvas_string_width(canvas, furi_string_get_cstr(string));
     if(len_px > width) {
         width -= canvas_string_width(canvas, "...");
         do {
@@ -634,12 +643,15 @@ void elements_scrollable_text_line_str(
 
 void elements_scrollable_text_line(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
+    int32_t x,
+    int32_t y,
+    size_t width,
     FuriString* string,
     size_t scroll,
     bool ellipsis) {
+    furi_check(canvas);
+    furi_check(string);
+
     FuriString* line = furi_string_alloc_set(string);
 
     size_t len_px = canvas_string_width(canvas, furi_string_get_cstr(line));
@@ -681,15 +693,15 @@ void elements_scrollable_text_line(
 
 void elements_text_box(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height,
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
     Align horizontal,
     Align vertical,
     const char* text,
     bool strip_to_dots) {
-    furi_assert(canvas);
+    furi_check(canvas);
 
     ElementTextBoxLine line[ELEMENTS_MAX_LINES_NUM];
     bool bold = false;
@@ -701,18 +713,18 @@ void elements_text_box(
     const CanvasFontParameters* font_params = canvas_get_font_params(canvas, current_font);
 
     // Fill line parameters
-    uint8_t line_leading_min = font_params->leading_min;
-    uint8_t line_leading_default = font_params->leading_default;
-    uint8_t line_height = font_params->height;
-    uint8_t line_descender = font_params->descender;
-    uint8_t line_num = 0;
-    uint8_t line_width = 0;
-    uint8_t line_len = 0;
-    uint8_t total_height_min = 0;
-    uint8_t total_height_default = 0;
-    uint16_t i = 0;
+    size_t line_leading_min = font_params->leading_min;
+    size_t line_leading_default = font_params->leading_default;
+    size_t line_height = font_params->height;
+    size_t line_descender = font_params->descender;
+    size_t line_num = 0;
+    size_t line_width = 0;
+    size_t line_len = 0;
+    size_t total_height_min = 0;
+    size_t total_height_default = 0;
+    size_t i = 0;
     bool full_text_processed = false;
-    uint16_t dots_width = canvas_string_width(canvas, "...");
+    size_t dots_width = canvas_string_width(canvas, "...");
 
     canvas_set_font(canvas, FontSecondary);
 
@@ -792,10 +804,9 @@ void elements_text_box(
             }
             line[line_num].y = total_height_min;
             line_num++;
-            if(text[i + 1]) {
+            if(!full_text_processed) {
                 line[line_num].text = &text[i + 1];
             }
-
             line_leading_min = font_params->leading_min;
             line_height = font_params->height;
             line_descender = font_params->descender;
@@ -814,14 +825,14 @@ void elements_text_box(
             line[0].y = y + line[0].height + (height - total_height_default);
         }
         if(line_num > 1) {
-            for(uint8_t i = 1; i < line_num; i++) {
+            for(size_t i = 1; i < line_num; i++) {
                 line[i].y = line[i - 1].y + line[i - 1].leading_default;
             }
         }
     } else if(line_num > 1) {
-        uint8_t free_pixel_num = height - total_height_min;
-        uint8_t fill_pixel = 0;
-        uint8_t j = 1;
+        size_t free_pixel_num = height - total_height_min;
+        size_t fill_pixel = 0;
+        size_t j = 1;
         line[0].y = y + line[0].height;
         while(fill_pixel < free_pixel_num) {
             line[j].y = line[j - 1].y + line[j - 1].leading_min + 1;
@@ -835,32 +846,35 @@ void elements_text_box(
     bold = false;
     mono = false;
     inverse = false;
-    for(uint8_t i = 0; i < line_num; i++) {
-        for(uint8_t j = 0; j < line[i].len; j++) {
+    for(size_t i = 0; i < line_num; i++) {
+        for(size_t j = 0; j < line[i].len; j++) {
             // Process format symbols
-            if(line[i].text[j] == ELEMENTS_BOLD_MARKER) {
-                if(bold) {
-                    current_font = FontSecondary;
-                } else {
-                    current_font = FontPrimary;
+            if(line[i].text[j] == '\e' && j < line[i].len - 1) {
+                ++j;
+                if(line[i].text[j] == ELEMENTS_BOLD_MARKER) {
+                    if(bold) {
+                        current_font = FontSecondary;
+                    } else {
+                        current_font = FontPrimary;
+                    }
+                    canvas_set_font(canvas, current_font);
+                    bold = !bold;
+                    continue;
                 }
-                canvas_set_font(canvas, current_font);
-                bold = !bold;
-                continue;
-            }
-            if(line[i].text[j] == ELEMENTS_MONO_MARKER) {
-                if(mono) {
-                    current_font = FontSecondary;
-                } else {
-                    current_font = FontKeyboard;
+                if(line[i].text[j] == ELEMENTS_MONO_MARKER) {
+                    if(mono) {
+                        current_font = FontSecondary;
+                    } else {
+                        current_font = FontKeyboard;
+                    }
+                    canvas_set_font(canvas, current_font);
+                    mono = !mono;
+                    continue;
+                }
+                if(line[i].text[j] == ELEMENTS_INVERSE_MARKER) {
+                    inverse = !inverse;
+                    continue;
                 }
-                canvas_set_font(canvas, current_font);
-                mono = !mono;
-                continue;
-            }
-            if(line[i].text[j] == ELEMENTS_INVERSE_MARKER) {
-                inverse = !inverse;
-                continue;
             }
             if(inverse) {
                 canvas_draw_box(
@@ -874,8 +888,9 @@ void elements_text_box(
                 canvas_invert_color(canvas);
             } else {
                 if((i == line_num - 1) && strip_to_dots) {
-                    uint8_t next_symbol_width = canvas_glyph_width(canvas, line[i].text[j]);
-                    if(line[i].x + next_symbol_width + dots_width > x + width) {
+                    size_t next_symbol_width = canvas_glyph_width(canvas, line[i].text[j]);
+                    if((line[i].x + (int32_t)next_symbol_width + (int32_t)dots_width) >
+                       (x + (int32_t)width)) {
                         canvas_draw_str(canvas, line[i].x, line[i].y, "...");
                         break;
                     }
diff --git a/applications/services/gui/elements.h b/applications/services/gui/elements.h
index bdc43d09a..8cc912362 100644
--- a/applications/services/gui/elements.h
+++ b/applications/services/gui/elements.h
@@ -29,7 +29,7 @@ extern "C" {
  * @param   width       progress bar width
  * @param   progress    progress (0.0 - 1.0)
  */
-void elements_progress_bar(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, float progress);
+void elements_progress_bar(Canvas* canvas, int32_t x, int32_t y, size_t width, float progress);
 
 /** Draw progress bar with text.
  *
@@ -42,9 +42,9 @@ void elements_progress_bar(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width,
  */
 void elements_progress_bar_with_text(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
+    int32_t x,
+    int32_t y,
+    size_t width,
     float progress,
     const char* text);
 
@@ -59,11 +59,11 @@ void elements_progress_bar_with_text(
  */
 void elements_scrollbar_pos(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t height,
-    uint16_t pos,
-    uint16_t total);
+    int32_t x,
+    int32_t y,
+    size_t height,
+    size_t pos,
+    size_t total);
 
 /** Draw scrollbar on canvas.
  * @note    width 3px, height equal to canvas height
@@ -72,7 +72,7 @@ void elements_scrollbar_pos(
  * @param   pos     current element of total elements
  * @param   total   total elements
  */
-void elements_scrollbar(Canvas* canvas, uint16_t pos, uint16_t total);
+void elements_scrollbar(Canvas* canvas, size_t pos, size_t total);
 
 /** Draw rounded frame
  *
@@ -80,7 +80,7 @@ void elements_scrollbar(Canvas* canvas, uint16_t pos, uint16_t total);
  * @param   x, y            top left corner coordinates
  * @param   width, height   frame width and height
  */
-void elements_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height);
+void elements_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height);
 
 /** Draw button in left corner
  *
@@ -112,8 +112,8 @@ void elements_button_center(Canvas* canvas, const char* str);
  */
 void elements_multiline_text_aligned(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
+    int32_t x,
+    int32_t y,
     Align horizontal,
     Align vertical,
     const char* text);
@@ -124,7 +124,7 @@ void elements_multiline_text_aligned(
  * @param   x, y    top left corner coordinates
  * @param   text    string (possible multiline)
  */
-void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, const char* text);
+void elements_multiline_text(Canvas* canvas, int32_t x, int32_t y, const char* text);
 
 /** Draw framed multiline text
  *
@@ -132,7 +132,7 @@ void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, const char* t
  * @param   x, y    top left corner coordinates
  * @param   text    string (possible multiline)
  */
-void elements_multiline_text_framed(Canvas* canvas, uint8_t x, uint8_t y, const char* text);
+void elements_multiline_text_framed(Canvas* canvas, int32_t x, int32_t y, const char* text);
 
 /** Draw slightly rounded frame
  *
@@ -142,10 +142,10 @@ void elements_multiline_text_framed(Canvas* canvas, uint8_t x, uint8_t y, const
  */
 void elements_slightly_rounded_frame(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height);
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height);
 
 /** Draw slightly rounded box
  *
@@ -155,10 +155,10 @@ void elements_slightly_rounded_frame(
  */
 void elements_slightly_rounded_box(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height);
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height);
 
 /** Draw bold rounded frame
  *
@@ -166,12 +166,7 @@ void elements_slightly_rounded_box(
  * @param   x, y            top left corner coordinates
  * @param   width, height   size of frame
  */
-void elements_bold_rounded_frame(
-    Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height);
+void elements_bold_rounded_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height);
 
 /** Draw bubble frame for text
  *
@@ -181,22 +176,21 @@ void elements_bold_rounded_frame(
  * @param   width   bubble width
  * @param   height  bubble height
  */
-void elements_bubble(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height);
+void elements_bubble(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height);
 
 /** Draw bubble frame for text with corner
  *
  * @param   canvas      Canvas instance
  * @param   x           left x coordinates
  * @param   y           top y coordinate
- * @param   width       bubble width
- * @param   height      bubble height
+ * @param   text        text to display
  * @param   horizontal  horizontal aligning
  * @param   vertical    aligning
  */
 void elements_bubble_str(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
+    int32_t x,
+    int32_t y,
     const char* text,
     Align horizontal,
     Align vertical);
@@ -207,7 +201,7 @@ void elements_bubble_str(
  * @param   string  string to trim
  * @param   width   max width
  */
-void elements_string_fit_width(Canvas* canvas, FuriString* string, uint8_t width);
+void elements_string_fit_width(Canvas* canvas, FuriString* string, size_t width);
 
 /** Draw scrollable text line
  *
@@ -221,9 +215,9 @@ void elements_string_fit_width(Canvas* canvas, FuriString* string, uint8_t width
  */
 void elements_scrollable_text_line(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
+    int32_t x,
+    int32_t y,
+    size_t width,
     FuriString* string,
     size_t scroll,
     bool ellipsis);
@@ -255,10 +249,10 @@ void elements_scrollable_text_line_str(
  */
 void elements_text_box(
     Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    uint8_t width,
-    uint8_t height,
+    int32_t x,
+    int32_t y,
+    size_t width,
+    size_t height,
     Align horizontal,
     Align vertical,
     const char* text,
diff --git a/applications/services/gui/gui.c b/applications/services/gui/gui.c
index 9deaf23fe..24ea57bc0 100644
--- a/applications/services/gui/gui.c
+++ b/applications/services/gui/gui.c
@@ -349,9 +349,10 @@ void gui_unlock(Gui* gui) {
 }
 
 void gui_add_view_port(Gui* gui, ViewPort* view_port, GuiLayer layer) {
-    furi_assert(gui);
-    furi_assert(view_port);
+    furi_check(gui);
+    furi_check(view_port);
     furi_check(layer < GuiLayerMAX);
+
     // Only fullscreen supports Vertical orientation for now
     ViewPortOrientation view_port_orientation = view_port_get_orientation(view_port);
     furi_check(
@@ -379,8 +380,8 @@ void gui_add_view_port(Gui* gui, ViewPort* view_port, GuiLayer layer) {
 }
 
 void gui_remove_view_port(Gui* gui, ViewPort* view_port) {
-    furi_assert(gui);
-    furi_assert(view_port);
+    furi_check(gui);
+    furi_check(view_port);
 
     gui_lock(gui);
     view_port_gui_set(view_port, NULL);
@@ -405,8 +406,8 @@ void gui_remove_view_port(Gui* gui, ViewPort* view_port) {
 }
 
 void gui_view_port_send_to_front(Gui* gui, ViewPort* view_port) {
-    furi_assert(gui);
-    furi_assert(view_port);
+    furi_check(gui);
+    furi_check(view_port);
 
     gui_lock(gui);
     // Remove
@@ -417,14 +418,14 @@ void gui_view_port_send_to_front(Gui* gui, ViewPort* view_port) {
         while(!ViewPortArray_end_p(it)) {
             if(*ViewPortArray_ref(it) == view_port) {
                 ViewPortArray_remove(gui->layers[i], it);
-                furi_assert(layer == GuiLayerMAX);
+                furi_check(layer == GuiLayerMAX);
                 layer = i;
             } else {
                 ViewPortArray_next(it);
             }
         }
     }
-    furi_assert(layer != GuiLayerMAX);
+    furi_check(layer != GuiLayerMAX);
     // Return to the top
     ViewPortArray_push_back(gui->layers[layer], view_port);
     gui_unlock(gui);
@@ -463,7 +464,7 @@ void gui_view_port_send_to_back(Gui* gui, ViewPort* view_port) {
 }
 
 void gui_add_framebuffer_callback(Gui* gui, GuiCanvasCommitCallback callback, void* context) {
-    furi_assert(gui);
+    furi_check(gui);
 
     canvas_add_framebuffer_callback(gui->canvas, callback, context);
 
@@ -472,18 +473,19 @@ void gui_add_framebuffer_callback(Gui* gui, GuiCanvasCommitCallback callback, vo
 }
 
 void gui_remove_framebuffer_callback(Gui* gui, GuiCanvasCommitCallback callback, void* context) {
-    furi_assert(gui);
+    furi_check(gui);
 
     canvas_remove_framebuffer_callback(gui->canvas, callback, context);
 }
 
 size_t gui_get_framebuffer_size(const Gui* gui) {
-    furi_assert(gui);
+    furi_check(gui);
+
     return canvas_get_buffer_size(gui->canvas);
 }
 
 void gui_set_lockdown(Gui* gui, bool lockdown) {
-    furi_assert(gui);
+    furi_check(gui);
 
     gui_lock(gui);
     gui->lockdown = lockdown;
@@ -494,11 +496,14 @@ void gui_set_lockdown(Gui* gui, bool lockdown) {
 }
 
 Canvas* gui_direct_draw_acquire(Gui* gui) {
-    furi_assert(gui);
+    furi_check(gui);
+
     gui_lock(gui);
     gui->direct_draw = true;
     gui_unlock(gui);
 
+    canvas_set_orientation(gui->canvas, CanvasOrientationHorizontal);
+    canvas_frame_set(gui->canvas, 0, 0, GUI_DISPLAY_WIDTH, GUI_DISPLAY_HEIGHT);
     canvas_reset(gui->canvas);
     canvas_commit(gui->canvas);
 
@@ -506,7 +511,7 @@ Canvas* gui_direct_draw_acquire(Gui* gui) {
 }
 
 void gui_direct_draw_release(Gui* gui) {
-    furi_assert(gui);
+    furi_check(gui);
 
     canvas_reset(gui->canvas);
     canvas_commit(gui->canvas);
@@ -518,7 +523,7 @@ void gui_direct_draw_release(Gui* gui) {
     gui_update(gui);
 }
 
-Gui* gui_alloc() {
+Gui* gui_alloc(void) {
     Gui* gui = malloc(sizeof(Gui));
     // Thread ID
     gui->thread_id = furi_thread_get_current_id();
diff --git a/applications/services/gui/icon.c b/applications/services/gui/icon.c
index 98f35b12a..e216b9255 100644
--- a/applications/services/gui/icon.c
+++ b/applications/services/gui/icon.c
@@ -1,13 +1,20 @@
 #include "icon_i.h"
+#include <furi.h>
 
 uint8_t icon_get_width(const Icon* instance) {
+    furi_check(instance);
+
     return instance->width;
 }
 
 uint8_t icon_get_height(const Icon* instance) {
+    furi_check(instance);
+
     return instance->height;
 }
 
 const uint8_t* icon_get_data(const Icon* instance) {
+    furi_check(instance);
+
     return instance->frames[0];
 }
diff --git a/applications/services/gui/icon_animation.c b/applications/services/gui/icon_animation.c
index a39ef2e25..f887b90ac 100644
--- a/applications/services/gui/icon_animation.c
+++ b/applications/services/gui/icon_animation.c
@@ -4,18 +4,22 @@
 #include <furi.h>
 
 IconAnimation* icon_animation_alloc(const Icon* icon) {
-    furi_assert(icon);
+    furi_check(icon);
+
     IconAnimation* instance = malloc(sizeof(IconAnimation));
     instance->icon = icon;
     instance->timer =
         furi_timer_alloc(icon_animation_timer_callback, FuriTimerTypePeriodic, instance);
+
     return instance;
 }
 
 void icon_animation_free(IconAnimation* instance) {
-    furi_assert(instance);
+    furi_check(instance);
+
     icon_animation_stop(instance);
     furi_timer_free(instance->timer);
+
     free(instance);
 }
 
@@ -23,7 +27,8 @@ void icon_animation_set_update_callback(
     IconAnimation* instance,
     IconAnimationCallback callback,
     void* context) {
-    furi_assert(instance);
+    furi_check(instance);
+
     instance->callback = callback;
     instance->callback_context = context;
 }
@@ -51,17 +56,20 @@ void icon_animation_timer_callback(void* context) {
 }
 
 uint8_t icon_animation_get_width(const IconAnimation* instance) {
-    furi_assert(instance);
+    furi_check(instance);
+
     return instance->icon->width;
 }
 
 uint8_t icon_animation_get_height(const IconAnimation* instance) {
-    furi_assert(instance);
+    furi_check(instance);
+
     return instance->icon->height;
 }
 
 void icon_animation_start(IconAnimation* instance) {
-    furi_assert(instance);
+    furi_check(instance);
+
     if(!instance->animating) {
         instance->animating = true;
         furi_assert(instance->icon->frame_rate);
@@ -73,7 +81,8 @@ void icon_animation_start(IconAnimation* instance) {
 }
 
 void icon_animation_stop(IconAnimation* instance) {
-    furi_assert(instance);
+    furi_check(instance);
+
     if(instance->animating) {
         instance->animating = false;
         furi_timer_stop(instance->timer);
@@ -82,6 +91,7 @@ void icon_animation_stop(IconAnimation* instance) {
 }
 
 bool icon_animation_is_last_frame(const IconAnimation* instance) {
-    furi_assert(instance);
+    furi_check(instance);
+
     return instance->icon->frame_count - instance->frame <= 1;
 }
diff --git a/applications/services/gui/modules/button_menu.c b/applications/services/gui/modules/button_menu.c
index 6ac786c92..ed76bd2b3 100644
--- a/applications/services/gui/modules/button_menu.c
+++ b/applications/services/gui/modules/button_menu.c
@@ -300,12 +300,12 @@ static bool button_menu_view_input_callback(InputEvent* event, void* context) {
 }
 
 View* button_menu_get_view(ButtonMenu* button_menu) {
-    furi_assert(button_menu);
+    furi_check(button_menu);
     return button_menu->view;
 }
 
 void button_menu_reset(ButtonMenu* button_menu) {
-    furi_assert(button_menu);
+    furi_check(button_menu);
 
     with_view_model(
         button_menu->view,
@@ -319,7 +319,7 @@ void button_menu_reset(ButtonMenu* button_menu) {
 }
 
 void button_menu_set_header(ButtonMenu* button_menu, const char* header) {
-    furi_assert(button_menu);
+    furi_check(button_menu);
 
     with_view_model(
         button_menu->view, ButtonMenuModel * model, { model->header = header; }, true);
@@ -333,8 +333,8 @@ ButtonMenuItem* button_menu_add_item(
     ButtonMenuItemType type,
     void* callback_context) {
     ButtonMenuItem* item = NULL;
-    furi_assert(label);
-    furi_assert(button_menu);
+    furi_check(label);
+    furi_check(button_menu);
 
     with_view_model(
         button_menu->view,
@@ -376,7 +376,7 @@ ButtonMenu* button_menu_alloc(void) {
 }
 
 void button_menu_free(ButtonMenu* button_menu) {
-    furi_assert(button_menu);
+    furi_check(button_menu);
 
     with_view_model(
         button_menu->view,
@@ -388,7 +388,7 @@ void button_menu_free(ButtonMenu* button_menu) {
 }
 
 void button_menu_set_selected_item(ButtonMenu* button_menu, uint32_t index) {
-    furi_assert(button_menu);
+    furi_check(button_menu);
 
     with_view_model(
         button_menu->view,
diff --git a/applications/services/gui/modules/button_panel.c b/applications/services/gui/modules/button_panel.c
index a6900dee3..9f39095cb 100644
--- a/applications/services/gui/modules/button_panel.c
+++ b/applications/services/gui/modules/button_panel.c
@@ -67,7 +67,7 @@ static void button_panel_process_ok(ButtonPanel* button_panel);
 static void button_panel_view_draw_callback(Canvas* canvas, void* _model);
 static bool button_panel_view_input_callback(InputEvent* event, void* context);
 
-ButtonPanel* button_panel_alloc() {
+ButtonPanel* button_panel_alloc(void) {
     ButtonPanel* button_panel = malloc(sizeof(ButtonPanel));
     button_panel->view = view_alloc();
     view_set_orientation(button_panel->view, ViewOrientationVertical);
@@ -125,7 +125,7 @@ void button_panel_reserve(ButtonPanel* button_panel, size_t reserve_x, size_t re
 }
 
 void button_panel_free(ButtonPanel* button_panel) {
-    furi_assert(button_panel);
+    furi_check(button_panel);
 
     button_panel_reset(button_panel);
 
@@ -143,7 +143,7 @@ void button_panel_free(ButtonPanel* button_panel) {
 }
 
 void button_panel_reset(ButtonPanel* button_panel) {
-    furi_assert(button_panel);
+    furi_check(button_panel);
 
     with_view_model(
         button_panel->view,
@@ -188,7 +188,7 @@ void button_panel_add_item(
     const Icon* icon_name_selected,
     ButtonItemCallback callback,
     void* callback_context) {
-    furi_assert(button_panel);
+    furi_check(button_panel);
 
     with_view_model( //-V773
         button_panel->view,
@@ -211,7 +211,7 @@ void button_panel_add_item(
 }
 
 View* button_panel_get_view(ButtonPanel* button_panel) {
-    furi_assert(button_panel);
+    furi_check(button_panel);
     return button_panel->view;
 }
 
@@ -416,7 +416,7 @@ void button_panel_add_label(
     uint16_t y,
     Font font,
     const char* label_str) {
-    furi_assert(button_panel);
+    furi_check(button_panel);
 
     with_view_model(
         button_panel->view,
@@ -437,7 +437,7 @@ void button_panel_add_icon(
     uint16_t x,
     uint16_t y,
     const Icon* icon_name) {
-    furi_assert(button_panel);
+    furi_check(button_panel);
 
     with_view_model( //-V773
         button_panel->view,
diff --git a/applications/services/gui/modules/byte_input.c b/applications/services/gui/modules/byte_input.c
index dd13e3aad..4c3da820b 100644
--- a/applications/services/gui/modules/byte_input.c
+++ b/applications/services/gui/modules/byte_input.c
@@ -808,7 +808,7 @@ static void byte_input_reset_model_input_data(ByteInputModel* model) {
     model->first_visible_byte = 0;
 }
 
-ByteInput* byte_input_alloc() {
+ByteInput* byte_input_alloc(void) {
     ByteInput* byte_input = malloc(sizeof(ByteInput));
     byte_input->view = view_alloc();
     view_set_context(byte_input->view, byte_input);
@@ -832,13 +832,13 @@ ByteInput* byte_input_alloc() {
 }
 
 void byte_input_free(ByteInput* byte_input) {
-    furi_assert(byte_input);
+    furi_check(byte_input);
     view_free(byte_input->view);
     free(byte_input);
 }
 
 View* byte_input_get_view(ByteInput* byte_input) {
-    furi_assert(byte_input);
+    furi_check(byte_input);
     return byte_input->view;
 }
 
@@ -849,6 +849,8 @@ void byte_input_set_result_callback(
     void* callback_context,
     uint8_t* bytes,
     uint8_t bytes_count) {
+    furi_check(byte_input);
+
     with_view_model(
         byte_input->view,
         ByteInputModel * model,
@@ -864,6 +866,8 @@ void byte_input_set_result_callback(
 }
 
 void byte_input_set_header_text(ByteInput* byte_input, const char* text) {
+    furi_check(byte_input);
+
     with_view_model(
         byte_input->view, ByteInputModel * model, { model->header = text; }, true);
 }
diff --git a/applications/services/gui/modules/byte_input.h b/applications/services/gui/modules/byte_input.h
index 42c4b5d65..9cca7575e 100644
--- a/applications/services/gui/modules/byte_input.h
+++ b/applications/services/gui/modules/byte_input.h
@@ -24,7 +24,7 @@ typedef void (*ByteChangedCallback)(void* context);
  *
  * @return     ByteInput instance pointer
  */
-ByteInput* byte_input_alloc();
+ByteInput* byte_input_alloc(void);
 
 /** Deinitialize and free byte input
  *
diff --git a/applications/services/gui/modules/dialog_ex.c b/applications/services/gui/modules/dialog_ex.c
index 7c3ef9b45..5fd42be6c 100644
--- a/applications/services/gui/modules/dialog_ex.c
+++ b/applications/services/gui/modules/dialog_ex.c
@@ -143,7 +143,7 @@ static bool dialog_ex_view_input_callback(InputEvent* event, void* context) {
     return consumed;
 }
 
-DialogEx* dialog_ex_alloc() {
+DialogEx* dialog_ex_alloc(void) {
     DialogEx* dialog_ex = malloc(sizeof(DialogEx));
     dialog_ex->view = view_alloc();
     view_set_context(dialog_ex->view, dialog_ex);
@@ -180,23 +180,23 @@ DialogEx* dialog_ex_alloc() {
 }
 
 void dialog_ex_free(DialogEx* dialog_ex) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     view_free(dialog_ex->view);
     free(dialog_ex);
 }
 
 View* dialog_ex_get_view(DialogEx* dialog_ex) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     return dialog_ex->view;
 }
 
 void dialog_ex_set_result_callback(DialogEx* dialog_ex, DialogExResultCallback callback) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     dialog_ex->callback = callback;
 }
 
 void dialog_ex_set_context(DialogEx* dialog_ex, void* context) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     dialog_ex->context = context;
 }
 
@@ -207,7 +207,7 @@ void dialog_ex_set_header(
     uint8_t y,
     Align horizontal,
     Align vertical) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     with_view_model(
         dialog_ex->view,
         DialogExModel * model,
@@ -228,7 +228,7 @@ void dialog_ex_set_text(
     uint8_t y,
     Align horizontal,
     Align vertical) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     with_view_model(
         dialog_ex->view,
         DialogExModel * model,
@@ -243,7 +243,7 @@ void dialog_ex_set_text(
 }
 
 void dialog_ex_set_icon(DialogEx* dialog_ex, uint8_t x, uint8_t y, const Icon* icon) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     with_view_model(
         dialog_ex->view,
         DialogExModel * model,
@@ -256,25 +256,25 @@ void dialog_ex_set_icon(DialogEx* dialog_ex, uint8_t x, uint8_t y, const Icon* i
 }
 
 void dialog_ex_set_left_button_text(DialogEx* dialog_ex, const char* text) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     with_view_model(
         dialog_ex->view, DialogExModel * model, { model->left_text = text; }, true);
 }
 
 void dialog_ex_set_center_button_text(DialogEx* dialog_ex, const char* text) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     with_view_model(
         dialog_ex->view, DialogExModel * model, { model->center_text = text; }, true);
 }
 
 void dialog_ex_set_right_button_text(DialogEx* dialog_ex, const char* text) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     with_view_model(
         dialog_ex->view, DialogExModel * model, { model->right_text = text; }, true);
 }
 
 void dialog_ex_reset(DialogEx* dialog_ex) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     TextElement clean_text_el = {
         .text = NULL, .x = 0, .y = 0, .horizontal = AlignLeft, .vertical = AlignLeft};
     IconElement clean_icon_el = {.icon = NULL, .x = 0, .y = 0};
@@ -295,11 +295,11 @@ void dialog_ex_reset(DialogEx* dialog_ex) {
 }
 
 void dialog_ex_enable_extended_events(DialogEx* dialog_ex) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     dialog_ex->enable_extended_events = true;
 }
 
 void dialog_ex_disable_extended_events(DialogEx* dialog_ex) {
-    furi_assert(dialog_ex);
+    furi_check(dialog_ex);
     dialog_ex->enable_extended_events = false;
 }
diff --git a/applications/services/gui/modules/dialog_ex.h b/applications/services/gui/modules/dialog_ex.h
index 26a465354..aa87097f7 100644
--- a/applications/services/gui/modules/dialog_ex.h
+++ b/applications/services/gui/modules/dialog_ex.h
@@ -38,7 +38,7 @@ typedef void (*DialogExResultCallback)(DialogExResult result, void* context);
  *
  * @return     DialogEx instance
  */
-DialogEx* dialog_ex_alloc();
+DialogEx* dialog_ex_alloc(void);
 
 /** Deinitialize and free dialog
  *
@@ -114,7 +114,6 @@ void dialog_ex_set_text(
  * @param      x          x position
  * @param      y          y position
  * @param      icon       The icon
- * @param      name  icon to be shown
  */
 void dialog_ex_set_icon(DialogEx* dialog_ex, uint8_t x, uint8_t y, const Icon* icon);
 
diff --git a/applications/services/gui/modules/empty_screen.c b/applications/services/gui/modules/empty_screen.c
index 0a51bc71c..1efb1d910 100644
--- a/applications/services/gui/modules/empty_screen.c
+++ b/applications/services/gui/modules/empty_screen.c
@@ -16,7 +16,7 @@ static bool empty_screen_view_input_callback(InputEvent* event, void* context) {
     return false;
 }
 
-EmptyScreen* empty_screen_alloc() {
+EmptyScreen* empty_screen_alloc(void) {
     EmptyScreen* empty_screen = malloc(sizeof(EmptyScreen));
     empty_screen->view = view_alloc();
     view_set_context(empty_screen->view, empty_screen);
@@ -26,12 +26,12 @@ EmptyScreen* empty_screen_alloc() {
 }
 
 void empty_screen_free(EmptyScreen* empty_screen) {
-    furi_assert(empty_screen);
+    furi_check(empty_screen);
     view_free(empty_screen->view);
     free(empty_screen);
 }
 
 View* empty_screen_get_view(EmptyScreen* empty_screen) {
-    furi_assert(empty_screen);
+    furi_check(empty_screen);
     return empty_screen->view;
 }
diff --git a/applications/services/gui/modules/empty_screen.h b/applications/services/gui/modules/empty_screen.h
index 23ebeb3a0..5ca99bda2 100644
--- a/applications/services/gui/modules/empty_screen.h
+++ b/applications/services/gui/modules/empty_screen.h
@@ -20,7 +20,7 @@ typedef struct EmptyScreen EmptyScreen;
  *
  * @return     EmptyScreen instance
  */
-EmptyScreen* empty_screen_alloc();
+EmptyScreen* empty_screen_alloc(void);
 
 /** Deinitialize and free empty screen
  *
diff --git a/applications/services/gui/modules/file_browser.c b/applications/services/gui/modules/file_browser.c
index bfca1f91c..c4a0a1b52 100644
--- a/applications/services/gui/modules/file_browser.c
+++ b/applications/services/gui/modules/file_browser.c
@@ -172,14 +172,14 @@ static void browser_list_item_cb(
 static void browser_long_load_cb(void* context);
 
 static void file_browser_scroll_timer_callback(void* context) {
-    furi_assert(context);
+    furi_check(context);
     FileBrowser* browser = context;
     with_view_model(
         browser->view, FileBrowserModel * model, { model->scroll_counter++; }, true);
 }
 
 static void file_browser_view_enter_callback(void* context) {
-    furi_assert(context);
+    furi_check(context);
     FileBrowser* browser = context;
     with_view_model(
         browser->view, FileBrowserModel * model, { model->scroll_counter = 0; }, true);
@@ -187,13 +187,14 @@ static void file_browser_view_enter_callback(void* context) {
 }
 
 static void file_browser_view_exit_callback(void* context) {
-    furi_assert(context);
+    furi_check(context);
     FileBrowser* browser = context;
     furi_timer_stop(browser->scroll_timer);
 }
 
 FileBrowser* file_browser_alloc(FuriString* result_path) {
-    furi_assert(result_path);
+    furi_check(result_path);
+
     FileBrowser* browser = malloc(sizeof(FileBrowser));
     browser->view = view_alloc();
     view_allocate_model(browser->view, ViewModelTypeLocking, sizeof(FileBrowserModel));
@@ -215,7 +216,7 @@ FileBrowser* file_browser_alloc(FuriString* result_path) {
 }
 
 void file_browser_free(FileBrowser* browser) {
-    furi_assert(browser);
+    furi_check(browser);
 
     furi_timer_free(browser->scroll_timer);
 
@@ -227,7 +228,7 @@ void file_browser_free(FileBrowser* browser) {
 }
 
 View* file_browser_get_view(FileBrowser* browser) {
-    furi_assert(browser);
+    furi_check(browser);
     return browser->view;
 }
 
@@ -239,7 +240,7 @@ void file_browser_configure(
     bool hide_dot_files,
     const Icon* file_icon,
     bool hide_ext) {
-    furi_assert(browser);
+    furi_check(browser);
 
     browser->ext_filter = extension;
     browser->skip_assets = skip_assets;
@@ -258,7 +259,7 @@ void file_browser_configure(
 }
 
 void file_browser_start(FileBrowser* browser, FuriString* path) {
-    furi_assert(browser);
+    furi_check(browser);
     browser->worker = file_browser_worker_alloc(
         path,
         browser->base_path,
@@ -273,7 +274,7 @@ void file_browser_start(FileBrowser* browser, FuriString* path) {
 }
 
 void file_browser_stop(FileBrowser* browser) {
-    furi_assert(browser);
+    furi_check(browser);
     file_browser_worker_free(browser->worker);
     with_view_model(
         browser->view,
@@ -289,6 +290,7 @@ void file_browser_stop(FileBrowser* browser) {
 }
 
 void file_browser_set_callback(FileBrowser* browser, FileBrowserCallback callback, void* context) {
+    furi_check(browser);
     browser->context = context;
     browser->callback = callback;
 }
@@ -297,6 +299,8 @@ void file_browser_set_item_callback(
     FileBrowser* browser,
     FileBrowserLoadItemCallback callback,
     void* context) {
+    furi_check(browser);
+
     browser->item_context = context;
     browser->item_callback = callback;
 }
@@ -336,7 +340,7 @@ static bool browser_is_list_load_required(FileBrowserModel* model) {
 }
 
 static void browser_update_offset(FileBrowser* browser) {
-    furi_assert(browser);
+    furi_check(browser);
 
     with_view_model(
         browser->view,
@@ -362,7 +366,7 @@ static void browser_update_offset(FileBrowser* browser) {
 
 static void
     browser_folder_open_cb(void* context, uint32_t item_cnt, int32_t file_idx, bool is_root) {
-    furi_assert(context);
+    furi_check(context);
     FileBrowser* browser = (FileBrowser*)context;
 
     int32_t load_offset = 0;
@@ -396,7 +400,7 @@ static void
 }
 
 static void browser_list_load_cb(void* context, uint32_t list_load_offset) {
-    furi_assert(context);
+    furi_check(context);
     FileBrowser* browser = (FileBrowser*)context;
 
     BrowserItem_t back_item;
@@ -428,7 +432,7 @@ static void browser_list_item_cb(
     uint32_t idx,
     bool is_folder,
     bool is_last) {
-    furi_assert(context);
+    furi_check(context);
     FileBrowser* browser = (FileBrowser*)context;
 
     BrowserItem_t item;
@@ -506,7 +510,7 @@ static void browser_list_item_cb(
 }
 
 static void browser_long_load_cb(void* context) {
-    furi_assert(context);
+    furi_check(context);
     FileBrowser* browser = (FileBrowser*)context;
 
     with_view_model(
@@ -643,7 +647,7 @@ static void file_browser_view_draw_callback(Canvas* canvas, void* _model) {
 
 static bool file_browser_view_input_callback(InputEvent* event, void* context) {
     FileBrowser* browser = context;
-    furi_assert(browser);
+    furi_check(browser);
     bool consumed = false;
     bool is_loading = false;
 
diff --git a/applications/services/gui/modules/file_browser_worker.c b/applications/services/gui/modules/file_browser_worker.c
index c33288765..08e194325 100644
--- a/applications/services/gui/modules/file_browser_worker.c
+++ b/applications/services/gui/modules/file_browser_worker.c
@@ -357,7 +357,7 @@ static bool browser_folder_load_full(BrowserWorker* browser, FuriString* path) {
 
 static int32_t browser_worker(void* context) {
     BrowserWorker* browser = (BrowserWorker*)context;
-    furi_assert(browser);
+    furi_check(browser);
     FURI_LOG_D(TAG, "Start");
 
     uint32_t items_cnt = 0;
@@ -373,7 +373,7 @@ static int32_t browser_worker(void* context) {
     while(1) {
         uint32_t flags =
             furi_thread_flags_wait(WORKER_FLAGS_ALL, FuriFlagWaitAny, FuriWaitForever);
-        furi_assert((flags & FuriFlagError) == 0);
+        furi_check((flags & FuriFlagError) == 0);
 
         if(flags & WorkerEvtConfigChange) {
             // If start path is a path to the file - try finding index of this file in a folder
@@ -499,7 +499,7 @@ BrowserWorker* file_browser_worker_alloc(
 } //-V773
 
 void file_browser_worker_free(BrowserWorker* browser) {
-    furi_assert(browser);
+    furi_check(browser);
 
     furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtStop);
     furi_thread_join(browser->thread);
@@ -516,35 +516,35 @@ void file_browser_worker_free(BrowserWorker* browser) {
 }
 
 void file_browser_worker_set_callback_context(BrowserWorker* browser, void* context) {
-    furi_assert(browser);
+    furi_check(browser);
     browser->cb_ctx = context;
 }
 
 void file_browser_worker_set_folder_callback(
     BrowserWorker* browser,
     BrowserWorkerFolderOpenCallback cb) {
-    furi_assert(browser);
+    furi_check(browser);
     browser->folder_cb = cb;
 }
 
 void file_browser_worker_set_list_callback(
     BrowserWorker* browser,
     BrowserWorkerListLoadCallback cb) {
-    furi_assert(browser);
+    furi_check(browser);
     browser->list_load_cb = cb;
 }
 
 void file_browser_worker_set_item_callback(
     BrowserWorker* browser,
     BrowserWorkerListItemCallback cb) {
-    furi_assert(browser);
+    furi_check(browser);
     browser->list_item_cb = cb;
 }
 
 void file_browser_worker_set_long_load_callback(
     BrowserWorker* browser,
     BrowserWorkerLongLoadCallback cb) {
-    furi_assert(browser);
+    furi_check(browser);
     browser->long_load_cb = cb;
 }
 
@@ -554,7 +554,7 @@ void file_browser_worker_set_config(
     const char* ext_filter,
     bool skip_assets,
     bool hide_dot_files) {
-    furi_assert(browser);
+    furi_check(browser);
     furi_string_set(browser->path_next, path);
     browser_parse_ext_filter(browser->ext_filter, ext_filter);
     browser->skip_assets = skip_assets;
@@ -563,30 +563,30 @@ void file_browser_worker_set_config(
 }
 
 void file_browser_worker_folder_enter(BrowserWorker* browser, FuriString* path, int32_t item_idx) {
-    furi_assert(browser);
+    furi_check(browser);
     furi_string_set(browser->path_next, path);
     browser->item_sel_idx = item_idx;
     furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtFolderEnter);
 }
 
 bool file_browser_worker_is_in_start_folder(BrowserWorker* browser) {
-    furi_assert(browser);
+    furi_check(browser);
     return (furi_string_cmp(browser->path_start, browser->path_current) == 0);
 }
 
 void file_browser_worker_folder_exit(BrowserWorker* browser) {
-    furi_assert(browser);
+    furi_check(browser);
     furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtFolderExit);
 }
 
 void file_browser_worker_folder_refresh(BrowserWorker* browser, int32_t item_idx) {
-    furi_assert(browser);
+    furi_check(browser);
     browser->item_sel_idx = item_idx;
     furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtFolderRefresh);
 }
 
 void file_browser_worker_load(BrowserWorker* browser, uint32_t offset, uint32_t count) {
-    furi_assert(browser);
+    furi_check(browser);
     browser->load_offset = offset;
     browser->load_count = count;
     furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtLoad);
diff --git a/applications/services/gui/modules/loading.c b/applications/services/gui/modules/loading.c
index e64aeb78f..7ef4ba8f3 100644
--- a/applications/services/gui/modules/loading.c
+++ b/applications/services/gui/modules/loading.c
@@ -79,6 +79,8 @@ Loading* loading_alloc(void) {
 }
 
 void loading_free(Loading* instance) {
+    furi_check(instance);
+
     LoadingModel* model = view_get_model(instance->view);
     icon_animation_free(model->icon);
     view_commit_model(instance->view, false);
@@ -89,7 +91,6 @@ void loading_free(Loading* instance) {
 }
 
 View* loading_get_view(Loading* instance) {
-    furi_assert(instance);
-    furi_assert(instance->view);
+    furi_check(instance);
     return instance->view;
 }
diff --git a/applications/services/gui/modules/loading.h b/applications/services/gui/modules/loading.h
index 1e071c10a..12eac00d5 100644
--- a/applications/services/gui/modules/loading.h
+++ b/applications/services/gui/modules/loading.h
@@ -14,7 +14,7 @@ typedef struct Loading Loading;
  *
  * @return     Loading View instance
  */
-Loading* loading_alloc();
+Loading* loading_alloc(void);
 
 /** Deinitialize and free Loading View
  *
diff --git a/applications/services/gui/modules/menu.c b/applications/services/gui/modules/menu.c
index afae8b8fa..f0a3b82b5 100644
--- a/applications/services/gui/modules/menu.c
+++ b/applications/services/gui/modules/menu.c
@@ -129,9 +129,9 @@ static void menu_exit(void* context) {
         false);
 }
 
-Menu* menu_alloc() {
+Menu* menu_alloc(void) {
     Menu* menu = malloc(sizeof(Menu));
-    menu->view = view_alloc(menu->view);
+    menu->view = view_alloc();
     view_set_context(menu->view, menu);
     view_allocate_model(menu->view, ViewModelTypeLocking, sizeof(MenuModel));
     view_set_draw_callback(menu->view, menu_draw_callback);
@@ -152,16 +152,18 @@ Menu* menu_alloc() {
 }
 
 void menu_free(Menu* menu) {
-    furi_assert(menu);
+    furi_check(menu);
+
     menu_reset(menu);
     with_view_model(
         menu->view, MenuModel * model, { MenuItemArray_clear(model->items); }, false);
     view_free(menu->view);
+
     free(menu);
 }
 
 View* menu_get_view(Menu* menu) {
-    furi_assert(menu);
+    furi_check(menu);
     return (menu->view);
 }
 
@@ -172,8 +174,8 @@ void menu_add_item(
     uint32_t index,
     MenuItemCallback callback,
     void* context) {
-    furi_assert(menu);
-    furi_assert(label);
+    furi_check(menu);
+    furi_check(label);
 
     MenuItem* item = NULL;
     with_view_model(
@@ -192,7 +194,7 @@ void menu_add_item(
 }
 
 void menu_reset(Menu* menu) {
-    furi_assert(menu);
+    furi_check(menu);
     with_view_model(
         menu->view,
         MenuModel * model,
@@ -210,6 +212,8 @@ void menu_reset(Menu* menu) {
 }
 
 void menu_set_selected_item(Menu* menu, uint32_t index) {
+    furi_check(menu);
+
     with_view_model(
         menu->view,
         MenuModel * model,
diff --git a/applications/services/gui/modules/menu.h b/applications/services/gui/modules/menu.h
index f66514a71..616bfcebe 100644
--- a/applications/services/gui/modules/menu.h
+++ b/applications/services/gui/modules/menu.h
@@ -21,7 +21,7 @@ typedef void (*MenuItemCallback)(void* context, uint32_t index);
  *
  * @return     Menu instance
  */
-Menu* menu_alloc();
+Menu* menu_alloc(void);
 
 /** Free menu
  *
diff --git a/applications/services/gui/modules/popup.c b/applications/services/gui/modules/popup.c
index 520efceef..45014f6f4 100644
--- a/applications/services/gui/modules/popup.c
+++ b/applications/services/gui/modules/popup.c
@@ -108,7 +108,7 @@ void popup_stop_timer(void* context) {
     furi_timer_stop(popup->timer);
 }
 
-Popup* popup_alloc() {
+Popup* popup_alloc(void) {
     Popup* popup = malloc(sizeof(Popup));
     popup->view = view_alloc();
     popup->timer = furi_timer_alloc(popup_timer_callback, FuriTimerTypeOnce, popup);
@@ -148,24 +148,25 @@ Popup* popup_alloc() {
 }
 
 void popup_free(Popup* popup) {
-    furi_assert(popup);
+    furi_check(popup);
     furi_timer_free(popup->timer);
     view_free(popup->view);
     free(popup);
 }
 
 View* popup_get_view(Popup* popup) {
-    furi_assert(popup);
+    furi_check(popup);
+
     return popup->view;
 }
 
 void popup_set_callback(Popup* popup, PopupCallback callback) {
-    furi_assert(popup);
+    furi_check(popup);
     popup->callback = callback;
 }
 
 void popup_set_context(Popup* popup, void* context) {
-    furi_assert(popup);
+    furi_check(popup);
     popup->context = context;
 }
 
@@ -176,7 +177,8 @@ void popup_set_header(
     uint8_t y,
     Align horizontal,
     Align vertical) {
-    furi_assert(popup);
+    furi_check(popup);
+
     with_view_model(
         popup->view,
         PopupModel * model,
@@ -197,7 +199,8 @@ void popup_set_text(
     uint8_t y,
     Align horizontal,
     Align vertical) {
-    furi_assert(popup);
+    furi_check(popup);
+
     with_view_model(
         popup->view,
         PopupModel * model,
@@ -212,7 +215,8 @@ void popup_set_text(
 }
 
 void popup_set_icon(Popup* popup, uint8_t x, uint8_t y, const Icon* icon) {
-    furi_assert(popup);
+    furi_check(popup);
+
     with_view_model(
         popup->view,
         PopupModel * model,
@@ -225,20 +229,24 @@ void popup_set_icon(Popup* popup, uint8_t x, uint8_t y, const Icon* icon) {
 }
 
 void popup_set_timeout(Popup* popup, uint32_t timeout_in_ms) {
-    furi_assert(popup);
+    furi_check(popup);
     popup->timer_period_in_ms = timeout_in_ms;
 }
 
 void popup_enable_timeout(Popup* popup) {
+    furi_check(popup);
+
     popup->timer_enabled = true;
 }
 
 void popup_disable_timeout(Popup* popup) {
+    furi_check(popup);
+
     popup->timer_enabled = false;
 }
 
 void popup_reset(Popup* popup) {
-    furi_assert(popup);
+    furi_check(popup);
 
     with_view_model(
         popup->view,
diff --git a/applications/services/gui/modules/popup.h b/applications/services/gui/modules/popup.h
index ca783fdb7..6bf6a9d50 100644
--- a/applications/services/gui/modules/popup.h
+++ b/applications/services/gui/modules/popup.h
@@ -25,7 +25,7 @@ typedef void (*PopupCallback)(void* context);
  *
  * @return     Popup instance
  */
-Popup* popup_alloc();
+Popup* popup_alloc(void);
 
 /** Deinitialize and free popup
  *
diff --git a/applications/services/gui/modules/submenu.c b/applications/services/gui/modules/submenu.c
index 368f5be28..a4250c2e1 100644
--- a/applications/services/gui/modules/submenu.c
+++ b/applications/services/gui/modules/submenu.c
@@ -234,7 +234,7 @@ void submenu_timer_callback(void* context) {
         submenu->view, SubmenuModel * model, { model->locked_message_visible = false; }, true);
 }
 
-Submenu* submenu_alloc() {
+Submenu* submenu_alloc(void) {
     Submenu* submenu = malloc(sizeof(Submenu));
     submenu->view = view_alloc();
     view_set_context(submenu->view, submenu);
@@ -259,7 +259,7 @@ Submenu* submenu_alloc() {
 }
 
 void submenu_free(Submenu* submenu) {
-    furi_assert(submenu);
+    furi_check(submenu);
 
     with_view_model(
         submenu->view,
@@ -276,7 +276,7 @@ void submenu_free(Submenu* submenu) {
 }
 
 View* submenu_get_view(Submenu* submenu) {
-    furi_assert(submenu);
+    furi_check(submenu);
     return submenu->view;
 }
 
@@ -298,11 +298,8 @@ void submenu_add_lockable_item(
     bool locked,
     const char* locked_message) {
     SubmenuItem* item = NULL;
-    furi_assert(label);
-    furi_assert(submenu);
-    if(locked) {
-        furi_assert(locked_message);
-    }
+    furi_check(label);
+    furi_check(submenu);
 
     with_view_model(
         submenu->view,
@@ -322,7 +319,7 @@ void submenu_add_lockable_item(
 }
 
 void submenu_reset(Submenu* submenu) {
-    furi_assert(submenu);
+    furi_check(submenu);
     view_set_orientation(submenu->view, ViewOrientationHorizontal);
 
     with_view_model(
@@ -339,6 +336,7 @@ void submenu_reset(Submenu* submenu) {
 }
 
 void submenu_set_selected_item(Submenu* submenu, uint32_t index) {
+    furi_check(submenu);
     with_view_model(
         submenu->view,
         SubmenuModel * model,
@@ -452,7 +450,7 @@ void submenu_process_ok(Submenu* submenu) {
 }
 
 void submenu_set_header(Submenu* submenu, const char* header) {
-    furi_assert(submenu);
+    furi_check(submenu);
 
     with_view_model(
         submenu->view,
diff --git a/applications/services/gui/modules/submenu.h b/applications/services/gui/modules/submenu.h
index 03337d777..676e99d29 100644
--- a/applications/services/gui/modules/submenu.h
+++ b/applications/services/gui/modules/submenu.h
@@ -21,7 +21,7 @@ typedef void (*SubmenuItemCallback)(void* context, uint32_t index);
  *
  * @return     Submenu instance
  */
-Submenu* submenu_alloc();
+Submenu* submenu_alloc(void);
 
 /** Deinitialize and free submenu
  *
diff --git a/applications/services/gui/modules/text_box.c b/applications/services/gui/modules/text_box.c
index c0110806a..9c2959b30 100644
--- a/applications/services/gui/modules/text_box.c
+++ b/applications/services/gui/modules/text_box.c
@@ -100,16 +100,19 @@ static void text_box_insert_endline(Canvas* canvas, TextBoxModel* model) {
     line_num++;
     model->text = furi_string_get_cstr(model->text_formatted);
     model->text_pos = (char*)model->text;
-    if(model->focus == TextBoxFocusEnd && line_num > 5) {
+    size_t lines_on_screen = 56 / canvas_current_font_height(canvas);
+    if(model->focus == TextBoxFocusEnd && line_num > lines_on_screen) {
         // Set text position to 5th line from the end
-        for(uint8_t i = 0; i < line_num - 5; i++) {
-            while(*model->text_pos++ != '\n') {
-            };
+        const char* end = model->text + furi_string_size(model->text_formatted);
+        for(size_t i = 0; i < line_num - lines_on_screen; i++) {
+            while(model->text_pos < end) {
+                if(*model->text_pos++ == '\n') break;
+            }
         }
-        model->scroll_num = line_num - 4;
-        model->scroll_pos = line_num - 5;
+        model->scroll_num = line_num - (lines_on_screen - 1);
+        model->scroll_pos = line_num - lines_on_screen;
     } else {
-        model->scroll_num = MAX(line_num - 4, 0u);
+        model->scroll_num = MAX(line_num - (lines_on_screen - 1), 0u);
         model->scroll_pos = 0;
     }
 }
@@ -169,7 +172,7 @@ static bool text_box_view_input_callback(InputEvent* event, void* context) {
     return consumed;
 }
 
-TextBox* text_box_alloc() {
+TextBox* text_box_alloc(void) {
     TextBox* text_box = malloc(sizeof(TextBox));
     text_box->view = view_alloc();
     view_set_context(text_box->view, text_box);
@@ -192,7 +195,7 @@ TextBox* text_box_alloc() {
 }
 
 void text_box_free(TextBox* text_box) {
-    furi_assert(text_box);
+    furi_check(text_box);
 
     with_view_model(
         text_box->view, TextBoxModel * model, { furi_string_free(model->text_formatted); }, true);
@@ -201,12 +204,12 @@ void text_box_free(TextBox* text_box) {
 }
 
 View* text_box_get_view(TextBox* text_box) {
-    furi_assert(text_box);
+    furi_check(text_box);
     return text_box->view;
 }
 
 void text_box_reset(TextBox* text_box) {
-    furi_assert(text_box);
+    furi_check(text_box);
 
     with_view_model(
         text_box->view,
@@ -222,8 +225,8 @@ void text_box_reset(TextBox* text_box) {
 }
 
 void text_box_set_text(TextBox* text_box, const char* text) {
-    furi_assert(text_box);
-    furi_assert(text);
+    furi_check(text_box);
+    furi_check(text);
     size_t str_length = strlen(text);
     size_t formating_margin = str_length * TEXT_BOX_MAX_SYMBOL_WIDTH / TEXT_BOX_LINE_WIDTH;
 
@@ -240,14 +243,14 @@ void text_box_set_text(TextBox* text_box, const char* text) {
 }
 
 void text_box_set_font(TextBox* text_box, TextBoxFont font) {
-    furi_assert(text_box);
+    furi_check(text_box);
 
     with_view_model(
         text_box->view, TextBoxModel * model, { model->font = font; }, true);
 }
 
 void text_box_set_focus(TextBox* text_box, TextBoxFocus focus) {
-    furi_assert(text_box);
+    furi_check(text_box);
 
     with_view_model(
         text_box->view, TextBoxModel * model, { model->focus = focus; }, true);
diff --git a/applications/services/gui/modules/text_box.h b/applications/services/gui/modules/text_box.h
index 2a0548f2e..0e30f6370 100644
--- a/applications/services/gui/modules/text_box.h
+++ b/applications/services/gui/modules/text_box.h
@@ -28,7 +28,7 @@ typedef enum {
  *
  * @return     TextBox instance
  */
-TextBox* text_box_alloc();
+TextBox* text_box_alloc(void);
 
 /** Deinitialize and free text_box
  *
diff --git a/applications/services/gui/modules/text_input.c b/applications/services/gui/modules/text_input.c
index 926a74910..c96510bcc 100644
--- a/applications/services/gui/modules/text_input.c
+++ b/applications/services/gui/modules/text_input.c
@@ -498,7 +498,7 @@ void text_input_timer_callback(void* context) {
         true);
 }
 
-TextInput* text_input_alloc() {
+TextInput* text_input_alloc(void) {
     TextInput* text_input = malloc(sizeof(TextInput));
     text_input->view = view_alloc();
     view_set_context(text_input->view, text_input);
@@ -525,7 +525,7 @@ TextInput* text_input_alloc() {
 }
 
 void text_input_free(TextInput* text_input) {
-    furi_assert(text_input);
+    furi_check(text_input);
     with_view_model(
         text_input->view,
         TextInputModel * model,
@@ -543,7 +543,7 @@ void text_input_free(TextInput* text_input) {
 }
 
 void text_input_reset(TextInput* text_input) {
-    furi_assert(text_input);
+    furi_check(text_input);
     with_view_model(
         text_input->view,
         TextInputModel * model,
@@ -568,7 +568,7 @@ void text_input_reset(TextInput* text_input) {
 }
 
 View* text_input_get_view(TextInput* text_input) {
-    furi_assert(text_input);
+    furi_check(text_input);
     return text_input->view;
 }
 
@@ -579,6 +579,7 @@ void text_input_set_result_callback(
     char* text_buffer,
     size_t text_buffer_size,
     bool clear_default_text) {
+    furi_check(text_input);
     with_view_model(
         text_input->view,
         TextInputModel * model,
@@ -613,6 +614,7 @@ void text_input_set_validator(
     TextInput* text_input,
     TextInputValidatorCallback callback,
     void* callback_context) {
+    furi_check(text_input);
     with_view_model(
         text_input->view,
         TextInputModel * model,
@@ -624,6 +626,7 @@ void text_input_set_validator(
 }
 
 TextInputValidatorCallback text_input_get_validator_callback(TextInput* text_input) {
+    furi_check(text_input);
     TextInputValidatorCallback validator_callback = NULL;
     with_view_model(
         text_input->view,
@@ -634,6 +637,7 @@ TextInputValidatorCallback text_input_get_validator_callback(TextInput* text_inp
 }
 
 void* text_input_get_validator_callback_context(TextInput* text_input) {
+    furi_check(text_input);
     void* validator_callback_context = NULL;
     with_view_model(
         text_input->view,
@@ -644,6 +648,7 @@ void* text_input_get_validator_callback_context(TextInput* text_input) {
 }
 
 void text_input_set_header_text(TextInput* text_input, const char* text) {
+    furi_check(text_input);
     with_view_model(
         text_input->view, TextInputModel * model, { model->header = text; }, true);
 }
diff --git a/applications/services/gui/modules/text_input.h b/applications/services/gui/modules/text_input.h
index 65207532e..6733c01cc 100644
--- a/applications/services/gui/modules/text_input.h
+++ b/applications/services/gui/modules/text_input.h
@@ -23,7 +23,7 @@ typedef bool (*TextInputValidatorCallback)(const char* text, FuriString* error,
  *
  * @return     TextInput instance
  */
-TextInput* text_input_alloc();
+TextInput* text_input_alloc(void);
 
 /** Deinitialize and free text input
  *
diff --git a/applications/services/gui/modules/validators.c b/applications/services/gui/modules/validators.c
index a18cb925f..407a3aa1e 100644
--- a/applications/services/gui/modules/validators.c
+++ b/applications/services/gui/modules/validators.c
@@ -9,7 +9,7 @@ struct ValidatorIsFile {
 };
 
 bool validator_is_file_callback(const char* text, FuriString* error, void* context) {
-    furi_assert(context);
+    furi_check(context);
     ValidatorIsFile* instance = context;
 
     if(instance->current_name != NULL) {
@@ -47,7 +47,7 @@ ValidatorIsFile* validator_is_file_alloc_init(
 }
 
 void validator_is_file_free(ValidatorIsFile* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     free(instance->app_path_folder);
     free(instance->current_name);
     free(instance);
diff --git a/applications/services/gui/modules/variable_item_list.c b/applications/services/gui/modules/variable_item_list.c
index 9aefcfd0e..3fe26b569 100644
--- a/applications/services/gui/modules/variable_item_list.c
+++ b/applications/services/gui/modules/variable_item_list.c
@@ -147,6 +147,7 @@ static void variable_item_list_draw_callback(Canvas* canvas, void* _model) {
 }
 
 void variable_item_list_set_selected_item(VariableItemList* variable_item_list, uint8_t index) {
+    furi_check(variable_item_list);
     with_view_model(
         variable_item_list->view,
         VariableItemListModel * model,
@@ -175,6 +176,7 @@ void variable_item_list_set_selected_item(VariableItemList* variable_item_list,
 }
 
 uint8_t variable_item_list_get_selected_item_index(VariableItemList* variable_item_list) {
+    furi_check(variable_item_list);
     VariableItemListModel* model = view_get_model(variable_item_list->view);
     uint8_t idx = model->position;
     view_commit_model(variable_item_list->view, false);
@@ -394,7 +396,7 @@ void variable_item_list_locked_timer_callback(void* context) {
         true);
 }
 
-VariableItemList* variable_item_list_alloc() {
+VariableItemList* variable_item_list_alloc(void) {
     VariableItemList* variable_item_list = malloc(sizeof(VariableItemList));
     variable_item_list->view = view_alloc();
     view_set_context(variable_item_list->view, variable_item_list);
@@ -424,7 +426,7 @@ VariableItemList* variable_item_list_alloc() {
 }
 
 void variable_item_list_free(VariableItemList* variable_item_list) {
-    furi_assert(variable_item_list);
+    furi_check(variable_item_list);
 
     with_view_model(
         variable_item_list->view,
@@ -448,7 +450,7 @@ void variable_item_list_free(VariableItemList* variable_item_list) {
 }
 
 void variable_item_list_reset(VariableItemList* variable_item_list) {
-    furi_assert(variable_item_list);
+    furi_check(variable_item_list);
 
     with_view_model(
         variable_item_list->view,
@@ -466,7 +468,7 @@ void variable_item_list_reset(VariableItemList* variable_item_list) {
 }
 
 View* variable_item_list_get_view(VariableItemList* variable_item_list) {
-    furi_assert(variable_item_list);
+    furi_check(variable_item_list);
     return variable_item_list->view;
 }
 
@@ -477,8 +479,8 @@ VariableItem* variable_item_list_add(
     VariableItemChangeCallback change_callback,
     void* context) {
     VariableItem* item = NULL;
-    furi_assert(label);
-    furi_assert(variable_item_list);
+    furi_check(label);
+    furi_check(variable_item_list);
 
     with_view_model(
         variable_item_list->view,
@@ -520,7 +522,7 @@ void variable_item_list_set_enter_callback(
     VariableItemList* variable_item_list,
     VariableItemListEnterCallback callback,
     void* context) {
-    furi_assert(callback);
+    furi_check(callback);
     with_view_model(
         variable_item_list->view,
         VariableItemListModel * model,
@@ -533,14 +535,17 @@ void variable_item_list_set_enter_callback(
 }
 
 void variable_item_set_current_value_index(VariableItem* item, uint8_t current_value_index) {
+    furi_check(item);
     item->current_value_index = current_value_index;
 }
 
 void variable_item_set_values_count(VariableItem* item, uint8_t values_count) {
+    furi_check(item);
     item->values_count = values_count;
 }
 
 void variable_item_set_current_value_text(VariableItem* item, const char* current_value_text) {
+    furi_check(item);
     furi_string_set(item->current_value_text, current_value_text);
 }
 
@@ -553,9 +558,11 @@ void variable_item_set_locked(VariableItem* item, bool locked, const char* locke
 }
 
 uint8_t variable_item_get_current_value_index(VariableItem* item) {
+    furi_check(item);
     return item->current_value_index;
 }
 
 void* variable_item_get_context(VariableItem* item) {
+    furi_check(item);
     return item->context;
 }
diff --git a/applications/services/gui/modules/variable_item_list.h b/applications/services/gui/modules/variable_item_list.h
index 59a3b0830..aec2239f7 100644
--- a/applications/services/gui/modules/variable_item_list.h
+++ b/applications/services/gui/modules/variable_item_list.h
@@ -20,7 +20,7 @@ typedef void (*VariableItemListEnterCallback)(void* context, uint32_t index);
  *
  * @return     VariableItemList*
  */
-VariableItemList* variable_item_list_alloc();
+VariableItemList* variable_item_list_alloc(void);
 
 /** Deinitialize and free VariableItemList
  *
diff --git a/applications/services/gui/modules/widget.c b/applications/services/gui/modules/widget.c
index 21b8e5616..50171e0cc 100644
--- a/applications/services/gui/modules/widget.c
+++ b/applications/services/gui/modules/widget.c
@@ -54,7 +54,7 @@ static bool gui_widget_view_input_callback(InputEvent* event, void* context) {
     return consumed;
 }
 
-Widget* widget_alloc() {
+Widget* widget_alloc(void) {
     Widget* widget = malloc(sizeof(Widget));
     widget->view = view_alloc();
     view_set_context(widget->view, widget);
@@ -69,7 +69,7 @@ Widget* widget_alloc() {
 }
 
 void widget_reset(Widget* widget) {
-    furi_assert(widget);
+    furi_check(widget);
 
     with_view_model(
         widget->view,
@@ -89,7 +89,7 @@ void widget_reset(Widget* widget) {
 }
 
 void widget_free(Widget* widget) {
-    furi_assert(widget);
+    furi_check(widget);
     // Free all elements
     widget_reset(widget);
     // Free elements container
@@ -101,7 +101,7 @@ void widget_free(Widget* widget) {
 }
 
 View* widget_get_view(Widget* widget) {
-    furi_assert(widget);
+    furi_check(widget);
     return widget->view;
 }
 
@@ -127,7 +127,7 @@ void widget_add_string_multiline_element(
     Align vertical,
     Font font,
     const char* text) {
-    furi_assert(widget);
+    furi_check(widget);
     WidgetElement* string_multiline_element =
         widget_element_string_multiline_create(x, y, horizontal, vertical, font, text);
     widget_add_element(widget, string_multiline_element);
@@ -141,7 +141,7 @@ void widget_add_string_element(
     Align vertical,
     Font font,
     const char* text) {
-    furi_assert(widget);
+    furi_check(widget);
     WidgetElement* string_element =
         widget_element_string_create(x, y, horizontal, vertical, font, text);
     widget_add_element(widget, string_element);
@@ -157,7 +157,7 @@ void widget_add_text_box_element(
     Align vertical,
     const char* text,
     bool strip_to_dots) {
-    furi_assert(widget);
+    furi_check(widget);
     WidgetElement* text_box_element = widget_element_text_box_create(
         x, y, width, height, horizontal, vertical, text, strip_to_dots);
     widget_add_element(widget, text_box_element);
@@ -170,7 +170,7 @@ void widget_add_text_scroll_element(
     uint8_t width,
     uint8_t height,
     const char* text) {
-    furi_assert(widget);
+    furi_check(widget);
     WidgetElement* text_scroll_element =
         widget_element_text_scroll_create(x, y, width, height, text);
     widget_add_element(widget, text_scroll_element);
@@ -182,15 +182,15 @@ void widget_add_button_element(
     const char* text,
     ButtonCallback callback,
     void* context) {
-    furi_assert(widget);
+    furi_check(widget);
     WidgetElement* button_element =
         widget_element_button_create(button_type, text, callback, context);
     widget_add_element(widget, button_element);
 }
 
 void widget_add_icon_element(Widget* widget, uint8_t x, uint8_t y, const Icon* icon) {
-    furi_assert(widget);
-    furi_assert(icon);
+    furi_check(widget);
+    furi_check(icon);
     WidgetElement* icon_element = widget_element_icon_create(x, y, icon);
     widget_add_element(widget, icon_element);
 }
@@ -202,7 +202,7 @@ void widget_add_frame_element(
     uint8_t width,
     uint8_t height,
     uint8_t radius) {
-    furi_assert(widget);
+    furi_check(widget);
     WidgetElement* frame_element = widget_element_frame_create(x, y, width, height, radius);
     widget_add_element(widget, frame_element);
 }
diff --git a/applications/services/gui/modules/widget.h b/applications/services/gui/modules/widget.h
index f86b14cc9..21a939c13 100644
--- a/applications/services/gui/modules/widget.h
+++ b/applications/services/gui/modules/widget.h
@@ -18,7 +18,7 @@ typedef struct WidgetElement WidgetElement;
  *
  * @return     Widget instance
  */
-Widget* widget_alloc();
+Widget* widget_alloc(void);
 
 /** Free Widget
  * @note       this function free allocated Widget Elements
diff --git a/applications/services/gui/scene_manager.c b/applications/services/gui/scene_manager.c
index 4122b3bc3..3cdcbf071 100644
--- a/applications/services/gui/scene_manager.c
+++ b/applications/services/gui/scene_manager.c
@@ -2,7 +2,7 @@
 #include <furi.h>
 
 SceneManager* scene_manager_alloc(const SceneManagerHandlers* app_scene_handlers, void* context) {
-    furi_assert(context);
+    furi_check(context);
 
     SceneManager* scene_manager = malloc(sizeof(SceneManager));
     // Set SceneManager context and scene handlers
@@ -17,7 +17,7 @@ SceneManager* scene_manager_alloc(const SceneManagerHandlers* app_scene_handlers
 }
 
 void scene_manager_free(SceneManager* scene_manager) {
-    furi_assert(scene_manager);
+    furi_check(scene_manager);
 
     // Clear SceneManager array
     SceneManagerIdStack_clear(scene_manager->scene_id_stack);
@@ -28,21 +28,21 @@ void scene_manager_free(SceneManager* scene_manager) {
 }
 
 void scene_manager_set_scene_state(SceneManager* scene_manager, uint32_t scene_id, uint32_t state) {
-    furi_assert(scene_manager);
-    furi_assert(scene_id < scene_manager->scene_handlers->scene_num);
+    furi_check(scene_manager);
+    furi_check(scene_id < scene_manager->scene_handlers->scene_num);
 
     scene_manager->scene[scene_id].state = state;
 }
 
 uint32_t scene_manager_get_scene_state(const SceneManager* scene_manager, uint32_t scene_id) {
-    furi_assert(scene_manager);
-    furi_assert(scene_id < scene_manager->scene_handlers->scene_num);
+    furi_check(scene_manager);
+    furi_check(scene_id < scene_manager->scene_handlers->scene_num);
 
     return scene_manager->scene[scene_id].state;
 }
 
 bool scene_manager_handle_custom_event(SceneManager* scene_manager, uint32_t custom_event) {
-    furi_assert(scene_manager);
+    furi_check(scene_manager);
 
     SceneManagerEvent event = {
         .type = SceneManagerEventTypeCustom,
@@ -61,7 +61,7 @@ bool scene_manager_handle_custom_event(SceneManager* scene_manager, uint32_t cus
 }
 
 bool scene_manager_handle_back_event(SceneManager* scene_manager) {
-    furi_assert(scene_manager);
+    furi_check(scene_manager);
 
     SceneManagerEvent event = {
         .type = SceneManagerEventTypeBack,
@@ -82,7 +82,7 @@ bool scene_manager_handle_back_event(SceneManager* scene_manager) {
 }
 
 void scene_manager_handle_tick_event(SceneManager* scene_manager) {
-    furi_assert(scene_manager);
+    furi_check(scene_manager);
 
     SceneManagerEvent event = {
         .type = SceneManagerEventTypeTick,
@@ -96,8 +96,8 @@ void scene_manager_handle_tick_event(SceneManager* scene_manager) {
 }
 
 void scene_manager_next_scene(SceneManager* scene_manager, uint32_t next_scene_id) {
-    furi_assert(scene_manager);
-    furi_assert(next_scene_id < scene_manager->scene_handlers->scene_num);
+    furi_check(scene_manager);
+    furi_check(next_scene_id < scene_manager->scene_handlers->scene_num);
 
     // Check if it is not the first scene
     if(SceneManagerIdStack_size(scene_manager->scene_id_stack) > 0) {
@@ -110,7 +110,7 @@ void scene_manager_next_scene(SceneManager* scene_manager, uint32_t next_scene_i
 }
 
 bool scene_manager_previous_scene(SceneManager* scene_manager) {
-    furi_assert(scene_manager);
+    furi_check(scene_manager);
 
     if(SceneManagerIdStack_size(scene_manager->scene_id_stack) > 0) {
         uint32_t cur_scene_id = 0;
@@ -133,7 +133,7 @@ bool scene_manager_previous_scene(SceneManager* scene_manager) {
 bool scene_manager_search_and_switch_to_previous_scene(
     SceneManager* scene_manager,
     uint32_t scene_id) {
-    furi_assert(scene_manager);
+    furi_check(scene_manager);
 
     if(SceneManagerIdStack_size(scene_manager->scene_id_stack) > 0) {
         uint32_t prev_scene_id = 0;
@@ -169,8 +169,8 @@ bool scene_manager_search_and_switch_to_previous_scene_one_of(
     SceneManager* scene_manager,
     const uint32_t* scene_ids,
     size_t scene_ids_size) {
-    furi_assert(scene_manager);
-    furi_assert(scene_ids);
+    furi_check(scene_manager);
+    furi_check(scene_ids);
     bool scene_found = false;
 
     for(size_t i = 0; i < scene_ids_size; ++i) {
@@ -185,7 +185,7 @@ bool scene_manager_search_and_switch_to_previous_scene_one_of(
 }
 
 bool scene_manager_has_previous_scene(const SceneManager* scene_manager, uint32_t scene_id) {
-    furi_assert(scene_manager);
+    furi_check(scene_manager);
     bool scene_found = false;
 
     if(SceneManagerIdStack_size(scene_manager->scene_id_stack) > 0) {
@@ -211,8 +211,8 @@ bool scene_manager_has_previous_scene(const SceneManager* scene_manager, uint32_
 bool scene_manager_search_and_switch_to_another_scene(
     SceneManager* scene_manager,
     uint32_t scene_id) {
-    furi_assert(scene_manager);
-    furi_assert(scene_id < scene_manager->scene_handlers->scene_num);
+    furi_check(scene_manager);
+    furi_check(scene_id < scene_manager->scene_handlers->scene_num);
 
     if(SceneManagerIdStack_size(scene_manager->scene_id_stack) > 0) {
         uint32_t cur_scene_id = *SceneManagerIdStack_back(scene_manager->scene_id_stack);
@@ -234,7 +234,7 @@ bool scene_manager_search_and_switch_to_another_scene(
 }
 
 void scene_manager_stop(SceneManager* scene_manager) {
-    furi_assert(scene_manager);
+    furi_check(scene_manager);
 
     if(SceneManagerIdStack_size(scene_manager->scene_id_stack) > 0) {
         uint32_t cur_scene_id = *SceneManagerIdStack_back(scene_manager->scene_id_stack);
diff --git a/applications/services/gui/scene_manager.h b/applications/services/gui/scene_manager.h
index c349a12ce..54dfa9cd4 100644
--- a/applications/services/gui/scene_manager.h
+++ b/applications/services/gui/scene_manager.h
@@ -108,7 +108,6 @@ bool scene_manager_handle_back_event(SceneManager* scene_manager);
  * Calls Scene event handler with Tick event parameter
  *
  * @param      scene_manager  SceneManager instance
- * @return     true if event was consumed, false otherwise
  */
 void scene_manager_handle_tick_event(SceneManager* scene_manager);
 
diff --git a/applications/services/gui/view.c b/applications/services/gui/view.c
index 316f5c612..8fc5c2699 100644
--- a/applications/services/gui/view.c
+++ b/applications/services/gui/view.c
@@ -1,77 +1,77 @@
 #include "view_i.h"
 
-View* view_alloc() {
+View* view_alloc(void) {
     View* view = malloc(sizeof(View));
     view->orientation = ViewOrientationHorizontal;
     return view;
 }
 
 void view_free(View* view) {
-    furi_assert(view);
+    furi_check(view);
     view_free_model(view);
     free(view);
 }
 
 void view_tie_icon_animation(View* view, IconAnimation* icon_animation) {
-    furi_assert(view);
+    furi_check(view);
     icon_animation_set_update_callback(icon_animation, view_icon_animation_callback, view);
 }
 
 void view_set_draw_callback(View* view, ViewDrawCallback callback) {
-    furi_assert(view);
+    furi_check(view);
     view->draw_callback = callback;
 }
 
 void view_set_input_callback(View* view, ViewInputCallback callback) {
-    furi_assert(view);
+    furi_check(view);
     view->input_callback = callback;
 }
 
 void view_set_custom_callback(View* view, ViewCustomCallback callback) {
-    furi_assert(view);
+    furi_check(view);
     view->custom_callback = callback;
 }
 
 void view_set_previous_callback(View* view, ViewNavigationCallback callback) {
-    furi_assert(view);
+    furi_check(view);
     view->previous_callback = callback;
 }
 
 void view_set_enter_callback(View* view, ViewCallback callback) {
-    furi_assert(view);
+    furi_check(view);
     view->enter_callback = callback;
 }
 
 void view_set_exit_callback(View* view, ViewCallback callback) {
-    furi_assert(view);
+    furi_check(view);
     view->exit_callback = callback;
 }
 
 void view_set_update_callback(View* view, ViewUpdateCallback callback) {
-    furi_assert(view);
+    furi_check(view);
     view->update_callback = callback;
 }
 
 void view_set_update_callback_context(View* view, void* context) {
-    furi_assert(view);
+    furi_check(view);
     view->update_callback_context = context;
 }
 
 void view_set_context(View* view, void* context) {
-    furi_assert(view);
+    furi_check(view);
     view->context = context;
 }
 
 void view_set_orientation(View* view, ViewOrientation orientation) {
-    furi_assert(view);
+    furi_check(view);
     view->orientation = orientation;
 }
 
 void view_allocate_model(View* view, ViewModelType type, size_t size) {
-    furi_assert(view);
-    furi_assert(size > 0);
-    furi_assert(view->model_type == ViewModelTypeNone);
-    furi_assert(view->model == NULL);
+    furi_check(view);
+    furi_check(size > 0);
+    furi_check(view->model_type == ViewModelTypeNone);
+    furi_check(view->model == NULL);
     view->model_type = type;
     if(view->model_type == ViewModelTypeLockFree) {
         view->model = malloc(size);
@@ -87,7 +87,7 @@ void view_allocate_model(View* view, ViewModelType type, size_t size) {
 }
 
 void view_free_model(View* view) {
-    furi_assert(view);
+    furi_check(view);
     if(view->model_type == ViewModelTypeNone) {
         return;
     } else if(view->model_type == ViewModelTypeLockFree) {
@@ -104,7 +104,7 @@ void view_free_model(View* view) {
 }
 
 void* view_get_model(View* view) {
-    furi_assert(view);
+    furi_check(view);
     if(view->model_type == ViewModelTypeLocking) {
         ViewModelLocking* model = (ViewModelLocking*)(view->model);
         furi_check(furi_mutex_acquire(model->mutex, FuriWaitForever) == FuriStatusOk);
@@ -114,7 +114,7 @@ void* view_get_model(View* view) {
 }
 
 void view_commit_model(View* view, bool update) {
-    furi_assert(view);
+    furi_check(view);
     view_unlock_model(view);
     if(update && view->update_callback) {
         view->update_callback(view, view->update_callback_context);
@@ -123,7 +123,7 @@ void view_commit_model(View* view, bool update) {
 
 void view_icon_animation_callback(IconAnimation* instance, void* context) {
     UNUSED(instance);
-    furi_assert(context);
+    furi_check(context);
     View* view = context;
     if(view->update_callback) {
         view->update_callback(view, view->update_callback_context);
@@ -131,7 +131,7 @@ void view_icon_animation_callback(IconAnimation* instance, void* context) {
 }
 
 void view_unlock_model(View* view) {
-    furi_assert(view);
+    furi_check(view);
     if(view->model_type == ViewModelTypeLocking) {
         ViewModelLocking* model = (ViewModelLocking*)(view->model);
         furi_check(furi_mutex_release(model->mutex) == FuriStatusOk);
@@ -139,7 +139,7 @@ void view_unlock_model(View* view) {
 }
 
 void view_draw(View* view, Canvas* canvas) {
-    furi_assert(view);
+    furi_check(view);
     if(view->draw_callback) {
         void* data = view_get_model(view);
         view->draw_callback(canvas, data);
@@ -148,7 +148,7 @@ void view_draw(View* view, Canvas* canvas) {
 }
 
 bool view_input(View* view, InputEvent* event) {
-    furi_assert(view);
+    furi_check(view);
     if(view->input_callback) {
         return view->input_callback(event, view->context);
     } else {
@@ -157,7 +157,7 @@ bool view_input(View* view, InputEvent* event) {
 }
 
 bool view_custom(View* view, uint32_t event) {
-    furi_assert(view);
+    furi_check(view);
     if(view->custom_callback) {
         return view->custom_callback(event, view->context);
     } else {
@@ -166,7 +166,7 @@ bool view_custom(View* view, uint32_t event) {
 }
 
 uint32_t view_previous(View* view) {
-    furi_assert(view);
+    furi_check(view);
     if(view->previous_callback) {
         return view->previous_callback(view->context);
     } else {
@@ -175,11 +175,11 @@ uint32_t view_previous(View* view) {
 }
 
 void view_enter(View* view) {
-    furi_assert(view);
+    furi_check(view);
     if(view->enter_callback) view->enter_callback(view->context);
 }
 
 void view_exit(View* view) {
-    furi_assert(view);
+    furi_check(view);
     if(view->exit_callback) view->exit_callback(view->context);
 }
diff --git a/applications/services/gui/view.h b/applications/services/gui/view.h
index 7a2003a63..1cae4cd6c 100644
--- a/applications/services/gui/view.h
+++ b/applications/services/gui/view.h
@@ -34,44 +34,44 @@ typedef enum {
 typedef struct View View;
 
 /** View Draw callback
- * @param      canvas,      pointer to canvas
- * @param      view_model,  pointer to context
+ * @param      canvas      pointer to canvas
+ * @param      model       pointer to model
  * @warning    called from GUI thread
  */
 typedef void (*ViewDrawCallback)(Canvas* canvas, void* model);
 
 /** View Input callback
- * @param      event,    pointer to input event data
- * @param      context,  pointer to context
+ * @param      event    pointer to input event data
+ * @param      context  pointer to context
  * @return     true if event handled, false if event ignored
  * @warning    called from GUI thread
  */
 typedef bool (*ViewInputCallback)(InputEvent* event, void* context);
 
 /** View Custom callback
- * @param      event,    number of custom event
- * @param      context,  pointer to context
+ * @param      event    number of custom event
+ * @param      context  pointer to context
  * @return     true if event handled, false if event ignored
  */
 typedef bool (*ViewCustomCallback)(uint32_t event, void* context);
 
 /** View navigation callback
- * @param      context,  pointer to context
+ * @param      context  pointer to context
  * @return     next view id
  * @warning    called from GUI thread
  */
 typedef uint32_t (*ViewNavigationCallback)(void* context);
 
 /** View callback
- * @param      context,  pointer to context
+ * @param      context  pointer to context
  * @warning    called from GUI thread
  */
 typedef void (*ViewCallback)(void* context);
 
 /** View Update Callback Called upon model change, need to be propagated to GUI
  * throw ViewPort update
- * @param      view,     pointer to view
- * @param      context,  pointer to context
+ * @param      view     pointer to view
+ * @param      context  pointer to context
  * @warning    called from GUI thread
  */
 typedef void (*ViewUpdateCallback)(View* view, void* context);
@@ -93,7 +93,7 @@ typedef enum {
 /** Allocate and init View
  * @return View instance
  */
-View* view_alloc();
+View* view_alloc(void);
 
 /** Free View
  *
diff --git a/applications/services/gui/view_dispatcher.c b/applications/services/gui/view_dispatcher.c
index 87b07a87c..d4c2f61e7 100644
--- a/applications/services/gui/view_dispatcher.c
+++ b/applications/services/gui/view_dispatcher.c
@@ -2,7 +2,7 @@
 
 #define TAG "ViewDispatcher"
 
-ViewDispatcher* view_dispatcher_alloc() {
+ViewDispatcher* view_dispatcher_alloc(void) {
     ViewDispatcher* view_dispatcher = malloc(sizeof(ViewDispatcher));
 
     view_dispatcher->view_port = view_port_alloc();
@@ -23,7 +23,7 @@ void view_dispatcher_free(ViewDispatcher* view_dispatcher) {
         gui_remove_view_port(view_dispatcher->gui, view_dispatcher->view_port);
     }
     // Crash if not all views were freed
-    furi_assert(!ViewDict_size(view_dispatcher->views));
+    furi_check(!ViewDict_size(view_dispatcher->views));
 
     ViewDict_clear(view_dispatcher->views);
     // Free ViewPort
@@ -37,29 +37,27 @@ void view_dispatcher_free(ViewDispatcher* view_dispatcher) {
 }
 
 void view_dispatcher_enable_queue(ViewDispatcher* view_dispatcher) {
-    furi_assert(view_dispatcher);
-    furi_assert(view_dispatcher->queue == NULL);
+    furi_check(view_dispatcher);
+    furi_check(view_dispatcher->queue == NULL);
     view_dispatcher->queue = furi_message_queue_alloc(16, sizeof(ViewDispatcherMessage));
 }
 
 void view_dispatcher_set_event_callback_context(ViewDispatcher* view_dispatcher, void* context) {
-    furi_assert(view_dispatcher);
+    furi_check(view_dispatcher);
     view_dispatcher->event_context = context;
 }
 
 void view_dispatcher_set_navigation_event_callback(
     ViewDispatcher* view_dispatcher,
     ViewDispatcherNavigationEventCallback callback) {
-    furi_assert(view_dispatcher);
-    furi_assert(callback);
+    furi_check(view_dispatcher);
     view_dispatcher->navigation_event_callback = callback;
 }
 
 void view_dispatcher_set_custom_event_callback(
     ViewDispatcher* view_dispatcher,
     ViewDispatcherCustomEventCallback callback) {
-    furi_assert(view_dispatcher);
-    furi_assert(callback);
+    furi_check(view_dispatcher);
     view_dispatcher->custom_event_callback = callback;
 }
 
@@ -67,15 +65,14 @@ void view_dispatcher_set_tick_event_callback(
     ViewDispatcher* view_dispatcher,
     ViewDispatcherTickEventCallback callback,
     uint32_t tick_period) {
-    furi_assert(view_dispatcher);
-    furi_assert(callback);
+    furi_check(view_dispatcher);
     view_dispatcher->tick_event_callback = callback;
     view_dispatcher->tick_period = tick_period;
 }
 
 void view_dispatcher_run(ViewDispatcher* view_dispatcher) {
-    furi_assert(view_dispatcher);
-    furi_assert(view_dispatcher->queue);
+    furi_check(view_dispatcher);
+    furi_check(view_dispatcher->queue);
 
     uint32_t tick_period = view_dispatcher->tick_period == 0 ? FuriWaitForever :
                                                                view_dispatcher->tick_period;
@@ -109,8 +106,8 @@ void view_dispatcher_run(ViewDispatcher* view_dispatcher) {
 }
 
 void view_dispatcher_stop(ViewDispatcher* view_dispatcher) {
-    furi_assert(view_dispatcher);
-    furi_assert(view_dispatcher->queue);
+    furi_check(view_dispatcher);
+    furi_check(view_dispatcher->queue);
     ViewDispatcherMessage message;
     message.type = ViewDispatcherMessageTypeStop;
     furi_check(
@@ -118,8 +115,8 @@ void view_dispatcher_stop(ViewDispatcher* view_dispatcher) {
 }
 
 void view_dispatcher_add_view(ViewDispatcher* view_dispatcher, uint32_t view_id, View* view) {
-    furi_assert(view_dispatcher);
-    furi_assert(view);
+    furi_check(view_dispatcher);
+    furi_check(view);
     // Check if view id is not used and register view
     furi_check(ViewDict_get(view_dispatcher->views, view_id) == NULL);
 
@@ -139,7 +136,7 @@ void view_dispatcher_add_view(ViewDispatcher* view_dispatcher, uint32_t view_id,
 }
 
 void view_dispatcher_remove_view(ViewDispatcher* view_dispatcher, uint32_t view_id) {
-    furi_assert(view_dispatcher);
+    furi_check(view_dispatcher);
 
     // Lock gui
     if(view_dispatcher->gui) {
@@ -169,7 +166,7 @@ void view_dispatcher_remove_view(ViewDispatcher* view_dispatcher, uint32_t view_
 }
 
 void view_dispatcher_switch_to_view(ViewDispatcher* view_dispatcher, uint32_t view_id) {
-    furi_assert(view_dispatcher);
+    furi_check(view_dispatcher);
     if(view_id == VIEW_NONE) {
         view_dispatcher_set_current_view(view_dispatcher, NULL);
     } else if(view_id == VIEW_IGNORE) {
@@ -181,14 +178,14 @@ void view_dispatcher_switch_to_view(ViewDispatcher* view_dispatcher, uint32_t vi
 }
 
 void view_dispatcher_send_to_front(ViewDispatcher* view_dispatcher) {
-    furi_assert(view_dispatcher);
-    furi_assert(view_dispatcher->gui);
+    furi_check(view_dispatcher);
+    furi_check(view_dispatcher->gui);
     gui_view_port_send_to_front(view_dispatcher->gui, view_dispatcher->view_port);
 }
 
 void view_dispatcher_send_to_back(ViewDispatcher* view_dispatcher) {
-    furi_assert(view_dispatcher);
-    furi_assert(view_dispatcher->gui);
+    furi_check(view_dispatcher);
+    furi_check(view_dispatcher->gui);
     gui_view_port_send_to_back(view_dispatcher->gui, view_dispatcher->view_port);
 }
 
@@ -196,9 +193,9 @@ void view_dispatcher_attach_to_gui(
     ViewDispatcher* view_dispatcher,
     Gui* gui,
     ViewDispatcherType type) {
-    furi_assert(view_dispatcher);
-    furi_assert(view_dispatcher->gui == NULL);
-    furi_assert(gui);
+    furi_check(view_dispatcher);
+    furi_check(view_dispatcher->gui == NULL);
+    furi_check(gui);
 
     if(type == ViewDispatcherTypeDesktop) {
         gui_add_view_port(gui, view_dispatcher->view_port, GuiLayerDesktop);
@@ -308,8 +305,8 @@ void view_dispatcher_handle_custom_event(ViewDispatcher* view_dispatcher, uint32
 }
 
 void view_dispatcher_send_custom_event(ViewDispatcher* view_dispatcher, uint32_t event) {
-    furi_assert(view_dispatcher);
-    furi_assert(view_dispatcher->queue);
+    furi_check(view_dispatcher);
+    furi_check(view_dispatcher->queue);
 
     ViewDispatcherMessage message;
     message.type = ViewDispatcherMessageTypeCustomEvent;
@@ -327,7 +324,7 @@ static const ViewPortOrientation view_dispatcher_view_port_orientation_table[] =
 };
 
 void view_dispatcher_set_current_view(ViewDispatcher* view_dispatcher, View* view) {
-    furi_assert(view_dispatcher);
+    furi_check(view_dispatcher);
     // Dispatch view exit event
     if(view_dispatcher->current_view) {
         view_exit(view_dispatcher->current_view);
@@ -355,8 +352,8 @@ void view_dispatcher_set_current_view(ViewDispatcher* view_dispatcher, View* vie
 }
 
 void view_dispatcher_update(View* view, void* context) {
-    furi_assert(view);
-    furi_assert(context);
+    furi_check(view);
+    furi_check(context);
 
     ViewDispatcher* view_dispatcher = context;
 
diff --git a/applications/services/gui/view_dispatcher.h b/applications/services/gui/view_dispatcher.h
index 67a3fc40b..f8567ea1a 100644
--- a/applications/services/gui/view_dispatcher.h
+++ b/applications/services/gui/view_dispatcher.h
@@ -1,6 +1,8 @@
 /**
  * @file view_dispatcher.h
- * GUI: ViewDispatcher API
+ * @brief GUI: ViewDispatcher API
+ *
+ * @warning Views added to a ViewDispatcher MUST NOT be in a ViewStack at the same time.
  */
 
 #pragma once
@@ -35,7 +37,7 @@ typedef void (*ViewDispatcherTickEventCallback)(void* context);
  *
  * @return     pointer to ViewDispatcher instance
  */
-ViewDispatcher* view_dispatcher_alloc();
+ViewDispatcher* view_dispatcher_alloc(void);
 
 /** Free ViewDispatcher instance
  *
diff --git a/applications/services/gui/view_holder.c b/applications/services/gui/view_holder.c
index 7ab0a8e1a..d9b382c17 100644
--- a/applications/services/gui/view_holder.c
+++ b/applications/services/gui/view_holder.c
@@ -20,7 +20,7 @@ struct ViewHolder {
 static void view_holder_draw_callback(Canvas* canvas, void* context);
 static void view_holder_input_callback(InputEvent* event, void* context);
 
-ViewHolder* view_holder_alloc() {
+ViewHolder* view_holder_alloc(void) {
     ViewHolder* view_holder = malloc(sizeof(ViewHolder));
 
     view_holder->view_port = view_port_alloc();
diff --git a/applications/services/gui/view_holder.h b/applications/services/gui/view_holder.h
index 8e7db3b85..90ce82b37 100644
--- a/applications/services/gui/view_holder.h
+++ b/applications/services/gui/view_holder.h
@@ -1,3 +1,9 @@
+/**
+ * @file view_holder.h
+ * @brief GUI: ViewHolder API
+ *
+ * @warning View added to a ViewHolder MUST NOT be in a ViewStack at the same time.
+ */
 #pragma once
 
 #include <gui/view.h>
@@ -24,7 +30,7 @@ typedef void (*BackCallback)(void* back_context);
  * @brief Allocate ViewHolder
  * @return pointer to ViewHolder instance
  */
-ViewHolder* view_holder_alloc();
+ViewHolder* view_holder_alloc(void);
 
 /**
  * @brief Free ViewHolder and call Free callback
@@ -88,8 +94,9 @@ void view_holder_start(ViewHolder* view_holder);
 void view_holder_stop(ViewHolder* view_holder);
 
 /** View Update Handler
- * @param view, View Instance
- * @param context, ViewHolder instance
+ *
+ * @param      view     View Instance
+ * @param      context  ViewHolder instance
  */
 void view_holder_update(View* view, void* context);
 
diff --git a/applications/services/gui/view_port.c b/applications/services/gui/view_port.c
index 25f670a7c..7f1da3b70 100644
--- a/applications/services/gui/view_port.c
+++ b/applications/services/gui/view_port.c
@@ -61,7 +61,7 @@ static const CanvasOrientation view_port_orientation_mapping[ViewPortOrientation
 
 // Remaps directional pad buttons on Flipper based on ViewPort orientation
 static void view_port_map_input(InputEvent* event, ViewPortOrientation orientation) {
-    furi_assert(orientation < ViewPortOrientationMAX && event->key < InputKeyMAX);
+    furi_check(orientation < ViewPortOrientationMAX && event->key < InputKeyMAX);
 
     if(event->sequence_source != INPUT_SEQUENCE_SOURCE_HARDWARE) {
         return;
@@ -90,7 +90,7 @@ static void view_port_setup_canvas_orientation(const ViewPort* view_port, Canvas
     canvas_set_orientation(canvas, orientation);
 }
 
-ViewPort* view_port_alloc() {
+ViewPort* view_port_alloc(void) {
     ViewPort* view_port = malloc(sizeof(ViewPort));
     view_port->orientation = ViewPortOrientationHorizontal;
     view_port->is_enabled = true;
@@ -99,7 +99,7 @@ ViewPort* view_port_alloc() {
 }
 
 void view_port_free(ViewPort* view_port) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     furi_check(view_port->gui == NULL);
     furi_check(furi_mutex_release(view_port->mutex) == FuriStatusOk);
@@ -108,14 +108,14 @@ void view_port_free(ViewPort* view_port) {
 }
 
 void view_port_set_width(ViewPort* view_port, uint8_t width) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     view_port->width = width;
     furi_check(furi_mutex_release(view_port->mutex) == FuriStatusOk);
 }
 
 uint8_t view_port_get_width(const ViewPort* view_port) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     uint8_t width = view_port->width;
     furi_check(furi_mutex_release(view_port->mutex) == FuriStatusOk);
@@ -123,14 +123,14 @@ uint8_t view_port_get_width(const ViewPort* view_port) {
 }
 
 void view_port_set_height(ViewPort* view_port, uint8_t height) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     view_port->height = height;
     furi_check(furi_mutex_release(view_port->mutex) == FuriStatusOk);
 }
 
 uint8_t view_port_get_height(const ViewPort* view_port) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     uint8_t height = view_port->height;
     furi_check(furi_mutex_release(view_port->mutex) == FuriStatusOk);
@@ -138,7 +138,7 @@ uint8_t view_port_get_height(const ViewPort* view_port) {
 }
 
 void view_port_enabled_set(ViewPort* view_port, bool enabled) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     if(view_port->is_enabled != enabled) {
         view_port->is_enabled = enabled;
@@ -148,7 +148,7 @@ void view_port_enabled_set(ViewPort* view_port, bool enabled) {
 }
 
 bool view_port_is_enabled(const ViewPort* view_port) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     bool is_enabled = view_port->is_enabled;
     furi_check(furi_mutex_release(view_port->mutex) == FuriStatusOk);
@@ -156,7 +156,7 @@ bool view_port_is_enabled(const ViewPort* view_port) {
 }
 
 void view_port_draw_callback_set(ViewPort* view_port, ViewPortDrawCallback callback, void* context) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     view_port->draw_callback = callback;
     view_port->draw_callback_context = context;
@@ -167,7 +167,7 @@ void view_port_input_callback_set(
     ViewPort* view_port,
     ViewPortInputCallback callback,
     void* context) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     view_port->input_callback = callback;
     view_port->input_callback_context = context;
@@ -175,7 +175,7 @@ void view_port_input_callback_set(
 }
 
 void view_port_update(ViewPort* view_port) {
-    furi_assert(view_port);
+    furi_check(view_port);
 
     // We are not going to lockup system, but will notify you instead
     // Make sure that you don't call viewport methods inside of another mutex, especially one that is used in draw call
@@ -188,15 +188,15 @@ void view_port_update(ViewPort* view_port) {
 }
 
 void view_port_gui_set(ViewPort* view_port, Gui* gui) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     view_port->gui = gui;
     furi_check(furi_mutex_release(view_port->mutex) == FuriStatusOk);
 }
 
 void view_port_draw(ViewPort* view_port, Canvas* canvas) {
-    furi_assert(view_port);
-    furi_assert(canvas);
+    furi_check(view_port);
+    furi_check(canvas);
 
     // We are not going to lockup system, but will notify you instead
     // Make sure that you don't call viewport methods inside of another mutex, especially one that is used in draw call
@@ -215,8 +215,8 @@ void view_port_draw(ViewPort* view_port, Canvas* canvas) {
 }
 
 void view_port_input(ViewPort* view_port, InputEvent* event) {
-    furi_assert(view_port);
-    furi_assert(event);
+    furi_check(view_port);
+    furi_check(event);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     furi_check(view_port->gui);
 
@@ -229,7 +229,7 @@ void view_port_input(ViewPort* view_port, InputEvent* event) {
 }
 
 void view_port_set_orientation(ViewPort* view_port, ViewPortOrientation orientation) {
-    furi_assert(view_port);
+    furi_check(view_port);
     furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
     view_port->orientation = orientation;
     furi_check(furi_mutex_release(view_port->mutex) == FuriStatusOk);
diff --git a/applications/services/gui/view_port.h b/applications/services/gui/view_port.h
index 752fc46ba..bdc8b2633 100644
--- a/applications/services/gui/view_port.h
+++ b/applications/services/gui/view_port.h
@@ -38,7 +38,7 @@ typedef void (*ViewPortInputCallback)(InputEvent* event, void* context);
  *
  * @return     ViewPort instance
  */
-ViewPort* view_port_alloc();
+ViewPort* view_port_alloc(void);
 
 /** ViewPort deallocator
  *
diff --git a/applications/services/gui/view_stack.h b/applications/services/gui/view_stack.h
index f16f5febc..5cfcbc5ab 100644
--- a/applications/services/gui/view_stack.h
+++ b/applications/services/gui/view_stack.h
@@ -1,11 +1,13 @@
 /**
  * @file view_stack.h
- * GUI: ViewStack API
+ * @brief GUI: ViewStack API
  *
  * ViewStack accumulates several Views in one stack.
  * Draw callbacks are called sequentially starting from
  * first added. Input callbacks are called in reverse order.
  * Consumed input is not passed on underlying layers.
+ *
+ * @warning Views added to a ViewStack MUST NOT be in a ViewDispatcher or a ViewHolder at the same time.
  */
 
 #pragma once
@@ -44,7 +46,7 @@ View* view_stack_get_view(ViewStack* view_stack);
  * Adds View on top of ViewStack.
  *
  * @param       view_stack  instance
- * @view        view        view to add
+ * @param       view        view to add
  */
 void view_stack_add_view(ViewStack* view_stack, View* view);
 
@@ -52,7 +54,7 @@ void view_stack_add_view(ViewStack* view_stack, View* view);
  * If no View to remove found - ignore.
  *
  * @param       view_stack  instance
- * @view        view        view to remove
+ * @param       view        view to remove
  */
 void view_stack_remove_view(ViewStack* view_stack, View* view);
 
diff --git a/applications/services/input/input_cli.c b/applications/services/input/input_cli.c
index f7e904b17..8aa04d6bd 100644
--- a/applications/services/input/input_cli.c
+++ b/applications/services/input/input_cli.c
@@ -4,7 +4,7 @@
 #include <cli/cli.h>
 #include <toolbox/args.h>
 
-static void input_cli_usage() {
+static void input_cli_usage(void) {
     printf("Usage:\r\n");
     printf("input <cmd> <args>\r\n");
     printf("Cmd list:\r\n");
@@ -40,7 +40,7 @@ static void input_cli_dump(Cli* cli, FuriString* args, Input* input) {
     furi_message_queue_free(input_queue);
 }
 
-static void input_cli_send_print_usage() {
+static void input_cli_send_print_usage(void) {
     printf("Invalid arguments. Usage:\r\n");
     printf("\tinput send <key> <type>\r\n");
     printf("\t\t <key>\t - one of 'up', 'down', 'left', 'right', 'back', 'ok'\r\n");
diff --git a/applications/services/loader/loader.c b/applications/services/loader/loader.c
index 11261a86c..8c8a46589 100644
--- a/applications/services/loader/loader.c
+++ b/applications/services/loader/loader.c
@@ -29,6 +29,9 @@ static const char* loader_find_external_application_by_name(const char* app_name
 
 LoaderStatus
     loader_start(Loader* loader, const char* name, const char* args, FuriString* error_message) {
+    furi_check(loader);
+    furi_check(name);
+
     LoaderMessage message;
     LoaderMessageLoaderStatusResult result;
 
@@ -40,13 +43,12 @@ LoaderStatus
     message.status_value = &result;
     furi_message_queue_put(loader->queue, &message, FuriWaitForever);
     api_lock_wait_unlock_and_free(message.api_lock);
+
     return result.value;
 }
 
-LoaderStatus loader_start_with_gui_error(Loader* loader, const char* name, const char* args) {
-    FuriString* error_message = furi_string_alloc();
-    LoaderStatus status = loader_start(loader, name, args, error_message);
-
+static void
+    loader_show_gui_error(LoaderStatus status, const char* name, FuriString* error_message) {
     if(status == LoaderStatusErrorUnknownApp &&
        loader_find_external_application_by_name(name) != NULL) {
         // Special case for external apps
@@ -68,6 +70,7 @@ LoaderStatus loader_start_with_gui_error(Loader* loader, const char* name, const
         dialog_message_set_header(message, "Error", 64, 0, AlignCenter, AlignTop);
         dialog_message_set_buttons(message, NULL, NULL, NULL);
 
+        furi_string_replace(error_message, ":", "\n");
         furi_string_replace(error_message, "/ext/apps/", "");
         furi_string_replace(error_message, ", ", "\n");
         furi_string_replace(error_message, ": ", "\n");
@@ -79,12 +82,34 @@ LoaderStatus loader_start_with_gui_error(Loader* loader, const char* name, const
         dialog_message_free(message);
         furi_record_close(RECORD_DIALOGS);
     }
+}
 
+LoaderStatus loader_start_with_gui_error(Loader* loader, const char* name, const char* args) {
+    furi_check(loader);
+    furi_check(name);
+
+    FuriString* error_message = furi_string_alloc();
+    LoaderStatus status = loader_start(loader, name, args, error_message);
+    loader_show_gui_error(status, name, error_message);
     furi_string_free(error_message);
     return status;
 }
 
+void loader_start_detached_with_gui_error(Loader* loader, const char* name, const char* args) {
+    furi_check(loader);
+    furi_check(name);
+
+    LoaderMessage message = {
+        .type = LoaderMessageTypeStartByNameDetachedWithGuiError,
+        .start.name = strdup(name),
+        .start.args = args ? strdup(args) : NULL,
+    };
+    furi_message_queue_put(loader->queue, &message, FuriWaitForever);
+}
+
 bool loader_lock(Loader* loader) {
+    furi_check(loader);
+
     LoaderMessage message;
     LoaderMessageBoolResult result;
     message.type = LoaderMessageTypeLock;
@@ -92,16 +117,22 @@ bool loader_lock(Loader* loader) {
     message.bool_value = &result;
     furi_message_queue_put(loader->queue, &message, FuriWaitForever);
     api_lock_wait_unlock_and_free(message.api_lock);
+
     return result.value;
 }
 
 void loader_unlock(Loader* loader) {
+    furi_check(loader);
+
     LoaderMessage message;
     message.type = LoaderMessageTypeUnlock;
+
     furi_message_queue_put(loader->queue, &message, FuriWaitForever);
 }
 
 bool loader_is_locked(Loader* loader) {
+    furi_check(loader);
+
     LoaderMessage message;
     LoaderMessageBoolResult result;
     message.type = LoaderMessageTypeIsLocked;
@@ -109,17 +140,21 @@ bool loader_is_locked(Loader* loader) {
     message.bool_value = &result;
     furi_message_queue_put(loader->queue, &message, FuriWaitForever);
     api_lock_wait_unlock_and_free(message.api_lock);
+
     return result.value;
 }
 
 void loader_show_menu(Loader* loader) {
+    furi_check(loader);
+
     LoaderMessage message;
     message.type = LoaderMessageTypeShowMenu;
+
     furi_message_queue_put(loader->queue, &message, FuriWaitForever);
 }
 
 FuriPubSub* loader_get_pubsub(Loader* loader) {
-    furi_assert(loader);
+    furi_check(loader);
     // it's safe to return pubsub without locking
     // because it's never freed and loader is never exited
     // also the loader instance cannot be obtained until the pubsub is created
@@ -147,11 +182,7 @@ static void loader_thread_state_callback(FuriThreadState thread_state, void* con
 
     Loader* loader = context;
 
-    if(thread_state == FuriThreadStateRunning) {
-        LoaderEvent event;
-        event.type = LoaderEventTypeApplicationStarted;
-        furi_pubsub_publish(loader->pubsub, &event);
-    } else if(thread_state == FuriThreadStateStopped) {
+    if(thread_state == FuriThreadStateStopped) {
         LoaderMessage message;
         message.type = LoaderMessageTypeAppClosed;
         furi_message_queue_put(loader->queue, &message, FuriWaitForever);
@@ -160,7 +191,7 @@ static void loader_thread_state_callback(FuriThreadState thread_state, void* con
 
 // implementation
 
-static Loader* loader_alloc() {
+static Loader* loader_alloc(void) {
     Loader* loader = malloc(sizeof(Loader));
     loader->pubsub = furi_pubsub_alloc();
     loader->queue = furi_message_queue_alloc(1, sizeof(LoaderMessage));
@@ -237,6 +268,9 @@ static void loader_start_internal_app(
     const FlipperInternalApplication* app,
     const char* args) {
     FURI_LOG_I(TAG, "Starting %s", app->name);
+    LoaderEvent event;
+    event.type = LoaderEventTypeApplicationBeforeLoad;
+    furi_pubsub_publish(loader->pubsub, &event);
 
     // store args
     furi_assert(loader->app.args == NULL);
@@ -292,6 +326,9 @@ static LoaderStatus loader_start_external_app(
     FuriString* error_message,
     bool ignore_mismatch) {
     LoaderStatus status = loader_make_success_status(error_message);
+    LoaderEvent event;
+    event.type = LoaderEventTypeApplicationBeforeLoad;
+    furi_pubsub_publish(loader->pubsub, &event);
 
     do {
         loader->app.fap = flipper_application_alloc(storage, firmware_api_interface);
@@ -371,6 +408,8 @@ static LoaderStatus loader_start_external_app(
     if(status != LoaderStatusOk) {
         flipper_application_free(loader->app.fap);
         loader->app.fap = NULL;
+        event.type = LoaderEventTypeApplicationLoadFailed;
+        furi_pubsub_publish(loader->pubsub, &event);
     }
 
     return status;
@@ -548,6 +587,16 @@ int32_t loader_srv(void* p) {
                     loader, message.start.name, message.start.args, message.start.error_message);
                 api_lock_unlock(message.api_lock);
                 break;
+            case LoaderMessageTypeStartByNameDetachedWithGuiError: {
+                FuriString* error_message = furi_string_alloc();
+                LoaderStatus status = loader_do_start_by_name(
+                    loader, message.start.name, message.start.args, error_message);
+                loader_show_gui_error(status, message.start.name, error_message);
+                if(message.start.name) free((void*)message.start.name);
+                if(message.start.args) free((void*)message.start.args);
+                furi_string_free(error_message);
+                break;
+            }
             case LoaderMessageTypeShowMenu:
                 loader_do_menu_show(loader);
                 break;
diff --git a/applications/services/loader/loader.h b/applications/services/loader/loader.h
index 63da7d3ca..ad6a46532 100644
--- a/applications/services/loader/loader.h
+++ b/applications/services/loader/loader.h
@@ -20,7 +20,8 @@ typedef enum {
 } LoaderStatus;
 
 typedef enum {
-    LoaderEventTypeApplicationStarted,
+    LoaderEventTypeApplicationBeforeLoad,
+    LoaderEventTypeApplicationLoadFailed,
     LoaderEventTypeApplicationStopped
 } LoaderEventType;
 
@@ -34,7 +35,7 @@ typedef struct {
  * @param[in] name application name or id
  * @param[in] args application arguments
  * @param[out] error_message detailed error message, can be NULL
- * @return LoaderStatus 
+ * @return LoaderStatus
  */
 LoaderStatus
     loader_start(Loader* instance, const char* name, const char* args, FuriString* error_message);
@@ -44,10 +45,18 @@ LoaderStatus
  * @param[in] instance loader instance
  * @param[in] name application name or id
  * @param[in] args application arguments
- * @return LoaderStatus 
+ * @return LoaderStatus
  */
 LoaderStatus loader_start_with_gui_error(Loader* loader, const char* name, const char* args);
 
+/**
+ * @brief Start application detached with GUI error message
+ * @param[in] instance loader instance
+ * @param[in] name application name
+ * @param[in] args application arguments
+ */
+void loader_start_detached_with_gui_error(Loader* loader, const char* name, const char* args);
+
 /** 
  * @brief Lock application start
  * @param[in] instance loader instance
diff --git a/applications/services/loader/loader_applications.c b/applications/services/loader/loader_applications.c
index 235cf20ec..d52aec097 100644
--- a/applications/services/loader/loader_applications.c
+++ b/applications/services/loader/loader_applications.c
@@ -49,7 +49,7 @@ typedef struct {
     Loading* loading;
 } LoaderApplicationsApp;
 
-static LoaderApplicationsApp* loader_applications_app_alloc() {
+static LoaderApplicationsApp* loader_applications_app_alloc(void) {
     LoaderApplicationsApp* app = malloc(sizeof(LoaderApplicationsApp)); //-V799
     app->file_path = furi_string_alloc_set(EXT_PATH("apps"));
     app->dialogs = furi_record_open(RECORD_DIALOGS);
diff --git a/applications/services/loader/loader_cli.c b/applications/services/loader/loader_cli.c
index 489a576e5..1fbd0035e 100644
--- a/applications/services/loader/loader_cli.c
+++ b/applications/services/loader/loader_cli.c
@@ -4,7 +4,7 @@
 #include <lib/toolbox/args.h>
 #include "loader.h"
 
-static void loader_cli_print_usage() {
+static void loader_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("loader <cmd> <args>\r\n");
     printf("Cmd list:\r\n");
@@ -13,7 +13,7 @@ static void loader_cli_print_usage() {
     printf("\tinfo\t - Show loader state\r\n");
 }
 
-static void loader_cli_list() {
+static void loader_cli_list(void) {
     printf("Apps:\r\n");
     for(size_t i = 0; i < FLIPPER_APPS_COUNT; i++) {
         printf("\t%s\r\n", FLIPPER_APPS[i].name);
@@ -96,7 +96,7 @@ static void loader_cli(Cli* cli, FuriString* args, void* context) {
     furi_record_close(RECORD_LOADER);
 }
 
-void loader_on_system_start() {
+void loader_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
     cli_add_command(cli, RECORD_LOADER, CliCommandFlagParallelSafe, loader_cli, NULL);
diff --git a/applications/services/loader/loader_i.h b/applications/services/loader/loader_i.h
index 688b8fb66..daa5484d3 100644
--- a/applications/services/loader/loader_i.h
+++ b/applications/services/loader/loader_i.h
@@ -30,6 +30,7 @@ typedef enum {
     LoaderMessageTypeLock,
     LoaderMessageTypeUnlock,
     LoaderMessageTypeIsLocked,
+    LoaderMessageTypeStartByNameDetachedWithGuiError,
 } LoaderMessageType;
 
 typedef struct {
diff --git a/applications/services/locale/locale.c b/applications/services/locale/locale.c
index 4f7eb90ec..f4ee9c634 100644
--- a/applications/services/locale/locale.c
+++ b/applications/services/locale/locale.c
@@ -39,8 +39,8 @@ void locale_format_time(
     const DateTime* datetime,
     const LocaleTimeFormat format,
     const bool show_seconds) {
-    furi_assert(out_str);
-    furi_assert(datetime);
+    furi_check(out_str);
+    furi_check(datetime);
 
     uint8_t hours = datetime->hour;
     uint8_t am_pm = 0;
@@ -72,9 +72,9 @@ void locale_format_date(
     const DateTime* datetime,
     const LocaleDateFormat format,
     const char* separator) {
-    furi_assert(out_str);
-    furi_assert(datetime);
-    furi_assert(separator);
+    furi_check(out_str);
+    furi_check(datetime);
+    furi_check(separator);
 
     if(format == LocaleDateFormatDMY) {
         furi_string_printf(
diff --git a/applications/services/locale/locale.h b/applications/services/locale/locale.h
index c4f8e78e5..0046302df 100644
--- a/applications/services/locale/locale.h
+++ b/applications/services/locale/locale.h
@@ -28,7 +28,7 @@ typedef enum {
  *
  * @return     The locale measurement units.
  */
-LocaleMeasurementUnits locale_get_measurement_unit();
+LocaleMeasurementUnits locale_get_measurement_unit(void);
 
 /** Set locale measurement units
  *
@@ -56,7 +56,7 @@ float locale_celsius_to_fahrenheit(float temp_c);
  *
  * @return     The locale time format.
  */
-LocaleTimeFormat locale_get_time_format();
+LocaleTimeFormat locale_get_time_format(void);
 
 /** Set Locale Time Format
  *
diff --git a/applications/services/notification/notification_app.c b/applications/services/notification/notification_app.c
index 9baa738b7..8e183f74e 100644
--- a/applications/services/notification/notification_app.c
+++ b/applications/services/notification/notification_app.c
@@ -24,9 +24,9 @@ static const uint8_t reset_display_mask = 1 << 5;
 static const uint8_t reset_blink_mask = 1 << 6;
 
 static void notification_vibro_on(bool force);
-static void notification_vibro_off();
+static void notification_vibro_off(void);
 static void notification_sound_on(float freq, float volume, bool force);
-static void notification_sound_off();
+static void notification_sound_off(void);
 
 static uint8_t notification_settings_get_display_brightness(NotificationApp* app, uint8_t value);
 static uint8_t notification_settings_get_rgb_led_brightness(NotificationApp* app, uint8_t value);
@@ -163,7 +163,7 @@ static void notification_vibro_on(bool force) {
     }
 }
 
-static void notification_vibro_off() {
+static void notification_vibro_off(void) {
     furi_hal_vibro_on(false);
 }
 
@@ -175,7 +175,7 @@ static void notification_sound_on(float freq, float volume, bool force) {
     }
 }
 
-static void notification_sound_off() {
+static void notification_sound_off(void) {
     if(furi_hal_speaker_is_mine()) {
         furi_hal_speaker_stop();
         furi_hal_speaker_release();
@@ -516,7 +516,7 @@ static void input_event_callback(const void* value, void* context) {
 }
 
 // App alloc
-static NotificationApp* notification_app_alloc() {
+static NotificationApp* notification_app_alloc(void) {
     NotificationApp* app = malloc(sizeof(NotificationApp));
     app->queue = furi_message_queue_alloc(8, sizeof(NotificationAppMessage));
     app->display_timer = furi_timer_alloc(notification_display_timer, FuriTimerTypeOnce, app);
diff --git a/applications/services/notification/notification_app_api.c b/applications/services/notification/notification_app_api.c
index 9bc06b013..9c9a2680e 100644
--- a/applications/services/notification/notification_app_api.c
+++ b/applications/services/notification/notification_app_api.c
@@ -5,18 +5,27 @@
 #include "notification_app.h"
 
 void notification_message(NotificationApp* app, const NotificationSequence* sequence) {
+    furi_check(app);
+    furi_check(sequence);
+
     NotificationAppMessage m = {
         .type = NotificationLayerMessage, .sequence = sequence, .back_event = NULL};
     furi_check(furi_message_queue_put(app->queue, &m, FuriWaitForever) == FuriStatusOk);
 };
 
 void notification_internal_message(NotificationApp* app, const NotificationSequence* sequence) {
+    furi_check(app);
+    furi_check(sequence);
+
     NotificationAppMessage m = {
         .type = InternalLayerMessage, .sequence = sequence, .back_event = NULL};
     furi_check(furi_message_queue_put(app->queue, &m, FuriWaitForever) == FuriStatusOk);
 };
 
 void notification_message_block(NotificationApp* app, const NotificationSequence* sequence) {
+    furi_check(app);
+    furi_check(sequence);
+
     NotificationAppMessage m = {
         .type = NotificationLayerMessage,
         .sequence = sequence,
@@ -30,6 +39,9 @@ void notification_message_block(NotificationApp* app, const NotificationSequence
 void notification_internal_message_block(
     NotificationApp* app,
     const NotificationSequence* sequence) {
+    furi_check(app);
+    furi_check(sequence);
+
     NotificationAppMessage m = {
         .type = InternalLayerMessage, .sequence = sequence, .back_event = furi_event_flag_alloc()};
     furi_check(furi_message_queue_put(app->queue, &m, FuriWaitForever) == FuriStatusOk);
diff --git a/applications/services/power/power_cli.c b/applications/services/power/power_cli.c
index 021ce3553..6e1e34e67 100644
--- a/applications/services/power/power_cli.c
+++ b/applications/services/power/power_cli.c
@@ -48,7 +48,7 @@ void power_cli_3v3(Cli* cli, FuriString* args) {
     }
 }
 
-static void power_cli_command_print_usage() {
+static void power_cli_command_print_usage(void) {
     printf("Usage:\r\n");
     printf("power <cmd> <args>\r\n");
     printf("Cmd list:\r\n");
@@ -106,7 +106,7 @@ void power_cli(Cli* cli, FuriString* args, void* context) {
     furi_string_free(cmd);
 }
 
-void power_on_system_start() {
+void power_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
 
diff --git a/applications/services/power/power_cli.h b/applications/services/power/power_cli.h
index 1517c6140..4056c8300 100644
--- a/applications/services/power/power_cli.h
+++ b/applications/services/power/power_cli.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-void power_on_system_start();
+void power_on_system_start(void);
 
 #ifdef __cplusplus
 }
diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c
index 5ee60d949..29ce529be 100644
--- a/applications/services/power/power_service/power.c
+++ b/applications/services/power/power_service/power.c
@@ -232,7 +232,7 @@ static ViewPort* power_battery_view_port_alloc(Power* power) {
     return battery_view_port;
 }
 
-Power* power_alloc() {
+Power* power_alloc(void) {
     Power* power = malloc(sizeof(Power));
 
     // Records
diff --git a/applications/services/power/power_service/power_api.c b/applications/services/power/power_service/power_api.c
index 8185b7cd5..1bb482bf5 100644
--- a/applications/services/power/power_service/power_api.c
+++ b/applications/services/power/power_service/power_api.c
@@ -5,6 +5,8 @@
 #include <update_util/update_operation.h>
 
 void power_off(Power* power) {
+    furi_check(power);
+
     furi_hal_power_off();
     // Notify user if USB is plugged
     view_dispatcher_send_to_front(power->view_dispatcher);
@@ -20,13 +22,16 @@ void power_reboot(PowerBootMode mode) {
         furi_hal_rtc_set_boot_mode(FuriHalRtcBootModeDfu);
     } else if(mode == PowerBootModeUpdateStart) {
         furi_hal_rtc_set_boot_mode(FuriHalRtcBootModePreUpdate);
+    } else {
+        furi_crash();
     }
+
     furi_hal_power_reset();
 }
 
 void power_get_info(Power* power, PowerInfo* info) {
-    furi_assert(power);
-    furi_assert(info);
+    furi_check(power);
+    furi_check(info);
 
     furi_mutex_acquire(power->api_mtx, FuriWaitForever);
     memcpy(info, &power->info, sizeof(power->info));
@@ -34,12 +39,12 @@ void power_get_info(Power* power, PowerInfo* info) {
 }
 
 FuriPubSub* power_get_pubsub(Power* power) {
-    furi_assert(power);
+    furi_check(power);
     return power->event_pubsub;
 }
 
 bool power_is_battery_healthy(Power* power) {
-    furi_assert(power);
+    furi_check(power);
     bool is_healthy = false;
     furi_mutex_acquire(power->api_mtx, FuriWaitForever);
     is_healthy = power->info.health > POWER_BATTERY_HEALTHY_LEVEL;
@@ -48,7 +53,7 @@ bool power_is_battery_healthy(Power* power) {
 }
 
 void power_enable_low_battery_level_notification(Power* power, bool enable) {
-    furi_assert(power);
+    furi_check(power);
     furi_mutex_acquire(power->api_mtx, FuriWaitForever);
     power->show_low_bat_level_message = enable;
     furi_mutex_release(power->api_mtx);
diff --git a/applications/services/power/power_service/views/power_off.c b/applications/services/power/power_service/views/power_off.c
index 3a1addbac..4da374b31 100644
--- a/applications/services/power/power_service/views/power_off.c
+++ b/applications/services/power/power_service/views/power_off.c
@@ -62,7 +62,7 @@ static bool power_off_input_callback(InputEvent* event, void* context) {
     return true;
 }
 
-PowerOff* power_off_alloc() {
+PowerOff* power_off_alloc(void) {
     PowerOff* power_off = malloc(sizeof(PowerOff));
 
     power_off->view = view_alloc();
diff --git a/applications/services/power/power_service/views/power_off.h b/applications/services/power/power_service/views/power_off.h
index 5137c2e99..df021fad8 100644
--- a/applications/services/power/power_service/views/power_off.h
+++ b/applications/services/power/power_service/views/power_off.h
@@ -11,7 +11,7 @@ typedef enum {
 
 #include <gui/view.h>
 
-PowerOff* power_off_alloc();
+PowerOff* power_off_alloc(void);
 
 void power_off_free(PowerOff* power_off);
 
diff --git a/applications/services/power/power_service/views/power_unplug_usb.c b/applications/services/power/power_service/views/power_unplug_usb.c
index c2d61139e..da230d892 100644
--- a/applications/services/power/power_service/views/power_unplug_usb.c
+++ b/applications/services/power/power_service/views/power_unplug_usb.c
@@ -21,7 +21,7 @@ static void power_unplug_usb_draw_callback(Canvas* canvas, void* _model) {
         canvas, 64, 32, AlignCenter, AlignCenter, "It's now safe to unplug\nthe USB cable");
 }
 
-PowerUnplugUsb* power_unplug_usb_alloc() {
+PowerUnplugUsb* power_unplug_usb_alloc(void) {
     PowerUnplugUsb* power_unplug_usb = malloc(sizeof(PowerUnplugUsb));
 
     power_unplug_usb->view = view_alloc();
diff --git a/applications/services/power/power_service/views/power_unplug_usb.h b/applications/services/power/power_service/views/power_unplug_usb.h
index e85c6d03b..a763cf87c 100644
--- a/applications/services/power/power_service/views/power_unplug_usb.h
+++ b/applications/services/power/power_service/views/power_unplug_usb.h
@@ -4,7 +4,7 @@ typedef struct PowerUnplugUsb PowerUnplugUsb;
 
 #include <gui/view.h>
 
-PowerUnplugUsb* power_unplug_usb_alloc();
+PowerUnplugUsb* power_unplug_usb_alloc(void);
 
 void power_unplug_usb_free(PowerUnplugUsb* power_unplug_usb);
 
diff --git a/applications/services/rpc/rpc.c b/applications/services/rpc/rpc.c
index ec49f9843..d2f4d2c24 100644
--- a/applications/services/rpc/rpc.c
+++ b/applications/services/rpc/rpc.c
@@ -91,7 +91,7 @@ struct Rpc {
 };
 
 RpcOwner rpc_session_get_owner(RpcSession* session) {
-    furi_assert(session);
+    furi_check(session);
     return session->owner;
 }
 
@@ -112,7 +112,7 @@ static void rpc_close_session_process(const PB_Main* request, void* context) {
 }
 
 void rpc_session_set_context(RpcSession* session, void* context) {
-    furi_assert(session);
+    furi_check(session);
 
     furi_mutex_acquire(session->callbacks_mutex, FuriWaitForever);
     session->context = context;
@@ -120,7 +120,7 @@ void rpc_session_set_context(RpcSession* session, void* context) {
 }
 
 void rpc_session_set_close_callback(RpcSession* session, RpcSessionClosedCallback callback) {
-    furi_assert(session);
+    furi_check(session);
 
     furi_mutex_acquire(session->callbacks_mutex, FuriWaitForever);
     session->closed_callback = callback;
@@ -128,7 +128,7 @@ void rpc_session_set_close_callback(RpcSession* session, RpcSessionClosedCallbac
 }
 
 void rpc_session_set_send_bytes_callback(RpcSession* session, RpcSendBytesCallback callback) {
-    furi_assert(session);
+    furi_check(session);
 
     furi_mutex_acquire(session->callbacks_mutex, FuriWaitForever);
     session->send_bytes_callback = callback;
@@ -138,7 +138,7 @@ void rpc_session_set_send_bytes_callback(RpcSession* session, RpcSendBytesCallba
 void rpc_session_set_buffer_is_empty_callback(
     RpcSession* session,
     RpcBufferIsEmptyCallback callback) {
-    furi_assert(session);
+    furi_check(session);
 
     furi_mutex_acquire(session->callbacks_mutex, FuriWaitForever);
     session->buffer_is_empty_callback = callback;
@@ -148,7 +148,7 @@ void rpc_session_set_buffer_is_empty_callback(
 void rpc_session_set_terminated_callback(
     RpcSession* session,
     RpcSessionTerminatedCallback callback) {
-    furi_assert(session);
+    furi_check(session);
 
     furi_mutex_acquire(session->callbacks_mutex, FuriWaitForever);
     session->terminated_callback = callback;
@@ -166,8 +166,8 @@ size_t rpc_session_feed(
     const uint8_t* encoded_bytes,
     size_t size,
     uint32_t timeout) {
-    furi_assert(session);
-    furi_assert(encoded_bytes);
+    furi_check(session);
+    furi_check(encoded_bytes);
 
     if(!size) return 0;
 
@@ -179,7 +179,7 @@ size_t rpc_session_feed(
 }
 
 size_t rpc_session_get_available_size(RpcSession* session) {
-    furi_assert(session);
+    furi_check(session);
     return furi_stream_buffer_spaces_available(session->stream);
 }
 
@@ -190,8 +190,6 @@ bool rpc_pb_stream_read(pb_istream_t* istream, pb_byte_t* buf, size_t count) {
     furi_assert(session);
     furi_assert(istream->bytes_left);
 
-    /* TODO FL-3768 this function may be called after
-       marking the worker for termination */
     if(session->terminate) {
         return false;
     }
@@ -383,7 +381,7 @@ static void rpc_session_thread_state_callback(FuriThreadState thread_state, void
 }
 
 RpcSession* rpc_session_open(Rpc* rpc, RpcOwner owner) {
-    furi_assert(rpc);
+    furi_check(rpc);
 
     RpcSession* session = malloc(sizeof(RpcSession));
     session->callbacks_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
@@ -421,8 +419,8 @@ RpcSession* rpc_session_open(Rpc* rpc, RpcOwner owner) {
 }
 
 void rpc_session_close(RpcSession* session) {
-    furi_assert(session);
-    furi_assert(session->rpc);
+    furi_check(session);
+    furi_check(session->rpc);
 
     rpc_session_set_send_bytes_callback(session, NULL);
     rpc_session_set_close_callback(session, NULL);
diff --git a/applications/services/rpc/rpc_app.c b/applications/services/rpc/rpc_app.c
index 9af652dae..aa2a3f64f 100644
--- a/applications/services/rpc/rpc_app.c
+++ b/applications/services/rpc/rpc_app.c
@@ -314,20 +314,20 @@ static void rpc_system_app_data_exchange_process(const PB_Main* request, void* c
 }
 
 void rpc_system_app_send_started(RpcAppSystem* rpc_app) {
-    furi_assert(rpc_app);
+    furi_check(rpc_app);
     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);
+    furi_check(rpc_app);
     rpc_system_app_send_state_response(rpc_app, PB_App_AppState_APP_CLOSED, "SendExit");
 }
 
 void rpc_system_app_confirm(RpcAppSystem* rpc_app, bool result) {
-    furi_assert(rpc_app);
-    furi_assert(rpc_app->last_command_id != 0);
+    furi_check(rpc_app);
+    furi_check(rpc_app->last_command_id != 0);
     /* Ensure that only commands of these types can be confirmed */
-    furi_assert(
+    furi_check(
         rpc_app->last_event_type == RpcAppEventTypeAppExit ||
         rpc_app->last_event_type == RpcAppEventTypeLoadFile ||
         rpc_app->last_event_type == RpcAppEventTypeButtonPress ||
@@ -353,19 +353,19 @@ void rpc_system_app_confirm(RpcAppSystem* rpc_app, bool result) {
 }
 
 void rpc_system_app_set_callback(RpcAppSystem* rpc_app, RpcAppSystemCallback callback, void* ctx) {
-    furi_assert(rpc_app);
+    furi_check(rpc_app);
 
     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);
+    furi_check(rpc_app);
     rpc_app->error_code = error_code;
 }
 
 void rpc_system_app_set_error_text(RpcAppSystem* rpc_app, const char* error_text) {
-    furi_assert(rpc_app);
+    furi_check(rpc_app);
 
     if(rpc_app->error_text) {
         free(rpc_app->error_text);
@@ -375,14 +375,14 @@ void rpc_system_app_set_error_text(RpcAppSystem* rpc_app, const char* error_text
 }
 
 void rpc_system_app_error_reset(RpcAppSystem* rpc_app) {
-    furi_assert(rpc_app);
+    furi_check(rpc_app);
 
     rpc_system_app_set_error_code(rpc_app, 0);
     rpc_system_app_set_error_text(rpc_app, NULL);
 }
 
 void rpc_system_app_exchange_data(RpcAppSystem* rpc_app, const uint8_t* data, size_t data_size) {
-    furi_assert(rpc_app);
+    furi_check(rpc_app);
 
     PB_Main* request = malloc(sizeof(PB_Main));
 
diff --git a/applications/services/storage/filesystem_api.c b/applications/services/storage/filesystem_api.c
index 30b20ede4..e6012864d 100644
--- a/applications/services/storage/filesystem_api.c
+++ b/applications/services/storage/filesystem_api.c
@@ -1,4 +1,5 @@
 #include "filesystem_api_defines.h"
+#include <furi.h>
 
 const char* filesystem_api_error_get_desc(FS_Error error_id) {
     const char* result = "unknown error";
@@ -38,5 +39,6 @@ const char* filesystem_api_error_get_desc(FS_Error error_id) {
 }
 
 bool file_info_is_dir(const FileInfo* file_info) {
+    furi_check(file_info);
     return (file_info->flags & FSF_DIRECTORY);
 }
\ No newline at end of file
diff --git a/applications/services/storage/storage.c b/applications/services/storage/storage.c
index a6229af81..f43c6e815 100644
--- a/applications/services/storage/storage.c
+++ b/applications/services/storage/storage.c
@@ -32,7 +32,7 @@ static void storage_app_sd_icon_draw_callback(Canvas* canvas, void* context) {
     }
 }
 
-Storage* storage_app_alloc() {
+Storage* storage_app_alloc(void) {
     Storage* app = malloc(sizeof(Storage));
     app->message_queue = furi_message_queue_alloc(8, sizeof(StorageMessage));
     app->pubsub = furi_pubsub_alloc();
diff --git a/applications/services/storage/storage.h b/applications/services/storage/storage.h
index 20a371fc0..eaef59cd6 100644
--- a/applications/services/storage/storage.h
+++ b/applications/services/storage/storage.h
@@ -339,7 +339,7 @@ FS_Error storage_common_merge(Storage* storage, const char* old_path, const char
  * @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.
+ * @param 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);
@@ -366,7 +366,6 @@ FS_Error storage_common_fs_info(
  * 
  * @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);
 
@@ -526,7 +525,8 @@ FS_Error storage_int_backup(Storage* storage, const char* dstname);
  * @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);
+FS_Error
+    storage_int_restore(Storage* storage, const char* dstname, Storage_name_converter converter);
 
 /***************** Simplified Functions ******************/
 
diff --git a/applications/services/storage/storage_cli.c b/applications/services/storage/storage_cli.c
index 52c911c57..67a7e288b 100644
--- a/applications/services/storage/storage_cli.c
+++ b/applications/services/storage/storage_cli.c
@@ -11,7 +11,7 @@
 
 #define MAX_NAME_LENGTH 255
 
-static void storage_cli_print_usage() {
+static void storage_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("storage <cmd> <path> <args>\r\n");
     printf("The path must start with /int or /ext\r\n");
@@ -611,7 +611,7 @@ static void storage_cli_factory_reset(Cli* cli, FuriString* args, void* context)
     }
 }
 
-void storage_on_system_start() {
+void storage_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
     cli_add_command(cli, RECORD_STORAGE, CliCommandFlagParallelSafe, storage_cli, NULL);
diff --git a/applications/services/storage/storage_external_api.c b/applications/services/storage/storage_external_api.c
index 666090346..a377751ea 100644
--- a/applications/services/storage/storage_external_api.c
+++ b/applications/services/storage/storage_external_api.c
@@ -16,8 +16,9 @@
 #define S_API_PROLOGUE FuriApiLock lock = api_lock_alloc_locked();
 
 #define S_FILE_API_PROLOGUE           \
+    furi_check(file);                 \
     Storage* storage = file->storage; \
-    furi_assert(storage);
+    furi_check(storage);
 
 #define S_API_EPILOGUE                                                               \
     furi_check(                                                                      \
@@ -92,6 +93,8 @@ bool storage_file_open(
     const char* path,
     FS_AccessMode access_mode,
     FS_OpenMode open_mode) {
+    furi_check(file);
+
     bool result;
     FuriEventFlag* event = furi_event_flag_alloc();
     FuriPubSubSubscription* subscription = furi_pubsub_subscribe(
@@ -198,6 +201,8 @@ size_t storage_file_read(File* file, void* buff, size_t to_read) {
 }
 
 size_t storage_file_write(File* file, const void* buff, size_t to_write) {
+    furi_check(file);
+
     size_t total = 0;
 
     const size_t max_chunk = UINT16_MAX;
@@ -276,6 +281,8 @@ bool storage_file_eof(File* file) {
 }
 
 bool storage_file_exists(Storage* storage, const char* path) {
+    furi_check(storage);
+
     bool exist = false;
     FileInfo fileinfo;
     FS_Error error = storage_common_stat(storage, path, &fileinfo);
@@ -288,6 +295,9 @@ bool storage_file_exists(Storage* storage, const char* path) {
 }
 
 bool storage_file_copy_to_file(File* source, File* destination, size_t size) {
+    furi_check(source);
+    furi_check(destination);
+
     uint8_t* buffer = malloc(FILE_BUFFER_SIZE);
 
     while(size) {
@@ -328,6 +338,8 @@ static bool storage_dir_open_internal(File* file, const char* path) {
 }
 
 bool storage_dir_open(File* file, const char* path) {
+    furi_check(file);
+
     bool result;
     FuriEventFlag* event = furi_event_flag_alloc();
     FuriPubSubSubscription* subscription = furi_pubsub_subscribe(
@@ -402,6 +414,8 @@ bool storage_dir_rewind(File* file) {
 }
 
 bool storage_dir_exists(Storage* storage, const char* path) {
+    furi_check(storage);
+
     bool exist = false;
     FileInfo fileinfo;
     FS_Error error = storage_common_stat(storage, path, &fileinfo);
@@ -415,6 +429,7 @@ bool storage_dir_exists(Storage* storage, const char* path) {
 /****************** COMMON ******************/
 
 FS_Error storage_common_timestamp(Storage* storage, const char* path, uint32_t* timestamp) {
+    furi_check(storage);
     S_API_PROLOGUE;
 
     SAData data = {
@@ -430,6 +445,8 @@ FS_Error storage_common_timestamp(Storage* storage, const char* path, uint32_t*
 }
 
 FS_Error storage_common_stat(Storage* storage, const char* path, FileInfo* fileinfo) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
     SAData data = {
         .cstat = {
@@ -444,6 +461,8 @@ FS_Error storage_common_stat(Storage* storage, const char* path, FileInfo* filei
 }
 
 FS_Error storage_common_remove(Storage* storage, const char* path) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
     SAData data = {
         .path = {
@@ -457,6 +476,7 @@ FS_Error storage_common_remove(Storage* storage, const char* path) {
 }
 
 FS_Error storage_common_rename(Storage* storage, const char* old_path, const char* new_path) {
+    furi_check(storage);
     FS_Error error;
 
     do {
@@ -557,6 +577,8 @@ static FS_Error
 }
 
 FS_Error storage_common_copy(Storage* storage, const char* old_path, const char* new_path) {
+    furi_check(storage);
+
     FS_Error error;
 
     FileInfo fileinfo;
@@ -650,6 +672,8 @@ static FS_Error
 }
 
 FS_Error storage_common_merge(Storage* storage, const char* old_path, const char* new_path) {
+    furi_check(storage);
+
     FS_Error error;
     const char* new_path_tmp = NULL;
     FuriString* new_path_next = NULL;
@@ -718,6 +742,8 @@ FS_Error storage_common_merge(Storage* storage, const char* old_path, const char
 }
 
 FS_Error storage_common_mkdir(Storage* storage, const char* path) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
     SAData data = {
         .path = {
@@ -735,6 +761,8 @@ FS_Error storage_common_fs_info(
     const char* fs_path,
     uint64_t* total_space,
     uint64_t* free_space) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
 
     SAData data = {
@@ -751,6 +779,8 @@ FS_Error storage_common_fs_info(
 }
 
 void storage_common_resolve_path_and_ensure_app_directory(Storage* storage, FuriString* path) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
 
     SAData data = {
@@ -764,6 +794,8 @@ void storage_common_resolve_path_and_ensure_app_directory(Storage* storage, Furi
 }
 
 FS_Error storage_common_migrate(Storage* storage, const char* source, const char* dest) {
+    furi_check(storage);
+
     if(!storage_common_exists(storage, source)) {
         return FSE_OK;
     }
@@ -778,6 +810,8 @@ FS_Error storage_common_migrate(Storage* storage, const char* source, const char
 }
 
 bool storage_common_exists(Storage* storage, const char* path) {
+    furi_check(storage);
+
     FileInfo file_info;
     return storage_common_stat(storage, path, &file_info) == FSE_OK;
 }
@@ -787,6 +821,8 @@ bool storage_common_equivalent_path(
     const char* path1,
     const char* path2,
     bool truncate) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
 
     SAData data = {
@@ -810,23 +846,25 @@ const char* storage_error_get_desc(FS_Error error_id) {
 }
 
 FS_Error storage_file_get_error(File* file) {
-    furi_check(file != NULL);
+    furi_check(file);
     return file->error_id;
 }
 
 int32_t storage_file_get_internal_error(File* file) {
-    furi_check(file != NULL);
+    furi_check(file);
     return file->internal_error_id;
 }
 
 const char* storage_file_get_error_desc(File* file) {
-    furi_check(file != NULL);
+    furi_check(file);
     return filesystem_api_error_get_desc(file->error_id);
 }
 
 /****************** Raw SD API ******************/
 
 FS_Error storage_sd_format(Storage* storage) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
     SAData data = {};
     S_API_MESSAGE(StorageCommandSDFormat);
@@ -835,6 +873,8 @@ FS_Error storage_sd_format(Storage* storage) {
 }
 
 FS_Error storage_sd_unmount(Storage* storage) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
     SAData data = {};
     S_API_MESSAGE(StorageCommandSDUnmount);
@@ -843,6 +883,8 @@ FS_Error storage_sd_unmount(Storage* storage) {
 }
 
 FS_Error storage_sd_mount(Storage* storage) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
     SAData data = {};
     S_API_MESSAGE(StorageCommandSDMount);
@@ -851,6 +893,8 @@ FS_Error storage_sd_mount(Storage* storage) {
 }
 
 FS_Error storage_sd_info(Storage* storage, SDInfo* info) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
     SAData data = {
         .sdinfo = {
@@ -862,6 +906,8 @@ FS_Error storage_sd_info(Storage* storage, SDInfo* info) {
 }
 
 FS_Error storage_sd_status(Storage* storage) {
+    furi_check(storage);
+
     S_API_PROLOGUE;
     SAData data = {};
     S_API_MESSAGE(StorageCommandSDStatus);
@@ -870,6 +916,8 @@ FS_Error storage_sd_status(Storage* storage) {
 }
 
 File* storage_file_alloc(Storage* storage) {
+    furi_check(storage);
+
     File* file = malloc(sizeof(File));
     file->type = FileTypeClosed;
     file->storage = storage;
@@ -880,14 +928,18 @@ File* storage_file_alloc(Storage* storage) {
 }
 
 bool storage_file_is_open(File* file) {
+    furi_check(file);
     return (file->type != FileTypeClosed);
 }
 
 bool storage_file_is_dir(File* file) {
+    furi_check(file);
     return (file->type == FileTypeOpenDir);
 }
 
 void storage_file_free(File* file) {
+    furi_check(file);
+
     if(storage_file_is_open(file)) {
         if(storage_file_is_dir(file)) {
             storage_dir_close(file);
@@ -901,13 +953,13 @@ void storage_file_free(File* file) {
 }
 
 FuriPubSub* storage_get_pubsub(Storage* storage) {
-    furi_assert(storage);
+    furi_check(storage);
     return storage->pubsub;
 }
 
 bool storage_simply_remove_recursive(Storage* storage, const char* path) {
-    furi_assert(storage);
-    furi_assert(path);
+    furi_check(storage);
+    furi_check(path);
     FileInfo fileinfo;
     bool result = false;
     FuriString* fullname;
@@ -967,12 +1019,16 @@ bool storage_simply_remove_recursive(Storage* storage, const char* path) {
 } //-V773
 
 bool storage_simply_remove(Storage* storage, const char* path) {
+    furi_check(storage);
+
     FS_Error result;
     result = storage_common_remove(storage, path);
     return result == FSE_OK || result == FSE_NOT_EXIST;
 }
 
 bool storage_simply_mkdir(Storage* storage, const char* path) {
+    furi_check(storage);
+
     FS_Error result;
     result = storage_common_mkdir(storage, path);
     return result == FSE_OK || result == FSE_EXIST;
@@ -985,6 +1041,8 @@ void storage_get_next_filename(
     const char* fileextension,
     FuriString* nextfilename,
     uint8_t max_len) {
+    furi_check(storage);
+
     FuriString* temp_str;
     uint16_t num = 0;
 
diff --git a/applications/services/storage/storage_internal_api.c b/applications/services/storage/storage_internal_api.c
index 6d620b9c0..37ea4a2a5 100644
--- a/applications/services/storage/storage_internal_api.c
+++ b/applications/services/storage/storage_internal_api.c
@@ -2,8 +2,10 @@
 #include "storage.h"
 #include <toolbox/tar/tar_archive.h>
 
-FS_Error storage_int_backup(Storage* api, const char* dstname) {
-    TarArchive* archive = tar_archive_alloc(api);
+FS_Error storage_int_backup(Storage* storage, const char* dstname) {
+    furi_check(storage);
+
+    TarArchive* archive = tar_archive_alloc(storage);
     bool success = tar_archive_open(archive, dstname, TAR_OPEN_MODE_WRITE) &&
                    tar_archive_add_dir(archive, STORAGE_INT_PATH_PREFIX, "") &&
                    tar_archive_finalize(archive);
@@ -11,8 +13,11 @@ FS_Error storage_int_backup(Storage* api, const char* dstname) {
     return success ? FSE_OK : FSE_INTERNAL;
 }
 
-FS_Error storage_int_restore(Storage* api, const char* srcname, Storage_name_converter converter) {
-    TarArchive* archive = tar_archive_alloc(api);
+FS_Error
+    storage_int_restore(Storage* storage, const char* srcname, Storage_name_converter converter) {
+    furi_check(storage);
+
+    TarArchive* archive = tar_archive_alloc(storage);
     bool success = tar_archive_open(archive, srcname, TAR_OPEN_MODE_READ) &&
                    tar_archive_unpack_to(archive, STORAGE_INT_PATH_PREFIX, converter);
     tar_archive_free(archive);
diff --git a/applications/services/storage/storages/storage_int.c b/applications/services/storage/storages/storage_int.c
index ea6fa68ef..8c3827fe5 100644
--- a/applications/services/storage/storages/storage_int.c
+++ b/applications/services/storage/storages/storage_int.c
@@ -23,13 +23,13 @@ typedef struct {
     bool open;
 } LFSHandle;
 
-static LFSHandle* lfs_handle_alloc_file() {
+static LFSHandle* lfs_handle_alloc_file(void) {
     LFSHandle* handle = malloc(sizeof(LFSHandle));
     handle->data = malloc(sizeof(lfs_file_t));
     return handle;
 }
 
-static LFSHandle* lfs_handle_alloc_dir() {
+static LFSHandle* lfs_handle_alloc_dir(void) {
     LFSHandle* handle = malloc(sizeof(LFSHandle));
     handle->data = malloc(sizeof(lfs_dir_t));
     return handle;
@@ -134,7 +134,7 @@ static int storage_int_device_sync(const struct lfs_config* c) {
     return 0;
 }
 
-static LFSData* storage_int_lfs_data_alloc() {
+static LFSData* storage_int_lfs_data_alloc(void) {
     LFSData* lfs_data = malloc(sizeof(LFSData));
 
     // Internal storage start address
diff --git a/applications/settings/bt_settings_app/bt_settings_app.c b/applications/settings/bt_settings_app/bt_settings_app.c
index f211c7128..d86c9df64 100644
--- a/applications/settings/bt_settings_app/bt_settings_app.c
+++ b/applications/settings/bt_settings_app/bt_settings_app.c
@@ -12,7 +12,7 @@ static bool bt_settings_back_event_callback(void* context) {
     return scene_manager_handle_back_event(app->scene_manager);
 }
 
-BtSettingsApp* bt_settings_app_alloc() {
+BtSettingsApp* bt_settings_app_alloc(void) {
     BtSettingsApp* app = malloc(sizeof(BtSettingsApp));
 
     // Load settings
diff --git a/applications/settings/desktop_settings/desktop_settings_app.c b/applications/settings/desktop_settings/desktop_settings_app.c
index 7e04271f2..15936bcb8 100644
--- a/applications/settings/desktop_settings/desktop_settings_app.c
+++ b/applications/settings/desktop_settings/desktop_settings_app.c
@@ -21,7 +21,7 @@ static bool desktop_settings_back_event_callback(void* context) {
     return scene_manager_handle_back_event(app->scene_manager);
 }
 
-DesktopSettingsApp* desktop_settings_app_alloc() {
+DesktopSettingsApp* desktop_settings_app_alloc(void) {
     DesktopSettingsApp* app = malloc(sizeof(DesktopSettingsApp));
 
     app->gui = furi_record_open(RECORD_GUI);
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c
index aade00662..117aeeccd 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c
@@ -142,7 +142,7 @@ void desktop_settings_scene_favorite_on_enter(void* context) {
         }
     }
 
-    submenu_set_header(submenu, is_dummy_app ? ("Dummy Mode app:") : ("Favorite app:"));
+    submenu_set_header(submenu, is_dummy_app ? ("Dummy Mode App") : ("Favorite App"));
     submenu_set_selected_item(submenu, pre_select_item); // If set during loop, visual glitch.
 
     view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewMenu);
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c
index 43f05ec9b..c3e22805d 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c
@@ -25,7 +25,7 @@ void desktop_settings_scene_pin_disable_on_enter(void* context) {
     popup_set_context(app->popup, app);
     popup_set_callback(app->popup, pin_disable_back_callback);
     popup_set_icon(app->popup, 0, 2, &I_DolphinMafia_119x62);
-    popup_set_header(app->popup, "Deleted", 80, 19, AlignLeft, AlignBottom);
+    popup_set_header(app->popup, "PIN\nDeleted!", 100, 0, AlignCenter, AlignTop);
     popup_set_timeout(app->popup, 1500);
     popup_enable_timeout(app->popup);
     view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewIdPopup);
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_menu.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_menu.c
index d226181d7..86e756ede 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_menu.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_menu.c
@@ -22,7 +22,7 @@ void desktop_settings_scene_pin_menu_on_enter(void* context) {
     if(!app->settings.pin_code.length) {
         submenu_add_item(
             submenu,
-            "Set Pin",
+            "Set PIN",
             SCENE_EVENT_SET_PIN,
             desktop_settings_scene_pin_menu_submenu_callback,
             app);
@@ -30,7 +30,7 @@ void desktop_settings_scene_pin_menu_on_enter(void* context) {
     } else {
         submenu_add_item(
             submenu,
-            "Change Pin",
+            "Change PIN",
             SCENE_EVENT_CHANGE_PIN,
             desktop_settings_scene_pin_menu_submenu_callback,
             app);
@@ -43,7 +43,7 @@ void desktop_settings_scene_pin_menu_on_enter(void* context) {
             app);
     }
 
-    submenu_set_header(app->submenu, "Pin code settings:");
+    submenu_set_header(app->submenu, "PIN Code Settings");
     submenu_set_selected_item(app->submenu, app->menu_idx);
     view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewMenu);
 }
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_done.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_done.c
index f6ceb96de..b829f995b 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_done.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_done.c
@@ -34,7 +34,7 @@ void desktop_settings_scene_pin_setup_done_on_enter(void* context) {
     desktop_view_pin_input_set_done_callback(app->pin_input_view, pin_setup_done_callback);
     desktop_view_pin_input_set_pin(app->pin_input_view, &app->settings.pin_code);
     desktop_view_pin_input_set_label_button(app->pin_input_view, "Done");
-    desktop_view_pin_input_set_label_primary(app->pin_input_view, 29, 8, "PIN activated!");
+    desktop_view_pin_input_set_label_primary(app->pin_input_view, 29, 8, "PIN Activated!");
     desktop_view_pin_input_set_label_secondary(
         app->pin_input_view, 7, 45, "Remember or write it down");
     desktop_view_pin_input_lock_input(app->pin_input_view);
diff --git a/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto.c b/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto.c
index 26aa7c3e1..b86d6c045 100644
--- a/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto.c
+++ b/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto.c
@@ -23,7 +23,7 @@ static void desktop_settings_view_pin_setup_howto_draw(Canvas* canvas, void* mod
     elements_button_right(canvas, "Next");
 
     canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text_aligned(canvas, 64, 0, AlignCenter, AlignTop, "Setting up PIN");
+    elements_multiline_text_aligned(canvas, 64, 0, AlignCenter, AlignTop, "Setting Up PIN");
 
     canvas_set_font(canvas, FontSecondary);
     elements_multiline_text(canvas, 58, 24, "Prepare to use\narrows as\nPIN symbols");
@@ -54,7 +54,7 @@ void desktop_settings_view_pin_setup_howto_set_callback(
     instance->context = context;
 }
 
-DesktopSettingsViewPinSetupHowto* desktop_settings_view_pin_setup_howto_alloc() {
+DesktopSettingsViewPinSetupHowto* desktop_settings_view_pin_setup_howto_alloc(void) {
     DesktopSettingsViewPinSetupHowto* view = malloc(sizeof(DesktopSettingsViewPinSetupHowto));
     view->view = view_alloc();
     view_set_context(view->view, view);
diff --git a/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto.h b/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto.h
index 0f62cb433..8a62018de 100644
--- a/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto.h
+++ b/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto.h
@@ -10,6 +10,6 @@ void desktop_settings_view_pin_setup_howto_set_callback(
     DesktopSettingsViewPinSetupHowto* instance,
     DesktopSettingsViewPinSetupHowtoDoneCallback callback,
     void* context);
-DesktopSettingsViewPinSetupHowto* desktop_settings_view_pin_setup_howto_alloc();
+DesktopSettingsViewPinSetupHowto* desktop_settings_view_pin_setup_howto_alloc(void);
 void desktop_settings_view_pin_setup_howto_free(DesktopSettingsViewPinSetupHowto* instance);
 View* desktop_settings_view_pin_setup_howto_get_view(DesktopSettingsViewPinSetupHowto* instance);
diff --git a/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto2.c b/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto2.c
index c28826e62..b09b0b95f 100644
--- a/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto2.c
+++ b/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto2.c
@@ -76,7 +76,7 @@ void desktop_settings_view_pin_setup_howto2_set_ok_callback(
     instance->ok_callback = callback;
 }
 
-DesktopSettingsViewPinSetupHowto2* desktop_settings_view_pin_setup_howto2_alloc() {
+DesktopSettingsViewPinSetupHowto2* desktop_settings_view_pin_setup_howto2_alloc(void) {
     DesktopSettingsViewPinSetupHowto2* view = malloc(sizeof(DesktopSettingsViewPinSetupHowto2));
     view->view = view_alloc();
     view_set_context(view->view, view);
diff --git a/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto2.h b/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto2.h
index 8e3018d98..760e7bae1 100644
--- a/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto2.h
+++ b/applications/settings/desktop_settings/views/desktop_settings_view_pin_setup_howto2.h
@@ -6,7 +6,7 @@ typedef struct DesktopSettingsViewPinSetupHowto2 DesktopSettingsViewPinSetupHowt
 
 typedef void (*DesktopSettingsViewPinSetupHowto2Callback)(void*);
 
-DesktopSettingsViewPinSetupHowto2* desktop_settings_view_pin_setup_howto2_alloc();
+DesktopSettingsViewPinSetupHowto2* desktop_settings_view_pin_setup_howto2_alloc(void);
 void desktop_settings_view_pin_setup_howto2_free(DesktopSettingsViewPinSetupHowto2* instance);
 View* desktop_settings_view_pin_setup_howto2_get_view(DesktopSettingsViewPinSetupHowto2* instance);
 void desktop_settings_view_pin_setup_howto2_set_context(
diff --git a/applications/settings/expansion_settings_app/expansion_settings_app.c b/applications/settings/expansion_settings_app/expansion_settings_app.c
index 12ead2160..fe0e3ca2c 100644
--- a/applications/settings/expansion_settings_app/expansion_settings_app.c
+++ b/applications/settings/expansion_settings_app/expansion_settings_app.c
@@ -24,7 +24,7 @@ static uint32_t expansion_settings_app_exit(void* context) {
     return VIEW_NONE;
 }
 
-static ExpansionSettingsApp* expansion_settings_app_alloc() {
+static ExpansionSettingsApp* expansion_settings_app_alloc(void) {
     ExpansionSettingsApp* app = malloc(sizeof(ExpansionSettingsApp));
 
     app->gui = furi_record_open(RECORD_GUI);
diff --git a/applications/settings/notification_settings/notification_settings_app.c b/applications/settings/notification_settings/notification_settings_app.c
index 2a1d988ac..7576dcf3c 100644
--- a/applications/settings/notification_settings/notification_settings_app.c
+++ b/applications/settings/notification_settings/notification_settings_app.c
@@ -173,7 +173,7 @@ static uint32_t notification_app_settings_exit(void* context) {
     return VIEW_NONE;
 }
 
-static NotificationAppSettings* alloc_settings() {
+static NotificationAppSettings* alloc_settings(void) {
     NotificationAppSettings* app = malloc(sizeof(NotificationAppSettings));
     app->notification = furi_record_open(RECORD_NOTIFICATION);
     app->gui = furi_record_open(RECORD_GUI);
diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c
index 923ec250e..c3f5d5ad8 100644
--- a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c
+++ b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c
@@ -10,7 +10,7 @@ void power_settings_scene_power_off_on_enter(void* context) {
     PowerSettingsApp* app = context;
     DialogEx* dialog = app->dialog;
 
-    dialog_ex_set_header(dialog, "Turn Off Device?", 64, 2, AlignCenter, AlignTop);
+    dialog_ex_set_header(dialog, "Turn OFF Device?", 64, 2, AlignCenter, AlignTop);
     dialog_ex_set_text(
         dialog, "   I will be\nwaiting for\n you here...", 78, 16, AlignLeft, AlignTop);
     dialog_ex_set_icon(dialog, 21, 13, &I_Cry_dolph_55x52);
diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_reboot.c b/applications/settings/power_settings_app/scenes/power_settings_scene_reboot.c
index 2d879612e..2d5dedfd4 100644
--- a/applications/settings/power_settings_app/scenes/power_settings_scene_reboot.c
+++ b/applications/settings/power_settings_app/scenes/power_settings_scene_reboot.c
@@ -15,10 +15,10 @@ void power_settings_scene_reboot_on_enter(void* context) {
     PowerSettingsApp* app = context;
     Submenu* submenu = app->submenu;
 
-    submenu_set_header(submenu, "Reboot type");
+    submenu_set_header(submenu, "Reboot Type");
     submenu_add_item(
         submenu,
-        "Firmware upgrade",
+        "Firmware Upgrade",
         PowerSettingsRebootSubmenuIndexDfu,
         power_settings_scene_reboot_submenu_callback,
         app);
diff --git a/applications/settings/power_settings_app/views/battery_info.c b/applications/settings/power_settings_app/views/battery_info.c
index 8add60db5..dd2ec2dbc 100644
--- a/applications/settings/power_settings_app/views/battery_info.c
+++ b/applications/settings/power_settings_app/views/battery_info.c
@@ -127,7 +127,7 @@ static void battery_info_draw_callback(Canvas* canvas, void* context) {
     draw_stat(canvas, 104, 42, &I_Health_16x16, health);
 }
 
-BatteryInfo* battery_info_alloc() {
+BatteryInfo* battery_info_alloc(void) {
     BatteryInfo* battery_info = malloc(sizeof(BatteryInfo));
     battery_info->view = view_alloc();
     view_set_context(battery_info->view, battery_info);
diff --git a/applications/settings/power_settings_app/views/battery_info.h b/applications/settings/power_settings_app/views/battery_info.h
index e52d1844c..97130cb46 100644
--- a/applications/settings/power_settings_app/views/battery_info.h
+++ b/applications/settings/power_settings_app/views/battery_info.h
@@ -14,7 +14,7 @@ typedef struct {
     uint8_t health;
 } BatteryInfoModel;
 
-BatteryInfo* battery_info_alloc();
+BatteryInfo* battery_info_alloc(void);
 
 void battery_info_free(BatteryInfo* battery_info);
 
diff --git a/applications/settings/storage_settings/storage_settings.c b/applications/settings/storage_settings/storage_settings.c
index 77a8f0f22..0508e8e0f 100644
--- a/applications/settings/storage_settings/storage_settings.c
+++ b/applications/settings/storage_settings/storage_settings.c
@@ -12,7 +12,7 @@ static bool storage_settings_back_event_callback(void* context) {
     return scene_manager_handle_back_event(app->scene_manager);
 }
 
-static StorageSettings* storage_settings_alloc() {
+static StorageSettings* storage_settings_alloc(void) {
     StorageSettings* app = malloc(sizeof(StorageSettings));
 
     app->gui = furi_record_open(RECORD_GUI);
diff --git a/applications/settings/system/system_settings.c b/applications/settings/system/system_settings.c
index 5d7f3193d..29fe0cd48 100644
--- a/applications/settings/system/system_settings.c
+++ b/applications/settings/system/system_settings.c
@@ -213,7 +213,7 @@ static uint32_t system_settings_exit(void* context) {
     return VIEW_NONE;
 }
 
-SystemSettings* system_settings_alloc() {
+SystemSettings* system_settings_alloc(void) {
     SystemSettings* app = malloc(sizeof(SystemSettings));
 
     // Load settings
diff --git a/applications/system/application.fam b/applications/system/application.fam
index 2d4dfcbb8..095ca1ab2 100644
--- a/applications/system/application.fam
+++ b/applications/system/application.fam
@@ -6,6 +6,7 @@ App(
         "updater_app",
         "storage_move_to_sd",
         "js_app",
+        "js_app_start",
         # "archive",
     ],
 )
diff --git a/applications/system/hid_app/hid.c b/applications/system/hid_app/hid.c
index cd4f75d2e..1b0667bbf 100644
--- a/applications/system/hid_app/hid.c
+++ b/applications/system/hid_app/hid.c
@@ -133,7 +133,7 @@ static uint32_t hid_ptt_menu_view(void* context) {
     return HidViewPushToTalkMenu;
 }
 
-Hid* hid_alloc() {
+Hid* hid_alloc(void) {
     Hid* app = malloc(sizeof(Hid));
 
     // Gui
diff --git a/applications/system/hid_app/views/hid_media.h b/applications/system/hid_app/views/hid_media.h
index 4aa51dc17..2356734b3 100644
--- a/applications/system/hid_app/views/hid_media.h
+++ b/applications/system/hid_app/views/hid_media.h
@@ -2,9 +2,11 @@
 
 #include <gui/view.h>
 
+typedef struct Hid Hid;
+
 typedef struct HidMedia HidMedia;
 
-HidMedia* hid_media_alloc();
+HidMedia* hid_media_alloc(Hid* hid);
 
 void hid_media_free(HidMedia* hid_media);
 
diff --git a/applications/system/js_app/application.fam b/applications/system/js_app/application.fam
index b586f1623..8088f232f 100644
--- a/applications/system/js_app/application.fam
+++ b/applications/system/js_app/application.fam
@@ -8,6 +8,13 @@ App(
     order=0,
 )
 
+App(
+    appid="js_app_start",
+    apptype=FlipperAppType.STARTUP,
+    entry_point="js_app_on_system_start",
+    order=160,
+)
+
 App(
     appid="js_dialog",
     apptype=FlipperAppType.PLUGIN,
@@ -47,3 +54,66 @@ App(
     requires=["js_app"],
     sources=["modules/js_usbdisk/*.c"],
 )
+
+App(
+    appid="js_submenu",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="js_submenu_ep",
+    requires=["js_app"],
+    sources=["modules/js_submenu.c"],
+)
+
+App(
+    appid="js_blebeacon",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="js_blebeacon_ep",
+    requires=["js_app"],
+    sources=["modules/js_blebeacon.c"],
+)
+
+App(
+    appid="js_math",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="js_math_ep",
+    requires=["js_app"],
+    sources=["modules/js_math.c"],
+)
+
+App(
+    appid="js_keyboard",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="js_keyboard_ep",
+    requires=["js_app"],
+    sources=["modules/js_keyboard.c"],
+)
+App(
+    appid="js_subghz",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="js_subghz_ep",
+    requires=["js_app"],
+    sources=["modules/js_subghz/*.c"],
+)
+
+App(
+    appid="js_gpio",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="js_gpio_ep",
+    requires=["js_app"],
+    sources=["modules/js_gpio.c"],
+)
+
+App(
+    appid="js_textbox",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="js_textbox_ep",
+    requires=["js_app"],
+    sources=["modules/js_textbox.c"],
+)
+
+App(
+    appid="js_widget",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="js_widget_ep",
+    requires=["js_app"],
+    sources=["modules/js_widget.c"],
+)
diff --git a/applications/system/js_app/examples/apps/Scripts/badusb_demo.js b/applications/system/js_app/examples/apps/Scripts/badusb_demo.js
index bbeedd445..be94a64d2 100644
--- a/applications/system/js_app/examples/apps/Scripts/badusb_demo.js
+++ b/applications/system/js_app/examples/apps/Scripts/badusb_demo.js
@@ -3,7 +3,13 @@ let notify = require("notification");
 let flipper = require("flipper");
 let dialog = require("dialog");
 
-badusb.setup({ vid: 0xAAAA, pid: 0xBBBB, mfr_name: "Flipper", prod_name: "Zero" });
+badusb.setup({
+    vid: 0xAAAA,
+    pid: 0xBBBB,
+    mfr_name: "Flipper",
+    prod_name: "Zero",
+    layout_path: "/ext/badusb/assets/layouts/en-US.kl"
+});
 dialog.message("BadUSB demo", "Press OK to start");
 
 if (badusb.isConnected()) {
@@ -26,6 +32,12 @@ if (badusb.isConnected()) {
     badusb.println("Flipper Name: " + flipper.getName());
     badusb.println("Battery level: " + to_string(flipper.getBatteryCharge()) + "%");
 
+    // Alt+Numpad method works only on Windows!!!
+    badusb.altPrintln("This was printed with Alt+Numpad method!");
+
+    // There's also badusb.print() and badusb.altPrint()
+    // which don't add the return at the end
+
     notify.success();
 } else {
     print("USB not connected");
diff --git a/applications/system/js_app/examples/apps/Scripts/blebeacon.js b/applications/system/js_app/examples/apps/Scripts/blebeacon.js
new file mode 100644
index 000000000..53983a745
--- /dev/null
+++ b/applications/system/js_app/examples/apps/Scripts/blebeacon.js
@@ -0,0 +1,59 @@
+let blebeacon = require("blebeacon");
+
+// Stop if previous background beacon is active
+if (blebeacon.isActive()) {
+    blebeacon.stop();
+}
+
+// Make sure it resets at script exit, true will keep advertising in background
+// This is false by default, can be omitted
+blebeacon.keepAlive(false);
+
+
+let math = require("math");
+
+let currentIndex = 0;
+let watchValues = [
+    0x1A, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+    0x09, 0x0A, 0x0B, 0x0C, 0x11, 0x12, 0x13, 0x14, 0x15,
+    0x16, 0x17, 0x18, 0xE4, 0xE5, 0x1B, 0x1C, 0x1D, 0x1E,
+    0x20, 0xEC, 0xEF
+];
+
+function generateRandomMac() {
+    let mac = [];
+    for (let i = 0; i < 6; i++) {
+        mac.push(math.floor(math.random() * 256));
+    }
+    return Uint8Array(mac);
+}
+
+function sendRandomModelAdvertisement() {
+    let model = watchValues[currentIndex];
+
+    let packet = [
+        14, 0xFF, 0x75, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x01, 0xFF, 0x00, 0x00, 0x43,
+        model
+    ];
+
+    let intervalMs = 50;
+
+    // Power level, min interval and max interval are optional
+    blebeacon.setConfig(generateRandomMac(), 0x1F, intervalMs, intervalMs * 3);
+
+    blebeacon.setData(Uint8Array(packet));
+
+    blebeacon.start();
+
+    print("Sent data for model ID " + to_string(model));
+
+    currentIndex = (currentIndex + 1) % watchValues.length;
+
+    delay(intervalMs);
+
+    blebeacon.stop();
+}
+
+while (true) {
+    sendRandomModelAdvertisement();
+}
\ No newline at end of file
diff --git a/applications/system/js_app/examples/apps/Scripts/dialog.js b/applications/system/js_app/examples/apps/Scripts/dialog.js
index 9fc44f8b9..4c5b0af20 100644
--- a/applications/system/js_app/examples/apps/Scripts/dialog.js
+++ b/applications/system/js_app/examples/apps/Scripts/dialog.js
@@ -7,13 +7,16 @@ let dialog_params = ({
     header: "Test_header",
     text: "Test_text",
     button_left: "Left",
-    button_right: "Right",
+    button_right: "Files",
     button_center: "OK"
 });
 
 let result2 = dialog.custom(dialog_params);
 if (result2 === "") {
     print("Back is pressed");
+} else if (result2 === "Files") {
+    let result3 = dialog.pickFile("/ext", "*");
+    print("Selected", result3);
 } else {
     print(result2, "is pressed");
 }
diff --git a/applications/system/js_app/examples/apps/Scripts/gpio.js b/applications/system/js_app/examples/apps/Scripts/gpio.js
new file mode 100644
index 000000000..02b55a3ad
--- /dev/null
+++ b/applications/system/js_app/examples/apps/Scripts/gpio.js
@@ -0,0 +1,62 @@
+let gpio = require("gpio");
+
+// initialize pins
+gpio.init("PC3", "outputPushPull", "up"); // pin, mode, pull
+print("PC3 is initialized as outputPushPull with pull-up");
+
+gpio.init("PC1", "input", "down"); // pin, mode, pull
+print("PC1 is initialized as input with pull-down");
+
+// let led on PC3 blink
+gpio.write("PC3", true); // high
+delay(1000);
+gpio.write("PC3", false); // low
+delay(1000);
+gpio.write("PC3", true);  // high
+delay(1000);
+gpio.write("PC3", false); // low
+
+// read value from PC1 and write it to PC3
+while (true) {
+    let value = gpio.read("PC1");
+    gpio.write("PC3", value);
+
+    value ? print("PC1 is high") : print("PC1 is low");
+
+    delay(100);
+}
+
+
+// possible pins https://docs.flipper.net/gpio-and-modules#miFsS
+// "PA7" aka 2
+// "PA6" aka 3
+// "PA4" aka 4
+// "PB3" aka 5
+// "PB2" aka 6
+// "PC3" aka 7
+// "PA14" aka 10
+// "PA13" aka 12
+// "PB6" aka 13
+// "PB7" aka 14
+// "PC1" aka 15
+// "PC0" aka 16
+// "PB14" aka 17
+
+// possible modes
+// "input"
+// "outputPushPull"
+// "outputOpenDrain"
+// "altFunctionPushPull"
+// "altFunctionOpenDrain"
+// "analog"
+// "interruptRise"
+// "interruptFall"
+// "interruptRiseFall"
+// "eventRise"
+// "eventFall"
+// "eventRiseFall"
+
+// possible pull
+// "no"
+// "up"
+// "down"
\ No newline at end of file
diff --git a/applications/system/js_app/examples/apps/Scripts/keyboard.js b/applications/system/js_app/examples/apps/Scripts/keyboard.js
new file mode 100644
index 000000000..2b01418de
--- /dev/null
+++ b/applications/system/js_app/examples/apps/Scripts/keyboard.js
@@ -0,0 +1,23 @@
+let keyboard = require("keyboard");
+
+keyboard.setHeader("Example Text Input");
+
+// Default text is optional
+let text = keyboard.text(100, "Default text", true);
+// Returns undefined when pressing back
+print("Got text:", text);
+
+keyboard.setHeader("Example Byte Input");
+
+// Default data is optional
+let result = keyboard.byte(6, Uint8Array([1, 2, 3, 4, 5, 6]));
+// Returns undefined when pressing back
+if (result !== undefined) {
+    let data = Uint8Array(result);
+    result = "0x";
+    for (let i = 0; i < data.byteLength; i++) {
+        if (data[i] < 0x10) result += "0";
+        result += to_hex_string(data[i]);
+    }
+}
+print("Got data:", result);
\ No newline at end of file
diff --git a/applications/system/js_app/examples/apps/Scripts/math.js b/applications/system/js_app/examples/apps/Scripts/math.js
new file mode 100644
index 000000000..49212f904
--- /dev/null
+++ b/applications/system/js_app/examples/apps/Scripts/math.js
@@ -0,0 +1,47 @@
+let math = require("math");
+
+let absResult = math.abs(-5);
+let acosResult = math.acos(0.5);
+let acoshResult = math.acosh(2);
+let asinResult = math.asin(0.5);
+let asinhResult = math.asinh(2);
+let atanResult = math.atan(1);
+let atan2Result = math.atan2(1, 1);
+let atanhResult = math.atanh(0.5);
+let cbrtResult = math.cbrt(27);
+let ceilResult = math.ceil(5.3);
+let clz32Result = math.clz32(1);
+let cosResult = math.cos(math.PI);
+let expResult = math.exp(1);
+let floorResult = math.floor(5.7);
+let maxResult = math.max(3, 5);
+let minResult = math.min(3, 5);
+let powResult = math.pow(2, 3);
+let randomResult = math.random();
+let signResult = math.sign(-5);
+let sinResult = math.sin(math.PI / 2);
+let sqrtResult = math.sqrt(25);
+let truncResult = math.trunc(5.7);
+
+print("math.abs(-5):", absResult);
+print("math.acos(0.5):", acosResult);
+print("math.acosh(2):", acoshResult);
+print("math.asin(0.5):", asinResult);
+print("math.asinh(2):", asinhResult);
+print("math.atan(1):", atanResult);
+print("math.atan2(1, 1):", atan2Result);
+print("math.atanh(0.5):", atanhResult);
+print("math.cbrt(27):", cbrtResult);
+print("math.ceil(5.3):", ceilResult);
+print("math.clz32(1):", clz32Result);
+print("math.cos(math.PI):", cosResult);
+print("math.exp(1):", expResult);
+print("math.floor(5.7):", floorResult);
+print("math.max(3, 5):", maxResult);
+print("math.min(3, 5):", minResult);
+print("math.pow(2, 3):", powResult);
+print("math.random():", randomResult);
+print("math.sign(-5):", signResult);
+print("math.sin(math.PI/2):", sinResult);
+print("math.sqrt(25):", sqrtResult);
+print("math.trunc(5.7):", truncResult);
\ No newline at end of file
diff --git a/applications/system/js_app/examples/apps/Scripts/path.js b/applications/system/js_app/examples/apps/Scripts/path.js
new file mode 100644
index 000000000..0381150d2
--- /dev/null
+++ b/applications/system/js_app/examples/apps/Scripts/path.js
@@ -0,0 +1,9 @@
+let storage = require("storage");
+
+print("script has __dirpath of" + __dirpath);
+print("script has __filepath of" + __filepath);
+if (storage.exists(__dirpath + "/math.js")) {
+    print("math.js exist here.");
+} else {
+    print("math.js does not exist here.");
+}
\ No newline at end of file
diff --git a/applications/system/js_app/examples/apps/Scripts/stringutils.js b/applications/system/js_app/examples/apps/Scripts/stringutils.js
new file mode 100644
index 000000000..51781328d
--- /dev/null
+++ b/applications/system/js_app/examples/apps/Scripts/stringutils.js
@@ -0,0 +1,19 @@
+let sampleText = "Hello, World!";
+
+let lengthOfText = "Length of text: " + to_string(sampleText.length);
+print(lengthOfText);
+
+let start = 7;
+let end = 12;
+let substringResult = sampleText.slice(start, end);
+print(substringResult);
+
+let searchStr = "World";
+let result2 = to_string(sampleText.indexOf(searchStr));
+print(result2);
+
+let upperCaseText = "Text in upper case: " + to_upper_case(sampleText);
+print(upperCaseText);
+
+let lowerCaseText = "Text in lower case: " + to_lower_case(sampleText);
+print(lowerCaseText);
diff --git a/applications/system/js_app/examples/apps/Scripts/subghz.js b/applications/system/js_app/examples/apps/Scripts/subghz.js
new file mode 100644
index 000000000..39dadf070
--- /dev/null
+++ b/applications/system/js_app/examples/apps/Scripts/subghz.js
@@ -0,0 +1,37 @@
+let subghz = require("subghz");
+subghz.setup();
+
+function printRXline() {
+    if (subghz.getState() !== "RX") {
+        subghz.setRx(); // to RX
+    }
+
+    let rssi = subghz.getRssi();
+    let freq = subghz.getFrequency();
+    let ext = subghz.isExternal();
+
+    print("rssi: ", rssi, "dBm", "@", freq, "MHz", "ext: ", ext);
+}
+
+function changeFrequency(freq) {
+    if (subghz.getState() !== "IDLE") {
+        subghz.setIdle(); // need to be idle to change frequency
+    }
+    subghz.setFrequency(freq);
+}
+
+subghz.setIdle();
+print(subghz.getState()); // "IDLE"
+subghz.setRx();
+print(subghz.getState()); // "RX"
+
+changeFrequency(433920000);
+printRXline();
+delay(1000);
+
+let result = subghz.transmitFile("/ext/subghz/0.sub");
+print(result ? "Send success" : "Send failed");
+delay(1000);
+
+changeFrequency(315000000);
+printRXline();
\ No newline at end of file
diff --git a/applications/system/js_app/examples/apps/Scripts/submenu.js b/applications/system/js_app/examples/apps/Scripts/submenu.js
new file mode 100644
index 000000000..245551309
--- /dev/null
+++ b/applications/system/js_app/examples/apps/Scripts/submenu.js
@@ -0,0 +1,11 @@
+let submenu = require("submenu");
+
+submenu.addItem("Item 1", 0);
+submenu.addItem("Item 2", 1);
+submenu.addItem("Item 3", 2);
+
+submenu.setHeader("Select an option:");
+
+let result = submenu.show();
+// Returns undefined when pressing back
+print("Result:", result);
diff --git a/applications/system/js_app/examples/apps/Scripts/textbox.js b/applications/system/js_app/examples/apps/Scripts/textbox.js
new file mode 100644
index 000000000..bb6c4fc23
--- /dev/null
+++ b/applications/system/js_app/examples/apps/Scripts/textbox.js
@@ -0,0 +1,30 @@
+let textbox = require("textbox");
+
+// You should set config before adding text
+// Focus (start / end), Font (text / hex)
+textbox.setConfig("end", "text");
+
+// Can make sure it's empty before showing, in case of reusing in same script
+// (Closing textbox already empties the text, but maybe you added more in a loop for example)
+textbox.emptyText();
+
+// Add default text
+textbox.addText("Example dynamic updating textbox\n");
+
+// Non-blocking, can keep updating text after, can close in JS or in GUI
+textbox.show();
+
+let i = 0;
+while (textbox.isOpen() && i < 20) {
+    print("console", i++);
+
+    // Add text to textbox buffer
+    textbox.addText("textbox " + to_string(i) + "\n");
+
+    delay(500);
+}
+
+// If not closed by user (instead i < 20 is false above), close forcefully
+if (textbox.isOpen()) {
+    textbox.close();
+}
diff --git a/applications/system/js_app/examples/apps/Scripts/uart_echo.js b/applications/system/js_app/examples/apps/Scripts/uart_echo.js
index 60d44d078..1cc0d8e62 100644
--- a/applications/system/js_app/examples/apps/Scripts/uart_echo.js
+++ b/applications/system/js_app/examples/apps/Scripts/uart_echo.js
@@ -8,4 +8,7 @@ while (1) {
         let data_view = Uint8Array(rx_data);
         print("0x" + to_hex_string(data_view[0]));
     }
-}
\ No newline at end of file
+}
+
+// There's also serial.end(), so you can serial.setup() again in same script
+// You can also use serial.readAny(timeout), will avoid starving your loop with single byte reads
diff --git a/applications/system/js_app/examples/apps/Scripts/widget-js.fxbm b/applications/system/js_app/examples/apps/Scripts/widget-js.fxbm
new file mode 100644
index 000000000..9ba5783ce
Binary files /dev/null and b/applications/system/js_app/examples/apps/Scripts/widget-js.fxbm differ
diff --git a/applications/system/js_app/examples/apps/Scripts/widget.js b/applications/system/js_app/examples/apps/Scripts/widget.js
new file mode 100644
index 000000000..4ff11e441
--- /dev/null
+++ b/applications/system/js_app/examples/apps/Scripts/widget.js
@@ -0,0 +1,59 @@
+let widget = require("widget");
+
+let demo_seconds = 30;
+
+print("Loading file", __filepath);
+print("From directory", __dirpath);
+
+// addText supports "Primary" and "Secondary" font sizes.
+widget.addText(10, 10, "Primary", "Example JS widget");
+widget.addText(10, 20, "Secondary", "Example widget from JS!");
+
+// load a Xbm file from the same directory as this script.
+widget.addText(0, 30, "Secondary", __filepath);
+let logo = widget.loadImageXbm(__dirpath + "/widget-js.fxbm");
+
+// add a line (x1, y1, x2, y2)
+widget.addLine(10, 35, 120, 35);
+
+// add a circle/disc (x, y, radius)
+widget.addCircle(12, 52, 10);
+widget.addDisc(12, 52, 5);
+
+// add a frame/box (x, y, width, height)
+widget.addFrame(30, 45, 10, 10);
+widget.addBox(32, 47, 6, 6);
+
+// add a rounded frame/box (x, y, width, height, radius)
+widget.addRframe(50, 45, 15, 15, 3);
+widget.addRbox(53, 48, 6, 6, 2);
+
+// add a dot (x, y)
+widget.addDot(100, 45);
+widget.addDot(102, 44);
+widget.addDot(104, 43);
+
+// add a glyph (x, y, glyph)
+widget.addGlyph(115, 50, "#".charCodeAt(0));
+
+// Show the widget (drawing the layers in the orderer they were added)
+widget.show();
+
+let i = 1;
+let bitmap = undefined;
+while (widget.isOpen() && i <= demo_seconds) {
+    // Print statements will only show up once the widget is closed.
+    print("count is at", i++);
+
+    // You can call remove on any added item, it does not impact the other ids.
+    if (bitmap) { widget.remove(bitmap); bitmap = undefined; }
+    // All of the addXXX functions return an id that can be used to remove the item.
+    else { bitmap = widget.addXbm(77, 45, logo); }
+
+    delay(1000);
+}
+
+// If user did not press the back button, close the widget.
+if (widget.isOpen()) {
+    widget.close();
+}
\ No newline at end of file
diff --git a/applications/system/js_app/js_app.c b/applications/system/js_app/js_app.c
index 1c1a2ae3c..24cb54589 100644
--- a/applications/system/js_app/js_app.c
+++ b/applications/system/js_app/js_app.c
@@ -4,6 +4,7 @@
 #include "js_app_i.h"
 #include <toolbox/path.h>
 #include <assets_icons.h>
+#include <cli/cli.h>
 
 #define TAG "JS app"
 
@@ -128,4 +129,86 @@ int32_t js_app(void* arg) {
 
     js_app_free(app);
     return 0;
-} //-V773
\ No newline at end of file
+} //-V773
+
+typedef struct {
+    Cli* cli;
+    FuriSemaphore* exit_sem;
+} JsCliContext;
+
+static void js_cli_print(JsCliContext* ctx, const char* msg) {
+    cli_write(ctx->cli, (uint8_t*)msg, strlen(msg));
+}
+
+static void js_cli_exit(JsCliContext* ctx) {
+    furi_check(furi_semaphore_release(ctx->exit_sem) == FuriStatusOk);
+}
+
+static void js_cli_callback(JsThreadEvent event, const char* msg, void* context) {
+    JsCliContext* ctx = context;
+    switch(event) {
+    case JsThreadEventError:
+        js_cli_print(ctx, "---- ERROR ----\r\n");
+        js_cli_print(ctx, msg);
+        js_cli_print(ctx, "\r\n");
+        break;
+    case JsThreadEventErrorTrace:
+        js_cli_print(ctx, "Trace:\r\n");
+        js_cli_print(ctx, msg);
+        js_cli_print(ctx, "\r\n");
+
+        js_cli_exit(ctx); // Exit when an error occurs
+        break;
+    case JsThreadEventPrint:
+        js_cli_print(ctx, msg);
+        js_cli_print(ctx, "\r\n");
+        break;
+    case JsThreadEventDone:
+        js_cli_print(ctx, "Script done!\r\n");
+
+        js_cli_exit(ctx);
+        break;
+    }
+}
+
+void js_cli_execute(Cli* cli, FuriString* args, void* context) {
+    UNUSED(context);
+
+    const char* path = furi_string_get_cstr(args);
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+
+    do {
+        if(furi_string_size(args) == 0) {
+            printf("Usage:\r\njs <path>\r\n");
+            break;
+        }
+
+        if(!storage_file_exists(storage, path)) {
+            printf("Can not open file %s\r\n", path);
+            break;
+        }
+
+        JsCliContext ctx = {.cli = cli};
+        ctx.exit_sem = furi_semaphore_alloc(1, 0);
+
+        printf("Running script %s, press CTRL+C to stop\r\n", path);
+        JsThread* js_thread = js_thread_run(path, js_cli_callback, &ctx);
+
+        while(furi_semaphore_acquire(ctx.exit_sem, 100) != FuriStatusOk) {
+            if(cli_cmd_interrupt_received(cli)) break;
+        }
+
+        js_thread_stop(js_thread);
+        furi_semaphore_free(ctx.exit_sem);
+    } while(false);
+
+    furi_record_close(RECORD_STORAGE);
+}
+
+void js_app_on_system_start(void) {
+#ifdef SRV_CLI
+    Cli* cli = furi_record_open(RECORD_CLI);
+    cli_add_command(cli, "js", CliCommandFlagDefault, js_cli_execute, NULL);
+    furi_record_close(RECORD_CLI);
+#endif
+}
diff --git a/applications/system/js_app/js_modules.c b/applications/system/js_app/js_modules.c
index 0e2d6bf25..fa5332884 100644
--- a/applications/system/js_app/js_modules.c
+++ b/applications/system/js_app/js_modules.c
@@ -5,6 +5,9 @@
 
 #define TAG "JS modules"
 
+// Absolute path is used to make possible plugin load from CLI
+#define MODULES_PATH "/ext/apps_data/js_app/plugins"
+
 typedef struct {
     JsModeConstructor create;
     JsModeDestructor destroy;
@@ -81,7 +84,7 @@ mjs_val_t js_module_require(JsModules* modules, const char* name, size_t name_le
     // External module load
     if(!module_found) {
         FuriString* module_path = furi_string_alloc();
-        furi_string_printf(module_path, "%s/js_%s.fal", APP_DATA_PATH("plugins"), name);
+        furi_string_printf(module_path, "%s/js_%s.fal", MODULES_PATH, name);
         FURI_LOG_I(TAG, "Loading external module %s", furi_string_get_cstr(module_path));
         do {
             uint32_t plugin_cnt_last = plugin_manager_get_count(modules->plugin_manager);
diff --git a/applications/system/js_app/js_thread.c b/applications/system/js_app/js_thread.c
index 5ca365404..1dd34d57c 100644
--- a/applications/system/js_app/js_thread.c
+++ b/applications/system/js_app/js_thread.c
@@ -1,4 +1,5 @@
 #include <common/cs_dbg.h>
+#include <toolbox/path.h>
 #include <toolbox/stream/file_stream.h>
 #include <loader/firmware_api/firmware_api.h>
 #include <flipper_application/api_hashtable/api_hashtable.h>
@@ -44,12 +45,12 @@ static void js_print(struct mjs* mjs) {
     FuriString* msg_str = furi_string_alloc();
     js_str_print(msg_str, mjs);
 
-    printf("%s\r\n", furi_string_get_cstr(msg_str));
-
     JsThread* worker = mjs_get_context(mjs);
     furi_assert(worker);
     if(worker->app_callback) {
         worker->app_callback(JsThreadEventPrint, furi_string_get_cstr(msg_str), worker->context);
+    } else {
+        FURI_LOG_D(TAG, "%s\r\n", furi_string_get_cstr(msg_str));
     }
 
     furi_string_free(msg_str);
@@ -195,7 +196,7 @@ static void js_require(struct mjs* mjs) {
 }
 
 static void js_global_to_string(struct mjs* mjs) {
-    double num = mjs_get_int(mjs, mjs_arg(mjs, 0));
+    double num = mjs_get_double(mjs, mjs_arg(mjs, 0));
     char tmp_str[] = "-2147483648";
     itoa(num, tmp_str, 10);
     mjs_val_t ret = mjs_mk_string(mjs, tmp_str, ~0, true);
@@ -210,6 +211,88 @@ static void js_global_to_hex_string(struct mjs* mjs) {
     mjs_return(mjs, ret);
 }
 
+static void js_parse_int(struct mjs* mjs) {
+    mjs_val_t arg = mjs_arg(mjs, 0);
+    if(!mjs_is_string(arg)) {
+        mjs_return(mjs, mjs_mk_number(mjs, 0));
+        return;
+    }
+    size_t str_len = 0;
+    const char* str = mjs_get_string(mjs, &arg, &str_len);
+    if((str_len == 0) || (str == NULL)) {
+        mjs_return(mjs, mjs_mk_number(mjs, 0));
+        return;
+    }
+
+    int32_t num = 0;
+    int32_t sign = 1;
+    size_t i = 0;
+
+    if(str[0] == '-') {
+        sign = -1;
+        i = 1;
+    } else if(str[0] == '+') {
+        i = 1;
+    }
+
+    for(; i < str_len; i++) {
+        if(str[i] >= '0' && str[i] <= '9') {
+            num = num * 10 + (str[i] - '0');
+        } else {
+            break;
+        }
+    }
+    num *= sign;
+
+    mjs_return(mjs, mjs_mk_number(mjs, num));
+}
+
+static void js_to_upper_case(struct mjs* mjs) {
+    mjs_val_t arg0 = mjs_arg(mjs, 0);
+
+    size_t str_len;
+    const char* str = NULL;
+    if(mjs_is_string(arg0)) {
+        str = mjs_get_string(mjs, &arg0, &str_len);
+    }
+    if(!str) {
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    char* upperStr = strdup(str);
+    for(size_t i = 0; i < str_len; i++) {
+        upperStr[i] = toupper(upperStr[i]);
+    }
+
+    mjs_val_t resultStr = mjs_mk_string(mjs, upperStr, ~0, true);
+    free(upperStr);
+    mjs_return(mjs, resultStr);
+}
+
+static void js_to_lower_case(struct mjs* mjs) {
+    mjs_val_t arg0 = mjs_arg(mjs, 0);
+
+    size_t str_len;
+    const char* str = NULL;
+    if(mjs_is_string(arg0)) {
+        str = mjs_get_string(mjs, &arg0, &str_len);
+    }
+    if(!str) {
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    char* lowerStr = strdup(str);
+    for(size_t i = 0; i < str_len; i++) {
+        lowerStr[i] = tolower(lowerStr[i]);
+    }
+
+    mjs_val_t resultStr = mjs_mk_string(mjs, lowerStr, ~0, true);
+    free(lowerStr);
+    mjs_return(mjs, resultStr);
+}
+
 #ifdef JS_DEBUG
 static void js_dump_write_callback(void* ctx, const char* format, ...) {
     File* file = ctx;
@@ -237,12 +320,33 @@ static int32_t js_thread(void* arg) {
     struct mjs* mjs = mjs_create(worker);
     worker->modules = js_modules_create(mjs, worker->resolver);
     mjs_val_t global = mjs_get_global(mjs);
+    if(worker->path) {
+        FuriString* dirpath = furi_string_alloc();
+        path_extract_dirname(furi_string_get_cstr(worker->path), dirpath);
+        mjs_set(
+            mjs,
+            global,
+            "__filepath",
+            ~0,
+            mjs_mk_string(
+                mjs, furi_string_get_cstr(worker->path), furi_string_size(worker->path), true));
+        mjs_set(
+            mjs,
+            global,
+            "__dirpath",
+            ~0,
+            mjs_mk_string(mjs, furi_string_get_cstr(dirpath), furi_string_size(dirpath), true));
+        furi_string_free(dirpath);
+    }
     mjs_set(mjs, global, "print", ~0, MJS_MK_FN(js_print));
     mjs_set(mjs, global, "delay", ~0, MJS_MK_FN(js_delay));
     mjs_set(mjs, global, "to_string", ~0, MJS_MK_FN(js_global_to_string));
     mjs_set(mjs, global, "to_hex_string", ~0, MJS_MK_FN(js_global_to_hex_string));
     mjs_set(mjs, global, "ffi_address", ~0, MJS_MK_FN(js_ffi_address));
     mjs_set(mjs, global, "require", ~0, MJS_MK_FN(js_require));
+    mjs_set(mjs, global, "parse_int", ~0, MJS_MK_FN(js_parse_int));
+    mjs_set(mjs, global, "to_upper_case", ~0, MJS_MK_FN(js_to_upper_case));
+    mjs_set(mjs, global, "to_lower_case", ~0, MJS_MK_FN(js_to_lower_case));
 
     mjs_val_t console_obj = mjs_mk_object(mjs);
     mjs_set(mjs, console_obj, "log", ~0, MJS_MK_FN(js_console_log));
diff --git a/applications/system/js_app/modules/js_badusb.c b/applications/system/js_app/modules/js_badusb.c
index 648632f51..d2e30b334 100644
--- a/applications/system/js_app/modules/js_badusb.c
+++ b/applications/system/js_app/modules/js_badusb.c
@@ -2,8 +2,11 @@
 #include "../js_modules.h"
 #include <furi_hal.h>
 
+#define ASCII_TO_KEY(layout, x) (((uint8_t)x < 128) ? (layout[(uint8_t)x]) : HID_KEYBOARD_NONE)
+
 typedef struct {
     FuriHalUsbHidConfig* hid_cfg;
+    uint16_t layout[128];
     FuriHalUsbInterface* usb_if_prev;
     uint8_t key_hold_cnt;
 } JsBadusbInst;
@@ -52,19 +55,48 @@ static const struct {
     {"F10", HID_KEYBOARD_F10},
     {"F11", HID_KEYBOARD_F11},
     {"F12", HID_KEYBOARD_F12},
+    {"F13", HID_KEYBOARD_F13},
+    {"F14", HID_KEYBOARD_F14},
+    {"F15", HID_KEYBOARD_F15},
+    {"F16", HID_KEYBOARD_F16},
+    {"F17", HID_KEYBOARD_F17},
+    {"F18", HID_KEYBOARD_F18},
+    {"F19", HID_KEYBOARD_F19},
+    {"F20", HID_KEYBOARD_F20},
+    {"F21", HID_KEYBOARD_F21},
+    {"F22", HID_KEYBOARD_F22},
+    {"F23", HID_KEYBOARD_F23},
+    {"F24", HID_KEYBOARD_F24},
+
+    {"NUM0", HID_KEYPAD_0},
+    {"NUM1", HID_KEYPAD_1},
+    {"NUM2", HID_KEYPAD_2},
+    {"NUM3", HID_KEYPAD_3},
+    {"NUM4", HID_KEYPAD_4},
+    {"NUM5", HID_KEYPAD_5},
+    {"NUM6", HID_KEYPAD_6},
+    {"NUM7", HID_KEYPAD_7},
+    {"NUM8", HID_KEYPAD_8},
+    {"NUM9", HID_KEYPAD_9},
 };
 
 static void js_badusb_quit_free(JsBadusbInst* badusb) {
     if(badusb->usb_if_prev) {
         furi_hal_hid_kb_release_all();
         furi_check(furi_hal_usb_set_config(badusb->usb_if_prev, NULL));
+        badusb->usb_if_prev = NULL;
     }
     if(badusb->hid_cfg) {
         free(badusb->hid_cfg);
+        badusb->hid_cfg = NULL;
     }
 }
 
-static bool setup_parse_params(struct mjs* mjs, mjs_val_t arg, FuriHalUsbHidConfig* hid_cfg) {
+static bool setup_parse_params(
+    JsBadusbInst* badusb,
+    struct mjs* mjs,
+    mjs_val_t arg,
+    FuriHalUsbHidConfig* hid_cfg) {
     if(!mjs_is_object(arg)) {
         return false;
     }
@@ -72,6 +104,7 @@ static bool setup_parse_params(struct mjs* mjs, mjs_val_t arg, FuriHalUsbHidConf
     mjs_val_t pid_obj = mjs_get(mjs, arg, "pid", ~0);
     mjs_val_t mfr_obj = mjs_get(mjs, arg, "mfr_name", ~0);
     mjs_val_t prod_obj = mjs_get(mjs, arg, "prod_name", ~0);
+    mjs_val_t layout_obj = mjs_get(mjs, arg, "layout_path", ~0);
 
     if(mjs_is_number(vid_obj) && mjs_is_number(pid_obj)) {
         hid_cfg->vid = mjs_get_int32(mjs, vid_obj);
@@ -98,6 +131,25 @@ static bool setup_parse_params(struct mjs* mjs, mjs_val_t arg, FuriHalUsbHidConf
         strlcpy(hid_cfg->product, str_temp, sizeof(hid_cfg->product));
     }
 
+    if(mjs_is_string(layout_obj)) {
+        size_t str_len = 0;
+        const char* str_temp = mjs_get_string(mjs, &layout_obj, &str_len);
+        if((str_len == 0) || (str_temp == NULL)) {
+            return false;
+        }
+        File* file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
+        bool layout_loaded = storage_file_open(file, str_temp, FSAM_READ, FSOM_OPEN_EXISTING) &&
+                             storage_file_read(file, badusb->layout, sizeof(badusb->layout)) ==
+                                 sizeof(badusb->layout);
+        storage_file_free(file);
+        furi_record_close(RECORD_STORAGE);
+        if(!layout_loaded) {
+            return false;
+        }
+    } else {
+        memcpy(badusb->layout, hid_asciimap, MIN(sizeof(hid_asciimap), sizeof(badusb->layout)));
+    }
+
     return true;
 }
 
@@ -120,7 +172,7 @@ static void js_badusb_setup(struct mjs* mjs) {
     } else if(num_args == 1) {
         badusb->hid_cfg = malloc(sizeof(FuriHalUsbHidConfig));
         // Parse argument object
-        args_correct = setup_parse_params(mjs, mjs_arg(mjs, 0), badusb->hid_cfg);
+        args_correct = setup_parse_params(badusb, mjs, mjs_arg(mjs, 0), badusb->hid_cfg);
     }
     if(!args_correct) {
         mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "");
@@ -130,12 +182,8 @@ static void js_badusb_setup(struct mjs* mjs) {
 
     badusb->usb_if_prev = furi_hal_usb_get_config();
 
-    if(!furi_hal_usb_set_config(&usb_hid, badusb->hid_cfg)) {
-        mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "USB is locked, close companion app first");
-        badusb->usb_if_prev = NULL;
-        mjs_return(mjs, MJS_UNDEFINED);
-        return;
-    }
+    furi_hal_usb_unlock();
+    furi_hal_usb_set_config(&usb_hid, badusb->hid_cfg);
 
     mjs_return(mjs, MJS_UNDEFINED);
 }
@@ -171,9 +219,9 @@ static void js_badusb_is_connected(struct mjs* mjs) {
     mjs_return(mjs, mjs_mk_boolean(mjs, is_connected));
 }
 
-uint16_t get_keycode_by_name(const char* key_name, size_t name_len) {
+uint16_t get_keycode_by_name(JsBadusbInst* badusb, const char* key_name, size_t name_len) {
     if(name_len == 1) { // Single char
-        return (HID_ASCII_TO_KEY(key_name[0]));
+        return (ASCII_TO_KEY(badusb->layout, key_name[0]));
     }
 
     for(size_t i = 0; i < COUNT_OF(key_codes); i++) {
@@ -190,7 +238,7 @@ uint16_t get_keycode_by_name(const char* key_name, size_t name_len) {
     return HID_KEYBOARD_NONE;
 }
 
-static bool parse_keycode(struct mjs* mjs, size_t nargs, uint16_t* keycode) {
+static bool parse_keycode(JsBadusbInst* badusb, struct mjs* mjs, size_t nargs, uint16_t* keycode) {
     uint16_t key_tmp = 0;
     for(size_t i = 0; i < nargs; i++) {
         mjs_val_t arg = mjs_arg(mjs, i);
@@ -201,7 +249,7 @@ static bool parse_keycode(struct mjs* mjs, size_t nargs, uint16_t* keycode) {
                 // String error
                 return false;
             }
-            uint16_t str_key = get_keycode_by_name(key_name, name_len);
+            uint16_t str_key = get_keycode_by_name(badusb, key_name, name_len);
             if(str_key == HID_KEYBOARD_NONE) {
                 // Unknown key code
                 return false;
@@ -239,7 +287,7 @@ static void js_badusb_press(struct mjs* mjs) {
     uint16_t keycode = HID_KEYBOARD_NONE;
     size_t num_args = mjs_nargs(mjs);
     if(num_args > 0) {
-        args_correct = parse_keycode(mjs, num_args, &keycode);
+        args_correct = parse_keycode(badusb, mjs, num_args, &keycode);
     }
     if(!args_correct) {
         mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "");
@@ -265,7 +313,7 @@ static void js_badusb_hold(struct mjs* mjs) {
     uint16_t keycode = HID_KEYBOARD_NONE;
     size_t num_args = mjs_nargs(mjs);
     if(num_args > 0) {
-        args_correct = parse_keycode(mjs, num_args, &keycode);
+        args_correct = parse_keycode(badusb, mjs, num_args, &keycode);
     }
     if(!args_correct) {
         mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "");
@@ -304,7 +352,7 @@ static void js_badusb_release(struct mjs* mjs) {
         mjs_return(mjs, MJS_UNDEFINED);
         return;
     } else {
-        args_correct = parse_keycode(mjs, num_args, &keycode);
+        args_correct = parse_keycode(badusb, mjs, num_args, &keycode);
     }
     if(!args_correct) {
         mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "");
@@ -318,7 +366,35 @@ static void js_badusb_release(struct mjs* mjs) {
     mjs_return(mjs, MJS_UNDEFINED);
 }
 
-static void badusb_print(struct mjs* mjs, bool ln) {
+// Make sure NUMLOCK is enabled for altchar
+static void ducky_numlock_on() {
+    if((furi_hal_hid_get_led_state() & HID_KB_LED_NUM) == 0) {
+        furi_hal_hid_kb_press(HID_KEYBOARD_LOCK_NUM_LOCK);
+        furi_hal_hid_kb_release(HID_KEYBOARD_LOCK_NUM_LOCK);
+    }
+}
+
+// Simulate pressing a character using ALT+Numpad ASCII code
+static void ducky_altchar(JsBadusbInst* badusb, const char* ascii_code) {
+    // Hold the ALT key
+    furi_hal_hid_kb_press(KEY_MOD_LEFT_ALT);
+
+    // Press the corresponding numpad key for each digit of the ASCII code
+    for(size_t i = 0; ascii_code[i] != '\0'; i++) {
+        char digitChar[5] = {'N', 'U', 'M', ascii_code[i], '\0'}; // Construct the numpad key name
+        uint16_t numpad_keycode = get_keycode_by_name(badusb, digitChar, strlen(digitChar));
+        if(numpad_keycode == HID_KEYBOARD_NONE) {
+            continue; // Skip if keycode not found
+        }
+        furi_hal_hid_kb_press(numpad_keycode);
+        furi_hal_hid_kb_release(numpad_keycode);
+    }
+
+    // Release the ALT key
+    furi_hal_hid_kb_release(KEY_MOD_LEFT_ALT);
+}
+
+static void badusb_print(struct mjs* mjs, bool ln, bool alt) {
     mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
     JsBadusbInst* badusb = mjs_get_ptr(mjs, obj_inst);
     furi_assert(badusb);
@@ -364,10 +440,20 @@ static void badusb_print(struct mjs* mjs, bool ln) {
         return;
     }
 
+    if(alt) {
+        ducky_numlock_on();
+    }
     for(size_t i = 0; i < text_len; i++) {
-        uint16_t keycode = HID_ASCII_TO_KEY(text_str[i]);
-        furi_hal_hid_kb_press(keycode);
-        furi_hal_hid_kb_release(keycode);
+        if(alt) {
+            // Convert character to ascii numeric value
+            char ascii_str[4];
+            snprintf(ascii_str, sizeof(ascii_str), "%u", (uint8_t)text_str[i]);
+            ducky_altchar(badusb, ascii_str);
+        } else {
+            uint16_t keycode = ASCII_TO_KEY(badusb->layout, text_str[i]);
+            furi_hal_hid_kb_press(keycode);
+            furi_hal_hid_kb_release(keycode);
+        }
         if(delay_val > 0) {
             bool need_exit = js_delay_with_flags(mjs, delay_val);
             if(need_exit) {
@@ -385,11 +471,19 @@ static void badusb_print(struct mjs* mjs, bool ln) {
 }
 
 static void js_badusb_print(struct mjs* mjs) {
-    badusb_print(mjs, false);
+    badusb_print(mjs, false, false);
 }
 
 static void js_badusb_println(struct mjs* mjs) {
-    badusb_print(mjs, true);
+    badusb_print(mjs, true, false);
+}
+
+static void js_badusb_alt_print(struct mjs* mjs) {
+    badusb_print(mjs, false, true);
+}
+
+static void js_badusb_alt_println(struct mjs* mjs) {
+    badusb_print(mjs, true, true);
 }
 
 static void* js_badusb_create(struct mjs* mjs, mjs_val_t* object) {
@@ -404,6 +498,8 @@ static void* js_badusb_create(struct mjs* mjs, mjs_val_t* object) {
     mjs_set(mjs, badusb_obj, "release", ~0, MJS_MK_FN(js_badusb_release));
     mjs_set(mjs, badusb_obj, "print", ~0, MJS_MK_FN(js_badusb_print));
     mjs_set(mjs, badusb_obj, "println", ~0, MJS_MK_FN(js_badusb_println));
+    mjs_set(mjs, badusb_obj, "altPrint", ~0, MJS_MK_FN(js_badusb_alt_print));
+    mjs_set(mjs, badusb_obj, "altPrintln", ~0, MJS_MK_FN(js_badusb_alt_println));
     *object = badusb_obj;
     return badusb;
 }
diff --git a/applications/system/js_app/modules/js_blebeacon.c b/applications/system/js_app/modules/js_blebeacon.c
new file mode 100644
index 000000000..7dc212b6a
--- /dev/null
+++ b/applications/system/js_app/modules/js_blebeacon.c
@@ -0,0 +1,244 @@
+#include "../js_modules.h"
+#include <furi_hal_bt.h>
+#include <extra_beacon.h>
+
+typedef struct {
+    bool saved_prev_cfg;
+    bool prev_cfg_set;
+    GapExtraBeaconConfig prev_cfg;
+
+    bool saved_prev_data;
+    uint8_t prev_data[EXTRA_BEACON_MAX_DATA_SIZE];
+    uint8_t prev_data_len;
+
+    bool saved_prev_active;
+    bool prev_active;
+
+    bool keep_alive;
+} JsBlebeaconInst;
+
+static JsBlebeaconInst* get_this_ctx(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsBlebeaconInst* blebeacon = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(blebeacon);
+    return blebeacon;
+}
+
+static void ret_bad_args(struct mjs* mjs, const char* error) {
+    mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "%s", error);
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void ret_int_err(struct mjs* mjs, const char* error) {
+    mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "%s", error);
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static bool check_arg_count(struct mjs* mjs, size_t count) {
+    size_t num_args = mjs_nargs(mjs);
+    if(num_args != count) {
+        ret_bad_args(mjs, "Wrong argument count");
+        return false;
+    }
+    return true;
+}
+
+static void js_blebeacon_is_active(struct mjs* mjs) {
+    JsBlebeaconInst* blebeacon = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+    UNUSED(blebeacon);
+
+    mjs_return(mjs, mjs_mk_boolean(mjs, furi_hal_bt_extra_beacon_is_active()));
+}
+
+static void js_blebeacon_set_config(struct mjs* mjs) {
+    JsBlebeaconInst* blebeacon = get_this_ctx(mjs);
+    if(mjs_nargs(mjs) < 1 || mjs_nargs(mjs) > 4) {
+        ret_bad_args(mjs, "Wrong argument count");
+        return;
+    }
+
+    char* mac = NULL;
+    size_t mac_len = 0;
+    mjs_val_t mac_arg = mjs_arg(mjs, 0);
+    if(mjs_is_typed_array(mac_arg)) {
+        if(mjs_is_data_view(mac_arg)) {
+            mac_arg = mjs_dataview_get_buf(mjs, mac_arg);
+        }
+        mac = mjs_array_buf_get_ptr(mjs, mac_arg, &mac_len);
+    }
+    if(!mac || mac_len != EXTRA_BEACON_MAC_ADDR_SIZE) {
+        ret_bad_args(mjs, "Wrong MAC address");
+        return;
+    }
+
+    uint8_t power = GapAdvPowerLevel_0dBm;
+    mjs_val_t power_arg = mjs_arg(mjs, 1);
+    if(mjs_is_number(power_arg)) {
+        power = mjs_get_int32(mjs, power_arg);
+    }
+    power = CLAMP(power, GapAdvPowerLevel_6dBm, GapAdvPowerLevel_Neg40dBm);
+
+    uint8_t intv_min = 50;
+    mjs_val_t intv_min_arg = mjs_arg(mjs, 2);
+    if(mjs_is_number(intv_min_arg)) {
+        intv_min = mjs_get_int32(mjs, intv_min_arg);
+    }
+    intv_min = MAX(intv_min, 20);
+
+    uint8_t intv_max = 150;
+    mjs_val_t intv_max_arg = mjs_arg(mjs, 3);
+    if(mjs_is_number(intv_max_arg)) {
+        intv_max = mjs_get_int32(mjs, intv_max_arg);
+    }
+    intv_max = MAX(intv_max, intv_min);
+
+    GapExtraBeaconConfig config = {
+        .min_adv_interval_ms = intv_min,
+        .max_adv_interval_ms = intv_max,
+        .adv_channel_map = GapAdvChannelMapAll,
+        .adv_power_level = power,
+        .address_type = GapAddressTypePublic,
+    };
+    memcpy(config.address, (uint8_t*)mac, sizeof(config.address));
+
+    if(!blebeacon->saved_prev_cfg) {
+        blebeacon->saved_prev_cfg = true;
+        const GapExtraBeaconConfig* prev_cfg_ptr = furi_hal_bt_extra_beacon_get_config();
+        if(prev_cfg_ptr) {
+            blebeacon->prev_cfg_set = true;
+            memcpy(&blebeacon->prev_cfg, prev_cfg_ptr, sizeof(blebeacon->prev_cfg));
+        } else {
+            blebeacon->prev_cfg_set = false;
+        }
+    }
+    if(!furi_hal_bt_extra_beacon_set_config(&config)) {
+        ret_int_err(mjs, "Failed setting beacon config");
+        return;
+    }
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_blebeacon_set_data(struct mjs* mjs) {
+    JsBlebeaconInst* blebeacon = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 1)) return;
+
+    char* data = NULL;
+    size_t data_len = 0;
+    mjs_val_t data_arg = mjs_arg(mjs, 0);
+    if(mjs_is_typed_array(data_arg)) {
+        if(mjs_is_data_view(data_arg)) {
+            data_arg = mjs_dataview_get_buf(mjs, data_arg);
+        }
+        data = mjs_array_buf_get_ptr(mjs, data_arg, &data_len);
+    }
+    if(!data) {
+        ret_bad_args(mjs, "Data must be a Uint8Array");
+        return;
+    }
+
+    if(!blebeacon->saved_prev_data) {
+        blebeacon->saved_prev_data = true;
+        blebeacon->prev_data_len = furi_hal_bt_extra_beacon_get_data(blebeacon->prev_data);
+    }
+    if(!furi_hal_bt_extra_beacon_set_data((uint8_t*)data, data_len)) {
+        ret_int_err(mjs, "Failed setting beacon data");
+        return;
+    }
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_blebeacon_start(struct mjs* mjs) {
+    JsBlebeaconInst* blebeacon = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+
+    if(!blebeacon->saved_prev_active) {
+        blebeacon->saved_prev_active = true;
+        blebeacon->prev_active = furi_hal_bt_extra_beacon_is_active();
+    }
+    if(!furi_hal_bt_extra_beacon_start()) {
+        ret_int_err(mjs, "Failed starting beacon");
+        return;
+    }
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_blebeacon_stop(struct mjs* mjs) {
+    JsBlebeaconInst* blebeacon = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+    UNUSED(blebeacon);
+
+    if(!blebeacon->saved_prev_active) {
+        blebeacon->saved_prev_active = true;
+        blebeacon->prev_active = furi_hal_bt_extra_beacon_is_active();
+    }
+    if(!furi_hal_bt_extra_beacon_stop()) {
+        ret_int_err(mjs, "Failed stopping beacon");
+        return;
+    }
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_blebeacon_keep_alive(struct mjs* mjs) {
+    JsBlebeaconInst* blebeacon = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 1)) return;
+
+    mjs_val_t bool_obj = mjs_arg(mjs, 0);
+    blebeacon->keep_alive = mjs_get_bool(mjs, bool_obj);
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void* js_blebeacon_create(struct mjs* mjs, mjs_val_t* object) {
+    JsBlebeaconInst* blebeacon = malloc(sizeof(JsBlebeaconInst));
+    mjs_val_t blebeacon_obj = mjs_mk_object(mjs);
+    mjs_set(mjs, blebeacon_obj, INST_PROP_NAME, ~0, mjs_mk_foreign(mjs, blebeacon));
+    mjs_set(mjs, blebeacon_obj, "isActive", ~0, MJS_MK_FN(js_blebeacon_is_active));
+    mjs_set(mjs, blebeacon_obj, "setConfig", ~0, MJS_MK_FN(js_blebeacon_set_config));
+    mjs_set(mjs, blebeacon_obj, "setData", ~0, MJS_MK_FN(js_blebeacon_set_data));
+    mjs_set(mjs, blebeacon_obj, "start", ~0, MJS_MK_FN(js_blebeacon_start));
+    mjs_set(mjs, blebeacon_obj, "stop", ~0, MJS_MK_FN(js_blebeacon_stop));
+    mjs_set(mjs, blebeacon_obj, "keepAlive", ~0, MJS_MK_FN(js_blebeacon_keep_alive));
+    *object = blebeacon_obj;
+    return blebeacon;
+}
+
+static void js_blebeacon_destroy(void* inst) {
+    JsBlebeaconInst* blebeacon = inst;
+    if(!blebeacon->keep_alive) {
+        if(furi_hal_bt_extra_beacon_is_active()) {
+            furi_check(furi_hal_bt_extra_beacon_stop());
+        }
+        if(blebeacon->saved_prev_cfg && blebeacon->prev_cfg_set) {
+            furi_check(furi_hal_bt_extra_beacon_set_config(&blebeacon->prev_cfg));
+        }
+        if(blebeacon->saved_prev_data) {
+            furi_check(
+                furi_hal_bt_extra_beacon_set_data(blebeacon->prev_data, blebeacon->prev_data_len));
+        }
+        if(blebeacon->prev_active) {
+            furi_check(furi_hal_bt_extra_beacon_start());
+        }
+    }
+    free(blebeacon);
+}
+
+static const JsModuleDescriptor js_blebeacon_desc = {
+    "blebeacon",
+    js_blebeacon_create,
+    js_blebeacon_destroy,
+};
+
+static const FlipperAppPluginDescriptor plugin_descriptor = {
+    .appid = PLUGIN_APP_ID,
+    .ep_api_version = PLUGIN_API_VERSION,
+    .entry_point = &js_blebeacon_desc,
+};
+
+const FlipperAppPluginDescriptor* js_blebeacon_ep(void) {
+    return &plugin_descriptor;
+}
\ No newline at end of file
diff --git a/applications/system/js_app/modules/js_dialog.c b/applications/system/js_app/modules/js_dialog.c
index 34de6d641..be2b5a95a 100644
--- a/applications/system/js_app/modules/js_dialog.c
+++ b/applications/system/js_app/modules/js_dialog.c
@@ -2,6 +2,18 @@
 #include "../js_modules.h"
 #include <dialogs/dialogs.h>
 
+// File icon
+#include <gui/icon_i.h>
+static const uint8_t _I_file_10px_0[] = {
+    0x00, 0x7f, 0x00, 0xa1, 0x00, 0x2d, 0x01, 0xe1, 0x01, 0x0d, 0x01,
+    0x01, 0x01, 0x7d, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0x01,
+};
+static const uint8_t* const _I_file_10px[] = {_I_file_10px_0};
+
+static const Icon I_file_10px =
+    {.width = 10, .height = 10, .frame_count = 1, .frame_rate = 0, .frames = _I_file_10px};
+// File icon end
+
 static bool js_dialog_msg_parse_params(struct mjs* mjs, const char** hdr, const char** msg) {
     size_t num_args = mjs_nargs(mjs);
     if(num_args != 2) {
@@ -128,10 +140,62 @@ static void js_dialog_custom(struct mjs* mjs) {
     }
 }
 
+static void js_dialog_pick_file(struct mjs* mjs) {
+    if(mjs_nargs(mjs) != 2) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Wrong arguments");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    mjs_val_t base_path_obj = mjs_arg(mjs, 0);
+    if(!mjs_is_string(base_path_obj)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Base path must be a string");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+    size_t base_path_len = 0;
+    const char* base_path = mjs_get_string(mjs, &base_path_obj, &base_path_len);
+    if((base_path_len == 0) || (base_path == NULL)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Bad base path argument");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    mjs_val_t extension_obj = mjs_arg(mjs, 1);
+    if(!mjs_is_string(extension_obj)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Extension must be a string");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+    size_t extension_len = 0;
+    const char* extension = mjs_get_string(mjs, &extension_obj, &extension_len);
+    if((extension_len == 0) || (extension == NULL)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Bad extension argument");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
+    const DialogsFileBrowserOptions browser_options = {
+        .extension = extension,
+        .icon = &I_file_10px,
+        .base_path = base_path,
+    };
+    FuriString* path = furi_string_alloc_set(base_path);
+    if(dialog_file_browser_show(dialogs, path, path, &browser_options)) {
+        mjs_return(mjs, mjs_mk_string(mjs, furi_string_get_cstr(path), ~0, true));
+    } else {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    furi_string_free(path);
+    furi_record_close(RECORD_DIALOGS);
+}
+
 static void* js_dialog_create(struct mjs* mjs, mjs_val_t* object) {
     mjs_val_t dialog_obj = mjs_mk_object(mjs);
     mjs_set(mjs, dialog_obj, "message", ~0, MJS_MK_FN(js_dialog_message));
     mjs_set(mjs, dialog_obj, "custom", ~0, MJS_MK_FN(js_dialog_custom));
+    mjs_set(mjs, dialog_obj, "pickFile", ~0, MJS_MK_FN(js_dialog_pick_file));
     *object = dialog_obj;
 
     return (void*)1;
diff --git a/applications/system/js_app/modules/js_gpio.c b/applications/system/js_app/modules/js_gpio.c
new file mode 100644
index 000000000..8f6158418
--- /dev/null
+++ b/applications/system/js_app/modules/js_gpio.c
@@ -0,0 +1,272 @@
+#include "../js_modules.h"
+#include <furi_hal_gpio.h>
+#include <furi_hal_resources.h>
+#include <expansion/expansion.h>
+
+typedef struct {
+    const GpioPin* pin;
+    const char* name;
+} GpioPinCtx;
+
+static const GpioPinCtx js_gpio_pins[] = {
+    {.pin = &gpio_ext_pa7, .name = "PA7"}, // 2
+    {.pin = &gpio_ext_pa6, .name = "PA6"}, // 3
+    {.pin = &gpio_ext_pa4, .name = "PA4"}, // 4
+    {.pin = &gpio_ext_pb3, .name = "PB3"}, // 5
+    {.pin = &gpio_ext_pb2, .name = "PB2"}, // 6
+    {.pin = &gpio_ext_pc3, .name = "PC3"}, // 7
+    {.pin = &gpio_swclk, .name = "PA14"}, // 10
+    {.pin = &gpio_swdio, .name = "PA13"}, // 12
+    {.pin = &gpio_usart_tx, .name = "PB6"}, // 13
+    {.pin = &gpio_usart_rx, .name = "PB7"}, // 14
+    {.pin = &gpio_ext_pc1, .name = "PC1"}, // 15
+    {.pin = &gpio_ext_pc0, .name = "PC0"}, // 16
+    {.pin = &gpio_ibutton, .name = "PB14"}, // 17
+};
+
+bool js_gpio_get_gpio_pull(const char* pull, GpioPull* value) {
+    if(strcmp(pull, "no") == 0) {
+        *value = GpioPullNo;
+        return true;
+    } else if(strcmp(pull, "up") == 0) {
+        *value = GpioPullUp;
+        return true;
+    } else if(strcmp(pull, "down") == 0) {
+        *value = GpioPullDown;
+        return true;
+    } else {
+        *value = GpioPullNo;
+        return true;
+    }
+    return false;
+}
+
+bool js_gpio_get_gpio_mode(const char* mode, GpioMode* value) {
+    if(strcmp(mode, "input") == 0) {
+        *value = GpioModeInput;
+        return true;
+    } else if(strcmp(mode, "outputPushPull") == 0) {
+        *value = GpioModeOutputPushPull;
+        return true;
+    } else if(strcmp(mode, "outputOpenDrain") == 0) {
+        *value = GpioModeOutputOpenDrain;
+        return true;
+    } else if(strcmp(mode, "altFunctionPushPull") == 0) {
+        *value = GpioModeAltFunctionPushPull;
+        return true;
+    } else if(strcmp(mode, "altFunctionOpenDrain") == 0) {
+        *value = GpioModeAltFunctionOpenDrain;
+        return true;
+    } else if(strcmp(mode, "analog") == 0) {
+        *value = GpioModeAnalog;
+        return true;
+    } else if(strcmp(mode, "interruptRise") == 0) {
+        *value = GpioModeInterruptRise;
+        return true;
+    } else if(strcmp(mode, "interruptFall") == 0) {
+        *value = GpioModeInterruptFall;
+        return true;
+    } else if(strcmp(mode, "interruptRiseFall") == 0) {
+        *value = GpioModeInterruptRiseFall;
+        return true;
+    } else if(strcmp(mode, "eventRise") == 0) {
+        *value = GpioModeEventRise;
+        return true;
+    } else if(strcmp(mode, "eventFall") == 0) {
+        *value = GpioModeEventFall;
+        return true;
+    } else if(strcmp(mode, "eventRiseFall") == 0) {
+        *value = GpioModeEventRiseFall;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+const GpioPin* js_gpio_get_gpio_pin(const char* name) {
+    for(size_t i = 0; i < COUNT_OF(js_gpio_pins); i++) {
+        if(strcmp(js_gpio_pins[i].name, name) == 0) {
+            return js_gpio_pins[i].pin;
+        }
+    }
+    return NULL;
+}
+
+static void js_gpio_init(struct mjs* mjs) {
+    mjs_val_t pin_arg = mjs_arg(mjs, 0);
+    mjs_val_t mode_arg = mjs_arg(mjs, 1);
+    mjs_val_t pull_arg = mjs_arg(mjs, 2);
+
+    if(!mjs_is_string(pin_arg)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a string");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    const char* pin_name = mjs_get_string(mjs, &pin_arg, NULL);
+    if(!pin_name) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Failed to get pin name");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    if(!mjs_is_string(mode_arg)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a string");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    const char* mode_name = mjs_get_string(mjs, &mode_arg, NULL);
+    if(!mode_name) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Failed to get mode name");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    if(!mjs_is_string(pull_arg)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a string");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    const char* pull_name = mjs_get_string(mjs, &pull_arg, NULL);
+    if(!pull_name) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Failed to get pull name");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    const GpioPin* gpio_pin = js_gpio_get_gpio_pin(pin_name);
+    if(gpio_pin == NULL) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Invalid pin name");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    GpioMode gpio_mode;
+    if(!js_gpio_get_gpio_mode(mode_name, &gpio_mode)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Invalid mode name");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    GpioPull gpio_pull;
+    if(!js_gpio_get_gpio_pull(pull_name, &gpio_pull)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Invalid pull name");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    expansion_disable(furi_record_open(RECORD_EXPANSION));
+    furi_record_close(RECORD_EXPANSION);
+
+    furi_hal_gpio_init(gpio_pin, gpio_mode, gpio_pull, GpioSpeedVeryHigh);
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_gpio_write(struct mjs* mjs) {
+    mjs_val_t pin_arg = mjs_arg(mjs, 0);
+    mjs_val_t value_arg = mjs_arg(mjs, 1);
+
+    if(!mjs_is_string(pin_arg)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a string");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    const char* pin_name = mjs_get_string(mjs, &pin_arg, NULL);
+    if(!pin_name) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Failed to get pin name");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    if(!mjs_is_boolean(value_arg)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a boolean");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    bool value = mjs_get_bool(mjs, value_arg);
+
+    const GpioPin* gpio_pin = js_gpio_get_gpio_pin(pin_name);
+
+    if(gpio_pin == NULL) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Invalid pin name");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    furi_hal_gpio_write(gpio_pin, value);
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_gpio_read(struct mjs* mjs) {
+    mjs_val_t pin_arg = mjs_arg(mjs, 0);
+
+    if(!mjs_is_string(pin_arg)) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a string");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    const char* pin_name = mjs_get_string(mjs, &pin_arg, NULL);
+    if(!pin_name) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Failed to get pin name");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    const GpioPin* gpio_pin = js_gpio_get_gpio_pin(pin_name);
+
+    if(gpio_pin == NULL) {
+        mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Invalid pin name");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    bool value = furi_hal_gpio_read(gpio_pin);
+
+    mjs_return(mjs, mjs_mk_boolean(mjs, value));
+}
+
+static void* js_gpio_create(struct mjs* mjs, mjs_val_t* object) {
+    mjs_val_t gpio_obj = mjs_mk_object(mjs);
+    mjs_set(mjs, gpio_obj, "init", ~0, MJS_MK_FN(js_gpio_init));
+    mjs_set(mjs, gpio_obj, "write", ~0, MJS_MK_FN(js_gpio_write));
+    mjs_set(mjs, gpio_obj, "read", ~0, MJS_MK_FN(js_gpio_read));
+    *object = gpio_obj;
+
+    return (void*)1;
+}
+
+static void js_gpio_destroy(void* inst) {
+    UNUSED(inst);
+
+    // loop through all pins and reset them to analog mode
+    for(size_t i = 0; i < COUNT_OF(js_gpio_pins); i++) {
+        furi_hal_gpio_write(js_gpio_pins[i].pin, false);
+        furi_hal_gpio_init(js_gpio_pins[i].pin, GpioModeAnalog, GpioPullNo, GpioSpeedVeryHigh);
+    }
+
+    expansion_enable(furi_record_open(RECORD_EXPANSION));
+    furi_record_close(RECORD_EXPANSION);
+}
+
+static const JsModuleDescriptor js_gpio_desc = {
+    "gpio",
+    js_gpio_create,
+    js_gpio_destroy,
+};
+
+static const FlipperAppPluginDescriptor plugin_descriptor = {
+    .appid = PLUGIN_APP_ID,
+    .ep_api_version = PLUGIN_API_VERSION,
+    .entry_point = &js_gpio_desc,
+};
+
+const FlipperAppPluginDescriptor* js_gpio_ep(void) {
+    return &plugin_descriptor;
+}
\ No newline at end of file
diff --git a/applications/system/js_app/modules/js_keyboard.c b/applications/system/js_app/modules/js_keyboard.c
new file mode 100644
index 000000000..2bfb296e0
--- /dev/null
+++ b/applications/system/js_app/modules/js_keyboard.c
@@ -0,0 +1,209 @@
+#include "../js_modules.h"
+#include <gui/modules/text_input.h>
+#include <gui/modules/byte_input.h>
+#include <gui/view_dispatcher.h>
+
+#define membersof(x) (sizeof(x) / sizeof(x[0]))
+
+typedef struct {
+    TextInput* text_input;
+    ByteInput* byte_input;
+    ViewDispatcher* view_dispatcher;
+    char* header;
+    bool accepted;
+} JsKeyboardInst;
+
+static void ret_bad_args(struct mjs* mjs, const char* error) {
+    mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "%s", error);
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static JsKeyboardInst* get_this_ctx(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsKeyboardInst* keyboard = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(keyboard);
+    return keyboard;
+}
+
+static void keyboard_callback(void* context) {
+    JsKeyboardInst* keyboard = (JsKeyboardInst*)context;
+    keyboard->accepted = true;
+    view_dispatcher_stop(keyboard->view_dispatcher);
+}
+
+static bool keyboard_exit(void* context) {
+    JsKeyboardInst* keyboard = (JsKeyboardInst*)context;
+    keyboard->accepted = false;
+    view_dispatcher_stop(keyboard->view_dispatcher);
+    return true;
+}
+
+static void js_keyboard_set_header(struct mjs* mjs) {
+    JsKeyboardInst* keyboard = get_this_ctx(mjs);
+
+    mjs_val_t header_arg = mjs_arg(mjs, 0);
+    const char* header = mjs_get_string(mjs, &header_arg, NULL);
+    if(!header) {
+        ret_bad_args(mjs, "Header must be a string");
+        return;
+    }
+
+    if(keyboard->header) {
+        free(keyboard->header);
+    }
+    keyboard->header = strdup(header);
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_keyboard_text(struct mjs* mjs) {
+    JsKeyboardInst* keyboard = get_this_ctx(mjs);
+
+    mjs_val_t input_length_arg = mjs_arg(mjs, 0);
+    if(!mjs_is_number(input_length_arg)) {
+        ret_bad_args(mjs, "Input length must be a number");
+        return;
+    }
+    int32_t input_length = mjs_get_int32(mjs, input_length_arg);
+    char* buffer = malloc(input_length);
+
+    mjs_val_t default_text_arg = mjs_arg(mjs, 1);
+    const char* default_text = mjs_get_string(mjs, &default_text_arg, NULL);
+    bool clear_default = false;
+    if(default_text) {
+        strlcpy(buffer, default_text, input_length);
+        mjs_val_t bool_obj = mjs_arg(mjs, 2);
+        clear_default = mjs_get_bool(mjs, bool_obj);
+    }
+
+    if(keyboard->header) {
+        text_input_set_header_text(keyboard->text_input, keyboard->header);
+    }
+    text_input_set_result_callback(
+        keyboard->text_input, keyboard_callback, keyboard, buffer, input_length, clear_default);
+
+    text_input_set_minimum_length(keyboard->text_input, 0);
+
+    Gui* gui = furi_record_open(RECORD_GUI);
+    keyboard->view_dispatcher = view_dispatcher_alloc();
+    view_dispatcher_enable_queue(keyboard->view_dispatcher);
+    view_dispatcher_add_view(
+        keyboard->view_dispatcher, 0, text_input_get_view(keyboard->text_input));
+    view_dispatcher_set_event_callback_context(keyboard->view_dispatcher, keyboard);
+    view_dispatcher_set_navigation_event_callback(keyboard->view_dispatcher, keyboard_exit);
+    view_dispatcher_attach_to_gui(keyboard->view_dispatcher, gui, ViewDispatcherTypeFullscreen);
+    view_dispatcher_switch_to_view(keyboard->view_dispatcher, 0);
+
+    view_dispatcher_run(keyboard->view_dispatcher);
+
+    view_dispatcher_remove_view(keyboard->view_dispatcher, 0);
+    view_dispatcher_free(keyboard->view_dispatcher);
+    keyboard->view_dispatcher = NULL;
+    furi_record_close(RECORD_GUI);
+
+    text_input_reset(keyboard->text_input);
+    if(keyboard->header) {
+        free(keyboard->header);
+        keyboard->header = NULL;
+    }
+    if(keyboard->accepted) {
+        mjs_return(mjs, mjs_mk_string(mjs, buffer, ~0, true));
+    } else {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    free(buffer);
+}
+
+static void js_keyboard_byte(struct mjs* mjs) {
+    JsKeyboardInst* keyboard = get_this_ctx(mjs);
+
+    mjs_val_t input_length_arg = mjs_arg(mjs, 0);
+    if(!mjs_is_number(input_length_arg)) {
+        ret_bad_args(mjs, "Input length must be a number");
+        return;
+    }
+    int32_t input_length = mjs_get_int32(mjs, input_length_arg);
+    uint8_t* buffer = malloc(input_length);
+
+    mjs_val_t default_data_arg = mjs_arg(mjs, 1);
+    if(mjs_is_typed_array(default_data_arg)) {
+        if(mjs_is_data_view(default_data_arg)) {
+            default_data_arg = mjs_dataview_get_buf(mjs, default_data_arg);
+        }
+        size_t default_data_len = 0;
+        char* default_data = mjs_array_buf_get_ptr(mjs, default_data_arg, &default_data_len);
+        memcpy(buffer, (uint8_t*)default_data, MIN((size_t)input_length, default_data_len));
+    }
+
+    if(keyboard->header) {
+        byte_input_set_header_text(keyboard->byte_input, keyboard->header);
+    }
+    byte_input_set_result_callback(
+        keyboard->byte_input, keyboard_callback, NULL, keyboard, buffer, input_length);
+
+    Gui* gui = furi_record_open(RECORD_GUI);
+    keyboard->view_dispatcher = view_dispatcher_alloc();
+    view_dispatcher_enable_queue(keyboard->view_dispatcher);
+    view_dispatcher_add_view(
+        keyboard->view_dispatcher, 0, byte_input_get_view(keyboard->byte_input));
+    view_dispatcher_set_event_callback_context(keyboard->view_dispatcher, keyboard);
+    view_dispatcher_set_navigation_event_callback(keyboard->view_dispatcher, keyboard_exit);
+    view_dispatcher_attach_to_gui(keyboard->view_dispatcher, gui, ViewDispatcherTypeFullscreen);
+    view_dispatcher_switch_to_view(keyboard->view_dispatcher, 0);
+
+    view_dispatcher_run(keyboard->view_dispatcher);
+
+    view_dispatcher_remove_view(keyboard->view_dispatcher, 0);
+    view_dispatcher_free(keyboard->view_dispatcher);
+    keyboard->view_dispatcher = NULL;
+    furi_record_close(RECORD_GUI);
+
+    if(keyboard->header) {
+        free(keyboard->header);
+        keyboard->header = NULL;
+    }
+    byte_input_set_result_callback(keyboard->byte_input, NULL, NULL, NULL, NULL, 0);
+    byte_input_set_header_text(keyboard->byte_input, "");
+    if(keyboard->accepted) {
+        mjs_return(mjs, mjs_mk_array_buf(mjs, (char*)buffer, input_length));
+    } else {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    free(buffer);
+}
+
+static void* js_keyboard_create(struct mjs* mjs, mjs_val_t* object) {
+    JsKeyboardInst* keyboard = malloc(sizeof(JsKeyboardInst));
+    mjs_val_t keyboard_obj = mjs_mk_object(mjs);
+    mjs_set(mjs, keyboard_obj, INST_PROP_NAME, ~0, mjs_mk_foreign(mjs, keyboard));
+    mjs_set(mjs, keyboard_obj, "setHeader", ~0, MJS_MK_FN(js_keyboard_set_header));
+    mjs_set(mjs, keyboard_obj, "text", ~0, MJS_MK_FN(js_keyboard_text));
+    mjs_set(mjs, keyboard_obj, "byte", ~0, MJS_MK_FN(js_keyboard_byte));
+    keyboard->byte_input = byte_input_alloc();
+    keyboard->text_input = text_input_alloc();
+    *object = keyboard_obj;
+    return keyboard;
+}
+
+static void js_keyboard_destroy(void* inst) {
+    JsKeyboardInst* keyboard = inst;
+    byte_input_free(keyboard->byte_input);
+    text_input_free(keyboard->text_input);
+    free(keyboard);
+}
+
+static const JsModuleDescriptor js_keyboard_desc = {
+    "keyboard",
+    js_keyboard_create,
+    js_keyboard_destroy,
+};
+
+static const FlipperAppPluginDescriptor plugin_descriptor = {
+    .appid = PLUGIN_APP_ID,
+    .ep_api_version = PLUGIN_API_VERSION,
+    .entry_point = &js_keyboard_desc,
+};
+
+const FlipperAppPluginDescriptor* js_keyboard_ep(void) {
+    return &plugin_descriptor;
+}
\ No newline at end of file
diff --git a/applications/system/js_app/modules/js_math.c b/applications/system/js_app/modules/js_math.c
new file mode 100644
index 000000000..e7daae41b
--- /dev/null
+++ b/applications/system/js_app/modules/js_math.c
@@ -0,0 +1,309 @@
+#include "../js_modules.h"
+#include "furi_hal_random.h"
+
+#define JS_MATH_PI (double)3.14159265358979323846
+#define JS_MATH_E (double)2.7182818284590452354
+
+static void ret_bad_args(struct mjs* mjs, const char* error) {
+    mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "%s", error);
+    mjs_return(mjs, mjs_mk_undefined());
+}
+
+static bool check_arg_count(struct mjs* mjs, size_t count) {
+    size_t num_args = mjs_nargs(mjs);
+    if(num_args != count) {
+        ret_bad_args(mjs, "Wrong argument count");
+        return false;
+    }
+    return true;
+}
+
+void js_math_abs(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    mjs_return(mjs, x < 0 ? mjs_mk_number(mjs, -x) : mjs_arg(mjs, 0));
+}
+
+void js_math_acos(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    if(x < -1 || x > 1) {
+        ret_bad_args(mjs, "Invalid input value for Math.acos");
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    mjs_return(mjs, mjs_mk_number(mjs, JS_MATH_PI / (double)2 - atan(x / sqrt(1 - x * x))));
+}
+
+void js_math_acosh(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    if(x < 1) {
+        ret_bad_args(mjs, "Invalid input value for Math.acosh");
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    mjs_return(mjs, mjs_mk_number(mjs, log(x + sqrt(x * x - 1))));
+}
+
+void js_math_asin(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    mjs_return(mjs, mjs_mk_number(mjs, atan(x / sqrt(1 - x * x))));
+}
+
+void js_math_asinh(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    mjs_return(mjs, mjs_mk_number(mjs, log(x + sqrt(x * x + 1))));
+}
+
+void js_math_atan(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    mjs_return(mjs, mjs_mk_number(mjs, atan(x)));
+}
+
+void js_math_atan2(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 2) || !mjs_is_number(mjs_arg(mjs, 0)) ||
+       !mjs_is_number(mjs_arg(mjs, 1))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double y = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 1));
+    mjs_return(mjs, mjs_mk_number(mjs, atan2(y, x)));
+}
+
+void js_math_atanh(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    if(x <= -1 || x >= 1) {
+        ret_bad_args(mjs, "Invalid input value for Math.atanh");
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    mjs_return(mjs, mjs_mk_number(mjs, (double)0.5 * log((1 + x) / (1 - x))));
+}
+
+void js_math_cbrt(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    mjs_return(mjs, mjs_mk_number(mjs, pow(x, 1.0 / 3.0)));
+}
+
+void js_math_ceil(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    mjs_return(mjs, mjs_mk_number(mjs, (int)(x + (double)0.5)));
+}
+
+void js_math_clz32(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    unsigned int x = (unsigned int)mjs_get_int(mjs, mjs_arg(mjs, 0));
+    int count = 0;
+    while(x) {
+        x >>= 1;
+        count++;
+    }
+    mjs_return(mjs, mjs_mk_number(mjs, 32 - count));
+}
+
+void js_math_cos(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    mjs_return(mjs, mjs_mk_number(mjs, cos(x)));
+}
+
+void js_math_exp(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    double result = 1;
+    double term = 1;
+    for(int i = 1; i < 100; i++) {
+        term *= x / i;
+        result += term;
+    }
+    mjs_return(mjs, mjs_mk_number(mjs, result));
+}
+
+void js_math_floor(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    mjs_return(mjs, mjs_mk_number(mjs, (int)x));
+}
+
+void js_math_log(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    if(x <= 0) {
+        ret_bad_args(mjs, "Invalid input value for Math.log");
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double result = 0;
+    while(x >= JS_MATH_E) {
+        x /= JS_MATH_E;
+        result++;
+    }
+    mjs_return(mjs, mjs_mk_number(mjs, result + log(x)));
+}
+
+void js_math_max(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 2) || !mjs_is_number(mjs_arg(mjs, 0)) ||
+       !mjs_is_number(mjs_arg(mjs, 1))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    double y = mjs_get_double(mjs, mjs_arg(mjs, 1));
+    mjs_return(mjs, mjs_mk_number(mjs, x > y ? x : y));
+}
+
+void js_math_min(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 2) || !mjs_is_number(mjs_arg(mjs, 0)) ||
+       !mjs_is_number(mjs_arg(mjs, 1))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    double y = mjs_get_double(mjs, mjs_arg(mjs, 1));
+    mjs_return(mjs, mjs_mk_number(mjs, x < y ? x : y));
+}
+
+void js_math_pow(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 2) || !mjs_is_number(mjs_arg(mjs, 0)) ||
+       !mjs_is_number(mjs_arg(mjs, 1))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double base = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    double exponent = mjs_get_double(mjs, mjs_arg(mjs, 1));
+    double result = 1;
+    for(int i = 0; i < exponent; i++) {
+        result *= base;
+    }
+    mjs_return(mjs, mjs_mk_number(mjs, result));
+}
+
+void js_math_random(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 0)) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    const uint32_t random_val = furi_hal_random_get();
+    double rnd = (double)random_val / FURI_HAL_RANDOM_MAX;
+    mjs_return(mjs, mjs_mk_number(mjs, rnd));
+}
+
+void js_math_sign(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    mjs_return(mjs, mjs_mk_number(mjs, x == 0 ? 0 : (x < 0 ? -1 : 1)));
+}
+
+void js_math_sin(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    double result = x;
+    double term = x;
+    for(int i = 1; i < 10; i++) {
+        term *= -x * x / ((2 * i) * (2 * i + 1));
+        result += term;
+    }
+    mjs_return(mjs, mjs_mk_number(mjs, result));
+}
+
+void js_math_sqrt(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    if(x < 0) {
+        ret_bad_args(mjs, "Invalid input value for Math.sqrt");
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double result = 1;
+    while(result * result < x) {
+        result += (double)0.001;
+    }
+    mjs_return(mjs, mjs_mk_number(mjs, result));
+}
+
+void js_math_trunc(struct mjs* mjs) {
+    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+    double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    mjs_return(mjs, mjs_mk_number(mjs, x < 0 ? ceil(x) : floor(x)));
+}
+
+static void* js_math_create(struct mjs* mjs, mjs_val_t* object) {
+    mjs_val_t math_obj = mjs_mk_object(mjs);
+    mjs_set(mjs, math_obj, "abs", ~0, MJS_MK_FN(js_math_abs));
+    mjs_set(mjs, math_obj, "acos", ~0, MJS_MK_FN(js_math_acos));
+    mjs_set(mjs, math_obj, "acosh", ~0, MJS_MK_FN(js_math_acosh));
+    mjs_set(mjs, math_obj, "asin", ~0, MJS_MK_FN(js_math_asin));
+    mjs_set(mjs, math_obj, "asinh", ~0, MJS_MK_FN(js_math_asinh));
+    mjs_set(mjs, math_obj, "atan", ~0, MJS_MK_FN(js_math_atan));
+    mjs_set(mjs, math_obj, "atan2", ~0, MJS_MK_FN(js_math_atan2));
+    mjs_set(mjs, math_obj, "atanh", ~0, MJS_MK_FN(js_math_atanh));
+    mjs_set(mjs, math_obj, "cbrt", ~0, MJS_MK_FN(js_math_cbrt));
+    mjs_set(mjs, math_obj, "ceil", ~0, MJS_MK_FN(js_math_ceil));
+    mjs_set(mjs, math_obj, "clz32", ~0, MJS_MK_FN(js_math_clz32));
+    mjs_set(mjs, math_obj, "cos", ~0, MJS_MK_FN(js_math_cos));
+    mjs_set(mjs, math_obj, "exp", ~0, MJS_MK_FN(js_math_exp));
+    mjs_set(mjs, math_obj, "floor", ~0, MJS_MK_FN(js_math_floor));
+    mjs_set(mjs, math_obj, "log", ~0, MJS_MK_FN(js_math_log));
+    mjs_set(mjs, math_obj, "max", ~0, MJS_MK_FN(js_math_max));
+    mjs_set(mjs, math_obj, "min", ~0, MJS_MK_FN(js_math_min));
+    mjs_set(mjs, math_obj, "pow", ~0, MJS_MK_FN(js_math_pow));
+    mjs_set(mjs, math_obj, "random", ~0, MJS_MK_FN(js_math_random));
+    mjs_set(mjs, math_obj, "sign", ~0, MJS_MK_FN(js_math_sign));
+    mjs_set(mjs, math_obj, "sin", ~0, MJS_MK_FN(js_math_sin));
+    mjs_set(mjs, math_obj, "sqrt", ~0, MJS_MK_FN(js_math_sqrt));
+    mjs_set(mjs, math_obj, "trunc", ~0, MJS_MK_FN(js_math_trunc));
+    mjs_set(mjs, math_obj, "PI", ~0, mjs_mk_number(mjs, JS_MATH_PI));
+    mjs_set(mjs, math_obj, "E", ~0, mjs_mk_number(mjs, JS_MATH_E));
+    *object = math_obj;
+    return (void*)1;
+}
+
+static const JsModuleDescriptor js_math_desc = {
+    "math",
+    js_math_create,
+    NULL,
+};
+
+static const FlipperAppPluginDescriptor plugin_descriptor = {
+    .appid = PLUGIN_APP_ID,
+    .ep_api_version = PLUGIN_API_VERSION,
+    .entry_point = &js_math_desc,
+};
+
+const FlipperAppPluginDescriptor* js_math_ep(void) {
+    return &plugin_descriptor;
+}
\ No newline at end of file
diff --git a/applications/system/js_app/modules/js_serial.c b/applications/system/js_app/modules/js_serial.c
index 4f1b14f98..a7d139895 100644
--- a/applications/system/js_app/modules/js_serial.c
+++ b/applications/system/js_app/modules/js_serial.c
@@ -1,4 +1,5 @@
 #include <core/common_defines.h>
+#include <expansion/expansion.h>
 #include <furi_hal.h>
 #include "../js_modules.h"
 #include <m-array.h>
@@ -88,16 +89,51 @@ static void js_serial_setup(struct mjs* mjs) {
         return;
     }
 
-    serial->rx_stream = furi_stream_buffer_alloc(RX_BUF_LEN, 1);
+    expansion_disable(furi_record_open(RECORD_EXPANSION));
+    furi_record_close(RECORD_EXPANSION);
+
     serial->serial_handle = furi_hal_serial_control_acquire(serial_id);
     if(serial->serial_handle) {
+        serial->rx_stream = furi_stream_buffer_alloc(RX_BUF_LEN, 1);
         furi_hal_serial_init(serial->serial_handle, baudrate);
         furi_hal_serial_async_rx_start(
             serial->serial_handle, js_serial_on_async_rx, serial, false);
         serial->setup_done = true;
+    } else {
+        expansion_enable(furi_record_open(RECORD_EXPANSION));
+        furi_record_close(RECORD_EXPANSION);
     }
 }
 
+static void js_serial_deinit(JsSerialInst* js_serial) {
+    if(js_serial->setup_done) {
+        furi_hal_serial_async_rx_stop(js_serial->serial_handle);
+        furi_hal_serial_deinit(js_serial->serial_handle);
+        furi_hal_serial_control_release(js_serial->serial_handle);
+        js_serial->serial_handle = NULL;
+        furi_stream_buffer_free(js_serial->rx_stream);
+
+        expansion_enable(furi_record_open(RECORD_EXPANSION));
+        furi_record_close(RECORD_EXPANSION);
+
+        js_serial->setup_done = false;
+    }
+}
+
+static void js_serial_end(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSerialInst* serial = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(serial);
+
+    if(!serial->setup_done) {
+        mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    js_serial_deinit(serial);
+}
+
 static void js_serial_write(struct mjs* mjs) {
     mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
     JsSerialInst* serial = mjs_get_ptr(mjs, obj_inst);
@@ -345,6 +381,55 @@ static void js_serial_read_bytes(struct mjs* mjs) {
     free(read_buf);
 }
 
+static char* js_serial_receive_any(JsSerialInst* serial, size_t* len, uint32_t timeout) {
+    uint32_t flags = ThreadEventCustomDataRx;
+    if(furi_stream_buffer_is_empty(serial->rx_stream)) {
+        flags = js_flags_wait(serial->mjs, ThreadEventCustomDataRx, timeout);
+    }
+    if(flags & ThreadEventCustomDataRx) { // New data received
+        *len = furi_stream_buffer_bytes_available(serial->rx_stream);
+        if(!*len) return NULL;
+        char* buf = malloc(*len);
+        furi_stream_buffer_receive(serial->rx_stream, buf, *len, 0);
+        return buf;
+    }
+    return NULL;
+}
+
+static void js_serial_read_any(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSerialInst* serial = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(serial);
+    if(!serial->setup_done) {
+        mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    uint32_t timeout = FuriWaitForever;
+
+    do {
+        size_t num_args = mjs_nargs(mjs);
+        if(num_args == 1) {
+            mjs_val_t timeout_arg = mjs_arg(mjs, 0);
+            if(!mjs_is_number(timeout_arg)) {
+                break;
+            }
+            timeout = mjs_get_int32(mjs, timeout_arg);
+        }
+    } while(0);
+
+    size_t bytes_read = 0;
+    char* read_buf = js_serial_receive_any(serial, &bytes_read, timeout);
+
+    mjs_val_t return_obj = MJS_UNDEFINED;
+    if(bytes_read > 0 && read_buf) {
+        return_obj = mjs_mk_string(mjs, read_buf, bytes_read, true);
+    }
+    mjs_return(mjs, return_obj);
+    free(read_buf);
+}
+
 static bool
     js_serial_expect_parse_string(struct mjs* mjs, mjs_val_t arg, PatternArray_t patterns) {
     size_t str_len = 0;
@@ -578,10 +663,12 @@ static void* js_serial_create(struct mjs* mjs, mjs_val_t* object) {
     mjs_val_t serial_obj = mjs_mk_object(mjs);
     mjs_set(mjs, serial_obj, INST_PROP_NAME, ~0, mjs_mk_foreign(mjs, js_serial));
     mjs_set(mjs, serial_obj, "setup", ~0, MJS_MK_FN(js_serial_setup));
+    mjs_set(mjs, serial_obj, "end", ~0, MJS_MK_FN(js_serial_end));
     mjs_set(mjs, serial_obj, "write", ~0, MJS_MK_FN(js_serial_write));
     mjs_set(mjs, serial_obj, "read", ~0, MJS_MK_FN(js_serial_read));
     mjs_set(mjs, serial_obj, "readln", ~0, MJS_MK_FN(js_serial_readln));
     mjs_set(mjs, serial_obj, "readBytes", ~0, MJS_MK_FN(js_serial_read_bytes));
+    mjs_set(mjs, serial_obj, "readAny", ~0, MJS_MK_FN(js_serial_read_any));
     mjs_set(mjs, serial_obj, "expect", ~0, MJS_MK_FN(js_serial_expect));
     *object = serial_obj;
 
@@ -590,14 +677,7 @@ static void* js_serial_create(struct mjs* mjs, mjs_val_t* object) {
 
 static void js_serial_destroy(void* inst) {
     JsSerialInst* js_serial = inst;
-    if(js_serial->setup_done) {
-        furi_hal_serial_async_rx_stop(js_serial->serial_handle);
-        furi_hal_serial_deinit(js_serial->serial_handle);
-        furi_hal_serial_control_release(js_serial->serial_handle);
-        js_serial->serial_handle = NULL;
-    }
-
-    furi_stream_buffer_free(js_serial->rx_stream);
+    js_serial_deinit(js_serial);
     free(js_serial);
 }
 
diff --git a/applications/system/js_app/modules/js_subghz/js_subghz.c b/applications/system/js_app/modules/js_subghz/js_subghz.c
new file mode 100644
index 000000000..f170aa04b
--- /dev/null
+++ b/applications/system/js_app/modules/js_subghz/js_subghz.c
@@ -0,0 +1,385 @@
+#include "../../js_modules.h"
+#include "radio_device_loader.h"
+
+#include <lib/subghz/transmitter.h>
+#include <lib/subghz/devices/devices.h>
+#include <lib/subghz/protocols/protocol_items.h>
+
+#include <flipper_format/flipper_format_i.h>
+
+#define tag "js_subghz"
+
+typedef enum {
+    JsSubghzRadioStateRX,
+    JsSubghzRadioStateTX,
+    JsSubghzRadioStateIDLE,
+} JsSubghzRadioState;
+
+typedef struct {
+    const SubGhzDevice* radio_device;
+    int frequency;
+    bool is_external;
+    JsSubghzRadioState state;
+} JsSubghzInst;
+
+// from subghz cli
+static FuriHalSubGhzPreset js_subghz_get_preset_name(const char* preset_name) {
+    FuriHalSubGhzPreset preset = FuriHalSubGhzPresetIDLE;
+    if(!strcmp(preset_name, "FuriHalSubGhzPresetOok270Async")) {
+        preset = FuriHalSubGhzPresetOok270Async;
+    } else if(!strcmp(preset_name, "FuriHalSubGhzPresetOok650Async")) {
+        preset = FuriHalSubGhzPresetOok650Async;
+    } else if(!strcmp(preset_name, "FuriHalSubGhzPreset2FSKDev238Async")) {
+        preset = FuriHalSubGhzPreset2FSKDev238Async;
+    } else if(!strcmp(preset_name, "FuriHalSubGhzPreset2FSKDev476Async")) {
+        preset = FuriHalSubGhzPreset2FSKDev476Async;
+    } else if(!strcmp(preset_name, "FuriHalSubGhzPresetCustom")) {
+        preset = FuriHalSubGhzPresetCustom;
+    } else {
+        FURI_LOG_I(tag, "unknown preset");
+    }
+    return preset;
+}
+
+static void js_subghz_set_rx(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(js_subghz);
+
+    if(js_subghz->state == JsSubghzRadioStateRX) {
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    subghz_devices_set_rx(js_subghz->radio_device);
+    js_subghz->state = JsSubghzRadioStateRX;
+}
+
+static void js_subgjz_set_idle(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(js_subghz);
+
+    if(js_subghz->state == JsSubghzRadioStateIDLE) {
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    subghz_devices_idle(js_subghz->radio_device);
+    js_subghz->state = JsSubghzRadioStateIDLE;
+}
+
+static void js_subghz_get_rssi(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(js_subghz);
+
+    if(js_subghz->state != JsSubghzRadioStateRX) {
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    float rssi = subghz_devices_get_rssi(js_subghz->radio_device);
+    mjs_return(mjs, mjs_mk_number(mjs, (double)rssi));
+}
+
+static void js_subghz_get_state(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(js_subghz);
+
+    const char* state;
+    switch(js_subghz->state) {
+    case JsSubghzRadioStateRX:
+        state = "RX";
+        break;
+    case JsSubghzRadioStateTX:
+        state = "TX";
+        break;
+    case JsSubghzRadioStateIDLE:
+        state = "IDLE";
+        break;
+    default:
+        state = "";
+        break;
+    }
+
+    mjs_return(mjs, mjs_mk_string(mjs, state, ~0, true));
+}
+
+static void js_subghz_is_external(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(js_subghz);
+
+    mjs_return(mjs, mjs_mk_boolean(mjs, js_subghz->is_external));
+}
+
+static void js_subghz_set_frequency(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(js_subghz);
+
+    if(js_subghz->state != JsSubghzRadioStateIDLE) {
+        mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Radio is not in IDLE state");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    mjs_val_t frequency_arg = mjs_arg(mjs, 0);
+    if(!mjs_is_number(frequency_arg)) {
+        mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Frequency must be a number");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+    int32_t frequency = mjs_get_int32(mjs, frequency_arg);
+
+    if(!subghz_devices_is_frequency_valid(js_subghz->radio_device, frequency)) {
+        mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Invalid frequency");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    js_subghz->frequency = subghz_devices_set_frequency(js_subghz->radio_device, frequency);
+
+    mjs_return(mjs, mjs_mk_number(mjs, (double)js_subghz->frequency));
+}
+
+static void js_subghz_get_frequency(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(js_subghz);
+
+    mjs_return(mjs, mjs_mk_number(mjs, (double)js_subghz->frequency));
+}
+
+static void js_subghz_transmit_file(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(js_subghz);
+
+    mjs_val_t file = mjs_arg(mjs, 0);
+
+    if(!mjs_is_string(file)) {
+        mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "File must be a string");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    const char* file_path = mjs_get_string(mjs, &file, NULL);
+    if(!file_path) {
+        mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Failed to get file path");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    FlipperFormat* fff_file = flipper_format_file_alloc(storage);
+    FlipperFormat* fff_data_raw = flipper_format_string_alloc();
+
+    if(!flipper_format_file_open_existing(fff_file, file_path)) {
+        flipper_format_free(fff_file);
+        furi_record_close(RECORD_STORAGE);
+        mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Failed to open file");
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    SubGhzEnvironment* environment = subghz_environment_alloc();
+    if(!subghz_environment_load_keystore(environment, SUBGHZ_KEYSTORE_DIR_NAME)) {
+        FURI_LOG_I(tag, "Load_keystore keeloq_mfcodes \033[0;31mERROR\033[0m\r\n");
+    }
+    if(!subghz_environment_load_keystore(environment, SUBGHZ_KEYSTORE_DIR_USER_NAME)) {
+        FURI_LOG_I(tag, "Load_keystore keeloq_mfcodes_user \033[0;33mAbsent\033[0m\r\n");
+    }
+    subghz_environment_set_alutech_at_4n_rainbow_table_file_name(
+        environment, SUBGHZ_ALUTECH_AT_4N_DIR_NAME);
+    subghz_environment_set_nice_flor_s_rainbow_table_file_name(
+        environment, SUBGHZ_NICE_FLOR_S_DIR_NAME);
+    subghz_environment_set_protocol_registry(environment, (void*)&subghz_protocol_registry);
+
+    FuriString* temp_str = furi_string_alloc();
+    SubGhzTransmitter* transmitter = NULL;
+    bool is_init_protocol = true;
+    bool is_sent = false;
+    uint32_t frequency = 0;
+    uint32_t repeat = 10;
+
+    do {
+        //Load frequency
+        if(!flipper_format_read_uint32(fff_file, "Frequency", &frequency, 1)) {
+            mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Failed to read frequency from file");
+            mjs_return(mjs, MJS_UNDEFINED);
+            break;
+        }
+
+        if(!subghz_devices_is_frequency_valid(js_subghz->radio_device, frequency)) {
+            mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Invalid frequency");
+            mjs_return(mjs, MJS_UNDEFINED);
+            break;
+        }
+
+        if(!flipper_format_read_string(fff_file, "Preset", temp_str)) {
+            mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Failed to read preset from file");
+            mjs_return(mjs, MJS_UNDEFINED);
+            break;
+        }
+
+        subghz_devices_reset(js_subghz->radio_device);
+
+        if(!strcmp(furi_string_get_cstr(temp_str), "FuriHalSubGhzPresetCustom")) {
+            mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Custom presets are not supported (yet)");
+            mjs_return(mjs, MJS_UNDEFINED);
+            break;
+        } else {
+            subghz_devices_load_preset(
+                js_subghz->radio_device,
+                js_subghz_get_preset_name(furi_string_get_cstr(temp_str)),
+                NULL);
+        }
+
+        js_subghz->frequency = subghz_devices_set_frequency(js_subghz->radio_device, frequency);
+
+        if(!flipper_format_read_string(fff_file, "Protocol", temp_str)) {
+            mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Failed to read protocol from file");
+            mjs_return(mjs, MJS_UNDEFINED);
+            break;
+        }
+
+        SubGhzProtocolStatus status;
+        bool is_raw = false;
+
+        if(!strcmp(furi_string_get_cstr(temp_str), "RAW")) {
+            subghz_protocol_raw_gen_fff_data(
+                fff_data_raw, file_path, subghz_devices_get_name(js_subghz->radio_device));
+            is_raw = true;
+        }
+
+        transmitter = subghz_transmitter_alloc_init(environment, furi_string_get_cstr(temp_str));
+        if(transmitter == NULL) {
+            is_init_protocol = false;
+        }
+
+        if(is_init_protocol) {
+            status = subghz_transmitter_deserialize(transmitter, is_raw ? fff_data_raw : fff_file);
+            if(status != SubGhzProtocolStatusOk) {
+                FURI_LOG_I(tag, "failed to deserialize transmitter");
+                is_init_protocol = false;
+            }
+        } else {
+            FURI_LOG_I(tag, "failed to allocate transmitter");
+            subghz_devices_idle(js_subghz->radio_device);
+            js_subghz->state = JsSubghzRadioStateIDLE;
+        }
+    } while(false);
+
+    if(is_init_protocol) {
+        if(!js_subghz->is_external) {
+            furi_hal_power_suppress_charge_enter();
+        }
+
+        FURI_LOG_I(tag, "transmitting file %s", file_path);
+
+        do {
+            furi_delay_ms(200);
+            if(subghz_devices_start_async_tx(
+                   js_subghz->radio_device, subghz_transmitter_yield, transmitter)) {
+                while(!subghz_devices_is_async_complete_tx(js_subghz->radio_device)) {
+                    furi_delay_ms(333);
+                }
+                subghz_devices_stop_async_tx(js_subghz->radio_device);
+                is_sent = true;
+            } else {
+                FURI_LOG_E(tag, "failed to start async tx");
+            }
+
+        } while(repeat && !strcmp(furi_string_get_cstr(temp_str), "RAW"));
+
+        subghz_devices_idle(js_subghz->radio_device);
+        js_subghz->state = JsSubghzRadioStateIDLE;
+
+        if(!js_subghz->is_external) {
+            furi_hal_power_suppress_charge_exit();
+        }
+    }
+
+    furi_string_free(temp_str);
+    flipper_format_free(fff_file);
+    flipper_format_free(fff_data_raw);
+    furi_record_close(RECORD_STORAGE);
+
+    subghz_environment_reset_keeloq(environment);
+    subghz_environment_free(environment);
+    subghz_transmitter_free(transmitter);
+
+    mjs_return(mjs, mjs_mk_boolean(mjs, is_sent));
+}
+
+static void js_subghz_setup(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(js_subghz);
+
+    js_subghz->radio_device =
+        radio_device_loader_set(js_subghz->radio_device, SubGhzRadioDeviceTypeExternalCC1101);
+
+    if(!subghz_devices_is_connect(js_subghz->radio_device)) {
+        js_subghz->is_external = true;
+    } else {
+        js_subghz->is_external = false;
+    }
+
+    js_subghz->state = JsSubghzRadioStateIDLE;
+    js_subghz->frequency = 433920000;
+
+    subghz_devices_reset(js_subghz->radio_device);
+    subghz_devices_idle(js_subghz->radio_device);
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void* js_subghz_create(struct mjs* mjs, mjs_val_t* object) {
+    JsSubghzInst* js_subghz = malloc(sizeof(JsSubghzInst));
+    mjs_val_t subghz_obj = mjs_mk_object(mjs);
+
+    subghz_devices_init();
+
+    mjs_set(mjs, subghz_obj, INST_PROP_NAME, ~0, mjs_mk_foreign(mjs, js_subghz));
+    mjs_set(mjs, subghz_obj, "setup", ~0, MJS_MK_FN(js_subghz_setup));
+    mjs_set(mjs, subghz_obj, "setRx", ~0, MJS_MK_FN(js_subghz_set_rx));
+    mjs_set(mjs, subghz_obj, "setIdle", ~0, MJS_MK_FN(js_subgjz_set_idle));
+    mjs_set(mjs, subghz_obj, "getRssi", ~0, MJS_MK_FN(js_subghz_get_rssi));
+    mjs_set(mjs, subghz_obj, "getState", ~0, MJS_MK_FN(js_subghz_get_state));
+    mjs_set(mjs, subghz_obj, "getFrequency", ~0, MJS_MK_FN(js_subghz_get_frequency));
+    mjs_set(mjs, subghz_obj, "setFrequency", ~0, MJS_MK_FN(js_subghz_set_frequency));
+    mjs_set(mjs, subghz_obj, "isExternal", ~0, MJS_MK_FN(js_subghz_is_external));
+    mjs_set(mjs, subghz_obj, "transmitFile", ~0, MJS_MK_FN(js_subghz_transmit_file));
+
+    *object = subghz_obj;
+
+    return js_subghz;
+}
+
+static void js_subghz_destroy(void* inst) {
+    JsSubghzInst* js_subghz = inst;
+
+    subghz_devices_deinit();
+
+    free(js_subghz);
+}
+
+static const JsModuleDescriptor js_subghz_desc = {
+    "subghz",
+    js_subghz_create,
+    js_subghz_destroy,
+};
+
+static const FlipperAppPluginDescriptor plugin_descriptor = {
+    .appid = PLUGIN_APP_ID,
+    .ep_api_version = PLUGIN_API_VERSION,
+    .entry_point = &js_subghz_desc,
+};
+
+const FlipperAppPluginDescriptor* js_subghz_ep(void) {
+    return &plugin_descriptor;
+}
diff --git a/applications/system/js_app/modules/js_subghz/radio_device_loader.c b/applications/system/js_app/modules/js_subghz/radio_device_loader.c
new file mode 100644
index 000000000..d2cffde58
--- /dev/null
+++ b/applications/system/js_app/modules/js_subghz/radio_device_loader.c
@@ -0,0 +1,64 @@
+#include "radio_device_loader.h"
+
+#include <applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h>
+#include <lib/subghz/devices/cc1101_int/cc1101_int_interconnect.h>
+
+static void radio_device_loader_power_on() {
+    uint8_t attempts = 0;
+    while(!furi_hal_power_is_otg_enabled() && attempts++ < 5) {
+        furi_hal_power_enable_otg();
+        //CC1101 power-up time
+        furi_delay_ms(10);
+    }
+}
+
+static void radio_device_loader_power_off() {
+    if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
+}
+
+bool radio_device_loader_is_connect_external(const char* name) {
+    bool is_connect = false;
+    bool is_otg_enabled = furi_hal_power_is_otg_enabled();
+
+    if(!is_otg_enabled) {
+        radio_device_loader_power_on();
+    }
+
+    const SubGhzDevice* device = subghz_devices_get_by_name(name);
+    if(device) {
+        is_connect = subghz_devices_is_connect(device);
+    }
+
+    if(!is_otg_enabled) {
+        radio_device_loader_power_off();
+    }
+    return is_connect;
+}
+
+const SubGhzDevice* radio_device_loader_set(
+    const SubGhzDevice* current_radio_device,
+    SubGhzRadioDeviceType radio_device_type) {
+    const SubGhzDevice* radio_device;
+
+    if(radio_device_type == SubGhzRadioDeviceTypeExternalCC1101 &&
+       radio_device_loader_is_connect_external(SUBGHZ_DEVICE_CC1101_EXT_NAME)) {
+        radio_device_loader_power_on();
+        radio_device = subghz_devices_get_by_name(SUBGHZ_DEVICE_CC1101_EXT_NAME);
+        subghz_devices_begin(radio_device);
+    } else if(current_radio_device == NULL) {
+        radio_device = subghz_devices_get_by_name(SUBGHZ_DEVICE_CC1101_INT_NAME);
+    } else {
+        radio_device_loader_end(current_radio_device);
+        radio_device = subghz_devices_get_by_name(SUBGHZ_DEVICE_CC1101_INT_NAME);
+    }
+
+    return radio_device;
+}
+
+void radio_device_loader_end(const SubGhzDevice* radio_device) {
+    furi_assert(radio_device);
+    radio_device_loader_power_off();
+    if(radio_device != subghz_devices_get_by_name(SUBGHZ_DEVICE_CC1101_INT_NAME)) {
+        subghz_devices_end(radio_device);
+    }
+}
\ No newline at end of file
diff --git a/applications/system/js_app/modules/js_subghz/radio_device_loader.h b/applications/system/js_app/modules/js_subghz/radio_device_loader.h
new file mode 100644
index 000000000..bee4e2c36
--- /dev/null
+++ b/applications/system/js_app/modules/js_subghz/radio_device_loader.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <lib/subghz/devices/devices.h>
+
+/** SubGhzRadioDeviceType */
+typedef enum {
+    SubGhzRadioDeviceTypeInternal,
+    SubGhzRadioDeviceTypeExternalCC1101,
+} SubGhzRadioDeviceType;
+
+const SubGhzDevice* radio_device_loader_set(
+    const SubGhzDevice* current_radio_device,
+    SubGhzRadioDeviceType radio_device_type);
+
+void radio_device_loader_end(const SubGhzDevice* radio_device);
\ No newline at end of file
diff --git a/applications/system/js_app/modules/js_submenu.c b/applications/system/js_app/modules/js_submenu.c
new file mode 100644
index 000000000..8c8d95fab
--- /dev/null
+++ b/applications/system/js_app/modules/js_submenu.c
@@ -0,0 +1,148 @@
+#include <gui/modules/submenu.h>
+#include <gui/view_dispatcher.h>
+#include <gui/view.h>
+#include "../js_modules.h"
+
+typedef struct {
+    Submenu* submenu;
+    ViewDispatcher* view_dispatcher;
+    uint32_t result;
+    bool accepted;
+} JsSubmenuInst;
+
+static JsSubmenuInst* get_this_ctx(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsSubmenuInst* submenu = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(submenu);
+    return submenu;
+}
+
+static void ret_bad_args(struct mjs* mjs, const char* error) {
+    mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "%s", error);
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static bool check_arg_count(struct mjs* mjs, size_t count) {
+    size_t num_args = mjs_nargs(mjs);
+    if(num_args != count) {
+        ret_bad_args(mjs, "Wrong argument count");
+        return false;
+    }
+    return true;
+}
+
+static void submenu_callback(void* context, uint32_t id) {
+    JsSubmenuInst* submenu = context;
+    submenu->result = id;
+    submenu->accepted = true;
+    view_dispatcher_stop(submenu->view_dispatcher);
+}
+
+static bool submenu_exit(void* context) {
+    JsSubmenuInst* submenu = context;
+    submenu->result = 0;
+    submenu->accepted = false;
+    view_dispatcher_stop(submenu->view_dispatcher);
+    return true;
+}
+
+static void js_submenu_add_item(struct mjs* mjs) {
+    JsSubmenuInst* submenu = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 2)) return;
+
+    mjs_val_t label_arg = mjs_arg(mjs, 0);
+    const char* label = mjs_get_string(mjs, &label_arg, NULL);
+    if(!label) {
+        ret_bad_args(mjs, "Label must be a string");
+        return;
+    }
+
+    mjs_val_t id_arg = mjs_arg(mjs, 1);
+    if(!mjs_is_number(id_arg)) {
+        ret_bad_args(mjs, "Id must be a number");
+        return;
+    }
+    int32_t id = mjs_get_int32(mjs, id_arg);
+
+    submenu_add_item(submenu->submenu, label, id, submenu_callback, submenu);
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_submenu_set_header(struct mjs* mjs) {
+    JsSubmenuInst* submenu = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 1)) return;
+
+    mjs_val_t header_arg = mjs_arg(mjs, 0);
+    const char* header = mjs_get_string(mjs, &header_arg, NULL);
+    if(!header) {
+        ret_bad_args(mjs, "Header must be a string");
+        return;
+    }
+
+    submenu_set_header(submenu->submenu, header);
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_submenu_show(struct mjs* mjs) {
+    JsSubmenuInst* submenu = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+
+    Gui* gui = furi_record_open(RECORD_GUI);
+    submenu->view_dispatcher = view_dispatcher_alloc();
+    view_dispatcher_enable_queue(submenu->view_dispatcher);
+    view_dispatcher_add_view(submenu->view_dispatcher, 0, submenu_get_view(submenu->submenu));
+    view_dispatcher_set_event_callback_context(submenu->view_dispatcher, submenu);
+    view_dispatcher_set_navigation_event_callback(submenu->view_dispatcher, submenu_exit);
+    view_dispatcher_attach_to_gui(submenu->view_dispatcher, gui, ViewDispatcherTypeFullscreen);
+    view_dispatcher_switch_to_view(submenu->view_dispatcher, 0);
+
+    view_dispatcher_run(submenu->view_dispatcher);
+
+    view_dispatcher_remove_view(submenu->view_dispatcher, 0);
+    view_dispatcher_free(submenu->view_dispatcher);
+    submenu->view_dispatcher = NULL;
+    furi_record_close(RECORD_GUI);
+
+    submenu_reset(submenu->submenu);
+    if(submenu->accepted) {
+        mjs_return(mjs, mjs_mk_number(mjs, submenu->result));
+    } else {
+        mjs_return(mjs, MJS_UNDEFINED);
+    }
+}
+
+static void* js_submenu_create(struct mjs* mjs, mjs_val_t* object) {
+    JsSubmenuInst* submenu = malloc(sizeof(JsSubmenuInst));
+    mjs_val_t submenu_obj = mjs_mk_object(mjs);
+    mjs_set(mjs, submenu_obj, INST_PROP_NAME, ~0, mjs_mk_foreign(mjs, submenu));
+    mjs_set(mjs, submenu_obj, "addItem", ~0, MJS_MK_FN(js_submenu_add_item));
+    mjs_set(mjs, submenu_obj, "setHeader", ~0, MJS_MK_FN(js_submenu_set_header));
+    mjs_set(mjs, submenu_obj, "show", ~0, MJS_MK_FN(js_submenu_show));
+    submenu->submenu = submenu_alloc();
+    *object = submenu_obj;
+    return submenu;
+}
+
+static void js_submenu_destroy(void* inst) {
+    JsSubmenuInst* submenu = inst;
+    submenu_free(submenu->submenu);
+    free(submenu);
+}
+
+static const JsModuleDescriptor js_submenu_desc = {
+    "submenu",
+    js_submenu_create,
+    js_submenu_destroy,
+};
+
+static const FlipperAppPluginDescriptor submenu_plugin_descriptor = {
+    .appid = PLUGIN_APP_ID,
+    .ep_api_version = PLUGIN_API_VERSION,
+    .entry_point = &js_submenu_desc,
+};
+
+const FlipperAppPluginDescriptor* js_submenu_ep(void) {
+    return &submenu_plugin_descriptor;
+}
\ No newline at end of file
diff --git a/applications/system/js_app/modules/js_textbox.c b/applications/system/js_app/modules/js_textbox.c
new file mode 100644
index 000000000..cf4e8dbbf
--- /dev/null
+++ b/applications/system/js_app/modules/js_textbox.c
@@ -0,0 +1,226 @@
+#include <gui/modules/text_box.h>
+#include <gui/view_dispatcher.h>
+#include <gui/view.h>
+#include "../js_modules.h"
+
+typedef struct {
+    TextBox* text_box;
+    ViewDispatcher* view_dispatcher;
+    FuriThread* thread;
+    FuriString* text;
+} JsTextboxInst;
+
+static JsTextboxInst* get_this_ctx(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsTextboxInst* textbox = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(textbox);
+    return textbox;
+}
+
+static void ret_bad_args(struct mjs* mjs, const char* error) {
+    mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "%s", error);
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static bool check_arg_count(struct mjs* mjs, size_t count) {
+    size_t num_args = mjs_nargs(mjs);
+    if(num_args != count) {
+        ret_bad_args(mjs, "Wrong argument count");
+        return false;
+    }
+    return true;
+}
+
+static void js_textbox_set_config(struct mjs* mjs) {
+    JsTextboxInst* textbox = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 2)) return;
+
+    TextBoxFocus set_focus = TextBoxFocusStart;
+    mjs_val_t focus_arg = mjs_arg(mjs, 0);
+    const char* focus = mjs_get_string(mjs, &focus_arg, NULL);
+    if(!focus) {
+        ret_bad_args(mjs, "Focus must be a string");
+        return;
+    } else {
+        if(!strncmp(focus, "start", strlen("start"))) {
+            set_focus = TextBoxFocusStart;
+        } else if(!strncmp(focus, "end", strlen("end"))) {
+            set_focus = TextBoxFocusEnd;
+        } else {
+            ret_bad_args(mjs, "Bad focus value");
+            return;
+        }
+    }
+
+    TextBoxFont set_font = TextBoxFontText;
+    mjs_val_t font_arg = mjs_arg(mjs, 1);
+    const char* font = mjs_get_string(mjs, &font_arg, NULL);
+    if(!font) {
+        ret_bad_args(mjs, "Font must be a string");
+        return;
+    } else {
+        if(!strncmp(font, "text", strlen("text"))) {
+            set_font = TextBoxFontText;
+        } else if(!strncmp(font, "hex", strlen("hex"))) {
+            set_font = TextBoxFontHex;
+        } else {
+            ret_bad_args(mjs, "Bad font value");
+            return;
+        }
+    }
+
+    text_box_set_focus(textbox->text_box, set_focus);
+    text_box_set_font(textbox->text_box, set_font);
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_textbox_add_text(struct mjs* mjs) {
+    JsTextboxInst* textbox = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 1)) return;
+
+    mjs_val_t text_arg = mjs_arg(mjs, 0);
+    size_t text_len = 0;
+    const char* text = mjs_get_string(mjs, &text_arg, &text_len);
+    if(!text) {
+        ret_bad_args(mjs, "Text must be a string");
+        return;
+    }
+
+    size_t new_len = furi_string_size(textbox->text) + text_len;
+    if(new_len >= 4096) {
+        furi_string_right(textbox->text, new_len / 2);
+    }
+
+    furi_string_cat(textbox->text, text);
+
+    text_box_set_text(textbox->text_box, furi_string_get_cstr(textbox->text));
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_textbox_empty_text(struct mjs* mjs) {
+    JsTextboxInst* textbox = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+
+    furi_string_reset(textbox->text);
+
+    text_box_set_text(textbox->text_box, furi_string_get_cstr(textbox->text));
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_textbox_is_open(struct mjs* mjs) {
+    JsTextboxInst* textbox = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+
+    mjs_return(mjs, mjs_mk_boolean(mjs, !!textbox->thread));
+}
+
+static void textbox_deinit(void* context) {
+    JsTextboxInst* textbox = context;
+    furi_thread_join(textbox->thread);
+    furi_thread_free(textbox->thread);
+    textbox->thread = NULL;
+
+    view_dispatcher_remove_view(textbox->view_dispatcher, 0);
+    view_dispatcher_free(textbox->view_dispatcher);
+    textbox->view_dispatcher = NULL;
+    furi_record_close(RECORD_GUI);
+
+    text_box_reset(textbox->text_box);
+    furi_string_reset(textbox->text);
+}
+
+static void textbox_callback(void* context, uint32_t arg) {
+    UNUSED(arg);
+    textbox_deinit(context);
+}
+
+static bool textbox_exit(void* context) {
+    JsTextboxInst* textbox = context;
+    view_dispatcher_stop(textbox->view_dispatcher);
+    furi_timer_pending_callback(textbox_callback, textbox, 0);
+    return true;
+}
+
+static int32_t textbox_thread(void* context) {
+    ViewDispatcher* view_dispatcher = context;
+    view_dispatcher_run(view_dispatcher);
+    return 0;
+}
+
+static void js_textbox_show(struct mjs* mjs) {
+    JsTextboxInst* textbox = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+
+    Gui* gui = furi_record_open(RECORD_GUI);
+    textbox->view_dispatcher = view_dispatcher_alloc();
+    view_dispatcher_enable_queue(textbox->view_dispatcher);
+    view_dispatcher_add_view(textbox->view_dispatcher, 0, text_box_get_view(textbox->text_box));
+    view_dispatcher_set_event_callback_context(textbox->view_dispatcher, textbox);
+    view_dispatcher_set_navigation_event_callback(textbox->view_dispatcher, textbox_exit);
+    view_dispatcher_attach_to_gui(textbox->view_dispatcher, gui, ViewDispatcherTypeFullscreen);
+    view_dispatcher_switch_to_view(textbox->view_dispatcher, 0);
+
+    textbox->thread =
+        furi_thread_alloc_ex("JsTextbox", 1024, textbox_thread, textbox->view_dispatcher);
+    furi_thread_start(textbox->thread);
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_textbox_close(struct mjs* mjs) {
+    JsTextboxInst* textbox = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+
+    if(textbox->thread) {
+        view_dispatcher_stop(textbox->view_dispatcher);
+        textbox_deinit(textbox);
+    }
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void* js_textbox_create(struct mjs* mjs, mjs_val_t* object) {
+    JsTextboxInst* textbox = malloc(sizeof(JsTextboxInst));
+    mjs_val_t textbox_obj = mjs_mk_object(mjs);
+    mjs_set(mjs, textbox_obj, INST_PROP_NAME, ~0, mjs_mk_foreign(mjs, textbox));
+    mjs_set(mjs, textbox_obj, "setConfig", ~0, MJS_MK_FN(js_textbox_set_config));
+    mjs_set(mjs, textbox_obj, "addText", ~0, MJS_MK_FN(js_textbox_add_text));
+    mjs_set(mjs, textbox_obj, "emptyText", ~0, MJS_MK_FN(js_textbox_empty_text));
+    mjs_set(mjs, textbox_obj, "isOpen", ~0, MJS_MK_FN(js_textbox_is_open));
+    mjs_set(mjs, textbox_obj, "show", ~0, MJS_MK_FN(js_textbox_show));
+    mjs_set(mjs, textbox_obj, "close", ~0, MJS_MK_FN(js_textbox_close));
+    textbox->text_box = text_box_alloc();
+    textbox->text = furi_string_alloc();
+    *object = textbox_obj;
+    return textbox;
+}
+
+static void js_textbox_destroy(void* inst) {
+    JsTextboxInst* textbox = inst;
+    if(textbox->thread) {
+        view_dispatcher_stop(textbox->view_dispatcher);
+        textbox_deinit(textbox);
+    }
+    text_box_free(textbox->text_box);
+    furi_string_free(textbox->text);
+    free(textbox);
+}
+
+static const JsModuleDescriptor js_textbox_desc = {
+    "textbox",
+    js_textbox_create,
+    js_textbox_destroy,
+};
+
+static const FlipperAppPluginDescriptor textbox_plugin_descriptor = {
+    .appid = PLUGIN_APP_ID,
+    .ep_api_version = PLUGIN_API_VERSION,
+    .entry_point = &js_textbox_desc,
+};
+
+const FlipperAppPluginDescriptor* js_textbox_ep(void) {
+    return &textbox_plugin_descriptor;
+}
diff --git a/applications/system/js_app/modules/js_widget.c b/applications/system/js_app/modules/js_widget.c
new file mode 100644
index 000000000..382177bbd
--- /dev/null
+++ b/applications/system/js_app/modules/js_widget.c
@@ -0,0 +1,956 @@
+#include <assets_icons.h>
+#include <gui/view_dispatcher.h>
+#include <gui/view.h>
+#include <m-array.h>
+#include <m-list.h>
+#include <string.h>
+#include "../js_modules.h"
+
+typedef struct WidgetComponent WidgetComponent;
+ARRAY_DEF(ComponentArray, WidgetComponent*, M_PTR_OPLIST);
+
+typedef struct XbmImage XbmImage;
+LIST_DEF(XbmImageList, XbmImage*, M_POD_OPLIST);
+
+struct WidgetComponent {
+    void (*draw)(Canvas* canvas, void* model);
+    void (*free)(WidgetComponent* component);
+    void* model;
+    uint32_t id;
+};
+
+struct XbmImage {
+    uint32_t width;
+    uint32_t height;
+    uint8_t data[];
+};
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+    uint8_t w;
+    uint8_t h;
+} BoxElement;
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+    uint8_t r;
+} CircleElement;
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+    uint8_t r;
+} DiscElement;
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+} DotElement;
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+    const Icon* icon;
+} IconElement;
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+    uint8_t w;
+    uint8_t h;
+} FrameElement;
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+    uint16_t ch;
+} GlyphElement;
+
+typedef struct {
+    uint8_t x1;
+    uint8_t y1;
+    uint8_t x2;
+    uint8_t y2;
+} LineElement;
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+    uint8_t w;
+    uint8_t h;
+    uint8_t r;
+} RboxElement;
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+    uint8_t w;
+    uint8_t h;
+    uint8_t r;
+} RframeElement;
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+    Font font;
+    FuriString* text;
+} TextElement;
+
+typedef struct {
+    uint8_t x;
+    uint8_t y;
+    uint32_t index;
+    View* view;
+} XbmElement;
+
+typedef struct {
+    ComponentArray_t component;
+    XbmImageList_t image;
+    uint32_t max_assigned_id;
+} WidgetModel;
+
+typedef struct {
+    View* view;
+    ViewDispatcher* view_dispatcher;
+    FuriThread* thread;
+} JsWidgetInst;
+
+static JsWidgetInst* get_this_ctx(struct mjs* mjs) {
+    mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
+    JsWidgetInst* widget = mjs_get_ptr(mjs, obj_inst);
+    furi_assert(widget);
+    return widget;
+}
+
+static void ret_bad_args(struct mjs* mjs, const char* error) {
+    mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "%s", error);
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static bool check_arg_count(struct mjs* mjs, size_t count) {
+    size_t num_args = mjs_nargs(mjs);
+    if(num_args != count) {
+        ret_bad_args(mjs, "Wrong argument count");
+        return false;
+    }
+    return true;
+}
+
+static void js_widget_load_image_xbm(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 1)) {
+        return;
+    }
+
+    mjs_val_t path_arg = mjs_arg(mjs, 0);
+    size_t path_len = 0;
+    const char* path = mjs_get_string(mjs, &path_arg, &path_len);
+    if(!path) {
+        ret_bad_args(mjs, "Path must be a string");
+        return;
+    }
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    File* file = storage_file_alloc(storage);
+    XbmImage* xbm = NULL;
+
+    do {
+        if(!storage_file_open(file, path, FSAM_READ, FSOM_OPEN_EXISTING)) {
+            ret_bad_args(mjs, "Failed to open file");
+            break;
+        }
+
+        uint32_t size = 0;
+        if(storage_file_read(file, &size, sizeof(size)) != sizeof(size)) {
+            ret_bad_args(mjs, "Failed to get file size");
+            break;
+        }
+
+        xbm = malloc(size);
+        if(storage_file_read(file, xbm, size) != size) {
+            ret_bad_args(mjs, "Failed to load entire file");
+            free(xbm);
+            xbm = NULL;
+            break;
+        }
+    } while(false);
+
+    storage_file_free(file);
+    furi_record_close(RECORD_STORAGE);
+
+    if(xbm == NULL) {
+        mjs_return(mjs, MJS_UNDEFINED);
+        return;
+    }
+
+    uint32_t count = 0;
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            count = XbmImageList_size(model->image);
+            XbmImageList_push_back(model->image, xbm);
+        },
+        false);
+
+    mjs_return(mjs, mjs_mk_number(mjs, count));
+}
+
+static void js_widget_remove(struct mjs* mjs) {
+    bool removed = false;
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 1)) {
+        return;
+    }
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            uint32_t id = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+            ComponentArray_it_t it;
+            ComponentArray_it(it, model->component);
+            while(!ComponentArray_end_p(it)) {
+                WidgetComponent* component = *ComponentArray_ref(it);
+                if(component->id == id) {
+                    if(component->free) {
+                        component->free(component);
+                    }
+                    ComponentArray_remove(model->component, it);
+                    removed = true;
+                    break;
+                }
+                ComponentArray_next(it);
+            }
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_boolean(mjs, removed));
+}
+
+static void widget_box_draw(Canvas* canvas, void* model) {
+    BoxElement* element = model;
+    canvas_draw_box(canvas, element->x, element->y, element->w, element->h);
+}
+
+static void widget_box_free(WidgetComponent* component) {
+    BoxElement* element = component->model;
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_box(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 4)) return;
+
+    int32_t x = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+    int32_t w = mjs_get_int32(mjs, mjs_arg(mjs, 2));
+    int32_t h = mjs_get_int32(mjs, mjs_arg(mjs, 3));
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_box_draw;
+    component->free = widget_box_free;
+    component->model = malloc(sizeof(BoxElement));
+    BoxElement* element = component->model;
+    element->x = x;
+    element->y = y;
+    element->w = w;
+    element->h = h;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void widget_circle_draw(Canvas* canvas, void* model) {
+    CircleElement* element = model;
+    canvas_draw_circle(canvas, element->x, element->y, element->r);
+}
+
+static void widget_circle_free(WidgetComponent* component) {
+    CircleElement* element = component->model;
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_circle(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 3)) return;
+
+    int32_t x = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+    int32_t r = mjs_get_int32(mjs, mjs_arg(mjs, 2));
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_circle_draw;
+    component->free = widget_circle_free;
+    component->model = malloc(sizeof(CircleElement));
+    CircleElement* element = component->model;
+    element->x = x;
+    element->y = y;
+    element->r = r;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void widget_disc_draw(Canvas* canvas, void* model) {
+    DiscElement* element = model;
+    canvas_draw_disc(canvas, element->x, element->y, element->r);
+}
+
+static void widget_disc_free(WidgetComponent* component) {
+    DiscElement* element = component->model;
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_disc(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 3)) return;
+
+    int32_t x = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+    int32_t r = mjs_get_int32(mjs, mjs_arg(mjs, 2));
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_disc_draw;
+    component->free = widget_disc_free;
+    component->model = malloc(sizeof(DiscElement));
+    DiscElement* element = component->model;
+    element->x = x;
+    element->y = y;
+    element->r = r;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void widget_dot_draw(Canvas* canvas, void* model) {
+    DotElement* element = model;
+    canvas_draw_dot(canvas, element->x, element->y);
+}
+
+static void widget_dot_free(WidgetComponent* component) {
+    DotElement* element = component->model;
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_dot(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 2)) return;
+
+    int32_t x = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_dot_draw;
+    component->free = widget_dot_free;
+    component->model = malloc(sizeof(DotElement));
+    DotElement* element = component->model;
+    element->x = x;
+    element->y = y;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void widget_frame_draw(Canvas* canvas, void* model) {
+    FrameElement* element = model;
+    canvas_draw_frame(canvas, element->x, element->y, element->w, element->h);
+}
+
+static void widget_frame_free(WidgetComponent* component) {
+    FrameElement* element = component->model;
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_frame(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 4)) return;
+
+    int32_t x = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+    int32_t w = mjs_get_int32(mjs, mjs_arg(mjs, 2));
+    int32_t h = mjs_get_int32(mjs, mjs_arg(mjs, 3));
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_frame_draw;
+    component->free = widget_frame_free;
+    component->model = malloc(sizeof(FrameElement));
+    FrameElement* element = component->model;
+    element->x = x;
+    element->y = y;
+    element->w = w;
+    element->h = h;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void widget_glyph_draw(Canvas* canvas, void* model) {
+    GlyphElement* element = model;
+    canvas_draw_glyph(canvas, element->x, element->y, element->ch);
+}
+
+static void widget_glyph_free(WidgetComponent* component) {
+    GlyphElement* element = component->model;
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_glyph(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 3)) return;
+
+    int32_t x = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+    int32_t ch = mjs_get_int32(mjs, mjs_arg(mjs, 2));
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_glyph_draw;
+    component->free = widget_glyph_free;
+    component->model = malloc(sizeof(GlyphElement));
+    GlyphElement* element = component->model;
+    element->x = x;
+    element->y = y;
+    element->ch = ch;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void widget_line_draw(Canvas* canvas, void* model) {
+    LineElement* element = model;
+    canvas_draw_line(canvas, element->x1, element->y1, element->x2, element->y2);
+}
+
+static void widget_line_free(WidgetComponent* component) {
+    LineElement* element = component->model;
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_line(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 4)) return;
+
+    int32_t x1 = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y1 = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+    int32_t x2 = mjs_get_int32(mjs, mjs_arg(mjs, 2));
+    int32_t y2 = mjs_get_int32(mjs, mjs_arg(mjs, 3));
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_line_draw;
+    component->free = widget_line_free;
+    component->model = malloc(sizeof(LineElement));
+    LineElement* element = component->model;
+    element->x1 = x1;
+    element->y1 = y1;
+    element->x2 = x2;
+    element->y2 = y2;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void widget_rbox_draw(Canvas* canvas, void* model) {
+    RboxElement* element = model;
+    canvas_draw_rbox(canvas, element->x, element->y, element->w, element->h, element->r);
+}
+
+static void widget_rbox_free(WidgetComponent* component) {
+    BoxElement* element = component->model;
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_rbox(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 5)) return;
+
+    int32_t x = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+    int32_t w = mjs_get_int32(mjs, mjs_arg(mjs, 2));
+    int32_t h = mjs_get_int32(mjs, mjs_arg(mjs, 3));
+    int32_t r = mjs_get_int32(mjs, mjs_arg(mjs, 4));
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_rbox_draw;
+    component->free = widget_rbox_free;
+    component->model = malloc(sizeof(RboxElement));
+    RboxElement* element = component->model;
+    element->x = x;
+    element->y = y;
+    element->w = w;
+    element->h = h;
+    element->r = r;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void widget_rframe_draw(Canvas* canvas, void* model) {
+    RframeElement* element = model;
+    canvas_draw_rframe(canvas, element->x, element->y, element->w, element->h, element->r);
+}
+
+static void widget_rframe_free(WidgetComponent* component) {
+    RframeElement* element = component->model;
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_rframe(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 5)) return;
+
+    int32_t x = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+    int32_t w = mjs_get_int32(mjs, mjs_arg(mjs, 2));
+    int32_t h = mjs_get_int32(mjs, mjs_arg(mjs, 3));
+    int32_t r = mjs_get_int32(mjs, mjs_arg(mjs, 4));
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_rframe_draw;
+    component->free = widget_rframe_free;
+    component->model = malloc(sizeof(RframeElement));
+    RframeElement* element = component->model;
+    element->x = x;
+    element->y = y;
+    element->w = w;
+    element->h = h;
+    element->r = r;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void widget_text_draw(Canvas* canvas, void* model) {
+    TextElement* element = model;
+    canvas_set_font(canvas, element->font);
+    canvas_draw_str(canvas, element->x, element->y, furi_string_get_cstr(element->text));
+}
+
+static void widget_text_free(WidgetComponent* component) {
+    TextElement* element = component->model;
+    furi_string_free(element->text);
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_text(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 4)) return;
+
+    int32_t x = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+
+    mjs_val_t font_arg = mjs_arg(mjs, 2);
+    size_t font_name_len = 0;
+    const char* font_name_text = mjs_get_string(mjs, &font_arg, &font_name_len);
+    if(!font_name_text) {
+        ret_bad_args(mjs, "Font name must be a string");
+        return;
+    }
+
+    Font font = FontTotalNumber;
+    size_t cmp_str_len = strlen("Primary");
+    if(font_name_len == cmp_str_len && strncmp(font_name_text, "Primary", cmp_str_len) == 0) {
+        font = FontPrimary;
+    } else {
+        cmp_str_len = strlen("Secondary");
+        if(font_name_len == cmp_str_len &&
+           strncmp(font_name_text, "Secondary", cmp_str_len) == 0) {
+            font = FontSecondary;
+        }
+    }
+    if(font == FontTotalNumber) {
+        ret_bad_args(mjs, "Unknown font name");
+        return;
+    }
+
+    mjs_val_t text_arg = mjs_arg(mjs, 3);
+    size_t text_len = 0;
+    const char* text = mjs_get_string(mjs, &text_arg, &text_len);
+    if(!text) {
+        ret_bad_args(mjs, "Text must be a string");
+        return;
+    }
+    FuriString* text_str = furi_string_alloc_set(text);
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_text_draw;
+    component->free = widget_text_free;
+    component->model = malloc(sizeof(TextElement));
+    TextElement* element = component->model;
+    element->x = x;
+    element->y = y;
+    element->font = font;
+    element->text = text_str;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void widget_xbm_draw(Canvas* canvas, void* model) {
+    XbmElement* element = model;
+    XbmImage* image = NULL;
+
+    with_view_model(
+        element->view,
+        WidgetModel * widget_model,
+        { image = *XbmImageList_get(widget_model->image, element->index); },
+        false);
+
+    if(image) {
+        canvas_draw_xbm(canvas, element->x, element->y, image->width, image->height, image->data);
+    }
+}
+
+static void widget_xbm_free(WidgetComponent* component) {
+    XbmElement* element = component->model;
+    free(element);
+    free(component);
+}
+
+static void js_widget_add_xbm(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 3)) return;
+
+    int32_t x = mjs_get_int32(mjs, mjs_arg(mjs, 0));
+    int32_t y = mjs_get_int32(mjs, mjs_arg(mjs, 1));
+    int32_t index = mjs_get_int32(mjs, mjs_arg(mjs, 2));
+    with_view_model(
+        widget->view,
+        WidgetModel * widget_model,
+        {
+            size_t count = XbmImageList_size(widget_model->image);
+            if(index < 0 || index >= (int32_t)count) {
+                ret_bad_args(mjs, "Invalid image index");
+                return;
+            }
+        },
+        false);
+
+    WidgetComponent* component = malloc(sizeof(WidgetComponent));
+    component->draw = widget_xbm_draw;
+    component->free = widget_xbm_free;
+    component->model = malloc(sizeof(XbmElement));
+    XbmElement* element = component->model;
+    element->x = x;
+    element->y = y;
+    element->index = index;
+
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ++model->max_assigned_id;
+            component->id = model->max_assigned_id;
+            element->view = widget->view;
+            ComponentArray_push_back(model->component, component);
+        },
+        true);
+
+    mjs_return(mjs, mjs_mk_number(mjs, component->id));
+}
+
+static void js_widget_is_open(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+
+    mjs_return(mjs, mjs_mk_boolean(mjs, !!widget->thread));
+}
+
+static void widget_deinit(void* context) {
+    JsWidgetInst* widget = context;
+    if(widget->thread) {
+        furi_thread_join(widget->thread);
+        furi_thread_free(widget->thread);
+        widget->thread = NULL;
+
+        furi_assert(widget->view_dispatcher);
+        view_dispatcher_remove_view(widget->view_dispatcher, 0);
+        view_dispatcher_free(widget->view_dispatcher);
+        widget->view_dispatcher = NULL;
+
+        furi_record_close(RECORD_GUI);
+    }
+}
+
+static void widget_callback(void* context, uint32_t arg) {
+    UNUSED(arg);
+    widget_deinit(context);
+}
+
+static bool widget_exit(void* context) {
+    JsWidgetInst* widget = context;
+    view_dispatcher_stop(widget->view_dispatcher);
+    furi_timer_pending_callback(widget_callback, widget, 0);
+    return true;
+}
+
+static int32_t widget_thread(void* context) {
+    ViewDispatcher* view_dispatcher = context;
+    view_dispatcher_run(view_dispatcher);
+    return 0;
+}
+
+static void js_widget_show(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+
+    Gui* gui = furi_record_open(RECORD_GUI);
+
+    widget->view_dispatcher = view_dispatcher_alloc();
+    view_dispatcher_enable_queue(widget->view_dispatcher);
+    view_dispatcher_add_view(widget->view_dispatcher, 0, widget->view);
+    view_dispatcher_set_event_callback_context(widget->view_dispatcher, widget);
+    view_dispatcher_set_navigation_event_callback(widget->view_dispatcher, widget_exit);
+    view_dispatcher_attach_to_gui(widget->view_dispatcher, gui, ViewDispatcherTypeFullscreen);
+    view_dispatcher_switch_to_view(widget->view_dispatcher, 0);
+
+    widget->thread =
+        furi_thread_alloc_ex("JsWidget", 1024, widget_thread, widget->view_dispatcher);
+    furi_thread_start(widget->thread);
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void js_widget_close(struct mjs* mjs) {
+    JsWidgetInst* widget = get_this_ctx(mjs);
+    if(!check_arg_count(mjs, 0)) return;
+
+    if(widget->thread) {
+        view_dispatcher_stop(widget->view_dispatcher);
+        widget_deinit(widget);
+    }
+
+    mjs_return(mjs, MJS_UNDEFINED);
+}
+
+static void widget_draw_callback(Canvas* canvas, void* model) {
+    WidgetModel* widget_model = model;
+    canvas_clear(canvas);
+
+    ComponentArray_it_t it;
+    ComponentArray_it(it, widget_model->component);
+    while(!ComponentArray_end_p(it)) {
+        WidgetComponent* component = *ComponentArray_ref(it);
+        if(component->draw != NULL) {
+            component->draw(canvas, component->model);
+        }
+        ComponentArray_next(it);
+    }
+}
+
+static void widget_remove_view(void* context) {
+    JsWidgetInst* widget = context;
+
+    if(widget->view) {
+        with_view_model(
+            widget->view,
+            WidgetModel * model,
+            {
+                ComponentArray_it_t it;
+                ComponentArray_it(it, model->component);
+                while(!ComponentArray_end_p(it)) {
+                    WidgetComponent* component = *ComponentArray_ref(it);
+                    if(component->free) {
+                        component->free(component);
+                        component->free = NULL;
+                    }
+                    ComponentArray_next(it);
+                }
+                ComponentArray_reset(model->component);
+                ComponentArray_clear(model->component);
+            },
+            false);
+        with_view_model(
+            widget->view, WidgetModel * model, { XbmImageList_clear(model->image); }, false);
+        view_free(widget->view);
+        widget->view = NULL;
+    }
+}
+
+static JsWidgetInst* widget_alloc(void) {
+    JsWidgetInst* widget = malloc(sizeof(JsWidgetInst));
+    widget->thread = NULL;
+    widget->view_dispatcher = NULL;
+
+    widget->view = view_alloc();
+    view_allocate_model(widget->view, ViewModelTypeLockFree, sizeof(WidgetModel));
+    view_set_draw_callback(widget->view, widget_draw_callback);
+    with_view_model(
+        widget->view,
+        WidgetModel * model,
+        {
+            ComponentArray_init(model->component);
+            XbmImageList_init(model->image);
+            model->max_assigned_id = 0;
+        },
+        true);
+
+    return widget;
+}
+
+static void* js_widget_create(struct mjs* mjs, mjs_val_t* object) {
+    JsWidgetInst* widget = widget_alloc();
+    mjs_val_t widget_obj = mjs_mk_object(mjs);
+    mjs_set(mjs, widget_obj, INST_PROP_NAME, ~0, mjs_mk_foreign(mjs, widget));
+    // addBox(x: number, y: number, w: number, h: number): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addBox", ~0, MJS_MK_FN(js_widget_add_box));
+    // addCircle(x: number, y: number, r: number): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addCircle", ~0, MJS_MK_FN(js_widget_add_circle));
+    // addDisc(x: number, y: number, r: number): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addDisc", ~0, MJS_MK_FN(js_widget_add_disc));
+    // addDot(x: number, y: number): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addDot", ~0, MJS_MK_FN(js_widget_add_dot));
+    // addFrame(x: number, y: number, w: number, h: number): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addFrame", ~0, MJS_MK_FN(js_widget_add_frame));
+    // addGlyph(x: number, y: number, ch: number): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addGlyph", ~0, MJS_MK_FN(js_widget_add_glyph));
+    // addLine(x1: number, y1: number, x2: number, y2: number): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addLine", ~0, MJS_MK_FN(js_widget_add_line));
+    // addRbox(x: number, y: number, w: number, h: number, r: number): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addRbox", ~0, MJS_MK_FN(js_widget_add_rbox));
+    // addRframe(x: number, y: number, w: number, h: number, r: number): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addRframe", ~0, MJS_MK_FN(js_widget_add_rframe));
+    // addText(x: number, y: number, font: string, text: string): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addText", ~0, MJS_MK_FN(js_widget_add_text));
+    // addXbm(x: number, y: number, index: number): number (returns id of the added component)
+    mjs_set(mjs, widget_obj, "addXbm", ~0, MJS_MK_FN(js_widget_add_xbm));
+    // loadImageXbm(path: string): number (returns index of the loaded image)
+    mjs_set(mjs, widget_obj, "loadImageXbm", ~0, MJS_MK_FN(js_widget_load_image_xbm));
+    // remove(id: number): boolean (returns true if the component was removed)
+    mjs_set(mjs, widget_obj, "remove", ~0, MJS_MK_FN(js_widget_remove));
+    // isOpen(): boolean (returns true if the widget is open)
+    mjs_set(mjs, widget_obj, "isOpen", ~0, MJS_MK_FN(js_widget_is_open));
+    // show(): void (shows the widget)
+    mjs_set(mjs, widget_obj, "show", ~0, MJS_MK_FN(js_widget_show));
+    // close(): void (closes the widget)
+    mjs_set(mjs, widget_obj, "close", ~0, MJS_MK_FN(js_widget_close));
+    *object = widget_obj;
+    return widget;
+}
+
+static void js_widget_destroy(void* inst) {
+    JsWidgetInst* widget = inst;
+    if(widget->thread) {
+        view_dispatcher_stop(widget->view_dispatcher);
+        widget_deinit(widget);
+    }
+    widget_remove_view(widget);
+    free(widget);
+}
+
+static const JsModuleDescriptor js_widget_desc = {
+    "widget",
+    js_widget_create,
+    js_widget_destroy,
+};
+
+static const FlipperAppPluginDescriptor widget_plugin_descriptor = {
+    .appid = PLUGIN_APP_ID,
+    .ep_api_version = PLUGIN_API_VERSION,
+    .entry_point = &js_widget_desc,
+};
+
+const FlipperAppPluginDescriptor* js_widget_ep(void) {
+    return &widget_plugin_descriptor;
+}
diff --git a/applications/system/storage_move_to_sd/storage_move_to_sd.c b/applications/system/storage_move_to_sd/storage_move_to_sd.c
index 949f889b2..bc587f3eb 100644
--- a/applications/system/storage_move_to_sd/storage_move_to_sd.c
+++ b/applications/system/storage_move_to_sd/storage_move_to_sd.c
@@ -113,7 +113,7 @@ static void storage_move_to_sd_unmount_callback(const void* message, void* conte
     }
 }
 
-static StorageMoveToSd* storage_move_to_sd_alloc() {
+static StorageMoveToSd* storage_move_to_sd_alloc(void) {
     StorageMoveToSd* app = malloc(sizeof(StorageMoveToSd));
 
     app->gui = furi_record_open(RECORD_GUI);
diff --git a/applications/system/updater/cli/updater_cli.c b/applications/system/updater/cli/updater_cli.c
index cebdc4d7c..0b734c0f4 100644
--- a/applications/system/updater/cli/updater_cli.c
+++ b/applications/system/updater/cli/updater_cli.c
@@ -103,7 +103,7 @@ static void updater_start_app(void* context, uint32_t arg) {
     furi_record_close(RECORD_LOADER);
 }
 
-void updater_on_system_start() {
+void updater_on_system_start(void) {
 #ifdef SRV_CLI
     Cli* cli = (Cli*)furi_record_open(RECORD_CLI);
     cli_add_command(cli, "update", CliCommandFlagDefault, updater_cli_ep, NULL);
diff --git a/applications/system/updater/scenes/updater_scene_main.c b/applications/system/updater/scenes/updater_scene_main.c
index 9fd68161f..3f55b7c33 100644
--- a/applications/system/updater/scenes/updater_scene_main.c
+++ b/applications/system/updater/scenes/updater_scene_main.c
@@ -45,7 +45,7 @@ void updater_scene_main_on_enter(void* context) {
     view_dispatcher_switch_to_view(updater->view_dispatcher, UpdaterViewMain);
 }
 
-static void updater_scene_cancel_update() {
+static void updater_scene_cancel_update(void) {
     update_operation_disarm();
     furi_hal_power_reset();
 }
diff --git a/applications/system/updater/util/update_task.c b/applications/system/updater/util/update_task.c
index df1793a80..c0ea6421c 100644
--- a/applications/system/updater/util/update_task.c
+++ b/applications/system/updater/util/update_task.c
@@ -387,7 +387,7 @@ static void update_task_worker_thread_cb(FuriThreadState state, void* context) {
     }
 }
 
-UpdateTask* update_task_alloc() {
+UpdateTask* update_task_alloc(void) {
     UpdateTask* update_task = malloc(sizeof(UpdateTask));
 
     update_task->state.stage = UpdateTaskStageProgress;
diff --git a/applications/system/updater/util/update_task.h b/applications/system/updater/util/update_task.h
index b3ac3f2f8..a3c47429e 100644
--- a/applications/system/updater/util/update_task.h
+++ b/applications/system/updater/util/update_task.h
@@ -69,7 +69,7 @@ typedef struct UpdateTask UpdateTask;
 typedef void (
     *updateProgressCb)(const char* status, const uint8_t stage_pct, bool failed, void* state);
 
-UpdateTask* update_task_alloc();
+UpdateTask* update_task_alloc(void);
 
 void update_task_free(UpdateTask* update_task);
 
diff --git a/applications/system/updater/views/updater_main.c b/applications/system/updater/views/updater_main.c
index d32d51b7c..4e018d419 100644
--- a/applications/system/updater/views/updater_main.c
+++ b/applications/system/updater/views/updater_main.c
@@ -102,7 +102,7 @@ static void updater_main_draw_callback(Canvas* canvas, void* _model) {
     }
 }
 
-UpdaterMainView* updater_main_alloc() {
+UpdaterMainView* updater_main_alloc(void) {
     UpdaterMainView* main_view = malloc(sizeof(UpdaterMainView));
 
     main_view->view = view_alloc();
diff --git a/applications/system/updater/views/updater_main.h b/applications/system/updater/views/updater_main.h
index 81a0e86c9..4d2b9b03c 100644
--- a/applications/system/updater/views/updater_main.h
+++ b/applications/system/updater/views/updater_main.h
@@ -9,7 +9,7 @@ typedef void (*UpdaterMainInputCallback)(InputType type, void* context);
 
 View* updater_main_get_view(UpdaterMainView* main_view);
 
-UpdaterMainView* updater_main_alloc();
+UpdaterMainView* updater_main_alloc(void);
 
 void updater_main_free(UpdaterMainView* main_view);
 
diff --git a/assets/ReadMe.md b/assets/ReadMe.md
index 84310e731..50e25a8c9 100644
--- a/assets/ReadMe.md
+++ b/assets/ReadMe.md
@@ -1,17 +1,19 @@
-# Requirements
+# Firmware Assets {#firmware_assets}
+
+## Requirements
 
 - Python3
 - Python3 packages: Pillow & heatshrink2 
 
-# Compiling
+## Compiling
 
 ```bash
 ./fbt icons proto dolphin_internal dolphin_blocking dolphin_ext resources
 ```
 
-# Asset naming rules
+## Asset naming rules
 
-## Images and Animations
+### Images and Animations
 
 `NAME_VARIANT_SIZE`
 
@@ -22,16 +24,16 @@
 Image names will be automatically prefixed with `I_`, animation names with `A_`.
 Icons and Animations will be gathered into `icon.h` and `icon.c`.
 
-## Dolphin and Games assets
+### Dolphin and Games assets
 
 Rules are same as for Images and Animations plus assets are grouped by level and level prepends `NAME`.
 Good starting point: https://docs.unrealengine.com/4.27/en-US/ProductionPipelines/AssetNaming/
 
-# Important notes
+## Important notes
 
 Don't include assets that you are not using, compiler is not going to strip unused assets.
 
-# Structure
+## Structure
 - `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.
diff --git a/assets/dolphin/ReadMe.md b/assets/dolphin/ReadMe.md
index e7572571c..d47dca0f7 100644
--- a/assets/dolphin/ReadMe.md
+++ b/assets/dolphin/ReadMe.md
@@ -1,4 +1,4 @@
-# Dolphin assets
+# Dolphin assets {#dolphin_assets}
 
 Dolphin assets are split into 3 parts:
 
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_21.png b/assets/dolphin/external/L1_Mods_128x64/frame_21.png
index 900cc7d12..00a7a6e99 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_21.png and b/assets/dolphin/external/L1_Mods_128x64/frame_21.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_22.png b/assets/dolphin/external/L1_Mods_128x64/frame_22.png
index de6c511e4..137d5ddf6 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_22.png and b/assets/dolphin/external/L1_Mods_128x64/frame_22.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_23.png b/assets/dolphin/external/L1_Mods_128x64/frame_23.png
index 4f82f63bc..89690fc03 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_23.png and b/assets/dolphin/external/L1_Mods_128x64/frame_23.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_24.png b/assets/dolphin/external/L1_Mods_128x64/frame_24.png
index d7c614902..53d7b07a5 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_24.png and b/assets/dolphin/external/L1_Mods_128x64/frame_24.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_25.png b/assets/dolphin/external/L1_Mods_128x64/frame_25.png
index 768030b3c..2838804e5 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_25.png and b/assets/dolphin/external/L1_Mods_128x64/frame_25.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_26.png b/assets/dolphin/external/L1_Mods_128x64/frame_26.png
index 12f22abdb..2af49cf17 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_26.png and b/assets/dolphin/external/L1_Mods_128x64/frame_26.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_27.png b/assets/dolphin/external/L1_Mods_128x64/frame_27.png
index 9fca976de..7dc44d061 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_27.png and b/assets/dolphin/external/L1_Mods_128x64/frame_27.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_28.png b/assets/dolphin/external/L1_Mods_128x64/frame_28.png
index 4b2ab5863..87df75ff7 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_28.png and b/assets/dolphin/external/L1_Mods_128x64/frame_28.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_29.png b/assets/dolphin/external/L1_Mods_128x64/frame_29.png
index 69c709adc..2fdb9d736 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_29.png and b/assets/dolphin/external/L1_Mods_128x64/frame_29.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_30.png b/assets/dolphin/external/L1_Mods_128x64/frame_30.png
index 13caae7ca..785f19fd0 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_30.png and b/assets/dolphin/external/L1_Mods_128x64/frame_30.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_31.png b/assets/dolphin/external/L1_Mods_128x64/frame_31.png
index b1d1e8bfe..36310f705 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_31.png and b/assets/dolphin/external/L1_Mods_128x64/frame_31.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_32.png b/assets/dolphin/external/L1_Mods_128x64/frame_32.png
index acf000827..92db8f024 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_32.png and b/assets/dolphin/external/L1_Mods_128x64/frame_32.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_33.png b/assets/dolphin/external/L1_Mods_128x64/frame_33.png
index b6c6fbb19..768030b3c 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_33.png and b/assets/dolphin/external/L1_Mods_128x64/frame_33.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_34.png b/assets/dolphin/external/L1_Mods_128x64/frame_34.png
index 7d2dcda5d..12f22abdb 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_34.png and b/assets/dolphin/external/L1_Mods_128x64/frame_34.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_35.png b/assets/dolphin/external/L1_Mods_128x64/frame_35.png
index 461270ba4..9fca976de 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_35.png and b/assets/dolphin/external/L1_Mods_128x64/frame_35.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_36.png b/assets/dolphin/external/L1_Mods_128x64/frame_36.png
index b018a94c1..4b2ab5863 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_36.png and b/assets/dolphin/external/L1_Mods_128x64/frame_36.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_37.png b/assets/dolphin/external/L1_Mods_128x64/frame_37.png
index fa2b303cc..69c709adc 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_37.png and b/assets/dolphin/external/L1_Mods_128x64/frame_37.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_38.png b/assets/dolphin/external/L1_Mods_128x64/frame_38.png
index ed38122f5..13caae7ca 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_38.png and b/assets/dolphin/external/L1_Mods_128x64/frame_38.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_39.png b/assets/dolphin/external/L1_Mods_128x64/frame_39.png
index 38610bb4b..b1d1e8bfe 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_39.png and b/assets/dolphin/external/L1_Mods_128x64/frame_39.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_40.png b/assets/dolphin/external/L1_Mods_128x64/frame_40.png
index 7f6b4b29a..acf000827 100644
Binary files a/assets/dolphin/external/L1_Mods_128x64/frame_40.png and b/assets/dolphin/external/L1_Mods_128x64/frame_40.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_41.png b/assets/dolphin/external/L1_Mods_128x64/frame_41.png
new file mode 100644
index 000000000..b6c6fbb19
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_41.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_42.png b/assets/dolphin/external/L1_Mods_128x64/frame_42.png
new file mode 100644
index 000000000..7d2dcda5d
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_42.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_43.png b/assets/dolphin/external/L1_Mods_128x64/frame_43.png
new file mode 100644
index 000000000..461270ba4
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_43.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_44.png b/assets/dolphin/external/L1_Mods_128x64/frame_44.png
new file mode 100644
index 000000000..b018a94c1
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_44.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_45.png b/assets/dolphin/external/L1_Mods_128x64/frame_45.png
new file mode 100644
index 000000000..fa2b303cc
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_45.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_46.png b/assets/dolphin/external/L1_Mods_128x64/frame_46.png
new file mode 100644
index 000000000..ed38122f5
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_46.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_47.png b/assets/dolphin/external/L1_Mods_128x64/frame_47.png
new file mode 100644
index 000000000..38610bb4b
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_47.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/frame_48.png b/assets/dolphin/external/L1_Mods_128x64/frame_48.png
new file mode 100644
index 000000000..7f6b4b29a
Binary files /dev/null and b/assets/dolphin/external/L1_Mods_128x64/frame_48.png differ
diff --git a/assets/dolphin/external/L1_Mods_128x64/meta.txt b/assets/dolphin/external/L1_Mods_128x64/meta.txt
index 0225c7e55..3164fe8d8 100644
--- a/assets/dolphin/external/L1_Mods_128x64/meta.txt
+++ b/assets/dolphin/external/L1_Mods_128x64/meta.txt
@@ -3,12 +3,12 @@ Version: 1
 
 Width: 128
 Height: 64
-Passive frames: 23
+Passive frames: 31
 Active frames: 18
-Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
 Active cycles: 1
 Frame rate: 2
 Duration: 3600
 Active cooldown: 7
 
-Bubble slots: 0
\ No newline at end of file
+Bubble slots: 0
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_0.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_0.png
new file mode 100755
index 000000000..7d42cb57d
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_0.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_1.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_1.png
new file mode 100755
index 000000000..25b4609c3
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_1.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_10.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_10.png
new file mode 100755
index 000000000..575df3b9f
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_10.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_11.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_11.png
new file mode 100755
index 000000000..2cfc582ef
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_11.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_12.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_12.png
new file mode 100755
index 000000000..4aa135cd6
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_12.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_13.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_13.png
new file mode 100755
index 000000000..aae2827e8
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_13.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_14.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_14.png
new file mode 100755
index 000000000..a66867a32
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_14.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_15.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_15.png
new file mode 100755
index 000000000..7ec1216e3
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_15.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_16.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_16.png
new file mode 100755
index 000000000..2632103d6
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_16.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_17.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_17.png
new file mode 100755
index 000000000..f50cd0b88
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_17.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_18.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_18.png
new file mode 100755
index 000000000..b5a85de1d
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_18.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_19.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_19.png
new file mode 100755
index 000000000..d9a29def6
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_19.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_2.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_2.png
new file mode 100755
index 000000000..ca4bf322b
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_2.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_20.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_20.png
new file mode 100755
index 000000000..fe95a716c
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_20.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_21.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_21.png
new file mode 100755
index 000000000..6a40d4148
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_21.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_22.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_22.png
new file mode 100755
index 000000000..67189811d
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_22.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_23.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_23.png
new file mode 100755
index 000000000..b770f3208
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_23.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_24.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_24.png
new file mode 100755
index 000000000..4a899faf2
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_24.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_25.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_25.png
new file mode 100755
index 000000000..c12a583f5
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_25.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_26.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_26.png
new file mode 100755
index 000000000..f62f6495e
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_26.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_27.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_27.png
new file mode 100755
index 000000000..37218c396
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_27.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_28.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_28.png
new file mode 100755
index 000000000..a28511c91
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_28.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_29.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_29.png
new file mode 100755
index 000000000..f18f8798d
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_29.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_3.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_3.png
new file mode 100755
index 000000000..93e694375
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_3.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_30.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_30.png
new file mode 100755
index 000000000..64cf58580
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_30.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_31.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_31.png
new file mode 100755
index 000000000..2502b3f21
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_31.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_32.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_32.png
new file mode 100755
index 000000000..417419f85
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_32.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_33.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_33.png
new file mode 100755
index 000000000..5c7906075
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_33.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_34.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_34.png
new file mode 100755
index 000000000..26dfe5391
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_34.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_35.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_35.png
new file mode 100755
index 000000000..b6d507057
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_35.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_36.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_36.png
new file mode 100755
index 000000000..7bd425e1d
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_36.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_37.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_37.png
new file mode 100755
index 000000000..7edea62a1
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_37.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_38.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_38.png
new file mode 100755
index 000000000..7b51b6a34
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_38.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_39.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_39.png
new file mode 100755
index 000000000..30b6bd67e
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_39.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_4.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_4.png
new file mode 100755
index 000000000..ff0b1fb28
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_4.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_40.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_40.png
new file mode 100755
index 000000000..d413cf0ed
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_40.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_41.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_41.png
new file mode 100755
index 000000000..277077265
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_41.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_42.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_42.png
new file mode 100755
index 000000000..baf3c7c79
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_42.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_43.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_43.png
new file mode 100755
index 000000000..b4cb1179f
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_43.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_44.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_44.png
new file mode 100755
index 000000000..09dfc28e8
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_44.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_45.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_45.png
new file mode 100755
index 000000000..94b26fe06
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_45.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_46.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_46.png
new file mode 100755
index 000000000..28f47d714
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_46.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_47.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_47.png
new file mode 100755
index 000000000..a9cc34ca2
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_47.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_48.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_48.png
new file mode 100755
index 000000000..cc9a89dad
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_48.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_49.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_49.png
new file mode 100755
index 000000000..ef68cf866
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_49.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_5.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_5.png
new file mode 100755
index 000000000..b0367a603
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_5.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_50.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_50.png
new file mode 100755
index 000000000..a44a566c7
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_50.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_51.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_51.png
new file mode 100755
index 000000000..ba00473dd
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_51.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_52.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_52.png
new file mode 100755
index 000000000..8045749ac
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_52.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_53.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_53.png
new file mode 100755
index 000000000..18337cd63
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_53.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_54.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_54.png
new file mode 100755
index 000000000..10be0ad16
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_54.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_55.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_55.png
new file mode 100755
index 000000000..fd8269bb4
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_55.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_56.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_56.png
new file mode 100755
index 000000000..300cbd9ec
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_56.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_6.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_6.png
new file mode 100755
index 000000000..56f37fbd8
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_6.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_7.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_7.png
new file mode 100755
index 000000000..0e4fb27a6
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_7.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_8.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_8.png
new file mode 100755
index 000000000..641d06f39
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_8.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_9.png b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_9.png
new file mode 100755
index 000000000..5bcf7e588
Binary files /dev/null and b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/frame_9.png differ
diff --git a/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/meta.txt b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/meta.txt
new file mode 100755
index 000000000..4eeb91306
--- /dev/null
+++ b/assets/dolphin/external/L3_Freedom_2_dolphins_128x64/meta.txt
@@ -0,0 +1,23 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 20
+Active frames: 38
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 12 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
+Active cycles: 1
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 1
+
+Slot: 0
+X: 52
+Y: 46
+Text: Thanks, man!
+AlignH: Left
+AlignV: Top
+StartFrame: 37
+EndFrame: 40
\ No newline at end of file
diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt
index 9aaff3c6f..d9488cbba 100644
--- a/assets/dolphin/external/manifest.txt
+++ b/assets/dolphin/external/manifest.txt
@@ -104,7 +104,7 @@ Min butthurt: 0
 Max butthurt: 8
 Min level: 1
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L2_Wake_up_128x64
 Min butthurt: 0
@@ -139,7 +139,7 @@ Min butthurt: 0
 Max butthurt: 8
 Min level: 2
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L3_Furippa3_128x64
 Min butthurt: 0
@@ -167,21 +167,28 @@ Min butthurt: 8
 Max butthurt: 13
 Min level: 1
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L2_Coding_in_the_shell_128x64
 Min butthurt: 0
 Max butthurt: 12
 Min level: 2
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L2_Secret_door_128x64
 Min butthurt: 0
 Max butthurt: 12
 Min level: 2
 Max level: 3
-Weight: 4
+Weight: 3
+
+Name: L3_Freedom_2_dolphins_128x64
+Min butthurt: 0
+Max butthurt: 12
+Min level: 3
+Max level: 3
+Weight: 5
 
 Name: L3_Fireplace_128x64
 Min butthurt: 0
diff --git a/documentation/.gitignore b/documentation/.gitignore
index c18ff03bb..9c7aebc74 100644
--- a/documentation/.gitignore
+++ b/documentation/.gitignore
@@ -1,2 +1 @@
-/html
-/latex
\ No newline at end of file
+/doxygen/build
\ No newline at end of file
diff --git a/documentation/AppManifests.md b/documentation/AppManifests.md
index 9afdccb0e..b612df1b7 100644
--- a/documentation/AppManifests.md
+++ b/documentation/AppManifests.md
@@ -1,14 +1,14 @@
-# Flipper Application Manifests (.fam)
+# Flipper Application Manifests (.fam) {#app_manifests}
 
 All components of Flipper Zero firmware — services, user applications, and system settings — are developed independently. Each component has a build system manifest file named `application.fam`, which defines the basic properties of that component and its relations to other parts of the system.
 
-When building firmware, **`fbt`** collects all application manifests and processes their dependencies. Then it builds only those components referenced in the current build configuration. See [FBT docs](./fbt.md#firmware-application-set) for details on build configurations.
+When building firmware, `fbt` collects all application manifests and processes their dependencies. Then it builds only those components referenced in the current build configuration. See [FBT docs](fbt.md) for details on build configurations.
 
 ## Application definition
 
 A firmware component's properties are declared in a Python code snippet, forming a call to the `App()` function with various parameters.
 
-Only two parameters are mandatory: **_appid_** and **_apptype_**. Others are optional and may only be meaningful for certain application types.
+Only two parameters are mandatory: **appid** and **apptype**. Others are optional and may only be meaningful for certain application types.
 
 ### Parameters
 
@@ -34,7 +34,7 @@ Only two parameters are mandatory: **_appid_** and **_apptype_**. Others are opt
 - **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. **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.
+- **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.
 - **stack_size**: stack size in bytes to allocate for an application on its startup. Note that allocating a stack too small for an app to run will cause a system crash due to stack overflow, and allocating too much stack space will reduce usable heap memory size for apps to process data. _Note: you can use `ps` and `free` CLI commands to profile your app's memory usage._
 - **icon**: animated icon name from built-in assets to be used when building the app as a part of the firmware.
@@ -55,11 +55,11 @@ The following parameters are used only for [FAPs](./AppsOnSDCard.md):
 - **fap_description**: string, may be empty. Short application description.
 - **fap_author**: string, may be empty. Application's author.
 - **fap_weburl**: string, may be empty. Application's homepage.
-- **fap_icon_assets**: string. If present, it defines a folder name to be used for gathering image assets for this application. These images will be preprocessed and built alongside the application. See [FAP assets](./AppsOnSDCard.md#fap-assets) for details.
-- **fap_extbuild**: provides support for parts of application sources to be built by external tools. Contains a list of `ExtFile(path="file name", command="shell command")` definitions. **`fbt`** will run the specified command for each file in the list.
+- **fap_icon_assets**: string. If present, it defines a folder name to be used for gathering image assets for this application. These images will be preprocessed and built alongside the application. See [FAP assets](AppsOnSDCard.md) for details.
+- **fap_extbuild**: provides support for parts of application sources to be built by external tools. Contains a list of `ExtFile(path="file name", command="shell command")` definitions. `fbt` will run the specified command for each file in the list.
 - **fal_embedded**: boolean, default `False`. Applies only to PLUGIN type. If `True`, the plugin will be embedded into host application's .fap file as a resource and extracted to `apps_assets/APPID` folder on its start. This allows plugins to be distributed as a part of the host application.
 
-Note that commands are executed at the firmware root folder, and all intermediate files must be placed in an application's temporary build folder. For that, you can use pattern expansion by **`fbt`**: `${FAP_WORK_DIR}` will be replaced with the path to the application's temporary build folder, and `${FAP_SRC_DIR}` will be replaced with the path to the application's source folder. You can also use other variables defined internally by **`fbt`**.
+Note that commands are executed at the firmware root folder, and all intermediate files must be placed in an application's temporary build folder. For that, you can use pattern expansion by `fbt`: `${FAP_WORK_DIR}` will be replaced with the path to the application's temporary build folder, and `${FAP_SRC_DIR}` will be replaced with the path to the application's source folder. You can also use other variables defined internally by `fbt`.
 
 Example for building an app from Rust sources:
 
@@ -77,12 +77,12 @@ Example for building an app from Rust sources:
   Library sources must be placed in a subfolder of the `lib` folder within the application's source folder.
   Each library is defined as a call to the `Lib()` function, accepting the following parameters:
 
-    - **name**: name of the library's folder. Required.
-    - **fap_include_paths**: list of the library's relative paths to add to the parent fap's include path list. The default value is `["."]`, meaning the library's source root.
-    - **sources**: list of filename masks to be used for gathering include files for this library. Paths are relative to the library's source root. The default value is `["*.c*"]`.
-    - **cflags**: list of additional compiler flags to be used for building this library. The default value is `[]`.
-    - **cdefines**: list of additional preprocessor definitions to be used for building this library. The default value is `[]`.
-    - **cincludes**: list of additional include paths to be used for building this library. Paths are relative to the application's root. This can be used for providing external search paths for this library's code — for configuration headers. The default value is `[]`.
+  - **name**: name of the library's folder. Required.
+  - **fap_include_paths**: list of the library's relative paths to add to the parent fap's include path list. The default value is `["."]`, meaning the library's source root.
+  - **sources**: list of filename masks to be used for gathering include files for this library. Paths are relative to the library's source root. The default value is `["*.c*"]`.
+  - **cflags**: list of additional compiler flags to be used for building this library. The default value is `[]`.
+  - **cdefines**: list of additional preprocessor definitions to be used for building this library. The default value is `[]`.
+  - **cincludes**: list of additional include paths to be used for building this library. Paths are relative to the application's root. This can be used for providing external search paths for this library's code — for configuration headers. The default value is `[]`.
 
 Example for building an app with a private library:
 
@@ -105,12 +105,12 @@ Example for building an app with a private library:
         ],
 ```
 
-For that snippet, **`fbt`** will build 2 libraries: one from sources in `lib/mbedtls` folder and another from sources in the `lib/loclass` folder. For the `mbedtls` library, **`fbt`** will add `lib/mbedtls/include` to the list of include paths for the application and compile only the files specified in the `sources` list. Additionally, **`fbt`** will enable `MBEDTLS_ERROR_C` preprocessor definition for `mbedtls` sources.
-For the `loclass` library, **`fbt`** will add `lib/loclass` to the list of the include paths for the application and build all sources in that folder. Also, **`fbt`** will disable treating compiler warnings as errors for the `loclass` library, which can be useful when compiling large 3rd-party codebases.
+For that snippet, `fbt` will build 2 libraries: one from sources in `lib/mbedtls` folder and another from sources in the `lib/loclass` folder. For the `mbedtls` library, `fbt` will add `lib/mbedtls/include` to the list of include paths for the application and compile only the files specified in the `sources` list. Additionally, `fbt` will enable `MBEDTLS_ERROR_C` preprocessor definition for `mbedtls` sources.
+For the `loclass` library, `fbt` will add `lib/loclass` to the list of the include paths for the application and build all sources in that folder. Also, `fbt` will disable treating compiler warnings as errors for the `loclass` library, which can be useful when compiling large 3rd-party codebases.
 
 Both libraries will be linked with the application.
 
-## `.fam` file contents
+## .fam file contents
 
 The `.fam` file contains one or more application definitions. For example, here's a part of `applications/service/bt/application.fam`:
 
diff --git a/documentation/AppsOnSDCard.md b/documentation/AppsOnSDCard.md
index 3f6d51acf..cb8106fc6 100644
--- a/documentation/AppsOnSDCard.md
+++ b/documentation/AppsOnSDCard.md
@@ -1,4 +1,4 @@
-# FAP (Flipper Application Package)
+# FAP (Flipper Application Package) {#apps_on_sd_card}
 
 [fbt](./fbt.md) supports building applications as FAP files. FAPs are essentially `.elf` executables with extra metadata and resources bundled in.
 
@@ -6,7 +6,7 @@ FAPs are built with the `faps` target. They can also be deployed to the `dist` f
 
 FAPs do not depend on being run on a specific firmware version. Compatibility is determined by the FAP's metadata, which includes the required [API version](#api-versioning).
 
-## How to set up an application to be built as a FAP
+## How to set up an application to be built as a FAP {#fap-howto}
 
 FAPs are created and developed the same way as internal applications that are part of the firmware.
 
@@ -21,15 +21,15 @@ To build your application as a FAP, create a folder with your app's source code
 
 FAPs can include static and animated images as private assets. They will be automatically compiled alongside application sources and can be referenced the same way as assets from the main firmware.
 
-To use that feature, put your images in a subfolder inside your application's folder, then reference that folder in your application's manifest in the `fap_icon_assets` field. See [Application Manifests](./AppManifests.md#application-definition) for more details.
+To use that feature, put your images in a subfolder inside your application's folder, then reference that folder in your application's manifest in the `fap_icon_assets` field. See [Application Manifests](AppManifests.md) for more details.
 
 To use these assets in your application, put `#include "{APPID}_icons.h"` in your application's source code, where `{APPID}` is the `appid` value field from your application's manifest. Then you can use all icons from your application's assets the same way as if they were a part of `assets_icons.h` of the main firmware.
 
-Images and animated icons should follow the same [naming convention](../assets/ReadMe.md#asset-naming-rules) as those from the main firmware.
+Images and animated icons should follow the same [naming convention](../assets/ReadMe.md) as those from the main firmware.
 
 ## Debugging FAPs
 
-**`fbt`** includes a script for gdb-py to provide debugging support for FAPs, `debug/flipperapps.py`. It is loaded in default debugging configurations by **`fbt`** and stock VS Code configurations.
+`fbt` includes a script for gdb-py to provide debugging support for FAPs, `debug/flipperapps.py`. It is loaded in default debugging configurations by `fbt` and stock VS Code configurations.
 
 With it, you can debug FAPs as if they were a part of the main firmware — inspect variables, set breakpoints, step through the code, etc.
 
@@ -43,7 +43,7 @@ To debug FAPs, do the following:
 
 1. Build firmware with `./fbt`
 2. Flash it with `./fbt flash`
-3. [Build your FAP](#how-to-set-up-an-application-to-be-built-as-a-fap) and run it on Flipper
+3. [Build your FAP](#fap-howto) and run it on Flipper
 
 After that, you can attach with `./fbt debug` or VS Code and use all debug features.
 
@@ -59,25 +59,25 @@ Applications are built for a specific API version. It is a part of the hardware
 
 The App Loader allocates memory for the application and copies it to RAM, processing relocations and providing concrete addresses for imported symbols using the [symbol table](#symbol-table). Then it starts the application.
 
-## API versioning
+## API versioning {#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 `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.
+`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.
 
 Breaking changes include:
 
 - Removing a function or a global variable
 - Changing the signature of a function
 
-API versioning is mostly automated by **`fbt`**. When rebuilding the firmware, **`fbt`** checks if there are any changes in the API exposed by headers gathered from `SDK_HEADERS`. If so, it stops the build, adjusts the API version, and asks the user to go through the changes in the `.csv` file. New entries are marked with a "`?`" mark, and the user is supposed to change the mark to "`+`" for the entry to be exposed for FAPs, or to "`-`" for it to be unavailable.
+API versioning is mostly automated by `fbt`. When rebuilding the firmware, `fbt` checks if there are any changes in the API exposed by headers gathered from `SDK_HEADERS`. If so, it stops the build, adjusts the API version, and asks the user to go through the changes in the `.csv` file. New entries are marked with a "`?`" mark, and the user is supposed to change the mark to "`+`" for the entry to be exposed for FAPs, or to "`-`" for it to be unavailable.
 
-**`fbt`** will not allow building a firmware until all "`?`" entries are changed to "`+`" or "`-`".
+`fbt` will not allow building a firmware until all "`?`" entries are changed to "`+`" or "`-`".
 
-**NB:** **`fbt`** automatically manages the API version. The only case where manually incrementing the major API version is allowed (and required) is when existing "`+`" entries are to be changed to "`-`".
+**NB:** `fbt` automatically manages the API version. The only case where manually incrementing the major API version is allowed (and required) is when existing "`+`" entries are to be changed to "`-`".
 
-### Symbol table
+### Symbol table {#symbol-table}
 
-The symbol table is a list of symbols exported by firmware and available for external applications. It is generated by **`fbt`** from the API symbols file and is used by the App Loader to resolve addresses of imported symbols. It is build as a part of the `fap_loader` application.
+The symbol table is a list of symbols exported by firmware and available for external applications. It is generated by `fbt` from the API symbols file and is used by the App Loader to resolve addresses of imported symbols. It is build as a part of the `fap_loader` application.
 
-**`fbt`** also checks if all imported symbols are present in the symbol table. If there are any missing symbols, it will issue a warning listing them. The application won't be able to run on the device until all required symbols are provided in the symbol table.
+`fbt` also checks if all imported symbols are present in the symbol table. If there are any missing symbols, it will issue a warning listing them. The application won't be able to run on the device until all required symbols are provided in the symbol table.
diff --git a/documentation/Doxyfile b/documentation/Doxyfile
index f31cbb9d8..5b93cf8b1 100644
--- a/documentation/Doxyfile
+++ b/documentation/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.2
+# Doxyfile 1.10.0
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -12,6 +12,16 @@
 # For lists, items can also be appended using:
 # TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -51,25 +61,43 @@ PROJECT_BRIEF          =
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           =
+PROJECT_LOGO           = $(DOXY_CONFIG_DIR)/logo.png
+
+# With the PROJECT_ICON tag one can specify an icon that is included in the tabs
+# when the HTML document is shown. Doxygen will copy the logo to the output
+# directory.
+
+PROJECT_ICON           = $(DOXY_CONFIG_DIR)/favicon.ico
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = documentation
+OUTPUT_DIRECTORY       = $(DOXY_CONFIG_DIR)/build
 
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
 # option can be useful when feeding doxygen a huge amount of source files, where
 # putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
 # The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# number of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
 # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII
 # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
@@ -81,14 +109,14 @@ ALLOW_UNICODE_NAMES    = NO
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
 # The default value is: English.
 
 OUTPUT_LANGUAGE        = English
@@ -341,13 +369,24 @@ MARKDOWN_SUPPORT       = YES
 
 TOC_INCLUDE_HEADINGS   = 5
 
+# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
+# generate identifiers for the Markdown headings. Note: Every identifier is
+# unique.
+# Possible values are: DOXYGEN use a fixed 'autotoc_md' string followed by a
+# sequence number starting at 0 and GITHUB use the lower case version of title
+# with any whitespace replaced by '-' and punctuation characters removed.
+# The default value is: DOXYGEN.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_ID_STYLE      = DOXYGEN
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
 # globally by setting AUTOLINK_SUPPORT to NO.
 # The default value is: YES.
 
-AUTOLINK_SUPPORT       = YES
+AUTOLINK_SUPPORT       = NO
 
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should set this
@@ -452,7 +491,7 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
-# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
 # during processing. When set to 0 doxygen will based this on the number of
 # cores available in the system. You can set it explicitly to a value larger
 # than 0 to get more control over the balance between CPU load and processing
@@ -465,6 +504,14 @@ LOOKUP_CACHE_SIZE      = 0
 
 NUM_PROC_THREADS       = 1
 
+# If the TIMESTAMP tag is set different from NO then each generated page will
+# contain the date or date and time when the page was generated. Setting this to
+# NO can help when comparing the output of multiple runs.
+# Possible values are: YES, NO, DATETIME and DATE.
+# The default value is: NO.
+
+TIMESTAMP              = NO
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -546,7 +593,8 @@ HIDE_UNDOC_MEMBERS     = NO
 # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set
 # to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
+# will also hide undocumented C++ concepts if enabled. This option has no effect
+# if EXTRACT_ALL is enabled.
 # The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
@@ -577,14 +625,15 @@ INTERNAL_DOCS          = NO
 # filesystem is case sensitive (i.e. it supports files in the same directory
 # whose names only differ in casing), the option must be set to YES to properly
 # deal with such files in case they appear in the input. For filesystems that
-# are not case sensitive the option should be be set to NO to properly deal with
+# are not case sensitive the option should be set to NO to properly deal with
 # output files written for symbols that only differ in casing, such as for two
 # classes, one named CLASS and the other named Class, and to also support
 # references to files without having to specify the exact matching casing. On
 # Windows (including Cygwin) and MacOS, users should typically set this option
 # to NO, whereas on Linux or other Unix flavors it should typically be set to
 # YES.
-# The default value is: system dependent.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
 
 CASE_SENSE_NAMES       = NO
 
@@ -793,7 +842,7 @@ CITE_BIB_FILES         =
 # messages are off.
 # The default value is: NO.
 
-QUIET                  = NO
+QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
@@ -809,7 +858,7 @@ WARNINGS               = YES
 # will automatically be disabled.
 # The default value is: YES.
 
-WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_UNDOCUMENTED   = NO
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as documenting some parameters in
@@ -834,16 +883,31 @@ WARN_IF_INCOMPLETE_DOC = YES
 # WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
-WARN_NO_PARAMDOC       = NO
+WARN_NO_PARAMDOC       = YES
+
+# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about
+# undocumented enumeration values. If set to NO, doxygen will accept
+# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: NO.
+
+WARN_IF_UNDOC_ENUM_VAL = NO
 
 # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
 # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
 # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
 # at the end of the doxygen process doxygen will return with a non-zero status.
-# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then doxygen behaves
+# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined doxygen will not
+# write the warning messages in between other messages but write them at the end
+# of a run, in case a WARN_LOGFILE is defined the warning messages will be
+# besides being in the defined file also be shown at the end of a run, unless
+# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case
+# the behavior will remain as with the setting FAIL_ON_WARNINGS.
+# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
 # The default value is: NO.
 
-WARN_AS_ERROR          = NO
+WARN_AS_ERROR          = FAIL_ON_WARNINGS
 
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
@@ -851,13 +915,27 @@ WARN_AS_ERROR          = NO
 # and the warning text. Optionally the format may contain $version, which will
 # be replaced by the version of the file (if it could be obtained via
 # FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
 # The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"
+
 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
-# error (stderr).
+# error (stderr). In case the file specified cannot be opened for writing the
+# warning and error messages are written to standard error. When as file - is
+# specified the warning and error messages are written to standard output
+# (stdout).
 
 WARN_LOGFILE           =
 
@@ -871,20 +949,34 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = applications \
-                        lib \
-                        firmware \
-                        furi
+INPUT                  = $(DOXY_SRC_ROOT)/applications \
+                         $(DOXY_SRC_ROOT)/documentation \
+                         $(DOXY_SRC_ROOT)/targets \
+                         $(DOXY_SRC_ROOT)/assets \
+                         $(DOXY_SRC_ROOT)/lib \
+                         $(DOXY_SRC_ROOT)/furi \
+                         $(DOXY_SRC_ROOT)/.vscode
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
 # documentation (see:
 # https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
+# "INPUT_ENCODING" for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =
+
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
 # *.h) to filter out the source-files in the directories.
@@ -896,12 +988,12 @@ INPUT_ENCODING         = UTF-8
 # Note the list of default checked file patterns might differ from the list of
 # default file extension mappings.
 #
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
-# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
-# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
-# *.vhdl, *.ucf, *.qsf and *.ice.
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cxxm,
+# *.cpp, *.cppm, *.ccm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl,
+# *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d,
+# *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to
+# be provided as doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -927,19 +1019,45 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE = \
-    lib/mlib \
-    lib/stm32wb_cmsis \
-    lib/stm32wb_copro \
-    lib/stm32wb_hal_driver \
-    lib/littlefs \
-    lib/nanopb \
-    assets/protobuf \
-    lib/libusb_stm32 \
-    lib/FreeRTOS-Kernel \
-    lib/microtar \
-    lib/mbedtls \
-    lib/cxxheaderparser
+EXCLUDE                = $(DOXY_SRC_ROOT)/lib/mlib \
+                         $(DOXY_SRC_ROOT)/lib/STM32CubeWB \
+                         $(DOXY_SRC_ROOT)/lib/littlefs \
+                         $(DOXY_SRC_ROOT)/lib/nanopb \
+                         $(DOXY_SRC_ROOT)/assets/protobuf \
+                         $(DOXY_SRC_ROOT)/lib/libusb_stm32 \
+                         $(DOXY_SRC_ROOT)/lib/FreeRTOS-Kernel \
+                         $(DOXY_SRC_ROOT)/lib/microtar \
+                         $(DOXY_SRC_ROOT)/lib/mbedtls \
+                         $(DOXY_SRC_ROOT)/lib/cxxheaderparser \
+                         $(DOXY_SRC_ROOT)/lib/ST25RFAL002 \
+                         $(DOXY_SRC_ROOT)/lib/fatfs \
+                         $(DOXY_SRC_ROOT)/lib/mlib \
+                         $(DOXY_SRC_ROOT)/lib/stm32wb_cmsis \
+                         $(DOXY_SRC_ROOT)/lib/stm32wb_copro \
+                         $(DOXY_SRC_ROOT)/lib/stm32wb_hal_driver \
+                         $(DOXY_SRC_ROOT)/lib/stm32wb_hal \
+                         $(DOXY_SRC_ROOT)/lib/cmsis_core \
+                         $(DOXY_SRC_ROOT)/targets/f7/fatfs/ \
+                         $(DOXY_SRC_ROOT)/applications/plugins/dap_link/lib/free-dap \
+                         $(DOXY_SRC_ROOT)/applications/debug \
+                         $(DOXY_SRC_ROOT)/applications/main \
+                         $(DOXY_SRC_ROOT)/applications/settings \
+                         $(DOXY_SRC_ROOT)/lib/micro-ecc \
+                         $(DOXY_SRC_ROOT)/lib/ReadMe.md \
+                         $(DOXY_SRC_ROOT)/lib/callback-connector \
+                         $(DOXY_SRC_ROOT)/lib/app-scened-template \
+                         $(DOXY_SRC_ROOT)/applications/ReadMe.md \
+                         $(DOXY_SRC_ROOT)/targets/ReadMe.md \
+                         $(DOXY_SRC_ROOT)/web \
+                         $(DOXY_SRC_ROOT)/assets/protobuf \
+                         $(DOXY_SRC_ROOT)/lib/libusb_stm32 \
+                         $(DOXY_SRC_ROOT)/lib/FreeRTOS-Kernel \
+                         $(DOXY_SRC_ROOT)/lib/microtar \
+                         $(DOXY_SRC_ROOT)/lib/mbedtls \
+                         $(DOXY_SRC_ROOT)/lib/cxxheaderparser \
+                         $(DOXY_SRC_ROOT)/applications/external/dap_link/lib/free-dap \
+                         $(DOXY_SRC_ROOT)/lib/heatshrink \
+                         $(DOXY_CONFIG_DIR)/doxygen-awesome-css
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -961,10 +1079,7 @@ EXCLUDE_PATTERNS       =
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
+# ANamespace::AClass, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        =
 
@@ -1009,6 +1124,11 @@ IMAGE_PATH             =
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
 #
+# Note that doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.
@@ -1050,6 +1170,15 @@ FILTER_SOURCE_PATTERNS =
 
 USE_MDFILE_AS_MAINPAGE =
 
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72
+
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -1064,7 +1193,8 @@ USE_MDFILE_AS_MAINPAGE =
 SOURCE_BROWSER         = NO
 
 # Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
+# multi-line macros, enums or list initialized variables directly into the
+# documentation.
 # The default value is: NO.
 
 INLINE_SOURCES         = NO
@@ -1147,10 +1277,11 @@ VERBATIM_HEADERS       = YES
 
 ALPHABETICAL_INDEX     = YES
 
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
+# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes)
+# that should be ignored while generating the index headers. The IGNORE_PREFIX
+# tag works for classes, function and member names. The entity will be placed in
+# the alphabetical list under the first letter of the entity name that remains
+# after removing the prefix.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
@@ -1229,7 +1360,12 @@ HTML_STYLESHEET        =
 # Doxygen will copy the style sheet files to the output directory.
 # Note: The order of the extra style sheet files is of importance (e.g. the last
 # style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
+# list).
+# Note: Since the styling of scrollbars can currently not be overruled in
+# Webkit/Chromium, the styling will be left out of the default doxygen.css if
+# one or more extra stylesheets have been specified. So if scrollbar
+# customization is desired it has to be added explicitly. For an example see the
+# documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_STYLESHEET  =
@@ -1244,6 +1380,19 @@ HTML_EXTRA_STYLESHEET  =
 
 HTML_EXTRA_FILES       =
 
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme.
+# Possible values are: LIGHT always generate light mode output, DARK always
+# generate dark mode output, AUTO_LIGHT automatically set the mode according to
+# the user preference, use light mode if no preference is set (the default),
+# AUTO_DARK automatically set the mode according to the user preference, use
+# dark mode if no preference is set and TOGGLE allow to user to switch between
+# light and dark mode via a button.
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = AUTO_LIGHT
+
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a color-wheel, see
@@ -1274,15 +1423,6 @@ HTML_COLORSTYLE_SAT    = 100
 
 HTML_COLORSTYLE_GAMMA  = 80
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
 # are dynamically created via JavaScript. If disabled, the navigation index will
@@ -1302,6 +1442,33 @@ HTML_DYNAMIC_MENUS     = YES
 
 HTML_DYNAMIC_SECTIONS  = NO
 
+# If the HTML_CODE_FOLDING tag is set to YES then classes and functions can be
+# dynamically folded and expanded in the generated HTML source code.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_CODE_FOLDING      = YES
+
+# If the HTML_COPY_CLIPBOARD tag is set to YES then doxygen will show an icon in
+# the top right corner of code and text fragments that allows the user to copy
+# its content to the clipboard. Note this only works if supported by the browser
+# and the web page is served via a secure context (see:
+# https://www.w3.org/TR/secure-contexts/), i.e. using the https: or file:
+# protocol.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COPY_CLIPBOARD    = YES
+
+# Doxygen stores a couple of settings persistently in the browser (via e.g.
+# cookies). By default these settings apply to all HTML pages generated by
+# doxygen across all projects. The HTML_PROJECT_COOKIE tag can be used to store
+# the settings under a project specific key, such that the user preferences will
+# be stored separately.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_PROJECT_COOKIE    =
+
 # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
 # shown in the various tree structured indices initially; the user can expand
 # and collapse entries dynamically later on. Doxygen will expand the tree to
@@ -1338,6 +1505,13 @@ GENERATE_DOCSET        = NO
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
+# This tag determines the URL of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDURL         =
+
 # This tag specifies a string that should uniquely identify the documentation
 # set bundle. This should be a reverse domain-name style string, e.g.
 # com.mycompany.MyDocSet. Doxygen will append .docset to the name.
@@ -1425,6 +1599,16 @@ BINARY_TOC             = NO
 
 TOC_EXPAND             = NO
 
+# The SITEMAP_URL tag is used to specify the full URL of the place where the
+# generated documentation will be placed on the server by the user during the
+# deployment of the documentation. The generated sitemap is called sitemap.xml
+# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL
+# is specified no sitemap is generated. For information about the sitemap
+# protocol see https://www.sitemaps.org
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SITEMAP_URL            =
+
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
 # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
 # can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
@@ -1542,7 +1726,7 @@ GENERATE_TREEVIEW      = NO
 # area (value NO) or if it should extend to the full height of the window (value
 # YES). Setting this to YES gives a layout similar to
 # https://docs.readthedocs.io with more room for contents, but less room for the
-# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# project logo, title, and description. If either GENERATE_TREEVIEW or
 # DISABLE_INDEX is set to NO, this option has no effect.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1573,6 +1757,13 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
+# addresses.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+OBFUSCATE_EMAILS       = YES
+
 # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
 # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
 # https://inkscape.org) to generate formulas as SVG images instead of PNGs for
@@ -1593,17 +1784,6 @@ HTML_FORMULA_FORMAT    = png
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
 # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
 # to create new LaTeX commands to be used in formulas as building blocks. See
 # the section "Including formulas" for details.
@@ -1665,8 +1845,8 @@ MATHJAX_RELPATH        =
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
-# for MathJax version 2 (see https://docs.mathjax.org/en/v2.7-latest/tex.html
-# #tex-and-latex-extensions):
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
 # For example for MathJax version 3 (see
 # http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
@@ -1917,9 +2097,16 @@ PDF_HYPERLINKS         = YES
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help.
+# The LATEX_BATCHMODE tag signals the behavior of LaTeX in case of an error.
+# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch
+# mode nothing is printed on the terminal, errors are scrolled as if <return> is
+# hit at every error; missing files that TeX tries to input or request from
+# keyboard input (\read on a not open input stream) cause the job to abort,
+# NON_STOP In nonstop mode the diagnostic message will appear on the terminal,
+# but there is no possibility of user interaction just like in batch mode,
+# SCROLL In scroll mode, TeX will stop only for missing files to input or if
+# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at
+# each error, asking for user intervention.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1940,14 +2127,6 @@ LATEX_HIDE_INDICES     = NO
 
 LATEX_BIB_STYLE        = plain
 
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
 # The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
 # path from which the emoji images will be read. If a relative path is entered,
 # it will be relative to the LATEX_OUTPUT directory. If left blank the
@@ -2113,13 +2292,39 @@ DOCBOOK_OUTPUT         = docbook
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# AutoGen Definitions (see https://autogen.sourceforge.net/) file that captures
 # the structure of the code including all documentation. Note that this feature
 # is still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
+#---------------------------------------------------------------------------
+# Configuration options related to Sqlite3 output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_SQLITE3 tag is set to YES doxygen will generate a Sqlite3
+# database with symbols found by doxygen stored in tables.
+# The default value is: NO.
+
+GENERATE_SQLITE3       = NO
+
+# The SQLITE3_OUTPUT tag is used to specify where the Sqlite3 database will be
+# put. If a relative path is entered the value of OUTPUT_DIRECTORY will be put
+# in front of it.
+# The default directory is: sqlite3.
+# This tag requires that the tag GENERATE_SQLITE3 is set to YES.
+
+SQLITE3_OUTPUT         = sqlite3
+
+# The SQLITE3_RECREATE_DB tag is set to YES, the existing doxygen_sqlite3.db
+# database file will be recreated with each doxygen run. If set to NO, doxygen
+# will warn if a database file is already found and not modify it.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_SQLITE3 is set to YES.
+
+SQLITE3_RECREATE_DB    = YES
+
 #---------------------------------------------------------------------------
 # Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
@@ -2194,7 +2399,8 @@ SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by the
-# preprocessor.
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
@@ -2261,15 +2467,15 @@ TAGFILES               =
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
+# If the ALLEXTERNALS tag is set to YES, all external classes and namespaces
+# will be listed in the class and namespace index. If set to NO, only the
+# inherited external classes will be listed.
 # The default value is: NO.
 
 ALLEXTERNALS           = NO
 
 # If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
+# in the topic index. If set to NO, only the current project's groups will be
 # listed.
 # The default value is: YES.
 
@@ -2283,25 +2489,9 @@ EXTERNAL_GROUPS        = YES
 EXTERNAL_PAGES         = YES
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to diagram generator tools
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
 # If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
@@ -2310,7 +2500,7 @@ HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# https://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
 # The default value is: NO.
@@ -2327,49 +2517,77 @@ HAVE_DOT               = NO
 
 DOT_NUM_THREADS        = 0
 
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTNAME           = Helvetica
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
 
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTSIZE           = 10
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
 
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then doxygen will
+# generate a graph for each documented class showing the direct and indirect
+# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and
+# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case
+# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the
+# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used.
+# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance
+# relations will be shown as texts / links. Explicit enabling an inheritance
+# graph or choosing a different representation for an inheritance graph of a
+# specific class, can be accomplished by means of the command \inheritancegraph.
+# Disabling an inheritance graph can be accomplished by means of the command
+# \hideinheritancegraph.
+# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
 # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
 # graph for each documented class showing the direct and indirect implementation
 # dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
+# class with other documented classes. Explicit enabling a collaboration graph,
+# when COLLABORATION_GRAPH is set to NO, can be accomplished by means of the
+# command \collaborationgraph. Disabling a collaboration graph can be
+# accomplished by means of the command \hidecollaborationgraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
 # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
+# groups, showing the direct groups dependencies. Explicit enabling a group
+# dependency graph, when GROUP_GRAPHS is set to NO, can be accomplished by means
+# of the command \groupgraph. Disabling a directory graph can be accomplished by
+# means of the command \hidegroupgraph. See also the chapter Grouping in the
+# manual.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2411,8 +2629,8 @@ DOT_UML_DETAILS        = NO
 
 # The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
 # to display on a single line. If the actual line length exceeds this threshold
-# significantly it will wrapped across multiple lines. Some heuristics are apply
-# to avoid ugly line breaks.
+# significantly it will be wrapped across multiple lines. Some heuristics are
+# applied to avoid ugly line breaks.
 # Minimum value: 0, maximum value: 1000, default value: 17.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2429,7 +2647,9 @@ TEMPLATE_RELATIONS     = NO
 # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
 # YES then doxygen will generate a graph for each documented file showing the
 # direct and indirect include dependencies of the file with other documented
-# files.
+# files. Explicit enabling an include graph, when INCLUDE_GRAPH is is set to NO,
+# can be accomplished by means of the command \includegraph. Disabling an
+# include graph can be accomplished by means of the command \hideincludegraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2438,7 +2658,10 @@ INCLUDE_GRAPH          = YES
 # If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
 # set to YES then doxygen will generate a graph for each documented file showing
 # the direct and indirect include dependencies of the file with other documented
-# files.
+# files. Explicit enabling an included by graph, when INCLUDED_BY_GRAPH is set
+# to NO, can be accomplished by means of the command \includedbygraph. Disabling
+# an included by graph can be accomplished by means of the command
+# \hideincludedbygraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2478,16 +2701,26 @@ GRAPHICAL_HIERARCHY    = YES
 # If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
 # dependencies a directory has on other directories in a graphical way. The
 # dependency relations are determined by the #include relations between the
-# files in the directories.
+# files in the directories. Explicit enabling a directory graph, when
+# DIRECTORY_GRAPH is set to NO, can be accomplished by means of the command
+# \directorygraph. Disabling a directory graph can be accomplished by means of
+# the command \hidedirectorygraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
+# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
+# of child directories generated in directory dependency graphs by dot.
+# Minimum value: 1, maximum value: 25, default value: 1.
+# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
+
+DIR_GRAPH_MAX_DEPTH    = 1
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. For an explanation of the image formats see the section
 # output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
+# https://www.graphviz.org/)).
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
@@ -2524,11 +2757,12 @@ DOT_PATH               =
 
 DOTFILE_DIRS           =
 
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
 
-MSCFILE_DIRS           =
+DIA_PATH               =
 
 # The DIAFILE_DIRS tag can be used to specify one or more directories that
 # contain dia files that are included in the documentation (see the \diafile
@@ -2537,10 +2771,10 @@ MSCFILE_DIRS           =
 DIAFILE_DIRS           =
 
 # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
+# path where java can find the plantuml.jar file or to the filename of jar file
+# to be used. If left blank, it is assumed PlantUML is not used or called during
+# a preprocessing step. Doxygen will generate a warning when it encounters a
+# \startuml command in this case and will not generate output for the diagram.
 
 PLANTUML_JAR_PATH      =
 
@@ -2578,18 +2812,6 @@ DOT_GRAPH_MAX_NODES    = 50
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
 # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10) support
@@ -2602,6 +2824,8 @@ DOT_MULTI_TARGETS      = NO
 # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.
+# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
+# graphical representation for inheritance and collaboration diagrams is used.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2615,3 +2839,19 @@ GENERATE_LEGEND        = YES
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. If the MSCGEN_TOOL tag is left empty (the default), then doxygen will
+# use a built-in version of mscgen tool to produce the charts. Alternatively,
+# the MSCGEN_TOOL tag can also specify the name an external tool. For instance,
+# specifying prog as the value, doxygen will call the tool as prog -T
+# <outfile_format> -o <outputfile> <inputfile>. The external tool should support
+# output file formats "png", "eps", "svg", and "ismap".
+
+MSCGEN_TOOL            =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
diff --git a/documentation/ExpansionModules.md b/documentation/ExpansionModules.md
index c757c0d2b..470564e57 100644
--- a/documentation/ExpansionModules.md
+++ b/documentation/ExpansionModules.md
@@ -1,4 +1,4 @@
-# Expansion Module Protocol - Draft
+# Expansion Module Protocol {#expansion_protocol}
 
 ## Terms and definitions
 
diff --git a/documentation/FuriCheck.md b/documentation/FuriCheck.md
index 02f3fc917..77a44ca84 100644
--- a/documentation/FuriCheck.md
+++ b/documentation/FuriCheck.md
@@ -1,4 +1,4 @@
-# Run time checks and forced system crash
+# Run time checks and forced system crash {#furi_check}
 
 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.
diff --git a/documentation/FuriHalBus.md b/documentation/FuriHalBus.md
index 7880c041f..12c5a70ec 100644
--- a/documentation/FuriHalBus.md
+++ b/documentation/FuriHalBus.md
@@ -1,4 +1,4 @@
-# Using FuriHalBus API
+# Using FuriHalBus API {#furi_hal_bus}
 
 ## Basic info
 
diff --git a/documentation/FuriHalDebuging.md b/documentation/FuriHalDebuging.md
index da00cbdfb..5104a9998 100644
--- a/documentation/FuriHalDebuging.md
+++ b/documentation/FuriHalDebuging.md
@@ -1,4 +1,4 @@
-# Furi HAL Debugging
+# Furi HAL Debugging {#furi_hal_debugging}
 
 Some Furi subsystems got additional debugging features that can be enabled by adding additional defines to firmware compilation.
 Usually they are used for low level tracing and profiling or signal redirection/duplication.
diff --git a/documentation/HardwareTargets.md b/documentation/HardwareTargets.md
index b3213d4f5..9c36088ea 100644
--- a/documentation/HardwareTargets.md
+++ b/documentation/HardwareTargets.md
@@ -1,4 +1,4 @@
-## What a Firmware Target is
+## What a Firmware Target is {#hardware_targets}
 
 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_.
 
@@ -29,7 +29,7 @@ A target definition file, `target.json`, is a JSON file that can contain the fol
 
 Not all applications are available on different hardware targets. 
 
-* For applications built into the firmware, you have to specify a compatible application set using `FIRMWARE_APP_SET=...` fbt option. See [fbt docs](./fbt.md#firmware-application-set) for details on build configurations.
+* For applications built into the firmware, you have to specify a compatible application set using `FIRMWARE_APP_SET=...` fbt option. See [fbt docs](./fbt.md) for details on build configurations.
 
 * For applications built as external .faps, you have to explicitly specify compatible targets in application's manifest, `application.fam`. For example, to limit application to a single target, add `targets=["f7"],` to the manifest. It won't be built for other targets.
 
diff --git a/documentation/KeyCombo.md b/documentation/KeyCombo.md
index 6db5b4113..e3c5e0004 100644
--- a/documentation/KeyCombo.md
+++ b/documentation/KeyCombo.md
@@ -1,4 +1,4 @@
-# Key Combos
+# Key Combos {#key_combos}
 
 There are times when your Flipper feels blue and doesn't respond to any of your commands due to a software issue. This guide will help you solve this problem.
 
diff --git a/documentation/LFRFIDRaw.md b/documentation/LFRFIDRaw.md
index 5a8cbde60..526b9a3cb 100644
--- a/documentation/LFRFIDRaw.md
+++ b/documentation/LFRFIDRaw.md
@@ -1,4 +1,4 @@
-# Reading RAW RFID data
+# Reading RAW RFID data {#lfrfid_raw}
 
 Flipper Zero has the option to read RAW data from 125 kHz cards that allows you to record the card's data and save it, similar to how a dictaphone records sound.
 
diff --git a/documentation/OTA.md b/documentation/OTA.md
index ed75560cf..9028eff71 100644
--- a/documentation/OTA.md
+++ b/documentation/OTA.md
@@ -1,20 +1,22 @@
-# Executing code from RAM
+# Flipper Zero OTA update process {#ota_updates}
+
+## Executing code from RAM
 
 In Flipper firmware, we have a special boot mode that loads a specially crafted system image into RAM and transfers control to it. System image executing in RAM has full write access to Flipper's entire flash memory — something that's not possible when running main code from the same flash.
 
 We leverage that boot mode to perform OTA firmware updates, including operations on a radio stack running on the second MCU core.
 
-# How does Flipper OTA work?
+## How does Flipper OTA work?
 
 Installation of OTA updates goes through 3 stages:
 
-## 1. Backing up internal storage (`/int`)
+### 1. Backing up internal storage (/int)
 
 It is a special partition of Flipper's flash memory, taking up all available space not used by the firmware code. Newer versions of firmware may be of different size, and simply installing them would cause flash repartitioning and data loss.
 
 So, before taking any action on the firmware, we back up the current configuration from `/int` into a plain tar archive on the SD card.
 
-## 2. Performing device update
+### 2. Performing device update
 
 The main firmware loads an updater image — a customized build of the main Flipper firmware — into RAM and runs it. Updater performs operations on system flash as described by an Update manifest file.
 
@@ -24,17 +26,17 @@ Then, updater validates and corrects Option Bytes — a special memory region co
 
 After that, updater loads a `.dfu` file with firmware to be flashed, checks its integrity using CRC32, writes it to system flash and validates written data.
 
-## 3. Restoring internal storage and updating resources
+### 3. Restoring internal storage and updating resources
 
 After performing operations on flash memory, the system restarts into newly flashed firmware. Then it performs restoration of previously backed up `/int` contents.
 
 If the update package contains an additional resources archive, it is extracted onto the SD card.
 
-# Update manifest
+## Update manifest
 
 An update package comes with a manifest that contains a description of its contents. The manifest is in Flipper File Format — a simple text file, comprised of key-value pairs.
 
-## Mandatory fields
+### Mandatory fields
 
 An update manifest must contain the following keys in the given order:
 
@@ -50,7 +52,7 @@ An update manifest must contain the following keys in the given order:
 
 - **Loader CRC**: CRC32 of loader file. Note that it is represented in little-endian hex.
 
-## Optional fields
+### Optional fields
 
 Other fields may have empty values. In this case, updater skips all operations related to these values.
 
@@ -66,7 +68,7 @@ Other fields may have empty values. In this case, updater skips all operations r
 
 - **OB reference**, **OB mask**, **OB write mask**: reference values for validating and correcting option bytes.
 
-# OTA update error codes
+## OTA update error codes
 
 We designed the OTA update process to be as fail-safe as possible. We don't start any risky operations before validating all related pieces of data to ensure we don't leave the device in a partially updated, or bricked, state.
 
@@ -102,21 +104,21 @@ Even if something goes wrong, updater allows you to retry failed operations and
 |      Restoring LFS      | **12** | **0-100**  | FS read/write error                        |
 |   Updating resources    | **13** | **0-100**  | SD card read/write error                   |
 
-# Building update packages
+## Building update packages
 
-## Full package
+### Full package
 
 To build a full update package, including firmware, radio stack and resources for the SD card, run:
 
 `./fbt COMPACT=1 DEBUG=0 updater_package`
 
-## Minimal package
+### Minimal package
 
 To build a minimal update package, including only firmware, run:
 
 `./fbt COMPACT=1 DEBUG=0 updater_minpackage`
 
-## Customizing update bundles
+### Customizing update bundles
 
 Default update packages are built with Bluetooth Light stack.
 You can pick a different stack if your firmware version supports it, and build a bundle with it by passing the stack type and binary name to `fbt`:
@@ -127,7 +129,7 @@ Note that `COPRO_OB_DATA` must point to a valid file in the `scripts` folder con
 
 In certain cases, you might have to confirm your intentions by adding `COPRO_DISCLAIMER=...` to the build command line.
 
-## Building partial update packages
+### Building partial update packages
 
 You can customize package contents by calling `scripts/update.py` directly.
 For example, to build a package only for installing BLE FULL stack:
diff --git a/documentation/SubGHzSettings.md b/documentation/SubGHzSettings.md
index 1988dcbd8..3c952a1a3 100644
--- a/documentation/SubGHzSettings.md
+++ b/documentation/SubGHzSettings.md
@@ -40,6 +40,7 @@ if you need your custom one, make sure it doesn't listed here
     390000000,
     418000000,
     430000000,
+    430500000,
     431000000,
     431500000,
     433075000, /* LPD433 first */
diff --git a/documentation/UnitTests.md b/documentation/UnitTests.md
index 9352917cd..b77cd56c6 100644
--- a/documentation/UnitTests.md
+++ b/documentation/UnitTests.md
@@ -1,11 +1,11 @@
-# Unit tests
+# Unit tests {#unit_tests}
 
 ## Intro
 
 Unit tests are special pieces of code that apply known inputs to the feature code and check the results to see if they are correct.
 They are crucial for writing robust, bug-free code.
 
-Flipper Zero firmware includes a separate application called [unit_tests](/applications/debug/unit_tests).
+Flipper Zero firmware includes a separate application called [unit_tests](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/applications/debug/unit_tests).
 It is run directly on Flipper devices in order to employ their hardware features and rule out any platform-related differences.
 
 When contributing code to the Flipper Zero firmware, it is highly desirable to supply unit tests along with the proposed features.
@@ -20,7 +20,7 @@ To run the unit tests, follow these steps:
 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.
+See [test_index.c](https://github.com/flipperdevices/flipperzero-firmware/blob/dev/applications/debug/unit_tests/test_index.c) for the complete list of test names.
 
 ## Adding unit tests
 
@@ -28,11 +28,11 @@ See [test_index.c](/applications/debug/unit_tests/test_index.c) for the complete
 
 #### Entry point
 
-The common entry point for all tests is the [unit_tests](/applications/debug/unit_tests) application. Test-specific code is placed into an arbitrarily named subdirectory and is then called from the [test_index.c](/applications/debug/unit_tests/test_index.c) source file.
+The common entry point for all tests is the [unit_tests](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/applications/debug/unit_tests) application. Test-specific code is placed into an arbitrarily named subdirectory and is then called from the [test_index.c](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/applications/debug/unit_tests/test_index.c) source file.
 
 #### Test assets
 
-Some unit tests require external data in order to function. These files (commonly called assets) reside in the [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.).
+Some unit tests require external data in order to function. These files (commonly called assets) reside in the [unit_tests](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/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
 
@@ -41,9 +41,9 @@ 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](/applications/debug/unit_tests/resources/unit_tests/infrared) directory.
+1. Create a file named `test_<your_protocol_name>.irtest` in the [assets](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/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).
+3. Add the test code to [infrared_test.c](https://github.com/flipperdevices/flipperzero-firmware/blob/dev/applications/debug/unit_tests/infrared/infrared_test.c).
 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
new file mode 100644
index 000000000..360d8a0ab
--- /dev/null
+++ b/documentation/UniversalRemotes.md
@@ -0,0 +1,76 @@
+# Universal Remotes {#universal_remotes}
+
+## Televisions
+
+Adding your TV set to the universal remote is quite straightforward. Up to 6 signals can be recorded: `Power`, `Mute`, `Vol_up`, `Vol_dn`, `Ch_next`, and `Ch_prev`. Any of them can be omitted if not supported by your TV.
+
+Each signal is recorded using the following algorithm:
+
+1. Get the remote and point it to Flipper's IR receiver.
+2. Start learning a new remote if it's the first button or press `+` to add a new button otherwise.
+3. Press a remote button and save it under a corresponding name.
+4. Repeat steps 2-3 until all required signals are saved.
+
+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](https://github.com/flipperdevices/flipperzero-firmware/blob/dev/applications/main/infrared/resources/infrared/assets/tv.ir).
+
+## Audio players
+
+Adding your audio player to the universal remote is done in the same manner as described above. Up to 8 signals can be recorded: `Power`, `Play`, `Pause`, `Vol_up`, `Vol_dn`, `Next`, `Prev`, and `Mute`. Any of them can be omitted if not supported by the player.
+
+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](https://github.com/flipperdevices/flipperzero-firmware/blob/dev/applications/main/infrared/resources/infrared/assets/audio.ir).
+
+## Projectors
+
+Adding your projector to the universal remote is really simple. Up to 4 signals can be recorded: `Power`, `Mute`, `Vol_up`, `Vol_dn`. Any of them can be omitted if not supported by your projector.
+To save time, please make sure every recording has been named accordingly.
+In case of omitting, on most projectors with the 4 following buttons, you should not have a problem.
+
+
+## Air conditioners
+
+Air conditioners differ from most other infrared-controlled devices because their state is tracked by the remote.
+The majority of A/C remotes have a small display that shows the current mode, temperature, and other settings.
+When the user presses a button, a whole set of parameters is transmitted to the device, which must be recorded and used as a whole.
+
+In order to add a particular air conditioner to the universal remote, 6 signals must be recorded: `Off`, `Dh`, `Cool_hi`, `Cool_lo`, `Heat_hi`, and `Heat_lo`.
+Each signal (except `Off`) is recorded using the following algorithm:
+
+1. Get the remote and press the **Power Button** so that the display shows that A/C is ON.
+2. Set the A/C to the corresponding mode (see table below), leaving other parameters such as fan speed or vane on **AUTO** (if applicable).
+3. Press the **POWER** button to switch the A/C off.
+4. Start learning a new remote on Flipper if it's the first button or press `+` to add a new button otherwise.
+5. Point the remote to Flipper's IR receiver as directed and press **POWER** button once again.
+6. Save the resulting signal under the specified name.
+7. Repeat steps 2-6 for each signal from the table below.
+
+| Signal  |    Mode    | Temperature | Note                                |
+| :-----: | :--------: | :---------: | ----------------------------------- |
+|   Dh    | Dehumidify |     N/A     |                                     |
+| Cool_hi |  Cooling   |  See note   | Lowest temperature in cooling mode  |
+| Cool_lo |  Cooling   |    23°C     |                                     |
+| Heat_hi |  Heating   |  See note   | Highest temperature in heating mode |
+| Heat_lo |  Heating   |    23°C     |                                     |
+
+Finally, record the `Off` signal:
+
+1. Make sure the display shows that the A/C is ON.
+2. Start learning a new signal on Flipper and point the remote towards the IR receiver.
+3. Press the **POWER** button so that the remote shows the OFF state.
+4. Save the resulting signal under the name `Off`.
+
+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](https://github.com/flipperdevices/flipperzero-firmware/blob/dev/applications/main/infrared/resources/infrared/assets/ac.ir).
+
+## Final steps
+
+The order of signals is not important, but they should be preceded by the following comment: `# Model: <Your model name>` in order to keep the library organized.
+
+When done, open a pull request containing the changed file.
diff --git a/documentation/devboard/Firmware update on Developer Board.md b/documentation/devboard/Firmware update on Developer Board.md
new file mode 100644
index 000000000..f6a81d97b
--- /dev/null
+++ b/documentation/devboard/Firmware update on Developer Board.md	
@@ -0,0 +1,122 @@
+# Firmware update on Developer Board {#dev_board_fw_update}
+
+It's important to regularly update your Developer Board to ensure that you have access to the latest features and bug fixes. This tutorial will guide you through the necessary steps to update the firmware of your Developer Board.
+
+This tutorial assumes that you're familiar with the basics of the command line. If you’re not, please refer to the [Windows](https://www.digitalcitizen.life/command-prompt-how-use-basic-commands/) or [MacOS/Linux](https://ubuntu.com/tutorials/command-line-for-beginners#1-overview) command line tutorials.
+
+***
+
+## Installing the micro Flipper Build Tool
+
+Micro Flipper Build Tool (uFBT) is a cross-platform tool that enables basic development tasks for Flipper Zero, such as building and debugging applications, flashing firmware, and creating VS Code development configurations.
+
+Install uFBT on your computer by running the following command in the Terminal:
+
+**For Linux & macOS:**
+
+```text
+python3 -m pip install --upgrade ufbt
+```
+
+**For Windows:**
+
+```text
+py -m pip install --upgrade ufbt
+```
+
+If you want to learn more about uFBT, visit [the project's page](https://pypi.org/project/ufbt/).
+
+***
+
+## Connecting the Developer Board to your computer
+
+1. List all of the serial devices on your computer.
+
+    **Windows**
+
+    On Windows, go to Device Manager and expand the Ports (COM & LPT) section.
+
+    **macOS**
+
+    On macOS, you can run the following command in the Terminal:
+
+    ```text
+    ls /dev/cu.*
+    ```
+
+    **Linux**
+
+    On Linux, you can run the following command in the Terminal:
+
+    ```text
+    ls /dev/tty*
+    ```
+
+    View the devices in the list.
+
+2. Connect the Developer Board to your computer using a USB-C cable.
+![The Developer Board in Wired mode](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/Aq7gfMI-m_5H6sGGjwb4I_monosnap-miro-2023-07-19-19-47-39.jpg)
+
+3. Switch your Developer Board to Bootloader mode:
+
+    3.1.  Press and hold the **BOOT** button.
+
+    3.2.  Press the **RESET** button while holding the **BOOT** button.
+
+    3.3. Release the **BOOT** button.\
+![You can easily switch the Dev Board to Bootloader mode](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/KynP9iT6sJ3mXLaLyI82__image.png)
+
+4. Repeat Step 1 and view the name of your Developer Board that appeared in the list.
+
+    For example, on macOS:
+
+    ```text
+    /dev/cu.usbmodem01
+    ```
+
+***
+
+## Flashing the firmware
+
+To flash the firmware onto your Developer Board, run the following command in the terminal:
+
+```text
+python3 -m ufbt devboard_flash
+```
+
+You should see the following message: `WiFi board flashed successfully`.
+
+## If flashing failed
+
+If you get an error message during the flashing process, such as this:
+
+```text
+A fatal error occurred: Serial data stream stopped: Possible serial noise or corruption.
+```
+
+Or this:
+
+```text
+FileNotFoundError: [Errno 2] No such file or directory: '/dev/cu.usbmodem01'
+```
+
+Try doing the following:
+
+* Disconnect the Developer Board from your computer, then reconnect it.
+
+* Use a different USB port on your computer.
+
+* Use a different USB-C cable.
+
+***
+
+## Finishing the installation
+
+After flashing the firmware:
+
+1. Reboot the Developer Board by pressing the **RESET** button.
+![Reset the Developer Board](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/rcQeKARgrVwa51tLoo-qY_monosnap-miro-2023-07-20-18-29-33.jpg)
+
+2. Disconnect and reconnect the USB-C cable.
+
+The Developer Board should appear as a serial device on your computer. Now, you can use it with the Black Magic Debug client of your choice.
diff --git a/documentation/devboard/Get started with the Dev Board.md b/documentation/devboard/Get started with the Dev Board.md
new file mode 100644
index 000000000..04fa9d358
--- /dev/null
+++ b/documentation/devboard/Get started with the Dev Board.md	
@@ -0,0 +1,178 @@
+# Get started with the Dev Board {#dev_board_get_started}
+
+The Wi-Fi Developer Board serves as a tool to debug the Flipper Zero firmware. To debug the firmware, the initial step involves compiling the firmware from its source code. This process enables the debugging functionality within the firmware and generates all the necessary files required for debugging purposes.
+
+> **NOTE:**  Building and debugging the Flipper Zero firmware is fully supported on MacOS and Linux. Support for Windows is in beta test.
+
+***
+
+## Updating the firmware of your Developer Board
+
+Update the firmware of your Developer Board before using it. For more information, visit [Firmware update on Developer Board](https://docs.flipperzero.one/development/hardware/wifi-debugger-module/update).
+
+***
+
+## Installing Git
+
+You'll need Git installed on your computer to clone the firmware repository. If you don't have Git, install it by doing the following:
+
+* **MacOS**
+
+    On MacOS, install the **Xcode Command Line Tools** package, which includes Git as one of the pre-installed command-line utilities, by running in the Terminal the following command:
+
+    ```text
+    xcode-select --install
+    ```
+
+* **Linux**
+
+    On Linux, you can install Git using your package manager. For example, on Ubuntu, run in the Terminal the following command:
+
+    ```text
+    sudo apt install git
+    ```
+
+For other distributions, refer to your package manager documentation.
+
+***
+
+## Building the firmware
+
+First, clone the firmware repository:
+
+```text
+git clone --recursive https://github.com/flipperdevices/flipperzero-firmware.git
+cd flipperzero-firmware
+```
+
+Then, run the **Flipper Build Tool** (FBT) to build the firmware:
+
+```text
+./fbt
+```
+
+***
+
+## Connecting the Developer Board
+
+The Developer Board can work in the **Wired** mode and two **Wireless** modes: **Wi-Fi access point (AP)** mode and **Wi-Fi client (STA)** mode. The Wired mode is the simplest to set up, but requires a USB Type-C cable. The Wireless modes are more complex to set up, but they allow you to debug your Flipper Zero wirelessly.
+
+   > **NOTE:**  Use the following credentials when connecting to the Developer Board in **Wi-Fi access point** mode:\n
+    Name: **blackmagic**\n
+    Password: **iamwitcher**
+
+## Wired
+
+![The Developer Board in Wired mode](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/jZdVlRTPVdSQVegzCyXp7_monosnap-miro-2023-06-22-16-28-06.jpg)
+
+To connect the Developer Board in **Wired** mode, do the following:
+
+1. Cold-plug the Developer Board by turning off your Flipper Zero and connecting the Developer Board, and then turning it back on.
+
+2. On your computer, open the **Terminal** and run the following:
+
+    * **MacOS**
+
+        ```text
+        ls /dev/cu.*
+        ```
+
+    * **Linux**
+
+        ```text
+        ls /dev/tty*
+        ```
+
+   Note the list of devices.
+
+3. Connect the Developer Board to your computer via a USB-C cable.
+
+4. Rerun the command. Two new devices have to appear: this is the Developer Board.
+
+   > **NOTE:**  If the Developer Board doesn't appear in the list of devices, try using a different cable, USB port, or computer.
+   >
+   > **NOTE:**  Flipper Zero logs can only be viewed when the Developer Board is connected via USB. The option to view logs over Wi-Fi will be added in future updates. For more information, visit [Reading logs via the Dev Board](https://docs.flipperzero.one/development/hardware/wifi-debugger-module/reading-logs).
+
+## Wireless
+
+### Wi-Fi access point (AP) mode
+
+![The Developer Board in Wi-Fi access point mode](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/tKRTMHAuruiLSEce2a8Ve_monosnap-miro-2023-06-22-16-39-17.jpg)
+
+Out of the box, the Developer Board is configured to work as a **Wi-Fi access point**. This means it'll create its own Wi-Fi network to which you can connect. If your Developer Board doesn't create a Wi-Fi network, it is probably configured to work in **Wi-Fi client** mode. To reset your Developer Board back to **Wi-Fi access point** mode, press and hold the **BOOT** button for 10 seconds, then wait for the module to reboot.
+
+![You can reconfigure the Developer Board mode by pressing and holding the BOOT button](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/57eELJsAwMxeZCEA1NMJw_monosnap-miro-2023-06-22-20-33-27.jpg)
+
+To connect the Developer Board in **Wi-Fi access point** mode, do the following:
+
+1. Cold-plug the Developer Board by turning off your Flipper Zero and connecting the Developer Board, and then turning it back on.
+
+2. Open Wi-Fi settings on your client device (phone, laptop, or other).
+
+3. Connect to the network:
+
+    * Name: **blackmagic**
+
+    * Password: **iamwitcher**
+
+4. To configure the Developer Board, open a browser and go to `http://192.168.4.1`.
+
+### Wi-Fi client (STA) mode
+
+![The Developer Board in Wi-Fi client mode](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/xLQpFyYPfUS5Cx0uQhrNd_monosnap-miro-2023-06-23-12-34-36.jpg)
+
+To connect the Developer Board in **Wi-Fi client** mode, you need to configure it to connect to your Wi-Fi network by doing the following:
+
+1. Cold-plug the Developer Board by turning off your Flipper Zero and connecting the Developer Board, and then turning it back on.
+
+2. Connect to the Developer Board in **Wi-Fi access point** mode.
+
+3. In a browser, go to the configuration page on `http://192.168.4.1`.
+
+4. Select the **STA** mode and enter your network's **SSID** (name) and **password**. For convenience, you can click the **+** button to see the list of nearby networks.
+
+5. Save the configuration and reboot the Developer Board.
+
+![In the Wi-Fi tab, you can set the Developer Board mode](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/klbLVj8lz2bEvm7j4wRaj_monosnap-miro-2023-06-23-13-06-32.jpg)
+
+After rebooting, the Developer Board connects to your Wi-Fi network. You can connect to the device using the mDNS name **blackmagic.local** or the IP address it got from your router (you'll have to figure this out yourself, every router is different).
+
+After connecting to your debugger via <http://blackmagic.local>, you can find its IP address in the **SYS** tab. You can also change the debugger's mode to **AP** or **STA** there.
+
+![In the SYS tab, you can view the IP address of your Developer Board](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/5XbUptlfqzlV0p6hRUqiG_monosnap-miro-2023-06-22-18-11-30.jpg)
+
+***
+
+## Debugging the firmware
+
+Open the **Terminal** in the **flipperzero-firmware** directory that you cloned earlier and run the following command:
+
+```text
+./fbt flash
+```
+
+This will upload the firmware you've just built to your Flipper Zero via the Developer Board. After that, you can start debugging the firmware using the [GDB](https://www.gnu.org/software/gdb/) debugger. We recommend using **VSCode** with the recommended extensions, and we have pre-made configurations for it.
+
+To debug in **VSCode**, do the following:
+
+1. In VSCode, open the **flipperzero-firmware** directory.
+
+2. You should see a notification about recommended extensions. Install them.
+
+    If there were no notifications, open the **Extensions** tab, enter `@recommended` in the search bar, and install the workspace recommendations.
+
+3. In the **Terminal**, run the `./fbt vscode_dist` command. This will generate the VSCode configuration files needed for debugging.
+
+4. In VSCode, open the **Run and Debug** tab and select **Attach FW (blackmagic)** from the dropdown menu.
+
+5. If needed, flash your Flipper Zero with the `./fbt flash` command, then click the **Play** button in the debug sidebar to start the debugging session.
+
+6. Note that starting a debug session halts the execution of the firmware, so you'll need to click the **Continue** button on the toolbar at the top of your VSCode window to continue execution.
+
+![Click Continue in the toolbar to continue execution of the firmware](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/lp8ygGaZ3DvWD3OSI9yGO_monosnap-miro-2023-06-23-17-58-09.jpg)
+
+To learn about debugging, visit the following pages:
+
+* [Debugging with GDB](https://sourceware.org/gdb/current/onlinedocs/gdb.pdf)
+
+* [Debugging in VS Code](https://code.visualstudio.com/docs/editor/debugging)
diff --git a/documentation/devboard/Reading logs via the Dev Board.md b/documentation/devboard/Reading logs via the Dev Board.md
new file mode 100644
index 000000000..e9fc0e2ca
--- /dev/null
+++ b/documentation/devboard/Reading logs via the Dev Board.md	
@@ -0,0 +1,160 @@
+# Reading logs via the Dev Board {#dev_board_reading_logs}
+
+The Developer Board allows you to read Flipper Zero logs via UART. Unlike reading logs via the command-line interface (CLI), the Developer Board enables you to collect logs from the device directly to a serial console independently from the operating system of Flipper Zero. It allows you to see the device's logs when it's loading, updating, or crashing. It's useful for debugging and troubleshooting during software development.
+
+> **NOTE:**  Flipper Zero logs can only be viewed when the developer board is connected via USB. The option to view logs over Wi-Fi will be added in future updates.
+
+***
+
+## Setting the log level
+
+Depending on your needs, you can set the log level by going to **Main Menu -> Settings -> Log Level**. To learn more about logging levels, visit [Settings](https://docs.flipperzero.one/basics/settings#d5TAt).
+
+![You can manually set the preferred log level](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/INzQMw8QUsG9PXi30WFS0_monosnap-miro-2023-07-11-13-29-47.jpg)
+
+***
+
+## Viewing Flipper Zero logs
+
+Depending on your operating system, you need to install an additional application on your computer to read logs via the Developer Board:
+
+### MacOS
+
+On MacOS, you need to install the **minicom** communication program by doing the following:
+
+1. [Install Homebrew](https://brew.sh/) by running the following command in the Terminal:
+
+   ```text
+   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+   ```
+
+2. After installation of Homebrew, run the following command to install minicom:
+
+   ```text
+   brew install minicom
+   ```
+
+After installation of minicom on your macOS computer, you can connect to the Developer Board to read Flipper Zero logs by doing the following:
+
+1. Cold-plug the Developer Board into your Flipper Zero by turning off the Flipper Zero, connecting the developer board, and then turning it back on.
+
+2. On your computer, open the Terminal and run the following command:
+
+   ```text
+   ls /dev/cu.*
+   ```
+
+   Note the list of devices.
+
+3. Connect the developer board to your computer using a USB Type-C cable.
+![Connect the developer board with a USB-C cable](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/iPpsMt2-is4aIjiVeFu5t_hjxs2i1oovrnps74v5jgsimage.png)
+
+4. Rerun the command. Two new devices have to appear: this is the Developer Board.
+
+   ```text
+   /dev/cu.usbmodemblackmagic1
+   ```
+
+   ```text
+   /dev/cu.usbmodemblackmagic3
+   ```
+
+    Your Developer Board might have different names.
+
+5. Run the following command:
+
+   ```text
+   minicom -D /dev/<port> -b 230400
+   ```
+
+    Where `<port>` is the name of your device with a bigger number.
+
+    Example:
+
+   ```text
+   minicom -D /dev/cu.usbmodemblackmagic3 -b 230400
+   ```
+
+6. View logs of your Flipper Zero in the Terminal.
+
+7. To quit, close the minicom window or quit via the minicom menu.
+
+### Linux
+
+On Linux, you need to install the **minicom** communication program. For example, on Ubuntu, run in the Terminal the following command:
+
+```text
+   sudo apt install minicom
+   ```
+
+After installation of minicom on your Linux computer, you can connect to the Developer Board to read Flipper Zero logs by doing the following:
+
+1. Cold-plug the Developer Board into your Flipper Zero by turning off the Flipper Zero, connecting the developer board, and then turning it back on.
+
+2. On your computer, open the Terminal and run the following command:
+
+   ```text
+   ls /dev/tty*
+   ```
+
+    Note the list of devices.
+
+3. Connect the developer board to your computer using a USB Type-C cable.
+![Connect the developer board with a USB-C cable](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/iPpsMt2-is4aIjiVeFu5t_hjxs2i1oovrnps74v5jgsimage.png)
+
+4. Rerun the command. Two new devices have to appear: this is the Developer Board.
+
+   ```text
+   /dev/ttyACM0
+   ```
+
+   ```text
+   /dev/ttyACM1
+   ```
+
+    Your Developer Board might have different names.
+
+5. Run the following command:
+
+    ```text
+    minicom -D /dev/<port> -b 230400
+    ```
+
+    Where `<port>` is the name of your device with a bigger number.
+
+    Example:
+
+    ```text
+    minicom -D /dev/cu.usbmodemblackmagic3 -b 230400
+    ```
+
+6. View logs of your Flipper Zero in the Terminal.
+
+    **NOTE:**  If no logs are shown in the Terminal, try running the command from Step 5 with another device name.
+
+7. To quit, close the minicom window or quit via the minicom menu.
+
+### Windows
+
+On Windows, do the following:
+
+1. On your computer, [install the PuTTY application](https://www.chiark.greenend.org.uk/\~sgtatham/putty/latest.html).
+
+2. Cold-plug the Developer Board into your Flipper Zero by turning off the Flipper Zero, connecting the developer board, and then turning it back on.
+
+3. Connect the developer board to your computer using a USB Type-C cable.
+![Connect the developer board with a USB-C cable](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/iPpsMt2-is4aIjiVeFu5t_hjxs2i1oovrnps74v5jgsimage.png)
+
+4. Find the serial port that the developer board is connected to by going to **Device Manager -> Ports (COM & LPT)** and looking for a new port that appears when you connect the Wi-Fi developer board.
+![Find the serial port in your Device Manager](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/KKLQJK1lvqmI5iab3d__C_image.png)
+
+5. Run the PuTTY application and select **Serial** as the connection type.
+
+6. Enter the port number you found in the previous step into the **Serial line** field.
+
+7. Set the **Speed** parameter to **230400** and click **Open**.
+![Set speed to 230400](https://archbee-image-uploads.s3.amazonaws.com/3StCFqarJkJQZV-7N79yY/ROBSJyfQ_CXiy4GUZcPbs_monosnap-miro-2023-07-12-13-56-47.jpg)
+
+8. View logs of your Flipper Zero in the PuTTY terminal window.
+
+9. To quit, close the PuTTY window.
diff --git a/documentation/fbt.md b/documentation/fbt.md
index 02de2949f..8e083349f 100644
--- a/documentation/fbt.md
+++ b/documentation/fbt.md
@@ -1,4 +1,4 @@
-# Flipper Build Tool
+# Flipper Build Tool {#fbt}
 
 FBT is the entry point for firmware-related commands and utilities.
 It is invoked by `./fbt` in the firmware project root directory. Internally, it is a wrapper around [scons](https://scons.org/) build system.
@@ -58,7 +58,7 @@ To use language servers other than the default VS Code C/C++ language server, us
 
 ## FBT targets
 
-**`fbt`** keeps track of internal dependencies, so you only need to build the highest-level target you need, and **`fbt`** will make sure everything they depend on is up-to-date.
+`fbt` keeps track of internal dependencies, so you only need to build the highest-level target you need, and `fbt` will make sure everything they depend on is up-to-date.
 
 ### High-level (what you most likely need)
 
@@ -71,20 +71,21 @@ To use language servers other than the default VS Code C/C++ language server, us
 - `debug` - build and flash firmware, then attach with gdb with firmware's .elf loaded.
 - `debug_other`, `debug_other_blackmagic` - attach GDB without loading any `.elf`. It will allow you to manually add external `.elf` files with `add-symbol-file` in GDB.
 - `updater_debug` - attach GDB with the updater's `.elf` loaded.
-- `devboard_flash` - update WiFi dev board with the latest firmware.
+- `devboard_flash` - Update WiFi dev board. Supports `ARGS="..."` to pass extra arguments to the update script, e.g. `ARGS="-c dev"`.
 - `blackmagic` - debug firmware with Blackmagic probe (WiFi dev board).
-- `openocd` - just start OpenOCD.
+- `openocd` - just start OpenOCD. You can pass extra arguments with `ARGS="..."`.
 - `get_blackmagic` - output the blackmagic address in the GDB remote format. Useful for IDE integration.
 - `get_stlink` - output serial numbers for attached STLink probes. Used for specifying an adapter with `SWD_TRANSPORT_SERIAL=...`.
-- `lint`, `format` - run clang-format on the C source code to check and reformat it according to the `.clang-format` specs.
-- `lint_py`, `format_py` - run [black](https://black.readthedocs.io/en/stable/index.html) on the Python source code, build system files & application manifests.
+- `lint`, `format` - run clang-format on the C source code to check and reformat it according to the `.clang-format` specs. Supports `ARGS="..."` to pass extra arguments to clang-format.
+- `lint_py`, `format_py` - run [black](https://black.readthedocs.io/en/stable/index.html) on the Python source code, build system files & application manifests. Supports `ARGS="..."` to pass extra arguments to black.
 - `firmware_pvs` - generate a PVS Studio report for the firmware. Requires PVS Studio to be available on your system's `PATH`.
+- `doxygen` - generate Doxygen documentation for the firmware. `doxy` target also opens web browser to view the generated documentation.
 - `cli` - start a Flipper CLI session over USB.
 
 ### Firmware targets
 
-- `faps` - build all external & plugin apps as [`.faps`](./AppsOnSDCard.md#fap-flipper-application-package).
-- **`fbt`** also defines per-app targets. For example, for an app with `appid=snake_game` target names are:
+- `faps` - build all external & plugin apps as [`.faps`](AppsOnSDCard.md).
+- `fbt` also defines per-app targets. For example, for an app with `appid=snake_game` target names are:
   - `fap_snake_game`, etc. - build single app as `.fap` by its application ID.
   - Check out [`--extra-ext-apps`](#command-line-parameters) for force adding extra apps to external build.
   - `fap_snake_game_list`, etc - generate source + assembler listing for app's `.fap`.
@@ -103,7 +104,7 @@ To use language servers other than the default VS Code C/C++ language server, us
 - `proto_ver` - generate `.h` with a protobuf version
 - `dolphin_internal`, `dolphin_blocking` - generate `.c+.h` for corresponding dolphin assets
 
-## Command-line parameters
+## Command-line parameters {#command-line-parameters}
 
 - `--options optionfile.py` (default value `fbt_options.py`) - load a file with multiple configuration values
 - `--extra-int-apps=app1,app2,appN` - force listed apps to be built as internal with the `firmware` target
diff --git a/documentation/file_formats/BadUsbScriptFormat.md b/documentation/file_formats/BadUsbScriptFormat.md
index 1eb8eb518..1bac3c4aa 100644
--- a/documentation/file_formats/BadUsbScriptFormat.md
+++ b/documentation/file_formats/BadUsbScriptFormat.md
@@ -1,21 +1,23 @@
-# Command syntax
+# BadUSB File Format {#badusb_file_format}
+
+## Command syntax
 
 BadUsb app uses extended Duckyscript syntax. It is compatible with classic USB Rubber Ducky 1.0 scripts but provides some additional commands and features, such as custom USB ID, ALT+Numpad input method, SYSRQ command, and more functional keys.
 
-# Script file format
+## Script file format
 
 BadUsb app can execute only text scripts from `.txt` files, no compilation is required. Both `\n` and `\r\n` line endings are supported. Empty lines are allowed. You can use spaces or tabs for line indentation.
 
-# Command set
+## Command set
 
-## Comment line
+### Comment line
 
 Just a single comment line. The interpreter will ignore all text after the REM command.
 | Command | Parameters   | Notes |
 | ------- | ------------ | ----- |
 | REM     | Comment text |       |
 
-## Delay
+### Delay
 
 Pause script execution by a defined time.
 | Command       | Parameters        | Notes                               |
@@ -24,7 +26,7 @@ Pause script execution by a defined time.
 | DEFAULT_DELAY | Delay value in ms | Add delay before every next command |
 | DEFAULTDELAY  | Delay value in ms | Same as DEFAULT_DELAY               |
 
-## Special keys
+### Special keys
 
 | Command            | Notes            |
 | ------------------ | ---------------- |
@@ -53,7 +55,7 @@ Pause script execution by a defined time.
 | APP                | Same as MENU     |
 | Fx                 | F1-F12 keys      |
 
-## Modifier keys
+### Modifier keys
 
 Can be combined with a special key command or a single character.
 | Command        | Notes      |
@@ -77,14 +79,6 @@ Up to 5 keys can be hold simultaneously.
 | HOLD    | Special key or single character | Press and hold key until RELEASE command |
 | RELEASE | Special key or single character | Release key                              |
 
-## Wait for button press
-
-Will wait indefinitely for a button to be pressed
-| Command               | Parameters   | Notes                                                                 |
-| --------------------- | ------------ | --------------------------------------------------------------------- |
-| WAIT_FOR_BUTTON_PRESS | None         | Will wait for the user to press a button to continue script execution |
-
-
 ## String
 
 | Command  | Parameters  | Notes                                      |
@@ -95,18 +89,20 @@ Will wait indefinitely for a button to be pressed
 ## String delay
 
 Delay between keypresses.
-| Command      | Parameters        | Notes                                         |
-| ------------ | ----------------- | --------------------------------------------- |
-| STRING_DELAY | Delay value in ms | Applied once to next appearing STRING command |
-| STRINGDELAY  | Delay value in ms | Same as STRING_DELAY                          |
+| Command              | Parameters        | Notes                                         |
+| -------------------- | ----------------- | --------------------------------------------- |
+| STRING_DELAY         | Delay value in ms | Applied once to next appearing STRING command |
+| STRINGDELAY          | Delay value in ms | Same as STRING_DELAY                          |
+| DEFAULT_STRING_DELAY | Delay value in ms | Apply to every appearing STRING command       |
+| DEFAULTSTRINGDELAY   | Delay value in ms | Same as DEFAULT_STRING_DELAY                  |
 
-## Repeat
+### Repeat
 
 | Command | Parameters                   | Notes                   |
 | ------- | ---------------------------- | ----------------------- |
 | REPEAT  | Number of additional repeats | Repeat previous command |
 
-## ALT+Numpad input
+### ALT+Numpad input
 
 On Windows and some Linux systems, you can print characters by holding `ALT` key and entering its code on Numpad.
 | Command   | Parameters     | Notes                                                           |
@@ -115,13 +111,60 @@ On Windows and some Linux systems, you can print characters by holding `ALT` key
 | ALTSTRING | Text string    | Print text string using ALT+Numpad method                       |
 | ALTCODE   | Text string    | Same as ALTSTRING, presents in some Duckyscript implementations |
 
-## SysRq
+### SysRq
 
 Send [SysRq command](https://en.wikipedia.org/wiki/Magic_SysRq_key)
 | Command | Parameters       | Notes |
 | ------- | ---------------- | ----- |
 | SYSRQ   | Single character |       |
 
+## Media keys
+
+Some Media/Consumer Control keys can be pressed with "MEDIA" command
+
+| Command | Parameters                | Notes |
+| ------- | ------------------------- | ----- |
+| MEDIA   | Media key, see list below |       |
+
+| Key name          | Notes                         |
+| ----------------- | ----------------------------- |
+| POWER             |                               |
+| REBOOT            |                               |
+| SLEEP             |                               |
+| LOGOFF            |                               |
+| EXIT              |                               |
+| HOME              |                               |
+| BACK              |                               |
+| FORWARD           |                               |
+| REFRESH           |                               |
+| SNAPSHOT          | Take photo in a camera app    |
+| PLAY              |                               |
+| PAUSE             |                               |
+| PLAY_PAUSE        |                               |
+| NEXT_TRACK        |                               |
+| PREV_TRACK        |                               |
+| STOP              |                               |
+| EJECT             |                               |
+| MUTE              |                               |
+| VOLUME_UP         |                               |
+| VOLUME_DOWN       |                               |
+| FN                | Fn/Globe key on Mac keyboard  |
+| BRIGHT_UP         | Increase display brightness   |
+| BRIGHT_DOWN       | Decrease display brightness   |
+
+## Fn/Globe key commands (Mac/iPad)
+
+| Command | Parameters                      | Notes |
+| ------- | ------------------------------- | ----- |
+| GLOBE   | Special key or single character |       |
+
+## Wait for button press
+
+Will wait indefinitely for a button to be pressed
+| Command               | Parameters   | Notes                                                                 |
+| --------------------- | ------------ | --------------------------------------------------------------------- |
+| WAIT_FOR_BUTTON_PRESS | None         | Will wait for the user to press a button to continue script execution |
+
 ## USB device ID
 
 You can set the custom ID of the Flipper USB HID device. ID command should be in the **first line** of script, it is executed before script run.
diff --git a/documentation/file_formats/InfraredFileFormats.md b/documentation/file_formats/InfraredFileFormats.md
index 4d43bd5b8..a416a5894 100644
--- a/documentation/file_formats/InfraredFileFormats.md
+++ b/documentation/file_formats/InfraredFileFormats.md
@@ -1,7 +1,7 @@
-# Infrared Flipper File Formats
+# Infrared Flipper File Formats {#infrared_file_format}
 
+## Supported protocols list for "type: parsed"
 
-## Supported protocols list for `type: parsed`
 ```
     NEC
     NECext
@@ -17,6 +17,7 @@
     Kaseikyo
     RCA
 ```
+
 ## Infrared Remote File Format
 
 ### Example
@@ -51,7 +52,7 @@ Each button is separated from others by a comment character (`#`) for better rea
 
 Known protocols are represented in the `parsed` form, whereas non-recognized signals may be saved and re-transmitted as `raw` data.
 
-#### Version history:
+#### Version history
 
 1. Initial version.
 
@@ -72,19 +73,19 @@ Known protocols are represented in the `parsed` form, whereas non-recognized sig
 
 ### Examples
 
-- [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)
+- [TV Universal Library](https://github.com/flipperdevices/flipperzero-firmware/blob/dev/applications/main/infrared/resources/infrared/assets/tv.ir)
+- [A/C Universal Library](https://github.com/flipperdevices/flipperzero-firmware/blob/dev/applications/main/infrared/resources/infrared/assets/ac.ir)
+- [Audio Universal Library](https://github.com/flipperdevices/flipperzero-firmware/blob/dev/applications/main/infrared/resources/infrared/assets/audio.ir)
 
 ### Description
 
 Filename extension: `.ir`
 
-This file format is used to store universal remote libraries. It is identical to the previous format, differing only in the `Filetype` field.\
+This file format is used to store universal remote libraries. It is identical to the previous format, differing only in the `Filetype` field.
 It also has predefined button names for each universal library type, so that the universal remote application can understand them.
-See [Universal Remotes](/documentation/UniversalRemotes.md) for more information.
+See [Universal Remotes](../UniversalRemotes.md) for more information.
 
-### Version history:
+### Version history
 
 1. Initial version.
 
@@ -92,7 +93,7 @@ See [Universal Remotes](/documentation/UniversalRemotes.md) for more information
 
 ### Examples
 
-See [Infrared Unit Tests](/applications/debug/unit_tests/resources/unit_tests/infrared/) for various examples.
+See [Infrared Unit Tests](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/applications/debug/unit_tests/resources/unit_tests/infrared) for various examples.
 
 ### Description
 
@@ -103,10 +104,10 @@ It is mostly similar to the two previous formats, with the main difference being
 
 Each infrared protocol must have corresponding unit tests complete with an `.irtest` file.
 
-Known protocols are represented in the `parsed_array` form, whereas raw data has the `raw` type.\
+Known protocols are represented in the `parsed_array` form, whereas raw data has the `raw` type.
 Note: a single parsed signal must be represented as an array of size 1.
 
-### Version history:
+### Version history
 
 1. Initial version.
 
@@ -141,4 +142,4 @@ and the number is a sequential integer: 1, 2, 3, etc., which produces names like
 | decoder_expected      | parsed_array | An array of parsed signals containing the expected decoder output. Also used as the encoder input. |
 | encoder_decoder_input | parsed_array | An array of parsed signals containing both the encoder-decoder input and expected output.             |
 
-See [Unit Tests](/documentation/UnitTests.md#infrared) for more info.
+See [Unit Tests](../UnitTests.md) for more info.
diff --git a/documentation/file_formats/LfRfidFileFormat.md b/documentation/file_formats/LfRfidFileFormat.md
index 5143d8bc1..2463195e4 100644
--- a/documentation/file_formats/LfRfidFileFormat.md
+++ b/documentation/file_formats/LfRfidFileFormat.md
@@ -1,4 +1,4 @@
-# LF RFID key file format
+# LF RFID key file format {#lfrfid_file_format}
 
 ## Example
 
diff --git a/documentation/file_formats/NfcFileFormats.md b/documentation/file_formats/NfcFileFormats.md
index f752cdb90..5b08c3471 100644
--- a/documentation/file_formats/NfcFileFormats.md
+++ b/documentation/file_formats/NfcFileFormats.md
@@ -1,4 +1,4 @@
-# NFC Flipper File Formats
+# NFC Flipper File Formats {#nfc_file_format}
 
 ## UID + Header (General format)
 
diff --git a/documentation/file_formats/SubGhzFileFormats.md b/documentation/file_formats/SubGhzFileFormats.md
index 35a6e3155..80047faf7 100644
--- a/documentation/file_formats/SubGhzFileFormats.md
+++ b/documentation/file_formats/SubGhzFileFormats.md
@@ -1,20 +1,20 @@
-# File Formats for Flipper's SubGhz Subsystem
+# SubGhz Subsystem File Formats {#subghz_file_format}
 
-## `.sub` File Format
+## .sub File Format
 
-Flipper uses `.sub` files to store SubGhz transmissions. These are text files in Flipper File Format. `.sub` files can contain either a SubGhz Key with a certain protocol or SubGhz RAW data.
+Flipper uses `.sub` files to store SubGhz signals. These files use the Flipper File Format. `.sub` files can contain either a SubGhz Key with a certain protocol or SubGhz RAW data.
 
-A `.sub` files consist of 3 parts:
+A `.sub` file consist of 3 parts:
 
-- **header**, contains file type, version, and frequency
+- **header**, contains the file type, version, and frequency
 - **preset information**, preset type and, in case of a custom preset, transceiver configuration data
 - **protocol and its data**, contains protocol name and its specific data, such as key, bit length, etc., or RAW data
 
-Flipper's SubGhz subsystem uses presets to configure the radio transceiver. Presets are used to configure modulation, bandwidth, filters, etc. There are several presets available in stock firmware, and there is a way to create custom presets. See [SubGhz Presets](#adding-a-custom-preset) for more details.
+Flipper's SubGhz subsystem uses presets to configure the radio transceiver. Presets are used to configure modulation, bandwidth, filters, etc. There are several presets available in stock firmware, and there is a way to create custom presets. See [SubGhz Presets](#adding-a-custom-preset) section for more details.
 
 ## Header format
 
-Header is a mandatory part of `.sub` file. It contains file type, version, and frequency.
+Header is a mandatory part of a `.sub` file. It contains the file type, version, and frequency.
 
 | Field       | Type   | Description                                                       |
 | ----------- | ------ | ----------------------------------------------------------------- |
@@ -41,7 +41,7 @@ Built-in presets:
 - `FuriHalSubGhzPreset2FSKDev238Async` — 2 Frequency Shift Keying, deviation 2kHz, 270kHz bandwidth, async(IO throw GP0)
 - `FuriHalSubGhzPreset2FSKDev476Async` — 2 Frequency Shift Keying, deviation 47kHz, 270kHz bandwidth, async(IO throw GP0)
 
-### Transceiver Configuration Data
+### Transceiver Configuration Data {#transceiver-configuration-data}
 
 Transceiver configuration data is a string of bytes, encoded in hex format, separated by spaces. For CC1101 data structure is: `XX YY XX YY .. 00 00 ZZ ZZ ZZ ZZ ZZ ZZ ZZ ZZ`, where:
 
@@ -54,7 +54,7 @@ You can find more details in the [CC1101 datasheet](https://www.ti.com/lit/ds/sy
 
 ## File Data
 
-`.sub` file data section contains either key data — protocol name and its specific data, bit length, etc., or RAW data — an array of signal timings, recorded without any protocol-specific processing.
+`.sub` file data section can either contain key data, consisting of a protocol name and its specific data, bit length, etc., or RAW data, which consists of an array of signal timings, recorded without any protocol-specific processing.
 
 ### Key Files
 
@@ -88,20 +88,20 @@ RAW `.sub` files contain raw signal data that is not processed through protocol-
 For RAW files, 2 fields are required:
 
 - **Protocol**, must be `RAW`
-- **RAW_Data**, contains an array of timings, specified in microseconds Values must be non-zero, start with a positive number, and interleaved (change sign with each value). Up to 512 values per line. Can be specified multiple times to store multiple lines of data.
+- **RAW_Data**, contains an array of timings, specified in microseconds. Values must be non-zero, start with a positive number, and interleaved (change sign with each value). Up to 512 values per line. Can be specified multiple times to store multiple lines of data.
 
 Example of RAW data:
 
     Protocol: RAW
     RAW_Data: 29262 361 -68 2635 -66 24113 -66 11 ...
 
-Long payload not fitting into internal memory buffer and consisting of short duration timings (< 10us) may not be read fast enough from the SD card. That might cause the signal transmission to stop before reaching the end of the payload. Ensure that your SD Card has good performance before transmitting long or complex RAW payloads.
+A long payload that doesn't fit into the internal memory buffer and consists of short duration timings (< 10us) may not be read fast enough from the SD card. That might cause the signal transmission to stop before reaching the end of the payload. Ensure that your SD Card has good performance before transmitting long or complex RAW payloads.
 
 ### BIN_RAW Files
 
 BinRAW `.sub` files and `RAW` files both contain data that has not been decoded by any protocol. However, unlike `RAW`, `BinRAW` files only record a useful repeating sequence of durations with a restored byte transfer rate and without broadcast noise. These files can emulate nearly all static protocols, whether Flipper knows them or not.
 
-- Usually, you have to receive the signal a little longer so that Flipper accumulates sufficient data for correct analysis.
+- Usually, you have to receive the signal a little longer so that Flipper accumulates sufficient data to analyze it correctly.
 
 For `BinRAW` files, the following parameters are required and must be aligned to the left:
 
@@ -188,7 +188,7 @@ Data_RAW: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 DE 02 D3 54 D5 4C D2 C
 
 SubGhz application provides support for adding extra radio presets and additional keys for decoding transmissions in certain protocols.
 
-## SubGhz `keeloq_mfcodes_user` file
+## SubGhz keeloq_mfcodes_user file
 
 This file contains additional manufacturer keys for Keeloq protocol. It is used to decode Keeloq transmissions.
 This file is loaded at subghz application start and is located at path `/ext/subghz/assets/keeloq_mfcodes_user`.
@@ -228,7 +228,7 @@ For each key, a name and encryption method must be specified, according to comme
     AABBCCDDEEFFAABB:1:Test1
     AABBCCDDEEFFAABB:1:Test2
 
-## SubGhz `setting_user` file
+## SubGhz setting_user file
 
 This file contains additional radio presets and frequencies for SubGhz application. It is used to add new presets and frequencies for existing presets. This file is being loaded on subghz application start and is located at path `/ext/subghz/assets/setting_user`.
 
@@ -256,7 +256,7 @@ Header must contain the following fields:
 
 Repeating the same frequency will cause Flipper to listen to this frequency more often.
 
-#### Adding a Custom Preset
+#### Adding a Custom Preset {#adding-a-custom-preset}
 
 You can have as many presets as you want. Presets are embedded into `.sub` files, so another Flipper can load them directly from that file.
 Each preset is defined by the following fields:
diff --git a/documentation/file_formats/iButtonFileFormat.md b/documentation/file_formats/iButtonFileFormat.md
index 225072629..01919b9c6 100644
--- a/documentation/file_formats/iButtonFileFormat.md
+++ b/documentation/file_formats/iButtonFileFormat.md
@@ -1,4 +1,4 @@
-# iButton key file format
+# iButton key file format {#ibutton_file_format}
 
 ## Example
 
diff --git a/documentation/js/js_badusb.md b/documentation/js/js_badusb.md
new file mode 100644
index 000000000..28372e56a
--- /dev/null
+++ b/documentation/js/js_badusb.md
@@ -0,0 +1,144 @@
+# js_badusb {#js_badusb}
+
+# BadUSB module
+```js
+let badusb = require("badusb");
+```
+# Methods
+## setup
+Start USB HID with optional parameters. Should be called before all other methods.
+
+### Parameters
+Configuration object (optional):
+- vid, pid (number): VID and PID values, both are mandatory
+- mfr_name (string): Manufacturer name (32  ASCII characters max), optional
+- prod_name (string): Product name (32  ASCII characters max), optional
+
+### Examples:
+```js
+// Start USB HID with default parameters
+badusb.setup();
+// Start USB HID with custom vid:pid = AAAA:BBBB, manufacturer and product strings not defined
+badusb.setup({ vid: 0xAAAA, pid: 0xBBBB }); 
+// Start USB HID with custom vid:pid = AAAA:BBBB, manufacturer string = "Flipper Devices", product string = "Flipper Zero"
+badusb.setup({ vid: 0xAAAA, pid: 0xBBBB, mfr_name: "Flipper Devices", prod_name: "Flipper Zero" });
+```
+
+## isConnected
+Returns USB connection state.
+
+### Example:
+```js
+if (badusb.isConnected()) {
+    // Do something
+} else {
+    // Show an error
+}
+```
+
+## press
+Press and release a key.
+
+### Parameters
+Key or modifier name, key code.
+
+See a list of key names below.
+
+### Examples:
+```js
+badusb.press("a"); // Press "a" key
+badusb.press("A"); // SHIFT + "a"
+badusb.press("CTRL", "a"); // CTRL + "a"
+badusb.press("CTRL", "SHIFT", "ESC"); // CTRL + SHIFT + ESC combo
+badusb.press(98); // Press key with HID code (dec) 98 (Numpad 0 / Insert)
+badusb.press(0x47); // Press key with HID code (hex) 0x47 (Scroll lock)
+```
+
+## hold
+Hold a key. Up to 5 keys (excluding modifiers) can be held simultaneously.
+
+### Parameters
+Same as `press`
+
+### Examples:
+```js
+badusb.hold("a"); // Press and hold "a" key
+badusb.hold("CTRL", "v"); // Press and hold CTRL + "v" combo
+```
+
+## release
+Release a previously hold key.
+
+### Parameters
+Same as `press`
+
+Release all keys if called without parameters
+
+### Examples:
+```js
+badusb.release(); // Release all keys
+badusb.release("a"); // Release "a" key
+```
+
+## print
+Print a string.
+
+### Parameters
+- A string to print
+- (optional) delay between key presses
+
+### Examples:
+```js
+badusb.print("Hello, world!"); // print "Hello, world!"
+badusb.print("Hello, world!", 100); // Add 100ms delay between key presses
+```
+
+## println
+Same as `print` but ended with "ENTER" press.
+
+### Parameters
+- A string to print
+- (optional) delay between key presses
+
+### Examples:
+```js
+badusb.println("Hello, world!");  // print "Hello, world!" and press "ENTER"
+```
+
+# Key names list
+
+## Modifier keys
+
+| Name          |
+| ------------- |
+| CTRL          |            
+| SHIFT         |  
+| ALT           |
+| GUI           |          
+
+## Special keys
+
+| Name               | Notes            |
+| ------------------ | ---------------- |
+| DOWN               | Down arrow       |
+| LEFT               | Left arrow       |
+| RIGHT              | Right arrow      |
+| UP                 | Up arrow         |
+| ENTER              |                  |
+| DELETE             |                  |
+| BACKSPACE          |                  |
+| END                |                  |
+| HOME               |                  |
+| ESC                |                  |
+| INSERT             |                  |
+| PAGEUP             |                  |
+| PAGEDOWN           |                  |
+| CAPSLOCK           |                  |
+| NUMLOCK            |                  |
+| SCROLLLOCK         |                  |
+| PRINTSCREEN        |                  |
+| PAUSE              | Pause/Break key  |
+| SPACE              |                  |
+| TAB                |                  |
+| MENU               | Context menu key |
+| Fx                 | F1-F24 keys      |
diff --git a/documentation/js/js_builtin.md b/documentation/js/js_builtin.md
new file mode 100644
index 000000000..3d113807b
--- /dev/null
+++ b/documentation/js/js_builtin.md
@@ -0,0 +1,56 @@
+# Built-in methods {#js_builtin}
+
+## require
+Load a module plugin.
+
+### Parameters
+- Module name
+
+### Examples:
+```js
+let serial = require("serial"); // Load "serial" module
+```
+
+## delay
+### Parameters
+- Delay value in ms
+
+### Examples:
+```js
+delay(500); // Delay for 500ms
+```
+## print
+Print a message on a screen console.
+
+### Parameters
+The following argument types are supported:
+- String
+- Number
+- Bool
+- undefined
+
+### Examples:
+```js
+print("string1", "string2", 123);
+```
+
+## console.log
+## console.warn
+## console.error
+## console.debug
+Same as `print`, but output to serial console only, with corresponding log level.
+
+## to_string
+Convert a number to string.
+
+### Examples:
+```js
+to_string(123)
+```
+## to_hex_string
+Convert a number to string(hex format).
+
+### Examples:
+```js
+to_hex_string(0xFF)
+```
diff --git a/documentation/js/js_data_types.md b/documentation/js/js_data_types.md
new file mode 100644
index 000000000..de1c896dc
--- /dev/null
+++ b/documentation/js/js_data_types.md
@@ -0,0 +1,13 @@
+# Data types {#js_data_types}
+
+Here is a list of common data types used by mJS.
+- string - sequence of single byte characters, no UTF8 support
+- number
+- boolean
+- foreign - C function or data pointer
+- undefined
+- null
+- object - a data structure with named fields
+- array - special type of object, all items have indexes and equal types
+- ArrayBuffer - raw data buffer
+- DataView - provides interface for accessing ArrayBuffer contents
diff --git a/documentation/js/js_dialog.md b/documentation/js/js_dialog.md
new file mode 100644
index 000000000..5804b075e
--- /dev/null
+++ b/documentation/js/js_dialog.md
@@ -0,0 +1,49 @@
+# js_dialog {#js_dialog}
+
+# Dialog module
+```js
+let dialog = require("dialog");
+```
+# Methods
+
+## message
+Show a simple message dialog with header, text and "OK" button.
+
+### Parameters
+- Dialog header text
+- Dialog text
+
+### Retuns
+true if central button was pressed, false if the dialog was closed by back key press
+
+### Examples:
+```js
+dialog.message("Dialog demo", "Press OK to start");
+```
+
+## custom
+More complex dialog with configurable buttons
+
+### Parameters
+Configuration object with the following fileds:
+- header: Dialog header text
+- text: Dialog text
+- button_left: (optional) left button name
+- button_right: (optional) right button name
+- button_center: (optional) central button name
+
+### Retuns
+Name of pressed button or empty string if the dialog was closed by back key press
+
+### Examples:
+```js
+let dialog_params = ({
+    header: "Dialog header",
+    text: "Dialog text",
+    button_left: "Left",
+    button_right: "Right",
+    button_center: "OK"
+});
+
+dialog.custom(dialog_params);
+```
diff --git a/documentation/js/js_notification.md b/documentation/js/js_notification.md
new file mode 100644
index 000000000..100da4414
--- /dev/null
+++ b/documentation/js/js_notification.md
@@ -0,0 +1,36 @@
+# js_notification {#js_notification}
+
+# Notification module
+```js
+let notify = require("notification");
+```
+# Methods
+
+## success
+"Success" flipper notification message
+
+### Examples:
+```js
+notify.success();
+```
+
+## error
+"Error" flipper notification message
+
+### Examples:
+```js
+notify.error();
+```
+
+## blink
+Blink notification LED
+
+### Parameters
+- Blink color (blue/red/green/yellow/cyan/magenta)
+- Blink type (short/long)
+
+### Examples:
+```js
+notify.blink("red", "short"); // Short blink of red LED
+notify.blink("green", "short"); // Long blink of green LED
+```
\ No newline at end of file
diff --git a/documentation/js/js_serial.md b/documentation/js/js_serial.md
new file mode 100644
index 000000000..cd9993a18
--- /dev/null
+++ b/documentation/js/js_serial.md
@@ -0,0 +1,107 @@
+# js_serial {#js_serial}
+
+# Serial module
+```js
+let serial = require("serial");
+```
+# Methods
+
+## setup
+Configure serial port. Should be called before all other methods.
+
+### Parameters
+- Serial port name (usart, lpuart)
+- Baudrate
+
+### Examples:
+```js
+// Configure LPUART port with baudrate = 115200
+serial.setup("lpuart", 115200);
+```
+
+## write
+Write data to serial port
+
+### Parameters
+One or more arguments of the following types:
+- A string
+- Single number, each number is interpreted as a byte
+- Array of numbers, each number is interpreted as a byte
+- ArrayBuffer or DataView
+
+### Examples:
+```js
+serial.write(0x0a); // Write a single byte 0x0A
+serial.write("Hello, world!"); // Write a string
+serial.write("Hello, world!", [0x0d, 0x0a]); // Write a string followed by two bytes
+```
+
+## read
+Read a fixed number of characters from serial port.
+
+### Parameters
+- Number of bytes to read
+- (optional) Timeout value in ms
+
+### Returns
+A sting of received characters or undefined if nothing was received before timeout.
+
+### Examples:
+```js
+serial.read(1); // Read a single byte, without timeout
+serial.read(10, 5000); // Read 10 bytes, with 5s timeout
+```
+
+## readln
+Read from serial port untill line break character
+
+### Parameters
+(optional) Timeout value in ms
+
+### Returns
+A sting of received characters or undefined if nothing was received before timeout.
+
+### Examples:
+```js
+serial.readln(); // Read without timeout
+serial.readln(5000); // Read with 5s timeout
+```
+
+## readBytes
+Read from serial port untill line break character
+
+### Parameters
+- Number of bytes to read
+- (optional) Timeout value in ms
+
+### Returns
+ArrayBuffer with received data or undefined if nothing was received before timeout.
+
+### Examples:
+```js
+serial.readBytes(4); // Read 4 bytes, without timeout
+
+// Read one byte from receive buffer with zero timeout, returns UNDEFINED if Rx bufer is empty
+serial.readBytes(1, 0);
+```
+
+## expect
+Search for a string pattern in received data stream
+
+### Parameters
+- Single argument or array of the following types:
+    - A string
+    - Array of numbers, each number is interpreted as a byte
+- (optional) Timeout value in ms
+
+### Returns
+Index of matched pattern in input patterns list, undefined if nothing was found.
+
+### Examples:
+```js
+// Wait for root shell prompt with 1s timeout, returns 0 if it was received before timeout, undefined if not
+serial.expect("# ", 1000); 
+
+// Infinitely wait for one of two strings, should return 0 if the first string got matched, 1 if the second one
+serial.expect([": not found", "Usage: "]);
+```
\ No newline at end of file
diff --git a/fbt_options.py b/fbt_options.py
index 2367caf9a..e1cece7f5 100644
--- a/fbt_options.py
+++ b/fbt_options.py
@@ -22,7 +22,7 @@ DIST_SUFFIX = "local"
 COPRO_OB_DATA = "scripts/ob.data"
 
 # Must match lib/stm32wb_copro version
-COPRO_CUBE_VERSION = "1.17.3"
+COPRO_CUBE_VERSION = "1.19.0"
 
 COPRO_CUBE_DIR = "lib/stm32wb_copro"
 
diff --git a/furi/core/check.c b/furi/core/check.c
index 802596169..90989474a 100644
--- a/furi/core/check.c
+++ b/furi/core/check.c
@@ -67,7 +67,7 @@ static void __furi_put_uint32_as_hex(uint32_t data) {
     furi_log_puts(tmp_str);
 }
 
-static void __furi_print_register_info() {
+static void __furi_print_register_info(void) {
     // Print registers
     for(uint8_t i = 0; i < 12; i++) {
         furi_log_puts("\r\n\tr");
@@ -80,12 +80,12 @@ static void __furi_print_register_info() {
     __furi_put_uint32_as_hex(__furi_check_registers[12]);
 }
 
-static void __furi_print_stack_info() {
+static void __furi_print_stack_info(void) {
     furi_log_puts("\r\n\tstack watermark: ");
     __furi_put_uint32_as_text(uxTaskGetStackHighWaterMark(NULL) * 4);
 }
 
-static void __furi_print_bt_stack_info() {
+static void __furi_print_bt_stack_info(void) {
     const BleGlueHardfaultInfo* fault_info = ble_glue_get_hardfault_info();
     if(fault_info == NULL) {
         furi_log_puts("\r\n\tcore2: not faulted");
@@ -99,7 +99,7 @@ static void __furi_print_bt_stack_info() {
     }
 }
 
-static void __furi_print_heap_info() {
+static void __furi_print_heap_info(void) {
     furi_log_puts("\r\n\t     heap total: ");
     __furi_put_uint32_as_text(xPortGetTotalHeapSize());
     furi_log_puts("\r\n\t      heap free: ");
@@ -125,7 +125,7 @@ static void __furi_print_name(bool isr) {
     }
 }
 
-FURI_NORETURN void __furi_crash_implementation() {
+FURI_NORETURN void __furi_crash_implementation(void) {
     __disable_irq();
     GET_MESSAGE_AND_STORE_REGISTERS();
 
@@ -176,7 +176,7 @@ FURI_NORETURN void __furi_crash_implementation() {
     __builtin_unreachable();
 }
 
-FURI_NORETURN void __furi_halt_implementation() {
+FURI_NORETURN void __furi_halt_implementation(void) {
     __disable_irq();
     GET_MESSAGE_AND_STORE_REGISTERS();
 
diff --git a/furi/core/check.h b/furi/core/check.h
index 2d5df4cf6..a51d7b41e 100644
--- a/furi/core/check.h
+++ b/furi/core/check.h
@@ -14,13 +14,10 @@
 #pragma once
 
 #include <m-core.h>
+#include "common_defines.h"
 
 #ifdef __cplusplus
 extern "C" {
-#define FURI_NORETURN [[noreturn]]
-#else
-#include <stdnoreturn.h>
-#define FURI_NORETURN noreturn
 #endif
 
 // Flags instead of pointers will save ~4 bytes on furi_assert and furi_check calls.
@@ -28,10 +25,10 @@ extern "C" {
 #define __FURI_CHECK_MESSAGE_FLAG (0x02)
 
 /** Crash system */
-FURI_NORETURN void __furi_crash_implementation();
+FURI_NORETURN void __furi_crash_implementation(void);
 
 /** Halt system */
-FURI_NORETURN void __furi_halt_implementation();
+FURI_NORETURN void __furi_halt_implementation(void);
 
 /** Crash system with message. Show message after reboot. */
 #define __furi_crash(message)                                 \
@@ -43,7 +40,7 @@ FURI_NORETURN void __furi_halt_implementation();
 
 /** Crash system
  *
- * @param      optional  message (const char*)
+ * @param      ... optional  message (const char*)
  */
 #define furi_crash(...) M_APPLY(__furi_crash, M_IF_EMPTY(__VA_ARGS__)((NULL), (__VA_ARGS__)))
 
@@ -57,7 +54,7 @@ FURI_NORETURN void __furi_halt_implementation();
 
 /** Halt system
  *
- * @param      optional  message (const char*)
+ * @param      ... optional  message (const char*)
  */
 #define furi_halt(...) M_APPLY(__furi_halt, M_IF_EMPTY(__VA_ARGS__)((NULL), (__VA_ARGS__)))
 
@@ -71,8 +68,7 @@ FURI_NORETURN void __furi_halt_implementation();
 
 /** Check condition and crash if failed
  *
- * @param      condition to check
- * @param      optional  message (const char*)
+ * @param      ... condition to check and optional  message (const char*)
  */
 #define furi_check(...) \
     M_APPLY(__furi_check, M_DEFAULT_ARGS(2, (__FURI_CHECK_MESSAGE_FLAG), __VA_ARGS__))
@@ -97,12 +93,18 @@ FURI_NORETURN void __furi_halt_implementation();
  *
  * @warning    only will do check if firmware compiled in debug mode
  *
- * @param      condition to check
- * @param      optional  message (const char*)
+ * @param      ... condition to check and optional  message (const char*)
  */
 #define furi_assert(...) \
     M_APPLY(__furi_assert, M_DEFAULT_ARGS(2, (__FURI_ASSERT_MESSAGE_FLAG), __VA_ARGS__))
 
+#define furi_break(__e)             \
+    do {                            \
+        if(!(__e)) {                \
+            asm volatile("bkpt 0"); \
+        }                           \
+    } while(0)
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/furi/core/common_defines.h b/furi/core/common_defines.h
index 820297863..beb9f6519 100644
--- a/furi/core/common_defines.h
+++ b/furi/core/common_defines.h
@@ -5,6 +5,10 @@
 
 #ifdef __cplusplus
 extern "C" {
+#define FURI_NORETURN [[noreturn]]
+#else
+#include <stdnoreturn.h>
+#define FURI_NORETURN noreturn
 #endif
 
 #include <cmsis_compiler.h>
diff --git a/furi/core/event_flag.c b/furi/core/event_flag.c
index 96b959187..ccbee93d6 100644
--- a/furi/core/event_flag.c
+++ b/furi/core/event_flag.c
@@ -8,8 +8,8 @@
 #define FURI_EVENT_FLAG_MAX_BITS_EVENT_GROUPS 24U
 #define FURI_EVENT_FLAG_INVALID_BITS (~((1UL << FURI_EVENT_FLAG_MAX_BITS_EVENT_GROUPS) - 1U))
 
-FuriEventFlag* furi_event_flag_alloc() {
-    furi_assert(!FURI_IS_IRQ_MODE());
+FuriEventFlag* furi_event_flag_alloc(void) {
+    furi_check(!FURI_IS_IRQ_MODE());
 
     EventGroupHandle_t handle = xEventGroupCreate();
     furi_check(handle);
@@ -18,13 +18,13 @@ FuriEventFlag* furi_event_flag_alloc() {
 }
 
 void furi_event_flag_free(FuriEventFlag* instance) {
-    furi_assert(!FURI_IS_IRQ_MODE());
+    furi_check(!FURI_IS_IRQ_MODE());
     vEventGroupDelete((EventGroupHandle_t)instance);
 }
 
 uint32_t furi_event_flag_set(FuriEventFlag* instance, uint32_t flags) {
-    furi_assert(instance);
-    furi_assert((flags & FURI_EVENT_FLAG_INVALID_BITS) == 0U);
+    furi_check(instance);
+    furi_check((flags & FURI_EVENT_FLAG_INVALID_BITS) == 0U);
 
     EventGroupHandle_t hEventGroup = (EventGroupHandle_t)instance;
     uint32_t rflags;
@@ -47,8 +47,8 @@ uint32_t furi_event_flag_set(FuriEventFlag* instance, uint32_t flags) {
 }
 
 uint32_t furi_event_flag_clear(FuriEventFlag* instance, uint32_t flags) {
-    furi_assert(instance);
-    furi_assert((flags & FURI_EVENT_FLAG_INVALID_BITS) == 0U);
+    furi_check(instance);
+    furi_check((flags & FURI_EVENT_FLAG_INVALID_BITS) == 0U);
 
     EventGroupHandle_t hEventGroup = (EventGroupHandle_t)instance;
     uint32_t rflags;
@@ -73,7 +73,7 @@ uint32_t furi_event_flag_clear(FuriEventFlag* instance, uint32_t flags) {
 }
 
 uint32_t furi_event_flag_get(FuriEventFlag* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     EventGroupHandle_t hEventGroup = (EventGroupHandle_t)instance;
     uint32_t rflags;
@@ -93,9 +93,9 @@ uint32_t furi_event_flag_wait(
     uint32_t flags,
     uint32_t options,
     uint32_t timeout) {
-    furi_assert(!FURI_IS_IRQ_MODE());
-    furi_assert(instance);
-    furi_assert((flags & FURI_EVENT_FLAG_INVALID_BITS) == 0U);
+    furi_check(!FURI_IS_IRQ_MODE());
+    furi_check(instance);
+    furi_check((flags & FURI_EVENT_FLAG_INVALID_BITS) == 0U);
 
     EventGroupHandle_t hEventGroup = (EventGroupHandle_t)instance;
     BaseType_t wait_all;
diff --git a/furi/core/event_flag.h b/furi/core/event_flag.h
index 133c95e7b..7200144cd 100644
--- a/furi/core/event_flag.h
+++ b/furi/core/event_flag.h
@@ -16,7 +16,7 @@ typedef void FuriEventFlag;
  *
  * @return     pointer to FuriEventFlag
  */
-FuriEventFlag* furi_event_flag_alloc();
+FuriEventFlag* furi_event_flag_alloc(void);
 
 /** Deallocate FuriEventFlag
  *
diff --git a/furi/core/kernel.c b/furi/core/kernel.c
index 89a50a9b5..db3d6a716 100644
--- a/furi/core/kernel.c
+++ b/furi/core/kernel.c
@@ -10,7 +10,7 @@
 
 #include CMSIS_device_header
 
-bool furi_kernel_is_irq_or_masked() {
+bool furi_kernel_is_irq_or_masked(void) {
     bool irq = false;
     BaseType_t state;
 
@@ -34,12 +34,12 @@ bool furi_kernel_is_irq_or_masked() {
     return (irq);
 }
 
-bool furi_kernel_is_running() {
+bool furi_kernel_is_running(void) {
     return xTaskGetSchedulerState() != taskSCHEDULER_RUNNING;
 }
 
-int32_t furi_kernel_lock() {
-    furi_assert(!furi_kernel_is_irq_or_masked());
+int32_t furi_kernel_lock(void) {
+    furi_check(!furi_kernel_is_irq_or_masked());
 
     int32_t lock;
 
@@ -63,8 +63,8 @@ int32_t furi_kernel_lock() {
     return (lock);
 }
 
-int32_t furi_kernel_unlock() {
-    furi_assert(!furi_kernel_is_irq_or_masked());
+int32_t furi_kernel_unlock(void) {
+    furi_check(!furi_kernel_is_irq_or_masked());
 
     int32_t lock;
 
@@ -94,7 +94,7 @@ int32_t furi_kernel_unlock() {
 }
 
 int32_t furi_kernel_restore_lock(int32_t lock) {
-    furi_assert(!furi_kernel_is_irq_or_masked());
+    furi_check(!furi_kernel_is_irq_or_masked());
 
     switch(xTaskGetSchedulerState()) {
     case taskSCHEDULER_SUSPENDED:
@@ -124,13 +124,13 @@ int32_t furi_kernel_restore_lock(int32_t lock) {
     return (lock);
 }
 
-uint32_t furi_kernel_get_tick_frequency() {
+uint32_t furi_kernel_get_tick_frequency(void) {
     /* Return frequency in hertz */
     return (configTICK_RATE_HZ_RAW);
 }
 
 void furi_delay_tick(uint32_t ticks) {
-    furi_assert(!furi_kernel_is_irq_or_masked());
+    furi_check(!furi_kernel_is_irq_or_masked());
     if(ticks == 0U) {
         taskYIELD();
     } else {
@@ -139,7 +139,7 @@ void furi_delay_tick(uint32_t ticks) {
 }
 
 FuriStatus furi_delay_until_tick(uint32_t tick) {
-    furi_assert(!furi_kernel_is_irq_or_masked());
+    furi_check(!furi_kernel_is_irq_or_masked());
 
     TickType_t tcnt, delay;
     FuriStatus stat;
@@ -165,7 +165,7 @@ FuriStatus furi_delay_until_tick(uint32_t tick) {
     return (stat);
 }
 
-uint32_t furi_get_tick() {
+uint32_t furi_get_tick(void) {
     TickType_t ticks;
 
     if(furi_kernel_is_irq_or_masked() != 0U) {
diff --git a/furi/core/kernel.h b/furi/core/kernel.h
index c962402ef..2973a90e5 100644
--- a/furi/core/kernel.h
+++ b/furi/core/kernel.h
@@ -25,13 +25,13 @@ extern "C" {
  * 
  * @return     true if CPU is in IRQ or kernel running and IRQ is masked
  */
-bool furi_kernel_is_irq_or_masked();
+bool furi_kernel_is_irq_or_masked(void);
 
 /** Check if kernel is running
  *
  * @return     true if running, false otherwise
  */
-bool furi_kernel_is_running();
+bool furi_kernel_is_running(void);
 
 /** Lock kernel, pause process scheduling
  *
@@ -39,7 +39,7 @@ bool furi_kernel_is_running();
  *
  * @return     previous lock state(0 - unlocked, 1 - locked)
  */
-int32_t furi_kernel_lock();
+int32_t furi_kernel_lock(void);
 
 /** Unlock kernel, resume process scheduling
  *
@@ -47,7 +47,7 @@ int32_t furi_kernel_lock();
  *
  * @return     previous lock state(0 - unlocked, 1 - locked)
  */
-int32_t furi_kernel_unlock();
+int32_t furi_kernel_unlock(void);
 
 /** Restore kernel lock state
  *
@@ -63,7 +63,7 @@ int32_t furi_kernel_restore_lock(int32_t lock);
  *
  * @return     systick counts per second
  */
-uint32_t furi_kernel_get_tick_frequency();
+uint32_t furi_kernel_get_tick_frequency(void);
 
 /** Delay execution
  *
@@ -79,7 +79,7 @@ void furi_delay_tick(uint32_t ticks);
  *
  * @warning This should never be called in interrupt request context.
  *
- * @param[in]  ticks  The tick until which kerel should delay task execution
+ * @param[in]  tick  The tick until which kerel should delay task execution
  *
  * @return     The furi status.
  */
diff --git a/furi/core/log.c b/furi/core/log.c
index 3d270816c..f8110b46a 100644
--- a/furi/core/log.c
+++ b/furi/core/log.c
@@ -31,7 +31,7 @@ static const FuriLogLevelDescription FURI_LOG_LEVEL_DESCRIPTIONS[] = {
     {"trace", FuriLogLevelTrace},
 };
 
-void furi_log_init() {
+void furi_log_init(void) {
     // Set default logging parameters
     furi_log.log_level = FURI_LOG_LEVEL_DEFAULT;
     furi_log.mutex = furi_mutex_alloc(FuriMutexTypeRecursive);
@@ -178,6 +178,8 @@ void furi_log_print_raw_format(FuriLogLevel level, const char* format, ...) {
 }
 
 void furi_log_set_level(FuriLogLevel level) {
+    furi_check(level <= FuriLogLevelTrace);
+
     if(level == FuriLogLevelDefault) {
         level = FURI_LOG_LEVEL_DEFAULT;
     }
diff --git a/furi/core/log.h b/furi/core/log.h
index a587d8ab2..3ce88db5b 100644
--- a/furi/core/log.h
+++ b/furi/core/log.h
@@ -51,7 +51,7 @@ void furi_log_init(void);
 
 /** Add log TX callback
  *
- * @param[in]  callback  The callback
+ * @param[in]  handler  The callback and its context
  *
  * @return     true on success, false otherwise
  */
@@ -59,7 +59,7 @@ bool furi_log_add_handler(FuriLogHandler handler);
 
 /** Remove log TX callback
  *
- * @param[in]  callback  The callback
+ * @param[in]  handler  The callback and its context
  *
  * @return     true on success, false otherwise
  */
@@ -112,15 +112,16 @@ FuriLogLevel furi_log_get_level(void);
 /** Log level to string
  *
  * @param[in]  level  The level
+ * @param[out] str    String representation of the level
  *
- * @return     The string
+ * @return     True if success, False otherwise
  */
 bool furi_log_level_to_string(FuriLogLevel level, const char** str);
 
 /** Log level from string
  *
  * @param[in]  str    The string
- * @param      level  The level
+ * @param[out] level  The level
  * 
  * @return     True if success, False otherwise
  */
diff --git a/furi/core/memmgr_heap.c b/furi/core/memmgr_heap.c
index b83b4212f..3f62b518c 100644
--- a/furi/core/memmgr_heap.c
+++ b/furi/core/memmgr_heap.c
@@ -133,7 +133,7 @@ static MemmgrHeapThreadDict_t memmgr_heap_thread_dict = {0};
 static volatile uint32_t memmgr_heap_thread_trace_depth = 0;
 
 /* Initialize tracing storage on start */
-void memmgr_heap_init() {
+void memmgr_heap_init(void) {
     MemmgrHeapThreadDict_init(memmgr_heap_thread_dict);
 }
 
@@ -224,7 +224,7 @@ static inline void traceFREE(void* pointer, size_t size) {
     }
 }
 
-size_t memmgr_heap_get_max_free_block() {
+size_t memmgr_heap_get_max_free_block(void) {
     size_t max_free_size = 0;
     BlockLink_t* pxBlock;
     vTaskSuspendAll();
@@ -241,7 +241,7 @@ size_t memmgr_heap_get_max_free_block() {
     return max_free_size;
 }
 
-void memmgr_heap_printf_free_blocks() {
+void memmgr_heap_printf_free_blocks(void) {
     BlockLink_t* pxBlock;
     //TODO enable when we can do printf with a locked scheduler
     //vTaskSuspendAll();
@@ -283,7 +283,7 @@ char* ultoa(unsigned long num, char* str, int radix) {
     return str;
 }
 
-static void print_heap_init() {
+static void print_heap_init(void) {
     char tmp_str[33];
     size_t heap_start = (size_t)&__heap_start__;
     size_t heap_end = (size_t)&__heap_end__;
@@ -486,7 +486,7 @@ void* pvPortMalloc(size_t xWantedSize) {
 
     configASSERT((((size_t)pvReturn) & (size_t)portBYTE_ALIGNMENT_MASK) == 0);
 
-    furi_check(pvReturn, "out of memory");
+    furi_check(pvReturn, xWantedSize ? "out of memory" : "malloc(0)");
     pvReturn = memset(pvReturn, 0, to_wipe);
     return pvReturn;
 }
diff --git a/furi/core/memmgr_heap.h b/furi/core/memmgr_heap.h
index 9aacba1ca..7d889f152 100644
--- a/furi/core/memmgr_heap.h
+++ b/furi/core/memmgr_heap.h
@@ -18,13 +18,13 @@ extern "C" {
  *
  * @param      thread_id  - thread id to track
  */
-void memmgr_heap_enable_thread_trace(FuriThreadId taks_handle);
+void memmgr_heap_enable_thread_trace(FuriThreadId thread_id);
 
 /** Memmgr heap disable thread allocation tracking
  *
  * @param      thread_id  - thread id to track
  */
-void memmgr_heap_disable_thread_trace(FuriThreadId taks_handle);
+void memmgr_heap_disable_thread_trace(FuriThreadId thread_id);
 
 /** Memmgr heap get allocatred thread memory
  *
@@ -32,17 +32,17 @@ void memmgr_heap_disable_thread_trace(FuriThreadId taks_handle);
  *
  * @return     bytes allocated right now
  */
-size_t memmgr_heap_get_thread_memory(FuriThreadId taks_handle);
+size_t memmgr_heap_get_thread_memory(FuriThreadId thread_id);
 
 /** Memmgr heap get the max contiguous block size on the heap
  *
  * @return     size_t max contiguous block size
  */
-size_t memmgr_heap_get_max_free_block();
+size_t memmgr_heap_get_max_free_block(void);
 
 /** Print the address and size of all free blocks to stdout
  */
-void memmgr_heap_printf_free_blocks();
+void memmgr_heap_printf_free_blocks(void);
 
 #ifdef __cplusplus
 }
diff --git a/furi/core/message_queue.c b/furi/core/message_queue.c
index e20fa420a..6e8ab1869 100644
--- a/furi/core/message_queue.c
+++ b/furi/core/message_queue.c
@@ -6,7 +6,7 @@
 #include <queue.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));
+    furi_check((furi_kernel_is_irq_or_masked() == 0U) && (msg_count > 0U) && (msg_size > 0U));
 
     QueueHandle_t handle = xQueueCreate(msg_count, msg_size);
     furi_check(handle);
@@ -15,14 +15,16 @@ FuriMessageQueue* furi_message_queue_alloc(uint32_t msg_count, uint32_t msg_size
 }
 
 void furi_message_queue_free(FuriMessageQueue* instance) {
-    furi_assert(furi_kernel_is_irq_or_masked() == 0U);
-    furi_assert(instance);
+    furi_check(furi_kernel_is_irq_or_masked() == 0U);
+    furi_check(instance);
 
     vQueueDelete((QueueHandle_t)instance);
 }
 
 FuriStatus
     furi_message_queue_put(FuriMessageQueue* instance, const void* msg_ptr, uint32_t timeout) {
+    furi_check(instance);
+
     QueueHandle_t hQueue = (QueueHandle_t)instance;
     FuriStatus stat;
     BaseType_t yield;
@@ -30,7 +32,7 @@ FuriStatus
     stat = FuriStatusOk;
 
     if(furi_kernel_is_irq_or_masked() != 0U) {
-        if((hQueue == NULL) || (msg_ptr == NULL) || (timeout != 0U)) {
+        if((msg_ptr == NULL) || (timeout != 0U)) {
             stat = FuriStatusErrorParameter;
         } else {
             yield = pdFALSE;
@@ -42,7 +44,7 @@ FuriStatus
             }
         }
     } else {
-        if((hQueue == NULL) || (msg_ptr == NULL)) {
+        if(msg_ptr == NULL) {
             stat = FuriStatusErrorParameter;
         } else {
             if(xQueueSendToBack(hQueue, msg_ptr, (TickType_t)timeout) != pdPASS) {
@@ -60,6 +62,8 @@ FuriStatus
 }
 
 FuriStatus furi_message_queue_get(FuriMessageQueue* instance, void* msg_ptr, uint32_t timeout) {
+    furi_check(instance);
+
     QueueHandle_t hQueue = (QueueHandle_t)instance;
     FuriStatus stat;
     BaseType_t yield;
@@ -67,7 +71,7 @@ FuriStatus furi_message_queue_get(FuriMessageQueue* instance, void* msg_ptr, uin
     stat = FuriStatusOk;
 
     if(furi_kernel_is_irq_or_masked() != 0U) {
-        if((hQueue == NULL) || (msg_ptr == NULL) || (timeout != 0U)) {
+        if((msg_ptr == NULL) || (timeout != 0U)) {
             stat = FuriStatusErrorParameter;
         } else {
             yield = pdFALSE;
@@ -79,7 +83,7 @@ FuriStatus furi_message_queue_get(FuriMessageQueue* instance, void* msg_ptr, uin
             }
         }
     } else {
-        if((hQueue == NULL) || (msg_ptr == NULL)) {
+        if(msg_ptr == NULL) {
             stat = FuriStatusErrorParameter;
         } else {
             if(xQueueReceive(hQueue, msg_ptr, (TickType_t)timeout) != pdPASS) {
@@ -92,47 +96,42 @@ FuriStatus furi_message_queue_get(FuriMessageQueue* instance, void* msg_ptr, uin
         }
     }
 
-    /* Return execution status */
     return (stat);
 }
 
 uint32_t furi_message_queue_get_capacity(FuriMessageQueue* instance) {
+    furi_check(instance);
+
     StaticQueue_t* mq = (StaticQueue_t*)instance;
     uint32_t capacity;
 
-    if(mq == NULL) {
-        capacity = 0U;
-    } else {
-        /* capacity = pxQueue->uxLength */
-        capacity = mq->uxDummy4[1];
-    }
+    /* capacity = pxQueue->uxLength */
+    capacity = mq->uxDummy4[1];
 
     /* Return maximum number of messages */
     return (capacity);
 }
 
 uint32_t furi_message_queue_get_message_size(FuriMessageQueue* instance) {
+    furi_check(instance);
+
     StaticQueue_t* mq = (StaticQueue_t*)instance;
     uint32_t size;
 
-    if(mq == NULL) {
-        size = 0U;
-    } else {
-        /* size = pxQueue->uxItemSize */
-        size = mq->uxDummy4[2];
-    }
+    /* size = pxQueue->uxItemSize */
+    size = mq->uxDummy4[2];
 
     /* Return maximum message size */
     return (size);
 }
 
 uint32_t furi_message_queue_get_count(FuriMessageQueue* instance) {
+    furi_check(instance);
+
     QueueHandle_t hQueue = (QueueHandle_t)instance;
     UBaseType_t count;
 
-    if(hQueue == NULL) {
-        count = 0U;
-    } else if(furi_kernel_is_irq_or_masked() != 0U) {
+    if(furi_kernel_is_irq_or_masked() != 0U) {
         count = uxQueueMessagesWaitingFromISR(hQueue);
     } else {
         count = uxQueueMessagesWaiting(hQueue);
@@ -143,13 +142,13 @@ uint32_t furi_message_queue_get_count(FuriMessageQueue* instance) {
 }
 
 uint32_t furi_message_queue_get_space(FuriMessageQueue* instance) {
+    furi_check(instance);
+
     StaticQueue_t* mq = (StaticQueue_t*)instance;
     uint32_t space;
     uint32_t isrm;
 
-    if(mq == NULL) {
-        space = 0U;
-    } else if(furi_kernel_is_irq_or_masked() != 0U) {
+    if(furi_kernel_is_irq_or_masked() != 0U) {
         isrm = taskENTER_CRITICAL_FROM_ISR();
 
         /* space = pxQueue->uxLength - pxQueue->uxMessagesWaiting; */
@@ -165,13 +164,13 @@ uint32_t furi_message_queue_get_space(FuriMessageQueue* instance) {
 }
 
 FuriStatus furi_message_queue_reset(FuriMessageQueue* instance) {
+    furi_check(instance);
+
     QueueHandle_t hQueue = (QueueHandle_t)instance;
     FuriStatus stat;
 
     if(furi_kernel_is_irq_or_masked() != 0U) {
         stat = FuriStatusErrorISR;
-    } else if(hQueue == NULL) {
-        stat = FuriStatusErrorParameter;
     } else {
         stat = FuriStatusOk;
         (void)xQueueReset(hQueue);
diff --git a/furi/core/message_queue.h b/furi/core/message_queue.h
index 392a145f1..8d7f389e1 100644
--- a/furi/core/message_queue.h
+++ b/furi/core/message_queue.h
@@ -32,7 +32,6 @@ void furi_message_queue_free(FuriMessageQueue* instance);
  * @param      instance  pointer to FuriMessageQueue instance
  * @param[in]  msg_ptr   The message pointer
  * @param[in]  timeout   The timeout
- * @param[in]  msg_prio  The message prio
  *
  * @return     The furi status.
  */
@@ -43,7 +42,6 @@ FuriStatus
  *
  * @param      instance  pointer to FuriMessageQueue instance
  * @param      msg_ptr   The message pointer
- * @param      msg_prio  The message prioority
  * @param[in]  timeout   The timeout
  *
  * @return     The furi status.
diff --git a/furi/core/mutex.c b/furi/core/mutex.c
index f18fb1681..e32be1a39 100644
--- a/furi/core/mutex.c
+++ b/furi/core/mutex.c
@@ -6,7 +6,7 @@
 #include <semphr.h>
 
 FuriMutex* furi_mutex_alloc(FuriMutexType type) {
-    furi_assert(!FURI_IS_IRQ_MODE());
+    furi_check(!FURI_IS_IRQ_MODE());
 
     SemaphoreHandle_t hMutex = NULL;
 
@@ -15,7 +15,7 @@ FuriMutex* furi_mutex_alloc(FuriMutexType type) {
     } else if(type == FuriMutexTypeRecursive) {
         hMutex = xSemaphoreCreateRecursiveMutex();
     } else {
-        furi_crash("Programming error");
+        furi_crash();
     }
 
     furi_check(hMutex != NULL);
@@ -30,13 +30,15 @@ FuriMutex* furi_mutex_alloc(FuriMutexType type) {
 }
 
 void furi_mutex_free(FuriMutex* instance) {
-    furi_assert(!FURI_IS_IRQ_MODE());
-    furi_assert(instance);
+    furi_check(!FURI_IS_IRQ_MODE());
+    furi_check(instance);
 
     vSemaphoreDelete((SemaphoreHandle_t)((uint32_t)instance & ~1U));
 }
 
 FuriStatus furi_mutex_acquire(FuriMutex* instance, uint32_t timeout) {
+    furi_check(instance);
+
     SemaphoreHandle_t hMutex;
     FuriStatus stat;
     uint32_t rmtx;
@@ -77,6 +79,8 @@ FuriStatus furi_mutex_acquire(FuriMutex* instance, uint32_t timeout) {
 }
 
 FuriStatus furi_mutex_release(FuriMutex* instance) {
+    furi_check(instance);
+
     SemaphoreHandle_t hMutex;
     FuriStatus stat;
     uint32_t rmtx;
@@ -109,6 +113,8 @@ FuriStatus furi_mutex_release(FuriMutex* instance) {
 }
 
 FuriThreadId furi_mutex_get_owner(FuriMutex* instance) {
+    furi_check(instance);
+
     SemaphoreHandle_t hMutex;
     FuriThreadId owner;
 
diff --git a/furi/core/pubsub.c b/furi/core/pubsub.c
index 44ef20c71..bcabc74a7 100644
--- a/furi/core/pubsub.c
+++ b/furi/core/pubsub.c
@@ -17,7 +17,7 @@ struct FuriPubSub {
     FuriMutex* mutex;
 };
 
-FuriPubSub* furi_pubsub_alloc() {
+FuriPubSub* furi_pubsub_alloc(void) {
     FuriPubSub* pubsub = malloc(sizeof(FuriPubSub));
 
     pubsub->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
@@ -42,6 +42,9 @@ void furi_pubsub_free(FuriPubSub* pubsub) {
 
 FuriPubSubSubscription*
     furi_pubsub_subscribe(FuriPubSub* pubsub, FuriPubSubCallback callback, void* callback_context) {
+    furi_check(pubsub);
+    furi_check(callback);
+
     furi_check(furi_mutex_acquire(pubsub->mutex, FuriWaitForever) == FuriStatusOk);
     // put uninitialized item to the list
     FuriPubSubSubscription* item = FuriPubSubSubscriptionList_push_raw(pubsub->items);
@@ -81,6 +84,8 @@ void furi_pubsub_unsubscribe(FuriPubSub* pubsub, FuriPubSubSubscription* pubsub_
 }
 
 void furi_pubsub_publish(FuriPubSub* pubsub, void* message) {
+    furi_check(pubsub);
+
     furi_check(furi_mutex_acquire(pubsub->mutex, FuriWaitForever) == FuriStatusOk);
 
     // iterate over subscribers
diff --git a/furi/core/pubsub.h b/furi/core/pubsub.h
index 69ca574ac..097ff0190 100644
--- a/furi/core/pubsub.h
+++ b/furi/core/pubsub.h
@@ -23,7 +23,7 @@ typedef struct FuriPubSubSubscription FuriPubSubSubscription;
  *
  * @return     pointer to FuriPubSub instance
  */
-FuriPubSub* furi_pubsub_alloc();
+FuriPubSub* furi_pubsub_alloc(void);
 
 /** Free FuriPubSub
  * 
diff --git a/furi/core/record.c b/furi/core/record.c
index 773585e7e..e9bd8edcd 100644
--- a/furi/core/record.c
+++ b/furi/core/record.c
@@ -37,7 +37,7 @@ static void furi_record_erase(const char* name, FuriRecordData* record_data) {
     FuriRecordDataDict_erase(furi_record->records, name);
 }
 
-void furi_record_init() {
+void furi_record_init(void) {
     furi_record = malloc(sizeof(FuriRecord));
     furi_record->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
     furi_check(furi_record->mutex);
@@ -45,7 +45,7 @@ void furi_record_init() {
 }
 
 static FuriRecordData* furi_record_data_get_or_create(const char* name) {
-    furi_assert(furi_record);
+    furi_check(furi_record);
     FuriRecordData* record_data = furi_record_get(name);
     if(!record_data) {
         FuriRecordData new_record;
@@ -58,17 +58,17 @@ static FuriRecordData* furi_record_data_get_or_create(const char* name) {
     return record_data;
 }
 
-static void furi_record_lock() {
+static void furi_record_lock(void) {
     furi_check(furi_mutex_acquire(furi_record->mutex, FuriWaitForever) == FuriStatusOk);
 }
 
-static void furi_record_unlock() {
+static void furi_record_unlock(void) {
     furi_check(furi_mutex_release(furi_record->mutex) == FuriStatusOk);
 }
 
 bool furi_record_exists(const char* name) {
-    furi_assert(furi_record);
-    furi_assert(name);
+    furi_check(furi_record);
+    furi_check(name);
 
     bool ret = false;
 
@@ -80,13 +80,14 @@ bool furi_record_exists(const char* name) {
 }
 
 void furi_record_create(const char* name, void* data) {
-    furi_assert(furi_record);
+    furi_check(furi_record);
+    furi_check(name);
 
     furi_record_lock();
 
     // Get record data and fill it
     FuriRecordData* record_data = furi_record_data_get_or_create(name);
-    furi_assert(record_data->data == NULL);
+    furi_check(record_data->data == NULL);
     record_data->data = data;
     furi_event_flag_set(record_data->flags, FURI_RECORD_FLAG_READY);
 
@@ -94,14 +95,15 @@ void furi_record_create(const char* name, void* data) {
 }
 
 bool furi_record_destroy(const char* name) {
-    furi_assert(furi_record);
+    furi_check(furi_record);
+    furi_check(name);
 
     bool ret = false;
 
     furi_record_lock();
 
     FuriRecordData* record_data = furi_record_get(name);
-    furi_assert(record_data);
+    furi_check(record_data);
     if(record_data->holders_count == 0) {
         furi_record_erase(name, record_data);
         ret = true;
@@ -113,7 +115,8 @@ bool furi_record_destroy(const char* name) {
 }
 
 void* furi_record_open(const char* name) {
-    furi_assert(furi_record);
+    furi_check(furi_record);
+    furi_check(name);
 
     furi_record_lock();
 
@@ -134,12 +137,13 @@ void* furi_record_open(const char* name) {
 }
 
 void furi_record_close(const char* name) {
-    furi_assert(furi_record);
+    furi_check(furi_record);
+    furi_check(name);
 
     furi_record_lock();
 
     FuriRecordData* record_data = furi_record_get(name);
-    furi_assert(record_data);
+    furi_check(record_data);
     record_data->holders_count--;
 
     furi_record_unlock();
diff --git a/furi/core/record.h b/furi/core/record.h
index 4819123e2..a269484f0 100644
--- a/furi/core/record.h
+++ b/furi/core/record.h
@@ -14,7 +14,7 @@ extern "C" {
 
 /** Initialize record storage For internal use only.
  */
-void furi_record_init();
+void furi_record_init(void);
 
 /** Check if record exists
  *
diff --git a/furi/core/semaphore.c b/furi/core/semaphore.c
index 1f1a07780..503eec472 100644
--- a/furi/core/semaphore.c
+++ b/furi/core/semaphore.c
@@ -6,8 +6,8 @@
 #include <semphr.h>
 
 FuriSemaphore* furi_semaphore_alloc(uint32_t max_count, uint32_t initial_count) {
-    furi_assert(!FURI_IS_IRQ_MODE());
-    furi_assert((max_count > 0U) && (initial_count <= max_count));
+    furi_check(!FURI_IS_IRQ_MODE());
+    furi_check((max_count > 0U) && (initial_count <= max_count));
 
     SemaphoreHandle_t hSemaphore = NULL;
     if(max_count == 1U) {
@@ -29,8 +29,8 @@ FuriSemaphore* furi_semaphore_alloc(uint32_t max_count, uint32_t initial_count)
 }
 
 void furi_semaphore_free(FuriSemaphore* instance) {
-    furi_assert(instance);
-    furi_assert(!FURI_IS_IRQ_MODE());
+    furi_check(instance);
+    furi_check(!FURI_IS_IRQ_MODE());
 
     SemaphoreHandle_t hSemaphore = (SemaphoreHandle_t)instance;
 
@@ -38,7 +38,7 @@ void furi_semaphore_free(FuriSemaphore* instance) {
 }
 
 FuriStatus furi_semaphore_acquire(FuriSemaphore* instance, uint32_t timeout) {
-    furi_assert(instance);
+    furi_check(instance);
 
     SemaphoreHandle_t hSemaphore = (SemaphoreHandle_t)instance;
     FuriStatus stat;
@@ -73,7 +73,7 @@ FuriStatus furi_semaphore_acquire(FuriSemaphore* instance, uint32_t timeout) {
 }
 
 FuriStatus furi_semaphore_release(FuriSemaphore* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     SemaphoreHandle_t hSemaphore = (SemaphoreHandle_t)instance;
     FuriStatus stat;
@@ -100,7 +100,7 @@ FuriStatus furi_semaphore_release(FuriSemaphore* instance) {
 }
 
 uint32_t furi_semaphore_get_count(FuriSemaphore* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     SemaphoreHandle_t hSemaphore = (SemaphoreHandle_t)instance;
     uint32_t count;
diff --git a/furi/core/stream_buffer.c b/furi/core/stream_buffer.c
index a13d256b1..8bd00d91c 100644
--- a/furi/core/stream_buffer.c
+++ b/furi/core/stream_buffer.c
@@ -7,7 +7,7 @@
 #include <FreeRTOS-Kernel/include/stream_buffer.h>
 
 FuriStreamBuffer* furi_stream_buffer_alloc(size_t size, size_t trigger_level) {
-    furi_assert(size != 0);
+    furi_check(size != 0);
 
     StreamBufferHandle_t handle = xStreamBufferCreate(size, trigger_level);
     furi_check(handle);
@@ -16,12 +16,13 @@ FuriStreamBuffer* furi_stream_buffer_alloc(size_t size, size_t trigger_level) {
 };
 
 void furi_stream_buffer_free(FuriStreamBuffer* stream_buffer) {
-    furi_assert(stream_buffer);
+    furi_check(stream_buffer);
+
     vStreamBufferDelete(stream_buffer);
 };
 
 bool furi_stream_set_trigger_level(FuriStreamBuffer* stream_buffer, size_t trigger_level) {
-    furi_assert(stream_buffer);
+    furi_check(stream_buffer);
     return xStreamBufferSetTriggerLevel(stream_buffer, trigger_level) == pdTRUE;
 };
 
@@ -30,6 +31,8 @@ size_t furi_stream_buffer_send(
     const void* data,
     size_t length,
     uint32_t timeout) {
+    furi_check(stream_buffer);
+
     size_t ret;
 
     if(FURI_IS_IRQ_MODE()) {
@@ -48,6 +51,8 @@ size_t furi_stream_buffer_receive(
     void* data,
     size_t length,
     uint32_t timeout) {
+    furi_check(stream_buffer);
+
     size_t ret;
 
     if(FURI_IS_IRQ_MODE()) {
@@ -62,22 +67,32 @@ size_t furi_stream_buffer_receive(
 }
 
 size_t furi_stream_buffer_bytes_available(FuriStreamBuffer* stream_buffer) {
+    furi_check(stream_buffer);
+
     return xStreamBufferBytesAvailable(stream_buffer);
 };
 
 size_t furi_stream_buffer_spaces_available(FuriStreamBuffer* stream_buffer) {
+    furi_check(stream_buffer);
+
     return xStreamBufferSpacesAvailable(stream_buffer);
 };
 
 bool furi_stream_buffer_is_full(FuriStreamBuffer* stream_buffer) {
+    furi_check(stream_buffer);
+
     return xStreamBufferIsFull(stream_buffer) == pdTRUE;
 };
 
 bool furi_stream_buffer_is_empty(FuriStreamBuffer* stream_buffer) {
+    furi_check(stream_buffer);
+
     return (xStreamBufferIsEmpty(stream_buffer) == pdTRUE);
 };
 
 FuriStatus furi_stream_buffer_reset(FuriStreamBuffer* stream_buffer) {
+    furi_check(stream_buffer);
+
     if(xStreamBufferReset(stream_buffer) == pdPASS) {
         return FuriStatusOk;
     } else {
diff --git a/furi/core/string.c b/furi/core/string.c
index a09ff953f..f3e40fe5e 100644
--- a/furi/core/string.c
+++ b/furi/core/string.c
@@ -22,7 +22,7 @@ struct FuriString {
 #undef furi_string_trim
 #undef furi_string_cat
 
-FuriString* furi_string_alloc() {
+FuriString* furi_string_alloc(void) {
     FuriString* string = malloc(sizeof(FuriString));
     string_init(string->string);
     return string;
diff --git a/furi/core/string.h b/furi/core/string.h
index 0e3e6a88e..324135e96 100644
--- a/furi/core/string.h
+++ b/furi/core/string.h
@@ -32,7 +32,7 @@ typedef struct FuriString FuriString;
  * @brief Allocate new FuriString.
  * @return FuriString* 
  */
-FuriString* furi_string_alloc();
+FuriString* furi_string_alloc(void);
 
 /**
  * @brief Allocate new FuriString and set it to string.
@@ -102,7 +102,7 @@ void furi_string_reserve(FuriString* string, size_t size);
 /**
  * @brief Reset string.
  * Make the string empty.
- * @param s 
+ * @param string
  */
 void furi_string_reset(FuriString* string);
 
diff --git a/furi/core/thread.c b/furi/core/thread.c
index 3c1a17258..f9f73b4f7 100644
--- a/furi/core/thread.c
+++ b/furi/core/thread.c
@@ -4,7 +4,6 @@
 #include "memmgr_heap.h"
 #include "check.h"
 #include "common_defines.h"
-#include "mutex.h"
 #include "string.h"
 
 #include "log.h"
@@ -57,7 +56,7 @@ static size_t __furi_thread_stdout_write(FuriThread* thread, const char* data, s
 static int32_t __furi_thread_stdout_flush(FuriThread* thread);
 
 /** Catch threads that are trying to exit wrong way */
-__attribute__((__noreturn__)) void furi_thread_catch() { //-V1082
+__attribute__((__noreturn__)) void furi_thread_catch(void) { //-V1082
     // If you're here it means you're probably doing something wrong
     // with critical sections or with scheduler state
     asm volatile("nop"); // extra magic
@@ -74,14 +73,14 @@ static void furi_thread_set_state(FuriThread* thread, FuriThreadState state) {
 }
 
 static void furi_thread_body(void* context) {
-    furi_assert(context);
+    furi_check(context);
     FuriThread* thread = context;
 
     // store thread instance to thread local storage
-    furi_assert(pvTaskGetThreadLocalStoragePointer(NULL, 0) == NULL);
+    furi_check(pvTaskGetThreadLocalStoragePointer(NULL, 0) == NULL);
     vTaskSetThreadLocalStoragePointer(NULL, 0, thread);
 
-    furi_assert(thread->state == FuriThreadStateStarting);
+    furi_check(thread->state == FuriThreadStateStarting);
     furi_thread_set_state(thread, FuriThreadStateRunning);
 
     TaskHandle_t task_handle = xTaskGetCurrentTaskHandle();
@@ -103,7 +102,7 @@ static void furi_thread_body(void* context) {
         memmgr_heap_disable_thread_trace((FuriThreadId)task_handle);
     }
 
-    furi_assert(thread->state == FuriThreadStateRunning);
+    furi_check(thread->state == FuriThreadStateRunning);
 
     if(thread->is_service) {
         FURI_LOG_W(
@@ -121,7 +120,7 @@ static void furi_thread_body(void* context) {
     furi_thread_catch();
 }
 
-FuriThread* furi_thread_alloc() {
+FuriThread* furi_thread_alloc(void) {
     FuriThread* thread = malloc(sizeof(FuriThread));
     thread->output.buffer = furi_string_alloc();
     thread->is_service = false;
@@ -167,11 +166,11 @@ FuriThread* furi_thread_alloc_ex(
 }
 
 void furi_thread_free(FuriThread* thread) {
-    furi_assert(thread);
+    furi_check(thread);
 
     // Ensure that use join before free
-    furi_assert(thread->state == FuriThreadStateStopped);
-    furi_assert(thread->task_handle == NULL);
+    furi_check(thread->state == FuriThreadStateStopped);
+    furi_check(thread->task_handle == NULL);
 
     if(thread->name) free(thread->name);
     if(thread->appid) free(thread->appid);
@@ -181,15 +180,17 @@ void furi_thread_free(FuriThread* thread) {
 }
 
 void furi_thread_set_name(FuriThread* thread, const char* name) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
+
     if(thread->name) free(thread->name);
+
     thread->name = name ? strdup(name) : NULL;
 }
 
 void furi_thread_set_appid(FuriThread* thread, const char* appid) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
     if(thread->appid) free(thread->appid);
     thread->appid = appid ? strdup(appid) : NULL;
 }
@@ -199,68 +200,70 @@ void furi_thread_mark_as_service(FuriThread* thread) {
 }
 
 void furi_thread_set_stack_size(FuriThread* thread, size_t stack_size) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
-    furi_assert(stack_size % 4 == 0);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
+    furi_check(stack_size % 4 == 0);
     thread->stack_size = stack_size;
 }
 
 void furi_thread_set_callback(FuriThread* thread, FuriThreadCallback callback) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
     thread->callback = callback;
 }
 
 void furi_thread_set_context(FuriThread* thread, void* context) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
     thread->context = context;
 }
 
 void furi_thread_set_priority(FuriThread* thread, FuriThreadPriority priority) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
-    furi_assert(priority >= FuriThreadPriorityIdle && priority <= FuriThreadPriorityIsr);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
+    furi_check(priority >= FuriThreadPriorityIdle && priority <= FuriThreadPriorityIsr);
     thread->priority = priority;
 }
 
 FuriThreadPriority furi_thread_get_priority(FuriThread* thread) {
-    furi_assert(thread);
+    furi_check(thread);
     TaskHandle_t hTask = furi_thread_get_id(thread);
     return (FuriThreadPriority)uxTaskPriorityGet(hTask);
 }
 
 void furi_thread_set_current_priority(FuriThreadPriority priority) {
+    furi_check(priority <= FuriThreadPriorityIsr);
+
     UBaseType_t new_priority = priority ? priority : FuriThreadPriorityNormal;
     vTaskPrioritySet(NULL, new_priority);
 }
 
-FuriThreadPriority furi_thread_get_current_priority() {
+FuriThreadPriority furi_thread_get_current_priority(void) {
     return (FuriThreadPriority)uxTaskPriorityGet(NULL);
 }
 
 void furi_thread_set_state_callback(FuriThread* thread, FuriThreadStateCallback callback) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
     thread->state_callback = callback;
 }
 
 void furi_thread_set_state_context(FuriThread* thread, void* context) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
     thread->state_context = context;
 }
 
 FuriThreadState furi_thread_get_state(FuriThread* thread) {
-    furi_assert(thread);
+    furi_check(thread);
     return thread->state;
 }
 
 void furi_thread_start(FuriThread* thread) {
-    furi_assert(thread);
-    furi_assert(thread->callback);
-    furi_assert(thread->state == FuriThreadStateStopped);
-    furi_assert(thread->stack_size > 0 && thread->stack_size < (UINT16_MAX * sizeof(StackType_t)));
+    furi_check(thread);
+    furi_check(thread->callback);
+    furi_check(thread->state == FuriThreadStateStopped);
+    furi_check(thread->stack_size > 0 && thread->stack_size < (UINT16_MAX * sizeof(StackType_t)));
 
     furi_thread_set_state(thread, FuriThreadStateStarting);
 
@@ -289,13 +292,13 @@ void furi_thread_cleanup_tcb_event(TaskHandle_t task) {
     if(thread) {
         // clear thread local storage
         vTaskSetThreadLocalStoragePointer(task, 0, NULL);
-        furi_assert(thread->task_handle == task);
+        furi_check(thread->task_handle == task);
         thread->task_handle = NULL;
     }
 }
 
 bool furi_thread_join(FuriThread* thread) {
-    furi_assert(thread);
+    furi_check(thread);
 
     furi_check(furi_thread_get_current() != thread);
 
@@ -311,45 +314,45 @@ bool furi_thread_join(FuriThread* thread) {
 }
 
 FuriThreadId furi_thread_get_id(FuriThread* thread) {
-    furi_assert(thread);
+    furi_check(thread);
     return thread->task_handle;
 }
 
 void furi_thread_enable_heap_trace(FuriThread* thread) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
     thread->heap_trace_enabled = true;
 }
 
 void furi_thread_disable_heap_trace(FuriThread* thread) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
     thread->heap_trace_enabled = false;
 }
 
 size_t furi_thread_get_heap_size(FuriThread* thread) {
-    furi_assert(thread);
-    furi_assert(thread->heap_trace_enabled == true);
+    furi_check(thread);
+    furi_check(thread->heap_trace_enabled == true);
     return thread->heap_size;
 }
 
 int32_t furi_thread_get_return_code(FuriThread* thread) {
-    furi_assert(thread);
-    furi_assert(thread->state == FuriThreadStateStopped);
+    furi_check(thread);
+    furi_check(thread->state == FuriThreadStateStopped);
     return thread->ret;
 }
 
-FuriThreadId furi_thread_get_current_id() {
+FuriThreadId furi_thread_get_current_id(void) {
     return xTaskGetCurrentTaskHandle();
 }
 
-FuriThread* furi_thread_get_current() {
+FuriThread* furi_thread_get_current(void) {
     FuriThread* thread = pvTaskGetThreadLocalStoragePointer(NULL, 0);
     return thread;
 }
 
-void furi_thread_yield() {
-    furi_assert(!FURI_IS_IRQ_MODE());
+void furi_thread_yield(void) {
+    furi_check(!FURI_IS_IRQ_MODE());
     taskYIELD();
 }
 
@@ -594,20 +597,21 @@ static int32_t __furi_thread_stdout_flush(FuriThread* thread) {
 
 void furi_thread_set_stdout_callback(FuriThreadStdoutWriteCallback callback) {
     FuriThread* thread = furi_thread_get_current();
-    furi_assert(thread);
+    furi_check(thread);
     __furi_thread_stdout_flush(thread);
     thread->output.write_callback = callback;
 }
 
-FuriThreadStdoutWriteCallback furi_thread_get_stdout_callback() {
+FuriThreadStdoutWriteCallback furi_thread_get_stdout_callback(void) {
     FuriThread* thread = furi_thread_get_current();
-    furi_assert(thread);
+    furi_check(thread);
     return thread->output.write_callback;
 }
 
 size_t furi_thread_stdout_write(const char* data, size_t size) {
     FuriThread* thread = furi_thread_get_current();
-    furi_assert(thread);
+    furi_check(thread);
+
     if(size == 0 || data == NULL) {
         return __furi_thread_stdout_flush(thread);
     } else {
@@ -629,19 +633,26 @@ size_t furi_thread_stdout_write(const char* data, size_t size) {
     return size;
 }
 
-int32_t furi_thread_stdout_flush() {
+int32_t furi_thread_stdout_flush(void) {
     FuriThread* thread = furi_thread_get_current();
-    furi_assert(thread);
+    furi_check(thread);
+
     return __furi_thread_stdout_flush(thread);
 }
 
 void furi_thread_suspend(FuriThreadId thread_id) {
+    furi_check(thread_id);
+
     TaskHandle_t hTask = (TaskHandle_t)thread_id;
+
     vTaskSuspend(hTask);
 }
 
 void furi_thread_resume(FuriThreadId thread_id) {
+    furi_check(thread_id);
+
     TaskHandle_t hTask = (TaskHandle_t)thread_id;
+
     if(FURI_IS_IRQ_MODE()) {
         xTaskResumeFromISR(hTask);
     } else {
@@ -650,6 +661,9 @@ void furi_thread_resume(FuriThreadId thread_id) {
 }
 
 bool furi_thread_is_suspended(FuriThreadId thread_id) {
+    furi_check(thread_id);
+
     TaskHandle_t hTask = (TaskHandle_t)thread_id;
+
     return eTaskGetState(hTask) == eSuspended;
 }
diff --git a/furi/core/thread.h b/furi/core/thread.h
index 83c051cc2..f21ee9df3 100644
--- a/furi/core/thread.h
+++ b/furi/core/thread.h
@@ -62,7 +62,7 @@ typedef void (*FuriThreadStateCallback)(FuriThreadState state, void* context);
  *
  * @return     FuriThread instance
  */
-FuriThread* furi_thread_alloc();
+FuriThread* furi_thread_alloc(void);
 
 /** Allocate FuriThread, shortcut version
  * 
@@ -155,7 +155,7 @@ void furi_thread_set_current_priority(FuriThreadPriority priority);
  *
  * @return     FuriThreadPriority value
  */
-FuriThreadPriority furi_thread_get_current_priority();
+FuriThreadPriority furi_thread_get_current_priority(void);
 
 /** Set FuriThread state change callback
  *
@@ -235,21 +235,19 @@ int32_t furi_thread_get_return_code(FuriThread* thread);
 /** Thread related methods that doesn't involve FuriThread directly */
 
 /** Get FreeRTOS FuriThreadId for current thread
- *
- * @param      thread  FuriThread instance
  *
  * @return     FuriThreadId or NULL
  */
-FuriThreadId furi_thread_get_current_id();
+FuriThreadId furi_thread_get_current_id(void);
 
 /** Get FuriThread instance for current thread
  * 
  * @return pointer to FuriThread or NULL if this thread doesn't belongs to Furi
  */
-FuriThread* furi_thread_get_current();
+FuriThread* furi_thread_get_current(void);
 
 /** Return control to scheduler */
-void furi_thread_yield();
+void furi_thread_yield(void);
 
 uint32_t furi_thread_flags_set(FuriThreadId thread_id, uint32_t flags);
 
@@ -263,7 +261,7 @@ uint32_t furi_thread_flags_wait(uint32_t flags, uint32_t options, uint32_t timeo
  * @brief Enumerate threads
  * 
  * @param thread_array array of FuriThreadId, where thread ids will be stored
- * @param array_items array size
+ * @param array_item_count array size
  * @return uint32_t threads count
  */
 uint32_t furi_thread_enumerate(FuriThreadId* thread_array, uint32_t array_item_count);
@@ -296,7 +294,7 @@ uint32_t furi_thread_get_stack_space(FuriThreadId thread_id);
  *
  * @return STDOUT callback
  */
-FuriThreadStdoutWriteCallback furi_thread_get_stdout_callback();
+FuriThreadStdoutWriteCallback furi_thread_get_stdout_callback(void);
 
 /** Set STDOUT callback for thread
  *
@@ -317,7 +315,7 @@ size_t furi_thread_stdout_write(const char* data, size_t size);
  * 
  * @return int32_t error code
  */
-int32_t furi_thread_stdout_flush();
+int32_t furi_thread_stdout_flush(void);
 
 /** Suspend thread
  * 
diff --git a/furi/core/timer.c b/furi/core/timer.c
index f667aae96..2e688dcc3 100644
--- a/furi/core/timer.c
+++ b/furi/core/timer.c
@@ -26,7 +26,7 @@ static void TimerCallback(TimerHandle_t hTimer) {
 }
 
 FuriTimer* furi_timer_alloc(FuriTimerCallback func, FuriTimerType type, void* context) {
-    furi_assert((furi_kernel_is_irq_or_masked() == 0U) && (func != NULL));
+    furi_check((furi_kernel_is_irq_or_masked() == 0U) && (func != NULL));
 
     TimerHandle_t hTimer;
     TimerCallback_t* callb;
@@ -59,8 +59,8 @@ FuriTimer* furi_timer_alloc(FuriTimerCallback func, FuriTimerType type, void* co
 }
 
 void furi_timer_free(FuriTimer* instance) {
-    furi_assert(!furi_kernel_is_irq_or_masked());
-    furi_assert(instance);
+    furi_check(!furi_kernel_is_irq_or_masked());
+    furi_check(instance);
 
     TimerHandle_t hTimer = (TimerHandle_t)instance;
     TimerCallback_t* callb;
@@ -86,9 +86,9 @@ 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);
+    furi_check(!furi_kernel_is_irq_or_masked());
+    furi_check(instance);
+    furi_check(ticks < portMAX_DELAY);
 
     TimerHandle_t hTimer = (TimerHandle_t)instance;
     FuriStatus stat;
@@ -104,9 +104,9 @@ FuriStatus furi_timer_start(FuriTimer* instance, uint32_t ticks) {
 }
 
 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);
+    furi_check(!furi_kernel_is_irq_or_masked());
+    furi_check(instance);
+    furi_check(ticks < portMAX_DELAY);
 
     TimerHandle_t hTimer = (TimerHandle_t)instance;
     FuriStatus stat;
@@ -123,8 +123,8 @@ FuriStatus furi_timer_restart(FuriTimer* instance, uint32_t ticks) {
 }
 
 FuriStatus furi_timer_stop(FuriTimer* instance) {
-    furi_assert(!furi_kernel_is_irq_or_masked());
-    furi_assert(instance);
+    furi_check(!furi_kernel_is_irq_or_masked());
+    furi_check(instance);
 
     TimerHandle_t hTimer = (TimerHandle_t)instance;
 
@@ -134,8 +134,8 @@ FuriStatus furi_timer_stop(FuriTimer* instance) {
 }
 
 uint32_t furi_timer_is_running(FuriTimer* instance) {
-    furi_assert(!furi_kernel_is_irq_or_masked());
-    furi_assert(instance);
+    furi_check(!furi_kernel_is_irq_or_masked());
+    furi_check(instance);
 
     TimerHandle_t hTimer = (TimerHandle_t)instance;
 
@@ -144,8 +144,8 @@ uint32_t furi_timer_is_running(FuriTimer* instance) {
 }
 
 uint32_t furi_timer_get_expire_time(FuriTimer* instance) {
-    furi_assert(!furi_kernel_is_irq_or_masked());
-    furi_assert(instance);
+    furi_check(!furi_kernel_is_irq_or_masked());
+    furi_check(instance);
 
     TimerHandle_t hTimer = (TimerHandle_t)instance;
 
@@ -153,17 +153,20 @@ uint32_t furi_timer_get_expire_time(FuriTimer* instance) {
 }
 
 void furi_timer_pending_callback(FuriTimerPendigCallback callback, void* context, uint32_t arg) {
+    furi_check(callback);
+
     BaseType_t ret = pdFAIL;
     if(furi_kernel_is_irq_or_masked()) {
         ret = xTimerPendFunctionCallFromISR(callback, context, arg, NULL);
     } else {
         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());
+    furi_check(!furi_kernel_is_irq_or_masked());
 
     TaskHandle_t task_handle = xTimerGetTimerDaemonTaskHandle();
     furi_check(task_handle); // Don't call this method before timer task start
diff --git a/furi/flipper.c b/furi/flipper.c
index b29424a9f..c7ba3b4fb 100644
--- a/furi/flipper.c
+++ b/furi/flipper.c
@@ -29,7 +29,7 @@ static void flipper_print_version(const char* target, const Version* version) {
     }
 }
 
-void flipper_init() {
+void flipper_init(void) {
     flipper_print_version("Firmware", furi_hal_version_get_firmware_version());
 
     FURI_LOG_I(TAG, "Boot mode %d, starting services", furi_hal_rtc_get_boot_mode());
diff --git a/furi/flipper.h b/furi/flipper.h
index 5b277fac6..674cccf88 100644
--- a/furi/flipper.h
+++ b/furi/flipper.h
@@ -1,3 +1,3 @@
 #pragma once
 
-void flipper_init();
+void flipper_init(void);
diff --git a/furi/furi.c b/furi/furi.c
index 6247e259f..628c47ea2 100644
--- a/furi/furi.c
+++ b/furi/furi.c
@@ -4,17 +4,17 @@
 #include <FreeRTOS.h>
 #include <queue.h>
 
-void furi_init() {
-    furi_assert(!furi_kernel_is_irq_or_masked());
-    furi_assert(xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED);
+void furi_init(void) {
+    furi_check(!furi_kernel_is_irq_or_masked());
+    furi_check(xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED);
 
     furi_log_init();
     furi_record_init();
 }
 
-void furi_run() {
-    furi_assert(!furi_kernel_is_irq_or_masked());
-    furi_assert(xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED);
+void furi_run(void) {
+    furi_check(!furi_kernel_is_irq_or_masked());
+    furi_check(xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED);
 
 #if(__ARM_ARCH_7A__ == 0U)
     /* Service Call interrupt might be configured before kernel start      */
diff --git a/furi/furi.h b/furi/furi.h
index 422509055..d8aec91c0 100644
--- a/furi/furi.h
+++ b/furi/furi.h
@@ -28,9 +28,9 @@
 extern "C" {
 #endif
 
-void furi_init();
+void furi_init(void);
 
-void furi_run();
+void furi_run(void);
 
 #ifdef __cplusplus
 }
diff --git a/lib/app-scened-template/text_store.h b/lib/app-scened-template/text_store.h
index a01784fde..3fe58ed1d 100644
--- a/lib/app-scened-template/text_store.h
+++ b/lib/app-scened-template/text_store.h
@@ -4,7 +4,7 @@
 class TextStore {
 public:
     TextStore(uint8_t text_size);
-    ~TextStore();
+    ~TextStore(void);
 
     void set(const char* text...);
     const uint8_t text_size;
diff --git a/lib/app-scened-template/view_modules/byte_input_vm.h b/lib/app-scened-template/view_modules/byte_input_vm.h
index 9a1610127..69031fbee 100644
--- a/lib/app-scened-template/view_modules/byte_input_vm.h
+++ b/lib/app-scened-template/view_modules/byte_input_vm.h
@@ -4,7 +4,7 @@
 
 class ByteInputVM : public GenericViewModule {
 public:
-    ByteInputVM();
+    ByteInputVM(void);
     ~ByteInputVM() final;
     View* get_view() final;
     void clean() final;
diff --git a/lib/app-scened-template/view_modules/dialog_ex_vm.h b/lib/app-scened-template/view_modules/dialog_ex_vm.h
index 66c2b760a..cb63ccdbc 100644
--- a/lib/app-scened-template/view_modules/dialog_ex_vm.h
+++ b/lib/app-scened-template/view_modules/dialog_ex_vm.h
@@ -4,7 +4,7 @@
 
 class DialogExVM : public GenericViewModule {
 public:
-    DialogExVM();
+    DialogExVM(void);
     ~DialogExVM() final;
     View* get_view() final;
     void clean() final;
diff --git a/lib/app-scened-template/view_modules/popup_vm.h b/lib/app-scened-template/view_modules/popup_vm.h
index 266505639..234f33774 100644
--- a/lib/app-scened-template/view_modules/popup_vm.h
+++ b/lib/app-scened-template/view_modules/popup_vm.h
@@ -4,7 +4,7 @@
 
 class PopupVM : public GenericViewModule {
 public:
-    PopupVM();
+    PopupVM(void);
     ~PopupVM() final;
     View* get_view() final;
     void clean() final;
@@ -56,12 +56,12 @@ public:
     /** 
      * Enable popup timeout
      */
-    void enable_timeout();
+    void enable_timeout(void);
 
     /** 
      * Disable popup timeout
      */
-    void disable_timeout();
+    void disable_timeout(void);
 
 private:
     Popup* popup;
diff --git a/lib/app-scened-template/view_modules/submenu_vm.h b/lib/app-scened-template/view_modules/submenu_vm.h
index 06541527a..223fbd531 100644
--- a/lib/app-scened-template/view_modules/submenu_vm.h
+++ b/lib/app-scened-template/view_modules/submenu_vm.h
@@ -4,7 +4,7 @@
 
 class SubmenuVM : public GenericViewModule {
 public:
-    SubmenuVM();
+    SubmenuVM(void);
     ~SubmenuVM() final;
     View* get_view() final;
     void clean() final;
diff --git a/lib/app-scened-template/view_modules/text_input_vm.h b/lib/app-scened-template/view_modules/text_input_vm.h
index 81799e48c..5c71c4318 100644
--- a/lib/app-scened-template/view_modules/text_input_vm.h
+++ b/lib/app-scened-template/view_modules/text_input_vm.h
@@ -4,7 +4,7 @@
 
 class TextInputVM : public GenericViewModule {
 public:
-    TextInputVM();
+    TextInputVM(void);
     ~TextInputVM() final;
     View* get_view() final;
     void clean() final;
@@ -34,7 +34,7 @@ public:
 
     void set_validator(TextInputValidatorCallback callback, void* callback_context);
 
-    void* get_validator_callback_context();
+    void* get_validator_callback_context(void);
 
 private:
     TextInput* text_input;
diff --git a/lib/bit_lib/bit_lib.c b/lib/bit_lib/bit_lib.c
index e13ca95d4..8122b1cc4 100644
--- a/lib/bit_lib/bit_lib.c
+++ b/lib/bit_lib/bit_lib.c
@@ -418,8 +418,8 @@ uint16_t bit_lib_crc16(
 }
 
 void bit_lib_num_to_bytes_be(uint64_t src, uint8_t len, uint8_t* dest) {
-    furi_assert(dest);
-    furi_assert(len <= 8);
+    furi_check(dest);
+    furi_check(len <= 8);
 
     while(len--) {
         dest[len] = (uint8_t)src;
@@ -428,8 +428,8 @@ void bit_lib_num_to_bytes_be(uint64_t src, uint8_t len, uint8_t* dest) {
 }
 
 void bit_lib_num_to_bytes_le(uint64_t src, uint8_t len, uint8_t* dest) {
-    furi_assert(dest);
-    furi_assert(len <= 8);
+    furi_check(dest);
+    furi_check(len <= 8);
 
     for(int i = 0; i < len; i++) {
         dest[i] = (uint8_t)(src >> (8 * i));
@@ -437,8 +437,8 @@ void bit_lib_num_to_bytes_le(uint64_t src, uint8_t len, uint8_t* dest) {
 }
 
 uint64_t bit_lib_bytes_to_num_be(const uint8_t* src, uint8_t len) {
-    furi_assert(src);
-    furi_assert(len <= 8);
+    furi_check(src);
+    furi_check(len <= 8);
 
     uint64_t res = 0;
     while(len--) {
@@ -449,8 +449,8 @@ uint64_t bit_lib_bytes_to_num_be(const uint8_t* src, uint8_t len) {
 }
 
 uint64_t bit_lib_bytes_to_num_le(const uint8_t* src, uint8_t len) {
-    furi_assert(src);
-    furi_assert(len <= 8);
+    furi_check(src);
+    furi_check(len <= 8);
 
     uint64_t res = 0;
     uint8_t shift = 0;
@@ -462,8 +462,8 @@ uint64_t bit_lib_bytes_to_num_le(const uint8_t* src, uint8_t len) {
 }
 
 uint64_t bit_lib_bytes_to_num_bcd(const uint8_t* src, uint8_t len, bool* is_bcd) {
-    furi_assert(src);
-    furi_assert(len <= 9);
+    furi_check(src);
+    furi_check(len <= 9);
 
     uint64_t res = 0;
     uint8_t nibble_1, nibble_2;
diff --git a/lib/ble_profile/extra_profiles/hid_profile.c b/lib/ble_profile/extra_profiles/hid_profile.c
index aaa66d960..7231fdb19 100644
--- a/lib/ble_profile/extra_profiles/hid_profile.c
+++ b/lib/ble_profile/extra_profiles/hid_profile.c
@@ -380,8 +380,8 @@ static GapConfig template_config = {
     .pairing_method = GapPairingPinCodeVerifyYesNo,
     .conn_param =
         {
-            .conn_int_min = 0x18, // 30 ms
-            .conn_int_max = 0x24, // 45 ms
+            .conn_int_min = 0x18, // AN5289: 4.7, we need at least 25ms + advertisement, which is 30 ms
+            .conn_int_max = 0x18, // 30 ms
             .slave_latency = 0,
             .supervisor_timeout = 0,
         },
diff --git a/lib/ble_profile/extra_services/hid_service.c b/lib/ble_profile/extra_services/hid_service.c
index d9ea09c14..92422d5d5 100644
--- a/lib/ble_profile/extra_services/hid_service.c
+++ b/lib/ble_profile/extra_services/hid_service.c
@@ -169,7 +169,7 @@ static BleEventAckStatus ble_svc_hid_event_handler(void* event, void* context) {
     return ret;
 }
 
-BleServiceHid* ble_svc_hid_start() {
+BleServiceHid* ble_svc_hid_start(void) {
     BleServiceHid* hid_svc = malloc(sizeof(BleServiceHid));
 
     // Register event handler
diff --git a/lib/ble_profile/extra_services/hid_service.h b/lib/ble_profile/extra_services/hid_service.h
index 8e9cc2975..9bbb83611 100644
--- a/lib/ble_profile/extra_services/hid_service.h
+++ b/lib/ble_profile/extra_services/hid_service.h
@@ -9,7 +9,7 @@ extern "C" {
 
 typedef struct BleServiceHid BleServiceHid;
 
-BleServiceHid* ble_svc_hid_start();
+BleServiceHid* ble_svc_hid_start(void);
 
 void ble_svc_hid_stop(BleServiceHid* service);
 
diff --git a/lib/datetime/datetime.c b/lib/datetime/datetime.c
index 7b1f73dd0..9c2194d96 100644
--- a/lib/datetime/datetime.c
+++ b/lib/datetime/datetime.c
@@ -1,4 +1,5 @@
 #include "datetime.h"
+#include <furi.h>
 
 #define TAG "DateTime"
 
@@ -37,6 +38,8 @@ bool datetime_validate_datetime(DateTime* datetime) {
 }
 
 uint32_t datetime_datetime_to_timestamp(DateTime* datetime) {
+    furi_check(datetime);
+
     uint32_t timestamp = 0;
     uint8_t years = 0;
     uint8_t leap_years = 0;
@@ -67,10 +70,12 @@ uint32_t datetime_datetime_to_timestamp(DateTime* datetime) {
 }
 
 void datetime_timestamp_to_datetime(uint32_t timestamp, DateTime* datetime) {
+    furi_check(datetime);
     uint32_t days = timestamp / SECONDS_PER_DAY;
     uint32_t seconds_in_day = timestamp % SECONDS_PER_DAY;
 
     datetime->year = EPOCH_START_YEAR;
+    datetime->weekday = ((days + 3) % 7) + 1;
 
     while(days >= datetime_get_days_per_year(datetime->year)) {
         days -= datetime_get_days_per_year(datetime->year);
diff --git a/lib/digital_signal/digital_sequence.c b/lib/digital_signal/digital_sequence.c
index c85aae8c0..24dddb77d 100644
--- a/lib/digital_signal/digital_sequence.c
+++ b/lib/digital_signal/digital_sequence.c
@@ -115,17 +115,17 @@ void digital_sequence_register_signal(
     DigitalSequence* sequence,
     uint8_t signal_index,
     const DigitalSignal* signal) {
-    furi_assert(sequence);
-    furi_assert(signal);
-    furi_assert(signal_index < DIGITAL_SEQUENCE_BANK_SIZE);
+    furi_check(sequence);
+    furi_check(signal);
+    furi_check(signal_index < DIGITAL_SEQUENCE_BANK_SIZE);
 
     sequence->signals[signal_index] = signal;
 }
 
 void digital_sequence_add_signal(DigitalSequence* sequence, uint8_t signal_index) {
-    furi_assert(sequence);
-    furi_assert(signal_index < DIGITAL_SEQUENCE_BANK_SIZE);
-    furi_assert(sequence->size < sequence->max_size);
+    furi_check(sequence);
+    furi_check(signal_index < DIGITAL_SEQUENCE_BANK_SIZE);
+    furi_check(sequence->size < sequence->max_size);
 
     sequence->data[sequence->size++] = signal_index;
 }
@@ -140,14 +140,14 @@ static inline void digital_sequence_start_dma(DigitalSequence* sequence) {
     LL_DMA_EnableChannel(DMA1, LL_DMA_CHANNEL_2);
 }
 
-static inline void digital_sequence_stop_dma() {
+static inline void digital_sequence_stop_dma(void) {
     LL_DMA_DisableChannel(DMA1, LL_DMA_CHANNEL_1);
     LL_DMA_DisableChannel(DMA1, LL_DMA_CHANNEL_2);
     LL_DMA_ClearFlag_TC1(DMA1);
     LL_DMA_ClearFlag_TC2(DMA1);
 }
 
-static inline void digital_sequence_start_timer() {
+static inline void digital_sequence_start_timer(void) {
     furi_hal_bus_enable(FuriHalBusTIM2);
 
     LL_TIM_SetCounterMode(TIM2, LL_TIM_COUNTERMODE_UP);
@@ -162,7 +162,7 @@ static inline void digital_sequence_start_timer() {
     LL_TIM_GenerateEvent_UPDATE(TIM2);
 }
 
-static void digital_sequence_stop_timer() {
+static void digital_sequence_stop_timer(void) {
     LL_TIM_DisableCounter(TIM2);
     LL_TIM_DisableUpdateEvent(TIM2);
     LL_TIM_DisableDMAReq_UPDATE(TIM2);
@@ -280,9 +280,9 @@ static inline void digital_sequence_timer_buffer_reset(DigitalSequence* sequence
 }
 
 void digital_sequence_transmit(DigitalSequence* sequence) {
-    furi_assert(sequence);
-    furi_assert(sequence->size);
-    furi_assert(sequence->state == DigitalSequenceStateIdle);
+    furi_check(sequence);
+    furi_check(sequence->size);
+    furi_check(sequence->state == DigitalSequenceStateIdle);
 
     FURI_CRITICAL_ENTER();
 
diff --git a/lib/digital_signal/digital_signal.c b/lib/digital_signal/digital_signal.c
index a0408900d..585250c26 100644
--- a/lib/digital_signal/digital_signal.c
+++ b/lib/digital_signal/digital_signal.c
@@ -15,33 +15,33 @@ DigitalSignal* digital_signal_alloc(uint32_t max_size) {
 }
 
 void digital_signal_free(DigitalSignal* signal) {
-    furi_assert(signal);
+    furi_check(signal);
 
     free(signal->data);
     free(signal);
 }
 
 bool digital_signal_get_start_level(const DigitalSignal* signal) {
-    furi_assert(signal);
+    furi_check(signal);
 
     return signal->start_level;
 }
 
 void digital_signal_set_start_level(DigitalSignal* signal, bool level) {
-    furi_assert(signal);
+    furi_check(signal);
 
     signal->start_level = level;
 }
 
 uint32_t digital_signal_get_size(const DigitalSignal* signal) {
-    furi_assert(signal);
+    furi_check(signal);
 
     return signal->size;
 }
 
 void digital_signal_add_period(DigitalSignal* signal, uint32_t ticks) {
-    furi_assert(signal);
-    furi_assert(signal->size < signal->max_size);
+    furi_check(signal);
+    furi_check(signal->size < signal->max_size);
 
     const uint32_t duration = ticks + signal->remainder;
 
@@ -80,7 +80,7 @@ static void digital_signal_extend_last_period(DigitalSignal* signal, uint32_t ti
 }
 
 void digital_signal_add_period_with_level(DigitalSignal* signal, uint32_t ticks, bool level) {
-    furi_assert(signal);
+    furi_check(signal);
 
     if(signal->size == 0) {
         signal->start_level = level;
diff --git a/lib/drivers/st25r3916_reg.c b/lib/drivers/st25r3916_reg.c
index 8ac467238..76a882755 100644
--- a/lib/drivers/st25r3916_reg.c
+++ b/lib/drivers/st25r3916_reg.c
@@ -34,7 +34,7 @@ static void st25r3916_reg_tx_byte(FuriHalSpiBusHandle* handle, uint8_t byte) {
 }
 
 void st25r3916_read_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* val) {
-    furi_assert(handle);
+    furi_check(handle);
     st25r3916_read_burst_regs(handle, reg, val, 1);
 }
 
@@ -43,9 +43,9 @@ void st25r3916_read_burst_regs(
     uint8_t reg_start,
     uint8_t* values,
     uint8_t length) {
-    furi_assert(handle);
-    furi_assert(values);
-    furi_assert(length);
+    furi_check(handle);
+    furi_check(values);
+    furi_check(length);
 
     furi_hal_gpio_write(handle->cs, false);
 
@@ -60,7 +60,7 @@ void st25r3916_read_burst_regs(
 }
 
 void st25r3916_write_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t val) {
-    furi_assert(handle);
+    furi_check(handle);
     uint8_t reg_val = val;
     st25r3916_write_burst_regs(handle, reg, &reg_val, 1);
 }
@@ -70,9 +70,9 @@ void st25r3916_write_burst_regs(
     uint8_t reg_start,
     const uint8_t* values,
     uint8_t length) {
-    furi_assert(handle);
-    furi_assert(values);
-    furi_assert(length);
+    furi_check(handle);
+    furi_check(values);
+    furi_check(length);
 
     furi_hal_gpio_write(handle->cs, false);
 
@@ -87,10 +87,10 @@ void st25r3916_write_burst_regs(
 }
 
 void st25r3916_reg_write_fifo(FuriHalSpiBusHandle* handle, const uint8_t* buff, size_t length) {
-    furi_assert(handle);
-    furi_assert(buff);
-    furi_assert(length);
-    furi_assert(length <= ST25R3916_FIFO_DEPTH);
+    furi_check(handle);
+    furi_check(buff);
+    furi_check(length);
+    furi_check(length <= ST25R3916_FIFO_DEPTH);
 
     furi_hal_gpio_write(handle->cs, false);
     st25r3916_reg_tx_byte(handle, ST25R3916_FIFO_LOAD);
@@ -99,10 +99,10 @@ void st25r3916_reg_write_fifo(FuriHalSpiBusHandle* handle, const uint8_t* buff,
 }
 
 void st25r3916_reg_read_fifo(FuriHalSpiBusHandle* handle, uint8_t* buff, size_t length) {
-    furi_assert(handle);
-    furi_assert(buff);
-    furi_assert(length);
-    furi_assert(length <= ST25R3916_FIFO_DEPTH);
+    furi_check(handle);
+    furi_check(buff);
+    furi_check(length);
+    furi_check(length <= ST25R3916_FIFO_DEPTH);
 
     furi_hal_gpio_write(handle->cs, false);
     st25r3916_reg_tx_byte(handle, ST25R3916_FIFO_READ);
@@ -111,10 +111,10 @@ void st25r3916_reg_read_fifo(FuriHalSpiBusHandle* handle, uint8_t* buff, size_t
 }
 
 void st25r3916_write_pta_mem(FuriHalSpiBusHandle* handle, const uint8_t* values, size_t length) {
-    furi_assert(handle);
-    furi_assert(values);
-    furi_assert(length);
-    furi_assert(length <= ST25R3916_PTM_LEN);
+    furi_check(handle);
+    furi_check(values);
+    furi_check(length);
+    furi_check(length <= ST25R3916_PTM_LEN);
 
     furi_hal_gpio_write(handle->cs, false);
     st25r3916_reg_tx_byte(handle, ST25R3916_PT_A_CONFIG_LOAD);
@@ -123,10 +123,10 @@ void st25r3916_write_pta_mem(FuriHalSpiBusHandle* handle, const uint8_t* values,
 }
 
 void st25r3916_read_pta_mem(FuriHalSpiBusHandle* handle, uint8_t* buff, size_t length) {
-    furi_assert(handle);
-    furi_assert(buff);
-    furi_assert(length);
-    furi_assert(length <= ST25R3916_PTM_LEN);
+    furi_check(handle);
+    furi_check(buff);
+    furi_check(length);
+    furi_check(length <= ST25R3916_PTM_LEN);
 
     uint8_t tmp_buff[ST25R3916_PTM_LEN + 1];
     furi_hal_gpio_write(handle->cs, false);
@@ -137,8 +137,8 @@ void st25r3916_read_pta_mem(FuriHalSpiBusHandle* handle, uint8_t* buff, size_t l
 }
 
 void st25r3916_write_ptf_mem(FuriHalSpiBusHandle* handle, const uint8_t* values, size_t length) {
-    furi_assert(handle);
-    furi_assert(values);
+    furi_check(handle);
+    furi_check(values);
 
     furi_hal_gpio_write(handle->cs, false);
     st25r3916_reg_tx_byte(handle, ST25R3916_PT_F_CONFIG_LOAD);
@@ -147,8 +147,8 @@ void st25r3916_write_ptf_mem(FuriHalSpiBusHandle* handle, const uint8_t* values,
 }
 
 void st25r3916_write_pttsn_mem(FuriHalSpiBusHandle* handle, uint8_t* buff, size_t length) {
-    furi_assert(handle);
-    furi_assert(buff);
+    furi_check(handle);
+    furi_check(buff);
 
     furi_hal_gpio_write(handle->cs, false);
     st25r3916_reg_tx_byte(handle, ST25R3916_PT_TSN_DATA_LOAD);
@@ -157,7 +157,7 @@ void st25r3916_write_pttsn_mem(FuriHalSpiBusHandle* handle, uint8_t* buff, size_
 }
 
 void st25r3916_direct_cmd(FuriHalSpiBusHandle* handle, uint8_t cmd) {
-    furi_assert(handle);
+    furi_check(handle);
 
     furi_hal_gpio_write(handle->cs, false);
     st25r3916_reg_tx_byte(handle, cmd | ST25R3916_CMD_MODE);
@@ -165,7 +165,7 @@ void st25r3916_direct_cmd(FuriHalSpiBusHandle* handle, uint8_t cmd) {
 }
 
 void st25r3916_read_test_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* val) {
-    furi_assert(handle);
+    furi_check(handle);
 
     furi_hal_gpio_write(handle->cs, false);
     st25r3916_reg_tx_byte(handle, ST25R3916_CMD_TEST_ACCESS);
@@ -175,7 +175,7 @@ void st25r3916_read_test_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t*
 }
 
 void st25r3916_write_test_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t val) {
-    furi_assert(handle);
+    furi_check(handle);
 
     furi_hal_gpio_write(handle->cs, false);
     st25r3916_reg_tx_byte(handle, ST25R3916_CMD_TEST_ACCESS);
@@ -185,7 +185,7 @@ void st25r3916_write_test_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t
 }
 
 void st25r3916_clear_reg_bits(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t clr_mask) {
-    furi_assert(handle);
+    furi_check(handle);
 
     uint8_t reg_val = 0;
     st25r3916_read_reg(handle, reg, &reg_val);
@@ -196,7 +196,7 @@ void st25r3916_clear_reg_bits(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t
 }
 
 void st25r3916_set_reg_bits(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t set_mask) {
-    furi_assert(handle);
+    furi_check(handle);
 
     uint8_t reg_val = 0;
     st25r3916_read_reg(handle, reg, &reg_val);
@@ -211,7 +211,7 @@ void st25r3916_change_reg_bits(
     uint8_t reg,
     uint8_t mask,
     uint8_t value) {
-    furi_assert(handle);
+    furi_check(handle);
 
     st25r3916_modify_reg(handle, reg, mask, (mask & value));
 }
@@ -221,7 +221,7 @@ void st25r3916_modify_reg(
     uint8_t reg,
     uint8_t clr_mask,
     uint8_t set_mask) {
-    furi_assert(handle);
+    furi_check(handle);
 
     uint8_t reg_val = 0;
     uint8_t new_val = 0;
@@ -237,7 +237,7 @@ void st25r3916_change_test_reg_bits(
     uint8_t reg,
     uint8_t mask,
     uint8_t value) {
-    furi_assert(handle);
+    furi_check(handle);
 
     uint8_t reg_val = 0;
     uint8_t new_val = 0;
@@ -249,7 +249,7 @@ void st25r3916_change_test_reg_bits(
 }
 
 bool st25r3916_check_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t mask, uint8_t val) {
-    furi_assert(handle);
+    furi_check(handle);
 
     uint8_t reg_val = 0;
     st25r3916_read_reg(handle, reg, &reg_val);
diff --git a/lib/flipper_application/api_hashtable/api_hashtable.cpp b/lib/flipper_application/api_hashtable/api_hashtable.cpp
index 11f2d7ecf..861eece79 100644
--- a/lib/flipper_application/api_hashtable/api_hashtable.cpp
+++ b/lib/flipper_application/api_hashtable/api_hashtable.cpp
@@ -9,6 +9,10 @@ bool elf_resolve_from_hashtable(
     const ElfApiInterface* interface,
     uint32_t hash,
     Elf32_Addr* address) {
+
+    furi_check(interface);
+    furi_check(address);
+
     bool result = false;
     const HashtableApiInterface* hashtable_interface =
         static_cast<const HashtableApiInterface*>(interface);
@@ -33,5 +37,6 @@ bool elf_resolve_from_hashtable(
 }
 
 uint32_t elf_symbolname_hash(const char* s) {
+    furi_check(s);
     return elf_gnu_hash(s);
 }
\ No newline at end of file
diff --git a/lib/flipper_application/application_manifest.c b/lib/flipper_application/application_manifest.c
index addbd5e4c..dfe18e249 100644
--- a/lib/flipper_application/application_manifest.c
+++ b/lib/flipper_application/application_manifest.c
@@ -1,8 +1,11 @@
 #include "application_manifest.h"
 
 #include <furi_hal_version.h>
+#include <furi.h>
 
 bool flipper_application_manifest_is_valid(const FlipperApplicationManifest* manifest) {
+    furi_check(manifest);
+
     if((manifest->base.manifest_magic != FAP_MANIFEST_MAGIC) ||
        (manifest->base.manifest_version != FAP_MANIFEST_SUPPORTED_VERSION)) {
         return false;
@@ -14,6 +17,9 @@ bool flipper_application_manifest_is_valid(const FlipperApplicationManifest* man
 bool flipper_application_manifest_is_too_old(
     const FlipperApplicationManifest* manifest,
     const ElfApiInterface* api_interface) {
+    furi_check(manifest);
+    furi_check(api_interface);
+
     if(manifest->base.api_version.major < api_interface->api_version_major /* ||
        manifest->base.api_version.minor > app->api_interface->api_version_minor */) {
         return false;
@@ -25,6 +31,9 @@ bool flipper_application_manifest_is_too_old(
 bool flipper_application_manifest_is_too_new(
     const FlipperApplicationManifest* manifest,
     const ElfApiInterface* api_interface) {
+    furi_check(manifest);
+    furi_check(api_interface);
+
     if(manifest->base.api_version.major > api_interface->api_version_major /* ||
        manifest->base.api_version.minor > app->api_interface->api_version_minor */) {
         return false;
@@ -34,6 +43,8 @@ bool flipper_application_manifest_is_too_new(
 }
 
 bool flipper_application_manifest_is_target_compatible(const FlipperApplicationManifest* manifest) {
+    furi_check(manifest);
+
     const Version* version = furi_hal_version_get_firmware_version();
     return version_get_target(version) == manifest->base.hardware_target_id;
 }
\ No newline at end of file
diff --git a/lib/flipper_application/elf/elf_file.h b/lib/flipper_application/elf/elf_file.h
index 631fe122f..921b506bd 100644
--- a/lib/flipper_application/elf/elf_file.h
+++ b/lib/flipper_application/elf/elf_file.h
@@ -98,8 +98,7 @@ bool elf_file_is_init_complete(ELFFile* elf);
 /**
  * @brief Get actual entry point for ELF file
  * @param elf_file 
- * @param args 
- * @return int32_t 
+ * @return void*
  */
 void* elf_file_get_entry_point(ELFFile* elf_file);
 
@@ -148,4 +147,4 @@ ElfProcessSectionResult elf_process_section(
 
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/lib/flipper_application/flipper_application.c b/lib/flipper_application/flipper_application.c
index d56a8a7ef..3c4a07f2f 100644
--- a/lib/flipper_application/flipper_application.c
+++ b/lib/flipper_application/flipper_application.c
@@ -24,7 +24,7 @@ FlipperApplicationList_t flipper_application_loaded_app_list = {0};
 static bool flipper_application_loaded_app_list_initialized = false;
 
 static void flipper_application_list_add_app(const FlipperApplication* app) {
-    furi_assert(app);
+    furi_check(app);
 
     if(!flipper_application_loaded_app_list_initialized) {
         FlipperApplicationList_init(flipper_application_loaded_app_list);
@@ -34,8 +34,8 @@ static void flipper_application_list_add_app(const FlipperApplication* app) {
 }
 
 static void flipper_application_list_remove_app(const FlipperApplication* app) {
-    furi_assert(flipper_application_loaded_app_list_initialized);
-    furi_assert(app);
+    furi_check(flipper_application_loaded_app_list_initialized);
+    furi_check(app);
 
     FlipperApplicationList_it_t it;
     for(FlipperApplicationList_it(it, flipper_application_loaded_app_list);
@@ -52,19 +52,24 @@ static void flipper_application_list_remove_app(const FlipperApplication* app) {
 
 FlipperApplication*
     flipper_application_alloc(Storage* storage, const ElfApiInterface* api_interface) {
+    furi_check(storage);
+    furi_check(api_interface);
+
     FlipperApplication* app = malloc(sizeof(FlipperApplication));
     app->elf = elf_file_alloc(storage, api_interface);
     app->thread = NULL;
     app->ep_thread_args = NULL;
+
     return app;
 }
 
 bool flipper_application_is_plugin(FlipperApplication* app) {
+    furi_check(app);
     return app->manifest.stack_size == 0;
 }
 
 void flipper_application_free(FlipperApplication* app) {
-    furi_assert(app);
+    furi_check(app);
 
     if(app->thread) {
         furi_thread_join(app->thread);
@@ -184,20 +189,29 @@ static FlipperApplicationPreloadStatus
 /* Parse headers, load manifest */
 FlipperApplicationPreloadStatus
     flipper_application_preload_manifest(FlipperApplication* app, const char* path) {
+    furi_check(app);
+    furi_check(path);
+
     return flipper_application_load(app, path, false);
 }
 
 /* Parse headers, load full file */
 FlipperApplicationPreloadStatus
     flipper_application_preload(FlipperApplication* app, const char* path) {
+    furi_check(app);
+    furi_check(path);
+
     return flipper_application_load(app, path, true);
 }
 
 const FlipperApplicationManifest* flipper_application_get_manifest(FlipperApplication* app) {
+    furi_check(app);
     return &app->manifest;
 }
 
 FlipperApplicationLoadStatus flipper_application_map_to_memory(FlipperApplication* app) {
+    furi_check(app);
+
     ELFFileLoadStatus status = elf_file_load_sections(app->elf);
 
     switch(status) {
@@ -215,7 +229,7 @@ FlipperApplicationLoadStatus flipper_application_map_to_memory(FlipperApplicatio
 }
 
 static int32_t flipper_application_thread(void* context) {
-    furi_assert(context);
+    furi_check(context);
     FlipperApplication* app = (FlipperApplication*)context;
 
     elf_file_call_init(app->elf);
@@ -237,6 +251,7 @@ static int32_t flipper_application_thread(void* context) {
 }
 
 FuriThread* flipper_application_alloc_thread(FlipperApplication* app, const char* args) {
+    furi_check(app);
     furi_check(app->thread == NULL);
     furi_check(!flipper_application_is_plugin(app));
 
@@ -290,6 +305,8 @@ const char* flipper_application_load_status_to_string(FlipperApplicationLoadStat
 
 const FlipperAppPluginDescriptor*
     flipper_application_plugin_get_descriptor(FlipperApplication* app) {
+    furi_check(app);
+
     if(!flipper_application_is_plugin(app)) {
         return NULL;
     }
@@ -318,6 +335,11 @@ bool flipper_application_load_name_and_icon(
     Storage* storage,
     uint8_t** icon_ptr,
     FuriString* item_name) {
+    furi_check(path);
+    furi_check(storage);
+    furi_check(icon_ptr);
+    furi_check(item_name);
+
     FlipperApplication* app = flipper_application_alloc(storage, firmware_api_interface);
 
     FlipperApplicationPreloadStatus preload_res =
diff --git a/lib/flipper_application/flipper_application.h b/lib/flipper_application/flipper_application.h
index a119cf530..3daca5bc0 100644
--- a/lib/flipper_application/flipper_application.h
+++ b/lib/flipper_application/flipper_application.h
@@ -33,15 +33,13 @@ typedef enum {
     FlipperApplicationLoadStatusMissingImports,
 } FlipperApplicationLoadStatus;
 
-/**
- * @brief Get text description of preload status
+/** Get text description of preload status
  * @param status Status code
  * @return String pointer to description
  */
 const char* flipper_application_preload_status_to_string(FlipperApplicationPreloadStatus status);
 
-/**
- * @brief Get text description of load status
+/** Get text description of load status
  * @param status Status code
  * @return String pointer to description
  */
@@ -61,8 +59,7 @@ typedef struct {
     uint8_t* debug_link;
 } FlipperApplicationState;
 
-/**
- * @brief Initialize FlipperApplication object
+/** Initialize FlipperApplication object
  * @param storage Storage instance
  * @param api_interface ELF API interface to use for pre-loading and symbol resolving
  * @return Application instance
@@ -70,44 +67,44 @@ typedef struct {
 FlipperApplication*
     flipper_application_alloc(Storage* storage, const ElfApiInterface* api_interface);
 
-/**
- * @brief Destroy FlipperApplication object
+/** Destroy FlipperApplication object
  * @param app Application pointer
  */
 void flipper_application_free(FlipperApplication* app);
 
-/**
- * @brief Validate elf file and load application metadata 
- * @param app Application pointer
- * @return Preload result code
+/** Validate elf file and load application metadata
+ *
+ * @param      app   Application pointer
+ * @param[in]  path  The path to fap file
+ *
+ * @return     Preload result code
  */
 FlipperApplicationPreloadStatus
     flipper_application_preload(FlipperApplication* app, const char* path);
 
-/**
- * @brief Validate elf file and load application manifest 
- * @param app Application pointer
- * @return Preload result code
+/** Validate elf file and load application manifest
+ *
+ * @param      app   Application pointer
+ * @param[in]  path  The path to fap file
+ *
+ * @return     Preload result code
  */
 FlipperApplicationPreloadStatus
     flipper_application_preload_manifest(FlipperApplication* app, const char* path);
 
-/**
- * @brief Get pointer to application manifest for preloaded application
+/** Get pointer to application manifest for preloaded application
  * @param app Application pointer
  * @return Pointer to application manifest
  */
 const FlipperApplicationManifest* flipper_application_get_manifest(FlipperApplication* app);
 
-/**
- * @brief Load sections and process relocations for already pre-loaded application
+/** Load sections and process relocations for already pre-loaded application
  * @param app Application pointer
  * @return Load result code
  */
 FlipperApplicationLoadStatus flipper_application_map_to_memory(FlipperApplication* app);
 
-/**
- * @brief Allocate application thread at entry point address, using app name and
+/** Allocate application thread at entry point address, using app name and
  * stack size from metadata. Returned thread isn't started yet. 
  * Can be only called once for application instance.
  * @param app Applicaiton pointer
@@ -116,20 +113,17 @@ FlipperApplicationLoadStatus flipper_application_map_to_memory(FlipperApplicatio
  */
 FuriThread* flipper_application_alloc_thread(FlipperApplication* app, const char* args);
 
-/**
- * @brief Check if application is a plugin (not a runnable standalone app)
+/** Check if application is a plugin (not a runnable standalone app)
  * @param app Application pointer
  * @return true if application is a plugin, false otherwise
  */
 bool flipper_application_is_plugin(FlipperApplication* app);
 
-/**
- * @brief Entry point prototype for standalone applications
+/** Entry point prototype for standalone applications
  */
 typedef int32_t (*FlipperApplicationEntryPoint)(void*);
 
-/**
- * @brief An object that describes a plugin - must be returned by plugin's entry point 
+/** An object that describes a plugin - must be returned by plugin's entry point 
  */
 typedef struct {
     const char* appid;
@@ -137,21 +131,18 @@ typedef struct {
     const void* entry_point;
 } FlipperAppPluginDescriptor;
 
-/**
- * @brief Entry point prototype for plugins
+/** Entry point prototype for plugins
  */
 typedef const FlipperAppPluginDescriptor* (*FlipperApplicationPluginEntryPoint)(void);
 
-/**
- * @brief Get plugin descriptor for preloaded plugin
+/** Get plugin descriptor for preloaded plugin
  * @param app Application pointer
  * @return Pointer to plugin descriptor
  */
 const FlipperAppPluginDescriptor*
     flipper_application_plugin_get_descriptor(FlipperApplication* app);
 
-/**
- * @brief Load name and icon from FAP file.
+/** Load name and icon from FAP file.
  * 
  * @param path Path to FAP file.
  * @param storage Storage instance.
diff --git a/lib/flipper_application/plugins/composite_resolver.c b/lib/flipper_application/plugins/composite_resolver.c
index 7cc2b340a..03dcd95e7 100644
--- a/lib/flipper_application/plugins/composite_resolver.c
+++ b/lib/flipper_application/plugins/composite_resolver.c
@@ -1,5 +1,6 @@
 #include "composite_resolver.h"
 
+#include <furi.h>
 #include <m-list.h>
 #include <m-algo.h>
 
@@ -25,21 +26,28 @@ static bool composite_api_resolver_callback(
     return false;
 }
 
-CompositeApiResolver* composite_api_resolver_alloc() {
+CompositeApiResolver* composite_api_resolver_alloc(void) {
     CompositeApiResolver* resolver = malloc(sizeof(CompositeApiResolver));
+
     resolver->api_interface.api_version_major = 0;
     resolver->api_interface.api_version_minor = 0;
     resolver->api_interface.resolver_callback = &composite_api_resolver_callback;
     ElfApiInterfaceList_init(resolver->interfaces);
+
     return resolver;
 }
 
 void composite_api_resolver_free(CompositeApiResolver* resolver) {
+    furi_check(resolver);
+
     ElfApiInterfaceList_clear(resolver->interfaces);
     free(resolver);
 }
 
 void composite_api_resolver_add(CompositeApiResolver* resolver, const ElfApiInterface* interface) {
+    furi_check(resolver);
+    furi_check(interface);
+
     if(ElfApiInterfaceList_empty_p(resolver->interfaces)) {
         resolver->api_interface.api_version_major = interface->api_version_major;
         resolver->api_interface.api_version_minor = interface->api_version_minor;
@@ -48,5 +56,6 @@ void composite_api_resolver_add(CompositeApiResolver* resolver, const ElfApiInte
 }
 
 const ElfApiInterface* composite_api_resolver_get(CompositeApiResolver* resolver) {
+    furi_check(resolver);
     return &resolver->api_interface;
 }
diff --git a/lib/flipper_application/plugins/composite_resolver.h b/lib/flipper_application/plugins/composite_resolver.h
index a2d4bab25..d8a22887f 100644
--- a/lib/flipper_application/plugins/composite_resolver.h
+++ b/lib/flipper_application/plugins/composite_resolver.h
@@ -19,7 +19,7 @@ typedef struct CompositeApiResolver CompositeApiResolver;
  * @brief Allocate composite API resolver
  * @return CompositeApiResolver* instance
  */
-CompositeApiResolver* composite_api_resolver_alloc();
+CompositeApiResolver* composite_api_resolver_alloc(void);
 
 /**
  * @brief Free composite API resolver
diff --git a/lib/flipper_application/plugins/plugin_manager.c b/lib/flipper_application/plugins/plugin_manager.c
index 8f30ed13e..d0e294220 100644
--- a/lib/flipper_application/plugins/plugin_manager.c
+++ b/lib/flipper_application/plugins/plugin_manager.c
@@ -36,6 +36,8 @@ PluginManager* plugin_manager_alloc(
 }
 
 void plugin_manager_free(PluginManager* manager) {
+    furi_check(manager);
+
     for
         M_EACH(loaded_lib, manager->libs, FlipperApplicationList_t) {
             flipper_application_free(*loaded_lib);
@@ -46,6 +48,7 @@ void plugin_manager_free(PluginManager* manager) {
 }
 
 PluginManagerError plugin_manager_load_single(PluginManager* manager, const char* path) {
+    furi_check(manager);
     FlipperApplication* lib = flipper_application_alloc(manager->storage, manager->api_interface);
 
     PluginManagerError error = PluginManagerErrorNone;
@@ -103,6 +106,7 @@ PluginManagerError plugin_manager_load_single(PluginManager* manager, const char
 }
 
 PluginManagerError plugin_manager_load_all(PluginManager* manager, const char* path) {
+    furi_check(manager);
     File* directory = storage_file_alloc(manager->storage);
     char file_name_buffer[256];
     FuriString* file_name = furi_string_alloc();
@@ -139,15 +143,21 @@ PluginManagerError plugin_manager_load_all(PluginManager* manager, const char* p
 }
 
 uint32_t plugin_manager_get_count(PluginManager* manager) {
+    furi_check(manager);
+
     return FlipperApplicationList_size(manager->libs);
 }
 
 const FlipperAppPluginDescriptor* plugin_manager_get(PluginManager* manager, uint32_t index) {
+    furi_check(manager);
+
     FlipperApplication* app = *FlipperApplicationList_get(manager->libs, index);
     return flipper_application_plugin_get_descriptor(app);
 }
 
 const void* plugin_manager_get_ep(PluginManager* manager, uint32_t index) {
+    furi_check(manager);
+
     const FlipperAppPluginDescriptor* lib_descr = plugin_manager_get(manager, index);
     furi_check(lib_descr);
     return lib_descr->entry_point;
diff --git a/lib/flipper_format/flipper_format.c b/lib/flipper_format/flipper_format.c
index bb1aa59f5..8992247d1 100644
--- a/lib/flipper_format/flipper_format.c
+++ b/lib/flipper_format/flipper_format.c
@@ -23,7 +23,7 @@ Stream* flipper_format_get_raw_stream(FlipperFormat* flipper_format) {
 
 /********************************** Public **********************************/
 
-FlipperFormat* flipper_format_string_alloc() {
+FlipperFormat* flipper_format_string_alloc(void) {
     FlipperFormat* flipper_format = malloc(sizeof(FlipperFormat));
     flipper_format->stream = string_stream_alloc();
     flipper_format->strict_mode = false;
@@ -45,18 +45,18 @@ FlipperFormat* flipper_format_buffered_file_alloc(Storage* storage) {
 }
 
 bool flipper_format_file_open_existing(FlipperFormat* flipper_format, const char* path) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return file_stream_open(flipper_format->stream, path, FSAM_READ_WRITE, FSOM_OPEN_EXISTING);
 }
 
 bool flipper_format_buffered_file_open_existing(FlipperFormat* flipper_format, const char* path) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return buffered_file_stream_open(
         flipper_format->stream, path, FSAM_READ_WRITE, FSOM_OPEN_EXISTING);
 }
 
 bool flipper_format_file_open_append(FlipperFormat* flipper_format, const char* path) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
 
     bool result =
         file_stream_open(flipper_format->stream, path, FSAM_READ_WRITE, FSOM_OPEN_APPEND);
@@ -87,33 +87,33 @@ bool flipper_format_file_open_append(FlipperFormat* flipper_format, const char*
 }
 
 bool flipper_format_file_open_always(FlipperFormat* flipper_format, const char* path) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return file_stream_open(flipper_format->stream, path, FSAM_READ_WRITE, FSOM_CREATE_ALWAYS);
 }
 
 bool flipper_format_buffered_file_open_always(FlipperFormat* flipper_format, const char* path) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return buffered_file_stream_open(
         flipper_format->stream, path, FSAM_READ_WRITE, FSOM_CREATE_ALWAYS);
 }
 
 bool flipper_format_file_open_new(FlipperFormat* flipper_format, const char* path) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return file_stream_open(flipper_format->stream, path, FSAM_READ_WRITE, FSOM_CREATE_NEW);
 }
 
 bool flipper_format_file_close(FlipperFormat* flipper_format) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return file_stream_close(flipper_format->stream);
 }
 
 bool flipper_format_buffered_file_close(FlipperFormat* flipper_format) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return buffered_file_stream_close(flipper_format->stream);
 }
 
 void flipper_format_free(FlipperFormat* flipper_format) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     stream_free(flipper_format->stream);
     free(flipper_format);
 }
@@ -123,12 +123,12 @@ void flipper_format_set_strict_mode(FlipperFormat* flipper_format, bool strict_m
 }
 
 bool flipper_format_rewind(FlipperFormat* flipper_format) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return stream_rewind(flipper_format->stream);
 }
 
 bool flipper_format_seek_to_end(FlipperFormat* flipper_format) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return stream_seek(flipper_format->stream, 0, StreamOffsetFromEnd);
 }
 
@@ -145,7 +145,7 @@ bool flipper_format_read_header(
     FlipperFormat* flipper_format,
     FuriString* filetype,
     uint32_t* version) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return flipper_format_read_string(flipper_format, flipper_format_filetype_key, filetype) &&
            flipper_format_read_uint32(flipper_format, flipper_format_version_key, version, 1);
 }
@@ -154,7 +154,7 @@ bool flipper_format_write_header(
     FlipperFormat* flipper_format,
     FuriString* filetype,
     const uint32_t version) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return flipper_format_write_header_cstr(
         flipper_format, furi_string_get_cstr(filetype), version);
 }
@@ -163,7 +163,7 @@ bool flipper_format_write_header_cstr(
     FlipperFormat* flipper_format,
     const char* filetype,
     const uint32_t version) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return flipper_format_write_string_cstr(
                flipper_format, flipper_format_filetype_key, filetype) &&
            flipper_format_write_uint32(flipper_format, flipper_format_version_key, &version, 1);
@@ -173,19 +173,19 @@ bool flipper_format_get_value_count(
     FlipperFormat* flipper_format,
     const char* key,
     uint32_t* count) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return flipper_format_stream_get_value_count(
         flipper_format->stream, key, count, flipper_format->strict_mode);
 }
 
 bool flipper_format_read_string(FlipperFormat* flipper_format, const char* key, FuriString* data) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return flipper_format_stream_read_value_line(
         flipper_format->stream, key, FlipperStreamValueStr, data, 1, flipper_format->strict_mode);
 }
 
 bool flipper_format_write_string(FlipperFormat* flipper_format, const char* key, FuriString* data) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueStr,
@@ -200,7 +200,7 @@ bool flipper_format_write_string_cstr(
     FlipperFormat* flipper_format,
     const char* key,
     const char* data) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueStr,
@@ -216,7 +216,7 @@ bool flipper_format_read_hex_uint64(
     const char* key,
     uint64_t* data,
     const uint16_t data_size) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return flipper_format_stream_read_value_line(
         flipper_format->stream,
         key,
@@ -231,7 +231,7 @@ bool flipper_format_write_hex_uint64(
     const char* key,
     const uint64_t* data,
     const uint16_t data_size) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueHexUint64,
@@ -247,7 +247,7 @@ bool flipper_format_read_uint32(
     const char* key,
     uint32_t* data,
     const uint16_t data_size) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return flipper_format_stream_read_value_line(
         flipper_format->stream,
         key,
@@ -262,7 +262,7 @@ bool flipper_format_write_uint32(
     const char* key,
     const uint32_t* data,
     const uint16_t data_size) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueUint32,
@@ -292,7 +292,7 @@ bool flipper_format_write_int32(
     const char* key,
     const int32_t* data,
     const uint16_t data_size) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueInt32,
@@ -322,7 +322,7 @@ bool flipper_format_write_bool(
     const char* key,
     const bool* data,
     const uint16_t data_size) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueBool,
@@ -352,7 +352,7 @@ bool flipper_format_write_float(
     const char* key,
     const float* data,
     const uint16_t data_size) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueFloat,
@@ -382,7 +382,7 @@ bool flipper_format_write_hex(
     const char* key,
     const uint8_t* data,
     const uint16_t data_size) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueHex,
@@ -394,17 +394,17 @@ bool flipper_format_write_hex(
 }
 
 bool flipper_format_write_comment(FlipperFormat* flipper_format, FuriString* data) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return flipper_format_write_comment_cstr(flipper_format, furi_string_get_cstr(data));
 }
 
 bool flipper_format_write_comment_cstr(FlipperFormat* flipper_format, const char* data) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     return flipper_format_stream_write_comment_cstr(flipper_format->stream, data);
 }
 
 bool flipper_format_delete_key(FlipperFormat* flipper_format, const char* key) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueIgnore,
@@ -417,7 +417,7 @@ bool flipper_format_delete_key(FlipperFormat* flipper_format, const char* key) {
 }
 
 bool flipper_format_update_string(FlipperFormat* flipper_format, const char* key, FuriString* data) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueStr,
@@ -433,7 +433,7 @@ bool flipper_format_update_string_cstr(
     FlipperFormat* flipper_format,
     const char* key,
     const char* data) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueStr,
@@ -450,7 +450,7 @@ bool flipper_format_update_uint32(
     const char* key,
     const uint32_t* data,
     const uint16_t data_size) {
-    furi_assert(flipper_format);
+    furi_check(flipper_format);
     FlipperStreamWriteData write_data = {
         .key = key,
         .type = FlipperStreamValueUint32,
diff --git a/lib/flipper_format/flipper_format.h b/lib/flipper_format/flipper_format.h
index 671ff6fa0..46f78e255 100644
--- a/lib/flipper_format/flipper_format.h
+++ b/lib/flipper_format/flipper_format.h
@@ -1,20 +1,20 @@
-/**
- * @file flipper_format.h
- * Flipper File Format helper library.
- * 
+/** @file flipper_format.h Flipper File Format helper library.
+ *
  * Flipper File Format is a fairly simple format for storing data in a file.
- * 
+ *
  * Flipper file structure:
- * 
+ *
  * ~~~~~~~~~~~~~~~~~~~~~
  * # Commentary
  * Field name: field value
  * ~~~~~~~~~~~~~~~~~~~~~
- * 
- * Lines starting with the # character are ignored (considered as comments). The separator between the name of the value and the value itself is the string ": ".
+ *
+ * Lines starting with the # character are ignored (considered as comments). The
+ * separator between the name of the value and the value itself is the string
+ * ": ".
  *
  * Currently supported types:
- * 
+ *
  * ~~~~~~~~~~~~~~~~~~~~~
  * String: text
  * Int32: 1 2 -3 4
@@ -22,13 +22,15 @@
  * Float: 1.0 1234.654
  * Hex: A4 B3 C2 D1 12 FF
  * ~~~~~~~~~~~~~~~~~~~~~
- * 
+ *
  * End of line is LF when writing, but CR is supported when reading.
- * 
- * The library is designed in such a way that comments and field values are completely ignored when searching for keys, that is, they do not consume memory.
- * 
- * File example: 
- * 
+ *
+ * The library is designed in such a way that comments and field values are
+ * completely ignored when searching for keys, that is, they do not consume
+ * memory.
+ *
+ * File example:
+ *
  * ~~~~~~~~~~~~~~~~~~~~~
  * Filetype: Flipper Test File
  * Version: 1
@@ -37,59 +39,49 @@
  * UINT: 1234
  * Hex: 00 01 FF A3
  * ~~~~~~~~~~~~~~~~~~~~~
- * 
+ *
  * Writing:
- * 
+ *
  * ~~~~~~~~~~~~~~~~~~~~~
  * FlipperFormat* format = flipper_format_file_alloc(storage);
- * 
- * do {
- *     const uint32_t version = 1;
- *     const char* string_value = "String value";
- *     const uint32_t uint32_value = 1234;
- *     const uint16_t array_size = 4;
- *     const uint8_t* array[array_size] = {0x00, 0x01, 0xFF, 0xA3};
- *     
- *     if(!flipper_format_file_open_new(format, EXT_PATH("flipper_format_test"))) break;
- *     if(!flipper_format_write_header_cstr(format, "Flipper Test File", version)) break;
- *     if(!flipper_format_write_comment_cstr(format, "Just test file")) break;
- *     if(!flipper_format_write_string_cstr(format, "String", string_value)) break;
- *     if(!flipper_format_write_uint32(format, "UINT", &uint32_value, 1)) break;
- *     if(!flipper_format_write_hex(format, "Hex Array", array, array_size)) break;
- *     
- *     // signal that the file was written successfully
- * } while(0);
- * 
+ *
+ * do { const uint32_t version = 1; const char* string_value = "String value";
+ * const uint32_t uint32_value = 1234; const uint16_t array_size = 4; const
+ * uint8_t* array[array_size] = {0x00, 0x01, 0xFF, 0xA3};
+ *
+ * if(!flipper_format_file_open_new(format, EXT_PATH("flipper_format_test")))
+ * break; if(!flipper_format_write_header_cstr(format, "Flipper Test File",
+ * version)) break; if(!flipper_format_write_comment_cstr(format,
+ * "Just test file")) break; if(!flipper_format_write_string_cstr(format,
+ * "String", string_value)) break; if(!flipper_format_write_uint32(format,
+ * "UINT", &uint32_value, 1)) break; if(!flipper_format_write_hex(format,
+ * "Hex Array", array, array_size)) break;
+ *
+ * // signal that the file was written successfully } while(0);
+ *
  * flipper_format_free(file);
  * ~~~~~~~~~~~~~~~~~~~~~
- * 
+ *
  * Reading:
- * 
+ *
  * ~~~~~~~~~~~~~~~~~~~~~
  * FlipperFormat* file = flipper_format_file_alloc(storage);
- * 
- * do {
- *     uint32_t version = 1;
- *     FuriString* file_type;
- *     FuriString* string_value;
- *     uint32_t uint32_value = 1;
- *     uint16_t array_size = 4;
- *     uint8_t* array[array_size] = {0};
- *     file_type = furi_string_alloc();
- *     string_value = furi_string_alloc();
- *     
- *     if(!flipper_format_file_open_existing(file, EXT_PATH("flipper_format_test"))) break;
- *     if(!flipper_format_read_header(file, file_type, &version)) break;
- *     if(!flipper_format_read_string(file, "String", string_value)) break;
- *     if(!flipper_format_read_uint32(file, "UINT", &uint32_value, 1)) break;
- *     if(!flipper_format_read_hex(file, "Hex Array", array, array_size)) break;
- *     
- *     // signal that the file was read successfully
- * } while(0);
- * 
+ *
+ * do { uint32_t version = 1; FuriString* file_type; FuriString* string_value;
+ * uint32_t uint32_value = 1; uint16_t array_size = 4; uint8_t*
+ * array[array_size] = {0}; file_type = furi_string_alloc(); string_value =
+ * furi_string_alloc();
+ *
+ * if(!flipper_format_file_open_existing(file, EXT_PATH("flipper_format_test")))
+ * break; if(!flipper_format_read_header(file, file_type, &version)) break;
+ * if(!flipper_format_read_string(file, "String", string_value)) break;
+ * if(!flipper_format_read_uint32(file, "UINT", &uint32_value, 1)) break;
+ * if(!flipper_format_read_hex(file, "Hex Array", array, array_size)) break;
+ *
+ * // signal that the file was read successfully } while(0);
+ *
  * flipper_format_free(file);
  * ~~~~~~~~~~~~~~~~~~~~~
- * 
  */
 
 #pragma once
@@ -102,215 +94,240 @@ extern "C" {
 
 typedef struct FlipperFormat FlipperFormat;
 
-/**
- * Allocate FlipperFormat as string.
- * @return FlipperFormat* pointer to a FlipperFormat instance
+/** Allocate FlipperFormat as string.
+ *
+ * @return     FlipperFormat* pointer to a FlipperFormat instance
  */
-FlipperFormat* flipper_format_string_alloc();
+FlipperFormat* flipper_format_string_alloc(void);
 
-/**
- * Allocate FlipperFormat as file.
- * @return FlipperFormat* pointer to a FlipperFormat instance
+/** Allocate FlipperFormat as file.
+ *
+ * @param      storage  The storage
+ *
+ * @return     FlipperFormat* pointer to a FlipperFormat instance
  */
 FlipperFormat* flipper_format_file_alloc(Storage* storage);
 
-/**
- * Allocate FlipperFormat as file, buffered mode.
- * @return FlipperFormat* pointer to a FlipperFormat instance
+/** Allocate FlipperFormat as file, buffered mode.
+ *
+ * @param      storage  The storage
+ *
+ * @return     FlipperFormat* pointer to a FlipperFormat instance
  */
 FlipperFormat* flipper_format_buffered_file_alloc(Storage* storage);
 
-/**
- * Open existing file. 
- * Use only if FlipperFormat allocated as a file.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param path File path
- * @return True on success
+/** Open existing file. Use only if FlipperFormat allocated as a file.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      path            File path
+ *
+ * @return     True on success
  */
 bool flipper_format_file_open_existing(FlipperFormat* flipper_format, const char* path);
 
-/**
- * Open existing file, buffered mode.
- * Use only if FlipperFormat allocated as a buffered file.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param path File path
- * @return True on success
+/** Open existing file, buffered mode. Use only if FlipperFormat allocated as a
+ * buffered file.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      path            File path
+ *
+ * @return     True on success
  */
 bool flipper_format_buffered_file_open_existing(FlipperFormat* flipper_format, const char* path);
 
-/**
- * Open existing file for writing and add values to the end of file. 
- * Use only if FlipperFormat allocated as a file.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param path File path
- * @return True on success
+/** Open existing file for writing and add values to the end of file. Use only if
+ * FlipperFormat allocated as a file.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      path            File path
+ *
+ * @return     True on success
  */
 bool flipper_format_file_open_append(FlipperFormat* flipper_format, const char* path);
 
-/**
- * Open file. Creates a new file, or deletes the contents of the file if it already exists. 
- * Use only if FlipperFormat allocated as a file.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param path File path
- * @return True on success
+/** Open file. Creates a new file, or deletes the contents of the file if it
+ * already exists. Use only if FlipperFormat allocated as a file.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      path            File path
+ *
+ * @return     True on success
  */
 bool flipper_format_file_open_always(FlipperFormat* flipper_format, const char* path);
 
-/**
- * Open file. Creates a new file, or deletes the contents of the file if it already exists, buffered mode.
- * Use only if FlipperFormat allocated as a buffered file.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param path File path
- * @return True on success
+/** Open file. Creates a new file, or deletes the contents of the file if it
+ * already exists, buffered mode. Use only if FlipperFormat allocated as a
+ * buffered file.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      path            File path
+ *
+ * @return     True on success
  */
 bool flipper_format_buffered_file_open_always(FlipperFormat* flipper_format, const char* path);
 
-/**
- * Open file. Creates a new file, fails if file already exists.
- * Use only if FlipperFormat allocated as a file.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param path File path
- * @return True on success
+/** Open file. Creates a new file, fails if file already exists. Use only if
+ * FlipperFormat allocated as a file.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      path            File path
+ *
+ * @return     True on success
  */
 bool flipper_format_file_open_new(FlipperFormat* flipper_format, const char* path);
 
-/**
- * Closes the file, use only if FlipperFormat allocated as a file.
- * @param flipper_format 
- * @return true 
- * @return false 
+/** Closes the file, use only if FlipperFormat allocated as a file.
+ *
+ * @param      flipper_format  The flipper format
+ *
+ * @return     true
+ * @return     false
  */
 bool flipper_format_file_close(FlipperFormat* flipper_format);
 
-/**
- * Closes the file, use only if FlipperFormat allocated as a buffered file.
- * @param flipper_format
- * @return true
- * @return false
+/** Closes the file, use only if FlipperFormat allocated as a buffered file.
+ *
+ * @param      flipper_format  The flipper format
+ *
+ * @return     true
+ * @return     false
  */
 bool flipper_format_buffered_file_close(FlipperFormat* flipper_format);
 
-/**
- * Free FlipperFormat.
- * @param flipper_format Pointer to a FlipperFormat instance
+/** Free FlipperFormat.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
  */
 void flipper_format_free(FlipperFormat* flipper_format);
 
-/**
- * Set FlipperFormat mode.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param strict_mode True obligates not to skip valid fields. False by default.
+/** Set FlipperFormat mode.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      strict_mode     True obligates not to skip valid fields. False by
+ *                             default.
  */
 void flipper_format_set_strict_mode(FlipperFormat* flipper_format, bool strict_mode);
 
-/**
- * Rewind the RW pointer.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @return True on success
+/** Rewind the RW pointer.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ *
+ * @return     True on success
  */
 bool flipper_format_rewind(FlipperFormat* flipper_format);
 
-/**
- * Move the RW pointer at the end. Can be useful if you want to add some data after reading.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @return True on success
+/** Move the RW pointer at the end. Can be useful if you want to add some data
+ * after reading.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ *
+ * @return     True on success
  */
 bool flipper_format_seek_to_end(FlipperFormat* flipper_format);
 
-/**
- * Check if the key exists.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @return true key exists
- * @return false key is not exists
+/** Check if the key exists.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ *
+ * @return     true key exists
+ * @return     false key is not exists
  */
 bool flipper_format_key_exist(FlipperFormat* flipper_format, const char* key);
 
-/**
- * Read the header (file type and version).
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param filetype File type string
- * @param version Version Value
- * @return True on success
+/** Read the header (file type and version).
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      filetype        File type string
+ * @param      version         Version Value
+ *
+ * @return     True on success
  */
 bool flipper_format_read_header(
     FlipperFormat* flipper_format,
     FuriString* filetype,
     uint32_t* version);
 
-/**
- * Write the header (file type and version).
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param filetype File type string
- * @param version Version Value
- * @return True on success
+/** Write the header (file type and version).
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      filetype        File type string
+ * @param      version         Version Value
+ *
+ * @return     True on success
  */
 bool flipper_format_write_header(
     FlipperFormat* flipper_format,
     FuriString* filetype,
     const uint32_t version);
 
-/**
- * Write the header (file type and version). Plain C string version.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param filetype File type string
- * @param version Version Value
- * @return True on success
+/** Write the header (file type and version). Plain C string version.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      filetype        File type string
+ * @param      version         Version Value
+ *
+ * @return     True on success
  */
 bool flipper_format_write_header_cstr(
     FlipperFormat* flipper_format,
     const char* filetype,
     const uint32_t version);
 
-/**
- * Get the count of values by key
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key 
- * @param count 
- * @return bool 
+/** Get the count of values by key
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             The key
+ * @param      count           The count
+ *
+ * @return     bool
  */
 bool flipper_format_get_value_count(
     FlipperFormat* flipper_format,
     const char* key,
     uint32_t* count);
 
-/**
- * Read a string by key
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @return True on success
+/** Read a string by key
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ *
+ * @return     True on success
  */
 bool flipper_format_read_string(FlipperFormat* flipper_format, const char* key, FuriString* data);
 
-/**
- * Write key and string
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @return True on success
+/** Write key and string
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ *
+ * @return     True on success
  */
 bool flipper_format_write_string(FlipperFormat* flipper_format, const char* key, FuriString* data);
 
-/**
- * Write key and string. Plain C string version.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @return True on success
+/** Write key and string. Plain C string version.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ *
+ * @return     True on success
  */
 bool flipper_format_write_string_cstr(
     FlipperFormat* flipper_format,
     const char* key,
     const char* data);
 
-/**
- * Read array of uint64 in hex format by key
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Read array of uint64 in hex format by key
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_read_hex_uint64(
     FlipperFormat* flipper_format,
@@ -318,13 +335,14 @@ bool flipper_format_read_hex_uint64(
     uint64_t* data,
     const uint16_t data_size);
 
-/**
- * Write key and array of uint64 in hex format
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Write key and array of uint64 in hex format
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_write_hex_uint64(
     FlipperFormat* flipper_format,
@@ -332,13 +350,14 @@ bool flipper_format_write_hex_uint64(
     const uint64_t* data,
     const uint16_t data_size);
 
-/**
- * Read array of uint32 by key
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Read array of uint32 by key
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_read_uint32(
     FlipperFormat* flipper_format,
@@ -346,13 +365,14 @@ bool flipper_format_read_uint32(
     uint32_t* data,
     const uint16_t data_size);
 
-/**
- * Write key and array of uint32
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Write key and array of uint32
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_write_uint32(
     FlipperFormat* flipper_format,
@@ -360,13 +380,14 @@ bool flipper_format_write_uint32(
     const uint32_t* data,
     const uint16_t data_size);
 
-/**
- * Read array of int32 by key
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Read array of int32 by key
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_read_int32(
     FlipperFormat* flipper_format,
@@ -374,13 +395,14 @@ bool flipper_format_read_int32(
     int32_t* data,
     const uint16_t data_size);
 
-/**
- * Write key and array of int32
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Write key and array of int32
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_write_int32(
     FlipperFormat* flipper_format,
@@ -388,13 +410,14 @@ bool flipper_format_write_int32(
     const int32_t* data,
     const uint16_t data_size);
 
-/**
- * Read array of bool by key
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Read array of bool by key
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_read_bool(
     FlipperFormat* flipper_format,
@@ -402,13 +425,14 @@ bool flipper_format_read_bool(
     bool* data,
     const uint16_t data_size);
 
-/**
- * Write key and array of bool
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Write key and array of bool
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_write_bool(
     FlipperFormat* flipper_format,
@@ -416,13 +440,14 @@ bool flipper_format_write_bool(
     const bool* data,
     const uint16_t data_size);
 
-/**
- * Read array of float by key
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Read array of float by key
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_read_float(
     FlipperFormat* flipper_format,
@@ -430,13 +455,14 @@ bool flipper_format_read_float(
     float* data,
     const uint16_t data_size);
 
-/**
- * Write key and array of float
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Write key and array of float
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_write_float(
     FlipperFormat* flipper_format,
@@ -444,13 +470,14 @@ bool flipper_format_write_float(
     const float* data,
     const uint16_t data_size);
 
-/**
- * Read array of hex-formatted bytes by key
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Read array of hex-formatted bytes by key
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_read_hex(
     FlipperFormat* flipper_format,
@@ -458,13 +485,14 @@ bool flipper_format_read_hex(
     uint8_t* data,
     const uint16_t data_size);
 
-/**
- * Write key and array of hex-formatted bytes
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @param data Value
- * @param data_size Values count
- * @return True on success
+/** Write key and array of hex-formatted bytes
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param      data_size       Values count
+ *
+ * @return     True on success
  */
 bool flipper_format_write_hex(
     FlipperFormat* flipper_format,
@@ -472,57 +500,68 @@ bool flipper_format_write_hex(
     const uint8_t* data,
     const uint16_t data_size);
 
-/**
- * Write comment
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param data Comment text
- * @return True on success
+/** Write comment
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      data            Comment text
+ *
+ * @return     True on success
  */
 bool flipper_format_write_comment(FlipperFormat* flipper_format, FuriString* data);
 
-/**
- * Write comment. Plain C string version.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param data Comment text
- * @return True on success
+/** Write comment. Plain C string version.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      data            Comment text
+ *
+ * @return     True on success
  */
 bool flipper_format_write_comment_cstr(FlipperFormat* flipper_format, const char* data);
 
-/**
- * Removes the first matching key and its value. Sets the RW pointer to a position of deleted data.
- * @param flipper_format Pointer to a FlipperFormat instance
- * @param key Key
- * @return True on success
+/** Removes the first matching key and its value. Sets the RW pointer to a
+ * position of deleted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ *
+ * @return     True on success
  */
 bool flipper_format_delete_key(FlipperFormat* flipper_format, const char* key);
 
-/**
- * Updates the value of the first matching key to a string value. Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a string value. Sets the RW
+ * pointer to a position at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ *
+ * @return     True on success
  */
 bool flipper_format_update_string(FlipperFormat* flipper_format, const char* key, FuriString* data);
 
-/**
- * Updates the value of the first matching key to a string value. Plain C version. Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a string value. Plain C
+ * version. Sets the RW pointer to a position at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ *
+ * @return     True on success
  */
 bool flipper_format_update_string_cstr(
     FlipperFormat* flipper_format,
     const char* key,
     const char* data);
 
-/**
- * Updates the value of the first matching key to a uint32 array value. Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a uint32 array value. Sets the
+ * RW pointer to a position at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param[in]  data_size       The data size
+ *
+ * @return     True on success
  */
 bool flipper_format_update_uint32(
     FlipperFormat* flipper_format,
@@ -530,12 +569,15 @@ bool flipper_format_update_uint32(
     const uint32_t* data,
     const uint16_t data_size);
 
-/**
- * Updates the value of the first matching key to a int32 array value. Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a int32 array value. Sets the
+ * RW pointer to a position at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param[in]  data_size       The data size
+ *
+ * @return     True on success
  */
 bool flipper_format_update_int32(
     FlipperFormat* flipper_format,
@@ -543,12 +585,15 @@ bool flipper_format_update_int32(
     const int32_t* data,
     const uint16_t data_size);
 
-/**
- * Updates the value of the first matching key to a bool array value. Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a bool array value. Sets the
+ * RW pointer to a position at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param[in]  data_size       The data size
+ *
+ * @return     True on success
  */
 bool flipper_format_update_bool(
     FlipperFormat* flipper_format,
@@ -556,12 +601,15 @@ bool flipper_format_update_bool(
     const bool* data,
     const uint16_t data_size);
 
-/**
- * Updates the value of the first matching key to a float array value. Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a float array value. Sets the
+ * RW pointer to a position at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param[in]  data_size       The data size
+ *
+ * @return     True on success
  */
 bool flipper_format_update_float(
     FlipperFormat* flipper_format,
@@ -569,12 +617,15 @@ bool flipper_format_update_float(
     const float* data,
     const uint16_t data_size);
 
-/**
- * Updates the value of the first matching key to an array of hex-formatted bytes. Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to an array of hex-formatted
+ * bytes. Sets the RW pointer to a position at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param[in]  data_size       The data size
+ *
+ * @return     True on success
  */
 bool flipper_format_update_hex(
     FlipperFormat* flipper_format,
@@ -582,40 +633,46 @@ bool flipper_format_update_hex(
     const uint8_t* data,
     const uint16_t data_size);
 
-/**
- * Updates the value of the first matching key to a string value, or adds the key and value if the key did not exist. 
- * Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a string value, or adds the
+ * key and value if the key did not exist. Sets the RW pointer to a position at
+ * the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ *
+ * @return     True on success
  */
 bool flipper_format_insert_or_update_string(
     FlipperFormat* flipper_format,
     const char* key,
     FuriString* data);
 
-/**
- * Updates the value of the first matching key to a string value, or adds the key and value if the key did not exist.  
- * Plain C version. 
- * Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a string value, or adds the
+ * key and value if the key did not exist. Plain C version. Sets the RW pointer
+ * to a position at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ *
+ * @return     True on success
  */
 bool flipper_format_insert_or_update_string_cstr(
     FlipperFormat* flipper_format,
     const char* key,
     const char* data);
 
-/**
- * Updates the value of the first matching key to a uint32 array value, or adds the key and value if the key did not exist. 
- *  Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a uint32 array value, or adds
+ * the key and value if the key did not exist. Sets the RW pointer to a position
+ * at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param[in]  data_size       The data size
+ *
+ * @return     True on success
  */
 bool flipper_format_insert_or_update_uint32(
     FlipperFormat* flipper_format,
@@ -623,13 +680,16 @@ bool flipper_format_insert_or_update_uint32(
     const uint32_t* data,
     const uint16_t data_size);
 
-/**
- * Updates the value of the first matching key to a int32 array value, or adds the key and value if the key did not exist. 
- * Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a int32 array value, or adds
+ * the key and value if the key did not exist. Sets the RW pointer to a position
+ * at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param[in]  data_size       The data size
+ *
+ * @return     True on success
  */
 bool flipper_format_insert_or_update_int32(
     FlipperFormat* flipper_format,
@@ -637,13 +697,16 @@ bool flipper_format_insert_or_update_int32(
     const int32_t* data,
     const uint16_t data_size);
 
-/**
- * Updates the value of the first matching key to a bool array value, or adds the key and value if the key did not exist. 
- * Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a bool array value, or adds
+ * the key and value if the key did not exist. Sets the RW pointer to a position
+ * at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param[in]  data_size       The data size
+ *
+ * @return     True on success
  */
 bool flipper_format_insert_or_update_bool(
     FlipperFormat* flipper_format,
@@ -651,13 +714,16 @@ bool flipper_format_insert_or_update_bool(
     const bool* data,
     const uint16_t data_size);
 
-/**
- * Updates the value of the first matching key to a float array value, or adds the key and value if the key did not exist. 
- * Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to a float array value, or adds
+ * the key and value if the key did not exist. Sets the RW pointer to a position
+ * at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param[in]  data_size       The data size
+ *
+ * @return     True on success
  */
 bool flipper_format_insert_or_update_float(
     FlipperFormat* flipper_format,
@@ -665,13 +731,16 @@ bool flipper_format_insert_or_update_float(
     const float* data,
     const uint16_t data_size);
 
-/**
- * Updates the value of the first matching key to an array of hex-formatted bytes, or adds the key and value if the key did not exist.  
- *Sets the RW pointer to a position at the end of inserted data.
- * @param flipper_format Pointer to a FlipperFormat instance 
- * @param key Key
- * @param data Value
- * @return True on success
+/** Updates the value of the first matching key to an array of hex-formatted
+ * bytes, or adds the key and value if the key did not exist. Sets the RW
+ * pointer to a position at the end of inserted data.
+ *
+ * @param      flipper_format  Pointer to a FlipperFormat instance
+ * @param      key             Key
+ * @param      data            Value
+ * @param[in]  data_size       The data size
+ *
+ * @return     True on success
  */
 bool flipper_format_insert_or_update_hex(
     FlipperFormat* flipper_format,
diff --git a/lib/ibutton/ibutton_key.c b/lib/ibutton/ibutton_key.c
index 926a826a2..cf98ea313 100644
--- a/lib/ibutton/ibutton_key.c
+++ b/lib/ibutton/ibutton_key.c
@@ -1,4 +1,5 @@
 #include "ibutton_key_i.h"
+#include <furi.h>
 
 struct iButtonKey {
     iButtonProtocolId protocol_id;
@@ -17,20 +18,28 @@ iButtonKey* ibutton_key_alloc(size_t data_size) {
 }
 
 void ibutton_key_free(iButtonKey* key) {
+    furi_check(key);
+
     free(key->protocol_data);
     free(key);
 }
 
 void ibutton_key_reset(iButtonKey* key) {
+    furi_check(key);
+
     key->protocol_id = iButtonProtocolIdInvalid;
+
     memset(key->protocol_data, 0, key->protocol_data_size);
 }
 
 iButtonProtocolId ibutton_key_get_protocol_id(const iButtonKey* key) {
+    furi_check(key);
+
     return key->protocol_id;
 }
 
 void ibutton_key_set_protocol_id(iButtonKey* key, iButtonProtocolId protocol_id) {
+    furi_check(key);
     key->protocol_id = protocol_id;
 }
 
diff --git a/lib/ibutton/ibutton_protocols.c b/lib/ibutton/ibutton_protocols.c
index df7412670..ce4392475 100644
--- a/lib/ibutton/ibutton_protocols.c
+++ b/lib/ibutton/ibutton_protocols.c
@@ -51,7 +51,7 @@ static void ibutton_protocols_get_group_by_id(
     furi_crash();
 }
 
-iButtonProtocols* ibutton_protocols_alloc() {
+iButtonProtocols* ibutton_protocols_alloc(void) {
     iButtonProtocols* protocols = malloc(sizeof(iButtonProtocols*));
 
     protocols->group_datas = malloc(sizeof(iButtonProtocolGroupData*) * iButtonProtocolGroupMax);
@@ -64,6 +64,8 @@ iButtonProtocols* ibutton_protocols_alloc() {
 }
 
 void ibutton_protocols_free(iButtonProtocols* protocols) {
+    furi_check(protocols);
+
     for(iButtonProtocolGroupId i = 0; i < iButtonProtocolGroupMax; ++i) {
         ibutton_protocol_groups[i]->free(protocols->group_datas[i]);
     }
@@ -72,7 +74,7 @@ void ibutton_protocols_free(iButtonProtocols* protocols) {
     free(protocols);
 }
 
-uint32_t ibutton_protocols_get_protocol_count() {
+uint32_t ibutton_protocols_get_protocol_count(void) {
     uint32_t count = 0;
 
     for(iButtonProtocolGroupId i = 0; i < iButtonProtocolGroupMax; ++i) {
@@ -83,6 +85,9 @@ uint32_t ibutton_protocols_get_protocol_count() {
 }
 
 iButtonProtocolId ibutton_protocols_get_id_by_name(iButtonProtocols* protocols, const char* name) {
+    furi_check(protocols);
+    furi_check(name);
+
     iButtonProtocolLocalId offset = 0;
 
     for(iButtonProtocolGroupId i = 0; i < iButtonProtocolGroupMax; ++i) {
@@ -96,11 +101,16 @@ iButtonProtocolId ibutton_protocols_get_id_by_name(iButtonProtocols* protocols,
 }
 
 uint32_t ibutton_protocols_get_features(iButtonProtocols* protocols, iButtonProtocolId id) {
+    furi_check(protocols);
+
     GET_PROTOCOL_GROUP(id);
+
     return GROUP_BASE->get_features(GROUP_DATA, PROTOCOL_ID);
 }
 
 size_t ibutton_protocols_get_max_data_size(iButtonProtocols* protocols) {
+    furi_check(protocols);
+
     size_t max_size = 0;
 
     for(iButtonProtocolGroupId i = 0; i < iButtonProtocolGroupMax; ++i) {
@@ -115,16 +125,25 @@ size_t ibutton_protocols_get_max_data_size(iButtonProtocols* protocols) {
 }
 
 const char* ibutton_protocols_get_manufacturer(iButtonProtocols* protocols, iButtonProtocolId id) {
+    furi_check(protocols);
+
     GET_PROTOCOL_GROUP(id);
+
     return GROUP_BASE->get_manufacturer(GROUP_DATA, PROTOCOL_ID);
 }
 
 const char* ibutton_protocols_get_name(iButtonProtocols* protocols, iButtonProtocolId id) {
+    furi_check(protocols);
+
     GET_PROTOCOL_GROUP(id);
+
     return GROUP_BASE->get_name(GROUP_DATA, PROTOCOL_ID);
 }
 
 bool ibutton_protocols_read(iButtonProtocols* protocols, iButtonKey* key) {
+    furi_check(protocols);
+    furi_check(key);
+
     iButtonProtocolLocalId id = iButtonProtocolIdInvalid;
     iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -142,6 +161,9 @@ bool ibutton_protocols_read(iButtonProtocols* protocols, iButtonKey* key) {
 }
 
 bool ibutton_protocols_write_blank(iButtonProtocols* protocols, iButtonKey* key) {
+    furi_check(protocols);
+    furi_check(key);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -150,6 +172,9 @@ bool ibutton_protocols_write_blank(iButtonProtocols* protocols, iButtonKey* key)
 }
 
 bool ibutton_protocols_write_copy(iButtonProtocols* protocols, iButtonKey* key) {
+    furi_check(protocols);
+    furi_check(key);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -158,6 +183,9 @@ bool ibutton_protocols_write_copy(iButtonProtocols* protocols, iButtonKey* key)
 }
 
 void ibutton_protocols_emulate_start(iButtonProtocols* protocols, iButtonKey* key) {
+    furi_check(protocols);
+    furi_check(key);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -166,6 +194,9 @@ void ibutton_protocols_emulate_start(iButtonProtocols* protocols, iButtonKey* ke
 }
 
 void ibutton_protocols_emulate_stop(iButtonProtocols* protocols, iButtonKey* key) {
+    furi_check(protocols);
+    furi_check(key);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -177,6 +208,10 @@ bool ibutton_protocols_save(
     iButtonProtocols* protocols,
     const iButtonKey* key,
     const char* file_name) {
+    furi_check(protocols);
+    furi_check(key);
+    furi_check(file_name);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     const iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -207,6 +242,10 @@ bool ibutton_protocols_save(
 }
 
 bool ibutton_protocols_load(iButtonProtocols* protocols, iButtonKey* key, const char* file_name) {
+    furi_check(protocols);
+    furi_check(key);
+    furi_check(file_name);
+
     iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
     bool success = false;
@@ -252,6 +291,10 @@ void ibutton_protocols_render_data(
     iButtonProtocols* protocols,
     const iButtonKey* key,
     FuriString* result) {
+    furi_check(protocols);
+    furi_check(key);
+    furi_check(result);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     const iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -263,6 +306,10 @@ void ibutton_protocols_render_brief_data(
     iButtonProtocols* protocols,
     const iButtonKey* key,
     FuriString* result) {
+    furi_check(protocols);
+    furi_check(key);
+    furi_check(result);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     const iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -274,6 +321,10 @@ void ibutton_protocols_render_error(
     iButtonProtocols* protocols,
     const iButtonKey* key,
     FuriString* result) {
+    furi_check(protocols);
+    furi_check(key);
+    furi_check(result);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     const iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -282,6 +333,9 @@ void ibutton_protocols_render_error(
 }
 
 bool ibutton_protocols_is_valid(iButtonProtocols* protocols, const iButtonKey* key) {
+    furi_check(protocols);
+    furi_check(key);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     const iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -293,6 +347,10 @@ void ibutton_protocols_get_editable_data(
     iButtonProtocols* protocols,
     const iButtonKey* key,
     iButtonEditableData* editable) {
+    furi_check(protocols);
+    furi_check(key);
+    furi_check(editable);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
@@ -301,6 +359,9 @@ void ibutton_protocols_get_editable_data(
 }
 
 void ibutton_protocols_apply_edits(iButtonProtocols* protocols, const iButtonKey* key) {
+    furi_check(protocols);
+    furi_check(key);
+
     const iButtonProtocolId id = ibutton_key_get_protocol_id(key);
     iButtonProtocolData* data = ibutton_key_get_protocol_data(key);
 
diff --git a/lib/ibutton/ibutton_protocols.h b/lib/ibutton/ibutton_protocols.h
index 0e7ed0a80..ec4a9fc72 100644
--- a/lib/ibutton/ibutton_protocols.h
+++ b/lib/ibutton/ibutton_protocols.h
@@ -23,7 +23,7 @@ typedef struct iButtonProtocols iButtonProtocols;
  * Allocate an iButtonProtocols object
  * @return pointer to an iButtonProtocols object
  */
-iButtonProtocols* ibutton_protocols_alloc();
+iButtonProtocols* ibutton_protocols_alloc(void);
 
 /**
  * Destroy an iButtonProtocols object, free resources
@@ -34,7 +34,7 @@ void ibutton_protocols_free(iButtonProtocols* protocols);
 /**
  * Get the total number of available protocols
  */
-uint32_t ibutton_protocols_get_protocol_count();
+uint32_t ibutton_protocols_get_protocol_count(void);
 
 /**
  * Get maximum data size out of all protocols available
diff --git a/lib/ibutton/ibutton_worker.c b/lib/ibutton/ibutton_worker.c
index d40dba71a..2874f120f 100644
--- a/lib/ibutton/ibutton_worker.c
+++ b/lib/ibutton/ibutton_worker.c
@@ -23,6 +23,8 @@ typedef struct {
 static int32_t ibutton_worker_thread(void* thread_context);
 
 iButtonWorker* ibutton_worker_alloc(iButtonProtocols* protocols) {
+    furi_check(protocols);
+
     iButtonWorker* worker = malloc(sizeof(iButtonWorker));
 
     worker->protocols = protocols;
@@ -38,7 +40,9 @@ void ibutton_worker_read_set_callback(
     iButtonWorker* worker,
     iButtonWorkerReadCallback callback,
     void* context) {
+    furi_check(worker);
     furi_check(worker->mode_index == iButtonWorkerModeIdle);
+
     worker->read_cb = callback;
     worker->cb_ctx = context;
 }
@@ -47,7 +51,9 @@ void ibutton_worker_write_set_callback(
     iButtonWorker* worker,
     iButtonWorkerWriteCallback callback,
     void* context) {
+    furi_check(worker);
     furi_check(worker->mode_index == iButtonWorkerModeIdle);
+
     worker->write_cb = callback;
     worker->cb_ctx = context;
 }
@@ -56,55 +62,83 @@ void ibutton_worker_emulate_set_callback(
     iButtonWorker* worker,
     iButtonWorkerEmulateCallback callback,
     void* context) {
+    furi_check(worker);
     furi_check(worker->mode_index == iButtonWorkerModeIdle);
+
     worker->emulate_cb = callback;
     worker->cb_ctx = context;
 }
 
 void ibutton_worker_read_start(iButtonWorker* worker, iButtonKey* key) {
+    furi_check(worker);
+
     iButtonMessage message = {.type = iButtonMessageRead, .data.key = key};
+
     furi_check(
         furi_message_queue_put(worker->messages, &message, FuriWaitForever) == FuriStatusOk);
 }
 
 void ibutton_worker_write_blank_start(iButtonWorker* worker, iButtonKey* key) {
+    furi_check(worker);
+    furi_check(key);
+
     iButtonMessage message = {.type = iButtonMessageWriteBlank, .data.key = key};
+
     furi_check(
         furi_message_queue_put(worker->messages, &message, FuriWaitForever) == FuriStatusOk);
 }
 
 void ibutton_worker_write_copy_start(iButtonWorker* worker, iButtonKey* key) {
+    furi_check(worker);
+    furi_check(key);
+
     iButtonMessage message = {.type = iButtonMessageWriteCopy, .data.key = key};
+
     furi_check(
         furi_message_queue_put(worker->messages, &message, FuriWaitForever) == FuriStatusOk);
 }
 
 void ibutton_worker_emulate_start(iButtonWorker* worker, iButtonKey* key) {
+    furi_check(worker);
+
     iButtonMessage message = {.type = iButtonMessageEmulate, .data.key = key};
+
     furi_check(
         furi_message_queue_put(worker->messages, &message, FuriWaitForever) == FuriStatusOk);
 }
 
 void ibutton_worker_stop(iButtonWorker* worker) {
+    furi_check(worker);
+
     iButtonMessage message = {.type = iButtonMessageStop};
+
     furi_check(
         furi_message_queue_put(worker->messages, &message, FuriWaitForever) == FuriStatusOk);
 }
 
 void ibutton_worker_free(iButtonWorker* worker) {
+    furi_check(worker);
+
     furi_message_queue_free(worker->messages);
     furi_thread_free(worker->thread);
+
     free(worker);
 }
 
 void ibutton_worker_start_thread(iButtonWorker* worker) {
+    furi_check(worker);
+
     furi_thread_start(worker->thread);
 }
 
 void ibutton_worker_stop_thread(iButtonWorker* worker) {
+    furi_check(worker);
+
     iButtonMessage message = {.type = iButtonMessageEnd};
+
     furi_check(
         furi_message_queue_put(worker->messages, &message, FuriWaitForever) == FuriStatusOk);
+
     furi_thread_join(worker->thread);
 }
 
diff --git a/lib/ibutton/protocols/dallas/protocol_group_dallas.c b/lib/ibutton/protocols/dallas/protocol_group_dallas.c
index 63ec97855..39cabbeb4 100644
--- a/lib/ibutton/protocols/dallas/protocol_group_dallas.c
+++ b/lib/ibutton/protocols/dallas/protocol_group_dallas.c
@@ -11,7 +11,7 @@ typedef struct {
     OneWireSlave* bus;
 } iButtonProtocolGroupDallas;
 
-static iButtonProtocolGroupDallas* ibutton_protocol_group_dallas_alloc() {
+static iButtonProtocolGroupDallas* ibutton_protocol_group_dallas_alloc(void) {
     iButtonProtocolGroupDallas* group = malloc(sizeof(iButtonProtocolGroupDallas));
 
     group->host = onewire_host_alloc(&gpio_ibutton);
diff --git a/lib/ibutton/protocols/misc/protocol_group_misc.c b/lib/ibutton/protocols/misc/protocol_group_misc.c
index dad1ef3cf..20534602d 100644
--- a/lib/ibutton/protocols/misc/protocol_group_misc.c
+++ b/lib/ibutton/protocols/misc/protocol_group_misc.c
@@ -16,7 +16,7 @@ typedef struct {
     ProtocolId emulate_id;
 } iButtonProtocolGroupMisc;
 
-static iButtonProtocolGroupMisc* ibutton_protocol_group_misc_alloc() {
+static iButtonProtocolGroupMisc* ibutton_protocol_group_misc_alloc(void) {
     iButtonProtocolGroupMisc* group = malloc(sizeof(iButtonProtocolGroupMisc));
 
     group->dict = protocol_dict_alloc(ibutton_protocols_misc, iButtonProtocolMiscMax);
diff --git a/lib/infrared/encoder_decoder/common/infrared_common_i.h b/lib/infrared/encoder_decoder/common/infrared_common_i.h
index f34e81eda..05c5faf8d 100644
--- a/lib/infrared/encoder_decoder/common/infrared_common_i.h
+++ b/lib/infrared/encoder_decoder/common/infrared_common_i.h
@@ -18,7 +18,6 @@ typedef InfraredStatus (
 typedef struct {
     InfraredTimings timings;
     bool manchester_start_from_space;
-    bool no_stop_bit;
     uint8_t databit_len[4];
     InfraredCommonDecode decode;
     InfraredCommonDecodeRepeat decode_repeat;
diff --git a/lib/infrared/encoder_decoder/infrared.c b/lib/infrared/encoder_decoder/infrared.c
index 56f2c3f9e..8f4c0c872 100644
--- a/lib/infrared/encoder_decoder/infrared.c
+++ b/lib/infrared/encoder_decoder/infrared.c
@@ -12,6 +12,7 @@
 #include "sirc/infrared_protocol_sirc.h"
 #include "kaseikyo/infrared_protocol_kaseikyo.h"
 #include "rca/infrared_protocol_rca.h"
+#include "pioneer/infrared_protocol_pioneer.h"
 
 typedef struct {
     InfraredAlloc alloc;
@@ -114,6 +115,20 @@ static const InfraredEncoderDecoder infrared_encoder_decoder[] = {
              .free = infrared_encoder_sirc_free},
         .get_protocol_variant = infrared_protocol_sirc_get_variant,
     },
+    {
+        .decoder =
+            {.alloc = infrared_decoder_pioneer_alloc,
+             .decode = infrared_decoder_pioneer_decode,
+             .reset = infrared_decoder_pioneer_reset,
+             .check_ready = infrared_decoder_pioneer_check_ready,
+             .free = infrared_decoder_pioneer_free},
+        .encoder =
+            {.alloc = infrared_encoder_pioneer_alloc,
+             .encode = infrared_encoder_pioneer_encode,
+             .reset = infrared_encoder_pioneer_reset,
+             .free = infrared_encoder_pioneer_free},
+        .get_protocol_variant = infrared_protocol_pioneer_get_variant,
+    },
     {
         .decoder =
             {.alloc = infrared_decoder_kaseikyo_alloc,
@@ -149,7 +164,7 @@ static const InfraredProtocolVariant* infrared_get_variant_by_protocol(InfraredP
 
 const InfraredMessage*
     infrared_decode(InfraredDecoderHandler* handler, bool level, uint32_t duration) {
-    furi_assert(handler);
+    furi_check(handler);
 
     InfraredMessage* message = NULL;
     InfraredMessage* result = NULL;
@@ -181,8 +196,8 @@ InfraredDecoderHandler* infrared_alloc_decoder(void) {
 }
 
 void infrared_free_decoder(InfraredDecoderHandler* handler) {
-    furi_assert(handler);
-    furi_assert(handler->ctx);
+    furi_check(handler);
+    furi_check(handler->ctx);
 
     for(size_t i = 0; i < COUNT_OF(infrared_encoder_decoder); ++i) {
         if(infrared_encoder_decoder[i].decoder.free)
@@ -194,6 +209,8 @@ void infrared_free_decoder(InfraredDecoderHandler* handler) {
 }
 
 void infrared_reset_decoder(InfraredDecoderHandler* handler) {
+    furi_check(handler);
+
     for(size_t i = 0; i < COUNT_OF(infrared_encoder_decoder); ++i) {
         if(infrared_encoder_decoder[i].decoder.reset)
             infrared_encoder_decoder[i].decoder.reset(handler->ctx[i]);
@@ -201,7 +218,7 @@ void infrared_reset_decoder(InfraredDecoderHandler* handler) {
 }
 
 const InfraredMessage* infrared_check_decoder_ready(InfraredDecoderHandler* handler) {
-    furi_assert(handler);
+    furi_check(handler);
 
     InfraredMessage* message = NULL;
     InfraredMessage* result = NULL;
@@ -226,13 +243,13 @@ InfraredEncoderHandler* infrared_alloc_encoder(void) {
 }
 
 void infrared_free_encoder(InfraredEncoderHandler* handler) {
-    furi_assert(handler);
+    furi_check(handler);
     const InfraredEncoders* encoder = handler->encoder;
 
     if(encoder || handler->handler) {
-        furi_assert(encoder);
-        furi_assert(handler->handler);
-        furi_assert(encoder->free);
+        furi_check(encoder);
+        furi_check(handler->handler);
+        furi_check(encoder->free);
         encoder->free(handler->handler);
     }
 
@@ -250,20 +267,20 @@ static int infrared_find_index_by_protocol(InfraredProtocol protocol) {
 }
 
 void infrared_reset_encoder(InfraredEncoderHandler* handler, const InfraredMessage* message) {
-    furi_assert(handler);
-    furi_assert(message);
+    furi_check(handler);
+    furi_check(message);
     int index = infrared_find_index_by_protocol(message->protocol);
     furi_check(index >= 0);
 
     const InfraredEncoders* required_encoder = &infrared_encoder_decoder[index].encoder;
-    furi_assert(required_encoder);
-    furi_assert(required_encoder->reset);
-    furi_assert(required_encoder->alloc);
+    furi_check(required_encoder);
+    furi_check(required_encoder->reset);
+    furi_check(required_encoder->alloc);
 
     /* Realloc encoder if different protocol set */
     if(required_encoder != handler->encoder) {
         if(handler->handler != NULL) {
-            furi_assert(handler->encoder->free);
+            furi_check(handler->encoder->free);
             handler->encoder->free(handler->handler);
         }
         handler->encoder = required_encoder;
@@ -274,15 +291,16 @@ void infrared_reset_encoder(InfraredEncoderHandler* handler, const InfraredMessa
 }
 
 InfraredStatus infrared_encode(InfraredEncoderHandler* handler, uint32_t* duration, bool* level) {
-    furi_assert(handler);
-    furi_assert(duration);
-    furi_assert(level);
+    furi_check(handler);
+    furi_check(duration);
+    furi_check(level);
+
     const InfraredEncoders* encoder = handler->encoder;
-    furi_assert(encoder);
-    furi_assert(encoder->encode);
+    furi_check(encoder);
+    furi_check(encoder->encode);
 
     InfraredStatus status = encoder->encode(handler->handler, duration, level);
-    furi_assert(status != InfraredStatusError);
+    furi_check(status != InfraredStatusError);
 
     return status;
 }
@@ -292,6 +310,8 @@ bool infrared_is_protocol_valid(InfraredProtocol protocol) {
 }
 
 InfraredProtocol infrared_get_protocol_by_name(const char* protocol_name) {
+    furi_check(protocol_name);
+
     for(InfraredProtocol protocol = 0; protocol < InfraredProtocolMAX; ++protocol) {
         const char* name = infrared_get_protocol_name(protocol);
         if(!strcmp(name, protocol_name)) return protocol;
@@ -306,7 +326,7 @@ static const InfraredProtocolVariant* infrared_get_variant_by_protocol(InfraredP
         variant = infrared_encoder_decoder[index].get_protocol_variant(protocol);
     }
 
-    furi_assert(variant);
+    furi_check(variant);
     return variant;
 }
 
diff --git a/lib/infrared/encoder_decoder/infrared.h b/lib/infrared/encoder_decoder/infrared.h
index ada449b98..377ce0ef2 100644
--- a/lib/infrared/encoder_decoder/infrared.h
+++ b/lib/infrared/encoder_decoder/infrared.h
@@ -34,6 +34,8 @@ typedef enum {
     InfraredProtocolSIRC20,
     InfraredProtocolKaseikyo,
     InfraredProtocolRCA,
+    InfraredProtocolPioneer,
+    /* Add new protocols here */
     InfraredProtocolMAX,
 } InfraredProtocol;
 
diff --git a/lib/infrared/encoder_decoder/kaseikyo/infrared_protocol_kaseikyo.c b/lib/infrared/encoder_decoder/kaseikyo/infrared_protocol_kaseikyo.c
index 0c61be3bf..63179cff3 100644
--- a/lib/infrared/encoder_decoder/kaseikyo/infrared_protocol_kaseikyo.c
+++ b/lib/infrared/encoder_decoder/kaseikyo/infrared_protocol_kaseikyo.c
@@ -15,7 +15,6 @@ const InfraredCommonProtocolSpec infrared_protocol_kaseikyo = {
             .min_split_time = INFRARED_KASEIKYO_MIN_SPLIT_TIME,
         },
     .databit_len[0] = 48,
-    .no_stop_bit = false,
     .decode = infrared_common_decode_pdwm,
     .encode = infrared_common_encode_pdwm,
     .interpret = infrared_decoder_kaseikyo_interpret,
diff --git a/lib/infrared/encoder_decoder/nec/infrared_protocol_nec.c b/lib/infrared/encoder_decoder/nec/infrared_protocol_nec.c
index 3444f78b6..bfd6d55fb 100644
--- a/lib/infrared/encoder_decoder/nec/infrared_protocol_nec.c
+++ b/lib/infrared/encoder_decoder/nec/infrared_protocol_nec.c
@@ -16,7 +16,6 @@ const InfraredCommonProtocolSpec infrared_protocol_nec = {
         },
     .databit_len[0] = 42,
     .databit_len[1] = 32,
-    .no_stop_bit = false,
     .decode = infrared_common_decode_pdwm,
     .encode = infrared_common_encode_pdwm,
     .interpret = infrared_decoder_nec_interpret,
diff --git a/lib/infrared/encoder_decoder/pioneer/infrared_decoder_pioneer.c b/lib/infrared/encoder_decoder/pioneer/infrared_decoder_pioneer.c
new file mode 100644
index 000000000..43c843bab
--- /dev/null
+++ b/lib/infrared/encoder_decoder/pioneer/infrared_decoder_pioneer.c
@@ -0,0 +1,57 @@
+#include "infrared_protocol_pioneer_i.h"
+#include <core/check.h>
+
+InfraredMessage* infrared_decoder_pioneer_check_ready(void* ctx) {
+    return infrared_common_decoder_check_ready(ctx);
+}
+
+bool infrared_decoder_pioneer_interpret(InfraredCommonDecoder* decoder) {
+    furi_assert(decoder);
+
+    uint32_t* data = (void*)&decoder->data[0];
+    uint8_t address = 0;
+    uint8_t command = 0;
+    InfraredProtocol protocol = InfraredProtocolUnknown;
+
+    if(decoder->databit_cnt == decoder->protocol->databit_len[0] ||
+       decoder->databit_cnt == decoder->protocol->databit_len[1]) {
+        address = *data & 0xFF;
+        uint8_t real_address_checksum = ~address;
+        uint8_t address_checksum = (*data >> 8) & 0xFF;
+        command = (*data >> 16) & 0xFF;
+        uint8_t real_command_checksum = ~command;
+        uint8_t command_checksum = (*data >> 24) & 0xFF;
+        if(address_checksum != real_address_checksum) {
+            return false;
+        }
+        if(command_checksum != real_command_checksum) {
+            return false;
+        }
+        protocol = InfraredProtocolPioneer;
+    } else {
+        return false;
+    }
+
+    decoder->message.protocol = protocol;
+    decoder->message.address = address;
+    decoder->message.command = command;
+    decoder->message.repeat = false;
+
+    return true;
+}
+
+void* infrared_decoder_pioneer_alloc(void) {
+    return infrared_common_decoder_alloc(&infrared_protocol_pioneer);
+}
+
+InfraredMessage* infrared_decoder_pioneer_decode(void* decoder, bool level, uint32_t duration) {
+    return infrared_common_decode(decoder, level, duration);
+}
+
+void infrared_decoder_pioneer_free(void* decoder) {
+    infrared_common_decoder_free(decoder);
+}
+
+void infrared_decoder_pioneer_reset(void* decoder) {
+    infrared_common_decoder_reset(decoder);
+}
diff --git a/lib/infrared/encoder_decoder/pioneer/infrared_encoder_pioneer.c b/lib/infrared/encoder_decoder/pioneer/infrared_encoder_pioneer.c
new file mode 100644
index 000000000..b72643d75
--- /dev/null
+++ b/lib/infrared/encoder_decoder/pioneer/infrared_encoder_pioneer.c
@@ -0,0 +1,61 @@
+#include "infrared_protocol_pioneer_i.h"
+#include <core/check.h>
+
+void infrared_encoder_pioneer_reset(void* encoder_ptr, const InfraredMessage* message) {
+    furi_assert(encoder_ptr);
+    furi_assert(message);
+
+    InfraredCommonEncoder* encoder = encoder_ptr;
+    infrared_common_encoder_reset(encoder);
+
+    uint8_t* data = encoder->data;
+
+    if(message->protocol == InfraredProtocolPioneer) {
+        data[0] = message->address & 0xFF;
+        data[1] = ~(message->address & 0xFF);
+        data[2] = message->command & 0xFF;
+        data[3] = ~(message->command & 0xFF);
+        data[4] = 0;
+        encoder->bits_to_encode = encoder->protocol->databit_len[0];
+    } else {
+        furi_crash();
+    }
+}
+
+void* infrared_encoder_pioneer_alloc(void) {
+    return infrared_common_encoder_alloc(&infrared_protocol_pioneer);
+}
+
+void infrared_encoder_pioneer_free(void* encoder_ptr) {
+    infrared_common_encoder_free(encoder_ptr);
+}
+
+InfraredStatus infrared_encoder_pioneer_encode_repeat(
+    InfraredCommonEncoder* encoder,
+    uint32_t* duration,
+    bool* level) {
+    furi_assert(encoder);
+
+    *duration = INFRARED_PIONEER_SILENCE;
+    *level = false;
+
+    encoder->timings_sum = 0;
+    encoder->timings_encoded = 1;
+    encoder->bits_encoded = 0;
+    encoder->state = InfraredCommonEncoderStatePreamble;
+
+    return InfraredStatusOk;
+}
+
+InfraredStatus
+    infrared_encoder_pioneer_encode(void* encoder_ptr, uint32_t* duration, bool* level) {
+    InfraredCommonEncoder* encoder = encoder_ptr;
+
+    InfraredStatus status = infrared_common_encode(encoder, duration, level);
+    if((status == InfraredStatusOk) && (encoder->bits_encoded == encoder->bits_to_encode)) {
+        furi_assert(!*level);
+        status = InfraredStatusDone;
+        encoder->state = InfraredCommonEncoderStateEncodeRepeat;
+    }
+    return status;
+}
diff --git a/lib/infrared/encoder_decoder/pioneer/infrared_protocol_pioneer.c b/lib/infrared/encoder_decoder/pioneer/infrared_protocol_pioneer.c
new file mode 100644
index 000000000..dec60f17f
--- /dev/null
+++ b/lib/infrared/encoder_decoder/pioneer/infrared_protocol_pioneer.c
@@ -0,0 +1,40 @@
+#include "infrared_protocol_pioneer_i.h"
+
+const InfraredCommonProtocolSpec infrared_protocol_pioneer = {
+    .timings =
+        {
+            .preamble_mark = INFRARED_PIONEER_PREAMBLE_MARK,
+            .preamble_space = INFRARED_PIONEER_PREAMBLE_SPACE,
+            .bit1_mark = INFRARED_PIONEER_BIT1_MARK,
+            .bit1_space = INFRARED_PIONEER_BIT1_SPACE,
+            .bit0_mark = INFRARED_PIONEER_BIT0_MARK,
+            .bit0_space = INFRARED_PIONEER_BIT0_SPACE,
+            .preamble_tolerance = INFRARED_PIONEER_PREAMBLE_TOLERANCE,
+            .bit_tolerance = INFRARED_PIONEER_BIT_TOLERANCE,
+            .silence_time = INFRARED_PIONEER_SILENCE,
+            .min_split_time = INFRARED_PIONEER_MIN_SPLIT_TIME,
+        },
+    .databit_len[0] = 33,
+    .databit_len[1] = 32,
+    .decode = infrared_common_decode_pdwm,
+    .encode = infrared_common_encode_pdwm,
+    .interpret = infrared_decoder_pioneer_interpret,
+    .decode_repeat = NULL,
+    .encode_repeat = infrared_encoder_pioneer_encode_repeat,
+};
+
+static const InfraredProtocolVariant infrared_protocol_variant_pioneer = {
+    .name = "Pioneer",
+    .address_length = 8,
+    .command_length = 8,
+    .frequency = INFRARED_PIONEER_CARRIER_FREQUENCY,
+    .duty_cycle = INFRARED_PIONEER_DUTY_CYCLE,
+    .repeat_count = INFRARED_PIONEER_REPEAT_COUNT_MIN,
+};
+
+const InfraredProtocolVariant* infrared_protocol_pioneer_get_variant(InfraredProtocol protocol) {
+    if(protocol == InfraredProtocolPioneer)
+        return &infrared_protocol_variant_pioneer;
+    else
+        return NULL;
+}
diff --git a/lib/infrared/encoder_decoder/pioneer/infrared_protocol_pioneer.h b/lib/infrared/encoder_decoder/pioneer/infrared_protocol_pioneer.h
new file mode 100644
index 000000000..d350cdaee
--- /dev/null
+++ b/lib/infrared/encoder_decoder/pioneer/infrared_protocol_pioneer.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "../infrared_i.h"
+
+/***************************************************************************************************
+*   Pioneer SR protocol description
+*   http://www.adrian-kingston.com/IRFormatPioneer.htm
+****************************************************************************************************
+*      Preamble  Preamble     Pulse Width Modulation           Pause           Entirely repeat
+*        mark     space                                     up to period          message..
+*
+*        8500      4250         33 bits (500, 1500)          ...26000          8500      4250
+*     __________          _ _ _ _  _  _  _ _ _  _  _ _ _                    __________          _ _
+* ____          __________ _ _ _ __ __ __ _ _ __ __ _ _ ____________________          __________ _
+*
+* In 33 bits of data there is:
+*  - 8 bits address
+*  - 8 bits address inverse
+*  - 8 bits command
+*  - 8 bits command inverse
+*  - 1 stop bit
+***************************************************************************************************/
+
+void* infrared_decoder_pioneer_alloc(void);
+void infrared_decoder_pioneer_reset(void* decoder);
+InfraredMessage* infrared_decoder_pioneer_check_ready(void* decoder);
+void infrared_decoder_pioneer_free(void* decoder);
+InfraredMessage* infrared_decoder_pioneer_decode(void* decoder, bool level, uint32_t duration);
+
+void* infrared_encoder_pioneer_alloc(void);
+void infrared_encoder_pioneer_reset(void* encoder_ptr, const InfraredMessage* message);
+void infrared_encoder_pioneer_free(void* decoder);
+InfraredStatus
+    infrared_encoder_pioneer_encode(void* encoder_ptr, uint32_t* duration, bool* polarity);
+
+const InfraredProtocolVariant* infrared_protocol_pioneer_get_variant(InfraredProtocol protocol);
diff --git a/lib/infrared/encoder_decoder/pioneer/infrared_protocol_pioneer_i.h b/lib/infrared/encoder_decoder/pioneer/infrared_protocol_pioneer_i.h
new file mode 100644
index 000000000..2ff7f7e3a
--- /dev/null
+++ b/lib/infrared/encoder_decoder/pioneer/infrared_protocol_pioneer_i.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "../common/infrared_common_i.h"
+
+#define INFRARED_PIONEER_CARRIER_FREQUENCY 40000
+#define INFRARED_PIONEER_DUTY_CYCLE 0.33
+#define INFRARED_PIONEER_PREAMBLE_MARK 8500
+#define INFRARED_PIONEER_PREAMBLE_SPACE 4225
+#define INFRARED_PIONEER_BIT1_MARK 500
+#define INFRARED_PIONEER_BIT1_SPACE 1500
+#define INFRARED_PIONEER_BIT0_MARK 500
+#define INFRARED_PIONEER_BIT0_SPACE 500
+#define INFRARED_PIONEER_PREAMBLE_TOLERANCE 200 // us
+#define INFRARED_PIONEER_BIT_TOLERANCE 120 // us
+#define INFRARED_PIONEER_SILENCE 26000
+#define INFRARED_PIONEER_MIN_SPLIT_TIME (INFRARED_PIONEER_SILENCE)
+#define INFRARED_PIONEER_REPEAT_COUNT_MIN 2
+
+extern const InfraredCommonProtocolSpec infrared_protocol_pioneer;
+
+bool infrared_decoder_pioneer_interpret(InfraredCommonDecoder* decoder);
+InfraredStatus infrared_encoder_pioneer_encode_repeat(
+    InfraredCommonEncoder* encoder,
+    uint32_t* duration,
+    bool* level);
\ No newline at end of file
diff --git a/lib/infrared/encoder_decoder/rca/infrared_protocol_rca.c b/lib/infrared/encoder_decoder/rca/infrared_protocol_rca.c
index 8e1e76dbd..f4a34ae2e 100644
--- a/lib/infrared/encoder_decoder/rca/infrared_protocol_rca.c
+++ b/lib/infrared/encoder_decoder/rca/infrared_protocol_rca.c
@@ -15,7 +15,6 @@ const InfraredCommonProtocolSpec infrared_protocol_rca = {
             .min_split_time = INFRARED_RCA_MIN_SPLIT_TIME,
         },
     .databit_len[0] = 24,
-    .no_stop_bit = false,
     .decode = infrared_common_decode_pdwm,
     .encode = infrared_common_encode_pdwm,
     .interpret = infrared_decoder_rca_interpret,
diff --git a/lib/infrared/encoder_decoder/samsung/infrared_protocol_samsung.c b/lib/infrared/encoder_decoder/samsung/infrared_protocol_samsung.c
index ca78726ac..5877911cd 100644
--- a/lib/infrared/encoder_decoder/samsung/infrared_protocol_samsung.c
+++ b/lib/infrared/encoder_decoder/samsung/infrared_protocol_samsung.c
@@ -15,7 +15,6 @@ const InfraredCommonProtocolSpec infrared_protocol_samsung32 = {
             .min_split_time = INFRARED_SAMSUNG_MIN_SPLIT_TIME,
         },
     .databit_len[0] = 32,
-    .no_stop_bit = false,
     .decode = infrared_common_decode_pdwm,
     .encode = infrared_common_encode_pdwm,
     .interpret = infrared_decoder_samsung32_interpret,
diff --git a/lib/infrared/encoder_decoder/sirc/infrared_protocol_sirc.c b/lib/infrared/encoder_decoder/sirc/infrared_protocol_sirc.c
index b527fba98..f5950b88d 100644
--- a/lib/infrared/encoder_decoder/sirc/infrared_protocol_sirc.c
+++ b/lib/infrared/encoder_decoder/sirc/infrared_protocol_sirc.c
@@ -17,7 +17,6 @@ const InfraredCommonProtocolSpec infrared_protocol_sirc = {
     .databit_len[0] = 20,
     .databit_len[1] = 15,
     .databit_len[2] = 12,
-    .no_stop_bit = true,
     .decode = infrared_common_decode_pdwm,
     .encode = infrared_common_encode_pdwm,
     .interpret = infrared_decoder_sirc_interpret,
diff --git a/lib/infrared/worker/infrared_transmit.c b/lib/infrared/worker/infrared_transmit.c
index 8f99c0066..5756da651 100644
--- a/lib/infrared/worker/infrared_transmit.c
+++ b/lib/infrared/worker/infrared_transmit.c
@@ -42,7 +42,7 @@ void infrared_send_raw_ext(
     bool start_from_mark,
     uint32_t frequency,
     float duty_cycle) {
-    furi_assert(timings);
+    furi_check(timings);
 
     infrared_tx_raw_start_from_mark = start_from_mark;
     infrared_tx_raw_timings_index = 0;
@@ -53,7 +53,7 @@ void infrared_send_raw_ext(
     furi_hal_infrared_async_tx_start(frequency, duty_cycle);
     furi_hal_infrared_async_tx_wait_termination();
 
-    furi_assert(!furi_hal_infrared_is_busy());
+    furi_check(!furi_hal_infrared_is_busy());
 }
 
 void infrared_send_raw(const uint32_t timings[], uint32_t timings_cnt, bool start_from_mark) {
@@ -95,9 +95,9 @@ FuriHalInfraredTxGetDataState
 }
 
 void infrared_send(const InfraredMessage* message, int times) {
-    furi_assert(message);
-    furi_assert(times);
-    furi_assert(infrared_is_protocol_valid(message->protocol));
+    furi_check(message);
+    furi_check(times);
+    furi_check(infrared_is_protocol_valid(message->protocol));
 
     InfraredEncoderHandler* handler = infrared_alloc_encoder();
     infrared_reset_encoder(handler, message);
@@ -113,5 +113,5 @@ void infrared_send(const InfraredMessage* message, int times) {
 
     infrared_free_encoder(handler);
 
-    furi_assert(!furi_hal_infrared_is_busy());
+    furi_check(!furi_hal_infrared_is_busy());
 }
diff --git a/lib/infrared/worker/infrared_transmit.h b/lib/infrared/worker/infrared_transmit.h
index 27e6a7df1..c425f53c9 100644
--- a/lib/infrared/worker/infrared_transmit.h
+++ b/lib/infrared/worker/infrared_transmit.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <furi_hal_infrared.h>
 #include <infrared.h>
 #include <stdint.h>
diff --git a/lib/infrared/worker/infrared_worker.c b/lib/infrared/worker/infrared_worker.c
index 38392fc06..89f351eb9 100644
--- a/lib/infrared/worker/infrared_worker.c
+++ b/lib/infrared/worker/infrared_worker.c
@@ -217,12 +217,13 @@ void infrared_worker_rx_set_received_signal_callback(
     InfraredWorker* instance,
     InfraredWorkerReceivedSignalCallback callback,
     void* context) {
-    furi_assert(instance);
+    furi_check(instance);
+
     instance->rx.received_signal_callback = callback;
     instance->rx.received_signal_context = context;
 }
 
-InfraredWorker* infrared_worker_alloc() {
+InfraredWorker* infrared_worker_alloc(void) {
     InfraredWorker* instance = malloc(sizeof(InfraredWorker));
 
     instance->thread = furi_thread_alloc_ex("InfraredWorker", 2048, NULL, instance);
@@ -242,8 +243,8 @@ InfraredWorker* infrared_worker_alloc() {
 }
 
 void infrared_worker_free(InfraredWorker* instance) {
-    furi_assert(instance);
-    furi_assert(instance->state == InfraredWorkerStateIdle);
+    furi_check(instance);
+    furi_check(instance->state == InfraredWorkerStateIdle);
 
     furi_record_close(RECORD_NOTIFICATION);
     infrared_free_decoder(instance->infrared_decoder);
@@ -255,8 +256,8 @@ void infrared_worker_free(InfraredWorker* instance) {
 }
 
 void infrared_worker_rx_start(InfraredWorker* instance) {
-    furi_assert(instance);
-    furi_assert(instance->state == InfraredWorkerStateIdle);
+    furi_check(instance);
+    furi_check(instance->state == InfraredWorkerStateIdle);
 
     furi_stream_set_trigger_level(instance->stream, sizeof(LevelDuration));
 
@@ -274,8 +275,8 @@ void infrared_worker_rx_start(InfraredWorker* instance) {
 }
 
 void infrared_worker_rx_stop(InfraredWorker* instance) {
-    furi_assert(instance);
-    furi_assert(instance->state == InfraredWorkerStateRunRx);
+    furi_check(instance);
+    furi_check(instance->state == InfraredWorkerStateRunRx);
 
     furi_hal_infrared_async_rx_set_timeout_isr_callback(NULL, NULL);
     furi_hal_infrared_async_rx_set_capture_isr_callback(NULL, NULL);
@@ -284,15 +285,14 @@ void infrared_worker_rx_stop(InfraredWorker* instance) {
     furi_thread_flags_set(furi_thread_get_id(instance->thread), INFRARED_WORKER_EXIT);
     furi_thread_join(instance->thread);
 
-    FuriStatus status = furi_stream_buffer_reset(instance->stream);
-    furi_assert(status == FuriStatusOk);
-    (void)status;
+    furi_check(furi_stream_buffer_reset(instance->stream) == FuriStatusOk);
 
     instance->state = InfraredWorkerStateIdle;
 }
 
 bool infrared_worker_signal_is_decoded(const InfraredWorkerSignal* signal) {
-    furi_assert(signal);
+    furi_check(signal);
+
     return signal->decoded;
 }
 
@@ -300,33 +300,36 @@ void infrared_worker_get_raw_signal(
     const InfraredWorkerSignal* signal,
     const uint32_t** timings,
     size_t* timings_cnt) {
-    furi_assert(signal);
-    furi_assert(timings);
-    furi_assert(timings_cnt);
+    furi_check(signal);
+    furi_check(timings);
+    furi_check(timings_cnt);
 
     *timings = signal->raw.timings;
     *timings_cnt = signal->timings_cnt;
 }
 
 const InfraredMessage* infrared_worker_get_decoded_signal(const InfraredWorkerSignal* signal) {
-    furi_assert(signal);
+    furi_check(signal);
+
     return &signal->message;
 }
 
 void infrared_worker_rx_enable_blink_on_receiving(InfraredWorker* instance, bool enable) {
-    furi_assert(instance);
+    furi_check(instance);
+
     instance->blink_enable = enable;
 }
 
 void infrared_worker_rx_enable_signal_decoding(InfraredWorker* instance, bool enable) {
-    furi_assert(instance);
+    furi_check(instance);
+
     instance->decode_enable = enable;
 }
 
 void infrared_worker_tx_start(InfraredWorker* instance) {
-    furi_assert(instance);
-    furi_assert(instance->state == InfraredWorkerStateIdle);
-    furi_assert(instance->tx.get_signal_callback);
+    furi_check(instance);
+    furi_check(instance->state == InfraredWorkerStateIdle);
+    furi_check(instance->tx.get_signal_callback);
 
     // size have to be greater than api hal infrared async tx buffer size
     furi_stream_set_trigger_level(instance->stream, sizeof(InfraredWorkerTiming));
@@ -560,7 +563,8 @@ void infrared_worker_tx_set_get_signal_callback(
     InfraredWorker* instance,
     InfraredWorkerGetSignalCallback callback,
     void* context) {
-    furi_assert(instance);
+    furi_check(instance);
+
     instance->tx.get_signal_callback = callback;
     instance->tx.get_signal_context = context;
 }
@@ -569,14 +573,15 @@ void infrared_worker_tx_set_signal_sent_callback(
     InfraredWorker* instance,
     InfraredWorkerMessageSentCallback callback,
     void* context) {
-    furi_assert(instance);
+    furi_check(instance);
+
     instance->tx.message_sent_callback = callback;
     instance->tx.message_sent_context = context;
 }
 
 void infrared_worker_tx_stop(InfraredWorker* instance) {
-    furi_assert(instance);
-    furi_assert(instance->state != InfraredWorkerStateRunRx);
+    furi_check(instance);
+    furi_check(instance->state != InfraredWorkerStateRunRx);
 
     furi_thread_flags_set(furi_thread_get_id(instance->thread), INFRARED_WORKER_EXIT);
     furi_thread_join(instance->thread);
@@ -584,15 +589,14 @@ void infrared_worker_tx_stop(InfraredWorker* instance) {
     furi_hal_infrared_async_tx_set_signal_sent_isr_callback(NULL, NULL);
 
     instance->signal.timings_cnt = 0;
-    FuriStatus status = furi_stream_buffer_reset(instance->stream);
-    furi_assert(status == FuriStatusOk);
-    (void)status;
+    furi_check(furi_stream_buffer_reset(instance->stream) == FuriStatusOk);
+
     instance->state = InfraredWorkerStateIdle;
 }
 
 void infrared_worker_set_decoded_signal(InfraredWorker* instance, const InfraredMessage* message) {
-    furi_assert(instance);
-    furi_assert(message);
+    furi_check(instance);
+    furi_check(message);
 
     instance->signal.decoded = true;
     instance->signal.message = *message;
@@ -604,11 +608,12 @@ void infrared_worker_set_raw_signal(
     size_t timings_cnt,
     uint32_t frequency,
     float duty_cycle) {
-    furi_assert(instance);
-    furi_assert(timings);
-    furi_assert(timings_cnt > 0);
-    furi_assert((frequency <= INFRARED_MAX_FREQUENCY) && (frequency >= INFRARED_MIN_FREQUENCY));
-    furi_assert((duty_cycle < 1.0f) && (duty_cycle > 0.0f));
+    furi_check(instance);
+    furi_check(timings);
+    furi_check(timings_cnt > 0);
+    furi_check((frequency <= INFRARED_MAX_FREQUENCY) && (frequency >= INFRARED_MIN_FREQUENCY));
+    furi_check((duty_cycle <= 1.0f) && (duty_cycle > 0.0f));
+
     size_t max_copy_num = COUNT_OF(instance->signal.raw.timings) - 1;
     furi_check(timings_cnt <= max_copy_num);
 
@@ -623,6 +628,8 @@ void infrared_worker_set_raw_signal(
 InfraredWorkerGetSignalResponse
     infrared_worker_tx_get_signal_steady_callback(void* context, InfraredWorker* instance) {
     UNUSED(context);
+    furi_check(instance);
+
     InfraredWorkerGetSignalResponse response = instance->tx.steady_signal_sent ?
                                                    InfraredWorkerGetSignalResponseSame :
                                                    InfraredWorkerGetSignalResponseNew;
diff --git a/lib/infrared/worker/infrared_worker.h b/lib/infrared/worker/infrared_worker.h
index e0e861983..2edb19227 100644
--- a/lib/infrared/worker/infrared_worker.h
+++ b/lib/infrared/worker/infrared_worker.h
@@ -37,7 +37,7 @@ typedef void (
  *
  * @return just created instance of InfraredWorker
  */
-InfraredWorker* infrared_worker_alloc();
+InfraredWorker* infrared_worker_alloc(void);
 
 /** Free InfraredWorker
  *
diff --git a/lib/lfrfid/lfrfid_dict_file.c b/lib/lfrfid/lfrfid_dict_file.c
index 33a3b09db..367150812 100644
--- a/lib/lfrfid/lfrfid_dict_file.c
+++ b/lib/lfrfid/lfrfid_dict_file.c
@@ -6,7 +6,10 @@
 #define LFRFID_DICT_FILETYPE "Flipper RFID key"
 
 bool lfrfid_dict_file_save(ProtocolDict* dict, ProtocolId protocol, const char* filename) {
+    furi_check(dict);
     furi_check(protocol != PROTOCOL_NO);
+    furi_check(filename);
+
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FlipperFormat* file = flipper_format_file_alloc(storage);
     size_t data_size = protocol_dict_get_data_size(dict, protocol);
@@ -139,6 +142,9 @@ static ProtocolId lfrfid_dict_protocol_fallback(
 }
 
 ProtocolId lfrfid_dict_file_load(ProtocolDict* dict, const char* filename) {
+    furi_check(dict);
+    furi_check(filename);
+
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FlipperFormat* file = flipper_format_file_alloc(storage);
     ProtocolId result = PROTOCOL_NO;
diff --git a/lib/lfrfid/lfrfid_raw_file.c b/lib/lfrfid/lfrfid_raw_file.c
index ca29770f1..441cf7333 100644
--- a/lib/lfrfid/lfrfid_raw_file.c
+++ b/lib/lfrfid/lfrfid_raw_file.c
@@ -26,6 +26,8 @@ struct LFRFIDRawFile {
 };
 
 LFRFIDRawFile* lfrfid_raw_file_alloc(Storage* storage) {
+    furi_check(storage);
+
     LFRFIDRawFile* file = malloc(sizeof(LFRFIDRawFile));
     file->stream = file_stream_alloc(storage);
     file->buffer = NULL;
@@ -33,16 +35,24 @@ LFRFIDRawFile* lfrfid_raw_file_alloc(Storage* storage) {
 }
 
 void lfrfid_raw_file_free(LFRFIDRawFile* file) {
+    furi_check(file);
+
     if(file->buffer) free(file->buffer);
     stream_free(file->stream);
     free(file);
 }
 
 bool lfrfid_raw_file_open_write(LFRFIDRawFile* file, const char* file_path) {
+    furi_check(file);
+    furi_check(file_path);
+
     return file_stream_open(file->stream, file_path, FSAM_READ_WRITE, FSOM_CREATE_ALWAYS);
 }
 
 bool lfrfid_raw_file_open_read(LFRFIDRawFile* file, const char* file_path) {
+    furi_check(file);
+    furi_check(file_path);
+
     return file_stream_open(file->stream, file_path, FSAM_READ, FSOM_OPEN_EXISTING);
 }
 
@@ -51,6 +61,8 @@ bool lfrfid_raw_file_write_header(
     float frequency,
     float duty_cycle,
     uint32_t max_buffer_size) {
+    furi_check(file);
+
     LFRFIDRawFileHeader header = {
         .magic = LFRFID_RAW_FILE_MAGIC,
         .version = LFRFID_RAW_FILE_VERSION,
@@ -63,6 +75,10 @@ bool lfrfid_raw_file_write_header(
 }
 
 bool lfrfid_raw_file_write_buffer(LFRFIDRawFile* file, uint8_t* buffer_data, size_t buffer_size) {
+    furi_check(file);
+    furi_check(buffer_data);
+    furi_check(buffer_size);
+
     size_t size;
     size = stream_write(file->stream, (uint8_t*)&buffer_size, sizeof(size_t));
     if(size != sizeof(size_t)) return false;
@@ -74,6 +90,10 @@ bool lfrfid_raw_file_write_buffer(LFRFIDRawFile* file, uint8_t* buffer_data, siz
 }
 
 bool lfrfid_raw_file_read_header(LFRFIDRawFile* file, float* frequency, float* duty_cycle) {
+    furi_check(file);
+    furi_check(frequency);
+    furi_check(duty_cycle);
+
     LFRFIDRawFileHeader header;
     size_t size = stream_read(file->stream, (uint8_t*)&header, sizeof(LFRFIDRawFileHeader));
     if(size == sizeof(LFRFIDRawFileHeader)) {
@@ -98,6 +118,10 @@ bool lfrfid_raw_file_read_pair(
     uint32_t* duration,
     uint32_t* pulse,
     bool* pass_end) {
+    furi_check(file);
+    furi_check(duration);
+    furi_check(pulse);
+
     size_t length = 0;
     if(file->buffer_counter >= file->buffer_size) {
         if(stream_eof(file->stream)) {
diff --git a/lib/lfrfid/lfrfid_raw_worker.c b/lib/lfrfid/lfrfid_raw_worker.c
index 344c2afa2..7c04b9dfa 100644
--- a/lib/lfrfid/lfrfid_raw_worker.c
+++ b/lib/lfrfid/lfrfid_raw_worker.c
@@ -58,21 +58,23 @@ typedef enum {
 static int32_t lfrfid_raw_read_worker_thread(void* thread_context);
 static int32_t lfrfid_raw_emulate_worker_thread(void* thread_context);
 
-LFRFIDRawWorker* lfrfid_raw_worker_alloc() {
+LFRFIDRawWorker* lfrfid_raw_worker_alloc(void) {
     LFRFIDRawWorker* worker = malloc(sizeof(LFRFIDRawWorker));
 
     worker->thread = furi_thread_alloc_ex("LfrfidRawWorker", 2048, NULL, worker);
-
-    worker->events = furi_event_flag_alloc(NULL);
-
+    worker->events = furi_event_flag_alloc();
     worker->file_path = furi_string_alloc();
+
     return worker;
 }
 
 void lfrfid_raw_worker_free(LFRFIDRawWorker* worker) {
+    furi_check(worker);
+
     furi_thread_free(worker->thread);
     furi_event_flag_free(worker->events);
     furi_string_free(worker->file_path);
+
     free(worker);
 }
 
@@ -83,6 +85,8 @@ void lfrfid_raw_worker_start_read(
     float duty_cycle,
     LFRFIDWorkerReadRawCallback callback,
     void* context) {
+    furi_check(worker);
+    furi_check(file_path);
     furi_check(furi_thread_get_state(worker->thread) == FuriThreadStateStopped);
 
     furi_string_set(worker->file_path, file_path);
@@ -102,7 +106,10 @@ void lfrfid_raw_worker_start_emulate(
     const char* file_path,
     LFRFIDWorkerEmulateRawCallback callback,
     void* context) {
+    furi_check(worker);
+    furi_check(file_path);
     furi_check(furi_thread_get_state(worker->thread) == FuriThreadStateStopped);
+
     furi_string_set(worker->file_path, file_path);
     worker->emulate_callback = callback;
     worker->context = context;
@@ -111,6 +118,8 @@ void lfrfid_raw_worker_start_emulate(
 }
 
 void lfrfid_raw_worker_stop(LFRFIDRawWorker* worker) {
+    furi_check(worker);
+
     worker->emulate_callback = NULL;
     worker->context = NULL;
     worker->read_callback = NULL;
diff --git a/lib/lfrfid/lfrfid_raw_worker.h b/lib/lfrfid/lfrfid_raw_worker.h
index 1195dd587..e145dcaa3 100644
--- a/lib/lfrfid/lfrfid_raw_worker.h
+++ b/lib/lfrfid/lfrfid_raw_worker.h
@@ -15,7 +15,7 @@ typedef struct LFRFIDRawWorker LFRFIDRawWorker;
  * 
  * @return LFRFIDRawWorker* 
  */
-LFRFIDRawWorker* lfrfid_raw_worker_alloc();
+LFRFIDRawWorker* lfrfid_raw_worker_alloc(void);
 
 /**
  * @brief Free a LFRFIDRawWorker instance
diff --git a/lib/lfrfid/lfrfid_worker.c b/lib/lfrfid/lfrfid_worker.c
index 7fda36f0b..9554957f1 100644
--- a/lib/lfrfid/lfrfid_worker.c
+++ b/lib/lfrfid/lfrfid_worker.c
@@ -21,7 +21,7 @@ typedef enum {
 static int32_t lfrfid_worker_thread(void* thread_context);
 
 LFRFIDWorker* lfrfid_worker_alloc(ProtocolDict* dict) {
-    furi_assert(dict);
+    furi_check(dict);
 
     LFRFIDWorker* worker = malloc(sizeof(LFRFIDWorker));
     worker->mode_index = LFRFIDWorkerIdle;
@@ -39,6 +39,8 @@ LFRFIDWorker* lfrfid_worker_alloc(ProtocolDict* dict) {
 }
 
 void lfrfid_worker_free(LFRFIDWorker* worker) {
+    furi_check(worker);
+
     if(worker->raw_filename) {
         free(worker->raw_filename);
     }
@@ -52,7 +54,9 @@ void lfrfid_worker_read_start(
     LFRFIDWorkerReadType type,
     LFRFIDWorkerReadCallback callback,
     void* context) {
-    furi_assert(worker->mode_index == LFRFIDWorkerIdle);
+    furi_check(worker);
+    furi_check(worker->mode_index == LFRFIDWorkerIdle);
+
     worker->read_type = type;
     worker->read_cb = callback;
     worker->cb_ctx = context;
@@ -64,7 +68,7 @@ void lfrfid_worker_write_start(
     LFRFIDProtocol protocol,
     LFRFIDWorkerWriteCallback callback,
     void* context) {
-    furi_assert(worker->mode_index == LFRFIDWorkerIdle);
+    furi_check(worker->mode_index == LFRFIDWorkerIdle);
     worker->protocol = protocol;
     worker->write_cb = callback;
     worker->cb_ctx = context;
@@ -84,7 +88,9 @@ void lfrfid_worker_write_and_set_pass_start(
 }
 
 void lfrfid_worker_emulate_start(LFRFIDWorker* worker, LFRFIDProtocol protocol) {
-    furi_assert(worker->mode_index == LFRFIDWorkerIdle);
+    furi_check(worker);
+    furi_check(worker->mode_index == LFRFIDWorkerIdle);
+
     worker->protocol = protocol;
     furi_thread_flags_set(furi_thread_get_id(worker->thread), LFRFIDEventEmulate);
 }
@@ -103,7 +109,9 @@ void lfrfid_worker_read_raw_start(
     LFRFIDWorkerReadType type,
     LFRFIDWorkerReadRawCallback callback,
     void* context) {
-    furi_assert(worker->mode_index == LFRFIDWorkerIdle);
+    furi_check(worker);
+    furi_check(worker->mode_index == LFRFIDWorkerIdle);
+
     worker->read_type = type;
     worker->read_raw_cb = callback;
     worker->cb_ctx = context;
@@ -116,7 +124,9 @@ void lfrfid_worker_emulate_raw_start(
     const char* filename,
     LFRFIDWorkerEmulateRawCallback callback,
     void* context) {
-    furi_assert(worker->mode_index == LFRFIDWorkerIdle);
+    furi_check(worker);
+    furi_check(worker->mode_index == LFRFIDWorkerIdle);
+
     lfrfid_worker_set_filename(worker, filename);
     worker->emulate_raw_cb = callback;
     worker->cb_ctx = context;
@@ -124,14 +134,20 @@ void lfrfid_worker_emulate_raw_start(
 }
 
 void lfrfid_worker_stop(LFRFIDWorker* worker) {
+    furi_check(worker);
+
     furi_thread_flags_set(furi_thread_get_id(worker->thread), LFRFIDEventStopMode);
 }
 
 void lfrfid_worker_start_thread(LFRFIDWorker* worker) {
+    furi_check(worker);
+
     furi_thread_start(worker->thread);
 }
 
 void lfrfid_worker_stop_thread(LFRFIDWorker* worker) {
+    furi_check(worker);
+
     furi_thread_flags_set(furi_thread_get_id(worker->thread), LFRFIDEventStopThread);
     furi_thread_join(worker->thread);
 }
diff --git a/lib/lfrfid/lfrfid_worker.h b/lib/lfrfid/lfrfid_worker.h
index 7ec6b6008..b8230f434 100644
--- a/lib/lfrfid/lfrfid_worker.h
+++ b/lib/lfrfid/lfrfid_worker.h
@@ -1,5 +1,4 @@
-/**
- * @file lfrfid_worker.h
+/** @file lfrfid_worker.h
  * 
  * LFRFID worker
  */
@@ -54,37 +53,35 @@ typedef void (*LFRFIDWorkerEmulateRawCallback)(LFRFIDWorkerEmulateRawResult resu
 
 typedef struct LFRFIDWorker LFRFIDWorker;
 
-/**
- * Allocate LF-RFID worker
+/** Allocate LF-RFID worker
  * @return LFRFIDWorker* 
  */
 LFRFIDWorker* lfrfid_worker_alloc(ProtocolDict* dict);
 
-/**
- * Free LF-RFID worker
- * @param worker 
+/** Free LF-RFID worker
+ *
+ * @param      worker  The worker
  */
 void lfrfid_worker_free(LFRFIDWorker* worker);
 
-/**
- * Start LF-RFID worker thread
- * @param worker 
+/** Start LF-RFID worker thread
+ *
+ * @param      worker  The worker
  */
 void lfrfid_worker_start_thread(LFRFIDWorker* worker);
 
-/**
- * Stop LF-RFID worker thread
- * @param worker 
+/** Stop LF-RFID worker thread
+ *
+ * @param      worker  The worker
  */
 void lfrfid_worker_stop_thread(LFRFIDWorker* worker);
 
-/**
- * @brief Start read mode
- * 
- * @param worker 
- * @param type 
- * @param callback 
- * @param context 
+/** Start read mode
+ *
+ * @param      worker    The worker
+ * @param      type      The type
+ * @param      callback  The callback
+ * @param      context   The context
  */
 void lfrfid_worker_read_start(
     LFRFIDWorker* worker,
@@ -92,13 +89,12 @@ void lfrfid_worker_read_start(
     LFRFIDWorkerReadCallback callback,
     void* context);
 
-/**
- * @brief Start write mode
- * 
- * @param worker 
- * @param protocol 
- * @param callback 
- * @param context 
+/** Start write mode
+ *
+ * @param      worker    The worker
+ * @param      protocol  The protocol
+ * @param      callback  The callback
+ * @param      context   The context
  */
 void lfrfid_worker_write_start(
     LFRFIDWorker* worker,
@@ -126,14 +122,13 @@ void lfrfid_worker_write_and_set_pass_start(
  */
 void lfrfid_worker_emulate_start(LFRFIDWorker* worker, LFRFIDProtocol protocol);
 
-/**
- * @brief Start raw read mode
- * 
- * @param worker 
- * @param filename 
- * @param type 
- * @param callback 
- * @param context 
+/** Start raw read mode
+ *
+ * @param      worker    The worker
+ * @param      filename  The filename
+ * @param      type      The type
+ * @param      callback  The callback
+ * @param      context   The context
  */
 void lfrfid_worker_read_raw_start(
     LFRFIDWorker* worker,
@@ -142,12 +137,12 @@ void lfrfid_worker_read_raw_start(
     LFRFIDWorkerReadRawCallback callback,
     void* context);
 
-/**
- * Emulate raw read mode
- * @param worker 
- * @param filename 
- * @param callback 
- * @param context 
+/** Emulate raw read mode
+ *
+ * @param      worker    The worker
+ * @param      filename  The filename
+ * @param      callback  The callback
+ * @param      context   The context
  */
 void lfrfid_worker_emulate_raw_start(
     LFRFIDWorker* worker,
@@ -155,9 +150,9 @@ void lfrfid_worker_emulate_raw_start(
     LFRFIDWorkerEmulateRawCallback callback,
     void* context);
 
-/**
- * Stop all modes
- * @param worker 
+/** Stop all modes
+ *
+ * @param      worker  The worker
  */
 void lfrfid_worker_stop(LFRFIDWorker* worker);
 
diff --git a/lib/lfrfid/protocols/protocol_awid.c b/lib/lfrfid/protocols/protocol_awid.c
index 914f2f01b..b3e92245e 100644
--- a/lib/lfrfid/protocols/protocol_awid.c
+++ b/lib/lfrfid/protocols/protocol_awid.c
@@ -164,7 +164,8 @@ void protocol_awid_render_data(ProtocolAwid* protocol, FuriString* result) {
     uint8_t* decoded_data = protocol->data;
     uint8_t format_length = decoded_data[0];
 
-    furi_string_cat_printf(result, "Format: %d\r\n", format_length);
+    furi_string_printf(result, "Format: %hhu\n", format_length);
+
     if(format_length == 26) {
         uint8_t facility;
         bit_lib_copy_bits(&facility, 0, 8, decoded_data, 9);
@@ -172,13 +173,17 @@ void protocol_awid_render_data(ProtocolAwid* protocol, FuriString* result) {
         uint16_t card_id;
         bit_lib_copy_bits((uint8_t*)&card_id, 8, 8, decoded_data, 17);
         bit_lib_copy_bits((uint8_t*)&card_id, 0, 8, decoded_data, 25);
-        furi_string_cat_printf(result, "Facility: %d\r\n", facility);
-        furi_string_cat_printf(result, "Card: %d", card_id);
+        furi_string_cat_printf(
+            result,
+            "FC: %hhu\n"
+            "Card: %hu",
+            facility,
+            card_id);
     } else {
         // print 66 bits as hex
         furi_string_cat_printf(result, "Data: ");
         for(size_t i = 0; i < AWID_DECODED_DATA_SIZE; i++) {
-            furi_string_cat_printf(result, "%02X", decoded_data[i]);
+            furi_string_cat_printf(result, "%02hhX", decoded_data[i]);
         }
     }
 };
@@ -187,7 +192,8 @@ void protocol_awid_render_brief_data(ProtocolAwid* protocol, FuriString* result)
     uint8_t* decoded_data = protocol->data;
     uint8_t format_length = decoded_data[0];
 
-    furi_string_cat_printf(result, "Format: %d\r\n", format_length);
+    furi_string_printf(result, "Format: %hhu", format_length);
+
     if(format_length == 26) {
         uint8_t facility;
         bit_lib_copy_bits(&facility, 0, 8, decoded_data, 9);
@@ -195,9 +201,14 @@ void protocol_awid_render_brief_data(ProtocolAwid* protocol, FuriString* result)
         uint16_t card_id;
         bit_lib_copy_bits((uint8_t*)&card_id, 8, 8, decoded_data, 17);
         bit_lib_copy_bits((uint8_t*)&card_id, 0, 8, decoded_data, 25);
-        furi_string_cat_printf(result, "ID: %03u,%05u", facility, card_id);
+        furi_string_cat_printf(
+            result,
+            "; FC: %hhu\n"
+            "Card: %hu",
+            facility,
+            card_id);
     } else {
-        furi_string_cat_printf(result, "Data: unknown");
+        furi_string_cat(result, "\nData: Unknown");
     }
 };
 
@@ -252,4 +263,4 @@ const ProtocolBase protocol_awid = {
     .render_data = (ProtocolRenderData)protocol_awid_render_data,
     .render_brief_data = (ProtocolRenderData)protocol_awid_render_brief_data,
     .write_data = (ProtocolWriteData)protocol_awid_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_em4100.c b/lib/lfrfid/protocols/protocol_em4100.c
index 6177f63c4..08b4ec9e0 100644
--- a/lib/lfrfid/protocols/protocol_em4100.c
+++ b/lib/lfrfid/protocols/protocol_em4100.c
@@ -335,8 +335,8 @@ bool protocol_em4100_write_data(ProtocolEM4100* protocol, void* data) {
         request->t5577.block[0] =
             (LFRFID_T5577_MODULATION_MANCHESTER | protocol_em4100_get_t5577_bitrate(protocol) |
              (2 << LFRFID_T5577_MAXBLOCK_SHIFT));
-        request->t5577.block[1] = protocol->encoded_data;
-        request->t5577.block[2] = protocol->encoded_data >> 32;
+        request->t5577.block[1] = protocol->encoded_data >> 32;
+        request->t5577.block[2] = protocol->encoded_data;
         request->t5577.blocks_to_write = 3;
         result = true;
     }
@@ -347,7 +347,8 @@ void protocol_em4100_render_data(ProtocolEM4100* protocol, FuriString* result) {
     uint8_t* data = protocol->data;
     furi_string_printf(
         result,
-        "FC: %03u, Card: %05u\n(RF/%u)",
+        "FC: %03u\n"
+        "Card: %05hu (RF/%hhu)",
         data[2],
         (uint16_t)((data[3] << 8) | (data[4])),
         protocol->clock_per_bit);
diff --git a/lib/lfrfid/protocols/protocol_fdx_a.c b/lib/lfrfid/protocols/protocol_fdx_a.c
index 667c4f88d..f7852eb10 100644
--- a/lib/lfrfid/protocols/protocol_fdx_a.c
+++ b/lib/lfrfid/protocols/protocol_fdx_a.c
@@ -217,14 +217,10 @@ void protocol_fdx_a_render_data(ProtocolFDXA* protocol, FuriString* result) {
 
     furi_string_printf(
         result,
-        "ID: %02X%02X%02X%02X%02X\r\n"
-        "Parity: %s",
-        data[0],
-        data[1],
-        data[2],
-        data[3],
-        data[4],
-        parity_sum == 0 ? "+" : "-");
+        "ID: %010llX\n"
+        "Parity: %c",
+        bit_lib_get_bits_64(data, 0, 40),
+        parity_sum == 0 ? '+' : '-');
 };
 
 const ProtocolBase protocol_fdx_a = {
@@ -249,4 +245,4 @@ const ProtocolBase protocol_fdx_a = {
     .render_data = (ProtocolRenderData)protocol_fdx_a_render_data,
     .render_brief_data = (ProtocolRenderData)protocol_fdx_a_render_data,
     .write_data = (ProtocolWriteData)protocol_fdx_a_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_fdx_b.c b/lib/lfrfid/protocols/protocol_fdx_b.c
index 18ccfa702..a5af855e4 100644
--- a/lib/lfrfid/protocols/protocol_fdx_b.c
+++ b/lib/lfrfid/protocols/protocol_fdx_b.c
@@ -288,21 +288,33 @@ void protocol_fdx_b_render_data(ProtocolFDXB* protocol, FuriString* result) {
     uint8_t replacement_number = bit_lib_get_bits(protocol->data, 60, 3);
     bool animal_flag = bit_lib_get_bit(protocol->data, 63);
 
-    furi_string_printf(result, "ID: %03u-%012llu\r\n", country_code, national_code);
-    furi_string_cat_printf(result, "Animal: %s, ", animal_flag ? "Yes" : "No");
+    furi_string_printf(
+        result,
+        "ID: %03hu-%012llu\n"
+        "Country Code: %hu\n"
+        "Temperature: ",
+        country_code,
+        national_code,
+        country_code);
 
     float temperature;
     if(protocol_fdx_b_get_temp(protocol->data, &temperature)) {
-        float temperature_c = (temperature - 32) / 1.8;
-        furi_string_cat_printf(
-            result, "T: %.2fF, %.2fC\r\n", (double)temperature, (double)temperature_c);
+        if(furi_hal_rtc_get_locale_units() == FuriHalRtcLocaleUnitsMetric) {
+            float temperature_c = (temperature - 32.0f) / 1.8f;
+            furi_string_cat_printf(result, "%.2fC", (double)temperature_c);
+        } else {
+            furi_string_cat_printf(result, "%.2fF", (double)temperature);
+        }
     } else {
-        furi_string_cat_printf(result, "T: ---\r\n");
+        furi_string_cat(result, "---");
     }
 
     furi_string_cat_printf(
         result,
-        "Bits: %X-%X-%X-%X-%X",
+        "\n"
+        "Animal: %s\n"
+        "Bits: %hhX-%hhX-%hhX-%hhX-%hhX",
+        animal_flag ? "Yes" : "No",
         block_status,
         rudi_bit,
         reserved,
@@ -317,21 +329,24 @@ void protocol_fdx_b_render_brief_data(ProtocolFDXB* protocol, FuriString* result
     // 10 bit of country code
     uint16_t country_code = protocol_fdx_b_get_country_code(protocol->data);
 
-    bool animal_flag = bit_lib_get_bit(protocol->data, 63);
-
-    furi_string_printf(result, "ID: %03u-%012llu\r\n", country_code, national_code);
-    furi_string_cat_printf(result, "Animal: %s, ", animal_flag ? "Yes" : "No");
+    furi_string_printf(
+        result,
+        "ID: %03hu-%012llu\n"
+        "Country: %hu; Temp.: ",
+        country_code,
+        national_code,
+        country_code);
 
     float temperature;
     if(protocol_fdx_b_get_temp(protocol->data, &temperature)) {
         if(furi_hal_rtc_get_locale_units() == FuriHalRtcLocaleUnitsMetric) {
             float temperature_c = (temperature - 32.0f) / 1.8f;
-            furi_string_cat_printf(result, "T: %.2fC", (double)temperature_c);
+            furi_string_cat_printf(result, "%.2fC", (double)temperature_c);
         } else {
-            furi_string_cat_printf(result, "T: %.2fF", (double)temperature);
+            furi_string_cat_printf(result, "%.2fF", (double)temperature);
         }
     } else {
-        furi_string_cat_printf(result, "T: ---");
+        furi_string_cat(result, "---");
     }
 };
 
@@ -380,4 +395,4 @@ const ProtocolBase protocol_fdx_b = {
     .render_data = (ProtocolRenderData)protocol_fdx_b_render_data,
     .render_brief_data = (ProtocolRenderData)protocol_fdx_b_render_brief_data,
     .write_data = (ProtocolWriteData)protocol_fdx_b_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_gallagher.c b/lib/lfrfid/protocols/protocol_gallagher.c
index 15bebb90b..b00c14acd 100644
--- a/lib/lfrfid/protocols/protocol_gallagher.c
+++ b/lib/lfrfid/protocols/protocol_gallagher.c
@@ -268,17 +268,44 @@ bool protocol_gallagher_write_data(ProtocolGallagher* protocol, void* data) {
     return result;
 };
 
-void protocol_gallagher_render_data(ProtocolGallagher* protocol, FuriString* result) {
-    UNUSED(protocol);
-    uint8_t rc = bit_lib_get_bits(protocol->data, 0, 4);
-    uint8_t il = bit_lib_get_bits(protocol->data, 4, 4);
+static void protocol_gallagher_render_data_internal(
+    ProtocolGallagher* protocol,
+    FuriString* result,
+    bool brief) {
+    uint8_t region = bit_lib_get_bits(protocol->data, 0, 4);
+    uint8_t issue_level = bit_lib_get_bits(protocol->data, 4, 4);
     uint32_t fc = bit_lib_get_bits_32(protocol->data, 8, 24);
     uint32_t card_id = bit_lib_get_bits_32(protocol->data, 32, 32);
 
-    furi_string_cat_printf(result, "Region: %u, Issue Level: %u\r\n", rc, il);
-    furi_string_cat_printf(result, "FC: %lu, C: %lu\r\n", fc, card_id);
+    if(brief) {
+        furi_string_printf(
+            result,
+            "FC: %lu\n"
+            "Card: %lu",
+            fc,
+            card_id);
+    } else {
+        furi_string_printf(
+            result,
+            "FC: %lu\n"
+            "Card: %lu\n"
+            "Region: %u\n"
+            "Issue Level: %u",
+            fc,
+            card_id,
+            region,
+            issue_level);
+    }
 };
 
+void protocol_gallagher_render_data(ProtocolGallagher* protocol, FuriString* result) {
+    protocol_gallagher_render_data_internal(protocol, result, false);
+}
+
+void protocol_gallagher_render_brief_data(ProtocolGallagher* protocol, FuriString* result) {
+    protocol_gallagher_render_data_internal(protocol, result, true);
+}
+
 const ProtocolBase protocol_gallagher = {
     .name = "Gallagher",
     .manufacturer = "Gallagher",
@@ -299,6 +326,6 @@ const ProtocolBase protocol_gallagher = {
             .yield = (ProtocolEncoderYield)protocol_gallagher_encoder_yield,
         },
     .render_data = (ProtocolRenderData)protocol_gallagher_render_data,
-    .render_brief_data = (ProtocolRenderData)protocol_gallagher_render_data,
+    .render_brief_data = (ProtocolRenderData)protocol_gallagher_render_brief_data,
     .write_data = (ProtocolWriteData)protocol_gallagher_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_h10301.c b/lib/lfrfid/protocols/protocol_h10301.c
index 2d7a3e669..6c6d5771a 100644
--- a/lib/lfrfid/protocols/protocol_h10301.c
+++ b/lib/lfrfid/protocols/protocol_h10301.c
@@ -359,8 +359,8 @@ void protocol_h10301_render_data(ProtocolH10301* protocol, FuriString* result) {
     uint8_t* data = protocol->data;
     furi_string_printf(
         result,
-        "FC: %u\r\n"
-        "Card: %u",
+        "FC: %hhu\n"
+        "Card: %hu",
         data[0],
         (uint16_t)((data[1] << 8) | (data[2])));
 };
@@ -387,4 +387,4 @@ const ProtocolBase protocol_h10301 = {
     .render_data = (ProtocolRenderData)protocol_h10301_render_data,
     .render_brief_data = (ProtocolRenderData)protocol_h10301_render_data,
     .write_data = (ProtocolWriteData)protocol_h10301_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_hid_ex_generic.c b/lib/lfrfid/protocols/protocol_hid_ex_generic.c
index 194e15328..efc7a5190 100644
--- a/lib/lfrfid/protocols/protocol_hid_ex_generic.c
+++ b/lib/lfrfid/protocols/protocol_hid_ex_generic.c
@@ -193,9 +193,13 @@ bool protocol_hid_ex_generic_write_data(ProtocolHIDEx* protocol, void* data) {
 };
 
 void protocol_hid_ex_generic_render_data(ProtocolHIDEx* protocol, FuriString* result) {
-    // TODO FL-3518: parser and render functions
     UNUSED(protocol);
-    furi_string_printf(result, "Generic HID Extended\r\nData: Unknown");
+
+    // TODO FL-3518: parser and render functions
+    furi_string_set(
+        result,
+        "Type: Generic HID Extended\n"
+        "Data: Unknown");
 };
 
 const ProtocolBase protocol_hid_ex_generic = {
@@ -220,4 +224,4 @@ const ProtocolBase protocol_hid_ex_generic = {
     .render_data = (ProtocolRenderData)protocol_hid_ex_generic_render_data,
     .render_brief_data = (ProtocolRenderData)protocol_hid_ex_generic_render_data,
     .write_data = (ProtocolWriteData)protocol_hid_ex_generic_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_hid_generic.c b/lib/lfrfid/protocols/protocol_hid_generic.c
index e24b5ade7..1a9528885 100644
--- a/lib/lfrfid/protocols/protocol_hid_generic.c
+++ b/lib/lfrfid/protocols/protocol_hid_generic.c
@@ -245,7 +245,7 @@ void protocol_hid_generic_render_data(ProtocolHID* protocol, FuriString* result)
     if(protocol_size == HID_PROTOCOL_SIZE_UNKNOWN) {
         furi_string_printf(
             result,
-            "Generic HID Proximity\r\n"
+            "Generic HID Proximity\n"
             "Data: %02X%02X%02X%02X%02X%X",
             protocol->data[0],
             protocol->data[1],
@@ -256,7 +256,7 @@ void protocol_hid_generic_render_data(ProtocolHID* protocol, FuriString* result)
     } else {
         furi_string_printf(
             result,
-            "%hhu-bit HID Proximity\r\n"
+            "%hhu-bit HID Proximity\n"
             "Data: ",
             protocol_size);
         protocol_hid_generic_string_cat_protocol_bits(protocol, protocol_size, result);
diff --git a/lib/lfrfid/protocols/protocol_idteck.c b/lib/lfrfid/protocols/protocol_idteck.c
index 6de8de206..2075576ba 100644
--- a/lib/lfrfid/protocols/protocol_idteck.c
+++ b/lib/lfrfid/protocols/protocol_idteck.c
@@ -205,26 +205,16 @@ static uint32_t get_card(const uint8_t* data) {
     return cn;
 }
 
-void protocol_idteck_render_data_internal(ProtocolIdteck* protocol, FuriString* result, bool brief) {
+void protocol_idteck_render_data(ProtocolIdteck* protocol, FuriString* result) {
     const uint32_t fc = get_fc(protocol->data);
     const uint32_t card = get_card(protocol->data);
 
-    if(brief) {
-        furi_string_printf(result, "FC: %08lX\r\nCard: %08lX", fc, card);
-    } else {
-        furi_string_printf(
-            result,
-            "FC: %08lX\r\n"
-            "Card: %08lX\r\n",
-            fc,
-            card);
-    }
-}
-void protocol_idteck_render_data(ProtocolIdteck* protocol, FuriString* result) {
-    protocol_idteck_render_data_internal(protocol, result, false);
-}
-void protocol_idteck_render_brief_data(ProtocolIdteck* protocol, FuriString* result) {
-    protocol_idteck_render_data_internal(protocol, result, true);
+    furi_string_printf(
+        result,
+        "FC: %08lX\n"
+        "Card: %08lX",
+        fc,
+        card);
 }
 
 bool protocol_idteck_write_data(ProtocolIdteck* protocol, void* data) {
@@ -264,6 +254,6 @@ const ProtocolBase protocol_idteck = {
             .yield = (ProtocolEncoderYield)protocol_idteck_encoder_yield,
         },
     .render_data = (ProtocolRenderData)protocol_idteck_render_data,
-    .render_brief_data = (ProtocolRenderData)protocol_idteck_render_brief_data,
+    .render_brief_data = (ProtocolRenderData)protocol_idteck_render_data,
     .write_data = (ProtocolWriteData)protocol_idteck_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_indala26.c b/lib/lfrfid/protocols/protocol_indala26.c
index 7ce83af7f..893361abb 100644
--- a/lib/lfrfid/protocols/protocol_indala26.c
+++ b/lib/lfrfid/protocols/protocol_indala26.c
@@ -289,22 +289,21 @@ void protocol_indala26_render_data_internal(
     if(brief) {
         furi_string_printf(
             result,
-            "FC: %u\r\nCard: %u, Parity:%s%s",
+            "FC: %u\n"
+            "Card: %u",
             fc,
-            card,
-            (checksum_correct ? "+" : "-"),
-            (wiegand_correct ? "+" : "-"));
+            card);
     } else {
         furi_string_printf(
             result,
-            "FC: %u\r\n"
-            "Card: %u\r\n"
-            "Checksum: %s\r\n"
-            "W26 Parity: %s",
+            "FC: %u\n"
+            "Card: %u\n"
+            "Parity: %c\n"
+            "Checksum: %c",
             fc,
             card,
-            (checksum_correct ? "+" : "-"),
-            (wiegand_correct ? "+" : "-"));
+            (wiegand_correct ? '+' : '-'),
+            (checksum_correct ? '+' : '-'));
     }
 }
 void protocol_indala26_render_data(ProtocolIndala* protocol, FuriString* result) {
diff --git a/lib/lfrfid/protocols/protocol_io_prox_xsf.c b/lib/lfrfid/protocols/protocol_io_prox_xsf.c
index 5cdc9064c..b41cb66f3 100644
--- a/lib/lfrfid/protocols/protocol_io_prox_xsf.c
+++ b/lib/lfrfid/protocols/protocol_io_prox_xsf.c
@@ -236,9 +236,9 @@ void protocol_io_prox_xsf_render_data(ProtocolIOProxXSF* protocol, FuriString* r
     uint8_t* data = protocol->data;
     furi_string_printf(
         result,
-        "FC: %u\r\n"
-        "VС: %u\r\n"
-        "Card: %u",
+        "FC: %hhu\n"
+        "V: %hhu\n"
+        "Card: %hu",
         data[0],
         data[1],
         (uint16_t)((data[2] << 8) | (data[3])));
@@ -248,8 +248,8 @@ void protocol_io_prox_xsf_render_brief_data(ProtocolIOProxXSF* protocol, FuriStr
     uint8_t* data = protocol->data;
     furi_string_printf(
         result,
-        "FC: %u, VС: %u\r\n"
-        "Card: %u",
+        "FC: %hhu, V: %hhu\n"
+        "Card: %hu",
         data[0],
         data[1],
         (uint16_t)((data[2] << 8) | (data[3])));
@@ -298,4 +298,4 @@ const ProtocolBase protocol_io_prox_xsf = {
     .render_data = (ProtocolRenderData)protocol_io_prox_xsf_render_data,
     .render_brief_data = (ProtocolRenderData)protocol_io_prox_xsf_render_brief_data,
     .write_data = (ProtocolWriteData)protocol_io_prox_xsf_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_jablotron.c b/lib/lfrfid/protocols/protocol_jablotron.c
index 467002c7e..c2cbb4174 100644
--- a/lib/lfrfid/protocols/protocol_jablotron.c
+++ b/lib/lfrfid/protocols/protocol_jablotron.c
@@ -162,7 +162,7 @@ LevelDuration protocol_jablotron_encoder_yield(ProtocolJablotron* protocol) {
 
 void protocol_jablotron_render_data(ProtocolJablotron* protocol, FuriString* result) {
     uint64_t id = protocol_jablotron_card_id(protocol->data);
-    furi_string_printf(result, "ID: %llX\r\n", id);
+    furi_string_printf(result, "Card: %llX", id);
 };
 
 bool protocol_jablotron_write_data(ProtocolJablotron* protocol, void* data) {
@@ -208,4 +208,4 @@ const ProtocolBase protocol_jablotron = {
     .render_data = (ProtocolRenderData)protocol_jablotron_render_data,
     .render_brief_data = (ProtocolRenderData)protocol_jablotron_render_data,
     .write_data = (ProtocolWriteData)protocol_jablotron_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_keri.c b/lib/lfrfid/protocols/protocol_keri.c
index d994229d9..2cc7e8cdf 100644
--- a/lib/lfrfid/protocols/protocol_keri.c
+++ b/lib/lfrfid/protocols/protocol_keri.c
@@ -212,13 +212,40 @@ LevelDuration protocol_keri_encoder_yield(ProtocolKeri* protocol) {
     return level_duration;
 };
 
-void protocol_keri_render_data(ProtocolKeri* protocol, FuriString* result) {
+static void
+    protocol_keri_render_data_internal(ProtocolKeri* protocol, FuriString* result, bool brief) {
     uint32_t data = bit_lib_get_bits_32(protocol->data, 0, 32);
     uint32_t internal_id = data & 0x7FFFFFFF;
     uint32_t fc = 0;
     uint32_t cn = 0;
     protocol_keri_descramble(&fc, &cn, &data);
-    furi_string_printf(result, "Internal ID: %lu\r\nFC: %lu, Card: %lu\r\n", internal_id, fc, cn);
+
+    if(brief) {
+        furi_string_printf(
+            result,
+            "Internal ID: %lu\n"
+            "FC: %lu; Card: %lu",
+            internal_id,
+            fc,
+            cn);
+    } else {
+        furi_string_printf(
+            result,
+            "Internal ID: %lu\n"
+            "FC: %lu\n"
+            "Card: %lu",
+            internal_id,
+            fc,
+            cn);
+    }
+}
+
+void protocol_keri_render_data(ProtocolKeri* protocol, FuriString* result) {
+    protocol_keri_render_data_internal(protocol, result, false);
+}
+
+void protocol_keri_render_brief_data(ProtocolKeri* protocol, FuriString* result) {
+    protocol_keri_render_data_internal(protocol, result, true);
 }
 
 bool protocol_keri_write_data(ProtocolKeri* protocol, void* data) {
@@ -262,6 +289,6 @@ const ProtocolBase protocol_keri = {
             .yield = (ProtocolEncoderYield)protocol_keri_encoder_yield,
         },
     .render_data = (ProtocolRenderData)protocol_keri_render_data,
-    .render_brief_data = (ProtocolRenderData)protocol_keri_render_data,
+    .render_brief_data = (ProtocolRenderData)protocol_keri_render_brief_data,
     .write_data = (ProtocolWriteData)protocol_keri_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_nexwatch.c b/lib/lfrfid/protocols/protocol_nexwatch.c
index 938ef273d..3df83be7a 100644
--- a/lib/lfrfid/protocols/protocol_nexwatch.c
+++ b/lib/lfrfid/protocols/protocol_nexwatch.c
@@ -263,7 +263,10 @@ LevelDuration protocol_nexwatch_encoder_yield(ProtocolNexwatch* protocol) {
     return level_duration;
 };
 
-void protocol_nexwatch_render_data(ProtocolNexwatch* protocol, FuriString* result) {
+static void protocol_nexwatch_render_data_internal(
+    ProtocolNexwatch* protocol,
+    FuriString* result,
+    bool brief) {
     uint32_t id = 0;
     uint32_t scrambled = bit_lib_get_bits_32(protocol->data, 8, 32);
     protocol_nexwatch_descramble(&id, &scrambled);
@@ -272,13 +275,42 @@ void protocol_nexwatch_render_data(ProtocolNexwatch* protocol, FuriString* resul
     uint8_t mode = bit_lib_get_bits(protocol->data, 40, 4);
     uint8_t parity = bit_lib_get_bits(protocol->data, 44, 4);
     uint8_t chk = bit_lib_get_bits(protocol->data, 48, 8);
-    for(m_idx = 0; m_idx < 3; m_idx++) {
+
+    for(m_idx = 0; m_idx < COUNT_OF(magic_items); m_idx++) {
         magic_items[m_idx].chk = protocol_nexwatch_checksum(magic_items[m_idx].magic, id, parity);
         if(magic_items[m_idx].chk == chk) {
             break;
         }
     }
-    furi_string_printf(result, "ID: %lu, M:%u\r\nType: %s\r\n", id, mode, magic_items[m_idx].desc);
+
+    const char* type = m_idx < COUNT_OF(magic_items) ? magic_items[m_idx].desc : "Unknown";
+
+    if(brief) {
+        furi_string_printf(
+            result,
+            "ID: %lu\n"
+            "Mode: %hhu; Type: %s",
+            id,
+            mode,
+            type);
+    } else {
+        furi_string_printf(
+            result,
+            "ID: %lu\n"
+            "Mode: %hhu\n"
+            "Type: %s",
+            id,
+            mode,
+            type);
+    }
+}
+
+void protocol_nexwatch_render_data(ProtocolNexwatch* protocol, FuriString* result) {
+    protocol_nexwatch_render_data_internal(protocol, result, false);
+}
+
+void protocol_nexwatch_render_brief_data(ProtocolNexwatch* protocol, FuriString* result) {
+    protocol_nexwatch_render_data_internal(protocol, result, true);
 }
 
 bool protocol_nexwatch_write_data(ProtocolNexwatch* protocol, void* data) {
@@ -318,6 +350,6 @@ const ProtocolBase protocol_nexwatch = {
             .yield = (ProtocolEncoderYield)protocol_nexwatch_encoder_yield,
         },
     .render_data = (ProtocolRenderData)protocol_nexwatch_render_data,
-    .render_brief_data = (ProtocolRenderData)protocol_nexwatch_render_data,
+    .render_brief_data = (ProtocolRenderData)protocol_nexwatch_render_brief_data,
     .write_data = (ProtocolWriteData)protocol_nexwatch_write_data,
 };
diff --git a/lib/lfrfid/protocols/protocol_pac_stanley.c b/lib/lfrfid/protocols/protocol_pac_stanley.c
index dc9eaaf49..67bc3bf48 100644
--- a/lib/lfrfid/protocols/protocol_pac_stanley.c
+++ b/lib/lfrfid/protocols/protocol_pac_stanley.c
@@ -202,8 +202,7 @@ bool protocol_pac_stanley_write_data(ProtocolPACStanley* protocol, void* data) {
 }
 
 void protocol_pac_stanley_render_data(ProtocolPACStanley* protocol, FuriString* result) {
-    uint8_t* data = protocol->data;
-    furi_string_printf(result, "CIN: %02X%02X%02X%02X", data[0], data[1], data[2], data[3]);
+    furi_string_printf(result, "CIN: %08lX", bit_lib_get_bits_32(protocol->data, 0, 32));
 }
 
 const ProtocolBase protocol_pac_stanley = {
diff --git a/lib/lfrfid/protocols/protocol_paradox.c b/lib/lfrfid/protocols/protocol_paradox.c
index b716acf7a..bb52f0529 100644
--- a/lib/lfrfid/protocols/protocol_paradox.c
+++ b/lib/lfrfid/protocols/protocol_paradox.c
@@ -171,10 +171,20 @@ void protocol_paradox_render_data(ProtocolParadox* protocol, FuriString* result)
     uint8_t card_crc = bit_lib_get_bits_16(decoded_data, 34, 8);
     uint8_t calc_crc = protocol_paradox_calculate_checksum(fc, card_id);
 
-    furi_string_cat_printf(result, "Facility: %u\r\n", fc);
-    furi_string_cat_printf(result, "Card: %u\r\n", card_id);
-    furi_string_cat_printf(result, "CRC: %u   Calc CRC: %u\r\n", card_crc, calc_crc);
-    if(card_crc != calc_crc) furi_string_cat_printf(result, "CRC Mismatch, Invalid Card!\r\n");
+    furi_string_printf(
+        result,
+        "FC: %hhu\n"
+        "Card: %hu\n"
+        "CRC: %hhu\n"
+        "Calc CRC: %hhu",
+        fc,
+        card_id,
+        card_crc,
+        calc_crc);
+
+    if(card_crc != calc_crc) {
+        furi_string_cat(result, "\nCRC Mismatch, Invalid Card!");
+    }
 };
 
 void protocol_paradox_render_brief_data(ProtocolParadox* protocol, FuriString* result) {
@@ -185,11 +195,10 @@ void protocol_paradox_render_brief_data(ProtocolParadox* protocol, FuriString* r
     uint8_t card_crc = bit_lib_get_bits_16(decoded_data, 34, 8);
     uint8_t calc_crc = protocol_paradox_calculate_checksum(fc, card_id);
 
-    furi_string_cat_printf(result, "FC: %03u, Card: %05u\r\n", fc, card_id);
-    if(calc_crc == card_crc) {
-        furi_string_cat_printf(result, "CRC : %03u", card_crc);
-    } else {
-        furi_string_cat_printf(result, "Card is Invalid!");
+    furi_string_printf(result, "FC: %hhu; Card: %hu", fc, card_id);
+
+    if(calc_crc != card_crc) {
+        furi_string_cat(result, "\nCRC Mismatch, Invalid Card!");
     }
 };
 
@@ -237,4 +246,4 @@ const ProtocolBase protocol_paradox = {
     .render_data = (ProtocolRenderData)protocol_paradox_render_data,
     .render_brief_data = (ProtocolRenderData)protocol_paradox_render_brief_data,
     .write_data = (ProtocolWriteData)protocol_paradox_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/protocols/protocol_pyramid.c b/lib/lfrfid/protocols/protocol_pyramid.c
index f0a506eb3..8711fe13a 100644
--- a/lib/lfrfid/protocols/protocol_pyramid.c
+++ b/lib/lfrfid/protocols/protocol_pyramid.c
@@ -243,7 +243,7 @@ void protocol_pyramid_render_data(ProtocolPyramid* protocol, FuriString* result)
     uint8_t* decoded_data = protocol->data;
     uint8_t format_length = decoded_data[0];
 
-    furi_string_cat_printf(result, "Format: %d\r\n", format_length);
+    furi_string_printf(result, "Format: %hhu\n", format_length);
     if(format_length == 26) {
         uint8_t facility;
         bit_lib_copy_bits(&facility, 0, 8, decoded_data, 8);
@@ -251,9 +251,9 @@ void protocol_pyramid_render_data(ProtocolPyramid* protocol, FuriString* result)
         uint16_t card_id;
         bit_lib_copy_bits((uint8_t*)&card_id, 8, 8, decoded_data, 16);
         bit_lib_copy_bits((uint8_t*)&card_id, 0, 8, decoded_data, 24);
-        furi_string_cat_printf(result, "FC: %03u, Card: %05u", facility, card_id);
+        furi_string_cat_printf(result, "FC: %03hhu; Card: %05hu", facility, card_id);
     } else {
-        furi_string_cat_printf(result, "Data: unknown");
+        furi_string_cat_printf(result, "Data: Unknown");
     }
 };
 
diff --git a/lib/lfrfid/protocols/protocol_viking.c b/lib/lfrfid/protocols/protocol_viking.c
index f5697012a..4989e4e68 100644
--- a/lib/lfrfid/protocols/protocol_viking.c
+++ b/lib/lfrfid/protocols/protocol_viking.c
@@ -176,8 +176,7 @@ bool protocol_viking_write_data(ProtocolViking* protocol, void* data) {
 };
 
 void protocol_viking_render_data(ProtocolViking* protocol, FuriString* result) {
-    uint32_t id = bit_lib_get_bits_32(protocol->data, 0, 32);
-    furi_string_printf(result, "ID: %08lX\r\n", id);
+    furi_string_printf(result, "ID: %08lX", bit_lib_get_bits_32(protocol->data, 0, 32));
 };
 
 const ProtocolBase protocol_viking = {
@@ -202,4 +201,4 @@ const ProtocolBase protocol_viking = {
     .render_data = (ProtocolRenderData)protocol_viking_render_data,
     .render_brief_data = (ProtocolRenderData)protocol_viking_render_data,
     .write_data = (ProtocolWriteData)protocol_viking_write_data,
-};
\ No newline at end of file
+};
diff --git a/lib/lfrfid/tools/t5577.c b/lib/lfrfid/tools/t5577.c
index 4b24b742a..483762ff6 100644
--- a/lib/lfrfid/tools/t5577.c
+++ b/lib/lfrfid/tools/t5577.c
@@ -17,14 +17,14 @@
 #define T5577_BLOCKS_IN_PAGE_0 8
 #define T5577_BLOCKS_IN_PAGE_1 4
 
-static void t5577_start() {
+static void t5577_start(void) {
     furi_hal_rfid_tim_read_start(125000, 0.5);
 
     // do not ground the antenna
     furi_hal_rfid_pin_pull_release();
 }
 
-static void t5577_stop() {
+static void t5577_stop(void) {
     furi_hal_rfid_tim_read_stop();
     furi_hal_rfid_pins_reset();
 }
@@ -49,7 +49,7 @@ static void t5577_write_opcode(uint8_t value) {
     t5577_write_bit((value >> 0) & 1);
 }
 
-static void t5577_write_reset() {
+static void t5577_write_reset(void) {
     t5577_write_gap(T5577_TIMING_START_GAP);
     t5577_write_bit(1);
     t5577_write_bit(0);
diff --git a/lib/lfrfid/tools/varint_pair.c b/lib/lfrfid/tools/varint_pair.c
index 1e6c82eee..48e0e4a13 100644
--- a/lib/lfrfid/tools/varint_pair.c
+++ b/lib/lfrfid/tools/varint_pair.c
@@ -8,7 +8,7 @@ struct VarintPair {
     uint8_t data[VARINT_PAIR_SIZE];
 };
 
-VarintPair* varint_pair_alloc() {
+VarintPair* varint_pair_alloc(void) {
     VarintPair* pair = malloc(sizeof(VarintPair));
     pair->data_length = 0;
     return pair;
diff --git a/lib/lfrfid/tools/varint_pair.h b/lib/lfrfid/tools/varint_pair.h
index 3c8386423..12697a7a6 100644
--- a/lib/lfrfid/tools/varint_pair.h
+++ b/lib/lfrfid/tools/varint_pair.h
@@ -15,7 +15,7 @@ typedef struct VarintPair VarintPair;
  * VarintPair is a buffer that holds pair of varint values
  * @return VarintPair* 
  */
-VarintPair* varint_pair_alloc();
+VarintPair* varint_pair_alloc(void);
 
 /**
  * @brief Free a VarintPair instance
diff --git a/lib/music_worker/music_worker.c b/lib/music_worker/music_worker.c
index 279d12673..3225134b7 100644
--- a/lib/music_worker/music_worker.c
+++ b/lib/music_worker/music_worker.c
@@ -97,7 +97,7 @@ static int32_t music_worker_thread_callback(void* context) {
     return 0;
 }
 
-MusicWorker* music_worker_alloc() {
+MusicWorker* music_worker_alloc(void) {
     MusicWorker* instance = malloc(sizeof(MusicWorker));
 
     NoteBlockArray_init(instance->notes);
diff --git a/lib/music_worker/music_worker.h b/lib/music_worker/music_worker.h
index 5a7cb4936..26c5dee0a 100644
--- a/lib/music_worker/music_worker.h
+++ b/lib/music_worker/music_worker.h
@@ -12,7 +12,7 @@ typedef void (*MusicWorkerCallback)(
 
 typedef struct MusicWorker MusicWorker;
 
-MusicWorker* music_worker_alloc();
+MusicWorker* music_worker_alloc(void);
 
 void music_worker_clear(MusicWorker* instance);
 
diff --git a/lib/nfc/SConscript b/lib/nfc/SConscript
index 3ad62f322..ff41a9bc9 100644
--- a/lib/nfc/SConscript
+++ b/lib/nfc/SConscript
@@ -25,6 +25,7 @@ env.Append(
         File("protocols/emv/emv.h"),
         File("protocols/slix/slix.h"),
         File("protocols/st25tb/st25tb.h"),
+        File("protocols/felica/felica.h"),
         # Pollers
         File("protocols/iso14443_3a/iso14443_3a_poller.h"),
         File("protocols/iso14443_3b/iso14443_3b_poller.h"),
@@ -35,6 +36,7 @@ env.Append(
         File("protocols/mf_desfire/mf_desfire_poller.h"),
         File("protocols/emv/emv_poller.h"),
         File("protocols/st25tb/st25tb_poller.h"),
+        File("protocols/felica/felica_poller.h"),
         # Listeners
         File("protocols/iso14443_3a/iso14443_3a_listener.h"),
         File("protocols/iso14443_4a/iso14443_4a_listener.h"),
@@ -50,6 +52,7 @@ env.Append(
         File("helpers/iso14443_crc.h"),
         File("helpers/iso13239_crc.h"),
         File("helpers/nfc_data_generator.h"),
+        File("helpers/crypto1.h"),
     ],
 )
 
diff --git a/lib/nfc/protocols/mf_classic/crypto1.c b/lib/nfc/helpers/crypto1.c
similarity index 99%
rename from lib/nfc/protocols/mf_classic/crypto1.c
rename to lib/nfc/helpers/crypto1.c
index e06eae370..938d2765a 100644
--- a/lib/nfc/protocols/mf_classic/crypto1.c
+++ b/lib/nfc/helpers/crypto1.c
@@ -13,7 +13,7 @@
 
 #define BEBIT(x, n) FURI_BIT(x, (n) ^ 24)
 
-Crypto1* crypto1_alloc() {
+Crypto1* crypto1_alloc(void) {
     Crypto1* instance = malloc(sizeof(Crypto1));
 
     return instance;
diff --git a/lib/nfc/protocols/mf_classic/crypto1.h b/lib/nfc/helpers/crypto1.h
similarity index 96%
rename from lib/nfc/protocols/mf_classic/crypto1.h
rename to lib/nfc/helpers/crypto1.h
index 7cc16fcff..e71ab9a40 100644
--- a/lib/nfc/protocols/mf_classic/crypto1.h
+++ b/lib/nfc/helpers/crypto1.h
@@ -11,7 +11,7 @@ typedef struct {
     uint32_t even;
 } Crypto1;
 
-Crypto1* crypto1_alloc();
+Crypto1* crypto1_alloc(void);
 
 void crypto1_free(Crypto1* instance);
 
diff --git a/lib/nfc/helpers/iso13239_crc.c b/lib/nfc/helpers/iso13239_crc.c
index c54fbcfb2..c1affba46 100644
--- a/lib/nfc/helpers/iso13239_crc.c
+++ b/lib/nfc/helpers/iso13239_crc.c
@@ -33,6 +33,8 @@ static uint16_t
 }
 
 void iso13239_crc_append(Iso13239CrcType type, BitBuffer* buf) {
+    furi_check(buf);
+
     const uint8_t* data = bit_buffer_get_data(buf);
     const size_t data_size = bit_buffer_get_size_bytes(buf);
 
@@ -41,6 +43,8 @@ void iso13239_crc_append(Iso13239CrcType type, BitBuffer* buf) {
 }
 
 bool iso13239_crc_check(Iso13239CrcType type, const BitBuffer* buf) {
+    furi_check(buf);
+
     const size_t data_size = bit_buffer_get_size_bytes(buf);
     if(data_size <= ISO13239_CRC_SIZE) return false;
 
@@ -55,6 +59,8 @@ bool iso13239_crc_check(Iso13239CrcType type, const BitBuffer* buf) {
 }
 
 void iso13239_crc_trim(BitBuffer* buf) {
+    furi_check(buf);
+
     const size_t data_size = bit_buffer_get_size_bytes(buf);
     furi_assert(data_size > ISO13239_CRC_SIZE);
 
diff --git a/lib/nfc/helpers/iso14443_4_layer.c b/lib/nfc/helpers/iso14443_4_layer.c
index b21e22423..87d820d64 100644
--- a/lib/nfc/helpers/iso14443_4_layer.c
+++ b/lib/nfc/helpers/iso14443_4_layer.c
@@ -29,7 +29,7 @@ static inline void iso14443_4_layer_update_pcb(Iso14443_4Layer* instance) {
     instance->pcb ^= (uint8_t)0x01;
 }
 
-Iso14443_4Layer* iso14443_4_layer_alloc() {
+Iso14443_4Layer* iso14443_4_layer_alloc(void) {
     Iso14443_4Layer* instance = malloc(sizeof(Iso14443_4Layer));
 
     iso14443_4_layer_reset(instance);
diff --git a/lib/nfc/helpers/iso14443_4_layer.h b/lib/nfc/helpers/iso14443_4_layer.h
index 14e435c2f..f4f8db520 100644
--- a/lib/nfc/helpers/iso14443_4_layer.h
+++ b/lib/nfc/helpers/iso14443_4_layer.h
@@ -9,7 +9,7 @@ extern "C" {
 
 typedef struct Iso14443_4Layer Iso14443_4Layer;
 
-Iso14443_4Layer* iso14443_4_layer_alloc();
+Iso14443_4Layer* iso14443_4_layer_alloc(void);
 
 void iso14443_4_layer_free(Iso14443_4Layer* instance);
 
diff --git a/lib/nfc/helpers/iso14443_crc.c b/lib/nfc/helpers/iso14443_crc.c
index fda9871aa..33789bd71 100644
--- a/lib/nfc/helpers/iso14443_crc.c
+++ b/lib/nfc/helpers/iso14443_crc.c
@@ -28,6 +28,8 @@ static uint16_t
 }
 
 void iso14443_crc_append(Iso14443CrcType type, BitBuffer* buf) {
+    furi_check(buf);
+
     const uint8_t* data = bit_buffer_get_data(buf);
     const size_t data_size = bit_buffer_get_size_bytes(buf);
 
@@ -36,6 +38,8 @@ void iso14443_crc_append(Iso14443CrcType type, BitBuffer* buf) {
 }
 
 bool iso14443_crc_check(Iso14443CrcType type, const BitBuffer* buf) {
+    furi_check(buf);
+
     const size_t data_size = bit_buffer_get_size_bytes(buf);
     if(data_size <= ISO14443_CRC_SIZE) return false;
 
@@ -50,8 +54,9 @@ bool iso14443_crc_check(Iso14443CrcType type, const BitBuffer* buf) {
 }
 
 void iso14443_crc_trim(BitBuffer* buf) {
+    furi_check(buf);
     const size_t data_size = bit_buffer_get_size_bytes(buf);
-    furi_assert(data_size > ISO14443_CRC_SIZE);
+    furi_check(data_size > ISO14443_CRC_SIZE);
 
     bit_buffer_set_size_bytes(buf, data_size - ISO14443_CRC_SIZE);
 }
diff --git a/lib/nfc/helpers/nfc_data_generator.c b/lib/nfc/helpers/nfc_data_generator.c
index 0ecccc3ac..c10e8fd94 100644
--- a/lib/nfc/helpers/nfc_data_generator.c
+++ b/lib/nfc/helpers/nfc_data_generator.c
@@ -552,9 +552,14 @@ static const NfcDataGenerator nfc_data_generator[NfcDataGeneratorTypeNum] = {
 };
 
 const char* nfc_data_generator_get_name(NfcDataGeneratorType type) {
+    furi_check(type < NfcDataGeneratorTypeNum);
+
     return nfc_data_generator[type].name;
 }
 
 void nfc_data_generator_fill_data(NfcDataGeneratorType type, NfcDevice* nfc_device) {
+    furi_check(type < NfcDataGeneratorTypeNum);
+    furi_check(nfc_device);
+
     nfc_data_generator[type].handler(nfc_device);
 }
diff --git a/lib/nfc/helpers/nfc_util.c b/lib/nfc/helpers/nfc_util.c
index 7bbc9d621..31ade8fc7 100644
--- a/lib/nfc/helpers/nfc_util.c
+++ b/lib/nfc/helpers/nfc_util.c
@@ -25,8 +25,8 @@ uint8_t nfc_util_odd_parity8(uint8_t data) {
 }
 
 void nfc_util_odd_parity(const uint8_t* src, uint8_t* dst, uint8_t len) {
-    furi_assert(src);
-    furi_assert(dst);
+    furi_check(src);
+    furi_check(dst);
 
     uint8_t parity = 0;
     uint8_t bit = 0;
diff --git a/lib/nfc/nfc.c b/lib/nfc/nfc.c
index 22a21c9d2..59d254592 100644
--- a/lib/nfc/nfc.c
+++ b/lib/nfc/nfc.c
@@ -235,7 +235,7 @@ static int32_t nfc_worker_poller(void* context) {
     return 0;
 }
 
-Nfc* nfc_alloc() {
+Nfc* nfc_alloc(void) {
     furi_check(furi_hal_nfc_acquire() == FuriHalNfcErrorNone);
 
     Nfc* instance = malloc(sizeof(Nfc));
@@ -253,8 +253,8 @@ Nfc* nfc_alloc() {
 }
 
 void nfc_free(Nfc* instance) {
-    furi_assert(instance);
-    furi_assert(instance->state == NfcStateIdle);
+    furi_check(instance);
+    furi_check(instance->state == NfcStateIdle);
 
     furi_thread_free(instance->worker_thread);
     free(instance);
@@ -263,10 +263,10 @@ void nfc_free(Nfc* instance) {
 }
 
 void nfc_config(Nfc* instance, NfcMode mode, NfcTech tech) {
-    furi_assert(instance);
-    furi_assert(mode < NfcModeNum);
-    furi_assert(tech < NfcTechNum);
-    furi_assert(instance->config_state == NfcConfigurationStateIdle);
+    furi_check(instance);
+    furi_check(mode < NfcModeNum);
+    furi_check(tech < NfcTechNum);
+    furi_check(instance->config_state == NfcConfigurationStateIdle);
 
     FuriHalNfcTech hal_tech = nfc_tech_table[mode][tech];
     if(hal_tech == FuriHalNfcTechInvalid) {
@@ -282,35 +282,35 @@ void nfc_config(Nfc* instance, NfcMode mode, NfcTech tech) {
 }
 
 void nfc_set_fdt_poll_fc(Nfc* instance, uint32_t fdt_poll_fc) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->fdt_poll_fc = fdt_poll_fc;
 }
 
 void nfc_set_fdt_listen_fc(Nfc* instance, uint32_t fdt_listen_fc) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->fdt_listen_fc = fdt_listen_fc;
 }
 
 void nfc_set_fdt_poll_poll_us(Nfc* instance, uint32_t fdt_poll_poll_us) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->fdt_poll_poll_us = fdt_poll_poll_us;
 }
 
 void nfc_set_guard_time_us(Nfc* instance, uint32_t guard_time_us) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->guard_time_us = guard_time_us;
 }
 
 void nfc_set_mask_receive_time_fc(Nfc* instance, uint32_t mask_rx_time_fc) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->mask_rx_time_fc = mask_rx_time_fc;
 }
 
 void nfc_start(Nfc* instance, NfcEventCallback callback, void* context) {
-    furi_assert(instance);
-    furi_assert(instance->worker_thread);
-    furi_assert(callback);
-    furi_assert(instance->config_state == NfcConfigurationStateDone);
+    furi_check(instance);
+    furi_check(instance->worker_thread);
+    furi_check(callback);
+    furi_check(instance->config_state == NfcConfigurationStateDone);
 
     instance->callback = callback;
     instance->context = context;
@@ -324,8 +324,8 @@ void nfc_start(Nfc* instance, NfcEventCallback callback, void* context) {
 }
 
 void nfc_stop(Nfc* instance) {
-    furi_assert(instance);
-    furi_assert(instance->state == NfcStateRunning);
+    furi_check(instance);
+    furi_check(instance->state == NfcStateRunning);
 
     if(instance->mode == NfcModeListener) {
         furi_hal_nfc_abort();
@@ -336,8 +336,8 @@ void nfc_stop(Nfc* instance) {
 }
 
 NfcError nfc_listener_tx(Nfc* instance, const BitBuffer* tx_buffer) {
-    furi_assert(instance);
-    furi_assert(tx_buffer);
+    furi_check(instance);
+    furi_check(tx_buffer);
 
     NfcError ret = NfcErrorNone;
 
@@ -409,11 +409,11 @@ NfcError nfc_iso14443a_poller_trx_custom_parity(
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer,
     uint32_t fwt) {
-    furi_assert(instance);
-    furi_assert(tx_buffer);
-    furi_assert(rx_buffer);
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
-    furi_assert(instance->poller_state == NfcPollerStateReady);
+    furi_check(instance->poller_state == NfcPollerStateReady);
 
     NfcError ret = NfcErrorNone;
     FuriHalNfcError error = FuriHalNfcErrorNone;
@@ -462,11 +462,11 @@ NfcError nfc_iso14443a_poller_trx_custom_parity(
 
 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_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
-    furi_assert(instance->poller_state == NfcPollerStateReady);
+    furi_check(instance->poller_state == NfcPollerStateReady);
 
     NfcError ret = NfcErrorNone;
     FuriHalNfcError error = FuriHalNfcErrorNone;
@@ -511,7 +511,7 @@ NfcError nfc_iso14443a_listener_set_col_res_data(
     uint8_t uid_len,
     uint8_t* atqa,
     uint8_t sak) {
-    furi_assert(instance);
+    furi_check(instance);
 
     FuriHalNfcError error =
         furi_hal_nfc_iso14443a_listener_set_col_res_data(uid, uid_len, atqa, sak);
@@ -524,14 +524,14 @@ NfcError nfc_iso14443a_poller_trx_short_frame(
     NfcIso14443aShortFrame frame,
     BitBuffer* rx_buffer,
     uint32_t fwt) {
-    furi_assert(instance);
-    furi_assert(rx_buffer);
+    furi_check(instance);
+    furi_check(rx_buffer);
 
     FuriHalNfcaShortFrame short_frame = (frame == NfcIso14443aShortFrameAllReqa) ?
                                             FuriHalNfcaShortFrameAllReq :
                                             FuriHalNfcaShortFrameSensReq;
 
-    furi_assert(instance->poller_state == NfcPollerStateReady);
+    furi_check(instance->poller_state == NfcPollerStateReady);
 
     NfcError ret = NfcErrorNone;
     FuriHalNfcError error = FuriHalNfcErrorNone;
@@ -574,11 +574,11 @@ NfcError nfc_iso14443a_poller_trx_sdd_frame(
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer,
     uint32_t fwt) {
-    furi_assert(instance);
-    furi_assert(tx_buffer);
-    furi_assert(rx_buffer);
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
-    furi_assert(instance->poller_state == NfcPollerStateReady);
+    furi_check(instance->poller_state == NfcPollerStateReady);
 
     NfcError ret = NfcErrorNone;
     FuriHalNfcError error = FuriHalNfcErrorNone;
@@ -618,8 +618,8 @@ NfcError nfc_iso14443a_poller_trx_sdd_frame(
 }
 
 NfcError nfc_iso14443a_listener_tx_custom_parity(Nfc* instance, const BitBuffer* tx_buffer) {
-    furi_assert(instance);
-    furi_assert(tx_buffer);
+    furi_check(instance);
+    furi_check(tx_buffer);
 
     NfcError ret = NfcErrorNone;
     FuriHalNfcError error = FuriHalNfcErrorNone;
@@ -635,7 +635,7 @@ NfcError nfc_iso14443a_listener_tx_custom_parity(Nfc* instance, const BitBuffer*
 }
 
 NfcError nfc_iso15693_listener_tx_sof(Nfc* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     while(furi_hal_nfc_timer_block_tx_is_running()) {
     }
@@ -652,9 +652,7 @@ NfcError nfc_felica_listener_set_sensf_res_data(
     const uint8_t idm_len,
     const uint8_t* pmm,
     const uint8_t pmm_len) {
-    furi_assert(instance);
-    furi_assert(idm);
-    furi_assert(pmm);
+    furi_check(instance);
 
     FuriHalNfcError error =
         furi_hal_nfc_felica_listener_set_sensf_res_data(idm, idm_len, pmm, pmm_len);
diff --git a/lib/nfc/nfc.h b/lib/nfc/nfc.h
index 4f7980b02..959bd018f 100644
--- a/lib/nfc/nfc.h
+++ b/lib/nfc/nfc.h
@@ -128,7 +128,7 @@ typedef enum {
  *
  * @returns pointer to the allocated Nfc instance.
  */
-Nfc* nfc_alloc();
+Nfc* nfc_alloc(void);
 
 /**
  * @brief Delete an Nfc instance.
@@ -170,7 +170,7 @@ void nfc_set_fdt_listen_fc(Nfc* instance, uint32_t fdt_listen_fc);
  * @brief Set mask receive time.
  *
  * @param[in,out] instance pointer to the instance to be modified.
- * @param[in] mask_rx_time mask receive time, in carrier cycles.
+ * @param[in] mask_rx_time_fc mask receive time, in carrier cycles.
  */
 void nfc_set_mask_receive_time_fc(Nfc* instance, uint32_t mask_rx_time_fc);
 
diff --git a/lib/nfc/nfc_device.c b/lib/nfc/nfc_device.c
index 267824d16..9f95dfc15 100644
--- a/lib/nfc/nfc_device.c
+++ b/lib/nfc/nfc_device.c
@@ -14,7 +14,7 @@
 
 #define NFC_DEVICE_UID_MAX_LEN (10U)
 
-NfcDevice* nfc_device_alloc() {
+NfcDevice* nfc_device_alloc(void) {
     NfcDevice* instance = malloc(sizeof(NfcDevice));
     instance->protocol = NfcProtocolInvalid;
 
@@ -22,14 +22,14 @@ NfcDevice* nfc_device_alloc() {
 }
 
 void nfc_device_free(NfcDevice* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     nfc_device_clear(instance);
     free(instance);
 }
 
 void nfc_device_clear(NfcDevice* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     if(instance->protocol == NfcProtocolInvalid) {
         furi_assert(instance->protocol_data == NULL);
@@ -43,8 +43,8 @@ void nfc_device_clear(NfcDevice* instance) {
 }
 
 void nfc_device_reset(NfcDevice* instance) {
-    furi_assert(instance);
-    furi_assert(instance->protocol < NfcProtocolNum);
+    furi_check(instance);
+    furi_check(instance->protocol < NfcProtocolNum);
 
     if(instance->protocol_data) {
         nfc_devices[instance->protocol]->reset(instance->protocol_data);
@@ -52,37 +52,40 @@ void nfc_device_reset(NfcDevice* instance) {
 }
 
 NfcProtocol nfc_device_get_protocol(const NfcDevice* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     return instance->protocol;
 }
 
 const NfcDeviceData* nfc_device_get_data(const NfcDevice* instance, NfcProtocol protocol) {
+    furi_check(instance);
     return nfc_device_get_data_ptr(instance, protocol);
 }
 
 const char* nfc_device_get_protocol_name(NfcProtocol protocol) {
-    furi_assert(protocol < NfcProtocolNum);
+    furi_check(protocol < NfcProtocolNum);
 
     return nfc_devices[protocol]->protocol_name;
 }
 
 const char* nfc_device_get_name(const NfcDevice* instance, NfcDeviceNameType name_type) {
-    furi_assert(instance);
-    furi_assert(instance->protocol < NfcProtocolNum);
+    furi_check(instance);
+    furi_check(instance->protocol < NfcProtocolNum);
 
     return nfc_devices[instance->protocol]->get_name(instance->protocol_data, name_type);
 }
 
 const uint8_t* nfc_device_get_uid(const NfcDevice* instance, size_t* uid_len) {
-    furi_assert(instance);
-    furi_assert(instance->protocol < NfcProtocolNum);
+    furi_check(instance);
+    furi_check(uid_len);
+    furi_check(instance->protocol < NfcProtocolNum);
 
     return nfc_devices[instance->protocol]->get_uid(instance->protocol_data, uid_len);
 }
 
 bool nfc_device_set_uid(NfcDevice* instance, const uint8_t* uid, size_t uid_len) {
-    furi_assert(instance);
-    furi_assert(instance->protocol < NfcProtocolNum);
+    furi_check(instance);
+    furi_check(uid);
+    furi_check(instance->protocol < NfcProtocolNum);
 
     return nfc_devices[instance->protocol]->set_uid(instance->protocol_data, uid, uid_len);
 }
@@ -91,8 +94,9 @@ void nfc_device_set_data(
     NfcDevice* instance,
     NfcProtocol protocol,
     const NfcDeviceData* protocol_data) {
-    furi_assert(instance);
-    furi_assert(protocol < NfcProtocolNum);
+    furi_check(instance);
+    furi_check(protocol_data);
+    furi_check(protocol < NfcProtocolNum);
 
     nfc_device_clear(instance);
 
@@ -106,9 +110,9 @@ void nfc_device_copy_data(
     const NfcDevice* instance,
     NfcProtocol protocol,
     NfcDeviceData* protocol_data) {
-    furi_assert(instance);
-    furi_assert(protocol < NfcProtocolNum);
-    furi_assert(protocol_data);
+    furi_check(instance);
+    furi_check(protocol < NfcProtocolNum);
+    furi_check(protocol_data);
 
     if(instance->protocol != protocol) {
         furi_crash(NFC_DEV_TYPE_ERROR);
@@ -121,17 +125,17 @@ bool nfc_device_is_equal_data(
     const NfcDevice* instance,
     NfcProtocol protocol,
     const NfcDeviceData* protocol_data) {
-    furi_assert(instance);
-    furi_assert(protocol < NfcProtocolNum);
-    furi_assert(protocol_data);
+    furi_check(instance);
+    furi_check(protocol < NfcProtocolNum);
+    furi_check(protocol_data);
 
     return instance->protocol == protocol &&
            nfc_devices[protocol]->is_equal(instance->protocol_data, protocol_data);
 }
 
 bool nfc_device_is_equal(const NfcDevice* instance, const NfcDevice* other) {
-    furi_assert(instance);
-    furi_assert(other);
+    furi_check(instance);
+    furi_check(other);
 
     return nfc_device_is_equal_data(instance, other->protocol, other->protocol_data);
 }
@@ -140,17 +144,17 @@ void nfc_device_set_loading_callback(
     NfcDevice* instance,
     NfcLoadingCallback callback,
     void* context) {
-    furi_assert(instance);
-    furi_assert(callback);
+    furi_check(instance);
+    furi_check(callback);
 
     instance->loading_callback = callback;
     instance->loading_callback_context = context;
 }
 
 bool nfc_device_save(NfcDevice* instance, const char* path) {
-    furi_assert(instance);
-    furi_assert(instance->protocol < NfcProtocolNum);
-    furi_assert(path);
+    furi_check(instance);
+    furi_check(instance->protocol < NfcProtocolNum);
+    furi_check(path);
 
     bool saved = false;
     Storage* storage = furi_record_open(RECORD_STORAGE);
@@ -313,8 +317,8 @@ static bool nfc_device_load_legacy(NfcDevice* instance, FlipperFormat* ff, uint3
 }
 
 bool nfc_device_load(NfcDevice* instance, const char* path) {
-    furi_assert(instance);
-    furi_assert(path);
+    furi_check(instance);
+    furi_check(path);
 
     bool loaded = false;
     Storage* storage = furi_record_open(RECORD_STORAGE);
diff --git a/lib/nfc/nfc_device.h b/lib/nfc/nfc_device.h
index 6636e7c76..055acec0a 100644
--- a/lib/nfc/nfc_device.h
+++ b/lib/nfc/nfc_device.h
@@ -47,7 +47,7 @@ typedef void (*NfcLoadingCallback)(void* context, bool state);
  *
  * @returns pointer to the allocated instance.
  */
-NfcDevice* nfc_device_alloc();
+NfcDevice* nfc_device_alloc(void);
 
 /**
  * @brief Delete an NfcDevice instance.
diff --git a/lib/nfc/nfc_listener.c b/lib/nfc/nfc_listener.c
index 57b00a875..4f711d62d 100644
--- a/lib/nfc/nfc_listener.c
+++ b/lib/nfc/nfc_listener.c
@@ -73,10 +73,10 @@ static void nfc_listener_list_free(NfcListener* instance) {
 }
 
 NfcListener* nfc_listener_alloc(Nfc* nfc, NfcProtocol protocol, const NfcDeviceData* data) {
-    furi_assert(nfc);
-    furi_assert(protocol < NfcProtocolNum);
-    furi_assert(data);
-    furi_assert(nfc_listeners_api[protocol]);
+    furi_check(nfc);
+    furi_check(protocol < NfcProtocolNum);
+    furi_check(data);
+    furi_check(nfc_listeners_api[protocol]);
 
     NfcListener* instance = malloc(sizeof(NfcListener));
     instance->nfc = nfc;
@@ -89,7 +89,7 @@ NfcListener* nfc_listener_alloc(Nfc* nfc, NfcProtocol protocol, const NfcDeviceD
 }
 
 void nfc_listener_free(NfcListener* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     nfc_listener_list_free(instance);
     nfc_device_free(instance->nfc_dev);
@@ -116,7 +116,7 @@ NfcCommand nfc_listener_start_callback(NfcEvent event, void* context) {
 }
 
 void nfc_listener_start(NfcListener* instance, NfcGenericCallback callback, void* context) {
-    furi_assert(instance);
+    furi_check(instance);
 
     NfcListenerListElement* tail_element = instance->list.tail;
     tail_element->listener_api->set_callback(tail_element->listener, callback, context);
@@ -124,20 +124,20 @@ void nfc_listener_start(NfcListener* instance, NfcGenericCallback callback, void
 }
 
 void nfc_listener_stop(NfcListener* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     nfc_stop(instance->nfc);
 }
 
 NfcProtocol nfc_listener_get_protocol(const NfcListener* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     return instance->protocol;
 }
 
 const NfcDeviceData* nfc_listener_get_data(const NfcListener* instance, NfcProtocol protocol) {
-    furi_assert(instance);
-    furi_assert(instance->protocol == protocol);
+    furi_check(instance);
+    furi_check(instance->protocol == protocol);
 
     NfcListenerListElement* tail_element = instance->list.tail;
     return tail_element->listener_api->get_data(tail_element->listener);
diff --git a/lib/nfc/nfc_poller.c b/lib/nfc/nfc_poller.c
index 48be37d92..114ff3695 100644
--- a/lib/nfc/nfc_poller.c
+++ b/lib/nfc/nfc_poller.c
@@ -75,8 +75,8 @@ static void nfc_poller_list_free(NfcPoller* instance) {
 }
 
 NfcPoller* nfc_poller_alloc(Nfc* nfc, NfcProtocol protocol) {
-    furi_assert(nfc);
-    furi_assert(protocol < NfcProtocolNum);
+    furi_check(nfc);
+    furi_check(protocol < NfcProtocolNum);
 
     NfcPoller* instance = malloc(sizeof(NfcPoller));
     instance->session_state = NfcPollerSessionStateIdle;
@@ -88,7 +88,7 @@ NfcPoller* nfc_poller_alloc(Nfc* nfc, NfcProtocol protocol) {
 }
 
 void nfc_poller_free(NfcPoller* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     nfc_poller_list_free(instance);
     free(instance);
@@ -119,9 +119,9 @@ static NfcCommand nfc_poller_start_callback(NfcEvent event, void* context) {
 }
 
 void nfc_poller_start(NfcPoller* instance, NfcGenericCallback callback, void* context) {
-    furi_assert(instance);
-    furi_assert(callback);
-    furi_assert(instance->session_state == NfcPollerSessionStateIdle);
+    furi_check(instance);
+    furi_check(callback);
+    furi_check(instance->session_state == NfcPollerSessionStateIdle);
 
     NfcPollerListElement* tail_poller = instance->list.tail;
     tail_poller->poller_api->set_callback(tail_poller->poller, callback, context);
@@ -180,9 +180,9 @@ static NfcCommand nfc_poller_start_ex_head_callback(NfcEvent event, void* contex
 }
 
 void nfc_poller_start_ex(NfcPoller* instance, NfcGenericCallbackEx callback, void* context) {
-    furi_assert(instance);
-    furi_assert(callback);
-    furi_assert(instance->session_state == NfcPollerSessionStateIdle);
+    furi_check(instance);
+    furi_check(callback);
+    furi_check(instance->session_state == NfcPollerSessionStateIdle);
 
     instance->callback = callback;
     instance->context = context;
@@ -200,8 +200,8 @@ void nfc_poller_start_ex(NfcPoller* instance, NfcGenericCallbackEx callback, voi
 }
 
 void nfc_poller_stop(NfcPoller* instance) {
-    furi_assert(instance);
-    furi_assert(instance->nfc);
+    furi_check(instance);
+    furi_check(instance->nfc);
 
     instance->session_state = NfcPollerSessionStateStopRequest;
     nfc_stop(instance->nfc);
@@ -246,8 +246,8 @@ static NfcCommand nfc_poller_detect_head_callback(NfcEvent event, void* context)
 }
 
 bool nfc_poller_detect(NfcPoller* instance) {
-    furi_assert(instance);
-    furi_assert(instance->session_state == NfcPollerSessionStateIdle);
+    furi_check(instance);
+    furi_check(instance->session_state == NfcPollerSessionStateIdle);
 
     instance->session_state = NfcPollerSessionStateActive;
     NfcPollerListElement* tail_poller = instance->list.tail;
@@ -270,13 +270,13 @@ bool nfc_poller_detect(NfcPoller* instance) {
 }
 
 NfcProtocol nfc_poller_get_protocol(const NfcPoller* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     return instance->protocol;
 }
 
 const NfcDeviceData* nfc_poller_get_data(const NfcPoller* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     NfcPollerListElement* tail_poller = instance->list.tail;
     return tail_poller->poller_api->get_data(tail_poller->poller);
diff --git a/lib/nfc/nfc_scanner.c b/lib/nfc/nfc_scanner.c
index 0056dfb1c..23922a829 100644
--- a/lib/nfc/nfc_scanner.c
+++ b/lib/nfc/nfc_scanner.c
@@ -218,7 +218,7 @@ static int32_t nfc_scanner_worker(void* context) {
 }
 
 NfcScanner* nfc_scanner_alloc(Nfc* nfc) {
-    furi_assert(nfc);
+    furi_check(nfc);
 
     NfcScanner* instance = malloc(sizeof(NfcScanner));
     instance->nfc = nfc;
@@ -227,16 +227,17 @@ NfcScanner* nfc_scanner_alloc(Nfc* nfc) {
 }
 
 void nfc_scanner_free(NfcScanner* instance) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(instance->state == NfcScannerStateIdle);
 
     free(instance);
 }
 
 void nfc_scanner_start(NfcScanner* instance, NfcScannerCallback callback, void* context) {
-    furi_assert(instance);
-    furi_assert(callback);
-    furi_assert(instance->session_state == NfcScannerSessionStateIdle);
-    furi_assert(instance->scan_worker == NULL);
+    furi_check(instance);
+    furi_check(callback);
+    furi_check(instance->state == NfcScannerStateIdle);
+    furi_check(instance->scan_worker == NULL);
 
     instance->callback = callback;
     instance->context = context;
@@ -252,8 +253,8 @@ void nfc_scanner_start(NfcScanner* instance, NfcScannerCallback callback, void*
 }
 
 void nfc_scanner_stop(NfcScanner* instance) {
-    furi_assert(instance);
-    furi_assert(instance->scan_worker);
+    furi_check(instance);
+    furi_check(instance->scan_worker);
 
     instance->session_state = NfcScannerSessionStateStopRequest;
     furi_thread_join(instance->scan_worker);
diff --git a/lib/nfc/nfc_scanner.h b/lib/nfc/nfc_scanner.h
index a1b4aabcd..c13a58b74 100644
--- a/lib/nfc/nfc_scanner.h
+++ b/lib/nfc/nfc_scanner.h
@@ -72,14 +72,14 @@ NfcScanner* nfc_scanner_alloc(Nfc* nfc);
 /**
  * @brief Delete an NfcScanner instance.
  *
- * @param[in,out] pointer to the instance to be deleted.
+ * @param[in,out] instance pointer to the instance to be deleted.
  */
 void nfc_scanner_free(NfcScanner* instance);
 
 /**
  * @brief Start an NfcScanner.
  *
- * @param[in,out] pointer to the instance to be started.
+ * @param[in,out] instance pointer to the instance to be started.
  * @param[in] callback pointer to the callback function (will be called upon a detection event).
  * @param[in] context pointer to the caller-specific context (will be passed to the callback).
  */
@@ -88,7 +88,7 @@ void nfc_scanner_start(NfcScanner* instance, NfcScannerCallback callback, void*
 /**
  * @brief Stop an NfcScanner.
  *
- * @param[in,out] pointer to the instance to be stopped.
+ * @param[in,out] instance pointer to the instance to be stopped.
  */
 void nfc_scanner_stop(NfcScanner* instance);
 
diff --git a/lib/nfc/protocols/emv/emv.c b/lib/nfc/protocols/emv/emv.c
index af208ea10..cfdad3c6e 100644
--- a/lib/nfc/protocols/emv/emv.c
+++ b/lib/nfc/protocols/emv/emv.c
@@ -25,7 +25,7 @@ const NfcDeviceBase nfc_device_emv = {
     .get_base_data = (NfcDeviceGetBaseData)emv_get_base_data,
 };
 
-EmvData* emv_alloc() {
+EmvData* emv_alloc(void) {
     EmvData* data = malloc(sizeof(EmvData));
     data->iso14443_4a_data = iso14443_4a_alloc();
     data->emv_application.pin_try_counter = 0xff;
diff --git a/lib/nfc/protocols/emv/emv.h b/lib/nfc/protocols/emv/emv.h
index e09eacaa4..638e93ddc 100644
--- a/lib/nfc/protocols/emv/emv.h
+++ b/lib/nfc/protocols/emv/emv.h
@@ -119,7 +119,7 @@ extern const NfcDeviceBase nfc_device_emv;
 
 // Virtual methods
 
-EmvData* emv_alloc();
+EmvData* emv_alloc(void);
 
 void emv_free(EmvData* data);
 
diff --git a/lib/nfc/protocols/felica/felica.c b/lib/nfc/protocols/felica/felica.c
index 4b7c91fb6..bc47e0642 100644
--- a/lib/nfc/protocols/felica/felica.c
+++ b/lib/nfc/protocols/felica/felica.c
@@ -13,6 +13,14 @@
 
 static const uint32_t felica_data_format_version = 1;
 
+/** @brief This is used in felica_prepare_first_block to define which 
+ * type of block needs to be prepared.
+*/
+typedef enum {
+    FelicaMACTypeRead,
+    FelicaMACTypeWrite,
+} FelicaMACType;
+
 const NfcDeviceBase nfc_device_felica = {
     .protocol_name = FELICA_PROTOCOL_NAME,
     .alloc = (NfcDeviceAlloc)felica_alloc,
@@ -29,24 +37,24 @@ const NfcDeviceBase nfc_device_felica = {
     .get_base_data = (NfcDeviceGetBaseData)felica_get_base_data,
 };
 
-FelicaData* felica_alloc() {
+FelicaData* felica_alloc(void) {
     FelicaData* data = malloc(sizeof(FelicaData));
     return data;
 }
 
 void felica_free(FelicaData* data) {
-    furi_assert(data);
-
+    furi_check(data);
     free(data);
 }
 
 void felica_reset(FelicaData* data) {
+    furi_check(data);
     memset(data, 0, sizeof(FelicaData));
 }
 
 void felica_copy(FelicaData* data, const FelicaData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     *data = *other;
 }
@@ -59,7 +67,7 @@ bool felica_verify(FelicaData* data, const FuriString* device_type) {
 }
 
 bool felica_load(FelicaData* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
 
     bool parsed = false;
 
@@ -77,13 +85,32 @@ bool felica_load(FelicaData* data, FlipperFormat* ff, uint32_t version) {
             break;
 
         parsed = true;
+        uint32_t blocks_total = 0;
+        uint32_t blocks_read = 0;
+        if(!flipper_format_read_uint32(ff, "Blocks total", &blocks_total, 1)) break;
+        if(!flipper_format_read_uint32(ff, "Blocks read", &blocks_read, 1)) break;
+        data->blocks_total = (uint8_t)blocks_total;
+        data->blocks_read = (uint8_t)blocks_read;
+
+        FuriString* temp_str = furi_string_alloc();
+        for(uint8_t i = 0; i < data->blocks_total; i++) {
+            furi_string_printf(temp_str, "Block %d", i);
+            if(!flipper_format_read_hex(
+                   ff,
+                   furi_string_get_cstr(temp_str),
+                   (&data->data.dump[i * sizeof(FelicaBlock)]),
+                   sizeof(FelicaBlock))) {
+                parsed = false;
+                break;
+            }
+        }
     } while(false);
 
     return parsed;
 }
 
 bool felica_save(const FelicaData* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
 
     bool saved = false;
 
@@ -98,15 +125,33 @@ bool felica_save(const FelicaData* data, FlipperFormat* ff) {
                ff, FELICA_MANUFACTURE_PARAMETER, data->pmm.data, FELICA_PMM_SIZE))
             break;
 
+        uint32_t blocks_total = data->blocks_total;
+        uint32_t blocks_read = data->blocks_read;
+        if(!flipper_format_write_uint32(ff, "Blocks total", &blocks_total, 1)) break;
+        if(!flipper_format_write_uint32(ff, "Blocks read", &blocks_read, 1)) break;
+
         saved = true;
+        FuriString* temp_str = furi_string_alloc();
+        for(uint8_t i = 0; i < blocks_total; i++) {
+            furi_string_printf(temp_str, "Block %d", i);
+            if(!flipper_format_write_hex(
+                   ff,
+                   furi_string_get_cstr(temp_str),
+                   (&data->data.dump[i * sizeof(FelicaBlock)]),
+                   sizeof(FelicaBlock))) {
+                saved = false;
+                break;
+            }
+        }
+        furi_string_free(temp_str);
     } while(false);
 
     return saved;
 }
 
 bool felica_is_equal(const FelicaData* data, const FelicaData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     return memcmp(data, other, sizeof(FelicaData)) == 0;
 }
@@ -119,7 +164,7 @@ const char* felica_get_device_name(const FelicaData* data, NfcDeviceNameType nam
 }
 
 const uint8_t* felica_get_uid(const FelicaData* data, size_t* uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     // Consider Manufacturer ID as UID
     if(uid_len) {
@@ -130,7 +175,7 @@ const uint8_t* felica_get_uid(const FelicaData* data, size_t* uid_len) {
 }
 
 bool felica_set_uid(FelicaData* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     // Consider Manufacturer ID as UID
     const bool uid_valid = uid_len == FELICA_IDM_SIZE;
@@ -145,3 +190,149 @@ FelicaData* felica_get_base_data(const FelicaData* data) {
     UNUSED(data);
     furi_crash("No base data");
 }
+
+static void felica_reverse_copy_block(const uint8_t* array, uint8_t* reverse_array) {
+    furi_assert(array);
+    furi_assert(reverse_array);
+
+    for(int i = 0; i < 8; i++) {
+        reverse_array[i] = array[7 - i];
+    }
+}
+
+void felica_calculate_session_key(
+    mbedtls_des3_context* ctx,
+    const uint8_t* ck,
+    const uint8_t* rc,
+    uint8_t* out) {
+    furi_check(ctx);
+    furi_check(ck);
+    furi_check(rc);
+    furi_check(out);
+
+    uint8_t iv[8];
+    memset(iv, 0, 8);
+
+    uint8_t ck_reversed[16];
+    felica_reverse_copy_block(ck, ck_reversed);
+    felica_reverse_copy_block(ck + 8, ck_reversed + 8);
+
+    uint8_t rc_reversed[16];
+    felica_reverse_copy_block(rc, rc_reversed);
+    felica_reverse_copy_block(rc + 8, rc_reversed + 8);
+
+    mbedtls_des3_set2key_enc(ctx, ck_reversed);
+    mbedtls_des3_crypt_cbc(ctx, MBEDTLS_DES_ENCRYPT, FELICA_DATA_BLOCK_SIZE, iv, rc_reversed, out);
+}
+
+static bool felica_calculate_mac(
+    mbedtls_des3_context* ctx,
+    const uint8_t* session_key,
+    const uint8_t* rc,
+    const uint8_t* first_block,
+    const uint8_t* data,
+    const size_t length,
+    uint8_t* mac) {
+    furi_check((length % 8) == 0);
+
+    uint8_t reverse_data[8];
+    uint8_t iv[8];
+    uint8_t out[8];
+    mbedtls_des3_set2key_enc(ctx, session_key);
+
+    felica_reverse_copy_block(rc, iv);
+    felica_reverse_copy_block(first_block, reverse_data);
+    uint8_t i = 0;
+    bool error = false;
+    do {
+        if(mbedtls_des3_crypt_cbc(ctx, MBEDTLS_DES_ENCRYPT, 8, iv, reverse_data, out) == 0) {
+            memcpy(iv, out, sizeof(iv));
+            felica_reverse_copy_block(data + i, reverse_data);
+            i += 8;
+        } else {
+            error = true;
+            break;
+        }
+    } while(i <= length);
+
+    if(!error) {
+        felica_reverse_copy_block(out, mac);
+    }
+    return !error;
+}
+
+static void felica_prepare_first_block(
+    FelicaMACType operation_type,
+    const uint8_t* blocks,
+    const uint8_t block_count,
+    uint8_t* out) {
+    furi_check(blocks);
+    furi_check(out);
+    if(operation_type == FelicaMACTypeRead) {
+        memset(out, 0xFF, 8);
+        for(uint8_t i = 0, j = 0; i < block_count; i++, j += 2) {
+            out[j] = blocks[i];
+            out[j + 1] = 0;
+        }
+    } else {
+        furi_check(block_count == 4);
+        memset(out, 0, 8);
+        out[0] = blocks[0];
+        out[1] = blocks[1];
+        out[2] = blocks[2];
+        out[4] = blocks[3];
+        out[6] = FELICA_BLOCK_INDEX_MAC_A;
+    }
+}
+
+bool felica_check_mac(
+    mbedtls_des3_context* ctx,
+    const uint8_t* session_key,
+    const uint8_t* rc,
+    const uint8_t* blocks,
+    const uint8_t block_count,
+    uint8_t* data) {
+    furi_check(ctx);
+    furi_check(session_key);
+    furi_check(rc);
+    furi_check(blocks);
+    furi_check(data);
+
+    uint8_t first_block[8];
+    uint8_t mac[8];
+    felica_prepare_first_block(FelicaMACTypeRead, blocks, block_count, first_block);
+
+    uint8_t data_size_without_mac = FELICA_DATA_BLOCK_SIZE * (block_count - 1);
+    felica_calculate_mac(ctx, session_key, rc, first_block, data, data_size_without_mac, mac);
+
+    uint8_t* mac_ptr = data + data_size_without_mac;
+    return !memcmp(mac, mac_ptr, 8);
+}
+
+void felica_calculate_mac_write(
+    mbedtls_des3_context* ctx,
+    const uint8_t* session_key,
+    const uint8_t* rc,
+    const uint8_t* wcnt,
+    const uint8_t* data,
+    uint8_t* mac) {
+    furi_check(ctx);
+    furi_check(session_key);
+    furi_check(rc);
+    furi_check(wcnt);
+    furi_check(data);
+    furi_check(mac);
+
+    const uint8_t WCNT_length = 3;
+    uint8_t block_data[WCNT_length + 1];
+    uint8_t first_block[8];
+
+    memcpy(block_data, wcnt, WCNT_length);
+    block_data[3] = FELICA_BLOCK_INDEX_STATE;
+    felica_prepare_first_block(FelicaMACTypeWrite, block_data, WCNT_length + 1, first_block);
+
+    uint8_t session_swapped[FELICA_DATA_BLOCK_SIZE];
+    memcpy(session_swapped, session_key + 8, 8);
+    memcpy(session_swapped + 8, session_key, 8);
+    felica_calculate_mac(ctx, session_swapped, rc, first_block, data, FELICA_DATA_BLOCK_SIZE, mac);
+}
\ No newline at end of file
diff --git a/lib/nfc/protocols/felica/felica.h b/lib/nfc/protocols/felica/felica.h
index 31e040b8a..d032943d3 100644
--- a/lib/nfc/protocols/felica/felica.h
+++ b/lib/nfc/protocols/felica/felica.h
@@ -2,6 +2,7 @@
 
 #include <toolbox/bit_buffer.h>
 #include <nfc/protocols/nfc_device_base_i.h>
+#include <mbedtls/include/mbedtls/des.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -9,6 +10,23 @@ extern "C" {
 
 #define FELICA_IDM_SIZE (8U)
 #define FELICA_PMM_SIZE (8U)
+#define FELICA_DATA_BLOCK_SIZE (16U)
+
+#define FELICA_BLOCKS_TOTAL_COUNT (27U)
+#define FELICA_BLOCK_INDEX_REG (0x0EU)
+#define FELICA_BLOCK_INDEX_RC (0x80U)
+#define FELICA_BLOCK_INDEX_MAC (0x81U)
+#define FELICA_BLOCK_INDEX_ID (0x82U)
+#define FELICA_BLOCK_INDEX_D_ID (0x83U)
+#define FELICA_BLOCK_INDEX_SER_C (0x84U)
+#define FELICA_BLOCK_INDEX_SYS_C (0x85U)
+#define FELICA_BLOCK_INDEX_CKV (0x86U)
+#define FELICA_BLOCK_INDEX_CK (0x87U)
+#define FELICA_BLOCK_INDEX_MC (0x88U)
+#define FELICA_BLOCK_INDEX_WCNT (0x90U)
+#define FELICA_BLOCK_INDEX_MAC_A (0x91U)
+#define FELICA_BLOCK_INDEX_STATE (0x92U)
+#define FELICA_BLOCK_INDEX_CRC_CHECK (0xA0U)
 
 #define FELICA_GUARD_TIME_US (20000U)
 #define FELICA_FDT_POLL_FC (10000U)
@@ -23,6 +41,7 @@ extern "C" {
 #define FELICA_TIME_SLOT_8 (0x07U)
 #define FELICA_TIME_SLOT_16 (0x0FU)
 
+/** @brief Type of possible Felica errors */
 typedef enum {
     FelicaErrorNone,
     FelicaErrorNotPresent,
@@ -35,22 +54,83 @@ typedef enum {
     FelicaErrorTimeout,
 } FelicaError;
 
+/** @brief Separate type for card key block. Used in authentication process */
+typedef struct {
+    uint8_t data[FELICA_DATA_BLOCK_SIZE];
+} FelicaCardKey;
+
+/** @brief In Felica there two types of auth. Internal is the first one, after
+  * which external became possible. Here are two flags representing which one
+  * was passed */
+typedef struct {
+    bool internal : 1;
+    bool external : 1;
+} FelicaAuthenticationStatus;
+
+/** @brief Struct which controls the process of authentication and can be passed as
+  * a parameter to the application level. In order to force user to fill card key block data. */
+typedef struct {
+    bool skip_auth; /**< By default it is true, so auth is skipped. By setting this to false several auth steps will be performed in order to pass auth*/
+    FelicaCardKey
+        card_key; /**< User must fill this field with known card key in order to pass auth*/
+    FelicaAuthenticationStatus auth_status; /**< Authentication status*/
+} FelicaAuthenticationContext;
+
+/** @brief Felica ID block */
 typedef struct {
     uint8_t data[FELICA_IDM_SIZE];
 } FelicaIDm;
 
+/** @brief Felica PMm block */
 typedef struct {
     uint8_t data[FELICA_PMM_SIZE];
 } FelicaPMm;
 
+/** @brief Felica block with status flags indicating last operation with it.
+  * See Felica manual for more details on status codes. */
+typedef struct {
+    uint8_t SF1; /**< Status flag 1, equals to 0 when success*/
+    uint8_t SF2; /**< Status flag 2, equals to 0 when success*/
+    uint8_t data[FELICA_DATA_BLOCK_SIZE]; /**< Block data */
+} FelicaBlock;
+
+/** @brief Felica filesystem structure */
+typedef struct {
+    FelicaBlock spad[14];
+    FelicaBlock reg;
+    FelicaBlock rc;
+    FelicaBlock mac;
+    FelicaBlock id;
+    FelicaBlock d_id;
+    FelicaBlock ser_c;
+    FelicaBlock sys_c;
+    FelicaBlock ckv;
+    FelicaBlock ck;
+    FelicaBlock mc;
+    FelicaBlock wcnt;
+    FelicaBlock mac_a;
+    FelicaBlock state;
+    FelicaBlock crc_check;
+} FelicaFileSystem;
+
+/** @brief Union which represents filesystem in junction with plain data dump */
+typedef union {
+    FelicaFileSystem fs;
+    uint8_t dump[sizeof(FelicaFileSystem)];
+} FelicaFSUnion;
+
+/** @brief Structure used to store Felica data and additional values about reading */
 typedef struct {
     FelicaIDm idm;
     FelicaPMm pmm;
+    uint8_t blocks_total;
+    uint8_t blocks_read;
+    FelicaFSUnion data;
 } FelicaData;
 
 extern const NfcDeviceBase nfc_device_felica;
 
-FelicaData* felica_alloc();
+FelicaData* felica_alloc(void);
 
 void felica_free(FelicaData* data);
 
@@ -74,6 +154,27 @@ bool felica_set_uid(FelicaData* data, const uint8_t* uid, size_t uid_len);
 
 FelicaData* felica_get_base_data(const FelicaData* data);
 
+void felica_calculate_session_key(
+    mbedtls_des3_context* ctx,
+    const uint8_t* ck,
+    const uint8_t* rc,
+    uint8_t* out);
+
+bool felica_check_mac(
+    mbedtls_des3_context* ctx,
+    const uint8_t* session_key,
+    const uint8_t* rc,
+    const uint8_t* blocks,
+    const uint8_t block_count,
+    uint8_t* data);
+
+void felica_calculate_mac_write(
+    mbedtls_des3_context* ctx,
+    const uint8_t* session_key,
+    const uint8_t* rc,
+    const uint8_t* wcnt,
+    const uint8_t* data,
+    uint8_t* mac);
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/felica/felica_poller.c b/lib/nfc/protocols/felica/felica_poller.c
index 23b1604e1..720daf238 100644
--- a/lib/nfc/protocols/felica/felica_poller.c
+++ b/lib/nfc/protocols/felica/felica_poller.c
@@ -3,6 +3,11 @@
 #include <nfc/protocols/nfc_poller_base.h>
 
 #include <furi.h>
+#include <furi_hal.h>
+
+#define TAG "FelicaPoller"
+
+typedef NfcCommand (*FelicaPollerReadHandler)(FelicaPoller* instance);
 
 const FelicaData* felica_poller_get_data(FelicaPoller* instance) {
     furi_assert(instance);
@@ -23,6 +28,8 @@ static FelicaPoller* felica_poller_alloc(Nfc* nfc) {
     nfc_set_guard_time_us(instance->nfc, FELICA_GUARD_TIME_US);
     nfc_set_fdt_poll_fc(instance->nfc, FELICA_FDT_POLL_FC);
     nfc_set_fdt_poll_poll_us(instance->nfc, FELICA_POLL_POLL_MIN_US);
+
+    mbedtls_des3_init(&instance->auth.des_context);
     instance->data = felica_alloc();
 
     instance->felica_event.data = &instance->felica_event_data;
@@ -40,6 +47,7 @@ static void felica_poller_free(FelicaPoller* instance) {
     furi_assert(instance->rx_buffer);
     furi_assert(instance->data);
 
+    mbedtls_des3_free(&instance->auth.des_context);
     bit_buffer_free(instance->tx_buffer);
     bit_buffer_free(instance->rx_buffer);
     felica_free(instance->data);
@@ -55,6 +63,212 @@ static void
     instance->context = context;
 }
 
+NfcCommand felica_poller_state_handler_idle(FelicaPoller* instance) {
+    FURI_LOG_D(TAG, "Idle");
+    felica_reset(instance->data);
+    instance->state = FelicaPollerStateActivated;
+
+    return NfcCommandContinue;
+}
+
+NfcCommand felica_poller_state_handler_activate(FelicaPoller* instance) {
+    FURI_LOG_D(TAG, "Activate");
+
+    NfcCommand command = NfcCommandContinue;
+
+    FelicaError error = felica_poller_activate(instance, instance->data);
+    if(error == FelicaErrorNone) {
+        furi_hal_random_fill_buf(instance->data->data.fs.rc.data, FELICA_DATA_BLOCK_SIZE);
+
+        instance->felica_event.type = FelicaPollerEventTypeRequestAuthContext;
+        instance->felica_event_data.auth_context = &instance->auth.context;
+
+        instance->callback(instance->general_event, instance->context);
+
+        bool skip_auth = instance->auth.context.skip_auth;
+        instance->state = skip_auth ? FelicaPollerStateReadBlocks :
+                                      FelicaPollerStateAuthenticateInternal;
+    } else if(error != FelicaErrorTimeout) {
+        instance->felica_event.type = FelicaPollerEventTypeError;
+        instance->felica_event_data.error = error;
+        instance->state = FelicaPollerStateReadFailed;
+    }
+    return command;
+}
+
+NfcCommand felica_poller_state_handler_auth_internal(FelicaPoller* instance) {
+    FURI_LOG_D(TAG, "Auth Internal");
+
+    felica_calculate_session_key(
+        &instance->auth.des_context,
+        instance->auth.context.card_key.data,
+        instance->data->data.fs.rc.data,
+        instance->auth.session_key.data);
+
+    instance->state = FelicaPollerStateReadBlocks;
+
+    uint8_t blocks[3] = {FELICA_BLOCK_INDEX_RC, 0, 0};
+    FelicaPollerWriteCommandResponse* tx_resp;
+    do {
+        FelicaError error = felica_poller_write_blocks(
+            instance, 1, blocks, instance->data->data.fs.rc.data, &tx_resp);
+        if((error != FelicaErrorNone) || (tx_resp->SF1 != 0) || (tx_resp->SF2 != 0)) break;
+
+        blocks[0] = FELICA_BLOCK_INDEX_ID;
+        blocks[1] = FELICA_BLOCK_INDEX_WCNT;
+        blocks[2] = FELICA_BLOCK_INDEX_MAC_A;
+        FelicaPollerReadCommandResponse* rx_resp;
+        error = felica_poller_read_blocks(instance, sizeof(blocks), blocks, &rx_resp);
+        if(error != FelicaErrorNone || rx_resp->SF1 != 0 || rx_resp->SF2 != 0) break;
+
+        if(felica_check_mac(
+               &instance->auth.des_context,
+               instance->auth.session_key.data,
+               instance->data->data.fs.rc.data,
+               blocks,
+               rx_resp->block_count,
+               rx_resp->data)) {
+            instance->auth.context.auth_status.internal = true;
+            instance->data->data.fs.wcnt.SF1 = 0;
+            instance->data->data.fs.wcnt.SF2 = 0;
+            memcpy(
+                instance->data->data.fs.wcnt.data,
+                rx_resp->data + FELICA_DATA_BLOCK_SIZE,
+                FELICA_DATA_BLOCK_SIZE);
+            instance->state = FelicaPollerStateAuthenticateExternal;
+        }
+    } while(false);
+
+    return NfcCommandContinue;
+}
+
+NfcCommand felica_poller_state_handler_auth_external(FelicaPoller* instance) {
+    FURI_LOG_D(TAG, "Auth External");
+    instance->state = FelicaPollerStateReadBlocks;
+    uint8_t blocks[2];
+
+    instance->data->data.fs.state.data[0] = 1;
+    FelicaAuthentication* auth = &instance->auth;
+    felica_calculate_mac_write(
+        &auth->des_context,
+        auth->session_key.data,
+        instance->data->data.fs.rc.data,
+        instance->data->data.fs.wcnt.data,
+        instance->data->data.fs.state.data,
+        instance->data->data.fs.mac_a.data);
+
+    memcpy(instance->data->data.fs.mac_a.data + 8, instance->data->data.fs.wcnt.data, 3); //-V1086
+
+    uint8_t tx_data[FELICA_DATA_BLOCK_SIZE * 2];
+    memcpy(tx_data, instance->data->data.fs.state.data, FELICA_DATA_BLOCK_SIZE);
+    memcpy(
+        tx_data + FELICA_DATA_BLOCK_SIZE,
+        instance->data->data.fs.mac_a.data,
+        FELICA_DATA_BLOCK_SIZE);
+
+    do {
+        blocks[0] = FELICA_BLOCK_INDEX_STATE;
+        blocks[1] = FELICA_BLOCK_INDEX_MAC_A;
+        FelicaPollerWriteCommandResponse* tx_resp;
+        FelicaError error = felica_poller_write_blocks(instance, 2, blocks, tx_data, &tx_resp);
+        if(error != FelicaErrorNone || tx_resp->SF1 != 0 || tx_resp->SF2 != 0) break;
+
+        FelicaPollerReadCommandResponse* rx_resp;
+        error = felica_poller_read_blocks(instance, 1, blocks, &rx_resp);
+        if(error != FelicaErrorNone || rx_resp->SF1 != 0 || rx_resp->SF2 != 0) break;
+
+        instance->data->data.fs.state.SF1 = 0;
+        instance->data->data.fs.state.SF2 = 0;
+        memcpy(instance->data->data.fs.state.data, rx_resp->data, FELICA_DATA_BLOCK_SIZE);
+        instance->auth.context.auth_status.external = instance->data->data.fs.state.data[0];
+    } while(false);
+    instance->state = FelicaPollerStateReadBlocks;
+    return NfcCommandContinue;
+}
+
+NfcCommand felica_poller_state_handler_read_blocks(FelicaPoller* instance) {
+    FURI_LOG_D(TAG, "Read Blocks");
+
+    uint8_t block_count = 1;
+    uint8_t block_list[4] = {0, 0, 0, 0};
+    block_list[0] = instance->block_index;
+
+    instance->block_index++;
+    if(instance->block_index == FELICA_BLOCK_INDEX_REG + 1) {
+        instance->block_index = FELICA_BLOCK_INDEX_RC;
+    } else if(instance->block_index == FELICA_BLOCK_INDEX_MC + 1) {
+        instance->block_index = FELICA_BLOCK_INDEX_WCNT;
+    } else if(instance->block_index == FELICA_BLOCK_INDEX_STATE + 1) {
+        instance->block_index = FELICA_BLOCK_INDEX_CRC_CHECK;
+    }
+
+    FelicaPollerReadCommandResponse* response;
+    FelicaError error = felica_poller_read_blocks(instance, block_count, block_list, &response);
+    if(error == FelicaErrorNone) {
+        block_count = (response->SF1 == 0) ? response->block_count : block_count;
+        uint8_t* data_ptr =
+            instance->data->data.dump + instance->data->blocks_total * sizeof(FelicaBlock);
+
+        *data_ptr++ = response->SF1;
+        *data_ptr++ = response->SF2;
+
+        if(response->SF1 == 0) {
+            uint8_t* response_data_ptr = response->data;
+            instance->data->blocks_read++;
+            memcpy(data_ptr, response_data_ptr, FELICA_DATA_BLOCK_SIZE);
+        } else {
+            memset(data_ptr, 0, FELICA_DATA_BLOCK_SIZE);
+        }
+        instance->data->blocks_total++;
+
+        if(instance->data->blocks_total == FELICA_BLOCKS_TOTAL_COUNT) {
+            instance->state = FelicaPollerStateReadSuccess;
+        }
+    } else {
+        instance->felica_event.type = FelicaPollerEventTypeError;
+        instance->felica_event_data.error = error;
+        instance->state = FelicaPollerStateReadFailed;
+    }
+
+    return NfcCommandContinue;
+}
+
+NfcCommand felica_poller_state_handler_read_success(FelicaPoller* instance) {
+    FURI_LOG_D(TAG, "Read Success");
+
+    if(!instance->auth.context.auth_status.internal ||
+       !instance->auth.context.auth_status.external) {
+        instance->data->blocks_read--;
+        instance->felica_event.type = FelicaPollerEventTypeIncomplete;
+    } else {
+        memcpy(
+            instance->data->data.fs.ck.data,
+            instance->auth.context.card_key.data,
+            FELICA_DATA_BLOCK_SIZE);
+        instance->felica_event.type = FelicaPollerEventTypeReady;
+    }
+
+    instance->felica_event_data.error = FelicaErrorNone;
+    return instance->callback(instance->general_event, instance->context);
+}
+
+NfcCommand felica_poller_state_handler_read_failed(FelicaPoller* instance) {
+    FURI_LOG_D(TAG, "Read Fail");
+    instance->callback(instance->general_event, instance->context);
+
+    return NfcCommandStop;
+}
+
+static const FelicaPollerReadHandler felica_poller_handler[FelicaPollerStateNum] = {
+    [FelicaPollerStateIdle] = felica_poller_state_handler_idle,
+    [FelicaPollerStateActivated] = felica_poller_state_handler_activate,
+    [FelicaPollerStateAuthenticateInternal] = felica_poller_state_handler_auth_internal,
+    [FelicaPollerStateAuthenticateExternal] = felica_poller_state_handler_auth_external,
+    [FelicaPollerStateReadBlocks] = felica_poller_state_handler_read_blocks,
+    [FelicaPollerStateReadSuccess] = felica_poller_state_handler_read_success,
+    [FelicaPollerStateReadFailed] = felica_poller_state_handler_read_failed,
+};
+
 static NfcCommand felica_poller_run(NfcGenericEvent event, void* context) {
     furi_assert(context);
     furi_assert(event.protocol == NfcProtocolInvalid);
@@ -65,24 +279,7 @@ static NfcCommand felica_poller_run(NfcGenericEvent event, void* context) {
     NfcCommand command = NfcCommandContinue;
 
     if(nfc_event->type == NfcEventTypePollerReady) {
-        if(instance->state != FelicaPollerStateActivated) {
-            FelicaError error = felica_poller_activate(instance, instance->data);
-            if(error == FelicaErrorNone) {
-                instance->felica_event.type = FelicaPollerEventTypeReady;
-                instance->felica_event_data.error = error;
-                command = instance->callback(instance->general_event, instance->context);
-            } else {
-                instance->felica_event.type = FelicaPollerEventTypeError;
-                instance->felica_event_data.error = error;
-                command = instance->callback(instance->general_event, instance->context);
-                // Add delay to switch context
-                furi_delay_ms(100);
-            }
-        } else {
-            instance->felica_event.type = FelicaPollerEventTypeReady;
-            instance->felica_event_data.error = FelicaErrorNone;
-            command = instance->callback(instance->general_event, instance->context);
-        }
+        command = felica_poller_handler[instance->state](instance);
     }
 
     return command;
diff --git a/lib/nfc/protocols/felica/felica_poller.h b/lib/nfc/protocols/felica/felica_poller.h
index b0e6778a0..d4366e767 100644
--- a/lib/nfc/protocols/felica/felica_poller.h
+++ b/lib/nfc/protocols/felica/felica_poller.h
@@ -19,14 +19,33 @@ typedef struct FelicaPoller FelicaPoller;
  */
 typedef enum {
     FelicaPollerEventTypeError, /**< An error occured during activation procedure. */
-    FelicaPollerEventTypeReady, /**< The card was activated by the poller. */
+    FelicaPollerEventTypeReady, /**< The card was activated and fully read by the poller. */
+    FelicaPollerEventTypeIncomplete, /**< The card was activated and partly read by the poller. */
+    FelicaPollerEventTypeRequestAuthContext, /**< Authentication context was requested by poller. */
 } FelicaPollerEventType;
 
+/**
+ * @brief Stucture for holding Felica session key which is calculated from rc and ck.
+*/
+typedef struct {
+    uint8_t data[FELICA_DATA_BLOCK_SIZE];
+} FelicaSessionKey;
+
+/**
+ * @brief Structure used to hold authentication related fields.
+*/
+typedef struct {
+    mbedtls_des3_context des_context; /**< Context for mbedtls des functions. */
+    FelicaSessionKey session_key; /**< Calculated session key. */
+    FelicaAuthenticationContext context; /**< Public auth context provided to upper levels. */
+} FelicaAuthentication;
+
 /**
  * @brief Felica poller event data.
  */
 typedef union {
     FelicaError error; /**< Error code indicating card activation fail reason. */
+    FelicaAuthenticationContext* auth_context; /**< Authentication context to be filled by user. */
 } FelicaPollerEventData;
 
 /**
diff --git a/lib/nfc/protocols/felica/felica_poller_i.c b/lib/nfc/protocols/felica/felica_poller_i.c
index bfbf150ef..f7726be32 100644
--- a/lib/nfc/protocols/felica/felica_poller_i.c
+++ b/lib/nfc/protocols/felica/felica_poller_i.c
@@ -3,6 +3,11 @@
 #include <nfc/helpers/felica_crc.h>
 
 #define TAG "FelicaPoller"
+#define FELICA_CMD_READ_WITHOUT_ENCRYPTION (0x06U)
+#define FELICA_CMD_WRITE_WITHOUT_ENCRYPTION (0x08U)
+
+#define FELICA_SERVICE_RW_ACCESS (0x0009U)
+#define FELICA_SERVICE_RO_ACCESS (0x000BU)
 
 static FelicaError felica_poller_process_error(NfcError error) {
     switch(error) {
@@ -15,8 +20,8 @@ static FelicaError felica_poller_process_error(NfcError error) {
     }
 }
 
-static FelicaError felica_poller_frame_exchange(
-    FelicaPoller* instance,
+FelicaError felica_poller_frame_exchange(
+    const FelicaPoller* instance,
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer,
     uint32_t fwt) {
@@ -93,11 +98,105 @@ FelicaError felica_poller_polling(
     return error;
 }
 
+static void felica_poller_prepare_tx_buffer(
+    const FelicaPoller* instance,
+    const uint8_t command,
+    const uint16_t service_code,
+    const uint8_t block_count,
+    const uint8_t* const blocks,
+    const uint8_t data_block_count,
+    const uint8_t* data) {
+    FelicaCommandHeader cmd = {
+        .code = command,
+        .idm = instance->data->idm,
+        .service_num = 1,
+        .service_code = service_code,
+        .block_count = block_count,
+    };
+
+    FelicaBlockListElement block_list[4] = {{0}, {0}, {0}, {0}};
+    for(uint8_t i = 0; i < block_count; i++) {
+        block_list[i].length = 1;
+        block_list[i].block_number = blocks[i];
+    }
+
+    uint8_t block_list_count = block_count;
+    uint8_t block_list_size = block_list_count * sizeof(FelicaBlockListElement);
+    uint8_t total_size = sizeof(FelicaCommandHeader) + 1 + block_list_size +
+                         data_block_count * FELICA_DATA_BLOCK_SIZE;
+    bit_buffer_reset(instance->tx_buffer);
+    bit_buffer_append_byte(instance->tx_buffer, total_size);
+    bit_buffer_append_bytes(instance->tx_buffer, (uint8_t*)&cmd, sizeof(FelicaCommandHeader));
+    bit_buffer_append_bytes(instance->tx_buffer, (uint8_t*)&block_list, block_list_size);
+
+    if(data_block_count != 0) {
+        bit_buffer_append_bytes(
+            instance->tx_buffer, data, data_block_count * FELICA_DATA_BLOCK_SIZE);
+    }
+}
+
+FelicaError felica_poller_read_blocks(
+    FelicaPoller* instance,
+    const uint8_t block_count,
+    const uint8_t* const block_numbers,
+    FelicaPollerReadCommandResponse** const response_ptr) {
+    furi_assert(instance);
+    furi_assert(block_count <= 4);
+    furi_assert(block_numbers);
+    furi_assert(response_ptr);
+
+    felica_poller_prepare_tx_buffer(
+        instance,
+        FELICA_CMD_READ_WITHOUT_ENCRYPTION,
+        FELICA_SERVICE_RO_ACCESS,
+        block_count,
+        block_numbers,
+        0,
+        NULL);
+    bit_buffer_reset(instance->rx_buffer);
+
+    FelicaError error = felica_poller_frame_exchange(
+        instance, instance->tx_buffer, instance->rx_buffer, FELICA_POLLER_POLLING_FWT);
+    if(error == FelicaErrorNone) {
+        *response_ptr = (FelicaPollerReadCommandResponse*)bit_buffer_get_data(instance->rx_buffer);
+    }
+    return error;
+}
+
+FelicaError felica_poller_write_blocks(
+    const FelicaPoller* instance,
+    const uint8_t block_count,
+    const uint8_t* const block_numbers,
+    const uint8_t* data,
+    FelicaPollerWriteCommandResponse** const response_ptr) {
+    furi_assert(instance);
+    furi_assert(block_count <= 2);
+    furi_assert(block_numbers);
+    furi_assert(data);
+    furi_assert(response_ptr);
+
+    felica_poller_prepare_tx_buffer(
+        instance,
+        FELICA_CMD_WRITE_WITHOUT_ENCRYPTION,
+        FELICA_SERVICE_RW_ACCESS,
+        block_count,
+        block_numbers,
+        block_count,
+        data);
+    bit_buffer_reset(instance->rx_buffer);
+
+    FelicaError error = felica_poller_frame_exchange(
+        instance, instance->tx_buffer, instance->rx_buffer, FELICA_POLLER_POLLING_FWT);
+    if(error == FelicaErrorNone) {
+        *response_ptr =
+            (FelicaPollerWriteCommandResponse*)bit_buffer_get_data(instance->rx_buffer);
+    }
+    return error;
+}
+
 FelicaError felica_poller_activate(FelicaPoller* instance, FelicaData* data) {
     furi_assert(instance);
 
-    felica_reset(data);
-
     FelicaError ret;
 
     do {
diff --git a/lib/nfc/protocols/felica/felica_poller_i.h b/lib/nfc/protocols/felica/felica_poller_i.h
index 3bd4d91f9..f7df4c845 100644
--- a/lib/nfc/protocols/felica/felica_poller_i.h
+++ b/lib/nfc/protocols/felica/felica_poller_i.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "felica_poller.h"
-
 #include <toolbox/bit_buffer.h>
 
 #ifdef __cplusplus
@@ -18,11 +17,20 @@ extern "C" {
 typedef enum {
     FelicaPollerStateIdle,
     FelicaPollerStateActivated,
+    FelicaPollerStateAuthenticateInternal,
+    FelicaPollerStateAuthenticateExternal,
+    FelicaPollerStateReadBlocks,
+    FelicaPollerStateReadSuccess,
+    FelicaPollerStateReadFailed,
+
+    FelicaPollerStateNum
 } FelicaPollerState;
 
 struct FelicaPoller {
     Nfc* nfc;
     FelicaPollerState state;
+    FelicaAuthentication auth;
+
     FelicaData* data;
     BitBuffer* tx_buffer;
     BitBuffer* rx_buffer;
@@ -31,6 +39,7 @@ struct FelicaPoller {
     FelicaPollerEvent felica_event;
     FelicaPollerEventData felica_event_data;
     NfcGenericCallback callback;
+    uint8_t block_index;
     void* context;
 };
 
@@ -46,13 +55,106 @@ typedef struct {
     uint8_t request_data[2];
 } FelicaPollerPollingResponse;
 
+typedef struct {
+    uint8_t service_code : 4;
+    uint8_t access_mode : 3;
+    uint8_t length : 1;
+    uint8_t block_number;
+} FelicaBlockListElement;
+
+#pragma pack(push, 1)
+typedef struct {
+    uint8_t code;
+    FelicaIDm idm;
+    uint8_t service_num;
+    uint16_t service_code;
+    uint8_t block_count;
+} FelicaCommandHeader;
+#pragma pack(pop)
+
+typedef struct {
+    uint8_t length;
+    uint8_t response_code;
+    FelicaIDm idm;
+    uint8_t SF1;
+    uint8_t SF2;
+    uint8_t block_count;
+    uint8_t data[];
+} FelicaPollerReadCommandResponse;
+
+typedef struct {
+    uint8_t length;
+    uint8_t response_code;
+    FelicaIDm idm;
+    uint8_t SF1;
+    uint8_t SF2;
+} FelicaPollerWriteCommandResponse;
+
 const FelicaData* felica_poller_get_data(FelicaPoller* instance);
 
+/**
+ * @brief Performs felica polling operation as part of the activation process
+ * 
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] cmd Pointer to polling command structure
+ * @param[out] resp Pointer to the response structure
+ * @return FelicaErrorNone on success, an error code on failure
+*/
 FelicaError felica_poller_polling(
     FelicaPoller* instance,
     const FelicaPollerPollingCommand* cmd,
     FelicaPollerPollingResponse* resp);
 
+/**
+ * @brief Performs felica read operation for blocks provided as parameters
+ * 
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] block_count Amount of blocks involved in reading procedure
+ * @param[in] block_numbers Array with block indexes according to felica docs
+ * @param[out] response_ptr Pointer to the response structure
+ * @return FelicaErrorNone on success, an error code on failure.
+*/
+FelicaError felica_poller_read_blocks(
+    FelicaPoller* instance,
+    const uint8_t block_count,
+    const uint8_t* const block_numbers,
+    FelicaPollerReadCommandResponse** const response_ptr);
+
+/**
+ * @brief Performs felica write operation with data provided as parameters
+ * 
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] block_count Amount of blocks involved in writing procedure
+ * @param[in] block_numbers Array with block indexes according to felica docs
+ * @param[in] data Data of blocks provided in block_numbers
+ * @param[out] response_ptr Pointer to the response structure
+ * @return FelicaErrorNone on success, an error code on failure.
+*/
+FelicaError felica_poller_write_blocks(
+    const FelicaPoller* instance,
+    const uint8_t block_count,
+    const uint8_t* const block_numbers,
+    const uint8_t* data,
+    FelicaPollerWriteCommandResponse** const response_ptr);
+
+/**
+ * @brief Perform frame exchange procedure.
+ *
+ * Prepares data for sending by adding crc, after that performs
+ * low level calls to send package data to the card
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] tx_buffer pointer to the buffer with data to be transmitted
+ * @param[out] rx_buffer pointer to the buffer with received data from card
+ * @param[in] fwt timeout window
+ * @return FelicaErrorNone on success, an error code on failure.
+ */
+FelicaError felica_poller_frame_exchange(
+    const FelicaPoller* instance,
+    const BitBuffer* tx_buffer,
+    BitBuffer* rx_buffer,
+    uint32_t fwt);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/nfc/protocols/iso14443_3a/iso14443_3a.c b/lib/nfc/protocols/iso14443_3a/iso14443_3a.c
index 96d0b3953..96e30e5c8 100644
--- a/lib/nfc/protocols/iso14443_3a/iso14443_3a.c
+++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a.c
@@ -28,36 +28,40 @@ const NfcDeviceBase nfc_device_iso14443_3a = {
     .get_base_data = (NfcDeviceGetBaseData)iso14443_3a_get_base_data,
 };
 
-Iso14443_3aData* iso14443_3a_alloc() {
+Iso14443_3aData* iso14443_3a_alloc(void) {
     Iso14443_3aData* data = malloc(sizeof(Iso14443_3aData));
     return data;
 }
 
 void iso14443_3a_free(Iso14443_3aData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     free(data);
 }
 
 void iso14443_3a_reset(Iso14443_3aData* data) {
-    furi_assert(data);
+    furi_check(data);
+
     memset(data, 0, sizeof(Iso14443_3aData));
 }
 
 void iso14443_3a_copy(Iso14443_3aData* data, const Iso14443_3aData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     *data = *other;
 }
 
 bool iso14443_3a_verify(Iso14443_3aData* data, const FuriString* device_type) {
     UNUSED(data);
+    furi_check(device_type);
+
     return furi_string_equal(device_type, ISO14443_3A_PROTOCOL_NAME_LEGACY);
 }
 
 bool iso14443_3a_load(Iso14443_3aData* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     bool parsed = false;
 
@@ -78,7 +82,8 @@ bool iso14443_3a_load(Iso14443_3aData* data, FlipperFormat* ff, uint32_t version
 }
 
 bool iso14443_3a_save(const Iso14443_3aData* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     bool saved = false;
 
@@ -98,8 +103,8 @@ bool iso14443_3a_save(const Iso14443_3aData* data, FlipperFormat* ff) {
 }
 
 bool iso14443_3a_is_equal(const Iso14443_3aData* data, const Iso14443_3aData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     return memcmp(data, other, sizeof(Iso14443_3aData)) == 0;
 }
@@ -111,7 +116,7 @@ const char* iso14443_3a_get_device_name(const Iso14443_3aData* data, NfcDeviceNa
 }
 
 const uint8_t* iso14443_3a_get_uid(const Iso14443_3aData* data, size_t* uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     if(uid_len) {
         *uid_len = data->uid_len;
@@ -121,7 +126,8 @@ const uint8_t* iso14443_3a_get_uid(const Iso14443_3aData* data, size_t* uid_len)
 }
 
 bool iso14443_3a_set_uid(Iso14443_3aData* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(uid);
 
     const bool uid_valid = uid_len == ISO14443_3A_UID_4_BYTES ||
                            uid_len == ISO14443_3A_UID_7_BYTES ||
@@ -141,7 +147,7 @@ Iso14443_3aData* iso14443_3a_get_base_data(const Iso14443_3aData* data) {
 }
 
 uint32_t iso14443_3a_get_cuid(const Iso14443_3aData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     uint32_t cuid = 0;
     const uint8_t* cuid_start = data->uid;
@@ -154,33 +160,33 @@ uint32_t iso14443_3a_get_cuid(const Iso14443_3aData* data) {
 }
 
 bool iso14443_3a_supports_iso14443_4(const Iso14443_3aData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->sak & ISO14443A_ATS_BIT;
 }
 
 uint8_t iso14443_3a_get_sak(const Iso14443_3aData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->sak;
 }
 
 void iso14443_3a_get_atqa(const Iso14443_3aData* data, uint8_t atqa[2]) {
-    furi_assert(data);
-    furi_assert(atqa);
+    furi_check(data);
+    furi_check(atqa);
 
     memcpy(atqa, data->atqa, sizeof(data->atqa));
 }
 
 void iso14443_3a_set_sak(Iso14443_3aData* data, uint8_t sak) {
-    furi_assert(data);
+    furi_check(data);
 
     data->sak = sak;
 }
 
 void iso14443_3a_set_atqa(Iso14443_3aData* data, const uint8_t atqa[2]) {
-    furi_assert(data);
-    furi_assert(atqa);
+    furi_check(data);
+    furi_check(atqa);
 
     memcpy(data->atqa, atqa, sizeof(data->atqa));
 }
diff --git a/lib/nfc/protocols/iso14443_3a/iso14443_3a.h b/lib/nfc/protocols/iso14443_3a/iso14443_3a.h
index 005626e62..714c1dada 100644
--- a/lib/nfc/protocols/iso14443_3a/iso14443_3a.h
+++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a.h
@@ -62,7 +62,7 @@ typedef struct {
     uint8_t sak;
 } Iso14443_3aData;
 
-Iso14443_3aData* iso14443_3a_alloc();
+Iso14443_3aData* iso14443_3a_alloc(void);
 
 void iso14443_3a_free(Iso14443_3aData* data);
 
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 2be88bc51..2cf66edba 100644
--- a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.c
+++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.c
@@ -55,8 +55,8 @@ static Iso14443_3aError iso14443_3a_poller_standard_frame_exchange(
 }
 
 Iso14443_3aError iso14443_3a_poller_check_presence(Iso14443_3aPoller* instance) {
-    furi_assert(instance);
-    furi_assert(instance->nfc);
+    furi_check(instance);
+    furi_check(instance->nfc);
 
     NfcError error = NfcErrorNone;
     Iso14443_3aError ret = Iso14443_3aErrorNone;
@@ -80,9 +80,9 @@ Iso14443_3aError iso14443_3a_poller_check_presence(Iso14443_3aPoller* instance)
 }
 
 Iso14443_3aError iso14443_3a_poller_halt(Iso14443_3aPoller* instance) {
-    furi_assert(instance);
-    furi_assert(instance->nfc);
-    furi_assert(instance->tx_buffer);
+    furi_check(instance);
+    furi_check(instance->nfc);
+    furi_check(instance->tx_buffer);
 
     uint8_t halt_cmd[2] = {0x50, 0x00};
     bit_buffer_copy_bytes(instance->tx_buffer, halt_cmd, sizeof(halt_cmd));
@@ -96,10 +96,10 @@ Iso14443_3aError iso14443_3a_poller_halt(Iso14443_3aPoller* instance) {
 
 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);
-    furi_assert(instance->rx_buffer);
+    furi_check(instance);
+    furi_check(instance->nfc);
+    furi_check(instance->tx_buffer);
+    furi_check(instance->rx_buffer);
 
     // Reset Iso14443_3a poller state
     memset(&instance->col_res, 0, sizeof(instance->col_res));
@@ -244,9 +244,9 @@ Iso14443_3aError iso14443_3a_poller_txrx_custom_parity(
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer,
     uint32_t fwt) {
-    furi_assert(instance);
-    furi_assert(tx_buffer);
-    furi_assert(rx_buffer);
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
     Iso14443_3aError ret = Iso14443_3aErrorNone;
     NfcError error =
@@ -263,9 +263,9 @@ Iso14443_3aError iso14443_3a_poller_txrx(
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer,
     uint32_t fwt) {
-    furi_assert(instance);
-    furi_assert(tx_buffer);
-    furi_assert(rx_buffer);
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
     Iso14443_3aError ret = Iso14443_3aErrorNone;
     NfcError error = nfc_poller_trx(instance->nfc, tx_buffer, rx_buffer, fwt);
@@ -281,9 +281,9 @@ Iso14443_3aError iso14443_3a_poller_send_standard_frame(
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer,
     uint32_t fwt) {
-    furi_assert(instance);
-    furi_assert(tx_buffer);
-    furi_assert(rx_buffer);
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
     Iso14443_3aError ret =
         iso14443_3a_poller_standard_frame_exchange(instance, tx_buffer, rx_buffer, fwt);
diff --git a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c
index ea7a6ae15..751a1c4ff 100644
--- a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c
+++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c
@@ -35,8 +35,8 @@ NfcCommand iso14443_3a_poller_read_callback(NfcGenericEvent event, void* context
 }
 
 Iso14443_3aError iso14443_3a_poller_sync_read(Nfc* nfc, Iso14443_3aData* iso14443_3a_data) {
-    furi_assert(nfc);
-    furi_assert(iso14443_3a_data);
+    furi_check(nfc);
+    furi_check(iso14443_3a_data);
 
     Iso14443_3aPollerContext poller_context = {};
     poller_context.thread_id = furi_thread_get_current_id();
diff --git a/lib/nfc/protocols/iso14443_3b/iso14443_3b.c b/lib/nfc/protocols/iso14443_3b/iso14443_3b.c
index fd81e390d..c2dc7e5a0 100644
--- a/lib/nfc/protocols/iso14443_3b/iso14443_3b.c
+++ b/lib/nfc/protocols/iso14443_3b/iso14443_3b.c
@@ -30,24 +30,26 @@ const NfcDeviceBase nfc_device_iso14443_3b = {
     .get_base_data = (NfcDeviceGetBaseData)iso14443_3b_get_base_data,
 };
 
-Iso14443_3bData* iso14443_3b_alloc() {
+Iso14443_3bData* iso14443_3b_alloc(void) {
     Iso14443_3bData* data = malloc(sizeof(Iso14443_3bData));
     return data;
 }
 
 void iso14443_3b_free(Iso14443_3bData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     free(data);
 }
 
 void iso14443_3b_reset(Iso14443_3bData* data) {
+    furi_check(data);
+
     memset(data, 0, sizeof(Iso14443_3bData));
 }
 
 void iso14443_3b_copy(Iso14443_3bData* data, const Iso14443_3bData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     *data = *other;
 }
@@ -60,7 +62,8 @@ bool iso14443_3b_verify(Iso14443_3bData* data, const FuriString* device_type) {
 }
 
 bool iso14443_3b_load(Iso14443_3bData* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     bool parsed = false;
 
@@ -84,7 +87,8 @@ bool iso14443_3b_load(Iso14443_3bData* data, FlipperFormat* ff, uint32_t version
 }
 
 bool iso14443_3b_save(const Iso14443_3bData* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     bool saved = false;
 
@@ -107,8 +111,8 @@ bool iso14443_3b_save(const Iso14443_3bData* data, FlipperFormat* ff) {
 }
 
 bool iso14443_3b_is_equal(const Iso14443_3bData* data, const Iso14443_3bData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     return memcmp(data, other, sizeof(Iso14443_3bData)) == 0;
 }
@@ -121,15 +125,16 @@ const char* iso14443_3b_get_device_name(const Iso14443_3bData* data, NfcDeviceNa
 }
 
 const uint8_t* iso14443_3b_get_uid(const Iso14443_3bData* data, size_t* uid_len) {
-    furi_assert(data);
-    furi_assert(uid_len);
+    furi_check(data);
+    furi_check(uid_len);
 
     *uid_len = ISO14443_3B_UID_SIZE;
     return data->uid;
 }
 
 bool iso14443_3b_set_uid(Iso14443_3bData* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(uid);
 
     const bool uid_valid = uid_len == ISO14443_3B_UID_SIZE;
 
@@ -146,13 +151,13 @@ Iso14443_3bData* iso14443_3b_get_base_data(const Iso14443_3bData* data) {
 }
 
 bool iso14443_3b_supports_iso14443_4(const Iso14443_3bData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->protocol_info.protocol_type == 0x01;
 }
 
 bool iso14443_3b_supports_bit_rate(const Iso14443_3bData* data, Iso14443_3bBitRate bit_rate) {
-    furi_assert(data);
+    furi_check(data);
 
     const uint8_t capability = data->protocol_info.bit_rate_capability;
 
@@ -177,7 +182,7 @@ bool iso14443_3b_supports_bit_rate(const Iso14443_3bData* data, Iso14443_3bBitRa
 }
 
 bool iso14443_3b_supports_frame_option(const Iso14443_3bData* data, Iso14443_3bFrameOption option) {
-    furi_assert(data);
+    furi_check(data);
 
     switch(option) {
     case Iso14443_3bFrameOptionNad:
@@ -190,15 +195,15 @@ bool iso14443_3b_supports_frame_option(const Iso14443_3bData* data, Iso14443_3bF
 }
 
 const uint8_t* iso14443_3b_get_application_data(const Iso14443_3bData* data, size_t* data_size) {
-    furi_assert(data);
-    furi_assert(data_size);
+    furi_check(data);
+    furi_check(data_size);
 
     *data_size = ISO14443_3B_APP_DATA_SIZE;
     return data->app_data;
 }
 
 uint16_t iso14443_3b_get_frame_size_max(const Iso14443_3bData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     const uint8_t fs_bits = data->protocol_info.max_frame_size;
 
@@ -216,7 +221,7 @@ uint16_t iso14443_3b_get_frame_size_max(const Iso14443_3bData* data) {
 }
 
 uint32_t iso14443_3b_get_fwt_fc_max(const Iso14443_3bData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     const uint8_t fwi = data->protocol_info.fwi;
     return fwi < 0x0F ? 4096UL << fwi : ISO14443_3B_FDT_POLL_DEFAULT_FC;
diff --git a/lib/nfc/protocols/iso14443_3b/iso14443_3b.h b/lib/nfc/protocols/iso14443_3b/iso14443_3b.h
index 848e610c3..7281dc62b 100644
--- a/lib/nfc/protocols/iso14443_3b/iso14443_3b.h
+++ b/lib/nfc/protocols/iso14443_3b/iso14443_3b.h
@@ -40,7 +40,7 @@ typedef struct Iso14443_3bData Iso14443_3bData;
 
 // Virtual methods
 
-Iso14443_3bData* iso14443_3b_alloc();
+Iso14443_3bData* iso14443_3b_alloc(void);
 
 void iso14443_3b_free(Iso14443_3bData* data);
 
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 1266e2482..e20a49d24 100644
--- a/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller_i.c
+++ b/lib/nfc/protocols/iso14443_3b/iso14443_3b_poller_i.c
@@ -64,8 +64,9 @@ static Iso14443_3bError iso14443_3b_poller_frame_exchange(
 }
 
 Iso14443_3bError iso14443_3b_poller_activate(Iso14443_3bPoller* instance, Iso14443_3bData* data) {
-    furi_assert(instance);
-    furi_assert(instance->nfc);
+    furi_check(instance);
+    furi_check(instance->nfc);
+    furi_check(data);
 
     iso14443_3b_reset(data);
 
@@ -155,7 +156,7 @@ Iso14443_3bError iso14443_3b_poller_activate(Iso14443_3bPoller* instance, Iso144
 }
 
 Iso14443_3bError iso14443_3b_poller_halt(Iso14443_3bPoller* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     bit_buffer_reset(instance->tx_buffer);
     bit_buffer_reset(instance->rx_buffer);
@@ -188,6 +189,10 @@ Iso14443_3bError iso14443_3b_poller_send_frame(
     Iso14443_3bPoller* instance,
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer) {
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
+
     Iso14443_3bError ret;
 
     do {
diff --git a/lib/nfc/protocols/iso14443_4a/iso14443_4a.c b/lib/nfc/protocols/iso14443_4a/iso14443_4a.c
index bfa2e71c6..756c35084 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a.c
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a.c
@@ -35,7 +35,7 @@ const NfcDeviceBase nfc_device_iso14443_4a = {
     .get_base_data = (NfcDeviceGetBaseData)iso14443_4a_get_base_data,
 };
 
-Iso14443_4aData* iso14443_4a_alloc() {
+Iso14443_4aData* iso14443_4a_alloc(void) {
     Iso14443_4aData* data = malloc(sizeof(Iso14443_4aData));
 
     data->iso14443_3a_data = iso14443_3a_alloc();
@@ -45,7 +45,7 @@ Iso14443_4aData* iso14443_4a_alloc() {
 }
 
 void iso14443_4a_free(Iso14443_4aData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     simple_array_free(data->ats_data.t1_tk);
     iso14443_3a_free(data->iso14443_3a_data);
@@ -54,7 +54,7 @@ void iso14443_4a_free(Iso14443_4aData* data) {
 }
 
 void iso14443_4a_reset(Iso14443_4aData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     iso14443_3a_reset(data->iso14443_3a_data);
 
@@ -68,8 +68,8 @@ void iso14443_4a_reset(Iso14443_4aData* data) {
 }
 
 void iso14443_4a_copy(Iso14443_4aData* data, const Iso14443_4aData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     iso14443_3a_copy(data->iso14443_3a_data, other->iso14443_3a_data);
 
@@ -91,7 +91,8 @@ bool iso14443_4a_verify(Iso14443_4aData* data, const FuriString* device_type) {
 }
 
 bool iso14443_4a_load(Iso14443_4aData* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     bool parsed = false;
 
@@ -145,7 +146,8 @@ bool iso14443_4a_load(Iso14443_4aData* data, FlipperFormat* ff, uint32_t version
 }
 
 bool iso14443_4a_save(const Iso14443_4aData* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     bool saved = false;
 
@@ -186,6 +188,9 @@ bool iso14443_4a_save(const Iso14443_4aData* data, FlipperFormat* ff) {
 }
 
 bool iso14443_4a_is_equal(const Iso14443_4aData* data, const Iso14443_4aData* other) {
+    furi_check(data);
+    furi_check(other);
+
     return iso14443_3a_is_equal(data->iso14443_3a_data, other->iso14443_3a_data);
 }
 
@@ -196,23 +201,26 @@ const char* iso14443_4a_get_device_name(const Iso14443_4aData* data, NfcDeviceNa
 }
 
 const uint8_t* iso14443_4a_get_uid(const Iso14443_4aData* data, size_t* uid_len) {
+    furi_check(data);
+    furi_check(uid_len);
+
     return iso14443_3a_get_uid(data->iso14443_3a_data, uid_len);
 }
 
 bool iso14443_4a_set_uid(Iso14443_4aData* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     return iso14443_3a_set_uid(data->iso14443_3a_data, uid, uid_len);
 }
 
 Iso14443_3aData* iso14443_4a_get_base_data(const Iso14443_4aData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->iso14443_3a_data;
 }
 
 uint16_t iso14443_4a_get_frame_size_max(const Iso14443_4aData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     const uint8_t fsci = data->ats_data.t0 & 0x0F;
 
@@ -230,7 +238,7 @@ uint16_t iso14443_4a_get_frame_size_max(const Iso14443_4aData* data) {
 }
 
 uint32_t iso14443_4a_get_fwt_fc_max(const Iso14443_4aData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     uint32_t fwt_fc_max = ISO14443_4A_FDT_DEFAULT_FC;
 
@@ -248,8 +256,8 @@ uint32_t iso14443_4a_get_fwt_fc_max(const Iso14443_4aData* data) {
 }
 
 const uint8_t* iso14443_4a_get_historical_bytes(const Iso14443_4aData* data, uint32_t* count) {
-    furi_assert(data);
-    furi_assert(count);
+    furi_check(data);
+    furi_check(count);
 
     *count = simple_array_get_count(data->ats_data.t1_tk);
     const uint8_t* hist_bytes = NULL;
@@ -261,7 +269,7 @@ const uint8_t* iso14443_4a_get_historical_bytes(const Iso14443_4aData* data, uin
 }
 
 bool iso14443_4a_supports_bit_rate(const Iso14443_4aData* data, Iso14443_4aBitRate bit_rate) {
-    furi_assert(data);
+    furi_check(data);
 
     if(!(data->ats_data.t0 & ISO14443_4A_ATS_T0_TA1))
         return bit_rate == Iso14443_4aBitRateBoth106Kbit;
@@ -289,7 +297,7 @@ bool iso14443_4a_supports_bit_rate(const Iso14443_4aData* data, Iso14443_4aBitRa
 }
 
 bool iso14443_4a_supports_frame_option(const Iso14443_4aData* data, Iso14443_4aFrameOption option) {
-    furi_assert(data);
+    furi_check(data);
 
     const Iso14443_4aAtsData* ats_data = &data->ats_data;
     if(!(ats_data->t0 & ISO14443_4A_ATS_T0_TC1)) return false;
diff --git a/lib/nfc/protocols/iso14443_4a/iso14443_4a.h b/lib/nfc/protocols/iso14443_4a/iso14443_4a.h
index 05a7bd577..6955d1c20 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a.h
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a.h
@@ -47,7 +47,7 @@ typedef struct {
 
 // Virtual methods
 
-Iso14443_4aData* iso14443_4a_alloc();
+Iso14443_4aData* iso14443_4a_alloc(void);
 
 void iso14443_4a_free(Iso14443_4aData* data);
 
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 45f427dc6..4caeb7bfd 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.c
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.c
@@ -10,7 +10,7 @@
 #define ISO14443_4A_SEND_BLOCK_MAX_ATTEMPTS (20)
 
 Iso14443_4aError iso14443_4a_poller_halt(Iso14443_4aPoller* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     iso14443_3a_poller_halt(instance->iso14443_3a_poller);
     instance->poller_state = Iso14443_4aPollerStateIdle;
@@ -20,7 +20,8 @@ Iso14443_4aError iso14443_4a_poller_halt(Iso14443_4aPoller* instance) {
 
 Iso14443_4aError
     iso14443_4a_poller_read_ats(Iso14443_4aPoller* instance, Iso14443_4aAtsData* data) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(data);
 
     bit_buffer_reset(instance->tx_buffer);
     bit_buffer_append_byte(instance->tx_buffer, ISO14443_4A_CMD_READ_ATS);
@@ -55,7 +56,9 @@ Iso14443_4aError iso14443_4a_poller_send_block(
     Iso14443_4aPoller* instance,
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
     bit_buffer_reset(instance->tx_buffer);
     iso14443_4_layer_encode_block(instance->iso14443_4_layer, tx_buffer, instance->tx_buffer);
diff --git a/lib/nfc/protocols/iso14443_4b/iso14443_4b.c b/lib/nfc/protocols/iso14443_4b/iso14443_4b.c
index 19f2939da..b859f9b8e 100644
--- a/lib/nfc/protocols/iso14443_4b/iso14443_4b.c
+++ b/lib/nfc/protocols/iso14443_4b/iso14443_4b.c
@@ -22,7 +22,7 @@ const NfcDeviceBase nfc_device_iso14443_4b = {
     .get_base_data = (NfcDeviceGetBaseData)iso14443_4b_get_base_data,
 };
 
-Iso14443_4bData* iso14443_4b_alloc() {
+Iso14443_4bData* iso14443_4b_alloc(void) {
     Iso14443_4bData* data = malloc(sizeof(Iso14443_4bData));
 
     data->iso14443_3b_data = iso14443_3b_alloc();
@@ -30,21 +30,21 @@ Iso14443_4bData* iso14443_4b_alloc() {
 }
 
 void iso14443_4b_free(Iso14443_4bData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     iso14443_3b_free(data->iso14443_3b_data);
     free(data);
 }
 
 void iso14443_4b_reset(Iso14443_4bData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     iso14443_3b_reset(data->iso14443_3b_data);
 }
 
 void iso14443_4b_copy(Iso14443_4bData* data, const Iso14443_4bData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     iso14443_3b_copy(data->iso14443_3b_data, other->iso14443_3b_data);
 }
@@ -58,16 +58,21 @@ bool iso14443_4b_verify(Iso14443_4bData* data, const FuriString* device_type) {
 }
 
 bool iso14443_4b_load(Iso14443_4bData* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
     return iso14443_3b_load(data->iso14443_3b_data, ff, version);
 }
 
 bool iso14443_4b_save(const Iso14443_4bData* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
     return iso14443_3b_save(data->iso14443_3b_data, ff);
 }
 
 bool iso14443_4b_is_equal(const Iso14443_4bData* data, const Iso14443_4bData* other) {
+    furi_check(data);
+    furi_check(other);
+
     return iso14443_3b_is_equal(data->iso14443_3b_data, other->iso14443_3b_data);
 }
 
@@ -78,17 +83,21 @@ const char* iso14443_4b_get_device_name(const Iso14443_4bData* data, NfcDeviceNa
 }
 
 const uint8_t* iso14443_4b_get_uid(const Iso14443_4bData* data, size_t* uid_len) {
+    furi_check(data);
+    furi_check(uid_len);
+
     return iso14443_3b_get_uid(data->iso14443_3b_data, uid_len);
 }
 
 bool iso14443_4b_set_uid(Iso14443_4bData* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(uid);
 
     return iso14443_3b_set_uid(data->iso14443_3b_data, uid, uid_len);
 }
 
 Iso14443_3bData* iso14443_4b_get_base_data(const Iso14443_4bData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->iso14443_3b_data;
 }
diff --git a/lib/nfc/protocols/iso14443_4b/iso14443_4b.h b/lib/nfc/protocols/iso14443_4b/iso14443_4b.h
index 1f269ed91..c7a2ae882 100644
--- a/lib/nfc/protocols/iso14443_4b/iso14443_4b.h
+++ b/lib/nfc/protocols/iso14443_4b/iso14443_4b.h
@@ -17,7 +17,7 @@ typedef struct Iso14443_4bData Iso14443_4bData;
 
 // Virtual methods
 
-Iso14443_4bData* iso14443_4b_alloc();
+Iso14443_4bData* iso14443_4b_alloc(void);
 
 void iso14443_4b_free(Iso14443_4bData* data);
 
diff --git a/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller_i.c b/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller_i.c
index 82de1d538..da82e1417 100644
--- a/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller_i.c
+++ b/lib/nfc/protocols/iso14443_4b/iso14443_4b_poller_i.c
@@ -7,7 +7,7 @@
 #define TAG "Iso14443_4bPoller"
 
 Iso14443_4bError iso14443_4b_poller_halt(Iso14443_4bPoller* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     iso14443_3b_poller_halt(instance->iso14443_3b_poller);
     instance->poller_state = Iso14443_4bPollerStateIdle;
@@ -19,7 +19,9 @@ Iso14443_4bError iso14443_4b_poller_send_block(
     Iso14443_4bPoller* instance,
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
     bit_buffer_reset(instance->tx_buffer);
     iso14443_4_layer_encode_block(instance->iso14443_4_layer, tx_buffer, instance->tx_buffer);
diff --git a/lib/nfc/protocols/iso15693_3/iso15693_3.c b/lib/nfc/protocols/iso15693_3/iso15693_3.c
index 472edfa95..d322cd5d9 100644
--- a/lib/nfc/protocols/iso15693_3/iso15693_3.c
+++ b/lib/nfc/protocols/iso15693_3/iso15693_3.c
@@ -36,7 +36,7 @@ const NfcDeviceBase nfc_device_iso15693_3 = {
     .get_base_data = (NfcDeviceGetBaseData)iso15693_3_get_base_data,
 };
 
-Iso15693_3Data* iso15693_3_alloc() {
+Iso15693_3Data* iso15693_3_alloc(void) {
     Iso15693_3Data* data = malloc(sizeof(Iso15693_3Data));
 
     data->block_data = simple_array_alloc(&simple_array_config_uint8_t);
@@ -46,7 +46,7 @@ Iso15693_3Data* iso15693_3_alloc() {
 }
 
 void iso15693_3_free(Iso15693_3Data* data) {
-    furi_assert(data);
+    furi_check(data);
 
     simple_array_free(data->block_data);
     simple_array_free(data->block_security);
@@ -54,7 +54,7 @@ void iso15693_3_free(Iso15693_3Data* data) {
 }
 
 void iso15693_3_reset(Iso15693_3Data* data) {
-    furi_assert(data);
+    furi_check(data);
 
     memset(data->uid, 0, ISO15693_3_UID_SIZE);
     memset(&data->system_info, 0, sizeof(Iso15693_3SystemInfo));
@@ -65,8 +65,8 @@ void iso15693_3_reset(Iso15693_3Data* data) {
 }
 
 void iso15693_3_copy(Iso15693_3Data* data, const Iso15693_3Data* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     memcpy(data->uid, other->uid, ISO15693_3_UID_SIZE);
 
@@ -79,6 +79,8 @@ void iso15693_3_copy(Iso15693_3Data* data, const Iso15693_3Data* other) {
 
 bool iso15693_3_verify(Iso15693_3Data* data, const FuriString* device_type) {
     UNUSED(data);
+    furi_check(device_type);
+
     return furi_string_equal(device_type, ISO15693_3_PROTOCOL_NAME_LEGACY);
 }
 
@@ -136,7 +138,8 @@ static inline bool iso15693_3_load_security(Iso15693_3Data* data, FlipperFormat*
 }
 
 bool iso15693_3_load(Iso15693_3Data* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
     UNUSED(version);
 
     bool loaded = false;
@@ -207,7 +210,8 @@ bool iso15693_3_load(Iso15693_3Data* data, FlipperFormat* ff, uint32_t version)
 }
 
 bool iso15693_3_save(const Iso15693_3Data* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     bool saved = false;
 
@@ -280,12 +284,15 @@ bool iso15693_3_save(const Iso15693_3Data* data, FlipperFormat* ff) {
 }
 
 bool iso15693_3_is_equal(const Iso15693_3Data* data, const Iso15693_3Data* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     return memcmp(data->uid, other->uid, ISO15693_3_UID_SIZE) == 0 &&
            memcmp(&data->settings, &other->settings, sizeof(Iso15693_3Settings)) == 0 &&
-           memcmp(&data->system_info, &other->system_info, sizeof(Iso15693_3SystemInfo)) == 0 &&
+           memcmp( //-V1103
+               &data->system_info,
+               &other->system_info,
+               sizeof(Iso15693_3SystemInfo)) == 0 &&
            simple_array_is_equal(data->block_data, other->block_data) &&
            simple_array_is_equal(data->block_security, other->block_security);
 }
@@ -298,15 +305,15 @@ const char* iso15693_3_get_device_name(const Iso15693_3Data* data, NfcDeviceName
 }
 
 const uint8_t* iso15693_3_get_uid(const Iso15693_3Data* data, size_t* uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     if(uid_len) *uid_len = ISO15693_3_UID_SIZE;
     return data->uid;
 }
 
 bool iso15693_3_set_uid(Iso15693_3Data* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
-    furi_assert(uid);
+    furi_check(data);
+    furi_check(uid);
 
     bool uid_valid = uid_len == ISO15693_3_UID_SIZE;
 
@@ -325,8 +332,8 @@ Iso15693_3Data* iso15693_3_get_base_data(const Iso15693_3Data* data) {
 }
 
 bool iso15693_3_is_block_locked(const Iso15693_3Data* data, uint8_t block_index) {
-    furi_assert(data);
-    furi_assert(block_index < data->system_info.block_count);
+    furi_check(data);
+    furi_check(block_index < data->system_info.block_count);
 
     // TODO: make proper fix for this, old format had no Block Security Status in file
     if(simple_array_get_count(data->block_security) != 0) {
@@ -337,26 +344,26 @@ bool iso15693_3_is_block_locked(const Iso15693_3Data* data, uint8_t block_index)
 }
 
 uint8_t iso15693_3_get_manufacturer_id(const Iso15693_3Data* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->uid[1];
 }
 
 uint16_t iso15693_3_get_block_count(const Iso15693_3Data* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->system_info.block_count;
 }
 
 uint8_t iso15693_3_get_block_size(const Iso15693_3Data* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->system_info.block_size;
 }
 
 const uint8_t* iso15693_3_get_block_data(const Iso15693_3Data* data, uint8_t block_index) {
-    furi_assert(data);
-    furi_assert(data->system_info.block_count > block_index);
+    furi_check(data);
+    furi_check(data->system_info.block_count > block_index);
 
     return (const uint8_t*)simple_array_cget(
         data->block_data, block_index * data->system_info.block_size);
diff --git a/lib/nfc/protocols/iso15693_3/iso15693_3.h b/lib/nfc/protocols/iso15693_3/iso15693_3.h
index 5d4158ab9..1120ac56e 100644
--- a/lib/nfc/protocols/iso15693_3/iso15693_3.h
+++ b/lib/nfc/protocols/iso15693_3/iso15693_3.h
@@ -122,7 +122,7 @@ typedef struct {
     SimpleArray* block_security;
 } Iso15693_3Data;
 
-Iso15693_3Data* iso15693_3_alloc();
+Iso15693_3Data* iso15693_3_alloc(void);
 
 void iso15693_3_free(Iso15693_3Data* data);
 
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 949390305..6aee84a3f 100644
--- a/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c
+++ b/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c
@@ -38,6 +38,8 @@ Iso15693_3Error iso15693_3_poller_send_frame(
     BitBuffer* rx_buffer,
     uint32_t fwt) {
     furi_assert(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
     Iso15693_3Error ret = Iso15693_3ErrorNone;
 
diff --git a/lib/nfc/protocols/mf_classic/mf_classic.c b/lib/nfc/protocols/mf_classic/mf_classic.c
index 361c53c3d..5fee3eb7b 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic.c
+++ b/lib/nfc/protocols/mf_classic/mf_classic.c
@@ -56,28 +56,28 @@ const NfcDeviceBase nfc_device_mf_classic = {
     .get_base_data = (NfcDeviceGetBaseData)mf_classic_get_base_data,
 };
 
-MfClassicData* mf_classic_alloc() {
+MfClassicData* mf_classic_alloc(void) {
     MfClassicData* data = malloc(sizeof(MfClassicData));
     data->iso14443_3a_data = iso14443_3a_alloc();
     return data;
 }
 
 void mf_classic_free(MfClassicData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     iso14443_3a_free(data->iso14443_3a_data);
     free(data);
 }
 
 void mf_classic_reset(MfClassicData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     iso14443_3a_reset(data->iso14443_3a_data);
 }
 
 void mf_classic_copy(MfClassicData* data, const MfClassicData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     iso14443_3a_copy(data->iso14443_3a_data, other->iso14443_3a_data);
     for(size_t i = 0; i < COUNT_OF(data->block); i++) {
@@ -92,7 +92,9 @@ void mf_classic_copy(MfClassicData* data, const MfClassicData* other) {
 }
 
 bool mf_classic_verify(MfClassicData* data, const FuriString* device_type) {
+    furi_check(device_type);
     UNUSED(data);
+
     return furi_string_equal_str(device_type, "Mifare Classic");
 }
 
@@ -146,7 +148,8 @@ static void mf_classic_parse_block(FuriString* block_str, MfClassicData* data, u
 }
 
 bool mf_classic_load(MfClassicData* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     FuriString* temp_str = furi_string_alloc();
     bool parsed = false;
@@ -255,7 +258,8 @@ static void
 }
 
 bool mf_classic_save(const MfClassicData* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     FuriString* temp_str = furi_string_alloc();
     bool saved = false;
@@ -297,6 +301,9 @@ bool mf_classic_save(const MfClassicData* data, FlipperFormat* ff) {
 }
 
 bool mf_classic_is_equal(const MfClassicData* data, const MfClassicData* other) {
+    furi_check(data);
+    furi_check(other);
+
     bool is_equal = false;
     bool data_array_is_equal = true;
 
@@ -329,8 +336,8 @@ bool mf_classic_is_equal(const MfClassicData* data, const MfClassicData* other)
 }
 
 const char* mf_classic_get_device_name(const MfClassicData* data, NfcDeviceNameType name_type) {
-    furi_assert(data);
-    furi_assert(data->type < MfClassicTypeNum);
+    furi_check(data);
+    furi_check(data->type < MfClassicTypeNum);
 
     if(name_type == NfcDeviceNameTypeFull) {
         return mf_classic_features[data->type].full_name;
@@ -340,13 +347,13 @@ const char* mf_classic_get_device_name(const MfClassicData* data, NfcDeviceNameT
 }
 
 const uint8_t* mf_classic_get_uid(const MfClassicData* data, size_t* uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     return iso14443_3a_get_uid(data->iso14443_3a_data, uid_len);
 }
 
 bool mf_classic_set_uid(MfClassicData* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     bool uid_valid = iso14443_3a_set_uid(data->iso14443_3a_data, uid, uid_len);
 
@@ -370,16 +377,18 @@ bool mf_classic_set_uid(MfClassicData* data, const uint8_t* uid, size_t uid_len)
 }
 
 Iso14443_3aData* mf_classic_get_base_data(const MfClassicData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->iso14443_3a_data;
 }
 
 uint8_t mf_classic_get_total_sectors_num(MfClassicType type) {
+    furi_check(type < MfClassicTypeNum);
     return mf_classic_features[type].sectors_total;
 }
 
 uint16_t mf_classic_get_total_block_num(MfClassicType type) {
+    furi_check(type < MfClassicTypeNum);
     return mf_classic_features[type].blocks_total;
 }
 
@@ -411,7 +420,7 @@ uint8_t mf_classic_get_sector_trailer_num_by_block(uint8_t block) {
 
 MfClassicSectorTrailer*
     mf_classic_get_sector_trailer_by_sector(const MfClassicData* data, uint8_t sector_num) {
-    furi_assert(data);
+    furi_check(data);
 
     uint8_t sec_tr_block = mf_classic_get_sector_trailer_num_by_sector(sector_num);
     MfClassicSectorTrailer* sec_trailer = (MfClassicSectorTrailer*)&data->block[sec_tr_block];
@@ -436,7 +445,8 @@ uint8_t mf_classic_get_sector_by_block(uint8_t block) {
 }
 
 bool mf_classic_block_to_value(const MfClassicBlock* block, int32_t* value, uint8_t* addr) {
-    furi_assert(block);
+    furi_check(block);
+    furi_check(value);
 
     uint32_t v = *(uint32_t*)&block->data[0];
     uint32_t v_inv = *(uint32_t*)&block->data[sizeof(uint32_t)];
@@ -445,9 +455,7 @@ bool mf_classic_block_to_value(const MfClassicBlock* block, int32_t* value, uint
     bool val_checks =
         ((v == v1) && (v == ~v_inv) && (block->data[12] == (~block->data[13] & 0xFF)) &&
          (block->data[14] == (~block->data[15] & 0xFF)) && (block->data[12] == block->data[14]));
-    if(value) {
-        *value = (int32_t)v;
-    }
+    *value = (int32_t)v;
     if(addr) {
         *addr = block->data[12];
     }
@@ -455,7 +463,7 @@ bool mf_classic_block_to_value(const MfClassicBlock* block, int32_t* value, uint
 }
 
 void mf_classic_value_to_block(int32_t value, uint8_t addr, MfClassicBlock* block) {
-    furi_assert(block);
+    furi_check(block);
 
     uint32_t v_inv = ~((uint32_t)value);
 
@@ -473,7 +481,7 @@ bool mf_classic_is_key_found(
     const MfClassicData* data,
     uint8_t sector_num,
     MfClassicKeyType key_type) {
-    furi_assert(data);
+    furi_check(data);
 
     bool key_found = false;
     if(key_type == MfClassicKeyTypeA) {
@@ -490,7 +498,7 @@ void mf_classic_set_key_found(
     uint8_t sector_num,
     MfClassicKeyType key_type,
     uint64_t key) {
-    furi_assert(data);
+    furi_check(data);
 
     uint8_t key_arr[6] = {};
     MfClassicSectorTrailer* sec_trailer =
@@ -509,7 +517,7 @@ void mf_classic_set_key_not_found(
     MfClassicData* data,
     uint8_t sector_num,
     MfClassicKeyType key_type) {
-    furi_assert(data);
+    furi_check(data);
 
     if(key_type == MfClassicKeyTypeA) {
         FURI_BIT_CLEAR(data->key_a_mask, sector_num);
@@ -519,13 +527,14 @@ void mf_classic_set_key_not_found(
 }
 
 bool mf_classic_is_block_read(const MfClassicData* data, uint8_t block_num) {
-    furi_assert(data);
+    furi_check(data);
 
     return (FURI_BIT(data->block_read_mask[block_num / 32], block_num % 32) == 1);
 }
 
 void mf_classic_set_block_read(MfClassicData* data, uint8_t block_num, MfClassicBlock* block_data) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(block_data);
 
     if(mf_classic_is_sector_trailer(block_num)) {
         memcpy(&data->block[block_num].data[6], &block_data->data[6], 4);
@@ -536,7 +545,7 @@ void mf_classic_set_block_read(MfClassicData* data, uint8_t block_num, MfClassic
 }
 
 uint8_t mf_classic_get_first_block_num_of_sector(uint8_t sector) {
-    furi_assert(sector < 40);
+    furi_check(sector < 40);
 
     uint8_t block = 0;
     if(sector < 32) {
@@ -549,7 +558,8 @@ uint8_t mf_classic_get_first_block_num_of_sector(uint8_t sector) {
 }
 
 uint8_t mf_classic_get_blocks_num_in_sector(uint8_t sector) {
-    furi_assert(sector < 40);
+    furi_check(sector < 40);
+
     return sector < 32 ? 4 : 16;
 }
 
@@ -557,9 +567,9 @@ void mf_classic_get_read_sectors_and_keys(
     const MfClassicData* data,
     uint8_t* sectors_read,
     uint8_t* keys_found) {
-    furi_assert(data);
-    furi_assert(sectors_read);
-    furi_assert(keys_found);
+    furi_check(data);
+    furi_check(sectors_read);
+    furi_check(keys_found);
 
     *sectors_read = 0;
     *keys_found = 0;
@@ -585,7 +595,7 @@ void mf_classic_get_read_sectors_and_keys(
 }
 
 bool mf_classic_is_card_read(const MfClassicData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     uint8_t sectors_total = mf_classic_get_total_sectors_num(data->type);
     uint8_t sectors_read = 0;
@@ -597,7 +607,7 @@ bool mf_classic_is_card_read(const MfClassicData* data) {
 }
 
 bool mf_classic_is_sector_read(const MfClassicData* data, uint8_t sector_num) {
-    furi_assert(data);
+    furi_check(data);
 
     bool sector_read = false;
     do {
@@ -662,7 +672,7 @@ bool mf_classic_is_allowed_access_data_block(
     uint8_t block_num,
     MfClassicKeyType key_type,
     MfClassicAction action) {
-    furi_assert(sec_tr);
+    furi_check(sec_tr);
 
     uint8_t* access_bits_arr = sec_tr->access_bits.data;
 
@@ -732,7 +742,7 @@ bool mf_classic_is_allowed_access(
     uint8_t block_num,
     MfClassicKeyType key_type,
     MfClassicAction action) {
-    furi_assert(data);
+    furi_check(data);
 
     bool access_allowed = false;
     if(mf_classic_is_sector_trailer(block_num)) {
@@ -749,7 +759,7 @@ bool mf_classic_is_allowed_access(
 }
 
 bool mf_classic_is_value_block(MfClassicSectorTrailer* sec_tr, uint8_t block_num) {
-    furi_assert(sec_tr);
+    furi_check(sec_tr);
 
     // Check if key A can write, if it can, it's transport configuration, not data block
     return !mf_classic_is_allowed_access_data_block(
diff --git a/lib/nfc/protocols/mf_classic/mf_classic.h b/lib/nfc/protocols/mf_classic/mf_classic.h
index 755c457d1..b42e09ab1 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic.h
+++ b/lib/nfc/protocols/mf_classic/mf_classic.h
@@ -143,7 +143,7 @@ typedef struct {
 
 extern const NfcDeviceBase nfc_device_mf_classic;
 
-MfClassicData* mf_classic_alloc();
+MfClassicData* mf_classic_alloc(void);
 
 void mf_classic_free(MfClassicData* data);
 
diff --git a/lib/nfc/protocols/mf_classic/mf_classic_listener_i.h b/lib/nfc/protocols/mf_classic/mf_classic_listener_i.h
index 5269743b5..af22b5234 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic_listener_i.h
+++ b/lib/nfc/protocols/mf_classic/mf_classic_listener_i.h
@@ -3,7 +3,7 @@
 #include "mf_classic_listener.h"
 #include <lib/nfc/protocols/iso14443_3a/iso14443_3a_listener_i.h>
 #include <nfc/protocols/nfc_generic_event.h>
-#include "crypto1.h"
+#include <nfc/helpers/crypto1.h>
 
 #ifdef __cplusplus
 extern "C" {
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 3f8b93482..2b01e74ee 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic_poller_i.c
+++ b/lib/nfc/protocols/mf_classic/mf_classic_poller_i.c
@@ -90,6 +90,8 @@ MfClassicError mf_classic_poller_get_nt(
     uint8_t block_num,
     MfClassicKeyType key_type,
     MfClassicNt* nt) {
+    furi_check(instance);
+
     return mf_classic_poller_get_nt_common(instance, block_num, key_type, nt, false);
 }
 
@@ -98,6 +100,8 @@ MfClassicError mf_classic_poller_get_nt_nested(
     uint8_t block_num,
     MfClassicKeyType key_type,
     MfClassicNt* nt) {
+    furi_check(instance);
+
     return mf_classic_poller_get_nt_common(instance, block_num, key_type, nt, true);
 }
 
@@ -179,6 +183,8 @@ MfClassicError mf_classic_poller_auth(
     MfClassicKey* key,
     MfClassicKeyType key_type,
     MfClassicAuthContext* data) {
+    furi_check(instance);
+    furi_check(key);
     return mf_classic_poller_auth_common(instance, block_num, key, key_type, data, false);
 }
 
@@ -188,10 +194,14 @@ MfClassicError mf_classic_poller_auth_nested(
     MfClassicKey* key,
     MfClassicKeyType key_type,
     MfClassicAuthContext* data) {
+    furi_check(instance);
+    furi_check(key);
     return mf_classic_poller_auth_common(instance, block_num, key, key_type, data, true);
 }
 
 MfClassicError mf_classic_poller_halt(MfClassicPoller* instance) {
+    furi_check(instance);
+
     MfClassicError ret = MfClassicErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -223,6 +233,9 @@ MfClassicError mf_classic_poller_read_block(
     MfClassicPoller* instance,
     uint8_t block_num,
     MfClassicBlock* data) {
+    furi_check(instance);
+    furi_check(data);
+
     MfClassicError ret = MfClassicErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -269,6 +282,9 @@ MfClassicError mf_classic_poller_write_block(
     MfClassicPoller* instance,
     uint8_t block_num,
     MfClassicBlock* data) {
+    furi_check(instance);
+    furi_check(data);
+
     MfClassicError ret = MfClassicErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -341,6 +357,8 @@ MfClassicError mf_classic_poller_value_cmd(
     uint8_t block_num,
     MfClassicValueCommand cmd,
     int32_t data) {
+    furi_check(instance);
+
     MfClassicError ret = MfClassicErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -407,6 +425,8 @@ MfClassicError mf_classic_poller_value_cmd(
 }
 
 MfClassicError mf_classic_poller_value_transfer(MfClassicPoller* instance, uint8_t block_num) {
+    furi_check(instance);
+
     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 a5af31530..14a7c61fd 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic_poller_i.h
+++ b/lib/nfc/protocols/mf_classic/mf_classic_poller_i.h
@@ -3,7 +3,7 @@
 #include "mf_classic_poller.h"
 #include <lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.h>
 #include <bit_lib/bit_lib.h>
-#include "crypto1.h"
+#include <nfc/helpers/crypto1.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/nfc/protocols/mf_classic/mf_classic_poller_sync.c b/lib/nfc/protocols/mf_classic/mf_classic_poller_sync.c
index 8566a8612..cc6bc0908 100644
--- a/lib/nfc/protocols/mf_classic/mf_classic_poller_sync.c
+++ b/lib/nfc/protocols/mf_classic/mf_classic_poller_sync.c
@@ -225,7 +225,7 @@ MfClassicError mf_classic_poller_sync_collect_nt(
     uint8_t block_num,
     MfClassicKeyType key_type,
     MfClassicNt* nt) {
-    furi_assert(nfc);
+    furi_check(nfc);
 
     MfClassicPollerContext poller_context = {
         .cmd_type = MfClassicPollerCmdTypeCollectNt,
@@ -250,8 +250,8 @@ MfClassicError mf_classic_poller_sync_auth(
     MfClassicKey* key,
     MfClassicKeyType key_type,
     MfClassicAuthContext* data) {
-    furi_assert(nfc);
-    furi_assert(key);
+    furi_check(nfc);
+    furi_check(key);
 
     MfClassicPollerContext poller_context = {
         .cmd_type = MfClassicPollerCmdTypeAuth,
@@ -277,9 +277,9 @@ MfClassicError mf_classic_poller_sync_read_block(
     MfClassicKey* key,
     MfClassicKeyType key_type,
     MfClassicBlock* data) {
-    furi_assert(nfc);
-    furi_assert(key);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(key);
+    furi_check(data);
 
     MfClassicPollerContext poller_context = {
         .cmd_type = MfClassicPollerCmdTypeReadBlock,
@@ -303,9 +303,9 @@ MfClassicError mf_classic_poller_sync_write_block(
     MfClassicKey* key,
     MfClassicKeyType key_type,
     MfClassicBlock* data) {
-    furi_assert(nfc);
-    furi_assert(key);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(key);
+    furi_check(data);
 
     MfClassicPollerContext poller_context = {
         .cmd_type = MfClassicPollerCmdTypeWriteBlock,
@@ -326,9 +326,9 @@ MfClassicError mf_classic_poller_sync_read_value(
     MfClassicKey* key,
     MfClassicKeyType key_type,
     int32_t* value) {
-    furi_assert(nfc);
-    furi_assert(key);
-    furi_assert(value);
+    furi_check(nfc);
+    furi_check(key);
+    furi_check(value);
 
     MfClassicPollerContext poller_context = {
         .cmd_type = MfClassicPollerCmdTypeReadValue,
@@ -353,9 +353,9 @@ MfClassicError mf_classic_poller_sync_change_value(
     MfClassicKeyType key_type,
     int32_t data,
     int32_t* new_value) {
-    furi_assert(nfc);
-    furi_assert(key);
-    furi_assert(new_value);
+    furi_check(nfc);
+    furi_check(key);
+    furi_check(new_value);
 
     MfClassicValueCommand command = MfClassicValueCommandRestore;
     int32_t command_data = 0;
@@ -459,9 +459,9 @@ NfcCommand mf_classic_poller_read_callback(NfcGenericEvent event, void* context)
 
 MfClassicError
     mf_classic_poller_sync_read(Nfc* nfc, const MfClassicDeviceKeys* keys, MfClassicData* data) {
-    furi_assert(nfc);
-    furi_assert(keys);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(keys);
+    furi_check(data);
 
     MfClassicError error = MfClassicErrorNone;
     MfClassicPollerContext poller_context = {};
@@ -493,8 +493,8 @@ MfClassicError
 }
 
 MfClassicError mf_classic_poller_sync_detect_type(Nfc* nfc, MfClassicType* type) {
-    furi_assert(nfc);
-    furi_assert(type);
+    furi_check(nfc);
+    furi_check(type);
 
     MfClassicError error = MfClassicErrorNone;
 
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire.c b/lib/nfc/protocols/mf_desfire/mf_desfire.c
index b83198a25..4d54a2c0e 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire.c
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire.c
@@ -20,7 +20,7 @@ const NfcDeviceBase nfc_device_mf_desfire = {
     .get_base_data = (NfcDeviceGetBaseData)mf_desfire_get_base_data,
 };
 
-MfDesfireData* mf_desfire_alloc() {
+MfDesfireData* mf_desfire_alloc(void) {
     MfDesfireData* data = malloc(sizeof(MfDesfireData));
     data->iso14443_4a_data = iso14443_4a_alloc();
     data->master_key_versions = simple_array_alloc(&mf_desfire_key_version_array_config);
@@ -31,7 +31,7 @@ MfDesfireData* mf_desfire_alloc() {
 }
 
 void mf_desfire_free(MfDesfireData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     mf_desfire_reset(data);
     simple_array_free(data->applications);
@@ -42,7 +42,7 @@ void mf_desfire_free(MfDesfireData* data) {
 }
 
 void mf_desfire_reset(MfDesfireData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     iso14443_4a_reset(data->iso14443_4a_data);
 
@@ -55,8 +55,8 @@ void mf_desfire_reset(MfDesfireData* data) {
 }
 
 void mf_desfire_copy(MfDesfireData* data, const MfDesfireData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     mf_desfire_reset(data);
 
@@ -77,7 +77,8 @@ bool mf_desfire_verify(MfDesfireData* data, const FuriString* device_type) {
 }
 
 bool mf_desfire_load(MfDesfireData* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     FuriString* prefix = furi_string_alloc();
 
@@ -143,7 +144,8 @@ bool mf_desfire_load(MfDesfireData* data, FlipperFormat* ff, uint32_t version) {
 }
 
 bool mf_desfire_save(const MfDesfireData* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     FuriString* prefix = furi_string_alloc();
 
@@ -208,12 +210,15 @@ bool mf_desfire_save(const MfDesfireData* data, FlipperFormat* ff) {
 }
 
 bool mf_desfire_is_equal(const MfDesfireData* data, const MfDesfireData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     return iso14443_4a_is_equal(data->iso14443_4a_data, other->iso14443_4a_data) &&
            memcmp(&data->version, &other->version, sizeof(MfDesfireVersion)) == 0 &&
-           memcmp(&data->free_memory, &other->free_memory, sizeof(MfDesfireFreeMemory)) == 0 &&
+           memcmp( //-V1103
+               &data->free_memory,
+               &other->free_memory,
+               sizeof(MfDesfireFreeMemory)) == 0 &&
            memcmp(
                &data->master_key_settings,
                &other->master_key_settings,
@@ -230,25 +235,29 @@ const char* mf_desfire_get_device_name(const MfDesfireData* data, NfcDeviceNameT
 }
 
 const uint8_t* mf_desfire_get_uid(const MfDesfireData* data, size_t* uid_len) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(uid_len);
 
     return iso14443_4a_get_uid(data->iso14443_4a_data, uid_len);
 }
 
 bool mf_desfire_set_uid(MfDesfireData* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     return iso14443_4a_set_uid(data->iso14443_4a_data, uid, uid_len);
 }
 
 Iso14443_4aData* mf_desfire_get_base_data(const MfDesfireData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->iso14443_4a_data;
 }
 
 const MfDesfireApplication*
     mf_desfire_get_application(const MfDesfireData* data, const MfDesfireApplicationId* app_id) {
+    furi_check(data);
+    furi_check(app_id);
+
     MfDesfireApplication* app = NULL;
 
     for(uint32_t i = 0; i < simple_array_get_count(data->application_ids); ++i) {
@@ -263,6 +272,9 @@ const MfDesfireApplication*
 
 const MfDesfireFileSettings*
     mf_desfire_get_file_settings(const MfDesfireApplication* data, const MfDesfireFileId* file_id) {
+    furi_check(data);
+    furi_check(file_id);
+
     MfDesfireFileSettings* file_settings = NULL;
 
     for(uint32_t i = 0; i < simple_array_get_count(data->file_ids); ++i) {
@@ -277,6 +289,9 @@ const MfDesfireFileSettings*
 
 const MfDesfireFileData*
     mf_desfire_get_file_data(const MfDesfireApplication* data, const MfDesfireFileId* file_id) {
+    furi_check(data);
+    furi_check(file_id);
+
     MfDesfireFileData* file_data = NULL;
 
     for(uint32_t i = 0; i < simple_array_get_count(data->file_ids); ++i) {
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire.h b/lib/nfc/protocols/mf_desfire/mf_desfire.h
index 8505b792a..4c3075386 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire.h
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire.h
@@ -152,7 +152,7 @@ extern const NfcDeviceBase nfc_device_mf_desfire;
 
 // Virtual methods
 
-MfDesfireData* mf_desfire_alloc();
+MfDesfireData* mf_desfire_alloc(void);
 
 void mf_desfire_free(MfDesfireData* data);
 
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c
index 5af033d4c..c9d8bbab6 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c
@@ -225,9 +225,17 @@ static bool mf_desfire_poller_detect(NfcGenericEvent event, void* context) {
     bool protocol_detected = false;
 
     if(iso14443_4a_event->type == Iso14443_4aPollerEventTypeReady) {
-        MfDesfireVersion version = {};
-        const MfDesfireError error = mf_desfire_poller_read_version(instance, &version);
-        protocol_detected = (error == MfDesfireErrorNone);
+        do {
+            MfDesfireKeyVersion key_version = 0;
+            MfDesfireError error = mf_desfire_poller_read_key_version(instance, 0, &key_version);
+            if(error != MfDesfireErrorNone) break;
+
+            MfDesfireVersion version = {};
+            error = mf_desfire_poller_read_version(instance, &version);
+            if(error != MfDesfireErrorNone) break;
+
+            protocol_detected = true;
+        } while(false);
     }
 
     return protocol_detected;
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h
index 6ef2f3f68..707df42cd 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h
@@ -91,6 +91,21 @@ MfDesfireError
 MfDesfireError
     mf_desfire_poller_read_key_settings(MfDesfirePoller* instance, MfDesfireKeySettings* data);
 
+/**
+ * @brief Read key version 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] key_num key number.
+ * @param[in] data pointer to the MfDesfireKeyVersion structure to be filled with key version data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_key_version(
+    MfDesfirePoller* instance,
+    uint8_t key_num,
+    MfDesfireKeyVersion* data);
+
 /**
  * @brief Read key versions on MfDesfire card.
  *
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 0b2d84138..790f11715 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
@@ -23,12 +23,12 @@ MfDesfireError mf_desfire_send_chunks(
     MfDesfirePoller* instance,
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer) {
-    furi_assert(instance);
-    furi_assert(instance->iso14443_4a_poller);
-    furi_assert(instance->tx_buffer);
-    furi_assert(instance->rx_buffer);
-    furi_assert(tx_buffer);
-    furi_assert(rx_buffer);
+    furi_check(instance);
+    furi_check(instance->iso14443_4a_poller);
+    furi_check(instance->tx_buffer);
+    furi_check(instance->rx_buffer);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
     MfDesfireError error = MfDesfireErrorNone;
 
@@ -75,7 +75,7 @@ MfDesfireError mf_desfire_send_chunks(
 }
 
 MfDesfireError mf_desfire_poller_read_version(MfDesfirePoller* instance, MfDesfireVersion* data) {
-    furi_assert(instance);
+    furi_check(instance);
 
     bit_buffer_reset(instance->input_buffer);
     bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_GET_VERSION);
@@ -97,7 +97,7 @@ MfDesfireError mf_desfire_poller_read_version(MfDesfirePoller* instance, MfDesfi
 
 MfDesfireError
     mf_desfire_poller_read_free_memory(MfDesfirePoller* instance, MfDesfireFreeMemory* data) {
-    furi_assert(instance);
+    furi_check(instance);
 
     bit_buffer_reset(instance->input_buffer);
     bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_GET_FREE_MEMORY);
@@ -119,7 +119,7 @@ MfDesfireError
 
 MfDesfireError
     mf_desfire_poller_read_key_settings(MfDesfirePoller* instance, MfDesfireKeySettings* data) {
-    furi_assert(instance);
+    furi_check(instance);
 
     bit_buffer_reset(instance->input_buffer);
     bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_GET_KEY_SETTINGS);
@@ -139,31 +139,42 @@ MfDesfireError
     return error;
 }
 
+MfDesfireError mf_desfire_poller_read_key_version(
+    MfDesfirePoller* instance,
+    uint8_t key_num,
+    MfDesfireKeyVersion* data) {
+    furi_check(instance);
+    furi_check(data);
+
+    bit_buffer_set_size_bytes(instance->input_buffer, sizeof(uint8_t) * 2);
+    bit_buffer_set_byte(instance->input_buffer, 0, MF_DESFIRE_CMD_GET_KEY_VERSION);
+    bit_buffer_set_byte(instance->input_buffer, 1, key_num);
+
+    MfDesfireError error =
+        mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer);
+    if(error == MfDesfireErrorNone) {
+        if(!mf_desfire_key_version_parse(data, instance->result_buffer)) {
+            error = MfDesfireErrorProtocol;
+        }
+    }
+
+    return error;
+}
+
 MfDesfireError mf_desfire_poller_read_key_versions(
     MfDesfirePoller* instance,
     SimpleArray* data,
     uint32_t count) {
-    furi_assert(instance);
-    furi_assert(count > 0);
+    furi_check(instance);
+    furi_check(count > 0);
 
     simple_array_init(data, count);
 
-    bit_buffer_set_size_bytes(instance->input_buffer, sizeof(uint8_t) * 2);
-    bit_buffer_set_byte(instance->input_buffer, 0, MF_DESFIRE_CMD_GET_KEY_VERSION);
-
     MfDesfireError error = MfDesfireErrorNone;
 
     for(uint32_t i = 0; i < count; ++i) {
-        bit_buffer_set_byte(instance->input_buffer, 1, i);
-
-        error = mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer);
-
+        error = mf_desfire_poller_read_key_version(instance, i, simple_array_get(data, i));
         if(error != MfDesfireErrorNone) break;
-
-        if(!mf_desfire_key_version_parse(simple_array_get(data, i), instance->result_buffer)) {
-            error = MfDesfireErrorProtocol;
-            break;
-        }
     }
 
     return error;
@@ -171,7 +182,8 @@ MfDesfireError mf_desfire_poller_read_key_versions(
 
 MfDesfireError
     mf_desfire_poller_read_application_ids(MfDesfirePoller* instance, SimpleArray* data) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(data);
 
     bit_buffer_reset(instance->input_buffer);
     bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_GET_APPLICATION_IDS);
@@ -204,7 +216,7 @@ MfDesfireError
 MfDesfireError mf_desfire_poller_select_application(
     MfDesfirePoller* instance,
     const MfDesfireApplicationId* id) {
-    furi_assert(instance);
+    furi_check(instance);
 
     bit_buffer_reset(instance->input_buffer);
     bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_SELECT_APPLICATION);
@@ -218,7 +230,8 @@ MfDesfireError mf_desfire_poller_select_application(
 }
 
 MfDesfireError mf_desfire_poller_read_file_ids(MfDesfirePoller* instance, SimpleArray* data) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(data);
 
     bit_buffer_reset(instance->input_buffer);
     bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_GET_FILE_IDS);
@@ -251,7 +264,8 @@ MfDesfireError mf_desfire_poller_read_file_settings(
     MfDesfirePoller* instance,
     MfDesfireFileId id,
     MfDesfireFileSettings* data) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(data);
 
     bit_buffer_reset(instance->input_buffer);
     bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_GET_FILE_SETTINGS);
@@ -276,7 +290,9 @@ MfDesfireError mf_desfire_poller_read_file_settings_multi(
     MfDesfirePoller* instance,
     const SimpleArray* file_ids,
     SimpleArray* data) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(file_ids);
+    furi_check(data);
 
     MfDesfireError error = MfDesfireErrorNone;
 
@@ -300,7 +316,8 @@ MfDesfireError mf_desfire_poller_read_file_data(
     uint32_t offset,
     size_t size,
     MfDesfireFileData* data) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(data);
 
     bit_buffer_reset(instance->input_buffer);
     bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_READ_DATA);
@@ -327,7 +344,8 @@ MfDesfireError mf_desfire_poller_read_file_value(
     MfDesfirePoller* instance,
     MfDesfireFileId id,
     MfDesfireFileData* data) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(data);
 
     bit_buffer_reset(instance->input_buffer);
     bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_GET_VALUE);
@@ -354,7 +372,8 @@ MfDesfireError mf_desfire_poller_read_file_records(
     uint32_t offset,
     size_t size,
     MfDesfireFileData* data) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(data);
 
     bit_buffer_reset(instance->input_buffer);
     bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_READ_RECORDS);
@@ -382,8 +401,11 @@ MfDesfireError mf_desfire_poller_read_file_data_multi(
     const SimpleArray* file_ids,
     const SimpleArray* file_settings,
     SimpleArray* data) {
-    furi_assert(instance);
-    furi_assert(simple_array_get_count(file_ids) == simple_array_get_count(file_settings));
+    furi_check(instance);
+    furi_check(file_ids);
+    furi_check(file_settings);
+    furi_check(data);
+    furi_check(simple_array_get_count(file_ids) == simple_array_get_count(file_settings));
 
     MfDesfireError error = MfDesfireErrorNone;
 
@@ -419,8 +441,8 @@ MfDesfireError mf_desfire_poller_read_file_data_multi(
 
 MfDesfireError
     mf_desfire_poller_read_application(MfDesfirePoller* instance, MfDesfireApplication* data) {
-    furi_assert(instance);
-    furi_assert(data);
+    furi_check(instance);
+    furi_check(data);
 
     MfDesfireError error;
 
@@ -452,7 +474,8 @@ MfDesfireError mf_desfire_poller_read_applications(
     MfDesfirePoller* instance,
     const SimpleArray* app_ids,
     SimpleArray* data) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(data);
 
     MfDesfireError error = MfDesfireErrorNone;
 
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight.c b/lib/nfc/protocols/mf_ultralight/mf_ultralight.c
index d4c5ba103..74436dc08 100644
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight.c
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight.c
@@ -168,28 +168,28 @@ const NfcDeviceBase nfc_device_mf_ultralight = {
     .get_base_data = (NfcDeviceGetBaseData)mf_ultralight_get_base_data,
 };
 
-MfUltralightData* mf_ultralight_alloc() {
+MfUltralightData* mf_ultralight_alloc(void) {
     MfUltralightData* data = malloc(sizeof(MfUltralightData));
     data->iso14443_3a_data = iso14443_3a_alloc();
     return data;
 }
 
 void mf_ultralight_free(MfUltralightData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     iso14443_3a_free(data->iso14443_3a_data);
     free(data);
 }
 
 void mf_ultralight_reset(MfUltralightData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     iso14443_3a_reset(data->iso14443_3a_data);
 }
 
 void mf_ultralight_copy(MfUltralightData* data, const MfUltralightData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     iso14443_3a_copy(data->iso14443_3a_data, other->iso14443_3a_data);
     for(size_t i = 0; i < COUNT_OF(data->counter); i++) {
@@ -222,7 +222,8 @@ static const char*
 }
 
 bool mf_ultralight_verify(MfUltralightData* data, const FuriString* device_type) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(device_type);
 
     bool verified = false;
 
@@ -239,7 +240,8 @@ bool mf_ultralight_verify(MfUltralightData* data, const FuriString* device_type)
 }
 
 bool mf_ultralight_load(MfUltralightData* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     FuriString* temp_str = furi_string_alloc();
     bool parsed = false;
@@ -338,7 +340,8 @@ bool mf_ultralight_load(MfUltralightData* data, FlipperFormat* ff, uint32_t vers
 }
 
 bool mf_ultralight_save(const MfUltralightData* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     FuriString* temp_str = furi_string_alloc();
     bool saved = false;
@@ -419,6 +422,9 @@ bool mf_ultralight_save(const MfUltralightData* data, FlipperFormat* ff) {
 }
 
 bool mf_ultralight_is_equal(const MfUltralightData* data, const MfUltralightData* other) {
+    furi_check(data);
+    furi_check(other);
+
     bool is_equal = false;
     bool data_array_is_equal = true;
 
@@ -467,20 +473,20 @@ bool mf_ultralight_is_equal(const MfUltralightData* data, const MfUltralightData
 
 const char*
     mf_ultralight_get_device_name(const MfUltralightData* data, NfcDeviceNameType name_type) {
-    furi_assert(data);
-    furi_assert(data->type < MfUltralightTypeNum);
+    furi_check(data);
+    furi_check(data->type < MfUltralightTypeNum);
 
     return mf_ultralight_get_device_name_by_type(data->type, name_type);
 }
 
 const uint8_t* mf_ultralight_get_uid(const MfUltralightData* data, size_t* uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     return iso14443_3a_get_uid(data->iso14443_3a_data, uid_len);
 }
 
 bool mf_ultralight_set_uid(MfUltralightData* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     bool uid_valid = iso14443_3a_set_uid(data->iso14443_3a_data, uid, uid_len);
 
@@ -498,13 +504,13 @@ bool mf_ultralight_set_uid(MfUltralightData* data, const uint8_t* uid, size_t ui
 }
 
 Iso14443_3aData* mf_ultralight_get_base_data(const MfUltralightData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->iso14443_3a_data;
 }
 
 MfUltralightType mf_ultralight_get_type_by_version(MfUltralightVersion* version) {
-    furi_assert(version);
+    furi_check(version);
 
     MfUltralightType type = MfUltralightTypeUnknown;
 
@@ -538,15 +544,19 @@ MfUltralightType mf_ultralight_get_type_by_version(MfUltralightVersion* version)
 }
 
 uint16_t mf_ultralight_get_pages_total(MfUltralightType type) {
+    furi_check(type < MfUltralightTypeNum);
+
     return mf_ultralight_features[type].total_pages;
 }
 
 uint32_t mf_ultralight_get_feature_support_set(MfUltralightType type) {
+    furi_check(type < MfUltralightTypeNum);
+
     return mf_ultralight_features[type].feature_set;
 }
 
 bool mf_ultralight_detect_protocol(const Iso14443_3aData* iso14443_3a_data) {
-    furi_assert(iso14443_3a_data);
+    furi_check(iso14443_3a_data);
 
     bool mfu_detected = (iso14443_3a_data->atqa[0] == 0x44) &&
                         (iso14443_3a_data->atqa[1] == 0x00) && (iso14443_3a_data->sak == 0x00);
@@ -555,10 +565,14 @@ bool mf_ultralight_detect_protocol(const Iso14443_3aData* iso14443_3a_data) {
 }
 
 uint16_t mf_ultralight_get_config_page_num(MfUltralightType type) {
+    furi_check(type < MfUltralightTypeNum);
+
     return mf_ultralight_features[type].config_page;
 }
 
 uint8_t mf_ultralight_get_pwd_page_num(MfUltralightType type) {
+    furi_check(type < MfUltralightTypeNum);
+
     uint8_t config_page = mf_ultralight_features[type].config_page;
     return (config_page != 0) ? config_page + 2 : 0;
 }
@@ -574,8 +588,8 @@ bool mf_ultralight_support_feature(const uint32_t feature_set, const uint32_t fe
 }
 
 bool mf_ultralight_get_config_page(const MfUltralightData* data, MfUltralightConfigPages** config) {
-    furi_assert(data);
-    furi_assert(config);
+    furi_check(data);
+    furi_check(config);
 
     bool config_pages_found = false;
 
@@ -589,7 +603,7 @@ bool mf_ultralight_get_config_page(const MfUltralightData* data, MfUltralightCon
 }
 
 bool mf_ultralight_is_all_data_read(const MfUltralightData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     bool all_read = false;
     if(data->pages_read == data->pages_total ||
@@ -616,7 +630,7 @@ bool mf_ultralight_is_all_data_read(const MfUltralightData* data) {
 }
 
 bool mf_ultralight_is_counter_configured(const MfUltralightData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     MfUltralightConfigPages* config = NULL;
     bool configured = false;
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight.h b/lib/nfc/protocols/mf_ultralight/mf_ultralight.h
index 4786b1825..5e348a0c9 100644
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight.h
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight.h
@@ -177,7 +177,7 @@ typedef struct {
 
 extern const NfcDeviceBase nfc_device_mf_ultralight;
 
-MfUltralightData* mf_ultralight_alloc();
+MfUltralightData* mf_ultralight_alloc(void);
 
 void mf_ultralight_free(MfUltralightData* data);
 
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 2d88db3e5..cc3433f73 100644
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_i.c
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_i.c
@@ -33,6 +33,9 @@ MfUltralightError mf_ultralight_process_error(Iso14443_3aError error) {
 MfUltralightError mf_ultralight_poller_auth_pwd(
     MfUltralightPoller* instance,
     MfUltralightPollerAuthContext* data) {
+    furi_check(instance);
+    furi_check(data);
+
     uint8_t auth_cmd[5] = {MF_ULTRALIGHT_CMD_PWD_AUTH}; //-V1009
     memccpy(&auth_cmd[1], data->password.data, 0, MF_ULTRALIGHT_AUTH_PASSWORD_SIZE);
     bit_buffer_copy_bytes(instance->tx_buffer, auth_cmd, sizeof(auth_cmd));
@@ -60,6 +63,8 @@ MfUltralightError mf_ultralight_poller_auth_pwd(
 }
 
 MfUltralightError mf_ultralight_poller_authenticate(MfUltralightPoller* instance) {
+    furi_check(instance);
+
     uint8_t auth_cmd[2] = {MF_ULTRALIGHT_CMD_AUTH, 0x00};
     bit_buffer_copy_bytes(instance->tx_buffer, auth_cmd, sizeof(auth_cmd));
 
@@ -91,6 +96,9 @@ MfUltralightError mf_ultralight_poller_read_page_from_sector(
     uint8_t sector,
     uint8_t tag,
     MfUltralightPageReadCommandData* data) {
+    furi_check(instance);
+    furi_check(data);
+
     MfUltralightError ret = MfUltralightErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -132,6 +140,9 @@ MfUltralightError mf_ultralight_poller_read_page(
     MfUltralightPoller* instance,
     uint8_t start_page,
     MfUltralightPageReadCommandData* data) {
+    furi_check(instance);
+    furi_check(data);
+
     MfUltralightError ret = MfUltralightErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -162,6 +173,9 @@ MfUltralightError mf_ultralight_poller_write_page(
     MfUltralightPoller* instance,
     uint8_t page,
     const MfUltralightPage* data) {
+    furi_check(instance);
+    furi_check(data);
+
     MfUltralightError ret = MfUltralightErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -193,6 +207,9 @@ MfUltralightError mf_ultralight_poller_write_page(
 
 MfUltralightError
     mf_ultralight_poller_read_version(MfUltralightPoller* instance, MfUltralightVersion* data) {
+    furi_check(instance);
+    furi_check(data);
+
     MfUltralightError ret = MfUltralightErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -222,6 +239,9 @@ MfUltralightError
 
 MfUltralightError
     mf_ultralight_poller_read_signature(MfUltralightPoller* instance, MfUltralightSignature* data) {
+    furi_check(instance);
+    furi_check(data);
+
     MfUltralightError ret = MfUltralightErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -251,6 +271,9 @@ MfUltralightError mf_ultralight_poller_read_counter(
     MfUltralightPoller* instance,
     uint8_t counter_num,
     MfUltralightCounter* data) {
+    furi_check(instance);
+    furi_check(data);
+
     MfUltralightError ret = MfUltralightErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
@@ -280,6 +303,9 @@ MfUltralightError mf_ultralight_poller_read_tearing_flag(
     MfUltralightPoller* instance,
     uint8_t tearing_falg_num,
     MfUltralightTearingFlag* data) {
+    furi_check(instance);
+    furi_check(data);
+
     MfUltralightError ret = MfUltralightErrorNone;
     Iso14443_3aError error = Iso14443_3aErrorNone;
 
diff --git a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.c b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.c
index c4833facf..157e2bdef 100644
--- a/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.c
+++ b/lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.c
@@ -119,8 +119,8 @@ static MfUltralightError
 
 MfUltralightError
     mf_ultralight_poller_sync_read_page(Nfc* nfc, uint16_t page, MfUltralightPage* data) {
-    furi_assert(nfc);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(data);
 
     MfUltralightPollerContext poller_context = {
         .cmd_type = MfUltralightPollerCmdTypeReadPage,
@@ -138,8 +138,8 @@ MfUltralightError
 
 MfUltralightError
     mf_ultralight_poller_sync_write_page(Nfc* nfc, uint16_t page, MfUltralightPage* data) {
-    furi_assert(nfc);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(data);
 
     MfUltralightPollerContext poller_context = {
         .cmd_type = MfUltralightPollerCmdTypeWritePage,
@@ -156,8 +156,8 @@ MfUltralightError
 }
 
 MfUltralightError mf_ultralight_poller_sync_read_version(Nfc* nfc, MfUltralightVersion* data) {
-    furi_assert(nfc);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(data);
 
     MfUltralightPollerContext poller_context = {
         .cmd_type = MfUltralightPollerCmdTypeReadVersion,
@@ -173,8 +173,8 @@ MfUltralightError mf_ultralight_poller_sync_read_version(Nfc* nfc, MfUltralightV
 }
 
 MfUltralightError mf_ultralight_poller_sync_read_signature(Nfc* nfc, MfUltralightSignature* data) {
-    furi_assert(nfc);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(data);
 
     MfUltralightPollerContext poller_context = {
         .cmd_type = MfUltralightPollerCmdTypeReadSignature,
@@ -193,8 +193,8 @@ MfUltralightError mf_ultralight_poller_sync_read_counter(
     Nfc* nfc,
     uint8_t counter_num,
     MfUltralightCounter* data) {
-    furi_assert(nfc);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(data);
 
     MfUltralightPollerContext poller_context = {
         .cmd_type = MfUltralightPollerCmdTypeReadCounter,
@@ -214,8 +214,8 @@ MfUltralightError mf_ultralight_poller_sync_read_tearing_flag(
     Nfc* nfc,
     uint8_t flag_num,
     MfUltralightTearingFlag* data) {
-    furi_assert(nfc);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(data);
 
     MfUltralightPollerContext poller_context = {
         .cmd_type = MfUltralightPollerCmdTypeReadTearingFlag,
@@ -261,8 +261,8 @@ static NfcCommand mf_ultralight_poller_read_callback(NfcGenericEvent event, void
 }
 
 MfUltralightError mf_ultralight_poller_sync_read_card(Nfc* nfc, MfUltralightData* data) {
-    furi_assert(nfc);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(data);
 
     MfUltralightPollerContext poller_context = {};
     poller_context.thread_id = furi_thread_get_current_id();
diff --git a/lib/nfc/protocols/nfc_device_base_i.h b/lib/nfc/protocols/nfc_device_base_i.h
index 946ae76dc..c440e7b93 100644
--- a/lib/nfc/protocols/nfc_device_base_i.h
+++ b/lib/nfc/protocols/nfc_device_base_i.h
@@ -20,7 +20,7 @@ extern "C" {
  *
  * @returns pointer to the allocated instance.
  */
-typedef NfcDeviceData* (*NfcDeviceAlloc)();
+typedef NfcDeviceData* (*NfcDeviceAlloc)(void);
 
 /**
  * @brief Delete the protocol-specific NFC device data instance.
diff --git a/lib/nfc/protocols/nfc_protocol.c b/lib/nfc/protocols/nfc_protocol.c
index 252f86de2..17c39fc9f 100644
--- a/lib/nfc/protocols/nfc_protocol.c
+++ b/lib/nfc/protocols/nfc_protocol.c
@@ -159,14 +159,14 @@ static const NfcProtocolTreeNode nfc_protocol_nodes[NfcProtocolNum] = {
 };
 
 NfcProtocol nfc_protocol_get_parent(NfcProtocol protocol) {
-    furi_assert(protocol < NfcProtocolNum);
+    furi_check(protocol < NfcProtocolNum);
 
     return nfc_protocol_nodes[protocol].parent_protocol;
 }
 
 bool nfc_protocol_has_parent(NfcProtocol protocol, NfcProtocol parent_protocol) {
-    furi_assert(protocol < NfcProtocolNum);
-    furi_assert(parent_protocol < NfcProtocolNum);
+    furi_check(protocol < NfcProtocolNum);
+    furi_check(parent_protocol < NfcProtocolNum);
 
     bool parent_found = false;
     const NfcProtocolTreeNode* iter = &nfc_protocol_nodes[protocol];
diff --git a/lib/nfc/protocols/slix/slix.c b/lib/nfc/protocols/slix/slix.c
index b575baa72..533ecff74 100644
--- a/lib/nfc/protocols/slix/slix.c
+++ b/lib/nfc/protocols/slix/slix.c
@@ -78,8 +78,8 @@ typedef struct {
 static const SlixPasswordConfig slix_password_configs[] = {
     [SlixPasswordTypeRead] = {SLIX_PASSWORD_READ_KEY, SLIX_TYPE_FEATURE_READ, 0x00000000U},
     [SlixPasswordTypeWrite] = {SLIX_PASSWORD_WRITE_KEY, SLIX_TYPE_FEATURE_WRITE, 0x00000000U},
-    [SlixPasswordTypePrivacy] = {SLIX_PASSWORD_PRIVACY_KEY, SLIX_TYPE_FEATURE_PRIVACY, 0xFFFFFFFFU},
-    [SlixPasswordTypeDestroy] = {SLIX_PASSWORD_DESTROY_KEY, SLIX_TYPE_FEATURE_DESTROY, 0xFFFFFFFFU},
+    [SlixPasswordTypePrivacy] = {SLIX_PASSWORD_PRIVACY_KEY, SLIX_TYPE_FEATURE_PRIVACY, 0x0F0F0F0FU},
+    [SlixPasswordTypeDestroy] = {SLIX_PASSWORD_DESTROY_KEY, SLIX_TYPE_FEATURE_DESTROY, 0x0F0F0F0FU},
     [SlixPasswordTypeEasAfi] = {SLIX_PASSWORD_EAS_KEY, SLIX_TYPE_FEATURE_EAS, 0x00000000U},
 };
 
@@ -89,7 +89,7 @@ static void slix_password_set_defaults(SlixPassword* passwords) {
     }
 }
 
-SlixData* slix_alloc() {
+SlixData* slix_alloc(void) {
     SlixData* data = malloc(sizeof(SlixData));
 
     data->iso15693_3_data = iso15693_3_alloc();
@@ -99,7 +99,7 @@ SlixData* slix_alloc() {
 }
 
 void slix_free(SlixData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     iso15693_3_free(data->iso15693_3_data);
 
@@ -107,7 +107,7 @@ void slix_free(SlixData* data) {
 }
 
 void slix_reset(SlixData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     iso15693_3_reset(data->iso15693_3_data);
     slix_password_set_defaults(data->passwords);
@@ -119,8 +119,8 @@ void slix_reset(SlixData* data) {
 }
 
 void slix_copy(SlixData* data, const SlixData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     iso15693_3_copy(data->iso15693_3_data, other->iso15693_3_data);
 
@@ -160,7 +160,8 @@ static bool slix_load_passwords(SlixPassword* passwords, SlixType slix_type, Fli
 }
 
 bool slix_load(SlixData* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     bool loaded = false;
 
@@ -238,7 +239,8 @@ static bool
 }
 
 bool slix_save(const SlixData* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     bool saved = false;
 
@@ -303,6 +305,9 @@ bool slix_save(const SlixData* data, FlipperFormat* ff) {
 }
 
 bool slix_is_equal(const SlixData* data, const SlixData* other) {
+    furi_check(data);
+    furi_check(other);
+
     return iso15693_3_is_equal(data->iso15693_3_data, other->iso15693_3_data) &&
            memcmp(&data->system_info, &other->system_info, sizeof(SlixSystemInfo)) == 0 &&
            memcmp(
@@ -313,6 +318,7 @@ bool slix_is_equal(const SlixData* data, const SlixData* other) {
 }
 
 const char* slix_get_device_name(const SlixData* data, NfcDeviceNameType name_type) {
+    furi_check(data);
     UNUSED(name_type);
 
     const SlixType slix_type = slix_get_type(data);
@@ -322,22 +328,25 @@ const char* slix_get_device_name(const SlixData* data, NfcDeviceNameType name_ty
 }
 
 const uint8_t* slix_get_uid(const SlixData* data, size_t* uid_len) {
+    furi_check(data);
     return iso15693_3_get_uid(data->iso15693_3_data, uid_len);
 }
 
 bool slix_set_uid(SlixData* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     return iso15693_3_set_uid(data->iso15693_3_data, uid, uid_len);
 }
 
 const Iso15693_3Data* slix_get_base_data(const SlixData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->iso15693_3_data;
 }
 
 SlixType slix_get_type(const SlixData* data) {
+    furi_check(data);
+
     SlixType type = SlixTypeUnknown;
 
     do {
@@ -364,14 +373,14 @@ SlixType slix_get_type(const SlixData* data) {
 }
 
 SlixPassword slix_get_password(const SlixData* data, SlixPasswordType password_type) {
-    furi_assert(data);
-    furi_assert(password_type < SlixPasswordTypeCount);
+    furi_check(data);
+    furi_check(password_type < SlixPasswordTypeCount);
 
     return data->passwords[password_type];
 }
 
 uint16_t slix_get_counter(const SlixData* data) {
-    furi_assert(data);
+    furi_check(data);
     const SlixCounter* counter = (const SlixCounter*)iso15693_3_get_block_data(
         data->iso15693_3_data, SLIX_COUNTER_BLOCK_NUM);
 
@@ -379,7 +388,7 @@ uint16_t slix_get_counter(const SlixData* data) {
 }
 
 bool slix_is_privacy_mode(const SlixData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     return data->privacy;
 }
@@ -388,8 +397,8 @@ bool slix_is_block_protected(
     const SlixData* data,
     SlixPasswordType password_type,
     uint8_t block_num) {
-    furi_assert(data);
-    furi_assert(password_type < SlixPasswordTypeCount);
+    furi_check(data);
+    furi_check(password_type < SlixPasswordTypeCount);
 
     bool ret = false;
 
@@ -411,7 +420,7 @@ bool slix_is_block_protected(
 }
 
 bool slix_is_counter_increment_protected(const SlixData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     const SlixCounter* counter = (const SlixCounter*)iso15693_3_get_block_data(
         data->iso15693_3_data, SLIX_COUNTER_BLOCK_NUM);
@@ -420,14 +429,14 @@ bool slix_is_counter_increment_protected(const SlixData* data) {
 }
 
 bool slix_type_has_features(SlixType slix_type, SlixTypeFeatures features) {
-    furi_assert(slix_type < SlixTypeCount);
+    furi_check(slix_type < SlixTypeCount);
 
     return (slix_type_features[slix_type] & features) == features;
 }
 
 bool slix_type_supports_password(SlixType slix_type, SlixPasswordType password_type) {
-    furi_assert(slix_type < SlixTypeCount);
-    furi_assert(password_type < SlixPasswordTypeCount);
+    furi_check(slix_type < SlixTypeCount);
+    furi_check(password_type < SlixPasswordTypeCount);
 
     return slix_type_features[slix_type] & slix_password_configs[password_type].feature_flag;
 }
diff --git a/lib/nfc/protocols/slix/slix.h b/lib/nfc/protocols/slix/slix.h
index 26341072b..2de26847a 100644
--- a/lib/nfc/protocols/slix/slix.h
+++ b/lib/nfc/protocols/slix/slix.h
@@ -99,7 +99,7 @@ typedef struct {
     SlixPrivacy privacy;
 } SlixData;
 
-SlixData* slix_alloc();
+SlixData* slix_alloc(void);
 
 void slix_free(SlixData* data);
 
diff --git a/lib/nfc/protocols/slix/slix_poller.c b/lib/nfc/protocols/slix/slix_poller.c
index d9d38d102..3c9a7cce4 100644
--- a/lib/nfc/protocols/slix/slix_poller.c
+++ b/lib/nfc/protocols/slix/slix_poller.c
@@ -73,17 +73,62 @@ static NfcCommand slix_poller_handler_read_signature(SlixPoller* instance) {
     if(slix_type_has_features(instance->type, SLIX_TYPE_FEATURE_SIGNATURE)) {
         instance->error = slix_poller_read_signature(instance, &instance->data->signature);
         if(instance->error == SlixErrorNone) {
-            instance->poller_state = SlixPollerStateReady;
+            instance->poller_state = SlixPollerStateCheckPrivacyPassword;
         } else {
             instance->poller_state = SlixPollerStateError;
         }
     } else {
-        instance->poller_state = SlixPollerStateReady;
+        instance->poller_state = SlixPollerStateCheckPrivacyPassword;
     }
 
     return NfcCommandContinue;
 }
 
+static NfcCommand slix_poller_handler_check_privacy_password(SlixPoller* instance) {
+    NfcCommand command = NfcCommandContinue;
+
+    do {
+        if(!slix_type_has_features(instance->type, SLIX_TYPE_FEATURE_PRIVACY)) {
+            instance->poller_state = SlixPollerStateReady;
+            break;
+        }
+        if(instance->privacy_password_checked) {
+            instance->poller_state = SlixPollerStateReady;
+            break;
+        }
+
+        instance->slix_event.type = SlixPollerEventTypePrivacyUnlockRequest;
+        command = instance->callback(instance->general_event, instance->context);
+
+        if(!instance->slix_event_data.privacy_password.password_set) {
+            instance->poller_state = SlixPollerStateReady;
+            break;
+        }
+
+        SlixPassword pwd = instance->slix_event_data.privacy_password.password;
+        FURI_LOG_I(TAG, "Trying to check privacy password: %08lX", pwd);
+
+        instance->error = slix_poller_get_random_number(instance, &instance->random_number);
+        if(instance->error != SlixErrorNone) {
+            instance->poller_state = SlixPollerStateReady;
+            break;
+        }
+
+        instance->error = slix_poller_set_password(instance, SlixPasswordTypePrivacy, pwd);
+        if(instance->error != SlixErrorNone) {
+            command = NfcCommandReset;
+            break;
+        }
+
+        FURI_LOG_I(TAG, "Found privacy password");
+        instance->data->passwords[SlixPasswordTypePrivacy] = pwd;
+        instance->privacy_password_checked = true;
+        instance->poller_state = SlixPollerStateReady;
+    } while(false);
+
+    return command;
+}
+
 static NfcCommand slix_poller_handler_privacy_unlock(SlixPoller* instance) {
     NfcCommand command = NfcCommandContinue;
     instance->poller_state = SlixPollerStateError;
@@ -108,6 +153,7 @@ static NfcCommand slix_poller_handler_privacy_unlock(SlixPoller* instance) {
 
         FURI_LOG_I(TAG, "Privacy mode disabled");
         instance->data->passwords[SlixPasswordTypePrivacy] = pwd;
+        instance->privacy_password_checked = true;
         instance->poller_state = SlixPollerStateIdle;
         slix_unlocked = true;
     } while(false);
@@ -140,6 +186,7 @@ static const SlixPollerStateHandler slix_poller_state_handler[SlixPollerStateNum
     [SlixPollerStateError] = slix_poller_handler_error,
     [SlixPollerStateGetNxpSysInfo] = slix_poller_handler_get_nfc_system_info,
     [SlixPollerStateReadSignature] = slix_poller_handler_read_signature,
+    [SlixPollerStateCheckPrivacyPassword] = slix_poller_handler_check_privacy_password,
     [SlixPollerStatePrivacyUnlock] = slix_poller_handler_privacy_unlock,
     [SlixPollerStateReady] = slix_poller_handler_ready,
 };
diff --git a/lib/nfc/protocols/slix/slix_poller_i.h b/lib/nfc/protocols/slix/slix_poller_i.h
index 7a3b543b7..38c23c297 100644
--- a/lib/nfc/protocols/slix/slix_poller_i.h
+++ b/lib/nfc/protocols/slix/slix_poller_i.h
@@ -14,6 +14,7 @@ typedef enum {
     SlixPollerStateIdle,
     SlixPollerStateGetNxpSysInfo,
     SlixPollerStateReadSignature,
+    SlixPollerStateCheckPrivacyPassword,
     SlixPollerStatePrivacyUnlock,
     SlixPollerStateReady,
     SlixPollerStateError,
@@ -27,6 +28,7 @@ struct SlixPoller {
     SlixPollerState poller_state;
     SlixError error;
     SlixRandomNumber random_number;
+    bool privacy_password_checked;
 
     BitBuffer* tx_buffer;
     BitBuffer* rx_buffer;
diff --git a/lib/nfc/protocols/st25tb/st25tb.c b/lib/nfc/protocols/st25tb/st25tb.c
index 2b3eebf9e..8b1e9be2e 100644
--- a/lib/nfc/protocols/st25tb/st25tb.c
+++ b/lib/nfc/protocols/st25tb/st25tb.c
@@ -79,35 +79,39 @@ const NfcDeviceBase nfc_device_st25tb = {
     .get_base_data = (NfcDeviceGetBaseData)st25tb_get_base_data,
 };
 
-St25tbData* st25tb_alloc() {
+St25tbData* st25tb_alloc(void) {
     St25tbData* data = malloc(sizeof(St25tbData));
     return data;
 }
 
 void st25tb_free(St25tbData* data) {
-    furi_assert(data);
+    furi_check(data);
 
     free(data);
 }
 
 void st25tb_reset(St25tbData* data) {
+    furi_check(data);
     memset(data, 0, sizeof(St25tbData));
 }
 
 void st25tb_copy(St25tbData* data, const St25tbData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
     *data = *other;
 }
 
 bool st25tb_verify(St25tbData* data, const FuriString* device_type) {
+    furi_check(device_type);
     UNUSED(data);
+
     return furi_string_equal_str(device_type, ST25TB_PROTOCOL_NAME);
 }
 
 bool st25tb_load(St25tbData* data, FlipperFormat* ff, uint32_t version) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     bool parsed = false;
 
@@ -150,7 +154,8 @@ bool st25tb_load(St25tbData* data, FlipperFormat* ff, uint32_t version) {
 }
 
 bool st25tb_save(const St25tbData* data, FlipperFormat* ff) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(ff);
 
     FuriString* temp_str = furi_string_alloc();
     bool saved = false;
@@ -184,19 +189,21 @@ bool st25tb_save(const St25tbData* data, FlipperFormat* ff) {
 }
 
 bool st25tb_is_equal(const St25tbData* data, const St25tbData* other) {
-    furi_assert(data);
-    furi_assert(other);
+    furi_check(data);
+    furi_check(other);
 
-    return memcmp(data, other, sizeof(St25tbData)) == 0;
+    return memcmp(data, other, sizeof(St25tbData)) == 0; //-V1103
 }
 
 uint8_t st25tb_get_block_count(St25tbType type) {
+    furi_check(type < St25tbTypeNum);
+
     return st25tb_features[type].blocks_total;
 }
 
 const char* st25tb_get_device_name(const St25tbData* data, NfcDeviceNameType name_type) {
-    furi_assert(data);
-    furi_assert(data->type < St25tbTypeNum);
+    furi_check(data);
+    furi_check(data->type < St25tbTypeNum);
 
     if(name_type == NfcDeviceNameTypeFull) {
         return st25tb_features[data->type].full_name;
@@ -206,7 +213,7 @@ const char* st25tb_get_device_name(const St25tbData* data, NfcDeviceNameType nam
 }
 
 const uint8_t* st25tb_get_uid(const St25tbData* data, size_t* uid_len) {
-    furi_assert(data);
+    furi_check(data);
 
     if(uid_len) {
         *uid_len = ST25TB_UID_SIZE;
@@ -216,7 +223,8 @@ const uint8_t* st25tb_get_uid(const St25tbData* data, size_t* uid_len) {
 }
 
 bool st25tb_set_uid(St25tbData* data, const uint8_t* uid, size_t uid_len) {
-    furi_assert(data);
+    furi_check(data);
+    furi_check(uid);
 
     const bool uid_valid = uid_len == ST25TB_UID_SIZE;
 
@@ -233,6 +241,8 @@ St25tbData* st25tb_get_base_data(const St25tbData* data) {
 }
 
 St25tbType st25tb_get_type_from_uid(const uint8_t* uid) {
+    furi_check(uid);
+
     switch(uid[2] >> 2) {
     case 0x0:
     case 0x3:
diff --git a/lib/nfc/protocols/st25tb/st25tb.h b/lib/nfc/protocols/st25tb/st25tb.h
index ed02dc2b2..67d733315 100644
--- a/lib/nfc/protocols/st25tb/st25tb.h
+++ b/lib/nfc/protocols/st25tb/st25tb.h
@@ -48,7 +48,7 @@ typedef struct {
 
 extern const NfcDeviceBase nfc_device_st25tb;
 
-St25tbData* st25tb_alloc();
+St25tbData* st25tb_alloc(void);
 
 void st25tb_free(St25tbData* data);
 
diff --git a/lib/nfc/protocols/st25tb/st25tb_poller_i.c b/lib/nfc/protocols/st25tb/st25tb_poller_i.c
index adb8626a3..2bf025563 100644
--- a/lib/nfc/protocols/st25tb/st25tb_poller_i.c
+++ b/lib/nfc/protocols/st25tb/st25tb_poller_i.c
@@ -20,7 +20,9 @@ St25tbError st25tb_poller_send_frame(
     const BitBuffer* tx_buffer,
     BitBuffer* rx_buffer,
     uint32_t fwt) {
-    furi_assert(instance);
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
 
     const size_t tx_bytes = bit_buffer_get_size_bytes(tx_buffer);
     furi_assert(
@@ -54,8 +56,8 @@ St25tbError st25tb_poller_send_frame(
 
 St25tbError st25tb_poller_initiate(St25tbPoller* instance, uint8_t* chip_id_ptr) {
     // Send Initiate()
-    furi_assert(instance);
-    furi_assert(instance->nfc);
+    furi_check(instance);
+    furi_check(instance->nfc);
 
     bit_buffer_reset(instance->tx_buffer);
     bit_buffer_reset(instance->rx_buffer);
@@ -86,8 +88,8 @@ St25tbError st25tb_poller_initiate(St25tbPoller* instance, uint8_t* chip_id_ptr)
 }
 
 St25tbError st25tb_poller_select(St25tbPoller* instance, uint8_t* chip_id_ptr) {
-    furi_assert(instance);
-    furi_assert(instance->nfc);
+    furi_check(instance);
+    furi_check(instance->nfc);
 
     St25tbError ret;
 
@@ -169,8 +171,9 @@ St25tbError st25tb_poller_read(St25tbPoller* instance, St25tbData* data) {
 }
 
 St25tbError st25tb_poller_get_uid(St25tbPoller* instance, uint8_t* uid) {
-    furi_assert(instance);
-    furi_assert(instance->nfc);
+    furi_check(instance);
+    furi_check(instance->nfc);
+    furi_check(uid);
 
     St25tbError ret;
 
@@ -213,10 +216,10 @@ St25tbError st25tb_poller_get_uid(St25tbPoller* instance, uint8_t* uid) {
 
 St25tbError
     st25tb_poller_read_block(St25tbPoller* instance, uint32_t* block, uint8_t block_number) {
-    furi_assert(instance);
-    furi_assert(instance->nfc);
-    furi_assert(block);
-    furi_assert(
+    furi_check(instance);
+    furi_check(instance->nfc);
+    furi_check(block);
+    furi_check(
         (block_number <= st25tb_get_block_count(instance->data->type)) ||
         block_number == ST25TB_SYSTEM_OTP_BLOCK);
     FURI_LOG_T(TAG, "reading block %d", block_number);
@@ -248,9 +251,9 @@ St25tbError
 
 St25tbError
     st25tb_poller_write_block(St25tbPoller* instance, uint32_t block, uint8_t block_number) {
-    furi_assert(instance);
-    furi_assert(instance->nfc);
-    furi_assert(
+    furi_check(instance);
+    furi_check(instance->nfc);
+    furi_check(
         (block_number <= st25tb_get_block_count(instance->data->type)) ||
         block_number == ST25TB_SYSTEM_OTP_BLOCK);
     FURI_LOG_T(TAG, "writing block %d", block_number);
@@ -292,7 +295,7 @@ St25tbError
 }
 
 St25tbError st25tb_poller_halt(St25tbPoller* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     bit_buffer_reset(instance->tx_buffer);
     bit_buffer_reset(instance->rx_buffer);
diff --git a/lib/nfc/protocols/st25tb/st25tb_poller_sync.c b/lib/nfc/protocols/st25tb/st25tb_poller_sync.c
index 3cd0b3792..359435034 100644
--- a/lib/nfc/protocols/st25tb/st25tb_poller_sync.c
+++ b/lib/nfc/protocols/st25tb/st25tb_poller_sync.c
@@ -109,7 +109,8 @@ static St25tbError st25tb_poller_cmd_execute(Nfc* nfc, St25tbPollerSyncContext*
 }
 
 St25tbError st25tb_poller_sync_read_block(Nfc* nfc, uint8_t block_num, uint32_t* block) {
-    furi_assert(block);
+    furi_check(nfc);
+    furi_check(block);
     St25tbPollerSyncContext poller_context = {
         .cmd_type = St25tbPollerCmdTypeReadBlock,
         .cmd_data =
@@ -125,6 +126,7 @@ St25tbError st25tb_poller_sync_read_block(Nfc* nfc, uint8_t block_num, uint32_t*
 }
 
 St25tbError st25tb_poller_sync_write_block(Nfc* nfc, uint8_t block_num, uint32_t block) {
+    furi_check(nfc);
     St25tbPollerSyncContext poller_context = {
         .cmd_type = St25tbPollerCmdTypeWriteBlock,
         .cmd_data =
@@ -140,7 +142,8 @@ St25tbError st25tb_poller_sync_write_block(Nfc* nfc, uint8_t block_num, uint32_t
 }
 
 St25tbError st25tb_poller_sync_detect_type(Nfc* nfc, St25tbType* type) {
-    furi_assert(type);
+    furi_check(nfc);
+    furi_check(type);
     St25tbPollerSyncContext poller_context = {
         .cmd_type = St25tbPollerCmdTypeDetectType,
         .cmd_data =
@@ -185,8 +188,8 @@ static NfcCommand nfc_scene_read_poller_callback_st25tb(NfcGenericEvent event, v
 }
 
 St25tbError st25tb_poller_sync_read(Nfc* nfc, St25tbData* data) {
-    furi_assert(nfc);
-    furi_assert(data);
+    furi_check(nfc);
+    furi_check(data);
 
     St25tbPollerSyncContext poller_context = {
         .thread_id = furi_thread_get_current_id(),
diff --git a/lib/one_wire/maxim_crc.c b/lib/one_wire/maxim_crc.c
index a5d099b10..ee60163e7 100644
--- a/lib/one_wire/maxim_crc.c
+++ b/lib/one_wire/maxim_crc.c
@@ -1,6 +1,9 @@
 #include "maxim_crc.h"
+#include <furi.h>
 
 uint8_t maxim_crc8(const uint8_t* data, const uint8_t data_size, const uint8_t crc_init) {
+    furi_check(data);
+
     uint8_t crc = crc_init;
 
     for(uint8_t index = 0; index < data_size; ++index) {
diff --git a/lib/one_wire/one_wire_host.c b/lib/one_wire/one_wire_host.c
index 678812105..9383e0f15 100644
--- a/lib/one_wire/one_wire_host.c
+++ b/lib/one_wire/one_wire_host.c
@@ -56,19 +56,26 @@ struct OneWireHost {
 };
 
 OneWireHost* onewire_host_alloc(const GpioPin* gpio_pin) {
+    furi_check(gpio_pin);
+
     OneWireHost* host = malloc(sizeof(OneWireHost));
     host->gpio_pin = gpio_pin;
     onewire_host_reset_search(host);
     onewire_host_set_overdrive(host, false);
+
     return host;
 }
 
 void onewire_host_free(OneWireHost* host) {
+    furi_check(host);
+
     onewire_host_stop(host);
     free(host);
 }
 
 bool onewire_host_reset(OneWireHost* host) {
+    furi_check(host);
+
     uint8_t r;
     uint8_t retries = 125;
 
@@ -100,6 +107,8 @@ bool onewire_host_reset(OneWireHost* host) {
 }
 
 bool onewire_host_read_bit(OneWireHost* host) {
+    furi_check(host);
+
     bool result;
 
     const OneWireHostTimings* timings = host->timings;
@@ -120,6 +129,8 @@ bool onewire_host_read_bit(OneWireHost* host) {
 }
 
 uint8_t onewire_host_read(OneWireHost* host) {
+    furi_check(host);
+
     uint8_t result = 0;
 
     for(uint8_t bitMask = 0x01; bitMask; bitMask <<= 1) {
@@ -132,12 +143,17 @@ uint8_t onewire_host_read(OneWireHost* host) {
 }
 
 void onewire_host_read_bytes(OneWireHost* host, uint8_t* buffer, uint16_t count) {
+    furi_check(host);
+    furi_check(buffer);
+
     for(uint16_t i = 0; i < count; i++) {
         buffer[i] = onewire_host_read(host);
     }
 }
 
 void onewire_host_write_bit(OneWireHost* host, bool value) {
+    furi_check(host);
+
     const OneWireHostTimings* timings = host->timings;
 
     if(value) {
@@ -160,6 +176,8 @@ void onewire_host_write_bit(OneWireHost* host, bool value) {
 }
 
 void onewire_host_write(OneWireHost* host, uint8_t value) {
+    furi_check(host);
+
     uint8_t bitMask;
 
     for(bitMask = 0x01; bitMask; bitMask <<= 1) {
@@ -168,22 +186,31 @@ void onewire_host_write(OneWireHost* host, uint8_t value) {
 }
 
 void onewire_host_write_bytes(OneWireHost* host, const uint8_t* buffer, uint16_t count) {
+    furi_check(host);
+    furi_check(buffer);
+
     for(uint16_t i = 0; i < count; ++i) {
         onewire_host_write(host, buffer[i]);
     }
 }
 
 void onewire_host_start(OneWireHost* host) {
+    furi_check(host);
+
     furi_hal_gpio_write(host->gpio_pin, true);
     furi_hal_gpio_init(host->gpio_pin, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow);
 }
 
 void onewire_host_stop(OneWireHost* host) {
+    furi_check(host);
+
     furi_hal_gpio_write(host->gpio_pin, true);
     furi_hal_gpio_init(host->gpio_pin, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 }
 
 void onewire_host_reset_search(OneWireHost* host) {
+    furi_check(host);
+
     host->last_discrepancy = 0;
     host->last_device_flag = false;
     host->last_family_discrepancy = 0;
@@ -194,6 +221,8 @@ void onewire_host_reset_search(OneWireHost* host) {
 }
 
 void onewire_host_target_search(OneWireHost* host, uint8_t family_code) {
+    furi_check(host);
+
     host->saved_rom[0] = family_code;
     for(uint8_t i = 1; i < 8; i++) host->saved_rom[i] = 0;
     host->last_discrepancy = 64;
@@ -202,6 +231,8 @@ void onewire_host_target_search(OneWireHost* host, uint8_t family_code) {
 }
 
 bool onewire_host_search(OneWireHost* host, uint8_t* new_addr, OneWireHostSearchMode mode) {
+    furi_check(host);
+
     uint8_t id_bit_number;
     uint8_t last_zero, rom_byte_number, search_result;
     uint8_t id_bit, cmp_id_bit;
@@ -317,5 +348,7 @@ bool onewire_host_search(OneWireHost* host, uint8_t* new_addr, OneWireHostSearch
 }
 
 void onewire_host_set_overdrive(OneWireHost* host, bool set) {
+    furi_check(host);
+
     host->timings = set ? &onewire_host_timings_overdrive : &onewire_host_timings_normal;
 }
diff --git a/lib/one_wire/one_wire_slave.c b/lib/one_wire/one_wire_slave.c
index 733b36e30..8dfbe4aa5 100644
--- a/lib/one_wire/one_wire_slave.c
+++ b/lib/one_wire/one_wire_slave.c
@@ -158,6 +158,8 @@ static inline bool onewire_slave_receive_and_process_command(OneWireSlave* bus)
 
 static inline bool onewire_slave_bus_start(OneWireSlave* bus) {
     FURI_CRITICAL_ENTER();
+
+    furi_hal_gpio_disable_int_callback(bus->gpio_pin);
     furi_hal_gpio_init(bus->gpio_pin, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow);
 
     while(onewire_slave_receive_and_process_command(bus))
@@ -166,6 +168,8 @@ static inline bool onewire_slave_bus_start(OneWireSlave* bus) {
     const bool result = (bus->error == OneWireSlaveErrorNone);
 
     furi_hal_gpio_init(bus->gpio_pin, GpioModeInterruptRiseFall, GpioPullNo, GpioSpeedLow);
+    furi_hal_gpio_enable_int_callback(bus->gpio_pin);
+
     FURI_CRITICAL_EXIT();
 
     return result;
@@ -205,6 +209,7 @@ static void onewire_slave_exti_callback(void* context) {
 /*********************** PUBLIC ***********************/
 
 OneWireSlave* onewire_slave_alloc(const GpioPin* gpio_pin) {
+    furi_check(gpio_pin);
     OneWireSlave* bus = malloc(sizeof(OneWireSlave));
 
     bus->gpio_pin = gpio_pin;
@@ -215,17 +220,23 @@ OneWireSlave* onewire_slave_alloc(const GpioPin* gpio_pin) {
 }
 
 void onewire_slave_free(OneWireSlave* bus) {
+    furi_check(bus);
+
     onewire_slave_stop(bus);
     free(bus);
 }
 
 void onewire_slave_start(OneWireSlave* bus) {
+    furi_check(bus);
+
     furi_hal_gpio_add_int_callback(bus->gpio_pin, onewire_slave_exti_callback, bus);
     furi_hal_gpio_write(bus->gpio_pin, true);
     furi_hal_gpio_init(bus->gpio_pin, GpioModeInterruptRiseFall, GpioPullNo, GpioSpeedLow);
 }
 
 void onewire_slave_stop(OneWireSlave* bus) {
+    furi_check(bus);
+
     furi_hal_gpio_write(bus->gpio_pin, true);
     furi_hal_gpio_init(bus->gpio_pin, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
     furi_hal_gpio_remove_int_callback(bus->gpio_pin);
@@ -235,6 +246,7 @@ void onewire_slave_set_reset_callback(
     OneWireSlave* bus,
     OneWireSlaveResetCallback callback,
     void* context) {
+    furi_check(bus);
     bus->reset_callback = callback;
     bus->reset_callback_context = context;
 }
@@ -243,6 +255,8 @@ void onewire_slave_set_command_callback(
     OneWireSlave* bus,
     OneWireSlaveCommandCallback callback,
     void* context) {
+    furi_check(bus);
+
     bus->command_callback = callback;
     bus->command_callback_context = context;
 }
@@ -251,11 +265,14 @@ void onewire_slave_set_result_callback(
     OneWireSlave* bus,
     OneWireSlaveResultCallback result_cb,
     void* context) {
+    furi_check(bus);
     bus->result_callback = result_cb;
     bus->result_callback_context = context;
 }
 
 bool onewire_slave_receive_bit(OneWireSlave* bus) {
+    furi_check(bus);
+
     const OneWireSlaveTimings* timings = bus->timings;
     // wait while bus is low
     if(!onewire_slave_wait_while_gpio_is(bus, timings->tslot_max, false)) {
@@ -274,6 +291,8 @@ bool onewire_slave_receive_bit(OneWireSlave* bus) {
 }
 
 bool onewire_slave_send_bit(OneWireSlave* bus, bool value) {
+    furi_check(bus);
+
     const OneWireSlaveTimings* timings = bus->timings;
     // wait while bus is low
     if(!onewire_slave_wait_while_gpio_is(bus, timings->tslot_max, false)) {
@@ -305,6 +324,8 @@ bool onewire_slave_send_bit(OneWireSlave* bus, bool value) {
 }
 
 bool onewire_slave_send(OneWireSlave* bus, const uint8_t* data, size_t data_size) {
+    furi_check(bus);
+
     furi_hal_gpio_write(bus->gpio_pin, true);
 
     size_t bytes_sent = 0;
@@ -324,6 +345,8 @@ bool onewire_slave_send(OneWireSlave* bus, const uint8_t* data, size_t data_size
 }
 
 bool onewire_slave_receive(OneWireSlave* bus, uint8_t* data, size_t data_size) {
+    furi_check(bus);
+
     furi_hal_gpio_write(bus->gpio_pin, true);
 
     size_t bytes_received = 0;
@@ -347,6 +370,7 @@ bool onewire_slave_receive(OneWireSlave* bus, uint8_t* data, size_t data_size) {
 }
 
 void onewire_slave_set_overdrive(OneWireSlave* bus, bool set) {
+    furi_check(bus);
     const OneWireSlaveTimings* new_timings = set ? &onewire_slave_timings_overdrive :
                                                    &onewire_slave_timings_normal;
     if(bus->timings != new_timings) {
diff --git a/lib/signal_reader/signal_reader.c b/lib/signal_reader/signal_reader.c
index c06c7a5c0..f457cd29c 100644
--- a/lib/signal_reader/signal_reader.c
+++ b/lib/signal_reader/signal_reader.c
@@ -86,9 +86,9 @@ SignalReader* signal_reader_alloc(const GpioPin* gpio_pin, uint32_t size) {
 }
 
 void signal_reader_free(SignalReader* instance) {
-    furi_assert(instance);
-    furi_assert(instance->gpio_buffer);
-    furi_assert(instance->bitstream_buffer);
+    furi_check(instance);
+    furi_check(instance->gpio_buffer);
+    furi_check(instance->bitstream_buffer);
 
     free(instance->gpio_buffer);
     free(instance->bitstream_buffer);
@@ -96,13 +96,13 @@ void signal_reader_free(SignalReader* instance) {
 }
 
 void signal_reader_set_pull(SignalReader* instance, GpioPull pull) {
-    furi_assert(instance);
+    furi_check(instance);
 
     instance->pull = pull;
 }
 
 void signal_reader_set_polarity(SignalReader* instance, SignalReaderPolarity polarity) {
-    furi_assert(instance);
+    furi_check(instance);
 
     instance->polarity = polarity;
 }
@@ -111,14 +111,14 @@ void signal_reader_set_sample_rate(
     SignalReader* instance,
     SignalReaderTimeUnit time_unit,
     uint32_t time) {
-    furi_assert(instance);
+    furi_check(instance);
     UNUSED(time_unit);
 
     instance->tim_arr = time;
 }
 
 void signal_reader_set_trigger(SignalReader* instance, SignalReaderTrigger trigger) {
-    furi_assert(instance);
+    furi_check(instance);
 
     instance->trigger = trigger;
 }
@@ -186,8 +186,8 @@ static void furi_hal_sw_digital_pin_dma_rx_isr(void* context) {
 }
 
 void signal_reader_start(SignalReader* instance, SignalReaderCallback callback, void* context) {
-    furi_assert(instance);
-    furi_assert(callback);
+    furi_check(instance);
+    furi_check(callback);
 
     instance->callback = callback;
     instance->context = context;
@@ -306,7 +306,7 @@ void signal_reader_start(SignalReader* instance, SignalReaderCallback callback,
 }
 
 void signal_reader_stop(SignalReader* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     furi_hal_interrupt_set_isr(SIGNAL_READER_DMA_GPIO_IRQ, NULL, NULL);
 
diff --git a/lib/stm32wb_copro b/lib/stm32wb_copro
index d8a6f1feb..64a060d91 160000
--- a/lib/stm32wb_copro
+++ b/lib/stm32wb_copro
@@ -1 +1 @@
-Subproject commit d8a6f1feb0ebb6798c44162c6ae5ea743f90f3df
+Subproject commit 64a060d91f5cbf25d765cf23231876add006bcf4
diff --git a/lib/subghz/blocks/custom_btn.c b/lib/subghz/blocks/custom_btn.c
index e33f79887..6a185c37b 100644
--- a/lib/subghz/blocks/custom_btn.c
+++ b/lib/subghz/blocks/custom_btn.c
@@ -15,7 +15,7 @@ bool subghz_custom_btn_set(uint8_t btn_id) {
     }
 }
 
-uint8_t subghz_custom_btn_get() {
+uint8_t subghz_custom_btn_get(void) {
     return custom_btn_id;
 }
 
@@ -23,7 +23,7 @@ void subghz_custom_btn_set_original(uint8_t btn_code) {
     custom_btn_original = btn_code;
 }
 
-uint8_t subghz_custom_btn_get_original() {
+uint8_t subghz_custom_btn_get_original(void) {
     return custom_btn_original;
 }
 
@@ -31,14 +31,14 @@ void subghz_custom_btn_set_max(uint8_t b) {
     custom_btn_max_btns = b;
 }
 
-void subghz_custom_btns_reset() {
+void subghz_custom_btns_reset(void) {
     custom_btn_original = 0;
     custom_btn_max_btns = 0;
     controller_programming_mode = PROG_MODE_OFF;
     custom_btn_id = SUBGHZ_CUSTOM_BTN_OK;
 }
 
-bool subghz_custom_btn_is_allowed() {
+bool subghz_custom_btn_is_allowed(void) {
     return custom_btn_max_btns != 0;
 }
 
@@ -46,6 +46,6 @@ void subghz_custom_btn_set_prog_mode(ProgMode prog_mode) {
     controller_programming_mode = prog_mode;
 }
 
-ProgMode subghz_custom_btn_get_prog_mode() {
+ProgMode subghz_custom_btn_get_prog_mode(void) {
     return controller_programming_mode;
 }
diff --git a/lib/subghz/blocks/custom_btn.h b/lib/subghz/blocks/custom_btn.h
index 45cd839d4..8473fa8c2 100644
--- a/lib/subghz/blocks/custom_btn.h
+++ b/lib/subghz/blocks/custom_btn.h
@@ -17,13 +17,13 @@ extern "C" {
 
 bool subghz_custom_btn_set(uint8_t btn_id);
 
-uint8_t subghz_custom_btn_get();
+uint8_t subghz_custom_btn_get(void);
 
-uint8_t subghz_custom_btn_get_original();
+uint8_t subghz_custom_btn_get_original(void);
 
-void subghz_custom_btns_reset();
+void subghz_custom_btns_reset(void);
 
-bool subghz_custom_btn_is_allowed();
+bool subghz_custom_btn_is_allowed(void);
 
 #ifdef __cplusplus
 }
diff --git a/lib/subghz/blocks/custom_btn_i.h b/lib/subghz/blocks/custom_btn_i.h
index aafcc82da..b800d7079 100644
--- a/lib/subghz/blocks/custom_btn_i.h
+++ b/lib/subghz/blocks/custom_btn_i.h
@@ -15,4 +15,4 @@ void subghz_custom_btn_set_max(uint8_t b);
 
 void subghz_custom_btn_set_prog_mode(ProgMode prog_mode);
 
-ProgMode subghz_custom_btn_get_prog_mode();
+ProgMode subghz_custom_btn_get_prog_mode(void);
diff --git a/lib/subghz/blocks/encoder.c b/lib/subghz/blocks/encoder.c
index 49ec4f177..4968c5e40 100644
--- a/lib/subghz/blocks/encoder.c
+++ b/lib/subghz/blocks/encoder.c
@@ -2,8 +2,6 @@
 #include "math.h"
 #include <core/check.h>
 
-#include "furi.h"
-
 #define TAG "SubGhzBlockEncoder"
 
 void subghz_protocol_blocks_set_bit_array(
@@ -11,7 +9,7 @@ void subghz_protocol_blocks_set_bit_array(
     uint8_t data_array[],
     size_t set_index_bit,
     size_t max_size_array) {
-    furi_assert(set_index_bit < max_size_array * 8);
+    furi_check(set_index_bit < max_size_array * 8);
     bit_write(data_array[set_index_bit >> 3], 7 - (set_index_bit & 0x7), bit_value);
 }
 
diff --git a/lib/subghz/blocks/generic.c b/lib/subghz/blocks/generic.c
index 1827388af..f11178c63 100644
--- a/lib/subghz/blocks/generic.c
+++ b/lib/subghz/blocks/generic.c
@@ -24,7 +24,7 @@ SubGhzProtocolStatus subghz_block_generic_serialize(
     SubGhzBlockGeneric* instance,
     FlipperFormat* flipper_format,
     SubGhzRadioPreset* preset) {
-    furi_assert(instance);
+    furi_check(instance);
     SubGhzProtocolStatus res = SubGhzProtocolStatusError;
     FuriString* temp_str;
     temp_str = furi_string_alloc();
@@ -104,7 +104,8 @@ SubGhzProtocolStatus subghz_block_generic_serialize(
 
 SubGhzProtocolStatus
     subghz_block_generic_deserialize(SubGhzBlockGeneric* instance, FlipperFormat* flipper_format) {
-    furi_assert(instance);
+    furi_check(instance);
+
     SubGhzProtocolStatus res = SubGhzProtocolStatusError;
     FuriString* temp_str;
     temp_str = furi_string_alloc();
@@ -145,6 +146,7 @@ SubGhzProtocolStatus subghz_block_generic_deserialize_check_count_bit(
     SubGhzBlockGeneric* instance,
     FlipperFormat* flipper_format,
     uint16_t count_bit) {
+    furi_check(instance);
     SubGhzProtocolStatus ret = SubGhzProtocolStatusError;
     do {
         ret = subghz_block_generic_deserialize(instance, flipper_format);
diff --git a/lib/subghz/devices/devices.c b/lib/subghz/devices/devices.c
index e034c474d..9ae252017 100644
--- a/lib/subghz/devices/devices.c
+++ b/lib/subghz/devices/devices.c
@@ -2,7 +2,7 @@
 
 #include "registry.h"
 
-void subghz_devices_init() {
+void subghz_devices_init(void) {
     furi_check(!subghz_device_registry_is_valid());
     subghz_device_registry_init();
 }
@@ -27,13 +27,13 @@ const char* subghz_devices_get_name(const SubGhzDevice* device) {
 }
 
 bool subghz_devices_begin(const SubGhzDevice* device) {
+    furi_check(device);
     bool ret = false;
-    furi_assert(device);
     if(device->interconnect->begin) {
         SubGhzDeviceConf conf = {
             .ver = 1,
             .extended_range = false, // TODO
-            .power_amp = furi_hal_subghz_get_ext_power_amp(),
+            .power_amp = true,
         };
 
         ret = device->interconnect->begin(&conf);
@@ -42,15 +42,15 @@ bool subghz_devices_begin(const SubGhzDevice* device) {
 }
 
 void subghz_devices_end(const SubGhzDevice* device) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->end) {
         device->interconnect->end();
     }
 }
 
 bool subghz_devices_is_connect(const SubGhzDevice* device) {
+    furi_check(device);
     bool ret = false;
-    furi_assert(device);
     if(device->interconnect->is_connect) {
         ret = device->interconnect->is_connect();
     }
@@ -58,21 +58,21 @@ bool subghz_devices_is_connect(const SubGhzDevice* device) {
 }
 
 void subghz_devices_reset(const SubGhzDevice* device) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->reset) {
         device->interconnect->reset();
     }
 }
 
 void subghz_devices_sleep(const SubGhzDevice* device) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->sleep) {
         device->interconnect->sleep();
     }
 }
 
 void subghz_devices_idle(const SubGhzDevice* device) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->idle) {
         device->interconnect->idle();
     }
@@ -82,15 +82,15 @@ void subghz_devices_load_preset(
     const SubGhzDevice* device,
     FuriHalSubGhzPreset preset,
     uint8_t* preset_data) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->load_preset) {
         device->interconnect->load_preset(preset, preset_data);
     }
 }
 
 uint32_t subghz_devices_set_frequency(const SubGhzDevice* device, uint32_t frequency) {
+    furi_check(device);
     uint32_t ret = 0;
-    furi_assert(device);
     if(device->interconnect->set_frequency) {
         ret = device->interconnect->set_frequency(frequency);
     }
@@ -99,7 +99,7 @@ uint32_t subghz_devices_set_frequency(const SubGhzDevice* device, uint32_t frequ
 
 bool subghz_devices_is_frequency_valid(const SubGhzDevice* device, uint32_t frequency) {
     bool ret = false;
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->is_frequency_valid) {
         ret = device->interconnect->is_frequency_valid(frequency);
     }
@@ -107,15 +107,15 @@ bool subghz_devices_is_frequency_valid(const SubGhzDevice* device, uint32_t freq
 }
 
 void subghz_devices_set_async_mirror_pin(const SubGhzDevice* device, const GpioPin* gpio) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->set_async_mirror_pin) {
         device->interconnect->set_async_mirror_pin(gpio);
     }
 }
 
 const GpioPin* subghz_devices_get_data_gpio(const SubGhzDevice* device) {
+    furi_check(device);
     const GpioPin* ret = NULL;
-    furi_assert(device);
     if(device->interconnect->get_data_gpio) {
         ret = device->interconnect->get_data_gpio();
     }
@@ -124,7 +124,7 @@ const GpioPin* subghz_devices_get_data_gpio(const SubGhzDevice* device) {
 
 bool subghz_devices_set_tx(const SubGhzDevice* device) {
     bool ret = 0;
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->set_tx) {
         ret = device->interconnect->set_tx();
     }
@@ -132,7 +132,7 @@ bool subghz_devices_set_tx(const SubGhzDevice* device) {
 }
 
 void subghz_devices_flush_tx(const SubGhzDevice* device) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->flush_tx) {
         device->interconnect->flush_tx();
     }
@@ -140,7 +140,7 @@ void subghz_devices_flush_tx(const SubGhzDevice* device) {
 
 bool subghz_devices_start_async_tx(const SubGhzDevice* device, void* callback, void* context) {
     bool ret = false;
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->start_async_tx) {
         ret = device->interconnect->start_async_tx(callback, context);
     }
@@ -149,7 +149,7 @@ bool subghz_devices_start_async_tx(const SubGhzDevice* device, void* callback, v
 
 bool subghz_devices_is_async_complete_tx(const SubGhzDevice* device) {
     bool ret = false;
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->is_async_complete_tx) {
         ret = device->interconnect->is_async_complete_tx();
     }
@@ -157,35 +157,35 @@ bool subghz_devices_is_async_complete_tx(const SubGhzDevice* device) {
 }
 
 void subghz_devices_stop_async_tx(const SubGhzDevice* device) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->stop_async_tx) {
         device->interconnect->stop_async_tx();
     }
 }
 
 void subghz_devices_set_rx(const SubGhzDevice* device) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->set_rx) {
         device->interconnect->set_rx();
     }
 }
 
 void subghz_devices_flush_rx(const SubGhzDevice* device) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->flush_rx) {
         device->interconnect->flush_rx();
     }
 }
 
 void subghz_devices_start_async_rx(const SubGhzDevice* device, void* callback, void* context) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->start_async_rx) {
         device->interconnect->start_async_rx(callback, context);
     }
 }
 
 void subghz_devices_stop_async_rx(const SubGhzDevice* device) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->stop_async_rx) {
         device->interconnect->stop_async_rx();
     }
@@ -193,7 +193,7 @@ void subghz_devices_stop_async_rx(const SubGhzDevice* device) {
 
 float subghz_devices_get_rssi(const SubGhzDevice* device) {
     float ret = 0;
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->get_rssi) {
         ret = device->interconnect->get_rssi();
     }
@@ -201,8 +201,8 @@ float subghz_devices_get_rssi(const SubGhzDevice* device) {
 }
 
 uint8_t subghz_devices_get_lqi(const SubGhzDevice* device) {
+    furi_check(device);
     uint8_t ret = 0;
-    furi_assert(device);
     if(device->interconnect->get_lqi) {
         ret = device->interconnect->get_lqi();
     }
@@ -210,8 +210,8 @@ uint8_t subghz_devices_get_lqi(const SubGhzDevice* device) {
 }
 
 bool subghz_devices_rx_pipe_not_empty(const SubGhzDevice* device) {
+    furi_check(device);
     bool ret = false;
-    furi_assert(device);
     if(device->interconnect->rx_pipe_not_empty) {
         ret = device->interconnect->rx_pipe_not_empty();
     }
@@ -220,7 +220,7 @@ bool subghz_devices_rx_pipe_not_empty(const SubGhzDevice* device) {
 
 bool subghz_devices_is_rx_data_crc_valid(const SubGhzDevice* device) {
     bool ret = false;
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->is_rx_data_crc_valid) {
         ret = device->interconnect->is_rx_data_crc_valid();
     }
@@ -228,15 +228,14 @@ bool subghz_devices_is_rx_data_crc_valid(const SubGhzDevice* device) {
 }
 
 void subghz_devices_read_packet(const SubGhzDevice* device, uint8_t* data, uint8_t* size) {
-    furi_assert(device);
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->read_packet) {
         device->interconnect->read_packet(data, size);
     }
 }
 
 void subghz_devices_write_packet(const SubGhzDevice* device, const uint8_t* data, uint8_t size) {
-    furi_assert(device);
+    furi_check(device);
     if(device->interconnect->write_packet) {
         device->interconnect->write_packet(data, size);
     }
diff --git a/lib/subghz/devices/devices.h b/lib/subghz/devices/devices.h
index dad3c9aeb..9d6b7dbe5 100644
--- a/lib/subghz/devices/devices.h
+++ b/lib/subghz/devices/devices.h
@@ -8,7 +8,7 @@ extern "C" {
 
 typedef struct SubGhzDevice SubGhzDevice;
 
-void subghz_devices_init();
+void subghz_devices_init(void);
 void subghz_devices_deinit(void);
 
 const SubGhzDevice* subghz_devices_get_by_name(const char* device_name);
diff --git a/lib/subghz/environment.c b/lib/subghz/environment.c
index 7b1e87b41..e129b689b 100644
--- a/lib/subghz/environment.c
+++ b/lib/subghz/environment.c
@@ -10,7 +10,7 @@ struct SubGhzEnvironment {
     uint8_t kl_type;
 };
 
-SubGhzEnvironment* subghz_environment_alloc() {
+SubGhzEnvironment* subghz_environment_alloc(void) {
     SubGhzEnvironment* instance = malloc(sizeof(SubGhzEnvironment));
 
     instance->keystore = subghz_keystore_alloc();
@@ -24,7 +24,7 @@ SubGhzEnvironment* subghz_environment_alloc() {
 }
 
 void subghz_environment_free(SubGhzEnvironment* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     instance->protocol_registry = NULL;
     instance->nice_flor_s_rainbow_table_file_name = NULL;
@@ -35,13 +35,13 @@ void subghz_environment_free(SubGhzEnvironment* instance) {
 }
 
 bool subghz_environment_load_keystore(SubGhzEnvironment* instance, const char* filename) {
-    furi_assert(instance);
+    furi_check(instance);
 
     return subghz_keystore_load(instance->keystore, filename);
 }
 
 SubGhzKeystore* subghz_environment_get_keystore(SubGhzEnvironment* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     return instance->keystore;
 }
@@ -65,14 +65,14 @@ const char*
 void subghz_environment_set_alutech_at_4n_rainbow_table_file_name(
     SubGhzEnvironment* instance,
     const char* filename) {
-    furi_assert(instance);
+    furi_check(instance);
 
     instance->alutech_at_4n_rainbow_table_file_name = filename;
 }
 
 const char*
     subghz_environment_get_alutech_at_4n_rainbow_table_file_name(SubGhzEnvironment* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     return instance->alutech_at_4n_rainbow_table_file_name;
 }
@@ -80,14 +80,14 @@ const char*
 void subghz_environment_set_nice_flor_s_rainbow_table_file_name(
     SubGhzEnvironment* instance,
     const char* filename) {
-    furi_assert(instance);
+    furi_check(instance);
 
     instance->nice_flor_s_rainbow_table_file_name = filename;
 }
 
 const char*
     subghz_environment_get_nice_flor_s_rainbow_table_file_name(SubGhzEnvironment* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     return instance->nice_flor_s_rainbow_table_file_name;
 }
@@ -95,22 +95,22 @@ const char*
 void subghz_environment_set_protocol_registry(
     SubGhzEnvironment* instance,
     const SubGhzProtocolRegistry* protocol_registry_items) {
-    furi_assert(instance);
+    furi_check(instance);
     const SubGhzProtocolRegistry* protocol_registry = protocol_registry_items;
     instance->protocol_registry = protocol_registry;
 }
 
 const SubGhzProtocolRegistry*
     subghz_environment_get_protocol_registry(SubGhzEnvironment* instance) {
-    furi_assert(instance);
-    furi_assert(instance->protocol_registry);
+    furi_check(instance);
+    furi_check(instance->protocol_registry);
     return instance->protocol_registry;
 }
 
 const char*
     subghz_environment_get_protocol_name_registry(SubGhzEnvironment* instance, size_t idx) {
-    furi_assert(instance);
-    furi_assert(instance->protocol_registry);
+    furi_check(instance);
+    furi_check(instance->protocol_registry);
     const SubGhzProtocol* protocol =
         subghz_protocol_registry_get_by_index(instance->protocol_registry, idx);
     if(protocol != NULL) {
diff --git a/lib/subghz/environment.h b/lib/subghz/environment.h
index ff694acb8..195b11d76 100644
--- a/lib/subghz/environment.h
+++ b/lib/subghz/environment.h
@@ -16,7 +16,7 @@ typedef struct SubGhzProtocolRegistry SubGhzProtocolRegistry;
  * Allocate SubGhzEnvironment.
  * @return SubGhzEnvironment* pointer to a SubGhzEnvironment instance
  */
-SubGhzEnvironment* subghz_environment_alloc();
+SubGhzEnvironment* subghz_environment_alloc(void);
 
 /**
  * Free SubGhzEnvironment.
diff --git a/lib/subghz/protocols/alutech_at_4n.c b/lib/subghz/protocols/alutech_at_4n.c
index 2a16cae85..d0c410e1c 100644
--- a/lib/subghz/protocols/alutech_at_4n.c
+++ b/lib/subghz/protocols/alutech_at_4n.c
@@ -323,7 +323,7 @@ bool subghz_protocol_alutech_at_4n_create_data(
  * Basic set | 0x11 | 0x22 | 0xFF | 0x44 | 0x33 |
  * @return Button code
  */
-static uint8_t subghz_protocol_alutech_at_4n_get_btn_code();
+static uint8_t subghz_protocol_alutech_at_4n_get_btn_code(void);
 
 /**
  * Generating an upload from data.
@@ -701,7 +701,7 @@ SubGhzProtocolStatus subghz_protocol_decoder_alutech_at_4n_deserialize(
     return ret;
 }
 
-static uint8_t subghz_protocol_alutech_at_4n_get_btn_code() {
+static uint8_t subghz_protocol_alutech_at_4n_get_btn_code(void) {
     uint8_t custom_btn_id = subghz_custom_btn_get();
     uint8_t original_btn_code = subghz_custom_btn_get_original();
     uint8_t btn = original_btn_code;
diff --git a/lib/subghz/protocols/base.c b/lib/subghz/protocols/base.c
index 37d1a308f..99af45bb2 100644
--- a/lib/subghz/protocols/base.c
+++ b/lib/subghz/protocols/base.c
@@ -5,6 +5,8 @@ void subghz_protocol_decoder_base_set_decoder_callback(
     SubGhzProtocolDecoderBase* decoder_base,
     SubGhzProtocolDecoderBaseRxCallback callback,
     void* context) {
+    furi_check(decoder_base);
+
     decoder_base->callback = callback;
     decoder_base->context = context;
 }
@@ -12,6 +14,9 @@ void subghz_protocol_decoder_base_set_decoder_callback(
 bool subghz_protocol_decoder_base_get_string(
     SubGhzProtocolDecoderBase* decoder_base,
     FuriString* output) {
+    furi_check(decoder_base);
+    furi_check(output);
+
     bool status = false;
 
     if(decoder_base->protocol && decoder_base->protocol->decoder &&
@@ -27,6 +32,9 @@ SubGhzProtocolStatus subghz_protocol_decoder_base_serialize(
     SubGhzProtocolDecoderBase* decoder_base,
     FlipperFormat* flipper_format,
     SubGhzRadioPreset* preset) {
+    furi_check(decoder_base);
+    furi_check(flipper_format);
+
     SubGhzProtocolStatus status = SubGhzProtocolStatusError;
 
     if(decoder_base->protocol && decoder_base->protocol->decoder &&
@@ -40,6 +48,8 @@ SubGhzProtocolStatus subghz_protocol_decoder_base_serialize(
 SubGhzProtocolStatus subghz_protocol_decoder_base_deserialize(
     SubGhzProtocolDecoderBase* decoder_base,
     FlipperFormat* flipper_format) {
+    furi_check(decoder_base);
+
     SubGhzProtocolStatus status = SubGhzProtocolStatusError;
 
     if(decoder_base->protocol && decoder_base->protocol->decoder &&
@@ -51,6 +61,8 @@ SubGhzProtocolStatus subghz_protocol_decoder_base_deserialize(
 }
 
 uint8_t subghz_protocol_decoder_base_get_hash_data(SubGhzProtocolDecoderBase* decoder_base) {
+    furi_check(decoder_base);
+
     uint8_t hash = 0;
 
     if(decoder_base->protocol && decoder_base->protocol->decoder &&
diff --git a/lib/subghz/protocols/bin_raw.c b/lib/subghz/protocols/bin_raw.c
index 511846797..6c0efd34d 100644
--- a/lib/subghz/protocols/bin_raw.c
+++ b/lib/subghz/protocols/bin_raw.c
@@ -882,7 +882,7 @@ static bool
 void subghz_protocol_decoder_bin_raw_data_input_rssi(
     SubGhzProtocolDecoderBinRAW* instance,
     float rssi) {
-    furi_assert(instance);
+    furi_check(instance);
     switch(instance->decoder.parser_step) {
     case BinRAWDecoderStepReset:
 
diff --git a/lib/subghz/protocols/came_atomo.c b/lib/subghz/protocols/came_atomo.c
index 87927e362..d21440490 100644
--- a/lib/subghz/protocols/came_atomo.c
+++ b/lib/subghz/protocols/came_atomo.c
@@ -78,7 +78,7 @@ static void subghz_protocol_came_atomo_remote_controller(SubGhzBlockGeneric* ins
  * Basic set | 0x0 | 0x2 | 0x4 | 0x6 |
  * @return Button code
  */
-static uint8_t subghz_protocol_came_atomo_get_btn_code();
+static uint8_t subghz_protocol_came_atomo_get_btn_code(void);
 
 void* subghz_protocol_encoder_came_atomo_alloc(SubGhzEnvironment* environment) {
     UNUSED(environment);
@@ -614,7 +614,7 @@ void atomo_decrypt(uint8_t* buff) {
     }
 }
 
-static uint8_t subghz_protocol_came_atomo_get_btn_code() {
+static uint8_t subghz_protocol_came_atomo_get_btn_code(void) {
     uint8_t custom_btn_id = subghz_custom_btn_get();
     uint8_t original_btn_code = subghz_custom_btn_get_original();
     uint8_t btn = original_btn_code;
diff --git a/lib/subghz/protocols/faac_slh.c b/lib/subghz/protocols/faac_slh.c
index 2044d9d20..b095977e1 100644
--- a/lib/subghz/protocols/faac_slh.c
+++ b/lib/subghz/protocols/faac_slh.c
@@ -24,7 +24,7 @@ static uint32_t temp_counter_backup = 0;
 static bool faac_prog_mode = false;
 static bool allow_zero_seed = false;
 
-void faac_slh_reset_prog_mode() {
+void faac_slh_reset_prog_mode(void) {
     temp_fix_backup = 0;
     temp_counter_backup = 0;
     faac_prog_mode = false;
diff --git a/lib/subghz/protocols/faac_slh.h b/lib/subghz/protocols/faac_slh.h
index 16b6f031e..66cbb70fa 100644
--- a/lib/subghz/protocols/faac_slh.h
+++ b/lib/subghz/protocols/faac_slh.h
@@ -110,4 +110,4 @@ void subghz_protocol_decoder_faac_slh_get_string(void* context, FuriString* outp
 
 // Reset prog mode vars
 // TODO: Remake in proper way
-void faac_slh_reset_prog_mode();
\ No newline at end of file
+void faac_slh_reset_prog_mode(void);
\ No newline at end of file
diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c
index 0f20cc529..cd0c3f8c6 100644
--- a/lib/subghz/protocols/keeloq.c
+++ b/lib/subghz/protocols/keeloq.c
@@ -346,7 +346,7 @@ bool subghz_protocol_keeloq_create_data(
     uint16_t cnt,
     const char* manufacture_name,
     SubGhzRadioPreset* preset) {
-    furi_assert(context);
+    furi_check(context);
     SubGhzProtocolEncoderKeeloq* instance = context;
     instance->generic.serial = serial;
     instance->generic.cnt = cnt;
diff --git a/lib/subghz/protocols/linear_delta3.c b/lib/subghz/protocols/linear_delta3.c
index 97ac5cc5a..321d25d41 100644
--- a/lib/subghz/protocols/linear_delta3.c
+++ b/lib/subghz/protocols/linear_delta3.c
@@ -10,9 +10,9 @@
 
 #define DIP_PATTERN "%c%c%c%c%c%c%c%c"
 #define DATA_TO_DIP(dip)                                                                    \
-    (dip & 0x0080 ? '1' : '0'), (dip & 0x0040 ? '1' : '0'), (dip & 0x0020 ? '1' : '0'),     \
-        (dip & 0x0010 ? '1' : '0'), (dip & 0x0008 ? '1' : '0'), (dip & 0x0004 ? '1' : '0'), \
-        (dip & 0x0002 ? '1' : '0'), (dip & 0x0001 ? '1' : '0')
+    (dip & 0x0080 ? '0' : '1'), (dip & 0x0040 ? '0' : '1'), (dip & 0x0020 ? '0' : '1'),     \
+        (dip & 0x0010 ? '0' : '1'), (dip & 0x0008 ? '0' : '1'), (dip & 0x0004 ? '0' : '1'), \
+        (dip & 0x0002 ? '0' : '1'), (dip & 0x0001 ? '0' : '1')
 
 static const SubGhzBlockConst subghz_protocol_linear_delta3_const = {
     .te_short = 500,
diff --git a/lib/subghz/protocols/nice_flor_s.c b/lib/subghz/protocols/nice_flor_s.c
index 3f56ba107..2e0435bdb 100644
--- a/lib/subghz/protocols/nice_flor_s.c
+++ b/lib/subghz/protocols/nice_flor_s.c
@@ -122,7 +122,7 @@ static void subghz_protocol_nice_one_get_data(uint8_t* p, uint8_t num_parcel, ui
  * Basic set | 0x1 | 0x2 | 0x4 | 0x8 |
  * @return Button code
  */
-static uint8_t subghz_protocol_nice_flor_s_get_btn_code();
+static uint8_t subghz_protocol_nice_flor_s_get_btn_code(void);
 
 /**
  * Generating an upload from data.
@@ -751,7 +751,7 @@ SubGhzProtocolStatus
     return ret;
 }
 
-static uint8_t subghz_protocol_nice_flor_s_get_btn_code() {
+static uint8_t subghz_protocol_nice_flor_s_get_btn_code(void) {
     uint8_t custom_btn_id = subghz_custom_btn_get();
     uint8_t original_btn_code = subghz_custom_btn_get_original();
     uint8_t btn = original_btn_code;
diff --git a/lib/subghz/protocols/raw.c b/lib/subghz/protocols/raw.c
index 35ac7fdd2..d837ea68b 100644
--- a/lib/subghz/protocols/raw.c
+++ b/lib/subghz/protocols/raw.c
@@ -87,7 +87,7 @@ bool subghz_protocol_raw_save_to_file_init(
     SubGhzProtocolDecoderRAW* instance,
     const char* dev_name,
     SubGhzRadioPreset* preset) {
-    furi_assert(instance);
+    furi_check(instance);
 
     instance->storage = furi_record_open(RECORD_STORAGE);
     instance->flipper_file = flipper_format_file_alloc(instance->storage);
@@ -189,7 +189,7 @@ static bool subghz_protocol_raw_save_to_file_write(SubGhzProtocolDecoderRAW* ins
 }
 
 void subghz_protocol_raw_save_to_file_stop(SubGhzProtocolDecoderRAW* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     if(instance->file_is_open == RAWFileIsOpenWrite && instance->ind_write)
         subghz_protocol_raw_save_to_file_write(instance);
@@ -205,7 +205,7 @@ void subghz_protocol_raw_save_to_file_stop(SubGhzProtocolDecoderRAW* instance) {
 }
 
 void subghz_protocol_raw_save_to_file_pause(SubGhzProtocolDecoderRAW* instance, bool pause) {
-    furi_assert(instance);
+    furi_check(instance);
 
     if(instance->pause != pause) {
         instance->pause = pause;
@@ -213,6 +213,7 @@ void subghz_protocol_raw_save_to_file_pause(SubGhzProtocolDecoderRAW* instance,
 }
 
 size_t subghz_protocol_raw_get_sample_write(SubGhzProtocolDecoderRAW* instance) {
+    furi_check(instance);
     return instance->sample_write + instance->ind_write;
 }
 
@@ -230,21 +231,21 @@ void* subghz_protocol_decoder_raw_alloc(SubGhzEnvironment* environment) {
 }
 
 void subghz_protocol_decoder_raw_free(void* context) {
-    furi_assert(context);
+    furi_check(context);
     SubGhzProtocolDecoderRAW* instance = context;
     furi_string_free(instance->file_name);
     free(instance);
 }
 
 void subghz_protocol_decoder_raw_reset(void* context) {
-    furi_assert(context);
+    furi_check(context);
     SubGhzProtocolDecoderRAW* instance = context;
     instance->ind_write = 0;
     instance->last_level = false;
 }
 
 void subghz_protocol_decoder_raw_feed(void* context, bool level, uint32_t duration) {
-    furi_assert(context);
+    furi_check(context);
     SubGhzProtocolDecoderRAW* instance = context;
     // Add check if we got duration higher than 1 second, we skipping it, temp fix
     if((!instance->pause && (instance->upload_raw != NULL)) && (duration < ((uint32_t)1000000))) {
@@ -263,7 +264,7 @@ void subghz_protocol_decoder_raw_feed(void* context, bool level, uint32_t durati
 
 SubGhzProtocolStatus
     subghz_protocol_decoder_raw_deserialize(void* context, FlipperFormat* flipper_format) {
-    furi_assert(context);
+    furi_check(context);
     UNUSED(context);
     UNUSED(flipper_format);
     // stub, for backwards compatibility
@@ -271,7 +272,7 @@ SubGhzProtocolStatus
 }
 
 void subghz_protocol_decoder_raw_get_string(void* context, FuriString* output) {
-    furi_assert(context);
+    furi_check(context);
     //SubGhzProtocolDecoderRAW* instance = context;
     UNUSED(context);
     furi_string_cat_printf(output, "RAW Data");
@@ -289,6 +290,7 @@ void* subghz_protocol_encoder_raw_alloc(SubGhzEnvironment* environment) {
 }
 
 void subghz_protocol_encoder_raw_stop(void* context) {
+    furi_check(context);
     SubGhzProtocolEncoderRAW* instance = context;
     instance->is_running = false;
     if(subghz_file_encoder_worker_is_running(instance->file_worker_encoder)) {
@@ -298,7 +300,7 @@ void subghz_protocol_encoder_raw_stop(void* context) {
 }
 
 void subghz_protocol_encoder_raw_free(void* context) {
-    furi_assert(context);
+    furi_check(context);
     SubGhzProtocolEncoderRAW* instance = context;
     subghz_protocol_encoder_raw_stop(instance);
     furi_string_free(instance->file_name);
@@ -310,8 +312,8 @@ void subghz_protocol_raw_file_encoder_worker_set_callback_end(
     SubGhzProtocolEncoderRAW* instance,
     SubGhzProtocolEncoderRAWCallbackEnd callback_end,
     void* context_end) {
-    furi_assert(instance);
-    furi_assert(callback_end);
+    furi_check(instance);
+    furi_check(callback_end);
     subghz_file_encoder_worker_callback_end(
         instance->file_worker_encoder, callback_end, context_end);
 }
@@ -337,6 +339,8 @@ void subghz_protocol_raw_gen_fff_data(
     FlipperFormat* flipper_format,
     const char* file_path,
     const char* radio_device_name) {
+    furi_check(flipper_format);
+
     do {
         stream_clean(flipper_format_get_raw_stream(flipper_format));
         if(!flipper_format_write_string_cstr(flipper_format, "Protocol", "RAW")) {
@@ -359,7 +363,7 @@ void subghz_protocol_raw_gen_fff_data(
 
 SubGhzProtocolStatus
     subghz_protocol_encoder_raw_deserialize(void* context, FlipperFormat* flipper_format) {
-    furi_assert(context);
+    furi_check(context);
     SubGhzProtocolEncoderRAW* instance = context;
     SubGhzProtocolStatus res = SubGhzProtocolStatusError;
     FuriString* temp_str;
@@ -396,6 +400,7 @@ SubGhzProtocolStatus
 }
 
 LevelDuration subghz_protocol_encoder_raw_yield(void* context) {
+    furi_check(context);
     SubGhzProtocolEncoderRAW* instance = context;
 
     if(!instance->is_running) return level_duration_reset();
diff --git a/lib/subghz/protocols/secplus_v2.c b/lib/subghz/protocols/secplus_v2.c
index 3df74ba1d..b58fe3df4 100644
--- a/lib/subghz/protocols/secplus_v2.c
+++ b/lib/subghz/protocols/secplus_v2.c
@@ -380,7 +380,7 @@ static uint64_t subghz_protocol_secplus_v2_encode_half(uint8_t roll_array[], uin
  * Basic set | 0x68 | 0x80 | 0x81 | 0xE2 | 0x78
  * @return Button code
  */
-static uint8_t subghz_protocol_secplus_v2_get_btn_code();
+static uint8_t subghz_protocol_secplus_v2_get_btn_code(void);
 
 /** 
  * Security+ 2.0 message encoding
@@ -614,7 +614,8 @@ bool subghz_protocol_secplus_v2_create_data(
     uint8_t btn,
     uint32_t cnt,
     SubGhzRadioPreset* preset) {
-    furi_assert(context);
+    furi_check(context);
+
     SubGhzProtocolEncoderSecPlus_v2* instance = context;
     instance->generic.serial = serial;
     instance->generic.cnt = cnt;
@@ -833,7 +834,7 @@ SubGhzProtocolStatus
     return ret;
 }
 
-static uint8_t subghz_protocol_secplus_v2_get_btn_code() {
+static uint8_t subghz_protocol_secplus_v2_get_btn_code(void) {
     uint8_t custom_btn_id = subghz_custom_btn_get();
     uint8_t original_btn_code = subghz_custom_btn_get_original();
     uint8_t btn = original_btn_code;
diff --git a/lib/subghz/protocols/somfy_telis.c b/lib/subghz/protocols/somfy_telis.c
index b198ce491..a1308dd6d 100644
--- a/lib/subghz/protocols/somfy_telis.c
+++ b/lib/subghz/protocols/somfy_telis.c
@@ -102,7 +102,7 @@ void subghz_protocol_encoder_somfy_telis_free(void* context) {
  * Basic set | 0x1 | 0x2 | 0x4 | 0x8 |
  * @return Button code
  */
-static uint8_t subghz_protocol_somfy_telis_get_btn_code();
+static uint8_t subghz_protocol_somfy_telis_get_btn_code(void);
 
 static bool subghz_protocol_somfy_telis_gen_data(
     SubGhzProtocolEncoderSomfyTelis* instance,
@@ -668,7 +668,7 @@ SubGhzProtocolStatus
         subghz_protocol_somfy_telis_const.min_count_bit_for_found);
 }
 
-static uint8_t subghz_protocol_somfy_telis_get_btn_code() {
+static uint8_t subghz_protocol_somfy_telis_get_btn_code(void) {
     uint8_t custom_btn_id = subghz_custom_btn_get();
     uint8_t original_btn_code = subghz_custom_btn_get_original();
     uint8_t btn = original_btn_code;
diff --git a/lib/subghz/receiver.c b/lib/subghz/receiver.c
index 698fe098e..c70229a12 100644
--- a/lib/subghz/receiver.c
+++ b/lib/subghz/receiver.c
@@ -42,7 +42,7 @@ SubGhzReceiver* subghz_receiver_alloc_init(SubGhzEnvironment* environment) {
 }
 
 void subghz_receiver_free(SubGhzReceiver* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     instance->callback = NULL;
     instance->context = NULL;
@@ -59,8 +59,8 @@ void subghz_receiver_free(SubGhzReceiver* instance) {
 }
 
 void subghz_receiver_decode(SubGhzReceiver* instance, bool level, uint32_t duration) {
-    furi_assert(instance);
-    furi_assert(instance->slots);
+    furi_check(instance);
+    furi_check(instance->slots);
 
     for
         M_EACH(slot, instance->slots, SubGhzReceiverSlotArray_t) {
@@ -71,8 +71,8 @@ void subghz_receiver_decode(SubGhzReceiver* instance, bool level, uint32_t durat
 }
 
 void subghz_receiver_reset(SubGhzReceiver* instance) {
-    furi_assert(instance);
-    furi_assert(instance->slots);
+    furi_check(instance);
+    furi_check(instance->slots);
 
     for
         M_EACH(slot, instance->slots, SubGhzReceiverSlotArray_t) {
@@ -91,7 +91,7 @@ void subghz_receiver_set_rx_callback(
     SubGhzReceiver* instance,
     SubGhzReceiverCallback callback,
     void* context) {
-    furi_assert(instance);
+    furi_check(instance);
 
     for
         M_EACH(slot, instance->slots, SubGhzReceiverSlotArray_t) {
@@ -104,13 +104,15 @@ void subghz_receiver_set_rx_callback(
 }
 
 void subghz_receiver_set_filter(SubGhzReceiver* instance, SubGhzProtocolFlag filter) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->filter = filter;
 }
 
 SubGhzProtocolDecoderBase* subghz_receiver_search_decoder_base_by_name(
     SubGhzReceiver* instance,
     const char* decoder_name) {
+    furi_check(instance);
+
     SubGhzProtocolDecoderBase* result = NULL;
 
     for
diff --git a/lib/subghz/registry.c b/lib/subghz/registry.c
index d0c22ea8c..be62b4649 100644
--- a/lib/subghz/registry.c
+++ b/lib/subghz/registry.c
@@ -3,7 +3,7 @@
 const SubGhzProtocol* subghz_protocol_registry_get_by_name(
     const SubGhzProtocolRegistry* protocol_registry,
     const char* name) {
-    furi_assert(protocol_registry);
+    furi_check(protocol_registry);
 
     for(size_t i = 0; i < subghz_protocol_registry_count(protocol_registry); i++) {
         if(strcmp(name, protocol_registry->items[i]->name) == 0) {
@@ -16,7 +16,7 @@ const SubGhzProtocol* subghz_protocol_registry_get_by_name(
 const SubGhzProtocol* subghz_protocol_registry_get_by_index(
     const SubGhzProtocolRegistry* protocol_registry,
     size_t index) {
-    furi_assert(protocol_registry);
+    furi_check(protocol_registry);
     if(index < subghz_protocol_registry_count(protocol_registry)) {
         return protocol_registry->items[index];
     } else {
@@ -25,6 +25,6 @@ const SubGhzProtocol* subghz_protocol_registry_get_by_index(
 }
 
 size_t subghz_protocol_registry_count(const SubGhzProtocolRegistry* protocol_registry) {
-    furi_assert(protocol_registry);
+    furi_check(protocol_registry);
     return protocol_registry->size;
 }
diff --git a/lib/subghz/subghz_file_encoder_worker.c b/lib/subghz/subghz_file_encoder_worker.c
index ade840a36..30654567e 100644
--- a/lib/subghz/subghz_file_encoder_worker.c
+++ b/lib/subghz/subghz_file_encoder_worker.c
@@ -190,7 +190,7 @@ static int32_t subghz_file_encoder_worker_thread(void* context) {
     return 0;
 }
 
-SubGhzFileEncoderWorker* subghz_file_encoder_worker_alloc() {
+SubGhzFileEncoderWorker* subghz_file_encoder_worker_alloc(void) {
     SubGhzFileEncoderWorker* instance = malloc(sizeof(SubGhzFileEncoderWorker));
 
     instance->thread =
diff --git a/lib/subghz/subghz_file_encoder_worker.h b/lib/subghz/subghz_file_encoder_worker.h
index eace03348..f3964b26b 100644
--- a/lib/subghz/subghz_file_encoder_worker.h
+++ b/lib/subghz/subghz_file_encoder_worker.h
@@ -24,7 +24,7 @@ void subghz_file_encoder_worker_callback_end(
  * Allocate SubGhzFileEncoderWorker.
  * @return SubGhzFileEncoderWorker* pointer to a SubGhzFileEncoderWorker instance 
  */
-SubGhzFileEncoderWorker* subghz_file_encoder_worker_alloc();
+SubGhzFileEncoderWorker* subghz_file_encoder_worker_alloc(void);
 
 /** 
  * Free SubGhzFileEncoderWorker.
diff --git a/lib/subghz/subghz_keystore.c b/lib/subghz/subghz_keystore.c
index 636288aa6..c12e23b42 100644
--- a/lib/subghz/subghz_keystore.c
+++ b/lib/subghz/subghz_keystore.c
@@ -27,7 +27,7 @@ typedef enum {
     SubGhzKeystoreEncryptionAES256,
 } SubGhzKeystoreEncryption;
 
-SubGhzKeystore* subghz_keystore_alloc() {
+SubGhzKeystore* subghz_keystore_alloc(void) {
     SubGhzKeystore* instance = malloc(sizeof(SubGhzKeystore));
 
     SubGhzKeyArray_init(instance->data);
diff --git a/lib/subghz/subghz_keystore.h b/lib/subghz/subghz_keystore.h
index dfb5c7373..c20eff36e 100644
--- a/lib/subghz/subghz_keystore.h
+++ b/lib/subghz/subghz_keystore.h
@@ -24,7 +24,7 @@ typedef struct SubGhzKeystore SubGhzKeystore;
  * Allocate SubGhzKeystore.
  * @return SubGhzKeystore* pointer to a SubGhzKeystore instance
  */
-SubGhzKeystore* subghz_keystore_alloc();
+SubGhzKeystore* subghz_keystore_alloc(void);
 
 /**
  * Free SubGhzKeystore.
diff --git a/lib/subghz/subghz_setting.c b/lib/subghz/subghz_setting.c
index a9f6b7c6b..cdfe493c4 100644
--- a/lib/subghz/subghz_setting.c
+++ b/lib/subghz/subghz_setting.c
@@ -47,6 +47,7 @@ static const uint32_t subghz_frequency_list[] = {
     390000000,
     418000000,
     430000000,
+    430500000,
     431000000,
     431500000,
     433075000, /* LPD433 first */
@@ -134,7 +135,7 @@ static void subghz_setting_preset_reset(SubGhzSetting* instance) {
 }
 
 void subghz_setting_free(SubGhzSetting* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     FrequencyList_clear(instance->frequencies);
     FrequencyList_clear(instance->hopper_frequencies);
     for
@@ -207,7 +208,7 @@ void subghz_setting_load_default(SubGhzSetting* instance) {
 }
 
 void subghz_setting_load(SubGhzSetting* instance, const char* file_path) {
-    furi_assert(instance);
+    furi_check(instance);
 
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FlipperFormat* fff_data_file = flipper_format_file_alloc(storage);
@@ -325,22 +326,22 @@ void subghz_setting_set_default_frequency(SubGhzSetting* instance, uint32_t freq
 }
 
 size_t subghz_setting_get_frequency_count(SubGhzSetting* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     return FrequencyList_size(instance->frequencies);
 }
 
 size_t subghz_setting_get_hopper_frequency_count(SubGhzSetting* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     return FrequencyList_size(instance->hopper_frequencies);
 }
 
 size_t subghz_setting_get_preset_count(SubGhzSetting* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     return SubGhzSettingCustomPresetItemArray_size(instance->preset->data);
 }
 
 const char* subghz_setting_get_preset_name(SubGhzSetting* instance, size_t idx) {
-    furi_assert(instance);
+    furi_check(instance);
     if(idx >= SubGhzSettingCustomPresetItemArray_size(instance->preset->data)) {
         idx = 0;
     }
@@ -350,7 +351,7 @@ const char* subghz_setting_get_preset_name(SubGhzSetting* instance, size_t idx)
 }
 
 int subghz_setting_get_inx_preset_by_name(SubGhzSetting* instance, const char* preset_name) {
-    furi_assert(instance);
+    furi_check(instance);
     size_t idx = 0;
     for
         M_EACH(item, instance->preset->data, SubGhzSettingCustomPresetItemArray_t) {
@@ -367,8 +368,8 @@ bool subghz_setting_load_custom_preset(
     SubGhzSetting* instance,
     const char* preset_name,
     FlipperFormat* fff_data_file) {
-    furi_assert(instance);
-    furi_assert(preset_name);
+    furi_check(instance);
+    furi_check(preset_name);
     uint32_t temp_data32;
     SubGhzSettingCustomPresetItem* item =
         SubGhzSettingCustomPresetItemArray_push_raw(instance->preset->data);
@@ -397,8 +398,8 @@ bool subghz_setting_load_custom_preset(
 }
 
 bool subghz_setting_delete_custom_preset(SubGhzSetting* instance, const char* preset_name) {
-    furi_assert(instance);
-    furi_assert(preset_name);
+    furi_check(instance);
+    furi_check(preset_name);
     SubGhzSettingCustomPresetItemArray_it_t it;
     SubGhzSettingCustomPresetItemArray_it_last(it, instance->preset->data);
     while(!SubGhzSettingCustomPresetItemArray_end_p(it)) {
@@ -415,28 +416,28 @@ bool subghz_setting_delete_custom_preset(SubGhzSetting* instance, const char* pr
 }
 
 uint8_t* subghz_setting_get_preset_data(SubGhzSetting* instance, size_t idx) {
-    furi_assert(instance);
+    furi_check(instance);
     SubGhzSettingCustomPresetItem* item =
         SubGhzSettingCustomPresetItemArray_get(instance->preset->data, idx);
     return item->custom_preset_data;
 }
 
 size_t subghz_setting_get_preset_data_size(SubGhzSetting* instance, size_t idx) {
-    furi_assert(instance);
+    furi_check(instance);
     SubGhzSettingCustomPresetItem* item =
         SubGhzSettingCustomPresetItemArray_get(instance->preset->data, idx);
     return item->custom_preset_data_size;
 }
 
 uint8_t* subghz_setting_get_preset_data_by_name(SubGhzSetting* instance, const char* preset_name) {
-    furi_assert(instance);
+    furi_check(instance);
     SubGhzSettingCustomPresetItem* item = SubGhzSettingCustomPresetItemArray_get(
         instance->preset->data, subghz_setting_get_inx_preset_by_name(instance, preset_name));
     return item->custom_preset_data;
 }
 
 uint32_t subghz_setting_get_frequency(SubGhzSetting* instance, size_t idx) {
-    furi_assert(instance);
+    furi_check(instance);
     if(idx < FrequencyList_size(instance->frequencies)) {
         return (*FrequencyList_get(instance->frequencies, idx)) & FREQUENCY_MASK;
     } else {
@@ -445,7 +446,7 @@ uint32_t subghz_setting_get_frequency(SubGhzSetting* instance, size_t idx) {
 }
 
 uint32_t subghz_setting_get_hopper_frequency(SubGhzSetting* instance, size_t idx) {
-    furi_assert(instance);
+    furi_check(instance);
     if(idx < FrequencyList_size(instance->hopper_frequencies)) {
         return *FrequencyList_get(instance->hopper_frequencies, idx);
     } else {
@@ -454,7 +455,7 @@ uint32_t subghz_setting_get_hopper_frequency(SubGhzSetting* instance, size_t idx
 }
 
 uint32_t subghz_setting_get_frequency_default_index(SubGhzSetting* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     for(size_t i = 0; i < FrequencyList_size(instance->frequencies); i++) {
         uint32_t frequency = *FrequencyList_get(instance->frequencies, i);
         if(frequency & FREQUENCY_FLAG_DEFAULT) {
@@ -465,7 +466,7 @@ uint32_t subghz_setting_get_frequency_default_index(SubGhzSetting* instance) {
 }
 
 uint32_t subghz_setting_get_default_frequency(SubGhzSetting* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     return subghz_setting_get_frequency(
         instance, subghz_setting_get_frequency_default_index(instance));
 }
diff --git a/lib/subghz/subghz_tx_rx_worker.c b/lib/subghz/subghz_tx_rx_worker.c
index 369f5206c..f5994d494 100644
--- a/lib/subghz/subghz_tx_rx_worker.c
+++ b/lib/subghz/subghz_tx_rx_worker.c
@@ -29,7 +29,7 @@ struct SubGhzTxRxWorker {
 };
 
 bool subghz_tx_rx_worker_write(SubGhzTxRxWorker* instance, uint8_t* data, size_t size) {
-    furi_assert(instance);
+    furi_check(instance);
     bool ret = false;
     size_t stream_tx_free_byte = furi_stream_buffer_spaces_available(instance->stream_tx);
     if(size && (stream_tx_free_byte >= size)) {
@@ -43,12 +43,12 @@ bool subghz_tx_rx_worker_write(SubGhzTxRxWorker* instance, uint8_t* data, size_t
 }
 
 size_t subghz_tx_rx_worker_available(SubGhzTxRxWorker* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     return furi_stream_buffer_bytes_available(instance->stream_rx);
 }
 
 size_t subghz_tx_rx_worker_read(SubGhzTxRxWorker* instance, uint8_t* data, size_t size) {
-    furi_assert(instance);
+    furi_check(instance);
     return furi_stream_buffer_receive(instance->stream_rx, data, size, 0);
 }
 
@@ -56,9 +56,9 @@ void subghz_tx_rx_worker_set_callback_have_read(
     SubGhzTxRxWorker* instance,
     SubGhzTxRxWorkerCallbackHaveRead callback,
     void* context) {
-    furi_assert(instance);
-    furi_assert(callback);
-    furi_assert(context);
+    furi_check(instance);
+    furi_check(callback);
+    furi_check(context);
     instance->callback_have_read = callback;
     instance->context_have_read = context;
 }
@@ -132,7 +132,7 @@ void subghz_tx_rx_worker_tx(SubGhzTxRxWorker* instance, uint8_t* data, size_t si
  */
 static int32_t subghz_tx_rx_worker_thread(void* context) {
     SubGhzTxRxWorker* instance = context;
-    furi_assert(instance->device);
+    furi_check(instance->device);
     FURI_LOG_I(TAG, "Worker start");
 
     subghz_devices_begin(instance->device);
@@ -205,7 +205,7 @@ static int32_t subghz_tx_rx_worker_thread(void* context) {
     return 0;
 }
 
-SubGhzTxRxWorker* subghz_tx_rx_worker_alloc() {
+SubGhzTxRxWorker* subghz_tx_rx_worker_alloc(void) {
     SubGhzTxRxWorker* instance = malloc(sizeof(SubGhzTxRxWorker));
 
     instance->thread =
@@ -222,8 +222,8 @@ SubGhzTxRxWorker* subghz_tx_rx_worker_alloc() {
 }
 
 void subghz_tx_rx_worker_free(SubGhzTxRxWorker* instance) {
-    furi_assert(instance);
-    furi_assert(!instance->worker_running);
+    furi_check(instance);
+    furi_check(!instance->worker_running);
     furi_stream_buffer_free(instance->stream_tx);
     furi_stream_buffer_free(instance->stream_rx);
     furi_thread_free(instance->thread);
@@ -235,8 +235,8 @@ bool subghz_tx_rx_worker_start(
     SubGhzTxRxWorker* instance,
     const SubGhzDevice* device,
     uint32_t frequency) {
-    furi_assert(instance);
-    furi_assert(!instance->worker_running);
+    furi_check(instance);
+    furi_check(!instance->worker_running);
     bool res = false;
     furi_stream_buffer_reset(instance->stream_tx);
     furi_stream_buffer_reset(instance->stream_rx);
@@ -255,8 +255,8 @@ bool subghz_tx_rx_worker_start(
 }
 
 void subghz_tx_rx_worker_stop(SubGhzTxRxWorker* instance) {
-    furi_assert(instance);
-    furi_assert(instance->worker_running);
+    furi_check(instance);
+    furi_check(instance->worker_running);
 
     instance->worker_running = false;
 
@@ -264,6 +264,6 @@ void subghz_tx_rx_worker_stop(SubGhzTxRxWorker* instance) {
 }
 
 bool subghz_tx_rx_worker_is_running(SubGhzTxRxWorker* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     return instance->worker_running;
 }
diff --git a/lib/subghz/subghz_tx_rx_worker.h b/lib/subghz/subghz_tx_rx_worker.h
index 56bdb0a1f..a8d547ab2 100644
--- a/lib/subghz/subghz_tx_rx_worker.h
+++ b/lib/subghz/subghz_tx_rx_worker.h
@@ -57,7 +57,7 @@ void subghz_tx_rx_worker_set_callback_have_read(
  * Allocate SubGhzTxRxWorker
  * @return SubGhzTxRxWorker* Pointer to a SubGhzTxRxWorker instance
  */
-SubGhzTxRxWorker* subghz_tx_rx_worker_alloc();
+SubGhzTxRxWorker* subghz_tx_rx_worker_alloc(void);
 
 /** 
  * Free SubGhzTxRxWorker
diff --git a/lib/subghz/subghz_worker.c b/lib/subghz/subghz_worker.c
index 50b5aba51..fe68d5e2d 100644
--- a/lib/subghz/subghz_worker.c
+++ b/lib/subghz/subghz_worker.c
@@ -79,7 +79,7 @@ static int32_t subghz_worker_thread_callback(void* context) {
     return 0;
 }
 
-SubGhzWorker* subghz_worker_alloc() {
+SubGhzWorker* subghz_worker_alloc(void) {
     SubGhzWorker* instance = malloc(sizeof(SubGhzWorker));
 
     instance->thread =
@@ -95,7 +95,7 @@ SubGhzWorker* subghz_worker_alloc() {
 }
 
 void subghz_worker_free(SubGhzWorker* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     furi_stream_buffer_free(instance->stream);
     furi_thread_free(instance->thread);
@@ -106,23 +106,23 @@ void subghz_worker_free(SubGhzWorker* instance) {
 void subghz_worker_set_overrun_callback(
     SubGhzWorker* instance,
     SubGhzWorkerOverrunCallback callback) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->overrun_callback = callback;
 }
 
 void subghz_worker_set_pair_callback(SubGhzWorker* instance, SubGhzWorkerPairCallback callback) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->pair_callback = callback;
 }
 
 void subghz_worker_set_context(SubGhzWorker* instance, void* context) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->context = context;
 }
 
 void subghz_worker_start(SubGhzWorker* instance) {
-    furi_assert(instance);
-    furi_assert(!instance->running);
+    furi_check(instance);
+    furi_check(!instance->running);
 
     instance->running = true;
 
@@ -130,8 +130,8 @@ void subghz_worker_start(SubGhzWorker* instance) {
 }
 
 void subghz_worker_stop(SubGhzWorker* instance) {
-    furi_assert(instance);
-    furi_assert(instance->running);
+    furi_check(instance);
+    furi_check(instance->running);
 
     instance->running = false;
 
@@ -139,11 +139,11 @@ void subghz_worker_stop(SubGhzWorker* instance) {
 }
 
 bool subghz_worker_is_running(SubGhzWorker* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     return instance->running;
 }
 
 void subghz_worker_set_filter(SubGhzWorker* instance, uint16_t timeout) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->filter_duration = timeout;
 }
\ No newline at end of file
diff --git a/lib/subghz/subghz_worker.h b/lib/subghz/subghz_worker.h
index 657278f50..87ea3fc7c 100644
--- a/lib/subghz/subghz_worker.h
+++ b/lib/subghz/subghz_worker.h
@@ -18,7 +18,7 @@ void subghz_worker_rx_callback(bool level, uint32_t duration, void* context);
  * Allocate SubGhzWorker.
  * @return SubGhzWorker* Pointer to a SubGhzWorker instance
  */
-SubGhzWorker* subghz_worker_alloc();
+SubGhzWorker* subghz_worker_alloc(void);
 
 /** 
  * Free SubGhzWorker.
diff --git a/lib/subghz/transmitter.c b/lib/subghz/transmitter.c
index 81be143b5..4f7922c35 100644
--- a/lib/subghz/transmitter.c
+++ b/lib/subghz/transmitter.c
@@ -27,18 +27,18 @@ SubGhzTransmitter*
 }
 
 void subghz_transmitter_free(SubGhzTransmitter* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     instance->protocol->encoder->free(instance->protocol_instance);
     free(instance);
 }
 
 SubGhzProtocolEncoderBase* subghz_transmitter_get_protocol_instance(SubGhzTransmitter* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     return instance->protocol_instance;
 }
 
 bool subghz_transmitter_stop(SubGhzTransmitter* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     bool ret = false;
     if(instance->protocol && instance->protocol->encoder && instance->protocol->encoder->stop) {
         instance->protocol->encoder->stop(instance->protocol_instance);
@@ -49,7 +49,7 @@ bool subghz_transmitter_stop(SubGhzTransmitter* instance) {
 
 SubGhzProtocolStatus
     subghz_transmitter_deserialize(SubGhzTransmitter* instance, FlipperFormat* flipper_format) {
-    furi_assert(instance);
+    furi_check(instance);
     SubGhzProtocolStatus ret = SubGhzProtocolStatusError;
     if(instance->protocol && instance->protocol->encoder &&
        instance->protocol->encoder->deserialize) {
diff --git a/lib/toolbox/bit_buffer.c b/lib/toolbox/bit_buffer.c
index 1943ee833..85a52e79d 100644
--- a/lib/toolbox/bit_buffer.c
+++ b/lib/toolbox/bit_buffer.c
@@ -12,7 +12,7 @@ struct BitBuffer {
 };
 
 BitBuffer* bit_buffer_alloc(size_t capacity_bytes) {
-    furi_assert(capacity_bytes);
+    furi_check(capacity_bytes);
 
     BitBuffer* buf = malloc(sizeof(BitBuffer));
 
@@ -26,7 +26,7 @@ BitBuffer* bit_buffer_alloc(size_t capacity_bytes) {
 }
 
 void bit_buffer_free(BitBuffer* buf) {
-    furi_assert(buf);
+    furi_check(buf);
 
     free(buf->data);
     free(buf->parity);
@@ -34,7 +34,7 @@ void bit_buffer_free(BitBuffer* buf) {
 }
 
 void bit_buffer_reset(BitBuffer* buf) {
-    furi_assert(buf);
+    furi_check(buf);
 
     memset(buf->data, 0, buf->capacity_bytes);
     size_t parity_buf_size = (buf->capacity_bytes + BITS_IN_BYTE - 1) / BITS_IN_BYTE;
@@ -43,50 +43,50 @@ void bit_buffer_reset(BitBuffer* buf) {
 }
 
 void bit_buffer_copy(BitBuffer* buf, const BitBuffer* other) {
-    furi_assert(buf);
-    furi_assert(other);
+    furi_check(buf);
+    furi_check(other);
 
     if(buf == other) return;
 
-    furi_assert(buf->capacity_bytes * BITS_IN_BYTE >= other->size_bits);
+    furi_check(buf->capacity_bytes * BITS_IN_BYTE >= other->size_bits);
 
     memcpy(buf->data, other->data, bit_buffer_get_size_bytes(other));
     buf->size_bits = other->size_bits;
 }
 
 void bit_buffer_copy_right(BitBuffer* buf, const BitBuffer* other, size_t start_index) {
-    furi_assert(buf);
-    furi_assert(other);
-    furi_assert(bit_buffer_get_size_bytes(other) > start_index);
-    furi_assert(buf->capacity_bytes >= bit_buffer_get_size_bytes(other) - start_index);
+    furi_check(buf);
+    furi_check(other);
+    furi_check(bit_buffer_get_size_bytes(other) > start_index);
+    furi_check(buf->capacity_bytes >= bit_buffer_get_size_bytes(other) - start_index);
 
     memcpy(buf->data, other->data + start_index, bit_buffer_get_size_bytes(other) - start_index);
     buf->size_bits = other->size_bits - start_index * BITS_IN_BYTE;
 }
 
 void bit_buffer_copy_left(BitBuffer* buf, const BitBuffer* other, size_t end_index) {
-    furi_assert(buf);
-    furi_assert(other);
-    furi_assert(bit_buffer_get_capacity_bytes(buf) >= end_index);
-    furi_assert(bit_buffer_get_size_bytes(other) >= end_index);
+    furi_check(buf);
+    furi_check(other);
+    furi_check(bit_buffer_get_capacity_bytes(buf) >= end_index);
+    furi_check(bit_buffer_get_size_bytes(other) >= end_index);
 
     memcpy(buf->data, other->data, end_index);
     buf->size_bits = end_index * BITS_IN_BYTE;
 }
 
 void bit_buffer_copy_bytes(BitBuffer* buf, const uint8_t* data, size_t size_bytes) {
-    furi_assert(buf);
-    furi_assert(data);
-    furi_assert(buf->capacity_bytes >= size_bytes);
+    furi_check(buf);
+    furi_check(data);
+    furi_check(buf->capacity_bytes >= size_bytes);
 
     memcpy(buf->data, data, size_bytes);
     buf->size_bits = size_bytes * BITS_IN_BYTE;
 }
 
 void bit_buffer_copy_bits(BitBuffer* buf, const uint8_t* data, size_t size_bits) {
-    furi_assert(buf);
-    furi_assert(data);
-    furi_assert(buf->capacity_bytes * BITS_IN_BYTE >= size_bits);
+    furi_check(buf);
+    furi_check(data);
+    furi_check(buf->capacity_bytes * BITS_IN_BYTE >= size_bits);
 
     size_t size_bytes = (size_bits + BITS_IN_BYTE - 1) / BITS_IN_BYTE;
     memcpy(buf->data, data, size_bytes);
@@ -94,8 +94,8 @@ void bit_buffer_copy_bits(BitBuffer* buf, const uint8_t* data, size_t size_bits)
 }
 
 void bit_buffer_copy_bytes_with_parity(BitBuffer* buf, const uint8_t* data, size_t size_bits) {
-    furi_assert(buf);
-    furi_assert(data);
+    furi_check(buf);
+    furi_check(data);
 
     size_t bits_processed = 0;
     size_t curr_byte = 0;
@@ -104,7 +104,7 @@ void bit_buffer_copy_bytes_with_parity(BitBuffer* buf, const uint8_t* data, size
         buf->size_bits = size_bits;
         buf->data[0] = data[0];
     } else {
-        furi_assert(size_bits % (BITS_IN_BYTE + 1) == 0);
+        furi_check(size_bits % (BITS_IN_BYTE + 1) == 0);
         while(bits_processed < size_bits) {
             buf->data[curr_byte] = data[bits_processed / BITS_IN_BYTE] >>
                                    (bits_processed % BITS_IN_BYTE);
@@ -126,9 +126,9 @@ void bit_buffer_copy_bytes_with_parity(BitBuffer* buf, const uint8_t* data, size
 }
 
 void bit_buffer_write_bytes(const BitBuffer* buf, void* dest, size_t size_bytes) {
-    furi_assert(buf);
-    furi_assert(dest);
-    furi_assert(bit_buffer_get_size_bytes(buf) <= size_bytes);
+    furi_check(buf);
+    furi_check(dest);
+    furi_check(bit_buffer_get_size_bytes(buf) <= size_bytes);
 
     memcpy(dest, buf->data, bit_buffer_get_size_bytes(buf));
 }
@@ -138,14 +138,14 @@ void bit_buffer_write_bytes_with_parity(
     void* dest,
     size_t size_bytes,
     size_t* bits_written) {
-    furi_assert(buf);
-    furi_assert(dest);
-    furi_assert(bits_written);
+    furi_check(buf);
+    furi_check(dest);
+    furi_check(bits_written);
 
     size_t buf_size_bytes = bit_buffer_get_size_bytes(buf);
     size_t buf_size_with_parity_bytes =
         (buf_size_bytes * (BITS_IN_BYTE + 1) + BITS_IN_BYTE) / BITS_IN_BYTE;
-    furi_assert(buf_size_with_parity_bytes <= size_bytes);
+    furi_check(buf_size_with_parity_bytes <= size_bytes);
 
     uint8_t next_par_bit = 0;
     uint16_t curr_bit_pos = 0;
@@ -177,53 +177,53 @@ void bit_buffer_write_bytes_mid(
     void* dest,
     size_t start_index,
     size_t size_bytes) {
-    furi_assert(buf);
-    furi_assert(dest);
-    furi_assert(start_index + size_bytes <= bit_buffer_get_size_bytes(buf));
+    furi_check(buf);
+    furi_check(dest);
+    furi_check(start_index + size_bytes <= bit_buffer_get_size_bytes(buf));
 
     memcpy(dest, buf->data + start_index, size_bytes);
 }
 
 bool bit_buffer_has_partial_byte(const BitBuffer* buf) {
-    furi_assert(buf);
+    furi_check(buf);
 
     return (buf->size_bits % BITS_IN_BYTE) != 0;
 }
 
 bool bit_buffer_starts_with_byte(const BitBuffer* buf, uint8_t byte) {
-    furi_assert(buf);
+    furi_check(buf);
 
     return bit_buffer_get_size_bytes(buf) && (buf->data[0] == byte);
 }
 
 size_t bit_buffer_get_capacity_bytes(const BitBuffer* buf) {
-    furi_assert(buf);
+    furi_check(buf);
 
     return buf->capacity_bytes;
 }
 
 size_t bit_buffer_get_size(const BitBuffer* buf) {
-    furi_assert(buf);
+    furi_check(buf);
 
     return buf->size_bits;
 }
 
 size_t bit_buffer_get_size_bytes(const BitBuffer* buf) {
-    furi_assert(buf);
+    furi_check(buf);
 
     return (buf->size_bits / BITS_IN_BYTE) + (buf->size_bits % BITS_IN_BYTE ? 1 : 0);
 }
 
 uint8_t bit_buffer_get_byte(const BitBuffer* buf, size_t index) {
-    furi_assert(buf);
-    furi_assert(buf->capacity_bytes > index);
+    furi_check(buf);
+    furi_check(buf->capacity_bytes > index);
 
     return buf->data[index];
 }
 
 uint8_t bit_buffer_get_byte_from_bit(const BitBuffer* buf, size_t index_bits) {
-    furi_assert(buf);
-    furi_assert(buf->capacity_bytes * BITS_IN_BYTE > index_bits);
+    furi_check(buf);
+    furi_check(buf->capacity_bytes * BITS_IN_BYTE > index_bits);
 
     const size_t byte_index = index_bits / BITS_IN_BYTE;
     const size_t bit_offset = index_bits % BITS_IN_BYTE;
@@ -235,29 +235,29 @@ uint8_t bit_buffer_get_byte_from_bit(const BitBuffer* buf, size_t index_bits) {
 }
 
 const uint8_t* bit_buffer_get_data(const BitBuffer* buf) {
-    furi_assert(buf);
+    furi_check(buf);
 
     return buf->data;
 }
 
 const uint8_t* bit_buffer_get_parity(const BitBuffer* buf) {
-    furi_assert(buf);
+    furi_check(buf);
 
     return buf->parity;
 }
 
 void bit_buffer_set_byte(BitBuffer* buf, size_t index, uint8_t byte) {
-    furi_assert(buf);
+    furi_check(buf);
 
     const size_t size_bytes = bit_buffer_get_size_bytes(buf);
-    furi_assert(size_bytes > index);
+    furi_check(size_bytes > index);
 
     buf->data[index] = byte;
 }
 
 void bit_buffer_set_byte_with_parity(BitBuffer* buff, size_t index, uint8_t byte, bool parity) {
-    furi_assert(buff);
-    furi_assert(buff->size_bits / BITS_IN_BYTE > index);
+    furi_check(buff);
+    furi_check(buff->size_bits / BITS_IN_BYTE > index);
 
     buff->data[index] = byte;
     if((index % BITS_IN_BYTE) == 0) {
@@ -268,15 +268,15 @@ void bit_buffer_set_byte_with_parity(BitBuffer* buff, size_t index, uint8_t byte
 }
 
 void bit_buffer_set_size(BitBuffer* buf, size_t new_size) {
-    furi_assert(buf);
-    furi_assert(buf->capacity_bytes * BITS_IN_BYTE >= new_size);
+    furi_check(buf);
+    furi_check(buf->capacity_bytes * BITS_IN_BYTE >= new_size);
 
     buf->size_bits = new_size;
 }
 
 void bit_buffer_set_size_bytes(BitBuffer* buf, size_t new_size_bytes) {
-    furi_assert(buf);
-    furi_assert(buf->capacity_bytes >= new_size_bytes);
+    furi_check(buf);
+    furi_check(buf->capacity_bytes >= new_size_bytes);
 
     buf->size_bits = new_size_bytes * BITS_IN_BYTE;
 }
@@ -286,43 +286,43 @@ void bit_buffer_append(BitBuffer* buf, const BitBuffer* other) {
 }
 
 void bit_buffer_append_right(BitBuffer* buf, const BitBuffer* other, size_t start_index) {
-    furi_assert(buf);
-    furi_assert(other);
+    furi_check(buf);
+    furi_check(other);
 
     const size_t size_bytes = bit_buffer_get_size_bytes(buf);
     const size_t other_size_bytes = bit_buffer_get_size_bytes(other) - start_index;
 
-    furi_assert(buf->capacity_bytes >= size_bytes + other_size_bytes);
+    furi_check(buf->capacity_bytes >= size_bytes + other_size_bytes);
 
     memcpy(buf->data + size_bytes, other->data + start_index, other_size_bytes);
     buf->size_bits += other->size_bits - start_index * BITS_IN_BYTE;
 }
 
 void bit_buffer_append_byte(BitBuffer* buf, uint8_t byte) {
-    furi_assert(buf);
+    furi_check(buf);
 
     const size_t data_size_bytes = bit_buffer_get_size_bytes(buf);
     const size_t new_data_size_bytes = data_size_bytes + 1;
-    furi_assert(new_data_size_bytes <= buf->capacity_bytes);
+    furi_check(new_data_size_bytes <= buf->capacity_bytes);
 
     buf->data[data_size_bytes] = byte;
     buf->size_bits = new_data_size_bytes * BITS_IN_BYTE;
 }
 
 void bit_buffer_append_bytes(BitBuffer* buf, const uint8_t* data, size_t size_bytes) {
-    furi_assert(buf);
-    furi_assert(data);
+    furi_check(buf);
+    furi_check(data);
 
     const size_t buf_size_bytes = bit_buffer_get_size_bytes(buf);
-    furi_assert(buf->capacity_bytes >= buf_size_bytes + size_bytes);
+    furi_check(buf->capacity_bytes >= buf_size_bytes + size_bytes);
 
     memcpy(&buf->data[buf_size_bytes], data, size_bytes);
     buf->size_bits += size_bytes * BITS_IN_BYTE;
 }
 
 void bit_buffer_append_bit(BitBuffer* buf, bool bit) {
-    furi_assert(buf);
-    furi_assert(
+    furi_check(buf);
+    furi_check(
         bit_buffer_get_size_bytes(buf) <=
         (buf->capacity_bytes - (bit_buffer_has_partial_byte(buf) ? 0 : 1)));
 
diff --git a/lib/toolbox/compress.c b/lib/toolbox/compress.c
index 0d5e1c654..70db47968 100644
--- a/lib/toolbox/compress.c
+++ b/lib/toolbox/compress.c
@@ -27,7 +27,7 @@ struct CompressIcon {
     uint8_t decoded_buff[COMPRESS_ICON_DECODED_BUFF_SIZE];
 };
 
-CompressIcon* compress_icon_alloc() {
+CompressIcon* compress_icon_alloc(void) {
     CompressIcon* instance = malloc(sizeof(CompressIcon));
     instance->decoder = heatshrink_decoder_alloc(
         COMPRESS_ICON_ENCODED_BUFF_SIZE,
@@ -40,15 +40,15 @@ CompressIcon* compress_icon_alloc() {
 }
 
 void compress_icon_free(CompressIcon* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     heatshrink_decoder_free(instance->decoder);
     free(instance);
 }
 
 void compress_icon_decode(CompressIcon* instance, const uint8_t* icon_data, uint8_t** decoded_buff) {
-    furi_assert(instance);
-    furi_assert(icon_data);
-    furi_assert(decoded_buff);
+    furi_check(instance);
+    furi_check(icon_data);
+    furi_check(decoded_buff);
 
     CompressHeader* header = (CompressHeader*)icon_data;
     if(header->is_compressed) {
@@ -64,7 +64,7 @@ void compress_icon_decode(CompressIcon* instance, const uint8_t* icon_data, uint
                 instance->decoded_buff,
                 sizeof(instance->decoded_buff),
                 &data_processed);
-            furi_assert((res == HSDR_POLL_EMPTY) || (res == HSDR_POLL_MORE));
+            furi_check((res == HSDR_POLL_EMPTY) || (res == HSDR_POLL_MORE));
             if(res != HSDR_POLL_MORE) {
                 break;
             }
@@ -98,7 +98,7 @@ Compress* compress_alloc(uint16_t compress_buff_size) {
 }
 
 void compress_free(Compress* compress) {
-    furi_assert(compress);
+    furi_check(compress);
 
     heatshrink_encoder_free(compress->encoder);
     heatshrink_decoder_free(compress->decoder);
diff --git a/lib/toolbox/compress.h b/lib/toolbox/compress.h
index a18551d7f..f844802ec 100644
--- a/lib/toolbox/compress.h
+++ b/lib/toolbox/compress.h
@@ -19,7 +19,7 @@ typedef struct CompressIcon CompressIcon;
  *
  * @return     Compress Icon instance
  */
-CompressIcon* compress_icon_alloc();
+CompressIcon* compress_icon_alloc(void);
 
 /** Free icon compressor
  *
@@ -43,27 +43,29 @@ typedef struct Compress Compress;
 
 /** Allocate encoder and decoder
  *
- * @param   compress_buff_size  size of decoder and encoder buffer to allocate
+ * @param      compress_buff_size  size of decoder and encoder buffer to
+ *                                 allocate
  *
- * @return  Compress instance
+ * @return     Compress instance
  */
 Compress* compress_alloc(uint16_t compress_buff_size);
 
 /** Free encoder and decoder
  *
- * @param   compress  Compress instance
+ * @param      compress  Compress instance
  */
 void compress_free(Compress* compress);
 
 /** Encode data
  *
- * @param   compress Compress instance
- * @param   data_in pointer to input data
- * @param   data_in_size size of input data
- * @param   data_out maximum size of output data
- * @param   data_res_size pointer to result output data size
+ * @param      compress       Compress instance
+ * @param      data_in        pointer to input data
+ * @param      data_in_size   size of input data
+ * @param      data_out       maximum size of output data
+ * @param[in]  data_out_size  The data out size
+ * @param      data_res_size  pointer to result output data size
  *
- * @return  true on success
+ * @return     true on success
  */
 bool compress_encode(
     Compress* compress,
@@ -75,13 +77,14 @@ bool compress_encode(
 
 /** Decode data
  *
- * @param   compress Compress instance
- * @param   data_in pointer to input data
- * @param   data_in_size size of input data
- * @param   data_out maximum size of output data
- * @param   data_res_size pointer to result output data size
+ * @param      compress       Compress instance
+ * @param      data_in        pointer to input data
+ * @param      data_in_size   size of input data
+ * @param      data_out       maximum size of output data
+ * @param[in]  data_out_size  The data out size
+ * @param      data_res_size  pointer to result output data size
  *
- * @return  true on success
+ * @return     true on success
  */
 bool compress_decode(
     Compress* compress,
diff --git a/lib/toolbox/dir_walk.c b/lib/toolbox/dir_walk.c
index 509ceb5b4..ed8c65866 100644
--- a/lib/toolbox/dir_walk.c
+++ b/lib/toolbox/dir_walk.c
@@ -14,6 +14,8 @@ struct DirWalk {
 };
 
 DirWalk* dir_walk_alloc(Storage* storage) {
+    furi_check(storage);
+
     DirWalk* dir_walk = malloc(sizeof(DirWalk));
     dir_walk->path = furi_string_alloc();
     dir_walk->file = storage_file_alloc(storage);
@@ -24,6 +26,8 @@ DirWalk* dir_walk_alloc(Storage* storage) {
 }
 
 void dir_walk_free(DirWalk* dir_walk) {
+    furi_check(dir_walk);
+
     storage_file_free(dir_walk->file);
     furi_string_free(dir_walk->path);
     DirIndexList_clear(dir_walk->index_list);
@@ -31,15 +35,18 @@ void dir_walk_free(DirWalk* dir_walk) {
 }
 
 void dir_walk_set_recursive(DirWalk* dir_walk, bool recursive) {
+    furi_check(dir_walk);
     dir_walk->recursive = recursive;
 }
 
 void dir_walk_set_filter_cb(DirWalk* dir_walk, DirWalkFilterCb cb, void* context) {
+    furi_check(dir_walk);
     dir_walk->filter_cb = cb;
     dir_walk->filter_context = context;
 }
 
 bool dir_walk_open(DirWalk* dir_walk, const char* path) {
+    furi_check(dir_walk);
     furi_string_set(dir_walk->path, path);
     dir_walk->current_index = 0;
     return storage_dir_open(dir_walk->file, path);
@@ -139,14 +146,17 @@ static DirWalkResult
 }
 
 FS_Error dir_walk_get_error(DirWalk* dir_walk) {
+    furi_check(dir_walk);
     return storage_file_get_error(dir_walk->file);
 }
 
 DirWalkResult dir_walk_read(DirWalk* dir_walk, FuriString* return_path, FileInfo* fileinfo) {
+    furi_check(dir_walk);
     return dir_walk_iter(dir_walk, return_path, fileinfo);
 }
 
 void dir_walk_close(DirWalk* dir_walk) {
+    furi_check(dir_walk);
     if(storage_file_is_open(dir_walk->file)) {
         storage_dir_close(dir_walk->file);
     }
diff --git a/lib/toolbox/hex.c b/lib/toolbox/hex.c
index 25dcb0950..e5cdfff17 100644
--- a/lib/toolbox/hex.c
+++ b/lib/toolbox/hex.c
@@ -1,6 +1,9 @@
 #include "hex.h"
+#include <furi.h>
 
 bool hex_char_to_hex_nibble(char c, uint8_t* nibble) {
+    furi_check(nibble);
+
     if((c >= '0' && c <= '9')) {
         *nibble = c - '0';
         return true;
@@ -16,6 +19,8 @@ bool hex_char_to_hex_nibble(char c, uint8_t* nibble) {
 }
 
 bool hex_char_to_uint8(char hi, char low, uint8_t* value) {
+    furi_check(value);
+
     uint8_t hi_nibble_value, low_nibble_value;
 
     if(hex_char_to_hex_nibble(hi, &hi_nibble_value) &&
@@ -28,6 +33,9 @@ bool hex_char_to_uint8(char hi, char low, uint8_t* value) {
 }
 
 bool hex_chars_to_uint8(const char* value_str, uint8_t* value) {
+    furi_check(value_str);
+    furi_check(value);
+
     bool parse_success = false;
     while(*value_str && value_str[1]) {
         parse_success = hex_char_to_uint8(*value_str, value_str[1], value++);
@@ -38,6 +46,9 @@ bool hex_chars_to_uint8(const char* value_str, uint8_t* value) {
 }
 
 bool hex_chars_to_uint64(const char* value_str, uint64_t* value) {
+    furi_check(value_str);
+    furi_check(value);
+
     uint8_t* _value = (uint8_t*)value;
     bool parse_success = false;
 
@@ -45,10 +56,14 @@ bool hex_chars_to_uint64(const char* value_str, uint64_t* value) {
         parse_success = hex_char_to_uint8(value_str[i * 2], value_str[i * 2 + 1], &_value[7 - i]);
         if(!parse_success) break;
     }
+
     return parse_success;
 }
 
 void uint8_to_hex_chars(const uint8_t* src, uint8_t* target, int length) {
+    furi_check(src);
+    furi_check(target);
+
     const char chars[] = "0123456789ABCDEF";
     while(--length >= 0)
         target[length] = chars[(src[length >> 1] >> ((1 - (length & 1)) << 2)) & 0xF];
diff --git a/lib/toolbox/keys_dict.c b/lib/toolbox/keys_dict.c
index 8d6f8c846..09fc241ee 100644
--- a/lib/toolbox/keys_dict.c
+++ b/lib/toolbox/keys_dict.c
@@ -53,7 +53,7 @@ static bool keys_dict_read_key_line(KeysDict* instance, FuriString* line, bool*
 }
 
 bool keys_dict_check_presence(const char* path) {
-    furi_assert(path);
+    furi_check(path);
 
     Storage* storage = furi_record_open(RECORD_STORAGE);
 
@@ -65,16 +65,13 @@ bool keys_dict_check_presence(const char* path) {
 }
 
 KeysDict* keys_dict_alloc(const char* path, KeysDictMode mode, size_t key_size) {
-    furi_assert(path);
-    furi_assert(key_size > 0);
+    furi_check(path);
+    furi_check(key_size > 0);
 
     KeysDict* instance = malloc(sizeof(KeysDict));
 
     Storage* storage = furi_record_open(RECORD_STORAGE);
-    furi_assert(storage);
-
     instance->stream = buffered_file_stream_alloc(storage);
-    furi_assert(instance->stream);
 
     FS_OpenMode open_mode = (mode == KeysDictModeOpenAlways) ? FSOM_OPEN_ALWAYS :
                                                                FSOM_OPEN_EXISTING;
@@ -116,8 +113,8 @@ KeysDict* keys_dict_alloc(const char* path, KeysDictMode mode, size_t key_size)
 }
 
 void keys_dict_free(KeysDict* instance) {
-    furi_assert(instance);
-    furi_assert(instance->stream);
+    furi_check(instance);
+    furi_check(instance->stream);
 
     buffered_file_stream_close(instance->stream);
     stream_free(instance->stream);
@@ -157,14 +154,14 @@ static void keys_dict_str_to_int(KeysDict* instance, FuriString* key_str, uint64
 }
 
 size_t keys_dict_get_total_keys(KeysDict* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     return instance->total_keys;
 }
 
 bool keys_dict_rewind(KeysDict* instance) {
-    furi_assert(instance);
-    furi_assert(instance->stream);
+    furi_check(instance);
+    furi_check(instance->stream);
 
     return stream_rewind(instance->stream);
 }
@@ -185,10 +182,10 @@ static bool keys_dict_get_next_key_str(KeysDict* instance, FuriString* key) {
 }
 
 bool keys_dict_get_next_key(KeysDict* instance, uint8_t* key, size_t key_size) {
-    furi_assert(instance);
-    furi_assert(instance->stream);
-    furi_assert(instance->key_size == key_size);
-    furi_assert(key);
+    furi_check(instance);
+    furi_check(instance->stream);
+    furi_check(instance->key_size == key_size);
+    furi_check(key);
 
     FuriString* temp_key = furi_string_alloc();
 
@@ -237,10 +234,10 @@ static bool keys_dict_is_key_present_str(KeysDict* instance, FuriString* key) {
 }
 
 bool keys_dict_is_key_present(KeysDict* instance, const uint8_t* key, size_t key_size) {
-    furi_assert(instance);
-    furi_assert(instance->stream);
-    furi_assert(instance->key_size == key_size);
-    furi_assert(key);
+    furi_check(instance);
+    furi_check(instance->stream);
+    furi_check(instance->key_size == key_size);
+    furi_check(key);
 
     FuriString* temp_key = furi_string_alloc();
 
@@ -274,13 +271,12 @@ static bool keys_dict_add_key_str(KeysDict* instance, FuriString* key) {
 }
 
 bool keys_dict_add_key(KeysDict* instance, const uint8_t* key, size_t key_size) {
-    furi_assert(instance);
-    furi_assert(instance->stream);
-    furi_assert(instance->key_size == key_size);
-    furi_assert(key);
+    furi_check(instance);
+    furi_check(instance->stream);
+    furi_check(instance->key_size == key_size);
+    furi_check(key);
 
     FuriString* temp_key = furi_string_alloc();
-    furi_assert(temp_key);
 
     keys_dict_int_to_str(instance, key, temp_key);
     bool key_added = keys_dict_add_key_str(instance, temp_key);
@@ -293,10 +289,10 @@ bool keys_dict_add_key(KeysDict* instance, const uint8_t* key, size_t key_size)
 }
 
 bool keys_dict_delete_key(KeysDict* instance, const uint8_t* key, size_t key_size) {
-    furi_assert(instance);
-    furi_assert(instance->stream);
-    furi_assert(instance->key_size == key_size);
-    furi_assert(key);
+    furi_check(instance);
+    furi_check(instance->stream);
+    furi_check(instance->key_size == key_size);
+    furi_check(key);
 
     bool key_removed = false;
 
diff --git a/lib/toolbox/manchester_encoder.c b/lib/toolbox/manchester_encoder.c
index c22e4a177..38b94eb86 100644
--- a/lib/toolbox/manchester_encoder.c
+++ b/lib/toolbox/manchester_encoder.c
@@ -1,7 +1,9 @@
 #include "manchester_encoder.h"
 #include <stdio.h>
+#include <furi.h>
 
 void manchester_encoder_reset(ManchesterEncoderState* state) {
+    furi_check(state);
     state->step = 0;
 }
 
@@ -9,6 +11,9 @@ bool manchester_encoder_advance(
     ManchesterEncoderState* state,
     const bool curr_bit,
     ManchesterEncoderResult* result) {
+    furi_check(state);
+    furi_check(result);
+
     bool advance = false;
     switch(state->step) {
     case 0:
@@ -41,14 +46,16 @@ bool manchester_encoder_advance(
         advance = true;
         break;
     default:
-        printf("DO CRASH HERE\r\n");
-        // furi_crash
+        furi_crash();
         break;
     }
     return advance;
 }
 
 ManchesterEncoderResult manchester_encoder_finish(ManchesterEncoderState* state) {
+    furi_check(state);
+
     state->step = 0;
+
     return (state->prev_bit << 1) + state->prev_bit;
 }
diff --git a/lib/toolbox/name_generator.c b/lib/toolbox/name_generator.c
index 9748a7648..0423c8ade 100644
--- a/lib/toolbox/name_generator.c
+++ b/lib/toolbox/name_generator.c
@@ -8,40 +8,15 @@
 #include <furi.h>
 
 const char* const name_generator_left[] = {
-    "super",
-    "big",
-    "little",
-    "liquid",
-    "unknown",
-    "thin",
-    "thick",
-    "great",
-    "my",
-    "mini",
-    "ultra",
-    "haupt",
-    "small",
-    "random",
-    "strange",
+    "super",  "big",   "little", "liquid", "unknown", "cheeky",  "tricky",
+    "sneaky", "silly", "oh_my",  "quick",  "oh_no",   "quantum", "kurwa",
+    "great",  "smart", "mini",   "ultra",  "small",   "random",  "strange",
 };
 
 const char* const name_generator_right[] = {
-    "maslina",
-    "sus",
-    "anomalija",
-    "artefact",
-    "monolit",
-    "burer",
-    "sidorovich",
-    "habar",
-    "radar",
-    "borov",
-    "pda",
-    "konserva",
-    "aptechka",
-    "door",
-    "thing",
-    "stuff",
+    "maslina",  "sus",  "anomalija", "artefact", "bobr",   "chomik",  "sidorovich",
+    "stalker",  "kit",  "habar",     "jezyk",    "borov",  "juzyk",   "konserva",
+    "aptechka", "door", "zalaz",     "breeky",   "bunker", "pingwin", "kot",
 };
 
 void name_generator_make_auto_datetime(
@@ -60,9 +35,17 @@ void name_generator_make_auto(char* name, size_t max_name_size, const char* pref
     name_generator_make_auto_datetime(name, max_name_size, prefix, NULL);
 }
 
+void name_generator_make_auto_basic(char* name, size_t max_name_size, const char* prefix) {
+    if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDetailedFilename)) {
+        name_generator_make_detailed_datetime(name, max_name_size, prefix, NULL);
+    } else {
+        name_generator_make_random(name, max_name_size);
+    }
+}
+
 void name_generator_make_random_prefixed(char* name, size_t max_name_size, const char* prefix) {
-    furi_assert(name);
-    furi_assert(max_name_size);
+    furi_check(name);
+    furi_check(max_name_size);
 
     uint8_t name_generator_left_i = rand() % COUNT_OF(name_generator_left);
     uint8_t name_generator_right_i = rand() % COUNT_OF(name_generator_right);
@@ -89,9 +72,8 @@ void name_generator_make_detailed_datetime(
     size_t max_name_size,
     const char* prefix,
     DateTime* custom_time) {
-    furi_assert(name);
-    furi_assert(max_name_size);
-    furi_assert(prefix);
+    furi_check(name);
+    furi_check(max_name_size);
 
     DateTime dateTime;
     if(custom_time) {
diff --git a/lib/toolbox/name_generator.h b/lib/toolbox/name_generator.h
index e6c443688..b990381c3 100644
--- a/lib/toolbox/name_generator.h
+++ b/lib/toolbox/name_generator.h
@@ -21,6 +21,9 @@ void name_generator_make_auto_datetime(
     const char* prefix,
     DateTime* custom_time);
 
+// Generate name without prefix in random names
+void name_generator_make_auto_basic(char* name, size_t max_name_size, const char* prefix);
+
 /** Generates random name
  *
  * @param      name           buffer to write random name
diff --git a/lib/toolbox/path.c b/lib/toolbox/path.c
index 3d161a196..37bacd65a 100644
--- a/lib/toolbox/path.c
+++ b/lib/toolbox/path.c
@@ -2,6 +2,9 @@
 #include <stddef.h>
 
 void path_extract_filename_no_ext(const char* path, FuriString* filename) {
+    furi_check(path);
+    furi_check(filename);
+
     furi_string_set(filename, path);
 
     size_t start_position = furi_string_search_rchar(filename, '/');
@@ -21,6 +24,9 @@ void path_extract_filename_no_ext(const char* path, FuriString* filename) {
 }
 
 void path_extract_filename(FuriString* path, FuriString* name, bool trim_ext) {
+    furi_check(path);
+    furi_check(name);
+
     size_t filename_start = furi_string_search_rchar(path, '/');
     if(filename_start > 0) {
         filename_start++;
@@ -35,6 +41,9 @@ void path_extract_filename(FuriString* path, FuriString* name, bool trim_ext) {
 }
 
 void path_extract_extension(FuriString* path, char* ext, size_t ext_len_max) {
+    furi_check(path);
+    furi_check(ext);
+
     size_t dot = furi_string_search_rchar(path, '.');
     size_t filename_start = furi_string_search_rchar(path, '/');
 
@@ -51,6 +60,9 @@ static inline void path_cleanup(FuriString* path) {
 }
 
 void path_extract_basename(const char* path, FuriString* basename) {
+    furi_check(path);
+    furi_check(basename);
+
     furi_string_set(basename, path);
     path_cleanup(basename);
     size_t pos = furi_string_search_rchar(basename, '/');
@@ -60,6 +72,9 @@ void path_extract_basename(const char* path, FuriString* basename) {
 }
 
 void path_extract_dirname(const char* path, FuriString* dirname) {
+    furi_check(path);
+    furi_check(dirname);
+
     furi_string_set(dirname, path);
     path_cleanup(dirname);
     size_t pos = furi_string_search_rchar(dirname, '/');
@@ -69,6 +84,9 @@ void path_extract_dirname(const char* path, FuriString* dirname) {
 }
 
 void path_append(FuriString* path, const char* suffix) {
+    furi_check(path);
+    furi_check(suffix);
+
     path_cleanup(path);
     FuriString* suffix_str;
     suffix_str = furi_string_alloc_set(suffix);
@@ -79,6 +97,10 @@ void path_append(FuriString* path, const char* suffix) {
 }
 
 void path_concat(const char* path, const char* suffix, FuriString* out_path) {
+    furi_check(path);
+    furi_check(suffix);
+    furi_check(out_path);
+
     furi_string_set(out_path, path);
     path_append(out_path, suffix);
 }
diff --git a/lib/toolbox/pretty_format.c b/lib/toolbox/pretty_format.c
index d5ba10381..2dcfdb6d9 100644
--- a/lib/toolbox/pretty_format.c
+++ b/lib/toolbox/pretty_format.c
@@ -11,7 +11,7 @@ void pretty_format_bytes_hex_canonical(
     const char* line_prefix,
     const uint8_t* data,
     size_t data_size) {
-    furi_assert(data);
+    furi_check(data);
 
     bool is_truncated = false;
 
diff --git a/lib/toolbox/profiler.c b/lib/toolbox/profiler.c
index 96f38dce2..4e7cade1a 100644
--- a/lib/toolbox/profiler.c
+++ b/lib/toolbox/profiler.c
@@ -17,7 +17,7 @@ struct Profiler {
     ProfilerRecordDict_t records;
 };
 
-Profiler* profiler_alloc() {
+Profiler* profiler_alloc(void) {
     Profiler* profiler = malloc(sizeof(Profiler));
     ProfilerRecordDict_init(profiler->records);
     return profiler;
diff --git a/lib/toolbox/profiler.h b/lib/toolbox/profiler.h
index 840146332..037711a8f 100644
--- a/lib/toolbox/profiler.h
+++ b/lib/toolbox/profiler.h
@@ -6,7 +6,7 @@ extern "C" {
 
 typedef struct Profiler Profiler;
 
-Profiler* profiler_alloc();
+Profiler* profiler_alloc(void);
 
 void profiler_free(Profiler* profiler);
 
diff --git a/lib/toolbox/property.c b/lib/toolbox/property.c
index c258cdd6a..900948b45 100644
--- a/lib/toolbox/property.c
+++ b/lib/toolbox/property.c
@@ -3,7 +3,7 @@
 #include <core/check.h>
 
 void property_value_out(PropertyValueContext* ctx, const char* fmt, unsigned int nparts, ...) {
-    furi_assert(ctx);
+    furi_check(ctx);
     furi_string_reset(ctx->key);
 
     va_list args;
diff --git a/lib/toolbox/protocols/protocol_dict.c b/lib/toolbox/protocols/protocol_dict.c
index 136dc1372..e8da4b1cd 100644
--- a/lib/toolbox/protocols/protocol_dict.c
+++ b/lib/toolbox/protocols/protocol_dict.c
@@ -8,6 +8,8 @@ struct ProtocolDict {
 };
 
 ProtocolDict* protocol_dict_alloc(const ProtocolBase** protocols, size_t count) {
+    furi_check(protocols);
+
     ProtocolDict* dict = malloc(sizeof(ProtocolDict));
     dict->base = protocols;
     dict->count = count;
@@ -21,6 +23,8 @@ ProtocolDict* protocol_dict_alloc(const ProtocolBase** protocols, size_t count)
 }
 
 void protocol_dict_free(ProtocolDict* dict) {
+    furi_check(dict);
+
     for(size_t i = 0; i < dict->count; i++) {
         dict->base[i]->free(dict->data[i]);
     }
@@ -34,8 +38,9 @@ void protocol_dict_set_data(
     size_t protocol_index,
     const uint8_t* data,
     size_t data_size) {
-    furi_assert(protocol_index < dict->count);
-    furi_assert(dict->base[protocol_index]->get_data != NULL);
+    furi_check(protocol_index < dict->count);
+    furi_check(dict->base[protocol_index]->get_data != NULL);
+
     uint8_t* protocol_data = dict->base[protocol_index]->get_data(dict->data[protocol_index]);
     size_t protocol_data_size = dict->base[protocol_index]->data_size;
     furi_check(data_size >= protocol_data_size);
@@ -47,8 +52,9 @@ void protocol_dict_get_data(
     size_t protocol_index,
     uint8_t* data,
     size_t data_size) {
-    furi_assert(protocol_index < dict->count);
-    furi_assert(dict->base[protocol_index]->get_data != NULL);
+    furi_check(protocol_index < dict->count);
+    furi_check(dict->base[protocol_index]->get_data != NULL);
+
     uint8_t* protocol_data = dict->base[protocol_index]->get_data(dict->data[protocol_index]);
     size_t protocol_data_size = dict->base[protocol_index]->data_size;
     furi_check(data_size >= protocol_data_size);
@@ -56,11 +62,12 @@ void protocol_dict_get_data(
 }
 
 size_t protocol_dict_get_data_size(ProtocolDict* dict, size_t protocol_index) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
     return dict->base[protocol_index]->data_size;
 }
 
 size_t protocol_dict_get_max_data_size(ProtocolDict* dict) {
+    furi_check(dict);
     size_t max_data_size = 0;
     for(size_t i = 0; i < dict->count; i++) {
         size_t data_size = dict->base[i]->data_size;
@@ -73,16 +80,18 @@ size_t protocol_dict_get_max_data_size(ProtocolDict* dict) {
 }
 
 const char* protocol_dict_get_name(ProtocolDict* dict, size_t protocol_index) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
     return dict->base[protocol_index]->name;
 }
 
 const char* protocol_dict_get_manufacturer(ProtocolDict* dict, size_t protocol_index) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
     return dict->base[protocol_index]->manufacturer;
 }
 
 void protocol_dict_decoders_start(ProtocolDict* dict) {
+    furi_check(dict);
+
     for(size_t i = 0; i < dict->count; i++) {
         ProtocolDecoderStart fn = dict->base[i]->decoder.start;
 
@@ -93,11 +102,13 @@ void protocol_dict_decoders_start(ProtocolDict* dict) {
 }
 
 uint32_t protocol_dict_get_features(ProtocolDict* dict, size_t protocol_index) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
     return dict->base[protocol_index]->features;
 }
 
 ProtocolId protocol_dict_decoders_feed(ProtocolDict* dict, bool level, uint32_t duration) {
+    furi_check(dict);
+
     bool done = false;
     ProtocolId ready_protocol_id = PROTOCOL_NO;
 
@@ -122,6 +133,8 @@ ProtocolId protocol_dict_decoders_feed_by_feature(
     uint32_t feature,
     bool level,
     uint32_t duration) {
+    furi_check(dict);
+
     bool done = false;
     ProtocolId ready_protocol_id = PROTOCOL_NO;
 
@@ -149,7 +162,7 @@ ProtocolId protocol_dict_decoders_feed_by_id(
     size_t protocol_index,
     bool level,
     uint32_t duration) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
 
     ProtocolId ready_protocol_id = PROTOCOL_NO;
     ProtocolDecoderFeed fn = dict->base[protocol_index]->decoder.feed;
@@ -164,7 +177,7 @@ ProtocolId protocol_dict_decoders_feed_by_id(
 }
 
 bool protocol_dict_encoder_start(ProtocolDict* dict, size_t protocol_index) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
     ProtocolEncoderStart fn = dict->base[protocol_index]->encoder.start;
 
     if(fn) {
@@ -175,7 +188,7 @@ bool protocol_dict_encoder_start(ProtocolDict* dict, size_t protocol_index) {
 }
 
 LevelDuration protocol_dict_encoder_yield(ProtocolDict* dict, size_t protocol_index) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
     ProtocolEncoderYield fn = dict->base[protocol_index]->encoder.yield;
 
     if(fn) {
@@ -186,7 +199,7 @@ LevelDuration protocol_dict_encoder_yield(ProtocolDict* dict, size_t protocol_in
 }
 
 void protocol_dict_render_data(ProtocolDict* dict, FuriString* result, size_t protocol_index) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
     ProtocolRenderData fn = dict->base[protocol_index]->render_data;
 
     if(fn) {
@@ -195,7 +208,7 @@ void protocol_dict_render_data(ProtocolDict* dict, FuriString* result, size_t pr
 }
 
 void protocol_dict_render_brief_data(ProtocolDict* dict, FuriString* result, size_t protocol_index) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
     ProtocolRenderData fn = dict->base[protocol_index]->render_brief_data;
 
     if(fn) {
@@ -204,11 +217,13 @@ void protocol_dict_render_brief_data(ProtocolDict* dict, FuriString* result, siz
 }
 
 uint32_t protocol_dict_get_validate_count(ProtocolDict* dict, size_t protocol_index) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
     return dict->base[protocol_index]->validate_count;
 }
 
 ProtocolId protocol_dict_get_protocol_by_name(ProtocolDict* dict, const char* name) {
+    furi_check(dict);
+    furi_check(name);
     for(size_t i = 0; i < dict->count; i++) {
         if(strcmp(name, protocol_dict_get_name(dict, i)) == 0) {
             return i;
@@ -218,9 +233,9 @@ ProtocolId protocol_dict_get_protocol_by_name(ProtocolDict* dict, const char* na
 }
 
 bool protocol_dict_get_write_data(ProtocolDict* dict, size_t protocol_index, void* data) {
-    furi_assert(protocol_index < dict->count);
+    furi_check(protocol_index < dict->count);
     ProtocolWriteData fn = dict->base[protocol_index]->write_data;
 
-    furi_assert(fn);
+    furi_check(fn);
     return fn(dict->data[protocol_index], data);
 }
\ No newline at end of file
diff --git a/lib/toolbox/pulse_joiner.c b/lib/toolbox/pulse_joiner.c
index b6206486c..dce63b823 100644
--- a/lib/toolbox/pulse_joiner.c
+++ b/lib/toolbox/pulse_joiner.c
@@ -13,7 +13,7 @@ struct PulseJoiner {
     Pulse pulses[PULSE_MAX_COUNT];
 };
 
-PulseJoiner* pulse_joiner_alloc() {
+PulseJoiner* pulse_joiner_alloc(void) {
     PulseJoiner* pulse_joiner = malloc(sizeof(PulseJoiner));
 
     pulse_joiner->pulse_index = 0;
diff --git a/lib/toolbox/pulse_joiner.h b/lib/toolbox/pulse_joiner.h
index 25f702e72..f9597280f 100644
--- a/lib/toolbox/pulse_joiner.h
+++ b/lib/toolbox/pulse_joiner.h
@@ -13,7 +13,7 @@ typedef struct PulseJoiner PulseJoiner;
  * 
  * @return PulseJoiner* 
  */
-PulseJoiner* pulse_joiner_alloc();
+PulseJoiner* pulse_joiner_alloc(void);
 
 /**
  * @brief Free PulseJoiner
diff --git a/lib/toolbox/pulse_protocols/pulse_glue.c b/lib/toolbox/pulse_protocols/pulse_glue.c
index 9cb914db5..f8574691d 100644
--- a/lib/toolbox/pulse_protocols/pulse_glue.c
+++ b/lib/toolbox/pulse_protocols/pulse_glue.c
@@ -6,7 +6,7 @@ struct PulseGlue {
     int32_t next_hi_period;
 };
 
-PulseGlue* pulse_glue_alloc() {
+PulseGlue* pulse_glue_alloc(void) {
     PulseGlue* pulse_glue = malloc(sizeof(PulseGlue));
     pulse_glue_reset(pulse_glue);
     return pulse_glue;
diff --git a/lib/toolbox/pulse_protocols/pulse_glue.h b/lib/toolbox/pulse_protocols/pulse_glue.h
index 4954e2719..9f707d0c2 100644
--- a/lib/toolbox/pulse_protocols/pulse_glue.h
+++ b/lib/toolbox/pulse_protocols/pulse_glue.h
@@ -14,7 +14,7 @@ extern "C" {
 
 typedef struct PulseGlue PulseGlue;
 
-PulseGlue* pulse_glue_alloc();
+PulseGlue* pulse_glue_alloc(void);
 void pulse_glue_free(PulseGlue* pulse_glue);
 void pulse_glue_reset(PulseGlue* pulse_glue);
 
diff --git a/lib/toolbox/saved_struct.c b/lib/toolbox/saved_struct.c
index 2f1c09c8e..db7e4de6e 100644
--- a/lib/toolbox/saved_struct.c
+++ b/lib/toolbox/saved_struct.c
@@ -13,10 +13,15 @@ typedef struct {
     uint32_t timestamp;
 } SavedStructHeader;
 
-bool saved_struct_save(const char* path, void* data, size_t size, uint8_t magic, uint8_t version) {
-    furi_assert(path);
-    furi_assert(data);
-    furi_assert(size);
+bool saved_struct_save(
+    const char* path,
+    const void* data,
+    size_t size,
+    uint8_t magic,
+    uint8_t version) {
+    furi_check(path);
+    furi_check(data);
+    furi_check(size);
     SavedStructHeader header;
 
     FURI_LOG_I(TAG, "Saving \"%s\"", path);
@@ -35,7 +40,7 @@ bool saved_struct_save(const char* path, void* data, size_t size, uint8_t magic,
     if(result) {
         // Calculate checksum
         uint8_t checksum = 0;
-        uint8_t* source = data;
+        const uint8_t* source = data;
         for(size_t i = 0; i < size; i++) {
             checksum += source[i];
         }
@@ -63,6 +68,10 @@ bool saved_struct_save(const char* path, void* data, size_t size, uint8_t magic,
 }
 
 bool saved_struct_load(const char* path, void* data, size_t size, uint8_t magic, uint8_t version) {
+    furi_check(path);
+    furi_check(data);
+    furi_check(size);
+
     FURI_LOG_I(TAG, "Loading \"%s\"", path);
 
     SavedStructHeader header;
@@ -126,13 +135,12 @@ bool saved_struct_load(const char* path, void* data, size_t size, uint8_t magic,
     return result;
 }
 
-bool saved_struct_get_payload_size(
+bool saved_struct_get_metadata(
     const char* path,
-    uint8_t magic,
-    uint8_t version,
+    uint8_t* magic,
+    uint8_t* version,
     size_t* payload_size) {
-    furi_assert(path);
-    furi_assert(payload_size);
+    furi_check(path);
 
     SavedStructHeader header;
     Storage* storage = furi_record_open(RECORD_STORAGE);
@@ -146,26 +154,22 @@ bool saved_struct_get_payload_size(
             break;
         }
 
-        size_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
-        if(bytes_count != sizeof(SavedStructHeader)) {
+        if(storage_file_read(file, &header, sizeof(SavedStructHeader)) !=
+           sizeof(SavedStructHeader)) {
             FURI_LOG_E(TAG, "Failed to read header");
             break;
         }
 
-        if((header.magic != magic) || (header.version != version)) {
-            FURI_LOG_E(
-                TAG,
-                "Magic(%d != %d) or Version(%d != %d) mismatch of file \"%s\"",
-                header.magic,
-                magic,
-                header.version,
-                version,
-                path);
-            break;
+        if(magic) {
+            *magic = header.magic;
+        }
+        if(version) {
+            *version = header.version;
+        }
+        if(payload_size) {
+            uint64_t file_size = storage_file_size(file);
+            *payload_size = file_size - sizeof(SavedStructHeader);
         }
-
-        uint64_t file_size = storage_file_size(file);
-        *payload_size = file_size - sizeof(SavedStructHeader);
 
         result = true;
     } while(false);
diff --git a/lib/toolbox/saved_struct.h b/lib/toolbox/saved_struct.h
index 9ce836564..5ce53d3cd 100644
--- a/lib/toolbox/saved_struct.h
+++ b/lib/toolbox/saved_struct.h
@@ -1,3 +1,8 @@
+/**
+ * @file saved_struct.h
+ * @brief SavedStruct - data serialization/de-serialization
+ * 
+ */
 #pragma once
 
 #include <stdint.h>
@@ -8,14 +13,50 @@
 extern "C" {
 #endif
 
+/** Load data from the file in saved structure format
+ *
+ * @param[in]  path     The path to the file
+ * @param[out] data     Pointer to the memory where to load data
+ * @param[in]  size     The size of the data
+ * @param[in]  magic    The magic to embed into metadata
+ * @param[in]  version  The version to embed into metadata
+ *
+ * @return     true on success, false otherwise
+ */
 bool saved_struct_load(const char* path, void* data, size_t size, uint8_t magic, uint8_t version);
 
-bool saved_struct_save(const char* path, void* data, size_t size, uint8_t magic, uint8_t version);
-
-bool saved_struct_get_payload_size(
+/** Save data in saved structure format
+ *
+ * @param[in]  path     The path to the file
+ * @param[in]  data     Pointer to the memory where data
+ * @param[in]  size     The size of the data
+ * @param[in]  magic    The magic to embed into metadata
+ * @param[in]  version  The version to embed into metadata
+ *
+ * @return     true on success, false otherwise
+ */
+bool saved_struct_save(
     const char* path,
+    const void* data,
+    size_t size,
     uint8_t magic,
-    uint8_t version,
+    uint8_t version);
+
+/** Get SavedStructure file metadata
+ *
+ * @param[in]  path          The path to the file
+ * @param[out] magic         Pointer to store magic or NULL if you don't need it
+ * @param[out] version       Pointer to store version or NULL if you don't need
+ *                           it
+ * @param[out] payload_size  Pointer to store payload size or NULL if you don't
+ *                           need it
+ *
+ * @return     true on success, false otherwise
+ */
+bool saved_struct_get_metadata(
+    const char* path,
+    uint8_t* magic,
+    uint8_t* version,
     size_t* payload_size);
 
 #ifdef __cplusplus
diff --git a/lib/toolbox/simple_array.c b/lib/toolbox/simple_array.c
index 7aed8e34b..af20444df 100644
--- a/lib/toolbox/simple_array.c
+++ b/lib/toolbox/simple_array.c
@@ -15,15 +15,15 @@ SimpleArray* simple_array_alloc(const SimpleArrayConfig* config) {
 }
 
 void simple_array_free(SimpleArray* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     simple_array_reset(instance);
     free(instance);
 }
 
 void simple_array_init(SimpleArray* instance, uint32_t count) {
-    furi_assert(instance);
-    furi_assert(count > 0);
+    furi_check(instance);
+    furi_check(count > 0);
 
     simple_array_reset(instance);
 
@@ -39,7 +39,7 @@ void simple_array_init(SimpleArray* instance, uint32_t count) {
 }
 
 void simple_array_reset(SimpleArray* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     if(instance->data) {
         SimpleArrayReset reset = instance->config->reset;
@@ -58,9 +58,9 @@ void simple_array_reset(SimpleArray* instance) {
 }
 
 void simple_array_copy(SimpleArray* instance, const SimpleArray* other) {
-    furi_assert(instance);
-    furi_assert(other);
-    furi_assert(instance->config == other->config);
+    furi_check(instance);
+    furi_check(other);
+    furi_check(instance->config == other->config);
 
     simple_array_reset(instance);
 
@@ -81,8 +81,8 @@ void simple_array_copy(SimpleArray* instance, const SimpleArray* other) {
 }
 
 bool simple_array_is_equal(const SimpleArray* instance, const SimpleArray* other) {
-    furi_assert(instance);
-    furi_assert(other);
+    furi_check(instance);
+    furi_check(other);
 
     // Equal if the same object
     if(instance == other) return true;
@@ -93,29 +93,31 @@ bool simple_array_is_equal(const SimpleArray* instance, const SimpleArray* other
 }
 
 uint32_t simple_array_get_count(const SimpleArray* instance) {
-    furi_assert(instance);
+    furi_check(instance);
     return instance->count;
 }
 
 SimpleArrayElement* simple_array_get(SimpleArray* instance, uint32_t index) {
-    furi_assert(instance);
-    furi_assert(index < instance->count);
+    furi_check(instance);
+    furi_check(index < instance->count);
 
     return instance->data + index * instance->config->type_size;
 }
 
 const SimpleArrayElement* simple_array_cget(const SimpleArray* instance, uint32_t index) {
+    furi_check(instance);
     return simple_array_get((SimpleArrayElement*)instance, index);
 }
 
 SimpleArrayData* simple_array_get_data(SimpleArray* instance) {
-    furi_assert(instance);
-    furi_assert(instance->data);
+    furi_check(instance);
+    furi_check(instance->data);
 
     return instance->data;
 }
 
 const SimpleArrayData* simple_array_cget_data(const SimpleArray* instance) {
+    furi_check(instance);
     return simple_array_get_data((SimpleArray*)instance);
 }
 
diff --git a/lib/toolbox/stream/buffered_file_stream.c b/lib/toolbox/stream/buffered_file_stream.c
index 3b485e80d..819e499c1 100644
--- a/lib/toolbox/stream/buffered_file_stream.c
+++ b/lib/toolbox/stream/buffered_file_stream.c
@@ -58,14 +58,14 @@ bool buffered_file_stream_open(
     const char* path,
     FS_AccessMode access_mode,
     FS_OpenMode open_mode) {
-    furi_assert(_stream);
+    furi_check(_stream);
     BufferedFileStream* stream = (BufferedFileStream*)_stream;
     furi_check(stream->stream_base.vtable == &buffered_file_stream_vtable);
     return file_stream_open(stream->file_stream, path, access_mode, open_mode);
 }
 
 bool buffered_file_stream_close(Stream* _stream) {
-    furi_assert(_stream);
+    furi_check(_stream);
     BufferedFileStream* stream = (BufferedFileStream*)_stream;
     furi_check(stream->stream_base.vtable == &buffered_file_stream_vtable);
     bool success = false;
@@ -80,21 +80,21 @@ bool buffered_file_stream_close(Stream* _stream) {
 }
 
 bool buffered_file_stream_sync(Stream* _stream) {
-    furi_assert(_stream);
+    furi_check(_stream);
     BufferedFileStream* stream = (BufferedFileStream*)_stream;
     furi_check(stream->stream_base.vtable == &buffered_file_stream_vtable);
     return stream->sync_pending ? buffered_file_stream_flush(stream) : true;
 }
 
 FS_Error buffered_file_stream_get_error(Stream* _stream) {
-    furi_assert(_stream);
+    furi_check(_stream);
     BufferedFileStream* stream = (BufferedFileStream*)_stream;
     furi_check(stream->stream_base.vtable == &buffered_file_stream_vtable);
     return file_stream_get_error(stream->file_stream);
 }
 
 static void buffered_file_stream_free(BufferedFileStream* stream) {
-    furi_assert(stream);
+    furi_check(stream);
     buffered_file_stream_sync((Stream*)stream);
     stream_free(stream->file_stream);
     stream_cache_free(stream->cache);
diff --git a/lib/toolbox/stream/file_stream.c b/lib/toolbox/stream/file_stream.c
index 2b5348b3e..80cbb7d5f 100644
--- a/lib/toolbox/stream/file_stream.c
+++ b/lib/toolbox/stream/file_stream.c
@@ -35,6 +35,8 @@ const StreamVTable file_stream_vtable = {
 };
 
 Stream* file_stream_alloc(Storage* storage) {
+    furi_check(storage);
+
     FileStream* stream = malloc(sizeof(FileStream));
     stream->file = storage_file_alloc(storage);
     stream->storage = storage;
@@ -48,21 +50,21 @@ bool file_stream_open(
     const char* path,
     FS_AccessMode access_mode,
     FS_OpenMode open_mode) {
-    furi_assert(_stream);
+    furi_check(_stream);
     FileStream* stream = (FileStream*)_stream;
     furi_check(stream->stream_base.vtable == &file_stream_vtable);
     return storage_file_open(stream->file, path, access_mode, open_mode);
 }
 
 bool file_stream_close(Stream* _stream) {
-    furi_assert(_stream);
+    furi_check(_stream);
     FileStream* stream = (FileStream*)_stream;
     furi_check(stream->stream_base.vtable == &file_stream_vtable);
     return storage_file_close(stream->file);
 }
 
 FS_Error file_stream_get_error(Stream* _stream) {
-    furi_assert(_stream);
+    furi_check(_stream);
     FileStream* stream = (FileStream*)_stream;
     furi_check(stream->stream_base.vtable == &file_stream_vtable);
     return storage_file_get_error(stream->file);
diff --git a/lib/toolbox/stream/stream.c b/lib/toolbox/stream/stream.c
index 407da0f2c..9aff8bd4f 100644
--- a/lib/toolbox/stream/stream.c
+++ b/lib/toolbox/stream/stream.c
@@ -7,22 +7,22 @@
 #define STREAM_BUFFER_SIZE (32U)
 
 void stream_free(Stream* stream) {
-    furi_assert(stream);
+    furi_check(stream);
     stream->vtable->free(stream);
 }
 
 void stream_clean(Stream* stream) {
-    furi_assert(stream);
+    furi_check(stream);
     stream->vtable->clean(stream);
 }
 
 bool stream_eof(Stream* stream) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream->vtable->eof(stream);
 }
 
 bool stream_seek(Stream* stream, int32_t offset, StreamOffset offset_type) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream->vtable->seek(stream, offset, offset_type);
 }
 
@@ -85,6 +85,8 @@ static bool stream_seek_to_char_backward(Stream* stream, char c) {
 }
 
 bool stream_seek_to_char(Stream* stream, char c, StreamDirection direction) {
+    furi_check(stream);
+
     const size_t old_position = stream_tell(stream);
 
     bool result = false;
@@ -103,22 +105,22 @@ bool stream_seek_to_char(Stream* stream, char c, StreamDirection direction) {
 }
 
 size_t stream_tell(Stream* stream) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream->vtable->tell(stream);
 }
 
 size_t stream_size(Stream* stream) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream->vtable->size(stream);
 }
 
 size_t stream_write(Stream* stream, const uint8_t* data, size_t size) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream->vtable->write(stream, data, size);
 }
 
 size_t stream_read(Stream* stream, uint8_t* data, size_t size) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream->vtable->read(stream, data, size);
 }
 
@@ -127,7 +129,7 @@ bool stream_delete_and_insert(
     size_t delete_size,
     StreamWriteCB write_callback,
     const void* ctx) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream->vtable->delete_and_insert(stream, delete_size, write_callback, ctx);
 }
 
@@ -139,13 +141,16 @@ typedef struct {
 } StreamWriteData;
 
 static bool stream_write_struct(Stream* stream, const void* context) {
-    furi_assert(stream);
-    furi_assert(context);
+    furi_check(stream);
+    furi_check(context);
     const StreamWriteData* write_data = context;
     return (stream_write(stream, write_data->data, write_data->size) == write_data->size);
 }
 
 bool stream_read_line(Stream* stream, FuriString* str_result) {
+    furi_check(stream);
+    furi_check(str_result);
+
     furi_string_reset(str_result);
     uint8_t buffer[STREAM_BUFFER_SIZE];
 
@@ -180,28 +185,28 @@ bool stream_read_line(Stream* stream, FuriString* str_result) {
 }
 
 bool stream_rewind(Stream* stream) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream_seek(stream, 0, StreamOffsetFromStart);
 }
 
 size_t stream_write_char(Stream* stream, char c) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream_write(stream, (const uint8_t*)&c, 1);
 }
 
 size_t stream_write_string(Stream* stream, FuriString* string) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream_write(
         stream, (const uint8_t*)furi_string_get_cstr(string), furi_string_size(string));
 }
 
 size_t stream_write_cstring(Stream* stream, const char* string) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream_write(stream, (const uint8_t*)string, strlen(string));
 }
 
 size_t stream_write_format(Stream* stream, const char* format, ...) {
-    furi_assert(stream);
+    furi_check(stream);
     size_t size;
     va_list args;
     va_start(args, format);
@@ -211,7 +216,7 @@ size_t stream_write_format(Stream* stream, const char* format, ...) {
 }
 
 size_t stream_write_vaformat(Stream* stream, const char* format, va_list args) {
-    furi_assert(stream);
+    furi_check(stream);
     FuriString* data;
     data = furi_string_alloc_vprintf(format, args);
     size_t size = stream_write_string(stream, data);
@@ -221,28 +226,28 @@ size_t stream_write_vaformat(Stream* stream, const char* format, va_list args) {
 }
 
 bool stream_insert(Stream* stream, const uint8_t* data, size_t size) {
-    furi_assert(stream);
+    furi_check(stream);
     StreamWriteData write_data = {.data = data, .size = size};
     return stream_delete_and_insert(stream, 0, stream_write_struct, &write_data);
 }
 
 bool stream_insert_char(Stream* stream, char c) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream_delete_and_insert_char(stream, 0, c);
 }
 
 bool stream_insert_string(Stream* stream, FuriString* string) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream_delete_and_insert_string(stream, 0, string);
 }
 
 bool stream_insert_cstring(Stream* stream, const char* string) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream_delete_and_insert_cstring(stream, 0, string);
 }
 
 bool stream_insert_format(Stream* stream, const char* format, ...) {
-    furi_assert(stream);
+    furi_check(stream);
     va_list args;
     va_start(args, format);
     bool result = stream_insert_vaformat(stream, format, args);
@@ -252,31 +257,31 @@ bool stream_insert_format(Stream* stream, const char* format, ...) {
 }
 
 bool stream_insert_vaformat(Stream* stream, const char* format, va_list args) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream_delete_and_insert_vaformat(stream, 0, format, args);
 }
 
 bool stream_delete_and_insert_char(Stream* stream, size_t delete_size, char c) {
-    furi_assert(stream);
+    furi_check(stream);
     StreamWriteData write_data = {.data = (uint8_t*)&c, .size = 1};
     return stream_delete_and_insert(stream, delete_size, stream_write_struct, &write_data);
 }
 
 bool stream_delete_and_insert_string(Stream* stream, size_t delete_size, FuriString* string) {
-    furi_assert(stream);
+    furi_check(stream);
     StreamWriteData write_data = {
         .data = (uint8_t*)furi_string_get_cstr(string), .size = furi_string_size(string)};
     return stream_delete_and_insert(stream, delete_size, stream_write_struct, &write_data);
 }
 
 bool stream_delete_and_insert_cstring(Stream* stream, size_t delete_size, const char* string) {
-    furi_assert(stream);
+    furi_check(stream);
     StreamWriteData write_data = {.data = (uint8_t*)string, .size = strlen(string)};
     return stream_delete_and_insert(stream, delete_size, stream_write_struct, &write_data);
 }
 
 bool stream_delete_and_insert_format(Stream* stream, size_t delete_size, const char* format, ...) {
-    furi_assert(stream);
+    furi_check(stream);
     va_list args;
     va_start(args, format);
     bool result = stream_delete_and_insert_vaformat(stream, delete_size, format, args);
@@ -290,9 +295,9 @@ bool stream_delete_and_insert_vaformat(
     size_t delete_size,
     const char* format,
     va_list args) {
-    furi_assert(stream);
-    FuriString* data;
-    data = furi_string_alloc_vprintf(format, args);
+    furi_check(stream);
+
+    FuriString* data = furi_string_alloc_vprintf(format, args);
     StreamWriteData write_data = {
         .data = (uint8_t*)furi_string_get_cstr(data), .size = furi_string_size(data)};
     bool result = stream_delete_and_insert(stream, delete_size, stream_write_struct, &write_data);
@@ -302,11 +307,14 @@ bool stream_delete_and_insert_vaformat(
 }
 
 bool stream_delete(Stream* stream, size_t size) {
-    furi_assert(stream);
+    furi_check(stream);
     return stream_delete_and_insert(stream, size, NULL, NULL);
 }
 
 size_t stream_copy(Stream* stream_from, Stream* stream_to, size_t size) {
+    furi_check(stream_from);
+    furi_check(stream_to);
+
     uint8_t* buffer = malloc(STREAM_CACHE_SIZE);
     size_t copied = 0;
 
@@ -330,6 +338,9 @@ size_t stream_copy(Stream* stream_from, Stream* stream_to, size_t size) {
 }
 
 size_t stream_copy_full(Stream* stream_from, Stream* stream_to) {
+    furi_check(stream_from);
+    furi_check(stream_to);
+
     size_t was_written = 0;
 
     do {
@@ -342,6 +353,8 @@ size_t stream_copy_full(Stream* stream_from, Stream* stream_to) {
 }
 
 bool stream_split(Stream* stream, Stream* stream_left, Stream* stream_right) {
+    furi_check(stream);
+
     bool result = false;
     size_t size = stream_size(stream);
     size_t tell = stream_tell(stream);
@@ -363,6 +376,9 @@ bool stream_split(Stream* stream, Stream* stream_left, Stream* stream_right) {
 }
 
 size_t stream_load_from_file(Stream* stream, Storage* storage, const char* path) {
+    furi_check(stream);
+    furi_check(storage);
+
     size_t was_written = 0;
     Stream* file = file_stream_alloc(storage);
 
@@ -376,6 +392,9 @@ size_t stream_load_from_file(Stream* stream, Storage* storage, const char* path)
 }
 
 size_t stream_save_to_file(Stream* stream, Storage* storage, const char* path, FS_OpenMode mode) {
+    furi_check(stream);
+    furi_check(storage);
+
     size_t was_written = 0;
     Stream* file = file_stream_alloc(storage);
 
@@ -389,6 +408,8 @@ size_t stream_save_to_file(Stream* stream, Storage* storage, const char* path, F
 }
 
 void stream_dump_data(Stream* stream) {
+    furi_check(stream);
+
     size_t size = stream_size(stream);
     size_t tell = stream_tell(stream);
     printf("stream %p\r\n", stream);
diff --git a/lib/toolbox/stream/stream_cache.c b/lib/toolbox/stream/stream_cache.c
index f5e147dfe..d38a2f7b7 100644
--- a/lib/toolbox/stream/stream_cache.c
+++ b/lib/toolbox/stream/stream_cache.c
@@ -8,7 +8,7 @@ struct StreamCache {
     size_t position;
 };
 
-StreamCache* stream_cache_alloc() {
+StreamCache* stream_cache_alloc(void) {
     StreamCache* cache = malloc(sizeof(StreamCache));
     cache->data_size = 0;
     cache->position = 0;
diff --git a/lib/toolbox/stream/stream_cache.h b/lib/toolbox/stream/stream_cache.h
index f61e5e8f2..b00538ae3 100644
--- a/lib/toolbox/stream/stream_cache.h
+++ b/lib/toolbox/stream/stream_cache.h
@@ -12,7 +12,7 @@ typedef struct StreamCache StreamCache;
  * Allocate stream cache.
  * @return StreamCache* pointer to a StreamCache instance
  */
-StreamCache* stream_cache_alloc();
+StreamCache* stream_cache_alloc(void);
 
 /**
  * Free stream cache.
diff --git a/lib/toolbox/stream/string_stream.c b/lib/toolbox/stream/string_stream.c
index f8a360c03..742547fb7 100644
--- a/lib/toolbox/stream/string_stream.c
+++ b/lib/toolbox/stream/string_stream.c
@@ -37,7 +37,7 @@ const StreamVTable string_stream_vtable = {
     .delete_and_insert = (StreamDeleteAndInsertFn)string_stream_delete_and_insert,
 };
 
-Stream* string_stream_alloc() {
+Stream* string_stream_alloc(void) {
     StringStream* stream = malloc(sizeof(StringStream));
     stream->string = furi_string_alloc();
     stream->index = 0;
diff --git a/lib/toolbox/stream/string_stream.h b/lib/toolbox/stream/string_stream.h
index f882a246b..279f053f2 100644
--- a/lib/toolbox/stream/string_stream.h
+++ b/lib/toolbox/stream/string_stream.h
@@ -10,7 +10,7 @@ extern "C" {
  * Allocate string stream
  * @return Stream* 
  */
-Stream* string_stream_alloc();
+Stream* string_stream_alloc(void);
 
 #ifdef __cplusplus
 }
diff --git a/lib/toolbox/tar/tar_archive.c b/lib/toolbox/tar/tar_archive.c
index fcfc22a70..639f2eaec 100644
--- a/lib/toolbox/tar/tar_archive.c
+++ b/lib/toolbox/tar/tar_archive.c
@@ -59,7 +59,7 @@ TarArchive* tar_archive_alloc(Storage* storage) {
 }
 
 bool tar_archive_open(TarArchive* archive, const char* path, TarOpenMode mode) {
-    furi_assert(archive);
+    furi_check(archive);
     FS_AccessMode access_mode;
     FS_OpenMode open_mode;
     int mtar_access = 0;
@@ -90,7 +90,7 @@ bool tar_archive_open(TarArchive* archive, const char* path, TarOpenMode mode) {
 }
 
 void tar_archive_free(TarArchive* archive) {
-    furi_assert(archive);
+    furi_check(archive);
     if(mtar_is_open(&archive->tar)) {
         mtar_close(&archive->tar);
     }
@@ -98,7 +98,7 @@ void tar_archive_free(TarArchive* archive) {
 }
 
 void tar_archive_set_file_callback(TarArchive* archive, tar_unpack_file_cb callback, void* context) {
-    furi_assert(archive);
+    furi_check(archive);
     archive->unpack_cb = callback;
     archive->unpack_cb_context = context;
 }
@@ -113,6 +113,7 @@ static int tar_archive_entry_counter(mtar_t* tar, const mtar_header_t* header, v
 }
 
 int32_t tar_archive_get_entries_count(TarArchive* archive) {
+    furi_check(archive);
     int32_t counter = 0;
     if(mtar_foreach(&archive->tar, tar_archive_entry_counter, &counter) != MTAR_ESUCCESS) {
         counter = -1;
@@ -121,12 +122,12 @@ int32_t tar_archive_get_entries_count(TarArchive* archive) {
 }
 
 bool tar_archive_dir_add_element(TarArchive* archive, const char* dirpath) {
-    furi_assert(archive);
+    furi_check(archive);
     return (mtar_write_dir_header(&archive->tar, dirpath) == MTAR_ESUCCESS);
 }
 
 bool tar_archive_finalize(TarArchive* archive) {
-    furi_assert(archive);
+    furi_check(archive);
     return (mtar_finalize(&archive->tar) == MTAR_ESUCCESS);
 }
 
@@ -135,7 +136,7 @@ bool tar_archive_store_data(
     const char* path,
     const uint8_t* data,
     const int32_t data_len) {
-    furi_assert(archive);
+    furi_check(archive);
 
     return (
         tar_archive_file_add_header(archive, path, data_len) &&
@@ -144,7 +145,7 @@ bool tar_archive_store_data(
 }
 
 bool tar_archive_file_add_header(TarArchive* archive, const char* path, const int32_t data_len) {
-    furi_assert(archive);
+    furi_check(archive);
 
     return (mtar_write_file_header(&archive->tar, path, data_len) == MTAR_ESUCCESS);
 }
@@ -153,13 +154,13 @@ bool tar_archive_file_add_data_block(
     TarArchive* archive,
     const uint8_t* data_block,
     const int32_t block_len) {
-    furi_assert(archive);
+    furi_check(archive);
 
     return (mtar_write_data(&archive->tar, data_block, block_len) == block_len);
 }
 
 bool tar_archive_file_finalize(TarArchive* archive) {
-    furi_assert(archive);
+    furi_check(archive);
     return (mtar_end_data(&archive->tar) == MTAR_ESUCCESS);
 }
 
@@ -259,7 +260,7 @@ bool tar_archive_unpack_to(
     TarArchive* archive,
     const char* destination,
     Storage_name_converter converter) {
-    furi_assert(archive);
+    furi_check(archive);
     TarArchiveDirectoryOpParams param = {
         .archive = archive,
         .work_dir = destination,
@@ -276,7 +277,7 @@ bool tar_archive_add_file(
     const char* fs_file_path,
     const char* archive_fname,
     const int32_t file_size) {
-    furi_assert(archive);
+    furi_check(archive);
     uint8_t* file_buffer = malloc(FILE_BLOCK_SIZE);
     bool success = false;
     File* src_file = storage_file_alloc(archive->storage);
@@ -314,8 +315,9 @@ bool tar_archive_add_file(
 }
 
 bool tar_archive_add_dir(TarArchive* archive, const char* fs_full_path, const char* path_prefix) {
-    furi_assert(archive);
+    furi_check(archive);
     furi_check(path_prefix);
+
     File* directory = storage_file_alloc(archive->storage);
     FileInfo file_info;
 
@@ -376,9 +378,9 @@ bool tar_archive_unpack_file(
     TarArchive* archive,
     const char* archive_fname,
     const char* destination) {
-    furi_assert(archive);
-    furi_assert(archive_fname);
-    furi_assert(destination);
+    furi_check(archive);
+    furi_check(archive_fname);
+    furi_check(destination);
     if(mtar_find(&archive->tar, archive_fname) != MTAR_ESUCCESS) {
         return false;
     }
diff --git a/lib/u8g2/u8g2.h b/lib/u8g2/u8g2.h
index 68611d482..540b7a873 100644
--- a/lib/u8g2/u8g2.h
+++ b/lib/u8g2/u8g2.h
@@ -67,7 +67,7 @@
   Use 16 Bit mode for any display with more than 240 pixel in one 
   direction.
 */
-//#define U8G2_16BIT
+#define U8G2_16BIT
 
 /*
   The following macro switches the library into dynamic display buffer allocation mode.
diff --git a/lib/update_util/update_manifest.c b/lib/update_util/update_manifest.c
index 42ab073b0..eef27cb42 100644
--- a/lib/update_util/update_manifest.c
+++ b/lib/update_util/update_manifest.c
@@ -19,7 +19,7 @@
 #define MANIFEST_KEY_OB_WRITE_MASK "OB write mask"
 #define MANIFEST_KEY_SPLASH_FILE "Splashscreen"
 
-UpdateManifest* update_manifest_alloc() {
+UpdateManifest* update_manifest_alloc(void) {
     UpdateManifest* update_manifest = malloc(sizeof(UpdateManifest));
     update_manifest->version = furi_string_alloc();
     update_manifest->firmware_dfu_image = furi_string_alloc();
diff --git a/lib/update_util/update_manifest.h b/lib/update_util/update_manifest.h
index c26e4f87b..0c6284516 100644
--- a/lib/update_util/update_manifest.h
+++ b/lib/update_util/update_manifest.h
@@ -45,7 +45,7 @@ typedef struct {
     bool valid;
 } UpdateManifest;
 
-UpdateManifest* update_manifest_alloc();
+UpdateManifest* update_manifest_alloc(void);
 
 void update_manifest_free(UpdateManifest* update_manifest);
 
diff --git a/lib/update_util/update_operation.c b/lib/update_util/update_operation.c
index 39a7ea075..cb603abe0 100644
--- a/lib/update_util/update_operation.c
+++ b/lib/update_util/update_operation.c
@@ -218,7 +218,7 @@ UpdatePrepareResult update_operation_prepare(const char* manifest_file_path) {
     return result;
 }
 
-bool update_operation_is_armed() {
+bool update_operation_is_armed(void) {
     FuriHalRtcBootMode boot_mode = furi_hal_rtc_get_boot_mode();
     const uint32_t rtc_upd_index =
         furi_hal_rtc_get_register(FuriHalRtcRegisterUpdateFolderFSIndex);
@@ -231,7 +231,7 @@ bool update_operation_is_armed() {
            ((rtc_upd_index != INT_MAX) || upd_fn_ptr_exists);
 }
 
-void update_operation_disarm() {
+void update_operation_disarm(void) {
     furi_hal_rtc_set_boot_mode(FuriHalRtcBootModeNormal);
     furi_hal_rtc_set_register(FuriHalRtcRegisterUpdateFolderFSIndex, INT_MAX);
     Storage* storage = furi_record_open(RECORD_STORAGE);
diff --git a/lib/update_util/update_operation.h b/lib/update_util/update_operation.h
index 8e36b5a13..063f577e2 100644
--- a/lib/update_util/update_operation.h
+++ b/lib/update_util/update_operation.h
@@ -56,12 +56,12 @@ bool update_operation_get_current_package_manifest_path(Storage* storage, FuriSt
 /* 
  * Checks if an update operation step is pending after reset
  */
-bool update_operation_is_armed();
+bool update_operation_is_armed(void);
 
 /* 
  * Cancels pending update operation
  */
-void update_operation_disarm();
+void update_operation_disarm(void);
 
 #ifdef __cplusplus
 }
diff --git a/scripts/fbt/util.py b/scripts/fbt/util.py
index 6b1f9dc6c..27b488f73 100644
--- a/scripts/fbt/util.py
+++ b/scripts/fbt/util.py
@@ -1,5 +1,9 @@
 import os
 import re
+import subprocess
+import sys
+import webbrowser
+from pathlib import Path, PurePosixPath
 
 import SCons
 from SCons.Errors import StopError
@@ -80,7 +84,29 @@ def resolve_real_dir_node(node):
     raise StopError(f"Can't find absolute path for {node.name} ({node})")
 
 
-def path_as_posix(path):
-    if SCons.Platform.platform_default() == "win32":
-        return path.replace(os.path.sep, os.path.altsep)
-    return path
+class PosixPathWrapper:
+    def __init__(self, pathobj):
+        self.pathobj = pathobj
+
+    @staticmethod
+    def fixup_separators(path):
+        if SCons.Platform.platform_default() == "win32":
+            return path.replace(os.path.sep, os.path.altsep)
+        return path
+
+    @staticmethod
+    def fix_path(path):
+        return str(PurePosixPath(Path(path).as_posix()))
+
+    def __call__(self, target, source, env, for_signature):
+        if for_signature:
+            return self.pathobj
+
+        return self.fix_path(env.subst(self.pathobj))
+
+
+def open_browser_action(target, source, env):
+    if sys.platform == "darwin":
+        subprocess.run(["open", source[0].abspath])
+    else:
+        webbrowser.open(source[0].abspath)
diff --git a/scripts/fbt_tools/doxygen.py b/scripts/fbt_tools/doxygen.py
new file mode 100644
index 000000000..319cb9e5d
--- /dev/null
+++ b/scripts/fbt_tools/doxygen.py
@@ -0,0 +1,40 @@
+from SCons.Script import Action, Builder
+
+
+def exists(env):
+    return True
+
+
+def DoxyBuild(env, target, source, doxy_env_variables=None):
+    if doxy_env_variables:
+        doxy_env = env.Clone()
+        doxy_env.Append(ENV=doxy_env_variables)
+    else:
+        doxy_env = env
+
+    return doxy_env._DoxyBuilder(target, source)
+
+
+def generate(env):
+    if not env["VERBOSE"]:
+        env.SetDefault(
+            DOXYGENCOMSTR="\tDOXY\t${TARGET}",
+        )
+
+    env.SetDefault(
+        DOXYGEN="doxygen",
+    )
+
+    env.AddMethod(DoxyBuild)
+    env.Append(
+        BUILDERS={
+            "_DoxyBuilder": Builder(
+                action=[
+                    Action(
+                        [["$DOXYGEN", "$SOURCE"]],
+                        "$DOXYGENCOMSTR",
+                    ),
+                ],
+            )
+        }
+    )
diff --git a/scripts/fbt_tools/fbt_apps.py b/scripts/fbt_tools/fbt_apps.py
index 7e0aec5ea..3a17a79a3 100644
--- a/scripts/fbt_tools/fbt_apps.py
+++ b/scripts/fbt_tools/fbt_apps.py
@@ -44,7 +44,7 @@ class ApplicationsCGenerator:
 
     def get_app_ep_forward(self, app: FlipperApplication):
         if app.apptype == FlipperAppType.STARTUP:
-            return f"extern void {app.entry_point}();"
+            return f"extern void {app.entry_point}(void);"
         return f"extern int32_t {app.entry_point}(void* p);"
 
     def get_app_descr(self, app: FlipperApplication):
diff --git a/scripts/fbt_tools/fbt_debugopts.py b/scripts/fbt_tools/fbt_debugopts.py
index 392465a51..77b63e203 100644
--- a/scripts/fbt_tools/fbt_debugopts.py
+++ b/scripts/fbt_tools/fbt_debugopts.py
@@ -18,7 +18,7 @@ def GetDevices(env):
 def generate(env, **kw):
     env.AddMethod(GetDevices)
     env.SetDefault(
-        FBT_DEBUG_DIR="${FBT_SCRIPT_DIR}/debug",
+        FBT_DEBUG_DIR="${POSIXPATH('$FBT_SCRIPT_DIR')}/debug",
     )
 
     if (adapter_serial := env.subst("$SWD_TRANSPORT_SERIAL")) != "auto":
@@ -36,11 +36,11 @@ def generate(env, **kw):
 
     env.SetDefault(
         OPENOCD_GDB_PIPE=[
-            "|openocd -c 'gdb_port pipe; log_output ${FBT_DEBUG_DIR}/openocd.log' ${[SINGLEQUOTEFUNC(OPENOCD_OPTS)]}"
+            "|openocd -c 'gdb_port pipe; log_output ${POSIXPATH('$FBT_DEBUG_DIR')}/openocd.log' ${[SINGLEQUOTEFUNC(OPENOCD_OPTS)]}"
         ],
         GDBOPTS_BASE=[
             "-ex",
-            "source ${FBT_DEBUG_DIR}/gdbinit",
+            "source ${POSIXPATH('$FBT_DEBUG_DIR')}/gdbinit",
             "-ex",
             "target extended-remote ${GDBREMOTE}",
         ],
@@ -57,17 +57,17 @@ def generate(env, **kw):
         ],
         GDBPYOPTS=[
             "-ex",
-            "source ${FBT_DEBUG_DIR}/FreeRTOS/FreeRTOS.py",
+            "source ${POSIXPATH('$FBT_DEBUG_DIR')}/FreeRTOS/FreeRTOS.py",
             "-ex",
-            "source ${FBT_DEBUG_DIR}/flipperapps.py",
+            "source ${POSIXPATH('$FBT_DEBUG_DIR')}/flipperapps.py",
             "-ex",
-            "source ${FBT_DEBUG_DIR}/flipperversion.py",
+            "source ${POSIXPATH('$FBT_DEBUG_DIR')}/flipperversion.py",
             "-ex",
-            "fap-set-debug-elf-root ${FBT_FAP_DEBUG_ELF_ROOT}",
+            "fap-set-debug-elf-root ${POSIXPATH('$FBT_FAP_DEBUG_ELF_ROOT')}",
             "-ex",
-            "source ${FBT_DEBUG_DIR}/PyCortexMDebug/PyCortexMDebug.py",
+            "source ${POSIXPATH('$FBT_DEBUG_DIR')}/PyCortexMDebug/PyCortexMDebug.py",
             "-ex",
-            "svd_load ${SVD_FILE}",
+            "svd_load ${POSIXPATH('$SVD_FILE')}",
             "-ex",
             "compare-sections",
             "-ex",
diff --git a/scripts/fbt_tools/fbt_dist.py b/scripts/fbt_tools/fbt_dist.py
index 160f5fa03..1f00bc93a 100644
--- a/scripts/fbt_tools/fbt_dist.py
+++ b/scripts/fbt_tools/fbt_dist.py
@@ -150,6 +150,7 @@ def generate(env):
                         "--interface=${SWD_TRANSPORT}",
                         "--serial=${SWD_TRANSPORT_SERIAL}",
                         "${SOURCE}",
+                        "${ARGS}",
                     ],
                     Touch("${TARGET}"),
                 ]
@@ -162,6 +163,7 @@ def generate(env):
                         "-p",
                         "${FLIP_PORT}",
                         "${UPDATE_BUNDLE_DIR}/update.fuf",
+                        "${ARGS}",
                     ],
                     Touch("${TARGET}"),
                 ]
@@ -180,6 +182,7 @@ def generate(env):
                             "--stack_type=${COPRO_STACK_TYPE}",
                             "--stack_file=${COPRO_STACK_BIN}",
                             "--stack_addr=${COPRO_STACK_ADDR}",
+                            "${ARGS}",
                         ]
                     ],
                     "${COPROCOMSTR}",
diff --git a/scripts/fbt_tools/fbt_sdk.py b/scripts/fbt_tools/fbt_sdk.py
index 17acc8cf1..a3f7faa57 100644
--- a/scripts/fbt_tools/fbt_sdk.py
+++ b/scripts/fbt_tools/fbt_sdk.py
@@ -6,7 +6,7 @@ import shutil
 
 from fbt.sdk.cache import SdkCache
 from fbt.sdk.collector import SdkCollector
-from fbt.util import path_as_posix
+from fbt.util import PosixPathWrapper
 from SCons.Action import Action
 from SCons.Builder import Builder
 from SCons.Errors import UserError
@@ -80,7 +80,7 @@ class SdkMeta:
             vars,
             target=Entry(self.MAP_FILE_SUBST),
         )
-        return path_as_posix(expanded_vars)
+        return PosixPathWrapper.fixup_separators(expanded_vars)
 
 
 class SdkTreeBuilder:
@@ -149,7 +149,7 @@ class SdkTreeBuilder:
         meta.save_to(self.target[0].path)
 
     def build_sdk_file_path(self, orig_path: str) -> str:
-        return path_as_posix(
+        return PosixPathWrapper.fix_path(
             posixpath.normpath(
                 posixpath.join(
                     self.SDK_DIR_SUBST,
diff --git a/scripts/fbt_tools/pvsstudio.py b/scripts/fbt_tools/pvsstudio.py
index ecf9d4b06..290531321 100644
--- a/scripts/fbt_tools/pvsstudio.py
+++ b/scripts/fbt_tools/pvsstudio.py
@@ -32,7 +32,7 @@ def atexist_handler():
 
     for bf in GetBuildFailures():
         for node in Flatten(bf.node):
-            if node.exists and node.name.endswith(".html"):
+            if node.exists and "pvs" in node.path and node.name.endswith(".html"):
                 # macOS
                 if sys.platform == "darwin":
                     subprocess.run(["open", node.abspath])
diff --git a/scripts/ufbt/SConstruct b/scripts/ufbt/SConstruct
index a26c2e404..784d66161 100644
--- a/scripts/ufbt/SConstruct
+++ b/scripts/ufbt/SConstruct
@@ -47,7 +47,7 @@ from fbt.appmanifest import FlipperApplication, FlipperAppType
 from fbt.sdk.cache import SdkCache
 from fbt.util import (
     FORWARDED_ENV_VARIABLES,
-    path_as_posix,
+    PosixPathWrapper,
     resolve_real_dir_node,
     single_quote,
     tempfile_arg_esc_func,
@@ -89,6 +89,7 @@ env = core_env.Clone(
         ("compilation_db", {"COMPILATIONDB_COMSTR": "\tCDB\t${TARGET}"}),
     ],
     FBT_FAP_DEBUG_ELF_ROOT=ufbt_build_dir,
+    POSIXPATH=PosixPathWrapper,
     TEMPFILE=TempFileMunge,
     MAXLINELENGTH=2048,
     PROGSUFFIX=".elf",
@@ -128,7 +129,7 @@ dist_env = env.Clone(
         "-c",
         "transport select hla_swd",
         "-f",
-        "${FBT_DEBUG_DIR}/stm32wbx.cfg",
+        "${POSIXPATH('$FBT_DEBUG_DIR')}/stm32wbx.cfg",
         "-c",
         "stm32wbx.cpu configure -rtos auto",
     ],
@@ -161,7 +162,6 @@ firmware_debug = dist_env.PhonyTarget(
     source=dist_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE}",
     GDBREMOTE="${OPENOCD_GDB_PIPE}",
-    FBT_FAP_DEBUG_ELF_ROOT=path_as_posix(dist_env.subst("$FBT_FAP_DEBUG_ELF_ROOT")),
 )
 
 dist_env.PhonyTarget(
@@ -170,15 +170,14 @@ dist_env.PhonyTarget(
     source=dist_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
     GDBREMOTE="${BLACKMAGIC_ADDR}",
-    FBT_FAP_DEBUG_ELF_ROOT=path_as_posix(dist_env.subst("$FBT_FAP_DEBUG_ELF_ROOT")),
 )
 
 # Debug alien elf
 debug_other_opts = [
     "-ex",
-    "source ${FBT_DEBUG_DIR}/PyCortexMDebug/PyCortexMDebug.py",
+    "source ${POSIXPATH('FBT_DEBUG_DIR')}/PyCortexMDebug/PyCortexMDebug.py",
     "-ex",
-    "source ${FBT_DEBUG_DIR}/flipperversion.py",
+    "source ${POSIXPATH('FBT_DEBUG_DIR')}/flipperversion.py",
     "-ex",
     "fw-version",
 ]
@@ -315,36 +314,62 @@ else:
 
 appenv.PhonyTarget(
     "cli",
-    [["${PYTHON3}", "${FBT_SCRIPT_DIR}/serial_cli.py", "-p", "${FLIP_PORT}"]],
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/serial_cli.py",
+            "-p",
+            "${FLIP_PORT}",
+            "${ARGS}",
+        ]
+    ],
 )
 
 # Update WiFi devboard firmware
 dist_env.PhonyTarget(
-    "devboard_flash", [["${PYTHON3}", "${FBT_SCRIPT_DIR}/wifi_board.py"]]
+    "devboard_flash",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/wifi_board.py",
+            "${ARGS}",
+        ]
+    ],
 )
 
 # Linter
-
 dist_env.PhonyTarget(
     "lint",
-    [["${PYTHON3}", "${FBT_SCRIPT_DIR}/lint.py", "check", "${LINT_SOURCES}"]],
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/lint.py",
+            "check",
+            "${LINT_SOURCES}",
+            "${ARGS}",
+        ]
+    ],
     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}",
+            "${ARGS}",
+        ]
+    ],
     source=original_app_dir.File(".clang-format"),
     LINT_SOURCES=[original_app_dir],
 )
 
 
 # Prepare vscode environment
-def _path_as_posix(path):
-    return pathlib.Path(path).as_posix()
-
-
 vscode_dist = []
 project_template_dir = dist_env["UFBT_SCRIPT_ROOT"].Dir("project_template")
 for template_file in project_template_dir.Dir(".vscode").glob("*"):
@@ -357,20 +382,26 @@ for template_file in project_template_dir.Dir(".vscode").glob("*"):
                 "@UFBT_TOOLCHAIN_ARM_TOOLCHAIN_DIR@": pathlib.Path(
                     dist_env.WhereIs("arm-none-eabi-gcc")
                 ).parent.as_posix(),
-                "@UFBT_TOOLCHAIN_GCC@": _path_as_posix(
+                "@UFBT_TOOLCHAIN_GCC@": PosixPathWrapper.fix_path(
                     dist_env.WhereIs("arm-none-eabi-gcc")
                 ),
-                "@UFBT_TOOLCHAIN_GDB_PY@": _path_as_posix(
+                "@UFBT_TOOLCHAIN_GDB_PY@": PosixPathWrapper.fix_path(
                     dist_env.WhereIs("arm-none-eabi-gdb-py3")
                 ),
-                "@UFBT_TOOLCHAIN_OPENOCD@": _path_as_posix(dist_env.WhereIs("openocd")),
-                "@UFBT_APP_DIR@": _path_as_posix(original_app_dir.abspath),
-                "@UFBT_ROOT_DIR@": _path_as_posix(Dir("#").abspath),
-                "@UFBT_DEBUG_DIR@": _path_as_posix(dist_env["FBT_DEBUG_DIR"].abspath),
-                "@UFBT_DEBUG_ELF_DIR@": _path_as_posix(
+                "@UFBT_TOOLCHAIN_OPENOCD@": PosixPathWrapper.fix_path(
+                    dist_env.WhereIs("openocd")
+                ),
+                "@UFBT_APP_DIR@": PosixPathWrapper.fix_path(original_app_dir.abspath),
+                "@UFBT_ROOT_DIR@": PosixPathWrapper.fix_path(Dir("#").abspath),
+                "@UFBT_DEBUG_DIR@": PosixPathWrapper.fix_path(
+                    dist_env.subst("$FBT_DEBUG_DIR")
+                ),
+                "@UFBT_DEBUG_ELF_DIR@": PosixPathWrapper.fix_path(
                     dist_env["FBT_FAP_DEBUG_ELF_ROOT"].abspath
                 ),
-                "@UFBT_FIRMWARE_ELF@": _path_as_posix(dist_env["FW_ELF"].abspath),
+                "@UFBT_FIRMWARE_ELF@": PosixPathWrapper.fix_path(
+                    dist_env["FW_ELF"].abspath
+                ),
             },
         )
     )
@@ -456,6 +487,7 @@ if dolphin_src_dir.exists():
                 "send",
                 "${SOURCE}",
                 "/ext/dolphin",
+                "${ARGS}",
             ]
         ],
         source=ufbt_build_dir.Dir("dolphin"),
diff --git a/scripts/ufbt/project_template/.vscode/tasks.json b/scripts/ufbt/project_template/.vscode/tasks.json
index 65c749e07..16ef12836 100644
--- a/scripts/ufbt/project_template/.vscode/tasks.json
+++ b/scripts/ufbt/project_template/.vscode/tasks.json
@@ -31,29 +31,23 @@
             "command": "ufbt -c"
         },
         {
-            "label": "Flash FW (ST-Link)",
+            "label": "Flash FW (SWD)",
             "group": "build",
             "type": "shell",
             "command": "ufbt FORCE=1 flash"
         },
-        {
-            "label": "Flash FW (blackmagic)",
-            "group": "build",
-            "type": "shell",
-            "command": "ufbt flash_blackmagic"
-        },
-        {
-            "label": "Flash FW (JLink)",
-            "group": "build",
-            "type": "shell",
-            "command": "ufbt FORCE=1 jflash"
-        },
         {
             "label": "Flash FW (USB, with resources)",
             "group": "build",
             "type": "shell",
             "command": "ufbt FORCE=1 flash_usb"
         },
+        {
+            "label": "Open Flipper CLI session",
+            "group": "build",
+            "type": "shell",
+            "command": "ufbt cli"
+        },
         {
             "label": "Update uFBT SDK",
             "group": "build",
@@ -61,7 +55,7 @@
             "command": "ufbt update"
         },
         {
-            "label": "Update VSCode config for current SDK",
+            "label": "Update VSCode config",
             "group": "build",
             "type": "shell",
             "command": "ufbt vscode_dist"
diff --git a/scripts/ufbt/site_tools/ufbt_help.py b/scripts/ufbt/site_tools/ufbt_help.py
index 4873b385c..632fd98b2 100644
--- a/scripts/ufbt/site_tools/ufbt_help.py
+++ b/scripts/ufbt/site_tools/ufbt_help.py
@@ -29,7 +29,8 @@ Flashing & debugging:
     debug, debug_other, blackmagic:
         Start GDB
     devboard_flash:
-        Update WiFi dev board with the latest firmware
+        Update WiFi dev board. 
+        Supports ARGS="..." to pass extra arguments to the update script, e.g. ARGS="-c dev"
 
 Other:
     cli:
diff --git a/scripts/wifi_board.py b/scripts/wifi_board.py
index 3f89ebdc6..b01b6225d 100755
--- a/scripts/wifi_board.py
+++ b/scripts/wifi_board.py
@@ -1,16 +1,16 @@
 #!/usr/bin/env python3
 
-from flipper.app import App
-from serial.tools.list_ports_common import ListPortInfo
-
+import json
 import logging
 import os
-import tempfile
 import subprocess
-import serial.tools.list_ports as list_ports
-import json
-import requests
 import tarfile
+import tempfile
+
+import requests
+import serial.tools.list_ports as list_ports
+from flipper.app import App
+from serial.tools.list_ports_common import ListPortInfo
 
 
 class UpdateDownloader:
@@ -29,15 +29,15 @@ class UpdateDownloader:
     def __init__(self):
         self.logger = logging.getLogger()
 
-    def download(self, channel_id: str, dir: str) -> bool:
+    def download(self, channel_id: str, target_dir: str) -> bool:
         # Aliases
         if channel_id in self.CHANNEL_ID_ALIAS:
             channel_id = self.CHANNEL_ID_ALIAS[channel_id]
 
         # Make directory
-        if not os.path.exists(dir):
-            self.logger.info(f"Creating directory {dir}")
-            os.makedirs(dir)
+        if not os.path.exists(target_dir):
+            self.logger.info(f"Creating directory {target_dir}")
+            os.makedirs(target_dir)
 
         # Download json index
         self.logger.info(f"Downloading {self.UPDATE_INDEX}")
@@ -79,19 +79,14 @@ class UpdateDownloader:
         self.logger.info(f"Using version '{version['version']}'")
 
         # Get changelog
-        changelog = None
-        try:
-            changelog = version["changelog"]
-        except Exception as e:
-            self.logger.error(f"Failed to get changelog: {e}")
-
-        # print changelog
-        if changelog is not None:
+        if changelog := version.get("changelog"):
             self.logger.info(f"Changelog:")
             for line in changelog.split("\n"):
                 if line.strip() == "":
                     continue
                 self.logger.info(f"  {line}")
+        else:
+            self.logger.warning(f"Changelog not found")
 
         # Find file
         file_url = None
@@ -106,7 +101,7 @@ class UpdateDownloader:
 
         # Make file path
         file_name = file_url.split("/")[-1]
-        file_path = os.path.join(dir, file_name)
+        file_path = os.path.join(target_dir, file_name)
 
         # Download file
         self.logger.info(f"Downloading {file_url} to {file_path}")
@@ -117,7 +112,7 @@ class UpdateDownloader:
         # Unzip tgz
         self.logger.info(f"Unzipping {file_path}")
         with tarfile.open(file_path, "r") as tar:
-            tar.extractall(dir)
+            tar.extractall(target_dir)
 
         return True
 
@@ -133,16 +128,24 @@ class Main(App):
         # logging
         self.logger = logging.getLogger()
 
-    def find_wifi_board(self) -> bool:
+    @staticmethod
+    def _grep_ports(regexp: str) -> list[ListPortInfo]:
         # idk why, but python thinks that list_ports.grep returns tuple[str, str, str]
-        blackmagics: list[ListPortInfo] = list(list_ports.grep("blackmagic"))  # type: ignore
-        daps: list[ListPortInfo] = list(list_ports.grep("CMSIS-DAP"))  # type: ignore
+        return list(list_ports.grep(regexp))  # type: ignore
 
-        return len(blackmagics) > 0 or len(daps) > 0
+    def is_wifi_board_connected(self) -> bool:
+        return (
+            len(self._grep_ports("ESP32-S2")) > 0
+            or len(self._grep_ports("CMSIS-DAP")) > 0
+        )
 
-    def find_wifi_board_bootloader(self):
-        # idk why, but python thinks that list_ports.grep returns tuple[str, str, str]
-        ports: list[ListPortInfo] = list(list_ports.grep("ESP32-S2"))  # type: ignore
+    @staticmethod
+    def is_windows() -> bool:
+        return os.name == "nt"
+
+    @classmethod
+    def find_port(cls, regexp: str) -> str:
+        ports: list[ListPortInfo] = cls._grep_ports(regexp)
 
         if len(ports) == 0:
             # Blackmagic probe serial port not found, will be handled later
@@ -151,27 +154,28 @@ class Main(App):
             raise Exception("More than one WiFi board found")
         else:
             port = ports[0]
-            if os.name == "nt":
-                port.device = f"\\\\.\\{port.device}"
-            return port.device
+            return f"\\\\.\\{port.device}" if cls.is_windows() else port.device
+
+    def find_wifi_board_bootloader_port(self):
+        return self.find_port("ESP32-S2")
+
+    def find_wifi_board_bootloader_port_damn_windows(self):
+        self.logger.info("Trying to find WiFi board using VID:PID")
+        return self.find_port("VID:PID=303A:0002")
 
     def update(self):
         try:
-            port = self.find_wifi_board_bootloader()
+            port = self.find_wifi_board_bootloader_port()
+
+            # Damn windows fix
+            if port is None and self.is_windows():
+                port = self.find_wifi_board_bootloader_port_damn_windows()
         except Exception as e:
             self.logger.error(f"{e}")
             return 1
 
-        if self.args.port != "auto":
-            port = self.args.port
-
-            available_ports = [p[0] for p in list(list_ports.comports())]
-            if port not in available_ports:
-                self.logger.error(f"Port {port} not found")
-                return 1
-
         if port is None:
-            if self.find_wifi_board():
+            if self.is_wifi_board_connected():
                 self.logger.error("WiFi board found, but not in bootloader mode.")
                 self.logger.info("Please hold down BOOT button and press RESET button")
             else:
@@ -179,6 +183,13 @@ class Main(App):
                 self.logger.info(
                     "Please connect WiFi board to your computer, hold down BOOT button and press RESET button"
                 )
+                if not self.is_windows():
+                    self.logger.info(
+                        "If you are using Linux, you may need to add udev rules to access the device"
+                    )
+                    self.logger.info(
+                        "Check out 41-flipper.rules & README in scripts/debug folder"
+                    )
             return 1
 
         # get temporary dir
@@ -197,24 +208,29 @@ class Main(App):
             with open(os.path.join(temp_dir, "flash.command"), "r") as f:
                 flash_command = f.read()
 
-            flash_command = flash_command.replace("\n", "").replace("\r", "")
-            flash_command = flash_command.replace("(PORT)", port)
-
-            # We can't reset the board after flashing via usb
-            flash_command = flash_command.replace(
-                "--after hard_reset", "--after no_reset_stub"
+            replacements = (
+                ("\n", ""),
+                ("\r", ""),
+                ("(PORT)", port),
+                # We can't reset the board after flashing via usb
+                ("--after hard_reset", "--after no_reset_stub"),
             )
 
-            args = flash_command.split(" ")[0:]
-            args = list(filter(None, args))
+            # hellish toolchain fix
+            if self.is_windows():
+                replacements += (("esptool.py", "python -m esptool"),)
+            else:
+                replacements += (("esptool.py", "python3 -m esptool"),)
 
-            esptool_params = []
-            esptool_params.extend(args)
+            for old, new in replacements:
+                flash_command = flash_command.replace(old, new)
+
+            args = list(filter(None, flash_command.split()))
 
             self.logger.info(f'Running command: "{" ".join(args)}" in "{temp_dir}"')
 
             process = subprocess.Popen(
-                esptool_params,
+                args,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT,
                 cwd=temp_dir,
diff --git a/site_scons/cc.scons b/site_scons/cc.scons
index 507cd2d12..603ec621c 100644
--- a/site_scons/cc.scons
+++ b/site_scons/cc.scons
@@ -4,6 +4,7 @@ Import("ENV")
 ENV.AppendUnique(
     CFLAGS=[
         "-std=gnu2x",
+        "-Wstrict-prototypes",
     ],
     CXXFLAGS=[
         "-std=c++20",
diff --git a/site_scons/commandline.scons b/site_scons/commandline.scons
index 6d8810f79..c36a9a6b6 100644
--- a/site_scons/commandline.scons
+++ b/site_scons/commandline.scons
@@ -279,6 +279,11 @@ vars.AddVariables(
         help="Enable strict import check for .faps",
         default=True,
     ),
+    (
+        "ARGS",
+        "Extra arguments to pass to certain scripts supporting it",
+        "",
+    ),
 )
 
 Return("vars")
diff --git a/site_scons/environ.scons b/site_scons/environ.scons
index ece8de212..3f2d3450e 100644
--- a/site_scons/environ.scons
+++ b/site_scons/environ.scons
@@ -3,6 +3,7 @@ import os
 
 from fbt.util import (
     FORWARDED_ENV_VARIABLES,
+    PosixPathWrapper,
     resolve_real_dir_node,
     single_quote,
     tempfile_arg_esc_func,
@@ -26,7 +27,6 @@ for env_value_name in variables_to_forward:
     if environ_value := os.environ.get(env_value_name, None):
         forward_os_env[env_value_name] = environ_value
 
-
 coreenv = VAR_ENV.Clone(
     tools=[
         "fbt_tweaks",
@@ -43,6 +43,7 @@ coreenv = VAR_ENV.Clone(
         "ccache",
     ],
     TEMPFILE=TempFileMunge,
+    POSIXPATH=PosixPathWrapper,
     MAXLINELENGTH=2048,
     PROGSUFFIX=".elf",
     ENV=forward_os_env,
diff --git a/site_scons/extapps.scons b/site_scons/extapps.scons
index 22d0be867..b67ce9621 100644
--- a/site_scons/extapps.scons
+++ b/site_scons/extapps.scons
@@ -48,6 +48,9 @@ appenv.AppendUnique(
         "stdc++",
         "supc++",
     ],
+    CFLAGS=[
+        "-Wno-strict-prototypes",
+    ],
 )
 
 
diff --git a/site_scons/fbt_extra/util.py b/site_scons/fbt_extra/util.py
index c670c01d4..e99d62c91 100644
--- a/site_scons/fbt_extra/util.py
+++ b/site_scons/fbt_extra/util.py
@@ -1,5 +1,5 @@
-from fbt.util import link_dir
 from ansi.color import fg
+from fbt.util import link_dir
 
 
 def link_elf_dir_as_latest(env, elf_node):
diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv
index bdfa8c7a4..6e597e7d0 100644
--- a/targets/f18/api_symbols.csv
+++ b/targets/f18/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,58.0,,
+Version,+,60.7,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -639,8 +639,8 @@ Function,+,ble_glue_is_alive,_Bool,
 Function,+,ble_glue_is_radio_stack_ready,_Bool,
 Function,+,ble_glue_reinit_c2,_Bool,
 Function,+,ble_glue_set_key_storage_changed_callback,void,"BleGlueKeyStorageChangedCallback, void*"
-Function,+,ble_glue_start,_Bool,
-Function,+,ble_glue_stop,void,
+Function,-,ble_glue_start,_Bool,
+Function,-,ble_glue_stop,void,
 Function,+,ble_glue_wait_for_c2_start,_Bool,int32_t
 Function,-,ble_profile_hid_consumer_key_press,_Bool,"FuriHalBleProfileBase*, uint16_t"
 Function,-,ble_profile_hid_consumer_key_release,_Bool,"FuriHalBleProfileBase*, uint16_t"
@@ -712,27 +712,27 @@ Function,-,bzero,void,"void*, size_t"
 Function,+,calloc,void*,"size_t, size_t"
 Function,+,canvas_clear,void,Canvas*
 Function,+,canvas_commit,void,Canvas*
-Function,+,canvas_current_font_height,uint8_t,const Canvas*
-Function,+,canvas_draw_bitmap,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*"
-Function,+,canvas_draw_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_circle,void,"Canvas*, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_disc,void,"Canvas*, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_dot,void,"Canvas*, uint8_t, uint8_t"
-Function,+,canvas_draw_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_glyph,void,"Canvas*, uint8_t, uint8_t, uint16_t"
-Function,+,canvas_draw_icon,void,"Canvas*, uint8_t, uint8_t, const Icon*"
-Function,+,canvas_draw_icon_animation,void,"Canvas*, uint8_t, uint8_t, IconAnimation*"
-Function,+,canvas_draw_icon_ex,void,"Canvas*, uint8_t, uint8_t, const Icon*, IconRotation"
-Function,+,canvas_draw_line,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_rbox,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_rframe,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_str,void,"Canvas*, uint8_t, uint8_t, const char*"
-Function,+,canvas_draw_str_aligned,void,"Canvas*, uint8_t, uint8_t, Align, Align, const char*"
-Function,+,canvas_draw_triangle,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, CanvasDirection"
-Function,+,canvas_draw_xbm,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*"
+Function,+,canvas_current_font_height,size_t,const Canvas*
+Function,+,canvas_draw_bitmap,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*"
+Function,+,canvas_draw_box,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,canvas_draw_circle,void,"Canvas*, int32_t, int32_t, size_t"
+Function,+,canvas_draw_disc,void,"Canvas*, int32_t, int32_t, size_t"
+Function,+,canvas_draw_dot,void,"Canvas*, int32_t, int32_t"
+Function,+,canvas_draw_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,canvas_draw_glyph,void,"Canvas*, int32_t, int32_t, uint16_t"
+Function,+,canvas_draw_icon,void,"Canvas*, int32_t, int32_t, const Icon*"
+Function,+,canvas_draw_icon_animation,void,"Canvas*, int32_t, int32_t, IconAnimation*"
+Function,+,canvas_draw_icon_ex,void,"Canvas*, int32_t, int32_t, const Icon*, IconRotation"
+Function,+,canvas_draw_line,void,"Canvas*, int32_t, int32_t, int32_t, int32_t"
+Function,+,canvas_draw_rbox,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t"
+Function,+,canvas_draw_rframe,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t"
+Function,+,canvas_draw_str,void,"Canvas*, int32_t, int32_t, const char*"
+Function,+,canvas_draw_str_aligned,void,"Canvas*, int32_t, int32_t, Align, Align, const char*"
+Function,+,canvas_draw_triangle,void,"Canvas*, int32_t, int32_t, size_t, size_t, CanvasDirection"
+Function,+,canvas_draw_xbm,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*"
 Function,+,canvas_get_font_params,const CanvasFontParameters*,"const Canvas*, Font"
-Function,+,canvas_glyph_width,uint8_t,"Canvas*, uint16_t"
-Function,+,canvas_height,uint8_t,const Canvas*
+Function,+,canvas_glyph_width,size_t,"Canvas*, uint16_t"
+Function,+,canvas_height,size_t,const Canvas*
 Function,+,canvas_invert_color,void,Canvas*
 Function,+,canvas_reset,void,Canvas*
 Function,+,canvas_set_bitmap_mode,void,"Canvas*, _Bool"
@@ -741,7 +741,7 @@ Function,+,canvas_set_custom_u8g2_font,void,"Canvas*, const uint8_t*"
 Function,+,canvas_set_font,void,"Canvas*, Font"
 Function,+,canvas_set_font_direction,void,"Canvas*, CanvasDirection"
 Function,+,canvas_string_width,uint16_t,"Canvas*, const char*"
-Function,+,canvas_width,uint8_t,const Canvas*
+Function,+,canvas_width,size_t,const Canvas*
 Function,-,cbrt,double,double
 Function,-,cbrtf,float,float
 Function,-,cbrtl,long double,long double
@@ -756,7 +756,7 @@ Function,+,cli_cmd_interrupt_received,_Bool,Cli*
 Function,+,cli_delete_command,void,"Cli*, const char*"
 Function,+,cli_getc,char,Cli*
 Function,+,cli_is_connected,_Bool,Cli*
-Function,+,cli_nl,void,
+Function,+,cli_nl,void,Cli*
 Function,+,cli_print_usage,void,"const char*, const char*, const char*"
 Function,+,cli_read,size_t,"Cli*, uint8_t*, size_t"
 Function,+,cli_read_timeout,size_t,"Cli*, uint8_t*, size_t, uint32_t"
@@ -852,25 +852,25 @@ Function,-,dprintf,int,"int, const char*, ..."
 Function,-,drand48,double,
 Function,-,drem,double,"double, double"
 Function,-,dremf,float,"float, float"
-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"
+Function,+,elements_bold_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,elements_bubble,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,elements_bubble_str,void,"Canvas*, int32_t, int32_t, const char*, Align, Align"
 Function,+,elements_button_center,void,"Canvas*, const char*"
 Function,+,elements_button_left,void,"Canvas*, const char*"
 Function,+,elements_button_right,void,"Canvas*, const char*"
-Function,+,elements_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,elements_multiline_text,void,"Canvas*, uint8_t, uint8_t, const char*"
-Function,+,elements_multiline_text_aligned,void,"Canvas*, uint8_t, uint8_t, Align, Align, const char*"
-Function,+,elements_multiline_text_framed,void,"Canvas*, uint8_t, uint8_t, const char*"
-Function,+,elements_progress_bar,void,"Canvas*, uint8_t, uint8_t, uint8_t, float"
-Function,+,elements_progress_bar_with_text,void,"Canvas*, uint8_t, uint8_t, uint8_t, float, const char*"
-Function,+,elements_scrollable_text_line,void,"Canvas*, uint8_t, uint8_t, uint8_t, FuriString*, size_t, _Bool"
-Function,+,elements_scrollbar,void,"Canvas*, uint16_t, uint16_t"
-Function,+,elements_scrollbar_pos,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint16_t, uint16_t"
-Function,+,elements_slightly_rounded_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,elements_slightly_rounded_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,elements_string_fit_width,void,"Canvas*, FuriString*, uint8_t"
-Function,+,elements_text_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, Align, Align, const char*, _Bool"
+Function,+,elements_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,elements_multiline_text,void,"Canvas*, int32_t, int32_t, const char*"
+Function,+,elements_multiline_text_aligned,void,"Canvas*, int32_t, int32_t, Align, Align, const char*"
+Function,+,elements_multiline_text_framed,void,"Canvas*, int32_t, int32_t, const char*"
+Function,+,elements_progress_bar,void,"Canvas*, int32_t, int32_t, size_t, float"
+Function,+,elements_progress_bar_with_text,void,"Canvas*, int32_t, int32_t, size_t, float, const char*"
+Function,+,elements_scrollable_text_line,void,"Canvas*, int32_t, int32_t, size_t, FuriString*, size_t, _Bool"
+Function,+,elements_scrollbar,void,"Canvas*, size_t, size_t"
+Function,+,elements_scrollbar_pos,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t"
+Function,+,elements_slightly_rounded_box,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,elements_slightly_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,elements_string_fit_width,void,"Canvas*, FuriString*, size_t"
+Function,+,elements_text_box,void,"Canvas*, int32_t, int32_t, size_t, size_t, Align, Align, const char*, _Bool"
 Function,+,elf_resolve_from_hashtable,_Bool,"const ElfApiInterface*, uint32_t, Elf32_Addr*"
 Function,+,elf_symbolname_hash,uint32_t,const char*
 Function,+,empty_screen_alloc,EmptyScreen*,
@@ -1205,6 +1205,7 @@ Function,+,furi_hal_gpio_init_simple,void,"const GpioPin*, const GpioMode"
 Function,+,furi_hal_gpio_remove_int_callback,void,const GpioPin*
 Function,+,furi_hal_hid_consumer_key_press,_Bool,uint16_t
 Function,+,furi_hal_hid_consumer_key_release,_Bool,uint16_t
+Function,+,furi_hal_hid_consumer_key_release_all,_Bool,
 Function,+,furi_hal_hid_get_led_state,uint8_t,
 Function,+,furi_hal_hid_is_connected,_Bool,
 Function,+,furi_hal_hid_kb_press,_Bool,uint16_t
@@ -1747,6 +1748,7 @@ Function,+,loader_is_locked,_Bool,Loader*
 Function,+,loader_lock,_Bool,Loader*
 Function,+,loader_show_menu,void,Loader*
 Function,+,loader_start,LoaderStatus,"Loader*, const char*, const char*, FuriString*"
+Function,+,loader_start_detached_with_gui_error,void,"Loader*, const char*, const char*"
 Function,+,loader_start_with_gui_error,LoaderStatus,"Loader*, const char*, const char*"
 Function,+,loader_unlock,void,Loader*
 Function,+,loading_alloc,Loading*,
@@ -2302,9 +2304,9 @@ Function,+,rpc_system_app_set_callback,void,"RpcAppSystem*, RpcAppSystemCallback
 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*
-Function,+,saved_struct_get_payload_size,_Bool,"const char*, uint8_t, uint8_t, size_t*"
+Function,+,saved_struct_get_metadata,_Bool,"const char*, uint8_t*, uint8_t*, size_t*"
 Function,+,saved_struct_load,_Bool,"const char*, void*, size_t, uint8_t, uint8_t"
-Function,+,saved_struct_save,_Bool,"const char*, void*, size_t, uint8_t, uint8_t"
+Function,+,saved_struct_save,_Bool,"const char*, const void*, size_t, uint8_t, uint8_t"
 Function,-,scalbln,double,"double, long int"
 Function,-,scalblnf,float,"float, long int"
 Function,-,scalblnl,long double,"long double, long"
@@ -2449,7 +2451,7 @@ Function,+,storage_simply_remove,_Bool,"Storage*, const char*"
 Function,+,storage_simply_remove_recursive,_Bool,"Storage*, const char*"
 Function,-,stpcpy,char*,"char*, const char*"
 Function,-,stpncpy,char*,"char*, const char*, size_t"
-Function,-,strcasecmp,int,"const char*, const char*"
+Function,+,strcasecmp,int,"const char*, const char*"
 Function,-,strcasecmp_l,int,"const char*, const char*, locale_t"
 Function,+,strcasestr,char*,"const char*, const char*"
 Function,-,strcat,char*,"char*, const char*"
diff --git a/targets/f18/furi_hal/furi_hal.c b/targets/f18/furi_hal/furi_hal.c
index 957d9d673..6e0a254c1 100644
--- a/targets/f18/furi_hal/furi_hal.c
+++ b/targets/f18/furi_hal/furi_hal.c
@@ -6,7 +6,7 @@
 
 #define TAG "FuriHal"
 
-void furi_hal_init_early() {
+void furi_hal_init_early(void) {
     furi_hal_cortex_init_early();
     furi_hal_clock_init_early();
     furi_hal_bus_init_early();
@@ -19,7 +19,7 @@ void furi_hal_init_early() {
     furi_hal_rtc_init_early();
 }
 
-void furi_hal_deinit_early() {
+void furi_hal_deinit_early(void) {
     furi_hal_rtc_deinit_early();
     furi_hal_i2c_deinit_early();
     furi_hal_spi_config_deinit_early();
@@ -29,7 +29,7 @@ void furi_hal_deinit_early() {
     furi_hal_clock_deinit_early();
 }
 
-void furi_hal_init() {
+void furi_hal_init(void) {
     furi_hal_mpu_init();
     furi_hal_clock_init();
     furi_hal_random_init();
diff --git a/targets/f18/furi_hal/furi_hal_resources.c b/targets/f18/furi_hal/furi_hal_resources.c
index 118935874..9935d4124 100644
--- a/targets/f18/furi_hal/furi_hal_resources.c
+++ b/targets/f18/furi_hal/furi_hal_resources.c
@@ -144,7 +144,7 @@ static void furi_hal_resources_init_gpio_pins(GpioMode mode) {
     }
 }
 
-void furi_hal_resources_init_early() {
+void furi_hal_resources_init_early(void) {
     furi_hal_bus_enable(FuriHalBusGPIOA);
     furi_hal_bus_enable(FuriHalBusGPIOB);
     furi_hal_bus_enable(FuriHalBusGPIOC);
@@ -190,7 +190,7 @@ void furi_hal_resources_init_early() {
     furi_hal_resources_init_gpio_pins(GpioModeAnalog);
 }
 
-void furi_hal_resources_deinit_early() {
+void furi_hal_resources_deinit_early(void) {
     furi_hal_resources_init_input_pins(GpioModeAnalog);
     furi_hal_bus_disable(FuriHalBusGPIOA);
     furi_hal_bus_disable(FuriHalBusGPIOB);
@@ -200,7 +200,7 @@ void furi_hal_resources_deinit_early() {
     furi_hal_bus_disable(FuriHalBusGPIOH);
 }
 
-void furi_hal_resources_init() {
+void furi_hal_resources_init(void) {
     // Button pins
     furi_hal_resources_init_input_pins(GpioModeInterruptRiseFall);
 
diff --git a/targets/f18/furi_hal/furi_hal_resources.h b/targets/f18/furi_hal/furi_hal_resources.h
index fed7802a5..3d45ad885 100644
--- a/targets/f18/furi_hal/furi_hal_resources.h
+++ b/targets/f18/furi_hal/furi_hal_resources.h
@@ -109,11 +109,11 @@ extern const GpioPin gpio_periph_power;
 extern const GpioPin gpio_usb_dm;
 extern const GpioPin gpio_usb_dp;
 
-void furi_hal_resources_init_early();
+void furi_hal_resources_init_early(void);
 
-void furi_hal_resources_deinit_early();
+void furi_hal_resources_deinit_early(void);
 
-void furi_hal_resources_init();
+void furi_hal_resources_init(void);
 
 /**
  * Get a corresponding external connector pin number for a gpio
diff --git a/targets/f18/furi_hal/furi_hal_spi_config.c b/targets/f18/furi_hal/furi_hal_spi_config.c
index 5ac84906f..8957bfe3a 100644
--- a/targets/f18/furi_hal/furi_hal_spi_config.c
+++ b/targets/f18/furi_hal/furi_hal_spi_config.c
@@ -77,17 +77,17 @@ const LL_SPI_InitTypeDef furi_hal_spi_preset_1edge_low_2m = {
 
 FuriMutex* furi_hal_spi_bus_r_mutex = NULL;
 
-void furi_hal_spi_config_init_early() {
+void furi_hal_spi_config_init_early(void) {
     furi_hal_spi_bus_init(&furi_hal_spi_bus_d);
     furi_hal_spi_bus_handle_init(&furi_hal_spi_bus_handle_display);
 }
 
-void furi_hal_spi_config_deinit_early() {
+void furi_hal_spi_config_deinit_early(void) {
     furi_hal_spi_bus_handle_deinit(&furi_hal_spi_bus_handle_display);
     furi_hal_spi_bus_deinit(&furi_hal_spi_bus_d);
 }
 
-void furi_hal_spi_config_init() {
+void furi_hal_spi_config_init(void) {
     furi_hal_spi_bus_handle_init(&furi_hal_spi_bus_handle_sd_fast);
     furi_hal_spi_bus_handle_init(&furi_hal_spi_bus_handle_sd_slow);
 
diff --git a/targets/f18/furi_hal/furi_hal_version_device.c b/targets/f18/furi_hal/furi_hal_version_device.c
index 198ceb3f1..8b8526031 100644
--- a/targets/f18/furi_hal/furi_hal_version_device.c
+++ b/targets/f18/furi_hal/furi_hal_version_device.c
@@ -1,33 +1,33 @@
 #include <furi_hal_version.h>
 
-bool furi_hal_version_do_i_belong_here() {
+bool furi_hal_version_do_i_belong_here(void) {
     return (furi_hal_version_get_hw_target() == 18) || (furi_hal_version_get_hw_target() == 0);
 }
 
-const char* furi_hal_version_get_model_name() {
+const char* furi_hal_version_get_model_name(void) {
     return "Flipper Nano";
 }
 
-const char* furi_hal_version_get_model_code() {
+const char* furi_hal_version_get_model_code(void) {
     return "FN.1";
 }
 
-const char* furi_hal_version_get_fcc_id() {
+const char* furi_hal_version_get_fcc_id(void) {
     return "Pending";
 }
 
-const char* furi_hal_version_get_ic_id() {
+const char* furi_hal_version_get_ic_id(void) {
     return "Pending";
 }
 
-const char* furi_hal_version_get_mic_id() {
+const char* furi_hal_version_get_mic_id(void) {
     return "Pending";
 }
 
-const char* furi_hal_version_get_srrc_id() {
+const char* furi_hal_version_get_srrc_id(void) {
     return "Pending";
 }
 
-const char* furi_hal_version_get_ncc_id() {
+const char* furi_hal_version_get_ncc_id(void) {
     return "Pending";
 }
\ No newline at end of file
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
index 03c12a66b..a75d6068c 100644
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,58.0,,
+Version,+,60.7,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
@@ -123,6 +123,7 @@ Header,+,lib/music_worker/music_worker.h,,
 Header,+,lib/nanopb/pb.h,,
 Header,+,lib/nanopb/pb_decode.h,,
 Header,+,lib/nanopb/pb_encode.h,,
+Header,+,lib/nfc/helpers/crypto1.h,,
 Header,+,lib/nfc/helpers/iso13239_crc.h,,
 Header,+,lib/nfc/helpers/iso14443_crc.h,,
 Header,+,lib/nfc/helpers/nfc_data_generator.h,,
@@ -134,6 +135,8 @@ Header,+,lib/nfc/nfc_poller.h,,
 Header,+,lib/nfc/nfc_scanner.h,,
 Header,+,lib/nfc/protocols/emv/emv.h,,
 Header,+,lib/nfc/protocols/emv/emv_poller.h,,
+Header,+,lib/nfc/protocols/felica/felica.h,,
+Header,+,lib/nfc/protocols/felica/felica_poller.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,,
@@ -689,7 +692,7 @@ Function,-,ble_app_get_key_storage_buff,void,"uint8_t**, uint16_t*"
 Function,-,ble_app_init,_Bool,
 Function,-,ble_event_app_notification,BleEventFlowStatus,void*
 Function,-,ble_event_dispatcher_init,void,
-Function,+,ble_event_dispatcher_process_event,BleEventFlowStatus,void*
+Function,-,ble_event_dispatcher_process_event,BleEventFlowStatus,void*
 Function,+,ble_event_dispatcher_register_svc_handler,GapSvcEventHandler*,"BleSvcEventHandlerCb, void*"
 Function,-,ble_event_dispatcher_reset,void,
 Function,+,ble_event_dispatcher_unregister_svc_handler,void,GapSvcEventHandler*
@@ -788,29 +791,29 @@ Function,-,bzero,void,"void*, size_t"
 Function,+,calloc,void*,"size_t, size_t"
 Function,+,canvas_clear,void,Canvas*
 Function,+,canvas_commit,void,Canvas*
-Function,+,canvas_current_font_height,uint8_t,const Canvas*
-Function,+,canvas_current_font_width,uint8_t,const Canvas*
-Function,+,canvas_draw_bitmap,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*"
-Function,+,canvas_draw_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_circle,void,"Canvas*, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_disc,void,"Canvas*, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_dot,void,"Canvas*, uint8_t, uint8_t"
-Function,+,canvas_draw_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_glyph,void,"Canvas*, uint8_t, uint8_t, uint16_t"
-Function,+,canvas_draw_icon,void,"Canvas*, uint8_t, uint8_t, const Icon*"
-Function,+,canvas_draw_icon_animation,void,"Canvas*, uint8_t, uint8_t, IconAnimation*"
+Function,+,canvas_current_font_height,size_t,const Canvas*
+Function,+,canvas_current_font_width,size_t,const Canvas*
+Function,+,canvas_draw_bitmap,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*"
+Function,+,canvas_draw_box,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,canvas_draw_circle,void,"Canvas*, int32_t, int32_t, size_t"
+Function,+,canvas_draw_disc,void,"Canvas*, int32_t, int32_t, size_t"
+Function,+,canvas_draw_dot,void,"Canvas*, int32_t, int32_t"
+Function,+,canvas_draw_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,canvas_draw_glyph,void,"Canvas*, int32_t, int32_t, uint16_t"
+Function,+,canvas_draw_icon,void,"Canvas*, int32_t, int32_t, const Icon*"
+Function,+,canvas_draw_icon_animation,void,"Canvas*, int32_t, int32_t, IconAnimation*"
 Function,+,canvas_draw_icon_bitmap,void,"Canvas*, uint8_t, uint8_t, int16_t, int16_t, const Icon*"
-Function,+,canvas_draw_icon_ex,void,"Canvas*, uint8_t, uint8_t, const Icon*, IconRotation"
-Function,+,canvas_draw_line,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_rbox,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_rframe,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,canvas_draw_str,void,"Canvas*, uint8_t, uint8_t, const char*"
-Function,+,canvas_draw_str_aligned,void,"Canvas*, uint8_t, uint8_t, Align, Align, const char*"
-Function,+,canvas_draw_triangle,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, CanvasDirection"
-Function,+,canvas_draw_xbm,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*"
+Function,+,canvas_draw_icon_ex,void,"Canvas*, int32_t, int32_t, const Icon*, IconRotation"
+Function,+,canvas_draw_line,void,"Canvas*, int32_t, int32_t, int32_t, int32_t"
+Function,+,canvas_draw_rbox,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t"
+Function,+,canvas_draw_rframe,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t"
+Function,+,canvas_draw_str,void,"Canvas*, int32_t, int32_t, const char*"
+Function,+,canvas_draw_str_aligned,void,"Canvas*, int32_t, int32_t, Align, Align, const char*"
+Function,+,canvas_draw_triangle,void,"Canvas*, int32_t, int32_t, size_t, size_t, CanvasDirection"
+Function,+,canvas_draw_xbm,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*"
 Function,+,canvas_get_font_params,const CanvasFontParameters*,"const Canvas*, Font"
-Function,+,canvas_glyph_width,uint8_t,"Canvas*, uint16_t"
-Function,+,canvas_height,uint8_t,const Canvas*
+Function,+,canvas_glyph_width,size_t,"Canvas*, uint16_t"
+Function,+,canvas_height,size_t,const Canvas*
 Function,+,canvas_invert_color,void,Canvas*
 Function,+,canvas_reset,void,Canvas*
 Function,+,canvas_set_bitmap_mode,void,"Canvas*, _Bool"
@@ -819,7 +822,7 @@ Function,+,canvas_set_custom_u8g2_font,void,"Canvas*, const uint8_t*"
 Function,+,canvas_set_font,void,"Canvas*, Font"
 Function,+,canvas_set_font_direction,void,"Canvas*, CanvasDirection"
 Function,+,canvas_string_width,uint16_t,"Canvas*, const char*"
-Function,+,canvas_width,uint8_t,const Canvas*
+Function,+,canvas_width,size_t,const Canvas*
 Function,-,cbrt,double,double
 Function,-,cbrtf,float,float
 Function,-,cbrtl,long double,long double
@@ -834,7 +837,7 @@ Function,+,cli_cmd_interrupt_received,_Bool,Cli*
 Function,+,cli_delete_command,void,"Cli*, const char*"
 Function,+,cli_getc,char,Cli*
 Function,+,cli_is_connected,_Bool,Cli*
-Function,+,cli_nl,void,
+Function,+,cli_nl,void,Cli*
 Function,+,cli_print_usage,void,"const char*, const char*, const char*"
 Function,+,cli_read,size_t,"Cli*, uint8_t*, size_t"
 Function,+,cli_read_timeout,size_t,"Cli*, uint8_t*, size_t, uint32_t"
@@ -863,6 +866,16 @@ Function,-,coshl,long double,long double
 Function,-,cosl,long double,long double
 Function,+,crc32_calc_buffer,uint32_t,"uint32_t, const void*, size_t"
 Function,+,crc32_calc_file,uint32_t,"File*, const FileCrcProgressCb, void*"
+Function,+,crypto1_alloc,Crypto1*,
+Function,+,crypto1_bit,uint8_t,"Crypto1*, uint8_t, int"
+Function,+,crypto1_byte,uint8_t,"Crypto1*, uint8_t, int"
+Function,+,crypto1_decrypt,void,"Crypto1*, const BitBuffer*, BitBuffer*"
+Function,+,crypto1_encrypt,void,"Crypto1*, uint8_t*, const BitBuffer*, BitBuffer*"
+Function,+,crypto1_encrypt_reader_nonce,void,"Crypto1*, uint64_t, uint32_t, uint8_t*, uint8_t*, BitBuffer*, _Bool"
+Function,+,crypto1_free,void,Crypto1*
+Function,+,crypto1_init,void,"Crypto1*, uint64_t"
+Function,+,crypto1_reset,void,Crypto1*
+Function,+,crypto1_word,uint32_t,"Crypto1*, uint32_t, int"
 Function,-,ctermid,char*,char*
 Function,-,cuserid,char*,char*
 Function,+,datetime_datetime_to_timestamp,uint32_t,DateTime*
@@ -930,26 +943,26 @@ Function,-,dprintf,int,"int, const char*, ..."
 Function,-,drand48,double,
 Function,-,drem,double,"double, double"
 Function,-,dremf,float,"float, float"
-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"
+Function,+,elements_bold_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,elements_bubble,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,elements_bubble_str,void,"Canvas*, int32_t, int32_t, const char*, Align, Align"
 Function,+,elements_button_center,void,"Canvas*, const char*"
 Function,+,elements_button_left,void,"Canvas*, const char*"
 Function,+,elements_button_right,void,"Canvas*, const char*"
-Function,+,elements_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,elements_multiline_text,void,"Canvas*, uint8_t, uint8_t, const char*"
-Function,+,elements_multiline_text_aligned,void,"Canvas*, uint8_t, uint8_t, Align, Align, const char*"
-Function,+,elements_multiline_text_framed,void,"Canvas*, uint8_t, uint8_t, const char*"
-Function,+,elements_progress_bar,void,"Canvas*, uint8_t, uint8_t, uint8_t, float"
-Function,+,elements_progress_bar_with_text,void,"Canvas*, uint8_t, uint8_t, uint8_t, float, const char*"
-Function,+,elements_scrollable_text_line,void,"Canvas*, uint8_t, uint8_t, uint8_t, FuriString*, size_t, _Bool"
+Function,+,elements_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,elements_multiline_text,void,"Canvas*, int32_t, int32_t, const char*"
+Function,+,elements_multiline_text_aligned,void,"Canvas*, int32_t, int32_t, Align, Align, const char*"
+Function,+,elements_multiline_text_framed,void,"Canvas*, int32_t, int32_t, const char*"
+Function,+,elements_progress_bar,void,"Canvas*, int32_t, int32_t, size_t, float"
+Function,+,elements_progress_bar_with_text,void,"Canvas*, int32_t, int32_t, size_t, float, const char*"
+Function,+,elements_scrollable_text_line,void,"Canvas*, int32_t, int32_t, size_t, FuriString*, size_t, _Bool"
 Function,+,elements_scrollable_text_line_str,void,"Canvas*, uint8_t, uint8_t, uint8_t, const char*, size_t, _Bool, _Bool"
-Function,+,elements_scrollbar,void,"Canvas*, uint16_t, uint16_t"
-Function,+,elements_scrollbar_pos,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint16_t, uint16_t"
-Function,+,elements_slightly_rounded_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,elements_slightly_rounded_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
-Function,+,elements_string_fit_width,void,"Canvas*, FuriString*, uint8_t"
-Function,+,elements_text_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, Align, Align, const char*, _Bool"
+Function,+,elements_scrollbar,void,"Canvas*, size_t, size_t"
+Function,+,elements_scrollbar_pos,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t"
+Function,+,elements_slightly_rounded_box,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,elements_slightly_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t"
+Function,+,elements_string_fit_width,void,"Canvas*, FuriString*, size_t"
+Function,+,elements_text_box,void,"Canvas*, int32_t, int32_t, size_t, size_t, Align, Align, const char*, _Bool"
 Function,+,elf_resolve_from_hashtable,_Bool,"const ElfApiInterface*, uint32_t, Elf32_Addr*"
 Function,+,elf_symbolname_hash,uint32_t,const char*
 Function,+,empty_screen_alloc,EmptyScreen*,
@@ -991,6 +1004,7 @@ Function,-,exp2f,float,float
 Function,-,exp2l,long double,long double
 Function,+,expansion_disable,void,Expansion*
 Function,+,expansion_enable,void,Expansion*
+Function,+,expansion_is_connected,_Bool,Expansion*
 Function,+,expansion_set_listen_serial,void,"Expansion*, FuriHalSerialId"
 Function,-,expf,float,float
 Function,-,expl,long double,long double
@@ -1007,6 +1021,22 @@ Function,-,fdim,double,"double, double"
 Function,-,fdimf,float,"float, float"
 Function,-,fdiml,long double,"long double, long double"
 Function,-,fdopen,FILE*,"int, const char*"
+Function,+,felica_alloc,FelicaData*,
+Function,+,felica_calculate_mac_write,void,"mbedtls_des3_context*, const uint8_t*, const uint8_t*, const uint8_t*, const uint8_t*, uint8_t*"
+Function,+,felica_calculate_session_key,void,"mbedtls_des3_context*, const uint8_t*, const uint8_t*, uint8_t*"
+Function,+,felica_check_mac,_Bool,"mbedtls_des3_context*, const uint8_t*, const uint8_t*, const uint8_t*, const uint8_t, uint8_t*"
+Function,+,felica_copy,void,"FelicaData*, const FelicaData*"
+Function,+,felica_free,void,FelicaData*
+Function,+,felica_get_base_data,FelicaData*,const FelicaData*
+Function,+,felica_get_device_name,const char*,"const FelicaData*, NfcDeviceNameType"
+Function,+,felica_get_uid,const uint8_t*,"const FelicaData*, size_t*"
+Function,+,felica_is_equal,_Bool,"const FelicaData*, const FelicaData*"
+Function,+,felica_load,_Bool,"FelicaData*, FlipperFormat*, uint32_t"
+Function,+,felica_poller_activate,FelicaError,"FelicaPoller*, FelicaData*"
+Function,+,felica_reset,void,FelicaData*
+Function,+,felica_save,_Bool,"const FelicaData*, FlipperFormat*"
+Function,+,felica_set_uid,_Bool,"FelicaData*, const uint8_t*, size_t"
+Function,+,felica_verify,_Bool,"FelicaData*, const FuriString*"
 Function,-,feof,int,FILE*
 Function,-,feof_unlocked,int,FILE*
 Function,-,ferror,int,FILE*
@@ -1307,6 +1337,7 @@ Function,+,furi_hal_gpio_init_simple,void,"const GpioPin*, const GpioMode"
 Function,+,furi_hal_gpio_remove_int_callback,void,const GpioPin*
 Function,+,furi_hal_hid_consumer_key_press,_Bool,uint16_t
 Function,+,furi_hal_hid_consumer_key_release,_Bool,uint16_t
+Function,+,furi_hal_hid_consumer_key_release_all,_Bool,
 Function,+,furi_hal_hid_get_led_state,uint8_t,
 Function,+,furi_hal_hid_is_connected,_Bool,
 Function,+,furi_hal_hid_kb_press,_Bool,uint16_t
@@ -1357,9 +1388,9 @@ Function,+,furi_hal_infrared_async_tx_set_signal_sent_isr_callback,void,"FuriHal
 Function,+,furi_hal_infrared_async_tx_start,void,"uint32_t, float"
 Function,+,furi_hal_infrared_async_tx_stop,void,
 Function,+,furi_hal_infrared_async_tx_wait_termination,void,
-Function,+,furi_hal_infrared_get_debug_out_status,_Bool,
+Function,+,furi_hal_infrared_detect_tx_output,FuriHalInfraredTxPin,
 Function,+,furi_hal_infrared_is_busy,_Bool,
-Function,+,furi_hal_infrared_set_debug_out,void,_Bool
+Function,+,furi_hal_infrared_set_tx_output,void,FuriHalInfraredTxPin
 Function,-,furi_hal_init,void,
 Function,-,furi_hal_init_early,void,
 Function,-,furi_hal_interrupt_init,void,
@@ -1588,7 +1619,6 @@ Function,-,furi_hal_subghz_dump_state,void,
 Function,+,furi_hal_subghz_flush_rx,void,
 Function,+,furi_hal_subghz_flush_tx,void,
 Function,+,furi_hal_subghz_get_data_gpio,const GpioPin*,
-Function,+,furi_hal_subghz_get_ext_power_amp,_Bool,
 Function,+,furi_hal_subghz_get_lqi,uint8_t,
 Function,+,furi_hal_subghz_get_rolling_counter_mult,int8_t,
 Function,+,furi_hal_subghz_get_rssi,float,
@@ -1606,7 +1636,6 @@ Function,+,furi_hal_subghz_reset,void,
 Function,+,furi_hal_subghz_rx,void,
 Function,+,furi_hal_subghz_rx_pipe_not_empty,_Bool,
 Function,+,furi_hal_subghz_set_async_mirror_pin,void,const GpioPin*
-Function,+,furi_hal_subghz_set_ext_power_amp,void,_Bool
 Function,+,furi_hal_subghz_set_frequency,uint32_t,uint32_t
 Function,+,furi_hal_subghz_set_frequency_and_path,uint32_t,uint32_t
 Function,+,furi_hal_subghz_set_path,void,FuriHalSubGhzPath
@@ -2172,6 +2201,7 @@ Function,+,loader_is_locked,_Bool,Loader*
 Function,+,loader_lock,_Bool,Loader*
 Function,+,loader_show_menu,void,Loader*
 Function,+,loader_start,LoaderStatus,"Loader*, const char*, const char*, FuriString*"
+Function,+,loader_start_detached_with_gui_error,void,"Loader*, const char*, const char*"
 Function,+,loader_start_with_gui_error,LoaderStatus,"Loader*, const char*, const char*"
 Function,+,loader_unlock,void,Loader*
 Function,+,loading_alloc,Loading*,
@@ -2491,6 +2521,7 @@ Function,+,mf_desfire_poller_read_file_settings_multi,MfDesfireError,"MfDesfireP
 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_version,MfDesfireError,"MfDesfirePoller*, uint8_t, MfDesfireKeyVersion*"
 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*"
@@ -2643,6 +2674,7 @@ Function,-,music_worker_set_volume,void,"MusicWorker*, float"
 Function,-,music_worker_start,void,MusicWorker*
 Function,-,music_worker_stop,void,MusicWorker*
 Function,+,name_generator_make_auto,void,"char*, size_t, const char*"
+Function,+,name_generator_make_auto_basic,void,"char*, size_t, const char*"
 Function,+,name_generator_make_auto_datetime,void,"char*, size_t, const char*, DateTime*"
 Function,+,name_generator_make_detailed,void,"char*, size_t, const char*"
 Function,+,name_generator_make_detailed_datetime,void,"char*, size_t, const char*, DateTime*"
@@ -2829,6 +2861,7 @@ Function,+,powf,float,"float, float"
 Function,-,powl,long double,"long double, long double"
 Function,+,pretty_format_bytes_hex_canonical,void,"FuriString*, size_t, const char*, const uint8_t*, size_t"
 Function,-,printf,int,"const char*, ..."
+Function,+,prng_successor,uint32_t,"uint32_t, uint32_t"
 Function,+,property_value_out,void,"PropertyValueContext*, const char*, unsigned int, ..."
 Function,+,protocol_dict_alloc,ProtocolDict*,"const ProtocolBase**, size_t"
 Function,+,protocol_dict_decoders_feed,ProtocolId,"ProtocolDict*, _Bool, uint32_t"
@@ -2913,9 +2946,9 @@ Function,+,rpc_system_app_set_callback,void,"RpcAppSystem*, RpcAppSystemCallback
 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*
-Function,+,saved_struct_get_payload_size,_Bool,"const char*, uint8_t, uint8_t, size_t*"
+Function,+,saved_struct_get_metadata,_Bool,"const char*, uint8_t*, uint8_t*, size_t*"
 Function,+,saved_struct_load,_Bool,"const char*, void*, size_t, uint8_t, uint8_t"
-Function,+,saved_struct_save,_Bool,"const char*, void*, size_t, uint8_t, uint8_t"
+Function,+,saved_struct_save,_Bool,"const char*, const void*, size_t, uint8_t, uint8_t"
 Function,-,scalbln,double,"double, long int"
 Function,-,scalblnf,float,"float, long int"
 Function,-,scalblnl,long double,"long double, long"
@@ -3105,7 +3138,7 @@ Function,+,storage_simply_remove,_Bool,"Storage*, const char*"
 Function,+,storage_simply_remove_recursive,_Bool,"Storage*, const char*"
 Function,-,stpcpy,char*,"char*, const char*"
 Function,-,stpncpy,char*,"char*, const char*, size_t"
-Function,-,strcasecmp,int,"const char*, const char*"
+Function,+,strcasecmp,int,"const char*, const char*"
 Function,-,strcasecmp_l,int,"const char*, const char*, locale_t"
 Function,+,strcasestr,char*,"const char*, const char*"
 Function,+,strcat,char*,"char*, const char*"
@@ -3806,6 +3839,7 @@ Variable,+,message_sound_off,const NotificationMessage,
 Variable,+,message_vibro_off,const NotificationMessage,
 Variable,+,message_vibro_on,const NotificationMessage,
 Variable,-,nfc_device_emv,const NfcDeviceBase,
+Variable,-,nfc_device_felica,const NfcDeviceBase,
 Variable,-,nfc_device_mf_classic,const NfcDeviceBase,
 Variable,-,nfc_device_mf_desfire,const NfcDeviceBase,
 Variable,-,nfc_device_mf_ultralight,const NfcDeviceBase,
diff --git a/targets/f7/ble_glue/app_debug.c b/targets/f7/ble_glue/app_debug.c
index fe76687b9..eab17e5b7 100644
--- a/targets/f7/ble_glue/app_debug.c
+++ b/targets/f7/ble_glue/app_debug.c
@@ -110,7 +110,7 @@ static const APPD_GpioConfig_t aRfConfigList[GPIO_NBR_OF_RF_SIGNALS] = {
 static void APPD_SetCPU2GpioConfig(void);
 static void APPD_BleDtbCfg(void);
 
-void APPD_Init() {
+void APPD_Init(void) {
     APPD_SetCPU2GpioConfig();
     APPD_BleDtbCfg();
 }
diff --git a/targets/f7/ble_glue/ble_app.c b/targets/f7/ble_glue/ble_app.c
index 1f392529d..fd4e64c09 100644
--- a/targets/f7/ble_glue/ble_app.c
+++ b/targets/f7/ble_glue/ble_app.c
@@ -54,8 +54,8 @@ static const SHCI_C2_Ble_Init_Cmd_Packet_t ble_init_cmd_packet = {
         .PrWriteListSize = CFG_BLE_PREPARE_WRITE_LIST_SIZE,
         .MblockCount = CFG_BLE_MBLOCK_COUNT,
         .AttMtu = CFG_BLE_MAX_ATT_MTU,
-        .SlaveSca = CFG_BLE_SLAVE_SCA,
-        .MasterSca = CFG_BLE_MASTER_SCA,
+        .PeripheralSca = CFG_BLE_SLAVE_SCA,
+        .CentralSca = CFG_BLE_MASTER_SCA,
         .LsSource = CFG_BLE_LSE_SOURCE,
         .MaxConnEventLength = CFG_BLE_MAX_CONN_EVENT_LENGTH,
         .HsStartupTime = CFG_BLE_HSE_STARTUP_TIME,
diff --git a/targets/f7/ble_glue/ble_event_thread.c b/targets/f7/ble_glue/ble_event_thread.c
index 6f9a1cdcd..deafbb9a4 100644
--- a/targets/f7/ble_glue/ble_event_thread.c
+++ b/targets/f7/ble_glue/ble_event_thread.c
@@ -80,7 +80,7 @@ void ble_event_thread_stop(void) {
     }
 
     FuriThreadId thread_id = furi_thread_get_id(event_thread);
-    furi_assert(thread_id);
+    furi_check(thread_id);
     furi_thread_flags_set(thread_id, BLE_EVENT_THREAD_FLAG_KILL_THREAD);
     furi_thread_join(event_thread);
     furi_thread_free(event_thread);
diff --git a/targets/f7/ble_glue/ble_glue.c b/targets/f7/ble_glue/ble_glue.c
index 91cb020d7..c50360361 100644
--- a/targets/f7/ble_glue/ble_glue.c
+++ b/targets/f7/ble_glue/ble_glue.c
@@ -49,13 +49,13 @@ static BleGlue* ble_glue = NULL;
 // static int32_t ble_glue_shci_thread(void* argument);
 static void ble_sys_status_not_callback(SHCI_TL_CmdStatus_t status);
 static void ble_sys_user_event_callback(void* pPayload);
-static void ble_glue_clear_shared_memory();
+static void ble_glue_clear_shared_memory(void);
 
 void ble_glue_set_key_storage_changed_callback(
     BleGlueKeyStorageChangedCallback callback,
     void* context) {
-    furi_assert(ble_glue);
-    furi_assert(callback);
+    furi_check(ble_glue);
+    furi_check(callback);
     ble_glue->callback = callback;
     ble_glue->context = context;
 }
@@ -224,7 +224,7 @@ bool ble_glue_wait_for_c2_start(int32_t timeout_ms) {
 }
 
 bool ble_glue_start(void) {
-    furi_assert(ble_glue);
+    furi_check(ble_glue);
 
     if(ble_glue->status != BleGlueStatusC2Started) {
         return false;
@@ -243,7 +243,7 @@ bool ble_glue_start(void) {
 }
 
 void ble_glue_stop(void) {
-    furi_assert(ble_glue);
+    furi_check(ble_glue);
 
     ble_event_thread_stop();
     // Free resources
diff --git a/targets/f7/ble_glue/ble_glue.h b/targets/f7/ble_glue/ble_glue.h
index 05c34148c..94821cc88 100644
--- a/targets/f7/ble_glue/ble_glue.h
+++ b/targets/f7/ble_glue/ble_glue.h
@@ -100,7 +100,7 @@ void ble_glue_set_key_storage_changed_callback(
     BleGlueKeyStorageChangedCallback callback,
     void* context);
 
-bool ble_glue_reinit_c2();
+bool ble_glue_reinit_c2(void);
 
 typedef enum {
     BleGlueCommandResultUnknown,
diff --git a/targets/f7/ble_glue/extra_beacon.c b/targets/f7/ble_glue/extra_beacon.c
index 446b31380..60338cb76 100644
--- a/targets/f7/ble_glue/extra_beacon.c
+++ b/targets/f7/ble_glue/extra_beacon.c
@@ -9,7 +9,8 @@
 #define GAP_MS_TO_SCAN_INTERVAL(x) ((uint16_t)((x) / 0.625))
 
 // Also used as an indicator of whether the beacon had ever been configured
-#define GAP_MIN_ADV_INTERVAL_MS (20)
+// AN5289: 4.7, we need at least 25ms + advertisement, which is 30 ms
+#define GAP_MIN_ADV_INTERVAL_MS (30u)
 
 typedef struct {
     GapExtraBeaconConfig last_config;
@@ -21,7 +22,7 @@ typedef struct {
 
 static ExtraBeacon extra_beacon = {0};
 
-void gap_extra_beacon_init() {
+void gap_extra_beacon_init(void) {
     if(extra_beacon.state_mutex) {
         // Already initialized - restore state if needed
         FURI_LOG_I(TAG, "Restoring state");
@@ -62,7 +63,7 @@ bool gap_extra_beacon_set_config(const GapExtraBeaconConfig* config) {
     return true;
 }
 
-bool gap_extra_beacon_start() {
+bool gap_extra_beacon_start(void) {
     furi_check(extra_beacon.state_mutex);
     furi_check(extra_beacon.last_config.min_adv_interval_ms >= GAP_MIN_ADV_INTERVAL_MS);
 
@@ -91,7 +92,7 @@ bool gap_extra_beacon_start() {
     return true;
 }
 
-bool gap_extra_beacon_stop() {
+bool gap_extra_beacon_stop(void) {
     furi_check(extra_beacon.state_mutex);
 
     if(extra_beacon.extra_beacon_state != GapExtraBeaconStateStarted) {
@@ -144,13 +145,13 @@ uint8_t gap_extra_beacon_get_data(uint8_t* data) {
     return extra_beacon.extra_beacon_data_len;
 }
 
-GapExtraBeaconState gap_extra_beacon_get_state() {
+GapExtraBeaconState gap_extra_beacon_get_state(void) {
     furi_check(extra_beacon.state_mutex);
 
     return extra_beacon.extra_beacon_state;
 }
 
-const GapExtraBeaconConfig* gap_extra_beacon_get_config() {
+const GapExtraBeaconConfig* gap_extra_beacon_get_config(void) {
     furi_check(extra_beacon.state_mutex);
 
     if(extra_beacon.last_config.min_adv_interval_ms < GAP_MIN_ADV_INTERVAL_MS) {
diff --git a/targets/f7/ble_glue/extra_beacon.h b/targets/f7/ble_glue/extra_beacon.h
index 675ea538c..d011bbeb8 100644
--- a/targets/f7/ble_glue/extra_beacon.h
+++ b/targets/f7/ble_glue/extra_beacon.h
@@ -76,17 +76,17 @@ typedef enum {
     GapExtraBeaconStateStarted,
 } GapExtraBeaconState;
 
-void gap_extra_beacon_init();
+void gap_extra_beacon_init(void);
 
-GapExtraBeaconState gap_extra_beacon_get_state();
+GapExtraBeaconState gap_extra_beacon_get_state(void);
 
-bool gap_extra_beacon_start();
+bool gap_extra_beacon_start(void);
 
-bool gap_extra_beacon_stop();
+bool gap_extra_beacon_stop(void);
 
 bool gap_extra_beacon_set_config(const GapExtraBeaconConfig* config);
 
-const GapExtraBeaconConfig* gap_extra_beacon_get_config();
+const GapExtraBeaconConfig* gap_extra_beacon_get_config(void);
 
 bool gap_extra_beacon_set_data(const uint8_t* data, uint8_t length);
 
diff --git a/targets/f7/ble_glue/furi_ble/event_dispatcher.c b/targets/f7/ble_glue/furi_ble/event_dispatcher.c
index ce3661d6d..19f60afb5 100644
--- a/targets/f7/ble_glue/furi_ble/event_dispatcher.c
+++ b/targets/f7/ble_glue/furi_ble/event_dispatcher.c
@@ -50,14 +50,14 @@ BleEventFlowStatus ble_event_dispatcher_process_event(void* payload) {
 }
 
 void ble_event_dispatcher_init(void) {
-    furi_assert(!initialized);
-
-    GapSvcEventHandlerList_init(handlers);
-    initialized = true;
+    if(!initialized) {
+        GapSvcEventHandlerList_init(handlers);
+        initialized = true;
+    }
 }
 
 void ble_event_dispatcher_reset(void) {
-    furi_assert(initialized);
+    furi_check(initialized);
     furi_check(GapSvcEventHandlerList_size(handlers) == 0);
 
     GapSvcEventHandlerList_clear(handlers);
diff --git a/targets/f7/ble_glue/furi_ble/gatt.c b/targets/f7/ble_glue/furi_ble/gatt.c
index dcea5f987..e40786583 100644
--- a/targets/f7/ble_glue/furi_ble/gatt.c
+++ b/targets/f7/ble_glue/furi_ble/gatt.c
@@ -11,8 +11,8 @@ void ble_gatt_characteristic_init(
     uint16_t svc_handle,
     const BleGattCharacteristicParams* char_descriptor,
     BleGattCharacteristicInstance* char_instance) {
-    furi_assert(char_descriptor);
-    furi_assert(char_instance);
+    furi_check(char_descriptor);
+    furi_check(char_instance);
 
     // Copy the descriptor to the instance, since it may point to stack memory
     char_instance->characteristic = malloc(sizeof(BleGattCharacteristicParams));
@@ -90,7 +90,7 @@ bool ble_gatt_characteristic_update(
     uint16_t svc_handle,
     BleGattCharacteristicInstance* char_instance,
     const void* source) {
-    furi_assert(char_instance);
+    furi_check(char_instance);
     const BleGattCharacteristicParams* char_descriptor = char_instance->characteristic;
     FURI_LOG_D(TAG, "Updating %s char", char_descriptor->name);
 
diff --git a/targets/f7/ble_glue/gap.c b/targets/f7/ble_glue/gap.c
index faac3be45..252e213f2 100644
--- a/targets/f7/ble_glue/gap.c
+++ b/targets/f7/ble_glue/gap.c
@@ -75,7 +75,7 @@ static inline void fetch_rssi() {
 }
 
 static void gap_verify_connection_parameters(Gap* gap) {
-    furi_assert(gap);
+    furi_check(gap);
 
     FURI_LOG_I(
         TAG,
@@ -410,7 +410,7 @@ static void gap_advertise_start(GapState new_state) {
     uint16_t min_interval;
     uint16_t max_interval;
 
-    FURI_LOG_I(TAG, "Start: %d", new_state);
+    FURI_LOG_D(TAG, "Start: %d", new_state);
 
     if(new_state == GapStateAdvFast) {
         min_interval = 0x80; // 80 ms
@@ -455,7 +455,7 @@ static void gap_advertise_start(GapState new_state) {
 }
 
 static void gap_advertise_stop(void) {
-    FURI_LOG_I(TAG, "Stop");
+    FURI_LOG_D(TAG, "Stop");
     tBleStatus ret;
     if(gap->state > GapStateIdle) {
         if(gap->state == GapStateConnected) {
@@ -515,6 +515,8 @@ bool gap_init(GapConfig* config, GapEventCallback on_event_cb, void* context) {
         return false;
     }
 
+    furi_check(gap == NULL);
+
     gap = malloc(sizeof(Gap));
     gap->config = config;
     // Create advertising timer
@@ -532,13 +534,13 @@ bool gap_init(GapConfig* config, GapEventCallback on_event_cb, void* context) {
     gap->conn_rssi = 127;
     gap->time_rssi_sample = 0;
 
+    // Command queue allocation
+    gap->command_queue = furi_message_queue_alloc(8, sizeof(GapCommand));
+
     // Thread configuration
     gap->thread = furi_thread_alloc_ex("BleGapDriver", 1024, gap_app, gap);
     furi_thread_start(gap->thread);
 
-    // Command queue allocation
-    gap->command_queue = furi_message_queue_alloc(8, sizeof(GapCommand));
-
     uint8_t adv_service_uid[2];
     gap->service.adv_svc_uuid_len = 1;
     adv_service_uid[0] = gap->config->adv_service_uuid & 0xff;
diff --git a/targets/f7/ble_glue/hw_ipcc.c b/targets/f7/ble_glue/hw_ipcc.c
index c2397f351..4daaa7e49 100644
--- a/targets/f7/ble_glue/hw_ipcc.c
+++ b/targets/f7/ble_glue/hw_ipcc.c
@@ -15,16 +15,16 @@
     (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, channel) && \
      LL_C1_IPCC_IsEnabledReceiveChannel(IPCC, channel))
 
-static void (*FreeBufCb)();
+static void (*FreeBufCb)(void);
 
-static void HW_IPCC_BLE_EvtHandler();
-static void HW_IPCC_BLE_AclDataEvtHandler();
-static void HW_IPCC_MM_FreeBufHandler();
-static void HW_IPCC_SYS_CmdEvtHandler();
-static void HW_IPCC_SYS_EvtHandler();
-static void HW_IPCC_TRACES_EvtHandler();
+static void HW_IPCC_BLE_EvtHandler(void);
+static void HW_IPCC_BLE_AclDataEvtHandler(void);
+static void HW_IPCC_MM_FreeBufHandler(void);
+static void HW_IPCC_SYS_CmdEvtHandler(void);
+static void HW_IPCC_SYS_EvtHandler(void);
+static void HW_IPCC_TRACES_EvtHandler(void);
 
-void HW_IPCC_Rx_Handler() {
+void HW_IPCC_Rx_Handler(void) {
     if(HW_IPCC_RX_PENDING(HW_IPCC_SYSTEM_EVENT_CHANNEL)) {
         HW_IPCC_SYS_EvtHandler();
     } else if(HW_IPCC_RX_PENDING(HW_IPCC_BLE_EVENT_CHANNEL)) {
@@ -34,7 +34,7 @@ void HW_IPCC_Rx_Handler() {
     }
 }
 
-void HW_IPCC_Tx_Handler() {
+void HW_IPCC_Tx_Handler(void) {
     if(HW_IPCC_TX_PENDING(HW_IPCC_SYSTEM_CMD_RSP_CHANNEL)) {
         HW_IPCC_SYS_CmdEvtHandler();
     } else if(HW_IPCC_TX_PENDING(HW_IPCC_SYSTEM_CMD_RSP_CHANNEL)) {
@@ -46,7 +46,7 @@ void HW_IPCC_Tx_Handler() {
     }
 }
 
-void HW_IPCC_Enable() {
+void HW_IPCC_Enable(void) {
     /**
   * Such as IPCC IP available to the CPU2, it is required to keep the IPCC clock running
     when FUS is running on CPU2 and CPU1 enters deep sleep mode
@@ -71,7 +71,7 @@ void HW_IPCC_Enable() {
     LL_PWR_EnableBootC2();
 }
 
-void HW_IPCC_Init() {
+void HW_IPCC_Init(void) {
     LL_C1_IPCC_EnableIT_RXO(IPCC);
     LL_C1_IPCC_EnableIT_TXF(IPCC);
 
@@ -81,36 +81,36 @@ void HW_IPCC_Init() {
     NVIC_EnableIRQ(IPCC_C1_TX_IRQn);
 }
 
-void HW_IPCC_BLE_Init() {
+void HW_IPCC_BLE_Init(void) {
     LL_C1_IPCC_EnableReceiveChannel(IPCC, HW_IPCC_BLE_EVENT_CHANNEL);
 }
 
-void HW_IPCC_BLE_SendCmd() {
+void HW_IPCC_BLE_SendCmd(void) {
     LL_C1_IPCC_SetFlag_CHx(IPCC, HW_IPCC_BLE_CMD_CHANNEL);
 }
 
-static void HW_IPCC_BLE_EvtHandler() {
+static void HW_IPCC_BLE_EvtHandler(void) {
     HW_IPCC_BLE_RxEvtNot();
 
     LL_C1_IPCC_ClearFlag_CHx(IPCC, HW_IPCC_BLE_EVENT_CHANNEL);
 }
 
-void HW_IPCC_BLE_SendAclData() {
+void HW_IPCC_BLE_SendAclData(void) {
     LL_C1_IPCC_SetFlag_CHx(IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL);
     LL_C1_IPCC_EnableTransmitChannel(IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL);
 }
 
-static void HW_IPCC_BLE_AclDataEvtHandler() {
+static void HW_IPCC_BLE_AclDataEvtHandler(void) {
     LL_C1_IPCC_DisableTransmitChannel(IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL);
 
     HW_IPCC_BLE_AclDataAckNot();
 }
 
-void HW_IPCC_SYS_Init() {
+void HW_IPCC_SYS_Init(void) {
     LL_C1_IPCC_EnableReceiveChannel(IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL);
 }
 
-void HW_IPCC_SYS_SendCmd() {
+void HW_IPCC_SYS_SendCmd(void) {
     LL_C1_IPCC_SetFlag_CHx(IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL);
 
     FuriHalCortexTimer timer = furi_hal_cortex_timer_get(33000000);
@@ -122,19 +122,19 @@ void HW_IPCC_SYS_SendCmd() {
     HW_IPCC_SYS_CmdEvtHandler();
 }
 
-static void HW_IPCC_SYS_CmdEvtHandler() {
+static void HW_IPCC_SYS_CmdEvtHandler(void) {
     LL_C1_IPCC_DisableTransmitChannel(IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL);
 
     HW_IPCC_SYS_CmdEvtNot();
 }
 
-static void HW_IPCC_SYS_EvtHandler() {
+static void HW_IPCC_SYS_EvtHandler(void) {
     HW_IPCC_SYS_EvtNot();
 
     LL_C1_IPCC_ClearFlag_CHx(IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL);
 }
 
-void HW_IPCC_MM_SendFreeBuf(void (*cb)()) {
+void HW_IPCC_MM_SendFreeBuf(void (*cb)(void)) {
     if(LL_C1_IPCC_IsActiveFlag_CHx(IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL)) {
         FreeBufCb = cb;
         LL_C1_IPCC_EnableTransmitChannel(IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL);
@@ -145,7 +145,7 @@ void HW_IPCC_MM_SendFreeBuf(void (*cb)()) {
     }
 }
 
-static void HW_IPCC_MM_FreeBufHandler() {
+static void HW_IPCC_MM_FreeBufHandler(void) {
     LL_C1_IPCC_DisableTransmitChannel(IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL);
 
     FreeBufCb();
@@ -153,11 +153,11 @@ static void HW_IPCC_MM_FreeBufHandler() {
     LL_C1_IPCC_SetFlag_CHx(IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL);
 }
 
-void HW_IPCC_TRACES_Init() {
+void HW_IPCC_TRACES_Init(void) {
     LL_C1_IPCC_EnableReceiveChannel(IPCC, HW_IPCC_TRACES_CHANNEL);
 }
 
-static void HW_IPCC_TRACES_EvtHandler() {
+static void HW_IPCC_TRACES_EvtHandler(void) {
     HW_IPCC_TRACES_EvtNot();
 
     LL_C1_IPCC_ClearFlag_CHx(IPCC, HW_IPCC_TRACES_CHANNEL);
diff --git a/targets/f7/ble_glue/profiles/serial_profile.c b/targets/f7/ble_glue/profiles/serial_profile.c
index a3949abfc..165b81330 100644
--- a/targets/f7/ble_glue/profiles/serial_profile.c
+++ b/targets/f7/ble_glue/profiles/serial_profile.c
@@ -46,8 +46,8 @@ static GapConfig serial_template_config = {
     .bonding_mode = true,
     .pairing_method = GapPairingPinCodeShow,
     .conn_param = {
-        .conn_int_min = 0x18, // 30 ms
-        .conn_int_max = 0x24, // 45 ms
+        .conn_int_min = 0x18, // AN5289: 4.7, we need at least 25ms + advertisement, which is 30 ms
+        .conn_int_max = 0x18, // 30 ms
         .slave_latency = 0,
         .supervisor_timeout = 0,
     }};
diff --git a/targets/f7/ble_glue/services/battery_service.c b/targets/f7/ble_glue/services/battery_service.c
index f4bc1ff7b..4250b356c 100644
--- a/targets/f7/ble_glue/services/battery_service.c
+++ b/targets/f7/ble_glue/services/battery_service.c
@@ -114,7 +114,7 @@ BleServiceBattery* ble_svc_battery_start(bool auto_update) {
 }
 
 void ble_svc_battery_stop(BleServiceBattery* battery_svc) {
-    furi_assert(battery_svc);
+    furi_check(battery_svc);
     if(battery_svc->auto_update) {
         BatterySvcInstanceList_it_t it;
         for(BatterySvcInstanceList_it(it, instances); !BatterySvcInstanceList_end_p(it);
diff --git a/targets/f7/ble_glue/services/dev_info_service.c b/targets/f7/ble_glue/services/dev_info_service.c
index 5f0603922..0db1f65ee 100644
--- a/targets/f7/ble_glue/services/dev_info_service.c
+++ b/targets/f7/ble_glue/services/dev_info_service.c
@@ -137,7 +137,7 @@ BleServiceDevInfo* ble_svc_dev_info_start(void) {
 }
 
 void ble_svc_dev_info_stop(BleServiceDevInfo* dev_info_svc) {
-    furi_assert(dev_info_svc);
+    furi_check(dev_info_svc);
     /* Delete service characteristics */
     for(size_t i = 0; i < DevInfoSvcGattCharacteristicCount; i++) {
         ble_gatt_characteristic_delete(
diff --git a/targets/f7/ble_glue/services/serial_service.c b/targets/f7/ble_glue/services/serial_service.c
index a8f10e6d7..6fe6a7130 100644
--- a/targets/f7/ble_glue/services/serial_service.c
+++ b/targets/f7/ble_glue/services/serial_service.c
@@ -179,7 +179,7 @@ void ble_svc_serial_set_callbacks(
     uint16_t buff_size,
     SerialServiceEventCallback callback,
     void* context) {
-    furi_assert(serial_svc);
+    furi_check(serial_svc);
     serial_svc->callback = callback;
     serial_svc->context = context;
     serial_svc->buff_size = buff_size;
@@ -193,8 +193,8 @@ void ble_svc_serial_set_callbacks(
 }
 
 void ble_svc_serial_notify_buffer_is_empty(BleServiceSerial* serial_svc) {
-    furi_assert(serial_svc);
-    furi_assert(serial_svc->buff_size_mtx);
+    furi_check(serial_svc);
+    furi_check(serial_svc->buff_size_mtx);
 
     furi_check(furi_mutex_acquire(serial_svc->buff_size_mtx, FuriWaitForever) == FuriStatusOk);
     if(serial_svc->bytes_ready_to_receive == 0) {
@@ -253,7 +253,7 @@ bool ble_svc_serial_update_tx(BleServiceSerial* serial_svc, uint8_t* data, uint1
 }
 
 void ble_svc_serial_set_rpc_active(BleServiceSerial* serial_svc, bool active) {
-    furi_assert(serial_svc);
+    furi_check(serial_svc);
     ble_svc_serial_update_rpc_char(
         serial_svc, active ? SerialServiceRpcStatusActive : SerialServiceRpcStatusNotActive);
 }
diff --git a/targets/f7/fatfs/fatfs.c b/targets/f7/fatfs/fatfs.c
index 0e17f75c1..fa791f122 100644
--- a/targets/f7/fatfs/fatfs.c
+++ b/targets/f7/fatfs/fatfs.c
@@ -14,7 +14,7 @@ void fatfs_init(void) {
   *
   * @return     Time in DWORD (toasters per square washing machine)
   */
-DWORD get_fattime() {
+DWORD get_fattime(void) {
     DateTime furi_time;
     furi_hal_rtc_get_datetime(&furi_time);
 
diff --git a/targets/f7/fatfs/sector_cache.c b/targets/f7/fatfs/sector_cache.c
index efb520ec8..319dd2173 100644
--- a/targets/f7/fatfs/sector_cache.c
+++ b/targets/f7/fatfs/sector_cache.c
@@ -17,7 +17,7 @@ typedef struct {
 
 static SectorCache* cache = NULL;
 
-void sector_cache_init() {
+void sector_cache_init(void) {
     if(cache == NULL) {
         cache = memmgr_alloc_from_pool(sizeof(SectorCache));
     }
diff --git a/targets/f7/fatfs/sector_cache.h b/targets/f7/fatfs/sector_cache.h
index 5fe4a2ed8..6792408a3 100644
--- a/targets/f7/fatfs/sector_cache.h
+++ b/targets/f7/fatfs/sector_cache.h
@@ -8,7 +8,7 @@ extern "C" {
 /**
  * @brief Init sector cache system
  */
-void sector_cache_init();
+void sector_cache_init(void);
 
 /**
  * @brief Get sector data from cache
diff --git a/targets/f7/furi_hal/furi_hal.c b/targets/f7/furi_hal/furi_hal.c
index 9054f4df5..1b7b827d1 100644
--- a/targets/f7/furi_hal/furi_hal.c
+++ b/targets/f7/furi_hal/furi_hal.c
@@ -6,7 +6,7 @@
 
 #define TAG "FuriHal"
 
-void furi_hal_init_early() {
+void furi_hal_init_early(void) {
     furi_hal_cortex_init_early();
     furi_hal_clock_init_early();
     furi_hal_bus_init_early();
@@ -19,7 +19,7 @@ void furi_hal_init_early() {
     furi_hal_rtc_init_early();
 }
 
-void furi_hal_deinit_early() {
+void furi_hal_deinit_early(void) {
     furi_hal_rtc_deinit_early();
     furi_hal_i2c_deinit_early();
     furi_hal_spi_config_deinit_early();
@@ -29,7 +29,7 @@ void furi_hal_deinit_early() {
     furi_hal_clock_deinit_early();
 }
 
-void furi_hal_init() {
+void furi_hal_init(void) {
     furi_hal_mpu_init();
     furi_hal_clock_init();
     furi_hal_random_init();
diff --git a/targets/f7/furi_hal/furi_hal_bt.c b/targets/f7/furi_hal/furi_hal_bt.c
index 2b1fbf04c..036d50ace 100644
--- a/targets/f7/furi_hal/furi_hal_bt.c
+++ b/targets/f7/furi_hal/furi_hal_bt.c
@@ -37,7 +37,7 @@ static FuriHalBt furi_hal_bt = {
     .stack = FuriHalBtStackUnknown,
 };
 
-void furi_hal_bt_init() {
+void furi_hal_bt_init(void) {
     FURI_LOG_I(TAG, "Start BT initialization");
     furi_hal_bus_enable(FuriHalBusHSEM);
     furi_hal_bus_enable(FuriHalBusIPCC);
@@ -47,7 +47,7 @@ void furi_hal_bt_init() {
 
     if(!furi_hal_bt.core2_mtx) {
         furi_hal_bt.core2_mtx = furi_mutex_alloc(FuriMutexTypeNormal);
-        furi_assert(furi_hal_bt.core2_mtx);
+        furi_check(furi_hal_bt.core2_mtx);
     }
 
     // Explicitly tell that we are in charge of CLK48 domain
@@ -57,13 +57,13 @@ void furi_hal_bt_init() {
     ble_glue_init();
 }
 
-void furi_hal_bt_lock_core2() {
-    furi_assert(furi_hal_bt.core2_mtx);
+void furi_hal_bt_lock_core2(void) {
+    furi_check(furi_hal_bt.core2_mtx);
     furi_check(furi_mutex_acquire(furi_hal_bt.core2_mtx, FuriWaitForever) == FuriStatusOk);
 }
 
-void furi_hal_bt_unlock_core2() {
-    furi_assert(furi_hal_bt.core2_mtx);
+void furi_hal_bt_unlock_core2(void) {
+    furi_check(furi_hal_bt.core2_mtx);
     furi_check(furi_mutex_release(furi_hal_bt.core2_mtx) == FuriStatusOk);
 }
 
@@ -87,9 +87,9 @@ static bool furi_hal_bt_radio_stack_is_supported(const BleGlueC2Info* info) {
     return supported;
 }
 
-bool furi_hal_bt_start_radio_stack() {
+bool furi_hal_bt_start_radio_stack(void) {
     bool res = false;
-    furi_assert(furi_hal_bt.core2_mtx);
+    furi_check(furi_hal_bt.core2_mtx);
 
     furi_mutex_acquire(furi_hal_bt.core2_mtx, FuriWaitForever);
 
@@ -130,11 +130,11 @@ bool furi_hal_bt_start_radio_stack() {
     return res;
 }
 
-FuriHalBtStack furi_hal_bt_get_radio_stack() {
+FuriHalBtStack furi_hal_bt_get_radio_stack(void) {
     return furi_hal_bt.stack;
 }
 
-bool furi_hal_bt_is_gatt_gap_supported() {
+bool furi_hal_bt_is_gatt_gap_supported(void) {
     if(furi_hal_bt.stack == FuriHalBtStackLight || furi_hal_bt.stack == FuriHalBtStackFull) {
         return true;
     } else {
@@ -142,7 +142,7 @@ bool furi_hal_bt_is_gatt_gap_supported() {
     }
 }
 
-bool furi_hal_bt_is_testing_supported() {
+bool furi_hal_bt_is_testing_supported(void) {
     if(furi_hal_bt.stack == FuriHalBtStackFull) {
         return true;
     } else {
@@ -168,7 +168,7 @@ FuriHalBleProfileBase* furi_hal_bt_start_app(
     FuriHalBleProfileParams params,
     GapEventCallback event_cb,
     void* context) {
-    furi_assert(event_cb);
+    furi_check(event_cb);
     furi_check(profile_template);
     furi_check(current_profile == NULL);
 
@@ -198,7 +198,7 @@ FuriHalBleProfileBase* furi_hal_bt_start_app(
     return current_profile;
 }
 
-void furi_hal_bt_reinit() {
+void furi_hal_bt_reinit(void) {
     furi_hal_power_insomnia_enter();
     FURI_LOG_I(TAG, "Disconnect and stop advertising");
     furi_hal_bt_stop_advertising();
@@ -239,13 +239,13 @@ FuriHalBleProfileBase* furi_hal_bt_change_app(
     FuriHalBleProfileParams profile_params,
     GapEventCallback event_cb,
     void* context) {
-    furi_assert(event_cb);
+    furi_check(event_cb);
 
     furi_hal_bt_reinit();
     return furi_hal_bt_start_app(profile_template, profile_params, event_cb, context);
 }
 
-bool furi_hal_bt_is_active() {
+bool furi_hal_bt_is_active(void) {
     return gap_get_state() > GapStateIdle;
 }
 
@@ -253,13 +253,13 @@ bool furi_hal_bt_is_connected() {
     return gap_get_state() == GapStateConnected;
 }
 
-void furi_hal_bt_start_advertising() {
+void furi_hal_bt_start_advertising(void) {
     if(gap_get_state() == GapStateIdle) {
         gap_start_advertising();
     }
 }
 
-void furi_hal_bt_stop_advertising() {
+void furi_hal_bt_stop_advertising(void) {
     if(furi_hal_bt_is_active()) {
         gap_stop_advertising();
         while(furi_hal_bt_is_active()) {
@@ -283,21 +283,21 @@ void furi_hal_bt_get_key_storage_buff(uint8_t** key_buff_addr, uint16_t* key_buf
 void furi_hal_bt_set_key_storage_change_callback(
     BleGlueKeyStorageChangedCallback callback,
     void* context) {
-    furi_assert(callback);
+    furi_check(callback);
     ble_glue_set_key_storage_changed_callback(callback, context);
 }
 
-void furi_hal_bt_nvm_sram_sem_acquire() {
+void furi_hal_bt_nvm_sram_sem_acquire(void) {
     while(LL_HSEM_1StepLock(HSEM, CFG_HW_BLE_NVM_SRAM_SEMID)) {
         furi_thread_yield();
     }
 }
 
-void furi_hal_bt_nvm_sram_sem_release() {
+void furi_hal_bt_nvm_sram_sem_release(void) {
     LL_HSEM_ReleaseLock(HSEM, CFG_HW_BLE_NVM_SRAM_SEMID, 0);
 }
 
-bool furi_hal_bt_clear_white_list() {
+bool furi_hal_bt_clear_white_list(void) {
     furi_hal_bt_nvm_sram_sem_acquire();
     tBleStatus status = aci_gap_clear_security_db();
     if(status) {
@@ -308,6 +308,8 @@ bool furi_hal_bt_clear_white_list() {
 }
 
 void furi_hal_bt_dump_state(FuriString* buffer) {
+    furi_check(buffer);
+
     if(furi_hal_bt_is_alive()) {
         uint8_t HCI_Version;
         uint16_t HCI_Revision;
@@ -332,7 +334,7 @@ void furi_hal_bt_dump_state(FuriString* buffer) {
     }
 }
 
-bool furi_hal_bt_is_alive() {
+bool furi_hal_bt_is_alive(void) {
     return ble_glue_is_alive();
 }
 
@@ -341,7 +343,7 @@ void furi_hal_bt_start_tone_tx(uint8_t channel, uint8_t power) {
     aci_hal_tone_start(channel, 0);
 }
 
-void furi_hal_bt_stop_tone_tx() {
+void furi_hal_bt_stop_tone_tx(void) {
     aci_hal_tone_stop();
 }
 
@@ -353,7 +355,7 @@ void furi_hal_bt_start_packet_rx(uint8_t channel, uint8_t datarate) {
     hci_le_enhanced_receiver_test(channel, datarate, 0);
 }
 
-uint16_t furi_hal_bt_stop_packet_test() {
+uint16_t furi_hal_bt_stop_packet_test(void) {
     uint16_t num_of_packets = 0;
     hci_le_test_end(&num_of_packets);
     return num_of_packets;
@@ -363,7 +365,7 @@ void furi_hal_bt_start_rx(uint8_t channel) {
     aci_hal_rx_start(channel);
 }
 
-float furi_hal_bt_get_rssi() {
+float furi_hal_bt_get_rssi(void) {
     float val;
     uint8_t rssi_raw[3];
 
@@ -411,13 +413,13 @@ void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]) {
     }
 }
 
-uint32_t furi_hal_bt_get_transmitted_packets() {
+uint32_t furi_hal_bt_get_transmitted_packets(void) {
     uint32_t packets = 0;
     aci_hal_le_tx_test_packet_number(&packets);
     return packets;
 }
 
-void furi_hal_bt_stop_rx() {
+void furi_hal_bt_stop_rx(void) {
     aci_hal_rx_stop();
 }
 
@@ -448,18 +450,18 @@ bool furi_hal_bt_extra_beacon_set_config(const GapExtraBeaconConfig* config) {
     return gap_extra_beacon_set_config(config);
 }
 
-const GapExtraBeaconConfig* furi_hal_bt_extra_beacon_get_config() {
+const GapExtraBeaconConfig* furi_hal_bt_extra_beacon_get_config(void) {
     return gap_extra_beacon_get_config();
 }
 
-bool furi_hal_bt_extra_beacon_start() {
+bool furi_hal_bt_extra_beacon_start(void) {
     return gap_extra_beacon_start();
 }
 
-bool furi_hal_bt_extra_beacon_stop() {
+bool furi_hal_bt_extra_beacon_stop(void) {
     return gap_extra_beacon_stop();
 }
 
-bool furi_hal_bt_extra_beacon_is_active() {
+bool furi_hal_bt_extra_beacon_is_active(void) {
     return gap_extra_beacon_get_state() == GapExtraBeaconStateStarted;
 }
diff --git a/targets/f7/furi_hal/furi_hal_bus.c b/targets/f7/furi_hal/furi_hal_bus.c
index 2c6f1f1eb..85b121dc4 100644
--- a/targets/f7/furi_hal/furi_hal_bus.c
+++ b/targets/f7/furi_hal/furi_hal_bus.c
@@ -143,7 +143,7 @@ static const uint32_t furi_hal_bus[] = {
     [FuriHalBusRF] = LL_APB3_GRP1_PERIPH_RF,
 };
 
-void furi_hal_bus_init_early() {
+void furi_hal_bus_init_early(void) {
     FURI_CRITICAL_ENTER();
 
     // FURI_HAL_BUS_PERIPH_DISABLE(AHB1, FURI_HAL_BUS_AHB1_GRP1, 1);
@@ -158,7 +158,7 @@ void furi_hal_bus_init_early() {
     FURI_CRITICAL_EXIT();
 }
 
-void furi_hal_bus_deinit_early() {
+void furi_hal_bus_deinit_early(void) {
     FURI_CRITICAL_ENTER();
 
     // FURI_HAL_BUS_PERIPH_ENABLE(AHB1, FURI_HAL_BUS_AHB1_GRP1, 1);
diff --git a/targets/f7/furi_hal/furi_hal_bus.h b/targets/f7/furi_hal/furi_hal_bus.h
index ad4bbec32..7c4fe6a03 100644
--- a/targets/f7/furi_hal/furi_hal_bus.h
+++ b/targets/f7/furi_hal/furi_hal_bus.h
@@ -68,10 +68,10 @@ typedef enum {
 } FuriHalBus;
 
 /** Early initialization */
-void furi_hal_bus_init_early();
+void furi_hal_bus_init_early(void);
 
 /** Early de-initialization */
-void furi_hal_bus_deinit_early();
+void furi_hal_bus_deinit_early(void);
 
 /**
  * Enable a peripheral by turning the clocking on and deasserting the reset.
diff --git a/targets/f7/furi_hal/furi_hal_clock.c b/targets/f7/furi_hal/furi_hal_clock.c
index 945dc323b..ad21031fe 100644
--- a/targets/f7/furi_hal/furi_hal_clock.c
+++ b/targets/f7/furi_hal/furi_hal_clock.c
@@ -22,15 +22,15 @@
 #define HS_CLOCK_IS_READY() (LL_RCC_HSE_IsReady() && LL_RCC_HSI_IsReady())
 #define LS_CLOCK_IS_READY() (LL_RCC_LSE_IsReady() && LL_RCC_LSI1_IsReady())
 
-void furi_hal_clock_init_early() {
+void furi_hal_clock_init_early(void) {
     LL_SetSystemCoreClock(CPU_CLOCK_EARLY_HZ);
     LL_Init1msTick(SystemCoreClock);
 }
 
-void furi_hal_clock_deinit_early() {
+void furi_hal_clock_deinit_early(void) {
 }
 
-void furi_hal_clock_init() {
+void furi_hal_clock_init(void) {
     /* HSE and HSI configuration and activation */
     LL_RCC_HSE_SetCapacitorTuning(0x26);
     LL_RCC_HSE_Enable();
@@ -125,7 +125,7 @@ void furi_hal_clock_init() {
     FURI_LOG_I(TAG, "Init OK");
 }
 
-void furi_hal_clock_switch_hse2hsi() {
+void furi_hal_clock_switch_hse2hsi(void) {
     LL_RCC_HSI_Enable();
 
     while(!LL_RCC_HSI_IsReady())
@@ -142,7 +142,7 @@ void furi_hal_clock_switch_hse2hsi() {
         ;
 }
 
-void furi_hal_clock_switch_hsi2hse() {
+void furi_hal_clock_switch_hsi2hse(void) {
 #ifdef FURI_HAL_CLOCK_TRACK_STARTUP
     uint32_t clock_start_time = DWT->CYCCNT;
 #endif
@@ -168,7 +168,7 @@ void furi_hal_clock_switch_hsi2hse() {
 #endif
 }
 
-bool furi_hal_clock_switch_hse2pll() {
+bool furi_hal_clock_switch_hse2pll(void) {
     furi_assert(LL_RCC_GetSysClkSource() == LL_RCC_SYS_CLKSOURCE_STATUS_HSE);
 
     LL_RCC_PLL_Enable();
@@ -191,7 +191,7 @@ bool furi_hal_clock_switch_hse2pll() {
     return true;
 }
 
-bool furi_hal_clock_switch_pll2hse() {
+bool furi_hal_clock_switch_pll2hse(void) {
     furi_assert(LL_RCC_GetSysClkSource() == LL_RCC_SYS_CLKSOURCE_STATUS_PLL);
 
     LL_RCC_HSE_Enable();
@@ -210,11 +210,11 @@ bool furi_hal_clock_switch_pll2hse() {
     return true;
 }
 
-void furi_hal_clock_suspend_tick() {
+void furi_hal_clock_suspend_tick(void) {
     CLEAR_BIT(SysTick->CTRL, SysTick_CTRL_ENABLE_Msk);
 }
 
-void furi_hal_clock_resume_tick() {
+void furi_hal_clock_resume_tick(void) {
     SET_BIT(SysTick->CTRL, SysTick_CTRL_ENABLE_Msk);
 }
 
@@ -271,7 +271,7 @@ void furi_hal_clock_mco_enable(FuriHalClockMcoSourceId source, FuriHalClockMcoDi
     }
 }
 
-void furi_hal_clock_mco_disable() {
+void furi_hal_clock_mco_disable(void) {
     LL_RCC_ConfigMCO(LL_RCC_MCO1SOURCE_NOCLOCK, FuriHalClockMcoDiv1);
     LL_RCC_MSI_Disable();
     while(LL_RCC_MSI_IsReady() != 0)
diff --git a/targets/f7/furi_hal/furi_hal_clock.h b/targets/f7/furi_hal/furi_hal_clock.h
index 3100b619f..302e3d174 100644
--- a/targets/f7/furi_hal/furi_hal_clock.h
+++ b/targets/f7/furi_hal/furi_hal_clock.h
@@ -33,37 +33,37 @@ typedef enum {
 } FuriHalClockMcoDivisorId;
 
 /** Early initialization */
-void furi_hal_clock_init_early();
+void furi_hal_clock_init_early(void);
 
 /** Early deinitialization */
-void furi_hal_clock_deinit_early();
+void furi_hal_clock_deinit_early(void);
 
 /** Initialize clocks */
-void furi_hal_clock_init();
+void furi_hal_clock_init(void);
 
 /** Switch clock from HSE to HSI */
-void furi_hal_clock_switch_hse2hsi();
+void furi_hal_clock_switch_hse2hsi(void);
 
 /** Switch clock from HSI to HSE */
-void furi_hal_clock_switch_hsi2hse();
+void furi_hal_clock_switch_hsi2hse(void);
 
 /** Switch clock from HSE to PLL
  *
  * @return     true if changed, false if failed or not possible at this moment
  */
-bool furi_hal_clock_switch_hse2pll();
+bool furi_hal_clock_switch_hse2pll(void);
 
 /** Switch clock from PLL to HSE
  *
  * @return     true if changed, false if failed or not possible at this moment
  */
-bool furi_hal_clock_switch_pll2hse();
+bool furi_hal_clock_switch_pll2hse(void);
 
 /** Stop SysTick counter without resetting */
-void furi_hal_clock_suspend_tick();
+void furi_hal_clock_suspend_tick(void);
 
 /** Continue SysTick counter operation */
-void furi_hal_clock_resume_tick();
+void furi_hal_clock_resume_tick(void);
 
 /** Enable clock output on MCO pin
  * 
@@ -73,7 +73,7 @@ void furi_hal_clock_resume_tick();
 void furi_hal_clock_mco_enable(FuriHalClockMcoSourceId source, FuriHalClockMcoDivisorId div);
 
 /** Disable clock output on MCO pin */
-void furi_hal_clock_mco_disable();
+void furi_hal_clock_mco_disable(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/f7/furi_hal/furi_hal_cortex.c b/targets/f7/furi_hal/furi_hal_cortex.c
index 9865e6ef8..9e184a597 100644
--- a/targets/f7/furi_hal/furi_hal_cortex.c
+++ b/targets/f7/furi_hal/furi_hal_cortex.c
@@ -5,7 +5,7 @@
 
 #define FURI_HAL_CORTEX_INSTRUCTIONS_PER_MICROSECOND (SystemCoreClock / 1000000)
 
-void furi_hal_cortex_init_early() {
+void furi_hal_cortex_init_early(void) {
     CoreDebug->DEMCR |= (CoreDebug_DEMCR_TRCENA_Msk | CoreDebug_DEMCR_MON_EN_Msk);
     DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
     DWT->CYCCNT = 0U;
@@ -24,7 +24,7 @@ void furi_hal_cortex_delay_us(uint32_t microseconds) {
     };
 }
 
-uint32_t furi_hal_cortex_instructions_per_microsecond() {
+uint32_t furi_hal_cortex_instructions_per_microsecond(void) {
     return FURI_HAL_CORTEX_INSTRUCTIONS_PER_MICROSECOND;
 }
 
diff --git a/targets/f7/furi_hal/furi_hal_crypto.c b/targets/f7/furi_hal/furi_hal_crypto.c
index a897648a3..236573bca 100644
--- a/targets/f7/furi_hal/furi_hal_crypto.c
+++ b/targets/f7/furi_hal/furi_hal_crypto.c
@@ -80,7 +80,7 @@ static const uint8_t enclave_signature_expected[ENCLAVE_FACTORY_KEY_SLOTS][ENCLA
     {0xc9, 0xf7, 0x03, 0xf1, 0x6c, 0x65, 0xad, 0x49, 0x74, 0xbe, 0x00, 0x54, 0xfd, 0xa6, 0x9c, 0x32},
 };
 
-void furi_hal_crypto_init() {
+void furi_hal_crypto_init(void) {
     furi_hal_crypto_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
     FURI_LOG_I(TAG, "Init OK");
 }
@@ -129,8 +129,8 @@ bool furi_hal_crypto_enclave_ensure_key(uint8_t key_slot) {
 }
 
 bool furi_hal_crypto_enclave_verify(uint8_t* keys_nb, uint8_t* valid_keys_nb) {
-    furi_assert(keys_nb);
-    furi_assert(valid_keys_nb);
+    furi_check(keys_nb);
+    furi_check(valid_keys_nb);
     uint8_t keys = 0;
     uint8_t keys_valid = 0;
     uint8_t buffer[ENCLAVE_SIGNATURE_SIZE];
@@ -155,8 +155,8 @@ bool furi_hal_crypto_enclave_verify(uint8_t* keys_nb, uint8_t* valid_keys_nb) {
 }
 
 bool furi_hal_crypto_enclave_store_key(FuriHalCryptoKey* key, uint8_t* slot) {
-    furi_assert(key);
-    furi_assert(slot);
+    furi_check(key);
+    furi_check(slot);
 
     furi_check(furi_mutex_acquire(furi_hal_crypto_mutex, FuriWaitForever) == FuriStatusOk);
 
@@ -256,8 +256,8 @@ static bool crypto_process_block(uint32_t* in, uint32_t* out, uint8_t blk_len) {
 }
 
 bool furi_hal_crypto_enclave_load_key(uint8_t slot, const uint8_t* iv) {
-    furi_assert(slot > 0 && slot <= 100);
-    furi_assert(furi_hal_crypto_mutex);
+    furi_check(slot > 0 && slot <= 100);
+    furi_check(furi_hal_crypto_mutex);
     furi_check(furi_mutex_acquire(furi_hal_crypto_mutex, FuriWaitForever) == FuriStatusOk);
 
     furi_hal_bus_enable(FuriHalBusAES1);
@@ -286,16 +286,16 @@ bool furi_hal_crypto_enclave_unload_key(uint8_t slot) {
     CLEAR_BIT(AES1->CR, AES_CR_EN);
 
     SHCI_CmdStatus_t shci_state = SHCI_C2_FUS_UnloadUsrKey(slot);
-    furi_assert(shci_state == SHCI_Success);
 
     furi_hal_bus_disable(FuriHalBusAES1);
 
     furi_check(furi_mutex_release(furi_hal_crypto_mutex) == FuriStatusOk);
+
     return (shci_state == SHCI_Success);
 }
 
 bool furi_hal_crypto_load_key(const uint8_t* key, const uint8_t* iv) {
-    furi_assert(furi_hal_crypto_mutex);
+    furi_check(furi_hal_crypto_mutex);
     furi_check(furi_mutex_acquire(furi_hal_crypto_mutex, FuriWaitForever) == FuriStatusOk);
 
     furi_hal_bus_enable(FuriHalBusAES1);
@@ -400,7 +400,7 @@ static void crypto_key_init_bswap(uint32_t* key, uint32_t* iv, uint32_t chaining
 
 static bool
     furi_hal_crypto_load_key_bswap(const uint8_t* key, const uint8_t* iv, uint32_t chaining_mode) {
-    furi_assert(furi_hal_crypto_mutex);
+    furi_check(furi_hal_crypto_mutex);
     furi_check(furi_mutex_acquire(furi_hal_crypto_mutex, FuriWaitForever) == FuriStatusOk);
 
     furi_hal_bus_enable(FuriHalBusAES1);
diff --git a/targets/f7/furi_hal/furi_hal_debug.c b/targets/f7/furi_hal/furi_hal_debug.c
index 3dc03ea69..7d1488fa5 100644
--- a/targets/f7/furi_hal/furi_hal_debug.c
+++ b/targets/f7/furi_hal/furi_hal_debug.c
@@ -8,7 +8,7 @@
 
 volatile bool furi_hal_debug_gdb_session_active = false;
 
-void furi_hal_debug_enable() {
+void furi_hal_debug_enable(void) {
     // Low power mode debug
     LL_DBGMCU_EnableDBGSleepMode();
     LL_DBGMCU_EnableDBGStopMode();
@@ -25,7 +25,7 @@ void furi_hal_debug_enable() {
         &gpio_swclk, GpioModeAltFunctionPushPull, GpioPullDown, GpioSpeedLow, GpioAltFn0JTCK_SWCLK);
 }
 
-void furi_hal_debug_disable() {
+void furi_hal_debug_disable(void) {
     // Low power mode debug
     LL_DBGMCU_DisableDBGSleepMode();
     LL_DBGMCU_DisableDBGStopMode();
@@ -36,6 +36,6 @@ void furi_hal_debug_disable() {
     furi_hal_gpio_init_simple(&gpio_swclk, GpioModeAnalog);
 }
 
-bool furi_hal_debug_is_gdb_session_active() {
+bool furi_hal_debug_is_gdb_session_active(void) {
     return furi_hal_debug_gdb_session_active;
 }
\ No newline at end of file
diff --git a/targets/f7/furi_hal/furi_hal_dma.c b/targets/f7/furi_hal/furi_hal_dma.c
index a6a30d906..e9bef9605 100644
--- a/targets/f7/furi_hal/furi_hal_dma.c
+++ b/targets/f7/furi_hal/furi_hal_dma.c
@@ -1,13 +1,13 @@
 #include <furi_hal_dma.h>
 #include <furi_hal_bus.h>
 
-void furi_hal_dma_init_early() {
+void furi_hal_dma_init_early(void) {
     furi_hal_bus_enable(FuriHalBusDMA1);
     furi_hal_bus_enable(FuriHalBusDMA2);
     furi_hal_bus_enable(FuriHalBusDMAMUX1);
 }
 
-void furi_hal_dma_deinit_early() {
+void furi_hal_dma_deinit_early(void) {
     furi_hal_bus_disable(FuriHalBusDMA1);
     furi_hal_bus_disable(FuriHalBusDMA2);
     furi_hal_bus_disable(FuriHalBusDMAMUX1);
diff --git a/targets/f7/furi_hal/furi_hal_dma.h b/targets/f7/furi_hal/furi_hal_dma.h
index cadcc7733..281a8ff1b 100644
--- a/targets/f7/furi_hal/furi_hal_dma.h
+++ b/targets/f7/furi_hal/furi_hal_dma.h
@@ -5,10 +5,10 @@ extern "C" {
 #endif
 
 /** Early initialization */
-void furi_hal_dma_init_early();
+void furi_hal_dma_init_early(void);
 
 /** Early de-initialization */
-void furi_hal_dma_deinit_early();
+void furi_hal_dma_deinit_early(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/f7/furi_hal/furi_hal_flash.c b/targets/f7/furi_hal/furi_hal_flash.c
index 37eec744c..63932ac61 100644
--- a/targets/f7/furi_hal/furi_hal_flash.c
+++ b/targets/f7/furi_hal/furi_hal_flash.c
@@ -41,7 +41,11 @@
   > If for any reason this test is never passed, this means there is a failure in the system and there is no other
   > way to recover than applying a device reset. 
  */
-#define FURI_HAL_FLASH_C2_LOCK_TIMEOUT_MS (3000U) /* 3 seconds */
+// Was previously 3000U, 3 seconds
+// Changing furi_assert() to furi_check() brought timeout crashes
+// Internal storage is very slow, and "big" files will often cause a "timeout" with 3 seconds
+// 10 seconds seems fine, the file operations complete successfully, albeit slowly
+#define FURI_HAL_FLASH_C2_LOCK_TIMEOUT_MS (10000U) /* 10 seconds */
 
 #define IS_ADDR_ALIGNED_64BITS(__VALUE__) (((__VALUE__) & 0x7U) == (0x00UL))
 #define IS_FLASH_PROGRAM_ADDRESS(__VALUE__)                                             \
@@ -51,37 +55,37 @@
 /* Free flash space borders, exported by linker */
 extern const void __free_flash_start__;
 
-size_t furi_hal_flash_get_base() {
+size_t furi_hal_flash_get_base(void) {
     return FLASH_BASE;
 }
 
-size_t furi_hal_flash_get_read_block_size() {
+size_t furi_hal_flash_get_read_block_size(void) {
     return FURI_HAL_FLASH_READ_BLOCK;
 }
 
-size_t furi_hal_flash_get_write_block_size() {
+size_t furi_hal_flash_get_write_block_size(void) {
     return FURI_HAL_FLASH_WRITE_BLOCK;
 }
 
-size_t furi_hal_flash_get_page_size() {
+size_t furi_hal_flash_get_page_size(void) {
     return FURI_HAL_FLASH_PAGE_SIZE;
 }
 
-size_t furi_hal_flash_get_cycles_count() {
+size_t furi_hal_flash_get_cycles_count(void) {
     return FURI_HAL_FLASH_CYCLES_COUNT;
 }
 
-const void* furi_hal_flash_get_free_start_address() {
+const void* furi_hal_flash_get_free_start_address(void) {
     return &__free_flash_start__;
 }
 
-const void* furi_hal_flash_get_free_end_address() {
+const void* furi_hal_flash_get_free_end_address(void) {
     uint32_t sfr_reg_val = READ_REG(FLASH->SFR);
     uint32_t sfsa = (READ_BIT(sfr_reg_val, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos);
     return (const void*)((sfsa * FURI_HAL_FLASH_PAGE_SIZE) + FLASH_BASE);
 }
 
-size_t furi_hal_flash_get_free_page_start_address() {
+size_t furi_hal_flash_get_free_page_start_address(void) {
     size_t start = (size_t)furi_hal_flash_get_free_start_address();
     size_t page_start = start - start % FURI_HAL_FLASH_PAGE_SIZE;
     if(page_start != start) {
@@ -90,13 +94,13 @@ size_t furi_hal_flash_get_free_page_start_address() {
     return page_start;
 }
 
-size_t furi_hal_flash_get_free_page_count() {
+size_t furi_hal_flash_get_free_page_count(void) {
     size_t end = (size_t)furi_hal_flash_get_free_end_address();
     size_t page_start = (size_t)furi_hal_flash_get_free_page_start_address();
     return (end - page_start) / FURI_HAL_FLASH_PAGE_SIZE;
 }
 
-void furi_hal_flash_init() {
+void furi_hal_flash_init(void) {
     /* Errata 2.2.9, Flash OPTVERR flag is always set after system reset */
     // WRITE_REG(FLASH->SR, FLASH_SR_OPTVERR);
     /* Actually, reset all error flags on start */
@@ -106,7 +110,7 @@ void furi_hal_flash_init() {
     }
 }
 
-static void furi_hal_flash_unlock() {
+static void furi_hal_flash_unlock(void) {
     /* verify Flash is locked */
     furi_check(READ_BIT(FLASH->CR, FLASH_CR_LOCK) != 0U);
 
@@ -450,7 +454,7 @@ uint32_t furi_hal_flash_ob_get_word(size_t word_idx, bool complementary) {
     return ob_data[raw_word_idx];
 }
 
-void furi_hal_flash_ob_unlock() {
+void furi_hal_flash_ob_unlock(void) {
     furi_check(READ_BIT(FLASH->CR, FLASH_CR_OPTLOCK) != 0U);
     furi_hal_flash_begin(true);
     WRITE_REG(FLASH->OPTKEYR, FURI_HAL_FLASH_OPT_KEY1);
@@ -460,7 +464,7 @@ void furi_hal_flash_ob_unlock() {
     furi_check(READ_BIT(FLASH->CR, FLASH_CR_OPTLOCK) == 0U);
 }
 
-void furi_hal_flash_ob_lock() {
+void furi_hal_flash_ob_lock(void) {
     furi_check(READ_BIT(FLASH->CR, FLASH_CR_OPTLOCK) == 0U);
     SET_BIT(FLASH->CR, FLASH_CR_OPTLOCK);
     furi_hal_flash_end(true);
@@ -511,7 +515,7 @@ static const FuriHalFlashObMapping furi_hal_flash_ob_reg_map[FURI_HAL_FLASH_OB_T
 };
 #undef OB_REG_DEF
 
-void furi_hal_flash_ob_apply() {
+void furi_hal_flash_ob_apply(void) {
     furi_hal_flash_ob_unlock();
     /* OBL_LAUNCH: When set to 1, this bit forces the option byte reloading. 
      * It cannot be written if OPTLOCK is set */
@@ -558,6 +562,6 @@ bool furi_hal_flash_ob_set_word(size_t word_idx, const uint32_t value) {
     return true;
 }
 
-const FuriHalFlashRawOptionByteData* furi_hal_flash_ob_get_raw_ptr() {
+const FuriHalFlashRawOptionByteData* furi_hal_flash_ob_get_raw_ptr(void) {
     return (const FuriHalFlashRawOptionByteData*)OPTION_BYTE_BASE;
 }
diff --git a/targets/f7/furi_hal/furi_hal_flash.h b/targets/f7/furi_hal/furi_hal_flash.h
index 9fa8f94af..6a5d42222 100644
--- a/targets/f7/furi_hal/furi_hal_flash.h
+++ b/targets/f7/furi_hal/furi_hal_flash.h
@@ -29,61 +29,61 @@ _Static_assert(
 
 /** Init flash, applying necessary workarounds
  */
-void furi_hal_flash_init();
+void furi_hal_flash_init(void);
 
 /** Get flash base address
  *
  * @return     pointer to flash base
  */
-size_t furi_hal_flash_get_base();
+size_t furi_hal_flash_get_base(void);
 
 /** Get flash read block size
  *
  * @return     size in bytes
  */
-size_t furi_hal_flash_get_read_block_size();
+size_t furi_hal_flash_get_read_block_size(void);
 
 /** Get flash write block size
  *
  * @return     size in bytes
  */
-size_t furi_hal_flash_get_write_block_size();
+size_t furi_hal_flash_get_write_block_size(void);
 
 /** Get flash page size
  *
  * @return     size in bytes
  */
-size_t furi_hal_flash_get_page_size();
+size_t furi_hal_flash_get_page_size(void);
 
 /** Get expected flash cycles count
  *
  * @return     count of erase-write operations
  */
-size_t furi_hal_flash_get_cycles_count();
+size_t furi_hal_flash_get_cycles_count(void);
 
 /** Get free flash start address
  *
  * @return     pointer to free region start
  */
-const void* furi_hal_flash_get_free_start_address();
+const void* furi_hal_flash_get_free_start_address(void);
 
 /** Get free flash end address
  *
  * @return     pointer to free region end
  */
-const void* furi_hal_flash_get_free_end_address();
+const void* furi_hal_flash_get_free_end_address(void);
 
 /** Get first free page start address
  *
  * @return     first free page memory address
  */
-size_t furi_hal_flash_get_free_page_start_address();
+size_t furi_hal_flash_get_free_page_start_address(void);
 
 /** Get free page count
  *
  * @return     free page count
  */
-size_t furi_hal_flash_get_free_page_count();
+size_t furi_hal_flash_get_free_page_count(void);
 
 /** Erase Flash
  *
@@ -133,13 +133,13 @@ bool furi_hal_flash_ob_set_word(size_t word_idx, const uint32_t value);
  * @warning Initializes system restart
  *
  */
-void furi_hal_flash_ob_apply();
+void furi_hal_flash_ob_apply(void);
 
 /** Get raw OB storage data
  *
  * @return     pointer to read-only data of OB (raw + complementary values)
  */
-const FuriHalFlashRawOptionByteData* furi_hal_flash_ob_get_raw_ptr();
+const FuriHalFlashRawOptionByteData* furi_hal_flash_ob_get_raw_ptr(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/f7/furi_hal/furi_hal_gpio.c b/targets/f7/furi_hal/furi_hal_gpio.c
index 64ba5913d..8e6192ca0 100644
--- a/targets/f7/furi_hal/furi_hal_gpio.c
+++ b/targets/f7/furi_hal/furi_hal_gpio.c
@@ -5,7 +5,7 @@
 #include <stm32wbxx_ll_comp.h>
 #include <stm32wbxx_ll_pwr.h>
 
-static uint32_t furi_hal_gpio_invalid_argument_crash() {
+static uint32_t furi_hal_gpio_invalid_argument_crash(void) {
     furi_crash("Invalid argument");
     return 0;
 }
@@ -194,8 +194,8 @@ void furi_hal_gpio_init_ex(
 }
 
 void furi_hal_gpio_add_int_callback(const GpioPin* gpio, GpioExtiCallback cb, void* ctx) {
-    furi_assert(gpio);
-    furi_assert(cb);
+    furi_check(gpio);
+    furi_check(cb);
 
     FURI_CRITICAL_ENTER();
 
@@ -211,7 +211,7 @@ void furi_hal_gpio_add_int_callback(const GpioPin* gpio, GpioExtiCallback cb, vo
 }
 
 void furi_hal_gpio_enable_int_callback(const GpioPin* gpio) {
-    furi_assert(gpio);
+    furi_check(gpio);
 
     FURI_CRITICAL_ENTER();
 
@@ -222,7 +222,7 @@ void furi_hal_gpio_enable_int_callback(const GpioPin* gpio) {
 }
 
 void furi_hal_gpio_disable_int_callback(const GpioPin* gpio) {
-    furi_assert(gpio);
+    furi_check(gpio);
 
     FURI_CRITICAL_ENTER();
 
@@ -234,7 +234,7 @@ void furi_hal_gpio_disable_int_callback(const GpioPin* gpio) {
 }
 
 void furi_hal_gpio_remove_int_callback(const GpioPin* gpio) {
-    furi_assert(gpio);
+    furi_check(gpio);
 
     FURI_CRITICAL_ENTER();
 
diff --git a/targets/f7/furi_hal/furi_hal_i2c.c b/targets/f7/furi_hal/furi_hal_i2c.c
index 8c7b054e3..71e1a5814 100644
--- a/targets/f7/furi_hal/furi_hal_i2c.c
+++ b/targets/f7/furi_hal/furi_hal_i2c.c
@@ -9,15 +9,15 @@
 
 #define TAG "FuriHalI2c"
 
-void furi_hal_i2c_init_early() {
+void furi_hal_i2c_init_early(void) {
     furi_hal_i2c_bus_power.callback(&furi_hal_i2c_bus_power, FuriHalI2cBusEventInit);
 }
 
-void furi_hal_i2c_deinit_early() {
+void furi_hal_i2c_deinit_early(void) {
     furi_hal_i2c_bus_power.callback(&furi_hal_i2c_bus_power, FuriHalI2cBusEventDeinit);
 }
 
-void furi_hal_i2c_init() {
+void furi_hal_i2c_init(void) {
     furi_hal_i2c_bus_external.callback(&furi_hal_i2c_bus_external, FuriHalI2cBusEventInit);
     FURI_LOG_I(TAG, "Init OK");
 }
@@ -235,7 +235,7 @@ bool furi_hal_i2c_tx(
     const uint8_t* data,
     size_t size,
     uint32_t timeout) {
-    furi_assert(timeout > 0);
+    furi_check(timeout > 0);
 
     return furi_hal_i2c_tx_ext(
         handle, address, false, data, size, FuriHalI2cBeginStart, FuriHalI2cEndStop, timeout);
@@ -247,7 +247,7 @@ bool furi_hal_i2c_rx(
     uint8_t* data,
     size_t size,
     uint32_t timeout) {
-    furi_assert(timeout > 0);
+    furi_check(timeout > 0);
 
     return furi_hal_i2c_rx_ext(
         handle, address, false, data, size, FuriHalI2cBeginStart, FuriHalI2cEndStop, timeout);
@@ -284,7 +284,7 @@ bool furi_hal_i2c_trx(
 bool furi_hal_i2c_is_device_ready(FuriHalI2cBusHandle* handle, uint8_t i2c_addr, uint32_t timeout) {
     furi_check(handle);
     furi_check(handle->bus->current_handle == handle);
-    furi_assert(timeout > 0);
+    furi_check(timeout > 0);
 
     bool ret = true;
     FuriHalCortexTimer timer = furi_hal_cortex_timer_get(timeout * 1000);
@@ -393,7 +393,7 @@ bool furi_hal_i2c_write_mem(
     uint32_t timeout) {
     furi_check(handle);
     furi_check(handle->bus->current_handle == handle);
-    furi_assert(timeout > 0);
+    furi_check(timeout > 0);
 
     return furi_hal_i2c_tx_ext(
                handle,
diff --git a/targets/f7/furi_hal/furi_hal_ibutton.c b/targets/f7/furi_hal/furi_hal_ibutton.c
index bf1127a85..07cf8de6e 100644
--- a/targets/f7/furi_hal/furi_hal_ibutton.c
+++ b/targets/f7/furi_hal/furi_hal_ibutton.c
@@ -33,7 +33,7 @@ static void furi_hal_ibutton_emulate_isr(void* context) {
     }
 }
 
-void furi_hal_ibutton_init() {
+void furi_hal_ibutton_init(void) {
     furi_hal_ibutton = malloc(sizeof(FuriHalIbutton));
     furi_hal_ibutton->state = FuriHalIbuttonStateIdle;
 
@@ -44,8 +44,8 @@ void furi_hal_ibutton_emulate_start(
     uint32_t period,
     FuriHalIbuttonEmulateCallback callback,
     void* context) {
-    furi_assert(furi_hal_ibutton);
-    furi_assert(furi_hal_ibutton->state == FuriHalIbuttonStateIdle);
+    furi_check(furi_hal_ibutton);
+    furi_check(furi_hal_ibutton->state == FuriHalIbuttonStateIdle);
 
     furi_hal_ibutton->state = FuriHalIbuttonStateRunning;
     furi_hal_ibutton->callback = callback;
@@ -74,8 +74,8 @@ void furi_hal_ibutton_emulate_set_next(uint32_t period) {
     LL_TIM_SetAutoReload(FURI_HAL_IBUTTON_TIMER, period);
 }
 
-void furi_hal_ibutton_emulate_stop() {
-    furi_assert(furi_hal_ibutton);
+void furi_hal_ibutton_emulate_stop(void) {
+    furi_check(furi_hal_ibutton);
 
     if(furi_hal_ibutton->state == FuriHalIbuttonStateRunning) {
         furi_hal_ibutton->state = FuriHalIbuttonStateIdle;
@@ -89,12 +89,12 @@ void furi_hal_ibutton_emulate_stop() {
     }
 }
 
-void furi_hal_ibutton_pin_configure() {
+void furi_hal_ibutton_pin_configure(void) {
     furi_hal_gpio_write(&gpio_ibutton, true);
     furi_hal_gpio_init(&gpio_ibutton, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow);
 }
 
-void furi_hal_ibutton_pin_reset() {
+void furi_hal_ibutton_pin_reset(void) {
     furi_hal_gpio_write(&gpio_ibutton, true);
     furi_hal_gpio_init(&gpio_ibutton, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 }
diff --git a/targets/f7/furi_hal/furi_hal_ibutton.h b/targets/f7/furi_hal/furi_hal_ibutton.h
index b723fe176..ae676f8b5 100644
--- a/targets/f7/furi_hal/furi_hal_ibutton.h
+++ b/targets/f7/furi_hal/furi_hal_ibutton.h
@@ -15,7 +15,7 @@ extern "C" {
 typedef void (*FuriHalIbuttonEmulateCallback)(void* context);
 
 /** Initialize */
-void furi_hal_ibutton_init();
+void furi_hal_ibutton_init(void);
 
 /**
  * Start emulation timer
@@ -37,17 +37,17 @@ void furi_hal_ibutton_emulate_set_next(uint32_t period);
 /**
  * Stop emulation timer
  */
-void furi_hal_ibutton_emulate_stop();
+void furi_hal_ibutton_emulate_stop(void);
 
 /**
  * Set the pin to normal mode (open collector), and sets it to float
  */
-void furi_hal_ibutton_pin_configure();
+void furi_hal_ibutton_pin_configure(void);
 
 /**
  * Sets the pin to analog mode, and sets it to float
  */
-void furi_hal_ibutton_pin_reset();
+void furi_hal_ibutton_pin_reset(void);
 
 /**
  * iButton write pin
diff --git a/targets/f7/furi_hal/furi_hal_infrared.c b/targets/f7/furi_hal/furi_hal_infrared.c
index 3cacc083d..a0b166fad 100644
--- a/targets/f7/furi_hal/furi_hal_infrared.c
+++ b/targets/f7/furi_hal/furi_hal_infrared.c
@@ -1,6 +1,7 @@
 #include <furi_hal_infrared.h>
 #include <furi_hal_interrupt.h>
 #include <furi_hal_resources.h>
+#include <furi_hal_cortex.h>
 #include <furi_hal_bus.h>
 
 #include <stm32wbxx_ll_tim.h>
@@ -75,10 +76,15 @@ typedef enum {
     InfraredStateMAX,
 } InfraredState;
 
+static FuriHalInfraredTxPin infrared_tx_output = FuriHalInfraredTxPinInternal;
 static volatile InfraredState furi_hal_infrared_state = InfraredStateIdle;
 static InfraredTimTx infrared_tim_tx;
 static InfraredTimRx infrared_tim_rx;
-static bool infrared_external_output;
+
+static const GpioPin* infrared_tx_pins[FuriHalInfraredTxPinMax] = {
+    [FuriHalInfraredTxPinInternal] = &gpio_infrared_tx,
+    [FuriHalInfraredTxPinExtPA7] = &gpio_ext_pa7,
+};
 
 static void furi_hal_infrared_tx_fill_buffer(uint8_t buf_num, uint8_t polarity_shift);
 static void furi_hal_infrared_async_tx_free_resources(void);
@@ -86,16 +92,8 @@ static void furi_hal_infrared_tx_dma_set_polarity(uint8_t buf_num, uint8_t polar
 static void furi_hal_infrared_tx_dma_set_buffer(uint8_t buf_num);
 static void furi_hal_infrared_tx_fill_buffer_last(uint8_t buf_num);
 static uint8_t furi_hal_infrared_get_current_dma_tx_buffer(void);
-static void furi_hal_infrared_tx_dma_polarity_isr();
-static void furi_hal_infrared_tx_dma_isr();
-
-void furi_hal_infrared_set_debug_out(bool enable) {
-    infrared_external_output = enable;
-}
-
-bool furi_hal_infrared_get_debug_out_status(void) {
-    return infrared_external_output;
-}
+static void furi_hal_infrared_tx_dma_polarity_isr(void*);
+static void furi_hal_infrared_tx_dma_isr(void*);
 
 static void furi_hal_infrared_tim_rx_isr(void* context) {
     UNUSED(context);
@@ -105,7 +103,7 @@ static void furi_hal_infrared_tim_rx_isr(void* context) {
     /* Timeout */
     if(LL_TIM_IsActiveFlag_CC3(INFRARED_RX_TIMER)) {
         LL_TIM_ClearFlag_CC3(INFRARED_RX_TIMER);
-        furi_assert(furi_hal_infrared_state == InfraredStateAsyncRx);
+        furi_check(furi_hal_infrared_state == InfraredStateAsyncRx);
 
         /* Timers CNT register starts to counting from 0 to ARR, but it is
          * reseted when Channel 1 catches interrupt. It is not reseted by
@@ -122,7 +120,7 @@ static void furi_hal_infrared_tim_rx_isr(void* context) {
     /* Rising Edge */
     if(LL_TIM_IsActiveFlag_CC1(INFRARED_RX_TIMER)) {
         LL_TIM_ClearFlag_CC1(INFRARED_RX_TIMER);
-        furi_assert(furi_hal_infrared_state == InfraredStateAsyncRx);
+        furi_check(furi_hal_infrared_state == InfraredStateAsyncRx);
 
         if(READ_BIT(INFRARED_RX_TIMER->CCMR1, TIM_CCMR1_CC1S)) {
             /* Low pin level is a Mark state of INFRARED signal. Invert level for further processing. */
@@ -137,7 +135,7 @@ static void furi_hal_infrared_tim_rx_isr(void* context) {
     /* Falling Edge */
     if(LL_TIM_IsActiveFlag_CC2(INFRARED_RX_TIMER)) {
         LL_TIM_ClearFlag_CC2(INFRARED_RX_TIMER);
-        furi_assert(furi_hal_infrared_state == InfraredStateAsyncRx);
+        furi_check(furi_hal_infrared_state == InfraredStateAsyncRx);
 
         if(READ_BIT(INFRARED_RX_TIMER->CCMR1, TIM_CCMR1_CC2S)) {
             /* High pin level is a Space state of INFRARED signal. Invert level for further processing. */
@@ -152,7 +150,7 @@ static void furi_hal_infrared_tim_rx_isr(void* context) {
 }
 
 void furi_hal_infrared_async_rx_start(void) {
-    furi_assert(furi_hal_infrared_state == InfraredStateIdle);
+    furi_check(furi_hal_infrared_state == InfraredStateIdle);
 
     furi_hal_gpio_init_ex(
         &gpio_infrared_rx,
@@ -201,7 +199,7 @@ void furi_hal_infrared_async_rx_start(void) {
 }
 
 void furi_hal_infrared_async_rx_stop(void) {
-    furi_assert(furi_hal_infrared_state == InfraredStateAsyncRx);
+    furi_check(furi_hal_infrared_state == InfraredStateAsyncRx);
 
     FURI_CRITICAL_ENTER();
     furi_hal_bus_disable(INFRARED_RX_TIMER_BUS);
@@ -240,7 +238,7 @@ static void furi_hal_infrared_tx_dma_terminate(void) {
     LL_DMA_DisableIT_HT(INFRARED_DMA_CH2_DEF);
     LL_DMA_DisableIT_TC(INFRARED_DMA_CH2_DEF);
 
-    furi_assert(furi_hal_infrared_state == InfraredStateAsyncTxStopInProgress);
+    furi_check(furi_hal_infrared_state == InfraredStateAsyncTxStopInProgress);
 
     LL_DMA_DisableIT_TC(INFRARED_DMA_CH1_DEF);
     LL_DMA_DisableChannel(INFRARED_DMA_CH2_DEF);
@@ -355,21 +353,11 @@ static void furi_hal_infrared_configure_tim_pwm_tx(uint32_t freq, float duty_cyc
     LL_TIM_SetAutoReload(
         INFRARED_DMA_TIMER,
         __LL_TIM_CALC_ARR(SystemCoreClock, LL_TIM_GetPrescaler(INFRARED_DMA_TIMER), freq));
-    if(infrared_external_output) {
-        LL_TIM_OC_SetCompareCH1(
-            INFRARED_DMA_TIMER,
-            ((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1 - duty_cycle)));
-        LL_TIM_OC_EnablePreload(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1);
-        /* LL_TIM_OCMODE_PWM2 set by DMA */
-        LL_TIM_OC_SetMode(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1, LL_TIM_OCMODE_FORCED_INACTIVE);
-        LL_TIM_OC_SetPolarity(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1N, LL_TIM_OCPOLARITY_HIGH);
-        LL_TIM_OC_DisableFast(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1);
-        LL_TIM_CC_EnableChannel(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1N);
-        LL_TIM_DisableIT_CC1(INFRARED_DMA_TIMER);
-    } else {
+
+    if(infrared_tx_output == FuriHalInfraredTxPinInternal) {
         LL_TIM_OC_SetCompareCH3(
             INFRARED_DMA_TIMER,
-            ((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1 - duty_cycle)));
+            ((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1.0f - duty_cycle)));
         LL_TIM_OC_EnablePreload(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3);
         /* LL_TIM_OCMODE_PWM2 set by DMA */
         LL_TIM_OC_SetMode(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3, LL_TIM_OCMODE_FORCED_INACTIVE);
@@ -377,7 +365,19 @@ static void furi_hal_infrared_configure_tim_pwm_tx(uint32_t freq, float duty_cyc
         LL_TIM_OC_DisableFast(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3);
         LL_TIM_CC_EnableChannel(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3N);
         LL_TIM_DisableIT_CC3(INFRARED_DMA_TIMER);
+    } else if(infrared_tx_output == FuriHalInfraredTxPinExtPA7) {
+        LL_TIM_OC_SetCompareCH1(
+            INFRARED_DMA_TIMER,
+            ((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1.0f - duty_cycle)));
+        LL_TIM_OC_EnablePreload(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1);
+        /* LL_TIM_OCMODE_PWM2 set by DMA */
+        LL_TIM_OC_SetMode(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1, LL_TIM_OCMODE_FORCED_INACTIVE);
+        LL_TIM_OC_SetPolarity(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1N, LL_TIM_OCPOLARITY_HIGH);
+        LL_TIM_OC_DisableFast(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1);
+        LL_TIM_CC_EnableChannel(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1N);
+        LL_TIM_DisableIT_CC1(INFRARED_DMA_TIMER);
     }
+
     LL_TIM_DisableMasterSlaveMode(INFRARED_DMA_TIMER);
     LL_TIM_EnableAllOutputs(INFRARED_DMA_TIMER);
     LL_TIM_DisableIT_UPDATE(INFRARED_DMA_TIMER);
@@ -386,11 +386,13 @@ static void furi_hal_infrared_configure_tim_pwm_tx(uint32_t freq, float duty_cyc
 
 static void furi_hal_infrared_configure_tim_cmgr2_dma_tx(void) {
     LL_DMA_InitTypeDef dma_config = {0};
-    if(infrared_external_output) {
-        dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR1);
-    } else {
-        dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR2);
+
+    if(infrared_tx_output == FuriHalInfraredTxPinInternal) {
+        dma_config.PeriphOrM2MSrcAddress = (uint32_t)(&(INFRARED_DMA_TIMER->CCMR2));
+    } else if(infrared_tx_output == FuriHalInfraredTxPinExtPA7) {
+        dma_config.PeriphOrM2MSrcAddress = (uint32_t)(&(INFRARED_DMA_TIMER->CCMR1));
     }
+
     dma_config.MemoryOrM2MDstAddress = (uint32_t)NULL;
     dma_config.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH;
     dma_config.Mode = LL_DMA_MODE_NORMAL;
@@ -452,14 +454,14 @@ static void furi_hal_infrared_configure_tim_rcr_dma_tx(void) {
 }
 
 static void furi_hal_infrared_tx_fill_buffer_last(uint8_t buf_num) {
-    furi_assert(buf_num < 2);
-    furi_assert(furi_hal_infrared_state != InfraredStateAsyncRx);
-    furi_assert(furi_hal_infrared_state < InfraredStateMAX);
-    furi_assert(infrared_tim_tx.data_callback);
+    furi_check(buf_num < 2);
+    furi_check(furi_hal_infrared_state != InfraredStateAsyncRx);
+    furi_check(furi_hal_infrared_state < InfraredStateMAX);
+    furi_check(infrared_tim_tx.data_callback);
     InfraredTxBuf* buffer = &infrared_tim_tx.buffer[buf_num];
-    furi_assert(buffer->data != NULL);
+    furi_check(buffer->data != NULL);
     (void)buffer->data;
-    furi_assert(buffer->polarity != NULL);
+    furi_check(buffer->polarity != NULL);
     (void)buffer->polarity;
 
     infrared_tim_tx.buffer[buf_num].data[0] = 0; // 1 pulse
@@ -472,13 +474,13 @@ static void furi_hal_infrared_tx_fill_buffer_last(uint8_t buf_num) {
 }
 
 static void furi_hal_infrared_tx_fill_buffer(uint8_t buf_num, uint8_t polarity_shift) {
-    furi_assert(buf_num < 2);
-    furi_assert(furi_hal_infrared_state != InfraredStateAsyncRx);
-    furi_assert(furi_hal_infrared_state < InfraredStateMAX);
-    furi_assert(infrared_tim_tx.data_callback);
+    furi_check(buf_num < 2);
+    furi_check(furi_hal_infrared_state != InfraredStateAsyncRx);
+    furi_check(furi_hal_infrared_state < InfraredStateMAX);
+    furi_check(infrared_tim_tx.data_callback);
     InfraredTxBuf* buffer = &infrared_tim_tx.buffer[buf_num];
-    furi_assert(buffer->data != NULL);
-    furi_assert(buffer->polarity != NULL);
+    furi_check(buffer->data != NULL);
+    furi_check(buffer->polarity != NULL);
 
     FuriHalInfraredTxGetDataState status = FuriHalInfraredTxGetDataStateOk;
     uint32_t duration = 0;
@@ -544,10 +546,10 @@ static void furi_hal_infrared_tx_fill_buffer(uint8_t buf_num, uint8_t polarity_s
 }
 
 static void furi_hal_infrared_tx_dma_set_polarity(uint8_t buf_num, uint8_t polarity_shift) {
-    furi_assert(buf_num < 2);
-    furi_assert(furi_hal_infrared_state < InfraredStateMAX);
+    furi_check(buf_num < 2);
+    furi_check(furi_hal_infrared_state < InfraredStateMAX);
     InfraredTxBuf* buffer = &infrared_tim_tx.buffer[buf_num];
-    furi_assert(buffer->polarity != NULL);
+    furi_check(buffer->polarity != NULL);
 
     FURI_CRITICAL_ENTER();
     bool channel_enabled = LL_DMA_IsEnabledChannel(INFRARED_DMA_CH1_DEF);
@@ -563,10 +565,10 @@ static void furi_hal_infrared_tx_dma_set_polarity(uint8_t buf_num, uint8_t polar
 }
 
 static void furi_hal_infrared_tx_dma_set_buffer(uint8_t buf_num) {
-    furi_assert(buf_num < 2);
-    furi_assert(furi_hal_infrared_state < InfraredStateMAX);
+    furi_check(buf_num < 2);
+    furi_check(furi_hal_infrared_state < InfraredStateMAX);
     InfraredTxBuf* buffer = &infrared_tim_tx.buffer[buf_num];
-    furi_assert(buffer->data != NULL);
+    furi_check(buffer->data != NULL);
 
     /* non-circular mode requires disabled channel before setup */
     FURI_CRITICAL_ENTER();
@@ -583,15 +585,12 @@ static void furi_hal_infrared_tx_dma_set_buffer(uint8_t buf_num) {
 }
 
 static void furi_hal_infrared_async_tx_free_resources(void) {
-    furi_assert(
+    furi_check(
         (furi_hal_infrared_state == InfraredStateIdle) ||
         (furi_hal_infrared_state == InfraredStateAsyncTxStopped));
 
-    if(infrared_external_output) {
-        furi_hal_gpio_init(&gpio_ext_pa7, GpioModeAnalog, GpioPullDown, GpioSpeedLow);
-    } else {
-        furi_hal_gpio_init(&gpio_infrared_tx, GpioModeAnalog, GpioPullDown, GpioSpeedLow);
-    }
+    furi_hal_gpio_init(
+        infrared_tx_pins[infrared_tx_output], GpioModeAnalog, GpioPullDown, GpioSpeedLow);
     furi_hal_interrupt_set_isr(INFRARED_DMA_CH1_IRQ, NULL, NULL);
     furi_hal_interrupt_set_isr(INFRARED_DMA_CH2_IRQ, NULL, NULL);
 
@@ -610,16 +609,16 @@ 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) ||
+    if((duty_cycle > 1.0f) || (duty_cycle <= 0.0f) || (freq > INFRARED_MAX_FREQUENCY) ||
        (freq < INFRARED_MIN_FREQUENCY) || (infrared_tim_tx.data_callback == NULL)) {
         furi_crash();
     }
 
-    furi_assert(furi_hal_infrared_state == InfraredStateIdle);
-    furi_assert(infrared_tim_tx.buffer[0].data == NULL);
-    furi_assert(infrared_tim_tx.buffer[1].data == NULL);
-    furi_assert(infrared_tim_tx.buffer[0].polarity == NULL);
-    furi_assert(infrared_tim_tx.buffer[1].polarity == NULL);
+    furi_check(furi_hal_infrared_state == InfraredStateIdle);
+    furi_check(infrared_tim_tx.buffer[0].data == NULL);
+    furi_check(infrared_tim_tx.buffer[1].data == NULL);
+    furi_check(infrared_tim_tx.buffer[0].polarity == NULL);
+    furi_check(infrared_tim_tx.buffer[1].polarity == NULL);
 
     size_t alloc_size_data = INFRARED_TIM_TX_DMA_BUFFER_SIZE * sizeof(uint16_t);
     infrared_tim_tx.buffer[0].data = malloc(alloc_size_data);
@@ -652,22 +651,11 @@ void furi_hal_infrared_async_tx_start(uint32_t freq, float duty_cycle) {
     furi_delay_us(5);
     LL_TIM_GenerateEvent_UPDATE(INFRARED_DMA_TIMER); /* DMA -> TIMx_RCR */
     furi_delay_us(5);
-    if(infrared_external_output) {
-        LL_GPIO_ResetOutputPin(
-            gpio_ext_pa7.port, gpio_ext_pa7.pin); /* when disable it prevents false pulse */
-        furi_hal_gpio_init_ex(
-            &gpio_ext_pa7, GpioModeAltFunctionPushPull, GpioPullUp, GpioSpeedHigh, GpioAltFn1TIM1);
-    } else {
-        LL_GPIO_ResetOutputPin(
-            gpio_infrared_tx.port,
-            gpio_infrared_tx.pin); /* when disable it prevents false pulse */
-        furi_hal_gpio_init_ex(
-            &gpio_infrared_tx,
-            GpioModeAltFunctionPushPull,
-            GpioPullUp,
-            GpioSpeedHigh,
-            GpioAltFn1TIM1);
-    }
+
+    const GpioPin* tx_gpio = infrared_tx_pins[infrared_tx_output];
+    LL_GPIO_ResetOutputPin(tx_gpio->port, tx_gpio->pin); /* when disable it prevents false pulse */
+    furi_hal_gpio_init_ex(
+        tx_gpio, GpioModeAltFunctionPushPull, GpioPullUp, GpioSpeedHigh, GpioAltFn1TIM1);
 
     FURI_CRITICAL_ENTER();
     LL_TIM_GenerateEvent_UPDATE(INFRARED_DMA_TIMER); /* TIMx_RCR -> Repetition counter */
@@ -676,8 +664,8 @@ void furi_hal_infrared_async_tx_start(uint32_t freq, float duty_cycle) {
 }
 
 void furi_hal_infrared_async_tx_wait_termination(void) {
-    furi_assert(furi_hal_infrared_state >= InfraredStateAsyncTx);
-    furi_assert(furi_hal_infrared_state < InfraredStateMAX);
+    furi_check(furi_hal_infrared_state >= InfraredStateAsyncTx);
+    furi_check(furi_hal_infrared_state < InfraredStateMAX);
 
     FuriStatus status;
     status = furi_semaphore_acquire(infrared_tim_tx.stop_semaphore, FuriWaitForever);
@@ -687,8 +675,8 @@ void furi_hal_infrared_async_tx_wait_termination(void) {
 }
 
 void furi_hal_infrared_async_tx_stop(void) {
-    furi_assert(furi_hal_infrared_state >= InfraredStateAsyncTx);
-    furi_assert(furi_hal_infrared_state < InfraredStateMAX);
+    furi_check(furi_hal_infrared_state >= InfraredStateAsyncTx);
+    furi_check(furi_hal_infrared_state < InfraredStateMAX);
 
     FURI_CRITICAL_ENTER();
     if(furi_hal_infrared_state == InfraredStateAsyncTx)
@@ -701,7 +689,7 @@ void furi_hal_infrared_async_tx_stop(void) {
 void furi_hal_infrared_async_tx_set_data_isr_callback(
     FuriHalInfraredTxGetDataISRCallback callback,
     void* context) {
-    furi_assert(furi_hal_infrared_state == InfraredStateIdle);
+    furi_check(furi_hal_infrared_state == InfraredStateIdle);
     infrared_tim_tx.data_callback = callback;
     infrared_tim_tx.data_context = context;
 }
@@ -712,3 +700,23 @@ void furi_hal_infrared_async_tx_set_signal_sent_isr_callback(
     infrared_tim_tx.signal_sent_callback = callback;
     infrared_tim_tx.signal_sent_context = context;
 }
+
+FuriHalInfraredTxPin furi_hal_infrared_detect_tx_output(void) {
+    for(FuriHalInfraredTxPin pin = FuriHalInfraredTxPinInternal + 1; //-V1008
+        pin < FuriHalInfraredTxPinMax;
+        ++pin) {
+        const GpioPin* gpio = infrared_tx_pins[pin];
+        furi_hal_gpio_init(gpio, GpioModeInput, GpioPullUp, GpioSpeedLow);
+        furi_hal_cortex_delay_us(1000U);
+        const bool level = furi_hal_gpio_read(gpio);
+        furi_hal_gpio_init(gpio, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
+        if(!level) return pin;
+    }
+
+    return FuriHalInfraredTxPinInternal;
+}
+
+void furi_hal_infrared_set_tx_output(FuriHalInfraredTxPin tx_pin) {
+    furi_check(tx_pin < FuriHalInfraredTxPinMax);
+    infrared_tx_output = tx_pin;
+}
diff --git a/targets/f7/furi_hal/furi_hal_interrupt.c b/targets/f7/furi_hal/furi_hal_interrupt.c
index a9cd4e7aa..5c2c315ef 100644
--- a/targets/f7/furi_hal/furi_hal_interrupt.c
+++ b/targets/f7/furi_hal/furi_hal_interrupt.c
@@ -101,7 +101,7 @@ __attribute__((always_inline)) static inline void
     NVIC_DisableIRQ(furi_hal_interrupt_irqn[index]);
 }
 
-void furi_hal_interrupt_init() {
+void furi_hal_interrupt_init(void) {
     NVIC_SetPriority(
         TAMP_STAMP_LSECSS_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(), 0, 0));
     NVIC_EnableIRQ(TAMP_STAMP_LSECSS_IRQn);
@@ -165,82 +165,82 @@ void furi_hal_interrupt_set_isr_ex(
 }
 
 /* Timer 2 */
-void TIM2_IRQHandler() {
+void TIM2_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdTIM2);
 }
 
 /* Timer 1 Update */
-void TIM1_UP_TIM16_IRQHandler() {
+void TIM1_UP_TIM16_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdTim1UpTim16);
 }
 
-void TIM1_TRG_COM_TIM17_IRQHandler() {
+void TIM1_TRG_COM_TIM17_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdTim1TrgComTim17);
 }
 
-void TIM1_CC_IRQHandler() {
+void TIM1_CC_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdTim1Cc);
 }
 
 /* DMA 1 */
-void DMA1_Channel1_IRQHandler() {
+void DMA1_Channel1_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma1Ch1);
 }
 
-void DMA1_Channel2_IRQHandler() {
+void DMA1_Channel2_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma1Ch2);
 }
 
-void DMA1_Channel3_IRQHandler() {
+void DMA1_Channel3_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma1Ch3);
 }
 
-void DMA1_Channel4_IRQHandler() {
+void DMA1_Channel4_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma1Ch4);
 }
 
-void DMA1_Channel5_IRQHandler() {
+void DMA1_Channel5_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma1Ch5);
 }
 
-void DMA1_Channel6_IRQHandler() {
+void DMA1_Channel6_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma1Ch6);
 }
 
-void DMA1_Channel7_IRQHandler() {
+void DMA1_Channel7_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma1Ch7);
 }
 
 /* DMA 2 */
-void DMA2_Channel1_IRQHandler() {
+void DMA2_Channel1_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma2Ch1);
 }
 
-void DMA2_Channel2_IRQHandler() {
+void DMA2_Channel2_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma2Ch2);
 }
 
-void DMA2_Channel3_IRQHandler() {
+void DMA2_Channel3_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma2Ch3);
 }
 
-void DMA2_Channel4_IRQHandler() {
+void DMA2_Channel4_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma2Ch4);
 }
 
-void DMA2_Channel5_IRQHandler() {
+void DMA2_Channel5_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma2Ch5);
 }
 
-void DMA2_Channel6_IRQHandler() {
+void DMA2_Channel6_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma2Ch6);
 }
 
-void DMA2_Channel7_IRQHandler() {
+void DMA2_Channel7_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdDma2Ch7);
 }
 
-void HSEM_IRQHandler() {
+void HSEM_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdHsem);
 }
 
@@ -256,11 +256,11 @@ void TAMP_STAMP_LSECSS_IRQHandler(void) {
     }
 }
 
-void RCC_IRQHandler() {
+void RCC_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdRcc);
 }
 
-void NMI_Handler() {
+void NMI_Handler(void) {
     if(LL_RCC_IsActiveFlag_HSECSS()) {
         LL_RCC_ClearFlag_HSECSS();
         FURI_LOG_E(TAG, "HSE CSS fired: resetting system");
@@ -268,11 +268,11 @@ void NMI_Handler() {
     }
 }
 
-void HardFault_Handler() {
+void HardFault_Handler(void) {
     furi_crash("HardFault");
 }
 
-void MemManage_Handler() {
+void MemManage_Handler(void) {
     if(FURI_BIT(SCB->CFSR, SCB_CFSR_MMARVALID_Pos)) {
         uint32_t memfault_address = SCB->MMFAR;
         if(memfault_address < (1024 * 1024)) {
@@ -290,54 +290,54 @@ void MemManage_Handler() {
     furi_crash("MemManage");
 }
 
-void BusFault_Handler() {
+void BusFault_Handler(void) {
     furi_crash("BusFault");
 }
 
-void UsageFault_Handler() {
+void UsageFault_Handler(void) {
     furi_crash("UsageFault");
 }
 
-void DebugMon_Handler() {
+void DebugMon_Handler(void) {
 }
 
 #include "usbd_core.h"
 
 extern usbd_device udev;
 
-extern void HW_IPCC_Tx_Handler();
-extern void HW_IPCC_Rx_Handler();
+extern void HW_IPCC_Tx_Handler(void);
+extern void HW_IPCC_Rx_Handler(void);
 
-void SysTick_Handler() {
+void SysTick_Handler(void) {
     furi_hal_os_tick();
 }
 
-void USB_LP_IRQHandler() {
+void USB_LP_IRQHandler(void) {
 #ifndef FURI_RAM_EXEC
     usbd_poll(&udev);
 #endif
 }
 
-void USB_HP_IRQHandler() {
+void USB_HP_IRQHandler(void) {
 }
 
-void IPCC_C1_TX_IRQHandler() {
+void IPCC_C1_TX_IRQHandler(void) {
     HW_IPCC_Tx_Handler();
 }
 
-void IPCC_C1_RX_IRQHandler() {
+void IPCC_C1_RX_IRQHandler(void) {
     HW_IPCC_Rx_Handler();
 }
 
-void FPU_IRQHandler() {
+void FPU_IRQHandler(void) {
     furi_crash("FpuFault");
 }
 
-void LPTIM1_IRQHandler() {
+void LPTIM1_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdLpTim1);
 }
 
-void LPTIM2_IRQHandler() {
+void LPTIM2_IRQHandler(void) {
     furi_hal_interrupt_call(FuriHalInterruptIdLpTim2);
 }
 
diff --git a/targets/f7/furi_hal/furi_hal_interrupt.h b/targets/f7/furi_hal/furi_hal_interrupt.h
index 03d7850f9..74bb768ce 100644
--- a/targets/f7/furi_hal/furi_hal_interrupt.h
+++ b/targets/f7/furi_hal/furi_hal_interrupt.h
@@ -81,7 +81,7 @@ typedef enum {
 } FuriHalInterruptPriority;
 
 /** Initialize interrupt subsystem */
-void furi_hal_interrupt_init();
+void furi_hal_interrupt_init(void);
 
 /** Set ISR and enable interrupt with default priority
  *
diff --git a/targets/f7/furi_hal/furi_hal_light.c b/targets/f7/furi_hal/furi_hal_light.c
index 83e1603b7..b44342b52 100644
--- a/targets/f7/furi_hal/furi_hal_light.c
+++ b/targets/f7/furi_hal/furi_hal_light.c
@@ -4,12 +4,12 @@
 #include <lp5562.h>
 #include <stdint.h>
 
-#define LED_CURRENT_RED 50
-#define LED_CURRENT_GREEN 50
-#define LED_CURRENT_BLUE 50
-#define LED_CURRENT_WHITE 150
+#define LED_CURRENT_RED (50u)
+#define LED_CURRENT_GREEN (50u)
+#define LED_CURRENT_BLUE (50u)
+#define LED_CURRENT_WHITE (150u)
 
-void furi_hal_light_init() {
+void furi_hal_light_init(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
 
     lp5562_reset(&furi_hal_i2c_handle_power);
@@ -64,7 +64,7 @@ void furi_hal_light_blink_start(Light light, uint8_t brightness, uint16_t on_tim
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
 }
 
-void furi_hal_light_blink_stop() {
+void furi_hal_light_blink_stop(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     lp5562_set_channel_src(
         &furi_hal_i2c_handle_power,
diff --git a/targets/f7/furi_hal/furi_hal_memory.c b/targets/f7/furi_hal/furi_hal_memory.c
index 0d60a3af5..780a9d743 100644
--- a/targets/f7/furi_hal/furi_hal_memory.c
+++ b/targets/f7/furi_hal/furi_hal_memory.c
@@ -25,7 +25,7 @@ extern const void __sram2a_start__;
 extern const void __sram2a_free__;
 extern const void __sram2b_start__;
 
-void furi_hal_memory_init() {
+void furi_hal_memory_init(void) {
     if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {
         return;
     }
@@ -106,7 +106,7 @@ void* furi_hal_memory_alloc(size_t size) {
     return allocated_memory;
 }
 
-size_t furi_hal_memory_get_free() {
+size_t furi_hal_memory_get_free(void) {
     if(furi_hal_memory == NULL) return 0;
 
     size_t free = 0;
@@ -116,7 +116,7 @@ size_t furi_hal_memory_get_free() {
     return free;
 }
 
-size_t furi_hal_memory_max_pool_block() {
+size_t furi_hal_memory_max_pool_block(void) {
     if(furi_hal_memory == NULL) return 0;
 
     size_t max = 0;
diff --git a/targets/f7/furi_hal/furi_hal_mpu.c b/targets/f7/furi_hal/furi_hal_mpu.c
index ea6cd55be..16724c975 100644
--- a/targets/f7/furi_hal/furi_hal_mpu.c
+++ b/targets/f7/furi_hal/furi_hal_mpu.c
@@ -7,18 +7,18 @@
 
 #define FURI_HAL_MPU_STACK_PROTECT_REGION FuriHalMPURegionSize32B
 
-void furi_hal_mpu_init() {
+void furi_hal_mpu_init(void) {
     furi_hal_mpu_enable();
 
     // NULL pointer dereference protection
     furi_hal_mpu_protect_no_access(FuriHalMpuRegionNULL, 0x00, FuriHalMPURegionSize1MB);
 }
 
-void furi_hal_mpu_enable() {
+void furi_hal_mpu_enable(void) {
     LL_MPU_Enable(LL_MPU_CTRL_PRIVILEGED_DEFAULT);
 }
 
-void furi_hal_mpu_disable() {
+void furi_hal_mpu_disable(void) {
     LL_MPU_Disable();
 }
 
diff --git a/targets/f7/furi_hal/furi_hal_nfc.c b/targets/f7/furi_hal/furi_hal_nfc.c
index e8a1033d5..550f1b16e 100644
--- a/targets/f7/furi_hal/furi_hal_nfc.c
+++ b/targets/f7/furi_hal/furi_hal_nfc.c
@@ -46,7 +46,7 @@ static FuriHalNfcError furi_hal_nfc_turn_on_osc(FuriHalSpiBusHandle* handle) {
     return error;
 }
 
-FuriHalNfcError furi_hal_nfc_is_hal_ready() {
+FuriHalNfcError furi_hal_nfc_is_hal_ready(void) {
     FuriHalNfcError error = FuriHalNfcErrorNone;
 
     do {
@@ -68,8 +68,8 @@ FuriHalNfcError furi_hal_nfc_is_hal_ready() {
     return error;
 }
 
-FuriHalNfcError furi_hal_nfc_init() {
-    furi_assert(furi_hal_nfc.mutex == NULL);
+FuriHalNfcError furi_hal_nfc_init(void) {
+    furi_check(furi_hal_nfc.mutex == NULL);
 
     furi_hal_nfc.mutex = furi_mutex_alloc(FuriMutexTypeNormal);
     FuriHalNfcError error = FuriHalNfcErrorNone;
@@ -252,11 +252,11 @@ FuriHalNfcError furi_hal_nfc_init() {
     return error;
 }
 
-static bool furi_hal_nfc_is_mine() {
+static bool furi_hal_nfc_is_mine(void) {
     return (furi_mutex_get_owner(furi_hal_nfc.mutex) == furi_thread_get_current_id());
 }
 
-FuriHalNfcError furi_hal_nfc_acquire() {
+FuriHalNfcError furi_hal_nfc_acquire(void) {
     furi_check(furi_hal_nfc.mutex);
 
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_nfc);
@@ -270,7 +270,7 @@ FuriHalNfcError furi_hal_nfc_acquire() {
     return error;
 }
 
-FuriHalNfcError furi_hal_nfc_release() {
+FuriHalNfcError furi_hal_nfc_release(void) {
     furi_check(furi_hal_nfc.mutex);
     furi_check(furi_hal_nfc_is_mine());
     furi_check(furi_mutex_release(furi_hal_nfc.mutex) == FuriStatusOk);
@@ -280,7 +280,7 @@ FuriHalNfcError furi_hal_nfc_release() {
     return FuriHalNfcErrorNone;
 }
 
-FuriHalNfcError furi_hal_nfc_low_power_mode_start() {
+FuriHalNfcError furi_hal_nfc_low_power_mode_start(void) {
     FuriHalNfcError error = FuriHalNfcErrorNone;
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
@@ -298,7 +298,7 @@ FuriHalNfcError furi_hal_nfc_low_power_mode_start() {
     return error;
 }
 
-FuriHalNfcError furi_hal_nfc_low_power_mode_stop() {
+FuriHalNfcError furi_hal_nfc_low_power_mode_stop(void) {
     FuriHalNfcError error = FuriHalNfcErrorNone;
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
@@ -346,8 +346,8 @@ static FuriHalNfcError furi_hal_nfc_listener_init_common(FuriHalSpiBusHandle* ha
 }
 
 FuriHalNfcError furi_hal_nfc_set_mode(FuriHalNfcMode mode, FuriHalNfcTech tech) {
-    furi_assert(mode < FuriHalNfcModeNum);
-    furi_assert(tech < FuriHalNfcTechNum);
+    furi_check(mode < FuriHalNfcModeNum);
+    furi_check(tech < FuriHalNfcTechNum);
 
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
@@ -373,7 +373,7 @@ FuriHalNfcError furi_hal_nfc_set_mode(FuriHalNfcMode mode, FuriHalNfcTech tech)
     return error;
 }
 
-FuriHalNfcError furi_hal_nfc_reset_mode() {
+FuriHalNfcError furi_hal_nfc_reset_mode(void) {
     FuriHalNfcError error = FuriHalNfcErrorNone;
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
@@ -413,7 +413,7 @@ FuriHalNfcError furi_hal_nfc_reset_mode() {
     return error;
 }
 
-FuriHalNfcError furi_hal_nfc_field_detect_start() {
+FuriHalNfcError furi_hal_nfc_field_detect_start(void) {
     FuriHalNfcError error = FuriHalNfcErrorNone;
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
@@ -427,7 +427,7 @@ FuriHalNfcError furi_hal_nfc_field_detect_start() {
     return error;
 }
 
-FuriHalNfcError furi_hal_nfc_field_detect_stop() {
+FuriHalNfcError furi_hal_nfc_field_detect_stop(void) {
     FuriHalNfcError error = FuriHalNfcErrorNone;
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
@@ -439,7 +439,7 @@ FuriHalNfcError furi_hal_nfc_field_detect_stop() {
     return error;
 }
 
-bool furi_hal_nfc_field_is_present() {
+bool furi_hal_nfc_field_is_present(void) {
     bool is_present = false;
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
@@ -454,7 +454,7 @@ bool furi_hal_nfc_field_is_present() {
     return is_present;
 }
 
-FuriHalNfcError furi_hal_nfc_poller_field_on() {
+FuriHalNfcError furi_hal_nfc_poller_field_on(void) {
     FuriHalNfcError error = FuriHalNfcErrorNone;
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
@@ -479,7 +479,7 @@ FuriHalNfcError furi_hal_nfc_poller_tx_common(
     FuriHalSpiBusHandle* handle,
     const uint8_t* tx_data,
     size_t tx_bits) {
-    furi_assert(tx_data);
+    furi_check(tx_data);
 
     FuriHalNfcError err = FuriHalNfcErrorNone;
 
@@ -521,40 +521,40 @@ FuriHalNfcError furi_hal_nfc_common_fifo_tx(
 }
 
 FuriHalNfcError furi_hal_nfc_poller_tx(const uint8_t* tx_data, size_t tx_bits) {
-    furi_assert(furi_hal_nfc.mode == FuriHalNfcModePoller);
-    furi_assert(furi_hal_nfc.tech < FuriHalNfcTechNum);
+    furi_check(furi_hal_nfc.mode == FuriHalNfcModePoller);
+    furi_check(furi_hal_nfc.tech < FuriHalNfcTechNum);
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
     return furi_hal_nfc_tech[furi_hal_nfc.tech]->poller.tx(handle, tx_data, tx_bits);
 }
 
 FuriHalNfcError furi_hal_nfc_poller_rx(uint8_t* rx_data, size_t rx_data_size, size_t* rx_bits) {
-    furi_assert(furi_hal_nfc.mode == FuriHalNfcModePoller);
-    furi_assert(furi_hal_nfc.tech < FuriHalNfcTechNum);
+    furi_check(furi_hal_nfc.mode == FuriHalNfcModePoller);
+    furi_check(furi_hal_nfc.tech < FuriHalNfcTechNum);
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
     return furi_hal_nfc_tech[furi_hal_nfc.tech]->poller.rx(handle, rx_data, rx_data_size, rx_bits);
 }
 
 FuriHalNfcEvent furi_hal_nfc_poller_wait_event(uint32_t timeout_ms) {
-    furi_assert(furi_hal_nfc.mode == FuriHalNfcModePoller);
-    furi_assert(furi_hal_nfc.tech < FuriHalNfcTechNum);
+    furi_check(furi_hal_nfc.mode == FuriHalNfcModePoller);
+    furi_check(furi_hal_nfc.tech < FuriHalNfcTechNum);
 
     return furi_hal_nfc_tech[furi_hal_nfc.tech]->poller.wait_event(timeout_ms);
 }
 
 FuriHalNfcEvent furi_hal_nfc_listener_wait_event(uint32_t timeout_ms) {
-    furi_assert(furi_hal_nfc.mode == FuriHalNfcModeListener);
-    furi_assert(furi_hal_nfc.tech < FuriHalNfcTechNum);
+    furi_check(furi_hal_nfc.mode == FuriHalNfcModeListener);
+    furi_check(furi_hal_nfc.tech < FuriHalNfcTechNum);
 
     return furi_hal_nfc_tech[furi_hal_nfc.tech]->listener.wait_event(timeout_ms);
 }
 
 FuriHalNfcError furi_hal_nfc_listener_tx(const uint8_t* tx_data, size_t tx_bits) {
-    furi_assert(tx_data);
+    furi_check(tx_data);
 
-    furi_assert(furi_hal_nfc.mode == FuriHalNfcModeListener);
-    furi_assert(furi_hal_nfc.tech < FuriHalNfcTechNum);
+    furi_check(furi_hal_nfc.mode == FuriHalNfcModeListener);
+    furi_check(furi_hal_nfc.tech < FuriHalNfcTechNum);
 
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
     return furi_hal_nfc_tech[furi_hal_nfc.tech]->listener.tx(handle, tx_data, tx_bits);
@@ -575,18 +575,18 @@ FuriHalNfcError furi_hal_nfc_common_fifo_rx(
 }
 
 FuriHalNfcError furi_hal_nfc_listener_rx(uint8_t* rx_data, size_t rx_data_size, size_t* rx_bits) {
-    furi_assert(rx_data);
-    furi_assert(rx_bits);
+    furi_check(rx_data);
+    furi_check(rx_bits);
 
-    furi_assert(furi_hal_nfc.mode == FuriHalNfcModeListener);
-    furi_assert(furi_hal_nfc.tech < FuriHalNfcTechNum);
+    furi_check(furi_hal_nfc.mode == FuriHalNfcModeListener);
+    furi_check(furi_hal_nfc.tech < FuriHalNfcTechNum);
 
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
     return furi_hal_nfc_tech[furi_hal_nfc.tech]->listener.rx(
         handle, rx_data, rx_data_size, rx_bits);
 }
 
-FuriHalNfcError furi_hal_nfc_trx_reset() {
+FuriHalNfcError furi_hal_nfc_trx_reset(void) {
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
     st25r3916_direct_cmd(handle, ST25R3916_CMD_STOP);
@@ -594,25 +594,25 @@ FuriHalNfcError furi_hal_nfc_trx_reset() {
     return FuriHalNfcErrorNone;
 }
 
-FuriHalNfcError furi_hal_nfc_listener_sleep() {
-    furi_assert(furi_hal_nfc.mode == FuriHalNfcModeListener);
-    furi_assert(furi_hal_nfc.tech < FuriHalNfcTechNum);
+FuriHalNfcError furi_hal_nfc_listener_sleep(void) {
+    furi_check(furi_hal_nfc.mode == FuriHalNfcModeListener);
+    furi_check(furi_hal_nfc.tech < FuriHalNfcTechNum);
 
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
     return furi_hal_nfc_tech[furi_hal_nfc.tech]->listener.sleep(handle);
 }
 
-FuriHalNfcError furi_hal_nfc_listener_idle() {
-    furi_assert(furi_hal_nfc.mode == FuriHalNfcModeListener);
-    furi_assert(furi_hal_nfc.tech < FuriHalNfcTechNum);
+FuriHalNfcError furi_hal_nfc_listener_idle(void) {
+    furi_check(furi_hal_nfc.mode == FuriHalNfcModeListener);
+    furi_check(furi_hal_nfc.tech < FuriHalNfcTechNum);
 
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
     return furi_hal_nfc_tech[furi_hal_nfc.tech]->listener.idle(handle);
 }
 
-FuriHalNfcError furi_hal_nfc_listener_enable_rx() {
+FuriHalNfcError furi_hal_nfc_listener_enable_rx(void) {
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
     st25r3916_direct_cmd(handle, ST25R3916_CMD_UNMASK_RECEIVE_DATA);
diff --git a/targets/f7/furi_hal/furi_hal_nfc_event.c b/targets/f7/furi_hal/furi_hal_nfc_event.c
index 266b606fd..e434e6a35 100644
--- a/targets/f7/furi_hal/furi_hal_nfc_event.c
+++ b/targets/f7/furi_hal/furi_hal_nfc_event.c
@@ -2,12 +2,12 @@
 
 FuriHalNfcEventInternal* furi_hal_nfc_event = NULL;
 
-void furi_hal_nfc_event_init() {
+void furi_hal_nfc_event_init(void) {
     furi_hal_nfc_event = malloc(sizeof(FuriHalNfcEventInternal));
 }
 
-FuriHalNfcError furi_hal_nfc_event_start() {
-    furi_assert(furi_hal_nfc_event);
+FuriHalNfcError furi_hal_nfc_event_start(void) {
+    furi_check(furi_hal_nfc_event);
 
     furi_hal_nfc_event->thread = furi_thread_get_current_id();
     furi_thread_flags_clear(FURI_HAL_NFC_EVENT_INTERNAL_ALL);
@@ -15,8 +15,8 @@ FuriHalNfcError furi_hal_nfc_event_start() {
     return FuriHalNfcErrorNone;
 }
 
-FuriHalNfcError furi_hal_nfc_event_stop() {
-    furi_assert(furi_hal_nfc_event);
+FuriHalNfcError furi_hal_nfc_event_stop(void) {
+    furi_check(furi_hal_nfc_event);
 
     furi_hal_nfc_event->thread = NULL;
 
@@ -24,21 +24,21 @@ FuriHalNfcError furi_hal_nfc_event_stop() {
 }
 
 void furi_hal_nfc_event_set(FuriHalNfcEventInternalType event) {
-    furi_assert(furi_hal_nfc_event);
+    furi_check(furi_hal_nfc_event);
 
     if(furi_hal_nfc_event->thread) {
         furi_thread_flags_set(furi_hal_nfc_event->thread, event);
     }
 }
 
-FuriHalNfcError furi_hal_nfc_abort() {
+FuriHalNfcError furi_hal_nfc_abort(void) {
     furi_hal_nfc_event_set(FuriHalNfcEventInternalTypeAbort);
     return FuriHalNfcErrorNone;
 }
 
 FuriHalNfcEvent furi_hal_nfc_wait_event_common(uint32_t timeout_ms) {
-    furi_assert(furi_hal_nfc_event);
-    furi_assert(furi_hal_nfc_event->thread);
+    furi_check(furi_hal_nfc_event);
+    furi_check(furi_hal_nfc_event->thread);
 
     FuriHalNfcEvent event = 0;
     uint32_t event_timeout = timeout_ms == FURI_HAL_NFC_EVENT_WAIT_FOREVER ? FuriWaitForever :
@@ -101,8 +101,8 @@ bool furi_hal_nfc_event_wait_for_specific_irq(
     FuriHalSpiBusHandle* handle,
     uint32_t mask,
     uint32_t timeout_ms) {
-    furi_assert(furi_hal_nfc_event);
-    furi_assert(furi_hal_nfc_event->thread);
+    furi_check(furi_hal_nfc_event);
+    furi_check(furi_hal_nfc_event->thread);
 
     bool irq_received = false;
     uint32_t event_flag =
diff --git a/targets/f7/furi_hal/furi_hal_nfc_felica.c b/targets/f7/furi_hal/furi_hal_nfc_felica.c
index f762a0ed3..82239fbc1 100644
--- a/targets/f7/furi_hal/furi_hal_nfc_felica.c
+++ b/targets/f7/furi_hal/furi_hal_nfc_felica.c
@@ -163,6 +163,9 @@ FuriHalNfcError furi_hal_nfc_felica_listener_set_sensf_res_data(
     const uint8_t idm_len,
     const uint8_t* pmm,
     const uint8_t pmm_len) {
+    furi_check(idm);
+    furi_check(pmm);
+
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
     // Write PT Memory
     uint8_t pt_memory[19] = {};
diff --git a/targets/f7/furi_hal/furi_hal_nfc_i.h b/targets/f7/furi_hal/furi_hal_nfc_i.h
index 53a25644d..084196451 100644
--- a/targets/f7/furi_hal/furi_hal_nfc_i.h
+++ b/targets/f7/furi_hal/furi_hal_nfc_i.h
@@ -69,7 +69,7 @@ extern FuriHalNfc furi_hal_nfc;
 /**
  * @brief Initialise NFC HAL event system.
  */
-void furi_hal_nfc_event_init();
+void furi_hal_nfc_event_init(void);
 
 /**
  * @brief Forcibly emit (a) particular internal event(s).
@@ -81,22 +81,22 @@ void furi_hal_nfc_event_set(FuriHalNfcEventInternalType event);
 /**
  * @brief Initialise GPIO to generate an interrupt from the NFC hardware.
  */
-void furi_hal_nfc_init_gpio_isr();
+void furi_hal_nfc_init_gpio_isr(void);
 
 /**
  * @brief Disable interrupts from the NFC hardware.
  */
-void furi_hal_nfc_deinit_gpio_isr();
+void furi_hal_nfc_deinit_gpio_isr(void);
 
 /**
  * @brief Initialise all NFC timers.
  */
-void furi_hal_nfc_timers_init();
+void furi_hal_nfc_timers_init(void);
 
 /**
  * @brief Disable all NFC timers.
  */
-void furi_hal_nfc_timers_deinit();
+void furi_hal_nfc_timers_deinit(void);
 
 /**
  * @brief Get the interrupt bitmask from the NFC hardware.
diff --git a/targets/f7/furi_hal/furi_hal_nfc_irq.c b/targets/f7/furi_hal/furi_hal_nfc_irq.c
index edacc52bf..90373955f 100644
--- a/targets/f7/furi_hal/furi_hal_nfc_irq.c
+++ b/targets/f7/furi_hal/furi_hal_nfc_irq.c
@@ -16,14 +16,14 @@ uint32_t furi_hal_nfc_get_irq(FuriHalSpiBusHandle* handle) {
     return irq;
 }
 
-void furi_hal_nfc_init_gpio_isr() {
+void furi_hal_nfc_init_gpio_isr(void) {
     furi_hal_gpio_init(
         &gpio_nfc_irq_rfid_pull, GpioModeInterruptRise, GpioPullDown, GpioSpeedVeryHigh);
     furi_hal_gpio_add_int_callback(&gpio_nfc_irq_rfid_pull, furi_hal_nfc_int_callback, NULL);
     furi_hal_gpio_enable_int_callback(&gpio_nfc_irq_rfid_pull);
 }
 
-void furi_hal_nfc_deinit_gpio_isr() {
+void furi_hal_nfc_deinit_gpio_isr(void) {
     furi_hal_gpio_remove_int_callback(&gpio_nfc_irq_rfid_pull);
     furi_hal_gpio_init(&gpio_nfc_irq_rfid_pull, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 }
diff --git a/targets/f7/furi_hal/furi_hal_nfc_iso14443a.c b/targets/f7/furi_hal/furi_hal_nfc_iso14443a.c
index 278ecf384..1ef23dfa4 100644
--- a/targets/f7/furi_hal/furi_hal_nfc_iso14443a.c
+++ b/targets/f7/furi_hal/furi_hal_nfc_iso14443a.c
@@ -182,7 +182,7 @@ FuriHalNfcError
 
 FuriHalNfcError
     furi_hal_nfc_iso14443a_poller_tx_custom_parity(const uint8_t* tx_data, size_t tx_bits) {
-    furi_assert(tx_data);
+    furi_check(tx_data);
 
     FuriHalNfcError err = FuriHalNfcErrorNone;
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
@@ -215,10 +215,9 @@ FuriHalNfcError furi_hal_nfc_iso14443a_listener_set_col_res_data(
     uint8_t uid_len,
     uint8_t* atqa,
     uint8_t sak) {
-    furi_assert(uid);
-    furi_assert(atqa);
-    UNUSED(uid_len);
-    UNUSED(sak);
+    furi_check(uid);
+    furi_check(atqa);
+
     FuriHalNfcError error = FuriHalNfcErrorNone;
 
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
@@ -280,10 +279,10 @@ FuriHalNfcError furi_hal_nfc_iso14443a_listener_tx_custom_parity(
     const uint8_t* tx_data,
     const uint8_t* tx_parity,
     size_t tx_bits) {
-    furi_assert(tx_data);
-    furi_assert(tx_parity);
+    furi_check(tx_data);
+    furi_check(tx_parity);
 
-    furi_assert(iso14443_3a_signal);
+    furi_check(iso14443_3a_signal);
 
     FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
 
diff --git a/targets/f7/furi_hal/furi_hal_nfc_iso15693.c b/targets/f7/furi_hal/furi_hal_nfc_iso15693.c
index cc936644b..9ab3532f9 100644
--- a/targets/f7/furi_hal/furi_hal_nfc_iso15693.c
+++ b/targets/f7/furi_hal/furi_hal_nfc_iso15693.c
@@ -43,7 +43,7 @@ typedef struct {
 static FuriHalNfcIso15693Listener* furi_hal_nfc_iso15693_listener = NULL;
 static FuriHalNfcIso15693Poller* furi_hal_nfc_iso15693_poller = NULL;
 
-static FuriHalNfcIso15693Listener* furi_hal_nfc_iso15693_listener_alloc() {
+static FuriHalNfcIso15693Listener* furi_hal_nfc_iso15693_listener_alloc(void) {
     FuriHalNfcIso15693Listener* instance = malloc(sizeof(FuriHalNfcIso15693Listener));
 
     instance->signal = iso15693_signal_alloc(&gpio_spi_r_mosi);
@@ -54,7 +54,7 @@ static FuriHalNfcIso15693Listener* furi_hal_nfc_iso15693_listener_alloc() {
 }
 
 static void furi_hal_nfc_iso15693_listener_free(FuriHalNfcIso15693Listener* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     iso15693_signal_free(instance->signal);
     iso15693_parser_free(instance->parser);
@@ -62,14 +62,14 @@ static void furi_hal_nfc_iso15693_listener_free(FuriHalNfcIso15693Listener* inst
     free(instance);
 }
 
-static FuriHalNfcIso15693Poller* furi_hal_nfc_iso15693_poller_alloc() {
+static FuriHalNfcIso15693Poller* furi_hal_nfc_iso15693_poller_alloc(void) {
     FuriHalNfcIso15693Poller* instance = malloc(sizeof(FuriHalNfcIso15693Poller));
 
     return instance;
 }
 
 static void furi_hal_nfc_iso15693_poller_free(FuriHalNfcIso15693Poller* instance) {
-    furi_assert(instance);
+    furi_check(instance);
 
     free(instance);
 }
@@ -113,7 +113,7 @@ static FuriHalNfcError furi_hal_nfc_iso15693_common_init(FuriHalSpiBusHandle* ha
 }
 
 static FuriHalNfcError furi_hal_nfc_iso15693_poller_init(FuriHalSpiBusHandle* handle) {
-    furi_assert(furi_hal_nfc_iso15693_poller == NULL);
+    furi_check(furi_hal_nfc_iso15693_poller == NULL);
 
     furi_hal_nfc_iso15693_poller = furi_hal_nfc_iso15693_poller_alloc();
 
@@ -143,7 +143,7 @@ static FuriHalNfcError furi_hal_nfc_iso15693_poller_init(FuriHalSpiBusHandle* ha
 
 static FuriHalNfcError furi_hal_nfc_iso15693_poller_deinit(FuriHalSpiBusHandle* handle) {
     UNUSED(handle);
-    furi_assert(furi_hal_nfc_iso15693_poller);
+    furi_check(furi_hal_nfc_iso15693_poller);
 
     furi_hal_nfc_iso15693_poller_free(furi_hal_nfc_iso15693_poller);
     furi_hal_nfc_iso15693_poller = NULL;
@@ -159,7 +159,7 @@ static void iso15693_3_poller_encode_frame(
     size_t* frame_buf_bits) {
     static const uint8_t bit_patterns_1_out_of_4[] = {0x02, 0x08, 0x20, 0x80};
     size_t frame_buf_size_calc = (tx_bits / 2) + 2;
-    furi_assert(frame_buf_size >= frame_buf_size_calc);
+    furi_check(frame_buf_size >= frame_buf_size_calc);
 
     // Add SOF 1 out of 4
     frame_buf[0] = 0x21;
@@ -300,7 +300,7 @@ static void furi_hal_nfc_iso15693_listener_transparent_mode_exit(FuriHalSpiBusHa
 }
 
 static FuriHalNfcError furi_hal_nfc_iso15693_listener_init(FuriHalSpiBusHandle* handle) {
-    furi_assert(furi_hal_nfc_iso15693_listener == NULL);
+    furi_check(furi_hal_nfc_iso15693_listener == NULL);
 
     furi_hal_nfc_iso15693_listener = furi_hal_nfc_iso15693_listener_alloc();
 
@@ -329,7 +329,7 @@ static FuriHalNfcError furi_hal_nfc_iso15693_listener_init(FuriHalSpiBusHandle*
 }
 
 static FuriHalNfcError furi_hal_nfc_iso15693_listener_deinit(FuriHalSpiBusHandle* handle) {
-    furi_assert(furi_hal_nfc_iso15693_listener);
+    furi_check(furi_hal_nfc_iso15693_listener);
 
     furi_hal_nfc_iso15693_listener_transparent_mode_exit(handle);
 
@@ -348,7 +348,7 @@ static FuriHalNfcError
 }
 
 static void furi_hal_nfc_iso15693_parser_callback(Iso15693ParserEvent event, void* context) {
-    furi_assert(context);
+    furi_check(context);
 
     if(event == Iso15693ParserEventDataReceived) {
         FuriThreadId thread_id = context;
@@ -391,7 +391,7 @@ static FuriHalNfcError furi_hal_nfc_iso15693_listener_tx(
     const uint8_t* tx_data,
     size_t tx_bits) {
     UNUSED(handle);
-    furi_assert(furi_hal_nfc_iso15693_listener);
+    furi_check(furi_hal_nfc_iso15693_listener);
 
     FuriHalNfcError error = FuriHalNfcErrorNone;
 
@@ -400,7 +400,7 @@ static FuriHalNfcError furi_hal_nfc_iso15693_listener_tx(
     return error;
 }
 
-FuriHalNfcError furi_hal_nfc_iso15693_listener_tx_sof() {
+FuriHalNfcError furi_hal_nfc_iso15693_listener_tx_sof(void) {
     iso15693_signal_tx_sof(furi_hal_nfc_iso15693_listener->signal, Iso15693SignalDataRateHi);
 
     return FuriHalNfcErrorNone;
@@ -411,7 +411,7 @@ static FuriHalNfcError furi_hal_nfc_iso15693_listener_rx(
     uint8_t* rx_data,
     size_t rx_data_size,
     size_t* rx_bits) {
-    furi_assert(furi_hal_nfc_iso15693_listener);
+    furi_check(furi_hal_nfc_iso15693_listener);
     UNUSED(handle);
 
     if(rx_data_size <
diff --git a/targets/f7/furi_hal/furi_hal_nfc_timer.c b/targets/f7/furi_hal/furi_hal_nfc_timer.c
index c9de9dfe8..dfc96bf1a 100644
--- a/targets/f7/furi_hal/furi_hal_nfc_timer.c
+++ b/targets/f7/furi_hal/furi_hal_nfc_timer.c
@@ -192,13 +192,13 @@ static void furi_hal_nfc_timer_stop(FuriHalNfcTimer timer) {
 #endif
 }
 
-void furi_hal_nfc_timers_init() {
+void furi_hal_nfc_timers_init(void) {
     for(size_t i = 0; i < FuriHalNfcTimerCount; i++) {
         furi_hal_nfc_timer_init(i);
     }
 }
 
-void furi_hal_nfc_timers_deinit() {
+void furi_hal_nfc_timers_deinit(void) {
     for(size_t i = 0; i < FuriHalNfcTimerCount; i++) {
         furi_hal_nfc_timer_deinit(i);
     }
@@ -208,7 +208,7 @@ void furi_hal_nfc_timer_fwt_start(uint32_t time_fc) {
     furi_hal_nfc_timer_start_fc(FuriHalNfcTimerFwt, time_fc);
 }
 
-void furi_hal_nfc_timer_fwt_stop() {
+void furi_hal_nfc_timer_fwt_stop(void) {
     furi_hal_nfc_timer_stop(FuriHalNfcTimerFwt);
 }
 
@@ -220,10 +220,10 @@ void furi_hal_nfc_timer_block_tx_start_us(uint32_t time_us) {
     furi_hal_nfc_timer_start_us(FuriHalNfcTimerBlockTx, time_us);
 }
 
-void furi_hal_nfc_timer_block_tx_stop() {
+void furi_hal_nfc_timer_block_tx_stop(void) {
     furi_hal_nfc_timer_stop(FuriHalNfcTimerBlockTx);
 }
 
-bool furi_hal_nfc_timer_block_tx_is_running() {
+bool furi_hal_nfc_timer_block_tx_is_running(void) {
     return furi_hal_nfc_timer_is_running(FuriHalNfcTimerBlockTx);
 }
diff --git a/targets/f7/furi_hal/furi_hal_os.c b/targets/f7/furi_hal/furi_hal_os.c
index efa760b47..ba28a141f 100644
--- a/targets/f7/furi_hal/furi_hal_os.c
+++ b/targets/f7/furi_hal/furi_hal_os.c
@@ -45,17 +45,17 @@
 #ifdef FURI_HAL_OS_DEBUG
 #include <stm32wbxx_ll_gpio.h>
 
-void furi_hal_os_timer_callback() {
+void furi_hal_os_timer_callback(void) {
     furi_hal_gpio_write(
         FURI_HAL_OS_DEBUG_SECOND_GPIO, !furi_hal_gpio_read(FURI_HAL_OS_DEBUG_SECOND_GPIO));
 }
 #endif
 
-extern void xPortSysTickHandler();
+extern void xPortSysTickHandler(void);
 
 static volatile uint32_t furi_hal_os_skew;
 
-void furi_hal_os_init() {
+void furi_hal_os_init(void) {
     furi_hal_idle_timer_init();
 
 #ifdef FURI_HAL_OS_DEBUG
@@ -72,7 +72,7 @@ void furi_hal_os_init() {
     FURI_LOG_I(TAG, "Init OK");
 }
 
-void furi_hal_os_tick() {
+void furi_hal_os_tick(void) {
     if(xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
 #ifdef FURI_HAL_OS_DEBUG
         furi_hal_gpio_write(
@@ -84,7 +84,7 @@ void furi_hal_os_tick() {
 
 #ifdef FURI_HAL_OS_DEBUG
 // Find out the IRQ number while debugging
-static void furi_hal_os_nvic_dbg_trap() {
+static void furi_hal_os_nvic_dbg_trap(void) {
     for(int32_t i = WWDG_IRQn; i <= DMAMUX1_OVR_IRQn; i++) {
         if(NVIC_GetPendingIRQ(i)) {
             (void)i;
@@ -107,7 +107,7 @@ static void furi_hal_os_exti_dbg_trap(uint32_t exti, uint32_t val) {
 }
 #endif
 
-static inline bool furi_hal_os_is_pending_irq() {
+static inline bool furi_hal_os_is_pending_irq(void) {
     if(FURI_HAL_OS_NVIC_IS_PENDING()) {
 #ifdef FURI_HAL_OS_DEBUG
         furi_hal_os_nvic_dbg_trap();
diff --git a/targets/f7/furi_hal/furi_hal_os.h b/targets/f7/furi_hal/furi_hal_os.h
index e13b2c258..f14a3da15 100644
--- a/targets/f7/furi_hal/furi_hal_os.h
+++ b/targets/f7/furi_hal/furi_hal_os.h
@@ -9,11 +9,11 @@ extern "C" {
 /* Initialize OS helpers
  * Configure and start tick timer
  */
-void furi_hal_os_init();
+void furi_hal_os_init(void);
 
 /* Advance OS tick counter
  */
-void furi_hal_os_tick();
+void furi_hal_os_tick(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/f7/furi_hal/furi_hal_power.c b/targets/f7/furi_hal/furi_hal_power.c
index f03aea75f..ccbc521a6 100644
--- a/targets/f7/furi_hal/furi_hal_power.c
+++ b/targets/f7/furi_hal/furi_hal_power.c
@@ -51,7 +51,7 @@ static volatile FuriHalPower furi_hal_power = {
 
 extern const BQ27220DMData furi_hal_power_gauge_data_memory[];
 
-void furi_hal_power_init() {
+void furi_hal_power_init(void) {
 #ifdef FURI_HAL_POWER_DEBUG
     furi_hal_gpio_init_simple(FURI_HAL_POWER_DEBUG_WFI_GPIO, GpioModeOutputPushPull);
     furi_hal_gpio_init_simple(FURI_HAL_POWER_DEBUG_STOP_GPIO, GpioModeOutputPushPull);
@@ -107,7 +107,7 @@ void furi_hal_power_init() {
     FURI_LOG_I(TAG, "Init OK");
 }
 
-bool furi_hal_power_gauge_is_ok() {
+bool furi_hal_power_gauge_is_ok(void) {
     bool ret = true;
 
     BatteryStatus battery_status;
@@ -129,7 +129,7 @@ bool furi_hal_power_gauge_is_ok() {
     return ret;
 }
 
-bool furi_hal_power_is_shutdown_requested() {
+bool furi_hal_power_is_shutdown_requested(void) {
     bool ret = false;
 
     BatteryStatus battery_status;
@@ -145,34 +145,34 @@ bool furi_hal_power_is_shutdown_requested() {
     return ret;
 }
 
-uint16_t furi_hal_power_insomnia_level() {
+uint16_t furi_hal_power_insomnia_level(void) {
     return furi_hal_power.insomnia;
 }
 
-void furi_hal_power_insomnia_enter() {
+void furi_hal_power_insomnia_enter(void) {
     FURI_CRITICAL_ENTER();
-    furi_assert(furi_hal_power.insomnia < UINT8_MAX);
+    furi_check(furi_hal_power.insomnia < UINT8_MAX);
     furi_hal_power.insomnia++;
     FURI_CRITICAL_EXIT();
 }
 
-void furi_hal_power_insomnia_exit() {
+void furi_hal_power_insomnia_exit(void) {
     FURI_CRITICAL_ENTER();
-    furi_assert(furi_hal_power.insomnia > 0);
+    furi_check(furi_hal_power.insomnia > 0);
     furi_hal_power.insomnia--;
     FURI_CRITICAL_EXIT();
 }
 
-bool furi_hal_power_sleep_available() {
+bool furi_hal_power_sleep_available(void) {
     return furi_hal_power.insomnia == 0;
 }
 
-static inline bool furi_hal_power_deep_sleep_available() {
+static inline bool furi_hal_power_deep_sleep_available(void) {
     return furi_hal_bt_is_alive() && !furi_hal_rtc_is_flag_set(FuriHalRtcFlagLegacySleep) &&
            !furi_hal_debug_is_gdb_session_active();
 }
 
-static inline void furi_hal_power_light_sleep() {
+static inline void furi_hal_power_light_sleep(void) {
 #ifdef FURI_HAL_POWER_DEBUG
     furi_hal_gpio_write(FURI_HAL_POWER_DEBUG_WFI_GPIO, 1);
 #endif
@@ -182,17 +182,17 @@ static inline void furi_hal_power_light_sleep() {
 #endif
 }
 
-static inline void furi_hal_power_suspend_aux_periphs() {
+static inline void furi_hal_power_suspend_aux_periphs(void) {
     // Disable USART
     furi_hal_serial_control_suspend();
 }
 
-static inline void furi_hal_power_resume_aux_periphs() {
+static inline void furi_hal_power_resume_aux_periphs(void) {
     // Re-enable USART
     furi_hal_serial_control_resume();
 }
 
-static inline void furi_hal_power_deep_sleep() {
+static inline void furi_hal_power_deep_sleep(void) {
     furi_hal_power_suspend_aux_periphs();
 
     if(!furi_hal_clock_switch_pll2hse()) {
@@ -260,7 +260,7 @@ static inline void furi_hal_power_deep_sleep() {
     furi_hal_rtc_sync_shadow();
 }
 
-void furi_hal_power_sleep() {
+void furi_hal_power_sleep(void) {
     if(furi_hal_power_deep_sleep_available()) {
         furi_hal_power_deep_sleep();
     } else {
@@ -268,35 +268,35 @@ void furi_hal_power_sleep() {
     }
 }
 
-uint8_t furi_hal_power_get_pct() {
+uint8_t furi_hal_power_get_pct(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     uint8_t ret = bq27220_get_state_of_charge(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     return ret;
 }
 
-uint8_t furi_hal_power_get_bat_health_pct() {
+uint8_t furi_hal_power_get_bat_health_pct(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     uint8_t ret = bq27220_get_state_of_health(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     return ret;
 }
 
-bool furi_hal_power_is_charging() {
+bool furi_hal_power_is_charging(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     bool ret = bq25896_is_charging(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     return ret;
 }
 
-bool furi_hal_power_is_charging_done() {
+bool furi_hal_power_is_charging_done(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     bool ret = bq25896_is_charging_done(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     return ret;
 }
 
-void furi_hal_power_shutdown() {
+void furi_hal_power_shutdown(void) {
     furi_hal_power_insomnia_enter();
 
     furi_hal_bt_reinit();
@@ -328,7 +328,7 @@ void furi_hal_power_shutdown() {
     furi_crash("Insomniac core2");
 }
 
-void furi_hal_power_off() {
+void furi_hal_power_off(void) {
     // Crutch: shutting down with ext 3V3 off is causing LSE to stop
     furi_hal_power_enable_external_3_3v();
     furi_hal_vibro_on(true);
@@ -340,11 +340,11 @@ void furi_hal_power_off() {
     furi_hal_vibro_on(false);
 }
 
-void furi_hal_power_reset() {
+FURI_NORETURN void furi_hal_power_reset(void) {
     NVIC_SystemReset();
 }
 
-bool furi_hal_power_enable_otg() {
+bool furi_hal_power_enable_otg(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     bq25896_set_boost_lim(&furi_hal_i2c_handle_power, BoostLim_2150);
     bq25896_enable_otg(&furi_hal_i2c_handle_power);
@@ -355,20 +355,20 @@ bool furi_hal_power_enable_otg() {
     return ret;
 }
 
-void furi_hal_power_disable_otg() {
+void furi_hal_power_disable_otg(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     bq25896_disable_otg(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
 }
 
-bool furi_hal_power_is_otg_enabled() {
+bool furi_hal_power_is_otg_enabled(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     bool ret = bq25896_is_otg_enabled(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     return ret;
 }
 
-float furi_hal_power_get_battery_charge_voltage_limit() {
+float furi_hal_power_get_battery_charge_voltage_limit(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     float ret = (float)bq25896_get_vreg_voltage(&furi_hal_i2c_handle_power) / 1000.0f;
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
@@ -382,35 +382,35 @@ void furi_hal_power_set_battery_charge_voltage_limit(float voltage) {
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
 }
 
-bool furi_hal_power_check_otg_fault() {
+bool furi_hal_power_check_otg_fault(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     bool ret = bq25896_check_otg_fault(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     return ret;
 }
 
-void furi_hal_power_check_otg_status() {
+void furi_hal_power_check_otg_status(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     if(bq25896_check_otg_fault(&furi_hal_i2c_handle_power))
         bq25896_disable_otg(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
 }
 
-uint32_t furi_hal_power_get_battery_remaining_capacity() {
+uint32_t furi_hal_power_get_battery_remaining_capacity(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     uint32_t ret = bq27220_get_remaining_capacity(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     return ret;
 }
 
-uint32_t furi_hal_power_get_battery_full_capacity() {
+uint32_t furi_hal_power_get_battery_full_capacity(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     uint32_t ret = bq27220_get_full_charge_capacity(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     return ret;
 }
 
-uint32_t furi_hal_power_get_battery_design_capacity() {
+uint32_t furi_hal_power_get_battery_design_capacity(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     uint32_t ret = bq27220_get_design_capacity(&furi_hal_i2c_handle_power);
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
@@ -425,6 +425,8 @@ float furi_hal_power_get_battery_voltage(FuriHalPowerIC ic) {
         ret = (float)bq25896_get_vbat_voltage(&furi_hal_i2c_handle_power) / 1000.0f;
     } else if(ic == FuriHalPowerICFuelGauge) {
         ret = (float)bq27220_get_voltage(&furi_hal_i2c_handle_power) / 1000.0f;
+    } else {
+        furi_crash();
     }
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
 
@@ -439,6 +441,8 @@ float furi_hal_power_get_battery_current(FuriHalPowerIC ic) {
         ret = (float)bq25896_get_vbat_current(&furi_hal_i2c_handle_power) / 1000.0f;
     } else if(ic == FuriHalPowerICFuelGauge) {
         ret = (float)bq27220_get_current(&furi_hal_i2c_handle_power) / 1000.0f;
+    } else {
+        furi_crash();
     }
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
 
@@ -466,22 +470,22 @@ float furi_hal_power_get_battery_temperature(FuriHalPowerIC ic) {
     return ret;
 }
 
-float furi_hal_power_get_usb_voltage() {
+float furi_hal_power_get_usb_voltage(void) {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
     float ret = (float)bq25896_get_vbus_voltage(&furi_hal_i2c_handle_power) / 1000.0f;
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     return ret;
 }
 
-void furi_hal_power_enable_external_3_3v() {
+void furi_hal_power_enable_external_3_3v(void) {
     furi_hal_gpio_write(&gpio_periph_power, 1);
 }
 
-void furi_hal_power_disable_external_3_3v() {
+void furi_hal_power_disable_external_3_3v(void) {
     furi_hal_gpio_write(&gpio_periph_power, 0);
 }
 
-void furi_hal_power_suppress_charge_enter() {
+void furi_hal_power_suppress_charge_enter(void) {
     FURI_CRITICAL_ENTER();
     bool disable_charging = furi_hal_power.suppress_charge == 0;
     furi_hal_power.suppress_charge++;
@@ -494,7 +498,7 @@ void furi_hal_power_suppress_charge_enter() {
     }
 }
 
-void furi_hal_power_suppress_charge_exit() {
+void furi_hal_power_suppress_charge_exit(void) {
     FURI_CRITICAL_ENTER();
     furi_hal_power.suppress_charge--;
     bool enable_charging = furi_hal_power.suppress_charge == 0;
@@ -508,7 +512,7 @@ void furi_hal_power_suppress_charge_exit() {
 }
 
 void furi_hal_power_info_get(PropertyValueCallback out, char sep, void* context) {
-    furi_assert(out);
+    furi_check(out);
 
     FuriString* value = furi_string_alloc();
     FuriString* key = furi_string_alloc();
@@ -581,7 +585,7 @@ void furi_hal_power_info_get(PropertyValueCallback out, char sep, void* context)
 }
 
 void furi_hal_power_debug_get(PropertyValueCallback out, void* context) {
-    furi_assert(out);
+    furi_check(out);
 
     FuriString* value = furi_string_alloc();
     FuriString* key = furi_string_alloc();
diff --git a/targets/f7/furi_hal/furi_hal_pwm.c b/targets/f7/furi_hal/furi_hal_pwm.c
index 879460e6b..4828cefbb 100644
--- a/targets/f7/furi_hal/furi_hal_pwm.c
+++ b/targets/f7/furi_hal/furi_hal_pwm.c
@@ -69,6 +69,8 @@ void furi_hal_pwm_start(FuriHalPwmOutputId channel, uint32_t freq, uint8_t duty)
         furi_hal_pwm_set_params(channel, freq, duty);
 
         LL_LPTIM_StartCounter(LPTIM2, LL_LPTIM_OPERATING_MODE_CONTINUOUS);
+    } else {
+        furi_crash();
     }
 }
 
@@ -79,6 +81,8 @@ void furi_hal_pwm_stop(FuriHalPwmOutputId channel) {
     } else if(channel == FuriHalPwmOutputIdLptim2PA4) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog);
         furi_hal_bus_disable(FuriHalBusLPTIM2);
+    } else {
+        furi_crash();
     }
 }
 
@@ -88,7 +92,8 @@ bool furi_hal_pwm_is_running(FuriHalPwmOutputId channel) {
     } else if(channel == FuriHalPwmOutputIdLptim2PA4) {
         return furi_hal_bus_is_enabled(FuriHalBusLPTIM2);
     }
-    return false;
+
+    furi_crash();
 }
 
 void furi_hal_pwm_set_params(FuriHalPwmOutputId channel, uint32_t freq, uint8_t duty) {
@@ -134,5 +139,7 @@ void furi_hal_pwm_set_params(FuriHalPwmOutputId channel, uint32_t freq, uint8_t
         } else {
             LL_RCC_SetLPTIMClockSource(LL_RCC_LPTIM2_CLKSOURCE_PCLK1);
         }
+    } else {
+        furi_crash();
     }
 }
diff --git a/targets/f7/furi_hal/furi_hal_random.c b/targets/f7/furi_hal/furi_hal_random.c
index 225519303..fd557fa98 100644
--- a/targets/f7/furi_hal/furi_hal_random.c
+++ b/targets/f7/furi_hal/furi_hal_random.c
@@ -10,7 +10,7 @@
 
 #define TAG "FuriHalRandom"
 
-static uint32_t furi_hal_random_read_rng() {
+static uint32_t furi_hal_random_read_rng(void) {
     while(LL_RNG_IsActiveFlag_CECS(RNG) && LL_RNG_IsActiveFlag_SECS(RNG) &&
           !LL_RNG_IsActiveFlag_DRDY(RNG)) {
         /* Error handling as described in RM0434, pg. 582-583 */
@@ -33,12 +33,12 @@ static uint32_t furi_hal_random_read_rng() {
     return LL_RNG_ReadRandData32(RNG);
 }
 
-void furi_hal_random_init() {
+void furi_hal_random_init(void) {
     furi_hal_bus_enable(FuriHalBusRNG);
     LL_RCC_SetRNGClockSource(LL_RCC_RNG_CLKSOURCE_CLK48);
 }
 
-uint32_t furi_hal_random_get() {
+uint32_t furi_hal_random_get(void) {
     while(LL_HSEM_1StepLock(HSEM, CFG_HW_RNG_SEMID))
         ;
     LL_RNG_Enable(RNG);
@@ -53,6 +53,9 @@ uint32_t furi_hal_random_get() {
 }
 
 void furi_hal_random_fill_buf(uint8_t* buf, uint32_t len) {
+    furi_check(buf);
+    furi_check(len);
+
     while(LL_HSEM_1StepLock(HSEM, CFG_HW_RNG_SEMID))
         ;
     LL_RNG_Enable(RNG);
@@ -71,10 +74,10 @@ void srand(unsigned seed) {
     UNUSED(seed);
 }
 
-int rand() {
+int rand(void) {
     return (furi_hal_random_get() & RAND_MAX);
 }
 
-long random() {
+long random(void) {
     return (furi_hal_random_get() & RAND_MAX);
 }
diff --git a/targets/f7/furi_hal/furi_hal_region.c b/targets/f7/furi_hal/furi_hal_region.c
index 0f0cb855c..c8af57a19 100644
--- a/targets/f7/furi_hal/furi_hal_region.c
+++ b/targets/f7/furi_hal/furi_hal_region.c
@@ -15,7 +15,7 @@ const FuriHalRegion furi_hal_region_zero = {
 
 static const FuriHalRegion* furi_hal_region = NULL;
 
-const FuriHalRegion* furi_hal_region_get() {
+const FuriHalRegion* furi_hal_region_get(void) {
     return &furi_hal_region_zero;
 }
 
@@ -44,10 +44,10 @@ bool furi_hal_region_is_frequency_allowed(uint32_t frequency) {
     return true;
 }
 
-bool furi_hal_region_is_provisioned() {
+bool furi_hal_region_is_provisioned(void) {
     return true;
 }
 
-const char* furi_hal_region_get_name() {
+const char* furi_hal_region_get_name(void) {
     return "00";
 }
diff --git a/targets/f7/furi_hal/furi_hal_resources.c b/targets/f7/furi_hal/furi_hal_resources.c
index fe4640d5b..b98d93769 100644
--- a/targets/f7/furi_hal/furi_hal_resources.c
+++ b/targets/f7/furi_hal/furi_hal_resources.c
@@ -125,7 +125,7 @@ static void furi_hal_resources_init_gpio_pins(GpioMode mode) {
     }
 }
 
-void furi_hal_resources_init_early() {
+void furi_hal_resources_init_early(void) {
     furi_hal_bus_enable(FuriHalBusGPIOA);
     furi_hal_bus_enable(FuriHalBusGPIOB);
     furi_hal_bus_enable(FuriHalBusGPIOC);
@@ -172,7 +172,7 @@ void furi_hal_resources_init_early() {
     furi_hal_resources_init_gpio_pins(GpioModeAnalog);
 }
 
-void furi_hal_resources_deinit_early() {
+void furi_hal_resources_deinit_early(void) {
     furi_hal_resources_init_input_pins(GpioModeAnalog);
     furi_hal_bus_disable(FuriHalBusGPIOA);
     furi_hal_bus_disable(FuriHalBusGPIOB);
@@ -182,7 +182,7 @@ void furi_hal_resources_deinit_early() {
     furi_hal_bus_disable(FuriHalBusGPIOH);
 }
 
-void furi_hal_resources_init() {
+void furi_hal_resources_init(void) {
     // Button pins
     furi_hal_resources_init_input_pins(GpioModeInterruptRiseFall);
 
diff --git a/targets/f7/furi_hal/furi_hal_resources.h b/targets/f7/furi_hal/furi_hal_resources.h
index 6ca6f9df0..bb01b9bcd 100644
--- a/targets/f7/furi_hal/furi_hal_resources.h
+++ b/targets/f7/furi_hal/furi_hal_resources.h
@@ -214,11 +214,11 @@ extern const GpioPin gpio_usb_dp;
 #define NFC_IRQ_Pin RFID_PULL_Pin
 #define NFC_IRQ_GPIO_Port RFID_PULL_GPIO_Port
 
-void furi_hal_resources_init_early();
+void furi_hal_resources_init_early(void);
 
-void furi_hal_resources_deinit_early();
+void furi_hal_resources_deinit_early(void);
 
-void furi_hal_resources_init();
+void furi_hal_resources_init(void);
 
 /**
  * Get a corresponding external connector pin number for a gpio
diff --git a/targets/f7/furi_hal/furi_hal_rfid.c b/targets/f7/furi_hal/furi_hal_rfid.c
index c40932922..07ea5ab0a 100644
--- a/targets/f7/furi_hal/furi_hal_rfid.c
+++ b/targets/f7/furi_hal/furi_hal_rfid.c
@@ -67,8 +67,8 @@ FuriHalRfid* furi_hal_rfid = NULL;
 #define LFRFID_LL_EMULATE_TIM TIM2
 #define LFRFID_LL_EMULATE_CHANNEL LL_TIM_CHANNEL_CH3
 
-void furi_hal_rfid_init() {
-    furi_assert(furi_hal_rfid == NULL);
+void furi_hal_rfid_init(void) {
+    furi_check(furi_hal_rfid == NULL);
     furi_hal_rfid = malloc(sizeof(FuriHalRfid));
     furi_hal_rfid->field.counter = 0;
     furi_hal_rfid->field.set_tim_counter_cnt = 0;
@@ -95,7 +95,7 @@ void furi_hal_rfid_init() {
     NVIC_EnableIRQ(COMP_IRQn);
 }
 
-void furi_hal_rfid_pins_reset() {
+void furi_hal_rfid_pins_reset(void) {
     // ibutton bus disable
     furi_hal_ibutton_pin_reset();
 
@@ -112,7 +112,7 @@ void furi_hal_rfid_pins_reset() {
     furi_hal_gpio_init(&gpio_rfid_data_in, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 }
 
-static void furi_hal_rfid_pins_emulate() {
+static void furi_hal_rfid_pins_emulate(void) {
     // ibutton low
     furi_hal_ibutton_pin_configure();
     furi_hal_ibutton_pin_write(false);
@@ -133,7 +133,7 @@ static void furi_hal_rfid_pins_emulate() {
         &gpio_rfid_carrier, GpioModeAltFunctionPushPull, GpioPullNo, GpioSpeedLow, GpioAltFn2TIM2);
 }
 
-static void furi_hal_rfid_pins_read() {
+static void furi_hal_rfid_pins_read(void) {
     // ibutton low
     furi_hal_ibutton_pin_configure();
     furi_hal_ibutton_pin_write(false);
@@ -154,7 +154,7 @@ static void furi_hal_rfid_pins_read() {
     furi_hal_gpio_init(&gpio_rfid_data_in, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 }
 
-static void furi_hal_rfid_pins_field() {
+static void furi_hal_rfid_pins_field(void) {
     // ibutton low
     furi_hal_ibutton_pin_configure();
     furi_hal_ibutton_pin_write(false);
@@ -171,11 +171,11 @@ static void furi_hal_rfid_pins_field() {
         &gpio_rfid_carrier, GpioModeAltFunctionPushPull, GpioPullNo, GpioSpeedLow, GpioAltFn2TIM2);
 }
 
-void furi_hal_rfid_pin_pull_release() {
+void furi_hal_rfid_pin_pull_release(void) {
     furi_hal_gpio_write(&gpio_nfc_irq_rfid_pull, true);
 }
 
-void furi_hal_rfid_pin_pull_pulldown() {
+void furi_hal_rfid_pin_pull_pulldown(void) {
     furi_hal_gpio_write(&gpio_nfc_irq_rfid_pull, false);
 }
 
@@ -201,19 +201,19 @@ void furi_hal_rfid_tim_read_start(float freq, float duty_cycle) {
     furi_hal_rfid_tim_read_continue();
 }
 
-void furi_hal_rfid_tim_read_continue() {
+void furi_hal_rfid_tim_read_continue(void) {
     LL_TIM_EnableAllOutputs(FURI_HAL_RFID_READ_TIMER);
 }
 
-void furi_hal_rfid_tim_read_pause() {
+void furi_hal_rfid_tim_read_pause(void) {
     LL_TIM_DisableAllOutputs(FURI_HAL_RFID_READ_TIMER);
 }
 
-void furi_hal_rfid_tim_read_stop() {
+void furi_hal_rfid_tim_read_stop(void) {
     furi_hal_bus_disable(FURI_HAL_RFID_READ_TIMER_BUS);
 }
 
-static void furi_hal_rfid_tim_emulate() {
+static void furi_hal_rfid_tim_emulate(void) {
     LL_TIM_SetPrescaler(FURI_HAL_RFID_EMULATE_TIMER, 0);
     LL_TIM_SetCounterMode(FURI_HAL_RFID_EMULATE_TIMER, LL_TIM_COUNTERMODE_UP);
     LL_TIM_SetAutoReload(FURI_HAL_RFID_EMULATE_TIMER, 1);
@@ -258,7 +258,7 @@ static void furi_hal_capture_dma_isr(void* context) {
 }
 
 void furi_hal_rfid_tim_read_capture_start(FuriHalRfidReadCaptureCallback callback, void* context) {
-    furi_assert(furi_hal_rfid);
+    furi_check(furi_hal_rfid);
 
     furi_hal_rfid->read_capture_callback = callback;
     furi_hal_rfid->context = context;
@@ -308,7 +308,7 @@ void furi_hal_rfid_tim_read_capture_start(FuriHalRfidReadCaptureCallback callbac
     furi_hal_rfid_comp_start();
 }
 
-void furi_hal_rfid_tim_read_capture_stop() {
+void furi_hal_rfid_tim_read_capture_stop(void) {
     furi_hal_rfid_comp_stop();
 
     furi_hal_interrupt_set_isr(FURI_HAL_RFID_EMULATE_TIMER_IRQ, NULL, NULL);
@@ -338,7 +338,7 @@ void furi_hal_rfid_tim_emulate_dma_start(
     size_t length,
     FuriHalRfidDMACallback callback,
     void* context) {
-    furi_assert(furi_hal_rfid);
+    furi_check(furi_hal_rfid);
 
     // setup interrupts
     furi_hal_rfid->dma_callback = callback;
@@ -401,7 +401,7 @@ void furi_hal_rfid_tim_emulate_dma_start(
     LL_TIM_EnableCounter(FURI_HAL_RFID_EMULATE_TIMER);
 }
 
-void furi_hal_rfid_tim_emulate_dma_stop() {
+void furi_hal_rfid_tim_emulate_dma_stop(void) {
     LL_TIM_DisableCounter(FURI_HAL_RFID_EMULATE_TIMER);
     LL_TIM_DisableAllOutputs(FURI_HAL_RFID_EMULATE_TIMER);
 
@@ -431,7 +431,7 @@ void furi_hal_rfid_set_read_pulse(uint32_t pulse) {
 #endif
 }
 
-void furi_hal_rfid_comp_start() {
+void furi_hal_rfid_comp_start(void) {
     LL_COMP_Enable(COMP1);
     // Magic
     uint32_t wait_loop_index = ((80 / 10UL) * ((SystemCoreClock / (100000UL * 2UL)) + 1UL));
@@ -440,7 +440,7 @@ void furi_hal_rfid_comp_start() {
     }
 }
 
-void furi_hal_rfid_comp_stop() {
+void furi_hal_rfid_comp_stop(void) {
     LL_COMP_Disable(COMP1);
 }
 
@@ -456,7 +456,7 @@ void furi_hal_rfid_comp_set_callback(FuriHalRfidCompCallback callback, void* con
 }
 
 /* Comparator trigger event */
-void COMP_IRQHandler() {
+void COMP_IRQHandler(void) {
     if(LL_EXTI_IsActiveFlag_0_31(LL_EXTI_LINE_20)) {
         LL_EXTI_ClearFlag_0_31(LL_EXTI_LINE_20);
     }
@@ -467,7 +467,7 @@ void COMP_IRQHandler() {
     }
 }
 
-static void furi_hal_rfid_field_tim_setup() {
+static void furi_hal_rfid_field_tim_setup(void) {
     // setup timer counter
     furi_hal_bus_enable(FURI_HAL_RFID_FIELD_COUNTER_TIMER_BUS);
 
@@ -582,6 +582,8 @@ void furi_hal_rfid_field_detect_stop(void) {
 }
 
 bool furi_hal_rfid_field_is_present(uint32_t* frequency) {
+    furi_check(frequency);
+
     *frequency = furi_hal_rfid->field.counter * 10;
     return (
         (*frequency >= FURI_HAL_RFID_FIELD_FREQUENCY_MIN) &&
diff --git a/targets/f7/furi_hal/furi_hal_rfid.h b/targets/f7/furi_hal/furi_hal_rfid.h
index 7087ba991..216e0d98c 100644
--- a/targets/f7/furi_hal/furi_hal_rfid.h
+++ b/targets/f7/furi_hal/furi_hal_rfid.h
@@ -15,19 +15,19 @@ extern "C" {
 
 /** Initialize RFID subsystem
  */
-void furi_hal_rfid_init();
+void furi_hal_rfid_init(void);
 
 /** Config rfid pins to reset state
  */
-void furi_hal_rfid_pins_reset();
+void furi_hal_rfid_pins_reset(void);
 
 /** Release rfid pull pin
  */
-void furi_hal_rfid_pin_pull_release();
+void furi_hal_rfid_pin_pull_release(void);
 
 /** Pulldown rfid pull pin
  */
-void furi_hal_rfid_pin_pull_pulldown();
+void furi_hal_rfid_pin_pull_pulldown(void);
 
 /** Start read timer
  * @param      freq        timer frequency
@@ -37,21 +37,21 @@ void furi_hal_rfid_tim_read_start(float freq, float duty_cycle);
 
 /** Pause read timer, to be able to continue later
  */
-void furi_hal_rfid_tim_read_pause();
+void furi_hal_rfid_tim_read_pause(void);
 
 /** Continue read timer
  */
-void furi_hal_rfid_tim_read_continue();
+void furi_hal_rfid_tim_read_continue(void);
 
 /** Stop read timer
  */
-void furi_hal_rfid_tim_read_stop();
+void furi_hal_rfid_tim_read_stop(void);
 
 typedef void (*FuriHalRfidReadCaptureCallback)(bool level, uint32_t duration, void* context);
 
 void furi_hal_rfid_tim_read_capture_start(FuriHalRfidReadCaptureCallback callback, void* context);
 
-void furi_hal_rfid_tim_read_capture_stop();
+void furi_hal_rfid_tim_read_capture_stop(void);
 
 typedef void (*FuriHalRfidDMACallback)(bool half, void* context);
 
@@ -62,7 +62,7 @@ void furi_hal_rfid_tim_emulate_dma_start(
     FuriHalRfidDMACallback callback,
     void* context);
 
-void furi_hal_rfid_tim_emulate_dma_stop();
+void furi_hal_rfid_tim_emulate_dma_stop(void);
 
 /** Set read timer period
  *
@@ -77,10 +77,10 @@ void furi_hal_rfid_set_read_period(uint32_t period);
 void furi_hal_rfid_set_read_pulse(uint32_t pulse);
 
 /** Start/Enable comparator */
-void furi_hal_rfid_comp_start();
+void furi_hal_rfid_comp_start(void);
 
 /** Stop/Disable comparator */
-void furi_hal_rfid_comp_stop();
+void furi_hal_rfid_comp_stop(void);
 
 typedef void (*FuriHalRfidCompCallback)(bool level, void* context);
 
@@ -88,10 +88,10 @@ typedef void (*FuriHalRfidCompCallback)(bool level, void* context);
 void furi_hal_rfid_comp_set_callback(FuriHalRfidCompCallback callback, void* context);
 
 /** Start/Enable Field Presence detect */
-void furi_hal_rfid_field_detect_start();
+void furi_hal_rfid_field_detect_start(void);
 
 /** Stop/Disable Field Presence detect */
-void furi_hal_rfid_field_detect_stop();
+void furi_hal_rfid_field_detect_stop(void);
 
 /** Check Field Presence
  *
diff --git a/targets/f7/furi_hal/furi_hal_rtc.c b/targets/f7/furi_hal/furi_hal_rtc.c
index cd4fa8b9b..a1c8b46c3 100644
--- a/targets/f7/furi_hal/furi_hal_rtc.c
+++ b/targets/f7/furi_hal/furi_hal_rtc.c
@@ -60,12 +60,12 @@ static const uint32_t furi_hal_rtc_log_baud_rates[] = {
     [FuriHalRtcLogBaudRate1843200] = 1843200,
 };
 
-static void furi_hal_rtc_reset() {
+static void furi_hal_rtc_reset(void) {
     LL_RCC_ForceBackupDomainReset();
     LL_RCC_ReleaseBackupDomainReset();
 }
 
-static bool furi_hal_rtc_start_clock_and_switch() {
+static bool furi_hal_rtc_start_clock_and_switch(void) {
     // Clock operation require access to Backup Domain
     LL_PWR_EnableBkUpAccess();
 
@@ -90,7 +90,7 @@ static bool furi_hal_rtc_start_clock_and_switch() {
     }
 }
 
-static void furi_hal_rtc_recover() {
+static void furi_hal_rtc_recover(void) {
     DateTime datetime = {0};
 
     // Handle fixable LSE failure
@@ -127,7 +127,7 @@ static void furi_hal_rtc_recover() {
     }
 }
 
-void furi_hal_rtc_init_early() {
+void furi_hal_rtc_init_early(void) {
     // Enable RTCAPB clock
     LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_RTCAPB);
 
@@ -151,10 +151,10 @@ void furi_hal_rtc_init_early() {
     }
 }
 
-void furi_hal_rtc_deinit_early() {
+void furi_hal_rtc_deinit_early(void) {
 }
 
-void furi_hal_rtc_init() {
+void furi_hal_rtc_init(void) {
     LL_RTC_InitTypeDef RTC_InitStruct;
     RTC_InitStruct.HourFormat = LL_RTC_HOURFORMAT_24HOUR;
     RTC_InitStruct.AsynchPrescaler = 127;
@@ -169,7 +169,7 @@ void furi_hal_rtc_init() {
     FURI_LOG_I(TAG, "Init OK");
 }
 
-void furi_hal_rtc_sync_shadow() {
+void furi_hal_rtc_sync_shadow(void) {
     if(!LL_RTC_IsShadowRegBypassEnabled(RTC)) {
         LL_RTC_ClearFlag_RS(RTC);
         while(!LL_RTC_IsActiveFlag_RS(RTC)) {
@@ -177,7 +177,7 @@ void furi_hal_rtc_sync_shadow() {
     }
 }
 
-void furi_hal_rtc_reset_registers() {
+void furi_hal_rtc_reset_registers(void) {
     for(size_t i = 0; i < RTC_BKP_NUMBER; i++) {
         furi_hal_rtc_set_register(i, 0);
     }
@@ -205,7 +205,7 @@ void furi_hal_rtc_set_log_level(uint8_t level) {
     furi_log_set_level(level);
 }
 
-uint8_t furi_hal_rtc_get_log_level() {
+uint8_t furi_hal_rtc_get_log_level(void) {
     uint32_t data_reg = furi_hal_rtc_get_register(FuriHalRtcRegisterSystem);
     SystemReg* data = (SystemReg*)&data_reg;
     return data->log_level;
@@ -222,7 +222,7 @@ void furi_hal_rtc_set_log_device(FuriHalRtcLogDevice device) {
         furi_hal_rtc_log_baud_rates[furi_hal_rtc_get_log_baud_rate()]);
 }
 
-FuriHalRtcLogDevice furi_hal_rtc_get_log_device() {
+FuriHalRtcLogDevice furi_hal_rtc_get_log_device(void) {
     uint32_t data_reg = furi_hal_rtc_get_register(FuriHalRtcRegisterSystem);
     SystemReg* data = (SystemReg*)&data_reg;
     return data->log_device;
@@ -239,7 +239,7 @@ void furi_hal_rtc_set_log_baud_rate(FuriHalRtcLogBaudRate baud_rate) {
         furi_hal_rtc_log_baud_rates[furi_hal_rtc_get_log_baud_rate()]);
 }
 
-FuriHalRtcLogBaudRate furi_hal_rtc_get_log_baud_rate() {
+FuriHalRtcLogBaudRate furi_hal_rtc_get_log_baud_rate(void) {
     uint32_t data_reg = furi_hal_rtc_get_register(FuriHalRtcRegisterSystem);
     SystemReg* data = (SystemReg*)&data_reg;
     return data->log_baud_rate;
@@ -280,7 +280,7 @@ void furi_hal_rtc_set_boot_mode(FuriHalRtcBootMode mode) {
     furi_hal_rtc_set_register(FuriHalRtcRegisterSystem, data_reg);
 }
 
-FuriHalRtcBootMode furi_hal_rtc_get_boot_mode() {
+FuriHalRtcBootMode furi_hal_rtc_get_boot_mode(void) {
     uint32_t data_reg = furi_hal_rtc_get_register(FuriHalRtcRegisterSystem);
     SystemReg* data = (SystemReg*)&data_reg;
     return data->boot_mode;
@@ -293,7 +293,7 @@ void furi_hal_rtc_set_heap_track_mode(FuriHalRtcHeapTrackMode mode) {
     furi_hal_rtc_set_register(FuriHalRtcRegisterSystem, data_reg);
 }
 
-FuriHalRtcHeapTrackMode furi_hal_rtc_get_heap_track_mode() {
+FuriHalRtcHeapTrackMode furi_hal_rtc_get_heap_track_mode(void) {
     uint32_t data_reg = furi_hal_rtc_get_register(FuriHalRtcRegisterSystem);
     SystemReg* data = (SystemReg*)&data_reg;
     return data->heap_track_mode;
@@ -306,7 +306,7 @@ void furi_hal_rtc_set_locale_units(FuriHalRtcLocaleUnits value) {
     furi_hal_rtc_set_register(FuriHalRtcRegisterSystem, data_reg);
 }
 
-FuriHalRtcLocaleUnits furi_hal_rtc_get_locale_units() {
+FuriHalRtcLocaleUnits furi_hal_rtc_get_locale_units(void) {
     uint32_t data_reg = furi_hal_rtc_get_register(FuriHalRtcRegisterSystem);
     SystemReg* data = (SystemReg*)&data_reg;
     return data->locale_units;
@@ -319,7 +319,7 @@ void furi_hal_rtc_set_locale_timeformat(FuriHalRtcLocaleTimeFormat value) {
     furi_hal_rtc_set_register(FuriHalRtcRegisterSystem, data_reg);
 }
 
-FuriHalRtcLocaleTimeFormat furi_hal_rtc_get_locale_timeformat() {
+FuriHalRtcLocaleTimeFormat furi_hal_rtc_get_locale_timeformat(void) {
     uint32_t data_reg = furi_hal_rtc_get_register(FuriHalRtcRegisterSystem);
     SystemReg* data = (SystemReg*)&data_reg;
     return data->locale_timeformat;
@@ -332,7 +332,7 @@ void furi_hal_rtc_set_locale_dateformat(FuriHalRtcLocaleDateFormat value) {
     furi_hal_rtc_set_register(FuriHalRtcRegisterSystem, data_reg);
 }
 
-FuriHalRtcLocaleDateFormat furi_hal_rtc_get_locale_dateformat() {
+FuriHalRtcLocaleDateFormat furi_hal_rtc_get_locale_dateformat(void) {
     uint32_t data_reg = furi_hal_rtc_get_register(FuriHalRtcRegisterSystem);
     SystemReg* data = (SystemReg*)&data_reg;
     return data->locale_dateformat;
@@ -340,7 +340,7 @@ FuriHalRtcLocaleDateFormat furi_hal_rtc_get_locale_dateformat() {
 
 void furi_hal_rtc_set_datetime(DateTime* datetime) {
     furi_check(!FURI_IS_IRQ_MODE());
-    furi_assert(datetime);
+    furi_check(datetime);
 
     FURI_CRITICAL_ENTER();
     /* Disable write protection */
@@ -379,7 +379,7 @@ void furi_hal_rtc_set_datetime(DateTime* datetime) {
 
 void furi_hal_rtc_get_datetime(DateTime* datetime) {
     furi_check(!FURI_IS_IRQ_MODE());
-    furi_assert(datetime);
+    furi_check(datetime);
 
     FURI_CRITICAL_ENTER();
     uint32_t time = LL_RTC_TIME_Get(RTC); // 0x00HHMMSS
@@ -399,7 +399,7 @@ void furi_hal_rtc_set_fault_data(uint32_t value) {
     furi_hal_rtc_set_register(FuriHalRtcRegisterFaultData, value);
 }
 
-uint32_t furi_hal_rtc_get_fault_data() {
+uint32_t furi_hal_rtc_get_fault_data(void) {
     return furi_hal_rtc_get_register(FuriHalRtcRegisterFaultData);
 }
 
@@ -407,11 +407,11 @@ void furi_hal_rtc_set_pin_fails(uint32_t value) {
     furi_hal_rtc_set_register(FuriHalRtcRegisterPinFails, value);
 }
 
-uint32_t furi_hal_rtc_get_pin_fails() {
+uint32_t furi_hal_rtc_get_pin_fails(void) {
     return furi_hal_rtc_get_register(FuriHalRtcRegisterPinFails);
 }
 
-uint32_t furi_hal_rtc_get_timestamp() {
+uint32_t furi_hal_rtc_get_timestamp(void) {
     DateTime datetime = {0};
     furi_hal_rtc_get_datetime(&datetime);
     return datetime_datetime_to_timestamp(&datetime);
diff --git a/targets/f7/furi_hal/furi_hal_rtc.h b/targets/f7/furi_hal/furi_hal_rtc.h
index c871d5060..3bdbb0c72 100644
--- a/targets/f7/furi_hal/furi_hal_rtc.h
+++ b/targets/f7/furi_hal/furi_hal_rtc.h
@@ -100,7 +100,7 @@ void furi_hal_rtc_init(void);
 void furi_hal_rtc_sync_shadow(void);
 
 /** Reset ALL RTC registers content */
-void furi_hal_rtc_reset_registers();
+void furi_hal_rtc_reset_registers(void);
 
 /** Get RTC register content
  *
@@ -199,7 +199,7 @@ FuriHalRtcHeapTrackMode furi_hal_rtc_get_heap_track_mode(void);
 
 /** Set locale units
  *
- * @param[in]  mode  The RTC Locale Units
+ * @param[in]  value  The RTC Locale Units
  */
 void furi_hal_rtc_set_locale_units(FuriHalRtcLocaleUnits value);
 
diff --git a/targets/f7/furi_hal/furi_hal_sd.c b/targets/f7/furi_hal/furi_hal_sd.c
index 619f6f890..fb7f43ec8 100644
--- a/targets/f7/furi_hal/furi_hal_sd.c
+++ b/targets/f7/furi_hal/furi_hal_sd.c
@@ -206,17 +206,17 @@ typedef struct {
 /** Pointer to currently used SPI Handle */
 FuriHalSpiBusHandle* furi_hal_sd_spi_handle = NULL;
 
-static inline void sd_spi_select_card() {
+static inline void sd_spi_select_card(void) {
     furi_hal_gpio_write(furi_hal_sd_spi_handle->cs, false);
     furi_delay_us(10); // Entry guard time for some SD cards
 }
 
-static inline void sd_spi_deselect_card() {
+static inline void sd_spi_deselect_card(void) {
     furi_delay_us(10); // Exit guard time for some SD cards
     furi_hal_gpio_write(furi_hal_sd_spi_handle->cs, true);
 }
 
-static void sd_spi_bus_to_ground() {
+static void sd_spi_bus_to_ground(void) {
     furi_hal_gpio_init_ex(
         furi_hal_sd_spi_handle->miso,
         GpioModeOutputPushPull,
@@ -242,7 +242,7 @@ static void sd_spi_bus_to_ground() {
     furi_hal_gpio_write(furi_hal_sd_spi_handle->sck, false);
 }
 
-static void sd_spi_bus_rise_up() {
+static void sd_spi_bus_rise_up(void) {
     sd_spi_deselect_card();
 
     furi_hal_gpio_init_ex(
@@ -329,12 +329,12 @@ static FuriStatus sd_spi_wait_for_data(uint8_t data, uint32_t timeout_ms) {
     return FuriStatusOk;
 }
 
-static inline void sd_spi_deselect_card_and_purge() {
+static inline void sd_spi_deselect_card_and_purge(void) {
     sd_spi_deselect_card();
     sd_spi_read_byte();
 }
 
-static inline void sd_spi_purge_crc() {
+static inline void sd_spi_purge_crc(void) {
     sd_spi_read_byte();
     sd_spi_read_byte();
 }
@@ -833,7 +833,7 @@ static inline void sd_cache_invalidate_range(uint32_t start_sector, uint32_t end
     sector_cache_invalidate_range(start_sector, end_sector);
 }
 
-static inline void sd_cache_invalidate_all() {
+static inline void sd_cache_invalidate_all(void) {
     sector_cache_init();
 }
 
@@ -907,7 +907,7 @@ bool furi_hal_sd_is_present(void) {
     return result;
 }
 
-uint8_t furi_hal_sd_max_mount_retry_count() {
+uint8_t furi_hal_sd_max_mount_retry_count(void) {
     return 10;
 }
 
@@ -972,6 +972,8 @@ FuriStatus furi_hal_sd_get_card_state(void) {
 }
 
 FuriStatus furi_hal_sd_read_blocks(uint32_t* buff, uint32_t sector, uint32_t count) {
+    furi_check(buff);
+
     FuriStatus status;
     bool single_sector = count == 1;
 
@@ -1009,6 +1011,8 @@ FuriStatus furi_hal_sd_read_blocks(uint32_t* buff, uint32_t sector, uint32_t cou
 }
 
 FuriStatus furi_hal_sd_write_blocks(const uint32_t* buff, uint32_t sector, uint32_t count) {
+    furi_check(buff);
+
     FuriStatus status;
 
     sd_cache_invalidate_range(sector, sector + count);
@@ -1037,6 +1041,8 @@ FuriStatus furi_hal_sd_write_blocks(const uint32_t* buff, uint32_t sector, uint3
 }
 
 FuriStatus furi_hal_sd_info(FuriHalSdInfo* info) {
+    furi_check(info);
+
     FuriStatus status;
     SD_CSD csd;
     SD_CID cid;
diff --git a/targets/f7/furi_hal/furi_hal_serial.c b/targets/f7/furi_hal/furi_hal_serial.c
index e0e2d8d52..f26b412d2 100644
--- a/targets/f7/furi_hal/furi_hal_serial.c
+++ b/targets/f7/furi_hal/furi_hal_serial.c
@@ -658,6 +658,7 @@ void furi_hal_serial_resume(FuriHalSerialHandle* handle) {
 
 void furi_hal_serial_tx(FuriHalSerialHandle* handle, const uint8_t* buffer, size_t buffer_size) {
     furi_check(handle);
+
     if(handle->id == FuriHalSerialIdUsart) {
         if(LL_USART_IsEnabled(USART1) == 0) return;
 
@@ -787,7 +788,7 @@ void furi_hal_serial_async_rx_stop(FuriHalSerialHandle* handle) {
 
 bool furi_hal_serial_async_rx_available(FuriHalSerialHandle* handle) {
     furi_check(FURI_IS_IRQ_MODE());
-    furi_assert(handle->id < FuriHalSerialIdMax);
+    furi_check(handle->id < FuriHalSerialIdMax);
 
     if(handle->id == FuriHalSerialIdUsart) {
         return LL_USART_IsActiveFlag_RXNE_RXFNE(USART1);
@@ -798,7 +799,7 @@ bool furi_hal_serial_async_rx_available(FuriHalSerialHandle* handle) {
 
 uint8_t furi_hal_serial_async_rx(FuriHalSerialHandle* handle) {
     furi_check(FURI_IS_IRQ_MODE());
-    furi_assert(handle->id < FuriHalSerialIdMax);
+    furi_check(handle->id < FuriHalSerialIdMax);
 
     if(handle->id == FuriHalSerialIdUsart) {
         return LL_USART_ReceiveData8(USART1);
@@ -841,7 +842,7 @@ static uint8_t furi_hal_serial_dma_rx_read_byte(FuriHalSerialHandle* handle) {
 
 size_t furi_hal_serial_dma_rx(FuriHalSerialHandle* handle, uint8_t* data, size_t len) {
     furi_check(FURI_IS_IRQ_MODE());
-    furi_assert(furi_hal_serial[handle->id].buffer_rx_ptr != NULL);
+    furi_check(furi_hal_serial[handle->id].buffer_rx_ptr != NULL);
     size_t i = 0;
     size_t available = furi_hal_serial_dma_bytes_available(handle->id);
     if(available < len) {
diff --git a/targets/f7/furi_hal/furi_hal_speaker.c b/targets/f7/furi_hal/furi_hal_speaker.c
index ad7ed994a..0aa8ce951 100644
--- a/targets/f7/furi_hal/furi_hal_speaker.c
+++ b/targets/f7/furi_hal/furi_hal_speaker.c
@@ -18,13 +18,13 @@ static FuriMutex* furi_hal_speaker_mutex = NULL;
 
 // #define FURI_HAL_SPEAKER_NEW_VOLUME
 
-void furi_hal_speaker_init() {
+void furi_hal_speaker_init(void) {
     furi_assert(furi_hal_speaker_mutex == NULL);
     furi_hal_speaker_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
     FURI_LOG_I(TAG, "Init OK");
 }
 
-void furi_hal_speaker_deinit() {
+void furi_hal_speaker_deinit(void) {
     furi_check(furi_hal_speaker_mutex != NULL);
     furi_mutex_free(furi_hal_speaker_mutex);
     furi_hal_speaker_mutex = NULL;
@@ -44,7 +44,7 @@ bool furi_hal_speaker_acquire(uint32_t timeout) {
     }
 }
 
-void furi_hal_speaker_release() {
+void furi_hal_speaker_release(void) {
     furi_check(!FURI_IS_IRQ_MODE());
     furi_check(furi_hal_speaker_is_mine());
 
@@ -57,7 +57,7 @@ void furi_hal_speaker_release() {
     furi_check(furi_mutex_release(furi_hal_speaker_mutex) == FuriStatusOk);
 }
 
-bool furi_hal_speaker_is_mine() {
+bool furi_hal_speaker_is_mine(void) {
     return (FURI_IS_IRQ_MODE()) ||
            (furi_mutex_get_owner(furi_hal_speaker_mutex) == furi_thread_get_current_id());
 }
@@ -132,7 +132,7 @@ void furi_hal_speaker_set_volume(float volume) {
 #endif
 }
 
-void furi_hal_speaker_stop() {
+void furi_hal_speaker_stop(void) {
     furi_check(furi_hal_speaker_is_mine());
     LL_TIM_DisableAllOutputs(FURI_HAL_SPEAKER_TIMER);
     LL_TIM_DisableCounter(FURI_HAL_SPEAKER_TIMER);
diff --git a/targets/f7/furi_hal/furi_hal_spi.c b/targets/f7/furi_hal/furi_hal_spi.c
index d295ad196..e2892572f 100644
--- a/targets/f7/furi_hal/furi_hal_spi.c
+++ b/targets/f7/furi_hal/furi_hal_spi.c
@@ -23,48 +23,48 @@
 static FuriSemaphore* spi_dma_lock = NULL;
 static FuriSemaphore* spi_dma_completed = NULL;
 
-void furi_hal_spi_dma_init() {
+void furi_hal_spi_dma_init(void) {
     spi_dma_lock = furi_semaphore_alloc(1, 1);
     spi_dma_completed = furi_semaphore_alloc(1, 1);
 }
 
 void furi_hal_spi_bus_init(FuriHalSpiBus* bus) {
-    furi_assert(bus);
+    furi_check(bus);
     bus->callback(bus, FuriHalSpiBusEventInit);
 }
 
 void furi_hal_spi_bus_deinit(FuriHalSpiBus* bus) {
-    furi_assert(bus);
+    furi_check(bus);
     bus->callback(bus, FuriHalSpiBusEventDeinit);
 }
 
 void furi_hal_spi_bus_handle_init(FuriHalSpiBusHandle* handle) {
-    furi_assert(handle);
+    furi_check(handle);
     handle->callback(handle, FuriHalSpiBusHandleEventInit);
 }
 
 void furi_hal_spi_bus_handle_deinit(FuriHalSpiBusHandle* handle) {
-    furi_assert(handle);
+    furi_check(handle);
     handle->callback(handle, FuriHalSpiBusHandleEventDeinit);
 }
 
 void furi_hal_spi_acquire(FuriHalSpiBusHandle* handle) {
-    furi_assert(handle);
+    furi_check(handle);
 
     furi_hal_power_insomnia_enter();
 
     handle->bus->callback(handle->bus, FuriHalSpiBusEventLock);
     handle->bus->callback(handle->bus, FuriHalSpiBusEventActivate);
 
-    furi_assert(handle->bus->current_handle == NULL);
+    furi_check(handle->bus->current_handle == NULL);
 
     handle->bus->current_handle = handle;
     handle->callback(handle, FuriHalSpiBusHandleEventActivate);
 }
 
 void furi_hal_spi_release(FuriHalSpiBusHandle* handle) {
-    furi_assert(handle);
-    furi_assert(handle->bus->current_handle == handle);
+    furi_check(handle);
+    furi_check(handle->bus->current_handle == handle);
 
     // Handle event and unset handle
     handle->callback(handle, FuriHalSpiBusHandleEventDeactivate);
@@ -93,10 +93,10 @@ bool furi_hal_spi_bus_rx(
     uint8_t* buffer,
     size_t size,
     uint32_t timeout) {
-    furi_assert(handle);
-    furi_assert(handle->bus->current_handle == handle);
-    furi_assert(buffer);
-    furi_assert(size > 0);
+    furi_check(handle);
+    furi_check(handle->bus->current_handle == handle);
+    furi_check(buffer);
+    furi_check(size > 0);
 
     return furi_hal_spi_bus_trx(handle, buffer, buffer, size, timeout);
 }
@@ -106,10 +106,11 @@ bool furi_hal_spi_bus_tx(
     const uint8_t* buffer,
     size_t size,
     uint32_t timeout) {
-    furi_assert(handle);
-    furi_assert(handle->bus->current_handle == handle);
-    furi_assert(buffer);
-    furi_assert(size > 0);
+    furi_check(handle);
+    furi_check(handle->bus->current_handle == handle);
+    furi_check(buffer);
+    furi_check(size > 0);
+
     bool ret = true;
 
     while(size > 0) {
@@ -132,9 +133,9 @@ bool furi_hal_spi_bus_trx(
     uint8_t* rx_buffer,
     size_t size,
     uint32_t timeout) {
-    furi_assert(handle);
-    furi_assert(handle->bus->current_handle == handle);
-    furi_assert(size > 0);
+    furi_check(handle);
+    furi_check(handle->bus->current_handle == handle);
+    furi_check(size > 0);
 
     bool ret = true;
     size_t tx_size = size;
@@ -196,9 +197,9 @@ bool furi_hal_spi_bus_trx_dma(
     uint8_t* rx_buffer,
     size_t size,
     uint32_t timeout_ms) {
-    furi_assert(handle);
-    furi_assert(handle->bus->current_handle == handle);
-    furi_assert(size > 0);
+    furi_check(handle);
+    furi_check(handle->bus->current_handle == handle);
+    furi_check(size > 0);
 
     // If scheduler is not running, use blocking mode
     if(furi_kernel_is_running()) {
diff --git a/targets/f7/furi_hal/furi_hal_spi_config.c b/targets/f7/furi_hal/furi_hal_spi_config.c
index 757ac2366..8a694961a 100644
--- a/targets/f7/furi_hal/furi_hal_spi_config.c
+++ b/targets/f7/furi_hal/furi_hal_spi_config.c
@@ -77,17 +77,17 @@ const LL_SPI_InitTypeDef furi_hal_spi_preset_1edge_low_2m = {
 
 FuriMutex* furi_hal_spi_bus_r_mutex = NULL;
 
-void furi_hal_spi_config_init_early() {
+void furi_hal_spi_config_init_early(void) {
     furi_hal_spi_bus_init(&furi_hal_spi_bus_d);
     furi_hal_spi_bus_handle_init(&furi_hal_spi_bus_handle_display);
 }
 
-void furi_hal_spi_config_deinit_early() {
+void furi_hal_spi_config_deinit_early(void) {
     furi_hal_spi_bus_handle_deinit(&furi_hal_spi_bus_handle_display);
     furi_hal_spi_bus_deinit(&furi_hal_spi_bus_d);
 }
 
-void furi_hal_spi_config_init() {
+void furi_hal_spi_config_init(void) {
     furi_hal_spi_bus_init(&furi_hal_spi_bus_r);
 
     furi_hal_spi_bus_handle_init(&furi_hal_spi_bus_handle_subghz);
diff --git a/targets/f7/furi_hal/furi_hal_subghz.c b/targets/f7/furi_hal/furi_hal_subghz.c
index 6ebaaf2b0..843f637f5 100644
--- a/targets/f7/furi_hal/furi_hal_subghz.c
+++ b/targets/f7/furi_hal/furi_hal_subghz.c
@@ -52,7 +52,6 @@ typedef struct {
     const GpioPin* async_mirror_pin;
 
     int8_t rolling_counter_mult;
-    bool ext_power_amp : 1;
     bool dangerous_frequency_i : 1;
 } FuriHalSubGhz;
 
@@ -61,7 +60,6 @@ volatile FuriHalSubGhz furi_hal_subghz = {
     .regulation = SubGhzRegulationTxRx,
     .async_mirror_pin = NULL,
     .rolling_counter_mult = 1,
-    .ext_power_amp = false,
     .dangerous_frequency_i = false,
 };
 
@@ -77,24 +75,16 @@ void furi_hal_subghz_set_dangerous_frequency(bool state_i) {
     furi_hal_subghz.dangerous_frequency_i = state_i;
 }
 
-void furi_hal_subghz_set_ext_power_amp(bool enabled) {
-    furi_hal_subghz.ext_power_amp = enabled;
-}
-
-bool furi_hal_subghz_get_ext_power_amp() {
-    return furi_hal_subghz.ext_power_amp;
-}
-
 void furi_hal_subghz_set_async_mirror_pin(const GpioPin* pin) {
     furi_hal_subghz.async_mirror_pin = pin;
 }
 
-const GpioPin* furi_hal_subghz_get_data_gpio() {
+const GpioPin* furi_hal_subghz_get_data_gpio(void) {
     return &gpio_cc1101_g0;
 }
 
-void furi_hal_subghz_init() {
-    furi_assert(furi_hal_subghz.state == SubGhzStateInit);
+void furi_hal_subghz_init(void) {
+    furi_check(furi_hal_subghz.state == SubGhzStateInit);
     furi_hal_subghz.state = SubGhzStateBroken;
 
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
@@ -162,8 +152,9 @@ void furi_hal_subghz_init() {
     }
 }
 
-void furi_hal_subghz_sleep() {
-    furi_assert(furi_hal_subghz.state == SubGhzStateIdle);
+void furi_hal_subghz_sleep(void) {
+    furi_check(furi_hal_subghz.state == SubGhzStateIdle);
+
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
 
     cc1101_switch_to_idle(&furi_hal_spi_bus_handle_subghz);
@@ -176,7 +167,7 @@ void furi_hal_subghz_sleep() {
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
-void furi_hal_subghz_dump_state() {
+void furi_hal_subghz_dump_state(void) {
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     printf(
         "[furi_hal_subghz] cc1101 chip %d, version %d\r\n",
@@ -186,6 +177,8 @@ void furi_hal_subghz_dump_state() {
 }
 
 void furi_hal_subghz_load_custom_preset(const uint8_t* preset_data) {
+    furi_check(preset_data);
+
     //load config
     furi_hal_subghz_reset();
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
@@ -216,6 +209,8 @@ void furi_hal_subghz_load_custom_preset(const uint8_t* preset_data) {
 }
 
 void furi_hal_subghz_load_registers(const uint8_t* data) {
+    furi_check(data);
+
     furi_hal_subghz_reset();
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     uint32_t i = 0;
@@ -227,12 +222,17 @@ void furi_hal_subghz_load_registers(const uint8_t* data) {
 }
 
 void furi_hal_subghz_load_patable(const uint8_t data[8]) {
+    furi_check(data);
+
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     cc1101_set_pa_table(&furi_hal_spi_bus_handle_subghz, data);
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
 void furi_hal_subghz_write_packet(const uint8_t* data, uint8_t size) {
+    furi_check(data);
+    furi_check(size);
+
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     cc1101_flush_tx(&furi_hal_spi_bus_handle_subghz);
     cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_FIFO, size);
@@ -240,19 +240,19 @@ void furi_hal_subghz_write_packet(const uint8_t* data, uint8_t size) {
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
-void furi_hal_subghz_flush_rx() {
+void furi_hal_subghz_flush_rx(void) {
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     cc1101_flush_rx(&furi_hal_spi_bus_handle_subghz);
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
-void furi_hal_subghz_flush_tx() {
+void furi_hal_subghz_flush_tx(void) {
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     cc1101_flush_tx(&furi_hal_spi_bus_handle_subghz);
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
-bool furi_hal_subghz_rx_pipe_not_empty() {
+bool furi_hal_subghz_rx_pipe_not_empty(void) {
     CC1101RxBytes status[1];
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     cc1101_read_reg(
@@ -266,7 +266,7 @@ bool furi_hal_subghz_rx_pipe_not_empty() {
     }
 }
 
-bool furi_hal_subghz_is_rx_data_crc_valid() {
+bool furi_hal_subghz_is_rx_data_crc_valid(void) {
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     uint8_t data[1];
     cc1101_read_reg(&furi_hal_spi_bus_handle_subghz, CC1101_STATUS_LQI | CC1101_BURST, data);
@@ -279,19 +279,22 @@ bool furi_hal_subghz_is_rx_data_crc_valid() {
 }
 
 void furi_hal_subghz_read_packet(uint8_t* data, uint8_t* size) {
+    furi_check(data);
+    furi_check(size);
+
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     cc1101_read_fifo(&furi_hal_spi_bus_handle_subghz, data, size);
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
-void furi_hal_subghz_shutdown() {
+void furi_hal_subghz_shutdown(void) {
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     // Reset and shutdown
     cc1101_shutdown(&furi_hal_spi_bus_handle_subghz);
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
-void furi_hal_subghz_reset() {
+void furi_hal_subghz_reset(void) {
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     furi_hal_gpio_init(&gpio_cc1101_g0, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
     cc1101_switch_to_idle(&furi_hal_spi_bus_handle_subghz);
@@ -301,7 +304,7 @@ void furi_hal_subghz_reset() {
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
-void furi_hal_subghz_idle() {
+void furi_hal_subghz_idle(void) {
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     cc1101_switch_to_idle(&furi_hal_spi_bus_handle_subghz);
     //waiting for the chip to switch to IDLE mode
@@ -309,7 +312,7 @@ void furi_hal_subghz_idle() {
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
-void furi_hal_subghz_rx() {
+void furi_hal_subghz_rx(void) {
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     cc1101_switch_to_rx(&furi_hal_spi_bus_handle_subghz);
     //waiting for the chip to switch to Rx mode
@@ -317,7 +320,7 @@ void furi_hal_subghz_rx() {
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
-bool furi_hal_subghz_tx() {
+bool furi_hal_subghz_tx(void) {
     if(furi_hal_subghz.regulation != SubGhzRegulationTxRx) return false;
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     cc1101_switch_to_tx(&furi_hal_spi_bus_handle_subghz);
@@ -327,7 +330,7 @@ bool furi_hal_subghz_tx() {
     return true;
 }
 
-float furi_hal_subghz_get_rssi() {
+float furi_hal_subghz_get_rssi(void) {
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     int32_t rssi_dec = cc1101_get_rssi(&furi_hal_spi_bus_handle_subghz);
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
@@ -342,7 +345,7 @@ float furi_hal_subghz_get_rssi() {
     return rssi;
 }
 
-uint8_t furi_hal_subghz_get_lqi() {
+uint8_t furi_hal_subghz_get_lqi(void) {
     furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
     uint8_t data[1];
     cc1101_read_reg(&furi_hal_spi_bus_handle_subghz, CC1101_STATUS_LQI | CC1101_BURST, data);
@@ -438,7 +441,7 @@ void furi_hal_subghz_set_path(FuriHalSubGhzPath path) {
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 }
 
-static bool furi_hal_subghz_start_debug() {
+static bool furi_hal_subghz_start_debug(void) {
     bool ret = false;
     if(furi_hal_subghz.async_mirror_pin != NULL) {
         furi_hal_gpio_write(furi_hal_subghz.async_mirror_pin, false);
@@ -452,7 +455,7 @@ static bool furi_hal_subghz_start_debug() {
     return ret;
 }
 
-static bool furi_hal_subghz_stop_debug() {
+static bool furi_hal_subghz_stop_debug(void) {
     bool ret = false;
     if(furi_hal_subghz.async_mirror_pin != NULL) {
         furi_hal_gpio_init(
@@ -498,7 +501,9 @@ static void furi_hal_subghz_capture_ISR(void* context) {
 }
 
 void furi_hal_subghz_start_async_rx(FuriHalSubGhzCaptureCallback callback, void* context) {
-    furi_assert(furi_hal_subghz.state == SubGhzStateIdle);
+    furi_check(furi_hal_subghz.state == SubGhzStateIdle);
+    furi_check(callback);
+
     furi_hal_subghz.state = SubGhzStateAsyncRx;
 
     furi_hal_subghz_capture_callback = callback;
@@ -565,8 +570,8 @@ void furi_hal_subghz_start_async_rx(FuriHalSubGhzCaptureCallback callback, void*
     furi_hal_subghz_capture_delta_duration = 0;
 }
 
-void furi_hal_subghz_stop_async_rx() {
-    furi_assert(furi_hal_subghz.state == SubGhzStateAsyncRx);
+void furi_hal_subghz_stop_async_rx(void) {
+    furi_check(furi_hal_subghz.state == SubGhzStateAsyncRx);
     furi_hal_subghz.state = SubGhzStateIdle;
 
     // Shutdown radio
@@ -664,7 +669,7 @@ static inline uint32_t furi_hal_subghz_async_tx_middleware_get_duration(
 }
 
 static void furi_hal_subghz_async_tx_refill(uint32_t* buffer, size_t samples) {
-    furi_assert(furi_hal_subghz.state == SubGhzStateAsyncTx);
+    furi_check(furi_hal_subghz.state == SubGhzStateAsyncTx);
 
     while(samples > 0) {
         volatile uint32_t duration = furi_hal_subghz_async_tx_middleware_get_duration(
@@ -704,7 +709,7 @@ static void furi_hal_subghz_async_tx_refill(uint32_t* buffer, size_t samples) {
 
 static void furi_hal_subghz_async_tx_dma_isr(void* context) {
     UNUSED(context);
-    furi_assert(furi_hal_subghz.state == SubGhzStateAsyncTx);
+    furi_check(furi_hal_subghz.state == SubGhzStateAsyncTx);
 
 #if SUBGHZ_DMA_CH1_CHANNEL == LL_DMA_CHANNEL_1
     if(LL_DMA_IsActiveFlag_HT1(SUBGHZ_DMA)) {
@@ -724,8 +729,8 @@ static void furi_hal_subghz_async_tx_dma_isr(void* context) {
 }
 
 bool furi_hal_subghz_start_async_tx(FuriHalSubGhzAsyncTxCallback callback, void* context) {
-    furi_assert(furi_hal_subghz.state == SubGhzStateIdle);
-    furi_assert(callback);
+    furi_check(furi_hal_subghz.state == SubGhzStateIdle);
+    furi_check(callback);
 
     //If transmission is prohibited by regional settings
     if(furi_hal_subghz.regulation != SubGhzRegulationTxRx) return false;
@@ -832,12 +837,12 @@ bool furi_hal_subghz_start_async_tx(FuriHalSubGhzAsyncTxCallback callback, void*
     return true;
 }
 
-bool furi_hal_subghz_is_async_tx_complete() {
+bool furi_hal_subghz_is_async_tx_complete(void) {
     return (furi_hal_subghz.state == SubGhzStateAsyncTx) && (LL_TIM_GetAutoReload(TIM2) == 0);
 }
 
-void furi_hal_subghz_stop_async_tx() {
-    furi_assert(furi_hal_subghz.state == SubGhzStateAsyncTx);
+void furi_hal_subghz_stop_async_tx(void) {
+    furi_check(furi_hal_subghz.state == SubGhzStateAsyncTx);
 
     // Shutdown radio
     furi_hal_subghz_idle();
diff --git a/targets/f7/furi_hal/furi_hal_subghz.h b/targets/f7/furi_hal/furi_hal_subghz.h
index b901e85ea..10d89947a 100644
--- a/targets/f7/furi_hal/furi_hal_subghz.h
+++ b/targets/f7/furi_hal/furi_hal_subghz.h
@@ -44,21 +44,21 @@ void furi_hal_subghz_set_async_mirror_pin(const GpioPin* pin);
  *
  * @return     pointer to the gpio pin structure
  */
-const GpioPin* furi_hal_subghz_get_data_gpio();
+const GpioPin* furi_hal_subghz_get_data_gpio(void);
 
 /** Initialize and switch to power save mode Used by internal API-HAL
  * initialization routine Can be used to reinitialize device to safe state and
  * send it to sleep
  */
-void furi_hal_subghz_init();
+void furi_hal_subghz_init(void);
 
 /** Send device to sleep mode
  */
-void furi_hal_subghz_sleep();
+void furi_hal_subghz_sleep(void);
 
 /** Dump info to stdout
  */
-void furi_hal_subghz_dump_state();
+void furi_hal_subghz_dump_state(void);
 
 /** Load custom registers from preset
  *
@@ -89,13 +89,13 @@ void furi_hal_subghz_write_packet(const uint8_t* data, uint8_t size);
  *
  * @return     true if not empty
  */
-bool furi_hal_subghz_rx_pipe_not_empty();
+bool furi_hal_subghz_rx_pipe_not_empty(void);
 
 /** Check if received data crc is valid
  *
  * @return     true if valid
  */
-bool furi_hal_subghz_is_rx_data_crc_valid();
+bool furi_hal_subghz_is_rx_data_crc_valid(void);
 
 /** Read packet from FIFO
  *
@@ -106,47 +106,47 @@ void furi_hal_subghz_read_packet(uint8_t* data, uint8_t* size);
 
 /** Flush rx FIFO buffer
  */
-void furi_hal_subghz_flush_rx();
+void furi_hal_subghz_flush_rx(void);
 
 /** Flush tx FIFO buffer
  */
-void furi_hal_subghz_flush_tx();
+void furi_hal_subghz_flush_tx(void);
 
 /** Shutdown Issue SPWD command
  * @warning    registers content will be lost
  */
-void furi_hal_subghz_shutdown();
+void furi_hal_subghz_shutdown(void);
 
 /** Reset Issue reset command
  * @warning    registers content will be lost
  */
-void furi_hal_subghz_reset();
+void furi_hal_subghz_reset(void);
 
 /** Switch to Idle
  */
-void furi_hal_subghz_idle();
+void furi_hal_subghz_idle(void);
 
 /** Switch to Receive
  */
-void furi_hal_subghz_rx();
+void furi_hal_subghz_rx(void);
 
 /** Switch to Transmit
  *
  * @return     true if the transfer is allowed by belonging to the region
  */
-bool furi_hal_subghz_tx();
+bool furi_hal_subghz_tx(void);
 
 /** Get RSSI value in dBm
  *
  * @return     RSSI value
  */
-float furi_hal_subghz_get_rssi();
+float furi_hal_subghz_get_rssi(void);
 
 /** Get LQI
  *
  * @return     LQI value
  */
-uint8_t furi_hal_subghz_get_lqi();
+uint8_t furi_hal_subghz_get_lqi(void);
 
 /** Check if frequency is in valid range
  *
@@ -211,7 +211,7 @@ void furi_hal_subghz_start_async_rx(FuriHalSubGhzCaptureCallback callback, void*
 
 /** Disable signal timings capture Resets GPIO and TIM2
  */
-void furi_hal_subghz_stop_async_rx();
+void furi_hal_subghz_stop_async_rx(void);
 
 /** Async TX callback type
  * @param      context  callback context
@@ -232,60 +232,13 @@ bool furi_hal_subghz_start_async_tx(FuriHalSubGhzAsyncTxCallback callback, void*
  *
  * @return     true if TX complete
  */
-bool furi_hal_subghz_is_async_tx_complete();
+bool furi_hal_subghz_is_async_tx_complete(void);
 
 /** Stop async transmission and cleanup resources Resets GPIO, TIM2, and DMA1
  */
-void furi_hal_subghz_stop_async_tx();
+void furi_hal_subghz_stop_async_tx(void);
 
-// /** Initialize and switch to power save mode Used by internal API-HAL
-//  * initialization routine Can be used to reinitialize device to safe state and
-//  * send it to sleep
-//  * @return     true if initialisation is successfully
-//  */
-// bool furi_hal_subghz_init_check(void);
-
-// /** Switching between internal and external radio
-//  * @param      state SubGhzRadioInternal or SubGhzRadioExternal
-//  * @return     true if switching is successful
-//  */
-// bool furi_hal_subghz_init_radio_type(SubGhzRadioType state);
-
-// /** Get current radio
-//  * @return     SubGhzRadioInternal or SubGhzRadioExternal
-//  */
-// SubGhzRadioType furi_hal_subghz_get_radio_type(void);
-
-// /** Check for a radio module
-//  * @return     true if check is successful
-//  */
-// bool furi_hal_subghz_check_radio(void);
-
-// /** Turn on the power of the external radio module
-//  * @return     true if power-up is successful
-//  */
-// bool furi_hal_subghz_enable_ext_power(void);
-
-// /** Turn off the power of the external radio module
-//  */
-// void furi_hal_subghz_disable_ext_power(void);
-
-// /** If true - disable 5v power of the external radio module
-//  */
-// void furi_hal_subghz_set_external_power_disable(bool state);
-
-// /** Get the current state of the external power disable flag
-//  */
-// bool furi_hal_subghz_get_external_power_disable(void);
-
-// /** Set what radio module we will be using
-//  */
-// void furi_hal_subghz_select_radio_type(SubGhzRadioType state);
-
-// External CC1101 Ebytes power amplifier control
-void furi_hal_subghz_set_ext_power_amp(bool enabled);
-
-bool furi_hal_subghz_get_ext_power_amp();
+// External CC1101 Ebytes power amplifier control is now enabled by default
 
 #ifdef __cplusplus
 }
diff --git a/targets/f7/furi_hal/furi_hal_usb.c b/targets/f7/furi_hal/furi_hal_usb.c
index b88168d5d..a482940e2 100644
--- a/targets/f7/furi_hal/furi_hal_usb.c
+++ b/targets/f7/furi_hal/furi_hal_usb.c
@@ -153,7 +153,7 @@ bool furi_hal_usb_set_config(FuriHalUsbInterface* new_if, void* ctx) {
     return return_data.bool_value;
 }
 
-FuriHalUsbInterface* furi_hal_usb_get_config() {
+FuriHalUsbInterface* furi_hal_usb_get_config(void) {
     UsbApiEventReturnData return_data = {
         .void_value = NULL,
     };
@@ -168,7 +168,7 @@ FuriHalUsbInterface* furi_hal_usb_get_config() {
     return return_data.void_value;
 }
 
-void furi_hal_usb_lock() {
+void furi_hal_usb_lock(void) {
     UsbApiEventMessage msg = {
         .lock = api_lock_alloc_locked(),
         .type = UsbApiEventTypeLock,
@@ -177,7 +177,7 @@ void furi_hal_usb_lock() {
     furi_hal_usb_send_message(&msg);
 }
 
-void furi_hal_usb_unlock() {
+void furi_hal_usb_unlock(void) {
     UsbApiEventMessage msg = {
         .lock = api_lock_alloc_locked(),
         .type = UsbApiEventTypeUnlock,
@@ -186,7 +186,7 @@ void furi_hal_usb_unlock() {
     furi_hal_usb_send_message(&msg);
 }
 
-bool furi_hal_usb_is_locked() {
+bool furi_hal_usb_is_locked(void) {
     UsbApiEventReturnData return_data = {
         .bool_value = false,
     };
@@ -201,7 +201,7 @@ bool furi_hal_usb_is_locked() {
     return return_data.bool_value;
 }
 
-void furi_hal_usb_disable() {
+void furi_hal_usb_disable(void) {
     UsbApiEventMessage msg = {
         .lock = api_lock_alloc_locked(),
         .type = UsbApiEventTypeDisable,
@@ -210,7 +210,7 @@ void furi_hal_usb_disable() {
     furi_hal_usb_send_message(&msg);
 }
 
-void furi_hal_usb_enable() {
+void furi_hal_usb_enable(void) {
     UsbApiEventMessage msg = {
         .lock = api_lock_alloc_locked(),
         .type = UsbApiEventTypeEnable,
@@ -219,7 +219,7 @@ void furi_hal_usb_enable() {
     furi_hal_usb_send_message(&msg);
 }
 
-void furi_hal_usb_reinit() {
+void furi_hal_usb_reinit(void) {
     UsbApiEventMessage msg = {
         .lock = api_lock_alloc_locked(),
         .type = UsbApiEventTypeReinit,
@@ -358,7 +358,7 @@ static void usb_process_mode_change(FuriHalUsbInterface* interface, void* contex
     }
 }
 
-static void usb_process_mode_reinit() {
+static void usb_process_mode_reinit(void) {
     // Temporary disable callback to avoid getting false reset events
     usbd_reg_event(&udev, usbd_evt_reset, NULL);
     FURI_LOG_I(TAG, "USB Reinit");
diff --git a/targets/f7/furi_hal/furi_hal_usb_ccid.c b/targets/f7/furi_hal/furi_hal_usb_ccid.c
index e24713ced..d8b43fc6c 100644
--- a/targets/f7/furi_hal/furi_hal_usb_ccid.c
+++ b/targets/f7/furi_hal/furi_hal_usb_ccid.c
@@ -186,7 +186,7 @@ static bool smartcard_inserted = true;
 static CcidCallbacks* callbacks[CCID_TOTAL_SLOTS] = {NULL};
 
 static void* ccid_set_string_descr(char* str) {
-    furi_assert(str);
+    furi_check(str);
 
     size_t len = strlen(str);
     struct usb_string_descriptor* dev_str_desc = malloc(len * 2 + 2);
@@ -292,7 +292,7 @@ void CALLBACK_CCID_GetSlotStatus(
 void CALLBACK_CCID_SetParametersT0(
     struct pc_to_rdr_set_parameters_t0* requestSetParametersT0,
     struct rdr_to_pc_parameters_t0* responseSetParametersT0) {
-    furi_assert(requestSetParametersT0->bProtocolNum == 0x00); //T0
+    furi_check(requestSetParametersT0->bProtocolNum == 0x00); //T0
     responseSetParametersT0->bMessageType = RDR_TO_PC_PARAMETERS;
     responseSetParametersT0->bSlot = requestSetParametersT0->bSlot;
     responseSetParametersT0->bSeq = requestSetParametersT0->bSeq;
@@ -381,11 +381,11 @@ void CALLBACK_CCID_XfrBlock(
     }
 }
 
-void furi_hal_ccid_ccid_insert_smartcard() {
+void furi_hal_ccid_ccid_insert_smartcard(void) {
     smartcard_inserted = true;
 }
 
-void furi_hal_ccid_ccid_remove_smartcard() {
+void furi_hal_ccid_ccid_remove_smartcard(void) {
     smartcard_inserted = false;
 }
 
@@ -410,7 +410,7 @@ static void ccid_tx_ep_callback(usbd_device* dev, uint8_t event, uint8_t ep) {
         int32_t bytes_read = usbd_ep_read(
             usb_dev, ep, &ReceiveBuffer, sizeof(ccid_bulk_message_header_t) + CCID_DATABLOCK_SIZE);
         //minimum request size is header size
-        furi_assert((uint16_t)bytes_read >= sizeof(ccid_bulk_message_header_t));
+        furi_check((uint16_t)bytes_read >= sizeof(ccid_bulk_message_header_t));
         ccid_bulk_message_header_t* message = (ccid_bulk_message_header_t*)&ReceiveBuffer; //-V641
 
         if(message->bMessageType == PC_TO_RDR_ICCPOWERON) {
@@ -455,14 +455,14 @@ static void ccid_tx_ep_callback(usbd_device* dev, uint8_t event, uint8_t ep) {
             struct rdr_to_pc_data_block* responseDataBlock =
                 (struct rdr_to_pc_data_block*)&SendBuffer;
 
-            furi_assert(receivedXfrBlock->dwLength <= CCID_DATABLOCK_SIZE);
-            furi_assert(
+            furi_check(receivedXfrBlock->dwLength <= CCID_DATABLOCK_SIZE);
+            furi_check(
                 (uint16_t)bytes_read >=
                 sizeof(ccid_bulk_message_header_t) + receivedXfrBlock->dwLength);
 
             CALLBACK_CCID_XfrBlock(receivedXfrBlock, responseDataBlock);
 
-            furi_assert(responseDataBlock->dwLength <= CCID_DATABLOCK_SIZE);
+            furi_check(responseDataBlock->dwLength <= CCID_DATABLOCK_SIZE);
 
             usbd_ep_write(
                 usb_dev,
@@ -476,8 +476,8 @@ static void ccid_tx_ep_callback(usbd_device* dev, uint8_t event, uint8_t ep) {
             struct rdr_to_pc_parameters_t0* responseSetParametersT0 =
                 (struct rdr_to_pc_parameters_t0*)&SendBuffer; //-V641
 
-            furi_assert(requestSetParametersT0->dwLength <= CCID_DATABLOCK_SIZE);
-            furi_assert(
+            furi_check(requestSetParametersT0->dwLength <= CCID_DATABLOCK_SIZE);
+            furi_check(
                 (uint16_t)bytes_read >=
                 sizeof(ccid_bulk_message_header_t) + requestSetParametersT0->dwLength);
 
diff --git a/targets/f7/furi_hal/furi_hal_usb_cdc.c b/targets/f7/furi_hal/furi_hal_usb_cdc.c
index 014c98bad..865c6a448 100644
--- a/targets/f7/furi_hal/furi_hal_usb_cdc.c
+++ b/targets/f7/furi_hal/furi_hal_usb_cdc.c
@@ -7,13 +7,13 @@
 #include "usb.h"
 #include "usb_cdc.h"
 
-#define CDC0_RXD_EP 0x02
+#define CDC0_RXD_EP 0x01
 #define CDC0_TXD_EP 0x82
-#define CDC0_NTF_EP 0x81
+#define CDC0_NTF_EP 0x83
 
 #define CDC1_RXD_EP 0x04
-#define CDC1_TXD_EP 0x84
-#define CDC1_NTF_EP 0x83
+#define CDC1_TXD_EP 0x85
+#define CDC1_NTF_EP 0x86
 
 #define CDC_NTF_SZ 0x08
 
@@ -472,7 +472,7 @@ static void cdc_deinit(usbd_device* dev) {
 }
 
 void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb, void* context) {
-    furi_assert(if_num < IF_NUM_MAX);
+    furi_check(if_num < IF_NUM_MAX);
 
     if(callbacks[if_num] != NULL) {
         if(callbacks[if_num]->state_callback != NULL) {
@@ -494,12 +494,12 @@ void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb, void* context)
 }
 
 struct usb_cdc_line_coding* furi_hal_cdc_get_port_settings(uint8_t if_num) {
-    furi_assert(if_num < IF_NUM_MAX);
+    furi_check(if_num < IF_NUM_MAX);
     return &cdc_config[if_num];
 }
 
 uint8_t furi_hal_cdc_get_ctrl_line_state(uint8_t if_num) {
-    furi_assert(if_num < IF_NUM_MAX);
+    furi_check(if_num < IF_NUM_MAX);
     return cdc_ctrl_line_state[if_num];
 }
 
diff --git a/targets/f7/furi_hal/furi_hal_usb_hid.c b/targets/f7/furi_hal/furi_hal_usb_hid.c
index b744e5ef7..5d1a9c46e 100644
--- a/targets/f7/furi_hal/furi_hal_usb_hid.c
+++ b/targets/f7/furi_hal/furi_hal_usb_hid.c
@@ -257,11 +257,11 @@ static void* cb_ctx;
 static uint8_t led_state;
 static bool boot_protocol = false;
 
-bool furi_hal_hid_is_connected() {
+bool furi_hal_hid_is_connected(void) {
     return hid_connected;
 }
 
-uint8_t furi_hal_hid_get_led_state() {
+uint8_t furi_hal_hid_get_led_state(void) {
     return led_state;
 }
 
@@ -300,7 +300,7 @@ bool furi_hal_hid_kb_release(uint16_t button) {
     return hid_send_report(ReportIdKeyboard);
 }
 
-bool furi_hal_hid_kb_release_all() {
+bool furi_hal_hid_kb_release_all(void) {
     for(uint8_t key_nb = 0; key_nb < HID_KB_MAX_KEYS; key_nb++) {
         hid_report.keyboard.boot.btn[key_nb] = 0;
     }
@@ -354,6 +354,13 @@ bool furi_hal_hid_consumer_key_release(uint16_t button) {
     return hid_send_report(ReportIdConsumer);
 }
 
+bool furi_hal_hid_consumer_key_release_all(void) {
+    for(uint8_t key_nb = 0; key_nb < HID_CONSUMER_MAX_KEYS; key_nb++) {
+        hid_report.consumer.btn[key_nb] = 0;
+    }
+    return hid_send_report(ReportIdConsumer);
+}
+
 static void* hid_set_string_descr(char* str) {
     furi_assert(str);
 
diff --git a/targets/f7/furi_hal/furi_hal_usb_u2f.c b/targets/f7/furi_hal/furi_hal_usb_u2f.c
index cc7e23b77..2a014093e 100644
--- a/targets/f7/furi_hal/furi_hal_usb_u2f.c
+++ b/targets/f7/furi_hal/furi_hal_usb_u2f.c
@@ -153,7 +153,7 @@ static bool hid_u2f_connected = false;
 static HidU2fCallback callback;
 static void* cb_ctx;
 
-bool furi_hal_hid_u2f_is_connected() {
+bool furi_hal_hid_u2f_is_connected(void) {
     return hid_u2f_connected;
 }
 
diff --git a/targets/f7/furi_hal/furi_hal_version.c b/targets/f7/furi_hal/furi_hal_version.c
index 46a15bde8..06e908f11 100644
--- a/targets/f7/furi_hal/furi_hal_version.c
+++ b/targets/f7/furi_hal/furi_hal_version.c
@@ -124,11 +124,11 @@ void furi_hal_version_set_name(const char* name) {
     furi_hal_version.ble_mac[5] = (uint8_t)((company_id & 0x0000FF00) >> 8);
 }
 
-static void furi_hal_version_load_otp_default() {
+static void furi_hal_version_load_otp_default(void) {
     furi_hal_version_set_name(NULL);
 }
 
-static void furi_hal_version_load_otp_v0() {
+static void furi_hal_version_load_otp_v0(void) {
     const FuriHalVersionOTPv0* otp = (FuriHalVersionOTPv0*)FURI_HAL_VERSION_OTP_ADDRESS;
 
     furi_hal_version.timestamp = otp->header_timestamp;
@@ -144,7 +144,7 @@ static void furi_hal_version_load_otp_v0() {
     }
 }
 
-static void furi_hal_version_load_otp_v1() {
+static void furi_hal_version_load_otp_v1(void) {
     const FuriHalVersionOTPv1* otp = (FuriHalVersionOTPv1*)FURI_HAL_VERSION_OTP_ADDRESS;
 
     furi_hal_version.timestamp = otp->header_timestamp;
@@ -162,7 +162,7 @@ static void furi_hal_version_load_otp_v1() {
     }
 }
 
-static void furi_hal_version_load_otp_v2() {
+static void furi_hal_version_load_otp_v2(void) {
     const FuriHalVersionOTPv2* otp = (FuriHalVersionOTPv2*)FURI_HAL_VERSION_OTP_ADDRESS;
 
     // 1st block, programmed afer baking
@@ -191,7 +191,7 @@ static void furi_hal_version_load_otp_v2() {
     }
 }
 
-void furi_hal_version_init() {
+void furi_hal_version_init(void) {
     switch(furi_hal_version_get_otp_version()) {
     case FuriHalVersionOtpVersionUnknown:
     case FuriHalVersionOtpVersionEmpty:
@@ -215,7 +215,7 @@ void furi_hal_version_init() {
     FURI_LOG_I(TAG, "Init OK");
 }
 
-FuriHalVersionOtpVersion furi_hal_version_get_otp_version() {
+FuriHalVersionOtpVersion furi_hal_version_get_otp_version(void) {
     if(*(uint64_t*)FURI_HAL_VERSION_OTP_ADDRESS == 0xFFFFFFFF) {
         return FuriHalVersionOtpVersionEmpty;
     } else {
@@ -238,39 +238,39 @@ FuriHalVersionOtpVersion furi_hal_version_get_otp_version() {
     }
 }
 
-uint8_t furi_hal_version_get_hw_version() {
+uint8_t furi_hal_version_get_hw_version(void) {
     return furi_hal_version.board_version;
 }
 
-uint8_t furi_hal_version_get_hw_target() {
+uint8_t furi_hal_version_get_hw_target(void) {
     return furi_hal_version.board_target;
 }
 
-uint8_t furi_hal_version_get_hw_body() {
+uint8_t furi_hal_version_get_hw_body(void) {
     return furi_hal_version.board_body;
 }
 
-FuriHalVersionColor furi_hal_version_get_hw_color() {
+FuriHalVersionColor furi_hal_version_get_hw_color(void) {
     return furi_hal_version.board_color;
 }
 
-uint8_t furi_hal_version_get_hw_connect() {
+uint8_t furi_hal_version_get_hw_connect(void) {
     return furi_hal_version.board_connect;
 }
 
-FuriHalVersionRegion furi_hal_version_get_hw_region() {
+FuriHalVersionRegion furi_hal_version_get_hw_region(void) {
     return FuriHalVersionRegionUnknown;
 }
 
-FuriHalVersionRegion furi_hal_version_get_hw_region_otp() {
+FuriHalVersionRegion furi_hal_version_get_hw_region_otp(void) {
     return furi_hal_version.board_region;
 }
 
-const char* furi_hal_version_get_hw_region_name() {
+const char* furi_hal_version_get_hw_region_name(void) {
     return "R00";
 }
 
-const char* furi_hal_version_get_hw_region_name_otp() {
+const char* furi_hal_version_get_hw_region_name_otp(void) {
     switch(furi_hal_version_get_hw_region_otp()) {
     case FuriHalVersionRegionUnknown:
         return "R00";
@@ -286,27 +286,27 @@ const char* furi_hal_version_get_hw_region_name_otp() {
     return "R??";
 }
 
-FuriHalVersionDisplay furi_hal_version_get_hw_display() {
+FuriHalVersionDisplay furi_hal_version_get_hw_display(void) {
     return furi_hal_version.board_display;
 }
 
-uint32_t furi_hal_version_get_hw_timestamp() {
+uint32_t furi_hal_version_get_hw_timestamp(void) {
     return furi_hal_version.timestamp;
 }
 
-const char* furi_hal_version_get_name_ptr() {
+const char* furi_hal_version_get_name_ptr(void) {
     return *furi_hal_version.name == 0x00 ? NULL : furi_hal_version.name;
 }
 
-const char* furi_hal_version_get_device_name_ptr() {
+const char* furi_hal_version_get_device_name_ptr(void) {
     return furi_hal_version.device_name + 1;
 }
 
-const char* furi_hal_version_get_ble_local_device_name_ptr() {
+const char* furi_hal_version_get_ble_local_device_name_ptr(void) {
     return furi_hal_version.device_name;
 }
 
-const uint8_t* furi_hal_version_get_ble_mac() {
+const uint8_t* furi_hal_version_get_ble_mac(void) {
     return furi_hal_version.ble_mac;
 }
 
@@ -314,15 +314,15 @@ const struct Version* furi_hal_version_get_firmware_version(void) {
     return version_get();
 }
 
-size_t furi_hal_version_uid_size() {
+size_t furi_hal_version_uid_size(void) {
     return 64 / 8;
 }
 
-const uint8_t* furi_hal_version_uid_default() {
+const uint8_t* furi_hal_version_uid_default(void) {
     return (const uint8_t*)UID64_BASE;
 }
 
-const uint8_t* furi_hal_version_uid() {
+const uint8_t* furi_hal_version_uid(void) {
     if(version_get_custom_name(NULL) != NULL) {
         return (const uint8_t*)&(*((uint32_t*)version_get_custom_name(NULL)));
     }
diff --git a/targets/f7/furi_hal/furi_hal_version_device.c b/targets/f7/furi_hal/furi_hal_version_device.c
index 897289984..af88c0671 100644
--- a/targets/f7/furi_hal/furi_hal_version_device.c
+++ b/targets/f7/furi_hal/furi_hal_version_device.c
@@ -1,33 +1,33 @@
 #include <furi_hal_version.h>
 
-bool furi_hal_version_do_i_belong_here() {
+bool furi_hal_version_do_i_belong_here(void) {
     return (furi_hal_version_get_hw_target() == 7) || (furi_hal_version_get_hw_target() == 0);
 }
 
-const char* furi_hal_version_get_model_name() {
+const char* furi_hal_version_get_model_name(void) {
     return "Flipper Zero";
 }
 
-const char* furi_hal_version_get_model_code() {
+const char* furi_hal_version_get_model_code(void) {
     return "FZ.1";
 }
 
-const char* furi_hal_version_get_fcc_id() {
+const char* furi_hal_version_get_fcc_id(void) {
     return "2A2V6-FZ";
 }
 
-const char* furi_hal_version_get_ic_id() {
+const char* furi_hal_version_get_ic_id(void) {
     return "27624-FZ";
 }
 
-const char* furi_hal_version_get_mic_id() {
+const char* furi_hal_version_get_mic_id(void) {
     return "210-175991";
 }
 
-const char* furi_hal_version_get_srrc_id() {
+const char* furi_hal_version_get_srrc_id(void) {
     return "2023DJ16420";
 }
 
-const char* furi_hal_version_get_ncc_id() {
+const char* furi_hal_version_get_ncc_id(void) {
     return "CCAJ23LP34D0T3";
 }
\ No newline at end of file
diff --git a/targets/f7/furi_hal/furi_hal_vibro.c b/targets/f7/furi_hal/furi_hal_vibro.c
index f46784677..33ff86549 100644
--- a/targets/f7/furi_hal/furi_hal_vibro.c
+++ b/targets/f7/furi_hal/furi_hal_vibro.c
@@ -3,7 +3,7 @@
 
 #define TAG "FuriHalVibro"
 
-void furi_hal_vibro_init() {
+void furi_hal_vibro_init(void) {
     furi_hal_gpio_init(&gpio_vibro, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
     furi_hal_gpio_write(&gpio_vibro, false);
     FURI_LOG_I(TAG, "Init OK");
diff --git a/targets/f7/inc/FreeRTOSConfig.h b/targets/f7/inc/FreeRTOSConfig.h
index 6a68bbae7..36800565c 100644
--- a/targets/f7/inc/FreeRTOSConfig.h
+++ b/targets/f7/inc/FreeRTOSConfig.h
@@ -89,7 +89,7 @@ to exclude the API function. */
 /* Furi-specific */
 #define configTASK_NOTIFICATION_ARRAY_ENTRIES 2
 
-extern __attribute__((__noreturn__)) void furi_thread_catch();
+extern __attribute__((__noreturn__)) void furi_thread_catch(void);
 #define configTASK_RETURN_ADDRESS (furi_thread_catch + 2)
 
 /*
diff --git a/targets/f7/inc/alt_boot.h b/targets/f7/inc/alt_boot.h
index d8be3aa48..23d7a46a8 100644
--- a/targets/f7/inc/alt_boot.h
+++ b/targets/f7/inc/alt_boot.h
@@ -4,11 +4,11 @@
 extern "C" {
 #endif
 
-void flipper_boot_update_exec();
+void flipper_boot_update_exec(void);
 
-void flipper_boot_dfu_exec();
+void flipper_boot_dfu_exec(void);
 
-void flipper_boot_recovery_exec();
+void flipper_boot_recovery_exec(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/f7/platform_specific/cxx_virtual_stub.c b/targets/f7/platform_specific/cxx_virtual_stub.c
index a81e5a5e0..74bd25478 100644
--- a/targets/f7/platform_specific/cxx_virtual_stub.c
+++ b/targets/f7/platform_specific/cxx_virtual_stub.c
@@ -1,6 +1,6 @@
 #include "cxx_virtual_stub.h"
 #include <furi.h>
 
-void __cxa_pure_virtual() {
+void __cxa_pure_virtual(void) {
     furi_crash("C++ pure virtual call");
 }
diff --git a/targets/f7/platform_specific/cxx_virtual_stub.h b/targets/f7/platform_specific/cxx_virtual_stub.h
index 46211030e..43eea5966 100644
--- a/targets/f7/platform_specific/cxx_virtual_stub.h
+++ b/targets/f7/platform_specific/cxx_virtual_stub.h
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-void __cxa_pure_virtual();
+void __cxa_pure_virtual(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/f7/src/dfu.c b/targets/f7/src/dfu.c
index 7e094b4c4..2d5bddb17 100644
--- a/targets/f7/src/dfu.c
+++ b/targets/f7/src/dfu.c
@@ -7,7 +7,7 @@
 #include <gui/canvas.h>
 #include <gui/canvas_i.h>
 
-void flipper_boot_dfu_show_splash() {
+void flipper_boot_dfu_show_splash(void) {
     // Initialize
     Canvas* canvas = canvas_init();
 
@@ -22,7 +22,7 @@ void flipper_boot_dfu_show_splash() {
     canvas_free(canvas);
 }
 
-void flipper_boot_dfu_exec() {
+void flipper_boot_dfu_exec(void) {
     // Show DFU splashscreen
     flipper_boot_dfu_show_splash();
 
diff --git a/targets/f7/src/main.c b/targets/f7/src/main.c
index ca705fe5e..77961f0ef 100644
--- a/targets/f7/src/main.c
+++ b/targets/f7/src/main.c
@@ -18,7 +18,7 @@ int32_t init_task(void* context) {
     return 0;
 }
 
-int main() {
+int main(void) {
     // Initialize FURI layer
     furi_init();
 
@@ -71,6 +71,6 @@ void Error_Handler(void) {
     furi_crash("ErrorHandler");
 }
 
-void abort() {
+void abort(void) {
     furi_crash("AbortHandler");
 }
diff --git a/targets/f7/src/recovery.c b/targets/f7/src/recovery.c
index 848236815..0a2532bf7 100644
--- a/targets/f7/src/recovery.c
+++ b/targets/f7/src/recovery.c
@@ -34,7 +34,7 @@ void flipper_boot_recovery_draw_splash(Canvas* canvas) {
     canvas_commit(canvas);
 }
 
-void flipper_boot_recovery_exec() {
+void flipper_boot_recovery_exec(void) {
     Canvas* canvas = canvas_init();
 
     // Show recovery splashscreen
diff --git a/targets/f7/src/update.c b/targets/f7/src/update.c
index 42ac90e7b..e6cb4aabe 100644
--- a/targets/f7/src/update.c
+++ b/targets/f7/src/update.c
@@ -22,7 +22,7 @@ static FATFS* pfs = NULL;
         }                       \
     }
 
-static bool flipper_update_mount_sd() {
+static bool flipper_update_mount_sd(void) {
     for(int i = 0; i < furi_hal_sd_max_mount_retry_count(); ++i) {
         if(furi_hal_sd_init((i % 2) == 0) != FuriStatusOk) {
             /* Next attempt will be without card reset, let it settle */
@@ -37,7 +37,7 @@ static bool flipper_update_mount_sd() {
     return false;
 }
 
-static bool flipper_update_init() {
+static bool flipper_update_init(void) {
     // TODO FL-3504: Configure missing peripherals properly
     furi_hal_bus_enable(FuriHalBusHSEM);
     furi_hal_bus_enable(FuriHalBusIPCC);
@@ -180,7 +180,7 @@ static UpdateManifest* flipper_update_process_manifest(const FuriString* manifes
     return manifest;
 }
 
-void flipper_boot_update_exec() {
+void flipper_boot_update_exec(void) {
     if(!flipper_update_init()) {
         return;
     }
diff --git a/targets/furi_hal_include/furi_hal.h b/targets/furi_hal_include/furi_hal.h
index 4f8aad6bd..3eaf06da6 100644
--- a/targets/furi_hal_include/furi_hal.h
+++ b/targets/furi_hal_include/furi_hal.h
@@ -46,13 +46,13 @@ extern "C" {
 #endif
 
 /** Early FuriHal init, only essential subsystems */
-void furi_hal_init_early();
+void furi_hal_init_early(void);
 
 /** Early FuriHal deinit */
-void furi_hal_deinit_early();
+void furi_hal_deinit_early(void);
 
 /** Init FuriHal */
-void furi_hal_init();
+void furi_hal_init(void);
 
 /** Transfer execution to address
  *
diff --git a/targets/furi_hal_include/furi_hal_bt.h b/targets/furi_hal_include/furi_hal_bt.h
index e498b1586..25ba33c28 100644
--- a/targets/furi_hal_include/furi_hal_bt.h
+++ b/targets/furi_hal_include/furi_hal_bt.h
@@ -30,37 +30,37 @@ typedef enum {
 
 /** Initialize
  */
-void furi_hal_bt_init();
+void furi_hal_bt_init(void);
 
 /** Lock core2 state transition */
-void furi_hal_bt_lock_core2();
+void furi_hal_bt_lock_core2(void);
 
 /** Lock core2 state transition */
-void furi_hal_bt_unlock_core2();
+void furi_hal_bt_unlock_core2(void);
 
 /** Start radio stack
  *
  * @return  true on successfull radio stack start
  */
-bool furi_hal_bt_start_radio_stack();
+bool furi_hal_bt_start_radio_stack(void);
 
 /** Get radio stack type
  *
  * @return  FuriHalBtStack instance
  */
-FuriHalBtStack furi_hal_bt_get_radio_stack();
+FuriHalBtStack furi_hal_bt_get_radio_stack(void);
 
 /** Check if radio stack supports BLE GAT/GAP
  *
  * @return  true if supported
  */
-bool furi_hal_bt_is_gatt_gap_supported();
+bool furi_hal_bt_is_gatt_gap_supported(void);
 
 /** Check if radio stack supports testing
  *
  * @return  true if supported
  */
-bool furi_hal_bt_is_testing_supported();
+bool furi_hal_bt_is_testing_supported(void);
 
 /** Check if particular instance of profile belongs to given type
  *
@@ -92,16 +92,17 @@ FURI_WARN_UNUSED FuriHalBleProfileBase* furi_hal_bt_start_app(
  * 
  * Also can be used to prepare core2 for stop modes
  */
-void furi_hal_bt_reinit();
+void furi_hal_bt_reinit(void);
 
 /** Change BLE app
  * Restarts 2nd core
  *
- * @param profile   FuriHalBleProfileTemplate instance
- * @param event_cb  GapEventCallback instance
- * @param context   pointer to context
+ * @param profile_template FuriHalBleProfileTemplate instance
+ * @param profile_params   Parameters to pass to the profile. Can be NULL
+ * @param event_cb         GapEventCallback instance
+ * @param context          pointer to context
  *
- * @return          instance of profile, NULL on failure
+ * @return                 instance of profile, NULL on failure
 */
 FURI_WARN_UNUSED FuriHalBleProfileBase* furi_hal_bt_change_app(
     const FuriHalBleProfileTemplate* profile_template,
@@ -122,15 +123,15 @@ void furi_hal_bt_update_power_state(bool charging);
  *
  * @return          true if device is connected or advertising, false otherwise
  */
-bool furi_hal_bt_is_active();
+bool furi_hal_bt_is_active(void);
 
 /** Start advertising
  */
-void furi_hal_bt_start_advertising();
+void furi_hal_bt_start_advertising(void);
 
 /** Stop advertising
  */
-void furi_hal_bt_stop_advertising();
+void furi_hal_bt_stop_advertising(void);
 
 /** Get BT/BLE system component state
  *
@@ -142,7 +143,7 @@ void furi_hal_bt_dump_state(FuriString* buffer);
  *
  * @return     true if core2 is alive
  */
-bool furi_hal_bt_is_alive();
+bool furi_hal_bt_is_alive(void);
 
 /** Get key storage buffer address and size
  *
@@ -154,18 +155,18 @@ void furi_hal_bt_get_key_storage_buff(uint8_t** key_buff_addr, uint16_t* key_buf
 /** Get SRAM2 hardware semaphore
  * @note Must be called before SRAM2 read/write operations
  */
-void furi_hal_bt_nvm_sram_sem_acquire();
+void furi_hal_bt_nvm_sram_sem_acquire(void);
 
 /** Release SRAM2 hardware semaphore
  * @note Must be called after SRAM2 read/write operations
  */
-void furi_hal_bt_nvm_sram_sem_release();
+void furi_hal_bt_nvm_sram_sem_release(void);
 
 /** Clear key storage
  *
  * @return      true on success
 */
-bool furi_hal_bt_clear_white_list();
+bool furi_hal_bt_clear_white_list(void);
 
 /** Set key storage change callback
  *
@@ -185,7 +186,7 @@ void furi_hal_bt_start_tone_tx(uint8_t channel, uint8_t power);
 
 /** Stop ble tone tx
  */
-void furi_hal_bt_stop_tone_tx();
+void furi_hal_bt_stop_tone_tx(void);
 
 /** Start sending ble packets at a given frequency and datarate
  *
@@ -199,7 +200,7 @@ void furi_hal_bt_start_packet_tx(uint8_t channel, uint8_t pattern, uint8_t datar
  *
  * @return     sent packet count
  */
-uint16_t furi_hal_bt_stop_packet_test();
+uint16_t furi_hal_bt_stop_packet_test(void);
 
 /** Start receiving packets
  *
@@ -216,19 +217,19 @@ void furi_hal_bt_start_rx(uint8_t channel);
 
 /** Stop RF listenning
  */
-void furi_hal_bt_stop_rx();
+void furi_hal_bt_stop_rx(void);
 
 /** Get RSSI
  *
  * @return     RSSI in dBm
  */
-float furi_hal_bt_get_rssi();
+float furi_hal_bt_get_rssi(void);
 
 /** Get number of transmitted packets
  *
  * @return     packet count
  */
-uint32_t furi_hal_bt_get_transmitted_packets();
+uint32_t furi_hal_bt_get_transmitted_packets(void);
 
 /** Reverse a MAC address byte order in-place
  * @param[in] mac       mac address to reverse
@@ -280,25 +281,25 @@ bool furi_hal_bt_extra_beacon_set_config(const GapExtraBeaconConfig* config);
  *
  * @return     true on success
  */
-bool furi_hal_bt_extra_beacon_start();
+bool furi_hal_bt_extra_beacon_start(void);
 
 /** Stop extra beacon
  *
  * @return     true on success
  */
-bool furi_hal_bt_extra_beacon_stop();
+bool furi_hal_bt_extra_beacon_stop(void);
 
 /** Check if extra beacon is active.
  *
  * @return     extra beacon state
  */
-bool furi_hal_bt_extra_beacon_is_active();
+bool furi_hal_bt_extra_beacon_is_active(void);
 
 /** Get last configured extra beacon config
  *
  * @return     extra beacon config. NULL if beacon had never been configured.
  */
-const GapExtraBeaconConfig* furi_hal_bt_extra_beacon_get_config();
+const GapExtraBeaconConfig* furi_hal_bt_extra_beacon_get_config(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/furi_hal_include/furi_hal_cortex.h b/targets/furi_hal_include/furi_hal_cortex.h
index ebabbabfd..81271d315 100644
--- a/targets/furi_hal_include/furi_hal_cortex.h
+++ b/targets/furi_hal_include/furi_hal_cortex.h
@@ -20,7 +20,7 @@ typedef struct {
 
 /** Early init stage for cortex
  */
-void furi_hal_cortex_init_early();
+void furi_hal_cortex_init_early(void);
 
 /** Microseconds delay
  *
@@ -32,7 +32,7 @@ void furi_hal_cortex_delay_us(uint32_t microseconds);
  *
  * @return     instructions per microsecond count
  */
-uint32_t furi_hal_cortex_instructions_per_microsecond();
+uint32_t furi_hal_cortex_instructions_per_microsecond(void);
 
 /** Get Timer
  *
diff --git a/targets/furi_hal_include/furi_hal_crypto.h b/targets/furi_hal_include/furi_hal_crypto.h
index 5e3b41040..04a2c67cf 100644
--- a/targets/furi_hal_include/furi_hal_crypto.h
+++ b/targets/furi_hal_include/furi_hal_crypto.h
@@ -91,7 +91,7 @@ typedef enum {
 } FuriHalCryptoGCMState;
 
 /** Initialize cryptography layer(includes AES engines, PKA and RNG) */
-void furi_hal_crypto_init();
+void furi_hal_crypto_init(void);
 
 /** Verify factory provisioned keys
  *
diff --git a/targets/furi_hal_include/furi_hal_debug.h b/targets/furi_hal_include/furi_hal_debug.h
index befbb4f40..1ea231bd0 100644
--- a/targets/furi_hal_include/furi_hal_debug.h
+++ b/targets/furi_hal_include/furi_hal_debug.h
@@ -13,13 +13,13 @@ extern "C" {
 #endif
 
 /** Enable MCU debug */
-void furi_hal_debug_enable();
+void furi_hal_debug_enable(void);
 
 /** Disable MCU debug */
-void furi_hal_debug_disable();
+void furi_hal_debug_disable(void);
 
 /** Check if GDB debug session is active */
-bool furi_hal_debug_is_gdb_session_active();
+bool furi_hal_debug_is_gdb_session_active(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/furi_hal_include/furi_hal_i2c.h b/targets/furi_hal_include/furi_hal_i2c.h
index f493655b4..7d69cd74d 100644
--- a/targets/furi_hal_include/furi_hal_i2c.h
+++ b/targets/furi_hal_include/furi_hal_i2c.h
@@ -43,13 +43,13 @@ typedef enum {
 } FuriHalI2cEnd;
 
 /** Early Init I2C */
-void furi_hal_i2c_init_early();
+void furi_hal_i2c_init_early(void);
 
 /** Early DeInit I2C */
-void furi_hal_i2c_deinit_early();
+void furi_hal_i2c_deinit_early(void);
 
 /** Init I2C */
-void furi_hal_i2c_init();
+void furi_hal_i2c_init(void);
 
 /** Acquire I2C bus handle
  *
@@ -91,7 +91,7 @@ bool furi_hal_i2c_tx(
  * @param      size     Size of data buffer
  * @param      begin    How to begin the transaction
  * @param      end      How to end the transaction
- * @param      timer    Timeout timer
+ * @param      timeout  Timeout in milliseconds
  *
  * @return     true on successful transfer, false otherwise
  */
@@ -131,7 +131,7 @@ bool furi_hal_i2c_rx(
  * @param      size     Size of data buffer
  * @param      begin    How to begin the transaction
  * @param      end      How to end the transaction
- * @param      timer    Timeout timer
+ * @param      timeout  Timeout in milliseconds
  *
  * @return     true on successful transfer, false otherwise
  */
diff --git a/targets/furi_hal_include/furi_hal_infrared.h b/targets/furi_hal_include/furi_hal_infrared.h
index bac3aba1e..29f7101c1 100644
--- a/targets/furi_hal_include/furi_hal_infrared.h
+++ b/targets/furi_hal_include/furi_hal_infrared.h
@@ -16,6 +16,12 @@ extern "C" {
 #define INFRARED_MAX_FREQUENCY 56000
 #define INFRARED_MIN_FREQUENCY 10000
 
+typedef enum {
+    FuriHalInfraredTxPinInternal,
+    FuriHalInfraredTxPinExtPA7,
+    FuriHalInfraredTxPinMax,
+} FuriHalInfraredTxPin;
+
 typedef enum {
     FuriHalInfraredTxGetDataStateOk, /**< New data obtained */
     FuriHalInfraredTxGetDataStateDone, /**< New data obtained, and this is end of package */
@@ -36,24 +42,18 @@ typedef void (*FuriHalInfraredTxSignalSentISRCallback)(void* context);
 
 /** Signature of callback function for receiving continuous INFRARED rx signal.
  *
- * @param      ctx[in]       context to pass to callback
- * @param      level[in]     level of input INFRARED rx signal
- * @param      duration[in]  duration of continuous rx signal level in us
+ * @param[in] ctx       context to pass to callback
+ * @param[in] level     level of input INFRARED rx signal
+ * @param[in] duration  duration of continuous rx signal level in us
  */
 typedef void (*FuriHalInfraredRxCaptureCallback)(void* ctx, bool level, uint32_t duration);
 
 /** Signature of callback function for reaching silence timeout on INFRARED port.
  *
- * @param      ctx[in]  context to pass to callback
+ * @param[in] ctx  context to pass to callback
  */
 typedef void (*FuriHalInfraredRxTimeoutCallback)(void* ctx);
 
-// Debug TX pin set
-void furi_hal_infrared_set_debug_out(bool enable);
-
-// Debug TX pin get status
-bool furi_hal_infrared_get_debug_out_status(void);
-
 /** Initialize INFRARED RX timer to receive interrupts.
  *
  * It provides interrupts for every RX-signal edge changing with its duration.
@@ -149,6 +149,29 @@ void furi_hal_infrared_async_tx_set_signal_sent_isr_callback(
     FuriHalInfraredTxSignalSentISRCallback callback,
     void* context);
 
+/** Detect which pin has an external IR module connected.
+ *
+ * External IR modules are detected by enabling a weak pull-up
+ * on supported pins and testing whether the input is still low.
+ *
+ * This method works best on modules that employ a FET with a
+ * strong pull-down or a BJT for driving IR LEDs.
+ *
+ * The module MUST pull the input voltage down to at least 0.9V
+ * or lower in order for it to be detected.
+ *
+ * If no module has been detected, FuriHalInfraredTxPinInternal is returned.
+ *
+ * @return numeric identifier of the first pin with a module detected.
+ */
+FuriHalInfraredTxPin furi_hal_infrared_detect_tx_output(void);
+
+/** Set which pin will be used to transmit infrared signals.
+ *
+ * @param[in]   tx_pin  pin to be used for signal transmission.
+ */
+void furi_hal_infrared_set_tx_output(FuriHalInfraredTxPin tx_pin);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/targets/furi_hal_include/furi_hal_light.h b/targets/furi_hal_include/furi_hal_light.h
index 0e06bd423..60f16afe8 100644
--- a/targets/furi_hal_include/furi_hal_light.h
+++ b/targets/furi_hal_include/furi_hal_light.h
@@ -15,7 +15,7 @@ extern "C" {
 
 /** Init light driver
  */
-void furi_hal_light_init();
+void furi_hal_light_init(void);
 
 /** Set light value
  *
@@ -35,7 +35,7 @@ void furi_hal_light_blink_start(Light light, uint8_t brightness, uint16_t on_tim
 
 /** Stop hardware LED blinking mode
  */
-void furi_hal_light_blink_stop();
+void furi_hal_light_blink_stop(void);
 
 /** Set color in hardware LED blinking mode
  *
diff --git a/targets/furi_hal_include/furi_hal_memory.h b/targets/furi_hal_include/furi_hal_memory.h
index e9efa08c1..6451d93bc 100644
--- a/targets/furi_hal_include/furi_hal_memory.h
+++ b/targets/furi_hal_include/furi_hal_memory.h
@@ -15,7 +15,7 @@ extern "C" {
 /**
  * @brief Init memory pool manager
  */
-void furi_hal_memory_init();
+void furi_hal_memory_init(void);
 
 /**
  * @brief Allocate memory from separate memory pool. That memory can't be freed.
@@ -30,14 +30,14 @@ void* furi_hal_memory_alloc(size_t size);
  * 
  * @return size_t 
  */
-size_t furi_hal_memory_get_free();
+size_t furi_hal_memory_get_free(void);
 
 /**
  * @brief Get max free block size from memory pool
  * 
  * @return size_t 
  */
-size_t furi_hal_memory_max_pool_block();
+size_t furi_hal_memory_max_pool_block(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/furi_hal_include/furi_hal_mpu.h b/targets/furi_hal_include/furi_hal_mpu.h
index 5dddadeb6..7a5759c17 100644
--- a/targets/furi_hal_include/furi_hal_mpu.h
+++ b/targets/furi_hal_include/furi_hal_mpu.h
@@ -57,17 +57,17 @@ typedef enum {
 /**
  * @brief Initialize memory protection unit
  */
-void furi_hal_mpu_init();
+void furi_hal_mpu_init(void);
 
 /**
 * @brief Enable memory protection unit
 */
-void furi_hal_mpu_enable();
+void furi_hal_mpu_enable(void);
 
 /**
 * @brief Disable memory protection unit
 */
-void furi_hal_mpu_disable();
+void furi_hal_mpu_disable(void);
 
 void furi_hal_mpu_protect_no_access(
     FuriHalMpuRegion region,
diff --git a/targets/furi_hal_include/furi_hal_nfc.h b/targets/furi_hal_include/furi_hal_nfc.h
index 3d145d100..1c9f54d35 100644
--- a/targets/furi_hal_include/furi_hal_nfc.h
+++ b/targets/furi_hal_include/furi_hal_nfc.h
@@ -101,14 +101,14 @@ typedef enum {
  * 
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_init();
+FuriHalNfcError furi_hal_nfc_init(void);
 
 /**
  * @brief Check whether the NFC HAL was properly initialised and is ready.
  *
  * @returns FuriHalNfcErrorNone if ready, any other error code if not ready.
  */
-FuriHalNfcError furi_hal_nfc_is_hal_ready();
+FuriHalNfcError furi_hal_nfc_is_hal_ready(void);
 
 /**
  * @brief Exclusively take over the NFC HAL and associated hardware.
@@ -118,7 +118,7 @@ FuriHalNfcError furi_hal_nfc_is_hal_ready();
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_acquire();
+FuriHalNfcError furi_hal_nfc_acquire(void);
 
 /**
  * @brief Release the exclusive lock and make the NFC HAL available for others.
@@ -129,7 +129,7 @@ FuriHalNfcError furi_hal_nfc_acquire();
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_release();
+FuriHalNfcError furi_hal_nfc_release(void);
 
 /**
  * @brief Configure the NFC hardware to enter the low-power mode.
@@ -139,7 +139,7 @@ FuriHalNfcError furi_hal_nfc_release();
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_low_power_mode_start();
+FuriHalNfcError furi_hal_nfc_low_power_mode_start(void);
 
 /**
  * @brief Configure the NFC hardware to exit the low-power mode.
@@ -149,7 +149,7 @@ FuriHalNfcError furi_hal_nfc_low_power_mode_start();
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_low_power_mode_stop();
+FuriHalNfcError furi_hal_nfc_low_power_mode_stop(void);
 
 /**
  * @brief Configure the NFC HAL to work in a particular mode.
@@ -167,28 +167,28 @@ FuriHalNfcError furi_hal_nfc_set_mode(FuriHalNfcMode mode, FuriHalNfcTech tech);
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_reset_mode();
+FuriHalNfcError furi_hal_nfc_reset_mode(void);
 
 /**
  * @brief Enable field (carrier) detection by the NFC hardware.
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_field_detect_start();
+FuriHalNfcError furi_hal_nfc_field_detect_start(void);
 
 /**
  * @brief Disable field (carrier) detection by the NFC hardware.
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_field_detect_stop();
+FuriHalNfcError furi_hal_nfc_field_detect_stop(void);
 
 /**
  * @brief Check if the reader field (carrier) was detected by the NFC hardware.
  *
  * @returns true if the field was detected, false otherwise.
  */
-bool furi_hal_nfc_field_is_present();
+bool furi_hal_nfc_field_is_present(void);
 
 /**
  * @brief Enable field (carrier) generation by the NFC hardware.
@@ -197,7 +197,7 @@ bool furi_hal_nfc_field_is_present();
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_poller_field_on();
+FuriHalNfcError furi_hal_nfc_poller_field_on(void);
 
 /**
  * @brief Wait for an NFC HAL event in poller mode.
@@ -228,9 +228,9 @@ FuriHalNfcError furi_hal_nfc_poller_tx(const uint8_t* tx_data, size_t tx_bits);
  *
  * The receive buffer must be big enough to accomodate all of the expected data.
  *
- * @param rx_data[out] pointer to a byte array to be filled with received data.
- * @param rx_data_size[in] maximum received data size, in bytes.
- * @param rx_bits[out] pointer to the variable to hold received data size, in bits.
+ * @param[out] rx_data pointer to a byte array to be filled with received data.
+ * @param[in] rx_data_size maximum received data size, in bytes.
+ * @param[out] rx_bits pointer to the variable to hold received data size, in bits.
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
 FuriHalNfcError furi_hal_nfc_poller_rx(uint8_t* rx_data, size_t rx_data_size, size_t* rx_bits);
@@ -249,9 +249,9 @@ FuriHalNfcError furi_hal_nfc_listener_tx(const uint8_t* tx_data, size_t tx_bits)
  *
  * The receive buffer must be big enough to accomodate all of the expected data.
  *
- * @param rx_data[out] pointer to a byte array to be filled with received data.
- * @param rx_data_size[in] maximum received data size, in bytes.
- * @param rx_bits[out] pointer to the variable to hold received data size, in bits.
+ * @param[out] rx_data pointer to a byte array to be filled with received data.
+ * @param[in] rx_data_size maximum received data size, in bytes.
+ * @param[out] rx_bits pointer to the variable to hold received data size, in bits.
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
 FuriHalNfcError furi_hal_nfc_listener_rx(uint8_t* rx_data, size_t rx_data_size, size_t* rx_bits);
@@ -263,7 +263,7 @@ FuriHalNfcError furi_hal_nfc_listener_rx(uint8_t* rx_data, size_t rx_data_size,
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_listener_sleep();
+FuriHalNfcError furi_hal_nfc_listener_sleep(void);
 
 /**
  * @brief Go to idle in listener mode.
@@ -272,7 +272,7 @@ FuriHalNfcError furi_hal_nfc_listener_sleep();
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_listener_idle();
+FuriHalNfcError furi_hal_nfc_listener_idle(void);
 
 /**
  * @brief Enable reception in listener mode.
@@ -281,7 +281,7 @@ FuriHalNfcError furi_hal_nfc_listener_idle();
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_listener_enable_rx();
+FuriHalNfcError furi_hal_nfc_listener_enable_rx(void);
 
 /**
  * @brief Reset communication.
@@ -290,7 +290,7 @@ FuriHalNfcError furi_hal_nfc_listener_enable_rx();
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_trx_reset();
+FuriHalNfcError furi_hal_nfc_trx_reset(void);
 
 /**
  * @brief Enable generation of NFC HAL events.
@@ -300,7 +300,7 @@ FuriHalNfcError furi_hal_nfc_trx_reset();
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_event_start();
+FuriHalNfcError furi_hal_nfc_event_start(void);
 
 /**
  * @brief Disable generation of NFC HAL events.
@@ -309,14 +309,14 @@ FuriHalNfcError furi_hal_nfc_event_start();
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
-FuriHalNfcError furi_hal_nfc_event_stop();
+FuriHalNfcError furi_hal_nfc_event_stop(void);
 
 /**
  * @brief Manually emit the FuriHalNfcEventAbortRequest event.
  *
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
 */
-FuriHalNfcError furi_hal_nfc_abort();
+FuriHalNfcError furi_hal_nfc_abort(void);
 
 /**
  * @brief Start frame wait timeout timer.
@@ -328,7 +328,7 @@ void furi_hal_nfc_timer_fwt_start(uint32_t time_fc);
 /**
  * @brief Stop frame wait timeout timer.
  */
-void furi_hal_nfc_timer_fwt_stop();
+void furi_hal_nfc_timer_fwt_stop(void);
 
 /**
  * @brief Start block transmit (frame delay) timer.
@@ -347,14 +347,14 @@ void furi_hal_nfc_timer_block_tx_start_us(uint32_t time_us);
 /**
  * @brief Stop block transmit (frame delay) timer.
  */
-void furi_hal_nfc_timer_block_tx_stop();
+void furi_hal_nfc_timer_block_tx_stop(void);
 
 /**
  * @brief Check whether block transmit (frame delay) timer is running.
  *
  * @returns true if timer is running, false otherwise.
  */
-bool furi_hal_nfc_timer_block_tx_is_running();
+bool furi_hal_nfc_timer_block_tx_is_running(void);
 
 /*
  * Technology-specific functions.
@@ -395,9 +395,9 @@ FuriHalNfcError furi_hal_nfc_iso14443a_tx_sdd_frame(const uint8_t* tx_data, size
  *
  * The receive buffer must be big enough to accomodate all of the expected data.
  *
- * @param rx_data[out] pointer to a byte array to be filled with received data.
- * @param rx_data_size[in] maximum received data size, in bytes.
- * @param rx_bits[out] pointer to the variable to hold received data size, in bits.
+ * @param[in] rx_data pointer to a byte array to be filled with received data.
+ * @param[in] rx_data_size maximum received data size, in bytes.
+ * @param[in] rx_bits pointer to the variable to hold received data size, in bits.
  * @returns FuriHalNfcErrorNone on success, any other error code on failure.
  */
 FuriHalNfcError
@@ -450,7 +450,7 @@ FuriHalNfcError furi_hal_nfc_iso14443a_listener_tx_custom_parity(
  *
  * @return FuriHalNfcError
 */
-FuriHalNfcError furi_hal_nfc_iso15693_listener_tx_sof();
+FuriHalNfcError furi_hal_nfc_iso15693_listener_tx_sof(void);
 
 /**
  * @brief Set FeliCa collision resolution parameters in listener mode.
diff --git a/targets/furi_hal_include/furi_hal_power.h b/targets/furi_hal_include/furi_hal_power.h
index ebe0fe614..06598df86 100644
--- a/targets/furi_hal_include/furi_hal_power.h
+++ b/targets/furi_hal_include/furi_hal_power.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <core/string.h>
+#include <core/common_defines.h>
 #include <toolbox/property.h>
 
 #ifdef __cplusplus
@@ -21,7 +22,7 @@ typedef enum {
 } FuriHalPowerIC;
 
 /** Initialize drivers */
-void furi_hal_power_init();
+void furi_hal_power_init(void);
 
 /** Check if gauge is ok
  * 
@@ -32,112 +33,110 @@ void furi_hal_power_init();
  * 
  * @return true if gauge is ok
  */
-bool furi_hal_power_gauge_is_ok();
+bool furi_hal_power_gauge_is_ok(void);
 
 /** Check if gauge requests system shutdown
  * 
  * @return true if system shutdown requested
  */
-bool furi_hal_power_is_shutdown_requested();
+bool furi_hal_power_is_shutdown_requested(void);
 
 /** Get current insomnia level
  *
  * @return     insomnia level: 0 - no insomnia, >0 - insomnia, bearer count.
  */
-uint16_t furi_hal_power_insomnia_level();
+uint16_t furi_hal_power_insomnia_level(void);
 
 /** Enter insomnia mode Prevents device from going to sleep
  * @warning    Internally increases insomnia level Must be paired with
  *             furi_hal_power_insomnia_exit
  */
-void furi_hal_power_insomnia_enter();
+void furi_hal_power_insomnia_enter(void);
 
 /** Exit insomnia mode Allow device to go to sleep
  * @warning    Internally decreases insomnia level. Must be paired with
  *             furi_hal_power_insomnia_enter
  */
-void furi_hal_power_insomnia_exit();
+void furi_hal_power_insomnia_exit(void);
 
 /** Check if sleep available
  *
  * @return     true if available
  */
-bool furi_hal_power_sleep_available();
+bool furi_hal_power_sleep_available(void);
 
 /** Go to sleep
  */
-void furi_hal_power_sleep();
+void furi_hal_power_sleep(void);
 
 /** Get predicted remaining battery capacity in percents
  *
  * @return     remaining battery capacity in percents
  */
-uint8_t furi_hal_power_get_pct();
+uint8_t furi_hal_power_get_pct(void);
 
 /** Get battery health state in percents
  *
  * @return     health in percents
  */
-uint8_t furi_hal_power_get_bat_health_pct();
+uint8_t furi_hal_power_get_bat_health_pct(void);
 
 /** Get charging status
  *
  * @return     true if charging
  */
-bool furi_hal_power_is_charging();
+bool furi_hal_power_is_charging(void);
 
 /** Get charge complete status
  *
  * @return     true if done charging and connected to charger
  */
-bool furi_hal_power_is_charging_done();
+bool furi_hal_power_is_charging_done(void);
 
 /** Switch MCU to SHUTDOWN */
-void furi_hal_power_shutdown();
+void furi_hal_power_shutdown(void);
 
 /** Poweroff device
  */
-void furi_hal_power_off();
+void furi_hal_power_off(void);
 
 /** Reset device
  */
-void furi_hal_power_reset();
+FURI_NORETURN void furi_hal_power_reset(void);
 
 /** OTG enable
  */
-bool furi_hal_power_enable_otg();
+bool furi_hal_power_enable_otg(void);
 
 /** OTG disable
  */
-void furi_hal_power_disable_otg();
+void furi_hal_power_disable_otg(void);
 
 /** Check OTG status fault
  */
-bool furi_hal_power_check_otg_fault();
+bool furi_hal_power_check_otg_fault(void);
 
 /** Check OTG status and disable it if falt happened
  */
-void furi_hal_power_check_otg_status();
+void furi_hal_power_check_otg_status(void);
 
 /** Get OTG status
  *
  * @return     true if enabled
  */
-bool furi_hal_power_is_otg_enabled();
+bool furi_hal_power_is_otg_enabled(void);
 
 /** Get battery charge voltage limit in V
  *
  * @return     voltage in V
  */
-float furi_hal_power_get_battery_charge_voltage_limit();
+float furi_hal_power_get_battery_charge_voltage_limit(void);
 
 /** Set battery charge voltage limit in V
  *
  * Invalid values will be clamped downward to the nearest valid value.
  *
- * @param      voltage[in]  voltage in V
- *
- * @return     voltage in V
+ * @param[in]      voltage  voltage in V
  */
 void furi_hal_power_set_battery_charge_voltage_limit(float voltage);
 
@@ -145,23 +144,23 @@ void furi_hal_power_set_battery_charge_voltage_limit(float voltage);
  *
  * @return     capacity in mAh
  */
-uint32_t furi_hal_power_get_battery_remaining_capacity();
+uint32_t furi_hal_power_get_battery_remaining_capacity(void);
 
 /** Get full charge battery capacity in mAh
  *
  * @return     capacity in mAh
  */
-uint32_t furi_hal_power_get_battery_full_capacity();
+uint32_t furi_hal_power_get_battery_full_capacity(void);
 
 /** Get battery capacity in mAh from battery profile
  *
  * @return     capacity in mAh
  */
-uint32_t furi_hal_power_get_battery_design_capacity();
+uint32_t furi_hal_power_get_battery_design_capacity(void);
 
 /** Get battery voltage in V
  *
- * @param      ic    FuriHalPowerIc to get measurment
+ * @param[in]      ic    FuriHalPowerIc to get measurment
  *
  * @return     voltage in V
  */
@@ -169,7 +168,7 @@ float furi_hal_power_get_battery_voltage(FuriHalPowerIC ic);
 
 /** Get battery current in A
  *
- * @param      ic    FuriHalPowerIc to get measurment
+ * @param[in]      ic    FuriHalPowerIc to get measurment
  *
  * @return     current in A
  */
@@ -177,7 +176,7 @@ float furi_hal_power_get_battery_current(FuriHalPowerIC ic);
 
 /** Get temperature in C
  *
- * @param      ic    FuriHalPowerIc to get measurment
+ * @param[in]      ic    FuriHalPowerIc to get measurment
  *
  * @return     temperature in C
  */
@@ -187,25 +186,25 @@ float furi_hal_power_get_battery_temperature(FuriHalPowerIC ic);
  *
  * @return     voltage in V
  */
-float furi_hal_power_get_usb_voltage();
+float furi_hal_power_get_usb_voltage(void);
 
 /** Enable 3.3v on external gpio and sd card
  */
-void furi_hal_power_enable_external_3_3v();
+void furi_hal_power_enable_external_3_3v(void);
 
 /** Disable 3.3v on external gpio and sd card
  */
-void furi_hal_power_disable_external_3_3v();
+void furi_hal_power_disable_external_3_3v(void);
 
 /** Enter supress charge mode.
  *
  * Use this function when your application need clean power supply.
  */
-void furi_hal_power_suppress_charge_enter();
+void furi_hal_power_suppress_charge_enter(void);
 
 /** Exit supress charge mode
  */
-void furi_hal_power_suppress_charge_exit();
+void furi_hal_power_suppress_charge_exit(void);
 
 /** Get power information
  *
diff --git a/targets/furi_hal_include/furi_hal_random.h b/targets/furi_hal_include/furi_hal_random.h
index 5ca9cb723..fab62083f 100644
--- a/targets/furi_hal_include/furi_hal_random.h
+++ b/targets/furi_hal_include/furi_hal_random.h
@@ -6,14 +6,18 @@
 extern "C" {
 #endif
 
+#define FURI_HAL_RANDOM_MAX 0xFFFFFFFFU
+
 /** Initialize random subsystem */
-void furi_hal_random_init();
+void furi_hal_random_init(void);
 
 /** Get random value
+ * furi_hal_random_get() gives up to FURI_HAL_RANDOM_MAX
+ * rand() and random() give up to RAND_MAX
  *
- * @return     random value
+ * @return     32 bit random value (up to FURI_HAL_RANDOM_MAX)
  */
-uint32_t furi_hal_random_get();
+uint32_t furi_hal_random_get(void);
 
 /** Fill buffer with random data
  *
diff --git a/targets/furi_hal_include/furi_hal_region.h b/targets/furi_hal_include/furi_hal_region.h
index 9586d51ed..a1605c93a 100644
--- a/targets/furi_hal_include/furi_hal_region.h
+++ b/targets/furi_hal_include/furi_hal_region.h
@@ -28,7 +28,7 @@ typedef struct {
  *
  * @return     pointer to FuriHalRegion instance (in RAM or Flash, check before freeing on region update)
  */
-const FuriHalRegion* furi_hal_region_get();
+const FuriHalRegion* furi_hal_region_get(void);
 
 /** Set device region data
  *
@@ -40,7 +40,7 @@ void furi_hal_region_set(FuriHalRegion* region);
  *
  * @return     true if provisioned, false otherwise
  */
-bool furi_hal_region_is_provisioned();
+bool furi_hal_region_is_provisioned(void);
 
 /** Get region name
  * 
@@ -52,7 +52,7 @@ bool furi_hal_region_is_provisioned();
  *
  * @return     Pointer to string
  */
-const char* furi_hal_region_get_name();
+const char* furi_hal_region_get_name(void);
 
 /** Сheck if transmission is allowed on this frequency for your flipper region
  *
diff --git a/targets/furi_hal_include/furi_hal_sd.h b/targets/furi_hal_include/furi_hal_sd.h
index 645403b7f..28534846c 100644
--- a/targets/furi_hal_include/furi_hal_sd.h
+++ b/targets/furi_hal_include/furi_hal_sd.h
@@ -29,19 +29,19 @@ typedef struct {
 /** 
  * @brief Init SD card presence detection
  */
-void furi_hal_sd_presence_init();
+void furi_hal_sd_presence_init(void);
 
 /** 
  * @brief Get SD card status
  * @return true if SD card is present
  */
-bool furi_hal_sd_is_present();
+bool furi_hal_sd_is_present(void);
 
 /**
  * @brief SD card max mount retry count
  * @return uint8_t 
  */
-uint8_t furi_hal_sd_max_mount_retry_count();
+uint8_t furi_hal_sd_max_mount_retry_count(void);
 
 /**
  * @brief Init SD card
@@ -79,7 +79,7 @@ FuriStatus furi_hal_sd_info(FuriHalSdInfo* info);
  * @brief Get SD card state
  * @return FuriStatus 
  */
-FuriStatus furi_hal_sd_get_card_state();
+FuriStatus furi_hal_sd_get_card_state(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/furi_hal_include/furi_hal_speaker.h b/targets/furi_hal_include/furi_hal_speaker.h
index 0b33d9232..825a44e04 100644
--- a/targets/furi_hal_include/furi_hal_speaker.h
+++ b/targets/furi_hal_include/furi_hal_speaker.h
@@ -11,10 +11,10 @@ extern "C" {
 #endif
 
 /** Init speaker */
-void furi_hal_speaker_init();
+void furi_hal_speaker_init(void);
 
 /** Deinit speaker */
-void furi_hal_speaker_deinit();
+void furi_hal_speaker_deinit(void);
 
 /** Acquire speaker ownership
  *
@@ -30,7 +30,7 @@ FURI_WARN_UNUSED bool furi_hal_speaker_acquire(uint32_t timeout);
  *
  * @warning    You must release speaker ownership after use
  */
-void furi_hal_speaker_release();
+void furi_hal_speaker_release(void);
 
 /** Check current process speaker ownership
  *
@@ -38,7 +38,7 @@ void furi_hal_speaker_release();
  *
  * @return     bool returns true if process owns speaker
  */
-bool furi_hal_speaker_is_mine();
+bool furi_hal_speaker_is_mine(void);
 
 /** Play a note
  *
@@ -61,7 +61,7 @@ void furi_hal_speaker_set_volume(float volume);
  *
  * @warning    no ownership check if called from ISR
  */
-void furi_hal_speaker_stop();
+void furi_hal_speaker_stop(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/furi_hal_include/furi_hal_spi.h b/targets/furi_hal_include/furi_hal_spi.h
index af15a8838..d497dff5c 100644
--- a/targets/furi_hal_include/furi_hal_spi.h
+++ b/targets/furi_hal_include/furi_hal_spi.h
@@ -8,16 +8,16 @@ extern "C" {
 #endif
 
 /** Early initialize SPI HAL */
-void furi_hal_spi_config_init_early();
+void furi_hal_spi_config_init_early(void);
 
 /** Early deinitialize SPI HAL */
-void furi_hal_spi_config_deinit_early();
+void furi_hal_spi_config_deinit_early(void);
 
 /** Initialize SPI HAL */
-void furi_hal_spi_config_init();
+void furi_hal_spi_config_init(void);
 
 /** Initialize SPI DMA HAL */
-void furi_hal_spi_dma_init();
+void furi_hal_spi_dma_init(void);
 
 /** Initialize SPI Bus
  *
diff --git a/targets/furi_hal_include/furi_hal_usb.h b/targets/furi_hal_include/furi_hal_usb.h
index a98797955..213e8d56f 100644
--- a/targets/furi_hal_include/furi_hal_usb.h
+++ b/targets/furi_hal_include/furi_hal_usb.h
@@ -41,7 +41,7 @@ typedef void (*FuriHalUsbStateCallback)(FuriHalUsbStateEvent state, void* contex
 
 /** USB device low-level initialization
  */
-void furi_hal_usb_init();
+void furi_hal_usb_init(void);
 
 /** Set USB device configuration
  *
@@ -55,29 +55,29 @@ bool furi_hal_usb_set_config(FuriHalUsbInterface* new_if, void* ctx);
  *
  * @return    current USB device mode
  */
-FuriHalUsbInterface* furi_hal_usb_get_config();
+FuriHalUsbInterface* furi_hal_usb_get_config(void);
 
 /** Lock USB device mode switch
  */
-void furi_hal_usb_lock();
+void furi_hal_usb_lock(void);
 
 /** Unlock USB device mode switch
  */
-void furi_hal_usb_unlock();
+void furi_hal_usb_unlock(void);
 
 /** Check if USB device mode switch locked
  * 
  * @return    lock state
  */
-bool furi_hal_usb_is_locked();
+bool furi_hal_usb_is_locked(void);
 
 /** Disable USB device
  */
-void furi_hal_usb_disable();
+void furi_hal_usb_disable(void);
 
 /** Enable USB device
  */
-void furi_hal_usb_enable();
+void furi_hal_usb_enable(void);
 
 /** Set USB state callback
  */
@@ -85,7 +85,7 @@ void furi_hal_usb_set_state_callback(FuriHalUsbStateCallback cb, void* ctx);
 
 /** Restart USB device
  */
-void furi_hal_usb_reinit();
+void furi_hal_usb_reinit(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/furi_hal_include/furi_hal_usb_ccid.h b/targets/furi_hal_include/furi_hal_usb_ccid.h
index a4880e4b6..500bafa3d 100644
--- a/targets/furi_hal_include/furi_hal_usb_ccid.h
+++ b/targets/furi_hal_include/furi_hal_usb_ccid.h
@@ -28,8 +28,8 @@ typedef struct {
 
 void furi_hal_ccid_set_callbacks(CcidCallbacks* cb);
 
-void furi_hal_ccid_ccid_insert_smartcard();
-void furi_hal_ccid_ccid_remove_smartcard();
+void furi_hal_ccid_ccid_insert_smartcard(void);
+void furi_hal_ccid_ccid_remove_smartcard(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/furi_hal_include/furi_hal_usb_hid.h b/targets/furi_hal_include/furi_hal_usb_hid.h
index 13e83ef67..29994196f 100644
--- a/targets/furi_hal_include/furi_hal_usb_hid.h
+++ b/targets/furi_hal_include/furi_hal_usb_hid.h
@@ -14,6 +14,11 @@ extern "C" {
 /** Max number of simultaneously pressed keys (consumer control) */
 #define HID_CONSUMER_MAX_KEYS 2
 
+/** OS-specific consumer keys, defined as "Reserved" in HID Usage Tables document */
+#define HID_CONSUMER_BRIGHTNESS_INCREMENT 0x006F
+#define HID_CONSUMER_BRIGHTNESS_DECREMENT 0x0070
+#define HID_CONSUMER_FN_GLOBE 0x029D
+
 #define HID_KEYBOARD_NONE 0x00
 
 /** HID keyboard modifier keys */
@@ -190,13 +195,13 @@ enum HidMouseButtons {
  *
  * @return      true / false
  */
-bool furi_hal_hid_is_connected();
+bool furi_hal_hid_is_connected(void);
 
 /** Get USB HID keyboard leds state
  *
  * @return      leds state
  */
-uint8_t furi_hal_hid_get_led_state();
+uint8_t furi_hal_hid_get_led_state(void);
 
 /** Set USB HID connect/disconnect callback
  *
@@ -220,7 +225,7 @@ bool furi_hal_hid_kb_release(uint16_t button);
 /** Clear all pressed keys and send HID report
  *
  */
-bool furi_hal_hid_kb_release_all();
+bool furi_hal_hid_kb_release_all(void);
 
 /** Set mouse movement and send HID report
  *
@@ -259,6 +264,11 @@ bool furi_hal_hid_consumer_key_press(uint16_t button);
  */
 bool furi_hal_hid_consumer_key_release(uint16_t button);
 
+/** Clear all pressed consumer keys and send HID report
+ *
+ */
+bool furi_hal_hid_consumer_key_release_all(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/targets/furi_hal_include/furi_hal_usb_hid_u2f.h b/targets/furi_hal_include/furi_hal_usb_hid_u2f.h
index 1b20a33c4..444ef552f 100644
--- a/targets/furi_hal_include/furi_hal_usb_hid_u2f.h
+++ b/targets/furi_hal_include/furi_hal_usb_hid_u2f.h
@@ -18,7 +18,7 @@ typedef void (*HidU2fCallback)(HidU2fEvent ev, void* context);
  *
  * @return      true / false
  */
-bool furi_hal_hid_u2f_is_connected();
+bool furi_hal_hid_u2f_is_connected(void);
 
 /** Set HID U2F event callback
  *
diff --git a/targets/furi_hal_include/furi_hal_version.h b/targets/furi_hal_include/furi_hal_version.h
index 49f4f82cb..ca870ad66 100644
--- a/targets/furi_hal_include/furi_hal_version.h
+++ b/targets/furi_hal_include/furi_hal_version.h
@@ -55,145 +55,145 @@ typedef enum {
 
 /** Init flipper version
  */
-void furi_hal_version_init();
+void furi_hal_version_init(void);
 
 /** Check target firmware version
  *
  * @return     true if target and real matches
  */
-bool furi_hal_version_do_i_belong_here();
+bool furi_hal_version_do_i_belong_here(void);
 
 /** Get model name
  *
  * @return     model name C-string
  */
-const char* furi_hal_version_get_model_name();
+const char* furi_hal_version_get_model_name(void);
 
 /** Get model name
  *
  * @return     model code C-string
  */
-const char* furi_hal_version_get_model_code();
+const char* furi_hal_version_get_model_code(void);
 
 /** Get FCC ID
  *
  * @return     FCC id as C-string
  */
-const char* furi_hal_version_get_fcc_id();
+const char* furi_hal_version_get_fcc_id(void);
 
 /** Get IC id
  *
  * @return     IC id as C-string
  */
-const char* furi_hal_version_get_ic_id();
+const char* furi_hal_version_get_ic_id(void);
 
 /** Get MIC id
  *
  * @return     MIC id as C-string
  */
-const char* furi_hal_version_get_mic_id();
+const char* furi_hal_version_get_mic_id(void);
 
 /** Get SRRC id
  *
  * @return     SRRC id as C-string
  */
-const char* furi_hal_version_get_srrc_id();
+const char* furi_hal_version_get_srrc_id(void);
 
 /** Get NCC id
  *
  * @return     NCC id as C-string
  */
-const char* furi_hal_version_get_ncc_id();
+const char* furi_hal_version_get_ncc_id(void);
 
 /** Get OTP version
  *
  * @return     OTP Version
  */
-FuriHalVersionOtpVersion furi_hal_version_get_otp_version();
+FuriHalVersionOtpVersion furi_hal_version_get_otp_version(void);
 
 /** Get hardware version
  *
  * @return     Hardware Version
  */
-uint8_t furi_hal_version_get_hw_version();
+uint8_t furi_hal_version_get_hw_version(void);
 
 /** Get hardware target
  *
  * @return     Hardware Target
  */
-uint8_t furi_hal_version_get_hw_target();
+uint8_t furi_hal_version_get_hw_target(void);
 
 /** Get hardware body
  *
  * @return     Hardware Body
  */
-uint8_t furi_hal_version_get_hw_body();
+uint8_t furi_hal_version_get_hw_body(void);
 
 /** Get hardware body color
  *
  * @return     Hardware Color
  */
-FuriHalVersionColor furi_hal_version_get_hw_color();
+FuriHalVersionColor furi_hal_version_get_hw_color(void);
 
 /** Get hardware connect
  *
  * @return     Hardware Interconnect
  */
-uint8_t furi_hal_version_get_hw_connect();
+uint8_t furi_hal_version_get_hw_connect(void);
 
 /** Get hardware region (fake) = 0
  *
  * @return     Hardware Region (fake)
  */
-FuriHalVersionRegion furi_hal_version_get_hw_region();
+FuriHalVersionRegion furi_hal_version_get_hw_region(void);
 
 /** Get hardware region name (fake) = R00
  *
  * @return     Hardware Region name (fake)
  */
-const char* furi_hal_version_get_hw_region_name();
+const char* furi_hal_version_get_hw_region_name(void);
 
 /** Get hardware region (OTP)
  *
  * @return     Hardware Region
  */
-FuriHalVersionRegion furi_hal_version_get_hw_region_otp();
+FuriHalVersionRegion furi_hal_version_get_hw_region_otp(void);
 
 /** Get hardware region name (OTP)
  *
  * @return     Hardware Region name
  */
-const char* furi_hal_version_get_hw_region_name_otp();
+const char* furi_hal_version_get_hw_region_name_otp(void);
 
 /** Get hardware display id
  *
  * @return     Display id
  */
-FuriHalVersionDisplay furi_hal_version_get_hw_display();
+FuriHalVersionDisplay furi_hal_version_get_hw_display(void);
 
 /** Get hardware timestamp
  *
  * @return     Hardware Manufacture timestamp
  */
-uint32_t furi_hal_version_get_hw_timestamp();
+uint32_t furi_hal_version_get_hw_timestamp(void);
 
 /** Get pointer to target name
  *
  * @return     Hardware Name C-string
  */
-const char* furi_hal_version_get_name_ptr();
+const char* furi_hal_version_get_name_ptr(void);
 
 /** Get pointer to target device name
  *
  * @return     Hardware Device Name C-string
  */
-const char* furi_hal_version_get_device_name_ptr();
+const char* furi_hal_version_get_device_name_ptr(void);
 
 /** Get pointer to target ble local device name
  *
  * @return     Ble Device Name C-string
  */
-const char* furi_hal_version_get_ble_local_device_name_ptr();
+const char* furi_hal_version_get_ble_local_device_name_ptr(void);
 
 /** Set flipper name
  */
@@ -203,27 +203,27 @@ void furi_hal_version_set_name(const char* name);
  *
  * @return     pointer to BLE MAC address
  */
-const uint8_t* furi_hal_version_get_ble_mac();
+const uint8_t* furi_hal_version_get_ble_mac(void);
 
 /** Get address of version structure of firmware.
  *
  * @return     Address of firmware version structure.
  */
-const struct Version* furi_hal_version_get_firmware_version();
+const struct Version* furi_hal_version_get_firmware_version(void);
 
 /** Get platform UID size in bytes
  *
  * @return     UID size in bytes
  */
-size_t furi_hal_version_uid_size();
+size_t furi_hal_version_uid_size(void);
 
 /** Get const pointer to UID
  *
  * @return     pointer to UID
  */
-const uint8_t* furi_hal_version_uid();
+const uint8_t* furi_hal_version_uid(void);
 
-const uint8_t* furi_hal_version_uid_default();
+const uint8_t* furi_hal_version_uid_default(void);
 
 #ifdef __cplusplus
 }
diff --git a/targets/furi_hal_include/furi_hal_vibro.h b/targets/furi_hal_include/furi_hal_vibro.h
index fa5a54c68..0254f42e0 100644
--- a/targets/furi_hal_include/furi_hal_vibro.h
+++ b/targets/furi_hal_include/furi_hal_vibro.h
@@ -15,7 +15,7 @@ extern "C" {
 
 /** Initialize vibro
  */
-void furi_hal_vibro_init();
+void furi_hal_vibro_init(void);
 
 /** Turn on/off vibro
  *