diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d297381..98cebb3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         applicationId = "com.keyborad.theme.trendyborad"
         minSdk = 24
         targetSdk = 36
-        versionCode = 6
-        versionName = "1.5"
+        versionCode = 7
+        versionName = "1.6"
         setProperty(
             "archivesBaseName",
             "TrendyBoard-" + versionName + "(${versionCode})_$timestamp"
diff --git a/app/src/main/java/com/keyborad/theme/trendyborad/trendykeyboardhelper/TrendyMyInputMethodService.java b/app/src/main/java/com/keyborad/theme/trendyborad/trendykeyboardhelper/TrendyMyInputMethodService.java
index 8327d3b..abc654e 100644
--- a/app/src/main/java/com/keyborad/theme/trendyborad/trendykeyboardhelper/TrendyMyInputMethodService.java
+++ b/app/src/main/java/com/keyborad/theme/trendyborad/trendykeyboardhelper/TrendyMyInputMethodService.java
@@ -43,12 +43,13 @@ public class TrendyMyInputMethodService extends InputMethodService implements Tr
 
     private ImageView imBG;
     private VideoView videoView;
-    
+
     private int a = R.xml.xml_one;
-    private int b= R.xml.xml_two;
+    private int b = R.xml.xml_two;
     private int c = R.xml.xml_three;
 
     private int curImeAction = EditorInfo.IME_ACTION_UNSPECIFIED;
+
     @SuppressLint("InflateParams")
     @Override
     public View onCreateInputView() {
@@ -73,7 +74,7 @@ public class TrendyMyInputMethodService extends InputMethodService implements Tr
     @Override
     public void onWindowHidden() {
         super.onWindowHidden();
-        if(videoView.isPlaying()){
+        if (videoView.isPlaying()) {
             videoView.pause();
 
         }
@@ -86,18 +87,18 @@ public class TrendyMyInputMethodService extends InputMethodService implements Tr
         curImeAction = TrendyCommon.INSTANCE.getTextForImeAction(currentInputEditorInfo.imeOptions);
         String skinPath = TrendySaveCurrentTheme.INSTANCE.getSkinPath();
 
-        if(skinPath == null || skinPath.isEmpty()){
+        if (skinPath == null || skinPath.isEmpty()) {
             Log.d(TrendyApp.TAG, "---------skinPath= bull");
             myKeyBoardView.updateUi(curImeAction);
-        }else {
+        } else {
             Log.d(TrendyApp.TAG, "---------skinPath= 1111");
             com.keyborad.theme.trendyborad.trendykeyboardhelper.TrendyKeyFunctions.INSTANCE.readBgOrVideo(this, new Function2<String, Drawable, Unit>() {
                 @Override
                 public Unit invoke(String s, Drawable drawable) {
-                    Log.d(TrendyApp.TAG, "---------s= "+s+"---------drawable="+drawable);
+                    Log.d(TrendyApp.TAG, "---------s= " + s + "---------drawable=" + drawable);
                     if (s != null) {
                         myKeyBoardView.setBackground(null);
-                        if(s.endsWith(".gif")){
+                        if (s.endsWith(".gif")) {
                             imBG.setVisibility(View.VISIBLE);
                             videoView.setVisibility(View.GONE);
                             Glide.with(TrendyMyInputMethodService.this)
@@ -115,8 +116,8 @@ public class TrendyMyInputMethodService extends InputMethodService implements Tr
                                             }
                                             return false;
                                         }
-                                    }).into(imBG) ;
-                        }else if(s.endsWith(".mp4")){
+                                    }).into(imBG);
+                        } else if (s.endsWith(".mp4")) {
                             imBG.setVisibility(View.GONE);
                             videoView.setVisibility(View.VISIBLE);
                             videoView.setVideoPath(s);
@@ -144,7 +145,9 @@ public class TrendyMyInputMethodService extends InputMethodService implements Tr
     @Override
     public void onDestroy() {
         super.onDestroy();
-        videoView.stopPlayback();
+        if (videoView != null) {
+            videoView.stopPlayback();
+        }
     }
 
     @Override
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index a22c8b9..3df46b3 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="MyKeyBoard" beanWrapper="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="MyKeyBoard" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>