diff --git a/app/src/main/java/com/topjohnwu/magisk/model/adapters/StringListAdapter.java b/app/src/main/java/com/topjohnwu/magisk/model/adapters/StringListAdapter.java
deleted file mode 100644
index b76064220..000000000
--- a/app/src/main/java/com/topjohnwu/magisk/model/adapters/StringListAdapter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.topjohnwu.magisk.model.adapters;
-
-import android.app.Activity;
-import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.util.List;
-
-import androidx.annotation.IdRes;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-public abstract class StringListAdapter<VH extends StringListAdapter.ViewHolder>
-        extends RecyclerView.Adapter<VH> {
-
-    private RecyclerView rv;
-    private boolean dynamic;
-    private int screenWidth;
-    private int txtWidth = -1;
-    private int padding;
-
-    protected List<String> mList;
-
-    public StringListAdapter(List<String> list) {
-        this(list, false);
-    }
-
-    public StringListAdapter(List<String> list, boolean isDynamic) {
-        mList = list;
-        dynamic = isDynamic;
-    }
-
-    @NonNull
-    @Override
-    public final VH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(itemLayoutRes(), parent, false);
-        VH vh = createViewHolder(v);
-        if (txtWidth < 0)
-            onUpdateTextWidth(vh);
-        return vh;
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull VH holder, int position) {
-        holder.txt.setText(mList.get(position));
-        holder.txt.getLayoutParams().width = txtWidth;
-        if (dynamic)
-            onUpdateTextWidth(holder);
-    }
-
-    protected void onUpdateTextWidth(VH vh) {
-        if (txtWidth < 0) {
-            txtWidth = screenWidth - padding;
-        } else {
-            vh.txt.measure(0, 0);
-            int width = vh.txt.getMeasuredWidth();
-            if (width > txtWidth) {
-                txtWidth = width;
-                vh.txt.getLayoutParams().width = txtWidth;
-            }
-        }
-        if (rv.getWidth() != txtWidth + padding)
-            rv.requestLayout();
-    }
-
-    @Override
-    public void onAttachedToRecyclerView(@NonNull RecyclerView rv) {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        ((Activity) rv.getContext()).getWindowManager()
-                .getDefaultDisplay().getMetrics(displayMetrics);
-        screenWidth = displayMetrics.widthPixels;
-        padding = rv.getPaddingStart() + rv.getPaddingEnd();
-        this.rv = rv;
-    }
-
-    @Override
-    public final int getItemCount() {
-        return mList.size();
-    }
-
-    @LayoutRes
-    protected abstract int itemLayoutRes();
-
-    @NonNull
-    public abstract VH createViewHolder(@NonNull View v);
-
-    public static abstract class ViewHolder extends RecyclerView.ViewHolder {
-
-        public TextView txt;
-
-        public ViewHolder(@NonNull View itemView) {
-            super(itemView);
-            txt = itemView.findViewById(textViewResId());
-        }
-
-        @IdRes
-        protected abstract int textViewResId();
-    }
-}
diff --git a/app/src/main/java/com/topjohnwu/magisk/view/ArrowExpandable.java b/app/src/main/java/com/topjohnwu/magisk/view/ArrowExpandable.java
deleted file mode 100644
index 81478cddd..000000000
--- a/app/src/main/java/com/topjohnwu/magisk/view/ArrowExpandable.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.topjohnwu.magisk.view;
-
-import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.RotateAnimation;
-
-public class ArrowExpandable extends Expandable {
-    protected Expandable mBase;
-    private View arrow;
-
-    public ArrowExpandable(Expandable base, View arrow) {
-        mBase = base;
-        this.arrow = arrow;
-    }
-
-    @Override
-    public void onExpand() {
-        mBase.onExpand();
-        setRotate(new RotateAnimation(0, 180,
-                Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f));
-    }
-
-    @Override
-    public void onCollapse() {
-        mBase.onCollapse();
-        setRotate(new RotateAnimation(180, 0,
-                Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f));
-    }
-
-    @Override
-    public void onSetExpanded(boolean expanded) {
-        mBase.onSetExpanded(expanded);
-        if (arrow != null)
-            arrow.setRotation(expanded ? 180 : 0);
-    }
-
-    private void setRotate(RotateAnimation rotate) {
-        rotate.setDuration(300);
-        rotate.setFillAfter(true);
-        arrow.startAnimation(rotate);
-    }
-}
diff --git a/app/src/main/java/com/topjohnwu/magisk/view/UpdateCardHolder.java b/app/src/main/java/com/topjohnwu/magisk/view/UpdateCardHolder.java
deleted file mode 100644
index 3e657e458..000000000
--- a/app/src/main/java/com/topjohnwu/magisk/view/UpdateCardHolder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.topjohnwu.magisk.view;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.R;
-
-import butterknife.BindView;
-import butterknife.Unbinder;
-
-public class UpdateCardHolder {
-
-    @BindView(R.id.status_icon) public ImageView statusIcon;
-    @BindView(R.id.progress) public ProgressBar progress;
-    @BindView(R.id.status) public TextView status;
-    @BindView(R.id.current_version) public TextView currentVersion;
-    @BindView(R.id.latest_version) public TextView latestVersion;
-    @BindView(R.id.additional) public TextView additional;
-    @BindView(R.id.install) public Button install;
-
-    public View itemView;
-    public Unbinder unbinder;
-
-    public UpdateCardHolder(LayoutInflater inflater, ViewGroup root) {
-        itemView = inflater.inflate(R.layout.update_card, root, false);
-        unbinder = new UpdateCardHolder_ViewBinding(this, itemView);
-    }
-
-    public void setClickable(View.OnClickListener listener) {
-        itemView.setClickable(true);
-        itemView.setFocusable(true);
-        itemView.setOnClickListener(listener);
-    }
-
-    public void setValid(boolean valid) {
-        progress.setVisibility(View.GONE);
-        statusIcon.setVisibility(View.VISIBLE);
-        if (valid) {
-            install.setVisibility(View.VISIBLE);
-            latestVersion.setVisibility(View.VISIBLE);
-        } else {
-            install.setVisibility(View.GONE);
-            latestVersion.setVisibility(View.GONE);
-        }
-    }
-
-    public void reset() {
-        progress.setVisibility(View.VISIBLE);
-        statusIcon.setVisibility(View.INVISIBLE);
-        latestVersion.setVisibility(View.GONE);
-        install.setVisibility(View.GONE);
-        status.setText(R.string.checking_for_updates);
-    }
-}
diff --git a/app/src/main/res/layout/list_item_console.xml b/app/src/main/res/layout/list_item_console.xml
deleted file mode 100644
index 14e132c3a..000000000
--- a/app/src/main/res/layout/list_item_console.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/txt"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:fontFamily="monospace"
-    android:textSize="10sp" />
diff --git a/app/src/main/res/layout/list_item_hide_app.xml b/app/src/main/res/layout/list_item_hide_app.xml
deleted file mode 100644
index 6bf54d091..000000000
--- a/app/src/main/res/layout/list_item_hide_app.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="?attr/cardStyle"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
-    android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
-    android:layout_marginBottom="@dimen/card_vertical_margin"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    app:cardCornerRadius="@dimen/card_corner_radius"
-    app:cardElevation="@dimen/card_elevation">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/info_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ImageView
-            android:id="@+id/app_icon"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:gravity="end"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/app_name"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/app_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textIsSelectable="false"
-            app:layout_constraintBottom_toTopOf="@+id/package_name"
-            app:layout_constraintEnd_toStartOf="@+id/checkbox"
-            app:layout_constraintStart_toEndOf="@+id/app_icon"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/package_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@android:color/tertiary_text_dark"
-            android:textIsSelectable="false"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/arrow"
-            app:layout_constraintStart_toStartOf="@+id/app_name"
-            app:layout_constraintTop_toBottomOf="@+id/app_name" />
-
-        <ImageView
-            android:id="@+id/arrow"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:tint="?attr/imageColorTint"
-            app:layout_constraintBottom_toBottomOf="@+id/package_name"
-            app:layout_constraintEnd_toEndOf="@+id/app_name"
-            app:layout_constraintStart_toEndOf="@+id/package_name"
-            app:layout_constraintTop_toTopOf="@+id/package_name"
-            app:srcCompat="@drawable/ic_arrow" />
-
-        <View
-            android:id="@+id/trigger"
-            android:layout_width="35dp"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/arrow"
-            app:layout_constraintStart_toStartOf="@+id/arrow"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.buildware.widget.indeterm.IndeterminateCheckBox
-            android:id="@+id/checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/app_name"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.cardview.widget.CardView>
-
-
diff --git a/app/src/main/res/layout/list_item_hide_process.xml b/app/src/main/res/layout/list_item_hide_process.xml
deleted file mode 100644
index d3dbd0095..000000000
--- a/app/src/main/res/layout/list_item_hide_process.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/cardView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="end"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
-    app:cardCornerRadius="0dp"
-    app:cardElevation="@dimen/card_elevation">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/info_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingTop="2dp"
-        android:paddingBottom="2dp">
-
-        <TextView
-            android:id="@+id/process"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@android:color/tertiary_text_dark"
-            android:textIsSelectable="false"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.506" />
-
-        <CheckBox
-            android:id="@+id/checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:checked="false"
-            android:focusable="false"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.cardview.widget.CardView>
-
-
diff --git a/app/src/main/res/layout/list_item_module.xml b/app/src/main/res/layout/list_item_module.xml
deleted file mode 100644
index cc82443c7..000000000
--- a/app/src/main/res/layout/list_item_module.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView 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"
-    style="?attr/cardStyle"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
-    android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
-    android:layout_marginBottom="@dimen/card_vertical_margin"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    app:cardCornerRadius="@dimen/card_corner_radius"
-    app:cardElevation="@dimen/card_elevation">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="10dp"
-        android:paddingTop="5dp"
-        android:paddingEnd="10dp"
-        android:paddingBottom="8dp">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textIsSelectable="false"
-            app:layout_constraintBottom_toTopOf="@+id/version_name"
-            app:layout_constraintEnd_toStartOf="@+id/checkbox"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/version_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@android:color/tertiary_text_dark"
-            android:textIsSelectable="false"
-            android:textStyle="bold|italic"
-            app:layout_constraintBottom_toTopOf="@+id/author"
-            app:layout_constraintEnd_toEndOf="@+id/title"
-            app:layout_constraintStart_toStartOf="@+id/title"
-            app:layout_constraintTop_toBottomOf="@+id/title" />
-
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@android:color/tertiary_text_dark"
-            android:textIsSelectable="false"
-            android:textStyle="bold|italic"
-            app:layout_constraintBottom_toTopOf="@+id/description"
-            app:layout_constraintEnd_toEndOf="@+id/title"
-            app:layout_constraintStart_toStartOf="@+id/title"
-            app:layout_constraintTop_toBottomOf="@+id/version_name" />
-
-        <TextView
-            android:id="@+id/description"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textIsSelectable="false"
-            app:layout_constraintBottom_toTopOf="@+id/notice"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/title"
-            app:layout_constraintTop_toBottomOf="@+id/author" />
-
-        <TextView
-            android:id="@+id/notice"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:text="@string/remove_file_created"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/red500"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/title"
-            app:layout_constraintTop_toBottomOf="@+id/description" />
-
-        <CheckBox
-            android:id="@+id/checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:focusable="false"
-            app:layout_constraintBottom_toTopOf="@+id/description"
-            app:layout_constraintEnd_toStartOf="@+id/delete"
-            app:layout_constraintStart_toEndOf="@+id/title"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/delete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:tint="@color/icon_grey"
-            app:layout_constraintBottom_toBottomOf="@+id/checkbox"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/checkbox"
-            app:layout_constraintTop_toTopOf="@+id/checkbox"
-            app:srcCompat="@drawable/ic_delete"
-            tools:ignore="ContentDescription" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_policy.xml b/app/src/main/res/layout/list_item_policy.xml
deleted file mode 100644
index 6830c1e04..000000000
--- a/app/src/main/res/layout/list_item_policy.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="?attr/cardStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
-    android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
-    android:layout_marginBottom="@dimen/card_vertical_margin"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    app:cardCornerRadius="@dimen/card_corner_radius"
-    app:cardElevation="@dimen/card_elevation">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@+id/app_icon"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="8dp"
-                android:gravity="end"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/app_name"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-
-            <TextView
-                android:id="@+id/app_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textIsSelectable="false"
-                app:layout_constraintBottom_toTopOf="@+id/package_name"
-                app:layout_constraintEnd_toStartOf="@+id/master_switch"
-                app:layout_constraintStart_toEndOf="@+id/app_icon"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/package_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@android:color/tertiary_text_dark"
-                android:textIsSelectable="false"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/arrow"
-                app:layout_constraintStart_toStartOf="@id/app_name"
-                app:layout_constraintTop_toBottomOf="@id/app_name" />
-
-            <ImageView
-                android:id="@+id/arrow"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="5dp"
-                android:tint="?attr/imageColorTint"
-                app:layout_constraintBottom_toBottomOf="@+id/package_name"
-                app:layout_constraintEnd_toEndOf="@+id/app_name"
-                app:layout_constraintStart_toEndOf="@+id/package_name"
-                app:layout_constraintTop_toTopOf="@+id/package_name"
-                app:srcCompat="@drawable/ic_arrow" />
-
-            <View
-                android:id="@+id/trigger"
-                android:layout_width="35dp"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="@+id/arrow"
-                app:layout_constraintStart_toStartOf="@+id/arrow"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/master_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:checked="false"
-                android:gravity="center_vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/app_name"
-                app:layout_constraintTop_toTopOf="parent" />
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/expand_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="5dp"
-            android:paddingBottom="5dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/package_name">
-
-            <ImageView
-                android:id="@+id/bell"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="16dp"
-                android:tint="@color/icon_grey"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/notification_switch"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_notifications" />
-
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/notification_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:checked="false"
-                android:gravity="center_vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/guideline"
-                app:layout_constraintStart_toEndOf="@+id/bell"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent="0.4" />
-
-            <ImageView
-                android:id="@+id/bug"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:tint="@color/icon_grey"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/logging_switch"
-                app:layout_constraintStart_toStartOf="@+id/guideline"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_bug_report" />
-
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/logging_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginEnd="16dp"
-                android:checked="false"
-                android:gravity="center_vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/guideline2"
-                app:layout_constraintStart_toEndOf="@+id/bug"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent="0.8" />
-
-            <ImageView
-                android:id="@+id/more_info"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:background="?android:attr/selectableItemBackground"
-                android:tint="@color/icon_grey"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/delete"
-                app:layout_constraintStart_toStartOf="@id/guideline2"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_more" />
-
-            <ImageView
-                android:id="@+id/delete"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:background="?android:attr/selectableItemBackground"
-                android:tint="@color/icon_grey"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/more_info"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_delete" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </LinearLayout>
-
-
-</androidx.cardview.widget.CardView>
-
-
diff --git a/app/src/main/res/layout/list_item_repo.xml b/app/src/main/res/layout/list_item_repo.xml
deleted file mode 100644
index aa50b056d..000000000
--- a/app/src/main/res/layout/list_item_repo.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="?attr/cardStyle"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
-    android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
-    android:layout_marginBottom="@dimen/card_vertical_margin"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    app:cardCornerRadius="@dimen/card_corner_radius"
-    app:cardElevation="@dimen/card_elevation">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="10dp"
-        android:paddingTop="5dp"
-        android:paddingEnd="10dp"
-        android:paddingBottom="8dp">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textIsSelectable="false"
-            app:layout_constraintBottom_toTopOf="@+id/version_name"
-            app:layout_constraintEnd_toStartOf="@+id/download"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/version_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@android:color/tertiary_text_dark"
-            android:textIsSelectable="false"
-            android:textStyle="bold|italic"
-            app:layout_constraintBottom_toTopOf="@+id/author"
-            app:layout_constraintEnd_toEndOf="@+id/title"
-            app:layout_constraintStart_toStartOf="@+id/title"
-            app:layout_constraintTop_toBottomOf="@+id/title" />
-
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@android:color/tertiary_text_dark"
-            android:textIsSelectable="false"
-            android:textStyle="bold|italic"
-            app:layout_constraintBottom_toTopOf="@+id/description"
-            app:layout_constraintEnd_toEndOf="@+id/title"
-            app:layout_constraintStart_toStartOf="@+id/title"
-            app:layout_constraintTop_toBottomOf="@+id/version_name" />
-
-        <TextView
-            android:id="@+id/description"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textIsSelectable="false"
-            app:layout_constraintBottom_toTopOf="@+id/update_time"
-            app:layout_constraintEnd_toEndOf="@id/title"
-            app:layout_constraintStart_toStartOf="@+id/title"
-            app:layout_constraintTop_toBottomOf="@+id/author" />
-
-        <TextView
-            android:id="@+id/update_time"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@android:color/tertiary_text_dark"
-            android:textStyle="bold|italic"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/title"
-            app:layout_constraintStart_toStartOf="@+id/title"
-            app:layout_constraintTop_toBottomOf="@+id/description" />
-
-        <View
-            android:id="@+id/info_layout"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="?android:attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            app:layout_constraintBottom_toBottomOf="@+id/update_time"
-            app:layout_constraintEnd_toEndOf="@+id/title"
-            app:layout_constraintStart_toStartOf="@+id/title"
-            app:layout_constraintTop_toTopOf="@+id/title" />
-
-        <ImageView
-            android:id="@+id/download"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="8dp"
-            android:background="?android:attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="end"
-            android:tint="@color/icon_grey"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/title"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_file_download_black" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</androidx.cardview.widget.CardView>
-
-
diff --git a/app/src/main/res/layout/list_item_sulog.xml b/app/src/main/res/layout/list_item_sulog.xml
deleted file mode 100644
index 5df989cf1..000000000
--- a/app/src/main/res/layout/list_item_sulog.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    style="?attr/cardStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
-    android:layout_marginTop="2dp"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
-    android:layout_marginBottom="2dp"
-    card_view:cardCornerRadius="@dimen/card_corner_radius"
-    card_view:cardElevation="@dimen/card_elevation">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/info_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="10dp">
-
-            <TextView
-                android:id="@+id/app_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textIsSelectable="false" />
-
-            <TextView
-                android:id="@+id/action"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center_horizontal"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary" />
-
-            <TextView
-                android:id="@+id/time"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center_horizontal"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/expand_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:paddingStart="10dp"
-            android:paddingTop="5dp"
-            android:paddingEnd="10dp"
-            android:paddingBottom="5dp">
-
-            <TextView
-                android:id="@+id/pid"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/pid"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/uid"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/target_uid"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/cmd"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:text="@string/command"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textSize="12sp" />
-
-        </LinearLayout>
-
-
-    </LinearLayout>
-
-
-</androidx.cardview.widget.CardView>
-
-
diff --git a/app/src/main/res/layout/list_item_sulog_group.xml b/app/src/main/res/layout/list_item_sulog_group.xml
deleted file mode 100644
index baffe09be..000000000
--- a/app/src/main/res/layout/list_item_sulog_group.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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="?attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="horizontal"
-    android:padding="5dp">
-
-    <ImageView
-        android:id="@+id/arrow"
-        android:layout_width="wrap_content"
-        android:layout_height="25dp"
-        android:layout_marginEnd="10dp"
-        android:tint="?attr/imageColorTint"
-        app:srcCompat="@drawable/ic_arrow" />
-
-    <TextView
-        android:id="@+id/date"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:text="2017/1/1"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary" />
-</LinearLayout>
\ No newline at end of file