Merge branch 'dev' into cc1101_ext

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",
 )
-

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,
-)
+    fap_icon="icon.png",
+    fap_category="Sub-Ghz",
+)

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"