diff --git a/build.gradle b/build.gradle
index 72e01fd7..6c29ea6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -132,7 +132,6 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10'
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.appcompat:appcompat-resources:1.4.1'
     implementation 'androidx.fragment:fragment-ktx:1.4.1'
     implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation "androidx.preference:preference-ktx:1.2.0"
diff --git a/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt b/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt
index 4836ec25..d4cd6445 100644
--- a/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt
@@ -22,9 +22,9 @@ import android.view.Gravity
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import androidx.appcompat.widget.LinearLayoutCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.net.toUri
 import androidx.core.text.HtmlCompat
@@ -349,7 +349,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
             this.defaultIcon = Utils.getDefaultApplicationIcon(icon.context)
         }
 
-        val targetBlock = itemView.findViewById<LinearLayoutCompat>(R.id.sdk_block)!!
+        val targetBlock = itemView.findViewById<LinearLayout>(R.id.sdk_block)!!
         val divider1 = itemView.findViewById<MaterialDivider>(R.id.divider1)!!
         val targetSdk = itemView.findViewById<MaterialTextView>(R.id.sdk)!!
         val version = itemView.findViewById<MaterialTextView>(R.id.version)!!
@@ -507,12 +507,12 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
     }
 
     private class EmptyViewHolder(context: Context) :
