diff --git a/applications/plugins/arkanoid/application.fam b/applications/plugins/arkanoid/application.fam
index 970dcc26f..99a2f10bc 100644
--- a/applications/plugins/arkanoid/application.fam
+++ b/applications/plugins/arkanoid/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="arkanoid_game",
     name="Arkanoid",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="arkanoid_game_app",
     cdefines=["APP_ARKANOID_GAME"],
     requires=["gui"],
diff --git a/applications/plugins/barcode_generator/application.fam b/applications/plugins/barcode_generator/application.fam
index 508facd61..05ddbae0f 100644
--- a/applications/plugins/barcode_generator/application.fam
+++ b/applications/plugins/barcode_generator/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="barcode_generator",
     name="UPC-A Generator",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="barcode_UPCA_generator_app",
     cdefines=["APP_BARCODE_GEN"],
     requires=[
diff --git a/applications/plugins/doom/application.fam b/applications/plugins/doom/application.fam
index f0ce5eea4..a032e14eb 100644
--- a/applications/plugins/doom/application.fam
+++ b/applications/plugins/doom/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="game_doom",
     name="DOOM",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="doom_app",
     cdefines=["APP_DOOM_GAME"],
     requires=[
diff --git a/applications/plugins/esp8266_deauth/application.fam b/applications/plugins/esp8266_deauth/application.fam
index 92bd4725b..8342edfba 100644
--- a/applications/plugins/esp8266_deauth/application.fam
+++ b/applications/plugins/esp8266_deauth/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="esp8266_deauth",
     name="[ESP8266] Deauther",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="esp8266_deauth_app",
     cdefines=["APP_ESP8266_deauth"],
     requires=["gui"],
diff --git a/applications/plugins/flappy_bird/application.fam b/applications/plugins/flappy_bird/application.fam
index a7b53163c..daee5791d 100644
--- a/applications/plugins/flappy_bird/application.fam
+++ b/applications/plugins/flappy_bird/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="game_flappybird",
     name="Flappy Bird",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="flappy_game_app",
     cdefines=["APP_FLAPPY_GAME"],
     requires=["gui"],
diff --git a/applications/plugins/flipfrid/application.fam b/applications/plugins/flipfrid/application.fam
index 0764ea733..77cfefbed 100644
--- a/applications/plugins/flipfrid/application.fam
+++ b/applications/plugins/flipfrid/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="flipfrid",
     name="RFID Fuzzer",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="flipfrid_start",
     cdefines=["APP_FLIP_FRID"],
     requires=["gui", "storage", "dialogs", "input", "notification"],
diff --git a/applications/plugins/mousejacker/application.fam b/applications/plugins/mousejacker/application.fam
index dacfd1ab0..9c71bf7a3 100644
--- a/applications/plugins/mousejacker/application.fam
+++ b/applications/plugins/mousejacker/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="mouse_jacker",
     name="[NRF24] Mouse Jacker",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="mousejacker_app",
     cdefines=["APP_MOUSEJACKER"],
     requires=[
diff --git a/applications/plugins/multi_converter/application.fam b/applications/plugins/multi_converter/application.fam
index 4277c306b..5da46e06b 100644
--- a/applications/plugins/multi_converter/application.fam
+++ b/applications/plugins/multi_converter/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="multi_converter",
     name="Multi Converter",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="multi_converter_app",
     cdefines=["APP_DEC_HEX_CONVERTER"],
     requires=["gui"],
diff --git a/applications/plugins/music_player/application.fam b/applications/plugins/music_player/application.fam
index f0c319e8d..30f2b9268 100644
--- a/applications/plugins/music_player/application.fam
+++ b/applications/plugins/music_player/application.fam
@@ -12,7 +12,7 @@ App(
     stack_size=2 * 1024,
     order=45,
     fap_icon="../../../assets/icons/Archive/music_10px.png",
-    fap_category="Games",
+    fap_category="Music",
 )
 
 App(
diff --git a/applications/plugins/nrfsniff/application.fam b/applications/plugins/nrfsniff/application.fam
index 2e44f58d2..269f139a9 100644
--- a/applications/plugins/nrfsniff/application.fam
+++ b/applications/plugins/nrfsniff/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="nrf_sniff",
     name="[NRF24] Sniffer",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="nrfsniff_app",
     cdefines=["APP_NRFSNIFF"],
     requires=["gui"],
diff --git a/applications/plugins/playlist/application.fam b/applications/plugins/playlist/application.fam
index 59aa0145f..991809ae3 100644
--- a/applications/plugins/playlist/application.fam
+++ b/applications/plugins/playlist/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="sub_playlist",
     name="Sub-GHz Playlist",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="playlist_app",
     cdefines=["APP_PLAYLIST"],
     requires=["storage", "gui", "dialogs", "subghz"],
diff --git a/applications/plugins/sentry_safe/application.fam b/applications/plugins/sentry_safe/application.fam
index f2ca5a066..f409e0b06 100644
--- a/applications/plugins/sentry_safe/application.fam
+++ b/applications/plugins/sentry_safe/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="sentry_safe",
     name="[GPIO] Sentry Safe",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="sentry_safe_app",
     cdefines=["APP_SENTRY_SAFE"],
     requires=["gui"],
diff --git a/applications/plugins/subbrute/application.fam b/applications/plugins/subbrute/application.fam
index 7ca2be332..752b0e0e6 100644
--- a/applications/plugins/subbrute/application.fam
+++ b/applications/plugins/subbrute/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="subbrute",
     name="Sub-GHz Bruteforcer",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="subbrute_start",
     cdefines=["APP_SUB_BRUTE"],
     requires=["gui","dialogs"],
diff --git a/applications/plugins/tetris_game/application.fam b/applications/plugins/tetris_game/application.fam
index 60cda8bf4..9a298a3d5 100644
--- a/applications/plugins/tetris_game/application.fam
+++ b/applications/plugins/tetris_game/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="tetris_game",
     name="Tetris",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="tetris_game_app",
     cdefines=["APP_TETRIS_GAME"],
     requires=["gui"],
diff --git a/applications/plugins/tictactoe_game/application.fam b/applications/plugins/tictactoe_game/application.fam
index e6aed723a..289f4f88d 100644
--- a/applications/plugins/tictactoe_game/application.fam
+++ b/applications/plugins/tictactoe_game/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="tictactoe_game",
     name="Tic Tac Toe",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="tictactoe_game_app",
     cdefines=["APP_TICTACTOE_GAME"],
     requires=["gui"],
diff --git a/applications/plugins/wav_player/application.fam b/applications/plugins/wav_player/application.fam
index a235841a7..4e8d81ab2 100644
--- a/applications/plugins/wav_player/application.fam
+++ b/applications/plugins/wav_player/application.fam
@@ -1,11 +1,11 @@
 App(
     appid="wav_player",
     name="WAV Player",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="wav_player_app",
     cdefines=["APP_WAV_PLAYER"],
     stack_size=4 * 1024,
     order=46,
     fap_icon="wav_10px.png",
-    fap_category="Games",
+    fap_category="Music",
 )
diff --git a/applications/plugins/wifi_marauder_companion/application.fam b/applications/plugins/wifi_marauder_companion/application.fam
index d44449731..0548905d9 100644
--- a/applications/plugins/wifi_marauder_companion/application.fam
+++ b/applications/plugins/wifi_marauder_companion/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="wifi_marauder",
     name="[ESP32] WiFi Marauder",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",
     cdefines=["APP_WIFI_MARAUDER"],
     requires=["gui"],
diff --git a/applications/plugins/wifi_scanner/application.fam b/applications/plugins/wifi_scanner/application.fam
index 58edd6565..22ca79673 100644
--- a/applications/plugins/wifi_scanner/application.fam
+++ b/applications/plugins/wifi_scanner/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="wifi_scanner",
     name="[WiFi] Scanner",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_scanner_app",
     cdefines=["APP_WIFI_SCANNER"],
     requires=["gui"],
diff --git a/applications/plugins/zombiez/application.fam b/applications/plugins/zombiez/application.fam
index 1d46f8bc0..14cad08ce 100644
--- a/applications/plugins/zombiez/application.fam
+++ b/applications/plugins/zombiez/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="game_zombiez",
     name="Zombiez",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="zombiez_game_app",
     cdefines=["APP_ZOMBIEZ_GAME"],
     requires=["gui"],