diff --git a/applications/external/arkanoid/application.fam b/applications/external/arkanoid/application.fam
index 05520b4bf..5cfec8862 100644
--- a/applications/external/arkanoid/application.fam
+++ b/applications/external/arkanoid/application.fam
@@ -3,7 +3,6 @@ App(
     name="Arkanoid",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="arkanoid_game_app",
-    cdefines=["APP_ARKANOID_GAME"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=30,
diff --git a/applications/external/barcode_generator/application.fam b/applications/external/barcode_generator/application.fam
index d2d7c4b96..c92498005 100644
--- a/applications/external/barcode_generator/application.fam
+++ b/applications/external/barcode_generator/application.fam
@@ -3,7 +3,6 @@ App(
     name="Barcode Generator",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="barcode_generator_app",
-    cdefines=["APP_BARCODE_GEN"],
     requires=[
         "gui",
         "dialogs",
diff --git a/applications/external/blackjack/application.fam b/applications/external/blackjack/application.fam
index d365cb895..f0645f003 100644
--- a/applications/external/blackjack/application.fam
+++ b/applications/external/blackjack/application.fam
@@ -3,7 +3,6 @@ App(
     name="Blackjack",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="blackjack_app",
-    cdefines=["APP_BLACKJACK"],
     requires=["gui","storage","canvas"],
     stack_size=2 * 1024,
     order=30,
diff --git a/applications/external/doom/application.fam b/applications/external/doom/application.fam
index d9ae4d67d..4ff7b12f3 100644
--- a/applications/external/doom/application.fam
+++ b/applications/external/doom/application.fam
@@ -3,7 +3,6 @@ App(
     name="DOOM",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="doom_app",
-    cdefines=["APP_DOOM_GAME"],
     requires=[
         "gui",
         "music_player",
diff --git a/applications/external/dtmf_dolphin/application.fam b/applications/external/dtmf_dolphin/application.fam
index 0727f5f52..460f6ded6 100644
--- a/applications/external/dtmf_dolphin/application.fam
+++ b/applications/external/dtmf_dolphin/application.fam
@@ -3,7 +3,6 @@ App(
     name="DTMF Dolphin",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="dtmf_dolphin_app",
-    cdefines=["DTMF_DOLPHIN"],
     requires=[
         "storage",
         "gui",
diff --git a/applications/external/esp8266_deauth/application.fam b/applications/external/esp8266_deauth/application.fam
index 0b305e1fb..780c51c53 100644
--- a/applications/external/esp8266_deauth/application.fam
+++ b/applications/external/esp8266_deauth/application.fam
@@ -3,7 +3,6 @@ App(
     name="[ESP8266] Deauther",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="esp8266_deauth_app",
-    cdefines=["APP_ESP8266_deauth"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=100,
diff --git a/applications/external/flappy_bird/application.fam b/applications/external/flappy_bird/application.fam
index 0912178ca..f9fe85fa2 100644
--- a/applications/external/flappy_bird/application.fam
+++ b/applications/external/flappy_bird/application.fam
@@ -3,7 +3,6 @@ App(
     name="Flappy Bird",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="flappy_game_app",
-    cdefines=["APP_FLAPPY_GAME"],
     requires=["gui"],
     stack_size=4 * 1024,
     order=100,
diff --git a/applications/external/flipfrid/application.fam b/applications/external/flipfrid/application.fam
index 07649efca..8f620f4ac 100644
--- a/applications/external/flipfrid/application.fam
+++ b/applications/external/flipfrid/application.fam
@@ -3,7 +3,6 @@ App(
     name="RFID Fuzzer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="flipfrid_start",
-    cdefines=["APP_FLIP_FRID"],
     requires=["gui", "storage", "dialogs", "input", "notification"],
     stack_size=1 * 1024,
     order=15,
diff --git a/applications/external/flipper_i2ctools/application.fam b/applications/external/flipper_i2ctools/application.fam
index 6fafeef58..5a00aa045 100644
--- a/applications/external/flipper_i2ctools/application.fam
+++ b/applications/external/flipper_i2ctools/application.fam
@@ -3,7 +3,6 @@ App(
     name="[GPIO] i2c Tools",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="i2ctools_app",
-    cdefines=["APP_I2CTOOLS"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=175,
diff --git a/applications/external/game15/application.fam b/applications/external/game15/application.fam
index ab00316c1..969cb536a 100644
--- a/applications/external/game15/application.fam
+++ b/applications/external/game15/application.fam
@@ -3,7 +3,6 @@ App(
     name="Game 15",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="game15_app",
-    cdefines=["APP_GAME15"],
     requires=["gui"],
     stack_size=1 * 1024,
     fap_icon="game15_10px.png",
diff --git a/applications/external/game_2048/application.fam b/applications/external/game_2048/application.fam
index eb51d65e8..1be179dca 100644
--- a/applications/external/game_2048/application.fam
+++ b/applications/external/game_2048/application.fam
@@ -3,7 +3,6 @@ App(
     name="2048",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="game_2048_app",
-    cdefines=["APP_GAME_2048"],
     requires=[
         "gui",
     ],
diff --git a/applications/external/gps_nmea_uart/application.fam b/applications/external/gps_nmea_uart/application.fam
index a5fdb4360..e02785744 100644
--- a/applications/external/gps_nmea_uart/application.fam
+++ b/applications/external/gps_nmea_uart/application.fam
@@ -3,7 +3,6 @@ App(
     name="[NMEA] GPS",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="gps_app",
-    cdefines=["APP_GPS"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=35,
diff --git a/applications/external/hc_sr04/application.fam b/applications/external/hc_sr04/application.fam
index ad451a102..c10d7c42f 100644
--- a/applications/external/hc_sr04/application.fam
+++ b/applications/external/hc_sr04/application.fam
@@ -3,7 +3,6 @@ App(
     name="[HC-SR] Dist. Sensor",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="hc_sr04_app",
-    cdefines=["APP_HC_SR04"],
     requires=[
         "gui",
     ],
diff --git a/applications/external/hex_viewer/application.fam b/applications/external/hex_viewer/application.fam
index 7204e07c8..9bb15dc86 100644
--- a/applications/external/hex_viewer/application.fam
+++ b/applications/external/hex_viewer/application.fam
@@ -3,7 +3,6 @@ App(
     name="HEX Viewer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="hex_viewer_app",
-    cdefines=["APP_HEX_VIEWER"],
     requires=[
         "gui",
         "dialogs",
diff --git a/applications/external/ibtn_fuzzer/application.fam b/applications/external/ibtn_fuzzer/application.fam
index b27f47ba9..00c244c41 100644
--- a/applications/external/ibtn_fuzzer/application.fam
+++ b/applications/external/ibtn_fuzzer/application.fam
@@ -3,7 +3,6 @@ App(
     name="iButton Fuzzer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="ibtnfuzzer_start",
-    cdefines=["APP_IBTN_FUZZ"],
     requires=["gui", "storage", "dialogs", "input", "notification"],
     stack_size=1 * 1024,
     order=15,
diff --git a/applications/external/lightmeter/application.fam b/applications/external/lightmeter/application.fam
index 8cd90ee26..7df664517 100644
--- a/applications/external/lightmeter/application.fam
+++ b/applications/external/lightmeter/application.fam
@@ -3,7 +3,6 @@ App(
     name="[BH1750] Lightmeter",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="lightmeter_app",
-    cdefines=["APP_LIGHTMETER"],
     requires=[
         "gui",
     ],
diff --git a/applications/external/metronome/application.fam b/applications/external/metronome/application.fam
index a3435fd77..67411c5f2 100644
--- a/applications/external/metronome/application.fam
+++ b/applications/external/metronome/application.fam
@@ -3,7 +3,6 @@ App(
     name="Metronome",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="metronome_app",
-    cdefines=["APP_METRONOME"],
     requires=[
         "gui",
     ],
diff --git a/applications/external/minesweeper/application.fam b/applications/external/minesweeper/application.fam
index 405cb0d1c..c0211282c 100644
--- a/applications/external/minesweeper/application.fam
+++ b/applications/external/minesweeper/application.fam
@@ -3,7 +3,6 @@ App(
     name="Minesweeper",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="minesweeper_app",
-    cdefines=["APP_MINESWEEPER"],
     requires=["gui"],
     stack_size=8 * 1024,
     fap_category="Games",
diff --git a/applications/external/morse_code/application.fam b/applications/external/morse_code/application.fam
index 16a52fbd5..5db0f6a94 100644
--- a/applications/external/morse_code/application.fam
+++ b/applications/external/morse_code/application.fam
@@ -3,7 +3,6 @@ App(
     name="Morse Code",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="morse_code_app",
-    cdefines=["APP_MORSE_CODE"],
     requires=[
         "gui",
     ],
diff --git a/applications/external/mousejacker/application.fam b/applications/external/mousejacker/application.fam
index 725e81ae8..f65b06cc2 100644
--- a/applications/external/mousejacker/application.fam
+++ b/applications/external/mousejacker/application.fam
@@ -3,7 +3,6 @@ App(
     name="[NRF24] Mouse Jacker",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="mousejacker_app",
-    cdefines=["APP_MOUSEJACKER"],
     requires=[
         "gui",
         "dialogs",
diff --git a/applications/external/multi_converter/application.fam b/applications/external/multi_converter/application.fam
index b19bce895..9f49f18ad 100644
--- a/applications/external/multi_converter/application.fam
+++ b/applications/external/multi_converter/application.fam
@@ -3,7 +3,6 @@ App(
     name="Multi Converter",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="multi_converter_app",
-    cdefines=["APP_DEC_HEX_CONVERTER"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=19,
diff --git a/applications/external/nrfsniff/application.fam b/applications/external/nrfsniff/application.fam
index 2a2b98ae7..c99b9bf22 100644
--- a/applications/external/nrfsniff/application.fam
+++ b/applications/external/nrfsniff/application.fam
@@ -3,7 +3,6 @@ App(
     name="[NRF24] Sniffer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="nrfsniff_app",
-    cdefines=["APP_NRFSNIFF"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=70,
diff --git a/applications/external/playlist/application.fam b/applications/external/playlist/application.fam
index 06357e24b..e137cdb39 100644
--- a/applications/external/playlist/application.fam
+++ b/applications/external/playlist/application.fam
@@ -3,7 +3,6 @@ App(
     name="Sub-GHz Playlist",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="playlist_app",
-    cdefines=["APP_PLAYLIST"],
     requires=["storage", "gui", "dialogs", "subghz"],
     stack_size=2 * 1024,
     order=14,
diff --git a/applications/external/pocsag_pager/application.fam b/applications/external/pocsag_pager/application.fam
index b0d1bedd1..3cef05374 100644
--- a/applications/external/pocsag_pager/application.fam
+++ b/applications/external/pocsag_pager/application.fam
@@ -3,7 +3,6 @@ App(
     name="POCSAG Pager",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="pocsag_pager_app",
-    cdefines=["APP_POCSAG_PAGER"],
     requires=["gui"],
     stack_size=4 * 1024,
     order=50,
diff --git a/applications/external/protoview/application.fam b/applications/external/protoview/application.fam
index 234a00bc6..29cef0e10 100644
--- a/applications/external/protoview/application.fam
+++ b/applications/external/protoview/application.fam
@@ -3,7 +3,6 @@ App(
     name="ProtoView",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="protoview_app_entry",
-    cdefines=["APP_PROTOVIEW"],
     requires=["gui"],
     stack_size=8*1024,
     order=50,
diff --git a/applications/external/sentry_safe/application.fam b/applications/external/sentry_safe/application.fam
index 070a677ba..8958dc8bc 100644
--- a/applications/external/sentry_safe/application.fam
+++ b/applications/external/sentry_safe/application.fam
@@ -3,7 +3,6 @@ App(
     name="[GPIO] Sentry Safe",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="sentry_safe_app",
-    cdefines=["APP_SENTRY_SAFE"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=80,
diff --git a/applications/external/solitaire/application.fam b/applications/external/solitaire/application.fam
index 66e4567ec..44152a038 100644
--- a/applications/external/solitaire/application.fam
+++ b/applications/external/solitaire/application.fam
@@ -3,7 +3,6 @@ App(
     name="Solitaire",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="solitaire_app",
-    cdefines=["APP_SOLITAIRE"],
     requires=["gui","storage","canvas"],
     stack_size=2 * 1024,
     order=30,
diff --git a/applications/external/spectrum_analyzer/application.fam b/applications/external/spectrum_analyzer/application.fam
index 344c2244f..286aa64ba 100644
--- a/applications/external/spectrum_analyzer/application.fam
+++ b/applications/external/spectrum_analyzer/application.fam
@@ -3,7 +3,6 @@ App(
     name="Spectrum Analyzer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="spectrum_analyzer_app",
-    cdefines=["APP_SPECTRUM_ANALYZER"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=12,
diff --git a/applications/external/subbrute b/applications/external/subbrute
index 49d32f8ed..685ac6540 160000
--- a/applications/external/subbrute
+++ b/applications/external/subbrute
@@ -1 +1 @@
-Subproject commit 49d32f8ed6790d3b9a99f261ad306766325a691a
+Subproject commit 685ac6540de1bf5f7f4bd267c808850cf539587e
diff --git a/applications/external/swd_probe/application.fam b/applications/external/swd_probe/application.fam
index c1aec00ea..c255e6f81 100644
--- a/applications/external/swd_probe/application.fam
+++ b/applications/external/swd_probe/application.fam
@@ -3,7 +3,6 @@ App(
     name="SWD Probe",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="swd_probe_app_main",
-    cdefines=["APP_SWD_PROBE"],
     requires=["notification", "gui", "storage", "dialogs", "cli"],
     stack_size=2 * 1024,
     order=10,
diff --git a/applications/external/tetris_game/application.fam b/applications/external/tetris_game/application.fam
index 69dda3297..998345c0e 100644
--- a/applications/external/tetris_game/application.fam
+++ b/applications/external/tetris_game/application.fam
@@ -3,7 +3,6 @@ App(
     name="Tetris",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="tetris_game_app",
-    cdefines=["APP_TETRIS_GAME"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=20,
diff --git a/applications/external/text_viewer/application.fam b/applications/external/text_viewer/application.fam
index dcd573c9d..518626f41 100644
--- a/applications/external/text_viewer/application.fam
+++ b/applications/external/text_viewer/application.fam
@@ -3,7 +3,6 @@ App(
     name="Text Viewer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="text_viewer_app",
-    cdefines=["APP_TEXT_VIEWER"],
     requires=[
         "gui",
         "dialogs",
diff --git a/applications/external/tictactoe_game/application.fam b/applications/external/tictactoe_game/application.fam
index 2e769417e..8b67be874 100644
--- a/applications/external/tictactoe_game/application.fam
+++ b/applications/external/tictactoe_game/application.fam
@@ -3,7 +3,6 @@ App(
     name="Tic Tac Toe",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="tictactoe_game_app",
-    cdefines=["APP_TICTACTOE_GAME"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=40,
diff --git a/applications/external/totp/application.fam b/applications/external/totp/application.fam
index fbd21ddf7..600ed6ca3 100644
--- a/applications/external/totp/application.fam
+++ b/applications/external/totp/application.fam
@@ -3,7 +3,6 @@ App(
     name="Authenticator",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="totp_app",
-    cdefines=["APP_TOTP"],
     requires=[
         "gui",
         "cli",
diff --git a/applications/external/uart_terminal/application.fam b/applications/external/uart_terminal/application.fam
index c6cea5362..b167ab83e 100644
--- a/applications/external/uart_terminal/application.fam
+++ b/applications/external/uart_terminal/application.fam
@@ -3,7 +3,6 @@ App(
     name="UART Terminal",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="uart_terminal_app",
-    cdefines=["APP_UART_TERMINAL"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=90,
diff --git a/applications/external/unitemp/application.fam b/applications/external/unitemp/application.fam
index 89292e504..3971f5138 100644
--- a/applications/external/unitemp/application.fam
+++ b/applications/external/unitemp/application.fam
@@ -3,7 +3,6 @@ App(
     name="Temp sensors reader",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="unitemp_app",
-    cdefines=["UNITEMP_APP"],
     requires=[
         "gui",
     ],
diff --git a/applications/external/wav_player/application.fam b/applications/external/wav_player/application.fam
index 6ab832d03..f76c1cd39 100644
--- a/applications/external/wav_player/application.fam
+++ b/applications/external/wav_player/application.fam
@@ -3,7 +3,6 @@ App(
     name="WAV Player",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wav_player_app",
-    cdefines=["APP_WAV_PLAYER"],
     stack_size=4 * 1024,
     order=46,
     fap_icon="wav_10px.png",
diff --git a/applications/external/wifi_marauder_companion/application.fam b/applications/external/wifi_marauder_companion/application.fam
index e3185d50a..d8bfc58a6 100644
--- a/applications/external/wifi_marauder_companion/application.fam
+++ b/applications/external/wifi_marauder_companion/application.fam
@@ -3,7 +3,6 @@ App(
     name="[ESP32] WiFi Marauder",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",
-    cdefines=["APP_WIFI_MARAUDER"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=90,
diff --git a/applications/external/wifi_scanner/application.fam b/applications/external/wifi_scanner/application.fam
index dc229efc0..c160e8aa9 100644
--- a/applications/external/wifi_scanner/application.fam
+++ b/applications/external/wifi_scanner/application.fam
@@ -3,7 +3,6 @@ App(
     name="[WiFi] Scanner",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_scanner_app",
-    cdefines=["APP_WIFI_SCANNER"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=110,
diff --git a/applications/external/zombiez/application.fam b/applications/external/zombiez/application.fam
index 3245187d2..069e591bc 100644
--- a/applications/external/zombiez/application.fam
+++ b/applications/external/zombiez/application.fam
@@ -3,7 +3,6 @@ App(
     name="Zombiez",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="zombiez_game_app",
-    cdefines=["APP_ZOMBIEZ_GAME"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=280,