diff --git a/www/templates/charisma/scripts/sorttable.js b/www/templates/charisma/scripts/sorttable.js
index 94921045a..f58207e30 100644
--- a/www/templates/charisma/scripts/sorttable.js
+++ b/www/templates/charisma/scripts/sorttable.js
@@ -35,7 +35,7 @@ function ts_makeSortable(table) {
 		// adjust the first column so it displays as selected
 		if ( i==0 ) {
 			cell.className = "Selected";
-			str_HTML += ' sortdir="down"><img src="' + WWW_TOP + '/templates/nntmux/images/sorting/arrow_down.gif" alt="" />';
+			str_HTML += ' sortdir="down"><img src="' + WWW_TOP + '/templates/charisma/images/sorting/arrow_down.gif" alt="" />';
 		}
 		else str_HTML += '>';
 
@@ -105,14 +105,14 @@ function ts_resortTable(lnk,clid) {
     if (span.getAttribute("sortdir") == 'down')
     {
         // ARROW = '&nbsp;&nbsp;&uarr;';
-		ARROW = '<img src="' + WWW_TOP + '/templates/nntmux/images/sorting/arrow_up.gif" />';
+		ARROW = '<img src="' + WWW_TOP + '/templates/charisma/images/sorting/arrow_up.gif" />';
         newRows.reverse();
         span.setAttribute('sortdir','up');
     }
     else
     {
         //ARROW = '&nbsp;&nbsp;&darr;';
-		ARROW = '<img src="' + WWW_TOP + '/templates/nntmux/images/sorting/arrow_down.gif" alt="" />';
+		ARROW = '<img src="' + WWW_TOP + '/templates/charisma/images/sorting/arrow_down.gif" alt="" />';
         span.setAttribute('sortdir','down');
     }
 
diff --git a/www/templates/charisma/views/frontend/movies.tpl b/www/templates/charisma/views/frontend/movies.tpl
index 9b9b495da..f412e3722 100644
--- a/www/templates/charisma/views/frontend/movies.tpl
+++ b/www/templates/charisma/views/frontend/movies.tpl
@@ -91,7 +91,7 @@
 
 													<a href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}"><img
 																class="cover"
-																src="{if $result.cover == 1}{$serverroot}covers/movies/{$result.imdbid}-cover.jpg{else}{$serverroot}templates/omicron/images/nocover.png{/if}"
+																src="{if $result.cover == 1}{$serverroot}covers/movies/{$result.imdbid}-cover.jpg{else}{$serverroot}templates/charisma/images/nocover.png{/if}"
 																width="100" border="0"
 																alt="{$result.title|escape:"htmlall"}"/></a>
 													<a target="_blank"
@@ -193,7 +193,7 @@
 													{if $smarty.foreach.loop.first}
 													<a href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}"><img
 																class="cover"
-																src="{if $result.cover == 1}{$serverroot}covers/movies/{$result.imdbid}-cover.jpg{else}{$serverroot}templates/omicron/images/nocover.png{/if}"
+																src="{if $result.cover == 1}{$serverroot}covers/movies/{$result.imdbid}-cover.jpg{else}{$serverroot}templates/charisma/images/nocover.png{/if}"
 																width="100" border="0"
 																alt="{$result.title|escape:"htmlall"}"/></a>
 													<a target="_blank"
@@ -305,7 +305,7 @@
 												name="CP{$result.imdbid}"
 												title="Add to CouchPotato"
 												><img
-													src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/couch.png"></a>
+													src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/couch.png"></a>
 									{/if}
 									{if isset($isadmin)}
 										<input type="button"
diff --git a/www/templates/charisma/views/frontend/mymovielist.tpl b/www/templates/charisma/views/frontend/mymovielist.tpl
index 4c32dc414..f6c352c83 100644
--- a/www/templates/charisma/views/frontend/mymovielist.tpl
+++ b/www/templates/charisma/views/frontend/mymovielist.tpl
@@ -12,7 +12,7 @@
 
 						<div>
 							<img class="shadow"
-								 src="{if $result['cover'] ==""}{$serverroot}templates/omicron/images/nocover.png{else}{$result['cover']}{/if}"
+								 src="{if $result['cover'] ==""}{$serverroot}templates/charisma/images/nocover.png{else}{$result['cover']}{/if}"
 								 width="120" border="0" alt="{$result['title']|escape:"htmlall"}"/>
 
 							<div>
diff --git a/www/templates/charisma/views/frontend/prehash.tpl b/www/templates/charisma/views/frontend/prehash.tpl
index 859e020e5..dc1652e2b 100644
--- a/www/templates/charisma/views/frontend/prehash.tpl
+++ b/www/templates/charisma/views/frontend/prehash.tpl
@@ -314,7 +314,7 @@
 													href="{$site->dereferrer_link}http://nzbindex.com/search/?q={$result.title}"
 													target="_blank"
 													>
