diff --git a/app/build.gradle b/app/build.gradle
index 675396ce..7c919df1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -223,21 +223,21 @@ dependencies {
     implementation 'com.google.android.material:material:1.11.0'
 
     //Dagger (dependency injection)
-    implementation 'com.google.dagger:dagger:2.50'
-    ksp 'com.google.dagger:dagger-compiler:2.50'
+    implementation 'com.google.dagger:dagger:2.51'
+    ksp 'com.google.dagger:dagger-compiler:2.51'
 
-    implementation("com.google.dagger:hilt-android:2.50")
-    ksp "com.google.dagger:hilt-compiler:2.50"
+    implementation('com.google.dagger:hilt-android:2.51')
+    ksp 'com.google.dagger:hilt-compiler:2.51'
 
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.10.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.10.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava3:2.10.0'
     implementation 'io.reactivex.rxjava3:rxjava:3.1.8'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
     implementation 'com.github.connyduck:sparkbutton:4.1.0'
 
-    implementation 'org.pixeldroid.pixeldroid:android-media-editor:1.7'
+    implementation 'org.pixeldroid.pixeldroid:android-media-editor:2.0'
     implementation project(path: ':scrambler')
     implementation project(path: ':pixel_common')
 
diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationFragment.kt b/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationFragment.kt
index 8e53629a..71cda420 100644
--- a/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationFragment.kt
+++ b/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationFragment.kt
@@ -39,6 +39,8 @@ import org.pixeldroid.app.utils.bindingLifecycleAware
 import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity
 import org.pixeldroid.app.utils.fileExtension
 import org.pixeldroid.app.utils.getMimeType
+import org.pixeldroid.media_editor.common.PICTURE_POSITION
+import org.pixeldroid.media_editor.common.PICTURE_URI
 import org.pixeldroid.media_editor.photoEdit.PhotoEditActivity
 import org.pixeldroid.media_editor.videoEdit.VideoEditActivity
 import java.io.File
@@ -47,7 +49,6 @@ import java.text.SimpleDateFormat
 import java.util.Locale
 
 class PostCreationFragment : BaseFragment() {
-
     private var binding: FragmentPostCreationBinding by bindingLifecycleAware()
     private val model: PostCreationViewModel by activityViewModels()
 
@@ -307,7 +308,7 @@ class PostCreationFragment : BaseFragment() {
         ActivityResultContracts.StartActivityForResult()){
             result: ActivityResult? ->
         if (result?.resultCode == Activity.RESULT_OK && result.data != null) {
-            val position: Int = result.data!!.getIntExtra(PhotoEditActivity.PICTURE_POSITION, 0)
+            val position: Int = result.data!!.getIntExtra(PICTURE_POSITION, 0)
             model.modifyAt(position, result.data!!)
                 ?: Toast.makeText(requireActivity(), R.string.error_editing, Toast.LENGTH_SHORT).show()
         } else if(result?.resultCode != Activity.RESULT_CANCELED){
@@ -320,8 +321,8 @@ class PostCreationFragment : BaseFragment() {
             requireActivity(),
             if (model.getPhotoData().value!![position].video) VideoEditActivity::class.java else PhotoEditActivity::class.java
         )
-            .putExtra(PhotoEditActivity.PICTURE_URI, model.getPhotoData().value!![position].imageUri)
-            .putExtra(PhotoEditActivity.PICTURE_POSITION, position)
+            .putExtra(PICTURE_URI, model.getPhotoData().value!![position].imageUri)
+            .putExtra(PICTURE_POSITION, position)
 
         editResultContract.launch(intent)
     }
diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationViewModel.kt b/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationViewModel.kt
index 40bc5cf9..993030ef 100644
--- a/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationViewModel.kt
+++ b/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationViewModel.kt
@@ -40,6 +40,7 @@ import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity
 import org.pixeldroid.app.utils.di.PixelfedAPIHolder
 import org.pixeldroid.app.utils.fileExtension
 import org.pixeldroid.app.utils.getMimeType
+import org.pixeldroid.media_editor.common.PICTURE_URI
 import org.pixeldroid.media_editor.videoEdit.VideoEditActivity
 import retrofit2.HttpException
 import java.io.File
@@ -299,7 +300,7 @@ class PostCreationViewModel @Inject constructor(
                     }
                 }
             } else {
-                imageUri = data.getStringExtra(org.pixeldroid.media_editor.photoEdit.PhotoEditActivity.PICTURE_URI)!!.toUri()
+                imageUri = data.getStringExtra(PICTURE_URI)!!.toUri()
                 val (imageSize, imageVideo) = getSizeAndVideoValidate(imageUri, position)
                 size = imageSize
                 video = imageVideo
diff --git a/build.gradle b/build.gradle
index b72f7232..5e54a8ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/pixel_common b/pixel_common
index 956bd5f8..702d14fe 160000
--- a/pixel_common
+++ b/pixel_common
@@ -1 +1 @@
-Subproject commit 956bd5f88d6189009f2ba0a8cb2860a1bfee0ee6
+Subproject commit 702d14fe701343958337efa1b4eb31f0250849f6
diff --git a/scrambler b/scrambler
index 7c67b911..23d4d94b 160000
--- a/scrambler
+++ b/scrambler
@@ -1 +1 @@
-Subproject commit 7c67b911930b4344a2917f2944493e08fdd04b57
+Subproject commit 23d4d94b45a848f0c64a042985eb03d0acc2f18b