diff --git a/src/components/UITheme.cpp b/src/components/UITheme.cpp
index 7b76f617..67a09e16 100644
--- a/src/components/UITheme.cpp
+++ b/src/components/UITheme.cpp
@@ -98,17 +98,11 @@ Rect UITheme::getContentRect(const GfxRenderer& renderer, bool hasBottomHints, b
   return Rect{left, top, w - left - right, h - top - bottom};
 }
 
-std::string UITheme::makeSeparatorTitle(const std::string& title) {
-  return std::string("__") + title;
-}
+std::string UITheme::makeSeparatorTitle(const std::string& title) { return std::string("__") + title; }
 
-std::string UITheme::makeSeparatorTitle(StrId labelId) {
-  return std::string("__") + I18N.get(labelId);
-}
+std::string UITheme::makeSeparatorTitle(StrId labelId) { return std::string("__") + I18N.get(labelId); }
 
-bool UITheme::isSeparatorTitle(const std::string& title) {
-  return title.rfind("__", 0) == 0;
-}
+bool UITheme::isSeparatorTitle(const std::string& title) { return title.rfind("__", 0) == 0; }
 
 std::string UITheme::stripSeparatorTitle(const std::string& title) {
   return isSeparatorTitle(title) ? title.substr(2) : title;
diff --git a/src/components/UITheme.h b/src/components/UITheme.h
index 17d5c997..abdc1906 100644
--- a/src/components/UITheme.h
+++ b/src/components/UITheme.h
@@ -1,10 +1,10 @@
 #pragma once
 
+#include <I18n.h>
+
 #include <functional>
 #include <memory>
 
-#include <I18n.h>
-
 #include "CrossPointSettings.h"
 #include "components/themes/BaseTheme.h"
 
diff --git a/src/util/ButtonNavigator.h b/src/util/ButtonNavigator.h
index 11a17449..b76df714 100644
--- a/src/util/ButtonNavigator.h
+++ b/src/util/ButtonNavigator.h
@@ -45,9 +45,9 @@ class ButtonNavigator final {
   [[nodiscard]] static int nextIndex(int currentIndex, const std::vector<bool>& selectable);
   [[nodiscard]] static int previousIndex(int currentIndex, const std::vector<bool>& selectable);
   [[nodiscard]] static int nextIndex(int currentIndex, int totalItems,
-                                    const std::function<bool(int index)>& isSelectable);
+                                     const std::function<bool(int index)>& isSelectable);
   [[nodiscard]] static int previousIndex(int currentIndex, int totalItems,
-                                        const std::function<bool(int index)>& isSelectable);
+                                         const std::function<bool(int index)>& isSelectable);
 
   [[nodiscard]] int nextIndex(int currentIndex) const;
   [[nodiscard]] int previousIndex(int currentIndex) const;