diff --git a/.vscode/example/tasks.json b/.vscode/example/tasks.json
index 16437cb10..28e67d456 100644
--- a/.vscode/example/tasks.json
+++ b/.vscode/example/tasks.json
@@ -13,7 +13,7 @@
             "label": "[Debug] Build",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FIRMWARE_APP_SET=debug_pack"
+            "command": "./fbt"
         },
         {
             "label": "[Release] Flash (ST-Link)",
@@ -25,7 +25,7 @@
             "label": "[Debug] Flash (ST-Link)",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FIRMWARE_APP_SET=debug_pack FORCE=1 flash"
+            "command": "./fbt FORCE=1 flash"
         },
         {
             "label": "[Release] Flash (blackmagic)",
@@ -37,7 +37,7 @@
             "label": "[Debug] Flash (blackmagic)",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FIRMWARE_APP_SET=debug_pack FORCE=1 flash_blackmagic"
+            "command": "./fbt FORCE=1 flash_blackmagic"
         },
         {
             "label": "[Release] Flash (JLink)",
@@ -49,7 +49,7 @@
             "label": "[Debug] Flash (JLink)",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FIRMWARE_APP_SET=debug_pack FORCE=1 jflash"
+            "command": "./fbt FORCE=1 jflash"
         },
         {
             "label": "[Release] Build update bundle",
@@ -61,7 +61,7 @@
             "label": "[Debug] Build update bundle",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FIRMWARE_APP_SET=debug_pack updater_package"
+            "command": "./fbt updater_package"
         },
         {
             "label": "[Release] Build updater",
@@ -73,13 +73,13 @@
             "label": "[Debug] Build updater",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FIRMWARE_APP_SET=debug_pack updater_all"
+            "command": "./fbt updater_all"
         },
         {
             "label": "[Debug] Flash (USB, w/o resources)",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FIRMWARE_APP_SET=debug_pack FORCE=1 flash_usb"
+            "command": "./fbt FORCE=1 flash_usb"
         },
         {
             "label": "[Release] Flash (USB, w/o resources)",
@@ -97,7 +97,7 @@
             "label": "[Debug] Flash (USB, with resources)",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FIRMWARE_APP_SET=debug_pack FORCE=1 flash_usb_full"
+            "command": "./fbt FORCE=1 flash_usb_full"
         },
         {
             "label": "[Release] Flash (USB, with resources)",
diff --git a/applications/main/clock_app/application.fam b/applications/main/clock_app/application.fam
index 9016973c5..47f152b1d 100644
--- a/applications/main/clock_app/application.fam
+++ b/applications/main/clock_app/application.fam
@@ -1,12 +1,11 @@
 App(
     appid="clock",
     name="Clock",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     entry_point="clock_app",
-    cdefines=["APP_CLOCK"],
-    requires=["gui"],
     icon="A_Clock_14",
     stack_size=2 * 1024,
     order=81,
+    fap_icon="icon.png",
+    fap_category="Tools",
 )
-
diff --git a/applications/main/clock_app/icon.png b/applications/main/clock_app/icon.png
new file mode 100644
index 000000000..8a5406e6c
Binary files /dev/null and b/applications/main/clock_app/icon.png differ
diff --git a/applications/main/subghz_remote/application.fam b/applications/main/subghz_remote/application.fam
index 804ac0b7c..f8980c0a7 100644
--- a/applications/main/subghz_remote/application.fam
+++ b/applications/main/subghz_remote/application.fam
@@ -1,17 +1,11 @@
 App(
     appid="subghz_remote",
     name="Sub-GHz Remote",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     entry_point="subghz_remote_app",
-    cdefines=[
-        "APP_SUBGHZREMOTE",
-        "SUBREM_LIGHT",
-    ],
-    requires=[
-        "gui",
-        "dialogs",
-    ],
     icon="A_SubGHzRemote_14",
     stack_size=2 * 1024,
     order=11,
-)
\ No newline at end of file
+    fap_icon="icon.png",
+    fap_category="Sub-Ghz",
+)
diff --git a/applications/main/subghz_remote/icon.png b/applications/main/subghz_remote/icon.png
new file mode 100644
index 000000000..c6b410f4c
Binary files /dev/null and b/applications/main/subghz_remote/icon.png differ
diff --git a/applications/main/subghz_remote/subghz_remote_app_i.h b/applications/main/subghz_remote/subghz_remote_app_i.h
index 1ced74d11..a0f25667c 100644
--- a/applications/main/subghz_remote/subghz_remote_app_i.h
+++ b/applications/main/subghz_remote/subghz_remote_app_i.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#define SUBREM_LIGHT 1
+#define APP_SUBGHZREMOTE 1
+
 #include "helpers/subrem_types.h"
 #include "helpers/subrem_presets.h"
 #include "scenes/subrem_scene.h"
diff --git a/documentation/HowToBuild.md b/documentation/HowToBuild.md
index 76830063f..ddf759f1b 100644
--- a/documentation/HowToBuild.md
+++ b/documentation/HowToBuild.md
@@ -31,11 +31,9 @@ Check out `documentation/fbt.md` for details on building and flashing firmware.
 
 ### Compile everything for development
 
-Edit this file to enable/disable Main apps that you need in DEBUG mode, flash space doesn't allows us to fit them all in DEBUG currently
-- `applications/main/application.fam`
 
 ```sh
-./fbt FIRMWARE_APP_SET=debug_pack updater_package
+./fbt updater_package
 ```
 
 ### Compile everything for release + get updater package to update from microSD card
@@ -55,11 +53,9 @@ Check out `documentation/fbt.md` for details on building and flashing firmware.
 
 ### Compile everything for development
 
-Edit this file to enable/disable Main apps that you need in DEBUG mode, flash space doesn't allows us to fit them all in DEBUG currently
-- `applications/main/application.fam`
 
 ```sh
-./fbt.cmd FIRMWARE_APP_SET=debug_pack updater_package
+./fbt.cmd updater_package
 ```
 
 ### Compile everything for release + get updater package to update from microSD card
diff --git a/fbt_options.py b/fbt_options.py
index 561b818d4..4286e08e8 100644
--- a/fbt_options.py
+++ b/fbt_options.py
@@ -74,19 +74,6 @@ FIRMWARE_APPS = {
         "updater_app",
         "unit_tests",
     ],
-    "debug_pack": [
-        # Svc
-        "basic_services",
-        # Apps
-        "main_apps_default",
-        "system_apps",
-        # Settings
-        "settings_apps",
-        # Plugins
-        # "basic_plugins",
-        # Debug
-        # "debug_apps",
-    ],
 }
 
 FIRMWARE_APP_SET = "default"