diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
deleted file mode 100644
index 2023c0781..000000000
--- a/app/src/main/res/anim/fade_in.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="450"
-    android:fromAlpha="0.0"
-    android:interpolator="@android:anim/linear_interpolator"
-    android:toAlpha="1.0" />
\ No newline at end of file
diff --git a/app/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml
deleted file mode 100644
index 408a3c18d..000000000
--- a/app/src/main/res/anim/fade_out.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="450"
-    android:fromAlpha="1.0"
-    android:interpolator="@android:anim/linear_interpolator"
-    android:toAlpha="0.0" />
\ No newline at end of file
diff --git a/app/src/main/res/color/preference_material_switch_color.xml b/app/src/main/res/color/preference_material_switch_color.xml
deleted file mode 100644
index a1c1ce825..000000000
--- a/app/src/main/res/color/preference_material_switch_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/white" android:state_checked="true" />
-    <item android:color="@android:color/darker_gray" />
-</selector>
diff --git a/app/src/main/res/layout-land/fragment_splash.xml b/app/src/main/res/layout-land/fragment_splash.xml
deleted file mode 100644
index 6ce654658..000000000
--- a/app/src/main/res/layout-land/fragment_splash.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:weightSum="2"
-    tools:context=".view.ui.splash.SplashFragment">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        app:menu="@menu/menu_splash" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:baselineAligned="false"
-        android:orientation="horizontal"
-        android:weightSum="2">
-
-        <RelativeLayout
-            android:id="@+id/layout_top"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/img_icon"
-                android:layout_width="@dimen/icon_size_avatar"
-                android:layout_height="@dimen/icon_size_avatar"
-                android:layout_above="@id/txt_title"
-                android:layout_centerHorizontal="true"
-                android:minWidth="176dp"
-                android:src="@mipmap/ic_launcher" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/txt_title"
-                style="@style/TextAppearance.Aurora.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="@dimen/margin_normal"
-                android:layout_marginBottom="@dimen/margin_xsmall"
-                android:text="@string/app_name"
-                android:textAlignment="center" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/txt_status"
-                style="@style/TextAppearance.Aurora.Line1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/txt_title"
-                android:layout_centerHorizontal="true"
-                android:maxLines="2"
-                android:textAlignment="center"
-                tools:text="@string/session_login" />
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@+id/layout_action"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="@dimen/padding_large"
-            android:visibility="invisible"
-            tools:visibility="visible">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/txt_action"
-                style="@style/AuroraTextStyle.Line1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/margin_normal"
-                android:text="@string/account_login_using" />
-
-            <com.aurora.store.view.custom.layouts.button.StateButton
-                android:id="@+id/btn_google"
-                android:layout_width="@dimen/width_button"
-                android:layout_height="wrap_content"
-                app:btnStateIcon="@drawable/ic_google"
-                app:btnStateText="@string/account_google" />
-
-            <com.aurora.store.view.custom.layouts.button.StateButton
-                android:id="@+id/btn_anonymous"
-                android:layout_width="@dimen/width_button"
-                android:layout_height="wrap_content"
-                app:btnStateIcon="@drawable/ic_anonymous"
-                app:btnStateText="@string/account_anonymous" />
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml
deleted file mode 100644
index b97a088c3..000000000
--- a/app/src/main/res/layout-sw600dp/activity_main.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/nav_host_fragment"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nav_view"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/mobile_navigation" />
-
-    <com.google.android.material.navigationrail.NavigationRailView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        app:headerLayout="@layout/layout_nav_header"
-        app:labelVisibilityMode="labeled"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:menu="@menu/menu_bottom_nav"
-        app:menuGravity="center"
-        tools:viewBindingType="com.google.android.material.navigation.NavigationBarView" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 0d07b3999..000000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/nav_host_fragment"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toTopOf="@+id/nav_view"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/mobile_navigation" />
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:labelVisibilityMode="labeled"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:menu="@menu/menu_bottom_nav"
-        tools:viewBindingType="com.google.android.material.navigation.NavigationBarView" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_auto_updates_restrictions.xml b/app/src/main/res/layout/dialog_auto_updates_restrictions.xml
deleted file mode 100644
index ff662396b..000000000
--- a/app/src/main/res/layout/dialog_auto_updates_restrictions.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ SPDX-FileCopyrightText: 2025 The Calyx Institute
-  ~ SPDX-License-Identifier: GPL-3.0-or-later
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingHorizontal="@dimen/padding_large">
-
-    <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/checkboxMetered"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:text="@string/pref_updates_restrictions_metered" />
-
-    <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/checkboxBattery"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:text="@string/pref_updates_restrictions_battery" />
-
-    <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/checkboxIdle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:text="@string/pref_updates_restrictions_idle" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_text_input_edit_text.xml b/app/src/main/res/layout/dialog_text_input_edit_text.xml
deleted file mode 100644
index f239079e1..000000000
--- a/app/src/main/res/layout/dialog_text_input_edit_text.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/textInputLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:hint="@string/pref_network_proxy_url_hint"
-    android:paddingHorizontal="@dimen/padding_large"
-    android:paddingTop="@dimen/padding_normal">
-
-    <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/textInputEditText"
-        style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="text"
-        android:maxLines="1" />
-</com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/fragment_apps_games.xml b/app/src/main/res/layout/fragment_apps_games.xml
deleted file mode 100644
index f523e9050..000000000
--- a/app/src/main/res/layout/fragment_apps_games.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        app:menu="@menu/menu_main" />
-
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tab_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/toolbar"
-        android:background="@android:color/transparent"
-        app:tabGravity="fill"
-        app:tabIndicator="@drawable/tab_indicator"
-        app:tabIndicatorHeight="2dp"
-        app:tabMode="scrollable"
-        app:tabPaddingEnd="@dimen/padding_normal"
-        app:tabPaddingStart="@dimen/padding_normal" />
-
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/tab_layout" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/search_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/margin_large"
-        android:contentDescription="@string/action_search"
-        app:srcCompat="@drawable/ic_round_search" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_dev_profile.xml b/app/src/main/res/layout/fragment_dev_profile.xml
deleted file mode 100644
index 8cb0f61ad..000000000
--- a/app/src/main/res/layout/fragment_dev_profile.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:divider="@drawable/divider"
-    android:orientation="vertical"
-    android:showDividers="middle"
-    tools:context=".view.ui.details.DevProfileFragment">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationIcon="@drawable/ic_arrow_back" />
-
-    <ViewFlipper
-        android:id="@+id/view_flipper"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/padding_normal">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/img_icon"
-                    android:layout_width="@dimen/icon_size"
-                    android:layout_height="@dimen/icon_size"
-                    app:srcCompat="@drawable/bg_placeholder" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/txt_dev_name"
-                    style="@style/AuroraTextStyle.Subtitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_small"
-                    android:layout_toEndOf="@id/img_icon"
-                    tools:text="Developer Name" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/txt_dev_description"
-                    style="@style/AuroraTextStyle.Line2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/txt_dev_name"
-                    android:layout_alignStart="@id/txt_dev_name"
-                    android:layout_alignEnd="@id/txt_dev_name"
-                    android:layout_marginTop="@dimen/margin_small"
-                    android:maxLines="6"
-                    tools:text="Developer Name" />
-
-            </RelativeLayout>
-
-            <com.airbnb.epoxy.EpoxyRecyclerView
-                android:id="@+id/recycler"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="true"
-                android:paddingBottom="@dimen/height_bottom_adj"
-                app:itemSpacing="@dimen/margin_normal"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                app:stackFromEnd="false" />
-        </LinearLayout>
-
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ProgressBar
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true" />
-        </RelativeLayout>
-    </ViewFlipper>
-</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_for_you.xml b/app/src/main/res/layout/fragment_for_you.xml
deleted file mode 100644
index 575e4a6eb..000000000
--- a/app/src/main/res/layout/fragment_for_you.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.airbnb.epoxy.EpoxyRecyclerView
-        android:id="@+id/recycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="@dimen/height_bottom_adj"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:stackFromEnd="false" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_generic_recycler.xml b/app/src/main/res/layout/fragment_generic_recycler.xml
deleted file mode 100644
index 23d8c210b..000000000
--- a/app/src/main/res/layout/fragment_generic_recycler.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.airbnb.epoxy.EpoxyRecyclerView
-        android:id="@+id/recycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:paddingBottom="@dimen/height_bottom_adj"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:stackFromEnd="false" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_generic_with_search.xml b/app/src/main/res/layout/fragment_generic_with_search.xml
deleted file mode 100644
index 4f208bd5a..000000000
--- a/app/src/main/res/layout/fragment_generic_with_search.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationIcon="@drawable/ic_arrow_back">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/searchBar"
-            android:layout_width="match_parent"
-            android:layout_height="42dp"
-            android:background="@null"
-            android:hint="@string/search_hint"
-            android:imeOptions="flagNoExtractUi|actionSearch"
-            android:inputType="text"
-            android:paddingStart="@dimen/padding_large"
-            android:paddingEnd="@dimen/padding_normal"
-            android:singleLine="true" />
-    </androidx.appcompat.widget.Toolbar>
-
-    <com.airbnb.epoxy.EpoxyRecyclerView
-        android:id="@+id/recycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/toolbar"
-        android:clipToPadding="true"
-        android:paddingBottom="@dimen/height_bottom_adj"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:stackFromEnd="false"
-        tools:listitem="@layout/view_app_list" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_generic_with_toolbar.xml b/app/src/main/res/layout/fragment_generic_with_toolbar.xml
deleted file mode 100644
index e4ec2f41c..000000000
--- a/app/src/main/res/layout/fragment_generic_with_toolbar.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationIcon="@drawable/ic_arrow_back" />
-
-    <com.airbnb.epoxy.EpoxyRecyclerView
-        android:id="@+id/recycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/toolbar"
-        android:clipToPadding="true"
-        android:paddingBottom="@dimen/height_bottom_adj"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:stackFromEnd="false" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_google.xml b/app/src/main/res/layout/fragment_google.xml
deleted file mode 100644
index 8d934ee23..000000000
--- a/app/src/main/res/layout/fragment_google.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".view.ui.account.GoogleFragment">
-
-    <com.google.android.material.progressindicator.LinearProgressIndicator
-        android:id="@+id/progressBar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        app:indicatorColor="?colorAccent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:trackCornerRadius="10dp"
-        app:trackThickness="5dp" />
-
-    <WebView
-        android:id="@+id/webview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml
deleted file mode 100644
index 328e8672c..000000000
--- a/app/src/main/res/layout/fragment_setting.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".view.ui.preferences.SettingsFragment">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:navigationIcon="@drawable/ic_arrow_back" />
-
-    <!--
-        Required ViewGroup for PreferenceFragmentCompat
-        False positive for id not in API < 24
-    -->
-    <FrameLayout
-        android:id="@android:id/list_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:targetApi="n" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_splash.xml b/app/src/main/res/layout/fragment_splash.xml
deleted file mode 100644
index 28064a419..000000000
--- a/app/src/main/res/layout/fragment_splash.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:weightSum="2"
-    tools:context=".view.ui.splash.SplashFragment">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        app:menu="@menu/menu_splash" />
-
-    <RelativeLayout
-        android:id="@+id/layout_top"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img_icon"
-            android:layout_width="@dimen/icon_size_avatar"
-            android:layout_height="@dimen/icon_size_avatar"
-            android:layout_centerInParent="true"
-            android:minWidth="176dp"
-            android:src="@mipmap/ic_launcher" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/txt_title"
-            style="@style/TextAppearance.Aurora.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/img_icon"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/margin_normal"
-            android:layout_marginBottom="@dimen/margin_xsmall"
-            android:text="@string/app_name"
-            android:textAlignment="center" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/txt_status"
-            style="@style/TextAppearance.Aurora.Line1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/txt_title"
-            android:layout_centerHorizontal="true"
-            android:layout_marginHorizontal="@dimen/margin_xlarge"
-            android:maxLines="2"
-            android:textAlignment="center"
-            tools:text="@string/session_login" />
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/layout_action"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="@dimen/padding_large"
-        android:visibility="invisible"
-        tools:visibility="visible">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/txt_action"
-            style="@style/AuroraTextStyle.Line1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_normal"
-            android:text="@string/account_login_using" />
-
-        <com.aurora.store.view.custom.layouts.button.StateButton
-            android:id="@+id/btn_google"
-            android:layout_width="@dimen/width_button"
-            android:layout_height="wrap_content"
-            app:btnStateIcon="@drawable/ic_google"
-            app:btnStateText="@string/account_google" />
-
-        <com.aurora.store.view.custom.layouts.button.StateButton
-            android:id="@+id/btn_anonymous"
-            android:layout_width="@dimen/width_button"
-            android:layout_height="wrap_content"
-            app:btnStateIcon="@drawable/ic_anonymous"
-            app:btnStateText="@string/account_anonymous" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_top_chart.xml b/app/src/main/res/layout/fragment_top_chart.xml
deleted file mode 100644
index 418e97b82..000000000
--- a/app/src/main/res/layout/fragment_top_chart.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <HorizontalScrollView
-        android:id="@+id/tab_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scrollbars="none">
-
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/top_tab_group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/padding_medium"
-            app:chipSpacingHorizontal="@dimen/margin_small"
-            app:selectionRequired="true"
-            app:singleLine="true"
-            app:singleSelection="true">
-
-            <com.google.android.material.chip.Chip
-                android:id="@+id/tab_top_free"
-                style="@style/Chip.TopChart"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_top_free" />
-
-            <com.google.android.material.chip.Chip
-                android:id="@+id/tab_top_grossing"
-                style="@style/Chip.TopChart"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_top_grossing" />
-
-
-            <com.google.android.material.chip.Chip
-                android:id="@+id/tab_trending"
-                style="@style/Chip.TopChart"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_trending" />
-
-            <com.google.android.material.chip.Chip
-                android:id="@+id/tab_top_paid"
-                style="@style/Chip.TopChart"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_top_paid" />
-        </com.google.android.material.chip.ChipGroup>
-    </HorizontalScrollView>
-
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/tab_layout" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_top_container.xml b/app/src/main/res/layout/fragment_top_container.xml
deleted file mode 100644
index 87cf650bf..000000000
--- a/app/src/main/res/layout/fragment_top_container.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.airbnb.epoxy.EpoxyRecyclerView
-        android:id="@+id/recycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="true"
-        android:paddingBottom="@dimen/height_bottom_adj"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:stackFromEnd="false"
-        tools:listitem="@layout/view_app_list" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_updates.xml b/app/src/main/res/layout/fragment_updates.xml
deleted file mode 100644
index 3e18b35cd..000000000
--- a/app/src/main/res/layout/fragment_updates.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        app:menu="@menu/menu_main"
-        app:title="@string/title_updates" />
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_refresh_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar">
-
-        <com.airbnb.epoxy.EpoxyRecyclerView
-            android:id="@+id/recycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:paddingBottom="@dimen/height_bottom_adj"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:stackFromEnd="false"
-            tools:listitem="@layout/view_app_list" />
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/search_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/margin_large"
-        android:contentDescription="@string/action_search"
-        app:srcCompat="@drawable/ic_round_search" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/item_preference.xml b/app/src/main/res/layout/item_preference.xml
deleted file mode 100644
index a89319918..000000000
--- a/app/src/main/res/layout/item_preference.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="@dimen/padding_normal"
-    android:paddingEnd="?android:attr/scrollbarSize">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@android:id/icon"
-        android:layout_width="@dimen/icon_size_default"
-        android:layout_height="@dimen/icon_size_default"
-        android:layout_gravity="center"
-        android:layout_marginStart="@dimen/margin_small"
-        app:tint="?android:attr/colorAccent"
-        app:tintMode="src_in" />
-
-    <RelativeLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="@dimen/margin_xxsmall"
-        android:layout_marginEnd="@dimen/margin_xxsmall"
-        android:layout_marginBottom="@dimen/margin_xxsmall"
-        android:layout_weight="1">
-
-        <TextView
-            android:id="@android:id/title"
-            style="@style/TextAppearance.Aurora.Line1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@android:id/summary"
-            style="@style/TextAppearance.Aurora.Line2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignStart="@android:id/title"
-            android:maxLines="4" />
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/layout_nav_header.xml b/app/src/main/res/layout/layout_nav_header.xml
deleted file mode 100644
index dd1e05888..000000000
--- a/app/src/main/res/layout/layout_nav_header.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/nav_header_layout"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/img"
-        android:layout_width="@dimen/icon_size_small"
-        android:layout_height="@dimen/icon_size_small"
-        android:src="@mipmap/ic_launcher"
-        app:srcCompat="@drawable/bg_placeholder" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/model_carousel_group.xml b/app/src/main/res/layout/model_carousel_group.xml
deleted file mode 100644
index 45dc62e1a..000000000
--- a/app/src/main/res/layout/model_carousel_group.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="vertical">
-
-    <ViewStub
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inflatedId="@+id/header_view" />
-
-    <ViewStub
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inflatedId="@+id/recycler_view" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_material_switch.xml b/app/src/main/res/layout/preference_material_switch.xml
deleted file mode 100644
index 3a3ee1385..000000000
--- a/app/src/main/res/layout/preference_material_switch.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Derived from https://github.com/androidx/androidx/blob/8cb282cc/preference/preference/res/layout/preference_widget_switch_compat.xml -->
-<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/switchWidget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@null"
-    android:clickable="false"
-    android:focusable="false"
-    app:thumbTint="@color/preference_material_switch_color" />
diff --git a/app/src/main/res/layout/sheet_app_menu.xml b/app/src/main/res/layout/sheet_app_menu.xml
deleted file mode 100644
index 6b3921589..000000000
--- a/app/src/main/res/layout/sheet_app_menu.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/navigation_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        android:padding="@dimen/padding_small"
-        app:elevation="0dp"
-        app:menu="@menu/menu_app" />
-</FrameLayout>
diff --git a/app/src/main/res/layout/sheet_device_miui.xml b/app/src/main/res/layout/sheet_device_miui.xml
deleted file mode 100644
index 65771c5c7..000000000
--- a/app/src/main/res/layout/sheet_device_miui.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:divider="@drawable/divider"
-            android:orientation="vertical"
-            android:padding="@dimen/padding_large"
-            android:showDividers="middle">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/img_icon"
-                    android:layout_width="@dimen/icon_size_category"
-                    android:layout_height="@dimen/icon_size_category"
-                    android:layout_centerVertical="true"
-                    tools:src="@drawable/ic_xiaomi_logo" />
-
-                <TextView
-                    android:id="@+id/txt_header"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_marginStart="@dimen/margin_normal"
-                    android:layout_marginBottom="@dimen/margin_normal"
-                    android:layout_toEndOf="@id/img_icon"
-                    android:maxLines="1"
-                    android:text="@string/title_installer"
-                    android:textAlignment="viewStart"
-                    android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/txt_line1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLines="3"
-                android:text="@string/device_miui_title"
-                android:textAlignment="viewStart"
-                android:textAppearance="@style/TextAppearance.Aurora.Line1" />
-
-            <TextView
-                android:id="@+id/txt_line2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLines="10"
-                android:text="@string/device_miui_subtitle"
-                android:textAlignment="viewStart"
-                android:textAppearance="@style/TextAppearance.Aurora.Line2" />
-
-            <TextView
-                android:id="@+id/txt_line3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/bg_changelog"
-                android:maxLines="10"
-                android:text="@string/device_miui_description"
-                android:textAlignment="viewStart"
-                android:textAppearance="@style/TextAppearance.Aurora.Line2" />
-
-            <TextView
-                android:id="@+id/txt_line4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLines="10"
-                android:text="@string/device_miui_extra"
-                android:textAlignment="viewStart"
-                android:textAppearance="@style/TextAppearance.Aurora.Line2"
-                android:textColor="@color/colorRed" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:weightSum="2">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_secondary"
-                style="@style/Widget.Material3.Button.TextButton.Dialog.Flush"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/height_button"
-                android:layout_weight="1"
-                android:text="@string/action_ignore" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_primary"
-                style="@style/Widget.Material3.Button.TextButton.Dialog.Flush"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/height_button"
-                android:layout_weight="1"
-                android:text="@string/action_disable" />
-        </LinearLayout>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_network.xml b/app/src/main/res/layout/sheet_network.xml
deleted file mode 100644
index dec6aa7ba..000000000
--- a/app/src/main/res/layout/sheet_network.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:paddingBottom="@dimen/padding_normal">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img"
-            android:layout_width="@dimen/icon_size_large"
-            android:layout_height="@dimen/icon_size_large"
-            android:layout_marginTop="@dimen/margin_xlarge"
-            app:srcCompat="@drawable/ic_network"
-            app:tint="?colorAccent" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/txt_warning"
-            style="@style/AuroraTextStyle.Subtitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/title_no_network"
-            android:textAlignment="center" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_action"
-            style="@style/Widget.Material3.Button.TonalButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/check_connectivity" />
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_action_header.xml b/app/src/main/res/layout/view_action_header.xml
deleted file mode 100644
index d1d48cbec..000000000
--- a/app/src/main/res/layout/view_action_header.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/layout"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingTop="@dimen/padding_xsmall"
-    android:paddingBottom="@dimen/padding_xsmall">
-
-    <TextView
-        android:id="@+id/txt_title"
-        style="@style/AuroraTextStyle.Subtitle.Alt"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/img_action"
-        android:ellipsize="end"
-        android:maxLines="1"
-        tools:text="Title" />
-
-    <TextView
-        android:id="@+id/txt_subtitle"
-        style="@style/AuroraTextStyle.Line2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txt_title"
-        android:layout_toStartOf="@id/img_action"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:visibility="gone"
-        tools:text="Subtitle"
-        tools:visibility="visible" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/img_action"
-        android:layout_width="@dimen/icon_size_category"
-        android:layout_height="@dimen/icon_size_category"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:background="?selectableItemBackgroundBorderless"
-        android:contentDescription="@string/expand"
-        android:padding="@dimen/padding_xsmall"
-        android:visibility="invisible"
-        app:srcCompat="@drawable/ic_arrow_right"
-        app:tint="?android:textColorPrimary" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/view_app.xml b/app/src/main/res/layout/view_app.xml
deleted file mode 100644
index fb9fc4cdd..000000000
--- a/app/src/main/res/layout/view_app.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/padding_xsmall">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/img_icon"
-        android:layout_width="@dimen/icon_size_cluster"
-        android:layout_height="@dimen/icon_size_cluster"
-        android:layout_centerHorizontal="true" />
-
-    <TextView
-        android:id="@+id/txt_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/img_icon"
-        android:layout_alignStart="@id/img_icon"
-        android:layout_alignEnd="@id/img_icon"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/margin_small"
-        android:maxLines="2"
-        android:textAppearance="@style/TextAppearance.Aurora.Line2"
-        android:textColor="?android:textColorPrimary"
-        tools:text="App Name" />
-
-    <TextView
-        android:id="@+id/txt_size"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txt_name"
-        android:layout_alignStart="@id/txt_name"
-        android:layout_alignEnd="@id/txt_name"
-        android:layout_centerHorizontal="true"
-        android:maxLines="1"
-        android:textAppearance="@style/TextAppearance.Aurora.Line3"
-        tools:text="53 MB" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_app_card_shimmer.xml b/app/src/main/res/layout/view_app_card_shimmer.xml
deleted file mode 100644
index 5261fd427..000000000
--- a/app/src/main/res/layout/view_app_card_shimmer.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<com.facebook.shimmer.ShimmerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:id="@+id/card"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img_cover"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:srcCompat="@drawable/bg_rounded"
-            tools:minHeight="196dp" />
-
-        <RelativeLayout
-            android:id="@+id/layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/img_cover"
-            android:layout_marginTop="@dimen/margin_small"
-            android:layout_marginBottom="@dimen/margin_small">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/img_icon"
-                android:layout_width="@dimen/icon_size_small"
-                android:layout_height="@dimen/icon_size_small"
-                android:background="@drawable/bg_rounded" />
-
-            <TextView
-                android:id="@+id/line1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/margin_normal"
-                android:layout_toEndOf="@id/img_icon"
-                android:background="?colorControlHighlight"
-                android:maxLines="1"
-                android:textAppearance="@style/TextAppearance.Aurora.Line2" />
-
-            <TextView
-                android:id="@+id/line2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/line1"
-                android:layout_alignStart="@id/line1"
-                android:layout_alignEnd="@id/line1"
-                android:layout_centerVertical="true"
-                android:layout_marginTop="@dimen/margin_xxsmall"
-                android:layout_marginBottom="@dimen/margin_xxsmall"
-                android:background="?colorControlHighlight"
-                android:maxLines="2"
-                android:textAppearance="@style/TextAppearance.Aurora.Line3" />
-
-            <RatingBar
-                android:id="@+id/rating_bar"
-                style="@style/Widget.AppCompat.RatingBar.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/line2"
-                android:layout_alignStart="@id/line1"
-                android:numStars="5" />
-        </RelativeLayout>
-    </RelativeLayout>
-
-</com.facebook.shimmer.ShimmerFrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_app_list.xml b/app/src/main/res/layout/view_app_list.xml
deleted file mode 100644
index a7df4bb4b..000000000
--- a/app/src/main/res/layout/view_app_list.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:paddingStart="@dimen/padding_medium"
-    android:paddingTop="@dimen/padding_xsmall"
-    android:paddingEnd="@dimen/padding_small"
-    android:paddingBottom="@dimen/padding_xsmall">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/img_icon"
-        android:layout_width="@dimen/icon_size_medium"
-        android:layout_height="@dimen/icon_size_medium"
-        android:layout_centerVertical="true"
-        tools:src="@drawable/bg_placeholder" />
-
-    <TextView
-        android:id="@+id/txt_line1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_normal"
-        android:layout_toEndOf="@id/img_icon"
-        android:maxLines="1"
-        android:textAlignment="viewStart"
-        android:textAppearance="@style/TextAppearance.Aurora.Line1"
-        tools:text="App Name" />
-
-    <TextView
-        android:id="@+id/txt_line2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txt_line1"
-        android:layout_alignStart="@id/txt_line1"
-        android:layout_alignEnd="@id/txt_line1"
-        android:maxLines="1"
-        android:textAlignment="viewStart"
-        android:textAppearance="@style/TextAppearance.Aurora.Line2"
-        tools:text="Company Name" />
-
-    <TextView
-        android:id="@+id/txt_line3"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txt_line2"
-        android:layout_alignStart="@id/txt_line1"
-        android:layout_alignEnd="@id/txt_line1"
-        android:maxLines="1"
-        android:textAlignment="viewStart"
-        android:textAppearance="@style/TextAppearance.Aurora.Line3"
-        tools:text="4.2 45MB" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_app_list_shimmer.xml b/app/src/main/res/layout/view_app_list_shimmer.xml
deleted file mode 100644
index 5bef93684..000000000
--- a/app/src/main/res/layout/view_app_list_shimmer.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<com.facebook.shimmer.ShimmerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/shimmer_view_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:shimmer_highlight_alpha="0.25">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingStart="@dimen/padding_medium"
-        android:paddingTop="@dimen/padding_xsmall"
-        android:paddingEnd="@dimen/padding_small"
-        android:paddingBottom="@dimen/padding_xsmall">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img_icon"
-            android:layout_width="@dimen/icon_size_medium"
-            android:layout_height="@dimen/icon_size_medium"
-            android:layout_centerVertical="true"
-            app:srcCompat="@drawable/bg_rounded" />
-
-        <TextView
-            android:id="@+id/txt_line1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_normal"
-            android:layout_toEndOf="@id/img_icon"
-            android:background="?colorControlHighlight"
-            android:maxLines="1"
-            android:textAlignment="viewStart"
-            android:textAppearance="@style/TextAppearance.Aurora.Line1" />
-
-        <TextView
-            android:id="@+id/txt_line2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/txt_line1"
-            android:layout_alignStart="@id/txt_line1"
-            android:layout_alignEnd="@id/txt_line1"
-            android:layout_marginTop="@dimen/margin_xxsmall"
-            android:background="?colorControlHighlight"
-            android:maxLines="1"
-            android:textAlignment="viewStart"
-            android:textAppearance="@style/TextAppearance.Aurora.Line2" />
-
-        <TextView
-            android:id="@+id/txt_line3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/txt_line2"
-            android:layout_alignStart="@id/txt_line1"
-            android:layout_alignEnd="@id/txt_line1"
-            android:layout_marginTop="@dimen/margin_xxsmall"
-            android:background="?colorControlHighlight"
-            android:maxLines="1"
-            android:textAlignment="viewStart"
-            android:textAppearance="@style/TextAppearance.Aurora.Line3" />
-    </RelativeLayout>
-</com.facebook.shimmer.ShimmerFrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_app_progress.xml b/app/src/main/res/layout/view_app_progress.xml
deleted file mode 100644
index c4809f34e..000000000
--- a/app/src/main/res/layout/view_app_progress.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:layout_margin="@dimen/margin_xsmall">
-
-    <ProgressBar
-        android:id="@+id/img_icon"
-        android:layout_width="@dimen/icon_size_cluster"
-        android:layout_height="@dimen/icon_size_cluster"
-        android:layout_centerInParent="true"
-        android:scaleX="0.5"
-        android:scaleY="0.5" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_app_shimmer.xml b/app/src/main/res/layout/view_app_shimmer.xml
deleted file mode 100644
index 479202113..000000000
--- a/app/src/main/res/layout/view_app_shimmer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<com.facebook.shimmer.ShimmerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/shimmer_view_container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    app:shimmer_highlight_alpha="0.25">
-
-    <RelativeLayout
-        android:id="@+id/card"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="@dimen/padding_xsmall">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img_icon"
-            android:layout_width="@dimen/icon_size_cluster"
-            android:layout_height="@dimen/icon_size_cluster"
-            android:layout_centerHorizontal="true"
-            android:background="@drawable/bg_rounded" />
-
-        <TextView
-            android:id="@+id/txt_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/img_icon"
-            android:layout_alignStart="@id/img_icon"
-            android:layout_alignEnd="@id/img_icon"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/margin_small"
-            android:background="?colorControlHighlight"
-            android:textAppearance="@style/TextAppearance.Aurora.Line2" />
-
-        <TextView
-            android:id="@+id/txt_size"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/txt_name"
-            android:layout_alignStart="@id/txt_name"
-            android:layout_alignEnd="@id/txt_name"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/margin_xxsmall"
-            android:background="?colorControlHighlight"
-            android:textAppearance="@style/TextAppearance.Aurora.Line3" />
-    </RelativeLayout>
-</com.facebook.shimmer.ShimmerFrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_app_update.xml b/app/src/main/res/layout/view_app_update.xml
deleted file mode 100644
index e508bff03..000000000
--- a/app/src/main/res/layout/view_app_update.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/layout_content"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:orientation="vertical"
-    android:paddingStart="@dimen/padding_medium"
-    android:paddingTop="@dimen/padding_small"
-    android:paddingEnd="@dimen/padding_small"
-    android:paddingBottom="@dimen/padding_small">
-
-    <RelativeLayout
-        android:id="@+id/head_flipper"
-        android:layout_width="@dimen/icon_size_medium"
-        android:layout_height="@dimen/icon_size_medium">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img_icon"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true" />
-
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:id="@+id/progress_download"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true"
-            android:visibility="gone"
-            app:indicatorSize="@dimen/icon_size_medium"
-            app:trackThickness="3dp"
-            tools:progress="40" />
-    </RelativeLayout>
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/txt_line1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_normal"
-        android:layout_toStartOf="@+id/headerIndicator"
-        android:layout_toEndOf="@id/head_flipper"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.Aurora.Line1" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/txt_line2"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/txt_line1"
-        android:layout_alignStart="@+id/txt_line1"
-        android:layout_alignEnd="@id/txt_line1"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.Aurora.Line3" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/txt_line3"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/txt_line2"
-        android:layout_alignStart="@+id/txt_line1"
-        android:layout_alignEnd="@id/txt_line1"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.Aurora.Line3" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/txt_line4"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/txt_line3"
-        android:layout_alignStart="@+id/txt_line1"
-        android:layout_alignEnd="@id/txt_line1"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.Aurora.Line3" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/headerIndicator"
-        style="@style/Widget.Material3.Button.IconButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@id/txt_line1"
-        android:layout_toStartOf="@id/btn_action"
-        android:contentDescription="@string/details_changelog"
-        app:iconTint="?colorControlNormal"
-        app:icon="@drawable/ic_arrow_down" />
-
-    <com.aurora.store.view.custom.layouts.button.UpdateButton
-        android:id="@+id/btn_action"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/height_button"
-        android:layout_alignTop="@id/txt_line1"
-        android:layout_alignParentEnd="true"
-        android:gravity="center" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card_changelog"
-        style="@style/Widget.Material3.CardView.Filled"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txt_line4"
-        android:layout_marginTop="@dimen/margin_small"
-        android:visibility="gone"
-        app:contentPadding="@dimen/padding_small">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/txt_changelog"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:singleLine="false"
-            android:textAppearance="@style/TextAppearance.Aurora.Line2"
-            android:textIsSelectable="true" />
-    </com.google.android.material.card.MaterialCardView>
-</RelativeLayout>
diff --git a/app/src/main/res/layout/view_category.xml b/app/src/main/res/layout/view_category.xml
deleted file mode 100644
index 34eb9c3da..000000000
--- a/app/src/main/res/layout/view_category.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:selectableItemBackground"
-    android:padding="@dimen/padding_small">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/img_background"
-        android:layout_width="@dimen/icon_size_default"
-        android:layout_height="@dimen/icon_size_default"
-        android:layout_centerVertical="true"
-        app:tint="?colorAccent" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/txt_name"
-        style="@style/AuroraTextStyle.Line1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/margin_normal"
-        android:layout_toEndOf="@id/img_background"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:singleLine="true"
-        android:textSize="16sp"
-        tools:text="Category" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_header.xml b/app/src/main/res/layout/view_header.xml
deleted file mode 100644
index 877a733ae..000000000
--- a/app/src/main/res/layout/view_header.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/layout"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingStart="@dimen/padding_small"
-    android:paddingTop="@dimen/padding_xxsmall"
-    android:paddingEnd="@dimen/padding_small"
-    android:paddingBottom="@dimen/padding_xxsmall">
-
-    <TextView
-        android:id="@+id/txt_title"
-        style="@style/AuroraTextStyle.Subtitle.Alt"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toStartOf="@id/img_action"
-        android:ellipsize="end"
-        android:maxLines="1"
-        tools:text="Header" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/img_action"
-        android:layout_width="@dimen/icon_size_category"
-        android:layout_height="@dimen/icon_size_category"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/margin_small"
-        android:background="?selectableItemBackgroundBorderless"
-        android:contentDescription="@string/expand"
-        android:padding="@dimen/padding_xsmall"
-        app:srcCompat="@drawable/ic_arrow_right"
-        app:tint="?android:textColorPrimary" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/view_header_shimmer.xml b/app/src/main/res/layout/view_header_shimmer.xml
deleted file mode 100644
index 01e704cd4..000000000
--- a/app/src/main/res/layout/view_header_shimmer.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<com.facebook.shimmer.ShimmerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/shimmer_view_container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    app:shimmer_highlight_alpha="0.25">
-
-    <RelativeLayout
-        android:id="@+id/layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/padding_medium"
-        android:paddingTop="@dimen/padding_xsmall"
-        android:paddingEnd="@dimen/padding_small"
-        android:paddingBottom="@dimen/padding_xsmall">
-
-        <TextView
-            android:id="@+id/txt_title"
-            style="@style/AuroraTextStyle.Subtitle.Alt"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@id/img_action"
-            android:background="?colorControlHighlight"
-            android:ellipsize="end"
-            android:maxLines="1" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img_action"
-            android:layout_width="@dimen/icon_size_category"
-            android:layout_height="@dimen/icon_size_category"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/margin_small"
-            android:contentDescription="@string/expand"
-            android:padding="@dimen/padding_xsmall"
-            app:srcCompat="@drawable/ic_arrow_right"
-            app:tint="?colorControlHighlight" />
-    </RelativeLayout>
-</com.facebook.shimmer.ShimmerFrameLayout>
diff --git a/app/src/main/res/layout/view_header_update.xml b/app/src/main/res/layout/view_header_update.xml
deleted file mode 100644
index 6276cda27..000000000
--- a/app/src/main/res/layout/view_header_update.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="@dimen/padding_medium"
-    android:paddingTop="@dimen/padding_xsmall"
-    android:paddingEnd="@dimen/padding_small"
-    android:paddingBottom="@dimen/padding_xsmall">
-
-    <TextView
-        android:id="@+id/txt_title"
-        style="@style/AuroraTextStyle.Subtitle.Alt"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toStartOf="@id/btn_action"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:maxLines="1"
-        tools:text="Header" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_action"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:ellipsize="end"
-        android:text="@string/action_update_all" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/view_info.xml b/app/src/main/res/layout/view_info.xml
deleted file mode 100644
index 327d3c6cf..000000000
--- a/app/src/main/res/layout/view_info.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/padding_xsmall"
-    android:paddingStart="@dimen/padding_small"
-    android:paddingEnd="@dimen/padding_xsmall">
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/txt_title"
-        style="@style/AuroraTextStyle.Line1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="viewStart"
-        tools:text="Title" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/txt_subtitle"
-        style="@style/AuroraTextStyle.Line2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txt_title"
-        tools:text="Subtitle" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_locale.xml b/app/src/main/res/layout/view_locale.xml
deleted file mode 100644
index 21c94eb01..000000000
--- a/app/src/main/res/layout/view_locale.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:padding="@dimen/padding_small">
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/line1"
-        style="@style/AuroraTextStyle.Subtitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/checkbox" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/line2"
-        style="@style/AuroraTextStyle.Line1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/line1"
-        android:layout_alignStart="@id/line1"
-        android:layout_alignEnd="@id/line1"
-        android:textAlignment="viewStart"
-        android:textDirection="locale" />
-
-    <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/checkbox"
-        android:layout_width="@dimen/icon_size_category"
-        android:layout_height="@dimen/icon_size_category"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:minWidth="0dp" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/view_more_badge.xml b/app/src/main/res/layout/view_more_badge.xml
deleted file mode 100644
index 4f4b90229..000000000
--- a/app/src/main/res/layout/view_more_badge.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/padding_xsmall"
-    android:paddingStart="@dimen/padding_small"
-    android:paddingEnd="@dimen/padding_xsmall">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/img"
-        android:layout_width="@dimen/icon_size_default"
-        android:layout_height="@dimen/icon_size_default"
-        android:layout_centerVertical="true"
-        android:padding="@dimen/padding_xxsmall" />
-
-    <TextView
-        android:id="@+id/line1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_small"
-        android:layout_toEndOf="@id/img"
-        android:maxLines="1"
-        android:textAlignment="viewStart"
-        android:textAppearance="@style/TextAppearance.Aurora.Line1"
-        tools:text="Line1" />
-
-    <TextView
-        android:id="@+id/line2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/line1"
-        android:layout_alignStart="@id/line1"
-        android:layout_alignEnd="@id/line1"
-        android:maxLines="1"
-        android:textAlignment="viewStart"
-        android:textAppearance="@style/TextAppearance.Aurora.Line2"
-        tools:text="Line2" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_no_app.xml b/app/src/main/res/layout/view_no_app.xml
deleted file mode 100644
index c3c1aee25..000000000
--- a/app/src/main/res/layout/view_no_app.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/img"
-        android:layout_width="@dimen/icon_size"
-        android:layout_height="@dimen/icon_size"
-        android:layout_centerInParent="true"
-        app:tint="?colorPrimary"
-        tools:src="@drawable/ic_updates" />
-
-    <TextView
-        android:id="@+id/txt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/img"
-        android:layout_centerInParent="true"
-        android:layout_marginVertical="@dimen/margin_small"
-        android:textAppearance="@style/TextAppearance.Aurora.Line1"
-        tools:text="No updates available" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txt"
-        android:layout_centerInParent="true"
-        android:visibility="gone"
-        tools:text="@string/check_updates"
-        tools:visibility="visible" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/view_state_button.xml b/app/src/main/res/layout/view_state_button.xml
deleted file mode 100644
index 639d39de8..000000000
--- a/app/src/main/res/layout/view_state_button.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn"
-        style="@style/Widget.Material3.Button.OutlinedButton"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/height_button"
-        android:layout_centerHorizontal="true"
-        android:textAlignment="viewStart"
-        android:textColor="?colorControlNormal"
-        app:iconPadding="@dimen/padding_normal"
-        app:iconTint="?colorControlNormal"
-        app:strokeColor="?colorControlHighlight"
-        app:strokeWidth="1dp"
-        tools:icon="@drawable/ic_anonymous"
-        tools:text="Button Name" />
-
-    <androidx.core.widget.ContentLoadingProgressBar
-        android:id="@+id/progress"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="@dimen/icon_size_default"
-        android:layout_height="@dimen/icon_size_default"
-        android:layout_alignEnd="@id/btn"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/margin_large"
-        android:elevation="8dp"
-        android:visibility="invisible" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/view_update_button.xml b/app/src/main/res/layout/view_update_button.xml
deleted file mode 100644
index 056e579f3..000000000
--- a/app/src/main/res/layout/view_update_button.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <ViewFlipper
-        android:id="@+id/view_flipper"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:inAnimation="@anim/fade_in"
-        android:outAnimation="@anim/fade_out"
-        tools:ignore="UselessParent">
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btnPositive"
-                style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/action_update" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btnNegative"
-                style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/action_cancel" />
-        </RelativeLayout>
-    </ViewFlipper>
-</RelativeLayout>
diff --git a/app/src/main/res/menu/menu_app.xml b/app/src/main/res/menu/menu_app.xml
deleted file mode 100644
index eb64de0b8..000000000
--- a/app/src/main/res/menu/menu_app.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_blacklist"
-        android:title="@string/action_blacklist" />
-    <item
-        android:id="@+id/action_ignore"
-        android:title="@string/action_ignore"
-        android:visible="false" />
-    <item
-        android:id="@+id/action_local"
-        android:title="@string/action_get_local_apk" />
-    <item
-        android:id="@+id/action_uninstall"
-        android:title="@string/action_uninstall" />
-    <item
-        android:id="@+id/action_info"
-        android:title="@string/action_info" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_bottom_nav.xml b/app/src/main/res/menu/menu_bottom_nav.xml
deleted file mode 100644
index 84ef7308a..000000000
--- a/app/src/main/res/menu/menu_bottom_nav.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@id/appsContainerFragment"
-        android:icon="@drawable/ic_apps"
-        android:title="@string/title_apps" />
-
-    <item
-        android:id="@id/gamesContainerFragment"
-        android:icon="@drawable/ic_games"
-        android:title="@string/title_games" />
-
-    <item
-        android:id="@id/updatesFragment"
-        android:icon="@drawable/ic_updates"
-        android:title="@string/title_updates" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_import_export.xml b/app/src/main/res/menu/menu_import_export.xml
deleted file mode 100644
index 5bad5f14c..000000000
--- a/app/src/main/res/menu/menu_import_export.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_import"
-        android:title="@string/action_import" />
-    <item
-        android:id="@+id/action_export"
-        android:title="@string/action_export" />
-</menu>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
deleted file mode 100644
index 93579998d..000000000
--- a/app/src/main/res/menu/menu_main.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/menu_download_manager"
-        android:icon="@drawable/ic_download_manager"
-        android:title="@string/title_download_manager"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/menu_more"
-        android:icon="@drawable/ic_settings_account"
-        android:title="@string/title_more"
-        app:showAsAction="ifRoom" />
-</menu>
diff --git a/app/src/main/res/menu/menu_splash.xml b/app/src/main/res/menu/menu_splash.xml
deleted file mode 100644
index 48f279a78..000000000
--- a/app/src/main/res/menu/menu_splash.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_blacklist_manager"
-        android:icon="@drawable/ic_blacklist"
-        android:title="@string/title_blacklist_manager" />
-
-    <item
-        android:id="@+id/menu_spoof_manager"
-        android:icon="@drawable/ic_anonymous"
-        android:title="@string/title_spoof_manager" />
-
-    <item
-        android:id="@+id/menu_settings"
-        android:icon="@drawable/ic_menu_settings"
-        android:title="@string/title_settings" />
-
-    <item
-        android:id="@+id/menu_about"
-        android:icon="@drawable/ic_menu_about"
-        android:title="@string/title_about" />
-</menu>
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
deleted file mode 100644
index b9ccea686..000000000
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/mobile_navigation"
-    app:startDestination="@id/splashFragment">
-
-    <action
-        android:id="@+id/action_global_categoryBrowseFragment"
-        app:destination="@id/categoryBrowseFragment" />
-    <action
-        android:id="@+id/action_global_expandedStreamBrowseFragment"
-        app:destination="@id/expandedStreamBrowseFragment" />
-    <action
-        android:id="@+id/action_global_devProfileFragment"
-        app:destination="@id/devProfileFragment" />
-    <action
-        android:id="@+id/action_global_appMenuSheet"
-        app:destination="@id/appMenuSheet" />
-    <action
-        android:id="@+id/action_global_moreDialogFragment"
-        app:destination="@id/moreDialogFragment" />
-    <fragment
-        android:id="@+id/appsContainerFragment"
-        android:name="com.aurora.store.view.ui.apps.AppsContainerFragment"
-        android:label="@string/title_apps"
-        tools:layout="@layout/fragment_apps_games" />
-    <fragment
-        android:id="@+id/gamesContainerFragment"
-        android:name="com.aurora.store.view.ui.games.GamesContainerFragment"
-        android:label="@string/title_games"
-        tools:layout="@layout/fragment_apps_games" />
-    <fragment
-        android:id="@+id/updatesFragment"
-        android:name="com.aurora.store.view.ui.updates.UpdatesFragment"
-        android:label="@string/title_updates"
-        tools:layout="@layout/fragment_updates" />
-    <fragment
-        android:id="@+id/settingsFragment"
-        android:name="com.aurora.store.view.ui.preferences.SettingsFragment"
-        android:label="@string/title_settings"
-        tools:layout="@layout/fragment_setting" />
-    <fragment
-        android:id="@+id/installationPreference"
-        android:name="com.aurora.store.view.ui.preferences.installation.InstallationPreference"
-        android:label="InstallationPreference"
-        tools:layout="@layout/fragment_setting" />
-    <fragment
-        android:id="@+id/networkPreference"
-        android:name="com.aurora.store.view.ui.preferences.network.NetworkPreference"
-        android:label="NetworkPreference"
-        tools:layout="@layout/fragment_setting" />
-    <fragment
-        android:id="@+id/UIPreference"
-        android:name="com.aurora.store.view.ui.preferences.UIPreference"
-        android:label="UIPreference"
-        tools:layout="@layout/fragment_setting" />
-    <fragment
-        android:id="@+id/updatesPreference"
-        android:name="com.aurora.store.view.ui.preferences.updates.UpdatesPreference"
-        android:label="UpdatesPreference"
-        tools:layout="@layout/fragment_setting" />
-    <fragment
-        android:id="@+id/categoryBrowseFragment"
-        android:name="com.aurora.store.view.ui.commons.CategoryBrowseFragment"
-        tools:layout="@layout/fragment_generic_with_toolbar">
-        <argument
-            android:name="title"
-            app:argType="string" />
-        <argument
-            android:name="browseUrl"
-            app:argType="string" />
-    </fragment>
-    <fragment
-        android:id="@+id/expandedStreamBrowseFragment"
-        android:name="com.aurora.store.view.ui.commons.ExpandedStreamBrowseFragment"
-        tools:layout="@layout/fragment_generic_with_toolbar">
-        <argument
-            android:name="title"
-            app:argType="string" />
-        <argument
-            android:name="expandedStreamUrl"
-            app:argType="string" />
-    </fragment>
-    <fragment
-        android:id="@+id/devProfileFragment"
-        android:name="com.aurora.store.view.ui.details.DevProfileFragment"
-        android:label="fragment_dev_profile"
-        tools:layout="@layout/fragment_dev_profile">
-        <argument
-            android:name="devId"
-            app:argType="string" />
-        <argument
-            android:name="title"
-            android:defaultValue=""
-            app:argType="string"
-            app:nullable="true" />
-        <deepLink
-            app:action="android.intent.action.VIEW"
-            app:uri="play.google.com/store/apps/dev?id={devId}" />
-    </fragment>
-    <fragment
-        android:id="@+id/splashFragment"
-        android:name="com.aurora.store.view.ui.splash.SplashFragment"
-        tools:layout="@layout/fragment_splash">
-        <argument
-            android:name="packageName"
-            android:defaultValue=""
-            app:argType="string" />
-        <!-- Android Market (deprecated) -->
-        <deepLink
-            app:action="android.intent.action.VIEW"
-            app:uri="market:///details?id={packageName}" />
-        <deepLink
-            app:action="android.intent.action.VIEW"
-            app:uri="market.android.com/details?id={packageName}" />
-        <!-- Google Play (formerly Android Market) -->
-        <deepLink
-            app:action="android.intent.action.VIEW"
-            app:uri="play.google.com/store/apps/details?id={packageName}" />
-        <deepLink
-            app:action="android.intent.action.VIEW"
-            app:uri="play.google.com/store/search?q={query}" />
-        <action
-            android:id="@+id/action_splashFragment_to_navigation_apps"
-            app:destination="@id/appsContainerFragment"
-            app:launchSingleTop="true"
-            app:popUpTo="@id/mobile_navigation"
-            app:popUpToInclusive="true" />
-        <action
-            android:id="@+id/action_splashFragment_to_gamesContainerFragment"
-            app:destination="@id/gamesContainerFragment"
-            app:launchSingleTop="true"
-            app:popUpTo="@id/mobile_navigation"
-            app:popUpToInclusive="true" />
-        <action
-            android:id="@+id/action_splashFragment_to_updatesFragment"
-            app:destination="@id/updatesFragment"
-            app:launchSingleTop="true"
-            app:popUpTo="@id/mobile_navigation"
-            app:popUpToInclusive="true" />
-    </fragment>
-    <fragment
-        android:id="@+id/googleFragment"
-        android:name="com.aurora.store.view.ui.account.GoogleFragment"
-        tools:layout="@layout/fragment_google">
-        <action
-            android:id="@+id/action_googleFragment_to_splashFragment"
-            app:destination="@id/splashFragment"
-            app:popUpTo="@id/splashFragment"
-            app:popUpToInclusive="true" />
-    </fragment>
-    <dialog
-        android:id="@+id/appMenuSheet"
-        android:name="com.aurora.store.view.ui.sheets.AppMenuSheet"
-        android:label="AppMenuSheet"
-        tools:layout="@layout/sheet_app_menu">
-        <argument
-            android:name="app"
-            app:argType="com.aurora.store.data.model.MinimalApp" />
-    </dialog>
-    <dialog
-        android:id="@+id/deviceMiuiSheet"
-        android:name="com.aurora.store.view.ui.sheets.DeviceMiuiSheet"
-        android:label="DeviceMiuiSheet"
-        tools:layout="@layout/sheet_device_miui" />
-    <dialog
-        android:id="@+id/moreDialogFragment"
-        android:name="com.aurora.store.view.ui.commons.MoreDialogFragment"
-        android:label="MoreDialogFragment" />
-    <dialog
-        android:id="@+id/proxyURLDialog"
-        android:name="com.aurora.store.view.ui.preferences.network.ProxyURLDialog"
-        android:label="@string/pref_network_proxy_url" />
-    <dialog
-        android:id="@+id/forceRestartDialog"
-        android:name="com.aurora.store.view.ui.commons.ForceRestartDialog"
-        android:label="@string/force_restart_title" />
-    <dialog
-        android:id="@+id/updatesRestrictionsDialog"
-        android:name="com.aurora.store.view.ui.preferences.updates.UpdatesRestrictionsDialog"
-        android:label="@string/pref_updates_restrictions_title" />
-</navigation>
diff --git a/app/src/main/res/xml/preferences_installation.xml b/app/src/main/res/xml/preferences_installation.xml
deleted file mode 100644
index b1deedda6..000000000
--- a/app/src/main/res/xml/preferences_installation.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<androidx.preference.PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        app:defaultValue="0"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_INSTALLER_ID"
-        app:summary="@string/pref_install_mode_summary"
-        app:title="@string/pref_install_mode_title" />
-
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:singleLineTitle="false"
-        app:title="@string/pref_common_extra" />
-
-    <SwitchPreferenceCompat
-        app:defaultValue="true"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_AUTO_DELETE"
-        app:summary="@string/pref_install_delete_summary"
-        app:title="@string/pref_install_delete_title" />
-
-    <Preference
-        app:iconSpaceReserved="false"
-        app:isPreferenceVisible="false"
-        app:key="PREFERENCE_INSTALLATION_DEVICE_OWNER"
-        app:summary="@string/pref_clear_device_owner_summary"
-        app:title="@string/pref_clear_device_owner_title" />
-</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_network.xml b/app/src/main/res/xml/preferences_network.xml
deleted file mode 100644
index fd55ab4d3..000000000
--- a/app/src/main/res/xml/preferences_network.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_DISPENSER_URLS"
-        app:summary="@string/pref_dispenser_summary"
-        app:title="@string/pref_dispenser_title" />
-
-    <Preference
-        app:disableDependentsState="false"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_PROXY_URL"
-        app:summary="@string/pref_network_proxy_desc"
-        app:title="@string/pref_network_proxy_url" />
-
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:singleLineTitle="false"
-        app:title="@string/pref_common_extra" />
-
-    <SwitchPreferenceCompat
-        app:defaultValue="true"
-        app:disableDependentsState="false"
-        app:iconSpaceReserved="false"
-        app:isPreferenceVisible="false"
-        app:key="PREFERENCE_MICROG_AUTH"
-        app:summary="@string/pref_network_microg_login_desc"
-        app:title="@string/pref_network_microg_login_title" />
-
-    <com.aurora.store.view.custom.preference.AuroraListPreference
-        app:defaultValue="0"
-        app:entries="@array/pref_vending_version"
-        app:entryValues="@array/pref_vending_version_values"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_VENDING_VERSION"
-        app:title="@string/pref_vending_version_title"
-        app:useSimpleSummaryProvider="true" />
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_settings.xml b/app/src/main/res/xml/preferences_settings.xml
deleted file mode 100644
index e4e7a60e0..000000000
--- a/app/src/main/res/xml/preferences_settings.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        app:icon="@drawable/ic_list_check"
-        app:iconSpaceReserved="false"
-        app:key="pref_perms"
-        app:layout="@layout/item_preference"
-        app:title="@string/onboarding_title_permissions" />
-
-    <Preference
-        app:icon="@drawable/ic_installation"
-        app:iconSpaceReserved="false"
-        app:key="pref_install"
-        app:layout="@layout/item_preference"
-        app:title="@string/title_installation" />
-
-    <Preference
-        app:icon="@drawable/ic_ui"
-        app:iconSpaceReserved="false"
-        app:key="pref_ui"
-        app:layout="@layout/item_preference"
-        app:title="@string/pref_ui_title" />
-
-    <Preference
-        app:icon="@drawable/ic_network"
-        app:iconSpaceReserved="false"
-        app:key="pref_network"
-        app:layout="@layout/item_preference"
-        app:title="@string/pref_network_title" />
-
-    <Preference
-        app:icon="@drawable/ic_updates"
-        app:iconSpaceReserved="false"
-        app:key="pref_updates"
-        app:layout="@layout/item_preference"
-        app:title="@string/title_updates" />
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_ui.xml b/app/src/main/res/xml/preferences_ui.xml
deleted file mode 100644
index b3367dcaa..000000000
--- a/app/src/main/res/xml/preferences_ui.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<androidx.preference.PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_APP_LANGUAGE"
-        app:title="@string/app_language" />
-
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:singleLineTitle="false"
-        app:title="@string/pref_ui_layout" />
-
-    <com.aurora.store.view.custom.preference.AuroraListPreference
-        app:defaultValue="0"
-        app:entries="@array/pref_default_tab"
-        app:entryValues="@array/pref_default_tab_values"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_DEFAULT_SELECTED_TAB"
-        app:title="@string/pref_ui_layout_tab"
-        app:useSimpleSummaryProvider="true" />
-
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:singleLineTitle="false"
-        app:title="@string/pref_common_extra" />
-
-    <SwitchPreferenceCompat
-        app:defaultValue="true"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_FOR_YOU"
-        app:summary="@string/pref_ui_no_for_you_desc"
-        app:title="@string/pref_ui_no_for_you" />
-</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_updates.xml b/app/src/main/res/xml/preferences_updates.xml
deleted file mode 100644
index 868001e9f..000000000
--- a/app/src/main/res/xml/preferences_updates.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <com.aurora.store.view.custom.preference.AuroraListPreference
-        app:defaultValue="2"
-        app:entries="@array/pref_updates_auto"
-        app:entryValues="@array/pref_updates_auto_values"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_UPDATES_AUTO"
-        app:summary="@string/pref_updates_auto_desc"
-        app:title="@string/pref_updates_auto" />
-
-    <SeekBarPreference
-        android:defaultValue="3"
-        android:key="PREFERENCE_UPDATES_CHECK_INTERVAL"
-        android:max="24"
-        android:summary="@string/pref_updates_check_frequency_desc"
-        android:title="@string/pref_updates_check_frequency"
-        app:adjustable="true"
-        app:iconSpaceReserved="false"
-        app:min="1"
-        app:showSeekBarValue="true" />
-
-    <Preference
-        app:disableDependentsState="false"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCES_UPDATES_RESTRICTIONS"
-        app:summary="@string/pref_updates_restrictions_desc"
-        app:title="@string/pref_updates_restrictions_title" />
-
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:singleLineTitle="false"
-        app:title="@string/pref_updates_app_source" />
-
-    <SwitchPreferenceCompat
-        app:defaultValue="true"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_FILTER_FDROID"
-        app:summary="@string/pref_filter_fdroid_summary"
-        app:title="@string/pref_filter_fdroid_title" />
-
-    <SwitchPreferenceCompat
-        app:defaultValue="false"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_FILTER_AURORA_ONLY"
-        app:summary="@string/pref_aurora_only_desc"
-        app:title="@string/pref_aurora_only" />
-
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:singleLineTitle="false"
-        app:title="@string/pref_common_advanced" />
-
-    <SwitchPreferenceCompat
-        app:defaultValue="false"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_UPDATES_EXTENDED"
-        app:summary="@string/pref_updates_incompatible_desc"
-        app:title="@string/pref_updates_incompatible" />
-</androidx.preference.PreferenceScreen>