diff --git a/www/themes/charisma/templates/frontend/viewseries.tpl b/www/themes/charisma/templates/frontend/viewseries.tpl
index efef2bdbc..0def8ad83 100644
--- a/www/themes/charisma/templates/frontend/viewseries.tpl
+++ b/www/themes/charisma/templates/frontend/viewseries.tpl
@@ -38,7 +38,7 @@
 		{if $show.image != 0}
 			<center>
 				<img class="shadow img img-polaroid" style="max-height:300px;" alt="{$show.title} Logo"
-					 src="{$smarty.const.WWW_TOP}/covers/tvshows/{$show.videos_id}.jpg"/>
+					 src="{$smarty.const.WWW_TOP}/covers/tvshows/{$show.id}.jpg"/>
 			</center>
 			<br/>
 		{/if}
@@ -48,16 +48,8 @@
 		</p>
 	</div>
 	<div class="btn-group">
-		{if $show|@count == 1 && $isadmin}
-			<a class="btn btn-sm btn-default"
-			   href="{$smarty.const.WWW_TOP}/admin/rage-edit.php?id={$r.id}&amp;action=update&amp;from={$smarty.server.REQUEST_URI|escape:"url"}">Update
-				From Tv Rage</a>
-		{/if}
-		<a class="btn btn-sm btn-default" target="_blank"
-		   href="{$site->dereferrer_link}http://www.tvrage.com/shows/id-{$show.videos_id}" title="View in TvRage">View
-			in Tv Rage</a>
 		<a class="btn btn-sm btn-default"
-		   href="{$smarty.const.WWW_TOP}/rss?show={$show.videos_id}{if $category != ''}&amp;t={$category}{/if}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">RSS
+		   href="{$smarty.const.WWW_TOP}/rss?show={$show.id}{if $category != ''}&amp;t={$category}{/if}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">RSS
 			for TV Show <i class="fa fa-rss"></i></a>
 	</div>
 	<br/>
@@ -93,17 +85,17 @@
 				<div class="btn-group">
 					{if $myshows.id != ''}
 						<a class="btn btn-sm btn-warning"
-						   href="{$smarty.const.WWW_TOP}/myshows/edit/{$show.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
-						   class="myshows" rel="edit" name="series{$show.videos_id}"
+						   href="{$smarty.const.WWW_TOP}/myshows/edit/{$show.id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
+						   class="myshows" rel="edit" name="series{$show.id}"
 						   title="Edit Categories for this show">Edit</a>
 						<a class="btn btn-sm btn-danger"
-						   href="{$smarty.const.WWW_TOP}/myshows/delete/{$show.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
-						   class="myshows" rel="remove" name="series{$show.videos_id}"
+						   href="{$smarty.const.WWW_TOP}/myshows/delete/{$show.id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
+						   class="myshows" rel="remove" name="series{$show.id}"
 						   title="Remove from My Shows">Remove</a>
 					{else}
 						<a class="btn btn-sm btn-success"
-						   href="{$smarty.const.WWW_TOP}/myshows/add/{$show.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
-						   class="myshows" rel="add" name="series{$show.videos_id}" title="Add to My Shows">Add</a>
+						   href="{$smarty.const.WWW_TOP}/myshows/add/{$show.id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
+						   class="myshows" rel="add" name="series{$show.id}" title="Add to My Shows">Add</a>
 					{/if}
 				</div>
 			</div>
diff --git a/www/themes/charisma/templates/frontend/viewserieslist.tpl b/www/themes/charisma/templates/frontend/viewserieslist.tpl
index ba9eee82e..7e8f02f05 100644
--- a/www/themes/charisma/templates/frontend/viewserieslist.tpl
+++ b/www/themes/charisma/templates/frontend/viewserieslist.tpl
@@ -44,23 +44,23 @@
 			</tr>
 			{foreach $series as $s}
 				<tr>
-					<td><a class="title" title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.videos_id}">{$s.releasetitle|escape:"htmlall"}</a>{if $s.prevdate != ''}<br /><span class="label label-info">Last: {$s.previnfo|escape:"htmlall"} aired {$s.prevdate|date_format}</span>{/if}</td>
+					<td><a class="title" title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.id}">{$s.releasetitle|escape:"htmlall"}</a>{if $s.prevdate != ''}<br /><span class="label label-info">Last: {$s.previnfo|escape:"htmlall"} aired {$s.prevdate|date_format}</span>{/if}</td>
 					<td>{$s.country|escape:"htmlall"}</td>
 					<td>{$s.genre|escape:"htmlall"|replace:'|':', '}</td>
 					<td class="mid">
 						{if $s.userseriesid != ''}
-							<a href="{$smarty.const.WWW_TOP}/myshows/edit/{$s.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-warning" rel="edit" name="series{$s.videos_id}" title="Edit">Edit</a>
+							<a href="{$smarty.const.WWW_TOP}/myshows/edit/{$s.id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-warning" rel="edit" name="series{$s.id}" title="Edit">Edit</a>
 							<br />
