diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt
index 37b317d9..5af1ef8c 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt
@@ -49,17 +49,17 @@ fun PrefsOtherPage() {
         ) {
             item {
                 PreferenceGroup(
-                    heading = stringResource(id = R.string.proxy)
-                ) {
-                    // TODO
-                }
+                    heading = stringResource(id = R.string.proxy),
+                    keys = proxyPrefs,
+                    onPrefDialog = onPrefDialog
+                )
             }
             item {
                 PreferenceGroup(
-                    heading = stringResource(id = R.string.credits)
-                ) {
-                    // TODO
-                }
+                    heading = stringResource(id = R.string.credits),
+                    keys = infoPrefs,
+                    onPrefDialog = onPrefDialog
+                )
             }
         }
 
diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt
index 0839f55e..304cdb37 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt
@@ -55,10 +55,17 @@ fun PrefsPersonalPage() {
         ) {
             item {
                 PreferenceGroup(
-                    heading = stringResource(id = R.string.prefs_personalization)
-                ) {
-                    // TODO
-                }
+                    heading = stringResource(id = R.string.prefs_personalization),
+                    keys = personalPrefs,
+                    onPrefDialog = onPrefDialog
+                )
+            }
+            item {
+                PreferenceGroup(
+                    heading = stringResource(id = R.string.prefs_cache),
+                    keys = cachePrefs,
+                    onPrefDialog = onPrefDialog
+                )
             }
         }
 
diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt
index b1a4c800..bd2d5769 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt
@@ -57,17 +57,24 @@ fun PrefsUpdatesPage() {
         ) {
             item {
                 PreferenceGroup(
-                    heading = stringResource(id = R.string.updates)
-                ) {
-                    // TODO
-                }
+                    heading = stringResource(id = R.string.prefs_sync),
+                    keys = syncPrefs,
+                    onPrefDialog = onPrefDialog
+                )
             }
             item {
                 PreferenceGroup(
-                    heading = stringResource(id = R.string.install_types)
-                ) {
-                    // TODO
-                }
+                    heading = stringResource(id = R.string.updates),
+                    keys = updatesPrefs,
+                    onPrefDialog = onPrefDialog
+                )
+            }
+            item {
+                PreferenceGroup(
+                    heading = stringResource(id = R.string.install_types),
+                    keys = installPrefs,
+                    onPrefDialog = onPrefDialog
+                )
             }
         }
 
diff --git a/src/main/kotlin/com/machiav3lli/fdroid/utility/Utils.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/Utils.kt
index b6be56e8..146b9f88 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/utility/Utils.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/Utils.kt
@@ -42,6 +42,7 @@ import androidx.core.text.HtmlCompat
 import androidx.core.text.util.LinkifyCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.FragmentManager
+import androidx.navigation.NavDestination
 import com.machiav3lli.fdroid.BuildConfig
 import com.machiav3lli.fdroid.PREFS_LANGUAGE_DEFAULT
 import com.machiav3lli.fdroid.R
@@ -56,6 +57,7 @@ import com.machiav3lli.fdroid.service.Connection
 import com.machiav3lli.fdroid.service.DownloadService
 import com.machiav3lli.fdroid.ui.compose.utils.Callbacks
 import com.machiav3lli.fdroid.ui.dialog.LaunchDialog
+import com.machiav3lli.fdroid.ui.navigation.NavItem
 import com.machiav3lli.fdroid.utility.extension.android.Android
 import com.machiav3lli.fdroid.utility.extension.android.singleSignature
 import com.machiav3lli.fdroid.utility.extension.android.versionCodeCompat