From 9f33c8059f885036c84da9f83d4b143b2d2c7614 Mon Sep 17 00:00:00 2001
From: msmannan00 <msmannan00@gmail.com>
Date: Thu, 22 Oct 2020 13:36:44 +0500
Subject: [PATCH] Bug Fixes

---
 .idea/inspectionProfiles/Project_Default.xml  |   5 +
 app/build.gradle                              |   1 +
 app/src/main/AndroidManifest.xml              |  26 +-
 .../bookmarkManager/bookmarkController.java   |   2 -
 .../appManager/homeManager/geckoSession.java  |   2 +-
 .../homeManager/homeController.java           |   2 +-
 .../landingManager/landingController.java     |  13 +-
 .../orbotManager/orbotController.java         |   1 +
 .../settingNotificationController.java        | 103 +++
 .../settingNotificationModel.java             |  50 ++
 .../settingNotificationViewController.java    |  71 ++
 .../settingSearchController.java              |  85 +++
 .../settingSearchModel.java                   |  28 +
 .../settingSearchViewController.java          |  53 ++
 .../settingController.java                    | 584 ++++++++--------
 .../{ => settingHomePage}/settingModel.java   | 302 ++++----
 .../settingViewController.java                | 364 +++++-----
 .../appManager/tabManager/tabController.java  |   1 -
 .../constants/constants.java                  |   2 +
 .../genesissearchengine/constants/keys.java   |   1 +
 .../genesissearchengine/constants/status.java |   4 +-
 .../helperManager/LocaleManager.java          |   2 +-
 .../helperManager/errorHandler.java           |  12 +-
 .../pluginManager/messageManager.java         |  20 +-
 .../pluginManager/pluginController.java       |   9 -
 .../images/xml/ic_baseline_adjust_24.xml      |  10 +
 app/src/main/res/drawable-hdpi/adjust.png     | Bin 0 -> 3941 bytes
 .../layouts/bookmark/layout/bookmark_view.xml |  16 +-
 .../bridge/layout/bridge_settings_view.xml    |  22 +-
 .../layouts/history/layout/history_view.xml   |  14 +-
 .../layouts/language/layout/language_view.xml |  18 +-
 .../orbot/layout/orbot_settings_view.xml      |  24 +-
 .../res/layouts/other/layout/hint_view.xml    |   4 +-
 .../res/layouts/other/layout/home_view.xml    |  20 +-
 .../other/layout/notification_menu.xml        |   6 +-
 .../res/layouts/other/layout/popup_menu.xml   |  26 +-
 .../layouts/other/layout/settings_view.xml    |  46 +-
 .../res/layouts/other/layout/tab_view.xml     | 118 ----
 .../res/layouts/setting/layout/setting.xml    | 649 ++++++++++++++++++
 .../layout/setting_notification_view.xml      | 147 ++++
 .../setting/layout/setting_search_view.xml    | 533 ++++++++++++++
 .../listviews/layout/recyclerview__menu.xml   |   8 +-
 .../layout/recyclerview__row_menu.xml         |  10 +-
 .../listviews/layout/recyclerview_row.xml     |   4 +-
 app/src/main/res/values-de/strings.xml        | 312 +--------
 app/src/main/res/values-it/strings.xml        | 311 +--------
 app/src/main/res/values-pt/strings.xml        | 312 +--------
 app/src/main/res/values-ru/strings.xml        | 312 +--------
 app/src/main/res/values-uk/strings.xml        | 312 +--------
 app/src/main/res/values-zh/strings.xml        | 311 +--------
 app/src/main/res/values/attrs.xml             |   5 +-
 app/src/main/res/values/strings.xml           | 425 ++++--------
 app/src/main/res/values/styles.xml            |   2 -
 53 files changed, 2674 insertions(+), 3046 deletions(-)
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationController.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationModel.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationViewController.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchController.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchModel.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchViewController.java
 rename app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/{ => settingHomePage}/settingController.java (84%)
 mode change 100755 => 100644
 rename app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/{ => settingHomePage}/settingModel.java (79%)
 mode change 100755 => 100644
 rename app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/{ => settingHomePage}/settingViewController.java (96%)
 mode change 100755 => 100644
 create mode 100644 app/src/main/res/custom-xml/images/xml/ic_baseline_adjust_24.xml
 create mode 100644 app/src/main/res/drawable-hdpi/adjust.png
 create mode 100644 app/src/main/res/layouts/setting/layout/setting.xml
 create mode 100644 app/src/main/res/layouts/setting/layout/setting_notification_view.xml
 create mode 100644 app/src/main/res/layouts/setting/layout/setting_search_view.xml
 mode change 100755 => 100644 app/src/main/res/values-de/strings.xml
 mode change 100755 => 100644 app/src/main/res/values-it/strings.xml
 mode change 100755 => 100644 app/src/main/res/values-pt/strings.xml
 mode change 100755 => 100644 app/src/main/res/values-ru/strings.xml
 mode change 100755 => 100644 app/src/main/res/values-uk/strings.xml
 mode change 100755 => 100644 app/src/main/res/values-zh/strings.xml

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 2235acf5..14111354 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,8 +1,13 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ConstantConditions" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
+      <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
+    </inspection_tool>
     <inspection_tool class="FieldCanBeLocal" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="FieldMayBeFinal" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InnerClassMayBeStatic" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SameParameterValue" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
diff --git a/app/build.gradle b/app/build.gradle
index e64cde27..44c0c02f 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,6 +76,7 @@ android {
                             'src/main/res/layouts/history',
                             'src/main/res/layouts/language',
                             'src/main/res/layouts/orbot',
+                            'src/main/res/layouts/setting',
                             'src/main/res/layouts/bridge',
                             'src/main/res/layouts/alert',
                             'src/main/res/layouts/bookmark',
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fb186d9b..8eece8b1 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,9 +30,9 @@
                 android:name="com.darkweb.genesissearchengine.appManager.orbotManager.orbotController"
                 android:launchMode="singleTop" />
         <activity
-                android:name="com.darkweb.genesissearchengine.appManager.settingManager.settingController"
+                android:name="com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage.settingController"
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-                android:label="@string/title_activity_setting_controller"
+                android:label="@string/SETTING_HEADER"
                 android:windowSoftInputMode="adjustNothing" />
         <activity
                 android:name="com.darkweb.genesissearchengine.appManager.historyManager.historyController"
@@ -45,13 +45,24 @@
         <activity
                 android:name="com.darkweb.genesissearchengine.appManager.languageManager.languageController"
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-                android:label="@string/title_activity_setting_controller"
+                android:label="@string/SETTING_HEADER"
                 android:windowSoftInputMode="adjustNothing" />
         <activity
-                android:name="com.darkweb.genesissearchengine.appManager.bridgeManager.bridgeController"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-                android:launchMode="singleTop"
-                android:windowSoftInputMode="adjustResize" />
+            android:name="com.darkweb.genesissearchengine.appManager.bridgeManager.bridgeController"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize" />
+
+        <activity
+            android:name="com.darkweb.genesissearchengine.appManager.settingManager.notificationManager.settingNotificationController"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="com.darkweb.genesissearchengine.appManager.settingManager.searchEngineManager.settingSearchController"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize" />
         <activity
                 android:name="com.darkweb.genesissearchengine.appManager.tabManager.tabController"
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
@@ -86,6 +97,7 @@
 
                 <action android:name="org.torproject.android.REQUEST_HS_PORT" />
             </intent-filter>
+
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java
index 021da0b0..50bbc0e2 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java
@@ -59,8 +59,6 @@ public class bookmarkController extends AppCompatActivity
     private ImageButton mSearchButton;
 
     private bookmarkViewController mbookmarkViewController;
-    private boolean isUpdatingRecyclerView = false;
-    private boolean mIsScrollingUp;
 
     /*Initializations*/
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoSession.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoSession.java
index d4a9d1dd..95ebf88d 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoSession.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoSession.java
@@ -402,7 +402,7 @@ public class geckoSession extends GeckoSession implements GeckoSession.Permissio
                     intent.setDataAndType(Uri.fromFile(file), (mimetype + "/*"));
                 } else {
                     intent.setAction(android.content.Intent.ACTION_VIEW);
-                    Uri uri_temp = FileProvider.getUriForFile(mContext,mContext.getString(R.string.file_provider_authority), file);
+                    Uri uri_temp = FileProvider.getUriForFile(mContext,mContext.getString(R.string.GENERAL_FILE_PROVIDER_AUTHORITY), file);
                     intent.setDataAndType(uri_temp, (mimetype + "/*"));
 
                     List<ResolveInfo> resInfoList = mContext.getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController.java
index 06200fe1..6473a371 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController.java
@@ -31,7 +31,7 @@ import com.darkweb.genesissearchengine.appManager.databaseManager.databaseContro
 import com.darkweb.genesissearchengine.appManager.historyManager.historyController;
 import com.darkweb.genesissearchengine.appManager.landingManager.landingController;
 import com.darkweb.genesissearchengine.appManager.languageManager.languageController;
-import com.darkweb.genesissearchengine.appManager.settingManager.settingController;
+import com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage.settingController;
 import com.darkweb.genesissearchengine.appManager.tabManager.tabController;
 import com.darkweb.genesissearchengine.appManager.tabManager.tabRowModel;
 import com.darkweb.genesissearchengine.constants.constants;
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingController.java
index 50030746..792a251e 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingController.java
@@ -1,6 +1,5 @@
 package com.darkweb.genesissearchengine.appManager.landingManager;
 
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
@@ -24,18 +23,18 @@ public class landingController extends AppIntro {
         // Instead of fragments, you can also use our default slide
         // Just set a title, description, background and image. AppIntro will do the rest.
         CustomSlideBigText welcome = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
-        welcome.setTitle(getString(R.string.hello));
-        welcome.setSubTitle(getString(R.string.welcome));
+        welcome.setTitle(getString(R.string.LANDING_HELLO));
+        welcome.setSubTitle(getString(R.string.LANDING_WELCOME));
         addSlide(welcome);
 
         CustomSlideBigText intro2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
-        intro2.setTitle(getString(R.string.browser_the_internet));
-        intro2.setSubTitle(getString(R.string.no_tracking));
+        intro2.setTitle(getString(R.string.LANDING_BROWSE_INFO));
+        intro2.setSubTitle(getString(R.string.LANDING_NO_TRACKING));
         addSlide(intro2);
 
         CustomSlideBigText cs2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
-        cs2.setTitle(getString(R.string.bridges_sometimes));
-        cs2.showButton(getString(R.string.action_more), new View.OnClickListener() {
+        cs2.setTitle(getString(R.string.LANDING_BRIDGES_INFO));
+        cs2.showButton(getString(R.string.LANDING_MORE), new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 startActivity(new Intent(landingController.this,bridgeController.class));
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java
index 153e7211..93640a10 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java
@@ -50,6 +50,7 @@ public class orbotController extends AppCompatActivity {
 
     /* LISTENERS */
 
+
     public void onBridgeSwitch(View view){
         status.sBridgeStatus = !mBridgeSwitch.isChecked();
         dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.BRIDGE_BRIDGE_ENABLES,status.sBridgeStatus));
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationController.java
new file mode 100644
index 00000000..66ab5bde
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationController.java
@@ -0,0 +1,103 @@
+package com.darkweb.genesissearchengine.appManager.settingManager.notificationManager;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import com.darkweb.genesissearchengine.appManager.activityContextManager;
+import com.darkweb.genesissearchengine.constants.enums;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.darkweb.genesissearchengine.pluginManager.pluginController;
+import com.example.myapplication.R;
+import com.google.android.material.switchmaterial.SwitchMaterial;
+
+import java.util.List;
+
+public class settingNotificationController extends AppCompatActivity {
+
+    /* PRIVATE VARIABLES */
+    private SwitchMaterial mNotificationManual;
+    private settingNotificationModel mSettingNotificationModel;
+    private settingNotificationViewController mSettingNotificationViewController;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        pluginController.getInstance().onCreate(this);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.setting_notification_view);
+
+        viewsInitializations();
+    }
+
+    public void viewsInitializations() {
+        mNotificationManual = findViewById(R.id.pNotificationManual);
+        mSettingNotificationViewController = new settingNotificationViewController(this, new settingNotificationViewCallback(), mNotificationManual);
+
+        mSettingNotificationModel = new settingNotificationModel(new settingNotificationModelCallback());
+    }
+
+    /* LISTENERS */
+    public class settingNotificationViewCallback implements eventObserver.eventListener{
+
+        @Override
+        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        {
+            return null;
+        }
+    }
+
+
+    public class settingNotificationModelCallback implements eventObserver.eventListener{
+
+        @Override
+        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        {
+            return null;
+        }
+    }
+
+    /* LOCAL OVERRIDES */
+
+    @Override
+    public void onResume()
+    {
+        activityContextManager.getInstance().setCurrentActivity(this);
+        super.onResume();
+
+        int notificationStatus = pluginController.getInstance().getNotificationStatus();
+        if(notificationStatus==0){
+            pluginController.getInstance().disableTorNotification();
+        } else if(notificationStatus==1){
+            pluginController.getInstance().enableTorNotification();
+        }
+    }
+
+    @Override
+    public void onPause()
+    {
+        super.onPause();
+    }
+
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
+
+    /*UI Redirection*/
+
+    public void onClose(View view){
+        finish();
+    }
+
+    public void onOpenNotificationSettings(View view){
+        Intent intent = new Intent();
+        intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
+        intent.putExtra("android.provider.extra.APP_PACKAGE", getPackageName());
+        startActivity(intent);
+    }
+
+    public void onSaveLocalNotificationSettings(View view){
+        mSettingNotificationModel.updateLocalNotification(!mNotificationManual.isChecked());
+        mNotificationManual.toggle();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationModel.java
new file mode 100644
index 00000000..81347f0b
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationModel.java
@@ -0,0 +1,50 @@
+package com.darkweb.genesissearchengine.appManager.settingManager.notificationManager;
+
+import com.darkweb.genesissearchengine.constants.enums;
+import com.darkweb.genesissearchengine.constants.keys;
+import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.constants.strings;
+import com.darkweb.genesissearchengine.dataManager.dataController;
+import com.darkweb.genesissearchengine.dataManager.dataEnums;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.darkweb.genesissearchengine.pluginManager.pluginController;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.mozilla.geckoview.ContentBlocking.CookieBehavior.ACCEPT_FIRST_PARTY;
+
+class settingNotificationModel
+{
+    /*Variable Declaration*/
+
+    private eventObserver.eventListener mEvent;
+
+    /*Initializations*/
+
+    settingNotificationModel(eventObserver.eventListener mEvent){
+        this.mEvent = mEvent;
+    }
+
+
+    /*Helper Methods*/
+
+    public void updateLocalNotification(boolean pStatus){
+
+        int mStatus = pStatus ? 1 : 0;
+        status.sBridgeNotificationManual = mStatus;
+
+        dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_NOTIFICATION_STATUS, mStatus));
+        pluginController.getInstance().setNotificationStatus(mStatus);
+        int notificationStatus = pluginController.getInstance().getNotificationStatus();
+        if(notificationStatus==0){
+            pluginController.getInstance().disableTorNotification();
+        } else if(notificationStatus==1){
+            pluginController.getInstance().enableTorNotification();
+        }else {
+            pluginController.getInstance().enableTorNotificationNoBandwidth();
+        }
+    }
+
+
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationViewController.java
new file mode 100644
index 00000000..1209ea31
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationViewController.java
@@ -0,0 +1,71 @@
+package com.darkweb.genesissearchengine.appManager.settingManager.notificationManager;
+
+import android.annotation.SuppressLint;
+import android.os.Build;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.SeekBar;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
+import com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage.settingController;
+import com.darkweb.genesissearchengine.constants.constants;
+import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.constants.strings;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.example.myapplication.R;
+import com.google.android.material.switchmaterial.SwitchMaterial;
+
+import static com.darkweb.genesissearchengine.constants.status.sSettingHistoryStatus;
+import static com.darkweb.genesissearchengine.constants.status.sSettingJavaStatus;
+
+class settingNotificationViewController
+{
+    /*Private Variables*/
+
+    private eventObserver.eventListener mEvent;
+    private AppCompatActivity mContext;
+
+    private SwitchMaterial mNotificationManual;
+
+    /*Initializations*/
+
+    settingNotificationViewController(settingNotificationController pContext, eventObserver.eventListener pEvent, SwitchMaterial pNotificationManual)
+    {
+        this.mNotificationManual = pNotificationManual;
+        this.mEvent = pEvent;
+        this.mContext = pContext;
+
+        initViews();
+        initPostUI();
+    }
+
+    private void initViews()
+    {
+        if(status.sBridgeNotificationManual == 1){
+            mNotificationManual.setChecked(true);
+        }else {
+            mNotificationManual.setChecked(false);
+        }
+    }
+
+    private void initPostUI(){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = mContext.getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+                window.setStatusBarColor(mContext.getResources().getColor(R.color.blue_dark));
+            }
+            else {
+                mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);//  set status text dark
+                mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.white));
+            }
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchController.java
new file mode 100644
index 00000000..2c603a55
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchController.java
@@ -0,0 +1,85 @@
+package com.darkweb.genesissearchengine.appManager.settingManager.searchEngineManager;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.darkweb.genesissearchengine.appManager.activityContextManager;
+import com.darkweb.genesissearchengine.constants.enums;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.darkweb.genesissearchengine.pluginManager.pluginController;
+import com.example.myapplication.R;
+
+import java.util.List;
+
+public class settingSearchController extends AppCompatActivity {
+
+    /* PRIVATE VARIABLES */
+    private settingSearchModel mSettingSearchModel;
+    private settingSearchViewController mSettingSearchViewController;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        pluginController.getInstance().onCreate(this);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.setting_search_view);
+
+        viewsInitializations();
+    }
+
+    public void viewsInitializations() {
+        mSettingSearchViewController = new settingSearchViewController(this, new settingSearchViewCallback());
+
+        mSettingSearchModel = new settingSearchModel(new settingSearchModelCallback());
+    }
+
+    /* LISTENERS */
+    public class settingSearchViewCallback implements eventObserver.eventListener{
+
+        @Override
+        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        {
+            return null;
+        }
+    }
+
+
+    public class settingSearchModelCallback implements eventObserver.eventListener{
+
+        @Override
+        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        {
+            return null;
+        }
+    }
+
+    /* LOCAL OVERRIDES */
+
+    @Override
+    public void onResume()
+    {
+        activityContextManager.getInstance().setCurrentActivity(this);
+        super.onResume();
+
+    }
+
+    @Override
+    public void onPause()
+    {
+        super.onPause();
+    }
+
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
+
+    /*UI Redirection*/
+
+    public void onClose(View view){
+        finish();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchModel.java
new file mode 100644
index 00000000..a2181408
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchModel.java
@@ -0,0 +1,28 @@
+package com.darkweb.genesissearchengine.appManager.settingManager.searchEngineManager;
+
+import com.darkweb.genesissearchengine.constants.keys;
+import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.dataManager.dataController;
+import com.darkweb.genesissearchengine.dataManager.dataEnums;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.darkweb.genesissearchengine.pluginManager.pluginController;
+
+import java.util.Arrays;
+
+class settingSearchModel
+{
+    /*Variable Declaration*/
+
+    private eventObserver.eventListener mEvent;
+
+    /*Initializations*/
+
+    settingSearchModel(eventObserver.eventListener mEvent){
+        this.mEvent = mEvent;
+    }
+
+
+    /*Helper Methods*/
+
+
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchViewController.java
new file mode 100644
index 00000000..f9bca9f3
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchViewController.java
@@ -0,0 +1,53 @@
+package com.darkweb.genesissearchengine.appManager.settingManager.searchEngineManager;
+
+import android.os.Build;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
+import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.example.myapplication.R;
+import com.google.android.material.switchmaterial.SwitchMaterial;
+
+class settingSearchViewController
+{
+    /*Private Variables*/
+
+    private eventObserver.eventListener mEvent;
+    private AppCompatActivity mContext;
+
+    /*Initializations*/
+
+    settingSearchViewController(settingSearchController pContext, eventObserver.eventListener pEvent)
+    {
+        this.mEvent = pEvent;
+        this.mContext = pContext;
+
+        initViews();
+        initPostUI();
+    }
+
+    private void initViews()
+    {
+    }
+
+    private void initPostUI(){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = mContext.getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+                window.setStatusBarColor(mContext.getResources().getColor(R.color.blue_dark));
+            }
+            else {
+                mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);//  set status text dark
+                mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.white));
+            }
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingController.java
old mode 100755
new mode 100644
similarity index 84%
rename from app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingController.java
rename to app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingController.java
index 91d3429b..096b16d6
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingController.java
@@ -1,282 +1,304 @@
-package com.darkweb.genesissearchengine.appManager.settingManager;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.SeekBar;
-import android.widget.Spinner;
-import android.widget.TextView;
-import androidx.appcompat.app.AppCompatActivity;
-import com.darkweb.genesissearchengine.appManager.activityContextManager;
-import com.darkweb.genesissearchengine.appManager.homeManager.homeController;
-import com.darkweb.genesissearchengine.constants.constants;
-import com.darkweb.genesissearchengine.constants.enums;
-import com.darkweb.genesissearchengine.constants.keys;
-import com.darkweb.genesissearchengine.constants.status;
-import com.darkweb.genesissearchengine.constants.strings;
-import com.darkweb.genesissearchengine.dataManager.dataController;
-import com.darkweb.genesissearchengine.dataManager.dataEnums;
-import com.darkweb.genesissearchengine.helperManager.eventObserver;
-import com.darkweb.genesissearchengine.pluginManager.pluginController;
-import com.example.myapplication.R;
-
-import java.util.Arrays;
-import java.util.List;
-import static com.darkweb.genesissearchengine.constants.status.sSettingCookieStatus;
-import static com.darkweb.genesissearchengine.constants.status.sSettingHistoryStatus;
-import static com.darkweb.genesissearchengine.constants.status.sSettingJavaStatus;
-
-public class settingController extends AppCompatActivity
-{
-    /*Private Observer Classes*/
-
-    private homeController mHomeController;
-    private settingViewController mSettingViewController;
-    private settingModel mSettingModel;
-
-    /*Private Variables*/
-
-    private Spinner mSearch;
-    private Spinner mJavascript;
-    private Spinner mHistory;
-    private Spinner mCookies;
-    private Spinner mFontAdjustable;
-    private Spinner mNotification;
-    private SeekBar mFontSize;
-    private TextView mFontSizePercentage;
-
-    /*Initializations*/
-
-    public settingController(){
-        mHomeController = activityContextManager.getInstance().getHomeController();
-        mSettingModel = new settingModel(new settingModelCallback());
-        mSettingModel.initNotification(pluginController.getInstance().getNotificationStatus());
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        pluginController.getInstance().onCreate(this);
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.settings_view);
-
-        viewsInitializations();
-        modelInitialization();
-        listenersInitializations();
-        initializeFontSizeListener();
-    }
-
-    public void modelInitialization(){
-        mSettingModel.setJavaStatus(sSettingJavaStatus);
-        mSettingModel.setHistoryStatus(sSettingHistoryStatus);
-        mSettingModel.setSearchStatus(status.sSettingSearchStatus);
-        mSettingModel.setAdjustableStatus(status.sSettingFontAdjustable);
-        mSettingModel.setFontSize(status.sSettingFontSize);
-    }
-
-    public void viewsInitializations()
-    {
-        mSearch = findViewById(R.id.search_manager);
-        mJavascript = findViewById(R.id.javascript_manager);
-        mHistory = findViewById(R.id.history_manager);
-        mFontSize = findViewById(R.id.font_size);
-        mFontAdjustable = findViewById(R.id.font_adjustable);
-        mFontSizePercentage = findViewById(R.id.font_size_percentage);
-        mCookies = findViewById(R.id.cookies_manager);
-        mNotification = findViewById(R.id.notification_manager);
-
-        mSettingViewController = new settingViewController(mSearch, mJavascript, mHistory, mFontSize, mFontAdjustable, mFontSizePercentage,this, new settingModelCallback(), mCookies,mNotification,pluginController.getInstance().getNotificationStatus());
-    }
-
-    public void listenersInitializations()
-    {
-        initializeItemSelectedListener(mSearch);
-        initializeItemSelectedListener(mJavascript);
-        initializeItemSelectedListener(mNotification);
-        initializeItemSelectedListener(mHistory);
-        initializeItemSelectedListener(mFontAdjustable);
-        initializeItemSelectedListener(mCookies);
-        pluginController.getInstance().logEvent(strings.EVENT_SETTINGS_OPENED);
-    }
-
-    /*Event Handlers*/
-
-    @Override
-    public void onTrimMemory(int level)
-    {
-        if(status.sSettingIsAppPaused && (level==80 || level==15))
-        {
-            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.HOME_LOW_MEMORY,true));
-            finish();
-        }
-    }
-
-    @Override
-    public void onResume()
-    {
-        activityContextManager.getInstance().setCurrentActivity(this);
-        status.sSettingIsAppPaused = false;
-        super.onResume();
-    }
-
-    @Override
-    public void onPause()
-    {
-        super.onPause();
-    }
-
-
-    @Override
-    public void onBackPressed(){
-        mSettingModel.onCloseView();
-    }
-
-    public void initializeItemSelectedListener(Spinner view){
-        view.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
-                if(parentView.getId()== R.id.search_manager)
-                {
-                    mSettingModel.setSearchStatus(getEngineURL(position));
-                }
-                else if(parentView.getId()== R.id.javascript_manager)
-                {
-                    mSettingModel.setJavaStatus(position==0);
-                }
-                else if(parentView.getId()== R.id.history_manager)
-                {
-                    mSettingModel.setHistoryStatus(position==0);
-                }
-                else if(parentView.getId()== R.id.font_adjustable)
-                {
-                    if(position==0){
-                        mSettingModel.setFontSize(100);
-                    }
-                    mSettingViewController.setFontSizeAdjustable(position==0);
-                    mSettingModel.setAdjustableStatus(position==0);
-                }
-                else if(parentView.getId()== R.id.cookies_manager)
-                {
-                    mSettingModel.setCookieStatus(position);
-                }
-                else if(parentView.getId()== R.id.notification_manager)
-                {
-                    mSettingModel.setmNotificationStatus(position);
-                }
-            }
-            @Override
-            public void onNothingSelected(AdapterView<?> parentView) {
-            }
-        });
-    }
-
-    public void initializeFontSizeListener(){
-
-        mFontSize.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int i, boolean b) {
-                float cur_progress = seekBar.getProgress();
-                mSettingModel.setFontSize((cur_progress));
-                mSettingViewController.updatePercentage(mFontSize.getProgress());
-                mSettingViewController.setFontSize(b);
-                mSettingModel.setAdjustableStatus(b);
-                if(cur_progress<1){
-                    mFontSize.setProgress(1);
-                }
-            }
-
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-
-            }
-
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-            }
-        });
-    }
-
-    public void onNavigationBackPressed(View view){
-        mSettingModel.onCloseView();
-    }
-
-    /*Event Observer*/
-
-    public class settingViewCallback implements eventObserver.eventListener{
-
-        @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
-        {
-            return null;
-        }
-    }
-
-    public class settingModelCallback implements eventObserver.eventListener{
-
-        @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
-        {
-            if(e_type == enums.etype.update_searcn){
-                status.sSettingSearchStatus = (String)data.get(0);
-                mHomeController.onHomeButton(null);
-                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE, mSettingModel.getSearchStatus()));
-            }
-            else if(e_type == enums.etype.update_javascript){
-                status.sSettingJavaStatus = (boolean)data.get(0);
-                mHomeController.onUpdateJavascript();
-                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_JAVA_SCRIPT, status.sSettingJavaStatus));
-            }
-            else if(e_type == enums.etype.update_history){
-                sSettingHistoryStatus = (boolean)data.get(0);
-                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_HISTORY_CLEAR, sSettingHistoryStatus));
-            }
-            else if(e_type == enums.etype.update_notification){
-                pluginController.getInstance().setNotificationStatus((int)data.get(0));
-                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_NOTIFICATION_STATUS, pluginController.getInstance().getNotificationStatus()));
-
-                int notificationStatus = pluginController.getInstance().getNotificationStatus();
-                if(notificationStatus==0){
-                    pluginController.getInstance().enableTorNotification();
-                } else if(notificationStatus==1){
-                    pluginController.getInstance().disableTorNotification();
-                }else {
-                    pluginController.getInstance().enableTorNotificationNoBandwidth();
-                }
-
-            }
-            else if(e_type == enums.etype.update_font_adjustable || e_type == enums.etype.update_font_size){
-                mHomeController.onLoadFont();
-            }
-            else if(e_type == enums.etype.update_cookies){
-                sSettingCookieStatus = (int)data.get(0);
-                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_COOKIE_ADJUSTABLE, sSettingCookieStatus));
-                mHomeController.onUpdateCookies();
-                pluginController.getInstance().updateCookiesStatus();
-            }
-            else if(e_type == enums.etype.close_view){
-                finish();
-
-            }
-            return null;
-        }
-    }
-
-    /*Helper Methods*/
-
-    public String getEngineURL(int index){
-
-        if (index == 0)
-        {
-            return constants.CONST_BACKEND_GENESIS_URL;
-        }
-        else if (index == 1)
-        {
-            return constants.CONST_BACKEND_GOOGLE_URL;
-        }
-        else
-        {
-            return constants.CONST_BACKEND_DUCK_DUCK_GO_URL;
-        }
-    }
-
+package com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.SeekBar;
+import android.widget.Spinner;
+import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import com.darkweb.genesissearchengine.appManager.activityContextManager;
+import com.darkweb.genesissearchengine.appManager.homeManager.homeController;
+import com.darkweb.genesissearchengine.appManager.settingManager.notificationManager.settingNotificationController;
+import com.darkweb.genesissearchengine.appManager.settingManager.searchEngineManager.settingSearchController;
+import com.darkweb.genesissearchengine.constants.constants;
+import com.darkweb.genesissearchengine.constants.enums;
+import com.darkweb.genesissearchengine.constants.keys;
+import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.constants.strings;
+import com.darkweb.genesissearchengine.dataManager.dataController;
+import com.darkweb.genesissearchengine.dataManager.dataEnums;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.darkweb.genesissearchengine.helperManager.helperMethod;
+import com.darkweb.genesissearchengine.pluginManager.pluginController;
+import com.example.myapplication.R;
+import java.util.Arrays;
+import java.util.List;
+import static com.darkweb.genesissearchengine.constants.enums.etype.on_not_support;
+import static com.darkweb.genesissearchengine.constants.status.sSettingCookieStatus;
+import static com.darkweb.genesissearchengine.constants.status.sSettingHistoryStatus;
+import static com.darkweb.genesissearchengine.constants.status.sSettingJavaStatus;
+
+public class settingController extends AppCompatActivity
+{
+    /*Private Observer Classes*/
+
+    private homeController mHomeController;
+    private settingViewController mSettingViewController;
+    private settingModel mSettingModel;
+
+    /*Private Variables*/
+
+    private Spinner mSearch;
+    private Spinner mJavascript;
+    private Spinner mHistory;
+    private Spinner mCookies;
+    private Spinner mFontAdjustable;
+    private Spinner mNotification;
+    private SeekBar mFontSize;
+    private TextView mFontSizePercentage;
+
+    /*Initializations*/
+
+    public settingController(){
+        mHomeController = activityContextManager.getInstance().getHomeController();
+        mSettingModel = new settingModel(new settingModelCallback());
+        mSettingModel.initNotification(pluginController.getInstance().getNotificationStatus());
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        pluginController.getInstance().onCreate(this);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.setting);
+
+        viewsInitializations();
+        modelInitialization();
+        listenersInitializations();
+        initializeFontSizeListener();
+    }
+
+    public void modelInitialization(){
+        mSettingModel.setJavaStatus(sSettingJavaStatus, true);
+        mSettingModel.setHistoryStatus(sSettingHistoryStatus, true);
+        mSettingModel.setSearchStatus(status.sSettingSearchStatus, true);
+        mSettingModel.setAdjustableStatus(status.sSettingFontAdjustable, true);
+        mSettingModel.setFontSize(status.sSettingFontSize, true);
+    }
+
+    public void viewsInitializations()
+    {
+        mSearch = findViewById(R.id.search_manager);
+        mJavascript = findViewById(R.id.javascript_manager);
+        mHistory = findViewById(R.id.history_manager);
+        mFontSize = findViewById(R.id.font_size);
+        mFontAdjustable = findViewById(R.id.font_adjustable);
+        mFontSizePercentage = findViewById(R.id.font_size_percentage);
+        mCookies = findViewById(R.id.cookies_manager);
+        mNotification = findViewById(R.id.notification_manager);
+
+        mSettingViewController = new settingViewController(mSearch, mJavascript, mHistory, mFontSize, mFontAdjustable, mFontSizePercentage,this, new settingModelCallback(), mCookies,mNotification,pluginController.getInstance().getNotificationStatus());
+    }
+
+    public void listenersInitializations()
+    {
+        initializeItemSelectedListener(mSearch);
+        initializeItemSelectedListener(mJavascript);
+        initializeItemSelectedListener(mNotification);
+        initializeItemSelectedListener(mHistory);
+        initializeItemSelectedListener(mFontAdjustable);
+        initializeItemSelectedListener(mCookies);
+        pluginController.getInstance().logEvent(strings.EVENT_SETTINGS_OPENED);
+    }
+
+    /*Event Handlers*/
+
+    @Override
+    public void onTrimMemory(int level)
+    {
+        if(status.sSettingIsAppPaused && (level==80 || level==15))
+        {
+            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.HOME_LOW_MEMORY,true));
+            finish();
+        }
+    }
+
+    @Override
+    public void onResume()
+    {
+        activityContextManager.getInstance().setCurrentActivity(this);
+        status.sSettingIsAppPaused = false;
+        super.onResume();
+    }
+
+    @Override
+    public void onPause()
+    {
+        super.onPause();
+    }
+
+
+    @Override
+    public void onBackPressed(){
+        finish();
+    }
+
+    public void initializeItemSelectedListener(Spinner view){
+        view.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
+                if(parentView.getId()== R.id.search_manager)
+                {
+                    mSettingModel.setSearchStatus(getEngineURL(position), false);
+                }
+                else if(parentView.getId()== R.id.javascript_manager)
+                {
+                    mSettingModel.setJavaStatus(position==0, false);
+                }
+                else if(parentView.getId()== R.id.history_manager)
+                {
+                    mSettingModel.setHistoryStatus(position==0, false);
+                }
+                else if(parentView.getId()== R.id.font_adjustable)
+                {
+                    if(position==0){
+                        mSettingModel.setFontSize(100, false);
+                    }
+                    mSettingViewController.setFontSizeAdjustable(position==0);
+                    mSettingModel.setAdjustableStatus(position==0, false);
+                }
+                else if(parentView.getId()== R.id.cookies_manager)
+                {
+                    mSettingModel.setCookieStatus(position, false);
+                }
+                else if(parentView.getId()== R.id.notification_manager)
+                {
+                    mSettingModel.setmNotificationStatus(position, false);
+                }
+            }
+            @Override
+            public void onNothingSelected(AdapterView<?> parentView) {
+            }
+        });
+    }
+
+    public void initializeFontSizeListener(){
+
+        mFontSize.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int i, boolean b) {
+                float cur_progress = seekBar.getProgress();
+                mSettingModel.setFontSize((cur_progress), false);
+                mSettingViewController.updatePercentage(mFontSize.getProgress());
+                mSettingViewController.setFontSize(b);
+                mSettingModel.setAdjustableStatus(b, false);
+                if(cur_progress<1){
+                    mFontSize.setProgress(1);
+                }
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+            }
+        });
+    }
+
+    public void onNavigationBackPressed(View view){
+        mSettingModel.onSaveSettings();
+        finish();
+    }
+
+    public void onDefaultBrowser(View view){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            startActivity(new Intent(android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS));
+        }else{
+            pluginController.getInstance().MessageManagerHandler(this, null, on_not_support);
+        }
+    }
+
+    public void onManageNotification(View view){
+        helperMethod.openActivity(settingNotificationController.class, constants.CONST_LIST_HISTORY, this,true);
+    }
+
+    public void onManageSearchEngine(View view){
+        helperMethod.openActivity(settingSearchController.class, constants.CONST_LIST_HISTORY, this,true);
+    }
+
+    /*Event Observer*/
+
+    public class settingViewCallback implements eventObserver.eventListener{
+
+        @Override
+        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        {
+            return null;
+        }
+    }
+
+    public class settingModelCallback implements eventObserver.eventListener{
+
+        @Override
+        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        {
+            if(e_type == enums.etype.update_searcn){
+                status.sSettingSearchStatus = (String)data.get(0);
+                mHomeController.onHomeButton(null);
+                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE, mSettingModel.getSearchStatus()));
+            }
+            else if(e_type == enums.etype.update_javascript){
+                status.sSettingJavaStatus = (boolean)data.get(0);
+                mHomeController.onUpdateJavascript();
+                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_JAVA_SCRIPT, status.sSettingJavaStatus));
+            }
+            else if(e_type == enums.etype.update_history){
+                sSettingHistoryStatus = (boolean)data.get(0);
+                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_HISTORY_CLEAR, sSettingHistoryStatus));
+            }
+            else if(e_type == enums.etype.update_notification){
+                pluginController.getInstance().setNotificationStatus((int)data.get(0));
+                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_NOTIFICATION_STATUS, pluginController.getInstance().getNotificationStatus()));
+
+                int notificationStatus = pluginController.getInstance().getNotificationStatus();
+                if(notificationStatus==0){
+                    pluginController.getInstance().disableTorNotification();
+                } else if(notificationStatus==1){
+                    pluginController.getInstance().enableTorNotification();
+                }else {
+                    pluginController.getInstance().enableTorNotificationNoBandwidth();
+                }
+
+            }
+            else if(e_type == enums.etype.update_font_adjustable || e_type == enums.etype.update_font_size){
+                mHomeController.onLoadFont();
+            }
+            else if(e_type == enums.etype.update_cookies){
+                sSettingCookieStatus = (int)data.get(0);
+                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_COOKIE_ADJUSTABLE, sSettingCookieStatus));
+                mHomeController.onUpdateCookies();
+                pluginController.getInstance().updateCookiesStatus();
+            }
+            else if(e_type == enums.etype.close_view){
+                finish();
+
+            }
+            return null;
+        }
+    }
+
+    /*Helper Methods*/
+
+    public String getEngineURL(int index){
+
+        if (index == 0)
+        {
+            return constants.CONST_BACKEND_GENESIS_URL;
+        }
+        else if (index == 1)
+        {
+            return constants.CONST_BACKEND_GOOGLE_URL;
+        }
+        else
+        {
+            return constants.CONST_BACKEND_DUCK_DUCK_GO_URL;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingModel.java
old mode 100755
new mode 100644
similarity index 79%
rename from app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingModel.java
rename to app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingModel.java
index 0fdb267a..e87fefff
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingModel.java
@@ -1,141 +1,161 @@
-package com.darkweb.genesissearchengine.appManager.settingManager;
-
-import com.darkweb.genesissearchengine.constants.enums;
-import com.darkweb.genesissearchengine.constants.keys;
-import com.darkweb.genesissearchengine.constants.status;
-import com.darkweb.genesissearchengine.constants.strings;
-import com.darkweb.genesissearchengine.dataManager.dataController;
-import com.darkweb.genesissearchengine.dataManager.dataEnums;
-import com.darkweb.genesissearchengine.helperManager.eventObserver;
-
-import java.util.Arrays;
-import java.util.Collections;
-import static org.mozilla.geckoview.ContentBlocking.CookieBehavior.ACCEPT_FIRST_PARTY;
-
-class settingModel
-{
-    /*Variable Declaration*/
-
-    private eventObserver.eventListener mEvent;
-
-    private String mSearchStatus = strings.GENERIC_EMPTY_STR;
-    private int mCookieStatus = ACCEPT_FIRST_PARTY;
-    private int mNotificationStatus = 0;
-    private boolean mJavaStatus = false;
-    private boolean mHistoryStatus = true;
-    private boolean mFontAdjustable = true;
-    private float mFontSize = 1;
-    private int notificationStatusGlobal;
-
-    /*Initializations*/
-
-    settingModel(eventObserver.eventListener mEvent){
-        init_status();
-        this.mEvent = mEvent;
-    }
-
-    /*Helper Methods*/
-
-    private void init_status()
-    {
-        mSearchStatus = status.sSettingSearchStatus;
-        mHistoryStatus = status.sSettingHistoryStatus;
-        mJavaStatus = status.sSettingJavaStatus;
-        mCookieStatus = status.sSettingCookieStatus;
-    }
-
-    void initNotification(int notificationStatus){
-        mNotificationStatus = notificationStatus;
-        notificationStatusGlobal = notificationStatus;
-    }
-
-    /*Changed Status*/
-
-    String getSearchStatus(){
-        return mSearchStatus;
-    }
-
-    void setCookieStatus(int cookie_status){
-        this.mCookieStatus = cookie_status;
-    }
-
-    void setSearchStatus(String search_status){
-        this.mSearchStatus = search_status;
-    }
-
-    void setFontSize(float font_size){
-        this.mFontSize = font_size;
-    }
-
-    void setAdjustableStatus(boolean font_status){
-        this.mFontAdjustable = font_status;
-    }
-
-
-    void setJavaStatus(boolean java_status){
-        this.mJavaStatus = java_status;
-    }
-
-    void setmNotificationStatus(int notification_status){
-        this.mNotificationStatus = notification_status;
-    }
-
-    void setHistoryStatus(boolean history_status){
-        this.mHistoryStatus = history_status;
-    }
-
-    void onCloseView()
-    {
-        if(!status.sSettingSearchStatus.equals(mSearchStatus))
-        {
-            mEvent.invokeObserver(Collections.singletonList(mSearchStatus), enums.etype.update_searcn);
-        }
-        if(status.sSettingJavaStatus != mJavaStatus)
-        {
-            mEvent.invokeObserver(Collections.singletonList(mJavaStatus), enums.etype.update_javascript);
-        }
-        if(notificationStatusGlobal != mNotificationStatus)
-        {
-            mEvent.invokeObserver(Collections.singletonList(mNotificationStatus), enums.etype.update_notification);
-        }
-        if(status.sSettingHistoryStatus != mHistoryStatus)
-        {
-            status.sSettingHistoryStatus = mHistoryStatus;
-            mEvent.invokeObserver(Collections.singletonList(mHistoryStatus), enums.etype.update_history);
-        }
-        if(status.sSettingFontAdjustable != mFontAdjustable)
-        {
-            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_COOKIE_ADJUSTABLE,mFontAdjustable));
-            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_FONT_SIZE,100));
-
-            status.sSettingFontAdjustable = mFontAdjustable;
-            status.sSettingFontSize = 100;
-            mFontSize = 100;
-
-            mEvent.invokeObserver(Collections.singletonList(mFontSize), enums.etype.update_font_adjustable);
-        }
-        if(status.sSettingFontSize != mFontSize)
-        {
-            if(mFontSize <=0){
-                mFontSize = 1;
-            }
-
-            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_FONT_SIZE,mFontSize));
-            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_FONT_ADJUSTABLE,false));
-
-            status.sSettingFontSize = mFontSize;
-            status.sSettingFontAdjustable = false;
-            mFontAdjustable = false;
-
-            mEvent.invokeObserver(Collections.singletonList(mFontSize), enums.etype.update_font_size);
-        }
-        if(status.sSettingCookieStatus != mCookieStatus)
-        {
-            status.sSettingCookieStatus = mCookieStatus;
-            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_COOKIE_ADJUSTABLE,status.sSettingCookieStatus));
-            mEvent.invokeObserver(Collections.singletonList(mCookieStatus), enums.etype.update_cookies);
-        }
-        mEvent.invokeObserver(Collections.singletonList(mHistoryStatus), enums.etype.close_view);
-    }
-
-}
+package com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage;
+
+import com.darkweb.genesissearchengine.constants.enums;
+import com.darkweb.genesissearchengine.constants.keys;
+import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.constants.strings;
+import com.darkweb.genesissearchengine.dataManager.dataController;
+import com.darkweb.genesissearchengine.dataManager.dataEnums;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+
+import java.util.Arrays;
+import java.util.Collections;
+import static org.mozilla.geckoview.ContentBlocking.CookieBehavior.ACCEPT_FIRST_PARTY;
+
+class settingModel
+{
+    /*Variable Declaration*/
+
+    private eventObserver.eventListener mEvent;
+
+    private String mSearchStatus = strings.GENERIC_EMPTY_STR;
+    private int mCookieStatus = ACCEPT_FIRST_PARTY;
+    private int mNotificationStatus = 0;
+    private boolean mJavaStatus = false;
+    private boolean mHistoryStatus = true;
+    private boolean mFontAdjustable = true;
+    private float mFontSize = 1;
+    private int notificationStatusGlobal;
+
+    /*Initializations*/
+
+    settingModel(eventObserver.eventListener mEvent){
+        init_status();
+        this.mEvent = mEvent;
+    }
+
+    /*Helper Methods*/
+
+    private void init_status()
+    {
+        mSearchStatus = status.sSettingSearchStatus;
+        mHistoryStatus = status.sSettingHistoryStatus;
+        mJavaStatus = status.sSettingJavaStatus;
+        mCookieStatus = status.sSettingCookieStatus;
+    }
+
+    void initNotification(int notificationStatus){
+        mNotificationStatus = notificationStatus;
+        notificationStatusGlobal = notificationStatus;
+    }
+
+    /*Changed Status*/
+
+    String getSearchStatus(){
+        return mSearchStatus;
+    }
+
+    void setCookieStatus(int cookie_status, boolean isActivityLoading){
+        this.mCookieStatus = cookie_status;
+        if(!isActivityLoading){
+            onSaveSettings();
+        }
+    }
+
+    void setSearchStatus(String search_status, boolean isActivityLoading){
+        this.mSearchStatus = search_status;
+        if(!isActivityLoading){
+            onSaveSettings();
+        }
+    }
+
+    void setFontSize(float font_size, boolean isActivityLoading){
+        this.mFontSize = font_size;
+        if(!isActivityLoading){
+            onSaveSettings();
+        }
+    }
+
+    void setAdjustableStatus(boolean font_status, boolean isActivityLoading){
+        this.mFontAdjustable = font_status;
+        if(!isActivityLoading){
+            onSaveSettings();
+        }
+    }
+
+
+    void setJavaStatus(boolean java_status, boolean isActivityLoading){
+        this.mJavaStatus = java_status;
+        if(!isActivityLoading){
+            onSaveSettings();
+        }
+    }
+
+    void setmNotificationStatus(int notification_status, boolean isActivityLoading){
+        this.mNotificationStatus = notification_status;
+        if(!isActivityLoading){
+            onSaveSettings();
+        }
+    }
+
+    void setHistoryStatus(boolean history_status, boolean isActivityLoading){
+        this.mHistoryStatus = history_status;
+        if(!isActivityLoading){
+            onSaveSettings();
+        }
+    }
+
+    void onSaveSettings()
+    {
+        if(!status.sSettingSearchStatus.equals(mSearchStatus))
+        {
+            mEvent.invokeObserver(Collections.singletonList(mSearchStatus), enums.etype.update_searcn);
+        }
+        if(status.sSettingJavaStatus != mJavaStatus)
+        {
+            mEvent.invokeObserver(Collections.singletonList(mJavaStatus), enums.etype.update_javascript);
+        }
+        if(notificationStatusGlobal != mNotificationStatus)
+        {
+            mEvent.invokeObserver(Collections.singletonList(mNotificationStatus), enums.etype.update_notification);
+        }
+        if(status.sSettingHistoryStatus != mHistoryStatus)
+        {
+            status.sSettingHistoryStatus = mHistoryStatus;
+            mEvent.invokeObserver(Collections.singletonList(mHistoryStatus), enums.etype.update_history);
+        }
+        if(status.sSettingFontAdjustable != mFontAdjustable)
+        {
+            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_FONT_ADJUSTABLE,mFontAdjustable));
+            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_FONT_SIZE,100));
+
+            status.sSettingFontAdjustable = mFontAdjustable;
+            status.sSettingFontSize = 100;
+            mFontSize = 100;
+
+            mEvent.invokeObserver(Collections.singletonList(mFontSize), enums.etype.update_font_adjustable);
+        }
+        if(status.sSettingFontSize != mFontSize)
+        {
+            if(mFontSize <=0){
+                mFontSize = 1;
+            }
+
+            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_FONT_SIZE,(int)mFontSize));
+            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_FONT_ADJUSTABLE,false));
+
+            status.sSettingFontSize = mFontSize;
+            status.sSettingFontAdjustable = false;
+            mFontAdjustable = false;
+
+            mEvent.invokeObserver(Collections.singletonList(mFontSize), enums.etype.update_font_size);
+        }
+        if(status.sSettingCookieStatus != mCookieStatus)
+        {
+            status.sSettingCookieStatus = mCookieStatus;
+            dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_COOKIE_ADJUSTABLE,status.sSettingCookieStatus));
+            mEvent.invokeObserver(Collections.singletonList(mCookieStatus), enums.etype.update_cookies);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingViewController.java
old mode 100755
new mode 100644
similarity index 96%
rename from app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingViewController.java
rename to app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingViewController.java
index a007c686..989e13ca
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingViewController.java
@@ -1,182 +1,182 @@
-package com.darkweb.genesissearchengine.appManager.settingManager;
-
-import android.annotation.SuppressLint;
-import android.os.Build;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.SeekBar;
-import android.widget.Spinner;
-import android.widget.TextView;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
-import com.darkweb.genesissearchengine.constants.constants;
-import com.darkweb.genesissearchengine.constants.status;
-import com.darkweb.genesissearchengine.constants.strings;
-import com.darkweb.genesissearchengine.helperManager.eventObserver;
-import com.example.myapplication.R;
-import static com.darkweb.genesissearchengine.constants.status.sSettingHistoryStatus;
-import static com.darkweb.genesissearchengine.constants.status.sSettingJavaStatus;
-
-class settingViewController
-{
-    /*Private Variables*/
-
-    private eventObserver.eventListener mEvent;
-    private AppCompatActivity mContext;
-
-    private Spinner mSearch;
-    private Spinner mJavaScript;
-    private Spinner mNotification;
-    private Spinner mHistory;
-    private Spinner mCookies;
-    private Spinner mFontAdjustable;
-    private SeekBar mFontSize;
-    private TextView mFontSizePercentage;
-
-    /*Initializations*/
-
-    settingViewController(Spinner mSearch, Spinner mJavaScript, Spinner mHistory, SeekBar mFontSize, Spinner mFontAdjustable, TextView mFontSizePercentage, settingController mContext, eventObserver.eventListener mEvent, Spinner mCookies, Spinner mNotification, int notificationStatus)
-    {
-        this.mFontSizePercentage = mFontSizePercentage;
-        this.mSearch = mSearch;
-        this.mJavaScript = mJavaScript;
-        this.mNotification = mNotification;
-        this.mHistory = mHistory;
-        this.mFontAdjustable = mFontAdjustable;
-        this.mFontSize = mFontSize;
-        this.mCookies = mCookies;
-
-        this.mEvent = mEvent;
-        this.mContext = mContext;
-
-        initNotification(notificationStatus);
-        initViews();
-        initJavascript();
-        initHistory();
-        initSearchEngine();
-        initFontAdjustable();
-        initCookies();
-        initFontSize();
-        initPostUI();
-    }
-
-    private void initPostUI(){
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = mContext.getWindow();
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-
-            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
-                window.setStatusBarColor(mContext.getResources().getColor(R.color.blue_dark));
-            }
-            else {
-                mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);//  set status text dark
-                mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.white));
-            }
-        }
-    }
-
-    private void initViews()
-    {
-        mSearch.setDropDownVerticalOffset(15);
-        mSearch.setDropDownHorizontalOffset(-15);
-        mJavaScript.setDropDownVerticalOffset(15);
-        mJavaScript.setDropDownHorizontalOffset(-15);
-        mNotification.setDropDownVerticalOffset(15);
-        mNotification.setDropDownHorizontalOffset(-15);
-        mHistory.setDropDownVerticalOffset(15);
-        mHistory.setDropDownHorizontalOffset(-15);
-        mCookies.setDropDownVerticalOffset(15);
-        mCookies.setDropDownHorizontalOffset(-15);
-        mFontAdjustable.setDropDownHorizontalOffset(-15);
-        mFontAdjustable.setDropDownVerticalOffset(15);
-    }
-
-    private void initJavascript()
-    {
-        if (sSettingJavaStatus)
-        {
-            mJavaScript.setSelection(0);
-        }
-        else
-        {
-            mJavaScript.setSelection(1);
-        }
-    }
-
-    private void initNotification(int status)
-    {
-        mNotification.setSelection(status);
-    }
-
-    private void initHistory()
-    {
-        if (sSettingHistoryStatus)
-        {
-            mHistory.setSelection(0);
-        }
-        else
-        {
-            mHistory.setSelection(1);
-        }
-    }
-
-    private void initCookies()
-    {
-        mCookies.setSelection(status.sSettingCookieStatus);
-    }
-
-    private void initFontAdjustable()
-    {
-        if (status.sSettingFontAdjustable)
-        {
-            mFontAdjustable.setSelection(0);
-        }
-        else
-        {
-            mFontAdjustable.setSelection(1);
-        }
-    }
-
-    private void initFontSize()
-    {
-        mFontSize.setProgress((int)status.sSettingFontSize);
-        updatePercentage(mFontSize.getProgress());
-    }
-
-    void setFontSize(boolean status){
-        if(status){
-            mFontAdjustable.setSelection(1);
-        }
-    }
-
-    void setFontSizeAdjustable(boolean status){
-        if(status){
-            mFontSize.setProgress(100);
-        }
-    }
-
-    private void initSearchEngine()
-    {
-        mSearch.setSelection(getEngineIndex());
-    }
-
-    /*External Helper Methods*/
-
-    private int getEngineIndex(){
-        if(status.sSettingSearchStatus.equals(constants.CONST_BACKEND_GENESIS_URL)){
-            return 0;
-        }
-        else if(status.sSettingSearchStatus.equals(constants.CONST_BACKEND_GOOGLE_URL)){
-            return 1;
-        }
-        else
-            return 2;
-    }
-
-    @SuppressLint("SetTextI18n")
-    void updatePercentage(int font_size){
-
-        mFontSizePercentage.setText(strings.SETTING_CUSTOM_FONTS + strings.GENERIC_EMPTY_SPACE + font_size +strings.SETTING_PERCENT_SIGN);
-    }
-}
+package com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage;
+
+import android.annotation.SuppressLint;
+import android.os.Build;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.SeekBar;
+import android.widget.Spinner;
+import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import com.darkweb.genesissearchengine.constants.constants;
+import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.constants.strings;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.example.myapplication.R;
+import static com.darkweb.genesissearchengine.constants.status.sSettingHistoryStatus;
+import static com.darkweb.genesissearchengine.constants.status.sSettingJavaStatus;
+
+class settingViewController
+{
+    /*Private Variables*/
+
+    private eventObserver.eventListener mEvent;
+    private AppCompatActivity mContext;
+
+    private Spinner mSearch;
+    private Spinner mJavaScript;
+    private Spinner mNotification;
+    private Spinner mHistory;
+    private Spinner mCookies;
+    private Spinner mFontAdjustable;
+    private SeekBar mFontSize;
+    private TextView mFontSizePercentage;
+
+    /*Initializations*/
+
+    settingViewController(Spinner mSearch, Spinner mJavaScript, Spinner mHistory, SeekBar mFontSize, Spinner mFontAdjustable, TextView mFontSizePercentage, settingController mContext, eventObserver.eventListener mEvent, Spinner mCookies, Spinner mNotification, int notificationStatus)
+    {
+        this.mFontSizePercentage = mFontSizePercentage;
+        this.mSearch = mSearch;
+        this.mJavaScript = mJavaScript;
+        this.mNotification = mNotification;
+        this.mHistory = mHistory;
+        this.mFontAdjustable = mFontAdjustable;
+        this.mFontSize = mFontSize;
+        this.mCookies = mCookies;
+
+        this.mEvent = mEvent;
+        this.mContext = mContext;
+
+        initNotification(notificationStatus);
+        initViews();
+        initJavascript();
+        initHistory();
+        initSearchEngine();
+        initFontAdjustable();
+        initCookies();
+        initFontSize();
+        initPostUI();
+    }
+
+    private void initPostUI(){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = mContext.getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+                window.setStatusBarColor(mContext.getResources().getColor(R.color.blue_dark));
+            }
+            else {
+                mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);//  set status text dark
+                mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.white));
+            }
+        }
+    }
+
+    private void initViews()
+    {
+        mSearch.setDropDownVerticalOffset(15);
+        mSearch.setDropDownHorizontalOffset(-15);
+        mJavaScript.setDropDownVerticalOffset(15);
+        mJavaScript.setDropDownHorizontalOffset(-15);
+        mNotification.setDropDownVerticalOffset(15);
+        mNotification.setDropDownHorizontalOffset(-15);
+        mHistory.setDropDownVerticalOffset(15);
+        mHistory.setDropDownHorizontalOffset(-15);
+        mCookies.setDropDownVerticalOffset(15);
+        mCookies.setDropDownHorizontalOffset(-15);
+        mFontAdjustable.setDropDownHorizontalOffset(-15);
+        mFontAdjustable.setDropDownVerticalOffset(15);
+    }
+
+    private void initJavascript()
+    {
+        if (sSettingJavaStatus)
+        {
+            mJavaScript.setSelection(0);
+        }
+        else
+        {
+            mJavaScript.setSelection(1);
+        }
+    }
+
+    private void initNotification(int status)
+    {
+        mNotification.setSelection(status);
+    }
+
+    private void initHistory()
+    {
+        if (sSettingHistoryStatus)
+        {
+            mHistory.setSelection(0);
+        }
+        else
+        {
+            mHistory.setSelection(1);
+        }
+    }
+
+    private void initCookies()
+    {
+        mCookies.setSelection(status.sSettingCookieStatus);
+    }
+
+    private void initFontAdjustable()
+    {
+        if (status.sSettingFontAdjustable)
+        {
+            mFontAdjustable.setSelection(0);
+        }
+        else
+        {
+            mFontAdjustable.setSelection(1);
+        }
+    }
+
+    private void initFontSize()
+    {
+        mFontSize.setProgress((int)status.sSettingFontSize);
+        updatePercentage(mFontSize.getProgress());
+    }
+
+    void setFontSize(boolean status){
+        if(status){
+            mFontAdjustable.setSelection(1);
+        }
+    }
+
+    void setFontSizeAdjustable(boolean status){
+        if(status){
+            mFontSize.setProgress(100);
+        }
+    }
+
+    private void initSearchEngine()
+    {
+        mSearch.setSelection(getEngineIndex());
+    }
+
+    /*External Helper Methods*/
+
+    private int getEngineIndex(){
+        if(status.sSettingSearchStatus.equals(constants.CONST_BACKEND_GENESIS_URL)){
+            return 0;
+        }
+        else if(status.sSettingSearchStatus.equals(constants.CONST_BACKEND_GOOGLE_URL)){
+            return 1;
+        }
+        else
+            return 2;
+    }
+
+    @SuppressLint("SetTextI18n")
+    void updatePercentage(int font_size){
+
+        mFontSizePercentage.setText(strings.SETTING_CUSTOM_FONTS + strings.GENERIC_EMPTY_SPACE + font_size +strings.SETTING_PERCENT_SIGN);
+    }
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
index 4b3b5e9c..4be69a32 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
@@ -71,7 +71,6 @@ public class tabController extends AppCompatActivity
         mListView = findViewById(R.id.pRecycleView);
         mClearButton = findViewById(R.id.pClearButton);
         mtabViewController = new tabViewController(mEmptyListNotifier, mListView, mClearButton,this);
-        mClearButton.setText(R.string.tab_view_clear_tab);
     }
     public void initializeList(){
         tabAdapter adapter = new tabAdapter(mListModel.getList(),new adapterCallback());
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java
index c496081e..29ab0e12 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java
@@ -8,6 +8,8 @@ public class constants
     public static final String CONST_LEAKED_DOCUMENT_URL = "https://boogle.store/search?q=leaked+document&p_num=1&s_type=all&p_num=1&s_type=all";
     public static final String CONST_NEWS_URL = "https://boogle.store/search?q=latest%20news&p_num=1&s_type=news";
     public static final String CONST_SOFTWARE_URL = "https://boogle.store/search?q=softwares+tools&p_num=1&s_type=all&p_num=1&s_type=all";
+    public static final String CONST_SOFTWARE_FINANCE = "https://boogle.store/search?q=finance&p_num=1&s_type=all&p_num=1&s_type=all";
+    public static final String CONST_COMMUNITIES = "https://boogle.store/search?q=news&p_num=1&s_type=all&p_num=1&s_type=all";
 
     /*URL CONSTANTS*/
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
index 8a5cb021..b9661af2 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
@@ -42,5 +42,6 @@ public class keys
     public static final String BRIDGE_CUSTOM_BRIDGE_1 = "CLEAR_PREFS";
     public static final String BRIDGE_BRIDGE_ENABLES = "S_BRIDGE_ENABLES";
     public static final String BRIDGE_VPN_ENABLED = "S_VPN_ENABLED";
+    public static final String BRIDGE_NOTIFICATION = "BRIDGE_NOTIFICATION";
 
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java
index 8dd9eeb1..04bd2ffd 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java
@@ -2,6 +2,7 @@ package com.darkweb.genesissearchengine.constants;
 
 import com.darkweb.genesissearchengine.dataManager.dataController;
 import com.darkweb.genesissearchengine.dataManager.dataEnums;
+import com.darkweb.genesissearchengine.pluginManager.pluginController;
 
 import java.util.Arrays;
 
@@ -26,13 +27,13 @@ public class status
     public static boolean sSettingIsAppRated = false;
     public static boolean sSettingFontAdjustable = true;
     public static boolean sSettingFirstStart = true;
-    public static boolean sSettingDesktopSite = false;
     public static int sSettingCookieStatus = ACCEPT_FIRST_PARTY;
     public static float sSettingFontSize = 1;
     public static String sSettingLanguage = "en";
 
     /*Bridge Status*/
 
+    public static int sBridgeNotificationManual = 0;
     public static boolean sBridgeGatewayAuto = false;
     public static boolean sBridgeGatewayManual = false;
     public static boolean sBridgeVPNStatus = false;
@@ -59,6 +60,7 @@ public class status
         status.sSettingLanguage = (String)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_STRING, Arrays.asList(keys.SETTING_LANGUAGE,strings.SETTING_DEFAULT_LANGUAGE));
         status.sSettingSearchStatus = (String)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE,constants.CONST_BACKEND_GENESIS_URL));
         status.sBridgeCustomBridge = (String)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_STRING, Arrays.asList(keys.BRIDGE_CUSTOM_BRIDGE_1,strings.BRIDGE_CUSTOM_BRIDGE_OBFS4));
+        status.sBridgeNotificationManual = (int)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_INT, Arrays.asList(keys.SETTING_NOTIFICATION_STATUS,0));
     }
 
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/LocaleManager.java b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/LocaleManager.java
index 32af2516..0db6a496 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/LocaleManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/LocaleManager.java
@@ -37,7 +37,7 @@ public class LocaleManager {
     }
 
     private static Locale getSelectedLocale(Context context) {
-        String defaultLanguage = context.getString(R.string.DEFAULT_LANGUAGE);
+        String defaultLanguage = context.getString(R.string.SETTING_DEFAULT_LANGUAGE);
         String selectedLanguage = PreferenceManager.getDefaultSharedPreferences(context).getString(
                 context.getResources().getString(R.string.PREF_LANGUAGE),
                 defaultLanguage
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/errorHandler.java b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/errorHandler.java
index 62a67362..ddba71d1 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/errorHandler.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/errorHandler.java
@@ -72,12 +72,12 @@ public class errorHandler
     }
 
     private String translateMessage(String message,String error){
-        message = message.replace("$ERROR_M1",mContext.getString(R.string.error_m1));
-        message = message.replace("$ERROR_M2",mContext.getString(R.string.error_m2));
-        message = message.replace("$ERROR_M3",mContext.getString(R.string.error_m3));
-        message = message.replace("$ERROR_M4",mContext.getString(R.string.error_m4));
-        message = message.replace("$ERROR_M5",mContext.getString(R.string.error_m5));
-        message = message.replace("$ERROR_M6",mContext.getString(R.string.error_m6));
+        message = message.replace("$ERROR_M1",mContext.getString(R.string.ERROR_M1));
+        message = message.replace("$ERROR_M2",mContext.getString(R.string.ERROR_M2));
+        message = message.replace("$ERROR_M3",mContext.getString(R.string.ERROR_M3));
+        message = message.replace("$ERROR_M4",mContext.getString(R.string.ERROR_M4));
+        message = message.replace("$ERROR_M5",mContext.getString(R.string.ERROR_M5));
+        message = message.replace("$ERROR_M6",mContext.getString(R.string.ERROR_M6));
         message = message.replace("$ERROR", error);
 
         return message;
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messageManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messageManager.java
index 8e01bedd..65031fe2 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messageManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messageManager.java
@@ -3,7 +3,6 @@ package com.darkweb.genesissearchengine.pluginManager;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
@@ -11,7 +10,6 @@ import android.os.Handler;
 import android.view.Gravity;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
-import android.widget.PopupMenu;
 import android.widget.RatingBar;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
@@ -67,11 +65,15 @@ class messageManager
             event.invokeObserver(Collections.singletonList(constants.CONST_SOFTWARE_URL), enums.etype.welcome);
             dialog.dismiss();
         });
-        dialog.findViewById(R.id.pOption6).setOnClickListener(v -> {
-            event.invokeObserver(Collections.singletonList(constants.CONST_SOFTWARE_URL), enums.etype.welcome);
+        dialog.findViewById(R.id.pOption5).setOnClickListener(v -> {
+            event.invokeObserver(Collections.singletonList(constants.CONST_SOFTWARE_FINANCE), enums.etype.welcome);
             dialog.dismiss();
         });
-        dialog.findViewById(R.id.pOption5).setOnClickListener(v -> {
+        dialog.findViewById(R.id.pOption6).setOnClickListener(v -> {
+            event.invokeObserver(Collections.singletonList(constants.CONST_COMMUNITIES), enums.etype.welcome);
+            dialog.dismiss();
+        });
+        dialog.findViewById(R.id.pDontShowAgain).setOnClickListener(v -> {
             event.invokeObserver(null, enums.etype.cancel_welcome);
             dialog.dismiss();
         });
@@ -115,7 +117,7 @@ class messageManager
                     helperMethod.sendRateEmail(app_context);
                 }
                 catch (Exception ex){
-                    createMessage(app_context,Collections.singletonList(app_context.getString(R.string.NOT_SUPPORTED_MESSAGE)),enums.etype.on_not_support);
+                    createMessage(app_context,Collections.singletonList(app_context.getString(R.string.ALERT_NOT_SUPPORTED_MESSAGE)),enums.etype.on_not_support);
                 }
             };
             handler.postDelayed(runnable, 1000);
@@ -237,7 +239,7 @@ class messageManager
     private void downloadFile()
     {
         initializeDialog(R.layout.popup_download_file, Gravity.BOTTOM);
-        ((TextView)dialog.findViewById(R.id.pDescription)).setText((app_context.getString(R.string.DOWNLOAD_MESSAGE) + data.get(0)));
+        ((TextView)dialog.findViewById(R.id.pDescription)).setText((app_context.getString(R.string.ALERT_DOWNLOAD_MESSAGE) + data.get(0)));
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
     }
 
@@ -306,7 +308,7 @@ class messageManager
         String file = data.get(1);
         String title = data.get(2);
 
-        String data_local = app_context.getString(R.string.LONG_URL_MESSAGE);
+        String data_local = app_context.getString(R.string.ALERT_LONG_URL_MESSAGE);
 
         int size = url.length();
         if(size>35){
@@ -378,7 +380,7 @@ class messageManager
                     helperMethod.sendBridgeEmail(app_context);
                 }
                 catch (Exception ex){
-                    createMessage(app_context,Collections.singletonList(app_context.getString(R.string.NOT_SUPPORTED_MESSAGE)),enums.etype.on_not_support);
+                    createMessage(app_context,Collections.singletonList(app_context.getString(R.string.ALERT_NOT_SUPPORTED_MESSAGE)),enums.etype.on_not_support);
                 }
             };
             handler.postDelayed(runnable, 1000);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
index 0466561d..823dc6a9 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
@@ -26,13 +26,11 @@ public class pluginController
 
     private adManager mAdManager;
     private analyticManager mAnalyticManager;
-    private fabricManager mFabricManager;
     private firebaseManager mFirebaseManager;
     private messageManager mMessageManager;
     private activityContextManager mContextManager;
     private boolean mIsInitialized = false;
     private langManager mLangManager;
-    private boolean mIsServiceInitialized = false;
 
     /*Private Variables*/
 
@@ -51,16 +49,9 @@ public class pluginController
         mIsInitialized = true;
     }
 
