categories part 1

apps_source_code/4inrow_game/application.fam

@@ -8,8 +8,8 @@ App(
     ],
     stack_size=1 * 1024,
     order=90,
-	fap_icon="4inrow_10px.png",
-    fap_category="Games_Extra",
+    fap_icon="4inrow_10px.png",
+    fap_category="Games",
     fap_author="leo-need-more-coffee",
     fap_weburl="https://github.com/leo-need-more-coffee/flipperzero-4inrow",
     fap_version="1.0",

apps_source_code/DVD-Bounce/application.fam

@@ -10,6 +10,6 @@ App(
     ],
     stack_size=1 * 1024,
     fap_icon="iconimage.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon_assets="assets",
-)
+)

apps_source_code/FlipBIP/application.fam

@@ -15,8 +15,8 @@ App(
             name="crypto",
         ),
     ],
-    fap_category="Tools_Extra",
+    fap_category="Tools",
     fap_description="Crypto toolkit for Flipper",
     fap_author="Struan Clark (xtruan)",
     fap_weburl="https://github.com/xtruan/FlipBIP",
-)
+)

apps_source_code/FlipperNightStand_clock/application.fam

@@ -7,7 +7,7 @@ App(
     icon="A_Clock_14",
     stack_size=2 * 1024,
     fap_icon="clock.png",
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     order=81,
     fap_author="@nymda & @Willy-JL",
     fap_weburl="https://github.com/nymda/FlipperNightStand",

apps_source_code/LORA_term/application.fam

@@ -8,6 +8,6 @@ App(
     stack_size=1 * 1024,
     order=90,
     fap_icon="uart_terminal.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon_assets="assets",
 )

apps_source_code/ServoTesterApp/application.fam

@@ -7,7 +7,7 @@ App(
     stack_size=8 * 1024,
     order=50,
     fap_icon="appicon.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_author="@mhasbini",
     fap_weburl="https://github.com/mhasbini/ServoTesterApp/tree/master",
     fap_version="1.0",

apps_source_code/SimonSays/application.fam

@@ -4,7 +4,7 @@ App(
     apptype=FlipperAppType.EXTERNAL,
     entry_point="simon_says_app_entry",
     stack_size=2 * 1024,
-    fap_category="Games_Extra",
+    fap_category="Games",
     # Optional values
     # fap_version=(0, 1),  # (major, minor)
     fap_icon="simon_says.png",  # 10x10 1-bit PNG

apps_source_code/Snake_2/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=30,
     fap_icon="snake_10px.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_author="@Willzvul",
     fap_weburl="https://github.com/Willzvul/Snake_2.0",
     fap_version="2.0",

apps_source_code/airmon/application.fam

@@ -6,7 +6,7 @@ App(
     requires=["gui", "power"],
     stack_size=1 * 1024,
     fap_icon="airmon_10px.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon_assets="icons",
     fap_author="3cky",
     fap_weburl="https://github.com/3cky/flipperzero-airmon",

apps_source_code/airmouse/application.fam

@@ -4,6 +4,6 @@ App(
     apptype=FlipperAppType.EXTERNAL,
     entry_point="air_mouse_app",
     stack_size=10 * 1024,
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon="mouse_10px.png",
 )

apps_source_code/barcode_gen/application.fam

@@ -5,7 +5,7 @@ App(
     entry_point="barcode_main",
     requires=["gui", "storage"],
     stack_size=2 * 1024,
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon="images/barcode_10.png",
     fap_icon_assets="images",
     fap_icon_assets_symbol="barcode_app",

apps_source_code/bc_scanner_emulator/application.fam

@@ -15,6 +15,6 @@ App(
     fap_weburl="https://github.com/polarikus/flipper-zero_bc_scanner_emulator",
     fap_version=(0, 5),
     order=70,
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon_assets="icons",
 )

apps_source_code/bluetooth-trigger/application.fam

@@ -7,7 +7,7 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     fap_icon="bt_trigger_logo.png",
-    fap_category="Tools_Extra",
+    fap_category="Tools",
     fap_icon_assets="assets",
     fap_author="@Nem0oo",
     fap_weburl="https://github.com/Nem0oo/flipper-zero-bluetooth-trigger",

apps_source_code/bpmtapper/application.fam

@@ -7,7 +7,7 @@ App(
     requires=["gui"],
     stack_size=2 * 1024,
     fap_icon="bpm_10px.png",
-    fap_category="Media_Extra",
+    fap_category="Media",
     fap_icon_assets="icons",
     order=15,
     fap_author="@panki27",

apps_source_code/brainfuck/application.fam

@@ -9,7 +9,7 @@ App(
     ],
     stack_size=8 * 1024,
     fap_icon="bfico.png",
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon_assets="icons",
     fap_author="@nymda",
     fap_weburl="https://github.com/nymda/FlipperZeroBrainfuck",

apps_source_code/bt_serial_example/application.fam

@@ -8,6 +8,6 @@ App(
         "bt",
         "gui",
     ],
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon="uart_10px.png",
-)
+)

apps_source_code/caesarcipher/application.fam

@@ -9,7 +9,7 @@ App(
     ],
     stack_size=2 * 1024,
     fap_icon="caesar_cipher_icon.png",
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     order=20,
     fap_author="@panki27",
     fap_weburl="https://github.com/panki27/caesar-cipher",

apps_source_code/calculator/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=45,
     fap_icon="calcIcon.png",
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_author="@n-o-T-I-n-s-a-n-e",
     fap_weburl="https://github.com/n-o-T-I-n-s-a-n-e",
     fap_version="1.0",

apps_source_code/color_guess/application.fam

@@ -11,7 +11,7 @@ App(
     order=10,
     fap_icon="color_guess_10px.png",
     fap_icon_assets="icons",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_author="Leed",
     fap_version="1.0",
     fap_weburl="https://github.com/leedave/Leeds-Flipper-Zero-Applications",

apps_source_code/counter/application.fam

@@ -6,7 +6,7 @@ App(
     requires=[
         "gui",
     ],
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon="icons/counter_icon.png",
     fap_icon_assets="icons",
     fap_author="@Krulknul",

apps_source_code/dice/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=90,
     fap_icon="icon.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon_assets="assets",
     fap_author="@Ka3u6y6a",
     fap_weburl="https://github.com/Ka3u6y6a/flipper-zero-dice",

apps_source_code/esp32cam_camera/application.fam

@@ -5,11 +5,11 @@ App(
     entry_point="camera_app",
     cdefines=["APP_CAMERA"],
     requires=["gui"],
-    stack_size=8*1024,
+    stack_size=8 * 1024,
     order=1,
-	fap_icon="icon.png",
-    fap_category="GPIO_Extra",
-	fap_description="ESP32-CAM live feed and photo capture, use left/right for orientation/mode, up/down for brightness and center for saving a screenshot. [Unplug the USB cable to test with Mayhem]",
-	fap_author="Z4urce",
-	fap_weburl="https://github.com/Z4urce/flipper-camera"
-)
+    fap_icon="icon.png",
+    fap_category="GPIO",
+    fap_description="ESP32-CAM live feed and photo capture, use left/right for orientation/mode, up/down for brightness and center for saving a screenshot. [Unplug the USB cable to test with Mayhem]",
+    fap_author="Z4urce",
+    fap_weburl="https://github.com/Z4urce/flipper-camera",
+)

apps_source_code/esp32cam_marauder_companion/application.fam

@@ -8,6 +8,6 @@ App(
     stack_size=4 * 1024,
     order=2,
     fap_icon="wifi_10px.png",
-    fap_category="GPIO_Extra",
-    fap_description="ESP32-CAM version of Marauder. Includes all functionality from the original plus some options to trigger the camera and flashlight. [Unplug the USB cable to test with Mayhem]"
+    fap_category="GPIO",
+    fap_description="ESP32-CAM version of Marauder. Includes all functionality from the original plus some options to trigger the camera and flashlight. [Unplug the USB cable to test with Mayhem]",
 )

apps_source_code/esp32cam_morseflasher/application.fam

@@ -9,6 +9,6 @@ App(
     order=90,
     fap_icon_assets="assets",
     fap_icon="icon.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_description="ESP32-CAM app to stream a message in morse using the powerful flashlight. [Unplug the USB cable to test with Mayhem]",
 )

apps_source_code/esp32cam_motion_detection/application.fam

@@ -5,11 +5,11 @@ App(
     entry_point="uart_echo_app",
     cdefines=["APP_QRCODE"],
     requires=["gui"],
-    stack_size=8*1024,
+    stack_size=8 * 1024,
     order=1,
-	fap_icon="icon.png",
-  fap_category="GPIO_Extra",
-	fap_description="ESP32-CAM Motion detection. It generates a beep when motion is detected. Can be extended to trigger more stuff in the code. [Unplug the USB cable to test with Mayhem]",
-	fap_author="eried",
-	fap_weburl="https://flipper.ried.cl"
-)
+    fap_icon="icon.png",
+    fap_category="GPIO",
+    fap_description="ESP32-CAM Motion detection. It generates a beep when motion is detected. Can be extended to trigger more stuff in the code. [Unplug the USB cable to test with Mayhem]",
+    fap_author="eried",
+    fap_weburl="https://flipper.ried.cl",
+)

apps_source_code/esp32cam_nannycam/application.fam

@@ -5,11 +5,11 @@ App(
     entry_point="uart_echo_app",
     cdefines=["APP_QRCODE"],
     requires=["gui"],
-    stack_size=8*1024,
+    stack_size=8 * 1024,
     order=1,
-	fap_icon="icon.png",
-  fap_category="GPIO_Extra",
-	fap_description="ESP32-CAM simple app to start a remote camera. [Unplug the USB cable to test with Mayhem]",
-	fap_author="eried",
-	fap_weburl="https://flipper.ried.cl"
-)
+    fap_icon="icon.png",
+    fap_category="GPIO",
+    fap_description="ESP32-CAM simple app to start a remote camera. [Unplug the USB cable to test with Mayhem]",
+    fap_author="eried",
+    fap_weburl="https://flipper.ried.cl",
+)

apps_source_code/esp32cam_qrcode/application.fam

@@ -5,11 +5,11 @@ App(
     entry_point="uart_echo_app",
     cdefines=["APP_QRCODE"],
     requires=["gui"],
-    stack_size=8*1024,
+    stack_size=8 * 1024,
     order=1,
-	fap_icon="icon.png",
-  fap_category="GPIO_Extra",
-	fap_description="ESP32-CAM simple app to show a payload from QR codes. Can be extended to trigger more stuff in the code. [Unplug the USB cable to test with Mayhem]",
-	fap_author="eried",
-	fap_weburl="https://flipper.ried.cl"
-)
+    fap_icon="icon.png",
+    fap_category="GPIO",
+    fap_description="ESP32-CAM simple app to show a payload from QR codes. Can be extended to trigger more stuff in the code. [Unplug the USB cable to test with Mayhem]",
+    fap_author="eried",
+    fap_weburl="https://flipper.ried.cl",
+)

apps_source_code/etch-a-sketch/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=2 * 1024,
     order=175,
     fap_icon="etch-a-sketch-icon.png",
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon_assets="assets",
     fap_author="@SimplyMinimal",
     fap_weburl="https://github.com/SimplyMinimal/FlipperZero-Etch-A-Sketch",

apps_source_code/flipagotchi/application.fam

@@ -8,6 +8,6 @@ App(
     stack_size=2 * 1024,
     order=12,
     fap_icon="flipagotchi_10px.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon_assets="assets",
-)
+)

apps_source_code/flipp_pomodoro/application.fam

@@ -5,7 +5,7 @@ App(
     entry_point="flipp_pomodoro_app",
     requires=["gui", "notification", "dolphin"],
     stack_size=1 * 1024,
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon_assets="images",
     fap_icon="flipp_pomodoro_10.png",
     fap_author="@Th3Un1q3",

apps_source_code/flipper-asteroids/application.fam

@@ -9,7 +9,7 @@ App(
     order=50,
     fap_icon="appicon.png",
     fap_icon_assets="assets",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_author="@antirez & @SimplyMinimal",
     fap_weburl="https://github.com/antirez/flipper-asteroids",
     fap_version="1.0",

apps_source_code/flipper-bp/application.fam

@@ -8,6 +8,6 @@ App(
         "bt",
         "gui",
     ],
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon="uart_10px.png",
-)
+)

apps_source_code/flipper-dcf77/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=10,
     fap_icon="icons/app.png",
-    fap_category="Tools_Extra",
+    fap_category="Tools",
     fap_author="@arha & @xMasterX",
     fap_weburl="https://github.com/arha/flipper-dcf77",
     fap_version="1.0",

apps_source_code/flipper-flashlight/application.fam

@@ -10,7 +10,7 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="flash10px.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_author="@xMasterX",
     fap_weburl="https://github.com/xMasterX/flipper-flashlight",
     fap_version="1.0",

apps_source_code/flipper-tictactoe-multi/application.fam

@@ -7,7 +7,7 @@ App(
     stack_size=1 * 1024,
     order=40,
     fap_icon="assets/tictactoe_10px.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon_assets="assets",
     fap_author="@RouNNdeL",
     fap_weburl="https://github.com/RouNNdeL/flipper-tictactoe-multi",

apps_source_code/flipper-xbox-controller/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=1,
     fap_icon="xbox_controller.png",
-    fap_category="Tools_Extra",
+    fap_category="Infrared",
     fap_icon_assets="assets",
     fap_icon_assets_symbol="xc",
     fap_author="@gebeto",

apps_source_code/flipper_analog_clock/application.fam

@@ -6,7 +6,7 @@ App(
     apptype=FlipperAppType.EXTERNAL,
     entry_point="analog_clock_app",
     stack_size=2 * 1024,
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     # Optional values
     # fap_version=(0, 1),  # (major, minor)
     fap_icon="analog_clock.png",  # 10x10 1-bit PNG

apps_source_code/flipper_geiger/application.fam

@@ -9,7 +9,7 @@ App(
     ],
     stack_size=1 * 1024,
     fap_icon="geiger.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_author="@nmrr",
     fap_weburl="https://github.com/nmrr/flipperzero-geigercounter",
     fap_version="1.0",

apps_source_code/flipper_passgen/application.fam

@@ -6,7 +6,7 @@ App(
     requires=[
         "gui",
     ],
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon="icons/passgen_icon.png",
     fap_icon_assets="icons",
-)
+)

apps_source_code/flipper_pong/application.fam

@@ -9,7 +9,7 @@ App(
     ],
     stack_size=1 * 1024,
     fap_icon="pong.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_author="@nmrr & @SimplyMinimal",
     fap_weburl="https://github.com/nmrr/flipperzero-pong",
     fap_version="1.0",

apps_source_code/flipper_radsens/application.fam

@@ -11,7 +11,7 @@ App(
     stack_size=1 * 1024,
     order=90,
     fap_icon="rad_sens.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon_assets="icons",
     fap_author="@sionyx",
     fap_weburl="https://github.com/sionyx/flipper_radsens",

apps_source_code/flipperscope/application.fam

@@ -5,15 +5,25 @@ App(
     entry_point="scope_main",
     requires=["gui"],
     stack_size=1 * 1024,
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon="scope_10px.png",
     fap_private_libs=[
-        Lib(name="adc",
+        Lib(
+            name="adc",
             fap_include_paths=["inc"],
             sources=[
-                "stm32wbxx_hal_adc.c", "stm32wbxx_hal_adc_ex.c", "stm32wbxx_hal_rcc_ex.c", "stm32wbxx_hal_gpio.c",
-                "stm32wbxx_hal_pwr.c", "stm32wbxx_hal.c", "stm32wbxx_hal_tim.c", "stm32wbxx_hal_tim_ex.c",
-                "stm32wbxx_hal_cortex.c", "stm32wbxx_hal_dma.c", "stm32wbxx_hal_rcc.c"
+                "stm32wbxx_hal_adc.c",
+                "stm32wbxx_hal_adc_ex.c",
+                "stm32wbxx_hal_rcc_ex.c",
+                "stm32wbxx_hal_gpio.c",
+                "stm32wbxx_hal_pwr.c",
+                "stm32wbxx_hal.c",
+                "stm32wbxx_hal_tim.c",
+                "stm32wbxx_hal_tim_ex.c",
+                "stm32wbxx_hal_cortex.c",
+                "stm32wbxx_hal_dma.c",
+                "stm32wbxx_hal_rcc.c",
             ],
-    )]
+        )
+    ],
 )

apps_source_code/flipperzero-camera/application.fam

@@ -5,11 +5,11 @@ App(
     entry_point="camera_app",
     cdefines=["APP_CAMERA"],
     requires=["gui"],
-    stack_size=8*1024,
+    stack_size=8 * 1024,
     order=1,
-	fap_icon="icon.png",
-    fap_category="GPIO_Extra",
-	fap_description="ESP32-CAM live feed and photo capture",
-	fap_author="Z4urce",
-	fap_weburl="https://github.com/Z4urce/flipper-camera"
-)
+    fap_icon="icon.png",
+    fap_category="GPIO",
+    fap_description="ESP32-CAM live feed and photo capture",
+    fap_author="Z4urce",
+    fap_weburl="https://github.com/Z4urce/flipper-camera",
+)

apps_source_code/flipperzero-qrcode/application.fam

@@ -1,7 +1,7 @@
 App(
     appid="qrcode",
     name="QR Code",
-    fap_version=(1,1),
+    fap_version=(1, 1),
     fap_description="Display qrcodes",
     fap_author="Bob Matcuk",
     fap_weburl="https://github.com/bmatcuk/flipperzero-qrcode",
@@ -13,7 +13,7 @@ App(
         "gui",
         "dialogs",
     ],
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon="icons/qrcode_10px.png",
     fap_icon_assets="icons",
 )

apps_source_code/flipperzero-slots/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     fap_icon="ddgame_icon.png",
     order=30,
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon_assets="assets",
     fap_author="@Daniel-dev-s",
     fap_weburl="https://github.com/Daniel-dev-s/flipperzero-slots",

apps_source_code/flipperzero-text2sam/application.fam

@@ -12,7 +12,7 @@ App(
     stack_size=4 * 1024,
     # stack_size=2 * 1024,
     fap_icon="icon.png",
-    fap_category="Media_Extra",
+    fap_category="Media",
     order=20,
     fap_author="@Round-Pi & (Fixes by @Willy-JL)",
     fap_weburl="https://github.com/Round-Pi/flipperzero-text2sam",

apps_source_code/flipperzero-tuning-fork/application.fam

@@ -8,7 +8,7 @@ App(
         "gui",
     ],
     fap_icon="tuning_fork_icon.png",
-    fap_category="Media_Extra",
+    fap_category="Media",
     stack_size=2 * 1024,
     order=20,
     fap_author="@besya & (Fixes by @Willy-JL)",

apps_source_code/flipperzero-yatzee-main/application.fam

@@ -7,7 +7,7 @@ App(
     stack_size=4 * 1024,
     order=99,
     fap_icon="images/yatzee_icon_10px.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon_assets="images",
     fap_author="@emfleak",
     fap_weburl="https://github.com/emfleak/flipperzero-yatzee",

apps_source_code/flipperzero_GPIO_read-main/application.fam

@@ -5,7 +5,7 @@ App(
     entry_point="GPIO_reader_app",
     requires=["gui"],
     stack_size=1 * 1024,
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon="icon.png",
     fap_author="@aureli1c",
     fap_weburl="https://github.com/aureli1c/flipperzero_GPIO_read",

apps_source_code/flipperzero_gpioreader/application.fam

@@ -6,7 +6,7 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=50,
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon="icon.png",
     fap_icon_assets="icons",
 )

apps_source_code/flipperzero_vb_migrate/application.fam

@@ -23,7 +23,7 @@ App(
     entry_point="vb_migrate_app",
     requires=["gui", "storage"],
     stack_size=2 * 1024,
-    fap_version=(1,1),
+    fap_version=(1, 1),
     fap_libs=[],
     fap_private_libs=[
         Lib(
@@ -31,7 +31,7 @@ App(
         ),
     ],
     fap_icon="vb_migrate_10px.png",
-    fap_category="Misc_Extra",
+    fap_category="NFC",
     fap_description="Makes transferring characters with VB Lab less cumbersome",
     fap_author="cyanic",
     fap_weburl="https://github.com/GMMan/flipperzero-vb-migrate",

apps_source_code/flizzer_tracker/application.fam

@@ -6,11 +6,11 @@ App(
     cdefines=["APP_FLIZZER_TRACKER"],
     stack_size=2 * 1024,
     order=90,
-	fap_version=(0, 2),
-	fap_description="An advanced Flipper Zero chiptune tracker with 4 channels",
-	fap_author="LTVA",
+    fap_version=(0, 2),
+    fap_description="An advanced Flipper Zero chiptune tracker with 4 channels",
+    fap_author="LTVA",
     fap_weburl="https://github.com/LTVA1/flizzer_tracker",
-	fap_icon="flizzer_tracker.png",
-	fap_icon_assets="images",
-    fap_category="Media_Extra",
+    fap_icon="flizzer_tracker.png",
+    fap_icon_assets="images",
+    fap_category="Media",
 )

apps_source_code/fpz_cntdown_timer-main/application.fam

@@ -12,7 +12,7 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="cntdown_timer.png",
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_author="@0w0mewo",
     fap_weburl="https://github.com/0w0mewo/fpz_cntdown_timer",
     fap_version="1.0",

apps_source_code/fz-em4100-generator/application.fam

@@ -5,7 +5,7 @@ App(
     entry_point="key_generator_main",
     requires=["gui"],
     stack_size=1 * 1024,
-    fap_category="Tools_Extra",
+    fap_category="RFID 125",
     fap_icon_assets="images",
     fap_icon="icon.png",
     fap_author="@Milk-Cool",

apps_source_code/fz-reaction-game/application.fam

@@ -5,7 +5,7 @@ App(
     entry_point="reaction_main",
     requires=["gui"],
     stack_size=1 * 1024,
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon="icon.png",
     fap_author="@Milk-Cool",
     fap_weburl="https://github.com/Milk-Cool/fz-reaction-game",

apps_source_code/game_of_life/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=2 * 1024,
     order=110,
     fap_icon="golIcon.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_author="@tgxn (original by @itsyourbedtime)",
     fap_weburl="https://github.com/tgxn/flipperzero-firmware/blob/dev/applications/game_of_life/game_of_life.c",
     fap_version="1.0",

apps_source_code/gb-pokemon-trading/application.fam

@@ -5,10 +5,10 @@ App(
     entry_point="pokemon_app",
     requires=["gui"],
     stack_size=2 * 1024,
-    fap_version=[1,2],
-    fap_category="GPIO_Extra",
+    fap_version=[1, 2],
+    fap_category="GPIO",
     fap_icon="pokemon_10px.png",
     fap_icon_assets="assets",
     fap_author="Esteban Fuentealba",
-    fap_weburl="https://github.com/EstebanFuentealba"
+    fap_weburl="https://github.com/EstebanFuentealba",
 )

apps_source_code/gpio_7segment/application.fam

@@ -6,7 +6,7 @@ App(
     requires=["gui", "gpio"],
     stack_size=2 * 1024,
     fap_icon="gpio_7segment.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_author="@jamisonderek",
     fap_weburl="https://github.com/jamisonderek/flipper-zero-tutorials/tree/main/gpio",
     fap_version="1.0",

apps_source_code/hex_editor/application.fam

@@ -11,7 +11,7 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="icons/edit_10px.png",
-    fap_category="Tools_Extra",
+    fap_category="Tools",
     fap_icon_assets="icons",
     fap_author="@dunaevai135",
     fap_weburl="https://github.com/dunaevai135/flipper-zero-hex_editor",

apps_source_code/ifttt/application.fam

@@ -10,5 +10,5 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="icon.png",
-    fap_category="GPIO_Extra",
-)
+    fap_category="GPIO",
+)

apps_source_code/ir_remote/application.fam

@@ -8,7 +8,7 @@ App(
         "gui",
         "dialogs",
     ],
-    fap_category="Tools_Extra",
+    fap_category="Infrared",
     fap_icon="ir_10px.png",
     fap_icon_assets="images",
     fap_author="@Hong5489 & @friebel & @d4ve10",

apps_source_code/logic_analyzer/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=2 * 1024,
     order=10,
     fap_icon="icons/app.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon_assets="icons",
     fap_author="@g3gg0",
     fap_weburl="https://github.com/g3gg0/flipper-logic_analyzer",

apps_source_code/magspoof_flipper/application.fam

@@ -14,7 +14,7 @@ App(
     stack_size=5 * 1024,
     order=64,  # keep it at the bottom of the list while still WIP
     fap_icon="icons/mag_10px.png",
-    fap_category="Tools_Extra",
+    fap_category="GPIO",
     fap_icon_assets="icons",
     fap_version=(0, 5),  # major, minor
     fap_description="WIP MagSpoof port using the RFID subsystem",

apps_source_code/mandelbrot/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=130,
     fap_icon="Mandelbrot.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_author="@Possibly-Matt",
     fap_weburl="https://github.com/Possibly-Matt",
     fap_version="1.0",

apps_source_code/memsic_2125/application.fam

@@ -6,5 +6,5 @@ App(
     requires=["gui"],
     stack_size=2 * 1024,
     fap_icon="memsic_2125.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
 )

apps_source_code/mh_z19/application.fam

@@ -7,6 +7,6 @@ App(
     stack_size=1 * 1024,
     order=20,
     fap_icon="co2_icon_10x10.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_icon_assets="media",
 )

apps_source_code/mifare_fuzzer/application.fam

@@ -10,7 +10,7 @@ App(
     stack_size=4 * 1024,
     order=30,
     fap_icon="images/mifare_fuzzer_10px.png",
-    fap_category="Tools_Extra",
+    fap_category="NFC",
     fap_icon_assets="images",
     fap_author="@spheeere98",
     fap_weburl="https://github.com/spheeere98/mifare_fuzzer",

apps_source_code/montyhall/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=185,
     fap_icon="Monty.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_author="@DevMilanIan",
     fap_version="1.0",
     fap_description="Monty Hall asks you to guess which closed door a prize is behind.",

apps_source_code/music_beeper/application.fam

@@ -13,5 +13,5 @@ App(
     order=45,
     fap_icon="music_10px.png",
     fap_icon_assets="icons",
-    fap_category="Media_Extra",
+    fap_category="Media",
 )

apps_source_code/musictracker/application.fam

@@ -9,7 +9,7 @@ App(
     stack_size=4 * 1024,
     order=20,
     fap_icon="zero_tracker.png",
-    fap_category="Media_Extra",
+    fap_category="Media",
     fap_icon_assets="icons",
     fap_author="@DrZlo13",
     fap_weburl="https://github.com/DrZlo13/flipper-zero-music-tracker",

apps_source_code/nrf24-batch/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=2 * 1024,
     order=60,
     fap_icon="nrf24batch_10px.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_private_libs=[
         Lib(
             name="nrf24",

apps_source_code/nrf24scan/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=2 * 1024,
     order=60,
     fap_icon="nrf24scan_10px.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_private_libs=[
         Lib(
             name="nrf24",

apps_source_code/nupogodi_game/application.fam

@@ -9,7 +9,7 @@ App(
     stack_size=1 * 1024,
     order=90,
     fap_icon="nupogodi.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon_assets="icons",
     fap_author="@sionyx",
     fap_weburl="https://github.com/sionyx/flipper_nupogodi",

apps_source_code/ocarina/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=30,
     fap_icon="icons/music_10px.png",
-    fap_category="Media_Extra",
+    fap_category="Media",
     fap_icon_assets="icons",
     fap_author="@invalidna-me",
     fap_weburl="https://github.com/invalidna-me/flipperzero-ocarina",

apps_source_code/paint/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=2 * 1024,
     order=175,
     fap_icon="paintIcon.png",
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_author="@n-o-T-I-n-s-a-n-e",
     fap_weburl="https://github.com/n-o-T-I-n-s-a-n-e",
     fap_version="1.0",

apps_source_code/pomodoro/application.fam

@@ -10,7 +10,7 @@ App(
     ],
     order=10,
     fap_icon="pomodoro_timer.png",
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon_assets="icons",
     fap_author="@sbrin",
     fap_weburl="https://github.com/sbrin/flipperzero_pomodoro",

apps_source_code/racegame/application.fam

@@ -9,7 +9,7 @@ App(
     stack_size=1 * 1024,
     order=90,
     fap_icon="icon.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_author="@zyuhel",
     fap_weburl="https://github.com/zyuhel/flipperzero-racegame",
     fap_version="1.0",

apps_source_code/rc2014_coleco/application.fam

@@ -9,5 +9,5 @@ App(
     order=35,
     fap_icon="coleco_10px.png",
     fap_icon_assets="icons",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
 )

apps_source_code/rcwl_0516/application.fam

@@ -1,14 +1,14 @@
 App(
-	appid="rcwl_0516",
-	name="[RCWL-0516] Motion Sensor",
-	apptype=FlipperAppType.EXTERNAL,
-	entry_point="rcwl_0516",
-	cdefines=["RCWL_0516"],
-	requires=[
-		"gui",
-	],
-	stack_size=1 * 1024,
-	order=90,
-	fap_icon="motion_detection_icon_10x10px.png",
-	fap_category="GPIO_Extra",
+    appid="rcwl_0516",
+    name="[RCWL-0516] Motion Sensor",
+    apptype=FlipperAppType.EXTERNAL,
+    entry_point="rcwl_0516",
+    cdefines=["RCWL_0516"],
+    requires=[
+        "gui",
+    ],
+    stack_size=1 * 1024,
+    order=90,
+    fap_icon="motion_detection_icon_10x10px.png",
+    fap_category="GPIO",
 )

apps_source_code/resistors/application.fam

@@ -6,7 +6,7 @@ App(
     apptype=FlipperAppType.EXTERNAL,
     entry_point="resistors_app",
     stack_size=2 * 1024,
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     # Optional values
     fap_version=(1, 1),
     fap_icon="resistors.png",

apps_source_code/reversi/application.fam

@@ -10,7 +10,7 @@ App(
     stack_size=1 * 1024,
     order=90,
     fap_icon="game_reversi.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon_assets_symbol="game_reversi",
     fap_author="@dimat",
     fap_weburl="https://github.com/zyuhel/flipperzero-racegame",

apps_source_code/rootoflife/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=30,
     fap_icon="roots_of_life_10px.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon_assets="images",
     fap_icon_assets_symbol="roots_of_life_game",
     fap_author="@Xorboo",

apps_source_code/rubiks_cube_scrambler/application.fam

@@ -15,7 +15,7 @@ App(
     apptype=FlipperAppType.EXTERNAL,
     entry_point="rubiks_cube_scrambler_main",
     stack_size=1 * 1024,
-    fap_category="Misc_Extra",
+    fap_category="Tools",
     fap_icon="cube.png",
     fap_author="@RaZeSloth",
     fap_weburl="https://github.com/RaZeSloth/flipperzero-rubiks-cube-scrambler",

apps_source_code/schip/application.fam

@@ -5,7 +5,7 @@ App(
     entry_point="schip_main",
     requires=["gui"],
     stack_size=1 * 1024,
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon="icon.png",
     fap_author="@Milk-Cool",
     fap_weburl="https://github.com/Milk-Cool/fz-schip",

apps_source_code/scorched_tanks/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=100,
     fap_icon="scorchedTanks_10px.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_author="@jasniec",
     fap_weburl="https://github.com/jasniec/flipper-scorched-tanks-game",
     fap_version="1.0",

apps_source_code/servotester/application.fam

@@ -9,7 +9,7 @@ App(
     stack_size=1 * 1024,
     order=90,
     fap_icon="servotester.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_author="Alexander Semion",
     fap_weburl="https://github.com/spin7ion/flipper-servotester",
     fap_version="1.0",

apps_source_code/sony-intervalometer/application.fam

@@ -8,7 +8,7 @@ App(
     order=20,
     fap_icon="intervalometer_10x.png",
     fap_icon_assets="icons",
-    fap_category="Tools_Extra",
+    fap_category="Infrared",
     fap_author="@Nitepone",
     fap_weburl="https://github.com/Nitepone/flipper-intervalometer",
     fap_version="1.0",

apps_source_code/t-rex-runner/application.fam

@@ -6,7 +6,7 @@ App(
     cdefines=["APP_TREXRUNNER"],
     requires=["gui"],
     stack_size=8 * 1024,
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon="trexrunner_icon.png",
     fap_icon_assets="assets",
     order=36,

apps_source_code/tama_p1/application.fam

@@ -8,5 +8,5 @@ App(
     stack_size=2 * 1024,
     order=215,
     fap_icon="tamaIcon.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
 )

apps_source_code/tanksgame/application.fam

@@ -8,6 +8,6 @@ App(
     stack_size=4 * 1024,
     order=730,
     fap_icon="tanksIcon.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_icon_assets="images",
 )

apps_source_code/timelapse/application.fam

@@ -9,7 +9,7 @@ App(
     order=90,
     fap_icon_assets="icons",
     fap_icon="zeitraffer.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_version="1.0",
     fap_description="Simple intervalometer app, works via GPIO pins.",
     fap_author="Aurelius Rosenbaum",

apps_source_code/usb_hid_autofire/application.fam

@@ -9,7 +9,7 @@ App(
     ],
     stack_size=1 * 1024,
     fap_icon="usb_hid_autofire.png",
-    fap_category="Tools_Extra",
+    fap_category="USB",
     fap_author="@pbek",
     fap_weburl="https://github.com/pbek/usb_hid_autofire",
     fap_version="1.0",

apps_source_code/usb_midi/application.fam

@@ -9,7 +9,7 @@ App(
     stack_size=4 * 1024,
     order=20,
     fap_icon="usb_midi.png",
-    fap_category="Media_Extra",
+    fap_category="Media",
     fap_author="@DrZlo13",
     fap_weburl="https://github.com/DrZlo13/flipper-zero-usb-midi",
     fap_version="1.0",

apps_source_code/usping/application.fam

@@ -10,7 +10,7 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="dist_sensor10px.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_author="@privet971",
     fap_weburl="https://github.com/privet971/FlipperZeroApps/tree/main/usping",
     fap_version="1.0",

apps_source_code/video_player/application.fam

@@ -6,11 +6,11 @@ App(
     cdefines=["APP_VIDEO_PLAYER"],
     stack_size=2 * 1024,
     order=90,
-	fap_version=(0, 1),
-	fap_description="An app that plays video along with sound on Flipper Zero.",
-	fap_author="LTVA",
+    fap_version=(0, 1),
+    fap_description="An app that plays video along with sound on Flipper Zero.",
+    fap_author="LTVA",
     fap_weburl="https://github.com/LTVA1/flipper_video_player",
-	fap_icon="video_player.png",
-	fap_icon_assets="images",
-    fap_category="Media_Extra",
+    fap_icon="video_player.png",
+    fap_icon_assets="images",
+    fap_category="Media",
 )

apps_source_code/videopoker/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=2 * 1024,
     order=270,
     fap_icon="pokerIcon.png",
-    fap_category="Games_Extra",
+    fap_category="Games",
     fap_author="@PixlEmly",
     fap_weburl="https://github.com/PixlEmly",
     fap_version="1.0",

apps_source_code/wiegand/application.fam

@@ -6,7 +6,7 @@ App(
     requires=["gui"],
     stack_size=2 * 1024,
     fap_icon="wiegand.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_author="@jamisonderek",
     fap_weburl="https://github.com/jamisonderek/flipper-zero-tutorials/tree/main/gpio",
     fap_version="1.0",

apps_source_code/wifi-map/application.fam

@@ -10,5 +10,5 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="CS.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
 )

apps_source_code/wifi_deauther/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=1 * 1024,
     order=30,
     fap_icon="wifi_10px.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_author="@Timmotools & @xMasterX",
     fap_weburl="https://github.com/Timmotools/flipperzero_esp8266_deautherv2",
     fap_version="1.0",

apps_source_code/wii_ec_anal/application.fam

@@ -24,7 +24,7 @@ App(
     # 	fap_description="Wii Extension Controller Protocol Analyser",
     # 	fap_version=(1,0),
     fap_icon="WiiEC.png",
-    fap_category="GPIO_Extra",
+    fap_category="GPIO",
     fap_author="@csBlueChip",
     fap_weburl="https://github.com/csBlueChip/FlipperZero_WiiEC",
     fap_version="1.0",