diff --git a/720p/IncludesMenuWidgets.xml b/720p/IncludesMenuWidgets.xml
index 509803d..df93c61 100644
--- a/720p/IncludesMenuWidgets.xml
+++ b/720p/IncludesMenuWidgets.xml
@@ -938,265 +938,15 @@
 	</control>
 	<control type="button" id="5111">
 	<include>InvisibleButton</include>
-	<onfocus condition="SubString(skin.string(mftvshows_list),aired)">Skin.SetString(mftvshows_list,latest)</onfocus>
 	<onfocus condition="SubString(skin.string(mftvshows_list),latest)">Skin.SetString(mftvshows_list,random)</onfocus>
 	<onfocus condition="SubString(skin.string(mftvshows_list),random)">Skin.SetString(mftvshows_list,inprogress)</onfocus>
 	<onfocus condition="SubString(skin.string(mftvshows_list),inprogress)">Skin.SetString(mftvshows_list,aired)</onfocus>
+	<onfocus condition="SubString(skin.string(mftvshows_list),aired)">Skin.SetString(mftvshows_list,latest)</onfocus>
 	<onfocus>SetFocus(5100)</onfocus>
 	</control>
 	<control type="group">
 	<posx>30</posx>
 	<posy>360</posy>
-	
-	<control type="panel" id="510"><!-- Recently AIRED (not added) -->
-	<include>panel_layout</include>
-	<visible>SubString(Container(9000).ListItem.Property(id),tvshow) + SubString(skin.string(mftvshows_list),aired)</visible>
-	<content>
-	<item>
-	<label>[COLOR=$VAR[value_menucolorlabel]]$LOCALIZE[31665] - [/COLOR]$INFO[Window(0).Property(RecommendedEpisode.1.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecommendedEpisode.1.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecommendedEpisode.1.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecommendedEpisode.1.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecommendedEpisode.1.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecommendedEpisode.1.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecommendedEpisode.1.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecommendedEpisode.1.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecommendedEpisode.1.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecommendedEpisode.1.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecommendedEpisode.1.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecommendedEpisode.1.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecommendedEpisode.1.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecommendedEpisode.1.EpisodeNo)]</property>
-	<property name="Percent">$INFO[Window(0).Property(RecommendedEpisode.1.PercentPlayed)]</property>
-	<property name="Progress">inprogress</property>
-	<onclick>$INFO[Window(0).Property(RecommendedEpisode.1.Play)]</onclick>
-	<visible>![IsEmpty(Window(0).Property(RecommendedEpisode.1.Title)) | Skin.HasSetting(noprogresswidget)]</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.1.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.1.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.1.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.1.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.1.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.1.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.1.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.1.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.1.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.1.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.1.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.1.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.1.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.1.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.1.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.1.Title))</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.2.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.2.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.2.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.2.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.2.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.2.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.2.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.2.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.2.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.2.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.2.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.2.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.2.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.2.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.2.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.2.Title))</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.3.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.3.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.3.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.3.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.3.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.3.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.3.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.3.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.3.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.3.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.3.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.3.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.3.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.3.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.3.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.3.Title))</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.4.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.4.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.4.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.4.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.4.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.4.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.4.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.4.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.4.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.4.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.4.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.4.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.4.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.4.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.4.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.4.Title)) + [SubString(skin.string(widgetsnumber),4) + IsEmpty(Window(0).Property(RecommendedEpisode.1.Title)) | SubString(skin.string(widgetsnumber),8) | SubString(skin.string(widgetsnumber),12)]</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.5.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.5.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.5.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.5.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.5.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.5.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.5.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.5.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.5.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.5.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.5.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.5.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.5.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.5.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.5.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.5.Title)) + [SubString(skin.string(widgetsnumber),8) | SubString(skin.string(widgetsnumber),12)]</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.6.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.6.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.6.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.6.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.6.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.6.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.6.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.6.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.6.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.6.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.6.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.6.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.6.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.6.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.6.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.6.Title)) + [SubString(skin.string(widgetsnumber),8) | SubString(skin.string(widgetsnumber),12)]</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.7.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.7.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.7.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.7.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.7.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.7.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.7.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.7.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.7.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.7.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.7.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.7.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.7.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.7.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.7.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.7.Title)) + [SubString(skin.string(widgetsnumber),8) | SubString(skin.string(widgetsnumber),12)]</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.8.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.8.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.8.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.8.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.8.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.8.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.8.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.8.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.8.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.8.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.8.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.8.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.8.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.8.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.8.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.8.Title)) + [SubString(skin.string(widgetsnumber),8) | SubString(skin.string(widgetsnumber),12)]</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.9.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.9.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.9.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.9.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.9.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.9.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.9.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.9.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.9.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.9.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.9.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.9.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.9.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.9.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.9.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.9.Title)) + SubString(skin.string(widgetsnumber),12)</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.10.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.10.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.10.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.10.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.10.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.10.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.10.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.10.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.10.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.10.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.10.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.10.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.10.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.10.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.10.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.10.Title)) + SubString(skin.string(widgetsnumber),12)</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.11.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.11.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.11.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.11.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.11.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.11.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.11.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.11.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.11.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.11.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.11.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.11.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.11.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.11.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.11.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.11.Title)) + SubString(skin.string(widgetsnumber),12)</visible>
-	</item>
-	<item>
-	<label>$INFO[Window(0).Property(RecentAiredEpisode.12.Title)]</label>
-	<label2>$INFO[Window(0).Property(RecentAiredEpisode.12.TVShowTitle)]</label2>
-	<icon>$INFO[Window(0).Property(RecentAiredEpisode.12.Art(tvshow.poster))]</icon>
-	<property name="Thumbnail">$INFO[Window(0).Property(RecentAiredEpisode.12.Art(thumb))]</property>
-	<property name="Fanart">$INFO[Window(0).Property(RecentAiredEpisode.12.Art(tvshow.fanart))]</property>
-	<property name="Genre">$INFO[Window(0).Property(RecentAiredEpisode.12.Genre)]</property>
-	<property name="Runtime">$INFO[Window(0).Property(RecentAiredEpisode.12.Runtime)]</property>
-	<property name="VideoRating">$INFO[Window(0).Property(RecentAiredEpisode.12.Rating)]</property>
-	<property name="Plot">$INFO[Window(0).Property(RecentAiredEpisode.12.Plot)]</property>
-	<property name="Year">$INFO[Window(0).Property(RecentAiredEpisode.12.Premiered)]</property>
-	<property name="Mpaa">$INFO[Window(0).Property(RecentAiredEpisode.12.MPAA)]</property>
-	<property name="File">$INFO[Window(0).Property(RecentAiredEpisode.12.File)]</property>
-	<property name="Codec">$INFO[Window(0).Property(RecentAiredEpisode.12.VideoCodec)]</property>
-	<property name="EpisodeNumber">$INFO[Window(0).Property(RecentAiredEpisode.12.EpisodeNo)]</property>
-	<onclick>$INFO[Window(0).Property(RecentAiredEpisode.12.Play)]</onclick>
-	<visible>!IsEmpty(Window(0).Property(RecentAiredEpisode.12.Title)) + [IsEmpty(Window(0).Property(RecommendedEpisode.1.Title)) | Skin.HasSetting(noprogresswidget)] + SubString(skin.string(widgetsnumber),12)</visible>
-	</item>
-	<item>
-	<icon>DefaultVideoPoster.png</icon>
-	<onclick>noop</onclick>
-	<visible>IsEmpty(Window(0).Property(RecentAiredEpisode.1.Title))</visible>
-	</item>
-	</content>
-	</control>
-	
-	
 	<control type="panel" id="510"><!-- Seriados Recentes -->
 	<include>panel_layout</include>
 	<visible>SubString(Container(9000).ListItem.Property(id),tvshow) + SubString(skin.string(mftvshows_list),latest)</visible>
@@ -1944,7 +1694,7 @@
 	</control>
 	</control>
 	</include>
-	<!-- ############################################################################### Concertos ################################################################################ -->
+	<!-- ################################################################################ Concertos ################################################################################ -->
 	<include name="mf_contentconcerts">
 	<control type="image"><!-- Fundo -->
     <include>widgets_back</include>
@@ -1971,7 +1721,7 @@
 	<control type="group">
 	<posx>30</posx>
 	<posy>360</posy>
-	<control type="panel" id="510"><!-- Recently Added Concerts / Concertos Recentes -->
+	<control type="panel" id="510"><!-- Concertos Recentes -->
 	<include>panel_layout</include>
 	<visible>SubString(Container(9000).ListItem.Property(id),concert) + SubString(skin.string(mfconcerts_list),latest)</visible>
 	<content>
@@ -2165,7 +1915,7 @@
 	</item>
 	</content>
 	</control>
-	<control type="panel" id="510"><!-- Random Concerts / Concertos Random -->
+	<control type="panel" id="510"><!-- Concertos Random -->
 	<include>panel_layout</include>
 	<visible>SubString(Container(9000).ListItem.Property(id),concert) + SubString(skin.string(mfconcerts_list),random)</visible>
 	<content>
@@ -2359,7 +2109,7 @@
 	</item>
 	</content>
 	</control>
-	<control type="panel" id="510"><!-- Concerts In Progress / Concertos Em Progresso -->
+	<control type="panel" id="510"><!-- Concertos Em Progresso -->
 	<include>panel_layout</include>
 	<visible>SubString(Container(9000).ListItem.Property(id),concert) + SubString(skin.string(mfconcerts_list),inprogress)</visible>
 	<content>
@@ -2552,7 +2302,7 @@
 	</control>
 	</control>
 	</include>
-	<!-- ########################################################################### Concerts # Musicas ########################################################################### -->
+	<!-- ################################################################################ Musicas ################################################################################ -->
 	<include name="mf_contentmusic">
 	<control type="image"><!-- Fundo -->
     <include>widgets_back</include>
