diff --git a/1080i/Custom_1130_Hub_Library_Movies.xml b/1080i/Custom_1130_Hub_Library_Movies.xml
new file mode 100644
index 00000000..655a763d
--- /dev/null
+++ b/1080i/Custom_1130_Hub_Library_Movies.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window type="window" id="1130">
+    <defaultcontrol>6000</defaultcontrol>
+    <controls>
+        <include>Defs_TMDbHelper_Loader</include>
+        <include>Background_ExtraFanart</include>
+        <include>Background_Main</include>
+
+        <include content="Hub_Grouplist">
+
+            <param name="l_window_id">1114</param>
+            <param name="r_window_id">1114</param>
+
+            <param name="submenu_label">Library</param>
+            <param name="submenu_content">videodb://movies/</param>
+
+            <include content="Hub_Widget_SideStack">
+                <param name="id">500</param>
+                <param name="label">$LOCALIZE[535]</param>
+                <param name="target">videos</param>
+            </include>
+            <include content="Hub_Widget_SideStack">
+                <param name="id">510</param>
+                <param name="label">$LOCALIZE[515]</param>
+                <param name="target">videos</param>
+            </include>
+            <include content="Hub_Widget_SideStack">
+                <param name="id">520</param>
+                <param name="label">$LOCALIZE[20339]</param>
+                <param name="target">videos</param>
+            </include>
+            <include content="Hub_Widget_SideStack">
+                <param name="id">530</param>
+                <param name="label">$LOCALIZE[572]</param>
+                <param name="target">videos</param>
+            </include>
+            <include content="Hub_Widget_SideStack">
+                <param name="id">540</param>
+                <param name="label">$LOCALIZE[345]</param>
+                <param name="target">videos</param>
+            </include>
+            <include content="Hub_Widget_SideStack">
+                <param name="id">550</param>
+                <param name="label">IMDb</param>
+                <param name="target">videos</param>
+            </include>
+        </include>
+
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5000</param>
+            <param name="nodeid">5002</param>
+            <content target="videos">special://skin/extras/hub/movies/lists/</content>
+        </include>
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5100</param>
+            <param name="nodeid">5102</param>
+            <content sortby="label" target="videos">videodb://movies/genres/</content>
+        </include>
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5200</param>
+            <param name="nodeid">5202</param>
+            <content sortby="label" target="videos">videodb://movies/directors/</content>
+        </include>
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5300</param>
+            <param name="nodeid">5302</param>
+            <content sortby="label" target="videos">videodb://movies/studios/</content>
+        </include>
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5400</param>
+            <param name="nodeid">5402</param>
+            <content sortby="label" sortorder="descending" target="videos">special://skin/extras/hub/movies/years/</content>
+        </include>
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5500</param>
+            <param name="nodeid">5502</param>
+            <content target="videos">special://skin/extras/hub/movies/awards/</content>
+        </include>
+
+        <include>Hub_Furniture</include>
+
+        <include content="Furniture_Top_Left">
+            <param name="label">$LOCALIZE[342]</param>
+        </include>
+
+    </controls>
+</window>
\ No newline at end of file
diff --git a/1080i/Custom_1131_Hub_Library_TVShows.xml b/1080i/Custom_1131_Hub_Library_TVShows.xml
new file mode 100644
index 00000000..4369dc7b
--- /dev/null
+++ b/1080i/Custom_1131_Hub_Library_TVShows.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window type="window" id="1131">
+    <defaultcontrol>6000</defaultcontrol>
+    <controls>
+        <include>Defs_TMDbHelper_Loader</include>
+        <include>Background_ExtraFanart</include>
+        <include>Background_Main</include>
+
+        <include content="Hub_Grouplist">
+
+            <param name="l_window_id">1114</param>
+            <param name="r_window_id">1114</param>
+
+            <param name="submenu_label">Library</param>
+            <param name="submenu_content">videodb://tvshows/</param>
+
+            <include content="Hub_Widget_SideStack">
+                <param name="id">500</param>
+                <param name="label">$LOCALIZE[535]</param>
+                <param name="target">videos</param>
+            </include>
+            <include content="Hub_Widget_SideStack">
+                <param name="id">510</param>
+                <param name="label">$LOCALIZE[515]</param>
+                <param name="target">videos</param>
+            </include>
+            <include content="Hub_Widget_SideStack">
+                <param name="id">520</param>
+                <param name="label">$LOCALIZE[20337]</param>
+                <param name="target">videos</param>
+            </include>
+            <include content="Hub_Widget_SideStack">
+                <param name="id">530</param>
+                <param name="label">$LOCALIZE[572]</param>
+                <param name="target">videos</param>
+            </include>
+            <include content="Hub_Widget_SideStack">
+                <param name="id">540</param>
+                <param name="label">$LOCALIZE[345]</param>
+                <param name="target">videos</param>
+            </include>
+            <include content="Hub_Widget_SideStack">
+                <param name="id">550</param>
+                <param name="label">IMDb</param>
+                <param name="target">videos</param>
+            </include>
+        </include>
+
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5000</param>
+            <param name="nodeid">5002</param>
+            <content target="videos">special://skin/extras/hub/tvshows/lists/</content>
+        </include>
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5100</param>
+            <param name="nodeid">5102</param>
+            <content sortby="label" target="videos">videodb://tvshows/genres/</content>
+        </include>
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5200</param>
+            <param name="nodeid">5202</param>
+            <content sortby="label" target="videos">videodb://tvshows/actors/</content>
+        </include>
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5300</param>
+            <param name="nodeid">5302</param>
+            <content sortby="label" target="videos">videodb://tvshows/studios/</content>
+        </include>
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5400</param>
+            <param name="nodeid">5402</param>
+            <content sortby="label" sortorder="descending" target="videos">videodb://tvshows/years/</content>
+        </include>
+        <include content="Widget_SideStack_NodeList">
+            <param name="id">5500</param>
+            <param name="nodeid">5502</param>
+            <content target="videos">special://skin/extras/hub/tvshows/awards/</content>
+        </include>
+
+        <include>Hub_Furniture</include>
+
+        <include content="Furniture_Top_Left">
+            <param name="label">$LOCALIZE[20343]</param>
+        </include>
+
+    </controls>
+</window>
\ No newline at end of file
diff --git a/extras/hub/movies/Top250Movies.xsp b/extras/hub/movies/awards/01-Top250Movies.xsp
similarity index 100%
rename from extras/hub/movies/Top250Movies.xsp
rename to extras/hub/movies/awards/01-Top250Movies.xsp
diff --git a/extras/hub/movies/TopRatedMovies.xsp b/extras/hub/movies/awards/02-TopRatedMovies.xsp
similarity index 100%
rename from extras/hub/movies/TopRatedMovies.xsp
rename to extras/hub/movies/awards/02-TopRatedMovies.xsp
diff --git a/extras/hub/movies/awards/03-MostVotedMovies.xsp b/extras/hub/movies/awards/03-MostVotedMovies.xsp
new file mode 100644
index 00000000..67c02d9c
--- /dev/null
+++ b/extras/hub/movies/awards/03-MostVotedMovies.xsp
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>Most Voted Movies</name>
+    <match>all</match>
+    <order direction="descending">votes</order>
+</smartplaylist>
diff --git a/extras/hub/movies/NewMovies.xsp b/extras/hub/movies/lists/01-NewMovies.xsp
similarity index 100%
rename from extras/hub/movies/NewMovies.xsp
rename to extras/hub/movies/lists/01-NewMovies.xsp
diff --git a/extras/hub/movies/InProgressMovies.xsp b/extras/hub/movies/lists/02-InProgressMovies.xsp
similarity index 100%
rename from extras/hub/movies/InProgressMovies.xsp
rename to extras/hub/movies/lists/02-InProgressMovies.xsp
diff --git a/extras/hub/movies/RandomMovies.xsp b/extras/hub/movies/lists/03-RandomMovies.xsp
similarity index 100%
rename from extras/hub/movies/RandomMovies.xsp
rename to extras/hub/movies/lists/03-RandomMovies.xsp
diff --git a/extras/hub/movies/RecentMovies.xsp b/extras/hub/movies/lists/04-RecentMovies.xsp
similarity index 100%
rename from extras/hub/movies/RecentMovies.xsp
rename to extras/hub/movies/lists/04-RecentMovies.xsp
diff --git a/extras/hub/movies/UnwatchedMovies.xsp b/extras/hub/movies/lists/05-UnwatchedMovies.xsp
similarity index 100%
rename from extras/hub/movies/UnwatchedMovies.xsp
rename to extras/hub/movies/lists/05-UnwatchedMovies.xsp
diff --git a/extras/hub/movies/years/1880-1919.xsp b/extras/hub/movies/years/1880-1919.xsp
new file mode 100644
index 00000000..f6ecf878
--- /dev/null
+++ b/extras/hub/movies/years/1880-1919.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>1880-1919</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1878</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>1920</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/1920-1929.xsp b/extras/hub/movies/years/1920-1929.xsp
new file mode 100644
index 00000000..a65adde1
--- /dev/null
+++ b/extras/hub/movies/years/1920-1929.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>1920-1929</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1919</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>1930</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/1930-1939.xsp b/extras/hub/movies/years/1930-1939.xsp
new file mode 100644
index 00000000..46fcbbf5
--- /dev/null
+++ b/extras/hub/movies/years/1930-1939.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>1930-1939</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1929</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>1940</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/1940-1949.xsp b/extras/hub/movies/years/1940-1949.xsp
new file mode 100644
index 00000000..7d5462c2
--- /dev/null
+++ b/extras/hub/movies/years/1940-1949.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>1940-1949</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1939</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>1950</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/1950-1959.xsp b/extras/hub/movies/years/1950-1959.xsp
new file mode 100644
index 00000000..a48222ce
--- /dev/null
+++ b/extras/hub/movies/years/1950-1959.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>1950-1959</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1949</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>1960</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/1960-1969.xsp b/extras/hub/movies/years/1960-1969.xsp
new file mode 100644
index 00000000..094dccf2
--- /dev/null
+++ b/extras/hub/movies/years/1960-1969.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>1960-1969</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1959</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>1970</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/1970-1979.xsp b/extras/hub/movies/years/1970-1979.xsp
new file mode 100644
index 00000000..cedb1abc
--- /dev/null
+++ b/extras/hub/movies/years/1970-1979.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>1970-1979</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1969</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>1980</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/1980-1989.xsp b/extras/hub/movies/years/1980-1989.xsp
new file mode 100644
index 00000000..28156c78
--- /dev/null
+++ b/extras/hub/movies/years/1980-1989.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>1980-1989</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1979</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>1990</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/1990-1999.xsp b/extras/hub/movies/years/1990-1999.xsp
new file mode 100644
index 00000000..e6cde012
--- /dev/null
+++ b/extras/hub/movies/years/1990-1999.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>1990-1999</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1989</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>2000</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/2000-2009.xsp b/extras/hub/movies/years/2000-2009.xsp
new file mode 100644
index 00000000..44c2c444
--- /dev/null
+++ b/extras/hub/movies/years/2000-2009.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>2000-2009</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1999</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>2010</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/2010-2019.xsp b/extras/hub/movies/years/2010-2019.xsp
new file mode 100644
index 00000000..d2b36068
--- /dev/null
+++ b/extras/hub/movies/years/2010-2019.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>2010-2019</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>2009</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>2020</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/movies/years/2020-2029.xsp b/extras/hub/movies/years/2020-2029.xsp
new file mode 100644
index 00000000..9780fdf4
--- /dev/null
+++ b/extras/hub/movies/years/2020-2029.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>2020-2029</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>2019</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>2030</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/awards/02-TopRatedTvShows.xsp b/extras/hub/tvshows/awards/02-TopRatedTvShows.xsp
new file mode 100644
index 00000000..1e9a28fe
--- /dev/null
+++ b/extras/hub/tvshows/awards/02-TopRatedTvShows.xsp
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>Top Rated TvShows</name>
+    <match>all</match>
+    <order direction="descending">rating</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/awards/03-MostVotedTvShows.xsp b/extras/hub/tvshows/awards/03-MostVotedTvShows.xsp
new file mode 100644
index 00000000..d8e1df6a
--- /dev/null
+++ b/extras/hub/tvshows/awards/03-MostVotedTvShows.xsp
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>Most Voted TvShows</name>
+    <match>all</match>
+    <order direction="descending">votes</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/awards/04-TopRatedEpisodes.xsp b/extras/hub/tvshows/awards/04-TopRatedEpisodes.xsp
new file mode 100644
index 00000000..035bd092
--- /dev/null
+++ b/extras/hub/tvshows/awards/04-TopRatedEpisodes.xsp
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="episodes">
+    <name>Top Rated Episodes</name>
+    <match>all</match>
+    <order direction="descending">rating</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/awards/05-MostVotedEpisodes.xsp b/extras/hub/tvshows/awards/05-MostVotedEpisodes.xsp
new file mode 100644
index 00000000..e5b20fb5
--- /dev/null
+++ b/extras/hub/tvshows/awards/05-MostVotedEpisodes.xsp
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="episodes">
+    <name>Most Voted Episodes</name>
+    <match>all</match>
+    <order direction="descending">votes</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/lists/01-RecentTvShows.xsp b/extras/hub/tvshows/lists/01-RecentTvShows.xsp
new file mode 100644
index 00000000..191b0638
--- /dev/null
+++ b/extras/hub/tvshows/lists/01-RecentTvShows.xsp
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>Recently Watched TV Shows</name>
+    <match>all</match>
+    <order direction="descending">lastplayed</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/lists/02-NewShows.xsp b/extras/hub/tvshows/lists/02-NewShows.xsp
new file mode 100644
index 00000000..6fb3b931
--- /dev/null
+++ b/extras/hub/tvshows/lists/02-NewShows.xsp
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>New TvShows</name>
+    <match>all</match>
+    <rule field="playcount" operator="is">
+        <value>0</value>
+    </rule>
+    <order direction="descending">dateadded</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/lists/03-RandomTvShows.xsp b/extras/hub/tvshows/lists/03-RandomTvShows.xsp
new file mode 100644
index 00000000..42c92a59
--- /dev/null
+++ b/extras/hub/tvshows/lists/03-RandomTvShows.xsp
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>Random TvShows</name>
+    <order direction="ascending">random</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/lists/04-UnwatchedEpisodes.xsp b/extras/hub/tvshows/lists/04-UnwatchedEpisodes.xsp
new file mode 100644
index 00000000..18b399e2
--- /dev/null
+++ b/extras/hub/tvshows/lists/04-UnwatchedEpisodes.xsp
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="episodes">
+    <name>Unwatched Episodes</name>
+    <match>all</match>
+    <rule field="playcount" operator="is">
+        <value>0</value>
+    </rule>
+    <order direction="ascending">dateadded</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/lists/05-NewEpisodes.xsp b/extras/hub/tvshows/lists/05-NewEpisodes.xsp
new file mode 100644
index 00000000..5dedf9ba
--- /dev/null
+++ b/extras/hub/tvshows/lists/05-NewEpisodes.xsp
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="episodes">
+    <name>New Episodes</name>
+    <match>all</match>
+    <rule field="playcount" operator="is">
+        <value>0</value>
+    </rule>
+    <order direction="descending">dateadded</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/lists/06-RandomEpisodes.xsp b/extras/hub/tvshows/lists/06-RandomEpisodes.xsp
new file mode 100644
index 00000000..b96f1250
--- /dev/null
+++ b/extras/hub/tvshows/lists/06-RandomEpisodes.xsp
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="episodes">
+    <name>Random Episodes</name>
+    <match>all</match>
+    <rule field="lastplayed" operator="notinthelast">
+        <value>14 Days</value>
+    </rule>
+    <order direction="ascending">random</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/lists/07-InProgressShows.xsp b/extras/hub/tvshows/lists/07-InProgressShows.xsp
new file mode 100644
index 00000000..af394546
--- /dev/null
+++ b/extras/hub/tvshows/lists/07-InProgressShows.xsp
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>In Progress TvShows</name>
+    <match>all</match>
+    <rule field="inprogress" operator="true" />
+    <order direction="descending">lastplayed</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/lists/08-InProgressEpisodes.xsp b/extras/hub/tvshows/lists/08-InProgressEpisodes.xsp
new file mode 100644
index 00000000..489b7226
--- /dev/null
+++ b/extras/hub/tvshows/lists/08-InProgressEpisodes.xsp
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="episodes">
+    <name>In Progress Episodes</name>
+    <match>all</match>
+    <rule field="inprogress" operator="true" />
+    <order direction="descending">lastplayed</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/years/1930-1969.xsp b/extras/hub/tvshows/years/1930-1969.xsp
new file mode 100644
index 00000000..bb14f713
--- /dev/null
+++ b/extras/hub/tvshows/years/1930-1969.xsp
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>1930-1969</name>
+    <match>all</match>
+    <rule field="year" operator="lessthan">
+        <value>1970</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/years/1970-1979.xsp b/extras/hub/tvshows/years/1970-1979.xsp
new file mode 100644
index 00000000..b84a3228
--- /dev/null
+++ b/extras/hub/tvshows/years/1970-1979.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>1970-1979</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1969</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>1980</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/years/1980-1989.xsp b/extras/hub/tvshows/years/1980-1989.xsp
new file mode 100644
index 00000000..131004bf
--- /dev/null
+++ b/extras/hub/tvshows/years/1980-1989.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>1980-1989</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1979</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>1990</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/years/1990-1999.xsp b/extras/hub/tvshows/years/1990-1999.xsp
new file mode 100644
index 00000000..e2961ae8
--- /dev/null
+++ b/extras/hub/tvshows/years/1990-1999.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>1990-1999</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1989</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>2000</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/years/2000-2009.xsp b/extras/hub/tvshows/years/2000-2009.xsp
new file mode 100644
index 00000000..671f67ad
--- /dev/null
+++ b/extras/hub/tvshows/years/2000-2009.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>2000-2009</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>1999</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>2010</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/years/2010-2019.xsp b/extras/hub/tvshows/years/2010-2019.xsp
new file mode 100644
index 00000000..cbbd3f02
--- /dev/null
+++ b/extras/hub/tvshows/years/2010-2019.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>2010-2019</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>2009</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>2020</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/extras/hub/tvshows/years/2020-2029.xsp b/extras/hub/tvshows/years/2020-2029.xsp
new file mode 100644
index 00000000..abeeee90
--- /dev/null
+++ b/extras/hub/tvshows/years/2020-2029.xsp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="tvshows">
+    <name>2020-2029</name>
+    <match>all</match>
+    <rule field="year" operator="greaterthan">
+        <value>2019</value>
+    </rule>
+    <rule field="year" operator="lessthan">
+        <value>2030</value>
+    </rule>
+    <order direction="descending">year</order>
+</smartplaylist>
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index d4a13a4b..47f12106 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -1649,3 +1649,13 @@ msgstr ""
 msgctxt "#31327"
 msgid "Expanded"
 msgstr ""
