diff --git a/android/app/src/main/java/com/fabledsword/minstrel/theme/LocalActionColors.kt b/android/app/src/main/java/com/fabledsword/minstrel/theme/ActionColors.kt
similarity index 100%
rename from android/app/src/main/java/com/fabledsword/minstrel/theme/LocalActionColors.kt
rename to android/app/src/main/java/com/fabledsword/minstrel/theme/ActionColors.kt
diff --git a/android/app/src/main/java/com/fabledsword/minstrel/theme/Tokens.kt b/android/app/src/main/java/com/fabledsword/minstrel/theme/FabledSwordTokens.kt
similarity index 100%
rename from android/app/src/main/java/com/fabledsword/minstrel/theme/Tokens.kt
rename to android/app/src/main/java/com/fabledsword/minstrel/theme/FabledSwordTokens.kt
diff --git a/android/app/src/main/java/com/fabledsword/minstrel/theme/Typography.kt b/android/app/src/main/java/com/fabledsword/minstrel/theme/Typography.kt
index f48ab4b3..9eafcfba 100644
--- a/android/app/src/main/java/com/fabledsword/minstrel/theme/Typography.kt
+++ b/android/app/src/main/java/com/fabledsword/minstrel/theme/Typography.kt
@@ -32,17 +32,42 @@ private val InterFont = GoogleFont("Inter")
 private val JetBrainsMonoFont = GoogleFont("JetBrains Mono")
 
 private val Fraunces = FontFamily(
-    Font(googleFont = FrauncesFont, fontProvider = GoogleFontProvider, weight = FontWeight.W400, style = FontStyle.Normal),
-    Font(googleFont = FrauncesFont, fontProvider = GoogleFontProvider, weight = FontWeight.W500, style = FontStyle.Normal),
+    Font(
+        googleFont = FrauncesFont,
+        fontProvider = GoogleFontProvider,
+        weight = FontWeight.W400,
+        style = FontStyle.Normal,
+    ),
+    Font(
+        googleFont = FrauncesFont,
+        fontProvider = GoogleFontProvider,
+        weight = FontWeight.W500,
+        style = FontStyle.Normal,
+    ),
 )
 
 private val Inter = FontFamily(
-    Font(googleFont = InterFont, fontProvider = GoogleFontProvider, weight = FontWeight.W400, style = FontStyle.Normal),
-    Font(googleFont = InterFont, fontProvider = GoogleFontProvider, weight = FontWeight.W500, style = FontStyle.Normal),
+    Font(
+        googleFont = InterFont,
+        fontProvider = GoogleFontProvider,
+        weight = FontWeight.W400,
+        style = FontStyle.Normal,
+    ),
+    Font(
+        googleFont = InterFont,
+        fontProvider = GoogleFontProvider,
+        weight = FontWeight.W500,
+        style = FontStyle.Normal,
+    ),
 )
 
 private val JetBrainsMono = FontFamily(
-    Font(googleFont = JetBrainsMonoFont, fontProvider = GoogleFontProvider, weight = FontWeight.W400, style = FontStyle.Normal),
+    Font(
+        googleFont = JetBrainsMonoFont,
+        fontProvider = GoogleFontProvider,
+        weight = FontWeight.W400,
+        style = FontStyle.Normal,
+    ),
 )
 
 /**
diff --git a/android/config/detekt.yml b/android/config/detekt.yml
index ae90ff9b..aef9b214 100644
--- a/android/config/detekt.yml
+++ b/android/config/detekt.yml
@@ -1,10 +1,13 @@
-# Empty detekt config — relies on defaults via `buildUponDefaultConfig = true`
-# in the :app detekt {} block. Per-rule overrides go here as needed:
+# Per-rule overrides layered on top of detekt's defaults
+# (`buildUponDefaultConfig = true` in the :app `detekt {}` block).
 #
-#   style:
-#     MagicNumber:
-#       active: false
-#
-# The pre-2.0 `build: maxIssues: 0` top-level was removed; failure
-# threshold is configured via the Gradle DSL's `failOnSeverity` option
-# instead (defaults to Error).
+# The pre-2.0 `build:` top-level was removed; failure-on-finding is
+# controlled by the Gradle DSL's `failOnSeverity` option instead.
+
+naming:
+  # Composables conventionally use PascalCase function names. Allow it
+  # by ignoring functions annotated @Composable for the FunctionNaming
+  # rule. Matches every mainstream Compose codebase.
+  FunctionNaming:
+    ignoreAnnotated:
+      - "Composable"