diff --git a/app/src/main/res/color/thumb_color_selector.xml b/app/src/main/res/color/thumb_color_selector.xml
new file mode 100644
index 0000000..750a1bb
--- /dev/null
+++ b/app/src/main/res/color/thumb_color_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#EF6456" android:state_checked="true" />
+    <item android:color="#BDBDBD" /> <!-- Default color when off -->
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/track_color_selector.xml b/app/src/main/res/color/track_color_selector.xml
new file mode 100644
index 0000000..b58bebe
--- /dev/null
+++ b/app/src/main/res/color/track_color_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#FFB3AB" android:state_checked="true" />
+    <item android:color="#E0E0E0" /> <!-- Default color when off -->
+</selector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bdb8bc1..020862e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,86 +9,111 @@
     tools:context=".MainActivity">
 
     <TextView
-        android:id="@+id/frida_server_state"
+        android:id="@+id/frida_version"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/frida_server_state_label"
+        android:text="@string/frida_version"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.139" />
+        app:layout_constraintTop_toBottomOf="@+id/btn_toggle_server"
+        app:layout_constraintVertical_bias="0.82" />
 
     <Button
         android:id="@+id/btn_install_update_server"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:backgroundTint="#EF6456"
         android:text="@string/btn_update_frida"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/frida_server_state"
-        app:layout_constraintVertical_bias="0.07999998" />
+        app:layout_constraintVertical_bias="0.116" />
 
     <Button
         android:id="@+id/btn_toggle_server"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:backgroundTint="#EF6456"
         android:text="@string/btn_kill_frida_server"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btn_install_update_server"
-        app:layout_constraintVertical_bias="0.04000002" />
+        app:layout_constraintVertical_bias="0.046" />
 
-    <TextView
-        android:id="@+id/frida_version"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/frida_version"
-        app:layout_constraintBottom_toBottomOf="parent"
+    <com.google.android.material.materialswitch.MaterialSwitch
+        android:id="@+id/switch_start_on_boot"
+        android:layout_width="260dp"
+        android:layout_height="48dp"
+        android:text="@string/start_on_boot"
+        android:textColor="@color/text_color"
+        app:layout_constraintBottom_toTopOf="@+id/frida_version"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btn_toggle_server"
-        app:layout_constraintVertical_bias="0.98" />
+        app:layout_constraintVertical_bias="0.274"
+        app:trackTint="@color/track_color_selector" />
 
     <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/switch_listen_on_network"
         android:layout_width="260dp"
         android:layout_height="48dp"
         android:text="@string/listen_on_network_interface"
+        android:textColor="@color/text_color"
         app:layout_constraintBottom_toTopOf="@+id/frida_version"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.50"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/switch_start_on_boot"
-        app:layout_constraintVertical_bias="0" />
+        app:layout_constraintVertical_bias="0.021"
+        app:trackTint="@color/track_color_selector" />
 
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/switch_start_on_boot"
-        android:layout_width="260dp"
-        android:layout_height="48dp"
-        android:text="@string/start_on_boot"
-        app:layout_constraintBottom_toTopOf="@+id/frida_version"
+    <TextView
+        android:id="@+id/frida_server_state"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/frida_server_state_label"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_toggle_server"
-        app:layout_constraintVertical_bias="0.18" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.342" />
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/input_port_number"
-        android:imeOptions="actionDone"
         android:layout_width="270dp"
         android:layout_height="48dp"
         android:hint="@string/port_number_hint"
+        android:imeOptions="actionDone"
         android:inputType="number"
         app:layout_constraintBottom_toTopOf="@+id/frida_version"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/switch_listen_on_network"
-        app:layout_constraintVertical_bias="0.0">
+        app:layout_constraintVertical_bias="0.032">
+
 
     </com.google.android.material.textfield.TextInputEditText>
 
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="154dp"
+        android:layout_height="130dp"
+        android:contentDescription="@string/main_logo"
+        app:layout_constraintBottom_toTopOf="@+id/frida_server_state"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.504"
+        app:srcCompat="@mipmap/ic_launcher" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..615be88
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="text_color">@color/white</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index ab7b5a8..b5e0940 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,11 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.Theme.FridaManager" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your dark theme here. -->
-        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+<resources>
+    <!-- Optional: You can leave this empty or match the light theme -->
+    <style name="Base.Theme.FridaManager" parent="Theme.Material3.Light.NoActionBar">
+        <item name="android:windowBackground">@color/dark_background</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">@color/white</item>
+        <item name="android:textColorTertiary">@color/white</item>
+        <item name="android:textColorHint">@color/white_50_percent</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4f00339..bc83ec6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="accent">#FFEF6456</color>
-
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="dark_background">#FF121212</color>
+    <color name="white_50_percent">#80FFFFFF</color>
+    <color name="text_color">@color/black</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 00cd3c4..8ef547f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,9 +1,6 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Base.Theme.FridaManager" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your light theme here. -->
-        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
     </style>
-
     <style name="Theme.FridaManager" parent="Base.Theme.FridaManager" />
 </resources>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e13773b..311bb56 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.6.0"
+agp = "8.7.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 237d588..a975906 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Sep 10 22:25:34 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists