diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8ab2a11..f1ffde4 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
-        android:label="vpn"
+        android:label="TrustTunnel"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..c85c327
Binary files /dev/null and b/android/app/src/main/ic_launcher-playstore.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/android12splash.png b/android/app/src/main/res/drawable-hdpi/android12splash.png
new file mode 100644
index 0000000..6e405d3
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
new file mode 100644
index 0000000..6e405d3
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/android12splash.png b/android/app/src/main/res/drawable-mdpi/android12splash.png
new file mode 100644
index 0000000..64a2f4a
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
new file mode 100644
index 0000000..64a2f4a
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/android/app/src/main/res/drawable-night-hdpi/android12splash.png
new file mode 100644
index 0000000..6e405d3
Binary files /dev/null and b/android/app/src/main/res/drawable-night-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/android/app/src/main/res/drawable-night-mdpi/android12splash.png
new file mode 100644
index 0000000..64a2f4a
Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
new file mode 100644
index 0000000..353d3e0
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
new file mode 100644
index 0000000..721aecf
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
new file mode 100644
index 0000000..70ee9da
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
new file mode 100644
index 0000000..c6ce21a
Binary files /dev/null and b/android/app/src/main/res/drawable-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
index f74085f..3cc4948 100644
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>
diff --git a/android/app/src/main/res/drawable-xhdpi/android12splash.png b/android/app/src/main/res/drawable-xhdpi/android12splash.png
new file mode 100644
index 0000000..353d3e0
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
new file mode 100644
index 0000000..353d3e0
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxhdpi/android12splash.png
new file mode 100644
index 0000000..721aecf
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
new file mode 100644
index 0000000..721aecf
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
new file mode 100644
index 0000000..70ee9da
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png
new file mode 100644
index 0000000..70ee9da
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
new file mode 100644
index 0000000..c6ce21a
Binary files /dev/null and b/android/app/src/main/res/drawable/background.png differ
diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..2e4439a
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group android:scaleX="0.5"
+      android:scaleY="0.5"
+      android:translateX="6"
+      android:translateY="6">
+    <path
+        android:pathData="M8.645,6.29C5.998,7.845 4.831,10.954 5.619,13.778C5.633,13.828 5.648,13.879 5.663,13.929C5.863,14.814 5.101,15.845 4.088,16.65C5.285,16.157 6.556,15.993 7.232,16.599C7.269,16.637 7.305,16.674 7.343,16.711C9.426,18.774 12.71,19.266 15.357,17.711C18.003,16.155 19.171,13.046 18.383,10.223C18.369,10.172 18.354,10.122 18.339,10.071C18.139,9.186 18.9,8.156 19.913,7.35C18.717,7.843 17.446,8.007 16.77,7.402C16.733,7.364 16.696,7.326 16.659,7.29C14.576,5.227 11.292,4.735 8.645,6.29Z"
+        android:fillColor="#F6F6F6"/>
+    <path
+        android:pathData="M6.911,3.34C10.925,0.981 15.907,1.727 19.066,4.855C19.123,4.911 19.179,4.968 19.234,5.025C20.26,5.944 22.187,5.695 24.002,4.947C22.466,6.169 21.31,7.733 21.613,9.075C21.637,9.151 21.659,9.228 21.681,9.305C22.876,13.587 21.105,18.302 17.091,20.661C13.077,23.02 8.095,22.274 4.936,19.146L4.768,18.975C3.742,18.057 1.815,18.305 0,19.053C1.536,17.831 2.692,16.268 2.389,14.926C2.365,14.849 2.343,14.773 2.321,14.696C1.126,10.414 2.897,5.699 6.911,3.34ZM16.656,7.29C14.573,5.228 11.289,4.735 8.643,6.29C5.996,7.845 4.828,10.954 5.616,13.777C5.63,13.828 5.646,13.879 5.661,13.93C5.861,14.815 5.099,15.845 4.086,16.65C5.282,16.157 6.553,15.993 7.229,16.599C7.266,16.636 7.303,16.674 7.34,16.711C9.423,18.774 12.708,19.266 15.354,17.711C18.001,16.156 19.168,13.046 18.38,10.223C18.366,10.172 18.351,10.122 18.336,10.071C18.136,9.186 18.898,8.156 19.911,7.351C18.715,7.843 17.444,8.007 16.768,7.402C16.731,7.364 16.694,7.327 16.656,7.29Z"
+        android:fillColor="#315AEF"/>
+    <path
+        android:pathData="M14.94,9.875C15.242,10.212 15.242,10.757 14.939,11.094L12.626,13.659C11.833,14.621 11.333,14.621 10.509,13.659L9.061,12.052C8.758,11.716 8.757,11.171 9.059,10.833C9.361,10.496 9.851,10.495 10.155,10.831L11.567,12.398L13.845,9.873C14.148,9.536 14.638,9.537 14.94,9.875Z"
+        android:fillColor="#315AEF"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index 304732f..3cc4948 100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..7353dbd
--- /dev/null
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..7353dbd
--- /dev/null
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index db77bb4..0000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000..07eb717
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..7c55580
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 17987b7..0000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000..39f7574
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..f97532f
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 09d4391..0000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 0000000..dc08bd6
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..6e973b5
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index d5f1c8d..0000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 0000000..f4064f3
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..8aaac81
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 4d6372e..0000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 0000000..b56cc51
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..e055061
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
new file mode 100644
index 0000000..b7e1992
--- /dev/null
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#E6EAEF</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 06952be..3c4a1fe 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
new file mode 100644
index 0000000..180e6c8
--- /dev/null
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#E6EAEF</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/android/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index cb1ef88..847e1be 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/assets/images/about.png b/assets/images/about.png
new file mode 100644
index 0000000..0afc142
Binary files /dev/null and b/assets/images/about.png differ
diff --git a/assets/images/dns.png b/assets/images/dns.png
deleted file mode 100644
index ccc49ec..0000000
Binary files a/assets/images/dns.png and /dev/null differ
diff --git a/assets/images/dns.webp b/assets/images/dns.webp
deleted file mode 100644
index ba82589..0000000
Binary files a/assets/images/dns.webp and /dev/null differ
diff --git a/assets/images/logo_white.png b/assets/images/logo_white.png
new file mode 100644
index 0000000..363c457
Binary files /dev/null and b/assets/images/logo_white.png differ
diff --git a/assets/images/privacy.png b/assets/images/privacy.png
deleted file mode 100644
index 6e6b028..0000000
Binary files a/assets/images/privacy.png and /dev/null differ
diff --git a/assets/images/privacy.webp b/assets/images/privacy.webp
deleted file mode 100644
index e2e90c3..0000000
Binary files a/assets/images/privacy.webp and /dev/null differ
diff --git a/assets/images/server.png b/assets/images/server.png
new file mode 100644
index 0000000..4a1d938
Binary files /dev/null and b/assets/images/server.png differ
diff --git a/flutter_native_splash.yaml b/flutter_native_splash.yaml
new file mode 100644
index 0000000..21fe260
--- /dev/null
+++ b/flutter_native_splash.yaml
@@ -0,0 +1,7 @@
+flutter_native_splash:
+  color: "#E6EAEF"
+  image:  assets/images/logo_white.png
+  fullscreen: true
+  android_12:
+    color: "#E6EAEF"
+    image: assets/images/logo_white.png
\ No newline at end of file
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 48ec53c..82f2656 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -614,6 +614,8 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = TrustTunnel;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -799,6 +801,8 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = TrustTunnel;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -825,6 +829,8 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = TrustTunnel;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index d36b1fa..4a069b2 100644
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,26 @@
 {
   "images" : [
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "filename" : "any.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     },
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "dark.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
deleted file mode 100644
index dc9ada4..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index 7353c41..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index 797d452..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 6ed2d93..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index 4cd7b00..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index fe73094..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index 321773c..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index 797d452..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index 502f463..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index 0ec3034..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index 0ec3034..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index e9f5fea..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index 84ac32a..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index 8953cba..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index 0467bf1..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/any.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/any.png
new file mode 100644
index 0000000..18e0bb0
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/any.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/dark.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/dark.png
new file mode 100644
index 0000000..a090482
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/dark.png differ
diff --git a/ios/Runner/Assets.xcassets/Contents.json b/ios/Runner/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..73c0059
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
new file mode 100644
index 0000000..9f447e1
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
new file mode 100644
index 0000000..c6ce21a
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
index 0bedcf2..00cabce 100644
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index 9da19ea..64a2f4a 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index 9da19ea..353d3e0 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index 9da19ea..721aecf 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
index f2e259c..7fa9c8f 100644
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -16,13 +16,19 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -32,6 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchImage" width="1200" height="1200"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index d9d9032..4751a0f 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,53 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>TrustTunnel</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>TrustTunnel</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-    <key>LSApplicationQueriesSchemes</key>
-    <array>
-        <string>https</string>
-    </array>
-</dict>
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>TrustTunnel</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>TrustTunnel</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>LSApplicationQueriesSchemes</key>
+		<array>
+			<string>https</string>
+		</array>
+		<key>UIStatusBarHidden</key>
+		<false/>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false/>
+	</dict>
 </plist>
diff --git a/lib/common/assets/assets_images.dart b/lib/common/assets/assets_images.dart
index 40bd49f..7b7ecbc 100644
--- a/lib/common/assets/assets_images.dart
+++ b/lib/common/assets/assets_images.dart
@@ -1,6 +1,7 @@
 abstract class AssetImages {
-  static const dns = '${_path}dns.webp';
+  static const server = '${_path}server.png';
+
+  static const about = '${_path}about.png';
 
-  static const privacy = '${_path}privacy.webp';
   static const _path = 'assets/images/';
 }
diff --git a/lib/common/extensions/theme_extensions.dart b/lib/common/extensions/theme_extensions.dart
index df705e0..938b6a6 100644
--- a/lib/common/extensions/theme_extensions.dart
+++ b/lib/common/extensions/theme_extensions.dart
@@ -3,176 +3,234 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 
 class CustomColors extends ThemeExtension<CustomColors> {
-  final Color primary1;
-  final Color primary2;
-  final Color primary3;
-  final Color primary4;
-  final Color blend1;
-  final Color blend2;
-  final Color blend3;
-  final Color orange1;
-  final Color orange2;
-  final Color orange3;
-  final Color orange4;
-  final Color red1;
-  final Color red2;
-  final Color red3;
-  final Color red4;
-  final Color background1;
-  final Color background2;
-  final Color background3;
-  final Color gray1;
-  final Color gray2;
-  final Color gray3;
-  final Color gray4;
-  final Color contrast1;
-  final Color contrast2;
-  final Color contrast3;
-  final Color contrast4;
-  final Color staticBlack1;
-  final Color staticBlack2;
-  final Color staticBlack3;
-  final Color staticWhite;
+  final Color accent;
+  final Color accentHover;
+  final Color accentPressed;
+  final Color accentDisabled;
+
+  final Color blend;
+  final Color blendHover;
+  final Color blendPressed;
+
+  final Color attention;
+  final Color attentionHover;
+  final Color attentionPressed;
+  final Color attentionDisabled;
+
+  final Color error;
+  final Color errorHover;
+  final Color errorPressed;
+  final Color errorDisabled;
+
+  final Color background;
+  final Color backgroundAdditional;
+  final Color backgroundElevated;
+
+  final Color backgroundSystem;
+  final Color backgroundSystemHover;
+  final Color backgroundSystemPressed;
+
+  final Color neutralLight;
+  final Color neutralLightHover;
+  final Color neutralLightPressed;
+
+  final Color neutralLightDisabled;
+  final Color neutralDark;
+  final Color neutralDarkHover;
+  final Color neutralDarkPressed;
+
+  final Color neutralBlack;
+  final Color neutralDarkDisabled;
+  final Color neutralBlackHover;
+  final Color neutralBlackPressed;
+
+  final Color neutralBlackDisabled;
+  final Color specialStaticWhite;
+  final Color specialStaticWhiteHover;
+  final Color specialStaticWhitePressed;
+  final Color specialStaticWhiteDisabled;
+
   final Color staticTransparent;
 
   const CustomColors({
-    required this.primary1,
-    required this.primary2,
-    required this.primary3,
-    required this.primary4,
-    required this.blend1,
-    required this.blend2,
-    required this.blend3,
-    required this.orange1,
-    required this.orange2,
-    required this.orange3,
-    required this.orange4,
-    required this.red1,
-    required this.red2,
-    required this.red3,
-    required this.red4,
-    required this.background1,
-    required this.background2,
-    required this.background3,
-    required this.gray1,
-    required this.gray2,
-    required this.gray3,
-    required this.gray4,
-    required this.contrast1,
-    required this.contrast2,
-    required this.contrast3,
-    required this.contrast4,
-    required this.staticBlack1,
-    required this.staticBlack2,
-    required this.staticBlack3,
-    required this.staticWhite,
+    required this.accent,
+    required this.accentHover,
+    required this.accentPressed,
+    required this.accentDisabled,
+    required this.blend,
+    required this.blendHover,
+    required this.blendPressed,
+    required this.attention,
+    required this.attentionHover,
+    required this.attentionPressed,
+    required this.attentionDisabled,
+    required this.error,
+    required this.errorHover,
+    required this.errorPressed,
+    required this.errorDisabled,
+    required this.background,
+    required this.backgroundAdditional,
+    required this.backgroundElevated,
+    required this.backgroundSystem,
+    required this.backgroundSystemHover,
+    required this.backgroundSystemPressed,
+    required this.neutralLight,
+    required this.neutralLightHover,
+    required this.neutralLightPressed,
+    required this.neutralLightDisabled,
+    required this.neutralDark,
+    required this.neutralDarkHover,
+    required this.neutralDarkPressed,
+    required this.neutralDarkDisabled,
+    required this.neutralBlack,
+    required this.neutralBlackHover,
+    required this.neutralBlackPressed,
+    required this.neutralBlackDisabled,
+    required this.specialStaticWhite,
+    required this.specialStaticWhiteHover,
+    required this.specialStaticWhitePressed,
+    required this.specialStaticWhiteDisabled,
     required this.staticTransparent,
   });
 
   @override
   CustomColors copyWith({
-    Color? primary1,
-    Color? primary2,
-    Color? primary3,
-    Color? primary4,
-    Color? blend1,
-    Color? blend2,
-    Color? blend3,
-    Color? orange1,
-    Color? orange2,
-    Color? orange3,
-    Color? orange4,
-    Color? red1,
-    Color? red2,
-    Color? red3,
-    Color? red4,
-    Color? background1,
-    Color? background2,
-    Color? background3,
-    Color? gray1,
-    Color? gray2,
-    Color? gray3,
-    Color? gray4,
-    Color? contrast1,
-    Color? contrast2,
-    Color? contrast3,
-    Color? contrast4,
-    Color? staticBlack1,
-    Color? staticBlack2,
-    Color? staticBlack3,
-    Color? staticWhite,
+    Color? accent,
+    Color? accentHover,
+    Color? accentPressed,
+    Color? accentDisabled,
+    Color? blend,
+    Color? blendHover,
+    Color? blendPressed,
+    Color? attention,
+    Color? attentionHover,
+    Color? attentionPressed,
+    Color? attentionDisabled,
+    Color? error,
+    Color? errorHover,
+    Color? errorPressed,
+    Color? errorDisabled,
+    Color? background,
+    Color? backgroundAdditional,
+    Color? backgroundElevated,
+    Color? backgroundSystem,
+    Color? backgroundSystemHover,
+    Color? backgroundSystemPressed,
+    Color? neutralLight,
+    Color? neutralLightHover,
+    Color? neutralLightPressed,
+    Color? neutralLightDisabled,
+    Color? neutralDark,
+    Color? neutralDarkHover,
+    Color? neutralDarkPressed,
+    Color? neutralDarkDisabled,
+    Color? neutralBlack,
+    Color? neutralBlackHover,
+    Color? neutralBlackPressed,
+    Color? neutralBlackDisabled,
+    Color? specialStaticWhite,
+    Color? specialStaticWhiteHover,
+    Color? specialStaticWhitePressed,
+    Color? specialStaticWhiteDisabled,
     Color? staticTransparent,
   }) => CustomColors(
-    primary1: primary1 ?? this.primary1,
-    primary2: primary2 ?? this.primary2,
-    primary3: primary3 ?? this.primary3,
-    primary4: primary4 ?? this.primary4,
-    blend1: blend1 ?? this.blend1,
-    blend2: blend2 ?? this.blend2,
-    blend3: blend3 ?? this.blend3,
-    orange1: orange1 ?? this.orange1,
-    orange2: orange2 ?? this.orange2,
-    orange3: orange3 ?? this.orange3,
-    orange4: orange4 ?? this.orange4,
-    red1: red1 ?? this.red1,
-    red2: red2 ?? this.red2,
-    red3: red3 ?? this.red3,
-    red4: red4 ?? this.red4,
-    background1: background1 ?? this.background1,
-    background2: background2 ?? this.background2,
-    background3: background3 ?? this.background3,
-    gray1: gray1 ?? this.gray1,
-    gray2: gray2 ?? this.gray2,
-    gray3: gray3 ?? this.gray3,
-    gray4: gray4 ?? this.gray4,
-    contrast1: contrast1 ?? this.contrast1,
-    contrast2: contrast2 ?? this.contrast2,
-    contrast3: contrast3 ?? this.contrast3,
-    contrast4: contrast4 ?? this.contrast4,
-    staticBlack1: staticBlack1 ?? this.staticBlack1,
-    staticBlack2: staticBlack2 ?? this.staticBlack2,
-    staticBlack3: staticBlack3 ?? this.staticBlack3,
-    staticWhite: staticWhite ?? this.staticWhite,
+    accent: accent ?? this.accent,
+    accentHover: accentHover ?? this.accentHover,
+    accentPressed: accentPressed ?? this.accentPressed,
+    accentDisabled: accentDisabled ?? this.accentDisabled,
+    blend: blend ?? this.blend,
+    blendHover: blendHover ?? this.blendHover,
+    blendPressed: blendPressed ?? this.blendPressed,
+    attention: attention ?? this.attention,
+    attentionHover: attentionHover ?? this.attentionHover,
+    attentionPressed: attentionPressed ?? this.attentionPressed,
+    attentionDisabled: attentionDisabled ?? this.attentionDisabled,
+    error: error ?? this.error,
+    errorHover: errorHover ?? this.errorHover,
+    errorPressed: errorPressed ?? this.errorPressed,
+    errorDisabled: errorDisabled ?? this.errorDisabled,
+    background: background ?? this.background,
+    backgroundAdditional: backgroundAdditional ?? this.backgroundAdditional,
+    backgroundElevated: backgroundElevated ?? this.backgroundElevated,
+    backgroundSystem: backgroundSystem ?? this.backgroundSystem,
+    backgroundSystemHover: backgroundSystemHover ?? this.backgroundSystemHover,
+    backgroundSystemPressed: backgroundSystemPressed ?? this.backgroundSystemPressed,
+    neutralLight: neutralLight ?? this.neutralLight,
+    neutralLightHover: neutralLightHover ?? this.neutralLightHover,
+    neutralLightPressed: neutralLightPressed ?? this.neutralLightPressed,
+    neutralLightDisabled: neutralLightDisabled ?? this.neutralLightDisabled,
+    neutralDark: neutralDark ?? this.neutralDark,
+    neutralDarkHover: neutralDarkHover ?? this.neutralDarkHover,
+    neutralDarkPressed: neutralDarkPressed ?? this.neutralDarkPressed,
+    neutralDarkDisabled: neutralDarkDisabled ?? this.neutralDarkDisabled,
+    neutralBlack: neutralBlack ?? this.neutralBlack,
+    neutralBlackHover: neutralBlackHover ?? this.neutralBlackHover,
+    neutralBlackPressed: neutralBlackPressed ?? this.neutralBlackPressed,
+    neutralBlackDisabled: neutralBlackDisabled ?? this.neutralBlackDisabled,
+    specialStaticWhite: specialStaticWhite ?? this.specialStaticWhite,
+    specialStaticWhiteHover: specialStaticWhiteHover ?? this.specialStaticWhiteHover,
+    specialStaticWhitePressed: specialStaticWhitePressed ?? this.specialStaticWhitePressed,
+    specialStaticWhiteDisabled: specialStaticWhiteDisabled ?? this.specialStaticWhiteDisabled,
     staticTransparent: staticTransparent ?? this.staticTransparent,
   );
 
   @override
-  ThemeExtension<CustomColors> lerp(covariant ThemeExtension<CustomColors>? other, double t) {
-    if (other is! CustomColors) {
-      return this;
-    }
+  ThemeExtension<CustomColors> lerp(
+    covariant ThemeExtension<CustomColors>? other,
+    double t,
+  ) {
+    if (other is! CustomColors) return this;
 
     return CustomColors(
-      primary1: Color.lerp(primary1, other.primary1, t)!,
-      primary2: Color.lerp(primary2, other.primary2, t)!,
-      primary3: Color.lerp(primary3, other.primary3, t)!,
-      primary4: Color.lerp(primary4, other.primary4, t)!,
-      blend1: Color.lerp(blend1, other.blend1, t)!,
-      blend2: Color.lerp(blend2, other.blend2, t)!,
-      blend3: Color.lerp(blend3, other.blend3, t)!,
-      orange1: Color.lerp(orange1, other.orange1, t)!,
-      orange2: Color.lerp(orange2, other.orange2, t)!,
-      orange3: Color.lerp(orange3, other.orange3, t)!,
-      orange4: Color.lerp(orange4, other.orange4, t)!,
-      red1: Color.lerp(red1, other.red1, t)!,
-      red2: Color.lerp(red2, other.red2, t)!,
-      red3: Color.lerp(red3, other.red3, t)!,
-      red4: Color.lerp(red4, other.red4, t)!,
-      background1: Color.lerp(background1, other.background1, t)!,
-      background2: Color.lerp(background2, other.background2, t)!,
-      background3: Color.lerp(background3, other.background3, t)!,
-      gray1: Color.lerp(gray1, other.gray1, t)!,
-      gray2: Color.lerp(gray2, other.gray2, t)!,
-      gray3: Color.lerp(gray3, other.gray3, t)!,
-      gray4: Color.lerp(gray4, other.gray4, t)!,
-      contrast1: Color.lerp(contrast1, other.contrast1, t)!,
-      contrast2: Color.lerp(contrast2, other.contrast2, t)!,
-      contrast3: Color.lerp(contrast3, other.contrast3, t)!,
-      contrast4: Color.lerp(contrast4, other.contrast4, t)!,
-      staticBlack1: Color.lerp(staticBlack1, other.staticBlack1, t)!,
-      staticBlack2: Color.lerp(staticBlack2, other.staticBlack2, t)!,
-      staticBlack3: Color.lerp(staticBlack3, other.staticBlack3, t)!,
-      staticWhite: Color.lerp(staticWhite, other.staticWhite, t)!,
+      accent: Color.lerp(accent, other.accent, t)!,
+      accentHover: Color.lerp(accentHover, other.accentHover, t)!,
+      accentPressed: Color.lerp(accentPressed, other.accentPressed, t)!,
+      accentDisabled: Color.lerp(accentDisabled, other.accentDisabled, t)!,
+      blend: Color.lerp(blend, other.blend, t)!,
+      blendHover: Color.lerp(blendHover, other.blendHover, t)!,
+      blendPressed: Color.lerp(blendPressed, other.blendPressed, t)!,
+      attention: Color.lerp(attention, other.attention, t)!,
+      attentionHover: Color.lerp(attentionHover, other.attentionHover, t)!,
+      attentionPressed: Color.lerp(attentionPressed, other.attentionPressed, t)!,
+      attentionDisabled: Color.lerp(attentionDisabled, other.attentionDisabled, t)!,
+      error: Color.lerp(error, other.error, t)!,
+      errorHover: Color.lerp(errorHover, other.errorHover, t)!,
+      errorPressed: Color.lerp(errorPressed, other.errorPressed, t)!,
+      errorDisabled: Color.lerp(errorDisabled, other.errorDisabled, t)!,
+      background: Color.lerp(background, other.background, t)!,
+      backgroundAdditional: Color.lerp(backgroundAdditional, other.backgroundAdditional, t)!,
+      backgroundElevated: Color.lerp(backgroundElevated, other.backgroundElevated, t)!,
+      backgroundSystem: Color.lerp(backgroundSystem, other.backgroundSystem, t)!,
+      backgroundSystemHover: Color.lerp(backgroundSystemHover, other.backgroundSystemHover, t)!,
+      backgroundSystemPressed: Color.lerp(backgroundSystemPressed, other.backgroundSystemPressed, t)!,
+      neutralLight: Color.lerp(neutralLight, other.neutralLight, t)!,
+      neutralLightHover: Color.lerp(neutralLightHover, other.neutralLightHover, t)!,
+      neutralLightPressed: Color.lerp(neutralLightPressed, other.neutralLightPressed, t)!,
+      neutralLightDisabled: Color.lerp(neutralLightDisabled, other.neutralLightDisabled, t)!,
+      neutralDark: Color.lerp(neutralDark, other.neutralDark, t)!,
+      neutralDarkHover: Color.lerp(neutralDarkHover, other.neutralDarkHover, t)!,
+      neutralDarkPressed: Color.lerp(neutralDarkPressed, other.neutralDarkPressed, t)!,
+      neutralDarkDisabled: Color.lerp(neutralDarkDisabled, other.neutralDarkDisabled, t)!,
+      neutralBlack: Color.lerp(neutralBlack, other.neutralBlack, t)!,
+      neutralBlackHover: Color.lerp(neutralBlackHover, other.neutralBlackHover, t)!,
+      neutralBlackPressed: Color.lerp(neutralBlackPressed, other.neutralBlackPressed, t)!,
+      neutralBlackDisabled: Color.lerp(neutralBlackDisabled, other.neutralBlackDisabled, t)!,
+      specialStaticWhite: Color.lerp(specialStaticWhite, other.specialStaticWhite, t)!,
+      specialStaticWhiteHover: Color.lerp(
+        specialStaticWhiteHover,
+        other.specialStaticWhiteHover,
+        t,
+      )!,
+      specialStaticWhitePressed: Color.lerp(
+        specialStaticWhitePressed,
+        other.specialStaticWhitePressed,
+        t,
+      )!,
+      specialStaticWhiteDisabled: Color.lerp(
+        specialStaticWhiteDisabled,
+        other.specialStaticWhiteDisabled,
+        t,
+      )!,
       staticTransparent: Color.lerp(staticTransparent, other.staticTransparent, t)!,
     );
   }
@@ -276,14 +334,12 @@ class CustomTextButtonTheme extends ThemeExtension<CustomTextButtonTheme> {
   final TextButtonThemeData attention;
   final TextButtonThemeData success;
   final TextButtonThemeData iconButton;
-  final TextButtonThemeData inlineButton;
 
   const CustomTextButtonTheme({
     required this.danger,
     required this.attention,
     required this.success,
     required this.iconButton,
-    required this.inlineButton,
   });
 
   @override
@@ -292,13 +348,11 @@ class CustomTextButtonTheme extends ThemeExtension<CustomTextButtonTheme> {
     TextButtonThemeData? attention,
     TextButtonThemeData? success,
     TextButtonThemeData? iconButton,
-    TextButtonThemeData? inlineButton,
   }) => CustomTextButtonTheme(
     danger: danger ?? this.danger,
     attention: attention ?? this.attention,
     success: success ?? this.success,
     iconButton: iconButton ?? this.iconButton,
-    inlineButton: inlineButton ?? this.inlineButton,
   );
 
   @override
@@ -315,7 +369,6 @@ class CustomTextButtonTheme extends ThemeExtension<CustomTextButtonTheme> {
       attention: TextButtonThemeData.lerp(attention, other.attention, t)!,
       success: TextButtonThemeData.lerp(success, other.success, t)!,
       iconButton: TextButtonThemeData.lerp(iconButton, other.iconButton, t)!,
-      inlineButton: TextButtonThemeData.lerp(inlineButton, other.inlineButton, t)!,
     );
   }
 }
diff --git a/lib/common/localization/arb/intl_en.arb b/lib/common/localization/arb/intl_en.arb
index 66fee85..cb7235c 100644
--- a/lib/common/localization/arb/intl_en.arb
+++ b/lib/common/localization/arb/intl_en.arb
@@ -70,7 +70,7 @@
   "typeSomething": "Type something",
   "deleteServer": "Delete server",
   "deleteServerDialogTitle": "Delete server?",
-  "deleteServerDescription": "{serverName} will be deleted",
+  "deleteServerDescription": "Server <b>{serverName}</b> will be deleted",
   "@deleteServerDescription": {
     "placeholders": {
       "serverName": {
diff --git a/lib/common/localization/arb/intl_ru.arb b/lib/common/localization/arb/intl_ru.arb
index 4611869..dd61393 100644
--- a/lib/common/localization/arb/intl_ru.arb
+++ b/lib/common/localization/arb/intl_ru.arb
@@ -70,7 +70,7 @@
   "typeSomething": "Type something",
   "deleteServer": "Delete server",
   "deleteServerDialogTitle": "Delete server?",
-  "deleteServerDescription": "{serverName} will be deleted",
+  "deleteServerDescription": "Server <b>{serverName}</b> will be deleted",
   "@deleteServerDescription": {
     "placeholders": {
       "serverName": {
diff --git a/lib/common/theme/light_theme.dart b/lib/common/theme/light_theme.dart
index f04c2b3..4b8c850 100644
--- a/lib/common/theme/light_theme.dart
+++ b/lib/common/theme/light_theme.dart
@@ -5,95 +5,115 @@ import 'package:vpn/common/extensions/theme_extensions.dart';
 import 'package:vpn/view/custom_icon.dart';
 
 class LightTheme {
-  static const _primary1 = Color(0xFF67B279);
-  static const _primary2 = Color(0xFF5B9F6B);
-  static const _primary3 = Color(0xFF4E8C5D);
-  static const _primary4 = Color(0xFFA2D0AD);
-  static const _blend1 = Color(0xFFD9ECDE);
-  static const _blend2 = Color(0xFFBEDFC6);
-  static const _blend3 = Color(0xFFA2D0AD);
-  static const _orange1 = Color(0xFFD58500);
-  static const _orange2 = Color(0xFFC77901);
-  static const _orange3 = Color(0xFFB76C01);
-  static const _orange4 = Color(0xFFE5B460);
-  static const _red1 = Color(0xFFE9653A);
-  static const _red2 = Color(0xFFE75727);
-  static const _red3 = Color(0xFFDC4918);
-  static const _red4 = Color(0xFFEF9071);
-  static const _background1 = Color(0xFFFFFFFF);
-  static const _background2 = Color(0xFFF6F6F6);
-  static const _background3 = Color(0xFFE4E4E4);
-  static const _gray1 = Color(0xFFA4A4A4);
-  static const _gray2 = Color(0xFF7F7F7F);
-  static const _gray3 = Color(0xFF5B5B5B);
-  static const _gray4 = Color(0xFFE4E4E4);
-  static const _contrast1 = Color(0xFF3D3D3D);
-  static const _contrast2 = Color(0xFF5B5B5B);
-  static const _contrast3 = Color(0xFF7F7F7F);
-  static const _contrast4 = Color(0xFFA4A4A4);
-  static const _staticBlack1 = Color(0xFF0A0A0A);
-  static const _staticBlack2 = Color(0xFF1F1F1F);
-  static const _staticBlack3 = Color(0xFF3D3D3D);
-  static const _staticWhite = Color(0xFFF6F6F6);
+  static const _accent = Color(0xFF3972AA);
+  static const _accentHover = Color(0xFF336699);
+  static const _accentPressed = Color(0xFF2D5986);
+  static const _accentDisabled = Color(0x664F8AC4);
+
+  static const _accentAdditional = Color(0xFF4F8AC4);
+
+  static const _blend = Color(0x334F8AC4);
+  static const _blendHover = Color(0x4D4F8AC4);
+  static const _blendPressed = Color(0x664F8AC4);
+  static const _attention = Color(0xFFF08400);
+  static const _attentionHover = Color(0xFFE07400);
+  static const _attentionPressed = Color(0xFFC76300);
+  static const _attentionDisabled = Color(0x80FFA424);
+  static const _error = Color(0xFFF44725);
+  static const _errorHover = Color(0xFFE7320D);
+  static const _errorPressed = Color(0xFFD02C0B);
+  static const _errorDisabled = Color(0x80F56447);
+  static const _background = Color(0xFFFFFFFF);
+  static const _backgroundHover = Color(0xFFF6F7F9);
+  static const _backgroundPressed = Color(0xFFE6EAEF);
+
+  static const _neutralBlend = Color(0x1A30353B);
+
+  static const _backgroundAdditional = Color(0xFFF6F7F9);
+  static const _backgroundElevated = Color(0xFFFFFFFF);
+  static const _backgroundSystem = Color(0xFFE6EAEF);
+  static const _backgroundSystemHover = Color(0xFFD1D8E0);
+  static const _backgroundSystemPressed = Color(0xFFBFC8D4);
+  static const _neutralLight = Color(0xFF9AA8B8);
+  static const _neutralLightHover = Color(0xFF8997A9);
+  static const _neutralLightPressed = Color(0xFF74869C);
+  static const _neutralLightDisabled = Color(0x3330353B);
+  static const _neutralDark = Color(0xFF74869C);
+  static const _neutralDarkHover = Color(0xFF5C6E84);
+  static const _neutralDarkPressed = Color(0xFF465567);
+  static const _neutralDarkDisabled = Color(0x4D30353B);
+  static const _neutralBlack = Color(0xFF333E4C);
+  static const _neutralBlackHover = Color(0xFF242D38);
+  static const _neutralBlackPressed = Color(0xFF1A2028);
+  static const _neutralBlackDisabled = Color(0x6630353B);
+  static const _specialStaticWhite = Color(0xFFFFFFFF);
+  static const _specialStaticWhiteHover = Color(0xFFF6F7F9);
+  static const _specialStaticWhitePressed = Color(0xFFE6EAEF);
+  static const _specialStaticWhiteDisabled = Color(0x80FFFFFF);
   static const _staticTransparent = Colors.transparent;
 
   late final _customColors = const CustomColors(
-    primary1: _primary1,
-    primary2: _primary2,
-    primary3: _primary3,
-    primary4: _primary4,
-    blend1: _blend1,
-    blend2: _blend2,
-    blend3: _blend3,
-    orange1: _orange1,
-    orange2: _orange2,
-    orange3: _orange3,
-    orange4: _orange4,
-    red1: _red1,
-    red2: _red2,
-    red3: _red3,
-    red4: _red4,
-    background1: _background1,
-    background2: _background2,
-    background3: _background3,
-    gray1: _gray1,
-    gray2: _gray2,
-    gray3: _gray3,
-    gray4: _gray4,
-    contrast1: _contrast1,
-    contrast2: _contrast2,
-    contrast3: _contrast3,
-    contrast4: _contrast4,
-    staticBlack1: _staticBlack1,
-    staticBlack2: _staticBlack2,
-    staticBlack3: _staticBlack3,
-    staticWhite: _staticWhite,
+    accent: _accent,
+    accentHover: _accentHover,
+    accentPressed: _accentPressed,
+    accentDisabled: _accentDisabled,
+    blend: _blend,
+    blendHover: _blendHover,
+    blendPressed: _blendPressed,
+    attention: _attention,
+    attentionHover: _attentionHover,
+    attentionPressed: _attentionPressed,
+    attentionDisabled: _attentionDisabled,
+    error: _error,
+    errorHover: _errorHover,
+    errorPressed: _errorPressed,
+    errorDisabled: _errorDisabled,
+    background: _background,
+    backgroundAdditional: _backgroundAdditional,
+    backgroundElevated: _backgroundElevated,
+    backgroundSystem: _backgroundSystem,
+    backgroundSystemHover: _backgroundSystemHover,
+    backgroundSystemPressed: _backgroundSystemPressed,
+    neutralLight: _neutralLight,
+    neutralLightHover: _neutralLightHover,
+    neutralLightPressed: _neutralLightPressed,
+    neutralLightDisabled: _neutralLightDisabled,
+    neutralBlack: _neutralBlack,
+    neutralBlackHover: _neutralBlackHover,
+    neutralBlackPressed: _neutralBlackPressed,
+    neutralBlackDisabled: _neutralBlackDisabled,
+    neutralDark: _neutralDark,
+    neutralDarkHover: _neutralDarkHover,
+    neutralDarkPressed: _neutralDarkPressed,
+    neutralDarkDisabled: _neutralDarkDisabled,
+    specialStaticWhite: _specialStaticWhite,
+    specialStaticWhiteHover: _specialStaticWhiteHover,
+    specialStaticWhitePressed: _specialStaticWhitePressed,
+    specialStaticWhiteDisabled: _specialStaticWhiteDisabled,
     staticTransparent: _staticTransparent,
   );
 
   late final _colorScheme = ColorScheme.fromSeed(
-    seedColor: _primary1,
+    seedColor: _accent,
   );
 
   late final _checkboxThemeData = CheckboxThemeData(
     fillColor: WidgetStateProperty.resolveWith(
       (states) {
-        if (states.contains(WidgetState.selected) && !states.contains(WidgetState.disabled)) return _primary1;
-        if (states.contains(WidgetState.selected) && states.contains(WidgetState.disabled)) return _primary4;
+        if (states.contains(WidgetState.selected) && !states.contains(WidgetState.disabled)) return _accent;
+        if (states.contains(WidgetState.selected) && states.contains(WidgetState.disabled)) return _accentDisabled;
 
         return null;
       },
     ),
-    shape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.circular(2.0),
-    ),
+    checkColor: WidgetStateProperty.all(_specialStaticWhite),
     side: WidgetStateBorderSide.resolveWith(
       (states) {
         if (!states.contains(WidgetState.selected) && !states.contains(WidgetState.disabled)) {
-          return const BorderSide(width: 2, color: _gray1);
+          return const BorderSide(width: 2, color: _neutralLight);
         }
         if (!states.contains(WidgetState.selected) && states.contains(WidgetState.disabled)) {
-          return const BorderSide(width: 2, color: _gray4);
+          return const BorderSide(width: 2, color: _neutralLightDisabled);
         }
 
         return null;
@@ -101,32 +121,30 @@ class LightTheme {
     ),
     overlayColor: WidgetStateProperty.resolveWith(
       (states) {
-        if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _background2;
+        if (states.contains(WidgetState.pressed)) return _accentPressed.withValues(alpha: 0.2);
 
-        return null;
+        if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _backgroundSystem;
+
+        return _staticTransparent;
       },
     ),
+    shape: RoundedRectangleBorder(
+      borderRadius: BorderRadius.circular(2.0),
+    ),
   );
 
   late final _iconButtonThemeData = IconButtonThemeData(
     style: ButtonStyle(
-      shape: WidgetStatePropertyAll(
-        RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(100),
-        ),
+      shape: const WidgetStatePropertyAll(
+        CircleBorder(),
       ),
-      foregroundColor: WidgetStateProperty.resolveWith(
-        (states) {
-          if (states.contains(WidgetState.disabled)) return _contrast4;
-
-          return _contrast1;
-        },
+      foregroundColor: const WidgetStatePropertyAll(
+        _specialStaticWhite,
       ),
       overlayColor: WidgetStateProperty.resolveWith(
         (states) {
-          if (states.contains(WidgetState.disabled)) return _staticTransparent;
-          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _background2;
-          if (states.contains(WidgetState.pressed)) return _background3;
+          if (states.contains(WidgetState.pressed) || states.contains(WidgetState.focused)) return _backgroundHover;
+          if (states.contains(WidgetState.hovered)) return _backgroundPressed;
 
           return null;
         },
@@ -138,8 +156,7 @@ class LightTheme {
           return null;
         },
       ),
-      textStyle: WidgetStatePropertyAll(_textTheme.labelLarge),
-      padding: const WidgetStatePropertyAll(EdgeInsets.all(10)),
+      padding: const WidgetStatePropertyAll(EdgeInsets.all(8)),
       iconSize: const WidgetStatePropertyAll(24),
     ),
   );
@@ -147,32 +164,41 @@ class LightTheme {
   late final _radioThemeData = RadioThemeData(
     fillColor: WidgetStateProperty.resolveWith(
       (states) {
-        if (states.contains(WidgetState.disabled)) return _contrast4;
+        if (states.contains(WidgetState.disabled)) return _neutralBlack.withValues(alpha: 0.38);
+        if (states.contains(WidgetState.selected)) return _accent;
 
-        return _contrast1;
+        return _neutralBlack;
       },
     ),
     overlayColor: WidgetStateProperty.resolveWith(
       (states) {
-        if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _background2;
-        if (states.contains(WidgetState.pressed)) return _background3;
+        if (states.contains(WidgetState.hovered) ||
+            states.contains(WidgetState.focused) ||
+            states.contains(WidgetState.pressed))
+          return _backgroundSystem;
 
-        return null;
+        return _staticTransparent;
       },
     ),
   );
 
   late final _floatingActionButtonThemeData = FloatingActionButtonThemeData(
-    backgroundColor: _primary1,
-    extendedTextStyle: _textTheme.labelLarge?.copyWith(color: _staticWhite),
-    foregroundColor: _staticWhite,
+    backgroundColor: _accent,
+    extendedTextStyle: _textTheme.labelLarge?.copyWith(color: _specialStaticWhite),
+    foregroundColor: _specialStaticWhite,
     iconSize: 24,
     extendedSizeConstraints: const BoxConstraints(minHeight: 56),
     smallSizeConstraints: const BoxConstraints(minHeight: 40, minWidth: 40),
     sizeConstraints: const BoxConstraints(minHeight: 56, minWidth: 56),
     largeSizeConstraints: const BoxConstraints(minHeight: 96, minWidth: 96),
-    focusColor: _primary2,
-    hoverColor: _primary2,
+    focusColor: _accentHover,
+    hoverColor: _accentHover,
+    splashColor: _accentPressed,
+    hoverElevation: 4,
+    elevation: 3,
+    focusElevation: 3,
+    disabledElevation: 3,
+    highlightElevation: 3,
     shape: RoundedRectangleBorder(
       borderRadius: BorderRadius.circular(16),
     ),
@@ -181,21 +207,20 @@ class LightTheme {
   late final _switchThemeData = SwitchThemeData(
     trackColor: WidgetStateProperty.resolveWith(
       (states) {
-        if (states.contains(WidgetState.disabled) && states.contains(WidgetState.selected)) return _primary4;
-        if (states.contains(WidgetState.disabled) && !states.contains(WidgetState.selected)) return _background2;
-        if (!states.contains(WidgetState.selected)) return _background2;
+        if (!states.contains(WidgetState.disabled) && states.contains(WidgetState.pressed)) return _accentPressed;
+        if (!states.contains(WidgetState.selected)) return _backgroundSystem;
 
-        return _primary1;
+        return _accent;
       },
     ),
     thumbColor: WidgetStateProperty.resolveWith(
       (states) {
-        if (states.contains(WidgetState.selected)) return _staticWhite;
-        if (states.contains(WidgetState.disabled)) return _contrast4;
-        if (states.contains(WidgetState.focused) || states.contains(WidgetState.focused)) return _contrast2;
-        if (states.contains(WidgetState.pressed)) return _contrast3;
+        if (states.contains(WidgetState.selected)) return _specialStaticWhite;
+        if (states.contains(WidgetState.disabled)) return _neutralDarkDisabled.withValues(alpha: 0.3);
+        if (states.contains(WidgetState.pressed)) return _neutralDarkPressed;
+        if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _neutralDark;
 
-        return _contrast1;
+        return _neutralBlack;
       },
     ),
     overlayColor: const WidgetStatePropertyAll(_staticTransparent),
@@ -208,46 +233,35 @@ class LightTheme {
     ),
     trackOutlineColor: WidgetStateProperty.resolveWith(
       (states) {
-        if (!states.contains(WidgetState.selected)) {
-          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _contrast2;
-          if (states.contains(WidgetState.disabled)) return _contrast4;
+        if (states.contains(WidgetState.selected)) return null;
 
-          return _contrast1;
-        }
+        if (states.contains(WidgetState.hovered) ||
+            states.contains(WidgetState.focused) ||
+            states.contains(WidgetState.disabled))
+          return _neutralDark;
 
-        return null;
+        return _neutralBlack;
       },
     ),
   );
 
   late final _snackBarThemeData = SnackBarThemeData(
-    backgroundColor: _staticBlack1,
+    backgroundColor: _neutralBlack,
     shape: RoundedRectangleBorder(
       borderRadius: BorderRadius.circular(4),
     ),
     behavior: SnackBarBehavior.floating,
-    contentTextStyle: _textTheme.bodyMedium?.copyWith(color: _staticWhite),
-    actionTextColor: _primary1,
-    closeIconColor: _staticWhite,
-  );
+    elevation: 3,
+    contentTextStyle: _textTheme.bodyMedium?.copyWith(color: _specialStaticWhite),
+    actionTextColor: _accentAdditional,
 
-  late final _bottomSheetTheme = const BottomSheetThemeData(
-    backgroundColor: _background1,
-    modalBackgroundColor: _background1,
-    surfaceTintColor: _background1,
-    showDragHandle: true,
-    shape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.only(
-        topLeft: Radius.circular(28),
-        topRight: Radius.circular(28),
-      ),
-    ),
+    closeIconColor: _specialStaticWhite,
   );
 
   late final _badgeThemeData = BadgeThemeData(
-    textColor: _staticWhite,
+    textColor: _specialStaticWhite,
     textStyle: _textTheme.labelSmall,
-    backgroundColor: _red1,
+    backgroundColor: _error,
     smallSize: 6,
     largeSize: 16,
     padding: const EdgeInsets.symmetric(horizontal: 4),
@@ -258,15 +272,15 @@ class LightTheme {
       style: _filledButtonTheme.style?.copyWith(
         backgroundColor: WidgetStateProperty.resolveWith(
           (states) {
-            if (states.contains(WidgetState.disabled)) return _red4;
+            if (states.contains(WidgetState.disabled)) return _error.withValues(alpha: 0.5);
 
-            return _red1;
+            return _error;
           },
         ),
         overlayColor: WidgetStateProperty.resolveWith(
           (states) {
-            if (states.contains(WidgetState.pressed)) return _red3;
-            if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _red2;
+            if (states.contains(WidgetState.pressed)) return _errorPressed;
+            if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _errorHover;
 
             return null;
           },
@@ -277,15 +291,15 @@ class LightTheme {
       style: _filledButtonTheme.style?.copyWith(
         backgroundColor: WidgetStateProperty.resolveWith(
           (states) {
-            if (states.contains(WidgetState.disabled)) return _orange4;
+            if (states.contains(WidgetState.disabled)) return _attention.withValues(alpha: 0.5);
 
-            return _orange1;
+            return _attention;
           },
         ),
         overlayColor: WidgetStateProperty.resolveWith(
           (states) {
-            if (states.contains(WidgetState.pressed)) return _orange3;
-            if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _orange2;
+            if (states.contains(WidgetState.pressed)) return _attentionPressed;
+            if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _attentionHover;
 
             return null;
           },
@@ -326,9 +340,9 @@ class LightTheme {
       style: _textButtonThemeData.style?.copyWith(
         foregroundColor: WidgetStateProperty.resolveWith(
           (states) {
-            if (states.contains(WidgetState.disabled)) return _red4;
+            if (states.contains(WidgetState.disabled)) return _errorDisabled.withValues(alpha: 0.5);
 
-            return _red1;
+            return _error;
           },
         ),
       ),
@@ -337,9 +351,9 @@ class LightTheme {
       style: _textButtonThemeData.style?.copyWith(
         foregroundColor: WidgetStateProperty.resolveWith(
           (states) {
-            if (states.contains(WidgetState.disabled)) return _primary4;
+            if (states.contains(WidgetState.disabled)) return _attentionDisabled.withValues(alpha: 0.5);
 
-            return _primary1;
+            return _attention;
           },
         ),
       ),
@@ -348,36 +362,9 @@ class LightTheme {
       style: _textButtonThemeData.style?.copyWith(
         foregroundColor: WidgetStateProperty.resolveWith(
           (states) {
-            if (states.contains(WidgetState.disabled)) return _primary4;
+            if (states.contains(WidgetState.disabled)) return _accentDisabled.withValues(alpha: 0.5);
 
-            return _primary1;
-          },
-        ),
-      ),
-    ),
-    inlineButton: TextButtonThemeData(
-      style: _textButtonThemeData.style?.copyWith(
-        padding: const WidgetStatePropertyAll(EdgeInsets.zero),
-        overlayColor: const WidgetStatePropertyAll(Colors.transparent),
-        tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-        minimumSize: const WidgetStatePropertyAll(Size.zero),
-        shape: const WidgetStatePropertyAll(RoundedRectangleBorder()),
-        side: const WidgetStatePropertyAll(BorderSide.none),
-        textStyle: WidgetStateProperty.resolveWith(
-          (states) {
-            final decorationColor = states.contains(WidgetState.disabled) ? _primary4 : _primary1;
-
-            return _textTheme.bodyMedium!.copyWith(
-              decoration: TextDecoration.underline,
-              decorationColor: decorationColor,
-            );
-          },
-        ),
-        foregroundColor: WidgetStateProperty.resolveWith(
-          (states) {
-            if (states.contains(WidgetState.disabled)) return _primary4;
-
-            return _primary1;
+            return _accent;
           },
         ),
       ),
@@ -385,7 +372,9 @@ class LightTheme {
     iconButton: _textButtonThemeData,
   );
 
-  late final _elevatedButtonTheme = ElevatedButtonThemeData(style: _filledButtonTheme.style);
+  late final _elevatedButtonTheme = ElevatedButtonThemeData(
+    style: _filledButtonTheme.style,
+  );
 
   late final _filledButtonTheme = FilledButtonThemeData(
     style: ButtonStyle(
@@ -396,16 +385,16 @@ class LightTheme {
       ),
       backgroundColor: WidgetStateProperty.resolveWith(
         (states) {
-          if (states.contains(WidgetState.disabled)) return _primary4;
+          if (states.contains(WidgetState.disabled)) return _accentDisabled.withValues(alpha: 0.4);
 
-          return _primary1;
+          return _accent;
         },
       ),
-      foregroundColor: const WidgetStatePropertyAll(_staticWhite),
+      foregroundColor: const WidgetStatePropertyAll(_specialStaticWhite),
       overlayColor: WidgetStateProperty.resolveWith(
         (states) {
-          if (states.contains(WidgetState.pressed)) return _primary3;
-          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _primary2;
+          if (states.contains(WidgetState.pressed)) return _accentPressed;
+          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _accentHover;
 
           return null;
         },
@@ -427,15 +416,32 @@ class LightTheme {
       backgroundColor: const WidgetStatePropertyAll(_staticTransparent),
       foregroundColor: WidgetStateProperty.resolveWith(
         (states) {
-          if (states.contains(WidgetState.disabled)) return _contrast4;
+          if (states.contains(WidgetState.disabled)) return _neutralLight;
 
-          return _contrast1;
+          return _neutralBlack;
+        },
+      ),
+      shape: WidgetStateProperty.resolveWith(
+        (states) {
+          final Color borderColor;
+
+          if (states.contains(WidgetState.disabled)) {
+            borderColor = _neutralLight;
+          } else {
+            borderColor = _neutralBlack;
+          }
+
+          return StadiumBorder(
+            side: BorderSide(
+              color: borderColor,
+            ),
+          );
         },
       ),
       overlayColor: WidgetStateProperty.resolveWith(
         (states) {
-          if (states.contains(WidgetState.pressed)) return _background3;
-          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _background2;
+          if (states.contains(WidgetState.pressed)) return _backgroundPressed;
+          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _backgroundHover;
 
           return null;
         },
@@ -448,15 +454,15 @@ class LightTheme {
       backgroundColor: const WidgetStatePropertyAll(_staticTransparent),
       foregroundColor: WidgetStateProperty.resolveWith(
         (states) {
-          if (states.contains(WidgetState.disabled)) return _contrast4;
+          if (states.contains(WidgetState.disabled)) return _neutralLight;
 
-          return _contrast1;
+          return _neutralBlack;
         },
       ),
       overlayColor: WidgetStateProperty.resolveWith(
         (states) {
-          if (states.contains(WidgetState.pressed)) return _background3;
-          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _background2;
+          if (states.contains(WidgetState.pressed)) return _backgroundPressed;
+          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _backgroundHover;
 
           return _staticTransparent;
         },
@@ -470,160 +476,33 @@ class LightTheme {
     ),
   );
 
-  late final _chipThemeData = ChipThemeData(
-    labelStyle: _textTheme.labelLarge,
-    padding: const EdgeInsets.symmetric(
-      vertical: 8,
-      horizontal: 16,
-    ),
-    surfaceTintColor: _background1,
-    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-    color: WidgetStateProperty.resolveWith(
-      (states) {
-        if (states.contains(WidgetState.selected)) {
-          if (states.contains(WidgetState.pressed)) return _blend3;
-          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _blend2;
-          if (states.contains(WidgetState.disabled)) return _blend2;
-
-          return _blend1;
-        } else {
-          if (states.contains(WidgetState.pressed)) return _background3;
-          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _background2;
-          if (states.contains(WidgetState.disabled)) return _background2;
-
-          return _background1;
-        }
-      },
-    ),
-    backgroundColor: _background1,
-    disabledColor: _background2,
-    selectedColor: _blend1,
-    checkmarkColor: _contrast1,
-    elevation: 0,
-  );
-
   late final _appBarTheme = AppBarTheme(
     backgroundColor: _staticTransparent,
     surfaceTintColor: _staticTransparent,
     shadowColor: _staticTransparent,
-    elevation: 0.11,
+    elevation: 0,
     scrolledUnderElevation: 0,
     titleTextStyle: _textTheme.titleLarge,
     centerTitle: true,
+    foregroundColor: _neutralBlack,
   );
 
   late final _navigationBarThemeData = const NavigationBarThemeData(
-    backgroundColor: _background2,
-    indicatorColor: _blend2,
+    backgroundColor: _backgroundSystem,
+    indicatorColor: _blendHover,
   );
 
   late final _popupMenuThemeData = PopupMenuThemeData(
-    color: _background1,
+    color: _background,
     position: PopupMenuPosition.under,
     shape: RoundedRectangleBorder(
       borderRadius: BorderRadius.circular(4.0),
     ),
-    surfaceTintColor: _background1,
-  );
+    surfaceTintColor: _background,
 
-  late final _datePickerThemeData = DatePickerThemeData(
-    backgroundColor: _background2,
-    headerBackgroundColor: _background2,
-    headerForegroundColor: _contrast1,
-    surfaceTintColor: _staticTransparent,
-    rangePickerSurfaceTintColor: _staticTransparent,
-    headerHeadlineStyle: _textTheme.headlineLarge,
-    headerHelpStyle: _textTheme.labelLarge,
-    weekdayStyle: _textTheme.bodyLarge,
-    dayStyle: _textTheme.bodyLarge,
-    dayBackgroundColor: WidgetStateProperty.resolveWith((states) {
-      if (states.contains(WidgetState.selected)) return _primary1;
-
-      return _staticTransparent;
-    }),
-    todayBackgroundColor: WidgetStateProperty.resolveWith((states) {
-      if (states.contains(WidgetState.selected)) return _primary1;
-
-      return _staticTransparent;
-    }),
-    dayForegroundColor: WidgetStateProperty.resolveWith((states) {
-      if (states.contains(WidgetState.selected)) return _staticWhite;
-      if (states.contains(WidgetState.disabled)) return _contrast4;
-
-      return _contrast1;
-    }),
-    todayForegroundColor: WidgetStateProperty.resolveWith((states) {
-      if (states.contains(WidgetState.selected)) return _staticWhite;
-      if (states.contains(WidgetState.disabled)) return _contrast4;
-
-      return _contrast1;
-    }),
-    yearStyle: _textTheme.labelLarge,
-    yearForegroundColor: WidgetStateProperty.resolveWith((states) {
-      if (states.contains(WidgetState.selected)) return _staticWhite;
-      if (states.contains(WidgetState.disabled)) return _contrast4;
-
-      return _contrast1;
-    }),
-    yearBackgroundColor: WidgetStateProperty.resolveWith((states) {
-      if (states.contains(WidgetState.selected)) return _primary1;
-
-      return _staticTransparent;
-    }),
-    inputDecorationTheme: _inputDecorationTheme.copyWith(errorMaxLines: 2),
-    rangePickerBackgroundColor: _background2,
-    rangePickerHeaderBackgroundColor: _background2,
-    rangePickerHeaderForegroundColor: _contrast1,
-    rangePickerHeaderHeadlineStyle: _textTheme.titleLarge,
-    rangePickerHeaderHelpStyle: _textTheme.labelLarge,
-    rangeSelectionBackgroundColor: _blend1,
-    dividerColor: _gray1,
-    cancelButtonStyle: _textButtonThemeData.style?.copyWith(
-      textStyle: WidgetStatePropertyAll(_textTheme.labelLarge),
-    ),
-    confirmButtonStyle: _textButtonThemeData.style?.copyWith(
-      textStyle: WidgetStatePropertyAll(_textTheme.labelLarge),
-    ),
-    dayOverlayColor: WidgetStateProperty.resolveWith((states) {
-      if (states.contains(WidgetState.selected)) return _primary2;
-
-      return _background2;
-    }),
-    yearOverlayColor: WidgetStateProperty.resolveWith((states) {
-      if (states.contains(WidgetState.selected)) return _primary2;
-
-      return _background2;
-    }),
-  );
-
-  late final _timePickerThemeData = TimePickerThemeData(
-    backgroundColor: _background2,
-    cancelButtonStyle: _textButtonThemeData.style?.copyWith(
-      textStyle: WidgetStatePropertyAll(_textTheme.labelLarge),
-    ),
-    confirmButtonStyle: _textButtonThemeData.style?.copyWith(
-      textStyle: WidgetStatePropertyAll(_textTheme.labelLarge),
-    ),
-    hourMinuteColor: _background3,
-    entryModeIconColor: _contrast1,
-    dialHandColor: _primary1,
-    dialTextColor: _contrast1,
-    dialBackgroundColor: _background3,
-    dayPeriodBorderSide: const BorderSide(color: _blend1),
-    helpTextStyle: _textTheme.labelLarge,
-    inputDecorationTheme: _inputDecorationTheme,
-  );
-
-  late final _dialogTheme = DialogThemeData(
-    backgroundColor: _background1,
-    surfaceTintColor: _staticTransparent,
-    titleTextStyle: _textTheme.headlineSmall,
-    contentTextStyle: _textTheme.bodyMedium,
-    iconColor: _contrast1,
-    shape: const RoundedRectangleBorder(
-      borderRadius: BorderRadius.all(
-        Radius.circular(28.0),
-      ),
+    elevation: 2,
+    textStyle: _textTheme.bodyLarge?.copyWith(
+      color: _neutralBlack,
     ),
   );
 
@@ -636,8 +515,11 @@ class LightTheme {
       overlayColor: WidgetStateProperty.resolveWith(
         (states) {
           if (states.contains(WidgetState.disabled)) return _staticTransparent;
-          if (states.contains(WidgetState.hovered) || states.contains(WidgetState.focused)) return _background2;
-          if (states.contains(WidgetState.pressed)) return _background3;
+          if (states.contains(WidgetState.hovered) ||
+              states.contains(WidgetState.focused) ||
+              states.contains(WidgetState.selected))
+            return _backgroundSystemHover;
+          if (states.contains(WidgetState.pressed)) return _backgroundSystemPressed;
 
           return null;
         },
@@ -647,7 +529,7 @@ class LightTheme {
 
   late final _menuBarThemeData = const MenuBarThemeData(
     style: MenuStyle(
-      backgroundColor: WidgetStatePropertyAll(_background1),
+      backgroundColor: WidgetStatePropertyAll(_background),
       surfaceTintColor: WidgetStatePropertyAll(_staticTransparent),
     ),
   );
@@ -656,7 +538,7 @@ class LightTheme {
     textStyle: _textTheme.bodyLarge,
     inputDecorationTheme: _inputDecorationTheme,
     menuStyle: const MenuStyle(
-      backgroundColor: WidgetStatePropertyAll(_background1),
+      backgroundColor: WidgetStatePropertyAll(_background),
       surfaceTintColor: WidgetStatePropertyAll(_staticTransparent),
       visualDensity: VisualDensity.standard,
       padding: WidgetStatePropertyAll(
@@ -667,44 +549,48 @@ class LightTheme {
 
   late final _menuThemeData = const MenuThemeData(
     style: MenuStyle(
-      backgroundColor: WidgetStatePropertyAll(_background1),
+      backgroundColor: WidgetStatePropertyAll(_background),
       surfaceTintColor: WidgetStatePropertyAll(_staticTransparent),
     ),
   );
 
-  late final _progressIndicatorThemeData = const ProgressIndicatorThemeData(
-    color: _primary1,
-    circularTrackColor: _blend1,
-    linearTrackColor: _blend1,
+  late final _progressIndicatorThemeData = ProgressIndicatorThemeData(
+    color: _accent,
+    circularTrackColor: _blend.withValues(alpha: 0.2),
+    linearTrackColor: _blend.withValues(alpha: 0.2),
     linearMinHeight: 4,
   );
 
   late final _inputDecorationTheme = InputDecorationTheme(
     filled: true,
-    disabledBorder: const OutlineInputBorder(
-      borderSide: BorderSide(color: _contrast4),
+    disabledBorder: OutlineInputBorder(
+      borderSide: BorderSide(
+        color: _neutralDarkDisabled.withValues(
+          alpha: 0.3,
+        ),
+      ),
     ),
     errorBorder: const OutlineInputBorder(
-      borderSide: BorderSide(color: _red1),
+      borderSide: BorderSide(color: _error),
     ),
     focusedBorder: const OutlineInputBorder(
-      borderSide: BorderSide(color: _contrast1, width: 3),
+      borderSide: BorderSide(color: _neutralBlack, width: 3),
     ),
     focusedErrorBorder: const OutlineInputBorder(
-      borderSide: BorderSide(color: _red1, width: 3),
+      borderSide: BorderSide(color: _error, width: 3),
     ),
-    outlineBorder: const BorderSide(color: _contrast1),
+    outlineBorder: const BorderSide(color: _neutralBlack),
     border: const OutlineInputBorder(
-      borderSide: BorderSide(color: _contrast1),
+      borderSide: BorderSide(color: _neutralBlack),
     ),
     floatingLabelStyle: WidgetStateTextStyle.resolveWith(
       (states) {
         if (states.contains(WidgetState.disabled)) {
-          return _textTheme.bodySmall!.copyWith(color: _contrast4);
+          return _textTheme.bodySmall!.copyWith(color: _neutralBlackDisabled.withValues(alpha: 0.4));
         }
 
         if (states.contains(WidgetState.error)) {
-          return _textTheme.bodySmall!.copyWith(color: _red1);
+          return _textTheme.bodySmall!.copyWith(color: _error);
         }
 
         return _textTheme.bodySmall!;
@@ -713,40 +599,63 @@ class LightTheme {
     labelStyle: WidgetStateTextStyle.resolveWith(
       (states) {
         if (states.contains(WidgetState.disabled)) {
-          return _textTheme.bodySmall!.copyWith(color: _contrast4);
+          return _textTheme.bodySmall!.copyWith(color: _neutralBlackDisabled.withValues(alpha: 0.3));
         }
 
         if (states.contains(WidgetState.error)) {
-          return _textTheme.bodySmall!.copyWith(color: _red1);
+          return _textTheme.bodySmall!.copyWith(color: _error);
         }
 
         return _textTheme.bodySmall!;
       },
     ),
     alignLabelWithHint: true,
-    hoverColor: _background2,
+    hoverColor: _backgroundSystem,
     fillColor: _staticTransparent,
-    iconColor: _contrast1,
-    prefixIconColor: _contrast1,
+    iconColor: _neutralBlack,
+    prefixIconColor: WidgetStateColor.resolveWith(
+      (states) {
+        if (states.contains(WidgetState.disabled)) {
+          return _neutralBlackDisabled;
+        }
+
+        return _neutralBlack;
+      },
+    ),
     suffixIconColor: WidgetStateColor.resolveWith(
       (states) {
         if (states.contains(WidgetState.disabled)) {
-          return _contrast4;
+          return _neutralBlackDisabled;
         }
 
         if (states.contains(WidgetState.error)) {
-          return _red1;
+          return _error;
         }
 
-        return _contrast1;
+        return _neutralBlack;
+      },
+    ),
+    errorStyle: _textTheme.bodySmall?.copyWith(color: _error),
+    hintStyle: WidgetStateTextStyle.resolveWith(
+      (states) {
+        final Color textColor;
+        if (states.contains(WidgetState.disabled)) {
+          textColor = _neutralDarkDisabled.withValues(alpha: 0.4);
+        } else {
+          textColor = _neutralDark;
+        }
+
+        return _textTheme.bodyLarge!.copyWith(color: textColor);
       },
     ),
-    errorStyle: _textTheme.bodySmall?.copyWith(color: _red1),
-    hintStyle: _textTheme.bodyLarge?.copyWith(color: _contrast4),
     helperStyle: WidgetStateTextStyle.resolveWith(
       (states) {
         if (states.contains(WidgetState.disabled)) {
-          return _textTheme.bodySmall!.copyWith(color: _contrast4);
+          return _textTheme.bodySmall!.copyWith(color: _neutralBlackDisabled.withValues(alpha: 0.3));
+        }
+
+        if (states.contains(WidgetState.error)) {
+          return _textTheme.bodySmall!.copyWith(color: _error);
         }
 
         return _textTheme.bodySmall!;
@@ -755,60 +664,70 @@ class LightTheme {
     counterStyle: WidgetStateTextStyle.resolveWith((states) => _textTheme.bodySmall!),
     contentPadding: const EdgeInsets.only(top: 16, bottom: 16, left: 16),
     floatingLabelBehavior: FloatingLabelBehavior.always,
-    focusColor: _background2,
+    focusColor: _staticTransparent,
   );
 
-  late final _textSelectionTheme = const TextSelectionThemeData(
-    cursorColor: _contrast1,
-    selectionColor: _blend1,
-    selectionHandleColor: _primary1,
+  late final _textSelectionTheme = TextSelectionThemeData(
+    cursorColor: WidgetStateColor.resolveWith(
+      (states) {
+        if (states.contains(WidgetState.error)) {
+          return _error;
+        }
+
+        return _neutralBlack;
+      },
+    ),
+    selectionColor: _blend,
+    selectionHandleColor: _accent,
   );
 
   late final _dividerThemeData = const DividerThemeData(
-    color: _gray4,
+    color: _neutralBlend,
     space: 1,
   );
 
   late final _iconThemeData = const IconThemeData(
     size: 24,
-    color: _contrast1,
+    color: _neutralBlack,
   );
 
   late final _navigationRailThemeData = NavigationRailThemeData(
-    indicatorColor: _blend2,
+    indicatorColor: _blend.withValues(alpha: 0.2),
     unselectedLabelTextStyle: _textTheme.labelMedium,
     selectedLabelTextStyle: _textTheme.labelMedium,
-    backgroundColor: _background2,
+    backgroundColor: _backgroundSystem,
   );
 
   late final _actionIconThemeData = ActionIconThemeData(
     closeButtonIconBuilder: (context) => CustomIcon.medium(
       icon: AssetIcons.close,
-      color: _contrast1,
+      color: _neutralBlack,
     ),
     backButtonIconBuilder: (context) => CustomIcon.medium(
       icon: AssetIcons.arrowBack,
-      color: _contrast1,
+      color: _neutralBlack,
     ),
   );
 
   late final _listTileThemeData = ListTileThemeData(
     contentPadding: const EdgeInsets.all(16),
     titleTextStyle: _textTheme.titleSmall,
-    subtitleTextStyle: _textTheme.bodyMedium?.copyWith(color: _gray1),
+    subtitleTextStyle: _textTheme.bodyMedium?.copyWith(color: _neutralLight),
   );
 
   late final _customDropdownMenuTheme = CustomDropdownMenuTheme(
     enabled: _dropdownMenuThemeData,
     disabled: _dropdownMenuThemeData.copyWith(
-      textStyle: _dropdownMenuThemeData.textStyle?.copyWith(color: _contrast4),
+      textStyle: _dropdownMenuThemeData.textStyle?.copyWith(
+        color: _neutralBlackDisabled.withValues(alpha: 0.4),
+      ),
     ),
   );
 
   late final _tabBarTheme = TabBarThemeData(
-    labelColor: _primary1,
-    unselectedLabelColor: _contrast1,
-    indicatorColor: _primary1,
+    labelColor: _accent,
+    unselectedLabelColor: _neutralBlack,
+    indicatorColor: _accent,
     labelPadding: const EdgeInsets.symmetric(
       vertical: 12,
       horizontal: 16,
@@ -816,11 +735,24 @@ class LightTheme {
     labelStyle: _textTheme.titleSmall,
   );
 
+  late final _dialogTheme = DialogThemeData(
+    backgroundColor: _background,
+    surfaceTintColor: _staticTransparent,
+    titleTextStyle: _textTheme.headlineSmall,
+    contentTextStyle: _textTheme.bodyMedium,
+    iconColor: _accent,
+    shape: const RoundedRectangleBorder(
+      borderRadius: BorderRadius.all(
+        Radius.circular(28.0),
+      ),
+    ),
+  );
+
   final _textTheme = const TextTheme(
     displayLarge: TextStyle(
       fontWeight: FontWeight.w400,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 57,
       letterSpacing: -0.25,
       height: 1.12,
@@ -830,7 +762,7 @@ class LightTheme {
     displayMedium: TextStyle(
       fontWeight: FontWeight.w400,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 45,
       height: 1.15,
       fontFamily: FontFamilies.roboto,
@@ -839,7 +771,7 @@ class LightTheme {
     displaySmall: TextStyle(
       fontWeight: FontWeight.w400,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 36,
       height: 1.22,
       fontFamily: FontFamilies.roboto,
@@ -848,7 +780,7 @@ class LightTheme {
     headlineLarge: TextStyle(
       fontWeight: FontWeight.w400,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 32,
       height: 1.25,
       fontFamily: FontFamilies.roboto,
@@ -857,7 +789,7 @@ class LightTheme {
     headlineMedium: TextStyle(
       fontWeight: FontWeight.w400,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 28,
       height: 1.28,
       fontFamily: FontFamilies.roboto,
@@ -866,7 +798,7 @@ class LightTheme {
     headlineSmall: TextStyle(
       fontWeight: FontWeight.w400,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 24,
       height: 1.33,
       fontFamily: FontFamilies.roboto,
@@ -875,7 +807,7 @@ class LightTheme {
     titleLarge: TextStyle(
       fontWeight: FontWeight.w400,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 22,
       height: 1.27,
       fontFamily: FontFamilies.roboto,
@@ -884,7 +816,7 @@ class LightTheme {
     titleMedium: TextStyle(
       fontWeight: FontWeight.w500,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 16,
       letterSpacing: 0.15,
       height: 1.5,
@@ -894,7 +826,7 @@ class LightTheme {
     titleSmall: TextStyle(
       fontWeight: FontWeight.w500,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 14,
       letterSpacing: 0.1,
       height: 1.42,
@@ -904,7 +836,7 @@ class LightTheme {
     labelLarge: TextStyle(
       fontWeight: FontWeight.w500,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 14,
       letterSpacing: 0.1,
       height: 1.42,
@@ -914,7 +846,7 @@ class LightTheme {
     labelMedium: TextStyle(
       fontWeight: FontWeight.w500,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 12,
       letterSpacing: 0.5,
       height: 1.33,
@@ -924,7 +856,7 @@ class LightTheme {
     labelSmall: TextStyle(
       fontWeight: FontWeight.w500,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 11,
       letterSpacing: 0.5,
       height: 1.45,
@@ -934,7 +866,7 @@ class LightTheme {
     bodyLarge: TextStyle(
       fontWeight: FontWeight.w400,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 16,
       letterSpacing: 0.5,
       height: 1.5,
@@ -944,7 +876,7 @@ class LightTheme {
     bodyMedium: TextStyle(
       fontWeight: FontWeight.w400,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 14,
       letterSpacing: 0.25,
       height: 1.42,
@@ -954,7 +886,7 @@ class LightTheme {
     bodySmall: TextStyle(
       fontWeight: FontWeight.w400,
       fontStyle: FontStyle.normal,
-      color: _contrast1,
+      color: _neutralBlack,
       fontSize: 12,
       letterSpacing: 0.4,
       height: 1.33,
@@ -968,62 +900,31 @@ class LightTheme {
     height: 40,
   );
 
-  final _cardTheme = CardThemeData(
-    color: _background2,
-    elevation: 0,
-    margin: EdgeInsets.zero,
-    shape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.circular(12.0),
-    ),
-    surfaceTintColor: _background1,
-  );
-
-  final _expansionTileTheme = ExpansionTileThemeData(
-    backgroundColor: _background2,
-    iconColor: _contrast1,
-    textColor: _contrast1,
-    collapsedIconColor: _contrast1,
-    collapsedTextColor: _contrast1,
-    collapsedBackgroundColor: _background2,
-    collapsedShape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.circular(4),
-    ),
-    shape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.circular(4),
-    ),
-    tilePadding: const EdgeInsets.symmetric(
-      horizontal: 16,
-      vertical: 4,
-    ),
-    childrenPadding: const EdgeInsets.symmetric(
-      horizontal: 16,
-      vertical: 8,
-    ),
-  );
-
   final _customFilledIconButtonTheme = CustomFilledIconButtonTheme(
     iconButton: IconButtonThemeData(
       style: ButtonStyle(
+        foregroundColor: const WidgetStatePropertyAll(_specialStaticWhite),
         backgroundColor: WidgetStateProperty.resolveWith(
           (states) {
             if (states.contains(WidgetState.selected)) {
-              return _primary1;
+              return _accent;
             }
 
-            return _gray1;
+            return _neutralDark;
           },
         ),
       ),
     ),
     iconButtonInProgress: IconButtonThemeData(
       style: ButtonStyle(
+        foregroundColor: const WidgetStatePropertyAll(_specialStaticWhite),
         backgroundColor: WidgetStateProperty.resolveWith(
           (states) {
             if (states.contains(WidgetState.selected)) {
-              return _primary4;
+              return _accent;
             }
 
-            return _gray1;
+            return _neutralDark;
           },
         ),
       ),
@@ -1032,7 +933,7 @@ class LightTheme {
 
   final _customMissSpelledTextTheme = const CustomMissSpelledTextTheme(
     missSpelledStyle: TextStyle(
-      decorationColor: _red1,
+      decorationColor: _error,
       decoration: TextDecoration.underline,
       decorationStyle: TextDecorationStyle.wavy,
       decorationThickness: 2,
@@ -1054,9 +955,9 @@ class LightTheme {
     ],
 
     // COLOR
-    scaffoldBackgroundColor: _background1,
+    scaffoldBackgroundColor: _background,
     brightness: Brightness.light,
-    primaryColor: _primary1,
+    primaryColor: _accent,
     colorScheme: _colorScheme,
     hoverColor: _staticTransparent,
     focusColor: _staticTransparent,
@@ -1074,21 +975,17 @@ class LightTheme {
     floatingActionButtonTheme: _floatingActionButtonThemeData,
     switchTheme: _switchThemeData,
     snackBarTheme: _snackBarThemeData,
-    bottomSheetTheme: _bottomSheetTheme,
     badgeTheme: _badgeThemeData,
     elevatedButtonTheme: _elevatedButtonTheme,
     filledButtonTheme: _filledButtonTheme,
     outlinedButtonTheme: _outlinedButtonThemeData,
     textButtonTheme: _textButtonThemeData,
-    chipTheme: _chipThemeData,
-    timePickerTheme: _timePickerThemeData,
     dialogTheme: _dialogTheme,
     menuButtonTheme: _menuButtonThemeData,
     menuBarTheme: _menuBarThemeData,
     dropdownMenuTheme: _dropdownMenuThemeData,
     menuTheme: _menuThemeData,
     popupMenuTheme: _popupMenuThemeData,
-    datePickerTheme: _datePickerThemeData,
     navigationBarTheme: _navigationBarThemeData,
     appBarTheme: _appBarTheme,
     progressIndicatorTheme: _progressIndicatorThemeData,
@@ -1097,8 +994,6 @@ class LightTheme {
     navigationRailTheme: _navigationRailThemeData,
     actionIconTheme: _actionIconThemeData,
     listTileTheme: _listTileThemeData,
-    cardTheme: _cardTheme,
-    expansionTileTheme: _expansionTileTheme,
     buttonTheme: _buttonTheme,
     tabBarTheme: _tabBarTheme,
   );
diff --git a/lib/di/common/initialization_helper.dart b/lib/di/common/initialization_helper.dart
index 117b74c..0bd0280 100644
--- a/lib/di/common/initialization_helper.dart
+++ b/lib/di/common/initialization_helper.dart
@@ -2,6 +2,7 @@ import 'dart:ui';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:vpn/di/common/initialization_result.dart';
 import 'package:vpn/di/factory/bloc_factory.dart';
 import 'package:vpn/di/factory/dependency_factory.dart';
@@ -14,7 +15,8 @@ abstract class InitializationHelper {
 class InitializationHelperIo extends InitializationHelper {
   @override
   Future<InitializationResult> init() async {
-    WidgetsFlutterBinding.ensureInitialized();
+    final bindings = WidgetsFlutterBinding.ensureInitialized();
+    FlutterNativeSplash.preserve(widgetsBinding: bindings);
     await _updateDeviceOrientation();
 
     final dependenciesFactory = DependencyFactoryImpl();
@@ -29,6 +31,8 @@ class InitializationHelperIo extends InitializationHelper {
 
     final initialVpnState = await repositoryFactory.vpnRepository.requestState();
 
+    FlutterNativeSplash.remove();
+
     return InitializationResult(
       dependenciesFactory: dependenciesFactory,
       blocFactory: blocFactory,
diff --git a/lib/feature/navigation/view/common/navigation_screen_utils.dart b/lib/feature/navigation/view/common/navigation_screen_utils.dart
index f851152..04ef97f 100644
--- a/lib/feature/navigation/view/common/navigation_screen_utils.dart
+++ b/lib/feature/navigation/view/common/navigation_screen_utils.dart
@@ -27,7 +27,6 @@ abstract class NavigationScreenUtils {
         (e) => NavigationRailDestination(
           icon: CustomIcon.medium(
             icon: e['icon'] as IconData,
-            color: context.colors.contrast1,
           ),
           label: Text(
             e['label'].toString(),
@@ -45,7 +44,6 @@ abstract class NavigationScreenUtils {
         (e) => NavigationDestination(
           icon: CustomIcon.medium(
             icon: e['icon'] as IconData,
-            color: context.colors.contrast1,
           ),
           label: e['label'].toString(),
         ),
diff --git a/lib/feature/navigation/view/navigation_screen.dart b/lib/feature/navigation/view/navigation_screen.dart
index 4f83434..10f1e98 100644
--- a/lib/feature/navigation/view/navigation_screen.dart
+++ b/lib/feature/navigation/view/navigation_screen.dart
@@ -19,24 +19,26 @@ class _NavigationScreenState extends State<NavigationScreen> {
 
   @override
   Widget build(BuildContext context) => Scaffold(
-    backgroundColor: context.colors.background2,
+    backgroundColor: context.colors.backgroundSystem,
     body: context.isMobileBreakpoint
         ? _getContent()
-        : Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              ValueListenableBuilder(
-                valueListenable: _selectedTabNotifier,
-                builder: (context, index, _) => CustomNavigationRail(
-                  selectedIndex: index,
-                  onDestinationSelected: _onDestinationSelected,
-                  destinations: NavigationScreenUtils.getNavigationRailDestinations(context),
+        : SafeArea(
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                ValueListenableBuilder(
+                  valueListenable: _selectedTabNotifier,
+                  builder: (context, index, _) => CustomNavigationRail(
+                    selectedIndex: index,
+                    onDestinationSelected: _onDestinationSelected,
+                    destinations: NavigationScreenUtils.getNavigationRailDestinations(context),
+                  ),
                 ),
-              ),
-              Expanded(
-                child: _getContent(),
-              ),
-            ],
+                Expanded(
+                  child: _getContent(),
+                ),
+              ],
+            ),
           ),
     bottomNavigationBar: context.isMobileBreakpoint
         ? ValueListenableBuilder(
diff --git a/lib/feature/routing/routing/view/widget/routing_card.dart b/lib/feature/routing/routing/view/widget/routing_card.dart
index e0a3894..c7bd779 100644
--- a/lib/feature/routing/routing/view/widget/routing_card.dart
+++ b/lib/feature/routing/routing/view/widget/routing_card.dart
@@ -59,13 +59,13 @@ class RoutingCard extends StatelessWidget {
               children: [
                 CustomIcon.medium(
                   icon: AssetIcons.delete,
-                  color: context.colors.red1,
+                  color: context.colors.error,
                 ),
                 const SizedBox(width: 12),
                 Text(
                   context.ln.deleteProfile,
                   style: context.textTheme.bodyLarge?.copyWith(
-                    color: context.colors.red1,
+                    color: context.colors.error,
                   ),
                 ),
               ],
diff --git a/lib/feature/routing/routing_details/view/widget/routing_details_screen_app_bar_action.dart b/lib/feature/routing/routing_details/view/widget/routing_details_screen_app_bar_action.dart
index 2018f09..4842260 100644
--- a/lib/feature/routing/routing_details/view/widget/routing_details_screen_app_bar_action.dart
+++ b/lib/feature/routing/routing_details/view/widget/routing_details_screen_app_bar_action.dart
@@ -41,13 +41,13 @@ class RoutingDetailsScreenAppBarAction extends StatelessWidget {
           children: [
             CustomIcon.medium(
               icon: AssetIcons.delete,
-              color: context.colors.red1,
+              color: context.colors.error,
             ),
             const SizedBox(width: 12),
             Text(
               context.ln.deleteAllRules,
               style: context.textTheme.bodyLarge?.copyWith(
-                color: context.colors.red1,
+                color: context.colors.error,
               ),
             ),
           ],
diff --git a/lib/feature/server/server_details/view/widget/server_details_screen_app_bar_action.dart b/lib/feature/server/server_details/view/widget/server_details_screen_app_bar_action.dart
index fac982e..6b6be48 100644
--- a/lib/feature/server/server_details/view/widget/server_details_screen_app_bar_action.dart
+++ b/lib/feature/server/server_details/view/widget/server_details_screen_app_bar_action.dart
@@ -16,7 +16,7 @@ class ServerDetailsScreenAppBarAction extends StatelessWidget {
     builder: (context, state) => state.isEditing
         ? CustomIconButton.square(
             icon: AssetIcons.delete,
-            color: context.colors.red1,
+            color: context.colors.error,
             size: 24,
             onPressed: () => _showDeleteDialog(
               context,
diff --git a/lib/feature/server/servers/view/widget/servers_card.dart b/lib/feature/server/servers/view/widget/servers_card.dart
index 5ae6fd3..aa40fba 100644
--- a/lib/feature/server/servers/view/widget/servers_card.dart
+++ b/lib/feature/server/servers/view/widget/servers_card.dart
@@ -37,9 +37,6 @@ class _ServersCardState extends State<ServersCard> {
     title: widget.server.name,
     titleStyle: context.textTheme.titleSmall,
     subtitle: widget.server.ipAddress,
-    subtitleStyle: context.textTheme.bodyMedium?.copyWith(
-      color: context.colors.gray1,
-    ),
     onTileTap: () => _pushServerDetailsScreen(
       context,
       server: widget.server,
diff --git a/lib/feature/server/servers/view/widget/servers_card_connection_button.dart b/lib/feature/server/servers/view/widget/servers_card_connection_button.dart
index 19dd2e9..ad61af4 100644
--- a/lib/feature/server/servers/view/widget/servers_card_connection_button.dart
+++ b/lib/feature/server/servers/view/widget/servers_card_connection_button.dart
@@ -32,7 +32,6 @@ class ServersCardConnectionButton extends StatelessWidget {
               icon: AssetIcons.update,
               onPressed: onPressed,
               size: 24,
-              color: context.colors.staticWhite,
               selected: true,
             ),
           )
@@ -40,7 +39,6 @@ class ServersCardConnectionButton extends StatelessWidget {
             icon: AssetIcons.powerSettingsNew,
             onPressed: onPressed,
             size: 24,
-            color: context.colors.staticWhite,
             selected: vpnManagerState == VpnState.connected,
           ),
   );
diff --git a/lib/feature/server/servers/view/widget/servers_empty_placeholder.dart b/lib/feature/server/servers/view/widget/servers_empty_placeholder.dart
index 53b4e19..086a7bf 100644
--- a/lib/feature/server/servers/view/widget/servers_empty_placeholder.dart
+++ b/lib/feature/server/servers/view/widget/servers_empty_placeholder.dart
@@ -14,16 +14,18 @@ class ServersEmptyPlaceholder extends StatelessWidget {
   Widget build(BuildContext context) => DefaultPage(
     title: context.ln.serversEmptyTitle,
     descriptionText: context.ln.serversEmptyDescription,
-    imagePath: AssetImages.dns,
+    imagePath: AssetImages.server,
     imageSize: const Size.square(248),
     buttonText: context.ln.create,
     onButtonPressed: () => _pushServerDetailsScreen(context),
     alignment: Alignment.center,
   );
 
-  void _pushServerDetailsScreen(BuildContext context) => context.push(
-    const ServerDetailsPopUp(),
-  ).then(
+  void _pushServerDetailsScreen(BuildContext context) => context
+      .push(
+        const ServerDetailsPopUp(),
+      )
+      .then(
         (_) => context.read<ServersBloc>().add(
           const ServersEvent.fetch(),
         ),
diff --git a/lib/feature/settings/settings_about/about_screen.dart b/lib/feature/settings/settings_about/about_screen.dart
index 4a9ba24..8dc582c 100644
--- a/lib/feature/settings/settings_about/about_screen.dart
+++ b/lib/feature/settings/settings_about/about_screen.dart
@@ -20,7 +20,7 @@ class AboutScreen extends StatelessWidget {
         builder: (context, snapshot) => DefaultPage(
           title: context.ln.vpnOss,
           descriptionText: snapshot.data,
-          imagePath: AssetImages.privacy,
+          imagePath: AssetImages.about,
           imageSize: const Size.square(248),
           alignment: Alignment.center,
         ),
diff --git a/lib/view/buttons/custom_elevated_button.dart b/lib/view/buttons/custom_elevated_button.dart
index 775b598..8741d0e 100644
--- a/lib/view/buttons/custom_elevated_button.dart
+++ b/lib/view/buttons/custom_elevated_button.dart
@@ -27,7 +27,6 @@ class CustomElevatedButton extends StatelessWidget {
         label: Text(label),
         icon: CustomIcon.medium(
           icon: icon,
-          color: context.theme.elevatedButtonTheme.style?.foregroundColor?.resolve({}) ?? context.colors.staticWhite,
         ),
       ),
     ),
diff --git a/lib/view/buttons/custom_filled_button.dart b/lib/view/buttons/custom_filled_button.dart
index 9b860ca..0357c85 100644
--- a/lib/view/buttons/custom_filled_button.dart
+++ b/lib/view/buttons/custom_filled_button.dart
@@ -27,7 +27,6 @@ class CustomFilledButton extends StatelessWidget {
         label: Text(label),
         icon: CustomIcon.medium(
           icon: icon,
-          color: context.theme.filledButtonTheme.style?.foregroundColor?.resolve({}) ?? context.colors.staticWhite,
         ),
       ),
     ),
diff --git a/lib/view/buttons/custom_floating_action_button.dart b/lib/view/buttons/custom_floating_action_button.dart
index d2945d8..04d1a37 100644
--- a/lib/view/buttons/custom_floating_action_button.dart
+++ b/lib/view/buttons/custom_floating_action_button.dart
@@ -49,7 +49,7 @@ class CustomFloatingActionButton extends StatelessWidget {
     final theme = Theme.of(context).floatingActionButtonTheme;
     final iconWidget = CustomIcon.medium(
       icon: icon,
-      color: theme.foregroundColor ?? context.colors.primary1,
+      color: theme.foregroundColor ?? context.colors.accent,
     );
 
     final Widget button = switch (type) {
diff --git a/lib/view/buttons/custom_icon_button.dart b/lib/view/buttons/custom_icon_button.dart
index d61f396..eb0f9cf 100644
--- a/lib/view/buttons/custom_icon_button.dart
+++ b/lib/view/buttons/custom_icon_button.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:vpn/common/extensions/context_extensions.dart';
 import 'package:vpn/view/custom_icon.dart';
 
 class CustomIconButton extends StatefulWidget {
@@ -124,7 +123,7 @@ class _CustomIconButtonState extends State<CustomIconButton> {
 
     return CustomIcon.medium(
       icon: widget.icon!,
-      color: widget.onPressed == null ? context.colors.contrast4 : widget.color,
+      color: widget.color,
     );
   }
 
@@ -139,7 +138,7 @@ class _CustomIconButtonState extends State<CustomIconButton> {
     return CustomIcon(
       icon: widget.selectedIcon!,
       size: widget.width ?? widget.height,
-      color: widget.onPressed == null ? context.colors.contrast4 : widget.color,
+      color: widget.color,
     );
   }
 }
diff --git a/lib/view/buttons/custom_outlined_button.dart b/lib/view/buttons/custom_outlined_button.dart
index 294a90f..68ee2af 100644
--- a/lib/view/buttons/custom_outlined_button.dart
+++ b/lib/view/buttons/custom_outlined_button.dart
@@ -37,9 +37,7 @@ class _OutlinedButtonSvgState extends State<CustomOutlinedButton> {
           valueListenable: _statesController,
           builder: (context, value, child) => CustomIcon.medium(
             icon: widget.icon,
-            color:
-                context.theme.outlinedButtonTheme.style?.foregroundColor?.resolve(value) ?? context.colors.staticWhite,
-          ),
+                ),
         ),
       ),
     ),
diff --git a/lib/view/buttons/custom_text_button.dart b/lib/view/buttons/custom_text_button.dart
index ce8b97a..63a3aa1 100644
--- a/lib/view/buttons/custom_text_button.dart
+++ b/lib/view/buttons/custom_text_button.dart
@@ -37,7 +37,6 @@ class _TextButtonSvgState extends State<CustomTextButton> {
           valueListenable: _statesController,
           builder: (context, value, child) => CustomIcon.small(
             icon: widget.icon,
-            color: context.theme.textButtonTheme.style?.foregroundColor?.resolve(value) ?? context.colors.staticWhite,
           ),
         ),
       ),
diff --git a/lib/view/common/custom_arrow_list_tile.dart b/lib/view/common/custom_arrow_list_tile.dart
index 8d77024..380d8d1 100644
--- a/lib/view/common/custom_arrow_list_tile.dart
+++ b/lib/view/common/custom_arrow_list_tile.dart
@@ -34,7 +34,7 @@ class CustomArrowListTile extends StatelessWidget {
               const SizedBox(width: 16),
               CustomIcon.medium(
                 icon: AssetIcons.navigateNext,
-                color: context.colors.gray1,
+                color: context.colors.neutralDark,
               ),
             ],
           ),
diff --git a/lib/view/common/custom_radio_list_tile.dart b/lib/view/common/custom_radio_list_tile.dart
index f1e5748..857fcc4 100644
--- a/lib/view/common/custom_radio_list_tile.dart
+++ b/lib/view/common/custom_radio_list_tile.dart
@@ -48,10 +48,10 @@ class CustomRadioListTile<T> extends StatelessWidget {
     final gestureEnabled = onChanged != null && enabled;
 
     final titleTextStyle = context.textTheme.bodyLarge?.copyWith(
-      color: titleColor ?? (gestureEnabled ? null : context.colors.contrast4),
+      color: titleColor ?? (gestureEnabled ? null : context.colors.neutralLight),
     );
     final bodyTextStyle = context.textTheme.bodyMedium?.copyWith(
-      color: gestureEnabled ? null : context.colors.contrast4,
+      color: gestureEnabled ? null : context.colors.neutralLight,
     );
 
     return InkWell(
@@ -90,7 +90,7 @@ class CustomRadioListTile<T> extends StatelessWidget {
                       Text(
                         error!,
                         style: context.textTheme.bodyMedium?.copyWith(
-                          color: context.colors.red1,
+                          color: context.colors.error,
                         ),
                       ),
                   ],
diff --git a/lib/view/custom_alert_dialog.dart b/lib/view/custom_alert_dialog.dart
index 7d0a335..df24685 100644
--- a/lib/view/custom_alert_dialog.dart
+++ b/lib/view/custom_alert_dialog.dart
@@ -119,7 +119,7 @@ class CustomAlertDialog extends StatelessWidget {
                       onTap: onClose ?? Navigator.of(context).pop,
                       child: CustomIcon.medium(
                         icon: AssetIcons.close,
-                        color: context.colors.contrast1,
+                        color: context.colors.neutralDark,
                       ),
                     ),
                   if (closeIconVariant != null) closeIconVariant!,
diff --git a/lib/view/custom_app_bar.dart b/lib/view/custom_app_bar.dart
index 79ed2d1..e048a9c 100644
--- a/lib/view/custom_app_bar.dart
+++ b/lib/view/custom_app_bar.dart
@@ -43,12 +43,11 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
     final backButton = showBackButton ? _getBackButtonByType(context, leadingIconType!) : null;
     final body = AppBar(
       centerTitle: centerTitle ?? !showBackButton,
-      surfaceTintColor: context.isMobileBreakpoint ? context.colors.gray1 : null,
       title: Padding(
         padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 4),
         child: Text(title),
       ),
-      backgroundColor: context.colors.background1,
+      backgroundColor: context.colors.background,
       bottom: bottom != null
           ? PreferredSize(
               preferredSize: Size.fromHeight(bottomHeight),
diff --git a/lib/view/inputs/custom_text_field.dart b/lib/view/inputs/custom_text_field.dart
index 297dbe6..9f4a661 100644
--- a/lib/view/inputs/custom_text_field.dart
+++ b/lib/view/inputs/custom_text_field.dart
@@ -160,7 +160,7 @@ class _CustomTextFieldState extends State<CustomTextField> {
                               ? CustomIconButton(
                                   color: widget.error == null
                                       ? context.theme.inputDecorationTheme.suffixIconColor
-                                      : context.colors.red1,
+                                      : context.colors.error,
                                   onPressed: widget.enabled
                                       ? () {
                                           _controller.clear();
@@ -174,7 +174,7 @@ class _CustomTextFieldState extends State<CustomTextField> {
                             padding: const EdgeInsets.all(8.0),
                             child: CustomIcon.medium(
                               icon: AssetIcons.error,
-                              color: context.colors.red1,
+                              color: context.colors.error,
                             ),
                           ),
                   ),
diff --git a/lib/view/progress_wrapper.dart b/lib/view/progress_wrapper.dart
index e6ffbc7..8efc989 100644
--- a/lib/view/progress_wrapper.dart
+++ b/lib/view/progress_wrapper.dart
@@ -24,7 +24,7 @@ class ProgressWrapper extends StatelessWidget {
           child: Padding(
             padding: const EdgeInsets.only(top: 4),
             child: ColoredBox(
-              color: color ?? context.colors.background1,
+              color: color ?? context.colors.background,
               child: LinearProgressIndicator(
                 borderRadius: BorderRadius.circular(4),
               ),
diff --git a/lib/view/scaffold_wrapper.dart b/lib/view/scaffold_wrapper.dart
index e0731c7..aa3e617 100644
--- a/lib/view/scaffold_wrapper.dart
+++ b/lib/view/scaffold_wrapper.dart
@@ -11,13 +11,13 @@ class ScaffoldWrapper extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => ColoredBox(
-    color: context.colors.background2,
+    color: context.colors.backgroundSystem,
     child: Padding(
       padding: EdgeInsets.all(context.isMobileBreakpoint ? 0 : 16),
       child: ClipRRect(
         borderRadius: BorderRadius.circular(context.isMobileBreakpoint ? 0 : 16),
         child: ColoredBox(
-          color: context.colors.background1,
+          color: context.colors.background,
           child: child,
         ),
       ),
diff --git a/pubspec.lock b/pubspec.lock
index 35b11c0..4fdb4de 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -17,6 +17,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.7.1"
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
   archive:
     dependency: transitive
     description:
@@ -291,6 +299,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_native_splash:
+    dependency: "direct main"
+    description:
+      name: flutter_native_splash
+      sha256: "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.7"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -373,6 +389,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.4"
   intl:
     dependency: "direct main"
     description:
@@ -637,6 +661,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.0"
+  punycoder:
+    dependency: "direct main"
+    description:
+      name: punycoder
+      sha256: aed79c05986a18782caa9bad649a4a786e840e1baaf6a2e1aa3a25d143d28e6e
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.2"
   recase:
     dependency: transitive
     description:
@@ -786,6 +818,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1"
   url_launcher:
     dependency: "direct main"
     description:
@@ -921,6 +961,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.6.1"
   yaml:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b3871d7..7dbb9b1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -46,6 +46,7 @@ dependencies:
   sqlite3_flutter_libs: ^0.5.39
   html: 0.15.6
   bloc_concurrency: ^0.3.0
+  flutter_native_splash: ^2.4.7
 
 dev_dependencies:
   flutter_test: