diff --git a/MediaServiceCore b/MediaServiceCore
index b6617dfbd..e0a70a91b 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit b6617dfbd354a20e9904abe99b32c66d81520ffd
+Subproject commit e0a70a91bad1fab0c7de00cebe9ce646bf46ec4f
diff --git a/SharedModules b/SharedModules
index 29640f76f..07767edeb 160000
--- a/SharedModules
+++ b/SharedModules
@@ -1 +1 @@
-Subproject commit 29640f76f0970ef7c13e1fcdd14fa41850dd6f69
+Subproject commit 07767edeb2b1b3327a651522354e6c97e72b97cf
diff --git a/leanbackassistant/src/main/java/com/liskovsoft/leanbackassistant/utils/AppUtil.java b/leanbackassistant/src/main/java/com/liskovsoft/leanbackassistant/utils/AppUtil.java
index b32119ee4..19245a1c6 100644
--- a/leanbackassistant/src/main/java/com/liskovsoft/leanbackassistant/utils/AppUtil.java
+++ b/leanbackassistant/src/main/java/com/liskovsoft/leanbackassistant/utils/AppUtil.java
@@ -11,6 +11,7 @@ import android.os.Build;
 import com.liskovsoft.sharedutils.GlobalConstants;
 import com.liskovsoft.sharedutils.configparser.AssetPropertyParser2;
 import com.liskovsoft.sharedutils.configparser.ConfigParser;
+import com.liskovsoft.sharedutils.helpers.AppInfoHelpers;
 
 public class AppUtil {
     private final Context mContext;
@@ -53,10 +54,16 @@ public class AppUtil {
             return null;
         }
 
+        String mainActivityName = AppInfoHelpers.getMainActivityName(mContext);
+
+        if (mainActivityName == null) {
+            return null;
+        }
+
         Intent intent = new Intent();
         intent.setAction(Intent.ACTION_VIEW);
         intent.setData(Uri.parse(url));
-        intent.setClassName(getAppPackageName(), getBootstrapClassName());
+        intent.setClassName(mContext.getPackageName(), mainActivityName);
         //intent.putExtra(GlobalConstants.INTERNAL_INTENT, true);
 
         return intent;
diff --git a/smarttubetv/src/main/AndroidManifest.xml b/smarttubetv/src/main/AndroidManifest.xml
index b983744fb..1dec85369 100644
--- a/smarttubetv/src/main/AndroidManifest.xml
+++ b/smarttubetv/src/main/AndroidManifest.xml
@@ -66,7 +66,7 @@
         <!-- Not implemented yet( -->
         <!--<meta-data android:name="whisperplay" android:resource="@xml/whisperplay"/>-->
 
-        <!-- This activity name also stored in: smarttubetv\src\main\assets\common.properties -->
+        <!-- This activity's name used inside atv channels -->
         <!-- More info: com.liskovsoft.leanbackassistant.utils.AppUtil -->
         <activity
             android:name="com.liskovsoft.smartyoutubetv2.tv.ui.main.SplashActivity"
diff --git a/smarttubetv/src/main/assets/tmp.png b/smarttubetv/src/main/assets/tmp.png
deleted file mode 100644
index 685e65f4b..000000000
Binary files a/smarttubetv/src/main/assets/tmp.png and /dev/null differ
diff --git a/smarttubetv/src/main/assets/tmp2.png b/smarttubetv/src/main/assets/tmp2.png
deleted file mode 100644
index be11ddb0b..000000000
Binary files a/smarttubetv/src/main/assets/tmp2.png and /dev/null differ