diff --git a/Android.bp b/Android.bp
index e2c2a1cb20ea266b6a70662c4b1ac567ea7e4a70..ef62148fbe89692c523c35559d98f08291d1168d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,5 +31,6 @@ android_app {
         "com.google.android.material_material",
         "ExactCalculator_com.hp_crcalc",
         "kotlin-stdlib",
+        "elib",
     ],
 }
diff --git a/res/layout/advanced_pad.xml b/res/layout/advanced_pad.xml
index 4fe91d5edf7781a8aff9f6cbb350d63015c63a89..e3474a45d9a1ac32f8267bcab3f6bcd6987d9a45 100644
--- a/res/layout/advanced_pad.xml
+++ b/res/layout/advanced_pad.xml
@@ -10,7 +10,7 @@
     style="@style/PadLayoutStyle.Advanced"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface">
+    android:background="@color/num_background">
 
     <com.android.calculator2.HapticButton
         android:id="@+id/op_sqrt"
diff --git a/res/layout/fragment_history.xml b/res/layout/fragment_history.xml
index 396274e8cc73276bc902d80f101568839be54e03..df4a0458b4f7df84fce182e03b34c622d238dc4e 100644
--- a/res/layout/fragment_history.xml
+++ b/res/layout/fragment_history.xml
@@ -18,6 +18,7 @@
         android:minHeight="?attr/actionBarSize"
         android:navigationContentDescription="@string/desc_navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"
+        android:background="@color/e_action_bar"
         app:title="@string/title_history" />
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/res/layout/input_pad.xml b/res/layout/input_pad.xml
index a9ec4ea416bdc5e60a5afbde01f9c52254bf1977..e0e9769dc54709d8bd057d53295dfd6e36070b94 100644
--- a/res/layout/input_pad.xml
+++ b/res/layout/input_pad.xml
@@ -10,14 +10,14 @@
     style="@style/PadLayoutStyle"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface">
+    android:background="@color/num_background">
 
     <com.android.calculator2.HapticButton
         android:id="@+id/lparen"
         style="@style/PadButtonStyle"
         android:contentDescription="@string/desc_lparen"
         android:text="@string/lparen"
-        android:theme="@style/Theme.Button.Operator"
+        android:theme="@style/Theme.Button.Numeric"
         app:layout_constraintBottom_toTopOf="@id/rowGuide1"
         app:layout_constraintEnd_toStartOf="@id/columnGuide1"
         app:layout_constraintStart_toStartOf="parent"
@@ -28,7 +28,7 @@
         style="@style/PadButtonStyle"
         android:contentDescription="@string/desc_rparen"
         android:text="@string/rparen"
-        android:theme="@style/Theme.Button.Operator"
+        android:theme="@style/Theme.Button.Numeric"
         app:layout_constraintBottom_toTopOf="@id/rowGuide1"
         app:layout_constraintEnd_toStartOf="@id/columnGuide2"
         app:layout_constraintStart_toStartOf="@id/columnGuide1"
@@ -39,7 +39,7 @@
         style="@style/PadButtonStyle"
         android:contentDescription="@string/desc_op_pct"
         android:text="@string/op_pct"
-        android:theme="@style/Theme.Button.Operator"
+        android:theme="@style/Theme.Button.Numeric"
         app:layout_constraintBottom_toTopOf="@id/rowGuide1"
         app:layout_constraintEnd_toStartOf="@id/columnGuide3"
         app:layout_constraintStart_toEndOf="@id/columnGuide2"
diff --git a/res/values-night/color.xml b/res/values-night/color.xml
index b9c8a3c968605e330a56546d79186b7adf778665..d94dd45b90ed41dd169edd0b3dc1d64eb8affd00 100644
--- a/res/values-night/color.xml
+++ b/res/values-night/color.xml
@@ -4,14 +4,6 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
-
-    <!-- Display background -->
-    <color name="history_background_color">@color/material_dynamic_neutral30</color>
-    <color name="display_background_color">@color/material_dynamic_neutral20</color>
-
-    <!-- Display text -->
-    <color name="display_formula_text_color">@color/material_dynamic_neutral90</color>
-    <color name="display_result_text_color">@color/material_dynamic_neutral70</color>
-    <color name="display_result_exponent_text_color">@color/material_dynamic_secondary60</color>
-
+    <color name="num_key_background">#343434</color>
+    <color name="opt_key_background">#405262</color>
 </resources>
