diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a2ac707..552bd6c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,12 +83,12 @@
             android:name=".AboutActivity"
             android:exported="true"
             android:hardwareAccelerated="true"
-            android:label="About App" />
+            android:label="@string/about_app" />
         <activity
             android:name=".StoreActivity"
             android:exported="true"
             android:hardwareAccelerated="true"
-            android:label="Apps &amp; Games" />
+            android:label="@string/store" />
         <activity
             android:name=".StoreItemActivity"
             android:exported="true"
@@ -117,7 +117,7 @@
         <activity
             android:name="com.vectras.qemu.MainSettingsManager"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:label="Settings"
+            android:label="@string/settings"
             android:theme="@style/AppTheme" />
         <activity
             android:name=".CustomRomActivity"
@@ -161,7 +161,6 @@
             android:exported="true"
             android:screenOrientation="sensorLandscape"/>
         <activity
-            android:theme="@style/Theme.AppCompat.DayNight"
             android:excludeFromRecents="true"
             android:name="com.vectras.vm.x11.LoriePreferences"
             android:taskAffinity="com.vectras.vm.x11.LoriePreferences"
diff --git a/app/src/main/java/com/vectras/qemu/MainSettingsManager.java b/app/src/main/java/com/vectras/qemu/MainSettingsManager.java
index 5fe7d08..2fd5321 100644
--- a/app/src/main/java/com/vectras/qemu/MainSettingsManager.java
+++ b/app/src/main/java/com/vectras/qemu/MainSettingsManager.java
@@ -30,9 +30,12 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.SwitchPreference;
 import androidx.preference.SwitchPreferenceCompat;
 
+import com.vectras.vm.AboutActivity;
 import com.vectras.vm.MainActivity;
 import com.vectras.vm.R;
+import com.vectras.vm.RomsManagerActivity;
 import com.vectras.vm.SplashActivity;
+import com.vectras.vm.StoreActivity;
 import com.vectras.vm.VectrasApp;
 
 import java.util.Arrays;
@@ -132,7 +135,6 @@ public class MainSettingsManager extends AppCompatActivity
 
     }
 
-
     public static class AppPreferencesFragment extends PreferenceFragmentCompat
             implements Preference.OnPreferenceChangeListener {
         @Override
diff --git a/app/src/main/java/com/vectras/qemu/MainVNCActivity.java b/app/src/main/java/com/vectras/qemu/MainVNCActivity.java
index 415be0c..d7dd746 100644
--- a/app/src/main/java/com/vectras/qemu/MainVNCActivity.java
+++ b/app/src/main/java/com/vectras/qemu/MainVNCActivity.java
@@ -236,6 +236,8 @@ public class MainVNCActivity extends VncCanvasActivity {
         });
         JoystickView joystick = (JoystickView) findViewById(R.id.joyStick);
         joystick.setVisibility(View.GONE);
+        ImageButton btnFit = findViewById(R.id.btnFit);
+        btnFit.setVisibility(View.GONE);
         tabBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/java/com/vectras/vm/CustomRomActivity.java b/app/src/main/java/com/vectras/vm/CustomRomActivity.java
index 1751b98..d7faf61 100644
--- a/app/src/main/java/com/vectras/vm/CustomRomActivity.java
+++ b/app/src/main/java/com/vectras/vm/CustomRomActivity.java
@@ -163,7 +163,7 @@ public class CustomRomActivity extends AppCompatActivity {
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setDisplayShowHomeEnabled(true);
-        setTitle("Rom Options");
+        setTitle(getString(R.string.rom_options));
         //AdView mAdView = findViewById(R.id.adView);
         //AdRequest adRequest = new AdRequest.Builder().build();
         //mAdView.loadAd(adRequest);
diff --git a/app/src/main/java/com/vectras/vm/MainActivity.java b/app/src/main/java/com/vectras/vm/MainActivity.java
index af82e20..579c579 100644
--- a/app/src/main/java/com/vectras/vm/MainActivity.java
+++ b/app/src/main/java/com/vectras/vm/MainActivity.java
@@ -597,18 +597,18 @@ public class MainActivity extends AppCompatActivity {
             }
         });
         if (Config.debug)
