diff --git a/applications/external/totp/application.fam b/applications/external/totp/application.fam
index 8ebf19820..8e56bbe76 100644
--- a/applications/external/totp/application.fam
+++ b/applications/external/totp/application.fam
@@ -4,15 +4,7 @@ App(
     apptype=FlipperAppType.EXTERNAL,
     entry_point="totp_app",
     cdefines=["APP_TOTP"],
-    requires=[
-        "gui",
-        "cli",
-        "dialogs",
-        "storage",
-        "input", 
-        "notification",
-        "bt"
-    ],
+    requires=["gui", "cli", "dialogs", "storage", "input", "notification", "bt"],
     stack_size=2 * 1024,
     order=20,
     fap_author="Alexander Kopachov (@akopachov)",
@@ -28,9 +20,7 @@ App(
         Lib(
             name="base64",
         ),
-        Lib(
-            name="linked_list"
-        ),
+        Lib(name="linked_list"),
         Lib(
             name="timezone_utils",
         ),
diff --git a/applications/external/totp/ui/fonts/font-info.h b/applications/external/totp/ui/fonts/font_info.h
similarity index 100%
rename from applications/external/totp/ui/fonts/font-info.h
rename to applications/external/totp/ui/fonts/font_info.h
diff --git a/applications/external/totp/ui/fonts/mode-nine/mode-nine.c b/applications/external/totp/ui/fonts/mode_nine/mode_nine.c
similarity index 99%
rename from applications/external/totp/ui/fonts/mode-nine/mode-nine.c
rename to applications/external/totp/ui/fonts/mode_nine/mode_nine.c
index a0befe77c..ca2191789 100644
--- a/applications/external/totp/ui/fonts/mode-nine/mode-nine.c
+++ b/applications/external/totp/ui/fonts/mode_nine/mode_nine.c
@@ -1,4 +1,4 @@
-#include "mode-nine.h"
+#include "mode_nine.h"
 #include <stdint.h>
 
 /* GENERATED BY https://github.com/pavius/the-dot-factory */
diff --git a/applications/external/totp/ui/fonts/mode-nine/mode-nine.h b/applications/external/totp/ui/fonts/mode_nine/mode_nine.h
similarity index 85%
rename from applications/external/totp/ui/fonts/mode-nine/mode-nine.h
rename to applications/external/totp/ui/fonts/mode_nine/mode_nine.h
index 50bd5cf1c..516e261f8 100644
--- a/applications/external/totp/ui/fonts/mode-nine/mode-nine.h
+++ b/applications/external/totp/ui/fonts/mode_nine/mode_nine.h
@@ -2,7 +2,7 @@
 
 /* GENERATED BY https://github.com/pavius/the-dot-factory */
 
-#include "../font-info.h"
+#include "../font_info.h"
 
 /* Font data for ModeNine 15pt */
 extern const FONT_INFO modeNine_15ptFontInfo;
diff --git a/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c b/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c
index d8de42cdf..22e6ebc33 100644
--- a/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c
+++ b/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c
@@ -19,7 +19,7 @@
 #ifdef TOTP_BADBT_TYPE_ENABLED
 #include "../../../workers/bt_type_code/bt_type_code.h"
 #endif
-#include "../../fonts/mode-nine/mode-nine.h"
+#include "../../fonts/mode_nine/mode_nine.h"
 
 #define PROGRESS_BAR_MARGIN (3)
 #define PROGRESS_BAR_HEIGHT (4)
diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c
index 818d5485f..d1215d628 100644
--- a/applications/main/bad_kb/bad_kb_app.c
+++ b/applications/main/bad_kb/bad_kb_app.c
@@ -153,7 +153,9 @@ int32_t bad_kb_connection_init(BadKbApp* app) {
         furi_hal_bt_set_profile_pairing_method(
             FuriHalBtProfileHidKeyboard, GapPairingPinCodeVerifyYesNo);
     } else {
-        if(memcmp(app->config.bt_mac, (uint8_t*)&BAD_KB_EMPTY_MAC_ADDRESS, BAD_KB_MAC_ADDRESS_LEN) != 0) {
+        if(memcmp(
+               app->config.bt_mac, (uint8_t*)&BAD_KB_EMPTY_MAC_ADDRESS, BAD_KB_MAC_ADDRESS_LEN) !=
+           0) {
             furi_hal_bt_set_profile_mac_addr(FuriHalBtProfileHidKeyboard, app->config.bt_mac);
         }
         furi_hal_bt_set_profile_pairing_method(FuriHalBtProfileHidKeyboard, GapPairingNone);
@@ -162,8 +164,12 @@ int32_t bad_kb_connection_init(BadKbApp* app) {
     if(strcmp(app->config.bt_name, "") == 0) {
         strcpy(app->config.bt_name, furi_hal_bt_get_profile_adv_name(FuriHalBtProfileHidKeyboard));
     }
-    if(memcmp(app->config.bt_mac, (uint8_t*)&BAD_KB_EMPTY_MAC_ADDRESS, BAD_KB_MAC_ADDRESS_LEN) == 0) {
-        memcpy(app->config.bt_mac, furi_hal_bt_get_profile_mac_addr(FuriHalBtProfileHidKeyboard), BAD_KB_MAC_ADDRESS_LEN);
+    if(memcmp(app->config.bt_mac, (uint8_t*)&BAD_KB_EMPTY_MAC_ADDRESS, BAD_KB_MAC_ADDRESS_LEN) ==
+       0) {
+        memcpy(
+            app->config.bt_mac,
+            furi_hal_bt_get_profile_mac_addr(FuriHalBtProfileHidKeyboard),
+            BAD_KB_MAC_ADDRESS_LEN);
     }
     if(app->is_bt) {
         furi_hal_bt_start_advertising();