diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 53bf5bd..69e46d2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,7 +15,7 @@ android {
         minSdk = 26
         targetSdk = 34
         versionCode = 68
-        versionName = "1.0.0"
+        versionName = "2.0.0"
         archivesName = "${applicationId}-v${versionName}"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/imageoptimizer/ImageOptimizerActivity.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/imageoptimizer/ImageOptimizerActivity.kt
index ee2faae..a190484 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/imageoptimizer/ImageOptimizerActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/imageoptimizer/ImageOptimizerActivity.kt
@@ -1,7 +1,6 @@
 package com.d4rk.cleaner.ui.imageoptimizer
 
 import android.content.Context
-import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.media.MediaScannerConnection
 import android.net.Uri
@@ -11,10 +10,8 @@ import android.provider.DocumentsContract
 import android.provider.MediaStore
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import androidx.preference.PreferenceManager
 import com.bumptech.glide.Glide
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.adapters.ImageOptimizationPagerAdapter
@@ -51,20 +48,6 @@ class ImageOptimizerActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityImageOptimizerBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        if (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES) {
-            if (PreferenceManager.getDefaultSharedPreferences(this)
-                    .getBoolean(getString(R.string.key_amoled_mode), false)
-            ) {
-                binding.root.setBackgroundColor(ContextCompat.getColor(this, android.R.color.black))
-                binding.tabLayout.setBackgroundColor(
-                    ContextCompat.getColor(
-                        this,
-                        android.R.color.black
-                    )
-                )
-                window.navigationBarColor = ContextCompat.getColor(this, android.R.color.black)
-            }
-        }
         val adapter = ImageOptimizationPagerAdapter(this)
         binding.viewPager.adapter = adapter
         binding.progressBar.alpha = 0f
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/imageoptimizer/ImagePickerActivity.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/imageoptimizer/ImagePickerActivity.kt
index 19c7959..e31a980 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/imageoptimizer/ImagePickerActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/imageoptimizer/ImagePickerActivity.kt
@@ -2,13 +2,10 @@ package com.d4rk.cleaner.ui.imageoptimizer
 
 import android.app.Activity
 import android.content.Intent
-import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Handler
 import android.view.animation.AnimationUtils
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.databinding.ActivityImagePickerBinding
 import com.google.android.gms.ads.AdRequest
@@ -32,29 +29,9 @@ class ImagePickerActivity : AppCompatActivity() {
         binding.buttonChooseImage.setOnClickListener {
             selectImage()
         }
-        if (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES) {
-            if (PreferenceManager.getDefaultSharedPreferences(this)
-                    .getBoolean(getString(R.string.key_amoled_mode), false)
-            ) {
-                binding.root.setBackgroundColor(ContextCompat.getColor(this, android.R.color.black))
-                window.navigationBarColor = ContextCompat.getColor(this, android.R.color.black)
-            }
-        }
-
     }
 
     private fun setAnimations() {
-        if (PreferenceManager.getDefaultSharedPreferences(this)
-                .getBoolean(getString(R.string.key_custom_animations), true)
-        ) {
-            binding.root.startAnimation(AnimationUtils.loadAnimation(this, R.anim.anim_entry))
-            binding.lottieAnimationView.startAnimation(
-                AnimationUtils.loadAnimation(
-                    this,
-                    R.anim.anim_fade_in
-                )
-            )
-        }
         binding.buttonChooseImage.startAnimation(
             AnimationUtils.loadAnimation(
                 this,
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/whitelist/WhitelistActivity.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/whitelist/WhitelistActivity.kt
index 45fbbdd..1a47f89 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/whitelist/WhitelistActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/whitelist/WhitelistActivity.kt
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.cleaner.ui.settings.display.theme.AppTheme
+import com.d4rk.cleaner.ui.settings.display.theme.style.AppTheme
 
 class WhitelistActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_image_optimizer.xml b/app/src/main/res/layout/activity_image_optimizer.xml
index fcb4c45..8a1037e 100644
--- a/app/src/main/res/layout/activity_image_optimizer.xml
+++ b/app/src/main/res/layout/activity_image_optimizer.xml
@@ -13,8 +13,7 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_margin="24dp"
-            app:cardCornerRadius="@dimen/medium_rounding">
+            android:layout_margin="24dp">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/image_view"
@@ -65,7 +64,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="12dp"
-        app:cardCornerRadius="@dimen/medium_rounding"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <com.google.android.gms.ads.AdView
diff --git a/app/src/main/res/layout/activity_image_picker.xml b/app/src/main/res/layout/activity_image_picker.xml
index 238c02d..d24a434 100644
--- a/app/src/main/res/layout/activity_image_picker.xml
+++ b/app/src/main/res/layout/activity_image_picker.xml
@@ -21,7 +21,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="12dp"
-        app:cardCornerRadius="@dimen/medium_rounding"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <com.google.android.gms.ads.AdView
diff --git a/app/src/main/res/layout/activity_whitelist.xml b/app/src/main/res/layout/activity_whitelist.xml
index 4135d33..cfb9323 100644
--- a/app/src/main/res/layout/activity_whitelist.xml
+++ b/app/src/main/res/layout/activity_whitelist.xml
@@ -11,7 +11,6 @@
         android:layout_height="0dp"
         android:layout_margin="24dp"
         android:layout_weight="1"
-        app:cardCornerRadius="@dimen/medium_rounding"
         app:layout_constraintBottom_toTopOf="@id/button_add_to_whitelist"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -22,7 +21,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_margin="32dp"
-            app:cardCornerRadius="@dimen/medium_rounding"
             app:layout_constraintBottom_toBottomOf="parent">
 
             <com.google.android.gms.ads.AdView
@@ -52,7 +50,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="12dp"
-        app:cardCornerRadius="@dimen/medium_rounding"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <com.google.android.gms.ads.AdView
diff --git a/app/src/main/res/values-night-v27/themes.xml b/app/src/main/res/values-night-v27/themes.xml
index fccea69..a8904ca 100644
--- a/app/src/main/res/values-night-v27/themes.xml
+++ b/app/src/main/res/values-night-v27/themes.xml
@@ -7,7 +7,6 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:fontFamily">@font/font_poppins</item>
-        <item name="dialogCornerRadius">@dimen/extra_large_rounding</item>
         <item name="popupMenuBackground">@drawable/bg_popup</item>
         <item name="android:alertDialogTheme">
             @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
diff --git a/app/src/main/res/values-night-v28/themes.xml b/app/src/main/res/values-night-v28/themes.xml
index fccea69..a8904ca 100644
--- a/app/src/main/res/values-night-v28/themes.xml
+++ b/app/src/main/res/values-night-v28/themes.xml
@@ -7,7 +7,6 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:fontFamily">@font/font_poppins</item>
-        <item name="dialogCornerRadius">@dimen/extra_large_rounding</item>
         <item name="popupMenuBackground">@drawable/bg_popup</item>
         <item name="android:alertDialogTheme">
             @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index e94e8eb..613ec65 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -8,7 +8,6 @@
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:fontFamily">@font/font_poppins</item>
         <item name="popupMenuBackground">@drawable/bg_popup</item>
-        <item name="dialogCornerRadius">@dimen/extra_large_rounding</item>
         <item name="android:alertDialogTheme">
             @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
         </item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6948a81..d370522 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -7,7 +7,6 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:fontFamily">@font/font_poppins</item>
-        <item name="dialogCornerRadius">@dimen/extra_large_rounding</item>
         <item name="popupMenuBackground">@drawable/bg_popup</item>
         <item name="android:alertDialogTheme">
             @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered