diff --git a/resources/lib/Entrypoint.py b/resources/lib/Entrypoint.py
index 06b3121b..1b8c2217 100644
--- a/resources/lib/Entrypoint.py
+++ b/resources/lib/Entrypoint.py
@@ -17,8 +17,6 @@ from PlaybackUtils import PlaybackUtils
 from DownloadUtils import DownloadUtils
 from ReadEmbyDB import ReadEmbyDB
 from API import API
-from ItemInfo import ItemInfo
-from PersonInfo import PersonInfo
 
 
 ##### Play items via plugin://plugin.video.emby/ #####
diff --git a/resources/skins/default/720p/NextUpInfo.xml b/resources/skins/default/720p/NextUpInfo.xml
index 05ada47a..1c805113 100644
--- a/resources/skins/default/720p/NextUpInfo.xml
+++ b/resources/skins/default/720p/NextUpInfo.xml
@@ -4,241 +4,178 @@
 	<zorder>0</zorder>
 	<controls>
 		<control type="group">
-			<control type="image">
-				<left>0</left>
-				<top>-150</top>
-				<width>1280</width>
-				<height>256</height>
-				<texture flipy="true" border="1">HomeNowPlayingBack.png</texture>
-			</control>
-			<control type="label" id="1">
-				<description>Clock label</description>
-				<left>450</left>
-				<top>5</top>
-				<width>800</width>
-				<height>25</height>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<label>$INFO[System.Time]</label>
-				<animation effect="slide" start="0,0" end="-70,0" time="0" condition="Window.IsVisible(VideoOSD)">conditional</animation>
-			</control>
-			<control type="image">
-				<left>0</left>
-				<top>230r</top>
-				<width>1280</width>
-				<height>230</height>
-				<texture border="1">HomeNowPlayingBack.png</texture>
-			</control>
-			<control type="image" id="3009">
-				<description>cover image</description>
-				<left>20</left>
-				<top>350r</top>
-				<width>300</width>
-				<height>330</height>
-			</control>
-			<control type="image" id="3006">
-				<description>clearart</description>
-				<visible>false</visible>
-			</control>
-			<control type="group" id="1">
-				<left>330</left>
-				<top>185r</top>
-				<control type="label" id="1">
-					<description>TV Show label</description>
-					<left>20</left>
-					<top>30</top>
-					<width>910</width>
-					<height>25</height>
-					<align>left</align>
-					<font>font12</font>
-					<label>$INFO[Control.GetLabel(3002),Up Next... ,][COLOR=orange]$INFO[Control.GetLabel(3000), ,][/COLOR]</label>
-					<textcolor>grey2</textcolor>
-					<shadowcolor>black</shadowcolor>
-					<visible>VideoPlayer.Content(Episodes)</visible>
+			<control type="group">
+				<animation effect="slide" start="0" end="0,-190" time="150" condition="Window.IsVisible(NextUpInfo.xml)">Conditional</animation>
+				<animation effect="slide" start="0,110" end="0" time="150">Visible</animation>
+				<animation effect="slide" start="0,110" end="0" time="150">WindowOpen</animation>
+				<control type="image" id="3006">
+					<right>0</right>
+					<bottom>110</bottom>
+					<width>500</width>
+					<height>281</height>
+					<aspectratio align="right" aligny="bottom">keep</aspectratio>
 				</control>
-				<control type="label" description="episode/season info" id="3002">
-					<width>100%</width>
-					<top>0</top>
-					<left>175</left>
-					<height>40</height>
-					<visible>false</visible>
+				<!-- buttons -->
+				<control type="button" id="3012">
+					<description>Watch Now</description>
+					<right>0</right>
+					<bottom>40</bottom>
+					<width>200</width>
+					<onup>3013</onup>
+					<ondown>3013</ondown>
+					<font>font14</font>
+					<label>Watch Now</label>
+					<focusedcolor>FFededed</focusedcolor>
+					<disabledcolor>B3dddddd</disabledcolor>
+					<selectedcolor>FFff4081</selectedcolor>
+					<height>68</height>
+					<textcolor>ff333333</textcolor>
 				</control>
-				<control type="label" description="Title" id="3000">
-					<width>100%</width>
-					<left>267</left>
-					<top>0</top>
-					<height>40</height>
-					<visible>false</visible>
+				<control type="button" id="3013">
+					<description>Cancel</description>
+					<right>0</right>
+					<bottom>-30</bottom>
+					<width>200</width>
+					<onup>3012</onup>
+					<ondown>3012</ondown>
+					<font>font14</font>
+					<label>222</label>
+					<focusedcolor>FFededed</focusedcolor>
+					<disabledcolor>B3dddddd</disabledcolor>
+					<selectedcolor>FFff4081</selectedcolor>
+					<height>68</height>
+					<textcolor>ff333333</textcolor>
 				</control>
