diff --git a/app/src/full/java/com/topjohnwu/magisk/Const.java b/app/src/full/java/com/topjohnwu/magisk/Const.java
index 178189ce7..fadecea29 100644
--- a/app/src/full/java/com/topjohnwu/magisk/Const.java
+++ b/app/src/full/java/com/topjohnwu/magisk/Const.java
@@ -18,13 +18,12 @@ public class Const {
     public static final String SU_KEYSTORE_KEY = "su_key";
 
     // Paths
-    public static File MAGISK_PATH;
+    public static final String MAGISK_PATH = "/sbin/.magisk/img";
     public static File MAGISK_DISABLE_FILE;
-    public static File MAGISK_HOST_FILE;
 
     static {
         /* Prevent crashing on unrooted devices */
-        MAGISK_PATH = MAGISK_DISABLE_FILE = MAGISK_HOST_FILE = new File("xxx");
+        MAGISK_DISABLE_FILE = new File("xxx");
     }
 
     public static final String BUSYBOX_PATH = "/sbin/.magisk/busybox";
diff --git a/app/src/full/java/com/topjohnwu/magisk/Data.java b/app/src/full/java/com/topjohnwu/magisk/Data.java
index 25d1cb3c9..b2bbabbf8 100644
--- a/app/src/full/java/com/topjohnwu/magisk/Data.java
+++ b/app/src/full/java/com/topjohnwu/magisk/Data.java
@@ -187,7 +187,6 @@ public class Data {
         MM().prefs.edit()
                 .putBoolean(Const.Key.DARK_THEME, isDarkTheme)
                 .putBoolean(Const.Key.MAGISKHIDE, magiskHide)
-                .putBoolean(Const.Key.HOSTS, Const.MAGISK_HOST_FILE.exists())
                 .putBoolean(Const.Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
                 .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(suRequestTimeout))
                 .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(suResponseType))
diff --git a/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java b/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
index 55ab75f46..e9352601f 100644
--- a/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
+++ b/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
@@ -22,9 +22,7 @@ import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
 import com.topjohnwu.magisk.utils.SuConnector;
 
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 
 import androidx.annotation.Nullable;
 import butterknife.BindView;
diff --git a/app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java b/app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
index b950a6e65..4200f6470 100644
--- a/app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
+++ b/app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
@@ -79,13 +79,43 @@ public class SettingsFragment extends PreferenceFragmentCompat
         PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
         PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
         Preference hideManager = findPreference("hide");
+        hideManager.setOnPreferenceClickListener(pref -> {
+            PatchAPK.hideManager(requireActivity());
+            return true;
+        });
         Preference restoreManager = findPreference("restore");
-        findPreference("clear").setOnPreferenceClickListener((pref) -> {
+        restoreManager.setOnPreferenceClickListener(pref -> {
+            Download.receive(
+                requireActivity(), new DownloadReceiver() {
+                    @Override
+                    public void onDownloadDone(Context context, Uri uri) {
+                        Data.exportPrefs();
+                        Shell.su("cp " + uri.getPath() + " /data/local/tmp/manager.apk").exec();
+                        if (ShellUtils.fastCmdResult("pm install /data/local/tmp/manager.apk")) {
+                            Shell.su("rm -f /data/local/tmp/manager.apk").exec();
+                            RootUtils.uninstallPkg(context.getPackageName());
+                            return;
+                        }
+                        Shell.su("rm -f /data/local/tmp/manager.apk").exec();
+                    }
+                },
+                Data.managerLink,
+                Utils.fmt("MagiskManager-v%s.apk", Data.remoteManagerVersionString)
+            );
+            return true;
+        });
+        findPreference("clear").setOnPreferenceClickListener(pref -> {
             mm.prefs.edit().remove(Const.Key.ETAG_KEY).apply();
             mm.repoDB.clearRepo();
             Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
             return true;
         });
+        findPreference("hosts").setOnPreferenceClickListener(pref -> {
+            Shell.su("add_hosts_module").exec();
+            Utils.loadModules();
+            Utils.toast(R.string.settings_hosts_toast, Toast.LENGTH_SHORT);
+            return true;
+        });
 
         updateChannel = (ListPreference) findPreference(Const.Key.UPDATE_CHANNEL);
         rootConfig = (ListPreference) findPreference(Const.Key.ROOT_ACCESS);
@@ -142,36 +172,10 @@ public class SettingsFragment extends PreferenceFragmentCompat
 
         if (Shell.rootAccess() && Const.USER_ID == 0) {
             if (mm.getPackageName().equals(Const.ORIG_PKG_NAME)) {
-                hideManager.setOnPreferenceClickListener((pref) -> {
-                    PatchAPK.hideManager(requireActivity());
-                    return true;
-                });
                 generalCatagory.removePreference(restoreManager);
             } else {
-                if (Download.checkNetworkStatus(mm)) {
-                    restoreManager.setOnPreferenceClickListener((pref) -> {
-                        Download.receive(
-                            requireActivity(), new DownloadReceiver() {
-                                @Override
-                                public void onDownloadDone(Context context, Uri uri) {
-                                    Data.exportPrefs();
-                                    Shell.su("cp " + uri.getPath() + " /data/local/tmp/manager.apk").exec();
-                                    if (ShellUtils.fastCmdResult("pm install /data/local/tmp/manager.apk")) {
-                                        Shell.su("rm -f /data/local/tmp/manager.apk").exec();
-                                        RootUtils.uninstallPkg(context.getPackageName());
-                                        return;
-                                    }
-                                    Shell.su("rm -f /data/local/tmp/manager.apk").exec();
-                                }
-                            },
-                            Data.managerLink,
-                            Utils.fmt("MagiskManager-v%s.apk", Data.remoteManagerVersionString)
-                        );
-                        return true;
-                    });
-                } else {
+                if (!Download.checkNetworkStatus(mm))
                     generalCatagory.removePreference(restoreManager);
-                }
                 generalCatagory.removePreference(hideManager);
             }
         } else {
@@ -258,17 +262,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
                     Shell.su("magiskhide --disable").submit();
                 }
                 break;
-            case Const.Key.HOSTS:
-                if (prefs.getBoolean(key, false)) {
-                    Shell.su("cp -af /system/etc/hosts " + Const.MAGISK_HOST_FILE,
-                            "mount -o bind " + Const.MAGISK_HOST_FILE + " /system/etc/hosts")
-                            .submit();
-                } else {
-                    Shell.su("umount -l /system/etc/hosts",
-                            "rm -f " + Const.MAGISK_HOST_FILE)
-                            .submit();
-                }
-                break;
             case Const.Key.LOCALE:
                 LocaleManager.setLocale(mm);
                 requireActivity().recreate();
diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java b/app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java
index 750cb8933..0a587946e 100644
--- a/app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java
+++ b/app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java
@@ -32,21 +32,9 @@ public class RootUtils extends Shell.Initializer {
             if (!new SuFile("/sbin/.magisk").exists())
                 job.add("ln -s /sbin/.core /sbin/.magisk");
 
-            InputStream magiskUtils = context.getResources().openRawResource(R.raw.util_functions);
-            InputStream managerUtils = context.getResources().openRawResource(R.raw.utils);
-            job.add(magiskUtils).add(managerUtils);
-
+            job.add(context.getResources().openRawResource(R.raw.util_functions))
+                .add(context.getResources().openRawResource(R.raw.utils));
             Const.MAGISK_DISABLE_FILE = new SuFile("/cache/.disable_magisk");
-            SuFile file = new SuFile("/sbin/.magisk/img");
-            if (file.exists()) {
-                Const.MAGISK_PATH = file;
-            } else if ((file = new SuFile("/dev/magisk/img")).exists()) {
-                Const.MAGISK_PATH = file;
-            } else {
-                Const.MAGISK_PATH = new SuFile("/magisk");
-            }
-            Const.MAGISK_HOST_FILE = new SuFile(Const.MAGISK_PATH + "/.core/hosts");
-
             Data.loadMagiskInfo();
         } else {
             InputStream nonroot = context.getResources().openRawResource(R.raw.nonroot_utils);
diff --git a/app/src/full/res/raw/utils.sh b/app/src/full/res/raw/utils.sh
index a5febef9a..4f20d73ad 100644
--- a/app/src/full/res/raw/utils.sh
+++ b/app/src/full/res/raw/utils.sh
@@ -110,3 +110,29 @@ post_ota() {
   chmod 755 post-fs-data.d/post_ota.sh
   cd /
 }
+
+add_hosts_module() {
+  # Do not touch existing hosts module
+  [ -d /sbin/.magisk/img/hosts ] && return
+  cd /sbin/.magisk/img
+  mkdir -p hosts/system/etc
+  cat << EOF > hosts/module.prop
+id=hosts
+name=Systemless Hosts
+version=1.0
+versionCode=1
+author=Magisk Manager
+description=Magisk Manager built-in systemless hosts module
+minMagisk=17000
+EOF
+  if [ -f .core/hosts ]; then
+    # Migrate old hosts file to new module
+    mv -f .core/hosts hosts/system/etc/hosts
+  else
+    cp -af /system/etc/hosts hosts/system/etc/hosts
+  fi
+  chcon u:object_r:system_file:s0 hosts/system/etc/hosts
+  touch hosts/update
+  touch hosts/auto_mount
+  cd /
+}
diff --git a/app/src/full/res/values-ar/strings.xml b/app/src/full/res/values-ar/strings.xml
index bba8f3373..c179cd9f0 100644
--- a/app/src/full/res/values-ar/strings.xml
+++ b/app/src/full/res/values-ar/strings.xml
@@ -82,7 +82,7 @@
     <string name="settings_clear_cache_summary">حذف المعلومات المخزنة مؤقتا للمستودع على الانترنت، يجبر التطبيق لتحديث عبر الانترنت</string>
 
     <string name="settings_core_only_title">Magisk الوضع الأساسي فقط</string>
-    <string name="settings_core_only_summary">تمكين الميزات الأساسية فقط، لن يتم تحميل جميع الإضافات. MagiskSU، MagiskHide، systemless hosts، و لا يزال ممكنا</string>
+    <string name="settings_core_only_summary">تمكين الميزات الأساسية فقط، لن يتم تحميل جميع الإضافات. MagiskSU، MagiskHide و لا يزال ممكنا</string>
     <string name="settings_magiskhide_summary">إخفاء Magisk من مختلف الاكتشافات</string>
     <string name="settings_hosts_title">تمكين المضيفين(الهوست) لـ systemless</string>
     <string name="settings_hosts_summary">Systemless يدعم تطبيقات حجب الإعلانات</string>
diff --git a/app/src/full/res/values-bg/strings.xml b/app/src/full/res/values-bg/strings.xml
index 8d6aa27ec..3eb892613 100644
--- a/app/src/full/res/values-bg/strings.xml
+++ b/app/src/full/res/values-bg/strings.xml
@@ -119,7 +119,7 @@
     <string name="env_fix_msg">Вашето устройство се нуждае от допълнителни настройки за Magisk, за да работи перфектно. Ще бъде изтеглен архивът за настройка на Magisk. Желаете ли да продължите?</string>
     <string name="setup_title">Допълнителни настройване</string>
     <string name="setup_msg">Настройването на средата е в ход…</string>
-    
+
     <!--Settings Activity -->
     <string name="settings_general_category">Общи</string>
     <string name="settings_dark_theme_title">Тъмна тема</string>
@@ -143,7 +143,7 @@
     <string name="settings_boot_format_title">Изходен формат за модифициран Boot образ</string>
     <string name="settings_boot_format_summary">Избор на изходен формат за модифициран Boot образ.\nИзберете .img, за инсталиране чрез fastboot/download режим; изберете .img.tar за инсталиране чрез ODIN.</string>
     <string name="settings_core_only_title">Режим Magisk Core Only</string>
-    <string name="settings_core_only_summary">Работят само основни функции, като MagiskSU, MagiskHide и несистемни хостове, без модули.</string>
+    <string name="settings_core_only_summary">Работят само основни функции, като MagiskSU и MagiskHide, без модули.</string>
     <string name="settings_magiskhide_summary">Скриване на Magisk от различни детектори</string>
     <string name="settings_hosts_title">Несистемни хостове</string>
     <string name="settings_hosts_summary">Поддръжка на несистемни хостове за използване на приложения, блокиращи реклами</string>
diff --git a/app/src/full/res/values-ca/strings.xml b/app/src/full/res/values-ca/strings.xml
index c075eb0b9..11d373b15 100644
--- a/app/src/full/res/values-ca/strings.xml
+++ b/app/src/full/res/values-ca/strings.xml
@@ -30,7 +30,7 @@
     <string name="uninstall_magisk_msg">Tots els mòduls seran desactivats / eliminats. L\'accés Root s\'eliminarà i, possiblement, xifrarà totes les dades si no estan ja xifrades.</string>
     <string name="uninstall_magisk_title">Desinstal·lar Magisk</string>
     <string name="update">Actualització %1$s</string>
-    
+
     <!--Module Fragment-->
     <string name="no_info_provided">(No hi ha informació)</string>
     <string name="no_modules_found">No s’han trobat mòduls</string>
@@ -117,7 +117,7 @@
     <string name="env_fix_msg">El seu dispositiu requereix d’una instal·lació addicional per tal de que Magisk funcioni correctament. Es descarregarà el zip d’instalació de Magisk, desitja continuar ara?</string>
     <string name="setup_title">Configuració Addicional</string>
     <string name="setup_msg">Executant Configuració d\'Entorn</string>
-    
+
     <!--Settings Activity -->
     <string name="settings_general_category">General</string>
     <string name="settings_dark_theme_title">Tema obscur</string>
@@ -140,8 +140,8 @@
     <string name="settings_update_custom_msg">Inserta una URL personalitzada</string>
     <string name="settings_boot_format_title">Arranja la imatge d’arrancada segons el tipus de format</string>
     <string name="settings_boot_format_summary">Seleccionar el format de sortida per arranjar la imatge d’arrancada.\nTriï  .img per flashejar mitcançant fastboot/download; triï .img.tar per flashejar amb ODIN.</string>
-    
-    <string name="settings_core_only_summary">Habilitar només les funcions principals, no es carregaran tots els mòduls. MagiskSU, MagiskHide, y Systemless Hosts seguirán habilitats</string>
+
+    <string name="settings_core_only_summary">Habilitar només les funcions principals, no es carregaran tots els mòduls. MagiskSU y MagiskHide seguirán habilitats</string>
     <string name="settings_magiskhide_summary">Amagar Magisk de varies deteccions</string>
     <string name="settings_hosts_title">Systemless Hosts</string>
     <string name="settings_hosts_summary">Suport per aplicacions tipus Adblock fora de la partició del sistema</string>
@@ -166,9 +166,9 @@
     <string name="settings_su_fingerprint_title">Autenticació per Empremta Dactilar</string>
     <string name="settings_su_fingerprint_summary">Utilitza el sensor d’Empremta Dactilar per permetre les sol·licituds de superusuari</string>
     <string name="auth_fingerprint">Autenticar Emprempta Digital</string>
- 
-    
-    <string name="multiuser_mode">Mode Multiusuari</string> 
+
+
+    <string name="multiuser_mode">Mode Multiusuari</string>
     <string name="settings_owner_only">Només Administrador del Dispositiu</string>
     <string name="settings_owner_manage">Administrador del Dispositiu</string>
     <string name="settings_user_independent">Usuari Independent</string>
@@ -176,7 +176,7 @@
     <string name="owner_manage_summary"> Només l’administrador pot supervisar l’acces root y rebre sol·licituds d’altres usuaris</string>
     <string name="user_indepenent_summary">Tots els usuaris tenen separades les seves pròpies regles de root </string>
     <string name="multiuser_hint_owner_request">S’ha enviat una sol·licitud a l’administrador del dispositiu. Per favor, canviï a la conta de l’administrador y concedeixi el permís</string>
-    
+
     <string name="mount_namespace_mode">Muntar Namespace </string>
     <string name="settings_ns_global">Namespace Global</string>
     <string name="settings_ns_requester">Heretar Namespace</string>
diff --git a/app/src/full/res/values-de/strings.xml b/app/src/full/res/values-de/strings.xml
index 727baeb48..1183e615c 100644
--- a/app/src/full/res/values-de/strings.xml
+++ b/app/src/full/res/values-de/strings.xml
@@ -143,7 +143,7 @@
     <string name="settings_boot_format_title">Ausgabeformat des gepatchten Boot-Images</string>
     <string name="settings_boot_format_summary">Wähle das Ausgabeformat des gepatchten Boot-Images.\nWähle .img, um mit \"fastboot/download mode\" zu flashen; wähle .img.tar zum Flashen mit ODIN.</string>
     <string name="settings_core_only_title">Nur Kernfunktionen</string>
-    <string name="settings_core_only_summary">Aktiviert lediglich die Kernfunktionen, Module werden nicht geladen. MagiskSU, Magisk Hide und Systemless hosts bleiben weiterhin aktiv</string>
+    <string name="settings_core_only_summary">Aktiviert lediglich die Kernfunktionen, Module werden nicht geladen. MagiskSU und Magisk Hide bleiben weiterhin aktiv</string>
     <string name="settings_magiskhide_summary">Versteckt Magisk vor diversen Entdeckungsmethoden</string>
     <string name="settings_hosts_title">Systemlose Hosts-Datei</string>
     <string name="settings_hosts_summary">Systemlose Unterstützung für Werbeblocker</string>
diff --git a/app/src/full/res/values-el/strings.xml b/app/src/full/res/values-el/strings.xml
index a568fbeb5..4302d9e79 100644
--- a/app/src/full/res/values-el/strings.xml
+++ b/app/src/full/res/values-el/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <!--Welcome Activity-->
     <string name="modules">Modules</string>
-	
+
     <string name="downloads">Λήψεις</string>
     <string name="superuser">Υπερχρήστης</string>
     <string name="log">Αρχείο Καταγραφής</string>
@@ -51,7 +51,7 @@
     <string name="updated_on">Αναβαθμίστηκε στις: %1$s</string>
     <string name="sorting_order">Ταξινόμηση κατά</string>
     <string name="sort_by_name">Ταξινόμηση κατά όνομα</string>
-    <string name="sort_by_update">Ταξινόμηση κατά τελευταία αναβάθμιση</string>			  
+    <string name="sort_by_update">Ταξινόμηση κατά τελευταία αναβάθμιση</string>
 
     <!--Log Fragment-->
     <string name="menuSaveLog">"Αποθήκευση καταγραφής "</string>
@@ -107,7 +107,7 @@
     <string name="proprietary_title">Λήψη Ιδιόκτητου Κώδικα</string>
     <string name="proprietary_notice">Το Magisk Manager είναι FOSS οπότε δεν περιέχει της Google τον ιδιόκτητο κώδικα του SafetyNet API.\n\nΕπιτρέπετε στο Magisk Manager να κατεβάσει μια επέκταση (περιέχει το GoogleApiClient) για ελέγχους του SafetyNet?</string>
     <string name="su_db_corrupt">Η βάση δεδομένων SU είναι κατεστραμμένη, θα αναδημιουργηθεί νέα</string>
-    
+
     <!--Settings Activity -->
     <string name="settings_general_category">Γενικά</string>
     <string name="settings_dark_theme_title">Σκούρο θέμα</string>
@@ -127,7 +127,7 @@
     <string name="settings_boot_format_title">Μορφή Τροποποιημένης Εικόνας Boot</string>
     <string name="settings_boot_format_summary">Επιλέξτε τη μορφή της εξαγόμενης εικόνας boot μετά το patch.\nΕπιλέξτε .img για flash μέσω λειτουργίας fastboot/download· επιλέξτε .img.tar για flash μέσω ODIN.</string>
     <string name="settings_core_only_title">Magisk Λειτουργία Πυρήνα Μόνο</string>
-    <string name="settings_core_only_summary">Ενεργοποίηση μόνο των λειτουργιών πυρήνα, καμία από τις ενότητες δεν θα ενεργοποιηθεί. Τα MagiskSU, MagiskHide, και systemless hosts θα παραμείνουν ενεργά</string>
+    <string name="settings_core_only_summary">Ενεργοποίηση μόνο των λειτουργιών πυρήνα, καμία από τις ενότητες δεν θα ενεργοποιηθεί. Τα MagiskSU και MagiskHide θα παραμείνουν ενεργά</string>
     <string name="settings_magiskhide_summary">Κρύβει το Magisk από διάφορες ανιχνεύσεις</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">Υποστήριξη Systemless hosts για εφαρμογές Adblock</string>
@@ -167,7 +167,7 @@
     <string name="requester_summary">Οι συνεδρίες root θα κληρονομούν το χώρο ονομάτων του αιτούντα τους</string>
     <string name="isolate_summary">Κάθε συνεδρία root θα έχει το δικό της απομονωμένο χώρο ονομάτων</string>
     <string name="android_o_not_support">Δεν υποστηρίζεται Android 8.0+</string>
-	
+
     <!--Superuser-->
     <string name="su_request_title">Αίτημα υπερχρήστη</string>
     <string name="deny_with_str">Άρνηση%1$s</string>
diff --git a/app/src/full/res/values-es/strings.xml b/app/src/full/res/values-es/strings.xml
index f9b67f0b1..7e2369e20 100644
--- a/app/src/full/res/values-es/strings.xml
+++ b/app/src/full/res/values-es/strings.xml
@@ -30,7 +30,7 @@
     <string name="uninstall_magisk_msg">Todos los módulos serán desactivados / eliminados. El acceso Root se eliminará y, posiblemente, cifrará los datos si los datos no están cifrados actualmente.</string>
     <string name="uninstall_magisk_title">Desinstalar Magisk</string>
     <string name="update">Actualización %1$s</string>
-    
+
     <!--Module Fragment-->
     <string name="no_info_provided">(No hay información)</string>
     <string name="no_modules_found">No se encontraron módulos</string>
@@ -118,7 +118,7 @@
     <string name="env_fix_msg">Su dispositivo requiere una instalación adicional para que Magisk funcione correctamente. Se descargará el zip de instalación de Magisk, desea continuar ahora?</string>
     <string name="setup_title">Configuración Adicional</string>
     <string name="setup_msg">Ejecutando Configuración de Entorno</string>
-    
+
     <!--Settings Activity -->
     <string name="settings_general_category">General</string>
     <string name="settings_dark_theme_title">Tema oscuro</string>
@@ -141,8 +141,8 @@
     <string name="settings_update_custom_msg">Insertar una URL personalizada</string>
     <string name="settings_boot_format_title">Parchear imagen boot por tipo de formato</string>
     <string name="settings_boot_format_summary">Seleccionar el formato de salida para parchear la imagen boot.\nEscoja .img para flashear mediante fastboot/download mode; escoja .img.tar para flashear con ODIN.</string>
-    
-    <string name="settings_core_only_summary">Habilitar sólo funciones principales, no se cargarán todos los módulos. MagiskSU, MagiskHide, y Systemless Hosts seguirán habilitados</string>
+
+    <string name="settings_core_only_summary">Habilitar sólo funciones principales, no se cargarán todos los módulos. MagiskSU y MagiskHide seguirán habilitados</string>
     <string name="settings_magiskhide_summary">Ocultar Magisk de varias detecciones</string>
     <string name="settings_hosts_title">Systemless Hosts</string>
     <string name="settings_hosts_summary">Soporte para aplicaciones Adblock fuera de la partición system</string>
@@ -167,8 +167,8 @@
     <string name="settings_su_fingerprint_title">Autenticación por Huella Dactilar</string>
     <string name="settings_su_fingerprint_summary">Utilizar el sensor de Huella Dactilar para permitir las solicitudes de superusuario</string>
     <string name="auth_fingerprint">Autenticar Huella Dactilar</string>
-    
-    <string name="multiuser_mode">Modo MultiUsuario</string> 
+
+    <string name="multiuser_mode">Modo MultiUsuario</string>
     <string name="settings_owner_only">Sólo Administrador del Dispositivo</string>
     <string name="settings_owner_manage">Administrador del Dispositivo</string>
     <string name="settings_user_independent">Usuario Independiente</string>
@@ -176,7 +176,7 @@
     <string name="owner_manage_summary">Sólo el administrador puede supervisar el acceso root y recibir solicitudes de otros usuarios</string>
     <string name="user_indepenent_summary">Cada usuario tiene separadas sus propias reglas de root </string>
     <string name="multiuser_hint_owner_request">Se ha enviado una solicitud al administrador del dispositivo. Por favor, cambie a la cuenta del administrador y conceda el permiso</string>
-    
+
     <string name="mount_namespace_mode">Montar Namespace </string>
     <string name="settings_ns_global">Global Namespace</string>
     <string name="settings_ns_requester">Heredar Namespace</string>
diff --git a/app/src/full/res/values-et/strings.xml b/app/src/full/res/values-et/strings.xml
index c12f12544..87bd7f45d 100644
--- a/app/src/full/res/values-et/strings.xml
+++ b/app/src/full/res/values-et/strings.xml
@@ -139,7 +139,7 @@
     <string name="settings_boot_format_title">Paigatud käivitusväljundi vorming</string>
     <string name="settings_boot_format_summary">Vali väljutatava paigatud käivituspildi vorming.\nVali .img, mida välgutada fastboot/allalaadimisrežiimi kaudu; vali .img.tar, mida välgutada ODIN\'i kaudu.</string>
     <string name="settings_core_only_title">Magisk\'i ainult tuuma režiim</string>
-    <string name="settings_core_only_summary">Luba ainult põhifunktsioonid. MagiskSU, MagiskHide ja süsteemivaba hosts siiski lubatakse, ent mooduleid ei laadita.</string>
+    <string name="settings_core_only_summary">Luba ainult põhifunktsioonid. MagiskSU ja MagiskHide siiski lubatakse, ent mooduleid ei laadita.</string>
     <string name="settings_magiskhide_summary">Peida Magisk erinevate tuvastuste eest</string>
     <string name="settings_hosts_title">Süsteemivaba hosts</string>
     <string name="settings_hosts_summary">Süsteemivaba hosts-tugi reklaamiblokeerijatest rakendustele</string>
diff --git a/app/src/full/res/values-fr/strings.xml b/app/src/full/res/values-fr/strings.xml
index 63c2df557..4c591214d 100644
--- a/app/src/full/res/values-fr/strings.xml
+++ b/app/src/full/res/values-fr/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-	
+
     <!--Welcome Activity-->
     <string name="modules">Modules</string>
     <string name="downloads">Téléchargements</string>
@@ -119,7 +119,7 @@
     <string name="env_fix_msg">Votre appareil a besoin d\'une configuration supplémentaire pour que Magisk fonctionne correctement. Il téléchargera le zip d\'installation de Magisk, voulez-vous procéder maintenant ?</string>
     <string name="setup_title">Installation Additionnel</string>
     <string name="setup_msg">Démarrer l\'installation de l\'environnement…</string>
- 
+
     <!--Settings Activity -->
     <string name="settings_general_category">Général</string>
     <string name="settings_dark_theme_title">Thème sombre</string>
@@ -143,7 +143,7 @@
     <string name="settings_boot_format_title">Patcher Format Fichier Démarrage</string>
     <string name="settings_boot_format_summary">Sélectioner le format de sortie de l\'image de boot.\nChoisir .img pour flasher à traver le mode démarrage rapide/téléchargement; choisir .img.tar pour flasher via ODIN.</string>
     <string name="settings_core_only_title">Mode Magisk Core uniquement</string>
-    <string name="settings_core_only_summary">Activer uniquement les fonctionnalités de base, tous les modules ne seront pas chargés. MagiskSU, MagiskHide et les hosts systemless restent activés</string>
+    <string name="settings_core_only_summary">Activer uniquement les fonctionnalités de base, tous les modules ne seront pas chargés. MagiskSU et MagiskHide restent activés</string>
     <string name="settings_magiskhide_summary">Masquer Magisk de diverses détections</string>
     <string name="settings_hosts_title">Hôtes systemless</string>
     <string name="settings_hosts_summary">Support d\'hôtes systemless pour les applications type Adblock</string>
diff --git a/app/src/full/res/values-hr/strings.xml b/app/src/full/res/values-hr/strings.xml
index 365c55864..58415ee2e 100644
--- a/app/src/full/res/values-hr/strings.xml
+++ b/app/src/full/res/values-hr/strings.xml
@@ -115,7 +115,7 @@
     <string name="settings_boot_format_summary">Odaberite izlazni format datoteke za podizanje sustava nakon zakrpe.\nOdaberite .img da biste aplicirali putem brzog pokretanja(fastboota)/preuzimanja(downloada); odaberite .img.tar da biste aplicirali putem ODIN-a.</string>
 
     <string name="settings_core_only_title">Samo Magisk Core način rada</string>
-    <string name="settings_core_only_summary">Omogućite samo osnovne značajke, svi se moduli neće učitati. MagiskSU, MagiskHide i systemless hostovi će i dalje biti omogućeni</string>
+    <string name="settings_core_only_summary">Omogućite samo osnovne značajke, svi se moduli neće učitati. MagiskSU i MagiskHide će i dalje biti omogućeni</string>
     <string name="settings_magiskhide_summary">Sakrij Magisk od raznih detekcija</string>
     <string name="settings_hosts_title">Systemless hostovi</string>
     <string name="settings_hosts_summary">Systemless hostovi podržavaju Adblock aplikacije</string>
diff --git a/app/src/full/res/values-in/strings.xml b/app/src/full/res/values-in/strings.xml
index f59a02677..51ef5027d 100644
--- a/app/src/full/res/values-in/strings.xml
+++ b/app/src/full/res/values-in/strings.xml
@@ -140,7 +140,7 @@
     <string name="settings_boot_format_title">Format Keluaran Boot yang Ditambal</string>
     <string name="settings_boot_format_summary">Pilih format keluaran boot image yang ditambal.\nPilih .img untuk flash melalui mode recovery/download; pilih .img.tar untuk flash melalui ODIN.</string>
     <string name="settings_core_only_title">Magisk Mode Inti Saja</string>
-    <string name="settings_core_only_summary">Aktifkan fitur inti saja. MagiskSU, MagiskHide, dan host tanpa sistem akan tetap diaktifkan</string>
+    <string name="settings_core_only_summary">Aktifkan fitur inti saja. MagiskSU dan MagiskHide akan tetap diaktifkan</string>
     <string name="settings_magiskhide_summary">Sembunyikan Magisk dari berbagai pendeteksian</string>
     <string name="settings_hosts_title">Host tanpa sistem</string>
     <string name="settings_hosts_summary">Dukungan host tanpa sistem untuk apl pemblokir iklan</string>
diff --git a/app/src/full/res/values-it/strings.xml b/app/src/full/res/values-it/strings.xml
index 810235213..b2651adcf 100644
--- a/app/src/full/res/values-it/strings.xml
+++ b/app/src/full/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <resources>
 	<!--Universal-->
-	
+
 	<!--Welcome Activity-->
 	<string name="modules">Moduli</string>
 	<string name="downloads">Download</string>
@@ -8,7 +8,7 @@
 	<string name="log">Registro eventi</string>
 	<string name="settings">Impostazioni</string>
 	<string name="install">Installa</string>
-	
+
 	<!--Status Fragment-->
 	<string name="magisk_version_error">Magisk non è installato</string>
 	<string name="checking_for_updates">Controllo aggiornamenti…</string>
@@ -19,7 +19,7 @@
 	<string name="safetyNet_check_success">Controllo SafetyNet OK</string>
 	<string name="safetyNet_api_error">Errore API SafetyNet</string>
     <string name="safetyNet_res_invalid">La risposta non è valida</string>
-	
+
 	<!--Install Fragment-->
 	<string name="advanced_settings_title">Impostazioni avanzate</string>
 	<string name="keep_force_encryption">Mantieni crittografia forzata</string>
@@ -30,7 +30,7 @@
 	<string name="uninstall_magisk_title">Disinstalla Magisk</string>
 	<string name="uninstall_magisk_msg">Tutti i moduli verranno disabilitati/rimossi. Il root verrà rimosso e se il dispositivo non è crittografato è possibile che tutti i dati vengano crittografati</string>
 	<string name="update">Aggiorna %1$s</string>
-	
+
 	<!--Module Fragment-->
 	<string name="no_info_provided">(Nessuna informazione)</string>
 	<string name="no_modules_found">Nessun modulo trovato</string>
@@ -43,7 +43,7 @@
 	<string name="reboot_recovery">Riavvia in Recovery</string>
 	<string name="reboot_bootloader">Riavvia in Bootloader</string>
 	<string name="reboot_download">Riavvia in Download Mode</string>
-	
+
 	<!--Repo Fragment-->
 	<string name="update_available">Aggiornamento disponibile</string>
 	<string name="installed">Installato</string>
@@ -52,7 +52,7 @@
 	<string name="sorting_order">Ordinamento</string>
 	<string name="sort_by_name">Ordina per nome</string>
 	<string name="sort_by_update">Ordina per ultimo aggiornamento</string>
-	
+
 	<!--Log Fragment-->
 	<string name="menuSaveLog">Salva registro eventi</string>
 	<string name="menuReload">Ricarica</string>
@@ -120,8 +120,8 @@
 	<string name="env_fix_msg">Il tuo dispositivo necessita di una configurazione aggiuntiva per far funzionare Magisk correttamente. Verrà scaricato il file zip di Magisk, vuoi procedere ora?</string>
 	<string name="setup_title">Configurazione aggiuntiva</string>
 	<string name="setup_msg">Configurazione dell\'ambiente in corso…</string>
-	
-	
+
+
 	<!--Settings Activity -->
 	<string name="settings_general_category">Generale</string>
 	<string name="settings_dark_theme_title">Tema scuro</string>
@@ -145,7 +145,7 @@
 	<string name="settings_boot_format_title">Formato dell\'immagine di boot aggiornata</string>
 	<string name="settings_boot_format_summary">Seleziona il formato nel quale l\'immagine di boot verrà salvata.\nSeleziona .img per il flash in Fastboot/Download Mode; Seleziona .img.tar per il flash con Odin.</string>
 	<string name="settings_core_only_title">Modalità Magisk Core</string>
-	<string name="settings_core_only_summary">Abilita solo le funzioni principali. Nessun modulo verrà caricato. MagiskSU, MagiskHide e host systemless rimarranno abilitati</string>
+	<string name="settings_core_only_summary">Abilita solo le funzioni principali. Nessun modulo verrà caricato. MagiskSU e MagiskHide rimarranno abilitati</string>
 	<string name="settings_magiskhide_summary">Nasconde Magisk da numerose rilevazioni</string>
 	<string name="settings_hosts_title">Host systemless</string>
 	<string name="settings_hosts_summary">Supporto a host systemless per le app che bloccano le pubblicità</string>
@@ -171,15 +171,15 @@
 	<string name="settings_su_fingerprint_summary">Utilizza il sensore di impronte per accettare le richieste Superuser</string>
 	<string name="auth_fingerprint">Conferma Impronta</string>
 
-	<string name="multiuser_mode">Modalità multiutente</string>    
+	<string name="multiuser_mode">Modalità multiutente</string>
 	<string name="settings_owner_only">Solo proprietario del dispositivo</string>
 	<string name="settings_owner_manage">Gestito dal proprietario utente</string>
-	<string name="settings_user_independent">Utente indipendente</string>		
+	<string name="settings_user_independent">Utente indipendente</string>
 	<string name="owner_only_summary">Solo il proprietario ha i permessi di root</string>
 	<string name="owner_manage_summary">Solo il proprietario può gestire accesso root e ricevere richieste</string>
 	<string name="user_indepenent_summary">Ogni utente ha le sue regole di root separate</string>
 	<string name="multiuser_hint_owner_request">Una richiesta è stata inviata al proprietario del dispositivo. Accedi come proprietario dispositivo e concedi i permessi.</string>
-	
+
 	<string name="mount_namespace_mode">Modalità mount namespace</string>
 	<string name="settings_ns_global">Namespace globale</string>
 	<string name="settings_ns_requester">Namespace ereditato</string>
@@ -189,7 +189,7 @@
 	<string name="isolate_summary">Ogni sessione di root avrà il suo namespace isolato</string>
 	<string name="android_o_not_support">Non è supportato da Android 8.0+</string>
 	<string name="disable_fingerprint">Non è presente alcuna impronta o il dispositivo non è supportato</string>
-	
+
 	<!--Superuser-->
 	<string name="su_request_title">Richiesta Superuser</string>
 	<string name="deny_with_str">Nega %1$s</string>
@@ -218,10 +218,10 @@
 	<string name="toast">Toast</string>
 	<string name="none">Nessuno</string>
 	<string name="auth_fail">Autenticatione fallita</string>
-	
+
 	<!--Superuser logs-->
 	<string name="pid">PID:\u0020</string>
 	<string name="target_uid">UID destinazione:\u0020</string>
 	<string name="command">Comando:\u0020</string>
-	
+
 </resources>
diff --git a/app/src/full/res/values-ja/strings.xml b/app/src/full/res/values-ja/strings.xml
index 0de289b72..f8f46e0e9 100644
--- a/app/src/full/res/values-ja/strings.xml
+++ b/app/src/full/res/values-ja/strings.xml
@@ -128,7 +128,7 @@
     <string name="settings_boot_format_title">パッチしたBootの出力形式</string>
     <string name="settings_boot_format_summary">パッチしたBootイメージの出力形式を選択してください。\nfastboot/download modeでインストールするには .img を、ODINでインストールするには .img.tar を選択してください</string>
     <string name="settings_core_only_title">Magisk コアモード</string>
-    <string name="settings_core_only_summary">コア機能のみを有効にします。すべてのモジュールが読み込まれなくなります。 MagiskSU、MagiskHide、systemless hostsは引き続き有効になります</string>
+    <string name="settings_core_only_summary">コア機能のみを有効にします。すべてのモジュールが読み込まれなくなります。 MagiskSU、MagiskHide は引き続き有効になります</string>
     <string name="settings_magiskhide_summary">さまざまな検出からMagiskを隠します</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">広告ブロックアプリのためのSystemless hostsサポートを有効化します</string>
diff --git a/app/src/full/res/values-ko/strings.xml b/app/src/full/res/values-ko/strings.xml
index a97be20a0..ad05ffe68 100644
--- a/app/src/full/res/values-ko/strings.xml
+++ b/app/src/full/res/values-ko/strings.xml
@@ -80,7 +80,7 @@
     <string name="settings_clear_cache_summary">온라인 저장소에 대해 캐시된 정보를 지우고, 온라인에서 정보를 강제로 새로 고칩니다.</string>
 
     <string name="settings_core_only_title">Magisk 핵심 기능 모드</string>
-    <string name="settings_core_only_summary">핵심 기능만 사용합니다. 모든 모듈은 로드하지 않습니다. MagiskSU, MagiskHide 및 systemless hosts 는 계속 사용할 수 있습니다.</string>
+    <string name="settings_core_only_summary">핵심 기능만 사용합니다. 모든 모듈은 로드하지 않습니다. MagiskSU 및 MagiskHide 는 계속 사용할 수 있습니다.</string>
     <string name="settings_magiskhide_summary">다양한 감지로부터 Magisk를 숨깁니다.</string>
     <string name="settings_hosts_title">systemless hosts</string>
     <string name="settings_hosts_summary">광고 차단 앱에서 사용하는 systemless hosts를 지원합니다.</string>
diff --git a/app/src/full/res/values-lt/strings.xml b/app/src/full/res/values-lt/strings.xml
index 3a498574e..dd6a2bb1f 100644
--- a/app/src/full/res/values-lt/strings.xml
+++ b/app/src/full/res/values-lt/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    
+
     <!--Welcome Activity-->
     <string name="modules">Papildiniai</string>
     <string name="downloads">Papildinių parduotuvė</string>
@@ -51,7 +51,7 @@
     <string name="sorting_order">Išdėliojimo tvarka</string>
     <string name="sort_by_name">Išdėlioti pagal pavadinimą (A-Z)</string>
     <string name="sort_by_update">Išdėlioti pagal atnaujinimo datą (Naujausi-Seniausi)</string>
-    
+
     <!--Log Fragment-->
     <string name="menuSaveLog">Išsaugoti įvykių sąrašą</string>
     <string name="menuReload">Įvykių sąrašo atnaujinmas</string>
@@ -98,7 +98,7 @@
     <string name="patch_boot_file">Ištaisyti boot failą</string>
     <string name="direct_install">Tiesioginis instaliavimas (Rekomenduojamas)</string>
     <string name="select_method">Pasirinkite metodą</string>
-    <string name="no_boot_file_patch_support">Pasirinkta Magisk versija nepalaiko pakeitimų boot faile</string>    
+    <string name="no_boot_file_patch_support">Pasirinkta Magisk versija nepalaiko pakeitimų boot faile</string>
     <string name="boot_file_patch_msg">Pasirinkti boot failą .img ar .img.tar formate</string>
     <string name="complete_uninstall">Pilnas pašalinimas</string>
     <string name="restore_img">Atstatyti boot failą</string>
@@ -112,7 +112,7 @@
     <string name="setup_fail">Pasiruošimas nesėkmingas</string>
     <string name="env_fix_title">Reikalingas papildomas pasiruošimas</string>
     <string name="env_fix_msg">Kad Magisk veiktų tinkamai, jūsų įrenginiui reikia papildomo paruošimo. Tai atsisiųs papildomą Magisk zip failą, ar norite tęsti?</string>
-    <string name="setup_title">Papildomas pasiruošimas</string>    
+    <string name="setup_title">Papildomas pasiruošimas</string>
     <string name="setup_msg">Paruošiama aplinka…</string>
 
     <!--Settings Activity -->
@@ -138,7 +138,7 @@
     <string name="settings_boot_format_title">Boot failo formatas</string>
     <string name="settings_boot_format_summary">Pasirinkti boot failo formatą.\n.img naudojamas įdiegimui per fastboot/download; .img.tar naudojamas įdiegimui per ODIN</string>
     <string name="settings_core_only_title">Pagrindinis Magisk režimas</string>
-    <string name="settings_core_only_summary">Įgalinti tik pagrindines funkcijas, išjungti visus papildinius. MagiskSU, Magisk Hide ir Sistemos pedejėjai liks įgalinti</string>
+    <string name="settings_core_only_summary">Įgalinti tik pagrindines funkcijas, išjungti visus papildinius. MagiskSU ir Magisk Hide liks įgalinti</string>
     <string name="settings_magiskhide_summary">Paslėpti Magisk nuo įvairių susekimų</string>
     <string name="settings_hosts_title">Sistemos padejėjai</string>
     <string name="settings_hosts_summary">Įgalinti sistemos padejėjus Adblock programėlėms</string>
@@ -162,7 +162,7 @@
     <string name="settings_su_reauth_summary">Pakartotinai patvirtinti supervartotojo leidimus po programėlės atnaujinimo</string>
     <string name="settings_su_fingerprint_title">Įgalinti patvirtinimą piršto antspaudu</string>
     <string name="settings_su_fingerprint_summary">Naudoti piršto antspaudą supervartotojo leidimo prašymų atsakymui</string>
-    
+
     <string name="multiuser_mode">Daugialypio vartotojo režimas</string>
     <string name="settings_owner_only">Tik įrenginio savininkas</string>
     <string name="settings_owner_manage">Įrenginio savininko valdomas</string>
@@ -181,7 +181,7 @@
     <string name="isolate_summary">Kiekviena root sesija turi savo izoliuotą vardų sritį</string>
     <string name="android_o_not_support">Įrenginiai su Android 8.0+ nepalaiko šio nustatymo</string>
     <string name="disable_fingerprint">Jūsų įrenginyje nebuvo surasta pirštų antspaudų arba jūsų įrenginys neturi pirštų antspaudų skaitytuvo</string>
-    
+
     <!--Superuser-->
     <string name="su_request_title">Supervartotojo prašymas</string>
     <string name="deny_with_str">Atmesti%1$s</string>
@@ -210,7 +210,7 @@
     <string name="toast">Išmesti</string>
     <string name="none">Nėra</string>
     <string name="auth_fail">Patvirtinimas žlugo</string>
-    
+
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>
     <string name="target_uid">Target UID:\u0020</string>
diff --git a/app/src/full/res/values-nl/strings.xml b/app/src/full/res/values-nl/strings.xml
index 3d0d0967a..366254a3b 100644
--- a/app/src/full/res/values-nl/strings.xml
+++ b/app/src/full/res/values-nl/strings.xml
@@ -132,7 +132,7 @@
     <string name="settings_boot_format_title">Gepatchte boot uitvoerformaat</string>
     <string name="settings_boot_format_summary">Kies het formaat van de boot image uitvoer.\nKies .img om via fastboot/downloadmodus te flashen; kies .img.tar om via ODIN te flashen.</string>
     <string name="settings_core_only_title">Magisk basismodus</string>
-    <string name="settings_core_only_summary">Alleen kernfuncties inschakelen. Alle modules worden niet geladen. MagiskSU, MagiskHide, en systeemloze hosts blijven ingeschakeld</string>
+    <string name="settings_core_only_summary">Alleen kernfuncties inschakelen. Alle modules worden niet geladen. MagiskSU en MagiskHide blijven ingeschakeld</string>
     <string name="settings_magiskhide_summary">Magisk van verschillende detecties verbergen</string>
     <string name="settings_hosts_title">Systeemloze hosts</string>
     <string name="settings_hosts_summary">Systemloze hosts ondersteuning voor Adblock apps</string>
@@ -156,7 +156,7 @@
     <string name="settings_su_reauth_summary">Superuser rechten opnieuw opvragen na bijwerken applicatie</string>
     <string name="settings_su_fingerprint_title">Vingerafdruk authenticatie inschakelen</string>
     <string name="settings_su_fingerprint_summary">Vingerafdruk gebruiken om superuser verzoeken toe te staan</string>
-    
+
     <string name="multiuser_mode">Multi-gebruiker modus</string>
     <string name="settings_owner_only">Alleen apparaateigenaar</string>
     <string name="settings_owner_manage">Beheerd door apparaateigenaar</string>
diff --git a/app/src/full/res/values-pl/strings.xml b/app/src/full/res/values-pl/strings.xml
index 7d51f6392..b95cecec5 100644
--- a/app/src/full/res/values-pl/strings.xml
+++ b/app/src/full/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    
+
     <!--Welcome Activity-->
     <string name="modules">Moduły</string>
     <string name="downloads">Pobieranie</string>
@@ -29,7 +29,7 @@
     <string name="uninstall_magisk_title">Odinstaluj Magisk</string>
 	<string name="uninstall_magisk_msg">Wszystkie moduły będą wyłączone/usunięte. Root zostanie usunięty i przywrócone szyfrowanie danych, jeśli nie są te dane obecnie szyfrowane</string>
     <string name="update">Aktualizacja %1$s</string>
-    
+
     <!--Module Fragment-->
     <string name="no_info_provided">(Nie umieszczono informacji)</string>
     <string name="no_modules_found">Nie znaleziono modułów</string>
@@ -42,7 +42,7 @@
     <string name="reboot_recovery">Restart do Recovery</string>
     <string name="reboot_bootloader">Restart do Bootloadera</string>
     <string name="reboot_download">Restart do Download</string>
-    
+
 	<!--Repo Fragment-->
     <string name="update_available">Aktualizacja jest dostępna</string>
     <string name="installed">Zainstalowany</string>
@@ -111,7 +111,7 @@
     <string name="setup_fail">Konfiguracja nieudana</string>
     <string name="env_fix_title">Wymaga Dodatkowej Konfiguracji</string>
     <string name="env_fix_msg">Twoje urządzenie potrzebuje dodatkowej konfiguracji, aby Magisk działał prawidłowo. Spowoduje to pobranie pliku instalacyjnego Magisk, czy chcesz kontynuować?</string>
-	
+
 	<!--Settings Activity -->
     <string name="settings_general_category">Ogólne</string>
     <string name="settings_dark_theme_title">Ciemny Motyw</string>
@@ -135,11 +135,11 @@
     <string name="settings_boot_format_title">Poprawny format pliku rozruchowego</string>
     <string name="settings_boot_format_summary">Wybierz format pliku boot image.\nWybierz .img dla wgrywania poprzez Fastboot/Download Mode. Wybierz .img.tar dla ODINA.</string>
     <string name="settings_core_only_title">Tylko Podstawowy Tryb Magisk</string>
-    <string name="settings_core_only_summary">Włącz tylko podstawowe funkcje, wszystkie moduły nie zostaną załadowane. MagiskSU, MagiskHide i systemless hosts nadal będą włączone</string>
+    <string name="settings_core_only_summary">Włącz tylko podstawowe funkcje, wszystkie moduły nie zostaną załadowane. MagiskSU i MagiskHide nadal będą włączone</string>
     <string name="settings_magiskhide_summary">Włącz Magisk Hide dla wykrytych aplikacji</string>
     <string name="settings_hosts_title">Włącz systemless hosts</string>
     <string name="settings_hosts_summary">Wsparcie systemless dla aplikacji Adblock</string>
-    
+
     <string name="settings_su_app_adb">Aplikacje i ADB</string>
     <string name="settings_su_app">Tylko Aplikacje</string>
     <string name="settings_su_adb">Tylko ADB</string>
@@ -159,7 +159,7 @@
     <string name="settings_su_reauth_summary">Ponowne uwierzytelnianie uprawnienia superużytkownika po aktualizacji aplikacji</string>
     <string name="settings_su_fingerprint_title">Włącz Uwierzytelnienie Odciskiem Palca</string>
     <string name="settings_su_fingerprint_summary">Użyj skanera linii papilarnych, aby zezwolić na żądania supersu</string>
-    
+
     <string name="multiuser_mode">Tryb Multiusera</string>
     <string name="settings_owner_only">Tylko Właściciel Urządzenia</string>
     <string name="settings_owner_manage">Zarządzanie Właścicielami Urządzenia</string>
@@ -178,7 +178,7 @@
     <string name="isolate_summary">W każdej sesji root będzie miał własną odosobnioną nazwę</string>
     <string name="android_o_not_support">Brak wsparcia dla Androida 8.0+</string>
     <string name="disable_fingerprint">Nie ustawiono żadnych odcisków palców lub brak obsługi urządzenia</string>
-		
+
     <!--Superuser-->
     <string name="su_request_title">Prośba o dostęp Superusera</string>
     <string name="deny_with_str">Odmów%1$s</string>
diff --git a/app/src/full/res/values-pt-rBR/strings.xml b/app/src/full/res/values-pt-rBR/strings.xml
index a8273b277..a6a28d653 100644
--- a/app/src/full/res/values-pt-rBR/strings.xml
+++ b/app/src/full/res/values-pt-rBR/strings.xml
@@ -133,7 +133,7 @@
     <string name="settings_boot_format_title">Formato de Saída de Inicialização Emendada</string>
     <string name="settings_boot_format_summary">Selecionar formato de saída de imagem de inicialização emendada.\nEscolha .img para gravar através do modo fastboot/download; escolha .img.tar para gravar com ODIN.</string>
     <string name="settings_core_only_title">Modo Magisk de Núcleo Apenas</string>
-    <string name="settings_core_only_summary">Ativar apenas recursos de núcleo. MagiskSU, MagiskHide e hosts sem sistema ainda serão ativados, mas nenhum módulo será carregado.</string>
+    <string name="settings_core_only_summary">Ativar apenas recursos de núcleo. MagiskSU e MagiskHide ainda serão ativados, mas nenhum módulo será carregado.</string>
     <string name="settings_magiskhide_summary">Ocultar Magisk de várias detecções</string>
     <string name="settings_hosts_title">Hosts sem sistema</string>
     <string name="settings_hosts_summary">Suporte de hosts sem sistema para apps de Adblock</string>
diff --git a/app/src/full/res/values-pt-rPT/strings.xml b/app/src/full/res/values-pt-rPT/strings.xml
index 3b9c61fba..7c631b853 100644
--- a/app/src/full/res/values-pt-rPT/strings.xml
+++ b/app/src/full/res/values-pt-rPT/strings.xml
@@ -102,7 +102,7 @@
     <string name="settings_update_stable">Estável</string>
     <string name="settings_update_beta">Beta</string>
     <string name="settings_core_only_title">Magisk somente em Modo Core</string>
-    <string name="settings_core_only_summary">Ativar somente funcionalidades principais, todos os módulos não serão carregados. MagiskSU, MagiskHide, e systemless hosts ainda estará ativado</string>
+    <string name="settings_core_only_summary">Ativar somente funcionalidades principais, todos os módulos não serão carregados. MagiskSU e MagiskHide ainda estará ativado</string>
     <string name="settings_magiskhide_summary">Oculta Magisk de várias deteções</string>
     <string name="settings_hosts_title">Ativar systemless hosts</string>
     <string name="settings_hosts_summary">Suporte de systemless para aplicações Adblock</string>
diff --git a/app/src/full/res/values-ro/strings.xml b/app/src/full/res/values-ro/strings.xml
index 6bc04b5ca..629d420ff 100644
--- a/app/src/full/res/values-ro/strings.xml
+++ b/app/src/full/res/values-ro/strings.xml
@@ -27,7 +27,7 @@
     <string name="uninstall_magisk_title">Dezinstalare Magisk</string>
     <string name="uninstall_magisk_msg">Toate modulele vor fi dezactivate/eliminate. Accesul la Root va fi eliminat și potențial se vor cripta datele dacă nu sunt în prezent criptate</string>
     <string name="update">Actualizare %1$s</string>
-  
+
 
     <!--Module Fragment-->
     <string name="no_info_provided">(Nu sunt furnizate informații)</string>
@@ -125,7 +125,7 @@
     <string name="settings_boot_format_title">Formatul Boot-ului modificat</string>
     <string name="settings_boot_format_summary">Selectați formatul fișierului imaginii de Boot modificată.\nAlegeţi .img pentru flash prin modul fastboot/download; alegeţi .img.tar pentru flash prin ODIN.</string>
     <string name="settings_core_only_title">Mod de bază</string>
-    <string name="settings_core_only_summary">Se activează numai caracteristicile principale, toate modulele nu vor fi încărcate. MagiskSU, MagiskHide şi systemless hosts vor fi în continuare activate</string>
+    <string name="settings_core_only_summary">Se activează numai caracteristicile principale, toate modulele nu vor fi încărcate. MagiskSU şi MagiskHide vor fi în continuare activate</string>
     <string name="settings_magiskhide_summary">Ascundeţi Magisk de la diferite detectări</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">Systemless hosts suport pentru aplicațiile Adblock</string>
@@ -149,7 +149,7 @@
     <string name="settings_su_reauth_summary">Reautentificare permisiuni pentru superuser după o actualizare a aplicației</string>
     <string name="settings_su_fingerprint_title">Activați autentificarea cu amprenta digitală</string>
     <string name="settings_su_fingerprint_summary">Utilizați scanerul de amprentă pentru a permite solicitările superuser</string>
- 
+
     <string name="multiuser_mode">Mod Multiutilizator</string>
     <string name="settings_owner_only">Numai proprietarul dispozitivului</string>
     <string name="settings_owner_manage">Gestionat de proprietarul dispozitivului</string>
diff --git a/app/src/full/res/values-ru/strings.xml b/app/src/full/res/values-ru/strings.xml
index 8607abcd0..c010f2eb1 100644
--- a/app/src/full/res/values-ru/strings.xml
+++ b/app/src/full/res/values-ru/strings.xml
@@ -143,7 +143,7 @@
     <string name="settings_boot_format_title">Тип образа ядра</string>
     <string name="settings_boot_format_summary">Выберите тип патченого образа ядра:\n*.img - для прошивки через fastboot/download режимы\n*.img.tar - для прошивки через ODIN (Samsung)</string>
     <string name="settings_core_only_title">Magisk Core</string>
-    <string name="settings_core_only_summary">Активировать только основные возможности. Модули не будут загружены. MagiskSU, Magisk Hide и внесистемные хосты останутся активными</string>
+    <string name="settings_core_only_summary">Активировать только основные возможности. Модули не будут загружены. MagiskSU и Magisk Hide останутся активными</string>
     <string name="settings_magiskhide_summary">Скрывать Magisk от различных проверок</string>
     <string name="settings_hosts_title">Внесистемные хосты</string>
     <string name="settings_hosts_summary">Поддержка внесистемных хостов для приложений, блокирующих рекламу</string>
diff --git a/app/src/full/res/values-sk/strings.xml b/app/src/full/res/values-sk/strings.xml
index 468be8ff4..7ec36ffc2 100644
--- a/app/src/full/res/values-sk/strings.xml
+++ b/app/src/full/res/values-sk/strings.xml
@@ -142,7 +142,7 @@
     <string name="settings_boot_format_title">Výstupný formát zaplátaného Boot</string>
     <string name="settings_boot_format_summary">Vyberte výstupný formát zaplátaného obrazu boot.\nVyberte .img pre flashovanie cez fastboot/download režim; vyberte .img.tar pre flashovanie cez ODIN.</string>
     <string name="settings_core_only_title">Režim Magisk Core</string>
-    <string name="settings_core_only_summary">Povolí iba hlavné funkcie. Stále budú povolené MagiskSU, MagiskHide a systemless hosts, ale žiadne moduly nebudú zavedené.</string>
+    <string name="settings_core_only_summary">Povolí iba hlavné funkcie. Stále budú povolené MagiskSU a MagiskHide, ale žiadne moduly nebudú zavedené.</string>
     <string name="settings_magiskhide_summary">Ukryť Magisk pre rôznymi detekciami</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">Podpora pre aplikácie systemless hosts Adblock</string>
diff --git a/app/src/full/res/values-sr/strings.xml b/app/src/full/res/values-sr/strings.xml
index 37c42c1e9..981b6ec52 100644
--- a/app/src/full/res/values-sr/strings.xml
+++ b/app/src/full/res/values-sr/strings.xml
@@ -120,7 +120,7 @@
     <string name="settings_boot_format_title">Закрпљено Покретање Излазни Формат</string>
     <string name="settings_boot_format_summary">Изабери формат излазних закрпљених слика покретања.\nИзаберите .img ако флешујете преко fastboot/download режима; Изаберите .img.tar ако флешујете уз ОДИН.</string>
     <string name="settings_core_only_title">Магиск Основни Режим</string>
-    <string name="settings_core_only_summary">Омогућава само основне карактеристике, сви модули неће бити учитани. МагискСК, МагискСакриј, и без-системски домаћини ће бити омогућени</string>
+    <string name="settings_core_only_summary">Омогућава само основне карактеристике, сви модули неће бити учитани. МагискСК и МагискСакриј ће бити омогућени</string>
     <string name="settings_magiskhide_summary">Сакриј Магиск од разних детекција</string>
     <string name="settings_hosts_title">Без-системски домаћини (hosts)</string>
     <string name="settings_hosts_summary">Подршка без-системских домаћина за апликације за блокирање реклама</string>
diff --git a/app/src/full/res/values-sv/strings.xml b/app/src/full/res/values-sv/strings.xml
index eaa3fd3f8..f9a3c5b50 100644
--- a/app/src/full/res/values-sv/strings.xml
+++ b/app/src/full/res/values-sv/strings.xml
@@ -87,7 +87,7 @@
     <string name="settings_clear_cache_summary">Rensa den lagrade information för online-repos, tvingar appen att uppdatera online</string>
 
     <string name="settings_core_only_title">Endast Magisk kärnläge</string>
-    <string name="settings_core_only_summary">Aktiverar endast kärnfunktioner, alla moduler laddas inte. MagiskSU, MagiskHide och systemless hosts kommer fortfarande att vara aktiverade</string>
+    <string name="settings_core_only_summary">Aktiverar endast kärnfunktioner, alla moduler laddas inte. MagiskSU och MagiskHide kommer fortfarande att vara aktiverade</string>
     <string name="settings_magiskhide_summary">Dölj Magisk från att bli upptäckt</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">Systemless hosts-stöd för Adblock-appar</string>
diff --git a/app/src/full/res/values-tr/strings.xml b/app/src/full/res/values-tr/strings.xml
index 668cd6db4..5039ed3ab 100644
--- a/app/src/full/res/values-tr/strings.xml
+++ b/app/src/full/res/values-tr/strings.xml
@@ -119,7 +119,7 @@
     <string name="env_fix_msg">Cihazınızın Magisk\'in düzgün çalışması için ek kuruluma ihtiyacı var. Bu Magisk kurulum zip dosyasını indirecektir, şimdi devam etmek istiyor musunuz?</string>
     <string name="setup_title">Ek Kurulum</string>
     <string name="setup_msg">Ortam Kurulumu Çalışıyor…</string>
-    
+
     <!--Settings Activity -->
     <string name="settings_general_category">Genel</string>
     <string name="settings_dark_theme_title">Karanlık Tema</string>
@@ -143,7 +143,7 @@
     <string name="settings_boot_format_title">Yamalı Önyükleme Formatı</string>
     <string name="settings_boot_format_summary">Yamalı önyükleme imaj dosyasının formatını seçin\nFastboot/download modunda yüklemek için .img seçeneğini seçin; ODIN ile yüklemek için .img.tar\'ı seçin.</string>
     <string name="settings_core_only_title">Magisk Sadece Çekirdek Modu</string>
-    <string name="settings_core_only_summary">Sadece temel özellikleri etkinleştirin, tüm modüller yüklenmez. MagiskSU, MagiskHide ve host yine de etkinleştirilecektir</string>
+    <string name="settings_core_only_summary">Sadece temel özellikleri etkinleştirin, tüm modüller yüklenmez. MagiskSU ve MagiskHide yine de etkinleştirilecektir</string>
     <string name="settings_magiskhide_summary">"Magisk\'i çeşitli algılamalardan gizle"</string>
     <string name="settings_hosts_title">Sistemsiz host</string>
     <string name="settings_hosts_summary">Reklam engelleme uygulamaları için sistemsiz host desteği</string>
diff --git a/app/src/full/res/values-uk/strings.xml b/app/src/full/res/values-uk/strings.xml
index 706f51d54..21bf33d91 100644
--- a/app/src/full/res/values-uk/strings.xml
+++ b/app/src/full/res/values-uk/strings.xml
@@ -143,7 +143,7 @@
     <string name="settings_boot_format_title">Формат пропатченого образу</string>
     <string name="settings_boot_format_summary">Виберіть формат вихідного пропатченого boot образу.\n.img - для прошивання через fastboot/download режим;\n.img.tar - для прошивання через ODIN.</string>
     <string name="settings_core_only_title">Режим ядра Magisk</string>
-    <string name="settings_core_only_summary">Увімкнути тільки можливості ядра, всі модулі не будуть активними. MagiskSU, Magisk Hide і позасистемні хости залишуться увімкненими</string>
+    <string name="settings_core_only_summary">Увімкнути тільки можливості ядра, всі модулі не будуть активними. MagiskSU i Magisk Hide залишуться увімкненими</string>
     <string name="settings_magiskhide_summary">Приховати Magisk від різних перевірок</string>
     <string name="settings_hosts_title">Позасистемні хости</string>
     <string name="settings_hosts_summary">Підтримка позасистемних хостів для програм блокування реклами</string>
diff --git a/app/src/full/res/values-zh-rCN/strings.xml b/app/src/full/res/values-zh-rCN/strings.xml
index 2ea282d28..c826de8d4 100644
--- a/app/src/full/res/values-zh-rCN/strings.xml
+++ b/app/src/full/res/values-zh-rCN/strings.xml
@@ -143,7 +143,7 @@
     <string name="settings_boot_format_title">已修补的 Boot 镜像输出格式</string>
     <string name="settings_boot_format_summary">选择已修补的 Boot 镜像文件输出格式\n若要通过 fastboot/download 模式刷入，请选择 .img 格式；若要通过 Odin 刷入，则选择 .img.tar\n</string>
     <string name="settings_core_only_title">Magisk 核心功能模式</string>
-    <string name="settings_core_only_summary">仅启用核心功能，所有模块将不会被载入。MagiskSU、MagiskHide 和 systemless hosts 仍会持续运作</string>
+    <string name="settings_core_only_summary">仅启用核心功能，所有模块将不会被载入。MagiskSU 和 MagiskHide 仍会持续运作</string>
     <string name="settings_magiskhide_summary">隐藏 Magisk 使其不被多种方法检测到</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">为广告屏蔽应用提供 Systemless hosts 支持</string>
diff --git a/app/src/full/res/values-zh-rTW/strings.xml b/app/src/full/res/values-zh-rTW/strings.xml
index 704b1948e..b5bce8332 100644
--- a/app/src/full/res/values-zh-rTW/strings.xml
+++ b/app/src/full/res/values-zh-rTW/strings.xml
@@ -133,7 +133,7 @@
     <string name="zip_process_title">處理中</string>
     <string name="uninstall_magisk_title">解除安裝 Magisk</string>
     <string name="uninstall_magisk_msg">所有模組將會被停用 / 刪除。root會被移除，並有可能在目前資料未加密的情況下被加密</string>
-    <string name="settings_core_only_summary">僅啟用核心功能，所有模組將不會被載入。MagiskSU、MagiskHide 和 systemless hosts 仍會持續運作</string>
+    <string name="settings_core_only_summary">僅啟用核心功能，所有模組將不會被載入。MagiskSU 和 MagiskHide 仍會持續運作</string>
     <string name="safetyNet_check_success">SafetyNet 檢查成功</string>
     <string name="safetyNet_res_invalid">回傳值無效</string>
     <string name="multiuser_hint_owner_request">已發送權限請求到擁有者帳戶中。請切換到擁有者帳戶進行准許</string>
diff --git a/app/src/full/res/values/strings.xml b/app/src/full/res/values/strings.xml
index 8f0aad9b3..0f971eae7 100644
--- a/app/src/full/res/values/strings.xml
+++ b/app/src/full/res/values/strings.xml
@@ -143,10 +143,11 @@
     <string name="settings_boot_format_title">Patched Boot Output Format</string>
     <string name="settings_boot_format_summary">Select the format for the output patched boot image.\nChoose .img to flash through fastboot/download mode; choose .img.tar to flash with ODIN.</string>
     <string name="settings_core_only_title">Magisk Core Only Mode</string>
-    <string name="settings_core_only_summary">Enable only core features. MagiskSU, MagiskHide and systemless hosts will still be enabled, but no modules will be loaded.</string>
+    <string name="settings_core_only_summary">Enable only core features. MagiskSU and MagiskHide will still be enabled, but no modules will be loaded.</string>
     <string name="settings_magiskhide_summary">Hide Magisk from various forms of detection.</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">Systemless hosts support for Adblock apps.</string>
+    <string name="settings_hosts_toast">Added systemless hosts module</string>
 
     <string name="settings_su_app_adb">Apps and ADB</string>
     <string name="settings_su_app">Apps only</string>
diff --git a/app/src/full/res/xml/app_settings.xml b/app/src/full/res/xml/app_settings.xml
index 077b848c6..59361618a 100644
--- a/app/src/full/res/xml/app_settings.xml
+++ b/app/src/full/res/xml/app_settings.xml
@@ -61,7 +61,7 @@
         android:key="magisk"
         android:title="@string/magisk">
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="disable"
             android:title="@string/settings_core_only_title"
             android:summary="@string/settings_core_only_summary" />
@@ -71,7 +71,7 @@
             android:title="@string/magiskhide"
             android:summary="@string/settings_magiskhide_summary" />
 
-        <SwitchPreference
+        <Preference
             android:key="hosts"
             android:title="@string/settings_hosts_title"
             android:summary="@string/settings_hosts_summary" />
diff --git a/native/jni/daemon/bootstages.cpp b/native/jni/daemon/bootstages.cpp
index 952effb3e..8e98cb964 100644
--- a/native/jni/daemon/bootstages.cpp
+++ b/native/jni/daemon/bootstages.cpp
@@ -752,12 +752,6 @@ void startup() {
 }
 
 static void core_only() {
-	// Systemless hosts
-	if (access(HOSTSFILE, F_OK) == 0) {
-		LOGI("* Enabling systemless hosts file support");
-		bind_mount(HOSTSFILE, "/system/etc/hosts");
-	}
-
 	auto_start_magiskhide();
 	unblock_boot_process();
 }
diff --git a/native/jni/include/magisk.h b/native/jni/include/magisk.h
index 6da21e3e5..0b751a29d 100644
--- a/native/jni/include/magisk.h
+++ b/native/jni/include/magisk.h
@@ -18,7 +18,6 @@
 #define BBPATH          MAGISKTMP "/busybox"
 #define MOUNTPOINT      MAGISKTMP "/img"
 #define COREDIR         MOUNTPOINT "/.core"
-#define HOSTSFILE       COREDIR "/hosts"
 #define SECURE_DIR      "/data/adb"
 #define MAINIMG         SECURE_DIR "/magisk.img"
 #define DATABIN         SECURE_DIR "/magisk"