-            UIUtils.UIAlert(activity, "DEBUG TESTING BUILD 5", "welcome to debug build of vectras vm :)<br>" +
-                    "this version unstable and has alot of bugs<br>" +
-                    "don't forget to tell us on github issues or telegram bot<br>" +
-                    "<a href=\"https://t.me/vectras_protect_bot\">telegram report bot</a><br>" +
-                    "<a href=\"https://github.com/epicstudios856/Vectras-VM-Android/issues\">github issues page</a><br>");
+            UIUtils.UIAlert(activity, getString(R.string.debug_testing_build_5), getString(R.string.welcome_to_debug_build_of_vectras_vm_br) +
+                    getString(R.string.this_version_unstable_and_has_alot_of_bugs_br) +
+                    getString(R.string.don_t_forget_to_tell_us_on_github_issues_or_telegram_bot_br) +
+                    getString(R.string.a_href_https_t_me_vectras_protect_bot_telegram_report_bot_a_br) +
+                    getString(R.string.a_href_https_github_com_epicstudios856_vectras_vm_android_issues_github_issues_page_a_br));
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
         if (!prefs.getBoolean("tgDialog", false)) {
             AlertDialog alertDialog;
             alertDialog = new AlertDialog.Builder(activity, R.style.MainDialogTheme).create();
-            alertDialog.setTitle("JOIN US ON TELEGRAM");
-            alertDialog.setMessage("Join us on Telegram where we publish all the news and updates and receive your opinions and bugs");
-            alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, "JOIN", new DialogInterface.OnClickListener() {
+            alertDialog.setTitle(getString(R.string.join_us_on_telegram));
+            alertDialog.setMessage(getString(R.string.join_us_on_telegram_where_we_publish_all_the_news_and_updates_and_receive_your_opinions_and_bugs));
+            alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, getString(R.string.join), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
                     String tg = "https://t.me/vectras_os";
                     Intent f = new Intent(Intent.ACTION_VIEW);
@@ -617,12 +617,12 @@ public class MainActivity extends AppCompatActivity {
                     return;
                 }
             });
-            alertDialog.setButton(DialogInterface.BUTTON_NEUTRAL, "CANCEL", new DialogInterface.OnClickListener() {
+            alertDialog.setButton(DialogInterface.BUTTON_NEUTRAL, getString(R.string.cancel), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
                     return;
                 }
             });
