diff --git a/16x9/Font.xml b/16x9/Font.xml
index 4cfdb6e6..21b73a1f 100644
--- a/16x9/Font.xml
+++ b/16x9/Font.xml
@@ -292,6 +292,11 @@
13
+
+ PVR_Guide
+ Inter/Inter-ExtraLight.ttf
+ 27
+
PVR_Channel
Inter/Inter-Regular.ttf
diff --git a/16x9/Templates_MyWindows.xml b/16x9/Templates_MyWindows.xml
index 641f3623..34272c4e 100644
--- a/16x9/Templates_MyWindows.xml
+++ b/16x9/Templates_MyWindows.xml
@@ -444,7 +444,7 @@
360
30
6
- pvr/tvguide_progress_indicator.png
+
vertical
11
SetFocus(3000,0,absolute)
@@ -474,6 +474,7 @@
+ PVR_Guide
450
90
30
@@ -495,6 +496,7 @@
+ PVR_Guide
$VAR[epggrid_Focused_Color]
90
450
@@ -505,6 +507,7 @@
+ PVR_Guide
15
false
@@ -517,6 +520,7 @@
$VAR[epggrid_Focused_Color]
+ PVR_Guide
15
false
diff --git a/16x9/Timers.xml b/16x9/Timers.xml
index 409dcef5..f614a459 100644
--- a/16x9/Timers.xml
+++ b/16x9/Timers.xml
@@ -37,7 +37,7 @@
trailer_autoplay
- Window.Is(videos) + Skin.HasSetting(Trailer_Autoplay) + [[Skin.String(Trailer_Autoplay_Movies_Enabled,true) + Container.Content(movies)] | [Skin.String(Trailer_Autoplay_TVShows_Enabled,true) + !Container.Content(tvshows)]] + Window.IsVisible(1160) + !Player.HasMedia
+ Window.Is(videos) + Skin.HasSetting(Trailer_Autoplay) + [[Skin.String(Trailer_Autoplay_Movies_Enabled,true) + Container.Content(movies)] | [Skin.String(Trailer_Autoplay_TVShows_Enabled,true) + Container.Content(tvshows)]] + Window.IsVisible(1160) + !Player.HasMedia
Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)
!String.IsEmpty(ListItem.Trailer) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !Player.HasVideo
SetProperty(Trailer_Autoplay,true,home)
diff --git a/README.md b/README.md
index 9b20feff..631c7461 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,9 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
### Changelog
---
+**2.6.0**
+- Fixed typo in trailer autoplay preventing tvshow trailers from autoplaying in videos window unless container content was NOT tvshows.
+
**2.5.9**
- Switched OSD idle timer from custom window to skin timer
diff --git a/addon.xml b/addon.xml
index e4eb4120..df3ae62a 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index fc55e252..183be824 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -1598,12 +1598,12 @@ msgstr ""
#/16x9/Content_Settings.xml
msgctxt "#31568"
-msgid "Autoplay autoplay can be quickly toggled on/off from the options menu within the video library."
+msgid "Autoplay can be quickly toggled on/off from the options menu within the video library."
msgstr ""
#/16x9/Content_Settings.xml
msgctxt "#31469"
-msgid "Play trailers for tv shows in video library"
+msgid "Autoplay trailers for tv shows in video library"
msgstr ""