@@ -2582,7 +2332,7 @@
 	<control type="group">
 	<posx>30</posx>
 	<posy>360</posy>
-	<control type="panel" id="510"><!--- Recently Added Songs # Musicas Recentes/Faixas -->
+	<control type="panel" id="510"><!--- Musicas Recentes/Faixas -->
 	<include>panel_layout</include>
 	<visible>SubString(Container(9000).ListItem.Property(id),music) + SubString(skin.string(mfmusic_list),latestsong)</visible>
 	<content>
@@ -2713,7 +2463,7 @@
 	</item>
 	</content>
 	</control>
-	<control type="panel" id="510"><!--- Recently Added Albums # Musicas Recentes/Albums -->
+	<control type="panel" id="510"><!--- Musicas Recentes/Albums -->
 	<include>panel_layout</include>
 	<visible>SubString(Container(9000).ListItem.Property(id),music) + SubString(skin.string(mfmusic_list),latestalbum)</visible>
 	<content>
@@ -2880,7 +2630,7 @@
 	</item>
 	</content>
 	</control>
-	<control type="panel" id="510"><!--- Random Songs # Musicas Random/Faixas -->
+	<control type="panel" id="510"><!--- Musicas Random/Faixas -->
 	<include>panel_layout</include>
 	<visible>SubString(Container(9000).ListItem.Property(id),music) + SubString(skin.string(mfmusic_list),randomsong)</visible>
 	<content>
@@ -3011,7 +2761,7 @@
 	</item>
 	</content>
 	</control>
-	<control type="panel" id="510"><!--- Random Albums # Musicas Random/Albums -->
+	<control type="panel" id="510"><!--- Musicas Random/Albums -->
 	<include>panel_layout</include>
 	<visible>SubString(Container(9000).ListItem.Property(id),music) + SubString(skin.string(mfmusic_list),randomalbum)</visible>
 	<content>
@@ -3178,7 +2928,7 @@
 	</item>
 	</content>
 	</control>
-	<control type="panel" id="510"><!--- Random Artists # Musicas Random/Artistas -->
+	<control type="panel" id="510"><!--- Musicas Random/Artistas -->
 	<include>panel_layout</include>
 	<visible>SubString(Container(9000).ListItem.Property(id),music) + SubString(skin.string(mfmusic_list),randomartist)</visible>
 	<content>
@@ -3309,7 +3059,7 @@
 	</item>
 	</content>
 	</control>
-	<control type="panel" id="510"><!--- Music In Progress # Musicas Em Progresso -->
+	<control type="panel" id="510"><!--- Musicas Em Progresso -->
 	<include>panel_layout</include>
 	<visible>SubString(Container(9000).ListItem.Property(id),music) + SubString(skin.string(mfmusic_list),inprogress)</visible>
 	<content>
@@ -3478,7 +3228,7 @@
 	</control>
 	</control>
 	</include>
-	<!-- ################################################################################# Youtube ################################################################################ -->
+	<!-- ################################################################################ Meu Menu 1 ################################################################################ -->
 	<include name="mf_contentmymenu1">
 	<control type="image"><!-- Fundo -->
     <include>widgets_back</include>
@@ -3567,16 +3317,16 @@
 	</control>
 	</control>
 	</include>
-<!-- ################################################################################ Meu Menu 2 ################################################################################ -->
-	<include name="mf_contentmymenu2">
-	<control type="image"><!-- Fundo -->
+<!-- ################################################################################ Youtube ################################################################################ -->
+	<include name="mf_contentyoutube">
+	<control type="image">
     <include>widgets_back</include>
 	<visible>StringCompare(Container(9000).ListItem.Property(id),mymenu2)</visible>
 	</control>
 	<control type="group">
 	<posx>30</posx>
 	<posy>360</posy>
-	<control type="panel" id="510"><!-- Meu Menu 2 -->
+	<control type="panel" id="510"><!-- YouTube -->
 	<include>panel_layout</include>
 	<visible>StringCompare(Container(9000).ListItem.Property(id),mymenu2)</visible>
 	<content>
diff --git a/720p/IncludesVariables.xml b/720p/IncludesVariables.xml
index a3be00c..6226dc1 100644
--- a/720p/IncludesVariables.xml
+++ b/720p/IncludesVariables.xml
@@ -1831,7 +1831,6 @@
 	<value condition="SubString(skin.string(mftvshows_list),latest)">$LOCALIZE[31583]</value>
 	<value condition="SubString(skin.string(mftvshows_list),random)">$LOCALIZE[31584]</value>
 	<value condition="SubString(skin.string(mftvshows_list),inprogress)">$LOCALIZE[31585]</value>
-	<value condition="SubString(skin.string(mftvshows_list),aired)">$LOCALIZE[32000]</value>
 	</variable>
 	<variable name="value_mflistmode_concert">
 	<value condition="SubString(skin.string(mfconcerts_list),latest)">$LOCALIZE[31583]</value>