-    public void initializeWithAbiError(){
-        mMessageManager = new messageManager(new messageCallback());
-        mIsInitialized = true;
-    }
-
     public void preInitialize(homeController context){
         mLangManager = new langManager(context,new langCallback());
         mLangManager.setDefaultLanguage(new Locale(status.sSettingLanguage));
-
-        mFabricManager = new fabricManager(context,new fabricCallback());
     }
 
     private void instanceObjectInitialization()
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_adjust_24.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_adjust_24.xml
new file mode 100644
index 00000000..85c2377b
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_adjust_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10 10,-4.49 10,-10S17.51,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM15,12c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3z"/>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/adjust.png b/app/src/main/res/drawable-hdpi/adjust.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3f9eea2c9d1bc0ed8f639f4eb9017023a2be376
GIT binary patch
literal 3941
zcmb7{3piA3+sD_Mg&}5yY=@9kB%27Kt)vnYB8R9U<P_7GL5$O|MhBsdB-A)1i5zl>
z5t>#xy$VHg)=Uap8OKac@lD>nzwdg#@4deFeb=?t_1x=z?&rDIb+707J^wq_`lKml
zlk6q{05CYSV>SQ)@=OpA6yP;Z0R>*XhA;34&Q6ebMF@Ia=e-M&&CUb@0Q&sT2h<O{
zGsttwTrzRIWJ~h8L~#r71Sk}WhL0a1(A|yfsX+?xrcW8l0swXdcg)x>B!e^TT<q+b
z*)ltQ=pa=_^-5umq^bVCy?tT2{FjvP=!jW%%c|wH?$+wiKR1(aD^YMV_vU+<8%H~}
zPVGquG;WkJd4auQH<o)|)j_-<_U>7aX4MZ{ZcZp(McwAMH62iy^7}s3AAXQ<@Xf&2
zrO0H-mlL7f`KXSlY}PqKW>xQ$*p!Itr<c_Vi#ynohz}ActKjl#Sc`4IPD7%=6&jj`
zhIeci9V*iIlPQx~B(OQiT$0jG`v8#|(ZxM8+mP9O6(@mJ%#5_=^w?O>U5+<`rpYL4
zwkjY^NC|TFmW86~qZnEdY}&ju=II_`CEAA?0#}U}YImBDv7_gf_qpyJ{qVxfoC6l~
ztx1MhsXxHQP2dqUEM-b<C`7S65ejVXt8v1{@H;fkmw;VqIi(_!3Q<P(KG)%B+#8Ze
zm**zl?*NBTPMvlp$+^oC>`{b*UUzc@R(FwY-$~-)zF<<MHgl%eN7x2%8ia-`l_Ynm
zW;G!Eh;6)!^boYDG$W;@mb|5X8hmaQ8n8`2RFo~M>hdEd>(``ip%z+Dio<-?HwXB6
zgG*%L*HjQMweIaN>Z(h=@bP(aEyuuBeP(h*0STW;b9vR|gLuvi9)&4+MJ6^VdX6FA
zAE4Dp_F7(sp-?dge9Rx2RU?g?&D1*@>IUbnI%z@~^x920Tn5i!YlT}fa8I41uD^3t
z=rav{eg7d%n-&ja?4CdM!Pitz=x_*ljCIo5wQJ_Y-(;wzBPcctZ+)K-NPJgajT(>#
zRN$}2SCi1rtmrUjI)R>FCHZy=SZvXXdK+KO$nokO8_4%0@;}i7)?()J^KLnUs}x~h
z3bB+Z+jH9D+ji7V4tonlTmGZ;%o|L%jb3l?zTQ+bI>a{Gkr>}v^<GaSzoVq29VC~H
z)cDjCFS$1Pm#UXsmTajCCK9o*_diA{7P<+*DO%9sSLvXlXB&{T&kHb<(FXEv$N)CY
zB7my<KXhN8HXE6Jlz)q=4U8D@U4+I^+s5A`rnHu$!d;FBSd8dz3}xBst7gvO>s%eO
zuIAR7eB(+)7kP{?JHE1?xqqPqfO1+n=h(V5!kJe^aNXIm(<}S$?Em)DAIsqrHX6EK
z4YWXCt4X07u~Qs=_A}aoLy!Ua(hXS-ol1W=O5x8s-U3@9^08wqp^E~Mw=S&t+$OR_
z;4ms*jgdd5j;1Ejt4XZj&_V0$H=qm7xiNYWe)CY{{0R@<Cq8L8=d7Q)DpY1zHdfn?
zGJ47EXLQoX0bfngh;*(z<vE{|`QlzrhkiXnzJdl0lGSZ;V@7diq1)t13bg?c)D?|T
z4iYn8)S2QJsUQi9z?yY5Q(LL>E7@Hi9BS<*2cv5r2X?fl`G#dElz}yZ`nTo|e2bw`
zyXW_mK_Rx7#CMY15-a1?%E!+7^oW#JBelr%*D$nWOdoJM+aRY#8#irpV?CNU!rG(>
zJo39ImGBLIlVH%>P74GLHOHK|obK9gy>$_3R}y<M5$yea=~*v?hsK3V7;2OFZBR~a
z463=~)CZ6A;(DlYblcKpxZL?XYgrn2e^5-5dsf*9>ulUtHL`snIF|a=9kBae1ecTI
z4Y4o3aKu-7T7ZJ7LbyCovgPXJ30Yv*hNm>mwL=1Qx9uK0&Mip<t%uKm?xM#P(BxpG
zPotbf6@kATkqvbD?C%QvTCwrkBXDCFtk?gTE+trZW#KmHUf0N6&;lOS>AOyTLLMs1
z&EwcoU?5Y=^<r8d1LXJDcriJ!>j6u&SnQR#Ny{BVI3|!IAE>cX{iJkbb$sC(mhCA!
z2~$on7Xtg_R#c~d+4@Qk>Sws&KMvB0@Ft;Z6PdKcz&9_e!J5sEkX(KQenJ%57T)Rg
zCA5n|qi(g{tP)zsJ+aR!)IHXx487vTilodB!?X_~^@n&r)KT=Jh4Zo3eGGnq!!?Ny
zHC%<Vks=_boFokdg&1+34fh;pQw!rSsIFWCtz#6(!kiU2RuV~@eIK>urz>p%u`G<2
zE|YgmtG%9DNm_J(4={>QUrS%dl##f^iT3BH?nz+;FWx(In%&c=YeB!b;staQ49I)Q
zCb>&2%#h_u0%1^NkSPN!;DsW7pPiP&r<EX?Ax$p!{oE48;c|!Ggk5NcGxGH3?lC|Z
z_&;|~dmw-r<XcUj^Q#D&{-FMFHRLOVjOrQ%PgQ)u8!tC<zNq2WgRjqdKT{?Xy#f4g
z7CkG>l1q#rPU1W9jzbt)JmJXSu5P|()u=3gFJhnFf(SXxvP$O#6VuzwB+hSEWWH4~
z9?UxS^bZf#|AE54V8(ykO~k-EVq1!2SN3}j`~t+lM8t{xsa|$*_b6KHQ7D%fCz-dN
z()Ey5MC-rXyI<G|TCL?LOtOyTl@2rQZ`E?$@Zbc*<}t=T>XCbxB-vpkD3}xL!BYOS
z55;ag4~h}N1awd4ibU&QV|-9-9&13Ow#{jfX-h$;N;3893D$9<N!%@X12;lr0)2n+
z#*=kmw+Rrz<IRiuAHk4=a;e)u9|IdF4`f43@z9P_e$b)p+Uu%rtOLc09kb0=@Th;P
zPW2hKX~?fWtlD0NfAxiNV2mdEj`@j^1`~uxeh&SNgm_7S0fj5I>lUJEj~{B}KA6O}
zGzr3?Y;CbIp;?~@T^SG7zRf#;U?}l;x=N#!&$OEJ9<DkR<kE1k?f)f?x&(iFrl;Yi
z;^KSF|C=^92m3u%_GeP*m(+6l0l{bFJaj~G+fzSmhA^9^HU4Fpmn2JXmh!Odx;Fa*
zGP?~b-8vus7+o#UA$6AI(8sXQkq1QiZ)D!DZ*AP^$JZg6K9Anm@t(O8K!}p-WR*pv
zTy1n2q3P&P#-zsPLu?1oo%Kto+?Dr(ySVBSmT1HlbRXZ7Al!fZTdZ9L>CS}%Kp4ho
zO;ZKcoL|8BeG;#H7YkRSniXysV%d`$NZZ$W3Amy&#{AnSM5Rk<V_H`t(kG9^OC*HS
z%FG>IWHhVI|2{GvYCeRG@O`P3%@--AIldKY=F#u9nQ>s6Y~=H6%YF)hr5xS1DoWea
z+DKd>mEOU$td)Fw5ik@j-n9AxtdE~7$!-|yvkGPOSu+b8nU>+ae8lCmu=R0sr@MZG
zwvA_9B|_xwWdiyZOVwT51P*a?+q>uUrco=YH>165y(mv^U+F(u{~04z#5)Rk$@Yj3
zuzjlsJx<iLy1sxk^NyDr)YpfL>CusfU555l)MMqX&CDRDV&Eryi0}S_Pmg~&DhEAu
zWaW_SdHxyC2uYbHUQ}D60A6%xi$Bx<BD&{+M(!wY;Yc<foDZ>2u~+9D&HHUdR>{7d
zt8Ve=u2t2prI4Au012l_dd@&G{#?2z#DLedaGIKU8)n9j?KePi8Vu%^T(;o@Qqo9~
z{{y2@M|+-oQ<p-_B&vfL^7}ZzI$7UQDsMi(Xw567_N9K7Lvk#UMAd0!{P(HhfLDo(
zLx9t{dH3-SX3#O?<(+4Tu<G5F%4Ey`29ZI1av$Tt1K!}%-*#`M9A%Gu3BEGdYW-dt
znb3XTbtOsI@ksV{%L>x{s&dlc09jDe;*VQ7?N+%Ol_cBz5>QbU_3sLpe;Y<s2Eb_t
zIjI1bWk;vM=>Ve869ZsODKXwhW3DFsFQb_k^+6%j$)dD`>8}+OK;)k=x__}RIBD)v
zfl7HCH?lN?r~8P5XJ;pn`x)rfA6MM{@|F^dOD_|CyF)N9P^5}y`qo9Z1zjW>mz1_w
zS-u<CbRi08gDBABt+PkZp@-f@%l;IJ)m2s8PcKaS(S|6w{MBEV<6$Gqv!|#|gO~1(
zRT1gcK$2ZHk$6aG_kSkm{#7=1;*$T#T}TZ(3=SpLU~#j=`D=>*L?-@yUOIR(PveM<
zxQZ8izpyANrLj^Q(cUn$wUJL7#tRvCXScoCiIGl)(XG*uLK&Gqg*Q)yXM$t2gFb|t
zTl#+>t0O@`oy}<_)mmrksWm7=zz{4xc{(A_F$?OcnDIuM_D1Y*KA5butj9jH$WZ{0
zrIaYKbjwpW^L8gdU*Q(^=kKUhxf*p7UgfbQ^-JW^$Ik}=ST`jc^lmCPv)QsPT#pU$
zofW=3Enq0(BvGk^>vY1g_8K7-+gVSt=W=uO8Vh(~E_`b~Gx3*WfcR99f=bgp!<#=C
zOhfI(tThw>K#0tYJUjVXTyl5)G)R}3tzNes7W-p&S!{sS;jV8>$}`xL{%;c9#(`yd
z^b~3>F~G{Ta5^pJgE?XZM7>TLUW<HqfKU3;cCs4TpI3P4PHt!Wy0Y|HhOL&y+rTxE
zMMbKVxS8+OY%q#{)xdpiuE8T5_>l@uJEfB)%5q0OnLU~^Vb>v?6qU(Dt7X6*%3=Bb
ztQxV4?!2mTLR!Q|J^?h{O&Xb%9<4eMPD7swv9+>a7o9z3(nzqtcJWGL0B3UYSm_bh
G=>GyDH9T<u

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml b/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
index f09307e1..e39670a0 100644
--- a/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
+++ b/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
@@ -8,7 +8,7 @@
     android:clickable="true"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    tools:context="com.darkweb.genesissearchengine.appManager.historyManager.historyController">
+    tools:context="com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkController">
 
     <LinearLayout
         android:id="@+id/pHeaderContainer"
@@ -44,7 +44,7 @@
                 android:layout_marginStart="0dp"
                 android:layout_marginTop="1dp"
                 android:background="@xml/gx_ripple_default_round"
-                android:contentDescription="@string/todo"
+                android:contentDescription="@string/GENERAL_TODO"
                 android:onClick="onBackPressed"
                 android:src="@xml/ic_arrow_back"
                 android:tint="@color/black" />
@@ -56,7 +56,7 @@
                 android:layout_marginTop="-3dp"
                 android:layout_weight="40"
                 android:gravity="center_vertical|start"
-                android:text="@string/BP_TITLE"
+                android:text="@string/BOOKMARK_TITLE"
                 android:textColor="@color/text_color_v1"
                 android:textSize="17sp"
                 android:textStyle="bold" />
@@ -69,7 +69,7 @@
                 android:layout_marginTop="1dp"
                 android:layout_weight="2.5"
                 android:background="@xml/ax_ripple_default_round_right"
-                android:contentDescription="@string/todo"
+                android:contentDescription="@string/GENERAL_TODO"
                 android:onClick="onHideSearch"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp"
@@ -85,7 +85,7 @@
                 android:layout_marginTop="1dp"
                 android:layout_weight="2.5"
                 android:background="@xml/ax_ripple_default_round_right"
-                android:contentDescription="@string/todo"
+                android:contentDescription="@string/GENERAL_TODO"
                 android:onClick="onLongPressMenu"
                 android:paddingTop="14dp"
                 android:paddingBottom="14dp"
@@ -124,7 +124,7 @@
             android:background="@xml/gx_ripple_blue"
             android:paddingStart="16dp"
             android:stateListAnimator="@null"
-            android:text="@string/BP_CLEAR"
+            android:text="@string/BOOKMARK_CLEAR"
             android:textAlignment="textStart"
             android:textColor="@color/blue"
 
@@ -146,7 +146,7 @@
             android:layout_marginBottom="0dp"
             android:background="@xml/gx_generic_input"
             android:ems="10"
-            android:hint="@string/BP_SEARCH_HINT"
+            android:hint="@string/BOOKMARK_SEARCH_HINT"
             android:importantForAutofill="no"
             android:inputType="textNoSuggestions"
             android:maxLines="1"
@@ -177,7 +177,7 @@
         android:layout_width="120dp"
         android:layout_height="120dp"
         android:alpha="0"
-        android:contentDescription="@string/todo"
+        android:contentDescription="@string/GENERAL_TODO"
         android:src="@drawable/empty_history"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml b/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
index dff3847d..8e409cec 100644
--- a/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
+++ b/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
@@ -31,7 +31,7 @@
                     android:tint="@color/black"
                     android:src="@xml/ic_arrow_back"
                     android:background="@xml/gx_ripple_default_round"
-                    android:contentDescription="@string/todo"/>
+                    android:contentDescription="@string/GENERAL_TODO"/>
                 <TextView
                     android:textColor="@color/text_color_v1"
                     android:onClick="onClose"
@@ -43,7 +43,7 @@
                     android:gravity="center_vertical|start"
                     android:textStyle="bold"
                     android:layout_marginStart="10dp"
-                    android:text="@string/bridge_header"
+                    android:text="@string/BRIDGE_HEADER"
                     />
             </LinearLayout>
 
@@ -69,7 +69,7 @@
                         android:layout_weight="40"
                         android:layout_marginTop="10dp"
                         android:layout_marginStart="20dp"
-                        android:text="@string/bridge_basic_settings"
+                        android:text="@string/BRIDGE_SETTING"
                         />
             </LinearLayout>
 
@@ -88,7 +88,7 @@
                         android:layout_weight="40"
                         android:background="@color/clear_alpha"
                         android:layout_marginStart="20dp"
-                        android:text="@string/bridge_desc"
+                        android:text="@string/BRIDGE_DESC"
                         />
             </LinearLayout>
 
@@ -107,7 +107,7 @@
                         android:layout_weight="40"
                         android:layout_marginStart="20dp"
                         android:textStyle="bold"
-                        android:text="@string/bridge_Automatid_title"
+                        android:text="@string/BRIDGE_AUTO"
                         />
             </LinearLayout>
             <LinearLayout
@@ -157,7 +157,7 @@
                             android:paddingBottom="15dp"
                             android:onClick="onObfsChecked"
                             android:layout_height="wrap_content"
-                            android:text="@string/bridge_type_obfs4" />
+                            android:text="@string/BRIDGE_OBFS4" />
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
@@ -172,7 +172,7 @@
                         android:paddingBottom="15dp"
                         android:layout_height="wrap_content"
                         android:buttonTint="@color/colorProgressGradientEnd"
-                        android:text="@string/bridge_type_meek" />
+                        android:text="@string/BRIDGE_MEEK" />
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
@@ -187,7 +187,7 @@
                         android:paddingBottom="15dp"
                         android:layout_height="wrap_content"
                         android:buttonTint="@color/colorProgressGradientEnd"
-                        android:text="@string/bridge_Manual_desc" />
+                        android:text="@string/BRIDGE_MANUAL" />
                 </RadioGroup>
 
                 <LinearLayout
@@ -218,7 +218,7 @@
                         android:layout_marginStart="15dp"
                         android:ems="10"
                         android:maxLines="1"
-                        android:hint="@string/bridge_port_hint"
+                        android:hint="@string/BRIDGE_PORT_HINT"
                         android:textSize="14.5sp"
                         android:text=""
                         android:autofillHints=""
@@ -234,7 +234,7 @@
                         android:layout_height="35dp"
                         android:background="@xml/hox_rounded_corner_suggestion_settings"
                         android:layout_marginStart="5dp"
-                        android:text="@string/bridge_request" />
+                        android:text="@string/BRIDGE_REQUEST" />
                 </LinearLayout>
                 <ImageView
                     android:layout_width="match_parent"
@@ -242,7 +242,7 @@
                     android:onClick="onCustomChecked"
                     android:layout_height="63dp"
                     android:layout_marginTop="-63dp"
-                    android:contentDescription="@string/todo">
+                    android:contentDescription="@string/GENERAL_TODO">
 
                 </ImageView>
 
diff --git a/app/src/main/res/layouts/history/layout/history_view.xml b/app/src/main/res/layouts/history/layout/history_view.xml
index 54a146fc..5525f64c 100644
--- a/app/src/main/res/layouts/history/layout/history_view.xml
+++ b/app/src/main/res/layouts/history/layout/history_view.xml
@@ -44,7 +44,7 @@
                 android:layout_marginStart="0dp"
                 android:layout_marginTop="1dp"
                 android:background="@xml/gx_ripple_default_round"
-                android:contentDescription="@string/todo"
+                android:contentDescription="@string/GENERAL_TODO"
                 android:onClick="onBackPressed"
                 android:src="@xml/ic_arrow_back"
                 android:tint="@color/black" />
@@ -56,7 +56,7 @@
                 android:layout_marginTop="-3dp"
                 android:layout_weight="40"
                 android:gravity="center_vertical|start"
-                android:text="@string/HP_TITLE"
+                android:text="@string/HOME_TITLE"
                 android:textColor="@color/text_color_v1"
                 android:textSize="17sp"
                 android:textStyle="bold" />
@@ -69,7 +69,7 @@
                 android:layout_marginTop="1dp"
                 android:layout_weight="2.5"
                 android:background="@xml/gx_ripple_default_round"
-                android:contentDescription="@string/todo"
+                android:contentDescription="@string/GENERAL_TODO"
                 android:onClick="onHideSearch"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp"
@@ -85,7 +85,7 @@
                 android:layout_marginTop="1dp"
                 android:layout_weight="2.5"
                 android:background="@xml/gx_ripple_default_round"
-                android:contentDescription="@string/todo"
+                android:contentDescription="@string/GENERAL_TODO"
                 android:onClick="onLongPressMenu"
                 android:paddingTop="14dp"
                 android:paddingBottom="14dp"
@@ -124,7 +124,7 @@
             android:background="@xml/gx_ripple_blue"
             android:paddingStart="20dp"
             android:stateListAnimator="@null"
-            android:text="@string/HP_CLEAR"
+            android:text="@string/HOME_CLEAR"
             android:textAlignment="textStart"
             android:textColor="@color/blue"
 
@@ -146,7 +146,7 @@
             android:layout_marginBottom="0dp"
             android:background="@xml/gx_generic_input"
             android:ems="10"
-            android:hint="@string/HP_SEARCH_HINT"
+            android:hint="@string/HOME_SEARCH_HINT"
             android:importantForAutofill="no"
             android:inputType="textNoSuggestions"
             android:maxLines="1"
@@ -177,7 +177,7 @@
         android:layout_width="120dp"
         android:layout_height="120dp"
         android:alpha="0"
-        android:contentDescription="@string/todo"
+        android:contentDescription="@string/GENERAL_TODO"
         android:src="@drawable/empty_history"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layouts/language/layout/language_view.xml b/app/src/main/res/layouts/language/layout/language_view.xml
index 889c3198..5e71c6e4 100644
--- a/app/src/main/res/layouts/language/layout/language_view.xml
+++ b/app/src/main/res/layouts/language/layout/language_view.xml
@@ -30,7 +30,7 @@
                 android:layout_marginStart="0dp"
                 android:layout_marginTop="1dp"
                 android:background="@xml/gx_ripple_default_round"
-                android:contentDescription="@string/todo"
+                android:contentDescription="@string/GENERAL_TODO"
                 android:onClick="onClose"
                 android:src="@xml/ic_arrow_back"
                 android:tint="@color/black" />
@@ -42,7 +42,7 @@
                 android:layout_marginTop="-3dp"
                 android:layout_weight="40"
                 android:gravity="center_vertical|start"
-                android:text="@string/LP_TITLE"
+                android:text="@string/LANGUAGE_TITLE"
                 android:textColor="@color/text_color_v1"
                 android:textSize="17sp"
                 android:textStyle="bold" />
@@ -75,7 +75,7 @@
                 android:onClick="onMenuItemInvoked"
                 android:paddingStart="15dp"
                 android:paddingEnd="15dp"
-                android:text="@string/LP_LANGUAGE_MESSAGE_BT_DEFAULT"
+                android:text="@string/LANGUAGE_LANGUAGE_MESSAGE_BT_DEFAULT"
                 android:textSize="14sp" />
 
             <View
@@ -93,7 +93,7 @@
                 android:onClick="onMenuItemInvoked"
                 android:paddingStart="15dp"
                 android:paddingEnd="15dp"
-                android:text="@string/LP_LANGUAGE_MESSAGE_BT_1"
+                android:text="@string/LANGUAGE_LANGUAGE_MESSAGE_BT_1"
                 android:textSize="14sp" />
 
             <View
@@ -111,7 +111,7 @@
                 android:onClick="onMenuItemInvoked"
                 android:paddingStart="15dp"
                 android:paddingEnd="15dp"
-                android:text="@string/LP_LANGUAGE_MESSAGE_BT_2"
+                android:text="@string/LANGUAGE_LANGUAGE_MESSAGE_BT_2"
                 android:textSize="14sp" />
 
             <View
@@ -129,7 +129,7 @@
                 android:onClick="onMenuItemInvoked"
                 android:paddingStart="15dp"
                 android:paddingEnd="15dp"
-                android:text="@string/LP_LANGUAGE_MESSAGE_BT_3"
+                android:text="@string/LANGUAGE_LANGUAGE_MESSAGE_BT_3"
                 android:textSize="14sp" />
 
             <View
@@ -147,7 +147,7 @@
                 android:onClick="onMenuItemInvoked"
                 android:paddingStart="15dp"
                 android:paddingEnd="15dp"
-                android:text="@string/LP_LANGUAGE_MESSAGE_BT_4"
+                android:text="@string/LANGUAGE_LANGUAGE_MESSAGE_BT_4"
                 android:textSize="14sp" />
 
             <View
@@ -165,7 +165,7 @@
                 android:onClick="onMenuItemInvoked"
                 android:paddingStart="15dp"
                 android:paddingEnd="15dp"
-                android:text="@string/LP_LANGUAGE_MESSAGE_BT_5"
+                android:text="@string/LANGUAGE_LANGUAGE_MESSAGE_BT_5"
                 android:textSize="14sp" />
 
             <View
@@ -183,7 +183,7 @@
                 android:onClick="onMenuItemInvoked"
                 android:paddingStart="15dp"
                 android:paddingEnd="15dp"
-                android:text="@string/LP_LANGUAGE_MESSAGE_BT_6"
+                android:text="@string/LANGUAGE_LANGUAGE_MESSAGE_BT_6"
                 android:textSize="14sp" />
             <!-- Title Header -->
 
diff --git a/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml b/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
index 5ae05573..79fd1215 100644
--- a/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
+++ b/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
@@ -32,7 +32,7 @@
                     android:tint="@color/black"
                     android:src="@xml/ic_arrow_back"
                     android:background="@xml/gx_ripple_default_round"
-                    android:contentDescription="@string/todo"/>
+                    android:contentDescription="@string/GENERAL_TODO"/>
                 <TextView
                         android:textColor="@color/text_color_v1"
                         android:onClick="onClose"
@@ -44,7 +44,7 @@
                         android:gravity="center_vertical|start"
                         android:textStyle="bold"
                         android:layout_marginStart="10dp"
-                        android:text="@string/orbot_header"
+                        android:text="@string/ORBOT_HEADER"
                         />
             </LinearLayout>
 
@@ -72,7 +72,7 @@
                         android:layout_weight="40"
                         android:layout_marginTop="10dp"
                         android:layout_marginStart="20dp"
-                        android:text="@string/security_basic_settings"
+                        android:text="@string/BRIDGE_BASIC_SETTING"
                         />
             </LinearLayout>
 
@@ -90,7 +90,7 @@
                         android:layout_weight="40"
                         android:background="@color/clear_alpha"
                         android:layout_marginStart="20dp"
-                        android:text="@string/orbot_desc"
+                        android:text="@string/ORBOT_DESCRIPTION"
                         />
             </LinearLayout>
 
@@ -109,7 +109,7 @@
                         android:layout_weight="40"
                         android:layout_marginStart="20dp"
                         android:textStyle="bold"
-                        android:text="@string/orbot_option_title"
+                        android:text="@string/ORBOT_TITLE"
                         />
             </LinearLayout>
             <View
@@ -136,7 +136,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="40"
                     android:layout_marginStart="20dp"
-                    android:text="@string/orbot_vpn_bridges"
+                    android:text="@string/ORBOT_SETTING_ENABLE_VPN"
                     />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
@@ -172,7 +172,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="40"
                     android:layout_marginStart="20dp"
-                    android:text="@string/orbot_settings_bridges"
+                    android:text="@string/ORBOT_SETTING_BRIDGE_ENABLE"
                     />
 
                     <com.google.android.material.switchmaterial.SwitchMaterial
@@ -227,7 +227,7 @@
                         android:scaleType="fitCenter"
                         android:src="@xml/ic_gateway_splash"
                         android:background="?attr/selectableItemBackgroundBorderless"
-                        android:contentDescription="@string/todo"
+                        android:contentDescription="@string/GENERAL_TODO"
                         app:tint="@color/black" />
 
                     <TextView
@@ -236,7 +236,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="40"
                         android:layout_marginStart="10dp"
-                        android:text="@string/orbot_customizes_bridges"
+                        android:text="@string/ORBOT_SETTING_CUSTOM_BRIDGE"
                         />
 
                     <ImageView
@@ -249,7 +249,7 @@
                         android:scaleType="fitCenter"
                         android:src="@xml/ic_arrow_right"
                         android:layout_marginEnd="12dp"
-                        android:contentDescription="@string/todo"
+                        android:contentDescription="@string/GENERAL_TODO"
                         app:tint="@color/black" />
 
                 </LinearLayout>
@@ -274,7 +274,7 @@
                             android:layout_marginStart="8dp"
                             android:textColor="#595959"
                             android:textStyle="bold"
-                            android:text="@string/orbot_settings_warning"
+                            android:text="@string/ORBOT_SETTING_WARNING"
                             />
                     <TextView
                             android:textSize="14sp"
@@ -284,7 +284,7 @@
                             android:layout_marginTop="8dp"
                             android:textColor="@color/holo_dark_gray"
                             android:paddingEnd="8dp"
-                            android:text="@string/orbot_option_warning_slow_speed"
+                            android:text="@string/ORBOT_BRIDGE_WARNING"
                             tools:ignore="RtlSymmetry" />
                 </LinearLayout>
 
diff --git a/app/src/main/res/layouts/other/layout/hint_view.xml b/app/src/main/res/layouts/other/layout/hint_view.xml
index 1c7349c8..8f1ae23d 100644
--- a/app/src/main/res/layouts/other/layout/hint_view.xml
+++ b/app/src/main/res/layouts/other/layout/hint_view.xml
@@ -29,7 +29,7 @@
                 android:singleLine="true"
                 android:textSize="14sp"
                 android:ellipsize="end"
-                android:text="@string/hint_default_suggession" />
+                android:text="@string/GENERAL_DEFAULT_HINT_SUGGESTION" />
 
         <TextView
                 android:id="@+id/hintCompletionUrl"
@@ -43,7 +43,7 @@
                 android:paddingRight="10dp"
                 android:textColor="@color/holo_dark_gray"
                 android:textSize="12.5sp"
-                android:text="@string/hint_default_suggession" />
+                android:text="@string/GENERAL_DEFAULT_HINT_SUGGESTION" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layouts/other/layout/home_view.xml b/app/src/main/res/layouts/other/layout/home_view.xml
index 8dbfb9a4..fd2e87cb 100644
--- a/app/src/main/res/layouts/other/layout/home_view.xml
+++ b/app/src/main/res/layouts/other/layout/home_view.xml
@@ -74,14 +74,14 @@
                         android:completionHintView="@layout/hint_view"
                         android:ems="10"
                         android:popupElevation="5dp"
-                        android:hint="@string/SearchHintMain"
+                        android:hint="@string/GENERAL_SEARCH_HINT"
                         android:inputType="textNoSuggestions"
                         android:importantForAutofill="no"
                         android:maxLines="1"
                         android:paddingLeft="15dp"
                         android:paddingRight="15dp"
                         android:selectAllOnFocus="true"
-                        android:text="@string/homeUrl"
+                        android:text="@string/GENERAL_HOME_URL"
                         android:textColor="@color/text_color_v2"
                         android:textColorHighlight="@color/text_color_highlight_v1"
                         android:textCursorDrawable="@xml/gx_search_cursor_state"
@@ -101,12 +101,12 @@
                             android:layout_marginStart="10dp"
                             android:layout_marginEnd="5dp"
                             android:layout_marginTop="17dp"
-                            android:text="@string/home_tab_text"
+                            android:text="@string/HOME_TAB_TEXT"
                             android:clickable="false"
                             android:textSize="12.5sp"
                             android:layout_marginBottom="0dp"
                             android:background="@xml/gx_generic_tab_button"
-                            android:contentDescription="@string/todo"
+                            android:contentDescription="@string/GENERAL_TODO"
                             android:scaleType="fitCenter"
                             android:tint="@color/black" />
                     </LinearLayout>
@@ -118,7 +118,7 @@
                         android:layout_marginTop="0dp"
                         android:layout_marginEnd="0dp"
                         android:background="@xml/hox_menu_button"
-                        android:contentDescription="@string/todo"
+                        android:contentDescription="@string/GENERAL_TODO"
                         android:paddingLeft="8dp"
                         android:paddingTop="19dp"
                         android:onClick="onOpenMenuItem"
@@ -168,7 +168,7 @@
                     app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    android:contentDescription="@string/todo" />
+                    android:contentDescription="@string/GENERAL_TODO" />
 
             <Button
                     android:id="@+id/Connect"
@@ -177,7 +177,7 @@
                     android:layout_marginStart="53dp"
                     android:background="@xml/hox_rounded_corner"
                     android:onClick="onStartApplication"
-                    android:text="@string/home_connect"
+                    android:text="@string/HOME_CONNECT"
                     app:layout_constraintBottom_toBottomOf="@+id/imageView_loading_back"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent" />
@@ -195,7 +195,7 @@
                     android:tint="@color/black"
                     app:layout_constraintBottom_toTopOf="@+id/loadingText"
                     app:layout_constraintEnd_toStartOf="@+id/Connect"
-                    android:contentDescription="@string/todo" />
+                    android:contentDescription="@string/GENERAL_TODO" />
 
             <TextView
                     android:id="@+id/loadingText"
@@ -207,7 +207,7 @@
                     android:ellipsize="end"
                     android:gravity="center"
                     android:singleLine="true"
-                    android:text="@string/home_loading"
+                    android:text="@string/HOME_LOADING"
                     android:textAlignment="center"
                     android:textColor="@color/white"
                     android:textFontWeight="5"
@@ -228,7 +228,7 @@
                     app:layout_constraintEnd_toStartOf="@+id/backsplash"
                     app:layout_constraintStart_toEndOf="@+id/backsplash"
                     app:srcCompat="@drawable/icon_loading"
-                    android:contentDescription="@string/todo" />
+                    android:contentDescription="@string/GENERAL_TODO" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
diff --git a/app/src/main/res/layouts/other/layout/notification_menu.xml b/app/src/main/res/layouts/other/layout/notification_menu.xml
index e4105dfb..f466a350 100644
--- a/app/src/main/res/layouts/other/layout/notification_menu.xml
+++ b/app/src/main/res/layouts/other/layout/notification_menu.xml
@@ -38,7 +38,7 @@
                     android:layout_gravity="center_vertical"
                     android:tint="#33cc33"
                     android:src="@xml/ic_check"
-                    android:contentDescription="@string/todo" />
+                    android:contentDescription="@string/GENERAL_TODO" />
 
             <TextView
                     android:id="@+id/notification_message"
@@ -46,7 +46,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_gravity="center_vertical"
-                    android:text="@string/notification_default_label" />
+                    android:text="@string/NOTIFICATION_DEFAULT_LABEL" />
 
         </LinearLayout>
 
@@ -72,7 +72,7 @@
                     android:textColor="@color/ease_blue"
                     android:layout_gravity="center_vertical"
                     style="?android:attr/borderlessButtonStyle"
-                    android:text="@string/notification_open_text" />
+                    android:text="@string/NOTIFICATION_OPEN_TEXT" />
 
 
         </LinearLayout>
diff --git a/app/src/main/res/layouts/other/layout/popup_menu.xml b/app/src/main/res/layouts/other/layout/popup_menu.xml
index 43185b21..f54c99e2 100644
--- a/app/src/main/res/layouts/other/layout/popup_menu.xml
+++ b/app/src/main/res/layouts/other/layout/popup_menu.xml
@@ -87,7 +87,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_new_tabs"
+                    android:text="@string/HOME_MENU__NEW_TABS"
                     android:textSize="14dp" />
 
             <Button
@@ -98,7 +98,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_close_tabs"
+                    android:text="@string/HOME_MENU_CLOSE_TABS"
                     android:textSize="14dp" />
 
             <Button
@@ -109,7 +109,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_open_Recent_tab"
+                    android:text="@string/HOME_MENU_OPEN_RECENT_TABS"
                     android:textSize="14dp" />
 
             <View
@@ -126,7 +126,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_settings"
+                    android:text="@string/HOME_MENU_SETTING"
                     android:textSize="14dp" />
 
             <View
@@ -143,7 +143,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_download"
+                    android:text="@string/HOME_MENU_DOWNLOAD"
                     android:textSize="14dp" />
 
             <Button
@@ -154,7 +154,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_history"
+                    android:text="@string/HOME_MENU_HISTORY"
                     android:textSize="14dp" />
 
             <Button
@@ -165,7 +165,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_languages"
+                    android:text="@string/HOME_MENU_LANGUAGE"
                     android:textSize="14dp" />
 
             <LinearLayout
@@ -190,7 +190,7 @@
                         android:clickable="false"
                         android:onClick="onMenuItemInvoked"
                         android:paddingLeft="15dp"
-                        android:text="@string/popup_desktop"
+                        android:text="@string/HOME_MENU_DESKTOP"
                         android:textSize="14dp" />
                 <com.google.android.material.checkbox.MaterialCheckBox
                         android:id="@+id/menu27"
@@ -218,7 +218,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_bookmark_page"
+                    android:text="@string/HOME_MENU_BOOKMARK"
                     android:textSize="14dp" />
 
             <Button
@@ -229,7 +229,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_open_bookmark"
+                    android:text="@string/HOME_MENU_OPEN_BOOKMARK"
                     android:textSize="14dp" />
 
             <View
@@ -246,7 +246,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_report"
+                    android:text="@string/HOME_MENU_REPORT"
                     android:textSize="14dp" />
 
             <Button
@@ -257,7 +257,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_rate"
+                    android:text="@string/HOME_MENU_RATE"
                     android:textSize="14dp" />
 
             <Button
@@ -268,7 +268,7 @@
                     android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
                     android:paddingLeft="15dp"
-                    android:text="@string/popup_share"
+                    android:text="@string/HOME_MENU_SHARE"
                     android:textSize="14dp" />
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layouts/other/layout/settings_view.xml b/app/src/main/res/layouts/other/layout/settings_view.xml
index 91129a9b..b0a36ad8 100644
--- a/app/src/main/res/layouts/other/layout/settings_view.xml
+++ b/app/src/main/res/layouts/other/layout/settings_view.xml
@@ -34,7 +34,7 @@
                             android:tint="@color/black"
                             android:src="@drawable/back_arrow"
                             android:background="?attr/selectableItemBackgroundBorderless"
-                            android:contentDescription="@string/todo"/>
+                            android:contentDescription="@string/GENERAL_TODO"/>
                     <TextView
                             android:textColor="@color/text_color_v1"
                             android:textSize="19sp"
@@ -44,7 +44,7 @@
                             android:layout_marginTop="12dp"
                             android:textStyle="bold"
                             android:layout_marginStart="30dp"
-                            android:text="@string/settings_header"
+                            android:text="@string/SETTING_HEADER"
                             />
                 </LinearLayout>
 
@@ -70,7 +70,7 @@
                             android:layout_weight="40"
                             android:layout_marginTop="00dp"
                             android:layout_marginStart="20dp"
-                            android:text="@string/settings_basic_settings"
+                            android:text="@string/SETTING_BASIC_SETTING"
                             />
                 </LinearLayout>
 
@@ -88,7 +88,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="40"
                             android:layout_marginStart="20dp"
-                            android:text="@string/settings_search_engine"
+                            android:text="@string/SETTING_SEARCH_ENGINE"
                             />
                     <Spinner
                             android:id="@+id/search_manager"
@@ -115,7 +115,7 @@
                             android:layout_marginStart="-26dp"
                             android:layout_marginTop="12dp"
                             android:src="@drawable/dropdown_arrow"
-                            android:contentDescription="@string/todo"/>
+                            android:contentDescription="@string/GENERAL_TODO"/>
                 </LinearLayout>
 
                 <!-- Title Enable Javascript -->
@@ -131,7 +131,7 @@
                             android:layout_weight="40"
                             android:layout_gravity="top"
                             android:layout_marginStart="20dp"
-                            android:text="@string/settings_javascript"
+                            android:text="@string/SETTING_JAVASCRIPT"
                             />
                     <Spinner
                             android:id="@+id/javascript_manager"
@@ -145,7 +145,7 @@
                             android:stateListAnimator="@xml/sx_spinner_style_animate"
                             android:background="@xml/sx_spinner_style_background"
                             android:drawSelectorOnTop="true"
-                            android:entries="@array/boolean_option"
+                            android:entries="@array/ARRAY_DEFAULT_BOOLEAN"
                             android:popupTheme="@style/AppTheme.PopupOverlay"
 
                             style="@style/Widget.AppCompat.DropDownItem.Spinner"
@@ -159,7 +159,7 @@
                             android:layout_marginStart="-26dp"
                             android:layout_marginTop="12dp"
                             android:src="@drawable/dropdown_arrow"
-                            android:contentDescription="@string/todo"/>
+                            android:contentDescription="@string/GENERAL_TODO"/>
                 </LinearLayout>
 
                 <!-- Title Auto Clear -->
@@ -175,7 +175,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="40"
                             android:layout_marginStart="20dp"
-                            android:text="@string/settings_clear_history"
+                            android:text="@string/SETTING_CLEAR_HISTORY"
                             />
                     <Spinner
                             android:id="@+id/history_manager"
@@ -189,7 +189,7 @@
                             android:stateListAnimator="@xml/sx_spinner_style_animate"
                             android:background="@xml/sx_spinner_style_background"
                             android:drawSelectorOnTop="true"
-                            android:entries="@array/boolean_option"
+                            android:entries="@array/ARRAY_DEFAULT_BOOLEAN"
                             android:popupTheme="@style/AppTheme.PopupOverlay"
 
                             style="@style/Widget.AppCompat.DropDownItem.Spinner"
@@ -203,7 +203,7 @@
                             android:layout_marginStart="-26dp"
                             android:layout_marginTop="12dp"
                             android:src="@drawable/dropdown_arrow"
-                            android:contentDescription="@string/todo"/>
+                            android:contentDescription="@string/GENERAL_TODO"/>
                 </LinearLayout>
 
                 <!-- Title Notification -->
@@ -220,7 +220,7 @@
                             android:layout_weight="40"
                             android:layout_marginStart="20dp"
                             android:layout_gravity="top"
-                            android:text="@string/settings_notification"
+                            android:text="@string/SETTING_NOTIFICATION"
                             />
                     <Spinner
                             android:id="@+id/notification_manager"
@@ -234,7 +234,7 @@
                             android:stateListAnimator="@xml/sx_spinner_style_animate"
                             android:background="@xml/sx_spinner_style_background"
                             android:drawSelectorOnTop="true"
-                            android:entries="@array/notification"
+                            android:entries="@array/ARRAY_NOTIFICATION"
                             android:popupTheme="@style/AppTheme.PopupOverlay"
 
                             style="@style/Widget.AppCompat.DropDownItem.Spinner"
@@ -248,7 +248,7 @@
                             android:layout_marginStart="-26dp"
                             android:layout_marginTop="12dp"
                             android:src="@drawable/dropdown_arrow"
-                            android:contentDescription="@string/todo"/>
+                            android:contentDescription="@string/GENERAL_TODO"/>
                 </LinearLayout>
 
                 <!-- Title Header -->
@@ -273,7 +273,7 @@
                             android:layout_weight="40"
                             android:layout_marginTop="10dp"
                             android:layout_marginStart="20dp"
-                            android:text="@string/settings_font_title"
+                            android:text="@string/SETTING_FONT_TITLE"
                             />
                 </LinearLayout>
 
@@ -292,7 +292,7 @@
                             android:layout_weight="40"
                             android:layout_marginStart="20dp"
                             android:layout_gravity="top"
-                            android:text="@string/settings_adjust_font"
+                            android:text="@string/SETTING_ADJUST_FONT"
                             />
                     <SeekBar
                             android:id="@+id/font_size"
@@ -324,7 +324,7 @@
                             android:layout_weight="40"
                             android:layout_marginStart="20dp"
                             android:layout_gravity="top"
-                            android:text="@string/settings_manual_font"
+                            android:text="@string/SETTING_MANUAL_FONT"
                             />
                     <Spinner
                             android:id="@+id/font_adjustable"
@@ -338,7 +338,7 @@
                             android:stateListAnimator="@xml/sx_spinner_style_animate"
                             android:background="@xml/sx_spinner_style_background"
                             android:drawSelectorOnTop="true"
-                            android:entries="@array/boolean_option"
+                            android:entries="@array/ARRAY_DEFAULT_BOOLEAN"
                             android:popupTheme="@style/AppTheme.PopupOverlay"
 
                             style="@style/Widget.AppCompat.DropDownItem.Spinner"
@@ -352,7 +352,7 @@
                             android:layout_marginStart="-26dp"
                             android:layout_marginTop="12dp"
                             android:src="@drawable/dropdown_arrow"
-                            android:contentDescription="@string/todo"/>
+                            android:contentDescription="@string/GENERAL_TODO"/>
                 </LinearLayout>
 
                 <View
@@ -375,7 +375,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="40"
                             android:layout_marginStart="20dp"
-                            android:text="@string/settings_cookies"
+                            android:text="@string/SETTING_COOKIE_TEXT_INFO"
                             />
                 </LinearLayout>
 
@@ -392,7 +392,7 @@
                             android:layout_weight="40"
                             android:layout_marginStart="20dp"
                             android:layout_gravity="top"
-                            android:text="@string/settings_cookie"
+                            android:text="@string/SETTING_COOKIE"
                             />
                     <Spinner
                             android:id="@+id/cookies_manager"
@@ -406,7 +406,7 @@
                             android:stateListAnimator="@xml/sx_spinner_style_animate"
                             android:background="@xml/sx_spinner_style_background"
                             android:drawSelectorOnTop="true"
-                            android:entries="@array/cookies"
+                            android:entries="@array/ARRAY_COOKIES"
                             android:popupTheme="@style/AppTheme.PopupOverlay"
 
                             style="@style/Widget.AppCompat.DropDownItem.Spinner"
@@ -420,7 +420,7 @@
                             android:layout_marginStart="-26dp"
                             android:layout_marginTop="12dp"
                             android:src="@drawable/dropdown_arrow"
-                            android:contentDescription="@string/todo"/>
+                            android:contentDescription="@string/GENERAL_TODO"/>
                 </LinearLayout>
 
             </LinearLayout>
diff --git a/app/src/main/res/layouts/other/layout/tab_view.xml b/app/src/main/res/layouts/other/layout/tab_view.xml
index 8d750917..52e5a0b2 100644
--- a/app/src/main/res/layouts/other/layout/tab_view.xml
+++ b/app/src/main/res/layouts/other/layout/tab_view.xml
@@ -7,123 +7,5 @@
         android:background="@color/white"
         tools:context="com.darkweb.genesissearchengine.appManager.tabManager.tabController">
 
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:background="@xml/ic_secondary_gradinet"
-            android:elevation="7dp"
-            android:gravity="left"
-            android:orientation="horizontal"
-            android:paddingRight="10dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="RtlHardcoded,RtlSymmetry,UselessParent">
-
-        <ImageButton
-                android:id="@+id/newButton"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="14dp"
-                android:layout_marginBottom="0dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/todo"
-                android:onClick="onBackPressed"
-                android:scaleType="fitCenter"
-                android:src="@drawable/back_arrow"
-                android:tint="@color/black" />
-
-        <EditText
-                android:id="@+id/pSearchInput"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="0dp"
-                android:layout_marginBottom="8dp"
-                android:layout_weight="1"
-                android:background="@xml/gx_generic_input"
-                android:ems="10"
-                android:hint="@string/tab_view_search_tab"
-                android:importantForAutofill="no"
-                android:inputType="textNoSuggestions"
-                android:maxLines="1"
-                android:paddingLeft="18dp"
-                android:paddingRight="10dp"
-                android:selectAllOnFocus="true"
-                android:textColor="@color/text_color_v2"
-                android:textColorHighlight="@color/text_color_highlight_v1"
-                android:textCursorDrawable="@xml/gx_search_cursor_state"
-                android:textSize="15sp"
-                tools:targetApi="o" />
-
-                <Button
-                        android:id="@+id/newTab"
-                        android:layout_width="35dp"
-                        android:layout_height="35dp"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginTop="7dp"
-                        android:layout_marginBottom="0dp"
-                        android:text="@string/tab_view_increment"
-                        android:background="@xml/gx_generic_input"
-                        android:contentDescription="@string/todo"
-                        android:onClick="onNewTabInvoked"
-                        android:scaleType="fitCenter"
-                        android:tint="@color/black" />
-
-    </LinearLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/pRecycleView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="0dp"
-            android:layout_marginTop="55dp"
-            android:paddingBottom="49dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-            android:id="@+id/pEmptyListNotification"
-            android:layout_width="120dp"
-            android:layout_height="120dp"
-            android:contentDescription="@string/todo"
-            android:src="@drawable/empty_tab"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:background="#fcfcfc"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_height="48dp">
-        <Button
-                android:id="@+id/pClearButton"
-                android:layout_width="match_parent"
-                android:layout_height="46dp"
-                android:textStyle="bold"
-                android:textSize="14sp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:textAlignment="center"
-                android:layout_marginBottom="2dp"
-                android:background="@xml/bx_primary_gradient"
-                android:paddingStart="10dp"
-                android:paddingEnd="-10dp"
-                android:text="@string/bookmark_clear_history"
-                android:textColor="@color/white"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/setting/layout/setting.xml b/app/src/main/res/layouts/setting/layout/setting.xml
new file mode 100644
index 00000000..e4e4b807
--- /dev/null
+++ b/app/src/main/res/layouts/setting/layout/setting.xml
@@ -0,0 +1,649 @@
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        tools:context="com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage.settingController">
+        <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingBottom="50dp"
+                    android:layout_height="wrap_content">
+
+                <!-- Title Header -->
+                <LinearLayout
+                    android:id="@+id/pHeaderContainerTop"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="@color/white"
+                    android:clickable="true"
+                    android:paddingEnd="7dp"
+                    android:paddingStart="5dp"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    tools:ignore="RtlSymmetry">
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:layout_marginTop="1dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:onClick="onNavigationBackPressed"
+                        android:src="@xml/ic_arrow_back"
+                        android:tint="@color/black" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="-3dp"
+                        android:layout_weight="40"
+                        android:gravity="center_vertical|start"
+                        android:text="@string/SETTING_HEADER"
+                        android:textColor="@color/text_color_v1"
+                        android:textSize="17sp"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
+                <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginBottom="10dp"
+                        android:background="@color/white_dark" />
+
+                <!-- Title Header -->
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:background="@color/white"
+                        android:layout_marginTop="15dp"
+                        android:layout_marginBottom="15dp"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content">
+                    <TextView
+                            android:textColor="@color/cursor_blue"
+                            android:textSize="15sp"
+                            android:layout_width="0dp"
+                            android:textStyle="bold"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="40"
+                            android:layout_marginTop="00dp"
+                            android:layout_marginStart="15dp"
+                            android:text="@string/SETTING_BASIC_SETTING"
+                            />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+
+                <LinearLayout
+                    android:id="@+id/pOption2"
+                    android:layout_width="match_parent"
+                    android:layout_height="65dp"
+                    android:onClick="onDefaultBrowser"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <Button
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="6"
+                        android:alpha="0.7"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:paddingStart="15dp"
+                        android:text="@string/SETTING_DEFAULT_BROWSER"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/blue_dark"
+                        android:textSize="15sp"
+                        tools:ignore="RtlSymmetry" />
+
+                    <ImageView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:scaleX="0.5"
+                        android:scaleY="0.5"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+
+                <LinearLayout
+                    android:id="@+id/pOption3"
+                    android:layout_width="match_parent"
+                    android:layout_height="65dp"
+                    android:onClick="onManageNotification"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="6"
+                        android:layout_height="65dp"
+                        android:orientation="vertical">
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="20dp"
+                            android:layout_marginTop="12dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_NOTIFICATION"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/blue_dark"
+                            android:textSize="15sp"
+                            tools:ignore="RtlSymmetry" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_NOTIFICATION_INFO"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/text_color_v3"
+                            android:textSize="12sp"
+                            tools:ignore="RtlSymmetry" />
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:scaleX="0.5"
+                        android:scaleY="0.5"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+
+                <LinearLayout
+                    android:id="@+id/pOption4"
+                    android:layout_width="match_parent"
+                    android:layout_height="65dp"
+                    android:onClick="onManageSearchEngine"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="6"
+                        android:layout_height="65dp"
+                        android:clickable="false"
+                        android:orientation="vertical">
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="20dp"
+                            android:layout_marginTop="12dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/blue_dark"
+                            android:textSize="15sp"
+                            tools:ignore="RtlSymmetry" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_INFO"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/text_color_v3"
+                            android:textSize="12sp"
+                            tools:ignore="RtlSymmetry" />
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:scaleX="0.5"
+                        android:scaleY="0.5"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                <!-- Title Search Engine -->
+                <LinearLayout
+                    android:layout_marginTop="1000dp"
+                        android:background="@color/white"
+                        android:layout_width="match_parent"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="20dp"
+                        android:layout_height="wrap_content">
+                    <TextView
+                            android:textSize="16sp"
+                            android:layout_gravity="top"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="40"
+                            android:layout_marginStart="20dp"
+                            android:text="@string/SETTING_SEARCH_ENGINE"
+                            />
+                    <Spinner
+                            android:id="@+id/search_manager"
+                            android:textSize="12sp"
+                            android:layout_width="150dp"
+                            android:paddingEnd="20dp"
+                            android:layout_height="40dp"
+                            android:paddingRight="30dp"
+                            android:paddingLeft="30dp"
+                            android:stateListAnimator="@xml/sx_spinner_style_animate"
+                            android:background="@xml/sx_spinner_style_background"
+                            android:drawSelectorOnTop="true"
+                            android:entries="@array/search_engines"
+                            style="@style/Widget.AppCompat.DropDownItem.Spinner"
+                            android:dropDownWidth="160dp"
+                            android:popupBackground="@android:color/white"
+                            android:layout_marginTop="1dp"
+                            android:overlapAnchor="false"
+                            android:popupTheme="@style/AppTheme.PopupOverlay"
+                            android:popupElevation="3dp"
+                            />
+                    <ImageView android:layout_width="15dp" android:layout_height="15dp"
+                            android:layout_marginEnd="35dp"
+                            android:layout_marginStart="-26dp"
+                            android:layout_marginTop="12dp"
+                            android:src="@drawable/dropdown_arrow"
+                            android:contentDescription="@string/GENERAL_TODO"/>
+                </LinearLayout>
+
+                <!-- Title Enable Javascript -->
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_marginBottom="20dp"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content">
+                    <TextView
+                            android:textSize="16sp"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="40"
+                            android:layout_gravity="top"
+                            android:layout_marginStart="20dp"
+                            android:text="@string/SETTING_JAVASCRIPT"
+                            />
+                    <Spinner
+                            android:id="@+id/javascript_manager"
+                            android:textSize="12sp"
+                            android:layout_width="150dp"
+                            android:paddingEnd="20dp"
+                            android:layout_height="40dp"
+                            android:layout_marginTop="1dp"
+                            android:paddingRight="30dp"
+                            android:paddingLeft="30dp"
+                            android:stateListAnimator="@xml/sx_spinner_style_animate"
+                            android:background="@xml/sx_spinner_style_background"
+                            android:drawSelectorOnTop="true"
+                            android:entries="@array/ARRAY_DEFAULT_BOOLEAN"
+                            android:popupTheme="@style/AppTheme.PopupOverlay"
+
+                            style="@style/Widget.AppCompat.DropDownItem.Spinner"
+                            android:dropDownWidth="160dp"
+                            android:popupBackground="@android:color/white"
+                            android:overlapAnchor="false"
+                            android:popupElevation="3dp"
+                            />
+                    <ImageView android:layout_width="15dp" android:layout_height="15dp"
+                            android:layout_marginEnd="35dp"
+                            android:layout_marginStart="-26dp"
+                            android:layout_marginTop="12dp"
+                            android:src="@drawable/dropdown_arrow"
+                            android:contentDescription="@string/GENERAL_TODO"/>
+                </LinearLayout>
+
+                <!-- Title Auto Clear -->
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:background="@color/white"
+                        android:layout_marginBottom="20dp"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content">
+                    <TextView
+                            android:textSize="16sp"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="40"
+                            android:layout_marginStart="20dp"
+                            android:text="@string/SETTING_CLEAR_HISTORY"
+                            />
+                    <Spinner
+                            android:id="@+id/history_manager"
+                            android:textSize="12sp"
+                            android:layout_width="150dp"
+                            android:paddingEnd="20dp"
+                            android:layout_height="40dp"
+                            android:layout_marginTop="1dp"
+                            android:paddingRight="30dp"
+                            android:paddingLeft="20dp"
+                            android:stateListAnimator="@xml/sx_spinner_style_animate"
+                            android:background="@xml/sx_spinner_style_background"
+                            android:drawSelectorOnTop="true"
+                            android:entries="@array/ARRAY_DEFAULT_BOOLEAN"
+                            android:popupTheme="@style/AppTheme.PopupOverlay"
+
+                            style="@style/Widget.AppCompat.DropDownItem.Spinner"
+                            android:dropDownWidth="160dp"
+                            android:popupBackground="@android:color/white"
+                            android:overlapAnchor="false"
+                            android:popupElevation="3dp"
+                            tools:ignore="RtlHardcoded" />
+                    <ImageView android:layout_width="15dp" android:layout_height="15dp"
+                            android:layout_marginEnd="35dp"
+                            android:layout_marginStart="-26dp"
+                            android:layout_marginTop="12dp"
+                            android:src="@drawable/dropdown_arrow"
+                            android:contentDescription="@string/GENERAL_TODO"/>
+                </LinearLayout>
+
+                <!-- Title Notification -->
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:background="@color/white"
+                        android:layout_marginBottom="20dp"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content">
+                    <TextView
+                            android:textSize="16sp"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="40"
+                            android:layout_marginStart="20dp"
+                            android:layout_gravity="top"
+                            android:text="@string/SETTING_NOTIFICATION"
+                            />
+                    <Spinner
+                            android:id="@+id/notification_manager"
+                            android:textSize="12sp"
+                            android:layout_width="150dp"
+                            android:paddingEnd="20dp"
+                            android:layout_height="40dp"
+                            android:layout_marginTop="1dp"
+                            android:paddingRight="30dp"
+                            android:paddingLeft="20dp"
+                            android:stateListAnimator="@xml/sx_spinner_style_animate"
+                            android:background="@xml/sx_spinner_style_background"
+                            android:drawSelectorOnTop="true"
+                            android:entries="@array/ARRAY_NOTIFICATION"
+                            android:popupTheme="@style/AppTheme.PopupOverlay"
+
+                            style="@style/Widget.AppCompat.DropDownItem.Spinner"
+                            android:dropDownWidth="160dp"
+                            android:popupBackground="@android:color/white"
+                            android:overlapAnchor="false"
+                            android:popupElevation="3dp"
+                            tools:ignore="RtlHardcoded" />
+                    <ImageView android:layout_width="15dp" android:layout_height="15dp"
+                            android:layout_marginEnd="35dp"
+                            android:layout_marginStart="-26dp"
+                            android:layout_marginTop="12dp"
+                            android:src="@drawable/dropdown_arrow"
+                            android:contentDescription="@string/GENERAL_TODO"/>
+                </LinearLayout>
+
+                <!-- Title Header -->
+                <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginBottom="0dp"
+                        android:background="@color/white_dark" />
+                <!-- Title Header -->
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:background="@color/white"
+                        android:layout_marginBottom="25dp"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content">
+                    <TextView
+                            android:textColor="@color/cursor_blue"
+                            android:textSize="17.5sp"
+                            android:layout_width="0dp"
+                            android:textStyle="bold"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="40"
+                            android:layout_marginTop="10dp"
+                            android:layout_marginStart="20dp"
+                            android:text="@string/SETTING_FONT_TITLE"
+                            />
+                </LinearLayout>
+
+                <!-- Title Auto Clear -->
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:background="@color/white"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="20dp"
+                        android:layout_height="wrap_content">
+                    <TextView
+                            android:id="@+id/font_size_percentage"
+                            android:textSize="16sp"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="40"
+                            android:layout_marginStart="20dp"
+                            android:layout_gravity="top"
+                            android:text="@string/SETTING_ADJUST_FONT"
+                            />
+                    <SeekBar
+                            android:id="@+id/font_size"
+                            android:layout_width="158dp"
+                            android:layout_height="wrap_content"
+                            android:paddingBottom="10dp"
+                            android:paddingTop="10dp"
+                            android:ems="10"
+                            android:progress="100"
+                            android:max="200"
+                            android:layout_marginEnd="18dp"
+                            android:layout_weight="1"
+                            android:paddingRight="30dp"
+                            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+                </LinearLayout>
+
+                <!-- Title Auto Clear -->
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:background="@color/white"
+                        android:layout_marginBottom="20dp"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content">
+                    <TextView
+                            android:textSize="16sp"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="40"
+                            android:layout_marginStart="20dp"
+                            android:layout_gravity="top"
+                            android:text="@string/SETTING_MANUAL_FONT"
+                            />
+                    <Spinner
+                            android:id="@+id/font_adjustable"
+                            android:textSize="12sp"
+                            android:paddingEnd="20dp"
+                            android:layout_width="150dp"
+                            android:layout_height="40dp"
+                            android:layout_marginTop="1dp"
+                            android:paddingRight="30dp"
+                            android:paddingLeft="20dp"
+                            android:stateListAnimator="@xml/sx_spinner_style_animate"
+                            android:background="@xml/sx_spinner_style_background"
+                            android:drawSelectorOnTop="true"
+                            android:entries="@array/ARRAY_DEFAULT_BOOLEAN"
+                            android:popupTheme="@style/AppTheme.PopupOverlay"
+
+                            style="@style/Widget.AppCompat.DropDownItem.Spinner"
+                            android:dropDownWidth="160dp"
+                            android:popupBackground="@android:color/white"
+                            android:overlapAnchor="false"
+                            android:popupElevation="3dp"
+                            tools:ignore="RtlHardcoded" />
+                    <ImageView android:layout_width="15dp" android:layout_height="15dp"
+                            android:layout_marginEnd="35dp"
+                            android:layout_marginStart="-26dp"
+                            android:layout_marginTop="12dp"
+                            android:src="@drawable/dropdown_arrow"
+                            android:contentDescription="@string/GENERAL_TODO"/>
+                </LinearLayout>
+
+                <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginBottom="10dp"
+                        android:background="@color/white_dark" />
+
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:background="@color/white"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="25dp"
+                        android:layout_height="wrap_content">
+                    <TextView
+                            android:textColor="@color/cursor_blue"
+                            android:textSize="17.5sp"
+                            android:layout_width="0dp"
+                            android:textStyle="bold"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="40"
+                            android:layout_marginStart="20dp"
+                            android:text="@string/SETTING_COOKIE_TEXT_INFO"
+                            />
+                </LinearLayout>
+
+                <!-- Title Auto Clear -->
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:background="@color/white"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content">
+                    <TextView
+                            android:textSize="16sp"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="40"
+                            android:layout_marginStart="20dp"
+                            android:layout_gravity="top"
+                            android:text="@string/SETTING_COOKIE"
+                            />
+                    <Spinner
+                            android:id="@+id/cookies_manager"
+                            android:textSize="12sp"
+                            android:layout_width="200dp"
+                            android:paddingEnd="20dp"
+                            android:layout_height="40dp"
+                            android:layout_marginTop="1dp"
+                            android:paddingRight="10dp"
+                            android:paddingLeft="0dp"
+                            android:stateListAnimator="@xml/sx_spinner_style_animate"
+                            android:background="@xml/sx_spinner_style_background"
+                            android:drawSelectorOnTop="true"
+                            android:entries="@array/ARRAY_COOKIES"
+                            android:popupTheme="@style/AppTheme.PopupOverlay"
+
+                            style="@style/Widget.AppCompat.DropDownItem.Spinner"
+                            android:dropDownWidth="160dp"
+                            android:popupBackground="@android:color/white"
+                            android:overlapAnchor="false"
+                            android:popupElevation="3dp"
+                            tools:ignore="RtlHardcoded" />
+                    <ImageView android:layout_width="15dp" android:layout_height="15dp"
+                            android:layout_marginEnd="35dp"
+                            android:layout_marginStart="-26dp"
+                            android:layout_marginTop="12dp"
+                            android:src="@drawable/dropdown_arrow"
+                            android:contentDescription="@string/GENERAL_TODO"/>
+                </LinearLayout>
+
+            </LinearLayout>
+        </ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layouts/setting/layout/setting_notification_view.xml b/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
new file mode 100644
index 00000000..637a4d9f
--- /dev/null
+++ b/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
@@ -0,0 +1,147 @@
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        tools:context="com.darkweb.genesissearchengine.appManager.settingManager.notificationManager.settingNotificationController">
+        <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:layout_height="wrap_content">
+
+                <!-- Title Header -->
+                <LinearLayout
+                    android:id="@+id/pHeaderContainerTop"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="@color/white"
+                    android:clickable="true"
+                    android:paddingEnd="7dp"
+                    android:paddingStart="5dp"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    tools:ignore="RtlSymmetry">
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:layout_marginTop="1dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:onClick="onClose"
+                        android:src="@xml/ic_arrow_back"
+                        android:tint="@color/black" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="-3dp"
+                        android:layout_weight="40"
+                        android:gravity="center_vertical|start"
+                        android:text="@string/SETTING_NOTIFICATION_HEADER"
+                        android:textColor="@color/text_color_v1"
+                        android:textSize="17sp"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
+                <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="@color/white_dark" />
+
+                <!-- Title Header -->
+
+                <LinearLayout
+                    android:id="@+id/pOption2"
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:onClick="onSaveLocalNotificationSettings"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <Button
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="6"
+                        android:alpha="0.7"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:paddingStart="15dp"
+                        android:text="@string/SETTING_NOTIFICATION_DISABLE_STATUS_NOTIFICATION"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/blue_dark"
+                        android:textSize="15sp"
+                        tools:ignore="RtlSymmetry" />
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="0dp"
+                        android:id="@+id/pNotificationManual"
+                        android:layout_height="match_parent"
+                        android:clickable="false"
+                        android:layout_marginEnd="10dp"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent">
+                    </com.google.android.material.switchmaterial.SwitchMaterial>
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+
+                <LinearLayout
+                    android:id="@+id/pOption3"
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:onClick="onOpenNotificationSettings"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <Button
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="6"
+                        android:alpha="0.7"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:paddingStart="15dp"
+                        android:text="@string/SETTING_NOTIFICATION_OPEN_NOTIFICATION_MANAGER"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/blue_dark"
+                        android:textSize="15sp"
+                        tools:ignore="RtlSymmetry" />
+
+                    <ImageView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:scaleX="0.5"
+                        android:scaleY="0.5"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+            </LinearLayout>
+        </ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layouts/setting/layout/setting_search_view.xml b/app/src/main/res/layouts/setting/layout/setting_search_view.xml
new file mode 100644
index 00000000..dc6c5cc9
--- /dev/null
+++ b/app/src/main/res/layouts/setting/layout/setting_search_view.xml
@@ -0,0 +1,533 @@
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        tools:context="com.darkweb.genesissearchengine.appManager.settingManager.searchEngineManager.settingSearchController">
+        <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:layout_height="wrap_content">
+
+                <!-- Title Header -->
+                <LinearLayout
+                    android:id="@+id/pHeaderContainerTop"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="@color/white"
+                    android:clickable="true"
+                    android:paddingEnd="7dp"
+                    android:paddingStart="5dp"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    tools:ignore="RtlSymmetry">
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:layout_marginTop="1dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:onClick="onClose"
+                        android:src="@xml/ic_arrow_back"
+                        android:tint="@color/black" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="-3dp"
+                        android:layout_weight="40"
+                        android:gravity="center_vertical|start"
+                        android:text="@string/SETTING_SEARCH_HEADER"
+                        android:textColor="@color/text_color_v1"
+                        android:textSize="17sp"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
+                <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                    android:layout_marginBottom="10dp"
+                        android:background="@color/white_dark" />
+
+                <!-- Title Header -->
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:background="@color/white"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginBottom="15dp"
+                    android:orientation="horizontal"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:textColor="@color/cursor_blue"
+                        android:textSize="14sp"
+                        android:layout_width="0dp"
+                        android:textStyle="bold"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="40"
+                        android:layout_marginTop="00dp"
+                        android:layout_marginStart="15dp"
+                        android:text="@string/SETTING_SEARCH_HEADER_1"
+                        />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/white_dark" />
+
+                <LinearLayout
+                    android:id="@+id/pOption1"
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="6"
+                        android:layout_height="55dp"
+                        android:background="@xml/gx_ripple_gray"
+                        android:orientation="vertical">
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="20dp"
+                            android:layout_marginTop="8dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_GENESIS"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/blue_dark"
+                            android:textSize="15sp"
+                            tools:ignore="RtlSymmetry" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_DEFAULT"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/text_color_v3"
+                            android:textSize="12sp"
+                            tools:ignore="RtlSymmetry" />
+                    </LinearLayout>
+
+                    <RadioButton
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+
+                <LinearLayout
+                    android:id="@+id/pOption2"
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="6"
+                        android:layout_height="55dp"
+                        android:background="@xml/gx_ripple_gray"
+                        android:orientation="vertical">
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="20dp"
+                            android:layout_marginTop="8dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_DUCK"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/blue_dark"
+                            android:textSize="15sp"
+                            tools:ignore="RtlSymmetry" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_DUCK"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/text_color_v3"
+                            android:textSize="12sp"
+                            tools:ignore="RtlSymmetry" />
+                    </LinearLayout>
+
+                    <RadioButton
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+
+                <LinearLayout
+                    android:id="@+id/pOption3"
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="6"
+                        android:layout_height="55dp"
+                        android:background="@xml/gx_ripple_gray"
+                        android:orientation="vertical">
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="20dp"
+                            android:layout_marginTop="8dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_GOOGLE"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/blue_dark"
+                            android:textSize="15sp"
+                            tools:ignore="RtlSymmetry" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_GOOGLE"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/text_color_v3"
+                            android:textSize="12sp"
+                            tools:ignore="RtlSymmetry" />
+                    </LinearLayout>
+
+                    <RadioButton
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+
+                <LinearLayout
+                    android:id="@+id/pOption4"
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="6"
+                        android:layout_height="55dp"
+                        android:background="@xml/gx_ripple_gray"
+                        android:orientation="vertical">
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="20dp"
+                            android:layout_marginTop="8dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_AMAZON"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/blue_dark"
+                            android:textSize="15sp"
+                            tools:ignore="RtlSymmetry" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_AMAZON"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/text_color_v3"
+                            android:textSize="12sp"
+                            tools:ignore="RtlSymmetry" />
+                    </LinearLayout>
+
+                    <RadioButton
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+
+                <LinearLayout
+                    android:id="@+id/pOption5"
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="6"
+                        android:layout_height="55dp"
+                        android:background="@xml/gx_ripple_gray"
+                        android:orientation="vertical">
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="20dp"
+                            android:layout_marginTop="8dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_BING"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/blue_dark"
+                            android:textSize="15sp"
+                            tools:ignore="RtlSymmetry" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_BING"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/text_color_v3"
+                            android:textSize="12sp"
+                            tools:ignore="RtlSymmetry" />
+                    </LinearLayout>
+
+                    <RadioButton
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/holo_gray_light"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:background="@color/white"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginBottom="15dp"
+                    android:orientation="horizontal"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:textColor="@color/cursor_blue"
+                        android:textSize="14sp"
+                        android:layout_width="0dp"
+                        android:textStyle="bold"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="40"
+                        android:layout_marginTop="00dp"
+                        android:layout_marginStart="15dp"
+                        android:text="@string/SETTING_SEARCH_HEADER_2"
+                        />
+                </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/pOption6"
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="6"
+                        android:layout_height="55dp"
+                        android:background="@xml/gx_ripple_gray"
+                        android:orientation="vertical">
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="20dp"
+                            android:layout_marginTop="8dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_BING"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/blue_dark"
+                            android:textSize="15sp"
+                            tools:ignore="RtlSymmetry" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_BING"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/text_color_v3"
+                            android:textSize="12sp"
+                            tools:ignore="RtlSymmetry" />
+                    </LinearLayout>
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/pOption7"
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="6"
+                        android:layout_height="55dp"
+                        android:background="@xml/gx_ripple_gray"
+                        android:orientation="vertical">
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="20dp"
+                            android:layout_marginTop="8dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_BING"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/blue_dark"
+                            android:textSize="15sp"
+                            tools:ignore="RtlSymmetry" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:alpha="0.7"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:paddingStart="15dp"
+                            android:text="@string/SETTING_SEARCH_BING"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/text_color_v3"
+                            android:textSize="12sp"
+                            tools:ignore="RtlSymmetry" />
+                    </LinearLayout>
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent"
+                        android:src="@xml/ic_arrow_right"
+                        android:contentDescription="@string/GENERAL_TODO" />
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+        </ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layouts/shared/listviews/layout/recyclerview__menu.xml b/app/src/main/res/layouts/shared/listviews/layout/recyclerview__menu.xml
index f43f28a4..01d330eb 100644
--- a/app/src/main/res/layouts/shared/listviews/layout/recyclerview__menu.xml
+++ b/app/src/main/res/layouts/shared/listviews/layout/recyclerview__menu.xml
@@ -28,7 +28,7 @@
                     android:paddingStart="15dp"
                     android:paddingEnd="0dp"
                     android:textAllCaps="false"
-                    android:text="@string/SRV_OPEN"
+                    android:text="@string/SHARED_RECYCLER_VIEW_OPEN"
                     android:textSize="14.5sp" />
 
             <Button
@@ -41,7 +41,7 @@
                 android:textAllCaps="false"
                 android:onClick="onShareSelectedURL"
                 android:paddingEnd="0dp"
-                android:text="@string/SRV_SHARE"
+                android:text="@string/SHARED_RECYCLER_VIEW_SHARE"
                 android:textSize="14.5sp" />
             <Button
                 android:id="@+id/pMenuOpenCurrentTab"
@@ -53,7 +53,7 @@
                 android:paddingStart="15dp"
                 android:textAllCaps="false"
                 android:paddingEnd="0dp"
-                android:text="@string/SRV_CLEAR_LONG_PRESSES"
+                android:text="@string/SHARED_RECYCLER_VIEW_CLEAR_LONG_PRESSES"
                 android:textSize="14.5sp" />
 
 
@@ -74,7 +74,7 @@
                     android:onClick="onDeleteSelected"
                     android:paddingEnd="0dp"
                     android:textAllCaps="false"
-                    android:text="@string/SRV_DELETE"
+                    android:text="@string/SHARED_RECYCLER_VIEW_DELETE"
                     android:textSize="14.5sp" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layouts/shared/listviews/layout/recyclerview__row_menu.xml b/app/src/main/res/layouts/shared/listviews/layout/recyclerview__row_menu.xml
index c95c9070..95455882 100644
--- a/app/src/main/res/layouts/shared/listviews/layout/recyclerview__row_menu.xml
+++ b/app/src/main/res/layouts/shared/listviews/layout/recyclerview__row_menu.xml
@@ -25,7 +25,7 @@
                     android:paddingStart="15dp"
                     android:paddingEnd="0dp"
                     android:textAllCaps="false"
-                    android:text="@string/SRV_COPY"
+                    android:text="@string/SHARED_RECYCLER_VIEW_COPY"
                     android:textSize="14.5sp" />
 
             <Button
@@ -37,7 +37,7 @@
                     android:paddingStart="15dp"
                     android:textAllCaps="false"
                     android:paddingEnd="0dp"
-                    android:text="@string/SRV_SHARE"
+                    android:text="@string/SHARED_RECYCLER_VIEW_SHARE"
                     android:textSize="14.5sp" />
 
                 <Button
@@ -49,7 +49,7 @@
                     android:paddingStart="15dp"
                     android:paddingEnd="0dp"
                     android:textAllCaps="false"
-                    android:text="@string/SRV_OPEN_CURRENT_TAB"
+                    android:text="@string/SHARED_RECYCLER_VIEW_OPEN_CURRENT_TAB"
                     android:textSize="14.5sp" />
 
                 <Button
@@ -61,7 +61,7 @@
                     android:paddingStart="15dp"
                     android:paddingEnd="0dp"
                     android:textAllCaps="false"
-                    android:text="@string/SRV_OPEN_NEW_TAB"
+                    android:text="@string/SHARED_RECYCLER_VIEW_OPEN_NEW_TAB"
                     android:textSize="14.5sp" />
 
             <View
@@ -80,7 +80,7 @@
                     android:paddingStart="15dp"
                     android:paddingEnd="0dp"
                     android:textAllCaps="false"
-                    android:text="@string/SRV_DELETE"
+                    android:text="@string/SHARED_RECYCLER_VIEW_DELETE"
                     android:textSize="14.5sp" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layouts/shared/listviews/layout/recyclerview_row.xml b/app/src/main/res/layouts/shared/listviews/layout/recyclerview_row.xml
index 7d1fc88a..c090b12a 100644
--- a/app/src/main/res/layouts/shared/listviews/layout/recyclerview_row.xml
+++ b/app/src/main/res/layouts/shared/listviews/layout/recyclerview_row.xml
@@ -47,7 +47,7 @@
                 android:src="@drawable/tick_recycler_view"
                 android:gravity="center_vertical"
                 tools:ignore="RtlCompat"
-                android:contentDescription="@string/todo" />
+                android:contentDescription="@string/GENERAL_TODO" />
 
             <LinearLayout
                 android:layout_width="0dp"
@@ -94,7 +94,7 @@
                 android:tint="@color/black"
                 android:src="@drawable/menu_item"
                 android:background="@xml/gx_ripple_gray"
-                android:contentDescription="@string/todo"
+                android:contentDescription="@string/GENERAL_TODO"
                 tools:ignore="RtlSymmetry" />
 
         </LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
old mode 100755
new mode 100644
index d92e7676..6b65f403
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,313 +1,3 @@
 <resources>
 
-
-    <!-- Generated by Automatic String Resource Translation
---><!--          https://asrt.gluege.boerde.de
---><string name="app_name" translatable="false">Genesis</string>
-    <string name="HP_SEARCH_HINT">Suchverlauf</string>
-    <string name="SearchHintMain">Suchen oder geben Sie die Webadresse ein</string>
-    <string name="homeUrl" translatable="false">https://genesis.onion</string>
-    <string name="errorTiyle">\ u0020 \ u0020 \ u0020Opps! Etwas ist schief gelaufen</string>
-    <string name="todo">ALLES</string>
-    <string name="projectName">Genesis-Suchmaschine</string>
-    <string name="loadingText">Online Freedom</string>
-    <string name="reload">Neu laden</string>
-    <string name="internetErrorMessage">Dies können die Probleme sein, mit denen Sie konfrontiert sind \ n \ n • Die Webseite oder Website ist möglicherweise ausgefallen \ n • Ihre Internetverbindung ist möglicherweise schlecht \ n • Sie verwenden möglicherweise einen Proxy \ n • Die Website ist möglicherweise durch eine Firewall blockiert</string>
-    <string name="title_activity_list_manager">list_manager</string>
-    <string name="title_activity_setting_controller">die Einstellungen</string>
-    <string name="file_provider_authority">com.darkweb.genesissearchengine.fileprovider</string>
-
-
-    <string name="preferences_messages_header">Mitteilungen</string>
-    <string name="preferences_sync_header">Synchronisieren</string>
-
-
-    <string name="messages_signature_title">Ihre Unterschrift</string>
-    <string name="messages_reply_title">Standardantwortaktion</string>
-
-
-    <string name="settings_basic_settings">Grundeinstellungen</string>
-    <string name="settings_header">die Einstellungen</string>
-    <string name="settings_search_engine">Suchmaschine</string>
-    <string name="settings_javascript">Javascript</string>
-    <string name="settings_clear_history">Verlauf automatisch löschen</string>
-    <string name="settings_font_title">Schriftarteneinstellungen</string>
-    <string name="settings_adjust_font">Kundenspezifische Schriftart</string>
-    <string name="settings_manual_font">Schriftart automatisch anpassen</string>
-    <string name="settings_cookies">Cookie-Einstellungen</string>
-    <string name="settings_cookie">Kekse</string>
-    <string name="settings_notification">Benachrichtigung verwalten</string>
-
-
-    <string name="security_basic_settings">Grundeinstellungen</string>
-    <string name="bridge_Automatid_title">Automatisch erstellen</string>
-    <string name="bridge_Manual_desc">Stellen Sie eine Brücke zur Verfügung, die ich kenne</string>
-    <string name="bridge_Auto_switch">Auto</string>
-    <string name="bridge_Manual_switch">Handbuch</string>
-    <string name="bridge_port_hint">Adresse: Port</string>
-    <string name="bridge_header">Brückeneinstellungen</string>
-    <string name="bridge_desc">Bridges sind nicht aufgeführte Tor-Relais, die das Blockieren von Verbindungen in das Tor-Netzwerk erschweren. Aufgrund der Art und Weise, wie einige Länder versuchen, Tor zu blockieren, funktionieren bestimmte Brücken in einigen Ländern, in anderen jedoch nicht</string>
-    <string name="bridge_default_title">Wählen Sie Standardbrücke</string>
-    <string name="bridge_request">Grundeinstellungen</string>
-
-
-    public <string name="WELCOME_MESSAGE_TITLE">Willkommen | Verstecktes Web-Gateway</string>
-    public <string name="WELCOME_MESSAGE_DESC">Diese Anwendung bietet Ihnen eine Plattform zum Suchen und Öffnen von versteckten Web-URLs. Hier einige Vorschläge \ n</string>
-    public <string name="WELCOME_MESSAGE_BT_1">Deep Web Online Market</string>
-    public <string name="WELCOME_MESSAGE_BT_2">Durchgesickerte Dokumente und Bücher</string>
-    public <string name="WELCOME_MESSAGE_BT_3">Dark Web News und Artikel</string>
-    public <string name="WELCOME_MESSAGE_BT_4">Geheime Software und Hacking Tools</string>
-    public <string name="WELCOME_MESSAGE_BT_5">Nicht mehr anzeigen</string>
-
-    public <string name="ABI_ERROR_TITLE">Ungültige Setup-Datei</string>
-    public <string name="ABI_ERROR_DESC">Sieht so aus, als hätten Sie die Installation durcheinander gebracht. Installieren Sie es entweder im Playstore oder folgen Sie dem Link</string>
-    public <string name="ABI_ERROR_BT_1">Lokales Upgrade</string>
-    public <string name="ABI_ERROR_BT_2">Aktualisieren Sie den Playstore</string>
-    public <string name="ABI_ERROR_BT_3">Mache trotzdem weiter</string>
-
-    public <string name="REPORT_URL_TITLE">Diese Website melden</string>
-    public <string name="REPORT_URL_DESC">Wenn Sie der Meinung sind, dass die URL illegal oder störend ist, melden Sie uns, damit wir unsere Datenbank aktualisieren können \ n</string>
-    public <string name="REPORT_URL_BT_1">Bericht</string>
-    public <string name="REPORT_URL_BT_2">Entlassen</string>
-
-    public <string name="ORBOT_INIT_TITLE">Initialisieren</string>
-    public <string name="ORBOT_INIT_DESC">Warten Sie mal! Während wir Sie mit verstecktem Web verbinden. Dies kann einige Minuten dauern \ n</string>
-    public <string name="ORBOT_INIT_BT_1">Entlassen</string>
-    public <string name="ORBOT_INIT_BT_2">Versuch es noch einmal</string>
-
-    public <string name="ORBOT_CLEAR_TITLE">Daten gelöscht</string>
-    public <string name="ORBOT_CLEAR_DESC">Genesis-Daten wurden gelöscht. Bitte versuchen Sie die Bewerbung von der Homepage aus zu starten \ n</string>
-    public <string name="ORBOT_CLEAR_BT_1">Entlassen</string>
-
-    public <string name="VERSION_TITLE">Update ausstehend</string>
-    public <string name="VERSION_DESC">Sie haben diese App eine Weile nicht aktualisiert. Bitte aktualisieren Sie sie, um die beste Leistung zu erzielen \ n</string>
-    public <string name="VERSION_BT_1">Aktualisieren</string>
-
-    public <string name="REPORT_SUCCESS_TITLE">URL erfolgreich gemeldet</string>
-    public <string name="REPORT_SUCCESS_DESC">URL wurde erfolgreich gemeldet. Es wird ungefähr eine Woche dauern, bis diese Website vollständig von unseren Servern entfernt ist \ n</string>
-    public <string name="REPORT_SUCCESS_BT_1">Entlassen</string>
-
-    public <string name="RATE_TITLE">Bewerten Sie uns</string>
-    public <string name="RATE_MESSAGE">Wir nehmen keine Spenden entgegen oder verdienen kein Geld mit dieser App. Wir versuchen, ein privates anonymes Internet zu schaffen \ n \ nWenn Sie der Meinung sind, dass diese App funktioniert, bewerten Sie uns bitte. Sie gibt uns Hoffnung und Kraft, weiterzumachen</string>
-    public <string name="RATE_POSITIVE">Gefällt mir diese App</string>
-    public <string name="RATE_NEGATIVE">Diese App gefällt mir nicht</string>
-
-    public <string name="RATE_SUCCESS_TITLE">Tut mir leid das zu hören!</string>
-    public <string name="RATE_SUCCESS_DESC">Wenn Sie Probleme haben und uns kontaktieren möchten, senden Sie uns bitte eine E-Mail an gamesolstudios@gmail.com. Wir werden versuchen, Ihr Problem so schnell wie möglich zu lösen</string>
-    public <string name="RATE_SUCCESS_BT_1">Send Mail</string>
-
-    public <string name="BOOKMARK_URL_BT_1">Lesezeichen</string>
-    public <string name="BOOKMARK_URL_BT_2">Entlassen</string>
-
-    public <string name="CLEAR_HISTORY_TITLE">Site-Speicher löschen?</string>
-    public <string name="CLEAR_HISTORY_DESC">Dadurch werden Daten für alle Sites gelöscht</string>
-    public <string name="CLEAR_HISTORY_BT_1">klar</string>
-    public <string name="CLEAR_HISTORY_BT_2">Entlassen</string>
-
-    public <string name="CLEAR_TAB_TITLE">Offene Tabs löschen?</string>
-    public <string name="CLEAR_TAB_DESC">Dadurch werden alle gespeicherten Registerkarten gelöscht</string>
-    public <string name="CLEAR_TAB_BT_1">klar</string>
-
-    public <string name="clear_bookmark_title">Site-Lesezeichen löschen?</string>
-    public <string name="clear_bookmark_desc">Dadurch werden Daten für alle gespeicherten Sites gelöscht \ n</string>
-    public <string name="clear_bookmark_bt1">klar</string>
-    public <string name="clear_bookmark_bt2">Entlassen</string>
-
-    public <string name="DOWNLOAD_TITLE">Benachrichtigung herunterladen</string>
-    public <string name="DOWNLOAD_MESSAGE">Datei herunterladen |</string>
-    public <string name="DOWNLOAD_POSITIVE">Herunterladen</string>
-
-    public <string name="BRIDGE_MAIL_TITLE">Neue Brücke anfordern</string>
-    public <string name="BRIDGE_MAIL_MESSAGE">Sie können eine Bridge-Adresse per E-Mail, im Internet oder durch Scannen eines Bridge-QR-Codes erhalten. Wählen Sie unten E-Mail , um eine Bridge-Adresse anzufordern. \ N \ nWenn Sie eine Adresse haben, kopieren Sie diese</string>
-    public <string name="BRIDGE_MAIL_POSITIVE">EMAIL</string>
-
-    public <string name="LONG_URL_TITLE">URL-Benachrichtigung</string>
-    public <string name="LONG_URL_MESSAGE" />
-    public <string name="LONG_URL_OPTION_1">In neuem Tab öffnen</string>
-    public <string name="LONG_URL_OPTION_2">In der Registerkarte "Aktuell" öffnen</string>
-    public <string name="LONG_URL_OPTION_3">In die Zwischenablage kopieren</string>
-    public <string name="LONG_URL_OPTION_4">Laden Sie diese Datei herunter</string>
-
-    public <string name="LONG_URL_FULL_MESSAGE">URL Beschreibung</string>
-    public <string name="LONG_URL_FULL_OPTION_1">Öffnen Sie die URL in einem neuen Tab</string>
-    public <string name="LONG_URL_FULL_OPTION_2">Öffnen Sie die URL im aktuellen Tab</string>
-    public <string name="LONG_URL_FULL_OPTION_3">URL in Zwischenablage kopieren</string>
-    public <string name="LONG_URL_FULL_OPTION_4">Öffne das Bild in einem neuen Tab</string>
-    public <string name="LONG_URL_FULL_OPTION_5">Öffnen Sie die Registerkarte "Bild aktuell"</string>
-    public <string name="LONG_URL_FULL_OPTION_6">Bild in Zwischenablage kopieren</string>
-    public <string name="LONG_URL_FULL_OPTION_7">Bilddatei herunterladen</string>
-
-    public <string name="BANNED_TITLE">Ist Tor in Ihrem Land verboten?</string>
-    public <string name="BANNED_DESC">Aktivieren Sie free GATEWAY, um durch gesperrte Konfiguration zu tunneln Verwenden Sie es nur, wenn tor in Ihrem Land verboten ist</string>
-
-    /*Tab Manager*/
-
-    public <string name="CLEAR_TABS">CLEAR TABS</string>
-
-    /*Bridge Manager*/
-
-    public <string name="CUSTOM_BRIDGE">obfs4</string>
-
-    /*Text Manager*/
-
-    public <string name="DARK_WEB">Verstecktes Web</string>
-    public <string name="EMPTY_STR" />
-    public <string name="EMPTY_SPACE" />
-
-    /*Settings Manager*/
-
-    public <string name="CUSTOM_FONTS">Benutzerdefinierte Schriftart</string>
-    public <string name="PERCENT_SIGN">%.</string>
-    public <string name="DEFAULT_LANGUAGE">ru</string>
-
-    /*Bookmark Manager*/
-
-    public <string name="CLEAR_BOOKMARK">LESEN SIE BUCHMARKE</string>
-
-    /*Home Manager*/
-
-    public <string name="BLANK_PAGE">ungefähr: leer</string>
-
-    /*Events*/
-
-    public <string name="APP_STARTED">APP_STARTED</string>
-    public <string name="PROXY_CHANGED">PROXY_CHANGED</string>
-    public <string name="APP_RESTARTED">APP_RESTARTED</string>
-    public <string name="APP_FINISHED">APP_FINISHED</string>
-    public <string name="SEARCH_SWITCH">SEARCH_SWITCH</string>
-    public <string name="SETTINGS_OPENED">SETTINGS_OPENED</string>
-    public <string name="URL_BOOKMARKED">URL_BOOKMARKED</string>
-    public <string name="BOOKMARK_OPENED" translatable="false">BOOKMARK_OPENED</string>
-    public <string name="TAB_OPENED">TAB_OPENED</string>
-    public <string name="GATEWAY_OPENED">GATEWAY_OPENED</string>
-    public <string name="HISTORY_OPENED">HISTORY_OPENED</string>
-    public <string name="HISTORY_TRIGGERED">HISTORY_TRIGGERED</string>
-    public <string name="BOOKMARK_TRIGGERED">BOOKMARK_TRIGGERED</string>
-    public <string name="TAB_TRIGGERED">TAB_TRIGGERED</string>
-    public <string name="URL_ERROR">URL_ERROR</string>
-    public <string name="URL_ERROR_NOT_LOADED">URL_ERROR_NOT_LOADED</string>
-    public <string name="PAGE_OPENED_SUCCESS">PAGE_OPENED_SUCCESS</string>
-    public <string name="HOME_INVOKED">HOME_INVOKED</string>
-    public <string name="SEARCH_INVOKED">SEARCH_INVOKED</string>
-    public <string name="MENU_INVOKED">MENU_INVOKED</string>
-    public <string name="ON_BACK">AUF DER RÜCKSEITE</string>
-
-
-    <string name="landing_next_page">Nächster</string>
-
-
-    <string name="listview_clear">klar</string>
-
-
-    <string name="popup_new_tabs">Neue Registerkarten</string>
-    <string name="popup_close_tabs">Tab schließen</string>
-    <string name="popup_open_Recent_tab">Öffnen Sie die letzten Registerkarten</string>
-    <string name="popup_languages">Sprache</string>
-    <string name="popup_download">Downloads</string>
-    <string name="popup_history">Geschichte</string>
-    <string name="popup_settings">die Einstellungen</string>
-    <string name="popup_bookmark_page">Ein Lesezeichen auf diese Seite setzen</string>
-    <string name="popup_open_bookmark">Offene Lesezeichen</string>
-    <string name="popup_report">Report Website</string>
-    <string name="popup_rate">Bewerte diese App</string>
-    <string name="popup_share">Teilen</string>
-
-
-
-    <string name="orbot_settings_warning">⚠ Warnung</string>
-    <string name="orbot_settings_bridges">Brücken aktivieren</string>
-    <string name="gateway_info">Gateway aktivieren</string>
-    <string name="gateway_button">Gateway aktivieren</string>
-    <string name="loading_please_wait">Laden, bitte warten</string>
-    <string name="orbot_option_title_reset">App beim Laden hängen geblieben</string>
-    <string name="orbot_option_desc_reset">Lager räumen</string>
-    <string name="orbot_option_desc_reset_button">Einstellungen öffnen</string>
-
-
-    <string name="orbot_header">Proxy-Einstellungen</string>
-    <string name="orbot_desc">Genesis Browser verbindet Sie mit dem Tor-Netzwerk, das von Tausenden von Freiwilligen auf der ganzen Welt betrieben wird! Können Ihnen diese Optionen helfen?</string>
-    <string name="orbot_option_title">Das Internet wird hier zensiert</string>
-    <string name="orbot_option_desc">Firewall umgehen</string>
-    <string name="orbot_option_warning_slow_speed">Bridges führt dazu, dass das Internet sehr langsam läuft. Verwenden Sie sie nur, wenn das Internet in Ihrem Land zensiert oder das Tor-Netzwerk blockiert ist</string>
-
-
-
-
-    <string name="bookmark_clear_history">Verlauf löschen</string>
-    <string name="tab_view_clear_bookmark">Lesezeichen löschen</string>
-
-
-    <string name="hint_default_suggession">BBC | Israel schlägt erneut zu</string>
-
-
-    <string name="notification_default_label">default.jpg</string>
-    <string name="notification_open_text">Öffnen</string>
-
-
-    <string name="tab_view_increment">1</string>
-    <string name="tab_view_search_tab">Registerkarten suchen</string>
-    <string name="tab_view_clear_tab">Tab löschen</string>
-
-
-    <string name="home_tab_text">1</string>
-    <string name="home_connect">Connect</string>
-    <string name="home_loading">Laden, bitte warten</string>
-
-
-    <string name="bridges_sometimes">"Manchmal braucht man eine Brücke, um nach Tor zu gelangen."</string>
-    <string name="action_more">"ERZÄHL MIR MEHR"</string>
-    <string name="vpn_setup">"Mit unserem integrierten VPN können Sie jeder App ermöglichen, Tor zu durchlaufen."</string>
-    <string name="vpn_setup_sub">"Das macht dich nicht anonym, aber es hilft dir, durch Firewalls zu kommen."</string>
-    <string name="action_vpn_choose">"APPS WÄHLEN"</string>
-    <string name="hello">"Hallo"</string>
-    <string name="welcome">"Willkommen bei Tor auf dem Handy."</string>
-    <string name="browser_the_internet">"Surfen Sie im Internet, wie Sie es erwarten."</string>
-    <string name="no_tracking">"Keine Verfolgung. Keine Zensur."</string>
-
-
-    <string name="error_m1">Diese Seite kann nicht erreicht werden</string>
-    <string name="error_m2">Während einer Verbindung ist ein Fehler aufgetreten</string>
-    <string name="error_m3">Die Seite, die Sie anzeigen möchten, kann nicht angezeigt werden, da die Authentizität der empfangenen Daten nicht überprüft werden konnte</string>
-    <string name="error_m4">Die Seite ist derzeit aus irgendeinem Grund nicht aktiv oder nicht verfügbar</string>
-    <string name="error_m5">Bitte wenden Sie sich an die Eigentümer der Website, um sie über dieses Problem zu informieren.</string>
-    <string name="error_m6" >Neu laden</string>
-
-
-    <string-array name="fonts">
-        <item>55 Prozent</item>
-        <item>70 Prozent</item>
-        <item>85 Prozent</item>
-        <item>100 Prozent</item>
-        <item>115 Prozent</item>
-        <item>130 Prozent</item>
-        <item>145 Prozent</item>
-    </string-array>
-
-    <string-array name="search_engines">
-        <item>Verstecktes Web</item>
-        <item>Google</item>
-        <item>Duck Duck Go</item>
-    </string-array>
-
-    <string-array name="boolean_option">
-        <item>aktiviert</item>
-        <item>Deaktiviert</item>
-    </string-array>
-
-    <string-array name="notification">
-        <item>Alles aktivieren</item>
-        <item>Alle deaktivieren</item>
-        <item>Keine Bandbreite</item>
-    </string-array>
-
-    <string-array name="cookies">
-        <item>Alles erlauben</item>
-        <item>Vertrauenswürdig zulassen</item>
-        <item>Keine zulassen</item>
-        <item>Besuch zulassen</item>
-        <item>Nicht-Tracker zulassen</item>
-    </string-array>
-
-    <!-- Generated by Automatic String Resource Translation
-    --><!--          https://asrt.gluege.boerde.de
---></resources>
\ No newline at end of file
+\</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
old mode 100755
new mode 100644
index ccd32483..8b3aba2f
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,313 +1,4 @@
 <resources>
 
 
-    <!-- Generated by Automatic String Resource Translation
---><!--          https://asrt.gluege.boerde.de
---><string name="app_name" translatable="false">Genesis</string>
-    <string name="HP_SEARCH_HINT">Cronologia delle ricerche</string>
-    <string name="SearchHintMain">Cerca o digita l\'indirizzo web</string>
-    <string name="homeUrl" translatable="false">https://genesis.onion</string>
-    <string name="errorTiyle">\ U0020 \ u0020 \ u0020Opps! Qualcosa è andato storto</string>
-    <string name="todo">TUTTI</string>
-    <string name="projectName">Motore di ricerca Genesis</string>
-    <string name="loadingText">Libertà online</string>
-    <string name="reload">Ricaricare</string>
-    <string name="internetErrorMessage">Questi potrebbero essere i problemi che stai riscontrando \ n \ n • Pagina Web o Sito Web potrebbero essere inattivi \ n • La tua connessione Internet potrebbe essere scarsa \ n • Potresti utilizzare un proxy \ n • Il sito Web potrebbe essere bloccato dal firewall</string>
-    <string name="title_activity_list_manager">list_manager</string>
-    <string name="title_activity_setting_controller">impostazioni</string>
-    <string name="file_provider_authority">com.darkweb.genesissearchengine.fileprovider</string>
-
-
-    <string name="preferences_messages_header">messaggi</string>
-    <string name="preferences_sync_header">Sync</string>
-
-
-    <string name="messages_signature_title">La tua firma</string>
-    <string name="messages_reply_title">Azione di risposta predefinita</string>
-
-
-    <string name="settings_basic_settings">Impostazioni di base</string>
-    <string name="settings_header">impostazioni</string>
-    <string name="settings_search_engine">Motore di ricerca</string>
-    <string name="settings_javascript">Javascript</string>
-    <string name="settings_clear_history">Cancella cronologia automatica</string>
-    <string name="settings_font_title">Impostazioni dei caratteri</string>
-    <string name="settings_adjust_font">Carattere personalizzato</string>
-    <string name="settings_manual_font">Carattere regolazione automatica</string>
-    <string name="settings_cookies">Impostazioni dei cookie</string>
-    <string name="settings_cookie">biscotti</string>
-    <string name="settings_notification">Gestisci notifica</string>
-
-
-    <string name="security_basic_settings">Impostazioni di base</string>
-    <string name="bridge_Automatid_title">Crea automaticamente</string>
-    <string name="bridge_Manual_desc">Fornire un ponte che conosco</string>
-    <string name="bridge_Auto_switch">Auto</string>
-    <string name="bridge_Manual_switch">Manuale</string>
-    <string name="bridge_port_hint">indirizzo: porta</string>
-    <string name="bridge_header">Impostazioni Bridge</string>
-    <string name="bridge_desc">I bridge sono relè Tor non elencati che rendono più difficile il blocco delle connessioni nella rete Tor. A causa di come alcuni paesi cercano di bloccare Tor, alcuni ponti funzionano in alcuni paesi ma non in altri</string>
-    <string name="bridge_default_title">Seleziona Bridge predefinito</string>
-    <string name="bridge_request">Impostazioni di base</string>
-
-
-    public <string name="WELCOME_MESSAGE_TITLE">Benvenuti | Gateway Web nascosto</string>
-    public <string name="WELCOME_MESSAGE_DESC">Questa applicazione fornisce una piattaforma per la ricerca e l\'apertura di URL Web nascosti. Ecco alcuni suggerimenti \ n</string>
-    public <string name="WELCOME_MESSAGE_BT_1">Deep Web Online Market</string>
-    public <string name="WELCOME_MESSAGE_BT_2">Documenti e libri trapelati</string>
-    public <string name="WELCOME_MESSAGE_BT_3">Notizie e articoli di Dark Web</string>
-    public <string name="WELCOME_MESSAGE_BT_4">Software segreti e strumenti di hacking</string>
-    public <string name="WELCOME_MESSAGE_BT_5">Non mostrare più</string>
-
-    public <string name="ABI_ERROR_TITLE">File di installazione non valido</string>
-    public <string name="ABI_ERROR_DESC">Sembra che tu abbia incasinato l\'installazione. Installalo dalla Playstore o segui il link</string>
-    public <string name="ABI_ERROR_BT_1">Aggiornamento locale</string>
-    public <string name="ABI_ERROR_BT_2">Aggiorna Playstore</string>
-    public <string name="ABI_ERROR_BT_3">Continua comunque</string>
-
-    public <string name="REPORT_URL_TITLE">Segnala questo sito Web</string>
-    public <string name="REPORT_URL_DESC">Se ritieni che l\'URL sia illegale o inquietante segnalaci in modo che possiamo aggiornare il nostro database \ n</string>
-    public <string name="REPORT_URL_BT_1">rapporto</string>
-    public <string name="REPORT_URL_BT_2">Respingere</string>
-
-    public <string name="ORBOT_INIT_TITLE">L\'inizializzazione</string>
-    public <string name="ORBOT_INIT_DESC">Attendere prego! Mentre ti colleghiamo al Web nascosto. Questa operazione potrebbe richiedere alcuni minuti \ n</string>
-    public <string name="ORBOT_INIT_BT_1">Respingere</string>
-    public <string name="ORBOT_INIT_BT_2">Riprova</string>
-
-    public <string name="ORBOT_CLEAR_TITLE">Dati cancellati</string>
-    public <string name="ORBOT_CLEAR_DESC">I dati della genesi sono stati cancellati. Prova ad avviare l\'applicazione dalla home page \ n</string>
-    public <string name="ORBOT_CLEAR_BT_1">Respingere</string>
-
-    public <string name="VERSION_TITLE">Aggiornamento in sospeso</string>
-    public <string name="VERSION_DESC">Non hai aggiornato questa app per un po \', aggiornala per ottenere le migliori prestazioni \ n</string>
-    public <string name="VERSION_BT_1">Aggiornare</string>
-
-    public <string name="REPORT_SUCCESS_TITLE">URL segnalato correttamente</string>
-    public <string name="REPORT_SUCCESS_DESC">L\'URL è stato segnalato correttamente. Ci vorrà circa una settimana per rimuovere completamente questo sito Web dai nostri server \ n</string>
-    public <string name="REPORT_SUCCESS_BT_1">Respingere</string>
-
-    public <string name="RATE_TITLE">Valuta gli Stati Uniti</string>
-    public <string name="RATE_MESSAGE">Non accettiamo donazioni o guadagniamo denaro da questa app. Stiamo cercando di creare un Internet anonimo privato \ n \ nSe pensi che questa app funzioni, ti preghiamo di valutarci, ci dà speranza e forza per continuare</string>
-    public <string name="RATE_POSITIVE">Mi piace questa app</string>
-    public <string name="RATE_NEGATIVE">Non ti piace questa app</string>
-
-    public <string name="RATE_SUCCESS_TITLE">Mi dispiace sentirlo!</string>
-    public <string name="RATE_SUCCESS_DESC">Se hai problemi e vuoi contattarci, scrivici a gamesolstudios@gmail.com. Proveremo a risolvere il tuo problema il prima possibile</string>
-    public <string name="RATE_SUCCESS_BT_1">Invia posta</string>
-
-    public <string name="BOOKMARK_URL_BT_1">Segnalibro</string>
-    public <string name="BOOKMARK_URL_BT_2">Respingere</string>
-
-    public <string name="CLEAR_HISTORY_TITLE">Cancella l\'archiviazione del sito?</string>
-    public <string name="CLEAR_HISTORY_DESC">Questo cancellerà i dati per tutti i siti</string>
-    public <string name="CLEAR_HISTORY_BT_1">Chiaro</string>
-    public <string name="CLEAR_HISTORY_BT_2">Respingere</string>
-
-    public <string name="CLEAR_TAB_TITLE">Cancella le schede aperte?</string>
-    public <string name="CLEAR_TAB_DESC">Questo cancellerà tutte le schede memorizzate</string>
-    public <string name="CLEAR_TAB_BT_1">Chiaro</string>
-
-    public <string name="clear_bookmark_title">Cancellare il segnalibro del sito?</string>
-    public <string name="clear_bookmark_desc">Ciò cancellerà i dati per tutti i siti salvati \ n</string>
-    public <string name="clear_bookmark_bt1">Chiaro</string>
-    public <string name="clear_bookmark_bt2">Respingere</string>
-
-    public <string name="DOWNLOAD_TITLE">Scarica la notifica</string>
-    public <string name="DOWNLOAD_MESSAGE">Download File |</string>
-    public <string name="DOWNLOAD_POSITIVE">Scarica</string>
-
-    public <string name="BRIDGE_MAIL_TITLE">Richiedi nuovo ponte</string>
-    public <string name="BRIDGE_MAIL_MESSAGE">Puoi ottenere un indirizzo bridge tramite e-mail, web o scansionando un codice QR bridge. Seleziona Email in basso per richiedere un indirizzo bridge. \ N \ nUna volta che hai un indirizzo, copia</string>
-    public <string name="BRIDGE_MAIL_POSITIVE">E-MAIL</string>
-
-    public <string name="LONG_URL_TITLE">Notifica URL</string>
-    public <string name="LONG_URL_MESSAGE" />
-    public <string name="LONG_URL_OPTION_1">Apri in una nuova scheda</string>
-    public <string name="LONG_URL_OPTION_2">Apri nella scheda corrente</string>
-    public <string name="LONG_URL_OPTION_3">Copia negli appunti</string>
-    public <string name="LONG_URL_OPTION_4">Scarica questo file</string>
-
-    public <string name="LONG_URL_FULL_MESSAGE">Descrizione URL</string>
-    public <string name="LONG_URL_FULL_OPTION_1">Apri l\'URL in una nuova scheda</string>
-    public <string name="LONG_URL_FULL_OPTION_2">Apri l\'URL nella scheda corrente</string>
-    public <string name="LONG_URL_FULL_OPTION_3">Copia l\'URL negli appunti</string>
-    public <string name="LONG_URL_FULL_OPTION_4">Apri l\'immagine in una nuova scheda</string>
-    public <string name="LONG_URL_FULL_OPTION_5">Apri la scheda corrente dell\'immagine</string>
-    public <string name="LONG_URL_FULL_OPTION_6">Copia l\'immagine negli appunti</string>
-    public <string name="LONG_URL_FULL_OPTION_7">Scarica il file immagine</string>
-
-    public <string name="BANNED_TITLE">Tor è vietato nel tuo paese?</string>
-    public <string name="BANNED_DESC">Abilita GATEWAY gratuito per tunnel attraverso la configurazione vietata | Usalo solo se tor è vietato nel tuo paese</string>
-
-    /*Tab Manager*/
-
-    public <string name="CLEAR_TABS">SCHEDE TRASPARENTI</string>
-
-    /*Bridge Manager*/
-
-    public <string name="CUSTOM_BRIDGE">obfs4</string>
-
-    /*Text Manager*/
-
-    public <string name="DARK_WEB">Hidden Web</string>
-    public <string name="EMPTY_STR" />
-    public <string name="EMPTY_SPACE" />
-
-    /*Settings Manager*/
-
-    public <string name="CUSTOM_FONTS">Carattere personalizzato</string>
-    public <string name="PERCENT_SIGN">%</string>
-    public <string name="DEFAULT_LANGUAGE">ru</string>
-
-    /*Bookmark Manager*/
-
-    public <string name="CLEAR_BOOKMARK">LIBRO SEGNALIBRO</string>
-
-    /*Home Manager*/
-
-    public <string name="BLANK_PAGE">su bianco</string>
-
-    /*Events*/
-
-    public <string name="APP_STARTED">APP_STARTED</string>
-    public <string name="PROXY_CHANGED">PROXY_CHANGED</string>
-    public <string name="APP_RESTARTED">APP_RESTARTED</string>
-    public <string name="APP_FINISHED">APP_FINISHED</string>
-    public <string name="SEARCH_SWITCH">SEARCH_SWITCH</string>
-    public <string name="SETTINGS_OPENED">SETTINGS_OPENED</string>
-    public <string name="URL_BOOKMARKED">URL_BOOKMARKED</string>
-    public <string name="BOOKMARK_OPENED" translatable="false">BOOKMARK_OPENED</string>
-    public <string name="TAB_OPENED">TAB_OPENED</string>
-    public <string name="GATEWAY_OPENED">GATEWAY_OPENED</string>
-    public <string name="HISTORY_OPENED">HISTORY_OPENED</string>
-    public <string name="HISTORY_TRIGGERED">HISTORY_TRIGGERED</string>
-    public <string name="BOOKMARK_TRIGGERED">BOOKMARK_TRIGGERED</string>
-    public <string name="TAB_TRIGGERED">TAB_TRIGGERED</string>
-    public <string name="URL_ERROR">URL_ERROR</string>
-    public <string name="URL_ERROR_NOT_LOADED">URL_ERROR_NOT_LOADED</string>
-    public <string name="PAGE_OPENED_SUCCESS">PAGE_OPENED_SUCCESS</string>
-    public <string name="HOME_INVOKED">HOME_INVOKED</string>
-    public <string name="SEARCH_INVOKED">SEARCH_INVOKED</string>
-    public <string name="MENU_INVOKED">MENU_INVOKED</string>
-    public <string name="ON_BACK">ON_BACK</string>
-
-
-    <string name="landing_next_page">Il prossimo</string>
-
-
-    <string name="listview_clear">Chiaro</string>
-
-
-    <string name="popup_new_tabs">Nuove schede</string>
-    <string name="popup_close_tabs">Chiudi scheda</string>
-    <string name="popup_open_Recent_tab">Apri le schede recenti</string>
-    <string name="popup_languages">linguaggio</string>
-    <string name="popup_download">download</string>
-    <string name="popup_history">Storia</string>
-    <string name="popup_settings">impostazioni</string>
-    <string name="popup_bookmark_page">Metti questa pagina nei preferiti</string>
-    <string name="popup_open_bookmark">Apri segnalibri</string>
-    <string name="popup_report">Segnala sito Web</string>
-    <string name="popup_rate">Valuta questa applicazione</string>
-    <string name="popup_share">Condividere</string>
-
-
-
-    <string name="orbot_settings_warning">⚠ Avvertenza</string>
-    <string name="orbot_settings_bridges">Abilita ponti</string>
-    <string name="gateway_info">Abilita gateway</string>
-    <string name="gateway_button">Abilita gateway</string>
-    <string name="loading_please_wait">Attendere il caricamento prego</string>
-    <string name="orbot_option_title_reset">App bloccata nel caricamento</string>
-    <string name="orbot_option_desc_reset">Spazio pulito</string>
-    <string name="orbot_option_desc_reset_button">Apri Impostazioni</string>
-
-
-    <string name="orbot_header">Impostazioni proxy</string>
-    <string name="orbot_desc">Genesis Browser ti collega alla rete Tor gestita da migliaia di volontari in tutto il mondo! Queste opzioni possono aiutarti?</string>
-    <string name="orbot_option_title">Internet è censurato qui</string>
-    <string name="orbot_option_desc">Bypass Firewall</string>
-    <string name="orbot_option_warning_slow_speed">Bridges causa il rallentamento di Internet. Usali solo se Internet è censurato nel tuo paese o la rete Tor è bloccata</string>
-
-
-
-
-    <string name="bookmark_clear_history">Cancellare la cronologia</string>
-    <string name="tab_view_clear_bookmark">Cancella segnalibro</string>
-
-
-    <string name="hint_default_suggession">BBC | Israele colpisce ancora</string>
-
-
-    <string name="notification_default_label">default.jpg</string>
-    <string name="notification_open_text">Aperto</string>
-
-
-    <string name="tab_view_increment">1</string>
-    <string name="tab_view_search_tab">Schede di ricerca</string>
-    <string name="tab_view_clear_tab">Cancella scheda</string>
-
-
-    <string name="home_tab_text">1</string>
-    <string name="home_connect">Connect</string>
-    <string name="home_loading">Attendere il caricamento prego</string>
-
-
-    <string name="bridges_sometimes">"A volte hai bisogno di un ponte per arrivare a Tor."</string>
-    <string name="action_more">"DIMMI DI PIÙ"</string>
-    <string name="vpn_setup">"Puoi abilitare qualsiasi app a passare attraverso Tor utilizzando la nostra VPN integrata."</string>
-    <string name="vpn_setup_sub">"Questo non ti renderà anonimo, ma ti aiuterà a superare i firewall."</string>
-    <string name="action_vpn_choose">"SCEGLI LE APP"</string>
-    <string name="hello">"Ciao"</string>
-    <string name="welcome">"Benvenuto in Tor su dispositivo mobile."</string>
-    <string name="browser_the_internet">"Naviga in Internet come ti aspetti che dovresti".</string>
-    <string name="no_tracking">"Nessun monitoraggio. Nessuna censura."</string>
-
-
-    <string name="error_m1">Questo sito non è raggiungibile</string>
-    <string name="error_m2">Si è verificato un errore durante una connessione</string>
-    <string name="error_m3">Non è possibile visualizzare la pagina che si sta tentando di visualizzare perché non è stato possibile verificare l\'autenticità dei dati ricevuti</string>
-    <string name="error_m4">La pagina al momento non è attiva o inattiva per qualche motivo</string>
-    <string name="error_m5">Si prega di contattare i proprietari del sito Web per informarli di questo problema.</string>
-    <string name="error_m6" >Ricaricare</string>
-
-
-    <string-array name="fonts">
-        <item>55 per cento</item>
-        <item>70 per cento</item>
-        <item>85 per cento</item>
-        <item>100 percento</item>
-        <item>115 percento</item>
-        <item>130 per cento</item>
-        <item>145 per cento</item>
-    </string-array>
-
-    <string-array name="search_engines">
-        <item>Hidden Web</item>
-        <item>Google</item>
-        <item>Duck Duck Go</item>
-    </string-array>
-
-    <string-array name="boolean_option">
-        <item>Abilitato</item>
-        <item>Disabilitato</item>
-    </string-array>
-
-    <string-array name="notification">
-        <item>Attiva tutto</item>
-        <item>Disabilitare tutto</item>
-        <item>Nessuna larghezza di banda</item>
-    </string-array>
-
-    <string-array name="cookies">
-        <item>Permettere tutto</item>
-        <item>Consenti affidabile</item>
-        <item>Consenti nessuno</item>
-        <item>Consenti visitato</item>
-        <item>Allow Non Tracker</item>
-    </string-array>
-
-    <!-- Generated by Automatic String Resource Translation
-    --><!--          https://asrt.gluege.boerde.de
---></resources>
\ No newline at end of file
+ </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
old mode 100755
new mode 100644
index c5ebf587..6b30d8d9
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,313 +1,3 @@
 <resources>
 
-
-    <!-- Generated by Automatic String Resource Translation
---><!--          https://asrt.gluege.boerde.de
---><string name="app_name" translatable="false">Genesis</string>
-    <string name="HP_SEARCH_HINT">Histórico de busca</string>
-    <string name="SearchHintMain">Pesquise ou digite o endereço da web</string>
-    <string name="homeUrl" translatable="false">https://genesis.onion</string>
-    <string name="errorTiyle">\ u0020 \ u0020 \ u0020Opps! Alguma coisa deu errado</string>
-    <string name="todo">TODO</string>
-    <string name="projectName">Genesis Search Engine</string>
-    <string name="loadingText">Liberdade Online</string>
-    <string name="reload">recarregar</string>
-    <string name="internetErrorMessage">Estes podem ser os problemas que você está enfrentando \ n \ n • Página ou site pode estar inoperante \ n • Sua conexão com a Internet pode estar ruim \ n • Você pode estar usando um proxy \ n • O site pode estar bloqueado por firewall</string>
-    <string name="title_activity_list_manager">list_manager</string>
-    <string name="title_activity_setting_controller">Configurações</string>
-    <string name="file_provider_authority">com.darkweb.genesissearchengine.fileprovider</string>
-
-
-    <string name="preferences_messages_header">Mensagens</string>
-    <string name="preferences_sync_header">Sincronizar</string>
-
-
-    <string name="messages_signature_title">Sua assinatura</string>
-    <string name="messages_reply_title">Ação de resposta padrão</string>
-
-
-    <string name="settings_basic_settings">Configurações básicas</string>
-    <string name="settings_header">Configurações</string>
-    <string name="settings_search_engine">Mecanismo de busca</string>
-    <string name="settings_javascript">Javascript</string>
-    <string name="settings_clear_history">Limpar histórico automaticamente</string>
-    <string name="settings_font_title">Configurações de fonte</string>
-    <string name="settings_adjust_font">Fonte Personalizada</string>
-    <string name="settings_manual_font">Fonte de ajuste automático</string>
-    <string name="settings_cookies">Configurações de cookies</string>
-    <string name="settings_cookie">bolinhos</string>
-    <string name="settings_notification">Gerenciar notificação</string>
-
-
-    <string name="security_basic_settings">Configurações básicas</string>
-    <string name="bridge_Automatid_title">Criar automaticamente</string>
-    <string name="bridge_Manual_desc">Forneça uma ponte que eu conheço</string>
-    <string name="bridge_Auto_switch">Auto</string>
-    <string name="bridge_Manual_switch">Manual</string>
-    <string name="bridge_port_hint">endereço: porta</string>
-    <string name="bridge_header">Configurações de ponte</string>
-    <string name="bridge_desc">Pontes são relés Tor não listados que dificultam o bloqueio de conexões na rede Tor. Por causa de como alguns países tentam bloquear o Tor, certas pontes funcionam em alguns países, mas não em outros.</string>
-    <string name="bridge_default_title">Selecionar ponte padrão</string>
-    <string name="bridge_request">Configurações básicas</string>
-
-
-    public <string name="WELCOME_MESSAGE_TITLE">Bem-vindo | Gateway da Web oculto</string>
-    public <string name="WELCOME_MESSAGE_DESC">Este aplicativo fornece uma plataforma para pesquisar e abrir URLs da Web ocultos. Aqui estão algumas sugestões \ n</string>
-    public <string name="WELCOME_MESSAGE_BT_1">Mercado Online da Deep Web</string>
-    public <string name="WELCOME_MESSAGE_BT_2">Documentos e Livros Vazados</string>
-    public <string name="WELCOME_MESSAGE_BT_3">Notícias e Artigos da Dark Web</string>
-    public <string name="WELCOME_MESSAGE_BT_4">Softwares secretos e ferramentas de hackers</string>
-    public <string name="WELCOME_MESSAGE_BT_5">Não mostre novamente</string>
-
-    public <string name="ABI_ERROR_TITLE">Arquivo de instalação inválido</string>
-    public <string name="ABI_ERROR_DESC">Parece que você estragou a instalação. Instale-o no playstore ou siga o link</string>
-    public <string name="ABI_ERROR_BT_1">Atualização local</string>
-    public <string name="ABI_ERROR_BT_2">Atualizar Playstore</string>
-    public <string name="ABI_ERROR_BT_3">Continue de qualquer maneira</string>
-
-    public <string name="REPORT_URL_TITLE">Denunciar este site</string>
-    public <string name="REPORT_URL_DESC">Se você acha que o URL é ilegal ou perturbador, informe-nos para que possamos atualizar nosso banco de dados \ n</string>
-    public <string name="REPORT_URL_BT_1">Relatório</string>
-    public <string name="REPORT_URL_BT_2">Dispensar</string>
-
-    public <string name="ORBOT_INIT_TITLE">Inicializando</string>
-    public <string name="ORBOT_INIT_DESC">Por favor, espere! Enquanto o conectamos à Web oculta. Isso pode levar alguns minutos \ n</string>
-    public <string name="ORBOT_INIT_BT_1">Dispensar</string>
-    public <string name="ORBOT_INIT_BT_2">Tente novamente</string>
-
-    public <string name="ORBOT_CLEAR_TITLE">Dados apagados</string>
-    public <string name="ORBOT_CLEAR_DESC">Os dados do Genesis foram limpos. Tente iniciar o aplicativo na página inicial \ n</string>
-    public <string name="ORBOT_CLEAR_BT_1">Dispensar</string>
-
-    public <string name="VERSION_TITLE">Atualização pendente</string>
-    public <string name="VERSION_DESC">Você não atualiza este aplicativo há um tempo. Atualize-o para obter o melhor desempenho \ n</string>
-    public <string name="VERSION_BT_1">Atualizar</string>
-
-    public <string name="REPORT_SUCCESS_TITLE">URL relatado com sucesso</string>
-    public <string name="REPORT_SUCCESS_DESC">URL foi relatado com sucesso. Levará cerca de uma semana para remover completamente este site dos nossos servidores \ n</string>
-    public <string name="REPORT_SUCCESS_BT_1">Dispensar</string>
-
-    public <string name="RATE_TITLE">Nos avalie</string>
-    public <string name="RATE_MESSAGE">Não aceitamos doações ou ganhamos dinheiro com este aplicativo. Estamos tentando criar uma Internet anônima privada \ n \ nSe você acha que esse aplicativo funciona, avalie-nos, isso nos dá esperança e força para continuar</string>
-    public <string name="RATE_POSITIVE">Like This App</string>
-    public <string name="RATE_NEGATIVE">Não gosto deste aplicativo</string>
-
-    public <string name="RATE_SUCCESS_TITLE">Desculpe ouvir isso!</string>
-    public <string name="RATE_SUCCESS_DESC">Se você estiver tendo algum problema e quiser entrar em contato, envie um email para gamesolstudios@gmail.com Vamos tentar resolver o seu problema o mais rápido possível</string>
-    public <string name="RATE_SUCCESS_BT_1">Enviar correio</string>
-
-    public <string name="BOOKMARK_URL_BT_1">marca páginas</string>
-    public <string name="BOOKMARK_URL_BT_2">Dispensar</string>
-
-    public <string name="CLEAR_HISTORY_TITLE">Limpar o armazenamento do site?</string>
-    public <string name="CLEAR_HISTORY_DESC">Isso limpará os dados de todos os sites</string>
-    public <string name="CLEAR_HISTORY_BT_1">Claro</string>
-    public <string name="CLEAR_HISTORY_BT_2">Dispensar</string>
-
-    public <string name="CLEAR_TAB_TITLE">Limpar abas abertas?</string>
-    public <string name="CLEAR_TAB_DESC">Isso limpará todas as guias armazenadas</string>
-    public <string name="CLEAR_TAB_BT_1">Claro</string>
-
-    public <string name="clear_bookmark_title">Limpar marcador de site?</string>
-    public <string name="clear_bookmark_desc">Isso limpará os dados de todos os sites salvos \ n</string>
-    public <string name="clear_bookmark_bt1">Claro</string>
-    public <string name="clear_bookmark_bt2">Dispensar</string>
-
-    public <string name="DOWNLOAD_TITLE">Notificação de Download</string>
-    public <string name="DOWNLOAD_MESSAGE">Baixar arquivo |</string>
-    public <string name="DOWNLOAD_POSITIVE">Baixar</string>
-
-    public <string name="BRIDGE_MAIL_TITLE">Solicitar nova ponte</string>
-    public <string name="BRIDGE_MAIL_MESSAGE">Você pode obter um endereço de ponte por email, na Web ou digitalizando um código QR da ponte. Selecione Email abaixo para solicitar um endereço de ponte. \ N \ nQuando você tiver um endereço, copie</string>
-    public <string name="BRIDGE_MAIL_POSITIVE">O EMAIL</string>
-
-    public <string name="LONG_URL_TITLE">Notificação de URL</string>
-    public <string name="LONG_URL_MESSAGE" />
-    public <string name="LONG_URL_OPTION_1">Abrir em uma nova guia</string>
-    public <string name="LONG_URL_OPTION_2">Abrir na guia atual</string>
-    public <string name="LONG_URL_OPTION_3">Copiar para área de transferência</string>
-    public <string name="LONG_URL_OPTION_4">Baixe este arquivo</string>
-
-    public <string name="LONG_URL_FULL_MESSAGE">URL Descrição</string>
-    public <string name="LONG_URL_FULL_OPTION_1">Abrir URL em uma nova guia</string>
-    public <string name="LONG_URL_FULL_OPTION_2">Abrir URL na guia atual</string>
-    public <string name="LONG_URL_FULL_OPTION_3">Copiar URL para a área de transferência</string>
-    public <string name="LONG_URL_FULL_OPTION_4">Abra a imagem em uma nova aba</string>
-    public <string name="LONG_URL_FULL_OPTION_5">Abrir guia atual da imagem</string>
-    public <string name="LONG_URL_FULL_OPTION_6">Copiar imagem para a área de transferência</string>
-    public <string name="LONG_URL_FULL_OPTION_7">Baixar arquivo de imagem</string>
-
-    public <string name="BANNED_TITLE">Tor é banido no seu país?</string>
-    public <string name="BANNED_DESC">Ativar o GATEWAY gratuito para fazer um túnel através da configuração proibida | Use-o somente se o tor for banido no seu país</string>
-
-    /*Tab Manager*/
-
-    public <string name="CLEAR_TABS">LIMPAR TABS</string>
-
-    /*Bridge Manager*/
-
-    public <string name="CUSTOM_BRIDGE">obfs4</string>
-
-    /*Text Manager*/
-
-    public <string name="DARK_WEB">Web oculta</string>
-    public <string name="EMPTY_STR" />
-    public <string name="EMPTY_SPACE" />
-
-    /*Settings Manager*/
-
-    public <string name="CUSTOM_FONTS">Fonte Personalizada</string>
-    public <string name="PERCENT_SIGN">%</string>
-    public <string name="DEFAULT_LANGUAGE">ru</string>
-
-    /*Bookmark Manager*/
-
-    public <string name="CLEAR_BOOKMARK">LIMPAR MARCADOR</string>
-
-    /*Home Manager*/
-
-    public <string name="BLANK_PAGE">sobre: blank</string>
-
-    /*Events*/
-
-    public <string name="APP_STARTED">APP_STARTED</string>
-    public <string name="PROXY_CHANGED">PROXY_CHANGED</string>
-    public <string name="APP_RESTARTED">APP_RESTARTED</string>
-    public <string name="APP_FINISHED">APP_FINISHED</string>
-    public <string name="SEARCH_SWITCH">SEARCH_SWITCH</string>
-    public <string name="SETTINGS_OPENED">SETTINGS_OPENED</string>
-    public <string name="URL_BOOKMARKED">URL_BOOKMARKED</string>
-    public <string name="BOOKMARK_OPENED" translatable="false">BOOKMARK_OPENED</string>
-    public <string name="TAB_OPENED">TAB_OPENED</string>
-    public <string name="GATEWAY_OPENED">GATEWAY_OPENED</string>
-    public <string name="HISTORY_OPENED">HISTORY_OPENED</string>
-    public <string name="HISTORY_TRIGGERED">HISTORY_TRIGGERED</string>
-    public <string name="BOOKMARK_TRIGGERED">BOOKMARK_TRIGGERED</string>
-    public <string name="TAB_TRIGGERED">TAB_TRIGGERED</string>
-    public <string name="URL_ERROR">URL_ERROR</string>
-    public <string name="URL_ERROR_NOT_LOADED">URL_ERROR_NOT_LOADED</string>
-    public <string name="PAGE_OPENED_SUCCESS">PAGE_OPENED_SUCCESS</string>
-    public <string name="HOME_INVOKED">HOME_INVOKED</string>
-    public <string name="SEARCH_INVOKED">SEARCH_INVOKED</string>
-    public <string name="MENU_INVOKED">MENU_INVOKED</string>
-    public <string name="ON_BACK">ON_BACK</string>
-
-
-    <string name="landing_next_page">Próximo</string>
-
-
-    <string name="listview_clear">Claro</string>
-
-
-    <string name="popup_new_tabs">Novas guias</string>
-    <string name="popup_close_tabs">Aba fechada</string>
-    <string name="popup_open_Recent_tab">Abrir separadores recentes</string>
-    <string name="popup_languages">Língua</string>
-    <string name="popup_download">Downloads</string>
-    <string name="popup_history">História</string>
-    <string name="popup_settings">Configurações</string>
-    <string name="popup_bookmark_page">Favoritar esta página</string>
-    <string name="popup_open_bookmark">Favoritos abertos</string>
-    <string name="popup_report">Denunciar site</string>
-    <string name="popup_rate">Avalie este aplicativo</string>
-    <string name="popup_share">Compartilhar</string>
-
-
-
-    <string name="orbot_settings_warning">⚠ Atenção</string>
-    <string name="orbot_settings_bridges">Ativar pontes</string>
-    <string name="gateway_info">Ativar gateway</string>
-    <string name="gateway_button">Ativar gateway</string>
-    <string name="loading_please_wait">Carregando, por favor espere</string>
-    <string name="orbot_option_title_reset">App preso no carregamento</string>
-    <string name="orbot_option_desc_reset">Armazenagem limpa</string>
-    <string name="orbot_option_desc_reset_button">Abrir configurações</string>
-
-
-    <string name="orbot_header">Configurações de proxy</string>
-    <string name="orbot_desc">O Genesis Browser conecta você à rede Tor, administrada por milhares de voluntários em todo o mundo! Essas opções podem ajudá-lo</string>
-    <string name="orbot_option_title">Internet é censurada aqui</string>
-    <string name="orbot_option_desc">Ignorar firewall</string>
-    <string name="orbot_option_warning_slow_speed">Pontes faz com que a internet corra muito lentamente. Use-os somente se a Internet for censurada em seu país ou a rede Tor estiver bloqueada</string>
-
-
-
-
-    <string name="bookmark_clear_history">Limpar histórico</string>
-    <string name="tab_view_clear_bookmark">Limpar marcador</string>
-
-
-    <string name="hint_default_suggession">BBC Israel ataca novamente</string>
-
-
-    <string name="notification_default_label">default.jpg</string>
-    <string name="notification_open_text">Aberto</string>
-
-
-    <string name="tab_view_increment">1</string>
-    <string name="tab_view_search_tab">Guias de pesquisa</string>
-    <string name="tab_view_clear_tab">Guia Limpar</string>
-
-
-    <string name="home_tab_text">1</string>
-    <string name="home_connect">Connect</string>
-    <string name="home_loading">Carregando, por favor espere</string>
-
-
-    <string name="bridges_sometimes">"Às vezes você precisa de uma ponte para chegar ao Tor."</string>
-    <string name="action_more">"ME DIGA MAIS"</string>
-    <string name="vpn_setup">"Você pode permitir que qualquer aplicativo passe pelo Tor usando nossa VPN integrada".</string>
-    <string name="vpn_setup_sub">"Isso não o tornará anônimo, mas ajudará a ultrapassar os firewalls."</string>
-    <string name="action_vpn_choose">"ESCOLHA APLICATIVOS"</string>
-    <string name="hello">"Olá"</string>
-    <string name="welcome">"Bem-vindo ao Tor no celular."</string>
-    <string name="browser_the_internet">"Navegue na internet como você espera."</string>
-    <string name="no_tracking">"Sem rastreamento. Sem censura."</string>
-
-
-    <string name="error_m1">Este site não pode ser acessado</string>
-    <string name="error_m2">Ocorreu um erro durante uma conexão</string>
-    <string name="error_m3">A página que você está tentando visualizar não pode ser mostrada porque a autenticidade dos dados recebidos não pôde ser verificada</string>
-    <string name="error_m4">No momento, a página não está ativa ou inativa devido a algum motivo</string>
-    <string name="error_m5">Entre em contato com os proprietários do site para informá-los sobre esse problema.</string>
-    <string name="error_m6" >recarregar</string>
-
-
-    <string-array name="fonts">
-        <item>55%</item>
-        <item>70%</item>
-        <item>85%</item>
-        <item>100 por cento</item>
-        <item>115%</item>
-        <item>130%</item>
-        <item>145%</item>
-    </string-array>
-
-    <string-array name="search_engines">
-        <item>Web oculta</item>
-        <item>Google</item>
-        <item>Duck Duck Go</item>
-    </string-array>
-
-    <string-array name="boolean_option">
-        <item>ativado</item>
-        <item>Desativado</item>
-    </string-array>
-
-    <string-array name="notification">
-        <item>Habilitar todos</item>
-        <item>Desativar tudo</item>
-        <item>No Bandwidth</item>
-    </string-array>
-
-    <string-array name="cookies">
-        <item>Permitir todos</item>
-        <item>Permitir Confiável</item>
-        <item>Permitir Nenhum</item>
-        <item>Permitir visitas</item>
-        <item>Permitir não rastreador</item>
-    </string-array>
-
-    <!-- Generated by Automatic String Resource Translation
-    --><!--          https://asrt.gluege.boerde.de
---></resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
old mode 100755
new mode 100644
index 49e8acd7..6b30d8d9
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,313 +1,3 @@
 <resources>
 
-
-    <!-- Generated by Automatic String Resource Translation
---><!--          https://asrt.gluege.boerde.de
---><string name="app_name" translatable="false">Genesis</string>
-    <string name="HP_SEARCH_HINT">История поиска</string>
-    <string name="SearchHintMain">Поиск или введите веб-адрес</string>
-    <string name="homeUrl" translatable="false">https://genesis.onion</string>
-    <string name="errorTiyle">\ U0020 \ u0020 \ u0020Opps! Что-то пошло не так</string>
-    <string name="todo">ВСЕ</string>
-    <string name="projectName">Genesis Search Engine</string>
-    <string name="loadingText">Интернет Свобода</string>
-    <string name="reload">Reload</string>
-    <string name="internetErrorMessage">Это могут быть проблемы, с которыми вы столкнулись \ n \ n • Возможно, веб-страница или веб-сайт не работают \ n • Возможно, ваше интернет-соединение плохое \ n • Возможно, вы используете прокси-сервер \ n • Веб-сайт может быть заблокирован брандмауэром</string>
-    <string name="title_activity_list_manager">list_manager</string>
-    <string name="title_activity_setting_controller">настройки</string>
-    <string name="file_provider_authority">com.darkweb.genesissearchengine.fileprovider</string>
-
-
-    <string name="preferences_messages_header">Сообщения</string>
-    <string name="preferences_sync_header">Синхронизация</string>
-
-
-    <string name="messages_signature_title">Ваша подпись</string>
-    <string name="messages_reply_title">Действие ответа по умолчанию</string>
-
-
-    <string name="settings_basic_settings">Базовые настройки</string>
-    <string name="settings_header">настройки</string>
-    <string name="settings_search_engine">Поисковый движок</string>
-    <string name="settings_javascript">Javascript</string>
-    <string name="settings_clear_history">Авто Очистить Историю</string>
-    <string name="settings_font_title">Настройки шрифта</string>
-    <string name="settings_adjust_font">Индивидуальный шрифт</string>
-    <string name="settings_manual_font">Авторегулировка шрифта</string>
-    <string name="settings_cookies">Настройки Cookie</string>
-    <string name="settings_cookie">печенье</string>
-    <string name="settings_notification">Управление уведомлением</string>
-
-
-    <string name="security_basic_settings">Базовые настройки</string>
-    <string name="bridge_Automatid_title">Создать автоматически</string>
-    <string name="bridge_Manual_desc">Предоставь мост, который я знаю</string>
-    <string name="bridge_Auto_switch">Авто</string>
-    <string name="bridge_Manual_switch">Руководство</string>
-    <string name="bridge_port_hint">адрес: порт</string>
-    <string name="bridge_header">Настройки моста</string>
-    <string name="bridge_desc">Мосты - это не включенные в список реле Tor, которые затрудняют блокировку соединений в сети Tor. Из-за того, что некоторые страны пытаются заблокировать Tor, в некоторых странах работают определенные мосты, а в других - нет.</string>
-    <string name="bridge_default_title">Выберите мост по умолчанию</string>
-    <string name="bridge_request">Базовые настройки</string>
-
-
-    public <string name="WELCOME_MESSAGE_TITLE">Добро пожаловать Скрытый веб-шлюз</string>
-    public <string name="WELCOME_MESSAGE_DESC">Это приложение предоставит вам платформу для поиска и открытия скрытых веб-адресов. Вот несколько предложений \ n</string>
-    public <string name="WELCOME_MESSAGE_BT_1">Deep Web Online Market</string>
-    public <string name="WELCOME_MESSAGE_BT_2">Утечка документов и книг</string>
-    public <string name="WELCOME_MESSAGE_BT_3">Dark Web Новости и статьи</string>
-    public <string name="WELCOME_MESSAGE_BT_4">Секретные программы и инструменты взлома</string>
-    public <string name="WELCOME_MESSAGE_BT_5">Не показывать снова</string>
-
-    public <string name="ABI_ERROR_TITLE">Неверный установочный файл</string>
-    public <string name="ABI_ERROR_DESC">Похоже, вы испортили установку. Либо установите его из playstore, либо перейдите по ссылке</string>
-    public <string name="ABI_ERROR_BT_1">Локальный апгрейд</string>
-    public <string name="ABI_ERROR_BT_2">Обновление PlayStore</string>
-    public <string name="ABI_ERROR_BT_3">Продолжай в любом случае</string>
-
-    public <string name="REPORT_URL_TITLE">Сообщить об этом сайте</string>
-    public <string name="REPORT_URL_DESC">Если вы считаете, что URL-адрес недопустим или беспокоит, сообщите нам, чтобы мы могли обновить нашу базу данных \ n</string>
-    public <string name="REPORT_URL_BT_1">отчет</string>
-    public <string name="REPORT_URL_BT_2">отклонять</string>
-
-    public <string name="ORBOT_INIT_TITLE">Инициализация</string>
-    public <string name="ORBOT_INIT_DESC">Пожалуйста, подождите! Пока мы подключаем вас к скрытой сети. Это может занять несколько минут \ n</string>
-    public <string name="ORBOT_INIT_BT_1">отклонять</string>
-    public <string name="ORBOT_INIT_BT_2">Попробуйте еще раз</string>
-
-    public <string name="ORBOT_CLEAR_TITLE">Данные очищены</string>
-    public <string name="ORBOT_CLEAR_DESC">Данные Бытия были очищены. Пожалуйста, попробуйте запустить приложение с домашней страницы \ n</string>
-    public <string name="ORBOT_CLEAR_BT_1">отклонять</string>
-
-    public <string name="VERSION_TITLE">Ожидание обновления</string>
-    public <string name="VERSION_DESC">Вы еще не обновляли это приложение, пожалуйста, обновите его, чтобы добиться максимальной производительности \ n</string>
-    public <string name="VERSION_BT_1">Обновить</string>
-
-    public <string name="REPORT_SUCCESS_TITLE">URL успешно отправлен</string>
-    public <string name="REPORT_SUCCESS_DESC">URL был успешно сообщен. Полное удаление этого сайта с наших серверов займет около недели \ n</string>
-    public <string name="REPORT_SUCCESS_BT_1">отклонять</string>
-
-    public <string name="RATE_TITLE">Оцените нас</string>
-    public <string name="RATE_MESSAGE">Мы не принимаем пожертвования и не зарабатываем деньги с помощью этого приложения. Мы пытаемся сделать частный анонимный интернет \ n \ nЕсли вы думаете, что это приложение работает, пожалуйста, оцените нас, оно дает нам надежду и силы для продолжения</string>
-    public <string name="RATE_POSITIVE">Нравится это приложение</string>
-    public <string name="RATE_NEGATIVE">Не нравится это приложение</string>
-
-    public <string name="RATE_SUCCESS_TITLE">Жаль это слышать!</string>
-    public <string name="RATE_SUCCESS_DESC">Если у вас возникли проблемы и вы хотите связаться с нами, пожалуйста, напишите нам по адресу gamesolstudios@gmail.com. Мы постараемся решить вашу проблему как можно скорее.</string>
-    public <string name="RATE_SUCCESS_BT_1">Отправить письмо</string>
-
-    public <string name="BOOKMARK_URL_BT_1">закладка</string>
-    public <string name="BOOKMARK_URL_BT_2">отклонять</string>
-
-    public <string name="CLEAR_HISTORY_TITLE">Очистить хранилище сайта?</string>
-    public <string name="CLEAR_HISTORY_DESC">Это очистит данные для всех сайтов</string>
-    public <string name="CLEAR_HISTORY_BT_1">ясно</string>
-    public <string name="CLEAR_HISTORY_BT_2">отклонять</string>
-
-    public <string name="CLEAR_TAB_TITLE">Очистить открытые вкладки?</string>
-    public <string name="CLEAR_TAB_DESC">Это очистит все сохраненные вкладки</string>
-    public <string name="CLEAR_TAB_BT_1">ясно</string>
-
-    public <string name="clear_bookmark_title">Очистить закладку сайта?</string>
-    public <string name="clear_bookmark_desc">Это очистит данные для всех сохраненных сайтов \ n</string>
-    public <string name="clear_bookmark_bt1">ясно</string>
-    public <string name="clear_bookmark_bt2">отклонять</string>
-
-    public <string name="DOWNLOAD_TITLE">Скачать уведомление</string>
-    public <string name="DOWNLOAD_MESSAGE">Скачать файл |</string>
-    public <string name="DOWNLOAD_POSITIVE">Скачать</string>
-
-    public <string name="BRIDGE_MAIL_TITLE">Запросить новый мост</string>
-    public <string name="BRIDGE_MAIL_MESSAGE">Вы можете получить адрес моста через электронную почту, Интернет или отсканировав QR-код моста. Выберите Email ниже, чтобы запросить адрес моста. \ N \ nКогда у вас есть адрес, скопируйте</string>
-    public <string name="BRIDGE_MAIL_POSITIVE">ЭЛ. АДРЕС</string>
-
-    public <string name="LONG_URL_TITLE">URL-уведомление</string>
-    public <string name="LONG_URL_MESSAGE" />
-    public <string name="LONG_URL_OPTION_1">Открыть в новой вкладке</string>
-    public <string name="LONG_URL_OPTION_2">Открыть в текущей вкладке</string>
-    public <string name="LONG_URL_OPTION_3">Скопировать в буфер обмена</string>
-    public <string name="LONG_URL_OPTION_4">Скачать этот файл</string>
-
-    public <string name="LONG_URL_FULL_MESSAGE">Описание URL</string>
-    public <string name="LONG_URL_FULL_OPTION_1">Открыть URL в новой вкладке</string>
-    public <string name="LONG_URL_FULL_OPTION_2">Открыть URL в текущей вкладке</string>
-    public <string name="LONG_URL_FULL_OPTION_3">Скопировать URL в буфер обмена</string>
-    public <string name="LONG_URL_FULL_OPTION_4">Открыть изображение в новой вкладке</string>
-    public <string name="LONG_URL_FULL_OPTION_5">Открыть текущую вкладку изображения</string>
-    public <string name="LONG_URL_FULL_OPTION_6">Скопировать изображение в буфер обмена</string>
-    public <string name="LONG_URL_FULL_OPTION_7">Скачать файл изображения</string>
-
-    public <string name="BANNED_TITLE">Tor запрещен в вашей стране?</string>
-    public <string name="BANNED_DESC">Включить бесплатный GATEWAY для туннелирования через запрещенную конфигурацию | Используйте его, только если tor запрещен в вашей стране</string>
-
-    /*Tab Manager*/
-
-    public <string name="CLEAR_TABS">ЧИСТЫЕ вкладки</string>
-
-    /*Bridge Manager*/
-
-    public <string name="CUSTOM_BRIDGE">obfs4</string>
-
-    /*Text Manager*/
-
-    public <string name="DARK_WEB">Скрытая сеть</string>
-    public <string name="EMPTY_STR" />
-    public <string name="EMPTY_SPACE" />
-
-    /*Settings Manager*/
-
-    public <string name="CUSTOM_FONTS">Пользовательский шрифт</string>
-    public <string name="PERCENT_SIGN">%</string>
-    public <string name="DEFAULT_LANGUAGE">RU</string>
-
-    /*Bookmark Manager*/
-
-    public <string name="CLEAR_BOOKMARK">ЧИСТАЯ ЗАКЛАДКА</string>
-
-    /*Home Manager*/
-
-    public <string name="BLANK_PAGE">о: пусто</string>
-
-    /*Events*/
-
-    public <string name="APP_STARTED">APP_STARTED</string>
-    public <string name="PROXY_CHANGED">PROXY_CHANGED</string>
-    public <string name="APP_RESTARTED">APP_RESTARTED</string>
-    public <string name="APP_FINISHED">APP_FINISHED</string>
-    public <string name="SEARCH_SWITCH">SEARCH_SWITCH</string>
-    public <string name="SETTINGS_OPENED">SETTINGS_OPENED</string>
-    public <string name="URL_BOOKMARKED">URL_BOOKMARKED</string>
-    public <string name="BOOKMARK_OPENED" translatable="false">BOOKMARK_OPENED</string>
-    public <string name="TAB_OPENED">TAB_OPENED</string>
-    public <string name="GATEWAY_OPENED">GATEWAY_OPENED</string>
-    public <string name="HISTORY_OPENED">HISTORY_OPENED</string>
-    public <string name="HISTORY_TRIGGERED">HISTORY_TRIGGERED</string>
-    public <string name="BOOKMARK_TRIGGERED">BOOKMARK_TRIGGERED</string>
-    public <string name="TAB_TRIGGERED">TAB_TRIGGERED</string>
-    public <string name="URL_ERROR">URL_ERROR</string>
-    public <string name="URL_ERROR_NOT_LOADED">URL_ERROR_NOT_LOADED</string>
-    public <string name="PAGE_OPENED_SUCCESS">PAGE_OPENED_SUCCESS</string>
-    public <string name="HOME_INVOKED">HOME_INVOKED</string>
-    public <string name="SEARCH_INVOKED">SEARCH_INVOKED</string>
-    public <string name="MENU_INVOKED">MENU_INVOKED</string>
-    public <string name="ON_BACK">СЗАДИ</string>
-
-
-    <string name="landing_next_page">следующий</string>
-
-
-    <string name="listview_clear">ясно</string>
-
-
-    <string name="popup_new_tabs">Новые вкладки</string>
-    <string name="popup_close_tabs">Закрыть вкладку</string>
-    <string name="popup_open_Recent_tab">Открыть последние вкладки</string>
-    <string name="popup_languages">язык</string>
-    <string name="popup_download">Загрузки</string>
-    <string name="popup_history">история</string>
-    <string name="popup_settings">настройки</string>
-    <string name="popup_bookmark_page">Добавить эту страницу в закладки</string>
-    <string name="popup_open_bookmark">Открытые закладки</string>
-    <string name="popup_report">Сайт отчета</string>
-    <string name="popup_rate">Оцените это приложение</string>
-    <string name="popup_share">Поделиться</string>
-
-
-
-    <string name="orbot_settings_warning">⚠ Предупреждение</string>
-    <string name="orbot_settings_bridges">Включить мосты</string>
-    <string name="gateway_info">Включить шлюз</string>
-    <string name="gateway_button">Включить шлюз</string>
-    <string name="loading_please_wait">Загрузка, пожалуйста подождите</string>
-    <string name="orbot_option_title_reset">Приложение застряло в загрузке</string>
-    <string name="orbot_option_desc_reset">Чистое хранилище</string>
-    <string name="orbot_option_desc_reset_button">Открыть настройки</string>
-
-
-    <string name="orbot_header">Настройки прокси</string>
-    <string name="orbot_desc">Браузер Genesis подключает вас к сети Tor, управляемой тысячами добровольцев по всему миру! Могут ли эти варианты помочь вам</string>
-    <string name="orbot_option_title">Интернет здесь подвергается цензуре</string>
-    <string name="orbot_option_desc">Обход брандмауэра</string>
-    <string name="orbot_option_warning_slow_speed">Мосты заставляют интернет работать очень медленно. Используйте их, только если в вашей стране есть цензура или если сеть Tor заблокирована</string>
-
-
-
-
-    <string name="bookmark_clear_history">Чистая история</string>
-    <string name="tab_view_clear_bookmark">Очистить закладку</string>
-
-
-    <string name="hint_default_suggession">Би-би-си | Израиль снова наносит удар</string>
-
-
-    <string name="notification_default_label">default.jpg</string>
-    <string name="notification_open_text">открыто</string>
-
-
-    <string name="tab_view_increment">1</string>
-    <string name="tab_view_search_tab">Вкладки поиска</string>
-    <string name="tab_view_clear_tab">Очистить вкладку</string>
-
-
-    <string name="home_tab_text">1</string>
-    <string name="home_connect">Connect</string>
-    <string name="home_loading">Загрузка, пожалуйста подождите</string>
-
-
-    <string name="bridges_sometimes">«Иногда тебе нужен мост, чтобы добраться до Тор».</string>
-    <string name="action_more">"Скажи мне больше"</string>
-    <string name="vpn_setup">«Вы можете включить любое приложение для прохождения через Tor, используя наш встроенный VPN».</string>
-    <string name="vpn_setup_sub">«Это не сделает вас анонимным, но поможет через брандмауэры».</string>
-    <string name="action_vpn_choose">"ВЫБЕРИТЕ ПРИЛОЖЕНИЯ"</string>
-    <string name="hello">"Здравствуйте"</string>
-    <string name="welcome">«Добро пожаловать в Tor на мобильном телефоне».</string>
-    <string name="browser_the_internet">"Просматривайте Интернет, как вы ожидаете."</string>
-    <string name="no_tracking">«Нет отслеживания. Нет цензуры».</string>
-
-
-    <string name="error_m1">Этот сайт не может быть достигнут</string>
-    <string name="error_m2">Произошла ошибка во время соединения</string>
-    <string name="error_m3">Невозможно отобразить страницу, которую вы пытаетесь просмотреть, поскольку не удалось проверить подлинность полученных данных.</string>
-    <string name="error_m4">Страница в настоящее время не работает или не работает по какой-либо причине</string>
-    <string name="error_m5">Пожалуйста, свяжитесь с владельцами сайта, чтобы сообщить им об этой проблеме.</string>
-    <string name="error_m6" >Reload</string>
-
-
-    <string-array name="fonts">
-        <item>55 процентов</item>
-        <item>70 процентов</item>
-        <item>85 процентов</item>
-        <item>100 процентов</item>
-        <item>115 процентов</item>
-        <item>130 процентов</item>
-        <item>145 процентов</item>
-    </string-array>
-
-    <string-array name="search_engines">
-        <item>Скрытая сеть</item>
-        <item>Google</item>
-        <item>Утка утка идти</item>
-    </string-array>
-
-    <string-array name="boolean_option">
-        <item>Включено</item>
-        <item>Отключено</item>
-    </string-array>
-
-    <string-array name="notification">
-        <item>Включить все</item>
-        <item>Отключить все</item>
-        <item>Нет пропускной способности</item>
-    </string-array>
-
-    <string-array name="cookies">
-        <item>Позволять все</item>
-        <item>Разрешить Доверенные</item>
-        <item>Разрешить нет</item>
-        <item>Разрешить посещение</item>
-        <item>Разрешить не трекер</item>
-    </string-array>
-
-    <!-- Generated by Automatic String Resource Translation
-    --><!--          https://asrt.gluege.boerde.de
---></resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
old mode 100755
new mode 100644
index 4939cb1e..6b30d8d9
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,313 +1,3 @@
 <resources>
 
-
-    <!-- Generated by Automatic String Resource Translation
---><!--          https://asrt.gluege.boerde.de
---><string name="app_name" translatable="false">Genesis</string>
-    <string name="HP_SEARCH_HINT">Історія пошуку</string>
-    <string name="SearchHintMain">Шукайте або введіть веб-адресу</string>
-    <string name="homeUrl" translatable="false">https://genesis.onion</string>
-    <string name="errorTiyle">\ u0020 \ u0020 \ u0020Оп! Щось пішло не так</string>
-    <string name="todo">ВСЕ</string>
-    <string name="projectName">Пошукова система Genesis</string>
-    <string name="loadingText">Інтернет-свобода</string>
-    <string name="reload">Перезавантажити</string>
-    <string name="internetErrorMessage">Це можуть бути проблеми, з якими ви стикаєтесь \ n \ n • Веб-сторінка або веб-сайт можуть бути відключені \ n • Ваш Інтернет-зв’язок може бути поганим \ n • Можливо, ви використовуєте проксі \ n • Веб-сайт може бути заблокований брандмауером</string>
-    <string name="title_activity_list_manager">list_manager</string>
-    <string name="title_activity_setting_controller">Налаштування</string>
-    <string name="file_provider_authority">com.darkweb.genesissearchengine.fileprovider</string>
-
-
-    <string name="preferences_messages_header">Повідомлення</string>
-    <string name="preferences_sync_header">Синхронізація</string>
-
-
-    <string name="messages_signature_title">Твій підпис</string>
-    <string name="messages_reply_title">Дія відповіді за замовчуванням</string>
-
-
-    <string name="settings_basic_settings">Основні налаштування</string>
-    <string name="settings_header">Налаштування</string>
-    <string name="settings_search_engine">Пошукова система</string>
-    <string name="settings_javascript">Javascript</string>
-    <string name="settings_clear_history">Автоматично очистити історію</string>
-    <string name="settings_font_title">Налаштування шрифту</string>
-    <string name="settings_adjust_font">Індивідуальний шрифт</string>
-    <string name="settings_manual_font">Автоматичне регулювання шрифту</string>
-    <string name="settings_cookies">Налаштування файлів cookie</string>
-    <string name="settings_cookie">печиво</string>
-    <string name="settings_notification">Управління сповіщенням</string>
-
-
-    <string name="security_basic_settings">Основні налаштування</string>
-    <string name="bridge_Automatid_title">Створюйте автоматично</string>
-    <string name="bridge_Manual_desc">Забезпечте міст, який я знаю</string>
-    <string name="bridge_Auto_switch">Авто</string>
-    <string name="bridge_Manual_switch">Посібник</string>
-    <string name="bridge_port_hint">адреса: порт</string>
-    <string name="bridge_header">Налаштування мосту</string>
-    <string name="bridge_desc">Мости - це нереєстровані реле Tor, які ускладнюють блокування підключень до мережі Tor. Через те, як деякі країни намагаються блокувати Тор, деякі мости працюють у деяких країнах, а не в інших</string>
-    <string name="bridge_default_title">Виберіть Bridge Bridge</string>
-    <string name="bridge_request">Основні налаштування</string>
-
-
-    public <string name="WELCOME_MESSAGE_TITLE">Ласкаво просимо | Прихований веб-шлюз</string>
-    public <string name="WELCOME_MESSAGE_DESC">Ця програма надає вам платформу для пошуку та відкриття прихованих веб-адрес. Ось кілька пропозицій \ n</string>
-    public <string name="WELCOME_MESSAGE_BT_1">Інтернет-ринок Deep Web</string>
-    public <string name="WELCOME_MESSAGE_BT_2">Просочені документи та книги</string>
-    public <string name="WELCOME_MESSAGE_BT_3">Темні веб-новини та статті</string>
-    public <string name="WELCOME_MESSAGE_BT_4">Секретні програмні засоби та засоби для злому</string>
-    public <string name="WELCOME_MESSAGE_BT_5">Не показуй знову</string>
-
-    public <string name="ABI_ERROR_TITLE">Недійсний файл налаштування</string>
-    public <string name="ABI_ERROR_DESC">Схоже, ви зіпсували установку. Або встановіть його з магазину чи перейдіть за посиланням</string>
-    public <string name="ABI_ERROR_BT_1">Локальне оновлення</string>
-    public <string name="ABI_ERROR_BT_2">Оновіть Playstore</string>
-    public <string name="ABI_ERROR_BT_3">Продовжуйте все одно</string>
-
-    public <string name="REPORT_URL_TITLE">Повідомте про цей веб-сайт</string>
-    public <string name="REPORT_URL_DESC">Якщо ви вважаєте, що URL незаконне чи заважає, повідомте про нас, щоб ми могли оновити нашу базу даних \ n</string>
-    public <string name="REPORT_URL_BT_1">Звіт</string>
-    public <string name="REPORT_URL_BT_2">Відхилити</string>
-
-    public <string name="ORBOT_INIT_TITLE">Ініціалізація</string>
-    public <string name="ORBOT_INIT_DESC">Будь ласка, зачекайте! Поки ми підключаємо вас до прихованої павутини. Це може зайняти кілька хвилин \ n</string>
-    public <string name="ORBOT_INIT_BT_1">Відхилити</string>
-    public <string name="ORBOT_INIT_BT_2">Спробуйте ще раз</string>
-
-    public <string name="ORBOT_CLEAR_TITLE">Дані очищені</string>
-    public <string name="ORBOT_CLEAR_DESC">Дані генезису очищені. Спробуйте запустити програму з домашньої сторінки \ n</string>
-    public <string name="ORBOT_CLEAR_BT_1">Відхилити</string>
-
-    public <string name="VERSION_TITLE">Оновлення очікує на розгляд</string>
-    public <string name="VERSION_DESC">Ви не оновлювали цю програму деякий час, будь ласка, оновіть її, щоб отримати найкращу ефективність \ n</string>
-    public <string name="VERSION_BT_1">Оновлення</string>
-
-    public <string name="REPORT_SUCCESS_TITLE">URL зареєстровано успішно</string>
-    public <string name="REPORT_SUCCESS_DESC">Про URL-адресу було успішно повідомлено. Щоб повністю видалити цей веб-сайт із наших серверів, знадобиться близько тижня \ n</string>
-    public <string name="REPORT_SUCCESS_BT_1">Відхилити</string>
-
-    public <string name="RATE_TITLE">Оцініть нас</string>
-    public <string name="RATE_MESSAGE">Ми не беремо пожертви і не заробляємо гроші на цьому додатку. Ми намагаємося зробити приватний анонімний Інтернет \ n \ n Якщо ви думаєте, що ця програма працює, будь ласка, оцініть нас, це дає нам надію та сили продовжувати</string>
-    public <string name="RATE_POSITIVE">Як ця програма</string>
-    public <string name="RATE_NEGATIVE">Не подобається це додаток</string>
-
-    public <string name="RATE_SUCCESS_TITLE">Прикро це чути!</string>
-    public <string name="RATE_SUCCESS_DESC">Якщо у вас виникли проблеми і ви хочете зв’язатися з нами, напишіть нам електронною поштою gamesolstudios@gmail.com. Ми постараємося вирішити вашу проблему якнайшвидше.</string>
-    public <string name="RATE_SUCCESS_BT_1">Надіслати пошту</string>
-
-    public <string name="BOOKMARK_URL_BT_1">Закладка</string>
-    public <string name="BOOKMARK_URL_BT_2">Відхилити</string>
-
-    public <string name="CLEAR_HISTORY_TITLE">Очистити сховище сайту?</string>
-    public <string name="CLEAR_HISTORY_DESC">Це очистить дані для всіх сайтів</string>
-    public <string name="CLEAR_HISTORY_BT_1">Ясно</string>
-    public <string name="CLEAR_HISTORY_BT_2">Відхилити</string>
-
-    public <string name="CLEAR_TAB_TITLE">Очистити відкриті вкладки?</string>
-    public <string name="CLEAR_TAB_DESC">Це очистить усі збережені вкладки</string>
-    public <string name="CLEAR_TAB_BT_1">Ясно</string>
-
-    public <string name="clear_bookmark_title">Очистити закладку сайту?</string>
-    public <string name="clear_bookmark_desc">Це очистить дані для всіх збережених сайтів \ n</string>
-    public <string name="clear_bookmark_bt1">Ясно</string>
-    public <string name="clear_bookmark_bt2">Відхилити</string>
-
-    public <string name="DOWNLOAD_TITLE">Повідомлення про завантаження</string>
-    public <string name="DOWNLOAD_MESSAGE">Завантажити файл |</string>
-    public <string name="DOWNLOAD_POSITIVE">Завантажити</string>
-
-    public <string name="BRIDGE_MAIL_TITLE">Запит нового мосту</string>
-    public <string name="BRIDGE_MAIL_MESSAGE">Ви можете отримати мостову адресу через електронну пошту, Інтернет або скануючи QR-код мосту. Виберіть \ "Електронна пошта \" нижче, щоб надіслати запит на адресу моста. \ N \ nЗалиця, скопіюйте адресу</string>
-    public <string name="BRIDGE_MAIL_POSITIVE">EMAIL</string>
-
-    public <string name="LONG_URL_TITLE">Повідомлення URL</string>
-    public <string name="LONG_URL_MESSAGE" />
-    public <string name="LONG_URL_OPTION_1">Відкрити в новій вкладці</string>
-    public <string name="LONG_URL_OPTION_2">Відкрити в поточній вкладці</string>
-    public <string name="LONG_URL_OPTION_3">Копіювати в буфер обміну</string>
-    public <string name="LONG_URL_OPTION_4">Завантажте цей файл</string>
-
-    public <string name="LONG_URL_FULL_MESSAGE">Опис URL-адреси</string>
-    public <string name="LONG_URL_FULL_OPTION_1">Відкрийте URL-адресу на новій вкладці</string>
-    public <string name="LONG_URL_FULL_OPTION_2">Відкрийте URL-адресу на поточній вкладці</string>
-    public <string name="LONG_URL_FULL_OPTION_3">Скопіюйте URL у буфер обміну</string>
-    public <string name="LONG_URL_FULL_OPTION_4">Відкрити зображення в новій вкладці</string>
-    public <string name="LONG_URL_FULL_OPTION_5">Відкрити поточну вкладку зображення</string>
-    public <string name="LONG_URL_FULL_OPTION_6">Скопіюйте зображення у буфер обміну</string>
-    public <string name="LONG_URL_FULL_OPTION_7">Завантажити файл зображення</string>
-
-    public <string name="BANNED_TITLE">Чи заборонено тор у вашій країні?</string>
-    public <string name="BANNED_DESC">Увімкнути безкоштовний GATEWAY для тунелю через заборонену конфігурацію | Використовуйте його, лише якщо tor заборонено у вашій країні</string>
-
-    /*Tab Manager*/
-
-    public <string name="CLEAR_TABS">ЧИСТІ ТАБЛИЦІ</string>
-
-    /*Bridge Manager*/
-
-    public <string name="CUSTOM_BRIDGE">obfs4</string>
-
-    /*Text Manager*/
-
-    public <string name="DARK_WEB">Прихована павутина</string>
-    public <string name="EMPTY_STR" />
-    public <string name="EMPTY_SPACE" />
-
-    /*Settings Manager*/
-
-    public <string name="CUSTOM_FONTS">Спеціальний шрифт</string>
-    public <string name="PERCENT_SIGN">%</string>
-    public <string name="DEFAULT_LANGUAGE">ru</string>
-
-    /*Bookmark Manager*/
-
-    public <string name="CLEAR_BOOKMARK">ЧИСТА КНИГА</string>
-
-    /*Home Manager*/
-
-    public <string name="BLANK_PAGE">про: порожній</string>
-
-    /*Events*/
-
-    public <string name="APP_STARTED">APP_STARTED</string>
-    public <string name="PROXY_CHANGED">PROXY_CHANGED</string>
-    public <string name="APP_RESTARTED">APP_RESTARTED</string>
-    public <string name="APP_FINISHED">APP_FINISHED</string>
-    public <string name="SEARCH_SWITCH">SEARCH_SWITCH</string>
-    public <string name="SETTINGS_OPENED">SETTINGS_OPENED</string>
-    public <string name="URL_BOOKMARKED">URL_BOOKMARKED</string>
-    public <string name="BOOKMARK_OPENED" translatable="false">BOOKMARK_OPENED</string>
-    public <string name="TAB_OPENED">TAB_OPENED</string>
-    public <string name="GATEWAY_OPENED">GATEWAY_OPENED</string>
-    public <string name="HISTORY_OPENED">HISTORY_OPENED</string>
-    public <string name="HISTORY_TRIGGERED">HISTORY_TRIGGERED</string>
-    public <string name="BOOKMARK_TRIGGERED">BOOKMARK_TRIGGERED</string>
-    public <string name="TAB_TRIGGERED">TAB_TRIGGERED</string>
-    public <string name="URL_ERROR">URL_ERROR</string>
-    public <string name="URL_ERROR_NOT_LOADED">URL_ERROR_NOT_LOADED</string>
-    public <string name="PAGE_OPENED_SUCCESS">PAGE_OPENED_SUCCESS</string>
-    public <string name="HOME_INVOKED">HOME_INVOKED</string>
-    public <string name="SEARCH_INVOKED">SEARCH_INVOKED</string>
-    public <string name="MENU_INVOKED">MENU_INVOKED</string>
-    public <string name="ON_BACK">ON_BACK</string>
-
-
-    <string name="landing_next_page">Далі</string>
-
-
-    <string name="listview_clear">Ясно</string>
-
-
-    <string name="popup_new_tabs">Нові вкладки</string>
-    <string name="popup_close_tabs">Закрити вкладку</string>
-    <string name="popup_open_Recent_tab">Відкрийте останні вкладки</string>
-    <string name="popup_languages">Мову</string>
-    <string name="popup_download">Завантаження</string>
-    <string name="popup_history">Історія</string>
-    <string name="popup_settings">Налаштування</string>
-    <string name="popup_bookmark_page">Закладка цієї сторінки</string>
-    <string name="popup_open_bookmark">Відкрийте закладки</string>
-    <string name="popup_report">Повідомте веб-сайт</string>
-    <string name="popup_rate">Оцініть цей додаток</string>
-    <string name="popup_share">Поділитися</string>
-
-
-
-    <string name="orbot_settings_warning">⚠ Попередження</string>
-    <string name="orbot_settings_bridges">Увімкнути мости</string>
-    <string name="gateway_info">Увімкнути шлюз</string>
-    <string name="gateway_button">Увімкнути шлюз</string>
-    <string name="loading_please_wait">Завантаження, будь ласка, зачекайте</string>
-    <string name="orbot_option_title_reset">Додаток застряг у завантаженні</string>
-    <string name="orbot_option_desc_reset">Очистити сховище</string>
-    <string name="orbot_option_desc_reset_button">Відкрийте Налаштування</string>
-
-
-    <string name="orbot_header">Налаштування проксі</string>
-    <string name="orbot_desc">Веб-переглядач Genesis підключає вас до мережі Tor, якою керують тисячі добровольців по всьому світу! Чи можуть ці варіанти вам допомогти</string>
-    <string name="orbot_option_title">Інтернет цензурується тут</string>
-    <string name="orbot_option_desc">Обхід брандмауера</string>
-    <string name="orbot_option_warning_slow_speed">Мости змушують Інтернет працювати дуже повільно. Використовуйте їх лише в тому випадку, якщо Інтернет піддається цензурі у вашій країні або заблокована мережа Tor</string>
-
-
-
-
-    <string name="bookmark_clear_history">Чиста історія</string>
-    <string name="tab_view_clear_bookmark">Очистити закладку</string>
-
-
-    <string name="hint_default_suggession">BBC | Ізраїль завдає удару знову</string>
-
-
-    <string name="notification_default_label">default.jpg</string>
-    <string name="notification_open_text">відчинено</string>
-
-
-    <string name="tab_view_increment">1</string>
-    <string name="tab_view_search_tab">Вкладки пошуку</string>
-    <string name="tab_view_clear_tab">Очистити вкладку</string>
-
-
-    <string name="home_tab_text">1</string>
-    <string name="home_connect">Connect</string>
-    <string name="home_loading">Завантаження, будь ласка, зачекайте</string>
-
-
-    <string name="bridges_sometimes">"Іноді потрібен міст, щоб дістатися до Тор".</string>
-    <string name="action_more">"РОЗКАЖИ МЕНІ БІЛЬШЕ"</string>
-    <string name="vpn_setup">"Ви можете дозволити будь-якій програмі пройти через Tor за допомогою вбудованої VPN."</string>
-    <string name="vpn_setup_sub">"Це не зробить вас анонімним, але це допоможе пройти через брандмауері."</string>
-    <string name="action_vpn_choose">"ВИБРАТИ APPS"</string>
-    <string name="hello">"Здравствуйте"</string>
-    <string name="welcome">"Ласкаво просимо в Tor на мобільний".</string>
-    <string name="browser_the_internet">"Перегляньте Інтернет, як ви очікуєте."</string>
-    <string name="no_tracking">"Ні відстеження. Ні цензури".</string>
-
-
-    <string name="error_m1">Цей сайт неможливо отримати</string>
-    <string name="error_m2">Під час з\'єднання сталася помилка</string>
-    <string name="error_m3">Сторінка, яку ви намагаєтеся переглянути, не може бути показана, оскільки не вдалося перевірити справжність отриманих даних</string>
-    <string name="error_m4">Наразі сторінка не з’являється в режимі "жива" чи "знищена" через певні причини</string>
-    <string name="error_m5">Зверніться до власників веб-сайтів, щоб повідомити їх про цю проблему.</string>
-    <string name="error_m6" >Перезавантажити</string>
-
-
-    <string-array name="fonts">
-        <item>55 відсотків</item>
-        <item>70 відсотків</item>
-        <item>85 відсотків</item>
-        <item>100 відсотків</item>
-        <item>115 відсотків</item>
-        <item>130 відсотків</item>
-        <item>145 відсотків</item>
-    </string-array>
-
-    <string-array name="search_engines">
-        <item>Прихована павутина</item>
-        <item>Google</item>
-        <item>Качка Качка Іди</item>
-    </string-array>
-
-    <string-array name="boolean_option">
-        <item>Увімкнено</item>
-        <item>Інваліди</item>
-    </string-array>
-
-    <string-array name="notification">
-        <item>Увімкнути всіх</item>
-        <item>Відключити все</item>
-        <item>Немає пропускної здатності</item>
-    </string-array>
-
-    <string-array name="cookies">
-        <item>Дозволити всім</item>
-        <item>Дозволити довірену</item>
-        <item>Дозволити жодне</item>
-        <item>Дозволити відвідуванню</item>
-        <item>Дозволити не відстежувати</item>
-    </string-array>
-
-    <!-- Generated by Automatic String Resource Translation
-    --><!--          https://asrt.gluege.boerde.de
---></resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
old mode 100755
new mode 100644
index 41964e0a..6b30d8d9
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,312 +1,3 @@
 <resources>
 
-
-    <!-- Generated by Automatic String Resource Translation
---><!--          https://asrt.gluege.boerde.de
---><string name="app_name" translatable="false">Genesis</string>
-    <string name="HP_SEARCH_HINT">搜索历史记录</string>
-    <string name="SearchHintMain">搜索或键入网址</string>
-    <string name="homeUrl" translatable="false">https://genesis.onion</string>
-    <string name="errorTiyle">\ u0020 \ u0020 \ u0020！有些不对劲</string>
-    <string name="todo">一切</string>
-    <string name="projectName">创世纪搜索引擎</string>
-    <string name="loadingText">在线自由</string>
-    <string name="reload">重装</string>
-    <string name="internetErrorMessage">这些可能是您面临的问题\ n \ n•网页或网站可能已关闭\ n•您的Internet连接可能不正常\ n•您可能正在使用代理\ n•网站可能已被防火墙阻止</string>
-    <string name="title_activity_list_manager">list_manager</string>
-    <string name="title_activity_setting_controller">设定值</string>
-    <string name="file_provider_authority">com.darkweb.genesissearchengine.fileprovider</string>
-
-
-    <string name="preferences_messages_header">留言内容</string>
-    <string name="preferences_sync_header">同步</string>
-
-
-    <string name="messages_signature_title">你的签名</string>
-    <string name="messages_reply_title">默认回复动作</string>
-
-
-    <string name="settings_basic_settings">基本设置</string>
-    <string name="settings_header">设定值</string>
-    <string name="settings_search_engine">搜索引擎</string>
-    <string name="settings_javascript">Java脚本</string>
-    <string name="settings_clear_history">自动清除记录</string>
-    <string name="settings_font_title">字型设定</string>
-    <string name="settings_adjust_font">定制字体</string>
-    <string name="settings_manual_font">自动调整字体</string>
-    <string name="settings_cookies">Cookie设置</string>
-    <string name="settings_cookie">曲奇饼</string>
-    <string name="settings_notification">管理通知</string>
-
-
-    <string name="security_basic_settings">基本设置</string>
-    <string name="bridge_Automatid_title">自动创建</string>
-    <string name="bridge_Manual_desc">提供我知道的桥梁</string>
-    <string name="bridge_Auto_switch">汽车</string>
-    <string name="bridge_Manual_switch">手册</string>
-    <string name="bridge_port_hint">地址：港口</string>
-    <string name="bridge_header">桥接设置</string>
-    <string name="bridge_desc">桥接器是未列出的Tor中继器，这使得阻止连接到Tor网络的难度更大。由于某些国家/地区试图阻止Tor，某些桥梁在某些国家/地区有效，而其他国家/地区则无法</string>
-    <string name="bridge_default_title">选择默认桥</string>
-    <string name="bridge_request">基本设置</string>
-
-
-    public <string name="WELCOME_MESSAGE_TITLE">欢迎光临|隐藏的Web网关</string>
-    public <string name="WELCOME_MESSAGE_DESC">此应用程序为您提供了一个搜索和打开隐藏的Web网址的平台。以下是一些建议\ n</string>
-    public <string name="WELCOME_MESSAGE_BT_1">深度网络在线市场</string>
-    public <string name="WELCOME_MESSAGE_BT_2">泄漏的文件和书籍</string>
-    public <string name="WELCOME_MESSAGE_BT_3">黑暗网新闻和文章</string>
-    public <string name="WELCOME_MESSAGE_BT_4">秘密软件和黑客工具</string>
-    public <string name="WELCOME_MESSAGE_BT_5">不再显示</string>
-
-    public <string name="ABI_ERROR_TITLE">无效的安装文件</string>
-    public <string name="ABI_ERROR_DESC">看起来您搞砸了安装。从playstore安装它或点击链接</string>
-    public <string name="ABI_ERROR_BT_1">本地升级</string>
-    public <string name="ABI_ERROR_BT_2">升级Playstore</string>
-    public <string name="ABI_ERROR_BT_3">仍然继续</string>
-
-    public <string name="REPORT_URL_TITLE">举报此网站</string>
-    public <string name="REPORT_URL_DESC">如果您认为url非法或令人不安，请向我们报告，以便我们更新数据库\ n</string>
-    public <string name="REPORT_URL_BT_1">报告</string>
-    public <string name="REPORT_URL_BT_2">解雇</string>
-
-    public <string name="ORBOT_INIT_TITLE">初始化中</string>
-    public <string name="ORBOT_INIT_DESC">请耐心等待！当我们将您连接到隐藏的网站时。这可能需要几分钟\ n</string>
-    public <string name="ORBOT_INIT_BT_1">解雇</string>
-    public <string name="ORBOT_INIT_BT_2">再试一次</string>
-
-    public <string name="ORBOT_CLEAR_TITLE">资料已清除</string>
-    public <string name="ORBOT_CLEAR_DESC">创世数据已清除。请尝试从首页启动应用程序\ n</string>
-    public <string name="ORBOT_CLEAR_BT_1">解雇</string>
-
-    public <string name="VERSION_TITLE">更新待处理</string>
-    public <string name="VERSION_DESC">您有一段时间没有更新过此应用，请对其进行更新以获得最佳性能\ n</string>
-    public <string name="VERSION_BT_1">更新资料</string>
-
-    public <string name="REPORT_SUCCESS_TITLE">URL成功报告</string>
-    public <string name="REPORT_SUCCESS_DESC">URL已成功报告。从我们的服务器中完全删除此网站大约需要一周的时间\ n</string>
-    public <string name="REPORT_SUCCESS_BT_1">解雇</string>
-
-    public <string name="RATE_TITLE">评价我们</string>
-    public <string name="RATE_MESSAGE">我们不接受任何捐赠或通过此应用赚钱。我们正在尝试建立私人匿名互联网\ n \ n如果您认为此应用有效，请给我们评分，它为我们提供了继续前进的希望和力量</string>
-    public <string name="RATE_POSITIVE">喜欢这个程序</string>
-    public <string name="RATE_NEGATIVE">不喜欢这个程序</string>
-
-    public <string name="RATE_SUCCESS_TITLE">抱歉听到！</string>
-    public <string name="RATE_SUCCESS_DESC">如果您有任何问题并想与我们联系，请给我们发送电子邮件至gameolstudios@gmail.com。我们将尽力尽快解决您的问题</string>
-    public <string name="RATE_SUCCESS_BT_1">发邮件</string>
-
-    public <string name="BOOKMARK_URL_BT_1">书签</string>
-    public <string name="BOOKMARK_URL_BT_2">解雇</string>
-
-    public <string name="CLEAR_HISTORY_TITLE">清除网站存储空间？</string>
-    public <string name="CLEAR_HISTORY_DESC">这将清除所有站点的数据</string>
-    public <string name="CLEAR_HISTORY_BT_1">明确</string>
-    public <string name="CLEAR_HISTORY_BT_2">解雇</string>
-
-    public <string name="CLEAR_TAB_TITLE">清除打开的标签页？</string>
-    public <string name="CLEAR_TAB_DESC">这将清除所有存储的标签</string>
-    public <string name="CLEAR_TAB_BT_1">明确</string>
-
-    public <string name="clear_bookmark_title">清除网站书签？</string>
-    public <string name="clear_bookmark_desc">这将清除所有已保存网站的数据\ n</string>
-    public <string name="clear_bookmark_bt1">明确</string>
-    public <string name="clear_bookmark_bt2">解雇</string>
-
-    public <string name="DOWNLOAD_TITLE">下载通知</string>
-    public <string name="DOWNLOAD_MESSAGE">下载文件|</string>
-    public <string name="DOWNLOAD_POSITIVE">下载</string>
-
-    public <string name="BRIDGE_MAIL_TITLE">申请新桥</string>
-    public <string name="BRIDGE_MAIL_MESSAGE">您可以通过电子邮件，网络或扫描桥QR码来获得桥地址。选择下面的\“电子邮件\”以请求网桥地址。\ n \ n一旦您有地址，请复制</string>
-    public <string name="BRIDGE_MAIL_POSITIVE">电子邮件</string>
-
-    public <string name="LONG_URL_TITLE">网址通知</string>
-    public <string name="LONG_URL_MESSAGE" />
-    public <string name="LONG_URL_OPTION_1">在新标签页中打开</string>
-    public <string name="LONG_URL_OPTION_2">在当前标签页中打开</string>
-    public <string name="LONG_URL_OPTION_3">复制到剪贴板</string>
-    public <string name="LONG_URL_OPTION_4">下载此文件</string>
-
-    public <string name="LONG_URL_FULL_MESSAGE">网址说明</string>
-    public <string name="LONG_URL_FULL_OPTION_1">在新标签页中打开网址</string>
-    public <string name="LONG_URL_FULL_OPTION_2">在当前标签页中打开网址</string>
-    public <string name="LONG_URL_FULL_OPTION_3">将网址复制到剪贴板</string>
-    public <string name="LONG_URL_FULL_OPTION_4">在新标签页中打开图片</string>
-    public <string name="LONG_URL_FULL_OPTION_5">打开图像当前选项卡</string>
-    public <string name="LONG_URL_FULL_OPTION_6">将图像复制到剪贴板</string>
-    public <string name="LONG_URL_FULL_OPTION_7">下载图片文件</string>
-
-    public <string name="BANNED_TITLE">Tor在您的国家被禁止了吗？</string>
-    public <string name="BANNED_DESC">启用免费网关以通过禁止的配置进行隧道传输仅在您的国家/地区禁止使用Tor时使用</string>
-
-    /*Tab Manager*/
-
-    public <string name="CLEAR_TABS">清除标签</string>
-
-    /*Bridge Manager*/
-
-    public <string name="CUSTOM_BRIDGE">obfs4</string>
-
-    /*Text Manager*/
-
-    public <string name="DARK_WEB">隐藏的网</string>
-    public <string name="EMPTY_STR" />
-    public <string name="EMPTY_SPACE"> </string>
-
-    /*Settings Manager*/
-
-    public <string name="CUSTOM_FONTS">自定义字体</string>
-    public <string name="PERCENT_SIGN">％</string>
-    public <string name="DEFAULT_LANGUAGE">ru</string>
-
-    /*Bookmark Manager*/
-
-    public <string name="CLEAR_BOOKMARK">清除书签</string>
-
-    /*Home Manager*/
-
-    public <string name="BLANK_PAGE">关于：空白</string>
-
-    /*Events*/
-
-    public <string name="APP_STARTED">APP_STARTED</string>
-    public <string name="PROXY_CHANGED">PROXY_CHANGED</string>
-    public <string name="APP_RESTARTED">APP_RESTARTED</string>
-    public <string name="APP_FINISHED">APP_FINISHED</string>
-    public <string name="SEARCH_SWITCH">SEARCH_SWITCH</string>
-    public <string name="SETTINGS_OPENED">SETTINGS_OPENED</string>
-    public <string name="URL_BOOKMARKED">URL_BOOKMARKED</string>
-    public <string name="BOOKMARK_OPENED" translatable="false">BOOKMARK_OPENED</string>
-    public <string name="TAB_OPENED">TAB_OPENED</string>
-    public <string name="GATEWAY_OPENED">GATEWAY_OPENED</string>
-    public <string name="HISTORY_OPENED">HISTORY_OPENED</string>
-    public <string name="HISTORY_TRIGGERED">HISTORY_TRIGGERED</string>
-    public <string name="BOOKMARK_TRIGGERED">BOOKMARK_TRIGGERED</string>
-    public <string name="TAB_TRIGGERED">TAB_TRIGGERED</string>
-    public <string name="URL_ERROR">URL_ERROR</string>
-    public <string name="URL_ERROR_NOT_LOADED">URL_ERROR_NOT_LOADED</string>
-    public <string name="PAGE_OPENED_SUCCESS">PAGE_OPENED_SUCCESS</string>
-    public <string name="HOME_INVOKED">HOME_INVOKED</string>
-    public <string name="SEARCH_INVOKED">SEARCH_INVOKED</string>
-    public <string name="MENU_INVOKED">MENU_INVOKED</string>
-    public <string name="ON_BACK">背部</string>
-
-
-    <string name="landing_next_page">下一个</string>
-
-
-    <string name="listview_clear">明确</string>
-
-
-    <string name="popup_new_tabs">新标签</string>
-    <string name="popup_close_tabs">关闭标签</string>
-    <string name="popup_open_Recent_tab">打开最近的标签页</string>
-    <string name="popup_languages">语言</string>
-    <string name="popup_download">资料下载</string>
-    <string name="popup_history">历史</string>
-    <string name="popup_settings">设定值</string>
-    <string name="popup_bookmark_page">收藏此页</string>
-    <string name="popup_open_bookmark">打开书签</string>
-    <string name="popup_report">报告网站</string>
-    <string name="popup_rate">为这个应用软件评分</string>
-    <string name="popup_share">分享</string>
-
-
-
-    <string name="orbot_settings_warning">Warning警告</string>
-    <string name="orbot_settings_bridges">启用网桥</string>
-    <string name="gateway_info">启用网关</string>
-    <string name="gateway_button">启用网关</string>
-    <string name="loading_please_wait">加载请稍候</string>
-    <string name="orbot_option_title_reset">应用卡在加载中</string>
-    <string name="orbot_option_desc_reset">清除存储</string>
-    <string name="orbot_option_desc_reset_button">打开设置</string>
-
-
-    <string name="orbot_header">代理设定</string>
-    <string name="orbot_desc">创世记浏览器将您连接到由全球数千名志愿者运营的Tor网络！这些选项可以帮助您吗</string>
-    <string name="orbot_option_title">互联网在这里进行审查</string>
-    <string name="orbot_option_desc">绕过防火墙</string>
-    <string name="orbot_option_warning_slow_speed">桥梁导致互联网运行非常缓慢。仅当您所在国家的互联网受到审查或Tor网络被阻止时才使用它们</string>
-
-
-
-
-    <string name="bookmark_clear_history">清除历史记录</string>
-    <string name="tab_view_clear_bookmark">清除书签</string>
-
-
-    <string name="hint_default_suggession">英国广播公司|以色列再次罢工</string>
-
-
-    <string name="notification_default_label">default.jpg</string>
-    <string name="notification_open_text">打开</string>
-
-
-    <string name="tab_view_increment"> 1个</string>
-    <string name="tab_view_search_tab">搜索标签</string>
-    <string name="tab_view_clear_tab">清除标签</string>
-
-
-    <string name="home_tab_text">1个</string>
-    <string name="home_connect">Connect</string>
-    <string name="home_loading">加载请稍候</string>
-
-
-    <string name="bridges_sometimes">“有时您需要一座通往Tor的桥梁。”</string>
-    <string name="action_more">“告诉我更多”</string>
-    <string name="vpn_setup">“您可以使用我们的内置VPN使任何应用程序都可以通过Tor。”</string>
-    <string name="vpn_setup_sub">“这不会使您匿名，但是它将帮助您穿过防火墙。”</string>
-    <string name="action_vpn_choose">“选择应用”</string>
-    <string name="hello">“你好”</string>
-    <string name="welcome">“欢迎使用手机上的Tor。”</string>
-    <string name="browser_the_internet">“按照您的期望浏览互联网。”</string>
-    <string name="no_tracking">“没有跟踪。没有审查制度。”</string>
-
-
-    <string name="error_m1">无法访问该网站</string>
-    <string name="error_m2">连接期间发生错误</string>
-    <string name="error_m3">您尝试查看的页面无法显示，因为无法验证所接收数据的真实性</string>
-    <string name="error_m4">由于某种原因，该页面当前未激活或关闭</string>
-    <string name="error_m5">请与网站所有者联系，以告知他们该问题。</string>
-    <string name="error_m6">重装</string>
-
-    <string-array name="fonts">
-        <item>55％</item>
-        <item>70％</item>
-        <item>85％</item>
-        <item>100％的</item>
-        <item>115％</item>
-        <item>130％</item>
-        <item>145％</item>
-    </string-array>
-
-    <string-array name="search_engines">
-        <item>隐藏的网</item>
-        <item>谷歌</item>
-        <item>鸭鸭去</item>
-    </string-array>
-
-    <string-array name="boolean_option">
-        <item>已启用</item>
-        <item>残障人士</item>
-    </string-array>
-
-    <string-array name="notification">
-        <item>全部启用</item>
-        <item>禁用所有</item>
-        <item>无带宽</item>
-    </string-array>
-
-    <string-array name="cookies">
-        <item>允许所有</item>
-        <item>允许信任</item>
-        <item>禁止无</item>
-        <item>允许访问</item>
-        <item>允许非追踪者</item>
-    </string-array>
-
-    <!-- Generated by Automatic String Resource Translation
-    --><!--          https://asrt.gluege.boerde.de
---></resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 768565f1..ce137b2b 100755
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <resources>
     <declare-styleable name="ResizableKeyboardViewDelegate">
         <attr name="viewToHideWhenActivated" format="reference" />
@@ -13,5 +11,4 @@
         <attr name="shiftDuration" format="reference" />
         <attr name="shiftInterpolator" format="reference" />
     </declare-styleable>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 579d89c0..db1bd3ce 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,38 +2,46 @@
 
     <!-- Application Strings -->
     <string name="app_name" translatable="false">Genesis</string>
-    <string name="SearchHintMain" translatable="false">Search or type web address</string>
-    <string name="homeUrl" translatable="false">https://genesis.onion</string>
-    <string name="errorTiyle" translatable="false">\u0020\u0020\u0020Opps! Some Thing Went Wrong</string>
-    <string name="todo" translatable="false">TODO</string>
-    <string name="projectName" translatable="false">Genesis Search Engine</string>
-    <string name="loadingText" translatable="false">Online Freedom</string>
-    <string name="reload" translatable="false">Reload</string>
-    <string name="internetErrorMessage" translatable="false">These might be the problems you are facing \n\n• Webpage or Website might be down \n• Your Internet connection might be poor \n• You might be using a proxy \n• Website might be blocked by firewall</string>
-    <string name="title_activity_list_manager" translatable="false">list_manager</string>
-    <string name="title_activity_setting_controller" translatable="false">Settings</string>
-    <string name="file_provider_authority" translatable="false">com.darkweb.genesissearchengine.fileprovider</string>
-
-    <!-- Preference Titles -->
-    <string name="preferences_messages_header" translatable="false">Messages</string>
-    <string name="preferences_sync_header" translatable="false">Sync</string>
-
-    <!-- Messages Preferences -->
-    <string name="messages_signature_title" translatable="false">Your signature</string>
-    <string name="messages_reply_title" translatable="false">Default reply action</string>
+    <string name="GENERAL_SEARCH_HINT" translatable="false">Search or type web address</string>
+    <string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+    <string name="GENERAL_ERROR_TITLE" translatable="false">\u0020\u0020\u0020Opps! Some Thing Went Wrong</string>
+    <string name="GENERAL_TODO" translatable="false">TODO</string>
+    <string name="GENERAL_PROJECT_NAME" translatable="false">Genesis Search Engine</string>
+    <string name="GENERAL_LOADING" translatable="false">Online Freedom</string>
+    <string name="GENERAL_RELOAD" translatable="false">Reload</string>
+    <string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="false">These might be the problems you are facing \n\n• Webpage or Website might be down \n• Your Internet connection might be poor \n• You might be using a proxy \n• Website might be blocked by firewall</string>
+    <string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.fileprovider</string>
+    <string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="false">BBC | Israel Strikes Again</string>
 
     <!-- Settings -->
-    <string name="settings_basic_settings" translatable="false">Basic Settings</string>
-    <string name="settings_header" translatable="false">Settings</string>
-    <string name="settings_search_engine" translatable="false">Search Engine</string>
-    <string name="settings_javascript" translatable="false">Javascript</string>
-    <string name="settings_clear_history" translatable="false">Auto Clear History</string>
-    <string name="settings_font_title" translatable="false">Font Settings</string>
-    <string name="settings_adjust_font" translatable="false">Customized Font</string>
-    <string name="settings_manual_font" translatable="false">Auto Adjust Font</string>
-    <string name="settings_cookies" translatable="false">Cookie Settings</string>
-    <string name="settings_cookie" translatable="false">Cookies</string>
-    <string name="settings_notification" translatable="false">Manage Notification</string>
+    <string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
+    <string name="SETTING_BASIC_SETTING" translatable="false">Basic Settings</string>
+    <string name="SETTING_DEFAULT_BROWSER" translatable="false">Make Genesis your default browser</string>
+    <string name="SETTING_HEADER" translatable="false">Settings</string>
+    <string name="SETTING_SEARCH_ENGINE" translatable="false">Search Engine</string>
+    <string name="SETTING_JAVASCRIPT" translatable="false">Javascript</string>
+    <string name="SETTING_CLEAR_HISTORY" translatable="false">Auto Clear History</string>
+    <string name="SETTING_FONT_TITLE" translatable="false">Font Settings</string>
+    <string name="SETTING_ADJUST_FONT" translatable="false">Customized Font</string>
+    <string name="SETTING_MANUAL_FONT" translatable="false">Auto Adjust Font</string>
+    <string name="SETTING_COOKIE_TEXT_INFO" translatable="false">Cookie Settings</string>
+    <string name="SETTING_COOKIE" translatable="false">Cookies</string>
+    <string name="SETTING_NOTIFICATION_HEADER" translatable="false">Settings | Notification</string>
+    <string name="SETTING_NOTIFICATION_DISABLE_STATUS_NOTIFICATION" translatable="false">Network Status Notification</string>
+    <string name="SETTING_NOTIFICATION_OPEN_NOTIFICATION_MANAGER" translatable="false">Device Notification Settings</string>
+    <string name="SETTING_SEARCH" translatable="false">Manage Search</string>
+    <string name="SETTING_SEARCH_INFO" translatable="false">Add, set default. show suggestions</string>
+    <string name="SETTING_NOTIFICATION" translatable="false">Manage Notification</string>
+    <string name="SETTING_NOTIFICATION_INFO" translatable="false">New features, network status</string>
+    <string name="SETTING_SEARCH_HEADER" translatable="false">Settings | Search</string>
+    <string name="SETTING_SEARCH_HEADER_1" translatable="false">Supported Search Engines</string>
+    <string name="SETTING_SEARCH_HEADER_2" translatable="false">Search Setting</string>
+    <string name="SETTING_SEARCH_DEFAULT" translatable="false">Default</string>
+    <string name="SETTING_SEARCH_GENESIS" translatable="false">Genesis</string>
+    <string name="SETTING_SEARCH_DUCK" translatable="false">DuckDuckGo</string>
+    <string name="SETTING_SEARCH_GOOGLE" translatable="false">Google</string>
+    <string name="SETTING_SEARCH_AMAZON" translatable="false">Bing</string>
+    <string name="SETTING_SEARCH_BING" translatable="false">Wikipedia</string>
 
     <!-- Alerts -->
     <string name="ALERT_CREATE_BOOKMARK" translatable="false">Bookmark Website</string>
@@ -71,20 +79,17 @@
     <string name="ALERT_WELCOME_MESSAGE_BT_4" translatable="false">Secret Softwares and Hacking Tools</string>
     <string name="ALERT_WELCOME_MESSAGE_BT_5" translatable="false">Don\'t Show Again</string>
     <string name="ALERT_WELCOME_MESSAGE_BT_6" translatable="false">Finance and Money</string>
-    <string name="ALERT_WELCOME_MESSAGE_BT_7" translatable="false">News Articles</string>
+    <string name="ALERT_WELCOME_MESSAGE_BT_7" translatable="false">Social Communities</string>
     <string name="ALERT_ABI_ERROR" translatable="false">Invalid Setup File</string>
     <string name="ALERT_ABI_ERROR_INFO" translatable="false">Looks like you messed up the installation. Either Install it from playstore or follow the link</string>
     <string name="ALERT_LOCAL_UPGRADE" translatable="false">Manual</string>
     <string name="ALERT_PLAYSTORE_UPGRADE" translatable="false">Playstore</string>
-
     <string name="ALERT_LONG_URL" translatable="false">URL Notification</string>
     <string name="ALERT_LONG_URL_OPTION_1" translatable="false">Open In New Tab</string>
     <string name="ALERT_LONG_URL_OPTION_2" translatable="false">Open In Current Tab</string>
     <string name="ALERT_LONG_URL_OPTION_3" translatable="false">Copy to Clipboard</string>
-o
     <string name="ALERT_LONG_FILE" translatable="false">File Notification</string>
     <string name="ALERT_DOWNLOAD" translatable="false">Download Notification</string>
-
     <string name="ALERT_DOWNLOAD_OPTION_1" translatable="false">Open url in new tab</string>
     <string name="ALERT_DOWNLOAD_OPTION_2" translatable="false">Open url in current tab</string>
     <string name="ALERT_DOWNLOAD_OPTION_3" translatable="false">Copy url to clipboard</string>
@@ -92,300 +97,120 @@ o
     <string name="ALERT_DOWNLOAD_OPTION_5" translatable="false">Open image current tab</string>
     <string name="ALERT_DOWNLOAD_OPTION_6" translatable="false">Copy image to clipboard</string>
     <string name="ALERT_DOWNLOAD_OPTION_7" translatable="false">Download image file</string>
-
     <string name="ALERT_DOWNLOAD_NOTIFICATION" translatable="false">Download Notification</string>
+    <string name="ALERT_LONG_URL_TITLE" translatable="false">URL Notification</string>
+    <string name="ALERT_LONG_URL_MESSAGE" translatable="false" />
+    <string name="ALERT_NOT_SUPPORTED_MESSAGE" translatable="false">No application found to handle email</string>
+    <string name="ALERT_DOWNLOAD_MESSAGE" translatable="false">Download File | </string>
 
     <!-- Bridge Settings -->
-    <string name="security_basic_settings" translatable="false">Security Settings</string>
-    <string name="bridge_basic_settings" translatable="false">Bridge Settings</string>
-    <string name="bridge_Automatid_title" translatable="false">Create Automatically</string>
-    <string name="bridge_Manual_desc" translatable="false">Provide a Bridge I know</string>
-    <string name="bridge_Auto_switch" translatable="false">Auto</string>
-    <string name="bridge_Manual_switch" translatable="false">Manual</string>
-    <string name="bridge_port_hint" translatable="false">address:port Single Line</string>
-    <string name="bridge_header" translatable="false">Proxy Settings | Bridges</string>
-    <string name="bridge_desc" translatable="false">Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others</string>
-    <string name="bridge_default_title" translatable="false">Select Default Bridge</string>
-    <string name="bridge_request" translatable="false">Request</string>
-    <string name="bridge_type_obfs4" translatable="false">obfs4 (Recommended)</string>
-    <string name="bridge_type_meek" translatable="false">Meek-azure (China)</string>
+    <string name="BRIDGE_BASIC_SETTING" translatable="false">Security Settings</string>
+    <string name="BRIDGE_SETTING" translatable="false">Bridge Settings</string>
+    <string name="BRIDGE_AUTO" translatable="false">Create Automatically</string>
+    <string name="BRIDGE_MANUAL" translatable="false">Provide a Bridge I know</string>
+    <string name="BRIDGE_PORT_HINT" translatable="false">address:port Single Line</string>
+    <string name="BRIDGE_HEADER" translatable="false">Proxy Settings | Bridges</string>
+    <string name="BRIDGE_DESC" translatable="false">Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others</string>
+    <string name="BRIDGE_TITLE" translatable="false">Select Default Bridge</string>
+    <string name="BRIDGE_REQUEST" translatable="false">Request</string>
+    <string name="BRIDGE_OBFS4" translatable="false">obfs4 (Recommended)</string>
+    <string name="BRIDGE_MEEK" translatable="false">Meek-azure (China)</string>
 
 
-    <!-- Message Manager -->
-    <string name="WELCOME_MESSAGE_TITLE" translatable="false">Welcome | Hidden  Web Gateway</string>
-    <string name="WELCOME_MESSAGE_DESC" translatable="false">This application provide you a platform to Search and Open Hidden Web urls.Here are few Suggestions\n</string>
-    <string name="WELCOME_MESSAGE_BT_1" translatable="false">Deep Web Online Market</string>
-    <string name="WELCOME_MESSAGE_BT_2" translatable="false">Leaked Documents and Books</string>
-    <string name="WELCOME_MESSAGE_BT_3" translatable="false">Dark Web News and Articles</string>
-    <string name="WELCOME_MESSAGE_BT_4" translatable="false">Secret Softwares and Hacking Tools</string>
-    <string name="WELCOME_MESSAGE_BT_5" translatable="false">Don\'t Show Again</string>
-    <string name="ABI_ERROR_TITLE" translatable="false">Invalid Setup File</string>
-    <string name="ABI_ERROR_DESC" translatable="false">Looks like you messed up the installation. Either Install it from playstore or follow the link</string>
-    <string name="ABI_ERROR_BT_1" translatable="false">Local Upgrade</string>
-    <string name="ABI_ERROR_BT_2" translatable="false">Playstore Upgrade</string>
-    <string name="ABI_ERROR_BT_3" translatable="false">Continue Anyway</string>
-    <string name="REPORT_URL_TITLE" translatable="false">Report This Website</string>
-    <string name="REPORT_URL_DESC" translatable="false">If you think url is illegal or disturbing report us so that we can update our database\n</string>
-    <string name="REPORT_URL_BT_1" translatable="false">Report</string>
-    <string name="REPORT_URL_BT_2" translatable="false">Dismiss</string>
-    <string name="ORBOT_INIT_TITLE" translatable="false">Initializing</string>
-    <string name="ORBOT_INIT_DESC" translatable="false">Please wait! While we connect you to hidden web. This might take few minutes\n</string>
-    <string name="ORBOT_INIT_BT_1" translatable="false">Dismiss</string>
-    <string name="ORBOT_INIT_BT_2" translatable="false">Try Again</string>
-    <string name="ORBOT_CLEAR_TITLE" translatable="false">Data Cleared</string>
-    <string name="ORBOT_CLEAR_DESC" translatable="false">Genesis data has been cleared. Please try to start application from Homepage\n</string>
-    <string name="ORBOT_CLEAR_BT_1" translatable="false">Dismiss</string>
-    <string name="VERSION_TITLE" translatable="false">Update Pending</string>
-    <string name="VERSION_DESC" translatable="false">You have not updated this app for a while please update it to get best performance\n</string>
-    <string name="VERSION_BT_1" translatable="false">Update</string>
-    <string name="REPORT_SUCCESS_TITLE" translatable="false">URL Reported Successfully</string>
-    <string name="REPORT_SUCCESS_DESC" translatable="false">URL has been successfully reported. It will take about a week to completely remove this website from our servers\n</string>
-    <string name="REPORT_SUCCESS_BT_1" translatable="false">Dismiss</string>
-    <string name="NOT_SUPPORTED_TITLE" translatable="false">Action not Supported</string>
-    <string name="NOT_SUPPORTED_MESSAGE" translatable="false">No application found to handle email</string>
-    <string name="NOT_SUPPORTED_BT_1" translatable="false">Dismiss</string>
-    <string name="RATE_TITLE" translatable="false">Rate US</string>
-    <string name="RATE_MESSAGE" translatable="false">We don\'t take donations or earn money from this app. We are trying to make a private anonymous internet \n\nIf you think this app works please rate us it gives us hope and strength to continue</string>
-    <string name="RATE_POSITIVE" translatable="false">Like This App</string>
-    <string name="RATE_NEGATIVE" translatable="false">Don\'t Like This App</string>
-    <string name="RATE_SUCCESS_TITLE" translatable="false">Sorry To Hear That!</string>
-    <string name="RATE_SUCCESS_DESC" translatable="false">If you are having any trouble and want to contact us please email us at gamesolstudios@gmail.com We will try to solve your problem as soon as possible</string>
-    <string name="RATE_SUCCESS_BT_1" translatable="false">Send Mail</string>
-    <string name="BOOKMARK_URL_BT_1" translatable="false">Bookmark</string>
-    <string name="BOOKMARK_URL_BT_2" translatable="false">Dismiss</string>
-    <string name="CLEAR_HISTORY_TITLE" translatable="false">Clear site storage?</string>
-    <string name="CLEAR_HISTORY_DESC" translatable="false">This will clear data for all sites</string>
-    <string name="CLEAR_HISTORY_BT_1" translatable="false">Clear</string>
-    <string name="CLEAR_HISTORY_BT_2" translatable="false">Dismiss</string>
-    <string name="CLEAR_TAB_TITLE" translatable="false">Clear open tabs?</string>
-    <string name="CLEAR_TAB_DESC" translatable="false">This will clear all stored tabs</string>
-    <string name="CLEAR_TAB_BT_1" translatable="false">Clear</string>
-    <string name="clear_bookmark_title" translatable="false">Clear site bookmark?</string>
-    <string name="clear_bookmark_desc" translatable="false">This will clear data for all saved sites\n</string>
-    <string name="clear_bookmark_bt1" translatable="false">Clear</string>
-    <string name="clear_bookmark_bt2" translatable="false">Dismiss</string>
-    <string name="DOWNLOAD_TITLE" translatable="false">Download Notification</string>
-    <string name="DOWNLOAD_MESSAGE" translatable="false">Download File | </string>
-    <string name="DOWNLOAD_POSITIVE" translatable="false">Download</string>
-    <string name="BRIDGE_MAIL_POSITIVE" translatable="false">Send Email</string>
-    <string name="LONG_URL_TITLE" translatable="false">URL Notification</string>
-    <string name="LONG_URL_MESSAGE" translatable="false" />
-    <string name="LONG_URL_OPTION_1" translatable="false">Open In New Tab</string>
-    <string name="LONG_URL_OPTION_2" translatable="false">Open In Current Tab</string>
-    <string name="LONG_URL_OPTION_3" translatable="false">Copy to Clipboard</string>
-    <string name="LONG_URL_OPTION_4" translatable="false">Download this file</string>
-    <string name="LONG_URL_FULL_MESSAGE" translatable="false">URL Description</string>
-    <string name="LONG_URL_FULL_OPTION_1" translatable="false">Open url in new tab</string>
-    <string name="LONG_URL_FULL_OPTION_2" translatable="false">Open url in current tab</string>
-    <string name="LONG_URL_FULL_OPTION_3" translatable="false">Copy url to clipboard</string>
-    <string name="LONG_URL_FULL_OPTION_4" translatable="false">Open image in new tab</string>
-    <string name="LONG_URL_FULL_OPTION_5" translatable="false">Open image current tab</string>
-    <string name="LONG_URL_FULL_OPTION_6" translatable="false">Copy image to clipboard</string>
-    <string name="LONG_URL_FULL_OPTION_7" translatable="false">Download image file</string>
-    <string name="BANNED_TITLE" translatable="false">Is Tor Bannned In Your Country?</string>
-    <string name="BANNED_DESC" translatable="false">Enable free GATEWAY to tunnel through banned configuration | Use it only if tor is banned in your country</string>
-
-    /*Tab Manager*/
-
-    public
-    <string name="CLEAR_TABS" translatable="false">CLEAR TABS</string>
-
-    /*Bridge Manager*/
-
-    public
-    <string name="CUSTOM_BRIDGE" translatable="false">obfs4</string>
-
-    /*Text Manager*/
-
-    public
-    <string name="DARK_WEB" translatable="false">Hidden Web</string>
-    public
-    <string name="EMPTY_STR" translatable="false" />
-    public
-    <string name="EMPTY_SPACE" translatable="false"> </string>
-
-    /*Settings Manager*/
-
-    public
-    <string name="CUSTOM_FONTS" translatable="false">Custom Font</string>
-    public
-    <string name="PERCENT_SIGN" translatable="false">%</string>
-    public
-    <string name="DEFAULT_LANGUAGE" translatable="false">ru</string>
-
-    /*Bookmark Manager*/
-
-    public
-    <string name="CLEAR_BOOKMARK" translatable="false">CLEAR BOOKMARK</string>
-
-    /*Home Manager*/
-
-    public
-    <string name="BLANK_PAGE" translatable="false">about:blank</string>
-
-    /*Events*/
-
-    public
-    <string name="APP_STARTED" translatable="false">APP_STARTED</string>
-    public
-    <string name="PROXY_CHANGED" translatable="false">PROXY_CHANGED</string>
-    public
-    <string name="APP_RESTARTED" translatable="false">APP_RESTARTED</string>
-    public
-    <string name="APP_FINISHED" translatable="false">APP_FINISHED</string>
-    public
-    <string name="SEARCH_SWITCH" translatable="false">SEARCH_SWITCH</string>
-    public
-    <string name="SETTINGS_OPENED" translatable="false">SETTINGS_OPENED</string>
-    public
-    <string name="URL_BOOKMARKED" translatable="false">URL_BOOKMARKED</string>
-    public
-    <string name="BOOKMARK_OPENED" translatable="false">BOOKMARK_OPENED</string>
-    public
-    <string name="TAB_OPENED" translatable="false">TAB_OPENED</string>
-    public
-    <string name="GATEWAY_OPENED" translatable="false">GATEWAY_OPENED</string>
-    public
-    <string name="HISTORY_OPENED" translatable="false">HISTORY_OPENED</string>
-    public
-    <string name="HISTORY_TRIGGERED" translatable="false">HISTORY_TRIGGERED</string>
-    public
-    <string name="BOOKMARK_TRIGGERED" translatable="false">BOOKMARK_TRIGGERED</string>
-    public
-    <string name="TAB_TRIGGERED" translatable="false">TAB_TRIGGERED</string>
-    public
-    <string name="URL_ERROR" translatable="false">URL_ERROR</string>
-    public
-    <string name="URL_ERROR_NOT_LOADED" translatable="false">URL_ERROR_NOT_LOADED</string>
-    public
-    <string name="PAGE_OPENED_SUCCESS" translatable="false">PAGE_OPENED_SUCCESS</string>
-    public
-    <string name="HOME_INVOKED" translatable="false">HOME_INVOKED</string>
-    public
-    <string name="SEARCH_INVOKED" translatable="false">SEARCH_INVOKED</string>
-    public
-    <string name="MENU_INVOKED" translatable="false">MENU_INVOKED</string>
-    public
-    <string name="ON_BACK" translatable="false">ON_BACK</string>
-
-    <!-- Landing View -->
-    <string name="landing_next_page" translatable="false">Next</string>
-
-    <!-- List View -->
-    <string name="listview_clear" translatable="false">Clear</string>
-
     <!-- Popup Menu -->
-    <string name="popup_new_tabs" translatable="false">New Tabs</string>
-    <string name="popup_close_tabs" translatable="false">Close Tab</string>
-    <string name="popup_open_Recent_tab" translatable="false">Open Recent Tabs</string>
-    <string name="popup_languages" translatable="false">Language</string>
-    <string name="popup_download" translatable="false">Downloads</string>
-    <string name="popup_history" translatable="false">History</string>
-    <string name="popup_settings" translatable="false">Settings</string>
-    <string name="popup_desktop" translatable="false">Desktop Site</string>
-    <string name="popup_bookmark_page" translatable="false">Bookmark This Page</string>
-    <string name="popup_open_bookmark" translatable="false">Open Bookmarks</string>
-    <string name="popup_report" translatable="false">Report Website</string>
-    <string name="popup_rate" translatable="false">Rate This App</string>
-    <string name="popup_share" translatable="false">Share</string>
+    <string name="HOME_MENU__NEW_TABS" translatable="false">New Tabs</string>
+    <string name="HOME_MENU_CLOSE_TABS" translatable="false">Close Tab</string>
+    <string name="HOME_MENU_OPEN_RECENT_TABS" translatable="false">Open Recent Tabs</string>
+    <string name="HOME_MENU_LANGUAGE" translatable="false">Language</string>
+    <string name="HOME_MENU_DOWNLOAD" translatable="false">Downloads</string>
+    <string name="HOME_MENU_HISTORY" translatable="false">History</string>
+    <string name="HOME_MENU_SETTING" translatable="false">Settings</string>
+    <string name="HOME_MENU_DESKTOP" translatable="false">Desktop Site</string>
+    <string name="HOME_MENU_BOOKMARK" translatable="false">Bookmark This Page</string>
+    <string name="HOME_MENU_OPEN_BOOKMARK" translatable="false">Open Bookmarks</string>
+    <string name="HOME_MENU_REPORT" translatable="false">Report Website</string>
+    <string name="HOME_MENU_RATE" translatable="false">Rate This App</string>
+    <string name="HOME_MENU_SHARE" translatable="false">Share</string>
 
     <!-- Shared Recycler View -->
-    <string name="SRV_OPEN" translatable="false">Open tabs</string>
-    <string name="SRV_COPY" translatable="false">Copy</string>
-    <string name="SRV_SHARE" translatable="false">Share</string>
-    <string name="SRV_CLEAR_LONG_PRESSES" translatable="false">Clear Selection</string>
-    <string name="SRV_OPEN_CURRENT_TAB" translatable="false">Open in current tab</string>
-    <string name="SRV_OPEN_NEW_TAB" translatable="false">Open in new tab</string>
-    <string name="SRV_DELETE" translatable="false">Delete</string>
+    <string name="SHARED_RECYCLER_VIEW_OPEN" translatable="false">Open tabs</string>
+    <string name="SHARED_RECYCLER_VIEW_COPY" translatable="false">Copy</string>
+    <string name="SHARED_RECYCLER_VIEW_SHARE" translatable="false">Share</string>
+    <string name="SHARED_RECYCLER_VIEW_CLEAR_LONG_PRESSES" translatable="false">Clear Selection</string>
+    <string name="SHARED_RECYCLER_VIEW_OPEN_CURRENT_TAB" translatable="false">Open in current tab</string>
+    <string name="SHARED_RECYCLER_VIEW_OPEN_NEW_TAB" translatable="false">Open in new tab</string>
+    <string name="SHARED_RECYCLER_VIEW_DELETE" translatable="false">Delete</string>
 
     <!-- History Popup Menu -->
-    <string name="HP_TITLE" translatable="false">History</string>
-    <string name="HP_CLEAR" translatable="false">Clear</string>
-    <string name="HP_SEARCH_HINT" translatable="false">Search ...</string>
+    <string name="HOME_TITLE" translatable="false">History</string>
+    <string name="HOME_CLEAR" translatable="false">Clear</string>
+    <string name="HOME_SEARCH_HINT" translatable="false">Search ...</string>
 
 
     <!-- BOOKMARK Popup Menu -->
-    <string name="BP_TITLE" translatable="false">Bookmark</string>
-    <string name="BP_CLEAR" translatable="false">Clear</string>
-    <string name="BP_SEARCH_HINT" translatable="false">Search ...</string>
+    <string name="BOOKMARK_TITLE" translatable="false">Bookmark</string>
+    <string name="BOOKMARK_CLEAR" translatable="false">Clear</string>
+    <string name="BOOKMARK_SEARCH_HINT" translatable="false">Search ...</string>
 
     <!-- Language Manager Manager -->
-    <string name="LP_TITLE" translatable="false">Language</string>
-    <string name="LP_LANGUAGE_MESSAGE_TITLE" translatable="false">Change Language</string>
-    <string name="LP_LANGUAGE_MESSAGE_DESC" translatable="false">We currently support the following langugage would be adding more soon\n</string>
-    <string name="LP_LANGUAGE_MESSAGE_BT_DEFAULT" translatable="false">English (United States)</string>
-    <string name="LP_LANGUAGE_MESSAGE_BT_1" translatable="false">German (Germany)</string>
-    <string name="LP_LANGUAGE_MESSAGE_BT_2" translatable="false">Italian (Italy)</string>
-    <string name="LP_LANGUAGE_MESSAGE_BT_3" translatable="false">Portuguese (Brazil)</string>
-    <string name="LP_LANGUAGE_MESSAGE_BT_4" translatable="false">Russian (Russia)</string>
-    <string name="LP_LANGUAGE_MESSAGE_BT_5" translatable="false">Ukrainian (Ukraine)</string>
-    <string name="LP_LANGUAGE_MESSAGE_BT_6" translatable="false">Chinese Simplified (Mainland China)</string>
+    <string name="LANGUAGE_TITLE" translatable="false">Language</string>
+    <string name="LANGUAGE_LANGUAGE_MESSAGE_TITLE" translatable="false">Change Language</string>
+    <string name="LANGUAGE_LANGUAGE_MESSAGE_DESC" translatable="false">We currently support the following langugage would be adding more soon\n</string>
+    <string name="LANGUAGE_LANGUAGE_MESSAGE_BT_DEFAULT" translatable="false">English (United States)</string>
+    <string name="LANGUAGE_LANGUAGE_MESSAGE_BT_1" translatable="false">German (Germany)</string>
+    <string name="LANGUAGE_LANGUAGE_MESSAGE_BT_2" translatable="false">Italian (Italy)</string>
+    <string name="LANGUAGE_LANGUAGE_MESSAGE_BT_3" translatable="false">Portuguese (Brazil)</string>
+    <string name="LANGUAGE_LANGUAGE_MESSAGE_BT_4" translatable="false">Russian (Russia)</string>
+    <string name="LANGUAGE_LANGUAGE_MESSAGE_BT_5" translatable="false">Ukrainian (Ukraine)</string>
+    <string name="LANGUAGE_LANGUAGE_MESSAGE_BT_6" translatable="false">Chinese Simplified (Mainland China)</string>
 
     <!-- Orbot Settings -->
-    <string name="orbot_settings_warning" translatable="false">⚠️ Warning</string>
-    <string name="orbot_customizes_bridges" translatable="false">Customize Bridges</string>
-    <string name="orbot_settings_bridges" translatable="false">Enable Bridges</string>
-    <string name="orbot_vpn_bridges" translatable="false">Enable VPN Serivce</string>
-    <string name="gateway_info" translatable="false">Enable Bridge Gateway</string>
-    <string name="gateway_button" translatable="false">Enable Gateway</string>
-    <string name="loading_please_wait" translatable="false">Loading Please Wait</string>
-    <string name="orbot_option_title_reset" translatable="false">App Stuck in loading</string>
-    <string name="orbot_option_desc_reset" translatable="false">Clear Storage</string>
-    <string name="orbot_option_desc_reset_button" translatable="false">Settings</string>
+    <string name="ORBOT_SETTING_WARNING" translatable="false">⚠️ Warning</string>
+    <string name="ORBOT_SETTING_CUSTOM_BRIDGE" translatable="false">Customize Bridges</string>
+    <string name="ORBOT_SETTING_BRIDGE_ENABLE" translatable="false">Enable Bridges</string>
+    <string name="ORBOT_SETTING_ENABLE_VPN" translatable="false">Enable VPN Serivce</string>
+    <string name="ORBOT_SETTING_GATEWAY_INFO" translatable="false">Enable Bridge Gateway</string>
+    <string name="ORBOT_SETTING_GATEWAY_BUTTON" translatable="false">Enable Gateway</string>
 
     <!-- Orbot View -->
-    <string name="orbot_header" translatable="false">Proxy Settings</string>
-    <string name="orbot_desc" translatable="false">We connect you to the Tor Network run by thousands of volunteers around the world! Can these options help you</string>
-    <string name="orbot_option_title" translatable="false">Internet is censored here (Bypass Firewall)</string>
-    <string name="orbot_option_desc" translatable="false">Bypass Firewall</string>
-    <string name="orbot_option_warning_slow_speed" translatable="false">Bridges causes internet to run very slow. Use them only if internet is censored in your country or Tor network is blocked</string>
-
-    <!-- Splash -->
-
-    <!-- Bookmark -->
-    <string name="bookmark_clear_history" translatable="false">Clear History</string>
-    <string name="tab_view_clear_bookmark" translatable="false">Clear Bookmark</string>
-
-    <!-- Hint View -->
-    <string name="hint_default_suggession" translatable="false">BBC | Israel Strikes Again</string>
+    <string name="ORBOT_HEADER" translatable="false">Proxy Settings</string>
+    <string name="ORBOT_DESCRIPTION" translatable="false">We connect you to the Tor Network run by thousands of volunteers around the world! Can these options help you</string>
+    <string name="ORBOT_TITLE" translatable="false">Internet is censored here (Bypass Firewall)</string>
+    <string name="ORBOT_OPTION_DESCRIPTION" translatable="false">Bypass Firewall</string>
+    <string name="ORBOT_BRIDGE_WARNING" translatable="false">Bridges causes internet to run very slow. Use them only if internet is censored in your country or Tor network is blocked</string>
 
     <!-- Notification Menu -->
-    <string name="notification_default_label" translatable="false">default.jpg</string>
-    <string name="notification_open_text" translatable="false">Open</string>
-
-    <!-- Tab View -->
-    <string name="tab_view_increment" translatable="false">+1</string>
-    <string name="tab_view_search_tab" translatable="false">Search Tabs</string>
-    <string name="tab_view_clear_tab" translatable="false">Clear Tab</string>
+    <string name="NOTIFICATION_DEFAULT_LABEL" translatable="false">default.jpg</string>
+    <string name="NOTIFICATION_OPEN_TEXT" translatable="false">Open</string>
 
     <!-- Home View -->
-    <string name="home_tab_text" translatable="false">1</string>
-    <string name="home_connect" translatable="false">Connect</string>
-    <string name="home_loading" translatable="false">Loading Please Wait</string>
+    <string name="HOME_TAB_TEXT" translatable="false">1</string>
+    <string name="HOME_CONNECT" translatable="false">Connect</string>
+    <string name="HOME_LOADING" translatable="false">Loading Please Wait</string>
 
     <!-- Landing Page -->
-    <string name="bridges_sometimes" translatable="false">"Sometimes you need a bridge to get to Tor."</string>
-    <string name="action_more" translatable="false">"TELL ME MORE"</string>
-    <string name="vpn_setup" translatable="false">"You can enable any app to go through Tor using our built-in VPN."</string>
-    <string name="vpn_setup_sub" translatable="false">"This won\'t make you anonymous, but it will help get through firewalls."</string>
-    <string name="action_vpn_choose" translatable="false">"CHOOSE APPS"</string>
-    <string name="hello" translatable="false">"Hello"</string>
-    <string name="welcome" translatable="false">"Welcome to Tor on mobile."</string>
-    <string name="browser_the_internet" translatable="false">"Browse the internet how you expect you should."</string>
-    <string name="no_tracking" translatable="false">"No tracking. No censorship."</string>
+    <string name="LANDING_BRIDGES_INFO" translatable="false">"Sometimes you need a bridge to get to Tor."</string>
+    <string name="LANDING_MORE" translatable="false">"TELL ME MORE"</string>
+    <string name="LANDING_VPN_SETUP" translatable="false">"You can enable any app to go through Tor using our built-in VPN."</string>
+    <string name="LANDING_VPN_SETUP_SUB_INFO" translatable="false">"This won\'t make you anonymous, but it will help get through firewalls."</string>
+    <string name="LANDING_VPN_CHOOSE_APPS" translatable="false">"CHOOSE APPS"</string>
+    <string name="LANDING_HELLO" translatable="false">"Hello"</string>
+    <string name="LANDING_WELCOME" translatable="false">"Welcome to Tor on mobile."</string>
+    <string name="LANDING_BROWSE_INFO" translatable="false">"Browse the internet how you expect you should."</string>
+    <string name="LANDING_NO_TRACKING" translatable="false">"No tracking. No censorship."</string>
 
     <!-- Error Page -->
-    <string name="error_m1" translatable="false">This site can\'t be reached</string>
-    <string name="error_m2" translatable="false">An error occurred during a connection</string>
-    <string name="error_m3" translatable="false">The page you are trying to view cannot be shown because the authenticity of the received data could not be verified</string>
-    <string name="error_m4" translatable="false">The page is currently not live or down due to some reason</string>
-    <string name="error_m5" translatable="false">Please contact the website owners to inform them of this problem.</string>
-    <string name="error_m6" translatable="false">Reload</string>
+    <string name="ERROR_M1" translatable="false">This site can\'t be reached</string>
+    <string name="ERROR_M2" translatable="false">An error occurred during a connection</string>
+    <string name="ERROR_M3" translatable="false">The page you are trying to view cannot be shown because the authenticity of the received data could not be verified</string>
+    <string name="ERROR_M4" translatable="false">The page is currently not live or down due to some reason</string>
+    <string name="ERROR_M5" translatable="false">Please contact the website owners to inform them of this problem.</string>
+    <string name="ERROR_M6" translatable="false">Reload</string>
 
     <!-- Others -->
     <string name="PREF_LANGUAGE" translatable="false">pref_language</string>
 
-    <string-array name="fonts" translatable="false">
+    <string-array name="ARRAY_FONTS" translatable="false">
         <item>55 Percent</item>
         <item>70 Percent</item>
         <item>85 Percent</item>
@@ -401,18 +226,18 @@ o
         <item>Duck Duck Go</item>
     </string-array>
 
-    <string-array name="boolean_option" translatable="false">
+    <string-array name="ARRAY_DEFAULT_BOOLEAN" translatable="false">
         <item>Enabled</item>
         <item>Disabled</item>
     </string-array>
 
-    <string-array name="notification" translatable="false">
+    <string-array name="ARRAY_NOTIFICATION" translatable="false">
         <item>Enable All</item>
         <item>Disable All</item>
         <item>No Bandwidth</item>
     </string-array>
 
-    <string-array name="cookies" translatable="false">
+    <string-array name="ARRAY_COOKIES" translatable="false">
         <item>Allow All</item>
         <item>Allow Trusted</item>
         <item>Allow None</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3c22a51a..365ce7c3 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,8 +1,6 @@
 <resources>
 
-    <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/ease_blue</item>
         <item name="colorPrimaryDark">@color/landing_ease_blue</item>
         <item name="colorAccent">@color/ease_blue</item>