diff --git a/applications/external/airmouse/air_mouse.c b/applications/external/airmouse/air_mouse.c
index 5ca5df21c..6723ed409 100644
--- a/applications/external/airmouse/air_mouse.c
+++ b/applications/external/airmouse/air_mouse.c
@@ -54,8 +54,9 @@ AirMouse* air_mouse_app_alloc() {
     AirMouse* app = malloc(sizeof(AirMouse));
 
     Storage* storage = furi_record_open(RECORD_STORAGE);
+    storage_simply_mkdir(storage, EXT_PATH("apps_data/air_mouse"));
     storage_common_migrate(
-        storage, EXT_PATH(".calibration.data"), APP_DATA_PATH("calibration.data"));
+        storage, EXT_PATH(".calibration.data"), EXT_PATH("apps_data/air_mouse/calibration.data"));
     furi_record_close(RECORD_STORAGE);
 
     // Gui
diff --git a/applications/external/airmouse/application.fam b/applications/external/airmouse/application.fam
index 1164b66de..dfb88da1e 100644
--- a/applications/external/airmouse/application.fam
+++ b/applications/external/airmouse/application.fam
@@ -6,4 +6,6 @@ App(
     stack_size=10 * 1024,
     fap_category="GPIO",
     fap_icon="mouse_10px.png",
+    fap_version="0.6",
+    sources=["*.c", "*.cc"],
 )
diff --git a/applications/external/airmouse/tracking/calibration_data.h b/applications/external/airmouse/tracking/calibration_data.h
index 522a09a9a..e373eaa66 100644
--- a/applications/external/airmouse/tracking/calibration_data.h
+++ b/applications/external/airmouse/tracking/calibration_data.h
@@ -7,7 +7,7 @@
 #include "util/vector.h"
 
 #define CALIBRATION_DATA_VER (1)
-#define CALIBRATION_DATA_PATH APP_DATA_PATH("calibration.data")
+#define CALIBRATION_DATA_PATH EXT_PATH("apps_data/air_mouse/calibration.data")
 #define CALIBRATION_DATA_MAGIC (0x23)
 
 #define CALIBRATION_DATA_SAVE(x)   \
diff --git a/applications/external/gpioreader_a/application.fam b/applications/external/gpioreader_a/application.fam
index c37346096..04bde0f14 100644
--- a/applications/external/gpioreader_a/application.fam
+++ b/applications/external/gpioreader_a/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="gpio_reader_a",
+    appid="gpio_reader",
     name="[GPIO] Reader (aureli1c)",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="GPIO_reader_app",
diff --git a/applications/external/gpioreader_b/application.fam b/applications/external/gpioreader_b/application.fam
index c3a417774..06d9551a9 100644
--- a/applications/external/gpioreader_b/application.fam
+++ b/applications/external/gpioreader_b/application.fam
@@ -1,9 +1,8 @@
 App(
-    appid="gpio_reader_b",
+    appid="gpioreader2",
     name="[GPIO] Reader (biotinker)",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="gpio_app",
-    cdefines=["APP_GPIOREADER"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=50,