--- a/skin.aeonmq5/720p/CustomSub6032.xml
+++ b/skin.aeonmq5/720p/CustomSub6032.xml
@@ -2,9 +2,7 @@
 
 	<window id="6032" type="dialog"><!-- Videos -->
 	<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">menu3201</property>
 	<property name="id">$INFO[skin.string(menu3201.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu3201.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6032)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu3201.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu3201.master)) | SubString(skin.string(menu3201.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -32,8 +30,8 @@
 	<property name="name">menu3202</property>
 	<property name="id">$INFO[skin.string(menu3202.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu3202.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6032)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu3202.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu3202.master)) | SubString(skin.string(menu3202.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -42,8 +40,8 @@
 	<property name="name">menu3203</property>
 	<property name="id">$INFO[skin.string(menu3203.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu3203.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6032)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu3203.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu3203.master)) | SubString(skin.string(menu3203.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -52,8 +50,8 @@
 	<property name="name">menu3204</property>
 	<property name="id">$INFO[skin.string(menu3204.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu3204.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6032)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu3204.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu3204.master)) | SubString(skin.string(menu3204.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -62,8 +60,8 @@
 	<property name="name">menu3205</property>
 	<property name="id">$INFO[skin.string(menu3205.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu3205.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6032)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu3205.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu3205.master)) | SubString(skin.string(menu3205.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -72,8 +70,8 @@
 	<property name="name">menu3206</property>
 	<property name="id">$INFO[skin.string(menu3206.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu3206.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6032)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu3206.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu3206.master)) | SubString(skin.string(menu3206.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -82,8 +80,8 @@
 	<property name="name">menu3207</property>
 	<property name="id">$INFO[skin.string(menu3207.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu3207.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6032)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu3207.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu3207.master)) | SubString(skin.string(menu3207.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -92,8 +90,8 @@
 	<property name="name">menu3208</property>
 	<property name="id">$INFO[skin.string(menu3208.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu3208.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6032)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu3208.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu3208.master)) | SubString(skin.string(menu3208.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -102,8 +100,8 @@
 	<property name="name">menu3209</property>
 	<property name="id">$INFO[skin.string(menu3209.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu3209.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6032)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu3209.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu3209.master)) | SubString(skin.string(menu3209.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	<item>
@@ -112,8 +110,8 @@
 	<property name="name">menu3210</property>
 	<property name="id">$INFO[skin.string(menu3210.master)]</property>
 	<onclick condition="Window.IsVisible(6000)">SetFocus(5000)</onclick>
-	<onclick condition="Window.IsVisible(Home)">Close</onclick>
-	<onclick condition="Window.IsVisible(Home)">$VAR[value_menu3210.action]</onclick>
+	<onclick condition="Window.IsVisible(Home)">Dialog.Close(6032)</onclick>
+	<onclick condition="Window.IsVisible(Home)">Skin.SetString(submenu_action,$VAR[value_menu3210.action])</onclick>
 	<visible>![IsEmpty(skin.string(menu3210.master)) | SubString(skin.string(menu3210.visible),off)] | Window.IsVisible(6000)</visible>
 	</item>
 	</content>