-        RecyclerView.ViewHolder(LinearLayoutCompat(context)) {
+        RecyclerView.ViewHolder(LinearLayout(context)) {
         val packageName: MaterialTextView
 
         init {
-            itemView as LinearLayoutCompat
-            itemView.orientation = LinearLayoutCompat.VERTICAL
+            itemView as LinearLayout
+            itemView.orientation = LinearLayout.VERTICAL
             itemView.gravity = Gravity.CENTER
             itemView.resources.sizeScaled(20).let { itemView.setPadding(it, it, it, it) }
             val title = MaterialTextView(itemView.context)
@@ -523,8 +523,8 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
             title.setText(R.string.application_not_found)
             itemView.addView(
                 title,
-                LinearLayoutCompat.LayoutParams.MATCH_PARENT,
-                LinearLayoutCompat.LayoutParams.WRAP_CONTENT
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
             )
             val packageName = MaterialTextView(itemView.context)
             packageName.gravity = Gravity.CENTER
@@ -532,8 +532,8 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
             packageName.setTextSizeScaled(18)
             itemView.addView(
                 packageName,
-                LinearLayoutCompat.LayoutParams.MATCH_PARENT,
-                LinearLayoutCompat.LayoutParams.WRAP_CONTENT
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
             )
             itemView.layoutParams = RecyclerView.LayoutParams(
                 RecyclerView.LayoutParams.MATCH_PARENT,
diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsNavFragmentX.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsNavFragmentX.kt
index 98d949c7..5805e4c0 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsNavFragmentX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsNavFragmentX.kt
@@ -11,8 +11,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
+import android.widget.LinearLayout
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.widget.LinearLayoutCompat
 import androidx.core.net.toUri
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.DialogFragment
@@ -119,7 +119,7 @@ abstract class PrefsNavFragmentX : Fragment() {
         }
     }
 
-    protected fun LinearLayoutCompat.addText(title: String, summary: String, url: String) {
+    protected fun LinearLayout.addText(title: String, summary: String, url: String) {
         val text = MaterialTextView(context)
         val subText = MaterialTextView(context)
         text.text = title
@@ -132,21 +132,21 @@ abstract class PrefsNavFragmentX : Fragment() {
         }
         addView(
             text,
-            LinearLayoutCompat.LayoutParams.MATCH_PARENT,
-            LinearLayoutCompat.LayoutParams.WRAP_CONTENT
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
         )
         addView(
             subText,
-            LinearLayoutCompat.LayoutParams.MATCH_PARENT,
-            LinearLayoutCompat.LayoutParams.WRAP_CONTENT
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
         )
         text.setOnClickListener { openURI(url.toUri()) }
         subText.setOnClickListener { openURI(url.toUri()) }
     }
 
-    protected inline fun LinearLayoutCompat.addCategory(
+    protected inline fun LinearLayout.addCategory(
         title: String,
-        callback: LinearLayoutCompat.() -> Unit,
+        callback: LinearLayout.() -> Unit,
     ) {
         val text = MaterialTextView(context)
         text.typeface = TypefaceExtra.medium
@@ -156,13 +156,13 @@ abstract class PrefsNavFragmentX : Fragment() {
         resources.sizeScaled(16).let { text.setPadding(it, it, it, 0) }
         addView(
             text,
-            LinearLayoutCompat.LayoutParams.MATCH_PARENT,
-            LinearLayoutCompat.LayoutParams.WRAP_CONTENT
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
         )
         callback()
     }
 
-    protected fun <T> LinearLayoutCompat.addPreference(
+    protected fun <T> LinearLayout.addPreference(
         key: Preferences.Key<T>, title: String,
         summaryProvider: () -> String, dialogProvider: ((Context) -> AlertDialog)?,
     ): Preference<T> {
@@ -172,7 +172,7 @@ abstract class PrefsNavFragmentX : Fragment() {
         return preference
     }
 
-    protected fun LinearLayoutCompat.addSwitch(
+    protected fun LinearLayout.addSwitch(
         key: Preferences.Key<Boolean>,
         title: String,
         summary: String,
@@ -183,7 +183,7 @@ abstract class PrefsNavFragmentX : Fragment() {
         preference.setCallback { preference.check.isChecked = Preferences[key] }
     }
 
-    protected fun <T> LinearLayoutCompat.addEdit(
+    protected fun <T> LinearLayout.addEdit(
         key: Preferences.Key<T>, title: String, valueToString: (T) -> String,
         stringToValue: (String) -> T?, configureEdit: (TextInputEditText) -> Unit,
     ) {
@@ -219,11 +219,11 @@ abstract class PrefsNavFragmentX : Fragment() {
         }
     }
 
-    protected fun LinearLayoutCompat.addEditString(key: Preferences.Key<String>, title: String) {
+    protected fun LinearLayout.addEditString(key: Preferences.Key<String>, title: String) {
         addEdit(key, title, { it }, { it }, { })
     }
 
-    protected fun LinearLayoutCompat.addEditInt(
+    protected fun LinearLayout.addEditInt(
         key: Preferences.Key<Int>,
         title: String,
         range: IntRange?,
@@ -239,7 +239,7 @@ abstract class PrefsNavFragmentX : Fragment() {
         }
     }
 
-    protected fun <T : Preferences.Enumeration<T>> LinearLayoutCompat.addEnumeration(
+    protected fun <T : Preferences.Enumeration<T>> LinearLayout.addEnumeration(
         key: Preferences.Key<T>,
         title: String,
         valueToString: (T) -> String,
@@ -260,7 +260,7 @@ abstract class PrefsNavFragmentX : Fragment() {
         }
     }
 
-    protected fun <T> LinearLayoutCompat.addList(
+    protected fun <T> LinearLayout.addList(
         key: Preferences.Key<T>,
         title: String,
         values: List<T>,
diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsOtherFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsOtherFragment.kt
index a78868a2..5ff0fce7 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsOtherFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsOtherFragment.kt
@@ -1,7 +1,7 @@
 package com.looker.droidify.ui.fragments
 
 import android.view.ViewGroup
-import androidx.appcompat.widget.LinearLayoutCompat
+import android.widget.LinearLayout
 import com.google.android.material.circularreveal.CircularRevealFrameLayout
 import com.looker.droidify.BuildConfig
 import com.looker.droidify.R
@@ -10,8 +10,8 @@ import com.looker.droidify.content.Preferences
 class PrefsOtherFragment : PrefsNavFragmentX() {
 
     override fun setupPrefs(scrollLayout: CircularRevealFrameLayout) {
-        val preferences = LinearLayoutCompat(scrollLayout.context)
-        preferences.orientation = LinearLayoutCompat.VERTICAL
+        val preferences = LinearLayout(scrollLayout.context)
+        preferences.orientation = LinearLayout.VERTICAL
         scrollLayout.addView(
             preferences,
             ViewGroup.LayoutParams.MATCH_PARENT,
diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUpdatesFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUpdatesFragment.kt
index d04a4afd..9ee823d6 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUpdatesFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUpdatesFragment.kt
@@ -1,7 +1,7 @@
 package com.looker.droidify.ui.fragments
 
 import android.view.ViewGroup
-import androidx.appcompat.widget.LinearLayoutCompat
+import android.widget.LinearLayout
 import com.google.android.material.circularreveal.CircularRevealFrameLayout
 import com.looker.droidify.R
 import com.looker.droidify.content.Preferences
@@ -9,8 +9,8 @@ import com.looker.droidify.content.Preferences
 class PrefsUpdatesFragment : PrefsNavFragmentX() {
 
     override fun setupPrefs(scrollLayout: CircularRevealFrameLayout) {
-        val preferences = LinearLayoutCompat(scrollLayout.context)
-        preferences.orientation = LinearLayoutCompat.VERTICAL
+        val preferences = LinearLayout(scrollLayout.context)
+        preferences.orientation = LinearLayout.VERTICAL
         scrollLayout.addView(
             preferences,
             ViewGroup.LayoutParams.MATCH_PARENT,
diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUserFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUserFragment.kt
index 1fd37edd..5e7fe1b5 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUserFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUserFragment.kt
@@ -1,7 +1,7 @@
 package com.looker.droidify.ui.fragments
 
 import android.view.ViewGroup
-import androidx.appcompat.widget.LinearLayoutCompat
+import android.widget.LinearLayout
 import com.google.android.material.circularreveal.CircularRevealFrameLayout
 import com.looker.droidify.R
 import com.looker.droidify.content.Preferences
@@ -12,8 +12,8 @@ import com.looker.droidify.utility.Utils.translateLocale
 class PrefsUserFragment : PrefsNavFragmentX() {
 
     override fun setupPrefs(scrollLayout: CircularRevealFrameLayout) {
-        val preferences = LinearLayoutCompat(scrollLayout.context)
-        preferences.orientation = LinearLayoutCompat.VERTICAL
+        val preferences = LinearLayout(scrollLayout.context)
+        preferences.orientation = LinearLayout.VERTICAL
         scrollLayout.addView(
             preferences,
             ViewGroup.LayoutParams.MATCH_PARENT,
diff --git a/src/main/res/layout/fragment_explore_x.xml b/src/main/res/layout/fragment_explore_x.xml
index aece8b86..c081e301 100644
--- a/src/main/res/layout/fragment_explore_x.xml
+++ b/src/main/res/layout/fragment_explore_x.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:nestedScrollingEnabled="true"
@@ -52,7 +52,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1" />
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </LinearLayout>
     </com.google.android.material.circularreveal.CircularRevealFrameLayout>
 </layout>
 
diff --git a/src/main/res/layout/fragment_installed_x.xml b/src/main/res/layout/fragment_installed_x.xml
index 63014e59..41a9dafb 100644
--- a/src/main/res/layout/fragment_installed_x.xml
+++ b/src/main/res/layout/fragment_installed_x.xml
@@ -22,7 +22,7 @@
 
     </data>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -37,7 +37,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.AppCompatButton
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonUpdated"
                 style="@style/Widget.Material3.Button.UnelevatedButton"
                 android:layout_width="wrap_content"
@@ -114,6 +114,6 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1" />
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
 </layout>
 
diff --git a/src/main/res/layout/fragment_latest_x.xml b/src/main/res/layout/fragment_latest_x.xml
index 740bfbdb..d5d38a11 100644
--- a/src/main/res/layout/fragment_latest_x.xml
+++ b/src/main/res/layout/fragment_latest_x.xml
@@ -22,7 +22,7 @@
 
     </data>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -81,6 +81,6 @@
             android:layout_weight="1"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/modeBar" />
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
 </layout>
 
diff --git a/src/main/res/layout/fragment_repositories_x.xml b/src/main/res/layout/fragment_repositories_x.xml
index eb68de3f..d5b10359 100644
--- a/src/main/res/layout/fragment_repositories_x.xml
+++ b/src/main/res/layout/fragment_repositories_x.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
@@ -45,7 +45,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1" />
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </LinearLayout>
     </com.google.android.material.circularreveal.CircularRevealFrameLayout>
 </layout>
 
diff --git a/src/main/res/layout/item_app_info_x.xml b/src/main/res/layout/item_app_info_x.xml
index 7ebcdbf2..93f6ce2a 100644
--- a/src/main/res/layout/item_app_info_x.xml
+++ b/src/main/res/layout/item_app_info_x.xml
@@ -12,7 +12,7 @@
         android:paddingTop="12dp"
         android:paddingBottom="4dp">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
             android:id="@+id/header_info"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
@@ -38,7 +38,7 @@
                     app:shapeAppearanceOverlay="@style/Shape.Medium"
                     tools:ignore="ContentDescription" />
 
-                <androidx.appcompat.widget.LinearLayoutCompat
+                <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/text_margin"
@@ -59,11 +59,11 @@
                         android:singleLine="true"
                         android:textAppearance="?textAppearanceBody2"
                         android:textColor="?android:attr/textColorSecondary" />
-                </androidx.appcompat.widget.LinearLayoutCompat>
+                </LinearLayout>
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+            </LinearLayout>
 
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <LinearLayout
                 android:id="@+id/release_info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -74,7 +74,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/header_info">
 
-                <androidx.appcompat.widget.LinearLayoutCompat
+                <LinearLayout
                     android:id="@+id/sdk_block"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
                         android:ellipsize="marquee"
                         android:singleLine="true"
                         android:textSize="16sp" />
-                </androidx.appcompat.widget.LinearLayoutCompat>
+                </LinearLayout>
 
                 <com.google.android.material.divider.MaterialDivider
                     android:id="@+id/divider1"
@@ -105,7 +105,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginVertical="12dp" />
 
-                <androidx.appcompat.widget.LinearLayoutCompat
+                <LinearLayout
                     android:id="@+id/version_block"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -128,7 +128,7 @@
                         android:ellipsize="marquee"
                         android:singleLine="true"
                         android:textSize="16sp" />
-                </androidx.appcompat.widget.LinearLayoutCompat>
+                </LinearLayout>
 
                 <com.google.android.material.divider.MaterialDivider
                     android:id="@+id/divider2"
@@ -136,7 +136,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginVertical="12dp" />
 
-                <androidx.appcompat.widget.LinearLayoutCompat
+                <LinearLayout
                     android:id="@+id/size_block"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -159,7 +159,7 @@
                         android:ellipsize="marquee"
                         android:singleLine="true"
                         android:textSize="16sp" />
-                </androidx.appcompat.widget.LinearLayoutCompat>
+                </LinearLayout>
 
                 <com.google.android.material.divider.MaterialDivider
                     android:id="@+id/divider3"
@@ -175,7 +175,7 @@
                     android:layout_margin="4dp"
                     android:layout_weight="1">
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:gravity="center"
@@ -199,12 +199,12 @@
                             android:ellipsize="marquee"
                             android:singleLine="true"
                             android:textSize="12sp" />
-                    </androidx.appcompat.widget.LinearLayoutCompat>
+                    </LinearLayout>
                 </com.google.android.material.card.MaterialCardView>
-            </androidx.appcompat.widget.LinearLayoutCompat>
-        </androidx.appcompat.widget.LinearLayoutCompat>
+            </LinearLayout>
+        </LinearLayout>
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
             android:id="@+id/status_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -232,7 +232,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical" />
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </LinearLayout>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/action"
diff --git a/src/main/res/layout/link_item.xml b/src/main/res/layout/link_item.xml
index 6957096f..674502fc 100644
--- a/src/main/res/layout/link_item.xml
+++ b/src/main/res/layout/link_item.xml
@@ -6,7 +6,7 @@
 
     </data>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
@@ -23,7 +23,7 @@
             android:tintMode="src_in"
             tools:ignore="ContentDescription" />
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -44,7 +44,7 @@
                 android:singleLine="true"
                 android:textSize="14sp" />
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </LinearLayout>
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/permissions_item.xml b/src/main/res/layout/permissions_item.xml
index a9fbcef5..b114b5ad 100644
--- a/src/main/res/layout/permissions_item.xml
+++ b/src/main/res/layout/permissions_item.xml
@@ -6,7 +6,7 @@
 
     </data>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
@@ -34,5 +34,5 @@
             android:paddingBottom="16dp"
             android:textSize="16sp" />
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/preference_item.xml b/src/main/res/layout/preference_item.xml
index 71cad1a5..6c1a580a 100644
--- a/src/main/res/layout/preference_item.xml
+++ b/src/main/res/layout/preference_item.xml
@@ -5,13 +5,13 @@
 
     </data>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -31,7 +31,7 @@
                 android:layout_height="wrap_content"
                 android:textSize="14sp" />
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </LinearLayout>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/check"
@@ -41,5 +41,5 @@
             android:clickable="false"
             android:paddingHorizontal="12dp"
             android:visibility="gone" />
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/product_item.xml b/src/main/res/layout/product_item.xml
index e820fa56..a73c592a 100644
--- a/src/main/res/layout/product_item.xml
+++ b/src/main/res/layout/product_item.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="72dp">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
@@ -25,14 +25,14 @@
                 app:shapeAppearanceOverlay="@style/Shape.Small"
                 tools:ignore="ContentDescription" />
 
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="14dp"
                 android:orientation="vertical">
 
-                <androidx.appcompat.widget.LinearLayoutCompat
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
@@ -54,7 +54,7 @@
                         android:singleLine="true"
                         android:textAppearance="?textAppearanceLabelMedium" />
 
-                </androidx.appcompat.widget.LinearLayoutCompat>
+                </LinearLayout>
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/summary"
@@ -63,7 +63,7 @@
                     android:singleLine="true"
                     android:textAppearance="?textAppearanceBody2"
                     android:textColor="?android:attr/textColorSecondary" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-        </androidx.appcompat.widget.LinearLayoutCompat>
+            </LinearLayout>
+        </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/release_item.xml b/src/main/res/layout/release_item.xml
index 9e60d115..c33c07e9 100644
--- a/src/main/res/layout/release_item.xml
+++ b/src/main/res/layout/release_item.xml
@@ -11,7 +11,7 @@
         android:layout_marginVertical="@dimen/shape_margin_small"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:baselineAligned="false"
@@ -19,13 +19,13 @@
             android:orientation="vertical"
             android:padding="16dp">
 
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="bottom"
                 android:orientation="horizontal">
 
-                <androidx.appcompat.widget.LinearLayoutCompat
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -49,7 +49,7 @@
                         android:textAllCaps="true"
                         android:textAppearance="?textAppearanceLabelMedium" />
 
-                </androidx.appcompat.widget.LinearLayoutCompat>
+                </LinearLayout>
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/added"
@@ -59,9 +59,9 @@
                     android:singleLine="true"
                     android:textSize="14sp" />
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+            </LinearLayout>
 
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
@@ -84,7 +84,7 @@
                     android:textColor="?android:attr/textColorSecondary"
                     android:textSize="14sp" />
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+            </LinearLayout>
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/signature"
@@ -102,7 +102,7 @@
                 android:textColor="?android:attr/textColorSecondary"
                 android:textSize="14sp" />
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/section_item.xml b/src/main/res/layout/section_item.xml
index a2b6e477..63cbd096 100644
--- a/src/main/res/layout/section_item.xml
+++ b/src/main/res/layout/section_item.xml
@@ -6,7 +6,7 @@
 
     </data>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
@@ -28,5 +28,5 @@
             android:src="@drawable/ic_arrow_down"
             tools:ignore="ContentDescription" />
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/sheet_edit_repository.xml b/src/main/res/layout/sheet_edit_repository.xml
index 04e56ca9..9ce7aa98 100644
--- a/src/main/res/layout/sheet_edit_repository.xml
+++ b/src/main/res/layout/sheet_edit_repository.xml
@@ -17,7 +17,7 @@
             android:layout_height="match_parent"
             android:fillViewport="true">
 
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
@@ -102,7 +102,7 @@
                     android:backgroundTint="?colorPrimary"
                     android:text="@string/save"
                     android:textColor="?colorSurface" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
+            </LinearLayout>
         </androidx.core.widget.NestedScrollView>
     </FrameLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/sheet_repository.xml b/src/main/res/layout/sheet_repository.xml
index 2e4e7f1a..fa623ce5 100644
--- a/src/main/res/layout/sheet_repository.xml
+++ b/src/main/res/layout/sheet_repository.xml
@@ -22,12 +22,12 @@
                 android:layout_height="match_parent"
                 android:padding="12dp">
 
-                <androidx.appcompat.widget.LinearLayoutCompat
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:orientation="vertical">
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
+                    <LinearLayout
                         android:id="@+id/address_block"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -48,9 +48,9 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="4dp"
                             android:textSize="16sp" />
-                    </androidx.appcompat.widget.LinearLayoutCompat>
+                    </LinearLayout>
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
+                    <LinearLayout
                         android:id="@+id/name_block"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -71,10 +71,10 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="4dp"
                             android:textSize="16sp" />
-                    </androidx.appcompat.widget.LinearLayoutCompat>
+                    </LinearLayout>
 
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
+                    <LinearLayout
                         android:id="@+id/description_block"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -95,9 +95,9 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="4dp"
                             android:textSize="16sp" />
-                    </androidx.appcompat.widget.LinearLayoutCompat>
+                    </LinearLayout>
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
+                    <LinearLayout
                         android:id="@+id/updated_block"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -118,9 +118,9 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="4dp"
                             android:textSize="16sp" />
-                    </androidx.appcompat.widget.LinearLayoutCompat>
+                    </LinearLayout>
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
+                    <LinearLayout
                         android:id="@+id/apps_block"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -141,10 +141,10 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="4dp"
                             android:textSize="16sp" />
-                    </androidx.appcompat.widget.LinearLayoutCompat>
+                    </LinearLayout>
 
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
+                    <LinearLayout
                         android:id="@+id/fingerprint_block"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -165,9 +165,9 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="4dp"
                             android:textSize="16sp" />
-                    </androidx.appcompat.widget.LinearLayoutCompat>
+                    </LinearLayout>
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -192,8 +192,8 @@
                             android:backgroundTint="?colorPrimary"
                             android:text="@string/edit_repository"
                             android:textColor="?colorSurface" />
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-                </androidx.appcompat.widget.LinearLayoutCompat>
+                    </LinearLayout>
+                </LinearLayout>
             </com.google.android.material.circularreveal.CircularRevealFrameLayout>
         </androidx.core.widget.NestedScrollView>
     </FrameLayout>
diff --git a/src/main/res/layout/tabs_toolbar.xml b/src/main/res/layout/tabs_toolbar.xml
index f2a4f571..99a9a1ca 100644
--- a/src/main/res/layout/tabs_toolbar.xml
+++ b/src/main/res/layout/tabs_toolbar.xml
@@ -6,7 +6,7 @@
 
     </data>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dp">
 
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <LinearLayout
                 android:id="@+id/section_change"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
@@ -50,9 +50,9 @@
                     android:src="@drawable/ic_arrow_down"
                     tools:ignore="ContentDescription" />
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+            </LinearLayout>
 
         </com.google.android.material.circularreveal.CircularRevealFrameLayout>
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/title_text_item.xml b/src/main/res/layout/title_text_item.xml
index 7ee73d67..2f338ec8 100644
--- a/src/main/res/layout/title_text_item.xml
+++ b/src/main/res/layout/title_text_item.xml
@@ -5,7 +5,7 @@
 
     </data>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -25,5 +25,5 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:textSize="16sp" />
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
 </layout>
\ No newline at end of file