diff --git a/features_config.h b/features_config.h
index 0d2d82994fc..5baf48d843f 100644
--- a/features_config.h
+++ b/features_config.h
@@ -14,8 +14,17 @@
 #define TOTP_FIRMWARE_XTREME (3)
 // End of list
 
-// Target firmware to build for.
+// Checking FlipC.org definitions (https://github.com/playmean/fap-list/issues/9)
+#if defined(TARGET_FIRMWARE_OFFICIAL)
+#define TOTP_TARGET_FIRMWARE TOTP_FIRMWARE_OFFICIAL_STABLE
+#elif defined(TARGET_FIRMWARE_UNLEASHED)
+#define TOTP_TARGET_FIRMWARE TOTP_FIRMWARE_OFFICIAL_DEV
+#elif defined(TARGET_FIRMWARE_XTREME)
+#define TOTP_TARGET_FIRMWARE TOTP_FIRMWARE_XTREME
+#endif
+// End of FlipC.org definition checks
+
+// If target firmware is not yet set, default it to Xtreme as I'm using it, and it is cool :)
 #ifndef TOTP_TARGET_FIRMWARE
-// Defaulting to Xtreme if not previously defined
 #define TOTP_TARGET_FIRMWARE TOTP_FIRMWARE_XTREME
 #endif
\ No newline at end of file