+
+#: /shortcuts/overrides.xml
+msgctxt "#31328"
+msgid "Hub - Movies (Library)"
+msgstr ""
+
+#: /shortcuts/overrides.xml
+msgctxt "#31329"
+msgid "Hub - TV Shows (Library)"
+msgstr ""
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index b77503ad..bbe9c08e 100644
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -22,6 +22,8 @@
     <!-- Additional Common Shortcuts -->
     <shortcut label="$LOCALIZE[31314]" type="571" grouping="common" thumbnail="special://skin/extras/icons/film.png" icon="special://skin/extras/icons/film.png">ActivateWindow(1120)</shortcut>
     <shortcut label="$LOCALIZE[31315]" type="571" grouping="common" thumbnail="special://skin/extras/icons/tv.png" icon="special://skin/extras/icons/tv.png">ActivateWindow(1121)</shortcut>
+    <shortcut label="$LOCALIZE[31328]" type="571" grouping="common" thumbnail="special://skin/extras/icons/film.png" icon="special://skin/extras/icons/film.png">ActivateWindow(1130)</shortcut>
+    <shortcut label="$LOCALIZE[31329]" type="571" grouping="common" thumbnail="special://skin/extras/icons/tv.png" icon="special://skin/extras/icons/tv.png">ActivateWindow(1131)</shortcut>
     <shortcut label="$LOCALIZE[31178]" type="571" grouping="common" thumbnail="special://skin/extras/icons/sidemenu.png" icon="special://skin/extras/icons/sidemenu.png">SetFocus(302,0,absolute)</shortcut>
     <shortcut label="$LOCALIZE[31162]" type="571" grouping="common" thumbnail="special://skin/extras/icons/tvguide.png" icon="special://skin/extras/icons/tvguide.png">ActivateWindow(1116)</shortcut>
     <shortcut label="$LOCALIZE[31161]" type="571" grouping="common" thumbnail="special://skin/extras/icons/tvguide.png" icon="special://skin/extras/icons/tvguide.png">ActivateWindow(1117)</shortcut>