diff --git a/1080i/Custom_1136_TMDB_Info.xml b/1080i/Custom_1136_TMDB_Info.xml
index a73122a1..a0dea8d0 100644
--- a/1080i/Custom_1136_TMDB_Info.xml
+++ b/1080i/Custom_1136_TMDB_Info.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="window" id="1136">
     <defaultcontrol always="true">9999</defaultcontrol>
-    <onload>SetProperty(Header_Center_Text,$LOCALIZE[14116])</onload>
-    <onload>SetProperty(Header_Left_Text,$LOCALIZE[31050]...)</onload>
     <controls>
         <include>Global_Background</include>
         <include>Topbar</include>
@@ -11,175 +9,17 @@
             <height>1</height>
             <left>-1000</left>
             <top>-1000</top>
-            <onfocus condition="!Integer.IsEqual(Container(9999).NumItems,0) + !Container(9999).IsUpdating + !String.IsEmpty(Window(Home).Property(TMDbHelper.Path.Current)) + !String.Contains(Window(Home).Property(TMDbHelper.Path.Current),type=person)">Action(Info)</onfocus>
-            <onfocus condition="!Integer.IsEqual(Container(9999).NumItems,0) + !Container(9999).IsUpdating + !String.IsEmpty(Window(Home).Property(TMDbHelper.Path.Current)) + String.Contains(Window(Home).Property(TMDbHelper.Path.Current),type=person)">SetFocus(3100)</onfocus>
-            <onfocus condition="[Integer.IsEqual(Container(9999).NumItems,0) | Container(9999).IsUpdating] + !String.IsEmpty(Window(Home).Property(TMDbHelper.Path.Current))">AlarmClock(doinfo,SetFocus(9999),00:01,silent)</onfocus>
-            <onfocus condition="String.IsEmpty(Window(Home).Property(TMDbHelper.Path.Current))">Action(Back)</onfocus>
             <itemlayout />
             <focusedlayout />
             <content limit="1" target="videos">$INFO[Window(Home).Property(TMDbHelper.Path.Current)]</content>
         </control>
 
         <control type="group">
-            <visible>[!String.Contains(Window(Home).Property(TMDbHelper.Path.Current),type=person) | Control.HasFocus(9999)] + !Window.IsVisible(DialogVideoInfo.xml)</visible>
-            <include>Dialog_Busy</include>
-        </control>
-
-        <!-- Person Info -->
-        <control type="group">
-            <visible>String.Contains(Window(Home).Property(TMDbHelper.Path.Current),type=person) + !Control.HasFocus(9999)</visible>
-            <top>view_top</top>
-            <left>view_pad</left>
-            <right>view_pad</right>
-            <include content="Object_Info_Arrows">
-                <param name="artworkid" value="750" />
-            </include>
-            <visible allowhiddenfocus="true">!$EXP[Exp_ShowPlotOverlay]</visible>
-            <include>Defs_InfoDialog_Visible</include>
+            <visible>Container(9999).IsUpdating</visible>
+            <visible>!Window.IsVisible(DialogVideoInfo.xml)</visible>
             <include>Animation_FadeInOut</include>
-            <control type="grouplist" id="9000">
-                <top>-15</top>
-                <left>-15</left>
-                <right>-15</right>
-                <height>view_height</height>
-                <orientation>vertical</orientation>
-                <itemgap>0</itemgap>
-                <control type="group" id="3000">
-                    <height>view_height</height>
-                    <control type="group">
-                        <top>15</top>
-                        <left>15</left>
-                        <right>15</right>
-                        <height>view_list_height</height>
-                        <!-- Poster -->
-                        <include content="View_50_Poster">
-                            <param name="include" value="Animation_Left_Delay" />
-                            <param name="defaulticonvisible" value="false" />
-                            <param name="icon" value="$INFO[Container(9999).ListItemAbsolute(0).Art(poster)]" />
-                            <param name="diffuse" value="diffuse/poster-big.png" />
-                        </include>
-
-                        <!-- Info -->
-                        <control type="group" id="300">
-                            <top>-15</top>
-                            <left>580</left>
-                            <include>Animation_Right_Delay</include>
-                            <control type="grouplist">
-                                <orientation>vertical</orientation>
-                                <usecontrolcoords>true</usecontrolcoords>
-                                <itemgap>0</itemgap>
-                                <include content="Object_Info_Title">
-                                    <param name="label" value="$INFO[Container(9999).ListItemAbsolute(0).Label]" />
-                                </include>
-                                <include content="Object_Info_Line_Label">
-                                    <param name="label" value="[CAPITALIZE]$INFO[Container(9999).ListItemAbsolute(0).Property(Birthday),[COLOR=main_fg_100],[/COLOR]]$INFO[Container(9999).ListItemAbsolute(0).Property(Born),  |  [COLOR=main_fg_100],[/COLOR]]$INFO[Container(9999).ListItemAbsolute(0).Property(Age),  |  [COLOR=main_fg_100], $LOCALIZE[31356][/COLOR]]$INFO[Container(9999).ListItemAbsolute(0).Property(Deathday),  |  [COLOR=main_fg_100]$LOCALIZE[21897] ,[/COLOR]][/CAPITALIZE]" />
-                                    <param name="textcolor" value="$VAR[ColorHighlight]" />
-                                    <param name="divider" value="false" />
-                                </include>
-                                <include content="Object_Info_Plot">
-                                    <param name="label" value="$INFO[Container(9999).ListItemAbsolute(0).Property(biography)]" />
-                                    <param name="maxheight" value="600" />
-                                    <param name="height" value="600" />
-                                </include>
-                            </control>
-                            <control type="button" id="3111">
-                                <onfocus>SetFocus(3100)</onfocus>
-                                <include>Defs_Hidden_Button</include>
-                            </control>
-                            <control type="list" id="3100">
-                                <orientation>horizontal</orientation>
-                                <onup>9601</onup>
-                                <ondown>5001</ondown>
-                                <onfocus>SetProperty(Header_Left_Text,Person)</onfocus>
-                                <onback condition="!String.IsEmpty(Window(Home).Property(TMDbHelper.Path.Current))">RunScript(plugin.video.themoviedb.helper,del_path,call_id=1137)</onback>
-                                <onback>3111</onback>
-                                <itemlayout />
-                                <focusedlayout />
-                                <include>Defs_Hidden_Button</include>
-                                <content>$INFO[Window(Home).Property(TMDbHelper.Path.Current)]</content>
-                            </control>
-                        </control>
-                    </control>
-                </control>
-                <control type="group" id="4000">
-                    <height>view_height</height>
-                    <control type="grouplist" id="4100">
-                        <top>-5</top>
-                        <scrolltime tween="quadratic">400</scrolltime>
-                        <onup>3100</onup>
-                        <ondown>6000</ondown>
-                        <height>view_height</height>
-                        <orientation>vertical</orientation>
-                        <itemgap>-52</itemgap>
-                        <usecontrolcoords>true</usecontrolcoords>
-                        <control type="group" id="7599"><height>0</height></control>
-                        <!-- List 01 -->
-                        <include content="Info_Widget_Poster">
-                            <param name="includecondition" value="true" />
-                            <param name="id" value="5001" />
-                            <param name="groupid" value="7501" />
-                            <param name="label" value="$INFO[Container(3100).ListItemAbsolute(1).Label]" />
-                            <param name="labelinclude" value="View_Cast_Character_Label" />
-                            <include content="Defs_InfoList_OnClick">
-                                <param name="prevent_del" value="noop" />
-                            </include>
-                            <include>Defs_InfoList_OnBack</include>
-                            <content limit="25" target="videos">$VAR[Info_Cast_List01]</content>
-                        </include>
-                        <!-- List 02 -->
-                        <include content="Info_Widget_Poster">
-                            <param name="includecondition" value="true" />
-                            <param name="id" value="5002" />
-                            <param name="groupid" value="7502" />
-                            <param name="label" value="$INFO[Container(3100).ListItemAbsolute(2).Label]" />
-                            <param name="labelinclude" value="View_Cast_Character_Label" />
-                            <include content="Defs_InfoList_OnClick">
-                                <param name="prevent_del" value="noop" />
-                            </include>
-                            <include>Defs_InfoList_OnBack</include>
-                            <content limit="25" target="videos">$VAR[Info_Cast_List02]</content>
-                        </include>
-                        <!-- List 03 -->
-                        <include content="Info_Widget_Poster">
-                            <param name="includecondition" value="true" />
-                            <param name="id" value="5003" />
-                            <param name="groupid" value="7503" />
-                            <param name="label" value="$INFO[Container(3100).ListItemAbsolute(3).Label]" />
-                            <param name="labelinclude" value="View_Cast_Job_Label" />
-                            <include content="Defs_InfoList_OnClick">
-                                <param name="prevent_del" value="noop" />
-                            </include>
-                            <include>Defs_InfoList_OnBack</include>
-                            <content limit="25" target="videos">$VAR[Info_Cast_List03]</content>
-                        </include>
-                        <!-- List 05 -->
-                        <include content="Info_Widget_Poster">
-                            <param name="includecondition" value="true" />
-                            <param name="id" value="5005" />
-                            <param name="groupid" value="7505" />
-                            <param name="label" value="$INFO[Container(3100).ListItemAbsolute(4).Label]" />
-                            <param name="labelinclude" value="View_Cast_Job_Label" />
-                            <include content="Defs_InfoList_OnClick">
-                                <param name="prevent_del" value="noop" />
-                            </include>
-                            <include>Defs_InfoList_OnBack</include>
-                            <content limit="25" target="videos">$VAR[Info_Cast_List04]</content>
-                        </include>
-                        <!-- List 06 -->
-                        <include content="Info_Widget_Poster">
-                            <param name="includecondition" value="true" />
-                            <param name="id" value="5006" />
-                            <param name="groupid" value="7506" />
-                            <param name="label" value="$INFO[Container(3100).ListItemAbsolute(5).Label]" />
-                            <onclick>SetFocus(9506)</onclick>
-                            <include>Defs_InfoList_OnBack</include>
-                            <content limit="25" target="videos">$VAR[Info_Cast_List05]</content>
-                        </include>
-                    </control>
-                </control>
-            </control>
+            <include>Dialog_Busy</include>
         </control>
 
-        <include>Info_ImageViewer</include>
     </controls>
 </window>
diff --git a/1080i/Custom_1140_SetsInfo.xml b/1080i/Custom_1140_SetsInfo.xml
index 07660106..253663d3 100644
--- a/1080i/Custom_1140_SetsInfo.xml
+++ b/1080i/Custom_1140_SetsInfo.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1140">
     <defaultcontrol always="true">8300</defaultcontrol>
-    <onunload condition="Window.IsVisible(1136)">RunScript(plugin.video.themoviedb.helper,del_path,call_id=1137)</onunload>
     <onload>SetProperty(Header_Center_Text,$LOCALIZE[14116])</onload>
     <onload>SetProperty(Header_Left_Text,$LOCALIZE[31006])</onload>
     <controls>
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index 15c8097c..32e09794 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -7,7 +7,6 @@
     <onload>ClearProperty(OSD_Menu,Home)</onload>
     <onunload>ClearProperty(FilePath,home)</onunload>
     <onunload>ClearProperty(OSD_Menu,Home)</onunload>
-    <onunload condition="Window.IsVisible(1136)">RunScript(plugin.video.themoviedb.helper,del_path,call_id=1137)</onunload>
     <controls>
 
         <!-- Top Info -->
@@ -19,7 +18,8 @@
         </control>
 
         <!-- Main Group -->