diff --git a/res/values/color.xml b/res/values/color.xml
index d49facddd82ff5598a83f9724c234ac11fb8e832..d58dbc671f2f8c37ee655f2e486c12bb390acba5 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -6,12 +6,17 @@
 <resources>
 
     <!-- Display background -->
-    <color name="history_background_color">@color/material_dynamic_neutral95</color>
-    <color name="display_background_color">@color/material_dynamic_neutral90</color>
+    <color name="history_background_color">@color/e_background</color>
+    <color name="display_background_color">@color/e_background_variant</color>
 
     <!-- Display text -->
-    <color name="display_formula_text_color">@color/material_dynamic_neutral20</color>
-    <color name="display_result_text_color">@color/material_dynamic_neutral40</color>
-    <color name="display_result_exponent_text_color">@color/material_dynamic_neutral40</color>
+    <color name="display_formula_text_color">@color/e_primary_text_color</color>
+    <color name="display_result_text_color">@color/e_primary_text_color</color>
+    <color name="display_result_exponent_text_color">@color/e_primary_text_color</color>
 
+    <color name="num_key_background">#FAFAFA</color>
+    <color name="opt_key_background">#C9E5FF</color>
+    <color name="num_background">@color/e_action_bar</color>
+    <color name="eq_key_background">@color/e_accent</color>
+    <color name="eq_key_icon">@color/e_background</color>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a19a1c7de481087ff98a4faef4df79be30e67b67..6aa902c15bc1d39545dc0d7b9e3f81a032615d50 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -6,10 +6,23 @@
 <resources>
 
     <style name="Theme" parent="Theme.Material3.DayNight">
-        <item name="android:statusBarColor">@color/display_background_color</item>
+        <item name="android:statusBarColor">@color/e_action_bar</item>
         <item name="android:windowLightStatusBar">?isLightTheme</item>
-        <item name="android:navigationBarColor">?colorSurface</item>
+        <item name="android:navigationBarColor">@color/e_action_bar</item>
         <item name="android:windowLightNavigationBar">?isLightTheme</item>
+        <item name="popupMenuBackground">@color/e_floating_background</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog</item>
+    </style>
+
+    <style name="ThemeOverlay.App.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="elevationOverlayEnabled">false</item>
+        <item name="colorSurface">@color/e_floating_background</item>
+        <item name="buttonBarPositiveButtonStyle">@style/Widget.App.Button</item>
+        <item name="buttonBarNegativeButtonStyle">@style/Widget.App.Button</item>
+    </style>
+
+    <style name="Widget.App.Button" parent="Widget.Material3.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/e_accent</item>
     </style>
 
     <style name="Theme.Calculator">
@@ -30,18 +43,18 @@
     </style>
 
     <style name="Theme.Button.Advanced">
-        <item name="colorContainer">?colorSurface</item>
-        <item name="colorOnContainer">?colorOnSurface</item>
+        <item name="colorContainer">@color/num_background</item>
+        <item name="colorOnContainer">@color/e_primary_text_color</item>
     </style>
 
     <style name="Theme.Button.Numeric">
-        <item name="colorContainer">?colorSurfaceContainer</item>
-        <item name="colorOnContainer">?colorOnSurface</item>
+        <item name="colorContainer">@color/num_key_background</item>
+        <item name="colorOnContainer">@color/e_primary_text_color</item>
     </style>
 
     <style name="Theme.Button.Operator">
-        <item name="colorContainer">?colorSecondaryContainer</item>
-        <item name="colorOnContainer">?colorOnSecondaryContainer</item>
+        <item name="colorContainer">@color/opt_key_background</item>
+        <item name="colorOnContainer">@color/e_primary_text_color</item>
     </style>
 
     <style name="Theme.Button.Clear">
@@ -50,8 +63,8 @@
     </style>
 
     <style name="Theme.Button.Action">
-        <item name="colorContainer">?colorPrimaryContainer</item>
-        <item name="colorOnContainer">?colorOnPrimaryContainer</item>
+        <item name="colorContainer">@color/e_accent_light</item>
+        <item name="colorOnContainer">@android:color/white</item>
     </style>
 
 </resources>