diff --git a/bootswatch/bootswatch.cfc b/bootswatch/Theme.cfc
similarity index 98%
rename from bootswatch/bootswatch.cfc
rename to bootswatch/Theme.cfc
index c4f706e..59684f1 100644
--- a/bootswatch/bootswatch.cfc
+++ b/bootswatch/Theme.cfc
@@ -28,6 +28,7 @@ A layout is composed of the following pieces
    + blog.cfm (Mandatory layout used for all blog views by convention)
    + pages.cfm (Mandatory layout used for all pages by convention)
    + maintenance.cfm (Optional used when in maintenance mode)
+   + search.cfm (Optional used when doing searches, else defaults to pages)
  / views (The folder that contains views for rendering)
    	+ archives.cfm (MANDATORY: The view used to render out blog archives.)
    	+ entry.cfm (MANDATORY: The view used to render out a single blog entry with comments, etc.)
@@ -79,7 +80,7 @@ component{
 	// Layout Variables
 	this.name 			= "Bootswatch";
 	this.description 	= "Bootswatch layout for ContentBox";
-	this.version		= "1.1";
+	this.version		= "1.2";
 	this.author 		= "Computer Know How";
 	this.authorURL		= "http://www.compknowhow.com";
 	// Screenshot URL, can be absolute or locally in your layout package.
@@ -114,5 +115,4 @@ component{
 	function onDelete(){
 
 	}
-
 }
\ No newline at end of file
diff --git a/bootswatch/layouts/blog.cfm b/bootswatch/layouts/blog.cfm
index bcce42a..1470aac 100644
--- a/bootswatch/layouts/blog.cfm
+++ b/bootswatch/layouts/blog.cfm
@@ -11,6 +11,7 @@
 		</title>
 		<meta name="generator" 	 content="ContentBox powered by ColdBox" />
 		<meta name="robots" 	 content="index,follow" />
+		<meta name="description" content="">
 		<meta name="author" content="">
 		<!--- Meta per page or index --->
 		<cfif cb.isEntryView() AND len(cb.getCurrentEntry().getHTMLDescription())>
@@ -40,10 +41,10 @@
 		<!--- Minify & Cache Our Assets --->
 		<cfif cb.layoutsetting('minifyCacheAssets',true)>
 			<!--- Use LESS --->
-			<cfif cb.layoutsetting('useLESS',true)>
+			<cfif 1 eq 0 and cb.layoutsetting('useLESS',true)>
 				#cb.minify(assets="#cb.layoutRoot()#/includes/css/less/blog.less,#cb.layoutRoot()#/includes/css/less/messagebox.less,#cb.layoutRoot()#/includes/css/less/paging.less,#cb.layoutRoot()#/includes/css/less/breadcrumbs.less", location="#cb.layoutRoot()#/includes/css")#
 			<cfelse>
-				#cb.minify(assets="#cb.layoutRoot()#/includes/css/main.css", location="#cb.layoutRoot()#/includes/css")#
+				#html.addAsset( "#cb.layoutRoot()#/includes/css/main.css" )#
 			</cfif>
 		<cfelse>
 			<!--- Include our unminified, unLESSified, non cached version of the stylesheet --->
diff --git a/bootswatch/layouts/pages.cfm b/bootswatch/layouts/pages.cfm
index d84b6fe..8dd9076 100644
--- a/bootswatch/layouts/pages.cfm
+++ b/bootswatch/layouts/pages.cfm
@@ -11,6 +11,7 @@
 		</title>
 		<meta name="generator" 	 content="ContentBox powered by ColdBox" />
 		<meta name="robots" 	 content="index,follow" />
+		<meta name="description" content="">
 		<meta name="author" content="">
 		<!--- Meta per page or index --->
 		<cfif cb.isEntryView() AND len(cb.getCurrentEntry().getHTMLDescription())>
@@ -40,10 +41,10 @@
 		<!--- Minify & Cache Our Assets --->
 		<cfif cb.layoutsetting('minifyCacheAssets',true)>
 			<!--- Use LESS --->
-			<cfif cb.layoutsetting('useLESS',true)>
+			<cfif 1 eq 0 and cb.layoutsetting('useLESS',true)>
 				#cb.minify(assets="#cb.layoutRoot()#/includes/css/less/blog.less,#cb.layoutRoot()#/includes/css/less/messagebox.less,#cb.layoutRoot()#/includes/css/less/paging.less,#cb.layoutRoot()#/includes/css/less/breadcrumbs.less", location="#cb.layoutRoot()#/includes/css")#
 			<cfelse>
-				#cb.minify(assets="#cb.layoutRoot()#/includes/css/main.css", location="#cb.layoutRoot()#/includes/css")#
+				#html.addAsset( "#cb.layoutRoot()#/includes/css/main.css" )#
 			</cfif>
 		<cfelse>
 			<!--- Include our unminified, unLESSified, non cached version of the stylesheet --->
diff --git a/bootswatch/views/_blogsidebar.cfm b/bootswatch/views/_blogsidebar.cfm
index e914e99..77fb080 100644
--- a/bootswatch/views/_blogsidebar.cfm
+++ b/bootswatch/views/_blogsidebar.cfm
@@ -30,7 +30,7 @@
 	#cb.widget("Archives")#
 
 	<li class="nav-header" style="padding-top:10px;">Entries Search</li>
-	#cb.widget("SearchForm")#
+	#cb.widget(name="SearchForm", args={ querycss="blogSideBarSearchField" } )#
 
 	<!---#cb.widget("Meta",{titleLevel="4"})#--->
 
@@ -38,4 +38,9 @@
 
 <!--- ContentBoxEvent --->
 #cb.event("cbui_afterSideBar")#
-</cfoutput>
\ No newline at end of file
+</cfoutput>
+<style>
+	.blogSideBarSearchField {
+		width:100%;
+	}
+</style>
\ No newline at end of file
diff --git a/bootswatch/views/_footer.cfm b/bootswatch/views/_footer.cfm
index 1fcd5e1..7e91d17 100644
--- a/bootswatch/views/_footer.cfm
+++ b/bootswatch/views/_footer.cfm
@@ -1,5 +1,7 @@
 <cfoutput>
 <footer id="footer">
 	<p>Copyright &copy; 2013 #cb.siteName()#.  All rights reserved.</p>
+	<!--- contentboxEvent --->
+	#cb.event("cbui_footer")#
 </footer>
 </cfoutput>
\ No newline at end of file