-        <include condition="!String.IsEqual(ListItem.DBType,musicvideo)">DialogVideoInfo</include>
+        <include condition="!String.IsEqual(ListItem.DBType,musicvideo) + !String.Contains(ListItem.FolderPath,type=person)">DialogVideoInfo</include>
+        <include condition="!String.IsEqual(ListItem.DBType,musicvideo) + String.Contains(ListItem.FolderPath,type=person)">DialogPersonInfo</include>
         <include condition="String.IsEqual(ListItem.DBType,musicvideo)">DialogMusicInfo</include>
 
         <control type="group">
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 8e6e2ef1..3a9ac241 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -2,7 +2,6 @@
 <!-- Foundation -->
 <window id="0">
     <defaultcontrol always="false">301</defaultcontrol>
-    <onload>RunScript(plugin.video.themoviedb.helper,reset_path)</onload>
     <onload condition="Skin.HasSetting(ThemeSwitcher) + System.Time(06:00,18:00) + !String.IsEqual(Skin.CurrentColourTheme,SKINDEFAULT)">XBMC.RunScript(script.skin.helper.service,action=setkodisetting,setting=lookandfeel.skincolors,value=SKINDEFAULT)</onload>
     <onload condition="Skin.HasSetting(ThemeSwitcher) + !System.Time(06:00,18:00) + !String.IsEqual(Skin.CurrentColourTheme,Dark)">XBMC.RunScript(script.skin.helper.service,action=setkodisetting,setting=lookandfeel.skincolors,value=Dark)</onload>
 
diff --git a/1080i/Includes_Defs.xml b/1080i/Includes_Defs.xml
index 96ce80e2..9d52d443 100644
--- a/1080i/Includes_Defs.xml
+++ b/1080i/Includes_Defs.xml
@@ -99,9 +99,9 @@
             <onclick condition="Skin.HasSetting(DisableExtendedInfo)">SetFocus(50)</onclick>
             <onclick>SetFocus(5000)</onclick>
             <onclick>SetFocus(300)</onclick>
-            <onclick condition="String.IsEmpty(ListItem.DBID) | [!String.IsEqual(ListItem.DBType,movie) + !String.IsEqual(ListItem.DBType,tvshow)]">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.FolderPath],call_id=1137,delay=0.35,$PARAM[prevent_del])</onclick>
-            <onclick condition="!String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,movie)">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.Label,videodb://movies/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D],call_id=1137,delay=0.35,$PARAM[prevent_del])</onclick>
-            <onclick condition="!String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,tvshow)">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.Label,videodb://tvshows/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D],call_id=1137,delay=0.35,$PARAM[prevent_del])</onclick>
+            <onclick condition="String.IsEmpty(ListItem.DBID) | [!String.IsEqual(ListItem.DBType,movie) + !String.IsEqual(ListItem.DBType,tvshow)]">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.FolderPath],call_auto=1136)</onclick>
+            <onclick condition="!String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,movie)">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.Label,videodb://movies/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D],call_auto=1136)</onclick>
+            <onclick condition="!String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,tvshow)">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.Label,videodb://tvshows/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D],call_auto=1136)</onclick>
         </definition>
     </include>
 
diff --git a/1080i/Includes_DialogVideoInfo.xml b/1080i/Includes_DialogVideoInfo.xml
index 2b906fe3..1cc36db1 100644
--- a/1080i/Includes_DialogVideoInfo.xml
+++ b/1080i/Includes_DialogVideoInfo.xml
@@ -83,7 +83,7 @@
                                 <onclick condition="Skin.HasSetting(DisableExtendedInfo)">SetFocus(50)</onclick>
                                 <onclick>SetFocus(5000)</onclick>
                                 <onclick>SetFocus(300)</onclick>
-                                <onclick>RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Container(50).ListItem.Label],type=person,call_id=1137,prevent_del,delay=0.35)</onclick>
+                                <onclick>RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Container(50).ListItem.Label],type=person,call_auto=1136)</onclick>
                                 <onback>300</onback>
                                 <onup>300</onup>
                                 <ondown>5001</ondown>