-				<control type="textbox" id="3001">
-					<description>text</description>
-					<left>30</left>
-					<top>62</top>
-					<width>550</width>
-					<height>98</height>
-					<align>left</align>
-					<label>-</label>
-					<font>font13</font>
-					<autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll>
-					<visible>false</visible>
-				</control>
-				<control type="grouplist" id="1">
-					<left>20</left>
-					<top>60</top>
-					<width>910</width>
-					<height>35</height>
-					<itemgap>5</itemgap>
-					<orientation>horizontal</orientation>
-					<control type="label" id="3003" description="rating">
-						<width>100%</width>
-						<top>50</top>
-						<height>40</height>
-						<visible>false</visible>
+			</control>
+			<control type="group">
+				<top>300r</top>
+				<bottom>0</bottom>
+				<width>100%</width>
+				<animation effect="fade" start="0" end="100" delay="150" time="150">Visible</animation>
+				<animation effect="fade" start="0" end="100" delay="150" time="150">WindowOpen</animation>
+				<control type="group">
+					<left>80</left>
+					<right>80</right>
+					<top>20</top>
+					<bottom>20</bottom>
+					<control type="image" id="3009">
+						<left>-70</left>
+						<top>-226</top>
+						<width>334</width>
+						<height>486</height>
 					</control>
