diff --git a/assets/licenses.html b/assets/licenses.html
index 4583bf74d041885bf1bf9c365d5de27884c66379..a9128a257ea003e787b72ec140d57ac251d8652a 100644
--- a/assets/licenses.html
+++ b/assets/licenses.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta name="viewport" content="width=device-width">
-<style> body { font-family: sans-serif; } pre { background-color: #eeeeee; padding: 1em; white-space: pre-wrap; word-wrap: break-word; } </style>
+<style> body { font-family: sans-serif; color: #000000cc; background-color: #fafafa; } pre { padding: 1em; white-space: pre-wrap; word-wrap: break-word; } </style>
 </head>
 <body>
 <h3>Notices for files:</h3>
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c78bf0f9b0178d091fa611528a71dc3d5737720d
--- /dev/null
+++ b/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/calculator_accent_color">
+    <path
+        android:fillColor="@color/calculator_accent_color"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/res/drawable/ic_del.xml b/res/drawable/ic_del.xml
index 3e5ffb611958eebd41d519f0ae1bfd6a6087d8cc..8eae46ce9b66c13aa658ef2d825ed6e633dfd006 100644
--- a/res/drawable/ic_del.xml
+++ b/res/drawable/ic_del.xml
@@ -23,7 +23,7 @@
     android:tint="@color/calculator_accent_color"
     >
     <path
-        android:fillColor="@color/pad_button_text_color"
+        android:fillColor="@color/calculator_accent_color"
         android:pathData="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41
         L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21
         H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5
diff --git a/res/drawable/ic_history_grey600_48dp.xml b/res/drawable/ic_history_grey600_48dp.xml
index 65103fc4d341f9725349261420760f79db24e330..ca23d348abaf5dcf63c9e7e8df5d5e037c37ba1f 100644
--- a/res/drawable/ic_history_grey600_48dp.xml
+++ b/res/drawable/ic_history_grey600_48dp.xml
@@ -21,7 +21,7 @@
     android:viewportHeight="48.0"
     android:viewportWidth="48.0">
     <path
-        android:fillColor="#757575"
+        android:fillColor="@lineageos.platform:color/color_default_gray2"
         android:pathData="M25.99,6C16.04,6 8,14.06 8,24H2l7.79,7.79 0.14,0.29L18,24h-6c0,-7.73
         6.27,-14 14,-14s14,6.27 14,14 -6.27,14 -14,14c-3.87,0 -7.36,-1.58
         -9.89,-4.11l-2.83,2.83C16.53,39.98 21.02,42 25.99,42 35.94,42 44,33.94 44,24S35.94,6
diff --git a/res/drawable/ic_more.xml b/res/drawable/ic_more.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb65be3f706f3cb867ee2d1c5b791c69f4d9c0c3
--- /dev/null
+++ b/res/drawable/ic_more.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/calculator_accent_color">
+    <path
+        android:fillColor="@color/calculator_accent_color"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml
index 72c09a6efdb964fb6fea70ffe9dfb42bdb3e2b26..903b4e5b3601f16be326bbbac79abbe95116d4ae 100644
--- a/res/layout/activity_calculator_port.xml
+++ b/res/layout/activity_calculator_port.xml
@@ -23,7 +23,7 @@
 
     <include layout="@layout/display" />
     <View
-        android:background="@color/calculator_accent_color"
+        android:background="@lineageos.platform:color/color_default_divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"/>
 
diff --git a/res/layout/pad_numeric.xml b/res/layout/pad_numeric.xml
index 4445bafa73e5f74e9ff40f1c5de3a997d33d72b4..1725a2539c707abedf3fd459c81a86c6d6ee59c0 100644
--- a/res/layout/pad_numeric.xml
+++ b/res/layout/pad_numeric.xml
@@ -120,7 +120,7 @@
             android:background="@drawable/circle_bg"
             android:contentDescription="@string/desc_eq"
             android:text="@string/eq"
-            android:textColor="@color/color_default_foreground" />
+            android:textColor="@android:color/white" />
     </RelativeLayout>
 
 </androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/pad_operator_two_col.xml b/res/layout/pad_operator_two_col.xml
index b9a26ba7aa68c809e03b4aeda5fcf4141fedb413..b7e5d8877961f4cc8bd3aa55d65ad87540f608bc 100644
--- a/res/layout/pad_operator_two_col.xml
+++ b/res/layout/pad_operator_two_col.xml
@@ -83,7 +83,7 @@
         android:onClick="onButtonClick"
         app:layout_gravity="fill">
         <Button
-            android:textColor="@color/color_default_foreground"
+            android:textColor="@android:color/white"
             android:id="@+id/eq"
             android:layout_width="48dp"
             android:layout_height="48dp"
diff --git a/res/values-night/lineage_colors.xml b/res/values-night/lineage_colors.xml
deleted file mode 100644
index 2222e36f82841a6bbc02896f47d8484398105be0..0000000000000000000000000000000000000000
--- a/res/values-night/lineage_colors.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 The LineageOS Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-    <!-- Primary color (Color for the toolbars). -->
-    <color name="calculator_primary_color">#212121</color>
-
-    <!-- Status bar color. -->
-    <color name="calculator_statusbar_color">#000000</color>
-
-    <!-- Background color for the operator pad. -->
-    <color name="pad_operator_background_color">#1E1E1E</color>
-
-    <!-- Text color for the formula in the calculator display. -->
-    <color name="display_formula_text_color">@android:color/white</color>
-
-    <!-- Text color for the result in the calculator display. -->
-    <color name="display_result_text_color">#6CFFFFFF</color>
-
-    <!-- Lighter color for exponent while scrolling. -->
-    <color name="display_result_exponent_text_color">#40FFFFFF</color>
-
-    <!-- Text color for a button in a pad. -->
-    <color name="pad_button_text_color">@android:color/white</color>
-
-    <!-- Ripple color when a button is pressed in a pad. -->
-    <color name="pad_button_ripple_color">#33FFFFFF</color>
-
-    <!-- Background color for the advanced pad. -->
-    <color name="pad_advanced_background_color">#131313</color>
-
-    <!-- Text color for a button in the advanced pad. -->
-    <color name="pad_button_advanced_text_color">#CCFFFFFF</color>
-
-    <!-- Ripple color when a button is pressed in a pad. -->
-    <color name="pad_button_advanced_ripple_color">#1AFFFFFF</color>
-</resources>
diff --git a/res/values/color.xml b/res/values/color.xml
index 82a90125abb222cc136897126233adc134b297d7..f317c26cd63783429d7e382bb33d79d84b7715b6 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -20,53 +20,49 @@
     <!-- Default accent color. -->
     <color name="calculator_accent_color">@lineageos.platform:color/color_default_accent</color>
 
-    <!-- Primary color (Color for the toolbars). -->
-    <color name="calculator_primary_color">@lineageos.platform:color/color_default_foreground</color>
+    <color name="calculator_primary_color">@lineageos.platform:color/color_default_primary</color>
+
+    <color name="calculator_primary_dark_color">@lineageos.platform:color/color_default_primary_dark</color>
 
     <!-- Status bar color. -->
-    <color name="calculator_statusbar_color">@lineageos.platform:color/color_default_background</color>
+    <color name="calculator_statusbar_color">@lineageos.platform:color/color_default_primary_dark</color>
 
     <!-- Color to indicate an error has occured. -->
-    <color name="calculator_error_color">#d0422d</color>
+    <color name="calculator_error_color">@lineageos.platform:color/color_default_red1</color>
 
     <!-- Background color of the calculator display. -->
-    <color name="display_background_color">@color/calculator_primary_color</color>
+    <color name="display_background_color">@lineageos.platform:color/color_default_background</color>
 
     <!-- Text color for the formula in the calculator display. -->
-    <color name="display_formula_text_color">#000000</color>
+    <color name="display_formula_text_color">@lineageos.platform:color/color_default_primary_text</color>
 
     <!-- Text color for the result in the calculator display. -->
-    <color name="display_result_text_color">#6C000000</color>
+    <color name="display_result_text_color">@lineageos.platform:color/color_default_primary_text</color>
 
     <!-- Lighter color for exponent while scrolling. -->
-    <color name="display_result_exponent_text_color">#40000000</color>
+    <color name="display_result_exponent_text_color">@lineageos.platform:color/color_default_secondary_text</color>
 
     <!-- Background color for the numeric pad. -->
-    <color name="pad_numeric_background_color">@color/calculator_primary_color</color>
+    <color name="pad_numeric_background_color">@color/display_background_color</color>
 
     <!-- Background color for the operator pad. -->
-    <color name="pad_operator_background_color">@color/calculator_statusbar_color</color>
+    <color name="pad_operator_background_color">@color/display_background_color</color>
 
     <!-- Background color for the advanced pad. -->
-    <color name="pad_advanced_background_color">@lineageos.platform:color/color_default_deep_grey</color>
+    <color name="pad_advanced_background_color">@lineageos.platform:color/color_default_foreground</color>
 
     <!-- Text color for a button in a pad. -->
-    <color name="pad_button_text_color">#333</color>
+    <color name="pad_button_text_color">@lineageos.platform:color/color_default_primary_text</color>
 
     <!-- Text color for a button in the advanced pad. -->
     <color name="pad_button_advanced_text_color">@lineageos.platform:color/color_default_primary_text</color>
 
-    <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
-
     <!-- Ripple color when a button is pressed in a pad. -->
-    <color name="pad_button_ripple_color">#33000000</color>
+    <color name="pad_button_ripple_color">@lineageos.platform:color/color_default_secondary_text</color>
 
     <!-- Ripple color when a button is pressed in a pad. -->
-    <color name="pad_button_advanced_ripple_color">#1A000000</color>
+    <color name="pad_button_advanced_ripple_color">@lineageos.platform:color/color_default_secondary_text</color>
 
     <!-- Background color for empty history view. -->
-    <color name="empty_history_color">@color/calculator_primary_color</color>
-
-    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
-
+    <color name="empty_history_color">@color/display_background_color</color>
 </resources>
diff --git a/res/values/lineage_colors.xml b/res/values/lineage_colors.xml
index 0deed33b2fe67a1a9edf81bcf470972fab8c230a..a5aa0b66a1e74e50ced7815e2b95bd79b68ddd8d 100644
--- a/res/values/lineage_colors.xml
+++ b/res/values/lineage_colors.xml
@@ -16,6 +16,6 @@
   -->
 
 <resources>
-    <color name="navigationBar_color">@android:color/white</color>
-    <color name="navigationBar_divider">#1f000000</color>
+    <color name="navigationBar_color">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="navigationBar_divider">@lineageos.platform:color/color_default_primary_dark</color>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 2104fe35380bb81ff46de37f464d4babafa768e5..04ee246ac52b6df5c777358846b11f9bdcae5617 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,6 +19,7 @@
 
     <style name="Theme" parent="@android:style/Theme.Material.Light">
         <item name="android:colorPrimary">@color/calculator_primary_color</item>
+        <item name="android:colorPrimaryDark">@color/calculator_primary_dark_color</item>
         <item name="android:colorAccent">@color/calculator_accent_color</item>
         <item name="android:statusBarColor">@color/calculator_statusbar_color</item>
         <item name="android:windowSoftInputMode">stateAlwaysHidden</item>
@@ -26,6 +27,8 @@
         <item name="android:navigationBarDividerColor">@color/navigationBar_divider</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:actionOverflowButtonStyle">@style/actionOverflowButtonStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="Theme.Calculator">
@@ -34,10 +37,30 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:layoutDirection">ltr</item>
+        <item name="android:colorPrimary">@color/calculator_primary_color</item>
+        <item name="android:colorPrimaryDark">@color/calculator_primary_dark_color</item>
+        <item name="android:colorAccent">@color/calculator_accent_color</item>
+        <item name="android:statusBarColor">@color/calculator_statusbar_color</item>
+        <item name="android:navigationBarColor">@color/navigationBar_color</item>
+        <item name="android:navigationBarDividerColor">@color/navigationBar_divider</item>
+        <item name="android:actionOverflowButtonStyle">@style/actionOverflowButtonStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="Theme.Licenses">
         <item name="android:title">@string/menu_licenses</item>
+        <item name="android:colorPrimary">@color/calculator_primary_color</item>
+        <item name="android:colorPrimaryDark">@color/calculator_primary_dark_color</item>
+        <item name="android:colorAccent">@color/calculator_accent_color</item>
+        <item name="android:statusBarColor">@color/calculator_statusbar_color</item>
+        <item name="android:navigationBarColor">@color/navigationBar_color</item>
+        <item name="android:navigationBarDividerColor">@color/navigationBar_divider</item>
+        <item name="android:actionOverflowButtonStyle">@style/actionOverflowButtonStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
+    <style name="actionOverflowButtonStyle">
+        <item name="android:src">@drawable/ic_more</item>
+        <item name="android:tint">@color/calculator_accent_color</item>
+    </style>
 </resources>
