diff --git a/build.gradle b/build.gradle
index 6a0ab2789c..87ca1011e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@
 buildscript {
 
     ext {
-      kotlinVersion = '2.0.0'
+      kotlinVersion = '2.0.10'
         hilt_version = '2.44'
     }
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 1fa1435c69..e912b7a866 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -4,13 +4,13 @@
       <verify-metadata>true</verify-metadata>
       <verify-signatures>true</verify-signatures>
       <trusted-artifacts>
+         <trust file="tensorflow-lite-metadata-0.1.0-rc2.pom" reason="differing hash on every CI run - temp global trust"/>
+         <trust group="androidx.fragment"/>
          <trust group="com.android.tools.build" name="aapt2" version="8.4.1-11315950" reason="ships OS specific artifacts (win/linux) - temp global trust"/>
          <trust group="com.github.nextcloud-deps" name="android-talk-webrtc" version="110.5481.0" reason="ships OS specific artifacts (win/linux) - temp global trust"/>
+         <trust group="com.google.dagger"/>
+         <trust group="org.javassist" name="javassist" version="3.26.0-GA" reason="java assist"/>
          <trust file=".*-sources[.]jar" regex="true"/>
-          <trust group="com.google.dagger" />
-          <trust group="org.javassist" name="javassist" version="3.26.0-GA" reason="java assist"/>
-          <trust group="androidx.fragment"/>
-		 <trust file="tensorflow-lite-metadata-0.1.0-rc2.pom" reason="differing hash on every CI run - temp global trust"/>
       </trusted-artifacts>
       <ignored-keys>
          <ignored-key id="0AA3E5C3D232E79B" reason="Key couldn't be downloaded from any key server"/>
@@ -236,7 +236,6 @@
          <trusted-key id="E4AC7874F3479A0F1F8ECF9960BB45F36B649F22" group="fr.dudie" name="nominatim-api" version="3.4"/>
          <trusted-key id="E77417AC194160A3FABD04969A259C7EE636C5ED" group="^com[.]google($|([.].*))" regex="true"/>
          <trusted-key id="E7DC75FC24FB3C8DFE8086AD3D5839A2262CBBFB" group="org.jetbrains.kotlinx"/>
-          <trusted-key id="64B9B09F164AA0BF88742EB61188B69F6D6259CA" group="com.google.accompanist"/>
          <trusted-key id="E82D2EAF2E83830CE1F7F6BE571A5291E827E1C7" group="net.java" name="jvnet-parent" version="3"/>
          <trusted-key id="E85AED155021AF8A6C6B7A4A7C7D8456294423BA" group="org.objenesis"/>
          <trusted-key id="EAA526B91DD83BA3E1B9636FA730529CA355A63E" group="org.ccil.cowan.tagsoup" name="tagsoup" version="1.2.1"/>
@@ -299,14 +298,6 @@
             <sha256 value="f7a29bcba338575dcf89a553cff9cfad3f140340eaf2b56fd0193244da602c0a" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="androidx.activity" name="activity-compose" version="1.7.0">
-         <artifact name="activity-compose-1.7.0.aar">
-            <sha256 value="caa72885d1ce7979c1d6c59a8b255c6097b770780d4d4da95d56979a348646cd" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="activity-compose-1.7.0.module">
-            <sha256 value="f7a29bcba338575dcf89a553cff9cfad3f140340eaf2b56fd0193244da602c0a" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="androidx.annotation" name="annotation" version="1.0.0">
          <artifact name="annotation-1.0.0.jar">
             <sha256 value="0baae9755f7caf52aa80cd04324b91ba93af55d4d1d17dcc9a7b53d99ef7c016" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -339,50 +330,6 @@
             <sha256 value="9516c2ae44284ea0bd3d0eade0ee638879b708cbe31e3af92ba96c300604ebc3" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-       <component group="androidx.exifinterface" name="exifinterface" version="1.3.6">
-           <artifact name="exifinterface-1.3.6.aar">
-               <sha256 value="1804105e9e05fdd8f760413bad5de498c381aa329f4f9d94c851bc891ac654c6" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-           <artifact name="exifinterface-1.3.6.module">
-               <sha256 value="5e9fd84ca3fd3b7706f6856fa4383107de8676bf7c42b7d4b8108949414d6201" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
-       <component group="androidx.core" name="core" version="1.1.0">
-           <artifact name="core-1.1.0.pom">
-               <sha256 value="dae46132cdcd46b798425f7cb78fd65890869b6d26101ccdcd43461a4f51754c" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
-       <component group="androidx.core" name="core" version="1.3.2">
-           <artifact name="core-1.3.2.pom">
-               <sha256 value="afb5ea494dd083ed404cd51f580d218e37362f8ae326e893bee521290ed34920" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
-       <component group="androidx.test.ext" name="junit" version="1.1.5">
-           <artifact name="junit-1.1.5.aar">
-               <sha256 value="4307c0e60f5d701db9c59bcd9115af705113c36a9132fa3dbad58db1294e9bfd" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-           <artifact name="junit-1.1.5.pom">
-               <sha256 value="4cff0df04cae25831e821ef2f9129245783460e98d0fd67d8f6824065a134c4e" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
-       <component group="androidx.core" name="core-ktx" version="1.8.0">
-           <artifact name="core-ktx-1.8.0.module">
-               <sha256 value="a91bc3e02f209f643dd8275345a9e3003ce20d64fc0760eccf479c1709842f72" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
-       <component group="androidx.annotation" name="annotation-experimental" version="1.3.0">
-           <artifact name="annotation-experimental-1.3.0.aar">
-               <sha256 value="abfd29c8556e5bd0325a9f769ab9e9d154ff4a5515c476cdd5a2a8285b1b19dc" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-           <artifact name="annotation-experimental-1.3.0.module">
-               <sha256 value="5eebeaff01d042e06dcf292abf8964ad391e4b0159f0090f16253d6045d38da0" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
-       <component group="androidx.annotation" name="annotation-experimental" version="1.1.0-rc01">
-           <artifact name="annotation-experimental-1.1.0-rc01.module">
-               <sha256 value="d45ac493e84d968aabb2bea2b7744031a98cf5074447c0f3b862d600fc44b55c" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
       <component group="androidx.annotation" name="annotation" version="1.5.0">
          <artifact name="annotation-1.5.0.jar">
             <sha256 value="261fb7c0210858500bab66d34354972a75166ab4182add283780b05513d6ec4a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -399,14 +346,6 @@
             <sha256 value="fbc64f5c44a7added8b6eab517cf7d70555e25153bf5d44a6ed9b0e5312f7de9" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-       <component group="androidx.exifinterface" name="exifinterface" version="1.3.2">
-           <artifact name="exifinterface-1.3.2.aar">
-               <sha256 value="8770c180103e0b8c04a07eb4c59153af639b09eca25deae9bdcdaf869d1e5b6b" origin="Generated by Gradle"/>
-           </artifact>
-           <artifact name="exifinterface-1.3.2.module">
-               <sha256 value="10ba5b5cbea7f5c8758be4fdaec60a3545e891a1130d830a442b88cf5336a885" origin="Generated by Gradle"/>
-           </artifact>
-       </component>
       <component group="androidx.annotation" name="annotation-experimental" version="1.0.0">
          <artifact name="annotation-experimental-1.0.0.pom">
             <sha256 value="6b73ff6608f4b1d6cbab620b65708a382d0b39901cf4e6b0d16f84a1b04d7732" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -420,11 +359,6 @@
             <sha256 value="0361d1526a4d7501255e19779e09e93cdbd07fee0e2f5c50b7a137432d510119" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-       <component group="androidx.annotation" name="annotation-experimental" version="1.1.0-rc01">
-       <artifact name="annotation-experimental-1.1.0-rc01.module">
-           <sha256 value="d45ac493e84d968aabb2bea2b7744031a98cf5074447c0f3b862d600fc44b55c" origin="Generated by Gradle" reason="Artifact is not signed"/>
-       </artifact>
-       </component>
       <component group="androidx.annotation" name="annotation-experimental" version="1.1.0-rc01">
          <artifact name="annotation-experimental-1.1.0-rc01.module">
             <sha256 value="d45ac493e84d968aabb2bea2b7744031a98cf5074447c0f3b862d600fc44b55c" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -446,76 +380,6 @@
             <sha256 value="9b6974a7dfe26d3c209dd63e16f8ee2461b57a091789160ca1eb492bb1bf3f84" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-       <component group="androidx.annotation" name="annotation-experimental" version="1.3.0">
-           <artifact name="annotation-experimental-1.3.0.aar">
-               <sha256 value="abfd29c8556e5bd0325a9f769ab9e9d154ff4a5515c476cdd5a2a8285b1b19dc" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-           <artifact name="annotation-experimental-1.3.0.module">
-               <sha256 value="5eebeaff01d042e06dcf292abf8964ad391e4b0159f0090f16253d6045d38da0" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
-       <component group="androidx.activity" name="activity-compose" version="1.7.0">
-           <artifact name="activity-compose-1.7.0.aar">
-               <sha256 value="caa72885d1ce7979c1d6c59a8b255c6097b770780d4d4da95d56979a348646cd" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-           <artifact name="activity-compose-1.7.0.module">
-               <sha256 value="f7a29bcba338575dcf89a553cff9cfad3f140340eaf2b56fd0193244da602c0a" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
-       <component group="androidx.compose.runtime" name="runtime" version="1.0.1">
-           <artifact name="runtime-1.0.1.module">
-               <sha256 value="2543a8c7edc16bde91f140286b4fd3773d7204a283a4ec99f6e5e286aa92c0c3" origin="Generated by Gradle"/>
-           </artifact>
-       </component>
-       <component group="androidx.compose.runtime" name="runtime-saveable" version="1.0.1">
-           <artifact name="runtime-saveable-1.0.1.module">
-               <sha256 value="c0d6f142542d8d74f65481ef6526d2be265f01f812a112948fcde87a458f4fb6" origin="Generated by Gradle"/>
-           </artifact>
-       </component>
-       <component group="androidx.compose.ui" name="ui" version="1.0.1">
-           <artifact name="ui-1.0.1.aar">
-               <sha256 value="1943daa4a3412861b9a2bdc1a7c8c2ff05d9b8191c1d3e56ebb223d2eb4a8526" origin="Generated by Gradle"/>
-           </artifact>
-           <artifact name="ui-1.0.1.module">
-               <sha256 value="57031a6ac9b60e5b56792ebf5cde6e16812ff566ed9190cbd188b00b46c13779" origin="Generated by Gradle"/>
-           </artifact>
-       </component>
-       <component group="androidx.compose" name="compose-bom" version="2024.06.00">
-           <artifact name="compose-bom-2024.06.00.pom">
-               <sha256 value="1b391a969ff81c0bb43b3711e92d977e8bfa72457a11d8a37910a7051bdc3045" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
-       <component group="androidx.activity" name="activity-compose" version="1.7.0">
-           <artifact name="activity-compose-1.7.0.aar">
-               <sha256 value="caa72885d1ce7979c1d6c59a8b255c6097b770780d4d4da95d56979a348646cd" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-           <artifact name="activity-compose-1.7.0.module">
-               <sha256 value="f7a29bcba338575dcf89a553cff9cfad3f140340eaf2b56fd0193244da602c0a" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
-       <component group="androidx.compose.runtime" name="runtime" version="1.0.1">
-           <artifact name="runtime-1.0.1.module">
-               <sha256 value="2543a8c7edc16bde91f140286b4fd3773d7204a283a4ec99f6e5e286aa92c0c3" origin="Generated by Gradle"/>
-           </artifact>
-       </component>
-       <component group="androidx.compose.runtime" name="runtime-saveable" version="1.0.1">
-           <artifact name="runtime-saveable-1.0.1.module">
-               <sha256 value="c0d6f142542d8d74f65481ef6526d2be265f01f812a112948fcde87a458f4fb6" origin="Generated by Gradle"/>
-           </artifact>
-       </component>
-       <component group="androidx.compose.ui" name="ui" version="1.0.1">
-           <artifact name="ui-1.0.1.aar">
-               <sha256 value="1943daa4a3412861b9a2bdc1a7c8c2ff05d9b8191c1d3e56ebb223d2eb4a8526" origin="Generated by Gradle"/>
-           </artifact>
-           <artifact name="ui-1.0.1.module">
-               <sha256 value="57031a6ac9b60e5b56792ebf5cde6e16812ff566ed9190cbd188b00b46c13779" origin="Generated by Gradle"/>
-           </artifact>
-       </component>
-       <component group="androidx.compose" name="compose-bom" version="2024.06.00">
-           <artifact name="compose-bom-2024.06.00.pom">
-               <sha256 value="1b391a969ff81c0bb43b3711e92d977e8bfa72457a11d8a37910a7051bdc3045" origin="Generated by Gradle" reason="Artifact is not signed"/>
-           </artifact>
-       </component>
       <component group="androidx.appcompat" name="appcompat" version="1.1.0">
          <artifact name="appcompat-1.1.0.pom">
             <sha256 value="340d617121f8ef8e02a6680c8f357aa3e542276d0c8a1cdcb6fd98984b2cb7b9" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5719,6 +5583,11 @@
             <sha256 value="cc39e9e0c9bbeec5a0ccfe0a78734c541c00fca3027c6de8ebc13bade0f5400b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.0.10">
+         <artifact name="kotlin-build-tools-api-2.0.10.pom">
+            <sha256 value="e5d5e14359c87fa0cc6a43820e503c14a63da9693dc851d5399d1725a59e74ad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.9.22">
          <artifact name="kotlin-compiler-embeddable-1.9.22.pom">
             <sha256 value="b3da34bb6f4296acf3a0f443466f0506c6c99da5cd9624d6e0b745b2228784eb" origin="Generated by Gradle"/>
@@ -5739,6 +5608,11 @@
             <sha256 value="13c04c2c983a8faab531b64d0662db247fd35a1d88489330a1c29dc4a91e569e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="2.0.10">
+         <artifact name="kotlin-compiler-embeddable-2.0.10.pom">
+            <sha256 value="c453b7cc1f761671108743c5685b5e1cd51aebbfca955c40c06071ea6042135b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1.9.22">
          <artifact name="kotlin-compiler-runner-1.9.22.pom">
             <sha256 value="a4ee8a67c1d6f253838c0027280bcb8050ac0dcdccad974896138a69a017eb01" origin="Generated by Gradle"/>
@@ -5759,6 +5633,11 @@
             <sha256 value="42e6632358fa62be99bb8e4a278707e6b810dfc71ad3e5eea17e54ae39c83aac" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.0.10">
+         <artifact name="kotlin-compiler-runner-2.0.10.pom">
+            <sha256 value="2d66c1a340bada93e13898bfbaf2494b138ca8a10e680100dba392b298db1cbc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.9.22">
          <artifact name="kotlin-daemon-client-1.9.22.pom">
             <sha256 value="62c44a659da55db6fb125e2929b98d504a30e1f4af814e08e4921426aa524f8a" origin="Generated by Gradle"/>
@@ -5779,6 +5658,11 @@
             <sha256 value="dbbc417fbbe94efab6a05a081d0f6336dacffa9d0426375e2a1781c57c5c2991" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="2.0.10">
+         <artifact name="kotlin-daemon-client-2.0.10.pom">
+            <sha256 value="4a284530fb7563d59932abd3e2e17e73c7ea05788dd8d0d5ad2505a84e99996f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.9.22">
          <artifact name="kotlin-daemon-embeddable-1.9.22.pom">
             <sha256 value="f6ea3dcf6bfb3a0d0698447c48a6bcf08d8eaacf83fc95fe9d4181a5e5e3c2b1" origin="Generated by Gradle"/>
@@ -5799,11 +5683,21 @@
             <sha256 value="ce23393a051fa5e94275854e12cee7ac1c1e9f641bd71ace81cba6fd54f9bc1a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="2.0.10">
+         <artifact name="kotlin-daemon-embeddable-2.0.10.pom">
+            <sha256 value="0c50d6b3ead788ce77a765cf0c96bc970ac3b7d57a6d6636769fcdfedbb392b3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.0.0">
          <artifact name="kotlin-gradle-plugins-bom-2.0.0.pom">
             <sha256 value="c4a0586af77f0fb4f7e367033a02ac718beff0d0193cc7989583a982aa2752f2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.0.10">
+         <artifact name="kotlin-gradle-plugins-bom-2.0.10.pom">
+            <sha256 value="772e5ecadd154fdb1722b26401e3255475831bcb7992eb3c1cd68dc68164f5e4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.9.0">
          <artifact name="kotlin-reflect-1.9.0.pom">
             <sha256 value="8571565676d189720471306cee9a55d916c080382f35a6da68193ac7b12f4cdb" origin="Generated by Gradle"/>