-					<control type="label" id="3004" description="year/runtime">
-						<width>100%</width>
-						<top>50</top>
-						<height>40</height>
-						<scroll>false</scroll>
-						<visible>false</visible>
-					</control>
-					<control type="label" id="1">
-						<width min="10" max="520">auto</width>
-						<height>30</height>
-						<font>font30</font>
-						<align>left</align>
-						<aligny>center</aligny>
-						<label>$INFO[Control.GetLabel(3003)]$INFO[Control.GetLabel(3004), ,]</label>
-						<textcolor>grey</textcolor>
-						<scroll>true</scroll>
-					</control>
-					<control type="button" id="3012">
-						<description>Watch now button</description>
-						<width>200</width>
-						<height>40</height>
-						<label>Watch Now</label>
-						<font>font12_title</font>
-						<onleft>3013</onleft>
-						<onright>3013</onright>
-					</control>
-					<control type="button" id="3013">
-						<description>cancel button</description>
-						<width>200</width>
-						<height>40</height>
-						<label>222</label>
-						<font>font12_title</font>
-						<onleft>3012</onleft>
-						<onright>3012</onright>
+					<control type="group">
+						<left>294</left>
+						<right>0</right>
+						<control type="label">
+							<width>100%</width>
+							<top>0</top>
+							<height>40</height>
+							<font>font16</font>
+							<textcolor>B3dddddd</textcolor>
+							<label>$INFO[Control.GetLabel(3002),Up Next... ,][COLOR=orange]$INFO[Control.GetLabel(3000), ,][/COLOR]</label>
+						</control>
+						<control type="label" description="episode/season info" id="3002">
+							<width>100%</width>
+							<top>0</top>
+							<left>175</left>
+							<height>40</height>
+							<font>font16</font>
+							<textcolor>B3dddddd</textcolor>
+							<visible>false</visible>
+						</control>
+						<control type="label" description="Title" id="3000">
+							<width>100%</width>
+							<left>267</left>
+							<top>0</top>
+							<height>40</height>
+							<font>font16</font>
+							<textcolor>orange</textcolor>
+							<visible>false</visible>
+						</control>
+						<control type="label" id="3003" description="rating">
+							<width>100%</width>
+							<top>50</top>
+							<height>40</height>
+							<font>font14</font>
+							<textcolor>B3dddddd</textcolor>
+						</control>
+						<control type="label" id="3004" description="year/runtime">
+							<left>55</left>
+							<width>100%</width>
+							<top>50</top>
+							<height>40</height>
+							<font>font14</font>
+							<textcolor>B3dddddd</textcolor>
+							<scroll>false</scroll>
+							<visible>Control.IsVisible(3003)</visible>
+						</control>
+						<control type="label" id="3004" description="year/runtime">
+							<width>100%</width>
+							<top>50</top>
+							<height>40</height>
+							<font>font14</font>
+							<textcolor>B3dddddd</textcolor>
+							<scroll>false</scroll>
+							<visible>!Control.IsVisible(3003)</visible>
+						</control>
+						<control type="textbox" description="Plot" id="3001">
+							<width>85%</width>
+							<top>105</top>
+							<height>68</height>
+							<font>font12</font>
+							<align>justify</align>
+							<left>0</left>
+							<textcolor>4Ddddddd</textcolor>
+						</control>
+						<control type="label" description="Next up">
+							<width>400</width>
+							<bottom>30</bottom>
+							<height>40</height>
+							<font>font12</font>
+							<textcolor>B3dddddd</textcolor>
+							<label>Press cancel to stop automatic play of next episode...</label>
+						</control>
+						<control type="label" description="Total Time">
+							<right>-30</right>
+							<align>right</align>
+							<width>400</width>
+							<bottom>30</bottom>
+							<height>80</height>
+							<font>WeatherTemp</font>
+							<textcolor>B3dddddd</textcolor>
+							<label>$INFO[Player.TimeRemaining(ss)]</label>
+						</control>
+						<control type="image">
+							<description>Progress Back</description>
+							<width>100%</width>
+							<bottom>10</bottom>
+							<height>8</height>
+							<texture colordiffuse="1F000000">white.png</texture>
+							`
+						</control>
+						<control type="progress" description="cache">
+							<description>Progress Bar</description>
+							<width>100%</width>
+							<bottom>10</bottom>
+							<height>8</height>
+							<info>Player.ProgressCache</info>
+							<visible>true</visible>
+							<texturebg colordiffuse="00ffffff">progress-bg.png</texturebg>
+							<lefttexture colordiffuse="FFff4081">progress-end.png</lefttexture>
+							<midtexture colordiffuse="FFff4081">progress-end.png</midtexture>
+							<righttexture colordiffuse="FFff4081">progress-end.png</righttexture>
+						</control>
+						<control type="progress" id="23">
+							<description>Progress Bar</description>
+							<width>100%</width>
+							<bottom>10</bottom>
+							<height>8</height>
+							<info>Player.Progress</info>
+							<visible>true</visible>
+						</control>
 					</control>
 				</control>
-				<control type="label" id="1">
-					<left>0</left>
-					<top>120</top>
-					<width>910</width>
-					<height>25</height>
-					<label>$INFO[Player.TimeRemaining(ss),Press cancel to stop automatic play of next episode , seconds remaining]</label>
-					<align>center</align>
-					<aligny>center</aligny>
-					<font>font12</font>
-					<textcolor>grey</textcolor>
-					<scroll>true</scroll>
-					<visible>!Window.IsVisible(VideoOSD) + !VideoPlayer.Content(LiveTV)</visible>
-					<animation effect="fade" time="200">VisibleChange</animation>
-				</control>
-			</control>
-			<control type="group" id="1">
-				<left>330</left>
-				<top>95r</top>
-				<visible>!VideoPlayer.Content(LiveTV) | [VideoPlayer.Content(LiveTV) + VideoPlayer.HasEpg]</visible>
-				<control type="label" id="1">
-					<visible>!VideoPlayer.Content(LiveTV)</visible>
-					<left>0</left>
-					<top>0</top>
-					<width>100</width>
-					<height>40</height>
-					<font>font13</font>
-					<align>left</align>
-					<aligny>center</aligny>
-					<label>$INFO[Player.Time(hh:mm:ss)]</label>
-				</control>
-				<control type="progress" id="1">
-					<description>ProgressbarCache</description>
-					<left>100</left>
-					<top>15</top>
-					<width>720</width>
-					<height>16</height>
-					<info>Player.ProgressCache</info>
-					<midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture>
-				</control>
-				<control type="progress" id="1">
-					<description>Progressbar</description>
-					<left>100</left>
-					<top>15</top>
-					<width>720</width>
-					<height>16</height>
-					<info>Player.Progress</info>
-				</control>
-				<control type="label" id="1">
-					<visible>!VideoPlayer.Content(LiveTV)</visible>
-					<left>820</left>
-					<top>0</top>
-					<width>100</width>
-					<height>40</height>
-					<font>font13</font>
-					<align>right</align>
-					<aligny>center</aligny>
-					<label>$INFO[Player.Duration(hh:mm:ss)]</label>
-				</control>
-			</control>
-		</control>
-		<!-- codec info -->
-		<control type="group" id="0">
-			<left>0</left>
-			<top>20</top>
-			<animation effect="fade" time="200">VisibleChange</animation>
-			<control type="image">
-				<description>media info background image</description>
-				<left>0</left>
-				<top>0</top>
-				<width>1280</width>
-				<height>160</height>
-				<texture>black-back.png</texture>
-			</control>
-			<control type="label" id="10">
-				<description>row 1 label</description>
-				<left>50</left>
-				<top>10</top>
-				<width>1180</width>
-				<height>30</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font12</font>
-				<label>-</label>
-			</control>
-			<control type="label" id="11">
-				<description>row 2 label</description>
-				<left>50</left>
-				<top>55</top>
-				<width>1180</width>
-				<height>30</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font12</font>
-				<label>-</label>
-			</control>
-			<control type="label" id="12">
-				<description>row 3 label</description>
-				<left>50</left>
-				<top>100</top>
-				<width>1180</width>
-				<height>45</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font12</font>
-				<label>-</label>
 			</control>
 		</control>
 	</controls>