-							<a href="{$smarty.const.WWW_TOP}/myshows/delete/{$s.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-danger" rel="remove" name="series{$s.videos_id}" title="Remove from My Shows">Remove</a>
+							<a href="{$smarty.const.WWW_TOP}/myshows/delete/{$s.id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-danger" rel="remove" name="series{$s.id}" title="Remove from My Shows">Remove</a>
 						{else}
-							<a href="{$smarty.const.WWW_TOP}/myshows/add/{$s.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-primary" rel="add" name="series{$s.videos_id}" title="Add to My Shows">Add</a>
+							<a href="{$smarty.const.WWW_TOP}/myshows/add/{$s.id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-primary" rel="add" name="series{$s.id}" title="Add to My Shows">Add</a>
 						{/if}
 					</td>
 					<td class="mid">
-						<a title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.videos_id}">Series</a><br />
-						{if $s.videos_id > 0}
-							<a title="View at TVRage" target="_blank" href="{$site->dereferrer_link}http://www.tvrage.com/shows/id-{$s.videos_id}">TVRage</a>&nbsp;&nbsp;
-							<a title="RSS Feed for {$s.title|escape:"htmlall"}" href="{$smarty.const.WWW_TOP}/rss?show={$s.videos_id}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}"><i class="fa fa-rss"></i></a>
+						<a title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.id}">Series</a><br />
+						{if $s.id > 0}
+							<a title="View at TVRage" target="_blank" href="{$site->dereferrer_link}http://www.tvrage.com/shows/id-{$s.id}">TVRage</a>&nbsp;&nbsp;
+							<a title="RSS Feed for {$s.title|escape:"htmlall"}" href="{$smarty.const.WWW_TOP}/rss?show={$s.id}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}"><i class="fa fa-rss"></i></a>
 						{/if}
 					</td>
 				</tr>
diff --git a/www/themes/omicron/templates/frontend/viewseries.tpl b/www/themes/omicron/templates/frontend/viewseries.tpl
index efef2bdbc..38555e390 100644
--- a/www/themes/omicron/templates/frontend/viewseries.tpl
+++ b/www/themes/omicron/templates/frontend/viewseries.tpl
@@ -29,16 +29,16 @@
 		{foreach $show as $r}
 			{$r.title}
 			{if !$r@last} / {/if}
-		{/foreach}{if isset($isadmin)}<a class="btn btn-xs btn-warning" title="Edit TV Rage Data"
-										 href="{$smarty.const.WWW_TOP}/admin/rage-edit.php?id={$r.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}">
-				Edit</a>{/if}
+		{/foreach}
+		{if isset($isadmin)}<a class="btn btn-xs btn-warning" title="Edit TV Rage Data"
+										 href="{$smarty.const.WWW_TOP}/admin/rage-edit.php?id={$r.id}&amp;from={$smarty.serve.REQUEST_URI|escape:"url"}"> Edit</a>{/if}
 	</h1>
 	{if $catname != ''}<span class="text-info h5">Current category shown: {$catname|escape:"htmlall"}</span>{/if}
 	<div class="tvseriesheading">
 		{if $show.image != 0}
 			<center>
 				<img class="shadow img img-polaroid" style="max-height:300px;" alt="{$show.title} Logo"
-					 src="{$smarty.const.WWW_TOP}/covers/tvshows/{$show.videos_id}.jpg"/>
+					 src="{$smarty.const.WWW_TOP}/covers/tvshows/{$show.id}.jpg"/>
 			</center>
 			<br/>
 		{/if}
@@ -48,16 +48,8 @@
 		</p>
 	</div>
 	<div class="btn-group">
-		{if $show|@count == 1 && $isadmin}
-			<a class="btn btn-sm btn-default"
-			   href="{$smarty.const.WWW_TOP}/admin/rage-edit.php?id={$r.id}&amp;action=update&amp;from={$smarty.server.REQUEST_URI|escape:"url"}">Update
-				From Tv Rage</a>
-		{/if}
-		<a class="btn btn-sm btn-default" target="_blank"
-		   href="{$site->dereferrer_link}http://www.tvrage.com/shows/id-{$show.videos_id}" title="View in TvRage">View
-			in Tv Rage</a>
 		<a class="btn btn-sm btn-default"
-		   href="{$smarty.const.WWW_TOP}/rss?show={$show.videos_id}{if $category != ''}&amp;t={$category}{/if}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">RSS
+		   href="{$smarty.const.WWW_TOP}/rss?show={$show.id}{if $category != ''}&amp;t={$category}{/if}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">RSS
 			for TV Show <i class="fa fa-rss"></i></a>
 	</div>
 	<br/>
@@ -93,17 +85,17 @@
 				<div class="btn-group">
 					{if $myshows.id != ''}
 						<a class="btn btn-sm btn-warning"