@@ -133,7 +133,7 @@
                             <onclick condition="Skin.HasSetting(DisableExtendedInfo)">SetFocus(50)</onclick>
                             <onclick>SetFocus(5000)</onclick>
                             <onclick>SetFocus(300)</onclick>
-                            <onclick>RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Container(5077).ListItem.Label],type=person,call_id=1137,prevent_del,delay=0.35)</onclick>
+                            <onclick>RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Container(5077).ListItem.Label],type=person,call_auto=1136)</onclick>
                             <include>Defs_InfoList_OnBack</include>
                             <visible>!String.IsEmpty(Container(5001).ListItem.Property(tmdb_id)) + !Container(5001).IsUpdating</visible>
                             <content limit="25" target="videos">plugin://plugin.video.themoviedb.helper/?info=cast&amp;type=movie&amp;tmdb_id=$INFO[Container(5001).ListItem.Property(tmdb_id)]</content>
@@ -369,4 +369,151 @@
         </include>
         <include>Object_PlotOverlay</include>
     </include>
+
+    <include name="DialogPersonInfo">
+
+        <!-- Person Info -->
+        <control type="group">
+            <top>view_top</top>
+            <left>view_pad</left>
+            <right>view_pad</right>
+            <include content="Object_Info_Arrows">
+                <param name="artworkid" value="750" />
+            </include>
+            <include>Animation_FadeInOut</include>
+            <control type="grouplist" id="9000">
+                <top>-15</top>
+                <left>-15</left>
+                <right>-15</right>
+                <height>view_height</height>
+                <orientation>vertical</orientation>
+                <itemgap>0</itemgap>
+                <control type="group" id="3000">
+                    <height>view_height</height>
+                    <control type="group">
+                        <top>15</top>
+                        <left>15</left>
+                        <right>15</right>
+                        <height>view_list_height</height>
+                        <!-- Poster -->
+                        <include content="View_50_Poster">
+                            <param name="include" value="Animation_Left_Delay" />
+                            <param name="defaulticonvisible" value="false" />
+                            <param name="icon" value="$INFO[ListItem.Art(poster)]" />
+                            <param name="diffuse" value="diffuse/poster-big.png" />
+                        </include>
+
+                        <!-- Info -->
+                        <control type="group" id="300">
+                            <top>-15</top>
+                            <left>580</left>
+                            <include>Animation_Right_Delay</include>
+                            <control type="grouplist">
+                                <orientation>vertical</orientation>
+                                <usecontrolcoords>true</usecontrolcoords>
+                                <itemgap>0</itemgap>
+                                <include content="Object_Info_Title">
+                                    <param name="label" value="$INFO[ListItem.Label]" />
+                                </include>
+                                <include content="Object_Info_Line_Label">
+                                    <param name="label" value="[CAPITALIZE]$INFO[ListItem.Property(Birthday),[COLOR=main_fg_100],[/COLOR]]$INFO[ListItem.Property(Born),  |  [COLOR=main_fg_100],[/COLOR]]$INFO[ListItem.Property(Age),  |  [COLOR=main_fg_100], $LOCALIZE[31356][/COLOR]]$INFO[ListItem.Property(Deathday),  |  [COLOR=main_fg_100]$LOCALIZE[21897] ,[/COLOR]][/CAPITALIZE]" />
+                                    <param name="textcolor" value="$VAR[ColorHighlight]" />
+                                    <param name="divider" value="false" />
+                                </include>
+                                <include content="Object_Info_Plot">
+                                    <param name="label" value="$INFO[ListItem.Property(biography)]" />
+                                    <param name="maxheight" value="600" />
+                                    <param name="height" value="600" />
+                                </include>
+                            </control>
+                            <control type="button" id="3100">
+                                <onup>9601</onup>
+                                <ondown>5001</ondown>
+                                <onfocus>SetProperty(Header_Left_Text,Person)</onfocus>
+                                <include>Defs_Hidden_Button</include>
+                            </control>
+                        </control>
+                    </control>
+                </control>
+                <control type="group" id="4000">
+                    <height>view_height</height>
+                    <control type="grouplist" id="4100">
+                        <top>-5</top>
+                        <scrolltime tween="quadratic">400</scrolltime>
+                        <onup>3100</onup>
+                        <ondown>6000</ondown>
+                        <height>view_height</height>
+                        <orientation>vertical</orientation>
+                        <itemgap>-52</itemgap>
+                        <usecontrolcoords>true</usecontrolcoords>
+                        <control type="group" id="7599"><height>0</height></control>
+                        <!-- List 01 -->
+                        <include content="Info_Widget_Poster">
+                            <param name="includecondition" value="true" />
+                            <param name="id" value="5001" />
+                            <param name="groupid" value="7501" />
+                            <param name="label" value="Movies as Cast Member" />
+                            <param name="labelinclude" value="View_Cast_Character_Label" />
+                            <include content="Defs_InfoList_OnClick">
+                                <param name="prevent_del" value="noop" />
+                            </include>
+                            <include>Defs_InfoList_OnBack</include>
+                            <content limit="25" target="videos">plugin://plugin.video.themoviedb.helper?info=stars_in_movies&amp;type=person&amp;tmdb_id=$INFO[ListItem.Property(tmdb_id)]</content>
+                        </include>
+                        <!-- List 02 -->
+                        <include content="Info_Widget_Poster">
+                            <param name="includecondition" value="true" />
+                            <param name="id" value="5002" />
+                            <param name="groupid" value="7502" />
+                            <param name="label" value="TV Shows as Cast Member" />
+                            <param name="labelinclude" value="View_Cast_Character_Label" />
+                            <include content="Defs_InfoList_OnClick">
+                                <param name="prevent_del" value="noop" />
+                            </include>
+                            <include>Defs_InfoList_OnBack</include>
+                            <content limit="25" target="videos">plugin://plugin.video.themoviedb.helper?info=stars_in_tvshows&amp;type=person&amp;tmdb_id=$INFO[ListItem.Property(tmdb_id)]</content>
+                        </include>
+                        <!-- List 03 -->
+                        <include content="Info_Widget_Poster">
+                            <param name="includecondition" value="true" />
+                            <param name="id" value="5003" />
+                            <param name="groupid" value="7503" />
+                            <param name="label" value="Movies as Crew Member" />
+                            <param name="labelinclude" value="View_Cast_Job_Label" />
+                            <include content="Defs_InfoList_OnClick">
+                                <param name="prevent_del" value="noop" />
+                            </include>
+                            <include>Defs_InfoList_OnBack</include>
+                            <content limit="25" target="videos">plugin://plugin.video.themoviedb.helper?info=crew_in_movies&amp;type=person&amp;tmdb_id=$INFO[ListItem.Property(tmdb_id)]</content>
+                        </include>
+                        <!-- List 05 -->
+                        <include content="Info_Widget_Poster">
+                            <param name="includecondition" value="true" />
+                            <param name="id" value="5005" />
+                            <param name="groupid" value="7505" />
+                            <param name="label" value="TV Shows as Crew Member" />
+                            <param name="labelinclude" value="View_Cast_Job_Label" />
+                            <include content="Defs_InfoList_OnClick">
+                                <param name="prevent_del" value="noop" />
+                            </include>
+                            <include>Defs_InfoList_OnBack</include>
+                            <content limit="25" target="videos">plugin://plugin.video.themoviedb.helper?info=crew_in_tvshows&amp;type=person&amp;tmdb_id=$INFO[ListItem.Property(tmdb_id)]</content>
+                        </include>
+                        <!-- List 06 -->
+                        <include content="Info_Widget_Poster">
+                            <param name="includecondition" value="true" />
+                            <param name="id" value="5006" />
+                            <param name="groupid" value="7506" />
+                            <param name="label" value="Images" />
+                            <onclick>SetFocus(9506)</onclick>
+                            <include>Defs_InfoList_OnBack</include>
+                            <content limit="25" target="videos">plugin://plugin.video.themoviedb.helper?info=images&amp;type=person&amp;tmdb_id=$INFO[ListItem.Property(tmdb_id)]</content>
+                        </include>
+                    </control>
+                </control>
+            </control>
+        </control>
+
+        <include>Info_ImageViewer</include>
+    </include>
 </includes>
diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
index d470acda..08dc7593 100644
--- a/1080i/Includes_OSD.xml
+++ b/1080i/Includes_OSD.xml
@@ -1078,13 +1078,13 @@
             <onclick>SetProperty(OSDExtendedInfo,1,Home)</onclick>
             <onclick condition="!Player.Paused + !Skin.HasSetting(DontPauseOSD)">Pause</onclick>
             <onclick>Action(Close)</onclick>
-            <onclick condition="String.IsEmpty(VideoPlayer.DBID) + VideoPlayer.Content(movies) + !String.IsEmpty(VideoPlayer.IMDBNumber)">RunScript(plugin.video.themoviedb.helper,add_path=plugin://plugin.video.themoviedb.helper/?info=details&amp;type=movie&amp;imdb_id=$INFO[VideoPlayer.IMDBNumber],call_id=1137,delay=0.35)</onclick>
-            <onclick condition="String.IsEmpty(VideoPlayer.DBID) + VideoPlayer.Content(movies) + String.IsEmpty(VideoPlayer.IMDBNumber)">RunScript(plugin.video.themoviedb.helper,add_path=plugin://plugin.video.themoviedb.helper/?info=details&amp;type=movie&amp;query=$INFO[Player.Title],call_id=1137,delay=0.35)</onclick>
-            <onclick condition="String.IsEmpty(VideoPlayer.DBID) + [VideoPlayer.Content(tvshows) | VideoPlayer.Content(episodes)]">RunScript(plugin.video.themoviedb.helper,add_path=plugin://plugin.video.themoviedb.helper/?info=details&amp;type=tv&amp;query=$INFO[VideoPlayer.TvShowTitle],call_id=1137,delay=0.35)</onclick>
+            <onclick condition="String.IsEmpty(VideoPlayer.DBID) + VideoPlayer.Content(movies) + !String.IsEmpty(VideoPlayer.IMDBNumber)">RunScript(plugin.video.themoviedb.helper,add_path=plugin://plugin.video.themoviedb.helper/?info=details&amp;type=movie&amp;imdb_id=$INFO[VideoPlayer.IMDBNumber],call_auto=1136)</onclick>
+            <onclick condition="String.IsEmpty(VideoPlayer.DBID) + VideoPlayer.Content(movies) + String.IsEmpty(VideoPlayer.IMDBNumber)">RunScript(plugin.video.themoviedb.helper,add_path=plugin://plugin.video.themoviedb.helper/?info=details&amp;type=movie&amp;query=$INFO[Player.Title],call_auto=1136)</onclick>
+            <onclick condition="String.IsEmpty(VideoPlayer.DBID) + [VideoPlayer.Content(tvshows) | VideoPlayer.Content(episodes)]">RunScript(plugin.video.themoviedb.helper,add_path=plugin://plugin.video.themoviedb.helper/?info=details&amp;type=tv&amp;query=$INFO[VideoPlayer.TvShowTitle],call_auto=1136)</onclick>
 
 
-            <onclick condition="!String.IsEmpty(VideoPlayer.DBID) + VideoPlayer.Content(movies)">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[Player.Title,videodb://movies/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D],call_id=1137,delay=0.35)</onclick>
-            <onclick condition="!String.IsEmpty(VideoPlayer.DBID) + [VideoPlayer.Content(tvshows) | VideoPlayer.Content(episodes)]">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[VideoPlayer.TvShowTitle,videodb://tvshows/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D],call_id=1137,delay=0.35)</onclick>
+            <onclick condition="!String.IsEmpty(VideoPlayer.DBID) + VideoPlayer.Content(movies)">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[Player.Title,videodb://movies/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D],call_auto=1136)</onclick>
+            <onclick condition="!String.IsEmpty(VideoPlayer.DBID) + [VideoPlayer.Content(tvshows) | VideoPlayer.Content(episodes)]">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[VideoPlayer.TvShowTitle,videodb://tvshows/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D],call_auto=1136)</onclick>
 
             <onfocus condition="!String.IsEmpty(Window(Home).Property(OSDExtendedInfo)) + Player.Paused + !Skin.HasSetting(DontPauseOSD)">Play</onfocus>
             <onfocus condition="!String.IsEmpty(Window(Home).Property(OSDExtendedInfo))">ClearProperty(OSDExtendedInfo,Home)</onfocus>
diff --git a/1080i/Includes_Object.xml b/1080i/Includes_Object.xml
index 9a439195..e3c741c8 100644
--- a/1080i/Includes_Object.xml
+++ b/1080i/Includes_Object.xml
@@ -289,9 +289,9 @@
                 <left>$PARAM[left]</left>
                 <onfocus>SetProperty(SkinHelper.WidgetContainer,$PARAM[id],Home)</onfocus>
                 <onfocus>SetProperty(ListItemHelper.WidgetContainerId,$PARAM[id],Home)</onfocus>
-                <onclick condition="[Window.IsVisible(DialogVideoInfo.xml) | Window.IsVisible(1136)] + String.StartsWith(ListItem.FolderPath,plugin://plugin.video.themoviedb.helper) + [String.IsEmpty(ListItem.DBID) | [!String.IsEqual(ListItem.DBType,movie) + !String.IsEqual(ListItem.DBType,tvshow)]]">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.FolderPath],call_id=1137,delay=0.35,$PARAM[prevent_del])</onclick>
-                <onclick condition="[Window.IsVisible(DialogVideoInfo.xml) | Window.IsVisible(1136)] + String.StartsWith(ListItem.FolderPath,plugin://plugin.video.themoviedb.helper) + !String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,movie)">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.Label,videodb://movies/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D],call_id=1137,delay=0.35,$PARAM[prevent_del])</onclick>
-                <onclick condition="[Window.IsVisible(DialogVideoInfo.xml) | Window.IsVisible(1136)] + String.StartsWith(ListItem.FolderPath,plugin://plugin.video.themoviedb.helper) + !String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,tvshow)">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.Label,videodb://tvshows/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D],call_id=1137,delay=0.35,$PARAM[prevent_del])</onclick>
+                <onclick condition="[Window.IsVisible(DialogVideoInfo.xml) | Window.IsVisible(1136)] + String.StartsWith(ListItem.FolderPath,plugin://plugin.video.themoviedb.helper) + [String.IsEmpty(ListItem.DBID) | [!String.IsEqual(ListItem.DBType,movie) + !String.IsEqual(ListItem.DBType,tvshow)]]">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.FolderPath],call_auto=1136)</onclick>
+                <onclick condition="[Window.IsVisible(DialogVideoInfo.xml) | Window.IsVisible(1136)] + String.StartsWith(ListItem.FolderPath,plugin://plugin.video.themoviedb.helper) + !String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,movie)">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.Label,videodb://movies/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D],call_auto=1136)</onclick>
+                <onclick condition="[Window.IsVisible(DialogVideoInfo.xml) | Window.IsVisible(1136)] + String.StartsWith(ListItem.FolderPath,plugin://plugin.video.themoviedb.helper) + !String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,tvshow)">RunScript(plugin.video.themoviedb.helper,add_path=$INFO[ListItem.Label,videodb://tvshows/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22,%22%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D],call_auto=1136)</onclick>
                 <preloaditems>2</preloaditems>
                 <orientation>horizontal</orientation>
 
diff --git a/addon.xml b/addon.xml
index 3e456e02..5966f632 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.59-alpha1">
+<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.60-alpha1">
     <requires>
         <import addon="xbmc.gui" version="5.14.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />