diff --git a/MediaServiceCore b/MediaServiceCore
index b21961348..bb61ae715 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit b21961348a32e3ab0231c19c924657954560f76d
+Subproject commit bb61ae7153d6c4e0d2d95427dfadf26f542c0af6
diff --git a/build.gradle b/build.gradle
index 18b45a87e..3293cf76c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: gradle.ext.sharedModulesConstants
+apply from: 'custom-repos.gradle'
 
 // NOT working
 // Running 'gradle wrapper' will generate gradlew
diff --git a/common/build.gradle b/common/build.gradle
index b99c8de26..6d50bd732 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -113,3 +113,5 @@ dependencies {
     stamazonImplementation project(':appupdatechecker2')
     staptoideImplementation project(':appupdatechecker2')
 }
+
+apply from: 'custom-deps.gradle'
diff --git a/common/custom-deps.gradle b/common/custom-deps.gradle
new file mode 100644
index 000000000..23f28b991
--- /dev/null
+++ b/common/custom-deps.gradle
@@ -0,0 +1,3 @@
+dependencies {
+
+}
\ No newline at end of file
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 5b891c72e..5e29451f2 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
     <!-- https://developer.android.com/guide/components/activities/background-starts -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.ACTION_MANAGE_OVERLAY_PERMISSION" />
-    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
+    <!-- <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> -->
 
     <!-- Add requestLegacyExternalStorage to fix unavailable storage on Android 10 (doesn't work on Android 11) -->
     <!-- More info: https://stackoverflow.com/questions/63364476/requestlegacyexternalstorage-is-not-working-in-android-11-api-30 -->
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java
index 542c13979..86c39bcf1 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java
@@ -569,6 +569,10 @@ public class VideoStateController extends BasePlayerController {
     }
 
     private void restoreVolume() {
+        if (getVideo() == null || getPlayer() == null) {
+            return;
+        }
+
         float newVolume = getPlayerData().getPlayerVolume();
 
         if (getPlayerTweaksData().isPlayerAutoVolumeEnabled()) {
@@ -587,6 +591,10 @@ public class VideoStateController extends BasePlayerController {
     }
 
     private void restorePitch() {
+        if (getPlayer() == null) {
+            return;
+        }
+
         getPlayer().setPitch(getPlayerData().getPitch());
     }
 
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/MediaServiceManager.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/MediaServiceManager.java
index f993ba60b..031925a57 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/MediaServiceManager.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/MediaServiceManager.java
@@ -465,7 +465,7 @@ public class MediaServiceManager implements OnAccountChange {
      * Channels could be of two types: regular (usr channel) and playlist channel (contains single row, try search: 'Mon mix')
      */
     public static void chooseChannelPresenter(Context context, Video item) {
-        if (item.hasVideo() || item.belongsToChannelUploads()) { // regular channel
+        if (item.hasVideo() || item.hasReloadPageKey()) { // an channel item from Channels section
             ChannelPresenter.instance(context).openChannel(item);
             return;
         }
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java b/common/src/stbeta/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
similarity index 100%
rename from common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
rename to common/src/stbeta/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
diff --git a/common/src/stredboxtv/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java b/common/src/stredboxtv/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
new file mode 100644
index 000000000..14f87debe
--- /dev/null
+++ b/common/src/stredboxtv/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
@@ -0,0 +1,9 @@
+package com.liskovsoft.smartyoutubetv2.common.utils;
+
+import android.content.Context;
+
+public class CustomInit {
+    public static void init(Context context) {
+        
+    }
+}
diff --git a/common/src/strtarmenia/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java b/common/src/strtarmenia/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
new file mode 100644
index 000000000..14f87debe
--- /dev/null
+++ b/common/src/strtarmenia/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
@@ -0,0 +1,9 @@
+package com.liskovsoft.smartyoutubetv2.common.utils;
+
+import android.content.Context;
+
+public class CustomInit {
+    public static void init(Context context) {
+        
+    }
+}
diff --git a/common/src/stsibsetru/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java b/common/src/stsibsetru/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
new file mode 100644
index 000000000..14f87debe
--- /dev/null
+++ b/common/src/stsibsetru/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
@@ -0,0 +1,9 @@
+package com.liskovsoft.smartyoutubetv2.common.utils;
+
+import android.content.Context;
+
+public class CustomInit {
+    public static void init(Context context) {
+        
+    }
+}
diff --git a/common/src/ststable/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java b/common/src/ststable/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
new file mode 100644
index 000000000..14f87debe
--- /dev/null
+++ b/common/src/ststable/java/com/liskovsoft/smartyoutubetv2/common/utils/CustomInit.java
@@ -0,0 +1,9 @@
+package com.liskovsoft.smartyoutubetv2.common.utils;
+
+import android.content.Context;
+
+public class CustomInit {
+    public static void init(Context context) {
+        
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index d6101c42b..908f1f210 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,6 +22,4 @@ apply from: new File(gradle.ext.exoplayerRoot, 'core_settings.gradle')
 // gradle.ext.exoplayerModulePrefix = 'exoplayer-'
 // apply from: new File(gradle.ext.exoplayerRoot, 'core_settings.gradle')
 
-apply from: new File(rootDir, './custom-repos.gradle')
-
 
diff --git a/smarttubetv/build.gradle b/smarttubetv/build.gradle
index 2758d24ee..5ec072ac3 100644
--- a/smarttubetv/build.gradle
+++ b/smarttubetv/build.gradle
@@ -242,5 +242,3 @@ dependencies {
 
     implementation 'net.gotev:speech:' + gotevSpeechVersion
 }
-
-apply from: 'custom-deps.gradle'
diff --git a/smarttubetv/multidex-keep.pro b/smarttubetv/multidex-keep.pro
index 44bf288fb..88e11a42d 100644
--- a/smarttubetv/multidex-keep.pro
+++ b/smarttubetv/multidex-keep.pro
@@ -1,4 +1,11 @@
--keep class com.liskovsoft.smartyoutubetv2.common.exoplayer.controller.ExoPlayerController { *; }
+#-keep class com.liskovsoft.smartyoutubetv2.common.exoplayer.controller.ExoPlayerController { *; }
+-keepclassmembers class com.liskovsoft.smartyoutubetv2.common.exoplayer.controller.ExoPlayerController {
+    boolean containsMedia();
+    <init>(...);
+}
+-keepclassmembers interface com.google.android.exoplayer2.Player$EventListener {
+    void onPlaybackParametersChanged(com.google.android.exoplayer2.PlaybackParameters);
+}
 -keep class androidx.leanback.app.BrowseSupportFragment { *; }
 -keep class com.liskovsoft.smartyoutubetv2.common.app.models.playback.controllers.AutoFrameRateController { *; }
 -keep class io.reactivex.internal.operators.observable.ObservableDelaySubscriptionOther { *; }
diff --git a/smarttubetv/src/main/AndroidManifest.xml b/smarttubetv/src/main/AndroidManifest.xml
index bc2f83586..03dc381df 100644
--- a/smarttubetv/src/main/AndroidManifest.xml
+++ b/smarttubetv/src/main/AndroidManifest.xml
@@ -33,7 +33,8 @@
         com.google.android.exoplayer2.testutil,
         com.google.android.exoplayer2.ext.okhttp,
         com.google.firebase.crashlytics,
-        com.google.firebase.iid"/>
+        com.google.firebase.iid,
+        io.nn.alpha"/>
 
     <uses-feature
         android:name="android.hardware.microphone"