diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f3f1e24e..2cada84a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -157,6 +157,8 @@ android {
 }
 
 dependencies {
+    detektPlugins("io.nlopez.compose.rules:detekt:0.4.17")
+    lintChecks("com.slack.lint.compose:compose-lint-checks:1.4.2")
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("androidx.activity:activity-ktx:1.9.2")
     implementation("androidx.navigation:navigation-fragment-ktx:2.8.0")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3b4573a6..790e1658 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,25 +28,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".activities.SplashActivity"
-            android:exported="false"
-           />
-
-        <activity-alias
-            android:name=".activities.SplashActivity.Orange"
-            android:enabled="true"
-            android:exported="true"
-            android:icon="@mipmap/ic_launcher"
-            android:roundIcon="@mipmap/ic_launcher"
-            android:targetActivity=".activities.SplashActivity" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity-alias>
-
         <activity
             android:name=".fragments.MainFragment"
             android:exported="false" />
diff --git a/app/src/main/java/be/scri/ui/screens/ThirdPartyScreen.kt b/app/src/main/java/be/scri/ui/screens/ThirdPartyScreen.kt
index b086a90e..4972c35d 100644
--- a/app/src/main/java/be/scri/ui/screens/ThirdPartyScreen.kt
+++ b/app/src/main/java/be/scri/ui/screens/ThirdPartyScreen.kt
@@ -14,16 +14,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import be.scri.R
-import be.scri.ui.theme.ScribeTheme
 import be.scri.ui.theme.ScribeTypography
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
-fun ThirdPartyScreen() {
-    Scaffold(modifier = Modifier.fillMaxSize()) {
+fun ThirdPartyScreen(modifier: Modifier = Modifier) {
+    Scaffold(modifier = modifier.fillMaxSize()) {
         Column(
             modifier =
                 Modifier
@@ -68,19 +66,3 @@ fun ThirdPartyScreen() {
         }
     }
 }
-
-@Preview
-@Composable
-fun ThirdPartyScreenPreviewDark() {
-    ScribeTheme(useDarkTheme = true) {
-        ThirdPartyScreen()
-    }
-}
-
-@Preview
-@Composable
-fun ThirdPartyScreenPreviewLight() {
-    ScribeTheme(useDarkTheme = false) {
-        ThirdPartyScreen()
-    }
-}
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2bd7192c..fda894f7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -181,16 +181,6 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
-    <style name="PinNumberStyle.Base">
-        <item name="android:gravity">center</item>
-        <item name="android:padding">@dimen/small_margin</item>
-        <item name="android:textSize">@dimen/big_text_size</item>
-    </style>
-
-    <style name="PinNumberStyle" parent="PinNumberStyle.Base">
-        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
-    </style>
-
     <style name="ColoredButtonStyle" parent="@android:style/Widget.TextView">
         <item name="android:textFontWeight">600</item>
         <item name="android:textAllCaps">true</item>
diff --git a/build.gradle.kts b/build.gradle.kts
index 26d14e3f..804ba656 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,6 +11,7 @@ buildscript {
     }
 
     dependencies {
+        classpath("io.nlopez.compose.rules:ktlint:0.4.17")
         classpath("com.android.tools.build:gradle:8.6.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6")
diff --git a/detekt.yml b/detekt.yml
index 53857c47..c86ce0b0 100644
--- a/detekt.yml
+++ b/detekt.yml
@@ -19,7 +19,7 @@ style:
 naming:
     FunctionNaming:
         active: true
-        ignoreAnnotated: ['Composable']
+        ignoreAnnotated: ["Composable"]
 
 complexity:
     TooManyFunctions:
diff --git a/lint.xml b/lint.xml
new file mode 100644
index 00000000..21d1f13e
--- /dev/null
+++ b/lint.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="FrequentlyChangedStateReadInComposition" severity="error" />
+    <issue id="ComposableModifierFactory" severity="error" />
+    <issue id="ModifierFactoryExtensionFunction" severity="error" />
+    <issue id="ModifierFactoryReturnType" severity="error" />
+    <issue id="ModifierParameter" severity="error" />
+    <issue id="UnnecessaryComposedModifier" severity="error" />
+    <issue id="InvalidColorHexValue" severity="error" />
+    <issue id="MissingColorAlphaChannel" severity="error" />
+    <issue id="ComposableLambdaParameterNaming" severity="error" />
+    <issue id="ComposableNaming" severity="error" />
+    <issue id="CompositionLocalNaming" severity="error" />
+    <issue id="MutableCollectionMutableState" severity="error" />
+</lint>