diff --git a/Blacklight/http/Capabilities.php b/Blacklight/http/Capabilities.php
index 6c5b82b60..e44f78b44 100755
--- a/Blacklight/http/Capabilities.php
+++ b/Blacklight/http/Capabilities.php
@@ -140,7 +140,7 @@ abstract class Capabilities
                 'email'      => Settings::settingValue('site.main.email'),
                 'meta'       => Settings::settingValue('site.main.metakeywords'),
                 'url'        => $serverroot,
-                'image'      => $serverroot.'themes/shared/images/tmux_logo.png',
+                'image'      => $serverroot.'assets/images/tmux_logo.png',
             ],
             'limits' => [
                 'max'     => 100,
diff --git a/Blacklight/http/XML_Response.php b/Blacklight/http/XML_Response.php
index 2d1f0cf5e..aba5893ac 100755
--- a/Blacklight/http/XML_Response.php
+++ b/Blacklight/http/XML_Response.php
@@ -333,7 +333,7 @@ class XML_Response
     protected function includeImage(): void
     {
         $this->xml->startElement('image');
-        $this->xml->writeAttribute('url', $this->server['server']['url'].'themes/shared/images/logo.png');
+        $this->xml->writeAttribute('url', $this->server['server']['url'].'assets/images/logo.png');
         $this->xml->writeAttribute('title', $this->server['server']['title']);
         $this->xml->writeAttribute('link', $this->server['server']['url']);
         $this->xml->writeAttribute(
diff --git a/Blacklight/utility/SmartyUtils.php b/Blacklight/utility/SmartyUtils.php
index 6ad8f0991..a203524d3 100755
--- a/Blacklight/utility/SmartyUtils.php
+++ b/Blacklight/utility/SmartyUtils.php
@@ -155,13 +155,13 @@ function release_flag($text, $page)
     }
 
     if ($code !== '' && $page === 'browse') {
-        $www = WWW_THEMES;
+        $www = WWW_TOP;
         if (! in_array(substr($www, -1), ['\\', '/'], false)) {
             $www .= DS;
         }
 
         return
-            '<img title="'.$language.'" alt="'.$language.'" src="'.$www.'shared/images/flags/'.$code.'.png"/>';
+            '<img title="'.$language.'" alt="'.$language.'" src="'.$www.'assets/images/flags/'.$code.'.png"/>';
     }
 
     if ($page === 'search') {
diff --git a/Changelog b/Changelog
index 7c8ca6e6b..c49954a4f 100755
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+2018-03-08 DariusIII
+	* Fix: Fix displaying of flag images
 2018-03-07 DariusIII
 	* Chg: Update laravel/framework to version 5.6.9 and laravel/tinker to version 1.0.4
 	* Chg: Update example .env file
diff --git a/config/themes.php b/config/themes.php
index f50d489f5..fe7d8dc36 100644
--- a/config/themes.php
+++ b/config/themes.php
@@ -11,7 +11,7 @@ return [
     |--------------------------------------------------------------------------
     */
 
-    'themes_path' => 'public/themes', // eg: base_path('resources/themes')
+    'themes_path' => 'resources/views/themes', // eg: base_path('resources/themes')
 
 	/*
 	|--------------------------------------------------------------------------
@@ -60,28 +60,28 @@ return [
 	'themes' => [
 	    'Charisma' => [
 	        'extends' => null,
-            'views-path' => 'Charisma',
-            'asset-path' => 'public/themes/shared/assets',
+            'views-path' => 'resources/views/themes/Charisma',
+            'asset-path' => 'public/assets/Charisma',
         ],
         'Gamma' => [
             'extends' => null,
-            'views-path' => 'Gamma',
-            'asset-path' => 'public/themes/shared/assets',
+            'views-path' => 'resources/views/themes/Gamma',
+            'asset-path' => 'public/assets/Gamma',
         ],
         'Gentele' => [
             'extends' => null,
-            'views-path' => 'Gentele',
-            'asset-path' => 'public/themes/shared/assets',
+            'views-path' => 'resources/views/themes/Gentele',
+            'asset-path' => 'public/assets',
         ],
         'Omicron' => [
             'extends' => null,
-            'views-path' => 'Omicron',
-            'asset-path' => 'public/themes/shared/assets',
+            'views-path' => 'resources/views/themes/Omicron',
+            'asset-path' => 'public/assets/Omicron',
         ],
         'admin' => [
             'extends' => null,
-            'views-path' => 'admin',
-            'asset-path' => 'public/themes/shared/assets',
+            'views-path' => 'resources/views/themes/admin',
+            'asset-path' => 'public/assets',
         ],
 
                 // Add your themes here. These settings will override theme.json settings defined for each theme
diff --git a/public/assets/Gamma/styles/bootstrap.slate.min.css b/public/assets/Gamma/styles/bootstrap.slate.min.css
index a9bde3c90..9a621dcaf 100755
--- a/public/assets/Gamma/styles/bootstrap.slate.min.css
+++ b/public/assets/Gamma/styles/bootstrap.slate.min.css
@@ -2284,7 +2284,7 @@ table th[class*="span"],
   *margin-right: .3em;
   line-height: 14px;
   vertical-align: text-top;
-  background-image: url("../../themes/shared/images/glyphicons-halflings.png");
+  background-image: url("../../assets/images/glyphicons-halflings.png");
   background-position: 14px 14px;
   background-repeat: no-repeat;
 }
diff --git a/public/assets/Gamma/styles/style.ie.css b/public/assets/Gamma/styles/style.ie.css
index cd0145962..fea929a8a 100755
--- a/public/assets/Gamma/styles/style.ie.css
+++ b/public/assets/Gamma/styles/style.ie.css
@@ -75,7 +75,7 @@ input.btn, a.btn, button.btn {height:auto;width:auto}
 .input-prepend input {margin-top:1px}
 
 /* Icons */
-.icon-sprite {background-image:url("../../themes/shared/images/glyphicons-halflings.png");background-repeat:no-repeat;display:inline-block;height:14px;line-height:14px;vertical-align:text-top;width:14px;padding-left:3px}
+.icon-sprite {background-image:url("../../images/glyphicons-halflings.png");background-repeat:no-repeat;display:inline-block;height:14px;line-height:14px;vertical-align:text-top;width:14px;padding-left:3px}
 
 /* Navbar */
 .dropdown .caret {font-size:1px;height:2px;background:none;background-color:#292929;color:#292929}
diff --git a/public/pages/ajax_rarfilelist.php b/public/pages/ajax_rarfilelist.php
index 2ea22902a..09c428739 100644
--- a/public/pages/ajax_rarfilelist.php
+++ b/public/pages/ajax_rarfilelist.php
@@ -18,7 +18,7 @@ if (count($files) === 0) {
 } else {
     echo "<ul>\n";
     foreach ($files as $f) {
-        echo '<li>'.htmlentities($f['name'], ENT_QUOTES).'&nbsp;'.($f['passworded'] === 1 ? '<img width="12" src="'.WWW_TOP.'/themes/shared/images/icons/lock.gif" />' : '')."</li>\n";
+        echo '<li>'.htmlentities($f['name'], ENT_QUOTES).'&nbsp;'.($f['passworded'] === 1 ? '<img width="12" src="'.WWW_TOP.'/assets/images/icons/lock.gif" />' : '')."</li>\n";
     }
     echo '</ul>';
 }
diff --git a/resources/views/themes/Charisma/viewfilelist.tpl b/resources/views/themes/Charisma/viewfilelist.tpl
index 899422291..2e8b66628 100755
--- a/resources/views/themes/Charisma/viewfilelist.tpl
+++ b/resources/views/themes/Charisma/viewfilelist.tpl
@@ -14,7 +14,7 @@
 		<tr class="{cycle values=",alt"}">
 			<td width="20">{$smarty.foreach.iteration.index+1}</td>
 			<td>{$file.title|escape:'htmlall'}</td>
-			{assign var="icon" value='themes/shared/images/fileicons/'|cat:$file.ext|cat:".png"}
+			{assign var="icon" value='assets/images/fileicons/'|cat:$file.ext|cat:".png"}
 			{if $file.ext == "" || !is_file("$icon")}
 				{assign var="icon" value='file'}
 			{else}
diff --git a/resources/views/themes/Gamma/viewfilelist.tpl b/resources/views/themes/Gamma/viewfilelist.tpl
index b9fa07fb0..e608f4a1c 100755
--- a/resources/views/themes/Gamma/viewfilelist.tpl
+++ b/resources/views/themes/Gamma/viewfilelist.tpl
@@ -18,7 +18,7 @@
 		<td width="30">{$smarty.foreach.iteration.index+1}</td>
 		<td>{$file.title|escape:'htmlall'}</td>
 
-		{assign var="icon" value='themes/shared/images/fileicons/'|cat:$file.ext|cat:".png"}
+		{assign var="icon" value='assets/images/fileicons/'|cat:$file.ext|cat:".png"}
 		{if $file.ext == "" || !is_file("$icon")}
 			{assign var="icon" value='file'}
 		{else}
diff --git a/resources/views/themes/Gentele/viewfilelist.tpl b/resources/views/themes/Gentele/viewfilelist.tpl
index 8c64b4565..9edb65d2e 100755
--- a/resources/views/themes/Gentele/viewfilelist.tpl
+++ b/resources/views/themes/Gentele/viewfilelist.tpl
@@ -15,7 +15,7 @@
 			<tr class="{cycle values=",alt"}">
 				<td width="20">{$smarty.foreach.iteration.index+1}</td>
 				<td>{$file.title|escape:'htmlall'}</td>
-				{assign var="icon" value='themes/shared/images/fileicons/'|cat:$file.ext|cat:".png"}
+				{assign var="icon" value='assets/images/fileicons/'|cat:$file.ext|cat:".png"}
 				{if $file.ext == "" || !is_file("$icon")}
 					{assign var="icon" value='file'}
 				{else}
diff --git a/resources/views/themes/Omicron/viewfilelist.tpl b/resources/views/themes/Omicron/viewfilelist.tpl
index dae65bf9c..15863cf57 100755
--- a/resources/views/themes/Omicron/viewfilelist.tpl
+++ b/resources/views/themes/Omicron/viewfilelist.tpl
@@ -14,7 +14,7 @@
 		<tr class="{cycle values=",alt"}">
 			<td width="20">{$smarty.foreach.iteration.index+1}</td>
 			<td>{$file.title|escape:'htmlall'}</td>
-			{assign var="icon" value='themes/shared/images/fileicons/'|cat:$file.ext|cat:".png"}
+			{assign var="icon" value='assets/images/fileicons/'|cat:$file.ext|cat:".png"}
 			{if $file.ext == "" || !is_file("$icon")}
 				{assign var="icon" value='file'}
 			{else}
diff --git a/resources/views/themes/shared/apicomments.tpl b/resources/views/themes/shared/apicomments.tpl
index 10a7382c3..208f0ed5c 100755
--- a/resources/views/themes/shared/apicomments.tpl
+++ b/resources/views/themes/shared/apicomments.tpl
@@ -10,7 +10,7 @@
 		<webMaster>{$site->email} ({$site->title|escape})</webMaster>
 		<category>{$site->meta_keywords}</category>
 		<image>
-			<url>{$serverroot}themes/shared/images/logo.png</url>
+			<url>{$serverroot}assets/images/logo.png</url>
 			<title>{$site->title|escape}</title>
 			<link>{$serverroot}</link>
 			<description>Visit {$site->title|escape} - {$site->strapline|escape}</description>
diff --git a/resources/views/themes/shared/apinfo.tpl b/resources/views/themes/shared/apinfo.tpl
index aadccfb77..52a019d65 100755
--- a/resources/views/themes/shared/apinfo.tpl
+++ b/resources/views/themes/shared/apinfo.tpl
@@ -10,7 +10,7 @@
 		<webMaster>{$site->email} ({$site->title|escape})</webMaster>
 		<category>{$site->meta_keywords}</category>
 		<image>
-			<url>{$serverroot}themes/shared/images/logo.png</url>
+			<url>{$serverroot}assets/images/logo.png</url>
 			<title>{$site->title|escape}</title>
 			<link>{$serverroot}</link>
 			<description>Visit {$site->title|escape} - {$site->strapline|escape}</description>