diff --git a/app/build.gradle b/app/build.gradle
index 0996e3a2..7a683c1c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:76498ebadd'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:5cd2e8dc9b'
     implementation 'me.grantland:autofittextview:0.2.1'
     implementation 'net.objecthunter:exp4j:0.4.8'
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
index 82de6f2e..a4310876 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
@@ -74,6 +74,12 @@ class MainActivity : SimpleActivity(), Calculator {
         }
 
         vibrateOnButtonPress = config.vibrateOnButtonPress
+
+        val adjustedPrimaryColor = getAdjustedPrimaryColor()
+        arrayOf(btn_percent, btn_power, btn_root, btn_clear, btn_reset, btn_divide, btn_multiply, btn_plus, btn_minus, btn_equals, btn_decimal).forEach{
+            it.setTextColor(adjustedPrimaryColor)
+        }
+
     }
 
     override fun onPause() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
index 7c779591..40f8b920 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
@@ -32,6 +32,10 @@ class SettingsActivity : SimpleActivity() {
         arrayOf(settings_color_customization_label, settings_general_settings_label).forEach {
             it.setTextColor(getAdjustedPrimaryColor())
         }
+
+        arrayOf(settings_color_customization_holder, settings_general_settings_holder).forEach {
+            it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
diff --git a/app/src/main/res/layout/widget_config.xml b/app/src/main/res/layout/widget_config.xml
index d719232b..1459415d 100644
--- a/app/src/main/res/layout/widget_config.xml
+++ b/app/src/main/res/layout/widget_config.xml
@@ -46,6 +46,7 @@
             android:layout_centerVertical="true"
             android:paddingLeft="@dimen/activity_margin"
             android:paddingRight="@dimen/activity_margin" />
+
     </RelativeLayout>
 
     <ImageView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 82dda916..6e7513a0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="AppTheme" parent="AppTheme.Base"/>
+    <style name="AppTheme" parent="AppTheme.Base" />
 
     <style name="MyButton" parent="Widget.AppCompat.Button">
         <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>