--- a/skin.aeonmq5/720p/CustomSub6025.xml
+++ b/skin.aeonmq5/720p/CustomSub6025.xml
@@ -2,9 +2,7 @@
 
 	<window id="6025" type="dialog"><!-- Video playlists -->
 	<defaultcontrol>-</defaultcontrol>
-	<onload condition="!StringCompare(Container(9000).numitems,0)">SetFocus(9000)</onload>
-	<onload condition="StringCompare(Container(9000).numitems,0)">SetFocus(9101)</onload>
-	<onunload>Skin.Reset(submode)</onunload>
+	<include>SubMenuCommon</include>
 	<controls>
 	<control type="group">
 	<include condition="Window.IsVisible(6000)">MenuCustom</include>
@@ -22,8 +20,8 @@
 	<property name="name">menu2501</property>
 	<property name="id">$INFO[skin.string(menu2501.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu2501.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6025)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu2501.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu2501.master)) | SubString(skin.string(menu2501.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -32,8 +30,8 @@
 	<property name="name">menu2502</property>
 	<property name="id">$INFO[skin.string(menu2502.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu2502.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6025)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu2502.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu2502.master)) | SubString(skin.string(menu2502.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -42,8 +40,8 @@
 	<property name="name">menu2503</property>
 	<property name="id">$INFO[skin.string(menu2503.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu2503.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6025)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu2503.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu2503.master)) | SubString(skin.string(menu2503.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -52,8 +50,8 @@
 	<property name="name">menu2504</property>
 	<property name="id">$INFO[skin.string(menu2504.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu2504.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6025)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu2504.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu2504.master)) | SubString(skin.string(menu2504.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -62,8 +60,8 @@
 	<property name="name">menu2505</property>
 	<property name="id">$INFO[skin.string(menu2505.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu2505.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6025)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu2505.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu2505.master)) | SubString(skin.string(menu2505.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -72,8 +70,8 @@
 	<property name="name">menu2506</property>
 	<property name="id">$INFO[skin.string(menu2506.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu2506.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6025)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu2506.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu2506.master)) | SubString(skin.string(menu2506.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -82,8 +80,8 @@
 	<property name="name">menu2507</property>
 	<property name="id">$INFO[skin.string(menu2507.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu2507.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6025)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu2507.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu2507.master)) | SubString(skin.string(menu2507.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -92,8 +90,8 @@
 	<property name="name">menu2508</property>
 	<property name="id">$INFO[skin.string(menu2508.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu2508.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6025)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu2508.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu2508.master)) | SubString(skin.string(menu2508.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -102,8 +100,8 @@
 	<property name="name">menu2509</property>
 	<property name="id">$INFO[skin.string(menu2509.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu2509.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6025)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu2509.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu2509.master)) | SubString(skin.string(menu2509.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -112,8 +110,8 @@
 	<property name="name">menu2510</property>
 	<property name="id">$INFO[skin.string(menu2510.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu2510.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6025)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu2510.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu2510.master)) | SubString(skin.string(menu2510.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	</content>