-												<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/nzbindex.png"/>
+												<img src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/nzbindex.png"/>
 												&nbsp;
 											</a>
 										</td>
@@ -325,7 +325,7 @@
 													href="{$site->dereferrer_link}http://binsearch.info/?q={$result.title}"
 													target="_blank"
 													>
-												<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/binsearch.png"/>
+												<img src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/binsearch.png"/>
 												&nbsp;
 											</a>
 										</td>
diff --git a/www/templates/charisma/views/frontend/search.tpl b/www/templates/charisma/views/frontend/search.tpl
index 241bf254b..0e3ea8c8d 100644
--- a/www/templates/charisma/views/frontend/search.tpl
+++ b/www/templates/charisma/views/frontend/search.tpl
@@ -201,15 +201,15 @@
 								{release_flag($result.searchname, browse)}
 								{if $result.passwordstatus == 1}
 									<img title="RAR/ZIP Possibly Passworded."
-										 src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/lock2.png"
+										 src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/lock2.png"
 										 alt="RAR/ZIP Possibly Passworded.">
 								{elseif $result.passwordstatus == 2}
 									<img title="RAR/ZIP Possibly Damaged."
-										 src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/broken.png"
+										 src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/broken.png"
 										 alt="RAR/ZIP Possibly Damaged.">
 								{elseif $result.passwordstatus == 10}
 									<img title="RAR/ZIP is Passworded."
-										 src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/lock.gif"
+										 src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/lock.gif"
 										 alt="RAR/ZIP is Passworded.">
 								{/if}
 								{if $result.videostatus > 0}
@@ -290,7 +290,7 @@
 						   href="{$smarty.const.WWW_TOP}/filelist/{$result.guid}">{$result.totalpart}</a>
 						{if $result.rarinnerfilecount > 0}
 							<div class="rarfilelist">
-								<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/magnifier.png"
+								<img src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/magnifier.png"
 									 alt="{$result.guid}">
 							</div>
 						{/if}
diff --git a/www/templates/charisma/views/frontend/viewanime.tpl b/www/templates/charisma/views/frontend/viewanime.tpl
index 5922a1e0b..cc5020c75 100644
--- a/www/templates/charisma/views/frontend/viewanime.tpl
+++ b/www/templates/charisma/views/frontend/viewanime.tpl
@@ -147,19 +147,19 @@
 										{if isset($sabintegrated)}
 											<a class="icon icon_sab" href="#" title="Send to Sab">
 												<img class="icon icon_sab" alt="Send to my Sabnzbd"
-													 src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/sabup.png">
+													 src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/sabup.png">
 											</a>
 										{/if}
 										{if $weHasVortex}
 											<a class="icon icon_nzbvortex" href="#" title="Send to NZBVortex">
 												<img class="icon icon_nzbvortex" alt="Send to my NZBVortex"
-													 src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/vortex/bigsmile.png">
+													 src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/vortex/bigsmile.png">
 											</a>
 										{/if}
 										{if isset($nzbgetintegrated)}<a class="icon icon_nzbget" title="Send to NZBGet"
 																		href="#"><img class="icon icon_nzbget"
 																					  alt="Send to NZBget"
-																					  src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/nzbgetup.png">
+																					  src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/nzbgetup.png">
 											</a>{/if}
 										{if isset($isadmin)}
 											<br/>
diff --git a/www/templates/charisma/views/frontend/viewfilelist.tpl b/www/templates/charisma/views/frontend/viewfilelist.tpl
index 3474af3c9..747a6307c 100644
--- a/www/templates/charisma/views/frontend/viewfilelist.tpl
+++ b/www/templates/charisma/views/frontend/viewfilelist.tpl
@@ -19,7 +19,7 @@
 			<td width="20">{$smarty.foreach.iteration.index+1}</td>
 			<td>{$file.title|escape:'htmlall'}</td>
 
-			{assign var="icon" value='templates/omicron/images/fileicons/'|cat:$file.ext|cat:".png"}
+			{assign var="icon" value='templates/charisma/images/fileicons/'|cat:$file.ext|cat:".png"}
 			{if $file.ext == "" || !is_file("$icon")}
 				{assign var="icon" value='file'}
 			{else}
@@ -33,7 +33,7 @@
 			{/if}
 
 			<td><img title=".{$file.ext}" alt="{$file.ext}"
