diff --git a/application.cfc b/application.cfc
index 83ac884..cd0b930 100644
--- a/application.cfc
+++ b/application.cfc
@@ -2,13 +2,14 @@
 
 
 component extends="framework.one" accessors="true"	{
-	
 
-this.name="bs-4-cf-349";
+
+this.name="bs-4-cf-355";
 this.applicationManagement = true;
 this.sessionManagement = true;
 
 
+
 variables.framework	=	{
 	home	= "docs.home",		// For PlumaCMS, change this to wiki.home or main.home aka login OR wiki.home
 	baseURL = 'useCGIScriptName',
@@ -31,7 +32,6 @@ variables.framework.routes	= [
 	{ "wiki/:id"			= "wiki/home/slug/:id"	},
 	
 	// documentation
-	{ "_bootstrap"			= "302:/main/home"		},
 	{ "common"			= "docs/common"		},
 	{ "theme"				= "theme/home"			},
 	{ "bootswatch/:id"		= "bootswatch/home/bootswatch/:id"	}
@@ -72,7 +72,7 @@ fileclose(objAppFile);
 	application.objFormUtilities	= new framework.formUtilities();
 	application.GSConfig		= new model.services.settings().getWebsite();
 
-	invoke("views._bootstrap.bootstrap", "setupApplication");
+	invoke("vendor.tags.bootstrap.bootstrap", "setupApplication");
 	} // end setupApplication
 	
 	
@@ -87,7 +87,7 @@ function setupSession()	{
 
 function setupRequest()	{
 	
-	invoke("views._bootstrap.bootstrap", "setupRequest");
+	invoke("vendor.tags.bootstrap.bootstrap", "setupRequest");
 	} // end setupRequest
 
 	
diff --git a/layouts/default.cfm b/layouts/default.cfm
index 0c3c7cb..8e24757 100644
--- a/layouts/default.cfm
+++ b/layouts/default.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../views/_bootstrap">
+<cfimport prefix="b" taglib="../vendor/tags/bootstrap">
 
 
 
@@ -24,7 +24,7 @@
 		<link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha/css/bootstrap.min.css" rel="stylesheet">
 	</cfcase>
 	<cfdefaultcase>
-		<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.6/<cfoutput>#lcase(session.bootswatch)#</cfoutput>/bootstrap.min.css" rel="stylesheet">
+		<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/<cfoutput>#lcase(session.bootswatch)#</cfoutput>/bootstrap.min.css" rel="stylesheet">
 	</cfdefaultcase>	
 </cfswitch>
 
diff --git a/layouts/docs.cfm b/layouts/docs.cfm
index 2009b32..366bd90 100644
--- a/layouts/docs.cfm
+++ b/layouts/docs.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../views/_bootstrap">
+<cfimport prefix="b" taglib="../vendor/tags/bootstrap">
 
 
 
@@ -8,7 +8,7 @@
 	
 		<b:dropMenu value="Getting Started">
 			<b:navLink key="Installation" 				active="#getItem().find('getting_started')#"	href="~/docs/getting_started" />
-			<b:navLink value="Setup"						active="#getItem().find('setup')#"			href="~/docs/setup" />
+			<b:navLink value="Setup & Layouts"				active="#getItem().find('setup')#"			href="~/docs/setup" />
 			<b:navLink value="I18n"						active="#getItem().find('i18n')#"			href="~/docs/i18n" />
 			<b:navLink value="Directory Structure"			active="#getItem().find('structure')#"		href="~/docs/structure" />
 			<b:navLink value="Smart tags & common features"	active="#getItem().find('common')#"		href="~/common" />
diff --git a/layouts/innovation.cfm b/layouts/innovation.cfm
index 889c6b9..39553db 100644
--- a/layouts/innovation.cfm
+++ b/layouts/innovation.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../views/_bootstrap">
+<cfimport prefix="b" taglib="../vendor/tags/bootstrap">
 
 
 
diff --git a/layouts/pages.cfm b/layouts/pages.cfm
index 5f0fbac..4ea9201 100644
--- a/layouts/pages.cfm
+++ b/layouts/pages.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../views/_bootstrap">
+<cfimport prefix="b" taglib="../vendor/tags/bootstrap">
 
 
 <b:jumbotron tight="true">
diff --git a/views/_bootstrap/alert.cfm b/vendor/tags/bootstrap/alert.cfm
similarity index 100%
rename from views/_bootstrap/alert.cfm
rename to vendor/tags/bootstrap/alert.cfm
diff --git a/views/_bootstrap/badge.cfm b/vendor/tags/bootstrap/badge.cfm
similarity index 100%
rename from views/_bootstrap/badge.cfm
rename to vendor/tags/bootstrap/badge.cfm
diff --git a/views/_bootstrap/blockquote.cfm b/vendor/tags/bootstrap/blockquote.cfm
similarity index 87%
rename from views/_bootstrap/blockquote.cfm
rename to vendor/tags/bootstrap/blockquote.cfm
index 70c7a61..7d53842 100644
--- a/views/_bootstrap/blockquote.cfm
+++ b/vendor/tags/bootstrap/blockquote.cfm
@@ -34,10 +34,7 @@ case "start" :
 	break;
      
 case "end" :     
-     if(attributes?.key 		!= "")										{
-																	thisTag.GeneratedContent	= application.geti18n(attributes.key, attributes?.placeholder);
-																	attributes.isSafeHTML 	= true;				
-																	}	
+	if( attributes?.value 	!= "")										thisTag.generatedContent = attributes.value;
      
 	
 									variables.result &= '<blockquote class="';
diff --git a/views/_bootstrap/bootstrap.cfc b/vendor/tags/bootstrap/bootstrap.cfc
similarity index 98%
rename from views/_bootstrap/bootstrap.cfc
rename to vendor/tags/bootstrap/bootstrap.cfc
index 9faa44b..7e1af45 100644
--- a/views/_bootstrap/bootstrap.cfc
+++ b/vendor/tags/bootstrap/bootstrap.cfc
@@ -14,7 +14,7 @@ void function setupApplication()	{
 		isSafeHTML		= [	"cf_buttongroup",	"cf_buttontoolbar",	"cf_column",	"cf_container",	"cf_dropmenu",
 							"cf_fieldset",		"cf_formgroup",	"cf_head",	"cf_include",
 							"cf_jumbotron",	"cf_modal",		"cf_navbar",	"cf_navbarlinks",	"cf_navlink",
-							"cf_panel",		"cf_row",			"cf_table",	"cf_tabview",		"cf_tr","cf_well"],	// these tags to not run through getSafeHTML		
+							"cf_panel",		"cf_row",			"cf_table",	"cf_tabview",		"cf_tr",	"cf_well"],	// these tags to not run through getSafeHTML		
 		profile			= "",	// blank means use system default
 		throwOnError		= false,	// Default behavior for getSafeHTML()
 		
@@ -155,11 +155,11 @@ string function filterAttributes(required struct attr, string attributeFilter =
 	if(arguments.attr?.disabled == true)	arguments.attr.disabled = "disabled";
 	if(arguments.attr?.readonly == true)	arguments.attr.readonly = "readonly";
 	if(arguments.attr?.required == true)	arguments.attr.required = "required";
-		
+	
 	var prev = "";	
 	
 	local.result = arguments.attr.filter(function(key, value)	{ 
-				return (attributeFilter.ListFind(key)		|| key.reFindNoCase("data\-|ng\-|on") );
+				return (attributeFilter.ListFind(key)		|| key.reFindNoCase("data\-|ng\-|on" && key != "throwonError") );
 
 			})?.reduce(function(string prev, string key, string value)	{
 				return prev & ' #key.lcase()# = "#value.encodeForHTMLAttribute()#"';
@@ -185,8 +185,8 @@ string function filterAttributes(required struct attr, string attributeFilter =
 
 string function generateContent(required string Content, required array tagstack, required struct attr) output="false"	{
 	
-
-	if(arguments.attr?.key 		!= "" )		{
+	
+	if(arguments.attr?.key 	!= "" )		{
 									arguments.Content			= application.geti18n(arguments.attr.key, arguments.attr?.placeholder);
 									arguments.attr.isSafeHTML 	= true;
 									}			
diff --git a/views/_bootstrap/button.cfm b/vendor/tags/bootstrap/button.cfm
similarity index 100%
rename from views/_bootstrap/button.cfm
rename to vendor/tags/bootstrap/button.cfm
diff --git a/views/_bootstrap/buttonGroup.cfm b/vendor/tags/bootstrap/buttonGroup.cfm
similarity index 100%
rename from views/_bootstrap/buttonGroup.cfm
rename to vendor/tags/bootstrap/buttonGroup.cfm
diff --git a/views/_bootstrap/buttonToolbar.cfm b/vendor/tags/bootstrap/buttonToolbar.cfm
similarity index 100%
rename from views/_bootstrap/buttonToolbar.cfm
rename to vendor/tags/bootstrap/buttonToolbar.cfm
diff --git a/views/_bootstrap/column.cfm b/vendor/tags/bootstrap/column.cfm
similarity index 100%
rename from views/_bootstrap/column.cfm
rename to vendor/tags/bootstrap/column.cfm
diff --git a/views/_bootstrap/commandButton.cfm b/vendor/tags/bootstrap/commandButton.cfm
similarity index 100%
rename from views/_bootstrap/commandButton.cfm
rename to vendor/tags/bootstrap/commandButton.cfm
diff --git a/views/_bootstrap/commandLink.cfm b/vendor/tags/bootstrap/commandLink.cfm
similarity index 100%
rename from views/_bootstrap/commandLink.cfm
rename to vendor/tags/bootstrap/commandLink.cfm
diff --git a/views/_bootstrap/container.cfm b/vendor/tags/bootstrap/container.cfm
similarity index 100%
rename from views/_bootstrap/container.cfm
rename to vendor/tags/bootstrap/container.cfm
diff --git a/views/_bootstrap/dropButton.cfm b/vendor/tags/bootstrap/dropButton.cfm
similarity index 100%
rename from views/_bootstrap/dropButton.cfm
rename to vendor/tags/bootstrap/dropButton.cfm
diff --git a/views/_bootstrap/dropMenu.cfm b/vendor/tags/bootstrap/dropMenu.cfm
similarity index 100%
rename from views/_bootstrap/dropMenu.cfm
rename to vendor/tags/bootstrap/dropMenu.cfm
diff --git a/views/_bootstrap/fieldset.cfm b/vendor/tags/bootstrap/fieldset.cfm
similarity index 100%
rename from views/_bootstrap/fieldset.cfm
rename to vendor/tags/bootstrap/fieldset.cfm
diff --git a/views/_bootstrap/formGroup.cfm b/vendor/tags/bootstrap/formGroup.cfm
similarity index 100%
rename from views/_bootstrap/formGroup.cfm
rename to vendor/tags/bootstrap/formGroup.cfm
diff --git a/views/_bootstrap/graphicImage.cfm b/vendor/tags/bootstrap/graphicImage.cfm
similarity index 100%
rename from views/_bootstrap/graphicImage.cfm
rename to vendor/tags/bootstrap/graphicImage.cfm
diff --git a/views/_bootstrap/h1.cfm b/vendor/tags/bootstrap/h1.cfm
similarity index 87%
rename from views/_bootstrap/h1.cfm
rename to vendor/tags/bootstrap/h1.cfm
index bc6af81..e39b055 100644
--- a/views/_bootstrap/h1.cfm
+++ b/vendor/tags/bootstrap/h1.cfm
@@ -42,10 +42,13 @@ case "start" :
      
 case "end" :     
 
+	if(attributes?.value	!= "")		{ thisTag.GeneratedContent = attributes.value; }
+
+
 	if(attributes?.key 		!= "" )		{
-																	thisTag.GeneratedContent	= application.geti18n(attributes.key, attributes?.placeholder);
-																	attributes.isSafeHTML 	= true;				
-																	}	
+											thisTag.GeneratedContent	= application.geti18n(attributes.key, attributes?.placeholder);
+											attributes.isSafeHTML 	= true;				
+											}	
      
 
 	if(attributes?.pageHeader == true)		variables.result &= '<div class="page-header">';
diff --git a/views/_bootstrap/h2.cfm b/vendor/tags/bootstrap/h2.cfm
similarity index 93%
rename from views/_bootstrap/h2.cfm
rename to vendor/tags/bootstrap/h2.cfm
index 9d01165..6aa7b72 100644
--- a/views/_bootstrap/h2.cfm
+++ b/vendor/tags/bootstrap/h2.cfm
@@ -42,6 +42,9 @@ case "start" :
      
 case "end" :
 
+	if(attributes?.value	!= "")		{ thisTag.GeneratedContent = attributes.value; }
+
+
 	if(attributes?.key 		!= "" )		{
 																	thisTag.GeneratedContent	= application.geti18n(attributes.key, attributes?.placeholder);
 																	attributes.isSafeHTML 	= true;				
diff --git a/views/_bootstrap/h3.cfm b/vendor/tags/bootstrap/h3.cfm
similarity index 92%
rename from views/_bootstrap/h3.cfm
rename to vendor/tags/bootstrap/h3.cfm
index bf564aa..1c04b47 100644
--- a/views/_bootstrap/h3.cfm
+++ b/vendor/tags/bootstrap/h3.cfm
@@ -40,7 +40,11 @@ case "start" :
 	
 	break;
 
-case "end" :     
+case "end" :
+
+	if(attributes?.value	!= "")		{ thisTag.GeneratedContent = attributes.value; }
+
+
 	if(attributes?.key 		!= "" )		{
 																	thisTag.GeneratedContent	= application.geti18n(attributes.key, attributes?.placeholder);
 																	attributes.isSafeHTML 	= true;				
diff --git a/views/_bootstrap/h4.cfm b/vendor/tags/bootstrap/h4.cfm
similarity index 92%
rename from views/_bootstrap/h4.cfm
rename to vendor/tags/bootstrap/h4.cfm
index 694f658..b6a3f50 100644
--- a/views/_bootstrap/h4.cfm
+++ b/vendor/tags/bootstrap/h4.cfm
@@ -38,7 +38,9 @@ case "start" :
 	break;
      
 case "end" :
-     
+
+	if(attributes?.value	!= "")		{ thisTag.GeneratedContent = attributes.value; }
+
      
      if(variables.myClass	== "")		variables.result &= '<h4';
 	if(variables.myClass	!= "")		variables.result &= '<h4 class="#variables.myClass.encodeForHTMLAttribute()#"';
diff --git a/views/_bootstrap/h5.cfm b/vendor/tags/bootstrap/h5.cfm
similarity index 92%
rename from views/_bootstrap/h5.cfm
rename to vendor/tags/bootstrap/h5.cfm
index 21abbdc..8e07603 100644
--- a/views/_bootstrap/h5.cfm
+++ b/vendor/tags/bootstrap/h5.cfm
@@ -39,6 +39,8 @@ case "start" :
      
 case "end" :
     
+	if(attributes?.value	!= "")		{ thisTag.GeneratedContent = attributes.value; }
+    
      
      if(variables.myClass	== "")		variables.result &= '<h5';
 	if(variables.myClass 	!= "")		variables.result &= '<h5 class="#variables.myClass.encodeForHTMLAttribute()#"';
diff --git a/views/_bootstrap/h6.cfm b/vendor/tags/bootstrap/h6.cfm
similarity index 91%
rename from views/_bootstrap/h6.cfm
rename to vendor/tags/bootstrap/h6.cfm
index ea8be44..9b842a9 100644
--- a/views/_bootstrap/h6.cfm
+++ b/vendor/tags/bootstrap/h6.cfm
@@ -42,10 +42,10 @@ case "start" :
 	
      break;
      
-case "end" :     
+case "end" :
+
+	if(attributes?.value	!= "")		{ thisTag.GeneratedContent = attributes.value; }
 
-     
-     
 	if(variables.myClass	== "")		variables.result &= '<h6';
 	if(variables.myClass 	!= "")		variables.result &= '<h6 class="#variables.myClass.encodeForHTMLAttribute()#"';
 	
diff --git a/views/_bootstrap/head.cfm b/vendor/tags/bootstrap/head.cfm
similarity index 100%
rename from views/_bootstrap/head.cfm
rename to vendor/tags/bootstrap/head.cfm
diff --git a/views/_bootstrap/icon.cfm b/vendor/tags/bootstrap/icon.cfm
similarity index 100%
rename from views/_bootstrap/icon.cfm
rename to vendor/tags/bootstrap/icon.cfm
diff --git a/views/_bootstrap/include.cfm b/vendor/tags/bootstrap/include.cfm
similarity index 93%
rename from views/_bootstrap/include.cfm
rename to vendor/tags/bootstrap/include.cfm
index f5ef082..71ec6ef 100644
--- a/views/_bootstrap/include.cfm
+++ b/vendor/tags/bootstrap/include.cfm
@@ -41,7 +41,7 @@
 
 	
 	<cfsavecontent variable="variables.result"> 
-		<cfinclude template="../#attributes.template#">
+		<cfinclude template="../../../views/#attributes.template#">
 	</cfsavecontent>
 	
 	<cfscript>
diff --git a/views/_bootstrap/jumbotron.cfm b/vendor/tags/bootstrap/jumbotron.cfm
similarity index 100%
rename from views/_bootstrap/jumbotron.cfm
rename to vendor/tags/bootstrap/jumbotron.cfm
diff --git a/views/_bootstrap/label.cfm b/vendor/tags/bootstrap/label.cfm
similarity index 100%
rename from views/_bootstrap/label.cfm
rename to vendor/tags/bootstrap/label.cfm
diff --git a/views/_bootstrap/modal.cfm b/vendor/tags/bootstrap/modal.cfm
similarity index 100%
rename from views/_bootstrap/modal.cfm
rename to vendor/tags/bootstrap/modal.cfm
diff --git a/views/_bootstrap/navBar.cfm b/vendor/tags/bootstrap/navBar.cfm
similarity index 100%
rename from views/_bootstrap/navBar.cfm
rename to vendor/tags/bootstrap/navBar.cfm
diff --git a/views/_bootstrap/navBarLinks.cfm b/vendor/tags/bootstrap/navBarLinks.cfm
similarity index 100%
rename from views/_bootstrap/navBarLinks.cfm
rename to vendor/tags/bootstrap/navBarLinks.cfm
diff --git a/views/_bootstrap/navLink.cfm b/vendor/tags/bootstrap/navLink.cfm
similarity index 100%
rename from views/_bootstrap/navLink.cfm
rename to vendor/tags/bootstrap/navLink.cfm
diff --git a/views/_bootstrap/outputScript.cfm b/vendor/tags/bootstrap/outputScript.cfm
similarity index 91%
rename from views/_bootstrap/outputScript.cfm
rename to vendor/tags/bootstrap/outputScript.cfm
index fb90e20..86ecfa4 100644
--- a/views/_bootstrap/outputScript.cfm
+++ b/vendor/tags/bootstrap/outputScript.cfm
@@ -45,7 +45,7 @@ case "end" :
      								variables.result &= crlf;
 	   								variables.result &= '<script ';
 	   								variables.result &= ' src="' & application?.Bootstrap?.ScriptLibrary[attributes.library] & attributes?.name & '"';
-									variables.result &= ' type="#encodeForHTMLAttribute(attributes.type)#"';              
+									variables.result &= ' type="#attributes.type.encodeForHTMLAttribute()#"';              
 									variables.result &= '>';
 								
 									variables.result &= thisTag.GeneratedContent.trim();
diff --git a/views/_bootstrap/outputStylesheet.cfm b/vendor/tags/bootstrap/outputStylesheet.cfm
similarity index 90%
rename from views/_bootstrap/outputStylesheet.cfm
rename to vendor/tags/bootstrap/outputStylesheet.cfm
index 717cb36..bdc948d 100644
--- a/views/_bootstrap/outputStylesheet.cfm
+++ b/vendor/tags/bootstrap/outputStylesheet.cfm
@@ -45,8 +45,8 @@ case "end" :
      								variables.result &= crlf;
 	   								variables.result &= '<link type="#attributes.type#"';
 	   								variables.result &= ' href="' & application?.Bootstrap?.StylesheetLibrary[attributes.library] & attributes?.name & '"';
-	if(attributes?.media	!= "")		variables.result &= ' media="#attributes.media#"';
-									variables.result &= ' rel="#attributes.rel#"';              
+	if(attributes?.media	!= "")		variables.result &= ' media="#attributes.media.encodeForHTMLAttribute()#"';
+									variables.result &= ' rel="#attributes.rel.encodeForHTMLAttribute()#"';              
 									variables.result &= '>';
 								
 									variables.result &= thisTag.GeneratedContent.trim();
diff --git a/views/_bootstrap/outputText.cfm b/vendor/tags/bootstrap/outputText.cfm
similarity index 93%
rename from views/_bootstrap/outputText.cfm
rename to vendor/tags/bootstrap/outputText.cfm
index fac1468..2cf8daf 100644
--- a/views/_bootstrap/outputText.cfm
+++ b/vendor/tags/bootstrap/outputText.cfm
@@ -40,7 +40,7 @@ case "start" :
 	break;
      
 case "end" :
-	if(attributes?.value 	!= "")			thisTag.generatedContent = attributes.value;
+	if (attributes?.value 	!= "")			thisTag.generatedContent = attributes.value;
      
 										variables.result &= variables.crlf;
 	if (attributes.usespan)	{											
diff --git a/views/_bootstrap/p.cfm b/vendor/tags/bootstrap/p.cfm
similarity index 92%
rename from views/_bootstrap/p.cfm
rename to vendor/tags/bootstrap/p.cfm
index fc3a858..27562c3 100644
--- a/views/_bootstrap/p.cfm
+++ b/vendor/tags/bootstrap/p.cfm
@@ -44,6 +44,8 @@ case "start" :
 
 case "end" :
 
+	if(attributes?.value	!= "")		{ thisTag.GeneratedContent = attributes.value; }
+
 
 									variables.result &= variables.crlf;
 	if(variables.myClass	== "")		variables.result &= '<p';
diff --git a/views/_bootstrap/panel.cfm b/vendor/tags/bootstrap/panel.cfm
similarity index 100%
rename from views/_bootstrap/panel.cfm
rename to vendor/tags/bootstrap/panel.cfm
diff --git a/views/_bootstrap/poll.cfm b/vendor/tags/bootstrap/poll.cfm
similarity index 100%
rename from views/_bootstrap/poll.cfm
rename to vendor/tags/bootstrap/poll.cfm
diff --git a/views/_bootstrap/progressBar.cfm b/vendor/tags/bootstrap/progressBar.cfm
similarity index 100%
rename from views/_bootstrap/progressBar.cfm
rename to vendor/tags/bootstrap/progressBar.cfm
diff --git a/views/_bootstrap/row.cfm b/vendor/tags/bootstrap/row.cfm
similarity index 100%
rename from views/_bootstrap/row.cfm
rename to vendor/tags/bootstrap/row.cfm
diff --git a/views/_bootstrap/selectBooleanCheckbox.cfm b/vendor/tags/bootstrap/selectBooleanCheckbox.cfm
similarity index 100%
rename from views/_bootstrap/selectBooleanCheckbox.cfm
rename to vendor/tags/bootstrap/selectBooleanCheckbox.cfm
diff --git a/views/_bootstrap/selectItem.cfm b/vendor/tags/bootstrap/selectItem.cfm
similarity index 100%
rename from views/_bootstrap/selectItem.cfm
rename to vendor/tags/bootstrap/selectItem.cfm
diff --git a/views/_bootstrap/selectItems.cfm b/vendor/tags/bootstrap/selectItems.cfm
similarity index 100%
rename from views/_bootstrap/selectItems.cfm
rename to vendor/tags/bootstrap/selectItems.cfm
diff --git a/views/_bootstrap/selectManyCheckbox.cfm b/vendor/tags/bootstrap/selectManyCheckbox.cfm
similarity index 100%
rename from views/_bootstrap/selectManyCheckbox.cfm
rename to vendor/tags/bootstrap/selectManyCheckbox.cfm
diff --git a/views/_bootstrap/selectManyMenu.cfm b/vendor/tags/bootstrap/selectManyMenu.cfm
similarity index 100%
rename from views/_bootstrap/selectManyMenu.cfm
rename to vendor/tags/bootstrap/selectManyMenu.cfm
diff --git a/views/_bootstrap/selectOneMenu.cfm b/vendor/tags/bootstrap/selectOneMenu.cfm
similarity index 100%
rename from views/_bootstrap/selectOneMenu.cfm
rename to vendor/tags/bootstrap/selectOneMenu.cfm
diff --git a/views/_bootstrap/selectOneRadio.cfm b/vendor/tags/bootstrap/selectOneRadio.cfm
similarity index 100%
rename from views/_bootstrap/selectOneRadio.cfm
rename to vendor/tags/bootstrap/selectOneRadio.cfm
diff --git a/views/_bootstrap/tab.cfm b/vendor/tags/bootstrap/tab.cfm
similarity index 100%
rename from views/_bootstrap/tab.cfm
rename to vendor/tags/bootstrap/tab.cfm
diff --git a/views/_bootstrap/tabView.cfm b/vendor/tags/bootstrap/tabView.cfm
similarity index 100%
rename from views/_bootstrap/tabView.cfm
rename to vendor/tags/bootstrap/tabView.cfm
diff --git a/views/_bootstrap/table.cfm b/vendor/tags/bootstrap/table.cfm
similarity index 100%
rename from views/_bootstrap/table.cfm
rename to vendor/tags/bootstrap/table.cfm
diff --git a/views/_bootstrap/td.cfm b/vendor/tags/bootstrap/td.cfm
similarity index 100%
rename from views/_bootstrap/td.cfm
rename to vendor/tags/bootstrap/td.cfm
diff --git a/views/_bootstrap/th.cfm b/vendor/tags/bootstrap/th.cfm
similarity index 100%
rename from views/_bootstrap/th.cfm
rename to vendor/tags/bootstrap/th.cfm
diff --git a/views/_bootstrap/tr.cfm b/vendor/tags/bootstrap/tr.cfm
similarity index 100%
rename from views/_bootstrap/tr.cfm
rename to vendor/tags/bootstrap/tr.cfm
diff --git a/views/_bootstrap/verbatim.cfm b/vendor/tags/bootstrap/verbatim.cfm
similarity index 100%
rename from views/_bootstrap/verbatim.cfm
rename to vendor/tags/bootstrap/verbatim.cfm
diff --git a/views/_bootstrap/well.cfm b/vendor/tags/bootstrap/well.cfm
similarity index 100%
rename from views/_bootstrap/well.cfm
rename to vendor/tags/bootstrap/well.cfm
diff --git a/views/_bootstrap/wysiwyg.cfm b/vendor/tags/bootstrap/wysiwyg.cfm
similarity index 100%
rename from views/_bootstrap/wysiwyg.cfm
rename to vendor/tags/bootstrap/wysiwyg.cfm
diff --git a/views/_bootstrap/yesnoformat.cfm b/vendor/tags/bootstrap/yesnoformat.cfm
similarity index 100%
rename from views/_bootstrap/yesnoformat.cfm
rename to vendor/tags/bootstrap/yesnoformat.cfm
diff --git a/views/backups/edit.cfm b/views/backups/edit.cfm
index 04c9bfc..c403ec2 100644
--- a/views/backups/edit.cfm
+++ b/views/backups/edit.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 <h1><b:outputText key="BACKUP_OF" /> &lsquo;<em><cfoutput>#encodeforHTML(rc.slug)#</cfoutput></em>&rsquo;</h1>
diff --git a/views/backups/home.cfm b/views/backups/home.cfm
index bc2758e..ec0bae6 100644
--- a/views/backups/home.cfm
+++ b/views/backups/home.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 <b:h1 key="BAK_MANAGEMENT" />
diff --git a/views/bootswatch/home.cfm b/views/bootswatch/home.cfm
index 8d452de..8cd6743 100644
--- a/views/bootswatch/home.cfm
+++ b/views/bootswatch/home.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
@@ -7,7 +7,7 @@
 	<b:row>
 		<b:column span="12">	
 
-			<b:h1 value="#rc.theme#" />
+			<b:h1 value="#session.bootswatch#" />
 			<p>All themes are from Bootswatch and are not a part of this distribution.</p>
 		</b:column>	
 	</b:row>
diff --git a/views/bootswatch/theme/button.cfm b/views/bootswatch/theme/button.cfm
index 3a5111a..a37853d 100644
--- a/views/bootswatch/theme/button.cfm
+++ b/views/bootswatch/theme/button.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../../_bootstrap">
+<cfimport prefix="b" taglib="../../../vendor/tags/bootstrap">
 
 
 <!-- Buttons
diff --git a/views/bootswatch/theme/containers.cfm b/views/bootswatch/theme/containers.cfm
index 2ee5b8d..78f7875 100644
--- a/views/bootswatch/theme/containers.cfm
+++ b/views/bootswatch/theme/containers.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../../_bootstrap">
+<cfimport prefix="b" taglib="../../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/bootswatch/theme/dialogs.cfm b/views/bootswatch/theme/dialogs.cfm
index 48e7b55..6c418df 100644
--- a/views/bootswatch/theme/dialogs.cfm
+++ b/views/bootswatch/theme/dialogs.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../../_bootstrap">
+<cfimport prefix="b" taglib="../../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/bootswatch/theme/forms.cfm b/views/bootswatch/theme/forms.cfm
index c6feca5..8994402 100644
--- a/views/bootswatch/theme/forms.cfm
+++ b/views/bootswatch/theme/forms.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../../_bootstrap">
+<cfimport prefix="b" taglib="../../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/bootswatch/theme/indicators.cfm b/views/bootswatch/theme/indicators.cfm
index e74dc7a..de4fcf7 100644
--- a/views/bootswatch/theme/indicators.cfm
+++ b/views/bootswatch/theme/indicators.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../../_bootstrap">
+<cfimport prefix="b" taglib="../../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/bootswatch/theme/nav.cfm b/views/bootswatch/theme/nav.cfm
index 15d9bb1..231d083 100644
--- a/views/bootswatch/theme/nav.cfm
+++ b/views/bootswatch/theme/nav.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../../_bootstrap">
+<cfimport prefix="b" taglib="../../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/bootswatch/theme/navbar.cfm b/views/bootswatch/theme/navbar.cfm
index 104841c..71fccd4 100644
--- a/views/bootswatch/theme/navbar.cfm
+++ b/views/bootswatch/theme/navbar.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../../_bootstrap">
+<cfimport prefix="b" taglib="../../../vendor/tags/bootstrap">
 
 
 <b:row>
diff --git a/views/bootswatch/theme/table.cfm b/views/bootswatch/theme/table.cfm
index 7db5674..9a0d1ee 100644
--- a/views/bootswatch/theme/table.cfm
+++ b/views/bootswatch/theme/table.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../../_bootstrap">
+<cfimport prefix="b" taglib="../../../vendor/tags/bootstrap">
 
 
       <!-- Tables
diff --git a/views/bootswatch/theme/typography.cfm b/views/bootswatch/theme/typography.cfm
index 6863a69..a8de887 100644
--- a/views/bootswatch/theme/typography.cfm
+++ b/views/bootswatch/theme/typography.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../../_bootstrap">
+<cfimport prefix="b" taglib="../../../vendor/tags/bootstrap">
 
 
 <cfset rc = { heading = "This is a sample heading using bind" }>
diff --git a/views/docs/alert.cfm b/views/docs/alert.cfm
index 866518c..d0bd03d 100644
--- a/views/docs/alert.cfm
+++ b/views/docs/alert.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/antisamy.cfm b/views/docs/antisamy.cfm
index db2bc57..b20ee07 100644
--- a/views/docs/antisamy.cfm
+++ b/views/docs/antisamy.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 <b:row>
diff --git a/views/docs/awesomecheckbox.cfm b/views/docs/awesomecheckbox.cfm
index 43a2d25..c6b1491 100644
--- a/views/docs/awesomecheckbox.cfm
+++ b/views/docs/awesomecheckbox.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/buttonGroups.cfm b/views/docs/buttonGroups.cfm
index 277951c..24b9a9a 100644
--- a/views/docs/buttonGroups.cfm
+++ b/views/docs/buttonGroups.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/buttons.cfm b/views/docs/buttons.cfm
index a7ef188..902554a 100644
--- a/views/docs/buttons.cfm
+++ b/views/docs/buttons.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 <b:row>
diff --git a/views/docs/cache.cfm b/views/docs/cache.cfm
index 6501444..2991140 100644
--- a/views/docs/cache.cfm
+++ b/views/docs/cache.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 <b:row>
 	<b:column span="12">	
diff --git a/views/docs/common.cfm b/views/docs/common.cfm
index 8d16ddd..f982df8 100644
--- a/views/docs/common.cfm
+++ b/views/docs/common.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/dropdowns.cfm b/views/docs/dropdowns.cfm
index 0a2ff5f..2d4ebf5 100644
--- a/views/docs/dropdowns.cfm
+++ b/views/docs/dropdowns.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/forms.cfm b/views/docs/forms.cfm
index 97976f2..ebd1db2 100644
--- a/views/docs/forms.cfm
+++ b/views/docs/forms.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/getting_started.cfm b/views/docs/getting_started.cfm
index 06bad67..6676b96 100644
--- a/views/docs/getting_started.cfm
+++ b/views/docs/getting_started.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/grid.cfm b/views/docs/grid.cfm
index 40a6155..966fe1b 100644
--- a/views/docs/grid.cfm
+++ b/views/docs/grid.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/helper.cfm b/views/docs/helper.cfm
index 562d058..1e9e7b1 100644
--- a/views/docs/helper.cfm
+++ b/views/docs/helper.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/home.cfm b/views/docs/home.cfm
index 1929528..c108c11 100644
--- a/views/docs/home.cfm
+++ b/views/docs/home.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
  
 
diff --git a/views/docs/i18n.cfm b/views/docs/i18n.cfm
index d455205..8d1a4fe 100644
--- a/views/docs/i18n.cfm
+++ b/views/docs/i18n.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/icons.cfm b/views/docs/icons.cfm
index 56add9e..08c83fe 100644
--- a/views/docs/icons.cfm
+++ b/views/docs/icons.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
@@ -175,9 +175,10 @@
 
 
 
-<h2>Requirements for b:iconAwesome</h2>
+<h2>Requirements</h2>
+
+<p>Font Awesome package is required for Font Awesome fonts. Font Awesome also adds resizing and animation to other libraries</p>
 
-<p>Font Awesome package is required</p>
 
 
 <b:h2 key="try_me" />
diff --git a/views/docs/image.cfm b/views/docs/image.cfm
index e7b44f8..7424b7f 100644
--- a/views/docs/image.cfm
+++ b/views/docs/image.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/include.cfm b/views/docs/include.cfm
index df36c1d..396650e 100644
--- a/views/docs/include.cfm
+++ b/views/docs/include.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/jumbotron.cfm b/views/docs/jumbotron.cfm
index 6faa421..73fbc9d 100644
--- a/views/docs/jumbotron.cfm
+++ b/views/docs/jumbotron.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 <b:row>
diff --git a/views/docs/label.cfm b/views/docs/label.cfm
index ca820f6..e168751 100644
--- a/views/docs/label.cfm
+++ b/views/docs/label.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/modal.cfm b/views/docs/modal.cfm
index 83bf65d..e74a91c 100644
--- a/views/docs/modal.cfm
+++ b/views/docs/modal.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/nav.cfm b/views/docs/nav.cfm
index d4afa35..fbb4f71 100644
--- a/views/docs/nav.cfm
+++ b/views/docs/nav.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/panel.cfm b/views/docs/panel.cfm
index 4c24b05..60b362f 100644
--- a/views/docs/panel.cfm
+++ b/views/docs/panel.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/poll.cfm b/views/docs/poll.cfm
index 19489c6..27eac4d 100644
--- a/views/docs/poll.cfm
+++ b/views/docs/poll.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
  
  
diff --git a/views/docs/progress.cfm b/views/docs/progress.cfm
index c9b07d6..b648c61 100644
--- a/views/docs/progress.cfm
+++ b/views/docs/progress.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
  
  
diff --git a/views/docs/select.cfm b/views/docs/select.cfm
index 623cc52..c2c3a77 100644
--- a/views/docs/select.cfm
+++ b/views/docs/select.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/setup.cfm b/views/docs/setup.cfm
index 2025455..d847073 100644
--- a/views/docs/setup.cfm
+++ b/views/docs/setup.cfm
@@ -1,11 +1,11 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
 <row>
 	<column span="12">	
-		<h1 pageHeader="true">Image</h1>
-		<p>b:outputStylesheets & b:outputScript</p>
+		<h1 pageHeader="true">Setup & LayoutsImage</h1>
+		<p><code>b:outputStylesheet</code>, <code>b:outputScript</code>, and <code>b:head</code></p>
 	</column>	
 </row>
 
@@ -17,12 +17,11 @@
 <h3>Minimal setup</h3>
 
 
-<p>Inside of <code>application.cfc</code></p>
+<p>Inside of <code>vendor/tags/bootstrap/bootstrap.cfc</code></p>
 
 <pre>
 	application.Bootstrap = {
 	
-		actionRoot 		= cgi.script_name,
 		IconLibrary		= {"default" = "glyphicon glyphicon-", "awesome" = "fa fa-"},
 		ImageLibrary		= {"default" = replace(cgi.script_name, "/index.cfm", "") & "/assets/"},	
 		StyleSheetLibrary	= {"default" = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css"},	
@@ -48,7 +47,7 @@
 <p>Inside of each view file</p>
 
 <pre>
-&lt;cfimport prefix="b" taglib="../bootstrap"&gt;
+&lt;cfimport prefix="b" taglib="../../vendor/tags/bootstrap"&gt;
 </pre>	
 
 <!--- And Bob's your uncle --->
@@ -78,7 +77,7 @@
 			<td>generatedContent</td>
 			<td>(none)</td>
 			<td>Pass through of content</td>
-			<td><b:label look="danger" key="No" />Default Antisamy wouldn't work anyway</td>
+			<td><b:label look="danger" key="No" /> Default Antisamy wouldn't work anyway</td>
 		</tr>
 		<tr>
 			<td><b:label look="info">Antisamy</b:label></td>
diff --git a/views/docs/structure.cfm b/views/docs/structure.cfm
index 723e7e4..a4b40b5 100644
--- a/views/docs/structure.cfm
+++ b/views/docs/structure.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/tab.cfm b/views/docs/tab.cfm
index e865b05..f9ae215 100644
--- a/views/docs/tab.cfm
+++ b/views/docs/tab.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/tables.cfm b/views/docs/tables.cfm
index 7983d1e..06b2ff7 100644
--- a/views/docs/tables.cfm
+++ b/views/docs/tables.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/typography.cfm b/views/docs/typography.cfm
index 96740fb..e297a85 100644
--- a/views/docs/typography.cfm
+++ b/views/docs/typography.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/docs/wysiwyg.cfm b/views/docs/wysiwyg.cfm
index c37347a..435ba2a 100644
--- a/views/docs/wysiwyg.cfm
+++ b/views/docs/wysiwyg.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/login/home.cfm b/views/login/home.cfm
index 518d497..e0c906f 100644
--- a/views/login/home.cfm
+++ b/views/login/home.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 <p>&nbsp;</p>
diff --git a/views/pages/edit.cfm b/views/pages/edit.cfm
index 65abfd7..0a595d0 100644
--- a/views/pages/edit.cfm
+++ b/views/pages/edit.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 <cfif rc.slug EQ "">
diff --git a/views/pages/home.cfm b/views/pages/home.cfm
index 526d397..2612689 100644
--- a/views/pages/home.cfm
+++ b/views/pages/home.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 <b:h1 key="page_management" />
diff --git a/views/pages/menu.cfm b/views/pages/menu.cfm
index 4dc2de5..cf04b9f 100644
--- a/views/pages/menu.cfm
+++ b/views/pages/menu.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 <b:h1 key="menu_manager" />
diff --git a/views/settings/home.cfm b/views/settings/home.cfm
index e0471e2..590f812 100644
--- a/views/settings/home.cfm
+++ b/views/settings/home.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/support/health.cfm b/views/support/health.cfm
index 54e787e..60e5394 100644
--- a/views/support/health.cfm
+++ b/views/support/health.cfm
@@ -1,5 +1,5 @@
 
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/support/home.cfm b/views/support/home.cfm
index 470b7a7..094c12a 100644
--- a/views/support/home.cfm
+++ b/views/support/home.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 <h1>Getting Started</h1>
diff --git a/views/theme/components.cfm b/views/theme/components.cfm
index a8361b6..75adc26 100644
--- a/views/theme/components.cfm
+++ b/views/theme/components.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/upload/details.cfm b/views/upload/details.cfm
index cdb734a..a974833 100644
--- a/views/upload/details.cfm
+++ b/views/upload/details.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">
 
 
 
diff --git a/views/upload/home.cfm b/views/upload/home.cfm
index 6cae472..4692f43 100644
--- a/views/upload/home.cfm
+++ b/views/upload/home.cfm
@@ -1,4 +1,4 @@
-<cfimport prefix="b" taglib="../_bootstrap">
+<cfimport prefix="b" taglib="../../vendor/tags/bootstrap">