diff --git a/app/src/main/kotlin/org/fossify/gallery/Constants.kt b/app/src/main/kotlin/org/fossify/gallery/Constants.kt
deleted file mode 100644
index ad0a4d844..000000000
--- a/app/src/main/kotlin/org/fossify/gallery/Constants.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.fossify.gallery
-
-const val SORT_BY_COUNT = 524288 // TODO: Replace with Constants from Commons, then delete this file.
diff --git a/app/src/main/kotlin/org/fossify/gallery/activities/SimpleActivity.kt b/app/src/main/kotlin/org/fossify/gallery/activities/SimpleActivity.kt
index 4808dd8da..258692277 100644
--- a/app/src/main/kotlin/org/fossify/gallery/activities/SimpleActivity.kt
+++ b/app/src/main/kotlin/org/fossify/gallery/activities/SimpleActivity.kt
@@ -59,6 +59,8 @@ open class SimpleActivity : BaseSimpleActivity() {
 
     override fun getAppLauncherName() = getString(R.string.app_launcher_name)
 
+    override fun getRepositoryName() = "Gallery"
+
     protected fun checkNotchSupport() {
         if (isPiePlus()) {
             val cutoutMode = when {
diff --git a/app/src/main/kotlin/org/fossify/gallery/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/org/fossify/gallery/dialogs/ChangeSortingDialog.kt
index e04690a84..dffc75fef 100644
--- a/app/src/main/kotlin/org/fossify/gallery/dialogs/ChangeSortingDialog.kt
+++ b/app/src/main/kotlin/org/fossify/gallery/dialogs/ChangeSortingDialog.kt
@@ -5,7 +5,6 @@ import org.fossify.commons.activities.BaseSimpleActivity
 import org.fossify.commons.extensions.*
 import org.fossify.commons.helpers.*
 import org.fossify.gallery.R
-import org.fossify.gallery.SORT_BY_COUNT
 import org.fossify.gallery.databinding.DialogChangeSortingBinding
 import org.fossify.gallery.extensions.config
 import org.fossify.gallery.helpers.SHOW_ALL
diff --git a/app/src/main/kotlin/org/fossify/gallery/extensions/Context.kt b/app/src/main/kotlin/org/fossify/gallery/extensions/Context.kt
index b8419b1c6..38932ea6a 100644
--- a/app/src/main/kotlin/org/fossify/gallery/extensions/Context.kt
+++ b/app/src/main/kotlin/org/fossify/gallery/extensions/Context.kt
@@ -37,7 +37,6 @@ import org.fossify.commons.extensions.*
 import org.fossify.commons.helpers.*
 import org.fossify.commons.views.MySquareImageView
 import org.fossify.gallery.R
-import org.fossify.gallery.SORT_BY_COUNT
 import org.fossify.gallery.asynctasks.GetMediaAsynctask
 import org.fossify.gallery.databases.GalleryDatabase
 import org.fossify.gallery.helpers.*
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6d2a6de2b..56e1173af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -289,7 +289,4 @@
         Haven't found some strings? There's more at
         https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
     -->
-
-    <!-- Replace with strings.xml from Commons, then delete these lines. -->
-    <string name="number_of_items">Number of items</string>
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 923437df0..2dbe6e2ee 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ exif = "1.0.1"
 #Room
 room = "2.6.1"
 #Fossify
-commons = "39c99b73c7"
+commons = "9e28c573e8"
 #Gradle4
 gradlePlugins-agp = "8.6.1"
 #Other
@@ -55,7 +55,7 @@ androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "
 androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 #Fossify
-fossify-commons = { module = "org.fossify:commons", version.ref = "commons" }
+fossify-commons = { module = "com.github.FossifyOrg:Commons", version.ref = "commons" }
 #Other
 android-gif-drawable = { module = "pl.droidsonroids.gif:android-gif-drawable", version.ref = "androidGifDrawable" }
 android-image-cropper = { module = "com.vanniktech:android-image-cropper", version.ref = "androidImageCropper" }