-					 src="{$smarty.const.WWW_TOP}/templates/omicron/images/fileicons/{$icon}.png"/></td>
+					 src="{$smarty.const.WWW_TOP}/templates/charisma/images/fileicons/{$icon}.png"/></td>
 			<td class="less right">{if $completion < 100}<span class="warning">{$completion}
 					%</span>{else}{$completion}%{/if}</td>
 			<td class="less right">{if $file.size < 100000}{$file.size|fsize_format:"KB"}{else}{$file.size|fsize_format:"MB"}{/if}</td>
diff --git a/www/templates/charisma/views/frontend/viewmoviefull.tpl b/www/templates/charisma/views/frontend/viewmoviefull.tpl
index 35fd55d6d..982edaabe 100644
--- a/www/templates/charisma/views/frontend/viewmoviefull.tpl
+++ b/www/templates/charisma/views/frontend/viewmoviefull.tpl
@@ -21,7 +21,7 @@
 				{else}
 					<img class="pull-right" style="margin-right:50px; max-height:278px;"
 						 alt="{$result.title|escape:"htmlall"} Logo"
-						 src="{$serverroot}templates/omicron/images/nomoviecover.jpg"/>
+						 src="{$serverroot}templates/charisma/images/nomoviecover.jpg"/>
 				{/if}
 				<span class="h1" style="display:inline;">{$result.title|escape:"htmlall"} ({$result.year})</span><a
 						class="btn btn-transparent btn-primary" target="_blank"
diff --git a/www/templates/charisma/views/frontend/viewseries.tpl b/www/templates/charisma/views/frontend/viewseries.tpl
index 4953c1499..4b009d95f 100644
--- a/www/templates/charisma/views/frontend/viewseries.tpl
+++ b/www/templates/charisma/views/frontend/viewseries.tpl
@@ -218,7 +218,7 @@
 																			   title="Send to Sab">
 																				<img class="icon icon_sab"
 																					 alt="Send to my Sabnzbd"
-																					 src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/sabup.png">
+																					 src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/sabup.png">
 																			</a>
 																		{/if}
 																		{if $weHasVortex}
@@ -226,7 +226,7 @@
 																			   title="Send to NZBVortex">
 																				<img class="icon icon_nzbvortex"
 																					 alt="Send to my NZBVortex"
-																					 src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/vortex/bigsmile.png">
+																					 src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/vortex/bigsmile.png">
 																			</a>
 																		{/if}
 																		{if isset($nzbgetintegrated)}<a
@@ -235,7 +235,7 @@
 																				href="#"><img
 																					class="icon icon_nzbget"
 																					alt="Send to NZBget"
-																					src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/nzbgetup.png">
+																					src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/nzbgetup.png">
 																			</a>{/if}
 																		{if isset($isadmin)}
 																			<br/>
diff --git a/www/templates/charisma/views/frontend/xxx.tpl b/www/templates/charisma/views/frontend/xxx.tpl
index c753ab8b6..0ed9dad74 100644
--- a/www/templates/charisma/views/frontend/xxx.tpl
+++ b/www/templates/charisma/views/frontend/xxx.tpl
@@ -88,7 +88,7 @@
 
 													<a href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}"><img
 																class="cover"
-																src="{if $result.cover == 1}{$serverroot}covers/xxx/{$result.id}-cover.jpg{else}{$serverroot}templates/omicron/images/nocover.png{/if}"
+																src="{if $result.cover == 1}{$serverroot}covers/xxx/{$result.id}-cover.jpg{else}{$serverroot}templates/charisma/images/nocover.png{/if}"
 																width="100" border="0"
 																alt="{$result.title|escape:"htmlall"}"/></a>
 													{if $result.classused == "ade"}
@@ -98,7 +98,7 @@
 																name="viewade{$result.title}"
 																title="View AdultdvdEmpire page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/ade.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/ade.png"></a>
 													{else}
 														<a
 																target="_blank"
@@ -106,7 +106,7 @@
 																name="viewade{$result.title}"
 																title="Search AdultdvdEmpire page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/ade.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/ade.png"></a>
 													{/if}
 													{if $result.classused == "hm"}
 														<a
@@ -115,7 +115,7 @@
 																name="viewhm{$result.title}"
 																title="View Hot Movies page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/hotmovies.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/hotmovies.png"></a>
 													{else}
 														<a
 																target="_blank"
@@ -123,7 +123,7 @@
 																name="viewhm{$result.title}"
 																title="Search Hot Movies page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/hotmovies.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/hotmovies.png"></a>
 													{/if}
 													{if $result.classused == "pop"}
 														<a
@@ -132,7 +132,7 @@
 																name="viewpop{$result.id}"
 																title="View Popporn page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/popporn.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/popporn.png"></a>
 													{else}
 														<a
 																target="_blank"
