diff --git a/e107_handlers/library_manager.php b/e107_handlers/library_manager.php
index 3a7a076bd..bbc812bbd 100644
--- a/e107_handlers/library_manager.php
+++ b/e107_handlers/library_manager.php
@@ -1007,14 +1007,16 @@ class e_library_manager
 			$siteTheme = e107::getPref('sitetheme');
 			$adminTheme = e107::getPref('admintheme');
 
+
+
 			foreach(array($siteTheme, $adminTheme) as $theme)
 			{
 				if(is_readable(e_THEME . $theme . '/theme_library.php')) // we don't use e_XXXX for themes.
 				{
 					e107_require_once(e_THEME . $theme . '/theme_library.php');
 
-					$className = $theme . '_library';
-					if(class_exists($className))
+					$className =  'theme_library';
+					if(class_exists($className)) //@todo replace with e107::callMethod();
 					{
 						$addonClass = new $className();
 
diff --git a/e107_themes/bootstrap3/theme_library.php b/e107_themes/bootstrap3/theme_library.php
index 00e2031eb..8e2575f69 100644
--- a/e107_themes/bootstrap3/theme_library.php
+++ b/e107_themes/bootstrap3/theme_library.php
@@ -15,7 +15,7 @@
 /**
  * Class bootstrap3_library.
  */
-class bootstrap3_library
+class theme_library
 {
 
 	/**