diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt
index df07cc913..6770b8e22 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt
@@ -22,7 +22,7 @@ class ChangeSortingDialog(
     init {
         currSorting = if (isDirectorySorting) config.directorySorting else config.getFolderSorting(pathToUse)
         binding = DialogChangeSortingBinding.inflate(activity.layoutInflater).apply {
-            useForThisFolderDivider.beVisibleIf(showFolderCheckbox || (currSorting and SORT_BY_NAME != 0 || currSorting and SORT_BY_PATH != 0))
+            sortingDialogOrderDivider.beVisibleIf(showFolderCheckbox || (currSorting and SORT_BY_NAME != 0 || currSorting and SORT_BY_PATH != 0))
 
             sortingDialogNumericSorting.beVisibleIf(showFolderCheckbox && (currSorting and SORT_BY_NAME != 0 || currSorting and SORT_BY_PATH != 0))
             sortingDialogNumericSorting.isChecked = currSorting and SORT_USE_NUMERIC_VALUE != 0
@@ -46,14 +46,14 @@ class ChangeSortingDialog(
 
     private fun setupSortRadio() {
         val sortingRadio = binding.sortingDialogRadioSorting
-        sortingRadio.setOnCheckedChangeListener { group, checkedId ->
+        sortingRadio.setOnCheckedChangeListener { _, checkedId ->
             val isSortingByNameOrPath = checkedId == binding.sortingDialogRadioName.id || checkedId == binding.sortingDialogRadioPath.id
             binding.sortingDialogNumericSorting.beVisibleIf(isSortingByNameOrPath)
-            binding.useForThisFolderDivider.beVisibleIf(binding.sortingDialogNumericSorting.isVisible() || binding.sortingDialogUseForThisFolder.isVisible())
+            binding.sortingDialogOrderDivider.beVisibleIf(binding.sortingDialogNumericSorting.isVisible() || binding.sortingDialogUseForThisFolder.isVisible())
 
             val hideSortOrder = checkedId == binding.sortingDialogRadioCustom.id || checkedId == binding.sortingDialogRadioRandom.id
             binding.sortingDialogRadioOrder.beGoneIf(hideSortOrder)
-            binding.sortingDialogOrderDivider.beGoneIf(hideSortOrder)
+            binding.sortingDialogSortingDivider.beGoneIf(hideSortOrder)
         }
 
         val sortBtn = when {
diff --git a/app/src/main/res/layout/dialog_change_sorting.xml b/app/src/main/res/layout/dialog_change_sorting.xml
index a64047385..246be097a 100644
--- a/app/src/main/res/layout/dialog_change_sorting.xml
+++ b/app/src/main/res/layout/dialog_change_sorting.xml
@@ -63,9 +63,12 @@
 
         </RadioGroup>
 
-        <include
-            android:id="@+id/sorting_dialog_order_divider"
-            layout="@layout/divider" />
+        <ImageView
+            android:id="@+id/sorting_dialog_sorting_divider"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_height"
+            android:background="@color/divider_grey"
+            android:importantForAccessibility="no" />
 
         <RadioGroup
             android:id="@+id/sorting_dialog_radio_order"
@@ -87,9 +90,12 @@
                 android:text="@string/descending" />
         </RadioGroup>
 
-        <include
-            android:id="@+id/use_for_this_folder_divider"
-            layout="@layout/divider" />
+        <ImageView
+            android:id="@+id/sorting_dialog_order_divider"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_height"
+            android:background="@color/divider_grey"
+            android:importantForAccessibility="no" />
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/sorting_dialog_numeric_sorting"
diff --git a/gradle.properties b/gradle.properties
index 9a656f4f3..23bdc1ab5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 android.enableJetifier=true
 android.nonTransitiveRClass=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx8192m
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 28ba853f3..2504a57e8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,9 +13,9 @@ exif = "1.0.1"
 #Room
 room = "2.6.0-beta01"
 #Simple tools
-simple-commons = "7c1e5b5777"
+simple-commons = "73d78e5cd3"
 #Gradle
-gradlePlugins-agp = "8.1.0"
+gradlePlugins-agp = "8.1.1"
 #Other
 androidGifDrawable = "1.2.25"
 androidImageCropper = "4.5.0"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a1c8e5667..431103c4c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,4 +17,14 @@ dependencyResolutionManagement {
         maven(url = "https://artifactory.img.ly/artifactory/imgly")
     }
 }
+
+rootProject.name = "Simple-Gallery"
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 include(":app")
+
+// TODO: This will be deprecated in future. Migrate to the newer `pluginManagement { includeBuild() }` mechanism instead of explicitly substituting dependency.
+/*includeBuild("../Simple-Commons") {
+    dependencySubstitution {
+        substitute(module("com.github.SimpleMobileTools:Simple-Commons")).using(project(":commons"))
+    }
+}*/