diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index ebe1aa319..646cc231c 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -1095,7 +1095,7 @@ class e_theme
 				$vars['library'][] = array(
 					'name'  => $val['@attributes']['name'],
 					'version' => varset($val['@attributes']['version']),
-					'scope' => varset($val['@attributes']['scope']),
+					'scope' => varset($val['@attributes']['scope'], 'front'),
 				);
 			}
 
diff --git a/e107_tests/tests/unit/e_themeTest.php b/e107_tests/tests/unit/e_themeTest.php
index d72b14b8f..b7528a9be 100644
--- a/e107_tests/tests/unit/e_themeTest.php
+++ b/e107_tests/tests/unit/e_themeTest.php
@@ -27,6 +27,7 @@
 			}
 
 			$this->tm->clearCache();
+			e107::getTheme()->clearCache();
 		}
 
 
@@ -203,6 +204,7 @@
 						  ),
 						),
 					),
+
 			);
 
 			foreach($tests as $index => $var)
@@ -216,6 +218,7 @@
 				$this->assertSame($var['expected'], $result, 'Test #'.$index.' failed.');
 			}
 
+
 		}
 
 
diff --git a/e107_themes/_blank/theme.xml b/e107_themes/_blank/theme.xml
index 47f6f5808..34bff1a90 100644
--- a/e107_themes/_blank/theme.xml
+++ b/e107_themes/_blank/theme.xml
@@ -6,8 +6,8 @@
 	<category>generic</category>
 	<compliance xhtml="1.1" css="2.1" />
 	<libraries>
-		<library name="bootstrap" version="3" scope="all"/>
-		<library name="fontawesome" version="4"  scope="all"/>
+		<library name="bootstrap" version="3" scope="front"/>
+		<library name="fontawesome" version="4"  scope="front"/>
 	</libraries>
     <plugins>
 		<plugin name='chatbox_menu' url='core' />