diff --git a/build.gradle b/build.gradle
index 4f3b3aa3..ede96428 100644
--- a/build.gradle
+++ b/build.gradle
@@ -120,25 +120,38 @@ repositories {
 }
 
 dependencies {
-    // Frontend
-    implementation 'androidx.appcompat:appcompat:1.4.0-rc01'
-    implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    implementation 'androidx.fragment:fragment-ktx:1.4.0-rc01'
-    implementation 'com.google.android.material:material:1.5.0-alpha05'
 
-    // Backend
-    implementation 'io.coil-kt:coil:1.4.0'
+    // Core
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.room:room-runtime:2.3.0'
-    implementation 'io.reactivex.rxjava3:rxjava:3.1.1'
+    implementation 'androidx.appcompat:appcompat:1.4.0-rc01'
+    implementation 'androidx.fragment:fragment-ktx:1.4.0-rc01'
+
+    // Material3
+    implementation 'com.google.android.material:material:1.5.0-beta01'
+
+    // Coil
+    implementation 'io.coil-kt:coil:1.4.0'
+
+    // OkHttps
     implementation 'com.squareup.okhttp3:okhttp:4.9.2'
+
+    // RxJava
+    implementation 'io.reactivex.rxjava3:rxjava:3.1.1'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+
+    // LibSu
     implementation 'com.github.topjohnwu.libsu:core:3.1.2'
+
+    // JackSon
     implementation 'com.fasterxml.jackson.core:jackson-core:2.13.0'
+
+    // Coroutines / Lifecycle
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
 
+    // Room
+    implementation 'androidx.room:room-runtime:2.3.0'
     implementation 'androidx.room:room-ktx:2.3.0'
     kapt 'androidx.room:room-compiler:2.3.0'
 }
diff --git a/src/main/res/color/switch_thumb_tint.xml b/src/main/res/color/switch_thumb_tint.xml
index 9d29e868..2ba4d629 100644
--- a/src/main/res/color/switch_thumb_tint.xml
+++ b/src/main/res/color/switch_thumb_tint.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnSurfaceInverse" android:state_enabled="false"/>
-    <item android:color="?attr/colorPrimary" android:state_checked="true"/>
-    <item android:color="?attr/colorOutline"/>
+    <item android:color="?attr/colorOnSurfaceInverse" android:state_enabled="false" />
+    <item android:color="?attr/colorPrimary" android:state_checked="true" />
+    <item android:color="?attr/colorOutline" />
 </selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/background_border.xml b/src/main/res/drawable/background_border.xml
index 81a07801..a8856e96 100644
--- a/src/main/res/drawable/background_border.xml
+++ b/src/main/res/drawable/background_border.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/colorSurface"/>
+    <solid android:color="?attr/colorSurface" />
     <corners android:radius="@dimen/shape_large_corner" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment.xml b/src/main/res/layout/fragment.xml
index 1a73f163..84d6987b 100644
--- a/src/main/res/layout/fragment.xml
+++ b/src/main/res/layout/fragment.xml
@@ -2,18 +2,18 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/coordinator"
-    android:background="?colorSurface"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?colorSurface"
     android:elevation="0dp"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout"
         style="?attr/appBarLayoutStyle"
-        android:background="@android:color/transparent"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
diff --git a/src/main/res/layout/product_item.xml b/src/main/res/layout/product_item.xml
index b5b429e5..e8fc394b 100644
--- a/src/main/res/layout/product_item.xml
+++ b/src/main/res/layout/product_item.xml
@@ -47,8 +47,8 @@
                     android:layout_height="wrap_content"
                     android:maxWidth="70dp"
                     android:singleLine="true"
-                    android:textColor="?android:attr/textColorSecondary"
-                    android:textAppearance="?textAppearanceCaption" />
+                    android:textAppearance="?textAppearanceCaption"
+                    android:textColor="?android:attr/textColorSecondary" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -57,8 +57,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textAppearance="?textAppearanceBody2" />
+                android:textAppearance="?textAppearanceBody2"
+                android:textColor="?android:attr/textColorSecondary" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index a12b99d6..b35e8ef8 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_failed">Eylem başarısız</string>
-    <string name="add_repository">Depo ekle</string>nm 
+    <string name="add_repository">Depo ekle</string>nm
     <string name="address">Adres</string>
     <string name="all_applications">Tüm uygulamalar</string>
     <string name="all_applications_up_to_date">Tüm uygulamalar güncel</string>