diff --git a/src/main/kotlin/com/looker/droidify/MainActivity.kt b/src/main/kotlin/com/looker/droidify/MainActivity.kt
deleted file mode 100644
index 5774c5dc..00000000
--- a/src/main/kotlin/com/looker/droidify/MainActivity.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.looker.droidify
-
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageInstaller
-import com.looker.droidify.ContextWrapperX.Companion.wrap
-import com.looker.droidify.screen.ScreenActivity
-
-class MainActivity : ScreenActivity() {
-    companion object {
-        const val ACTION_UPDATES = "${BuildConfig.APPLICATION_ID}.intent.action.UPDATES"
-        const val ACTION_INSTALL = "${BuildConfig.APPLICATION_ID}.intent.action.INSTALL"
-        const val EXTRA_CACHE_FILE_NAME =
-            "${BuildConfig.APPLICATION_ID}.intent.extra.CACHE_FILE_NAME"
-    }
-
-    override fun handleIntent(intent: Intent?) {
-        when (intent?.action) {
-            ACTION_UPDATES -> handleSpecialIntent(SpecialIntent.Updates)
-            ACTION_INSTALL -> handleSpecialIntent(
-                SpecialIntent.Install(
-                    intent.packageName,
-                    intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -1),
-                    intent.getParcelableExtra(Intent.EXTRA_INTENT)
-                )
-            )
-            else -> super.handleIntent(intent)
-        }
-    }
-
-    override fun attachBaseContext(newBase: Context) {
-        super.attachBaseContext(wrap(newBase))
-    }
-}
diff --git a/src/main/kotlin/com/looker/droidify/MainApplication.kt b/src/main/kotlin/com/looker/droidify/MainApplication.kt
index e7164c87..d325352e 100644
--- a/src/main/kotlin/com/looker/droidify/MainApplication.kt
+++ b/src/main/kotlin/com/looker/droidify/MainApplication.kt
@@ -17,6 +17,7 @@ import com.looker.droidify.network.CoilDownloader
 import com.looker.droidify.network.Downloader
 import com.looker.droidify.service.Connection
 import com.looker.droidify.service.SyncService
+import com.looker.droidify.ui.activities.MainActivityX
 import com.looker.droidify.utility.Utils.setLanguage
 import com.looker.droidify.utility.Utils.toInstalledItem
 import com.looker.droidify.utility.extension.android.Android
@@ -119,7 +120,7 @@ class MainApplication : Application(), ImageLoaderFactory {
                         val refresh = Intent.makeRestartActivityTask(
                             ComponentName(
                                 baseContext,
-                                MainActivity::class.java
+                                MainActivityX::class.java
                             )
                         )
                         applicationContext.startActivity(refresh)
diff --git a/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt b/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt
index a8154cdf..2e85ff97 100644
--- a/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt
+++ b/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt
@@ -13,8 +13,8 @@ import android.view.ContextThemeWrapper
 import androidx.core.app.NotificationCompat
 import com.looker.droidify.NOTIFICATION_CHANNEL_INSTALLER
 import com.looker.droidify.NOTIFICATION_ID_INSTALLER
-import com.looker.droidify.MainActivity
 import com.looker.droidify.R
+import com.looker.droidify.ui.activities.MainActivityX
 import com.looker.droidify.utility.Utils
 import com.looker.droidify.utility.extension.android.Android
 import com.looker.droidify.utility.extension.android.notificationManager
@@ -176,14 +176,14 @@ class InstallerService : Service() {
      */
     private fun installIntent(intent: Intent): PendingIntent {
         // prepare prompt intent
-        val promptIntent : Intent? = intent.getParcelableExtra(Intent.EXTRA_INTENT)
+        val promptIntent: Intent? = intent.getParcelableExtra(Intent.EXTRA_INTENT)
         val name = intent.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME)
 
         return PendingIntent.getActivity(
             this,
             0,
-            Intent(this, MainActivity::class.java)
-                .setAction(MainActivity.ACTION_INSTALL)
+            Intent(this, MainActivityX::class.java)
+                .setAction(MainActivityX.ACTION_INSTALL)
                 .setData(Uri.parse("package:$name"))
                 .putExtra(Intent.EXTRA_INTENT, promptIntent)
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
diff --git a/src/main/kotlin/com/looker/droidify/service/DownloadService.kt b/src/main/kotlin/com/looker/droidify/service/DownloadService.kt
index 67d689d8..2d5190c9 100644
--- a/src/main/kotlin/com/looker/droidify/service/DownloadService.kt
+++ b/src/main/kotlin/com/looker/droidify/service/DownloadService.kt
@@ -13,6 +13,7 @@ import com.looker.droidify.database.entity.Repository
 import com.looker.droidify.entity.Release
 import com.looker.droidify.installer.AppInstaller
 import com.looker.droidify.network.Downloader
+import com.looker.droidify.ui.activities.MainActivityX
 import com.looker.droidify.utility.Utils
 import com.looker.droidify.utility.extension.android.Android
 import com.looker.droidify.utility.extension.android.notificationManager
@@ -198,7 +199,7 @@ class DownloadService : ConnectionService<DownloadService.Binder>() {
                     PendingIntent.getActivity(
                         this,
                         0,
-                        Intent(this, MainActivity::class.java)
+                        Intent(this, MainActivityX::class.java)
                             .setAction(Intent.ACTION_VIEW)
                             .setData(Uri.parse("package:${task.packageName}"))
                             .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
diff --git a/src/main/kotlin/com/looker/droidify/service/SyncService.kt b/src/main/kotlin/com/looker/droidify/service/SyncService.kt
index 6b6c5fe6..9368a22e 100644
--- a/src/main/kotlin/com/looker/droidify/service/SyncService.kt
+++ b/src/main/kotlin/com/looker/droidify/service/SyncService.kt
@@ -20,6 +20,7 @@ import com.looker.droidify.entity.Order
 import com.looker.droidify.entity.ProductItem
 import com.looker.droidify.entity.Section
 import com.looker.droidify.index.RepositoryUpdater
+import com.looker.droidify.ui.activities.MainActivityX
 import com.looker.droidify.utility.RxUtils
 import com.looker.droidify.utility.Utils
 import com.looker.droidify.utility.extension.android.Android
@@ -502,8 +503,8 @@ class SyncService : ConnectionService<SyncService.Binder>() {
                     PendingIntent.getActivity(
                         this,
                         0,
-                        Intent(this, MainActivity::class.java)
-                            .setAction(MainActivity.ACTION_UPDATES),
+                        Intent(this, MainActivityX::class.java)
+                            .setAction(MainActivityX.ACTION_UPDATES),
                         if (Android.sdk(23))
                             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
                         else