diff --git a/app/build.gradle b/app/build.gradle
index c9bda77c..5dadeb6b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,16 +2,17 @@ apply plugin: 'com.android.application'
 
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31//CS304 Issue Link : https://github.com/SubhamTyagi/Last-Launcher/issue/142
 
     defaultConfig {
         applicationId "io.github.subhamtyagi.lastlauncher"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30//CS304 Issue Link : https://github.com/SubhamTyagi/Last-Launcher/issue/142
         versionCode 19
         versionName "0.19"
         //resConfigs "en", "de"
         buildConfigField "boolean", "enableColorSniffer", "false"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         debug {
@@ -68,6 +69,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':flowlayout:layouts')
+    implementation 'androidx.appcompat:appcompat:1.3.0' //CS304 Issue Link : https://github.com/SubhamTyagi/Last-Launcher/issue/142
+    implementation 'com.google.android.material:material:1.5.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test:rules:1.4.0'//CS304 Issue Link : https://github.com/SubhamTyagi/Last-Launcher/issue/142
+
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
 }
 
diff --git a/app/src/androidTest/java/io/github/subhamtyagi/lastlauncher/LauncherActivityTest.java b/app/src/androidTest/java/io/github/subhamtyagi/lastlauncher/LauncherActivityTest.java
new file mode 100644
index 00000000..e86b4341
--- /dev/null
+++ b/app/src/androidTest/java/io/github/subhamtyagi/lastlauncher/LauncherActivityTest.java
@@ -0,0 +1,44 @@
+package io.github.subhamtyagi.lastlauncher;
+
+
+import static org.junit.Assert.assertEquals;
+
+
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import io.github.subhamtyagi.lastlauncher.utils.DbUtils;
+
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+/**
+ * To test if it starts with default theme
+ * CS304 Issue Link : https://github.com/SubhamTyagi/Last-Launcher/issue/142
+ */
+public class LauncherActivityTest { //NOPMD - suppressed AtLeastOneConstructor - It is a test file
+
+
+    /**
+     * Construct LauncherActivity
+     */
+    @Rule
+    public ActivityTestRule<LauncherActivity> mActivityTestRule = new ActivityTestRule<>(LauncherActivity.class);
+
+    /**
+     * Test
+     */
+    @Test
+    public void launcherActivityTest() {
+
+        assertEquals("Theme is not default",R.style.AppTheme,DbUtils.getTheme());
+    }
+
+
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ba18c9c3..3d20cf28 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,8 @@
             android:excludeFromRecents="true"
             android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true"><!--changed-->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/assets/fonts/raleway_bold.ttf b/app/src/main/assets/fonts/raleway_bold.ttf
index d4110f06..700a6aee 100644
Binary files a/app/src/main/assets/fonts/raleway_bold.ttf and b/app/src/main/assets/fonts/raleway_bold.ttf differ
diff --git a/app/src/main/java/io/github/subhamtyagi/lastlauncher/LauncherActivity.java b/app/src/main/java/io/github/subhamtyagi/lastlauncher/LauncherActivity.java
index 4383e4cf..3b744049 100644
--- a/app/src/main/java/io/github/subhamtyagi/lastlauncher/LauncherActivity.java
+++ b/app/src/main/java/io/github/subhamtyagi/lastlauncher/LauncherActivity.java
@@ -108,6 +108,8 @@
 import static io.github.subhamtyagi.lastlauncher.utils.Constants.SORT_BY_SIZE;
 import static io.github.subhamtyagi.lastlauncher.utils.Constants.SORT_BY_UPDATE_TIME;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
  * --------------------------------------------------------------------------
  * People can criticise me all the time they want,
@@ -124,13 +126,14 @@
  * Don’t just think, do it. Now it is you turn,  do it now, go fast and open pull request
  * -
  * ----------------------------------------------------------------------------
- * This Activity extends the api 14 Activity Class not latest AppCompatActivity
- * Reason: Small apk size
+ * This Activity extends AppCompatActivity to achieve changing theme with day/Night theme
+ *
+ *
  */
 @SuppressLint("NonConstantResourceId")
-public class LauncherActivity extends Activity implements View.OnClickListener,
+public class LauncherActivity extends AppCompatActivity implements View.OnClickListener,
         View.OnLongClickListener,
-        Gestures.OnSwipeListener {
+        Gestures.OnSwipeListener { //CS304 Issue Link : https://github.com/SubhamTyagi/Last-Launcher/issue/142
 
 
     //region Field declarations
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index c5f4f557..362adcbb 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -57,4 +57,5 @@
     <string name="rename">Gi nytt navn</string>
     <string name="color_for_this_entry">Farger og størrelse</string>
     <string name="from_color_sniffer_app">Fra ColorSniffer-program</string>
+    <string name="restart_launcher">Start oppstarter på ny</string>
 </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
index c85f5d5c..a596e9b4 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -56,4 +56,5 @@
     <string name="color_for_this_entry">Цвета и размер</string>
     <string name="action_settings">Настройки</string>
     <string name="from_color_sniffer_app">Из приложения ColorSniffer</string>
+    <string name="restart_launcher">Перезапустить лаунчер</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index e58fb4a3..4f28e04c 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -55,4 +55,5 @@
     <string name="action_settings">Nastavenia</string>
     <string name="recently_first">Nedávneho použitia</string>
     <string name="custom">Vlastné</string>
+    <string name="restart_launcher">Reštartovať spúšťač</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
new file mode 100644
index 00000000..e875c999
--- /dev/null
+++ b/app/src/main/res/values-tr/strings.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="color_for_this_entry">Renkler ve Boyut</string>
+    <string name="fonts">Yazi Tipleri</string>
+    <string name="random_colors">Rastgele Renkler</string>
+    <string name="default_theme">Varsayılan Tema</string>
+    <string name="action_settings">Ayarlar</string>
+    <string name="rename">Yeniden Adlandır</string>
+    <string name="uninstall">Kaldır</string>
+    <string name="hide">Gizle</string>
+    <string name="hidden_apps">Gizli Uygulamalar</string>
+    <string name="frozen_apps">Dondurulmuş Uygulamalar</string>
+    <string name="background_wallpaper">Arkaplan Resmi</string>
+    <string name="white_on_black">Siyah üzerinde beyaz</string>
+    <string name="black_on_white">Beyaz üzerinde siyah</string>
+    <string name="themes">Temalar</string>
+    <string name="set_to_primary_colors">Ana Renkleri Ayarla</string>
+    <string name="backup">Yedekle</string>
+    <string name="app_info">Uygulama Bilgisi</string>
+    <string name="reset_to_default">Hepsini Sıfırla</string>
+    <string name="reset_to_default_settings">Varsayılan ayarlara sıfırla</string>
+    <string name="freeze_apps_size">Uygulamaların Boyutunu Dondur</string>
+    <string name="unfreeze_app_size">Uygulamaların Boyutunu Çöz</string>
+    <string name="freeze_size">Boyutu Dondur</string>
+    <string name="unfreeze_size">Boyutu çöz</string>
+    <string name="backup_saved_to_downloads">Yedek İndirilenler klasörüne kaydedildi</string>
+    <string name="restore">Onar</string>
+    <string name="fixed_colors">Sabit Renkler</string>
+    <string name="black_on_grey">Gri üzerinde beyaz</string>
+    <string name="hacker_red">Hacker Kırmızısı</string>
+    <string name="padding">Dolgu</string>
+    <string name="open">Aç</string>
+    <string name="sort_apps_by">Uygulamaları Sıralama Ölçütü</string>
+    <string name="start">Başlangıç</string>
+    <string name="white_on_grey">Beyaz üzerinde gri</string>
+    <string name="hacker_green">Hacker Yeşili</string>
+    <string name="choose_old_backup_files">Önceki yedek dosyasını seç</string>
+    <string name="from_clipboard">Panodan</string>
+    <string name="from_color_sniffer_app">ColorSniffer Uygulamasından</string>
+    <string name="some_error_occurred">Bazı hatalar oluştu</string>
+    <string name="choose_old_backup_file">Eski yedek dosyasını seç</string>
+    <string name="end">Bitiş</string>
+    <string name="on">:Aç</string>
+    <string name="off">:Kapat</string>
+    <string name="alignment">Hizalama</string>
+    <string name="center">Orta</string>
+    <string name="reset_color">Rengi Sıfırla</string>
+    <string name="remove">Kaldır</string>
+    <string name="restore_default_fonts">Varsayılan yazı tipine sıfırla</string>
+    <string name="select_fonts">Yazı tipi seç</string>
+    <string name="by_opening_counts">Uygulama Kullanımı</string>
+    <string name="by_name">İsim</string>
+    <string name="by_color">Renk</string>
+    <string name="restart_launcher">Başlatıcıyı Yeniden Başlat</string>
+    <string name="update_time">Güncelleme zamanı</string>
+    <string name="custom">Özel</string>
+    <string name="by_size">Boyut</string>
+    <string name="recently_first">Önce ilk</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6729bf15..685d9744 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">
+    <style name="AppBaseTheme" parent="Theme.MaterialComponents.DayNight"><!--changed to themes in materialComponents-->
         <item name="android:popupAnimationStyle">@style/WindowAnimationTransition</item>
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
         <item name="android:listPreferredItemHeightSmall">40dp</item>
@@ -19,9 +19,9 @@
     <style name="AppTheme" parent="AppBaseTheme">
         <item name="android:textColor">#8F8C8C</item>
         <!--<item name="android:switchTextAppearance">#FF8F8C8C</item>-->
-        <item name="android:background">@android:color/black</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>
-        <item name="android:navigationBarColor" tools:targetApi="21">@android:color/black</item>
+<!--        <item name="android:background">@android:color/black</item>-->
+<!--        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>-->
+<!--        <item name="android:navigationBarColor" tools:targetApi="21">@android:color/black</item>-->
 
     </style>
 
diff --git a/build.gradle b/build.gradle
index c1324586..302cbce8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,3 +21,17 @@ allprojects {
         maven { url 'https://jitpack.io' }
     }
 }
+
+apply plugin: 'checkstyle'
+checkstyle{
+    toolVersion = '10.1'
+    configFile = rootProject.file('config/checkstyle/checkstyle.xml')
+}
+task Checkstyle(type:Checkstyle){
+    source 'src/main/java'
+    include '**/*.java'
+    exclude '**/gen/**'
+    exclude '**/R.java'
+    exclude '**/BuildConfig.java'
+    classpath = rootProject.files()
+}
diff --git a/fastlane/metadata/android/hr/full_description.txt b/fastlane/metadata/android/hr/full_description.txt
index 3388be02..9f042582 100644
--- a/fastlane/metadata/android/hr/full_description.txt
+++ b/fastlane/metadata/android/hr/full_description.txt
@@ -1,4 +1,4 @@
-Last Launcher je brz, jednostavan, minimalistički, prilagodljiv pokretač za Android. Cilj mu je pružiti najbrže i najjednostavnije korisničko iskustvo ikad.
+Last Launcher je brz, jednostavan, minimalistički, prilagodljiv pokretač za Android. Cilj mu je pružiti najbrže i najjednostavnije korisničko iskustvo ikada.
 
 <p>
 *************************
diff --git a/fastlane/metadata/android/pt-BR/changelogs/18.txt b/fastlane/metadata/android/pt-BR/changelogs/18.txt
new file mode 100644
index 00000000..c04bd3a7
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/18.txt
@@ -0,0 +1,10 @@
+*Lançamento do Beta 8*
+
+* O que há de novo neste lançamento
+
+- Correção de erros para "Crashing o Launcher ao atualizar apps".
+- Correção de vazamento de memória
+
+* Mudanças nos códigos fonte do projeto.
+
+- Atualização de tradução.
diff --git a/fastlane/metadata/android/pt-BR/changelogs/19.txt b/fastlane/metadata/android/pt-BR/changelogs/19.txt
new file mode 100644
index 00000000..9dab8ef3
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/19.txt
@@ -0,0 +1,9 @@
+*Glória à Ucrânia 🇺🇦 *
+*StandWithUkraine*
+
+Atualização de tradução para:
+
+Lituano
+Romeno
+Espanhol
+Ucraniano
diff --git a/fastlane/metadata/android/ru/short_description.txt b/fastlane/metadata/android/ru/short_description.txt
new file mode 100644
index 00000000..7da54f63
--- /dev/null
+++ b/fastlane/metadata/android/ru/short_description.txt
@@ -0,0 +1 @@
+Быстрее света
diff --git a/fastlane/metadata/android/ru/title.txt b/fastlane/metadata/android/ru/title.txt
new file mode 100644
index 00000000..de66edbe
--- /dev/null
+++ b/fastlane/metadata/android/ru/title.txt
@@ -0,0 +1 @@
+Last Launcher
diff --git a/fastlane/metadata/android/ru/video.txt b/fastlane/metadata/android/ru/video.txt
new file mode 100644
index 00000000..3d6486da
--- /dev/null
+++ b/fastlane/metadata/android/ru/video.txt
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=SzhJgH4a2cU
diff --git a/fastlane/metadata/android/tr/changelogs/1.txt b/fastlane/metadata/android/tr/changelogs/1.txt
new file mode 100644
index 00000000..97dad49d
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/1.txt
@@ -0,0 +1 @@
+*Önizleme sürümü*
diff --git a/fastlane/metadata/android/tr/changelogs/10.txt b/fastlane/metadata/android/tr/changelogs/10.txt
new file mode 100644
index 00000000..cd1d8f40
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/10.txt
@@ -0,0 +1,7 @@
+*Önizleme sürümü 10*
+
+- Uygulamaları isim, boyut, renk ve kullanıma gore sıralama
+- Uygulama, website kısayollarını ve PWA'ları gösterme
+- Yedeklemeden sonra temanın doğru olmaması için hata düzeltmesi
+- Kırmızı şeylerin düzgün görüntülenmemesi için hata düzeltmesi
+- Performans geliştirmeleri.
diff --git a/fastlane/metadata/android/tr/changelogs/11.txt b/fastlane/metadata/android/tr/changelogs/11.txt
new file mode 100644
index 00000000..04d51c2b
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/11.txt
@@ -0,0 +1,13 @@
+*Beta sürüm 1*
+
+* Çok sayıda önizleme sürümünden sonra Last Launcher beta aşamasına girdi.
+
+* Bu Sürümdeki Yenilikler
+
+- Uygulama arama.
+- Performans iyileştirmeleri(başlangıç, sıralama ve rastgele renk).
+- APK boyutunda büyük azalma (23%).
+- Daha fazla bellek tüketimi azaltma.
+- Daha fazla Bellek sızıntısına neden olan Kısayollar ve PWA'larla ilgili hata düzeltmesi
+
+- Bu güncelleme, bu başlatıcıdan eski kısayolları kaldıracak, güncellemeden sonra yeniden eklemeniz gerek.
diff --git a/fastlane/metadata/android/tr/full_description.txt b/fastlane/metadata/android/tr/full_description.txt
new file mode 100644
index 00000000..442a4610
--- /dev/null
+++ b/fastlane/metadata/android/tr/full_description.txt
@@ -0,0 +1,44 @@
+Last Launcher hızlı, basit, minimalist ve kişiselleştirilebilir bir Android başlatıcısıdır. En hızlı ve en basit kullanıcı deneyimini sunmayı hedefler.
+
+<p>
+*************************
+**Bu bir <font color="#FF6E40"><b>Beta sürümüdür***
+*************************
+</p>
+
+<h4>Bu uygulamayı <a href="https://hosted.weblate.org/projects/last-launcher">Weblate(https://hosted.weblate.org/projects/last-launcher)</a> üzerinden kendi diline çevir.</h4>
+
+<h2>Tasarı</h2>
+▶ Her zaman ücretsiz (ücretsiz ve özgür).
+▶ F-droid'e özel.
+
+<h2>🚀 Performans</h2>
+▶ Hızlıdan daha hızlı :)
+▶ 130KB'dan daha düşük hafif ve küçük APK boyutu.
+▶ Düşük bellek ve CPU kullanımı.
+
+<h2>💥 Özellikler</h2>
+▶ Uygulamalar arasında arama.
+▶ Kısayol ve PWA desteği.
+▶ Boyutlandırılabilir ve renklendirilebilir uygulama isimleri.
+▶ Birçok şekilde uygulamaları sıralama.
+▶ Özel yerleşim ve dolgu.
+▶ Rastgele renkler.
+▶ Çoklu tema.
+▶ Uygulamaları gizleme.
+▶ Uygulama boyutunu dondurma.
+▶ Başlatıcı verisini yedekleme/geri yükleme.
+▶ İkon ve widget yok <strike>(dezavantaj olabilir)</strike>.
+▶ Dahası için <font color="#FF6E40"><b>başlatıcıyı dene</b></font> ve farkı gör.
+
+<h2> Gizlilik<h2>
+▶ İnternet erişimi izni yok.
+▶ Depolama erişimi izni yok.
+▶ Tüm veriler cihazın özel deposunda saklanır ve hassas veriler basit bir algoritma ile şifrelenir.
+
+<h2>Navigasyon</h2>
+▶<font color="#FF6E40"> Başlatıcı ayarlarına erişmek için BOŞ BİR ALANA basılı tut.</font>
+▶<font color="#FF6E40"> Arama barına erişmek için SAĞA kaydır.</font>
+▶<font color="#FF6E40"> Arama barını gizlemek için Geri/Ev tuşuna basın veya ana ekranda SOLA kaydırın.</font>
+
+<h4>Bu uygulamayı <a href="https://hosted.weblate.org/projects/last-launcher">Weblate(https://hosted.weblate.org/projects/last-launcher)</a> üzerinden kendi diline çevir.</h4>
diff --git a/fastlane/metadata/android/tr/short_description.txt b/fastlane/metadata/android/tr/short_description.txt
new file mode 100644
index 00000000..b354f041
--- /dev/null
+++ b/fastlane/metadata/android/tr/short_description.txt
@@ -0,0 +1 @@
+Işıktan daha hızlı
diff --git a/fastlane/metadata/android/tr/title.txt b/fastlane/metadata/android/tr/title.txt
new file mode 100644
index 00000000..de66edbe
--- /dev/null
+++ b/fastlane/metadata/android/tr/title.txt
@@ -0,0 +1 @@
+Last Launcher
diff --git a/fastlane/metadata/android/tr/video.txt b/fastlane/metadata/android/tr/video.txt
new file mode 100644
index 00000000..3d6486da
--- /dev/null
+++ b/fastlane/metadata/android/tr/video.txt
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=SzhJgH4a2cU
diff --git a/flowlayout/layouts/build.gradle b/flowlayout/layouts/build.gradle
index 12a176af..6612371b 100644
--- a/flowlayout/layouts/build.gradle
+++ b/flowlayout/layouts/build.gradle
@@ -1,14 +1,15 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+
+    compileSdkVersion 31//CS304 Issue Link : https://github.com/SubhamTyagi/Last-Launcher/issue/142
 
 
     defaultConfig {
         versionCode 2
         versionName "0.2"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30//CS304 Issue Link : https://github.com/SubhamTyagi/Last-Launcher/issue/142
     }
     buildTypes {
         release {
diff --git a/gradle.properties b/gradle.properties
index 4c5a29b8..1f70d56a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,8 +20,9 @@
 org.gradle.parallel=true
 android.enableR8=true
 org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=512m -Dfile.encoding=UTF-8
-android.useAndroidX=false
-android.enableJetifier=false
+#changed
+android.useAndroidX=true
+android.enableJetifier=true
 #exerimental
 #android.enableR8=true
 #deprecated