diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0d88639..136739d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "cz.bugsy.passwordzebra"
         minSdk = 29
         targetSdk = 34
-        versionCode = 4
-        versionName = "1.3.1"
+        versionCode = 5
+        versionName = "1.4.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 925d952..adedc07 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="MediaStore.createWriteRequest" />
     <application
+        android:name=".PasswordZebra"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
diff --git a/app/src/main/java/cz/bugsy/passwordzebra/PasswordZebra.kt b/app/src/main/java/cz/bugsy/passwordzebra/PasswordZebra.kt
new file mode 100644
index 0000000..25ce221
--- /dev/null
+++ b/app/src/main/java/cz/bugsy/passwordzebra/PasswordZebra.kt
@@ -0,0 +1,12 @@
+package cz.bugsy.passwordzebra
+
+import android.app.Application
+import com.google.android.material.color.DynamicColors
+
+class PasswordZebra : Application() {
+    override fun onCreate() {
+        // Apply dynamic color
+        //DynamicColors.applyToActivitiesIfAvailable(this)
+        DynamicColors.applyToActivitiesIfAvailable(this, R.style.AppTheme_Overlay)
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ac1aa30..c51c7df 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -37,7 +37,6 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="16dp"
-        android:background="@drawable/password_background"
         android:gravity="center"
         android:padding="16dp"
         android:text=""
@@ -50,8 +49,8 @@
         android:id="@+id/passwordLengthLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="80dp"
-        android:layout_marginBottom="104dp"
+        android:layout_marginStart="72dp"
+        android:layout_marginBottom="96dp"
         android:text="@string/textview_password_length"
         app:layout_constraintBottom_toTopOf="@id/switchWithoutSpaces"
         app:layout_constraintStart_toStartOf="parent" />
@@ -60,9 +59,11 @@
         android:id="@+id/passwordLengthPicker"
         android:layout_width="69dp"
         android:layout_height="178dp"
+        android:layout_marginStart="81dp"
         android:layout_marginEnd="72dp"
         app:layout_constraintBottom_toTopOf="@+id/switchWithoutSpaces"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/passwordLengthLabel"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.953" />
 
@@ -89,12 +90,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="64dp"
-        android:backgroundTint="@color/design_default_color_secondary"
         android:text="@string/generate_button_text"
-        android:textColor="@android:color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="20dp" />
+
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index cb49a61..c4ce9e3 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,5 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.Theme.PasswordZebra" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your dark theme here. -->
-        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+
+<resources>
+    <style name="Theme.PasswordZebra" parent="Theme.Material3.DayNight.NoActionBar">
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/attrs.xml.xml b/app/src/main/res/values/attrs.xml.xml
new file mode 100644
index 0000000..dbf11aa
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml.xml
@@ -0,0 +1,4 @@
+<resources>
+    <attr name="iconColor" format="color" />
+</resources>
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c8524cd..b657e4e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
+    <color name="green">#1B5E20</color>
+    <color name="green_dark">#003300</color>
+    <color name="green_light">#A5D6A7</color>
+    <color name="blue">#0288D1</color>
+    <color name="blue_dark">#005B9F</color>
+    <color name="blue_light">#81D4FA</color>
+    <color name="black">#000000</color>
+    <color name="white">#FFFFFF</color>
+    <color name="overlay_light_primary">#9C4146</color>
+    <color name="overlay_light_onPrimary">#FFFFFF</color>
+    <color name="overlay_light_primaryContainer">#FFDADB</color>
+    <color name="overlay_light_onPrimaryContainer">#400008</color>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ef3f828..5f1d393 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,9 +1,5 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.Theme.PasswordZebra" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your light theme here. -->
-        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
-    </style>
 
-    <style name="Theme.PasswordZebra" parent="Base.Theme.PasswordZebra" />
-</resources>
\ No newline at end of file
+<resources>
+    <style name="Theme.PasswordZebra" parent="Theme.Material3.Light.NoActionBar">
+    </style>
+</resources>
diff --git a/app/src/main/res/values/themes_overlays.xml.xml b/app/src/main/res/values/themes_overlays.xml.xml
new file mode 100644
index 0000000..4b9318f
--- /dev/null
+++ b/app/src/main/res/values/themes_overlays.xml.xml
@@ -0,0 +1,5 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="AppTheme.Overlay" parent="ThemeOverlay.Material3.DynamicColors.DayNight">
+        <item name="iconColor">@android:color/system_accent2_600</item>
+    </style>
+</resources>
\ No newline at end of file