diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 75927da2c..e02fc66ad 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -1619,7 +1619,7 @@ class e107
 			}
 			else
 			{
-				$themedir= self::getPref('sitetheme');
+				$themedir= deftrue('USERTHEME', self::getPref('sitetheme'));
 			}
 		}
 
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index 143e5c787..b92feeba7 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -89,7 +89,7 @@ class e_theme
 	{
 		if($theme === null)
 		{
-			$theme = e107::pref('core','sitetheme');
+			$theme = deftrue('USERTHEME', e107::pref('core','sitetheme'));
 		}
 
 		if(!is_readable(e_THEME.$theme."/layouts/".$key."_layout.html") || !is_readable(e_THEME.$theme."/theme.html"))
@@ -1125,7 +1125,6 @@ class e_theme
 			return;
 		}
 
-
 		// check for valid theme.
 		if (@fopen(e_THEME . $themeDir . '/theme.php', 'r'))
 		{
@@ -1160,12 +1159,14 @@ class e_theme
 		define('THEME', e_THEME . $e107tmp_theme . '/');
 		define('THEME_ABS', e_THEME_ABS . $e107tmp_theme . '/');
 		define('THEME_VERSION', 2.3);
+		define('THEME_LEGACY', false);
+		define('USERTHEME', 'bootstrap3');
+		define('BOOTSTRAP', 3);
+		define('FONTAWESOME', 4);
 
-		if (ADMIN && strpos(e_SELF, $ADMIN_DIRECTORY) === false)
+		if (ADMIN && (e_ADMIN_AREA !== true))
 		{
-			echo '<script>alert("' . $tp->toJS(CORE_LAN1) . '")</script>';
-			$tm = e107::getSingleton('themeHandler');
-			$tm->setTheme($e107tmp_theme);
+			echo "<div class='alert alert-danger'><b>".$themeDir."</b> ".str_replace('\n','<br />',CORE_LAN1)."</div>";
 		}
 
 		e107::getDebug()->logTime('Theme Check End');
diff --git a/e107_plugins/gallery/includes/gallery_load.php b/e107_plugins/gallery/includes/gallery_load.php
index 6278c5f6b..a483c66ad 100644
--- a/e107_plugins/gallery/includes/gallery_load.php
+++ b/e107_plugins/gallery/includes/gallery_load.php
@@ -66,7 +66,7 @@ function gallery_load_prettyphoto() // @lonalore FIXME Stop loading this on ever
 		if(vartrue($plugPref['downloadable'], false))
 		{
 			$settings['prettyphoto']['image_markup'] .= '<span class="download-btn">';
-			$settings['prettyphoto']['image_markup'] .= '<a class="btn btn-default btn-secondary btn-xs" href="{path}">' . LAN_DOWNLOAD . '</a>';
+			$settings['prettyphoto']['image_markup'] .= '<a class="btn btn-default btn-secondary btn-sm btn-xs" href="{path}">' . LAN_DOWNLOAD . '</a>';
 			$settings['prettyphoto']['image_markup'] .= '</span>';
 		}
 
diff --git a/e107_plugins/gallery/templates/gallery_template.php b/e107_plugins/gallery/templates/gallery_template.php
index 70965cb0a..e7805963c 100644
--- a/e107_plugins/gallery/templates/gallery_template.php
+++ b/e107_plugins/gallery/templates/gallery_template.php
@@ -66,10 +66,10 @@ $GALLERY_TEMPLATE['slideshow_wrapper'] = '
 </div>
 
 <div class="gallery-slideshow-controls">
-	<a href="#" class="gallery-control gal-next btn btn-xs btn-default btn-secondary pull-right float-right">
+	<a href="#" class="gallery-control gal-next btn btn-sm btn-xs btn-default btn-secondary pull-right float-right">
 		' . LAN_NEXT . ' {GLYPH=fa-chevron-right}
 	</a>
-	<a href="#" class="gallery-control gal-prev btn btn-xs btn-default btn-secondary">
+	<a href="#" class="gallery-control gal-prev btn btn-sm btn-xs btn-default btn-secondary">
 		{GLYPH=fa-chevron-left} ' . LAN_PREVIOUS . '
 	</a>
 	<span class="gallery-slide-jumper-container">
diff --git a/e107_plugins/news/other_news_menu.php b/e107_plugins/news/other_news_menu.php
index 6efca6f1d..7ebc85617 100644
--- a/e107_plugins/news/other_news_menu.php
+++ b/e107_plugins/news/other_news_menu.php
@@ -57,8 +57,8 @@ if(!$OTHERNEWS_STYLE)
 		}
 		$template = e107::getTemplate('news', 'news_menu', 'other', true, true);
 		
-		$item_selector = '<div class="btn-group pull-right float-right"><a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="prev" data-bs-slide="prev">‹</a>  
- 		<a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="next" data-bs-slide="next">›</a></div>';
+		$item_selector = '<div class="btn-group pull-right float-right"><a class="btn btn-mini btn-sm btn-xs btn-default btn-secondary" href="#otherNews" data-slide="prev" data-bs-slide="prev">‹</a>  
+ 		<a class="btn btn-sm btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="next" data-bs-slide="next">›</a></div>';
 
 		if(!empty($parms['caption']))
 		{
diff --git a/e107_plugins/pm/templates/pm_menu_template.php b/e107_plugins/pm/templates/pm_menu_template.php
index d63f39183..ef02d0c84 100644
--- a/e107_plugins/pm/templates/pm_menu_template.php
+++ b/e107_plugins/pm/templates/pm_menu_template.php
@@ -27,7 +27,7 @@ if (!defined('e107_INIT')) { exit; }
 
 if(deftrue('BOOTSTRAP') && deftrue('FONTAWESOME'))
 {
-	define('PM_INBOX_ICON', e107::getParser()->toGlyph('fa-inbox'));
+	define('PM_INBOX_ICON', e107::getParser()->toGlyph('fa-inbox').e107::getParser()->toGlyph('fa-arrow-down'));
 	// Icon candidate to stacked fontawesome icons...
 	define('PM_OUTBOX_ICON', e107::getParser()->toGlyph('fa-inbox').e107::getParser()->toGlyph('fa-arrow-up'));
 	// Icon candidate to animated fontawesome icons...