diff --git a/src/components/themes/BaseTheme.cpp b/src/components/themes/BaseTheme.cpp
index eb22266e..5a4e6986 100644
--- a/src/components/themes/BaseTheme.cpp
+++ b/src/components/themes/BaseTheme.cpp
@@ -12,8 +12,8 @@
 
 #include "I18n.h"
 #include "RecentBooksStore.h"
-#include "components/icons/bluetooth.h"
 #include "components/UITheme.h"
+#include "components/icons/bluetooth.h"
 #include "components/icons/bookmark.h"
 #include "fontIds.h"
 
diff --git a/src/main.cpp b/src/main.cpp
index 5a035381..2ff9ac2f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -570,9 +570,9 @@ void loop() {
   static unsigned long lastMemPrint = 0;
 
   gpio.update();
-  updateBluetoothLifecycle();    // bring BLE up/down for the current activity context
+  updateBluetoothLifecycle();  // bring BLE up/down for the current activity context
   static bool lastBleConnected = false;
-  BleHid.poll();                 // drive BLE auto-reconnect + key auto-repeat (no-op when BT off)
+  BleHid.poll();  // drive BLE auto-reconnect + key auto-repeat (no-op when BT off)
   const bool bleConnected = BleHid.isConnected();
   if (bleConnected && !lastBleConnected) {
     LOG_INF("BLELC", "connected name=%s heap=%u maxAlloc=%u", BleHid.connectedName(), ESP.getFreeHeap(),