diff --git a/app/build.gradle b/app/build.gradle
index 3b7511bf..0565464b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:f38bfd22d5'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:d949143b75'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation "androidx.exifinterface:exifinterface:1.3.5"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
index 91385459..295df007 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
@@ -57,18 +57,9 @@ class SettingsActivity : SimpleActivity() {
         ).forEach {
             it.setTextColor(properPrimaryColor)
         }
-
-        arrayOf(
-            settings_color_customization_holder,
-            settings_general_settings_holder,
-            settings_shutter_holder,
-            settings_saving_holder
-        ).forEach {
-            it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
-        }
     }
 
-    fun refreshMenuItems() {
+    private fun refreshMenuItems() {
         settings_toolbar.menu.apply {
             findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
         }
@@ -87,13 +78,6 @@ class SettingsActivity : SimpleActivity() {
 
     private fun setupPurchaseThankYou() {
         settings_purchase_thank_you_holder.beGoneIf(isOrWasThankYouInstalled())
-
-        // make sure the corners at ripple fit the stroke rounded corners
-        if (settings_purchase_thank_you_holder.isGone()) {
-            settings_use_english_holder.background = resources.getDrawable(R.drawable.ripple_all_corners, theme)
-            settings_language_holder.background = resources.getDrawable(R.drawable.ripple_all_corners, theme)
-        }
-
         settings_purchase_thank_you_holder.setOnClickListener {
             launchPurchaseThankYouIntent()
         }
@@ -101,7 +85,7 @@ class SettingsActivity : SimpleActivity() {
 
     private fun setupCustomizeColors() {
         settings_customize_colors_label.text = getCustomizeColorsString()
-        settings_customize_colors_holder.setOnClickListener {
+        settings_color_customization_holder.setOnClickListener {
             handleCustomizeColorsClick()
         }
     }
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index f87abd9d..60e0b3aa 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -36,30 +36,26 @@
                 android:layout_height="wrap_content"
                 android:text="@string/color_customization" />
 
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/settings_color_customization_holder"
+                style="@style/SettingsHolderTextViewOneLinerStyle"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/medium_margin"
-                android:background="@drawable/section_holder_stroke"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
-                <RelativeLayout
-                    android:id="@+id/settings_customize_colors_holder"
-                    style="@style/SettingsHolderTextViewOneLinerStyle"
-                    android:layout_width="match_parent"
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/settings_customize_colors_label"
+                    style="@style/SettingsTextLabelStyle"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_all_corners">
+                    android:text="@string/customize_colors"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-                    <com.simplemobiletools.commons.views.MyTextView
-                        android:id="@+id/settings_customize_colors_label"
-                        style="@style/SettingsTextLabelStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/customize_colors" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-                </RelativeLayout>
-            </LinearLayout>
+            <include
+                android:id="@+id/settings_color_customization_divider"
+                layout="@layout/divider" />
 
             <TextView
                 android:id="@+id/settings_general_settings_label"
@@ -72,16 +68,13 @@
                 android:id="@+id/settings_general_settings_holder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/medium_margin"
-                android:background="@drawable/section_holder_stroke"
                 android:orientation="vertical">
 
                 <RelativeLayout
                     android:id="@+id/settings_purchase_thank_you_holder"
                     style="@style/SettingsHolderTextViewOneLinerStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_top_corners">
+                    android:layout_height="wrap_content">
 
                     <com.simplemobiletools.commons.views.MyTextView
                         android:id="@+id/settings_purchase_thank_you"
@@ -96,8 +89,7 @@
                     android:id="@+id/settings_use_english_holder"
                     style="@style/SettingsHolderCheckboxStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_background">
+                    android:layout_height="wrap_content">
 
                     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                         android:id="@+id/settings_use_english"
@@ -112,8 +104,7 @@
                     android:id="@+id/settings_language_holder"
                     style="@style/SettingsHolderTextViewStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_bottom_corners">
+                    android:layout_height="wrap_content">
 
                     <com.simplemobiletools.commons.views.MyTextView
                         android:id="@+id/settings_language_label"
@@ -133,6 +124,10 @@
                 </RelativeLayout>
             </LinearLayout>
 
+            <include
+                android:id="@+id/settings_general_settings_divider"
+                layout="@layout/divider" />
+
             <TextView
                 android:id="@+id/settings_shutter_label"
                 style="@style/SettingsSectionLabelStyle"
@@ -144,16 +139,13 @@
                 android:id="@+id/settings_shutter_holder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/medium_margin"
-                android:background="@drawable/section_holder_stroke"
                 android:orientation="vertical">
 
                 <RelativeLayout
                     android:id="@+id/settings_sound_holder"
                     style="@style/SettingsHolderCheckboxStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_top_corners">
+                    android:layout_height="wrap_content">
 
                     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                         android:id="@+id/settings_sound"
@@ -168,8 +160,7 @@
                     android:id="@+id/settings_volume_buttons_as_shutter_holder"
                     style="@style/SettingsHolderCheckboxStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_bottom_corners">
+                    android:layout_height="wrap_content">
 
                     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                         android:id="@+id/settings_volume_buttons_as_shutter"
@@ -181,6 +172,10 @@
                 </RelativeLayout>
             </LinearLayout>
 
+            <include
+                android:id="@+id/settings_shutter_divider"
+                layout="@layout/divider" />
+
             <TextView
                 android:id="@+id/settings_saving_label"
                 style="@style/SettingsSectionLabelStyle"
@@ -192,16 +187,13 @@
                 android:id="@+id/settings_saving_holder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/medium_margin"
-                android:background="@drawable/section_holder_stroke"
                 android:orientation="vertical">
 
                 <RelativeLayout
                     android:id="@+id/settings_save_photo_metadata_holder"
                     style="@style/SettingsHolderCheckboxStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_top_corners">
+                    android:layout_height="wrap_content">
 
                     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                         android:id="@+id/settings_save_photo_metadata"
@@ -216,8 +208,7 @@
                     android:id="@+id/settings_flip_photos_holder"
                     style="@style/SettingsHolderCheckboxStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_background">
+                    android:layout_height="wrap_content">
 
                     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                         android:id="@+id/settings_flip_photos"
@@ -232,8 +223,7 @@
                     android:id="@+id/settings_save_photos_holder"
                     style="@style/SettingsHolderTextViewStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_background">
+                    android:layout_height="wrap_content">
 
                     <com.simplemobiletools.commons.views.MyTextView
                         android:id="@+id/settings_save_photos_label"
@@ -256,8 +246,7 @@
                     android:id="@+id/settings_photo_quality_holder"
                     style="@style/SettingsHolderTextViewStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_background">
+                    android:layout_height="wrap_content">
 
                     <com.simplemobiletools.commons.views.MyTextView
                         android:id="@+id/settings_photo_quality_label"
@@ -280,8 +269,7 @@
                     android:id="@+id/settings_capture_mode_holder"
                     style="@style/SettingsHolderTextViewStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_bottom_corners">
+                    android:layout_height="wrap_content">
 
                     <com.simplemobiletools.commons.views.MyTextView
                         android:id="@+id/settings_capture_mode_label"