diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 00a3cc9..1028de3 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -890,6 +890,17 @@
                     <texturefocus border="12" colordiffuse="PosterHighlight">common/white.png</texturefocus>
                 </control>
                 
+                <control type="button" id="812" description="Startup Video">
+                    <label>31287</label>
+                    <align>left</align>
+                    <font>Font-ListInfo</font>
+                    <label2>$INFO[Skin.String(StartupPlaylist)]</label2>
+                    <onclick condition="IsEmpty(Skin.String(StartupPlaylist))">Skin.SetFile(StartupPlaylist)</onclick>
+                    <onclick condition="!IsEmpty(Skin.String(StartupPlaylist))">Skin.Reset(StartupPlaylist)</onclick>
+                    <visible>ControlGroup(3).HasFocus(36)</visible>
+                    <texturefocus border="12" colordiffuse="PosterHighlight">common/white.png</texturefocus>
+                </control>
+                
                 <!-- ADVANCED -->
         
                 <control type="radiobutton" id="803" description="Kiosk mode">
diff --git a/1080i/Startup.xml b/1080i/Startup.xml
index 43e7ca0..3f72b84 100644
--- a/1080i/Startup.xml
+++ b/1080i/Startup.xml
@@ -3,6 +3,7 @@
 <window>
     <defaultcontrol always="true">9315</defaultcontrol>
     <onload>ClearProperty(homefocus,home)</onload>
+    <onload>SetProperty(SkinInitStarted,1,home)</onload>
     <onunload>SetProperty(widget,movies,home)</onunload>
 
     <controls>
@@ -232,9 +233,11 @@
             <visible allowhiddenfocus="true">false</visible>
             <onfocus condition="!Skin.HasSetting(skin.init)">SetFocus(9314)</onfocus>
             <onfocus condition="!Skin.HasSetting(skin.init2)">SetFocus(9316)</onfocus>
+            <onfocus condition="IsEmpty(Window(home).Property(SkinInitStarted)) + Skin.HasSetting(skin.init) + Skin.HasSetting(skin.init2) + !IsEmpty(Skin.String(StartupPlaylist))">PlayMedia($ESCINFO[Skin.String(StartupPlaylist)])</onfocus>
             <onfocus condition="Skin.HasSetting(skin.init) + Skin.HasSetting(skin.init2)">RunScript(script.skin.info.service)</onfocus>
             <onfocus condition="Skin.HasSetting(skin.init) + Skin.HasSetting(skin.init2) + Skin.HasSetting(NextAired.Update) + Library.HasContent(tvshows)">RunScript(script.tv.show.next.aired,silent=True)</onfocus>
-            <onfocus condition="Skin.HasSetting(skin.init) + Skin.HasSetting(skin.init2)">AlarmClock(GoHome,ReplaceWindow(home),00:01,silent,false)</onfocus>
+            <onfocus condition="Skin.HasSetting(skin.init) + Skin.HasSetting(skin.init2) + !Player.HasVideo">ReplaceWindow(Home)</onfocus>
+            <!--<onfocus condition="Skin.HasSetting(skin.init) + Skin.HasSetting(skin.init2)">AlarmClock(GoHome,ReplaceWindow(home),00:01,silent,false)</onfocus>-->
         </control>
         <control type="label">
             <description>Loading</description>
diff --git a/addon.xml b/addon.xml
index c1add56..5078993 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
     id="skin.eminence"
-    version="1.1.9"
+    version="1.2.0"
     name="Eminence"
     provider-name="jurialmunkey">
     <requires>
diff --git a/changelog.txt b/changelog.txt
index 8cfc484..b07a1f8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.2.0[/B]
+Startup video option
+
 [B]1.1.9[/B]
 Add more hub option presets
 Add OSD PVR Guide
diff --git a/language/English/strings.po b/language/English/strings.po
index 4fb9143..1d744a6 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -755,3 +755,7 @@ msgstr ""
 msgctxt "#31286"
 msgid "Disable clock"
 msgstr ""
+
+msgctxt "#31287"
+msgid "Set startup video"
+msgstr ""
diff --git a/language/English/strings.po~ b/language/English/strings.po~
index b63739c..dcea805 100644
--- a/language/English/strings.po~
+++ b/language/English/strings.po~
@@ -753,5 +753,9 @@ msgid "Premiere Date"
 msgstr ""
 
 msgctxt "#31286"
-msgid "Disable Clock"
+msgid "Disable clock"
+msgstr ""
+
+msgctxt "#31287"
+msgid "Set intro movie"
 msgstr ""