diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 774fd620..7569ad71 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,12 +9,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Test">
+        android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.Test.NoActionBar">
+            android:theme="@style/AppTheme.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 140e38df..00000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Test" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
-        <item name="colorOnPrimary">@color/colorOnPrimary</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="colorSecondaryVariant">@color/colorSecondaryDark</item>
-        <item name="colorOnSecondary">@color/colorOnSecondary</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/lib_theme/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/lib_theme/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 5adfaf9b..f2b1d164 100644
--- a/lib_theme/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/lib_theme/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -22,6 +22,6 @@
   -->
 
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/actionBarColor"/>
+    <background android:drawable="@color/md_theme_primary"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/lib_theme/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/lib_theme/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 5adfaf9b..f2b1d164 100644
--- a/lib_theme/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/lib_theme/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -22,6 +22,6 @@
   -->
 
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/actionBarColor"/>
+    <background android:drawable="@color/md_theme_primary"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/lib_theme/src/main/res/values-night/colors.xml b/lib_theme/src/main/res/values-night/colors.xml
deleted file mode 100644
index c2f2aef6..00000000
--- a/lib_theme/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#FF212121</color>
-    <color name="colorPrimaryDark">@android:color/black</color>
-    <color name="colorSecondary">#FF008CD2</color>
-    <color name="colorSecondaryDark">#FF008CD2</color>
-    <color name="colorOnSecondary">#FFFFFFFF</color>
-    <color name="colorOnPrimary">#FFFFFFFF</color>
-    <color name="background">@android:color/black</color>
-    <color name="actionBarColor">#FF0090B0</color>
-</resources>
\ No newline at end of file
diff --git a/lib_theme/src/main/res/values/colors.xml b/lib_theme/src/main/res/values/colors.xml
deleted file mode 100644
index c3b04f40..00000000
--- a/lib_theme/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#FF00A9CE</color>
-    <color name="colorPrimaryDark">#FF007a9d</color>
-    <color name="colorOnPrimary">#FFFFFFFF</color>
-    <color name="colorSecondary">#FF0077c8</color>
-    <color name="colorSecondaryDark">#FF004c97</color>
-    <color name="colorOnSecondary">#FFFFFFFF</color>
-    <color name="background">#FFF5F5F5</color>
-    <color name="actionBarColor">#FF0090B0</color>
-</resources>
diff --git a/lib_theme/src/main/res/values/themes.xml b/lib_theme/src/main/res/values/themes.xml
deleted file mode 100644
index 4d31cda5..00000000
--- a/lib_theme/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Test" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="android:background">@color/background</item>
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
-        <item name="colorOnPrimary">@color/colorOnPrimary</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="colorSecondaryVariant">@color/colorSecondaryDark</item>
-        <item name="colorOnSecondary">@color/colorOnSecondary</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-
-    <style name="Theme.Test.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="Theme.Test.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="Theme.Test.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-</resources>