-						   href="{$smarty.const.WWW_TOP}/myshows/edit/{$show.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
-						   class="myshows" rel="edit" name="series{$show.videos_id}"
+						   href="{$smarty.const.WWW_TOP}/myshows/edit/{$show.id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
+						   class="myshows" rel="edit" name="series{$show.id}"
 						   title="Edit Categories for this show">Edit</a>
 						<a class="btn btn-sm btn-danger"
-						   href="{$smarty.const.WWW_TOP}/myshows/delete/{$show.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
-						   class="myshows" rel="remove" name="series{$show.videos_id}"
+						   href="{$smarty.const.WWW_TOP}/myshows/delete/{$show.id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
+						   class="myshows" rel="remove" name="series{$show.id}"
 						   title="Remove from My Shows">Remove</a>
 					{else}
 						<a class="btn btn-sm btn-success"
-						   href="{$smarty.const.WWW_TOP}/myshows/add/{$show.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
-						   class="myshows" rel="add" name="series{$show.videos_id}" title="Add to My Shows">Add</a>
+						   href="{$smarty.const.WWW_TOP}/myshows/add/{$show.id}?from={$smarty.server.REQUEST_URI|escape:"url"}"
+						   class="myshows" rel="add" name="series{$show.id}" title="Add to My Shows">Add</a>
 					{/if}
 				</div>
 			</div>
diff --git a/www/themes/omicron/templates/frontend/viewserieslist.tpl b/www/themes/omicron/templates/frontend/viewserieslist.tpl
index ba9eee82e..7e8f02f05 100644
--- a/www/themes/omicron/templates/frontend/viewserieslist.tpl
+++ b/www/themes/omicron/templates/frontend/viewserieslist.tpl
@@ -44,23 +44,23 @@
 			</tr>
 			{foreach $series as $s}
 				<tr>
-					<td><a class="title" title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.videos_id}">{$s.releasetitle|escape:"htmlall"}</a>{if $s.prevdate != ''}<br /><span class="label label-info">Last: {$s.previnfo|escape:"htmlall"} aired {$s.prevdate|date_format}</span>{/if}</td>
+					<td><a class="title" title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.id}">{$s.releasetitle|escape:"htmlall"}</a>{if $s.prevdate != ''}<br /><span class="label label-info">Last: {$s.previnfo|escape:"htmlall"} aired {$s.prevdate|date_format}</span>{/if}</td>
 					<td>{$s.country|escape:"htmlall"}</td>
 					<td>{$s.genre|escape:"htmlall"|replace:'|':', '}</td>
 					<td class="mid">
 						{if $s.userseriesid != ''}
-							<a href="{$smarty.const.WWW_TOP}/myshows/edit/{$s.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-warning" rel="edit" name="series{$s.videos_id}" title="Edit">Edit</a>
+							<a href="{$smarty.const.WWW_TOP}/myshows/edit/{$s.id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-warning" rel="edit" name="series{$s.id}" title="Edit">Edit</a>
 							<br />
-							<a href="{$smarty.const.WWW_TOP}/myshows/delete/{$s.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-danger" rel="remove" name="series{$s.videos_id}" title="Remove from My Shows">Remove</a>
+							<a href="{$smarty.const.WWW_TOP}/myshows/delete/{$s.id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-danger" rel="remove" name="series{$s.id}" title="Remove from My Shows">Remove</a>
 						{else}
-							<a href="{$smarty.const.WWW_TOP}/myshows/add/{$s.videos_id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-primary" rel="add" name="series{$s.videos_id}" title="Add to My Shows">Add</a>
+							<a href="{$smarty.const.WWW_TOP}/myshows/add/{$s.id}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows btn btn-sm btn-primary" rel="add" name="series{$s.id}" title="Add to My Shows">Add</a>
 						{/if}
 					</td>
 					<td class="mid">
-						<a title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.videos_id}">Series</a><br />
-						{if $s.videos_id > 0}
-							<a title="View at TVRage" target="_blank" href="{$site->dereferrer_link}http://www.tvrage.com/shows/id-{$s.videos_id}">TVRage</a>&nbsp;&nbsp;
-							<a title="RSS Feed for {$s.title|escape:"htmlall"}" href="{$smarty.const.WWW_TOP}/rss?show={$s.videos_id}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}"><i class="fa fa-rss"></i></a>
+						<a title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.id}">Series</a><br />
+						{if $s.id > 0}
+							<a title="View at TVRage" target="_blank" href="{$site->dereferrer_link}http://www.tvrage.com/shows/id-{$s.id}">TVRage</a>&nbsp;&nbsp;
+							<a title="RSS Feed for {$s.title|escape:"htmlall"}" href="{$smarty.const.WWW_TOP}/rss?show={$s.id}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}"><i class="fa fa-rss"></i></a>
 						{/if}
 					</td>
 				</tr>