@@ -140,7 +140,7 @@
 																name="viewpop{$result.id}"
 																title="Search Popporn page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/popporn.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/popporn.png"></a>
 													{/if}
 													<a
 															target="_blank"
@@ -148,7 +148,7 @@
 															name="viewiafd{$result.title}"
 															title="Search Internet Adult Film Database"
 															><img
-																src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/iafd.png"></a>
+																src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/iafd.png"></a>
 													{if $mnfo[$m@index] > 0}<a
 														href="{$smarty.const.WWW_TOP}/nfo/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}"
 														title="View NFO" class="label label-default"
@@ -227,7 +227,7 @@
 													{if $smarty.foreach.loop.first}
 													<a href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}"><img
 																class="cover"
-																src="{if $result.cover == 1}{$serverroot}covers/xxx/{$result.id}-cover.jpg{else}{$serverroot}templates/omicron/images/nocover.png{/if}"
+																src="{if $result.cover == 1}{$serverroot}covers/xxx/{$result.id}-cover.jpg{else}{$serverroot}templates/charisma/images/nocover.png{/if}"
 																width="100" border="0"
 																alt="{$result.title|escape:"htmlall"}"/></a>
 													{if $result.classused == "ade"}
@@ -237,7 +237,7 @@
 																name="viewade{$result.title}"
 																title="View AdultdvdEmpire page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/ade.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/ade.png"></a>
 													{else}
 														<a
 																target="_blank"
@@ -245,7 +245,7 @@
 																name="viewade{$result.title}"
 																title="Search AdultdvdEmpire page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/ade.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/ade.png"></a>
 													{/if}
 													{if $result.classused == "hm"}
 														<a
@@ -254,7 +254,7 @@
 																name="viewhm{$result.title}"
 																title="View Hot Movies page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/hotmovies.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/hotmovies.png"></a>
 													{else}
 														<a
 																target="_blank"
@@ -262,7 +262,7 @@
 																name="viewhm{$result.title}"
 																title="Search Hot Movies page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/hotmovies.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/hotmovies.png"></a>
 													{/if}
 													{if $result.classused == "pop"}
 														<a
@@ -271,7 +271,7 @@
 																name="viewpop{$result.id}"
 																title="View Popporn page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/popporn.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/popporn.png"></a>
 													{else}
 														<a
 																target="_blank"
@@ -279,7 +279,7 @@
 																name="viewpop{$result.id}"
 																title="Search Popporn page"
 																><img
-																	src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/popporn.png"></a>
+																	src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/popporn.png"></a>
 													{/if}
 													<a
 															target="_blank"
@@ -287,7 +287,7 @@
 															name="viewiafd{$result.title}"
 															title="Search Internet Adult Film Database"
 															><img
-																src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/iafd.png"></a>
+																src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/iafd.png"></a>
 													{if $mnfo[$m@index] > 0}<a
 														href="{$smarty.const.WWW_TOP}/nfo/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}"
 														title="View NFO" class="label label-default"
diff --git a/www/templates/omicron/scripts/sorttable.js b/www/templates/omicron/scripts/sorttable.js
index 94921045a..e16fc4ff4 100644
--- a/www/templates/omicron/scripts/sorttable.js
+++ b/www/templates/omicron/scripts/sorttable.js
@@ -35,7 +35,7 @@ function ts_makeSortable(table) {
 		// adjust the first column so it displays as selected
 		if ( i==0 ) {
 			cell.className = "Selected";
-			str_HTML += ' sortdir="down"><img src="' + WWW_TOP + '/templates/nntmux/images/sorting/arrow_down.gif" alt="" />';
+			str_HTML += ' sortdir="down"><img src="' + WWW_TOP + '/templates/omicron/images/sorting/arrow_down.gif" alt="" />';
 		}
 		else str_HTML += '>';
 
@@ -105,14 +105,14 @@ function ts_resortTable(lnk,clid) {
     if (span.getAttribute("sortdir") == 'down')
     {
         // ARROW = '&nbsp;&nbsp;&uarr;';
-		ARROW = '<img src="' + WWW_TOP + '/templates/nntmux/images/sorting/arrow_up.gif" />';
+		ARROW = '<img src="' + WWW_TOP + '/templates/omicron/images/sorting/arrow_up.gif" />';
         newRows.reverse();
         span.setAttribute('sortdir','up');
     }
     else
     {
         //ARROW = '&nbsp;&nbsp;&darr;';
-		ARROW = '<img src="' + WWW_TOP + '/templates/nntmux/images/sorting/arrow_down.gif" alt="" />';
+		ARROW = '<img src="' + WWW_TOP + '/templates/omicron/images/sorting/arrow_down.gif" alt="" />';
         span.setAttribute('sortdir','down');
     }