-            alertDialog.setButton(DialogInterface.BUTTON_NEGATIVE, "DONT SHOW AGAIN", new DialogInterface.OnClickListener() {
+            alertDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getString(R.string.dont_show_again), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
                     SharedPreferences.Editor edit = prefs.edit();
diff --git a/app/src/main/java/com/vectras/vm/SetupQemuActivity.java b/app/src/main/java/com/vectras/vm/SetupQemuActivity.java
index e6dbad0..a0e45a3 100644
--- a/app/src/main/java/com/vectras/vm/SetupQemuActivity.java
+++ b/app/src/main/java/com/vectras/vm/SetupQemuActivity.java
@@ -6,6 +6,7 @@ import static android.content.Intent.ACTION_VIEW;
 import com.termux.app.TermuxService;
 import static com.vectras.vm.utils.UIUtils.UIAlert;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -316,6 +317,7 @@ public class SetupQemuActivity extends AppCompatActivity implements View.OnClick
     String tarPath;
 
     // Function to append text and automatically scroll to bottom
+    @SuppressLint("SetTextI18n")
     private void appendTextAndScroll(String textToAdd) {
         ScrollView scrollView = findViewById(R.id.scrollView);
 
@@ -331,29 +333,29 @@ public class SetupQemuActivity extends AppCompatActivity implements View.OnClick
 
         if (textToAdd.contains("Starting setup...")) {
             title.setText("Getting ready for you...");
-            textviewsettingup.setText("Getting ready for you...\nPlease don't disconnect the network.");
+            textviewsettingup.setText(R.string.getting_ready_for_you_please_don_t_disconnect_the_network);
         } else if (textToAdd.contains("Installing packages...")) {
-            title.setText("It won't take long...");
-            textviewsettingup.setText("Completed 10%\nIt won't take long...");
+            title.setText(R.string.it_won_t_take_long);
+            textviewsettingup.setText(R.string.completed_10_it_won_t_take_long);
         } else if (textToAdd.contains("(50/")) {
-            textviewsettingup.setText("Completed 20%\nIt won't take long...");
+            textviewsettingup.setText(R.string.completed_20_it_won_t_take_long);
         } else if (textToAdd.contains("100/")) {
-            textviewsettingup.setText("Completed 30%\nIt won't take long...");
+            textviewsettingup.setText(R.string.completed_30_it_won_t_take_long);
         } else if (textToAdd.contains("150/")) {
-            textviewsettingup.setText("Completed 40%\nIt won't take long...");
+            textviewsettingup.setText(R.string.completed_40_it_won_t_take_long);
         } else if (textToAdd.contains("200/")) {
-            textviewsettingup.setText("Completed 50%\nIt won't take long...");
+            textviewsettingup.setText(R.string.completed_50_it_won_t_take_long);
         } else if (textToAdd.contains("Downloading Qemu...")) {
-            title.setText("Don't disconnect...");
-            textviewsettingup.setText("Completed 75%\nDon't disconnect...");
+            title.setText(R.string.don_t_disconnect);
+            textviewsettingup.setText(R.string.completed_75_don_t_disconnect);
         } else if (textToAdd.contains("Installing Qemu...")) {
-            title.setText("Keep it up...");
-            textviewsettingup.setText("Completed 80%\nKeep it up...");
+            title.setText(R.string.keep_it_up);
+            textviewsettingup.setText(R.string.completed_80_keep_it_up);
         } else if (textToAdd.contains("qemu-system")) {
-            textviewsettingup.setText("Completed 95%\nKeep it up...");
+            textviewsettingup.setText(R.string.completed_95_keep_it_up);
         } else if (textToAdd.contains("Just a sec...")) {
-            title.setText("Almost there.");
-            textviewsettingup.setText("Almost there.");
+            title.setText(R.string.almost_there);
+            textviewsettingup.setText(getString(R.string.almost_there));
         }
 
         // Scroll to the bottom
@@ -678,10 +680,10 @@ public class SetupQemuActivity extends AppCompatActivity implements View.OnClick
         }
 
         alertDialog = new AlertDialog.Builder(activity, R.style.MainDialogTheme).create();
-        alertDialog.setTitle("BOOTSTRAP REQUIRED!");
-        alertDialog.setMessage("You can choose between auto download and setup or manual setup by choosing bootstrap file.");
+        alertDialog.setTitle(getString(R.string.bootstrap_required));
+        alertDialog.setMessage(getString(R.string.you_can_choose_between_auto_download_and_setup_or_manual_setup_by_choosing_bootstrap_file));
         alertDialog.setCancelable(false);
-        alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, "AUTO SETUP", new DialogInterface.OnClickListener() {
+        alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, getString(R.string.auto_setup), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
                 //startDownload();
                 if (AppConfig.getSetupFiles().contains("arm64-v8a") || AppConfig.getSetupFiles().contains("x86_64")) {
@@ -692,7 +694,7 @@ public class SetupQemuActivity extends AppCompatActivity implements View.OnClick
                 return;
             }
         });
-        alertDialog.setButton(DialogInterface.BUTTON_NEGATIVE, "MANUAL SETUP", new DialogInterface.OnClickListener() {
+        alertDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getString(R.string.manual_setup), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
                 Intent intent = new Intent(ACTION_OPEN_DOCUMENT);
                 intent.addCategory(Intent.CATEGORY_OPENABLE);
diff --git a/app/src/main/java/com/vectras/vm/SplashActivity.java b/app/src/main/java/com/vectras/vm/SplashActivity.java
index f876a42..28ccbca 100644
--- a/app/src/main/java/com/vectras/vm/SplashActivity.java
+++ b/app/src/main/java/com/vectras/vm/SplashActivity.java
@@ -35,6 +35,7 @@ import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
+import androidx.preference.PreferenceManager;
 
 import com.vectras.qemu.MainSettingsManager;
 import com.vectras.vm.utils.FileUtils;
@@ -85,15 +86,17 @@ public class SplashActivity extends AppCompatActivity implements Runnable {
 
         setupFiles();
 
-        updateLocale(MainSettingsManager.getLang(activity));
+        updateLocale();
     }
 
-    private void updateLocale(String languageCode) {
+    private void updateLocale() {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        String languageCode = sharedPreferences.getString("language", "en");
+
         Locale locale = new Locale(languageCode);
         Locale.setDefault(locale);
         Configuration config = new Configuration();
         config.setLocale(locale);
-
         getResources().updateConfiguration(config, getResources().getDisplayMetrics());
     }
 
diff --git a/app/src/main/java/com/vectras/vm/StartVM.java b/app/src/main/java/com/vectras/vm/StartVM.java
index f5dc847..824b373 100644
--- a/app/src/main/java/com/vectras/vm/StartVM.java
+++ b/app/src/main/java/com/vectras/vm/StartVM.java
@@ -202,7 +202,7 @@ public class StartVM {
             params.add("gtk");
         }
 
-        params.add("-full-screen");
+        //params.add("-full-screen");
 
         params.add("-qmp");
         params.add("tcp:localhost:4444,server,nowait");
diff --git a/app/src/main/java/com/vectras/vm/VectrasApp.java b/app/src/main/java/com/vectras/vm/VectrasApp.java
index 1d13499..4cb5290 100644
--- a/app/src/main/java/com/vectras/vm/VectrasApp.java
+++ b/app/src/main/java/com/vectras/vm/VectrasApp.java
@@ -1,6 +1,7 @@
 package com.vectras.vm;
 
 import static androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale;
+import static androidx.core.content.ContextCompat.getString;
 
 import android.Manifest;
 import android.app.Activity;
@@ -443,16 +444,16 @@ public class VectrasApp extends Application {
 		} else {
 			if (request) {
 				AlertDialog alertDialog = new AlertDialog.Builder(activity, R.style.MainDialogTheme).create();
-				alertDialog.setTitle("Allow permissions");
-				alertDialog.setMessage("You need to grant permission to access the storage before use.");
+				alertDialog.setTitle(activity.getString(R.string.allow_permissions));
+				alertDialog.setMessage(activity.getString(R.string.you_need_to_grant_permission_to_access_the_storage_before_use));
 				alertDialog.setCancelable(false);
-				alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, "Allow", new DialogInterface.OnClickListener() {
+				alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, getContext().getString(R.string.allow), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int which) {
 						if (activity.shouldShowRequestPermissionRationale(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
 							Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
 							intent.setData(Uri.parse("package:" + activity.getPackageName()));
 							activity.startActivity(intent);
-							Toast.makeText(activity, "Find and allow access to storage in Settings.", Toast.LENGTH_LONG).show();
+							Toast.makeText(activity, R.string.find_and_allow_access_to_storage_in_settings, Toast.LENGTH_LONG).show();
 						} else {
 							ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1000);
 						}
diff --git a/app/src/main/java/com/vectras/vm/x11/X11Activity.java b/app/src/main/java/com/vectras/vm/x11/X11Activity.java
index 812af6d..dcba615 100644
--- a/app/src/main/java/com/vectras/vm/x11/X11Activity.java
+++ b/app/src/main/java/com/vectras/vm/x11/X11Activity.java
@@ -368,6 +368,7 @@ public class X11Activity extends AppCompatActivity implements View.OnApplyWindow
 
         ImageButton shutdownBtn = findViewById(R.id.shutdownBtn);
         ImageButton settingBtn = findViewById(R.id.btnSettings);
+        ImageButton btnFit = findViewById(R.id.btnFit);
         ImageButton keyboardBtn = findViewById(R.id.kbdBtn);
         ImageButton controllersBtn = findViewById(R.id.btnMode);
         ImageButton upBtn = findViewById(R.id.upBtn);
@@ -393,7 +394,27 @@ public class X11Activity extends AppCompatActivity implements View.OnApplyWindow
         ImageButton leftGameBtn = findViewById(R.id.leftGameBtn);
         ImageButton rightGameBtn = findViewById(R.id.rightGameBtn);
         ImageButton enterGameBtn = findViewById(R.id.enterGameBtn);
+
         qmpBtn = findViewById(R.id.btnQmp);
+
+        final boolean[] isFullScreen = {false};
+        btnFit.setOnClickListener(view -> {
+            sendKey(KEYCODE_CTRL_LEFT, false);
+            sendKey(KEYCODE_ALT_LEFT, false);
+            sendKey(KEYCODE_F, false);
+            sendKey(KEYCODE_CTRL_LEFT, true);
+            sendKey(KEYCODE_ALT_LEFT, true);
+            sendKey(KEYCODE_F, true);
+
+            if (isFullScreen[0]) {
+                btnFit.setImageDrawable(getResources().getDrawable(R.drawable.close_fullscreen_24px));
+                isFullScreen[0] = false;
+            } else {
+                btnFit.setImageDrawable(getResources().getDrawable(R.drawable.open_in_full_24px));
+                isFullScreen[0] = true;
+            }
+        });
+
         upGameBtn.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
@@ -586,16 +607,15 @@ public class X11Activity extends AppCompatActivity implements View.OnApplyWindow
                 newFragment.show(ft, "Controllers");
             }
         });
-        settingBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                final Dialog alertDialog = new Dialog(activity, R.style.MainDialogTheme);
-                alertDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-                alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-                alertDialog.setContentView(R.layout.dialog_setting);
-                alertDialog.show();
-            }
-        });
+        findViewById(R.id.btnSettings)
+                .setOnClickListener(
+                        (l) ->
+                                startActivity(
+                                        new Intent(this, LoriePreferences.class) {
+                                            {
+                                                setAction(Intent.ACTION_MAIN);
+                                            }
+                                        }));
         upBtn.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
diff --git a/app/src/main/res/drawable/close_fullscreen_24px.xml b/app/src/main/res/drawable/close_fullscreen_24px.xml
new file mode 100644
index 0000000..623b055
--- /dev/null
+++ b/app/src/main/res/drawable/close_fullscreen_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M400,616L164,852Q153,863 136,863Q119,863 108,852Q97,841 97,824Q97,807 108,796L344,560L200,560Q183,560 171.5,548.5Q160,537 160,520Q160,503 171.5,491.5Q183,480 200,480L440,480Q457,480 468.5,491.5Q480,503 480,520L480,760Q480,777 468.5,788.5Q457,800 440,800Q423,800 411.5,788.5Q400,777 400,760L400,616ZM616,400L760,400Q777,400 788.5,411.5Q800,423 800,440Q800,457 788.5,468.5Q777,480 760,480L520,480Q503,480 491.5,468.5Q480,457 480,440L480,200Q480,183 491.5,171.5Q503,160 520,160Q537,160 548.5,171.5Q560,183 560,200L560,344L796,108Q807,97 824,97Q841,97 852,108Q863,119 863,136Q863,153 852,164L616,400Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/open_in_full_24px.xml b/app/src/main/res/drawable/open_in_full_24px.xml
new file mode 100644
index 0000000..b774523
--- /dev/null
+++ b/app/src/main/res/drawable/open_in_full_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M160,840Q143,840 131.5,828.5Q120,817 120,800L120,560Q120,543 131.5,531.5Q143,520 160,520Q177,520 188.5,531.5Q200,543 200,560L200,704L704,200L560,200Q543,200 531.5,188.5Q520,177 520,160Q520,143 531.5,131.5Q543,120 560,120L800,120Q817,120 828.5,131.5Q840,143 840,160L840,400Q840,417 828.5,428.5Q817,440 800,440Q783,440 771.5,428.5Q760,417 760,400L760,256L256,760L400,760Q417,760 428.5,771.5Q440,783 440,800Q440,817 428.5,828.5Q417,840 400,840L160,840Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_setup_qemu.xml b/app/src/main/res/layout/activity_setup_qemu.xml
index 33269e0..5d53b20 100644
--- a/app/src/main/res/layout/activity_setup_qemu.xml
+++ b/app/src/main/res/layout/activity_setup_qemu.xml
@@ -83,14 +83,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="8dp"
-                    android:text="Start setup"
+                    android:text="@string/start_setup"
                     android:textSize="18sp" />
                 <TextView
                     android:id="@+id/textview3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="8dp"
-                    android:text="Do you want to set it up automatically or select the bootstrap file manually\?" />
+                    android:text="@string/do_you_want_to_set_it_up_automatically_or_select_the_bootstrap_file_manually" />
                 <LinearLayout
                     android:id="@+id/linear5"
                     android:layout_width="match_parent"
@@ -105,14 +105,14 @@
                         android:layout_marginRight="4dp"
                         android:padding="8dp"
                         android:gravity="center_horizontal|center_vertical"
-                        android:text="Auto setup" />
+                        android:text="@string/auto_setup" />
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/buttonmanualsetup"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="8dp"
                         android:gravity="center_horizontal|center_vertical"
-                        android:text="Manual" />
+                        android:text="@string/manual" />
                 </LinearLayout>
             </LinearLayout>
             <LinearLayout
@@ -136,7 +136,7 @@
                     android:layout_height="wrap_content"
                     android:padding="8dp"
                     android:gravity="center"
-                    android:text="Getting ready for you..." />
+                    android:text="@string/getting_ready_for_you" />
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/linearsetupfailed"
@@ -150,14 +150,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="8dp"
-                    android:text="Failed!"
+                    android:text="@string/failed"
                     android:textSize="18sp" />
                 <TextView
                     android:id="@+id/textview6"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="8dp"
-                    android:text="Something went wrong during setup. Would you like to try again\?" />
+                    android:text="@string/something_went_wrong_during_setup_would_you_like_to_try_again" />
                 <LinearLayout
                     android:id="@+id/linear8"
                     android:layout_width="match_parent"
@@ -172,14 +172,14 @@
                         android:layout_marginRight="4dp"
                         android:padding="8dp"
                         android:gravity="center_horizontal|center_vertical"
-                        android:text="Try again" />
+                        android:text="@string/try_again" />
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/buttonsetupshowlog"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="8dp"
                         android:gravity="center_horizontal|center_vertical"
-                        android:text="Show log" />
+                        android:text="@string/show_log" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
@@ -194,7 +194,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="8dp"
-                android:text="Show advanced setup" />
+                android:text="@string/show_advanced_setup" />
         </LinearLayout>
     </LinearLayout>
 <androidx.cardview.widget.CardView
diff --git a/app/src/main/res/layout/controls_fragment.xml b/app/src/main/res/layout/controls_fragment.xml
index ffb71da..9be3ec1 100644
--- a/app/src/main/res/layout/controls_fragment.xml
+++ b/app/src/main/res/layout/controls_fragment.xml
@@ -90,6 +90,16 @@
                         android:src="@drawable/round_terminal_24"
                         app:tint="?attr/colorPrimary" />
 
+                    <ImageButton
+                        android:id="@+id/btnFit"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:background="@drawable/controls_button"
+                        android:backgroundTint="?attr/colorPrimary"
+                        android:src="@drawable/open_in_full_24px"
+                        app:tint="?attr/colorPrimary" />
+
                     <ImageButton
                         android:id="@+id/btnMode"
                         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4391df5..1a19712 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -464,4 +464,45 @@
     <string name="no">cancel</string>
     <string name="cancel">cancel</string>
     <string name="back_to_the_display">Back to the Display</string>
+    <string name="x11_ui_environment">x11 ui environment.</string>
+    <string name="x11">X11</string>
+    <string name="rom_options">Rom Options</string>
+    <string name="about_app">About App</string>
+    <string name="join_us_on_telegram">JOIN US ON TELEGRAM</string>
+    <string name="join_us_on_telegram_where_we_publish_all_the_news_and_updates_and_receive_your_opinions_and_bugs">Join us on Telegram where we publish all the news and updates and receive your opinions and bugs</string>
+    <string name="join">JOIN</string>
+    <string name="dont_show_again">DONT SHOW AGAIN</string>
+    <string name="this_version_unstable_and_has_alot_of_bugs_br"><![CDATA[this version unstable and has alot of bugs<br>]]></string>
+    <string name="debug_testing_build_5">DEBUG TESTING BUILD 5</string>
+    <string name="welcome_to_debug_build_of_vectras_vm_br"><![CDATA[welcome to debug build of vectras vm :)<br>]]></string>
+    <string name="don_t_forget_to_tell_us_on_github_issues_or_telegram_bot_br"><![CDATA[don\'t forget to tell us on github issues or telegram bot<br>]]></string>
+    <string name="a_href_https_t_me_vectras_protect_bot_telegram_report_bot_a_br"><![CDATA[<a href=\"https://t.me/vectras_protect_bot\">telegram report bot</a><br>]]></string>
+    <string name="a_href_https_github_com_epicstudios856_vectras_vm_android_issues_github_issues_page_a_br"><![CDATA[<a href=\"https://github.com/epicstudios856/Vectras-VM-Android/issues\">github issues page</a><br>]]></string>
+    <string name="getting_ready_for_you_please_don_t_disconnect_the_network">Getting ready for you...\nPlease don\'t disconnect the network.</string>
+    <string name="it_won_t_take_long">It won\'t take long...</string>
+    <string name="completed_10_it_won_t_take_long">Completed 10%\nIt won\'t take long...</string>
+    <string name="completed_20_it_won_t_take_long">Completed 20%\nIt won\'t take long...</string>
+    <string name="completed_30_it_won_t_take_long">Completed 30%\nIt won\'t take long...</string>
+    <string name="completed_40_it_won_t_take_long">Completed 40%\nIt won\'t take long...</string>
+    <string name="completed_50_it_won_t_take_long">Completed 50%\nIt won\'t take long...</string>
+    <string name="don_t_disconnect">Don\'t disconnect...</string>
+    <string name="completed_75_don_t_disconnect">Completed 75%\nDon\'t disconnect...</string>
+    <string name="keep_it_up">Keep it up...</string>
+    <string name="completed_80_keep_it_up">Completed 80%\nKeep it up...</string>
+    <string name="completed_95_keep_it_up">Completed 95%\nKeep it up...</string>
+    <string name="almost_there">Almost there.</string>
+    <string name="show_advanced_setup">Show advanced setup</string>
+    <string name="allow_permissions">Allow permissions</string>
+    <string name="you_need_to_grant_permission_to_access_the_storage_before_use">You need to grant permission to access the storage before use.</string>
+    <string name="find_and_allow_access_to_storage_in_settings">Find and allow access to storage in Settings.</string>
+    <string name="do_you_want_to_set_it_up_automatically_or_select_the_bootstrap_file_manually">Do you want to set it up automatically or select the bootstrap file manually?</string>
+    <string name="auto_setup">Auto setup</string>
+    <string name="manual">Manual</string>
+    <string name="getting_ready_for_you">Getting ready for you...</string>
+    <string name="failed">Failed!</string>
+    <string name="something_went_wrong_during_setup_would_you_like_to_try_again">Something went wrong during setup. Would you like to try again?</string>
+    <string name="show_log">Show log</string>
+    <string name="bootstrap_required">BOOTSTRAP REQUIRED!</string>
+    <string name="you_can_choose_between_auto_download_and_setup_or_manual_setup_by_choosing_bootstrap_file">You can choose between auto download and setup or manual setup by choosing bootstrap file.</string>
+    <string name="manual_setup">MANUAL SETUP</string>
 </resources>
diff --git a/app/src/main/res/xml/headers_preference.xml b/app/src/main/res/xml/headers_preference.xml
index 99760a3..56d0ec5 100644
--- a/app/src/main/res/xml/headers_preference.xml
+++ b/app/src/main/res/xml/headers_preference.xml
@@ -26,4 +26,10 @@
         android:title="@string/vnc"
         android:summary="@string/vnc_ui_environment"
         app:iconSpaceReserved="false" />
+    <Preference
+        android:key="x11"
+        android:fragment="com.vectras.vm.x11.LoriePreferences$LoriePreferenceFragment"
+        android:title="@string/x11"
+        android:summary="@string/x11_ui_environment"
+        app:iconSpaceReserved="false" />
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index aaf53fe..2159646 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -3,7 +3,7 @@
     <PreferenceCategory
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:title="APP SETTINGS"
+        android:title="@string/app_settings"
         app:icon="@drawable/round_settings_24">
 
         <SwitchPreferenceCompat
diff --git a/app/src/main/res/xml/userinterface.xml b/app/src/main/res/xml/userinterface.xml
index 89f224d..2ecea4a 100644
--- a/app/src/main/res/xml/userinterface.xml
+++ b/app/src/main/res/xml/userinterface.xml
@@ -4,7 +4,7 @@
     <PreferenceCategory
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:title="USER INTERFACE"
+        android:title="@string/user_interface"
         app:iconSpaceReserved="false">
 
         <SwitchPreferenceCompat
diff --git a/web/data/roms-store.json b/web/data/roms-store.json
index 35e2443..3e98f12 100644
--- a/web/data/roms-store.json
+++ b/web/data/roms-store.json
@@ -88,7 +88,7 @@
         "rom_icon":"https://www.getmyos.com/upload/files/2018/10/12/windows_2001_logo_1_abcd7f82240a9d6d4ef94d5c6223130b.png",
         "rom_url":"https://github.com/Stiven2016/vecras-roms/releases/download/Microx%C3%BC/micro.xp.cvbi",
         "rom_path":"micro.xp.cvbi",
-        "rom_avail":true,
+        "rom_avail":false,
         "rom_size":"110MB (From Stiven2016)",
         "rom_arch":"X86_64",
         "rom_kernel":"windows",
@@ -100,7 +100,7 @@
         "rom_icon":"https://www.getmyos.com/upload/files/2018/10/19/windows_8_8.1_logo_1_17b84e6869fdc9169328be8b5827d602.png",
         "rom_url":"https://www.mediafire.com/file/m1zh38hzahz0s8y/win10vectras.cvbi/file",
         "rom_path":"win8.1.cvbi",
-        "rom_avail":true,
+        "rom_avail":false,
         "rom_size":"2.8GB (From Mhmd Acil)",
         "rom_arch":"X86_64",
         "rom_kernel":"windows",