diff --git a/README.md b/README.md
index b92968a..f7e2356 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
-# BS-4-CF
-Bootstrap tags for Adobe ColdFusion
+# Bootstrap for ColdFusion
 
 
-Simplify Bootstrap and ColdFusion
+Simplifying both Bootstrap and ColdFusion
 
 
 # Why is this interesting?
@@ -14,7 +13,7 @@ The two put together are highly unreadable and difficult to debug. This is where
 BootsFaces for JSF shows the way to a cleaner approach. So what I have done is created a similar library for ColdFusion.
 
 
-### Without BS-4-CF
+### Without Bootstrap for ColdFusion
 ```
 <cfif showme>	
      <button type="button" class="btn btn-default btn-lg">
@@ -25,7 +24,7 @@ BootsFaces for JSF shows the way to a cleaner approach. So what I have done is c
 ```	
 
 
-### With BS-4-CF
+### With Bootstrap for ColdFusion
 
 ```
 <b:button processed="#showme#" binding="savelabel" icon="floppy-disk" size="lg" />	
diff --git a/application.cfc b/application.cfc
index 12f923e..2c81027 100644
--- a/application.cfc
+++ b/application.cfc
@@ -3,22 +3,32 @@
 
 component	{
 	
-this.name="bs-4-cf-17";
+this.name="bs-4-cf-34";
 this.applicationManagement = true;
 this.sessionManagement = true;
 
 
 function onApplicationStart()	{
 	application.Bootstrap = {
+				
+		// Antisamy options
+		isSafeHTML		= ["buttongroup","buttontoolbar","column","container","dropmenu","fieldset","formgroup","head",
+							"jumbotron","modal","navbar","navbarlinks","navlink","panel","row","table","tabview","tr","well"],	// these tags to not run through getSafeHTML		
+		profile			= "",	// blank means use system default
+		throwOnError		= false,	// Default behavior for getSafeHTML()
+		
 	
 		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"},	
-		ScriptLibrary		= {"default" = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"}	
+		validLook			= ["", "link", "default", "primary", "success", "info", "warning", "danger"], // There does not guarantee they are valid	
+		
+		iconLibrary		= {"default" = "glyphicon glyphicon-", "awesome" = "fa fa-", "jquery-ui" = "ui-icon ui-icon-"}, 		// be sure to include ending dashes
+		imageLibrary		= {"default" = replace(cgi.script_name, "/index.cfm", "") & "/assets/"},							// used by b:graphicImage
+		styleSheetLibrary	= {"default" = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css"},				// used by b:outputStyleSheet
+		scriptLibrary		= {"default" = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js", local="assets/"}	// used by b:outputScript
 		};
 	
 		
+		
 	} // end onApplicationStart
 
 	
diff --git a/bootstrap/alert.cfm b/bootstrap/alert.cfm
index 440e46f..0e93d08 100644
--- a/bootstrap/alert.cfm
+++ b/bootstrap/alert.cfm
@@ -15,31 +15,50 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.closable	= false;
-	param attributes.id			= "";
-	param attributes.look		= "warning";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.title		= "";
-	param attributes.tooltip		= "";
+	param attributes.closable		= false;
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("alert");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.look			= "warning";
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.title			= "";
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
      
-     if (!attributes.processed) exit "exitTag";
+    
+	
+	if (!application.Bootstrap.validLook.contains(attributes.look))	throw "This is an invalid look option";
+        
+	if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :     
      
-	   							variables.result &= '<div class="alert alert-#lcase(attributes.look)#';
+	   							variables.result &= '<div class="alert alert-#encodeForHTMLAttribute(attributes.look.lcase())#';
 	if(attributes.closable)			variables.result &= ' alert-dismissible';  							
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.tooltip    != "")    variables.result &= ' tooltip="#attributes.tooltip#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	
+	if(attributes.tooltip    != "")    variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
+	
 								variables.result &= '>';
 	
 	if(attributes.closable)			variables.result &= '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>';		
-	if(attributes.title		!= "")    variables.result &= '<strong>#attributes.title#</strong>';
+	if(attributes.title		!= "")    variables.result &= '<strong>#encodeForHTML(attributes.title)#</strong>';
 								variables.result &= variables.crlf;
 	if(attributes.title		!= "")    variables.result &= '<br />';
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+	
+	
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+	
+
 								variables.result &= '</div><!-- /.alert -->';
 								variables.result &= variables.crlf;
      
diff --git a/bootstrap/badge.cfm b/bootstrap/badge.cfm
index 629280c..2694075 100644
--- a/bootstrap/badge.cfm
+++ b/bootstrap/badge.cfm
@@ -6,48 +6,80 @@
 <cfscript>
 if (!thisTag.HasEndTag) 
 	abort "An end tag is required for b:badge."; 
-	
-	
 
-switch (thisTag.ExecutionMode)     {
+
+
+switch (thisTag.ExecutionMode)	{
 case "start" :
 
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
-  
-  	param attributes.binding		= "";
-	param attributes.id			= "";
-	param attributes.look	 	= "warning";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.tooltip		= "";
-	param attributes.value		= "";
+
+	param attributes.binding			= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("badge");
+	param attributes.look			= "warning";
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+	param attributes.value			= "";
+
+
+	if (structKeyExists(attributes, "text")) throw "attributes.text is an invalid option. Don't even think of using it";
+
+	if (!application.Bootstrap.validLook.contains(attributes.look))	throw "This is an invalid look option";
+	
+	
+	
+	variables.arAttrSeries = [];
 	
 	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
 
-	if (structKeyExists(attributes, "text")) throw "attributes.text is an invalid option. Don't even think of using it";
-     if (!attributes.processed) exit "exitTag";
+
+
+	if (!attributes.processed) exit "exitTag";
 	break;
-     
-case "end" :     
-     
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) attributes.text = xmlformat(evaluate("caller.rc.#attributes.binding#"));
-          
-     
-								variables.result &= '<span class="badge badge-#lcase(attributes.look)#"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';							
-	if(attributes.tooltip    != "")    variables.result &= ' title="#attributes.tooltip#"';							
+
+case "end" :
+
+	if(attributes.value != "")											thisTag.generatedContent = attributes.value;
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) 	thisTag.generatedContent = evaluate("caller.rc.#attributes.binding#");
+
+
+								variables.result &= '<span class = "badge badge-#encodeForHTMLAttribute(attributes.look.lcase())#"';
+	if(attributes.id		!= "")	variables.result &= ' id = "#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
+		
+	if(attributes.tooltip	!= "")	variables.result &= ' title = "#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
 								variables.result &= '>';
-								variables.result &= attributes.value; // pass through of content
+
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+
 								variables.result &= '</span>';
-								
-	
+
+
 	thisTag.GeneratedContent = ""; // This tag does not have pass through
-	
-     if (attributes.rendered)			writeOutput(variables.result);
-     
+
+	if (attributes.rendered)			writeOutput(variables.result);
+
 	break;
 	}
-     
- 
+
+
 </cfscript>
\ No newline at end of file
diff --git a/bootstrap/blockquote.cfm b/bootstrap/blockquote.cfm
index 8dd792f..aae733d 100644
--- a/bootstrap/blockquote.cfm
+++ b/bootstrap/blockquote.cfm
@@ -15,35 +15,60 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.binding		= "";
-     param attributes.id			= "";
-     param attributes.processed 	= true;
-     param attributes.reverse		= false;
-	param attributes.rendered 	= true; // removes content not actuall td
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-     param attributes.tooltip		= "";
+	param attributes.binding			= "";
+     param attributes.id				= "";
+     param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("blockquote");
+    	param attributes.key			= "";
+	param attributes.placeholder		= [];
+     param attributes.processed 		= true;
+     param attributes.profile			= application.Bootstrap.profile;
+     param attributes.reverse			= false;
+	param attributes.rendered 		= true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+     param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+	
+	
+	variables.arAttrSeries = [];
+	
+	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
+		
 
 
      if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :     
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
 	
 	   							variables.result &= '<blockquote class="';
 	if(attributes.reverse)			variables.result &= ' blockquote-reverse';	
-	if(attributes.text		!= "")	variables.result &= ' text-#attributes.text#';	
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';		
+	if(attributes.text		!= "")	variables.result &= ' text-#encodeForHTMLAttribute(attributes.text)#';	
+	if(attributes.styleClass	!= "")	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';		
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
+		
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';               
 								variables.result &= '>';
-							
-								variables.result &= trim(thisTag.GeneratedContent); // pass through of content
 	
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+									
 								variables.result &= '</blockquote>';
      
      
diff --git a/bootstrap/button.cfm b/bootstrap/button.cfm
index 7afe7c0..1dcc2b4 100644
--- a/bootstrap/button.cfm
+++ b/bootstrap/button.cfm
@@ -15,25 +15,30 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
 
-	param attributes.binding		= "";
-	param attributes.disabled	= false;
-	param attributes.dismiss		= false;
-	param attributes.icon		= "";
-	param attributes.iconAlign	= "left";
-	param attributes.id			= "";
-	param attributes.lang		= "";
-	param attributes.library		= "default";	// for icon
-	param attributes.look		= "default";
-	param attributes.outline		= false;
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.role		= "button";
-	param attributes.size		= "";		// large, small, mini
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.tooltip		= "";
-	param attributes.tooltipPosition = "bottom";
-	param attributes.value		= "";
+	param attributes.binding			= "";
+	param attributes.disabled		= false;
+	param attributes.dismiss			= false;
+	param attributes.icon			= "";
+	param attributes.iconAlign		= "left";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("button");;
+	param attributes.key			= "";
+	param attributes.lang			= "";
+	param attributes.library			= "default";	// for icon
+	param attributes.look			= "default";
+	param attributes.outline			= false;
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.role			= "button";
+	param attributes.size			= "";		// large, small, mini
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+	param attributes.value			= "";
 
 
 	variables.arAttrSeries = [];
@@ -48,48 +53,56 @@ case "start" :
 		
 
 
+	if (!application.Bootstrap.validLook.contains(attributes.look))	throw "This is an invalid look option";
+
+
 	if (!attributes.processed) exit "exitTag";
 	break;
 
 case "end" :
 
-	if(attributes.value != "")											thisTag.generatedContent = xmlFormat(attributes.value);
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) 	thisTag.generatedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+	if(attributes.value != "")											thisTag.generatedContent = attributes.value;
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) 	thisTag.generatedContent = evaluate("caller.rc.#attributes.binding#");
 
 
-											variables.result &= '<button type="button" class="btn btn-#lcase(attributes.look)#';
+											variables.result &= '<button type="button" class="btn btn-#encodeForHTMLAttribute(attributes.look.lcase())#';
 	if(attributes.outline)						variables.result &= "-outline";
-	if(attributes.size		!= "")				variables.result &= ' btn-#attributes.size#';
-	if(attributes.styleClass	!= "")				variables.result &= ' #attributes.styleClass#';
+	if(attributes.size		!= "")				variables.result &= ' btn-#encodeForHTMLAttribute(attributes.size)#';
+	if(attributes.styleClass	!= "")				variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';
 											variables.result &= '"';
 	// end class specification
 	
-	if(attributes.dismiss	!= "")				variables.result &= ' data-dismiss="#attributes.dismiss#"';
-	if(structKeyExists(attributes, "data-target"))	variables.result &= ' data-target="' & attributes['data-target'] & '"';
-	if(structKeyExists(attributes, "data-toggle"))	variables.result &= ' data-toggle="' & attributes['data-toggle'] & '"';
-	if(attributes.id		!= "")				variables.result &= ' id="#attributes.id#"';
-	if(attributes.lang		!= "")				variables.result &= ' lang="#attributes.lang#"';
+	if(attributes.dismiss	!= "")				variables.result &= ' data-dismiss="#encodeForHTMLAttribute(attributes.dismiss)#"';
+	if(attributes.keyExists("data-target"))			variables.result &= ' data-target="' & attributes['data-target'] & '"';
+	if(attributes.keyExists("data-toggle"))			variables.result &= ' data-toggle="' & attributes['data-toggle'] & '"';
+	if(attributes.id		!= "")				variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.lang		!= "")				variables.result &= ' lang="#encodeForHTMLAttribute(attributes.lang)#"';
 		
-	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
 		
-	if(attributes.role		!= "")				variables.result &= ' role="#attributes.role#"';
-	if(attributes.style		!= "")				variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip	!= "")				variables.result &= ' title="#attributes.tooltip#"';
+	if(attributes.role		!= "")				variables.result &= ' role="#encodeForHTMLAttribute(attributes.role)#"';
+	if(attributes.style		!= "")				variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	
+	if(attributes.tooltip	!= "")				variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")				variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
 	if(attributes.tooltip	!= "")				variables.result &= ' data-toggle="tooltip"';
-	if(attributes.tooltip	!= "")				variables.result &= ' data-placement="#attributes.tooltipPosition#"';
+	
 	if(attributes.disabled)						variables.result &= ' disabled="disabled"';
 											variables.result &= '>';
 								
 	// space on end is not an accident							
-	if (attributes.icon 		!= "" && attributes.iconAlign == "left")	{
-											variables.result &= '<i class="#application.Bootstrap.IconLibrary[attributes.library]##attributes.icon#"></i> ';
+	if (attributes.icon 	!= "" && attributes.iconAlign == "left")	{
+											variables.result &= '<i class="#application.Bootstrap.IconLibrary[attributes.library]##encodeForHTMLAttribute(attributes.icon)#"></i> ';
 											}		
 
-											variables.result &= thisTag.generatedContent; // pass through of content
+	if(!attributes.isSafeHTML)					variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)					variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+
 	
 	// space at start is not an accident
 	if (attributes.icon 		!= "" && attributes.iconAlign == "right")	{
-											variables.result &= ' <i class="#application.Bootstrap.IconLibrary[attributes.library]##attributes.icon#"></i>';
+											variables.result &= ' <i class="#application.Bootstrap.IconLibrary[attributes.library]##encodeForHTMLAttribute(attributes.icon)#"></i>';
 											}		
 
 
diff --git a/bootstrap/buttonGroup.cfm b/bootstrap/buttonGroup.cfm
index be8e728..878d0a9 100644
--- a/bootstrap/buttonGroup.cfm
+++ b/bootstrap/buttonGroup.cfm
@@ -15,19 +15,25 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
 	
-	thisTag.qryOption 				= QueryNew("disabled,display,group,id,look,value,selected,tooltip");
-
-	param attributes.id			= "";
-	param attributes.justified	= false;
-	param attributes.look		= ""; // this is the default unless over ridden 
-	param attributes.name		= "";
-	param attributes.orientation 	= "horizontal"; // horizontal, vertical, up
-	param attributes.processed 	= true;
-	param attributes.pull 		= "";
-	param attributes.rendered	= true;
-	param attributes.size		= "";
-	param attributes.toggle		= false;
-	param attributes.tooltip		= "";
+	thisTag.qryOption 				= QueryNew("disabled,display,group,id,look,value,selected,tooltip,tooltipPosition");
+
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("buttongroup"); // really does not work with true
+	param attributes.key			= "";
+	param attributes.justified		= false;
+	param attributes.look			= ""; // this is the default unless over ridden 
+	param attributes.name			= "";
+	param attributes.orientation 		= "horizontal"; // horizontal, vertical, up
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.pull 			= "";
+	param attributes.rendered		= true;
+	param attributes.size			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.toggle			= false;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
 
 
 
@@ -41,12 +47,12 @@ case "end" :
 	if(attributes.orientation == "up")			variables.result &= '<div class="btn-group dropup';
 	
 
-	if(attributes.size		!= "")	variables.result &= ' btn-group-#attributes.size#';
+	if(attributes.size		!= "")	variables.result &= ' btn-group-#encodeForHTMLAttribute(attributes.size)#';
 	if(attributes.justified)			variables.result &= ' btn-group-justified';
-	if(attributes.pull		!= "")	variables.result &= ' pull-#attributes.pull#';
+	if(attributes.pull		!= "")	variables.result &= ' pull-#encodeForHTMLAttribute(attributes.pull)#';
 								variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.tooltip	!= "")	variables.result &=	' title="#attributes.tooltip#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.tooltip	!= "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
 	if(attributes.toggle)			variables.result &= ' data-toggle="buttons"';
 								variables.result &= ' role="group">';
 
@@ -57,22 +63,22 @@ case "end" :
 
 		if(thisTag.qryOption.id[variables.myRow] == "auto")	QuerySetCell(thisTag.qryOption, "id", "auto_" & left(createUUID(), 10), variables.myRow);
 			
-													variables.result &= '<label class="btn btn-#lcase(variables.myLook)# ';
+													variables.result &= '<label class="btn btn-#encodeForHTMLAttribute(variables.myLook.lcase())# ';
 		
 		if(thisTag.qryOption.selected[variables.myRow])		variables.result &= ' active';
 													variables.result &= '"';
 	
-		if(thisTag.qryOption.tooltip[variables.myRow] != "")	variables.result &= ' tooltip="#thisTag.qryOption.tooltip[variables.myRow]#"';
+		if(thisTag.qryOption.tooltip[variables.myRow] != "")	variables.result &= ' title="#encodeForHTML(thisTag.qryOption.tooltip[variables.myRow])#"';
 													variables.result &= '>';
 
 
 
 													variables.result &= '<input type="radio"';
-		if(attributes.name					 != "")		variables.result &= ' name="#attributes.name#"';
-		if(thisTag.qryOption.id[variables.myRow] != "")		variables.result &= ' id="#thisTag.qryOption.id[variables.myRow]#"';
+		if(attributes.name					 != "")		variables.result &= ' name="#encodeForHTML(attributes.name)#"';
+		if(thisTag.qryOption.id[variables.myRow] != "")		variables.result &= ' id="#encodeForHTML(thisTag.qryOption.id[variables.myRow])#"';
 		if(thisTag.qryOption.selected[variables.myRow])
 													variables.result &= ' checked="checked"';
-													variables.result &= ' value="#thisTag.qryOption.value[variables.myRow]#"';	
+													variables.result &= ' value="#encodeForHTML(thisTag.qryOption.value[variables.myRow])#"';	
 													variables.result &= ' />';
 		
 													variables.result &= thisTag.qryOption.display[variables.myRow]; // pass through of content
@@ -82,9 +88,11 @@ case "end" :
 
 		} // end for
 								
-							
-								variables.result &= thisTag.GeneratedContent; // pass through of content
-	
+		
+	if(!attributes.isSafeHTML)					variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)					variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+
 								variables.result &= '</div><!-- /.btn-group -->';
 								variables.result &= variables.crlf;
 
diff --git a/bootstrap/buttonToolbar.cfm b/bootstrap/buttonToolbar.cfm
index edbcb9f..c400c6e 100644
--- a/bootstrap/buttonToolbar.cfm
+++ b/bootstrap/buttonToolbar.cfm
@@ -15,13 +15,19 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
- 	param attributes.id			= "";
-	param attributes.processed 	= true;
-	param attributes.rendered	= true;
-	param attributes.size		= "";
-	param attributes.tooltip		= "";
+ 	param attributes.id				= "";
+ 	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("buttonToolbar"); // really doesn't work with false
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered		= true;
+	param attributes.size			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+
 
-	
 	if (!attributes.processed) exit "exitTag";
 	break;
      
@@ -29,12 +35,18 @@ case "end" :
      
 								variables.result &= '<div class="btn-toolbar';
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id.encodeForHTMLAttribute()#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip.encodeForHTMLAttribute()#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';          
 								variables.result &= '>';
-							
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+								
 	
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+
+						
 								variables.result &= '</div><!-- /.btn-toolbar -->';
      
      
diff --git a/bootstrap/column.cfm b/bootstrap/column.cfm
index 7080e2d..dd6c663 100644
--- a/bootstrap/column.cfm
+++ b/bootstrap/column.cfm
@@ -15,25 +15,31 @@ case "start" :
 	variables.result = "";
   	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.id			= "";
-	param attributes.offset		= 0;
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.span		= 0;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.tooltip		= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("column"); // this content is very large. Make sure it is clean before passing in
+	param attributes.key			= "";
+	param attributes.offset			= 0;
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.span			= 0;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
   
 	// spans for specific screen sizes
-	param attributes.colXs		= attributes.span;
-	param attributes.colSm		= attributes.span;
-	param attributes.colMd		= attributes.span;
-	param attributes.colLg		= "";
+	param attributes.colXs			= attributes.span;		if (!isnumeric(attributes.colXs)) attributes.colXs = attributes.span;
+	param attributes.colSm			= attributes.span;		if (!isnumeric(attributes.colSm)) attributes.colXs = attributes.span;
+	param attributes.colMd			= attributes.span;		if (!isnumeric(attributes.colMd)) attributes.colXs = attributes.span;
+	param attributes.colLg			= "";				if (!isnumeric(attributes.colLg)) attributes.colXs = attributes.span;
 	
-	param attributes.offsetXs	= attributes.offset;
-	param attributes.offsetSm	= attributes.offset;
-	param attributes.offsetMd	= attributes.offset;
-	param attributes.offsetLg	= 0;
+	param attributes.offsetXs		= attributes.offset;	if (!isnumeric(attributes.offsetXs)) attributes.offsetXs = attributes.offset;
+	param attributes.offsetSm		= attributes.offset;	if (!isnumeric(attributes.offsetSm)) attributes.offsetSm = attributes.offset;
+	param attributes.offsetMd		= attributes.offset;	if (!isnumeric(attributes.offsetMd)) attributes.offsetMd = attributes.offset;
+	param attributes.offsetLg		= 0;					if (!isnumeric(attributes.offsetLg)) attributes.offsetLg = attributes.offset;
 
 
  	if (!attributes.processed) exit "exitTag";
@@ -42,24 +48,32 @@ case "start" :
 case "end" :     
      
 	   							variables.result &= variables.crlf & '<div class="';
-	   							variables.result &= 'col-xs-#attributes.colXs# ';
-	   							variables.result &= 'col-sm-#attributes.colSm# ';
-	   							variables.result &= 'col-md-#attributes.colMd# ';
-	if(attributes.colLg 	!= "")	variables.result &= 'col-lg-#attributes.colLg# ';
-	if(attributes.offsetXs 	!= 0)   	variables.result &= 'col-xs-offset-#attributes.offsetXs# ';
-	if(attributes.offsetSm 	!= 0)	variables.result &= 'col-sm-offset-#attributes.offsetSm# ';
-	if(attributes.offsetMd 	!= 0)	variables.result &= 'col-md-offset-#attributes.offsetMd# ';
-	if(attributes.offsetLg 	!= 0)	variables.result &= 'col-lg-offset-#attributes.offsetLg# ';
+	   							variables.result &= 'col-xs-#encodeForHTMLAttribute(attributes.colXs)# ';
+	   							variables.result &= 'col-sm-#encodeForHTMLAttribute(attributes.colSm)# ';
+	   							variables.result &= 'col-md-#encodeForHTMLAttribute(attributes.colMd)# ';
+	if(attributes.colLg 	!= "")	variables.result &= 'col-lg-#encodeForHTMLAttribute(attributes.colLg)# ';
+	if(attributes.offsetXs 	!= 0)   	variables.result &= 'col-xs-offset-#encodeForHTMLAttribute(attributes.offsetXs)# ';
+	if(attributes.offsetSm 	!= 0)	variables.result &= 'col-sm-offset-#encodeForHTMLAttribute(attributes.offsetSm)# ';
+	if(attributes.offsetMd 	!= 0)	variables.result &= 'col-md-offset-#encodeForHTMLAttribute(attributes.offsetMd)# ';
+	if(attributes.offsetLg 	!= 0)	variables.result &= 'col-lg-offset-#encodeForHTMLAttribute(attributes.offsetLg)# ';
 	   							
 	   							
 	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';		
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';                       
-	if(attributes.tooltip    != "")    variables.result &= ' title="#attributes.tooltip#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';                       
+	
+	if(attributes.tooltip    != "")    variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
+	
 								variables.result &= '>';
 								variables.result &= variables.crlf;
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+								
 								variables.result &= variables.crlf & '</div><!-- /.column -->';
 								variables.result &= variables.crlf;
      
diff --git a/bootstrap/commandButton.cfm b/bootstrap/commandButton.cfm
index 16af81d..1e94cb8 100644
--- a/bootstrap/commandButton.cfm
+++ b/bootstrap/commandButton.cfm
@@ -14,27 +14,33 @@ case "start" :
 
 	variables.result = "";
 
-	param attributes.ajax		= ""; // reserved for future use
-	param attributes.binding		= "";
-	param attributes.disabled	= false;
-	param attributes.icon		= "";
-	param attributes.iconAlign	= "left";
-	param attributes.id			= "";
-	param attributes.lang		= "";
-	param attributes.library		= "default";	// for icon
-	param attributes.look		= "default";
-	param attributes.name		= "";
-	param attributes.outline		= false;
-	param attributes.processed	= true;
-	param attributes.rendered	= true;
-	param attributes.rel		= "";
-	param attributes.role		= "button";
-	param attributes.size		= "";		// large, small, mini
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.tooltip		= "";
-	param attributes.type		= "submit";	// as opposed to reset, use button for buttons
-	param attributes.value		= "";
+	param attributes.ajax			= ""; // reserved for future use
+	param attributes.binding			= "";
+	param attributes.disabled		= false;
+	param attributes.icon			= "";
+	param attributes.iconAlign		= "left";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("commandButton");
+	param attributes.key			= "";
+	param attributes.lang			= "";
+	param attributes.library			= "default";	// for icon
+	param attributes.look			= "default";
+	param attributes.name			= "";
+	param attributes.outline			= false;
+	param attributes.placeholder		= [];
+	param attributes.processed		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered		= true;
+	param attributes.rel			= "";
+	param attributes.role			= "button";
+	param attributes.size			= "";		// large, small, mini
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+	param attributes.type			= "submit";	// as opposed to reset, use button for buttons
+	param attributes.value			= "";
 
 
 	// Patch this
@@ -52,40 +58,44 @@ case "start" :
 		}	// end for
 
 
+	if (!application.Bootstrap.validLook.contains(attributes.look))	throw "This is an invalid look option";
+	
 
 	if (!attributes.processed) exit "exitTag";
 	break;
 
 case "end" :
 
-	if(attributes.value != "")											thisTag.generatedContent = xmlFormat(attributes.value);
-	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) 	thisTag.generatedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+	if(attributes.value != "")											thisTag.generatedContent = attributes.value;
+	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) 	thisTag.generatedContent = evaluate("caller.rc.#attributes.binding#");
 	
-											variables.result &= '<button type="#attributes.type#" class="btn btn-#lcase(attributes.look)#';
+											variables.result &= '<button type="#attributes.type#" class="btn btn-#attributes.look.lcase()#';
 	if(attributes.outline)						variables.result &= "-outline";
 	if(attributes.size		!= "")				variables.result &= ' btn-#attributes.size#';
 	if(attributes.styleClass	!= "")				variables.result &= ' #attributes.styleClass#';
 											variables.result &= '"';
 	// end class specification
 
-	if(attributes.id		!= "")				variables.result &= ' id="#attributes.id#"';
-	if(attributes.lang		!= "")				variables.result &= ' lang="#attributes.lang#"';
-	if(attributes.name		!= "")				variables.result &= ' name="#attributes.name#"';
+	if(attributes.id		!= "")				variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.lang		!= "")				variables.result &= ' lang="#encodeForHTMLAttribute(attributes.lang)#"';
+	if(attributes.name		!= "")				variables.result &= ' name="#encodeForHTMLAttribute(attributes.name)#"';
 
 	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
 
-	if(attributes.role		!= "")				variables.result &= ' role="#attributes.role#"';
-	if(attributes.style		!= "")				variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip	!= "")				variables.result &= ' tooltip="#attributes.tooltip#"';
+	if(attributes.role		!= "")				variables.result &= ' role="#encodeForHTMLAttribute(attributes.role)#"';
+	if(attributes.style		!= "")				variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip	!= "")				variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
 	if(attributes.disabled)						variables.result &= ' disabled="disabled"';
 											variables.result &= '>';
 
 	// space on end is not an accident							
 	if (attributes.icon 		!= "" && attributes.iconAlign == "left")	{
 											variables.result &= '<i class="#application.Bootstrap.IconLibrary[attributes.library]##attributes.icon#"></i> ';
-											}	
+											}
+											
+	if(!attributes.isSafeHTML)					variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)					variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
 
-											variables.result &= thisTag.generatedContent; // pass through of content
 
 	// space at start is not an accident
 	if (attributes.icon 		!= "" && attributes.iconAlign == "right")	{
diff --git a/bootstrap/commandLink.cfm b/bootstrap/commandLink.cfm
index 76a4603..fdf810c 100644
--- a/bootstrap/commandLink.cfm
+++ b/bootstrap/commandLink.cfm
@@ -17,27 +17,33 @@ case "start" :
 	variables.crlf =  chr(13) & chr(10);
 
 
-	param attributes.action		= "";	// powered by application.Bootstrap.actionRoot;
-	param attributes.binding		= "";
-	param attributes.disabled	= false;
-	param attributes.dropdown	= false;
-	param attributes.href		= "";	// any target
-	param attributes.icon		= "";
-	param attributes.iconAlign	= "left";
-	param attributes.id			= "";
-	param attributes.library		= "default";	// for icon
-	param attributes.look	 	= "default";
-	param attributes.outline		= false;
-	param attributes.processed 	= true;
-	param attributes.rel		= "";
-	param attributes.rendered 	= true;
-	param attributes.role		= "button";
-	param attributes.size		= "";
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.target		= "";
-	param attributes.tooltip		= "";
-	param attributes.value		= "";
+	param attributes.action			= "";	// powered by application.Bootstrap.actionRoot;
+	param attributes.binding			= "";
+	param attributes.disabled		= false;
+	param attributes.dropdown		= false;
+	param attributes.href			= "";	// any target
+	param attributes.icon			= "";
+	param attributes.iconAlign		= "left";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("commandlink");
+	param attributes.key			= "";
+	param attributes.library			= "default";	// for icon
+	param attributes.look	 		= "default";
+	param attributes.outline			= false;
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rel			= "";
+	param attributes.rendered 		= true;
+	param attributes.role			= "button";
+	param attributes.size			= "";
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.target			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition 	= "bottom";
+	param attributes.value			= "";
 	
 	
 	// Patch this
@@ -52,7 +58,10 @@ case "start" :
 			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
 			} // end if	
 		}	// end for
-		
+
+
+	if (!application.Bootstrap.validLook.contains(attributes.look))	throw "This #attributes.look# is an invalid look option";
+
 	
 	if (!attributes.processed) exit "exitTag";
 	break;
@@ -60,49 +69,55 @@ case "start" :
 case "end" :
 
 	
-	if(attributes.value != "")											thisTag.generatedContent = xmlFormat(attributes.value);	
-	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) 	thisTag.generatedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+	if (attributes.value != "")											thisTag.generatedContent = attributes.value;	
+	if (attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) 	thisTag.generatedContent = evaluate("caller.rc.#attributes.binding#");
 
 	// no target of any kind was set AND this is not an anchor
-	if((attributes.action != "" || attributes.href == "") && attributes.id == "")	attributes.href = application.Bootstrap.actionRoot & attributes.action;
+	if ((attributes.action != "" || attributes.href == "") && attributes.id == "")	attributes.href = application.Bootstrap.actionRoot & attributes.action;
 
-	if(attributes.look == 'link')					variables.result &= '<a class="';				// we don't do anything special so that link look like links
-	if(attributes.look != 'link')					variables.result &= '<a class="btn btn-#lcase(attributes.look)#';
-	if(attributes.outline)						variables.result &= "-outline ";
-	if(attributes.disabled)						variables.result &= 'disabled="disabled" ';
-	if(attributes.dropdown)   					variables.result &= 'datatoggle ';
-	if(attributes.size 		!= "")				variables.result &= 'btn-#attributes.size# ';
-	if(attributes.styleClass != "")				variables.result &= '#attributes.styleClass#';	
-											variables.result &= '"';
+	if (attributes.look == 'link')				variables.result &= '<a class="';				// we don't do anything special so that link look like links
+	if (attributes.look != 'link')				variables.result &= '<a class="btn btn-#encodeForHTMLAttribute(attributes.look.lcase())#';
+	if (attributes.outline)						variables.result &= "-outline";
+	if (attributes.size 		!= "")			variables.result &= ' btn-#encodeForHTMLAttribute(attributes.size)#'; // space needed
+	if (attributes.styleClass != "")				variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';
+		
+	if (attributes.dropdown)   					variables.result &= ' datatoggle ';
+	
+											variables.result &= '" '; // end class
+	if (attributes.disabled)						variables.result &= 'disabled="disabled" ';
+											
 
-	if(attributes.href		!= "")				variables.result &= ' href="#attributes.href#"';
-	if(attributes.id		!= "")				variables.result &= ' id="#attributes.id#"';
+	if (attributes.href		!= "")				variables.result &= ' href="#attributes.href#"';
+	if (attributes.id		!= "")				variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 
-	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
 
 
-	if(attributes.rel		!= "")				variables.result &= ' rel="#attributes.rel#"';
-	if(attributes.role		!= "")				variables.result &= ' role="#attributes.role#"';
-	if(attributes.target	!= "")				variables.result &= ' target="#attributes.target#"';
-	if(attributes.tooltip    != "")				variables.result &= ' title="#attributes.tooltip#"';
-	if(attributes.style    	!= "")				variables.result &= ' style="#attributes.style#"';
+	if (attributes.rel		!= "")				variables.result &= ' rel = "#encodeForHTMLAttribute(attributes.rel)#"';
+	if (attributes.role		!= "")				variables.result &= ' role = "#encodeForHTMLAttribute(attributes.role)#"';
+	if (attributes.target	!= "")				variables.result &= ' target = "#encodeForHTMLAttribute(attributes.target)#"';
+	if (attributes.tooltip   != "")				variables.result &= ' title = "#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if (attributes.style    	!= "")				variables.result &= ' style = "#encodeForHTMLAttribute(attributes.style)#"';
 
-	if(attributes.dropdown)						variables.result &= ' data-toggle="dropdown"';
+	if (attributes.dropdown)						variables.result &= ' data-toggle="dropdown"';
 											variables.result &= '>';
 
 	// space on end is not an accident							
 	if (attributes.icon 		!= "" && attributes.iconAlign == "left")	{
-											variables.result &= '<i class="#application.Bootstrap.IconLibrary[attributes.library]##attributes.icon#"></i> ';
+											variables.result &= '<i class="#application.Bootstrap.IconLibrary[attributes.library]##encodeForHTMLAttribute(attributes.icon)#"></i> ';
 											}
-											variables.result &= thisTag.generatedContent; // pass through of content
 	
+	if(!attributes.isSafeHTML)					variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)					variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+
 	
 	// space at start is not an accident
 	if (attributes.icon 		!= "" && attributes.iconAlign == "right")	{
 											variables.result &= ' <i class="#application.Bootstrap.IconLibrary[attributes.library]##attributes.icon#"></i>';
 											}			
 
-	if(attributes.dropdown)						variables.result &= '<span class="caret"></span>';
+	if (attributes.dropdown)						variables.result &= '<span class="caret"></span>';
 											variables.result &= '</a>';
 
 
diff --git a/bootstrap/container.cfm b/bootstrap/container.cfm
index 95a11a8..7f0f732 100644
--- a/bootstrap/container.cfm
+++ b/bootstrap/container.cfm
@@ -15,31 +15,45 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.fluid		= false;
-	param attributes.id			= "";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.tooltip		= "";
-     
-     
+	param attributes.fluid			= false;
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("container"); // Content holds a lot of data. Consider cleaning the inner data instead
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+	
+        
 	if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :     
      
-	if(attributes.fluid)			variables.result &= '<div class="container-fluid';
-	if(!attributes.fluid)			variables.result &= '<div class="container';
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';			
-	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';                     
-	if(attributes.tooltip    != "")    variables.result &= ' tooltip="#attributes.tooltip#"';
-								variables.result &= '>';
-								variables.result &= thisTag.GeneratedContent; // pass through of content
-								variables.result &= '</div><!-- /.container -->';
-								variables.result &= variables.crlf;
+	if(attributes.fluid)				variables.result &= '<div class="container-fluid';
+	if(!attributes.fluid)				variables.result &= '<div class="container';
+	if(attributes.styleClass	!= "")		variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';			
+	   								variables.result &= '"';
+	if(attributes.id		!= "")		variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.style		!= "")		variables.result &= ' style="#encodeForCSS(attributes.style)#"';                     
+	if(attributes.tooltip    != "")   		variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")		variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")		variables.result &= ' data-toggle="tooltip"'; 
+									variables.result &= '>';
+	
+
+	if(!attributes.isSafeHTML)			variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)			variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+					
+								
+									variables.result &= '</div><!-- /.container -->';
+									variables.result &= variables.crlf;
      
      thisTag.GeneratedContent = "";
      if (attributes.rendered)			writeOutput(variables.result);
diff --git a/bootstrap/dropButton.cfm b/bootstrap/dropButton.cfm
index e0a9d41..fd05f0f 100644
--- a/bootstrap/dropButton.cfm
+++ b/bootstrap/dropButton.cfm
@@ -22,25 +22,34 @@ case "start" :
 		throw "This tag must be in #ArrayToList(variables.validTag)#. It appears to be #variables.parentTag#";
 		}
   
-
-	param attributes.look		= "default";
-	param attributes.processed 	= true;
-	param attributes.rendered	= true;
-	param attributes.role		= "button";
-	param attributes.value		= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("dropbutton"); // this really does not work with false
+	param attributes.key			= "";
+	param attributes.look			= "default";
+	param attributes.placeholder		= [];
+	param attributes.processed	 	= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered		= true;
+	param attributes.role			= "button";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.value			= "";
 	
 	if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :
 	if (attributes.look == "tab")		variables.result &= crlf & '<a class="dropdown-toggle" ';
-	if (attributes.look != "tab")		variables.result &= crlf & '<a class="btn btn-#lcase(attributes.look)# dropdown-toggle" ';
+	if (attributes.look != "tab")		variables.result &= crlf & '<a class="btn btn-#encodeForHTMLAttribute(attributes.look.lcase())# dropdown-toggle" ';
+	
+								variables.result &= 'data-toggle="dropdown" role="#EncodeForHTMLAttribute(attributes.role)#">#EncodeForHTML(attributes.value)# <b class="caret"></b></a>';  
+								variables.result &= crlf & '<ul class="dropdown-menu" role="menu">';
+	
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+	
 	
-	variables.result &= 'data-toggle="dropdown" role="#attributes.role#">#attributes.value# <b class="caret"></b></a>';  
-	variables.result &= crlf & '<ul class="dropdown-menu" role="menu">';
-	variables.result &= crlf & thisTag.generatedContent;
-	variables.result &= crlf & '</ul>';
-	variables.result &= crlf & '<!-- /.end dropdown -->';
+								variables.result &= crlf & '</ul>';
+								variables.result &= crlf & '<!-- /.end dropdown -->';
 	
 	
      thisTag.GeneratedContent = "";
diff --git a/bootstrap/dropMenu.cfm b/bootstrap/dropMenu.cfm
index 5049089..88fa42a 100644
--- a/bootstrap/dropMenu.cfm
+++ b/bootstrap/dropMenu.cfm
@@ -16,24 +16,35 @@ case "start" :
 	variables.crlf =  chr(13) & chr(10);
   
 
-	param attributes.active		= false;
-	param attributes.processed 	= true;
-	param attributes.rendered	= true;
-	param attributes.value		= "";
+	param attributes.active			= false;
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("dropmenu");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered		= true;
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.value			= "";
 	
 	if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :     
-     					variables.result &= crlf & '<li class="dropdown';
-     if (attributes.active)	variables.result &=' active';
-						variables.result &= '">';
-						variables.result &= crlf & '<a class="dropdown-toggle" data-toggle="dropdown" role="button">';
-						variables.result &= attributes.value;
-						variables.result &= '<b class="caret"></b></a>';
-						variables.result &= crlf & '<ul class="dropdown-menu" role="menu">';
-						variables.result &= crlf & thisTag.generatedContent;
-						variables.result &= crlf & '</ul></li>';
+     						variables.result &= crlf & '<li class="dropdown';
+     if (attributes.active)		variables.result &=' active';
+							variables.result &= '">';
+							variables.result &= crlf & '<a class="dropdown-toggle" data-toggle="dropdown" role="button">';
+							variables.result &= attributes.value;
+							variables.result &= '<b class="caret"></b></a>';
+							variables.result &= crlf & '<ul class="dropdown-menu" role="menu">';
+						
+	if(!attributes.isSafeHTML)	variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)	variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+					
+						
+						
+							variables.result &= crlf & '</ul></li>';
 	
      thisTag.GeneratedContent = "";
      if (attributes.rendered)			writeOutput(variables.result);
diff --git a/bootstrap/fieldset.cfm b/bootstrap/fieldset.cfm
index e972f85..b50ca9c 100644
--- a/bootstrap/fieldset.cfm
+++ b/bootstrap/fieldset.cfm
@@ -13,38 +13,47 @@ switch (thisTag.ExecutionMode)     {
 case "start" :
 
 	variables.result = "";
-  
-	param attributes.disabled	= false;
-	param attributes.id			= "";
-	param attributes.legend		= "";
-	param attributes.processed 	= true;
-     param attributes.rendered 	= true; // removes content not actuall td
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	
+
+	param attributes.disabled		= false;
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("fieldset");;
+	param attributes.key			= "";
+	param attributes.legend			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered	 	= true; 
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+
 	if (!attributes.processed) exit "exitTag";
 	break;
-     
-case "end" :     
-
-          
-	   							variables.result &= '<fieldset class="';
-		if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';		
-	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.disabled)			variables.result &= ' disabled="disabled"';                
+
+case "end" :
+
+
+								variables.result &= '<fieldset class="';
+	if(attributes.styleClass	!= "")	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';		
+								variables.result &= '"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.disabled)			variables.result &= ' disabled="disabled"';
 								variables.result &= '>';
-	if(attributes.legend	!= "")	variables.result &= '<legend>#attributes.legend#</legend>';							
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+	if(attributes.legend	!= "")	variables.result &= '<legend>#encodeForHTML(attributes.legend)#</legend>';
+	
+	
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
 								variables.result &= '</fieldset>';
-     
-     
-     thisTag.GeneratedContent = "";
+
+
+	thisTag.GeneratedContent = "";
 	if (attributes.rendered)			 writeOutput(variables.result);
-     
+
 	break;
 	}
-     
- 
-</cfscript>
\ No newline at end of file
+
+
+</cfscript>
diff --git a/bootstrap/formGroup.cfm b/bootstrap/formGroup.cfm
index af01be2..89a041c 100644
--- a/bootstrap/formGroup.cfm
+++ b/bootstrap/formGroup.cfm
@@ -15,12 +15,19 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.id			= "";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.tooltip		= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("formgroup");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+     
      
 	if (!attributes.processed) exit "exitTag";
 	break;
@@ -28,13 +35,18 @@ case "start" :
 case "end" :     
      
 	   							variables.result &= variables.crlf & '<div class="form-group';
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';			
+	if(attributes.styleClass	!= "")	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';			
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';                         
-	if(attributes.tooltip    != "")    variables.result &= ' tooltip="#attributes.tooltip#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';           
+	if(attributes.tooltip    != "")    variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
 								variables.result &= '>';
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+								
+	
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+							
 								variables.result &= variables.crlf & '</div><!-- /.form-group -->';
      
      
diff --git a/bootstrap/graphicImage.cfm b/bootstrap/graphicImage.cfm
index e7c7bc2..ceeabb9 100644
--- a/bootstrap/graphicImage.cfm
+++ b/bootstrap/graphicImage.cfm
@@ -7,7 +7,7 @@
 
 <cfscript>
 if (!thisTag.HasEndTag) 
-	abort "An end tag is required for b:p."; 
+	abort "An end tag is required for b:graphicImage."; 
 	
 	
 
@@ -21,17 +21,29 @@ case "start" :
 	param attributes.binding		= "";
 	param attributes.height		= ""; //creates CSS
      param attributes.id			= "";
-     param attributes.library		= "default";
+     // param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("graphicImage");
+     // param attributes.key			= "";
+	param attributes.library		= "default";
+     // param attributes.placeholder		= [];
      param attributes.processed	= true;
+     //param attributes.profile			= application.Bootstrap.profile;
 	param attributes.rendered 	= true;
 	param attributes.shape		= ""; //rounded, circle, thumbnail
 	param attributes.name;
 	param attributes.style		= "";
 	param attributes.styleClass	= "";
 	param attributes.text		= "";
+	//param attributes.throwOnError		= application.Bootstrap.throwOnError;
      param attributes.tooltip		= "";
+     param attributes.tooltipPosition = "bottom";
      param attributes.width		= ""; // creates CSS
      
+     
+     if(!isnumeric(attributes.height)) attributes.height = "";
+     if(!isnumeric(attributes.width)) attributes.width = "";
+     
+     
+     
      variables.arAttrSeries = [];
 		
 	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
@@ -40,25 +52,26 @@ case "start" :
 			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
 			} // end if	
 		}	// end for
-		
+
+
 
 
      if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
 	
 	   							variables.result &= '<img class="';
-	if(attributes.shape		!= "")	variables.result &= ' img-#lcase(attributes.shape)#';
-	if(attributes.text		!= "")	variables.result &= ' text-#attributes.text#';
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';
+	if(attributes.shape		!= "")	variables.result &= ' img-#encodeForHTMLAttribute(attributes.shape.lcase())#';
+	if(attributes.text		!= "")	variables.result &= ' text-#encodeForHTMLAttribute(attributes.text)#';
+	if(attributes.styleClass	!= "")	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 	
-	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
 	
-								variables.result &= ' src="#application.Bootstrap.ImageLibrary[attributes.library]##attributes.name#"';
+								variables.result &= ' src="#application.Bootstrap.ImageLibrary[attributes.library]##encodeForHTMLAttribute(attributes.name)#"';
 	
 	// start style
 	if(attributes.style		!= "" || attributes.height != "" || attributes.width != "")	{
@@ -66,11 +79,11 @@ case "end" :
 								}	
 	if(attributes.height	!= "")	variables.result &= ' height : #attributes.height#px;';
 	if(attributes.width		!= "")	variables.result &= ' width  : #attributes.width#px;';
-								variables.result &= ' #attributes.style#"';
+								variables.result &= ' #encodeForCSS(attributes.style)#"';
 	// end style
 	
-								variables.result &= ' alt="#attributes.alt#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+								variables.result &= ' alt="#encodeForHTMLAttribute(attributes.alt)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';               
 								variables.result &= ' />';
 							
 	
diff --git a/bootstrap/h1.cfm b/bootstrap/h1.cfm
index 56424a6..fd775f8 100644
--- a/bootstrap/h1.cfm
+++ b/bootstrap/h1.cfm
@@ -15,39 +15,65 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.binding		= "";
-	param attributes.id			= "";
-	param attributes.pageHeader	= false;
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-	param attributes.tooltip		= "";
+	param attributes.binding			= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("h1");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.pageHeader		= false;
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
 	
 	
 	variables.myClass = "";
 	if(attributes.text		!= "")	variables.myClass &= 'text-#attributes.text# ';		
-	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';		
-
-
+	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';
+	
+	variables.arAttrSeries = [];
+	
+	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
+		
+	
 	if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :     
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlformat(evaluate("caller.rc.#attributes.binding#"));
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
      
 
 	if(attributes.pageHeader)		variables.result &= '<div class="page-header">';
 	if(variables.myClass == "")		variables.result &= '<h1';
-	if(variables.myClass != "")		variables.result &= '<h1 class="#variables.myClass#"';
+	if(variables.myClass != "")		variables.result &= '<h1 class="#encodeForHTMLAttribute(variables.myClass)#"';
 
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(attributes.id		!= "")	variables.result &= ' id = "#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
+	
+	
+	if(attributes.style		!= "")	variables.result &= ' style = "#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title = "#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';               
 								variables.result &= '>';
 							
-								variables.result &= trim(thisTag.GeneratedContent); // pass through of content
+							
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+							
 	
 								variables.result &= '</h1>' & variables.crlf;
      if(attributes.pageHeader)		variables.result &= '</div><!-- /.page-header -->';
diff --git a/bootstrap/h2.cfm b/bootstrap/h2.cfm
index 8a23b58..c8044d2 100644
--- a/bootstrap/h2.cfm
+++ b/bootstrap/h2.cfm
@@ -15,38 +15,64 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.binding		= "";
-	param attributes.id			= "";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true; 
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-	param attributes.tooltip		= "";
+	param attributes.binding			= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("h2");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed	 	= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true; 
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
 
 
 	variables.myClass = "";
 	if(attributes.text		!= "")	variables.myClass &= 'text-#attributes.text# ';		
-	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';	
+	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';
+	
+	
+	variables.arAttrSeries = [];
+	
+	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
+		
 
 
+	
 	if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :
-	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
 	
 	
 	if(variables.myClass == "")		variables.result &= '<h2';
-	if(variables.myClass != "")		variables.result &= '<h2 class="#variables.myClass#"';
+	if(variables.myClass != "")		variables.result &= '<h2 class="#encodeForHTMLAttribute(variables.myClass)#"';
 
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
+	
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';               
 								variables.result &= '>';
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+							
 							
-								variables.result &= trim(thisTag.GeneratedContent); // pass through of content
-	
 								variables.result &= '</h2>' & variables.crlf;
      
     
diff --git a/bootstrap/h3.cfm b/bootstrap/h3.cfm
index 4bfd92f..e5132a1 100644
--- a/bootstrap/h3.cfm
+++ b/bootstrap/h3.cfm
@@ -15,14 +15,20 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
 	  
-	param attributes.binding		= "";
-	param attributes.id			= "";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true; 
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-	param attributes.tooltip		= "";
+	param attributes.binding			= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("h3");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered	 	= true; 
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
 
 
 	variables.myClass = "";
@@ -30,23 +36,44 @@ case "start" :
 	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';
 	
 
+	variables.arAttrSeries = [];
+	
+	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
+		
+
+	
 	if (!attributes.processed) exit "exitTag";
 	break;
-     
+
 case "end" :     
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
      
      
      if(variables.myClass == "")		variables.result &= '<h3';
-	if(variables.myClass != "")		variables.result &= '<h3 class="#variables.myClass#"';
+	if(variables.myClass != "")		variables.result &= '<h3 class="#encodeForHTMLAttribute(variables.myClass)#"';
 
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
-								variables.result &= '>';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 
-								variables.result &= trim(thisTag.GeneratedContent); // pass through of content
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
+		
 	
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';           
+								variables.result &= '>';
+
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+
+		
 								variables.result &= '</h3>' & variables.crlf;
      
 
diff --git a/bootstrap/h4.cfm b/bootstrap/h4.cfm
index 35e86d4..73609ba 100644
--- a/bootstrap/h4.cfm
+++ b/bootstrap/h4.cfm
@@ -15,37 +15,63 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.binding		= "";
-     param attributes.id			= "";
-     param attributes.processed 	= true;
-	param attributes.rendered 	= true; 
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-     param attributes.tooltip		= "";
+	param attributes.binding			= "";
+     param attributes.id				= "";
+     param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("h4");
+     param attributes.key			= "";
+	param attributes.placeholder		= [];
+     param attributes.processed 		= true;
+     param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true; 
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+     param attributes.tooltip			= "";
+     param attributes.tooltipPosition	= "bottom";
 
 
 	variables.myClass = "";
 	if(attributes.text		!= "")	variables.myClass &= 'text-#attributes.text# ';		
 	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';	
 	
+	
+	variables.arAttrSeries = [];
+	
+	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
+		
 
+
+ 
      if (!attributes.processed) exit "exitTag";
      break;
      
 case "end" :
-    	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlformat(evaluate("caller.rc.#attributes.binding#"));
+    	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
      
      
      if(variables.myClass == "")		variables.result &= '<h4';
-	if(variables.myClass != "")		variables.result &= '<h4 class="#variables.myClass#"';
+	if(variables.myClass != "")		variables.result &= '<h4 class="#encodeForHTMLAttribute(variables.myClass)#"';
 
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
+		
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';     
 								variables.result &= '>';
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
 							
-								variables.result &= trim(thisTag.GeneratedContent); // pass through of content
 	
 								variables.result &= '</h4>' & variables.crlf;
      
diff --git a/bootstrap/h5.cfm b/bootstrap/h5.cfm
index 2307e21..0222ab8 100644
--- a/bootstrap/h5.cfm
+++ b/bootstrap/h5.cfm
@@ -15,39 +15,62 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.binding		= "";
-     param attributes.id			= "";
-     param attributes.processed 	= true;
-	param attributes.rendered 	= true; 
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-     param attributes.tooltip		= "";
+	param attributes.binding			= "";
+     param attributes.id				= "";
+     param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("h5");
+     param attributes.key			= "";
+    	param attributes.placeholder		= [];
+     param attributes.processed 		= true;
+     param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true; 
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+     param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
 
 
 	variables.myClass = "";
 	if(attributes.text		!= "")	variables.myClass &= 'text-#attributes.text# ';		
 	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';	
 	
-
+	
+   	variables.arAttrSeries = [];
+	
+	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
+		
+     
      if (!attributes.processed) exit "exitTag";
-	break;
+     break;
      
 case "end" :
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
      
      
      if(variables.myClass == "")		variables.result &= '<h5';
-	if(variables.myClass != "")		variables.result &= '<h5 class="#variables.myClass#"';
-
+	if(variables.myClass != "")		variables.result &= '<h5 class="#encodeForHTMLAttribute(variables.myClass)#"';
      
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
+		
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';             
 								variables.result &= '>';
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
 							
-								variables.result &= trim(thisTag.GeneratedContent); // pass through of content
-	
+						
 								variables.result &= '</h5>' & variables.crlf;
      
      
diff --git a/bootstrap/h6.cfm b/bootstrap/h6.cfm
index 010f217..b7074a5 100644
--- a/bootstrap/h6.cfm
+++ b/bootstrap/h6.cfm
@@ -15,38 +15,61 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.binding		= "";
-     param attributes.id			= "";
-     param attributes.processed 	= true;
-	param attributes.rendered 	= true; 
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-     param attributes.tooltip		= "";
+	param attributes.binding			= "";
+     param attributes.id				= "";
+     param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("h6");
+    	param attributes.key			= "";
+    	param attributes.placeholder		= [];
+     param attributes.processed 		= true;
+     param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true; 
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+     param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
 
 
 	variables.myClass = "";
 	if(attributes.text		!= "")	variables.myClass &= 'text-#attributes.text# ';		
-	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';	
-
+	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';
+	
+	
+	variables.arAttrSeries = [];
+	
+	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
+		
 
 	if (!attributes.processed) exit "exitTag";
      break;
      
 case "end" :     
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
      
 	if(variables.myClass == "")		variables.result &= '<h6';
-	if(variables.myClass != "")		variables.result &= '<h6 class="#variables.myClass#"';
-
+	if(variables.myClass != "")		variables.result &= '<h6 class="#encodeForHTMLAttribute(variables.myClass)#"';
         
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
+		
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';              
 								variables.result &= '>';
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
 							
-								variables.result &= trim(thisTag.GeneratedContent); // pass through of content
-	
+						
 								variables.result &= '</h6>' & variables.crlf;
      
      
diff --git a/bootstrap/head.cfm b/bootstrap/head.cfm
new file mode 100644
index 0000000..b9e89a7
--- /dev/null
+++ b/bootstrap/head.cfm
@@ -0,0 +1,42 @@
+<!---@ Description: Support for head. The real strenth in this tag comes from how it interacts with outputScript and outputStyleSheet --->
+
+
+
+<cfscript>
+if (!thisTag.HasEndTag) 
+	abort "An end tag is required for b:head"; 
+	
+	
+
+switch (thisTag.ExecutionMode)     {
+case "start" :
+	
+	variables.result = "";
+
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("head");
+
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+
+
+	if (!attributes.processed) exit "exitTag";
+	break;
+case "end" :   
+
+
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+	
+
+	
+		
+	thisTag.GeneratedContent = "";
+	if (attributes.rendered)			writeOutput(variables.result);	
+
+ 	break;
+	}
+ </cfscript>
+ 
+ 
\ No newline at end of file
diff --git a/bootstrap/icon.cfm b/bootstrap/icon.cfm
index 920f5fe..cfc4737 100644
--- a/bootstrap/icon.cfm
+++ b/bootstrap/icon.cfm
@@ -14,19 +14,25 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.addon		= false;
-	param attributes.binding		= "";
-	param attributes.id			= "";
-	param attributes.library		= "default";
-	param attributes.look		= "";
-	param attributes.name		= "";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.size		= "";
-     param attributes.spin		= false;
-     param attributes.style		= "";
-     param attributes.styleClass	= "";
-     param attributes.tooltip		= "";
+	param attributes.addon			= false;
+	param attributes.binding			= "";
+	param attributes.id				= "";
+	// param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("icon");
+	param attributes.library			= "default";
+	param attributes.look			= "";
+	// param attributes.key			= "";
+	param attributes.name			= "";
+	// param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	// param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.size			= "";
+     param attributes.spin			= false;
+     param attributes.style			= "";
+     param attributes.styleClass		= "";
+     // param attributes.throwOnError		= application.Bootstrap.throwOnError;
+     param attributes.tooltip			= "";
+     param attributes.tooltipPosition = "bottom";
      
 
     	variables.arAttrSeries = [];
@@ -39,25 +45,29 @@ case "start" :
 			} // end if	
 		}	// end for
      
-	if (!attributes.processed) exit "exitTag";
+
+	if (!attributes.processed) exit "exitTag";	
 	break;
      
 case "end" :
-	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) attributes.name = xmlFormat(evaluate("caller.rc.#attributes.binding#"));    
+	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) attributes.name = evaluate("caller.rc.#attributes.binding#");    
      
 	if(attributes.addon)			variables.result &= '<span class="input-group-addon">';
-	   							variables.result &= '<i class="#application.Bootstrap.IconLibrary[attributes.library]##attributes.name#';
-	if(attributes.look 		!= "")	variables.result &= ' text-#lcase(attributes.look)#';
-	if(attributes.size 		!= "")	variables.result &= ' fa-#attributes.size#';
+	   							variables.result &= '<i class="#application.Bootstrap.IconLibrary[attributes.library]##encodeForHTMLAttribute(attributes.name)#';
+	if(attributes.look 		!= "")	variables.result &= ' text-#encodeForHTMLAttribute(attributes.look.lcase())#';
+	if(attributes.size 		!= "")	variables.result &= ' fa-#encodeForHTMLAttribute(attributes.size)#';
 	if(attributes.spin)				variables.result &= ' fa-spin';
-	if(attributes.styleClass != "") 	variables.result &= ' #attributes.styleClass#';  							
+	if(attributes.styleClass != "") 	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';  							
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
 	
-	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
+	if(attributes.style 	!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")    variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
 	
-	if(attributes.style 	!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")    variables.result &= ' title="#attributes.tooltip#"';
 								variables.result &= '></i>';
 	if(attributes.addon)			variables.result &= '</span>';
      
diff --git a/bootstrap/jumbotron.cfm b/bootstrap/jumbotron.cfm
index 53c6d8e..5f51134 100644
--- a/bootstrap/jumbotron.cfm
+++ b/bootstrap/jumbotron.cfm
@@ -15,12 +15,18 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.id			= "";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.tight		= false;
-	param attributes.tooltip		= "";
-     
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("jumbotron");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tight			= false;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition 	= "bottom";     
+
 	if (!attributes.processed) exit "exitTag";
 	break;
      
@@ -28,11 +34,16 @@ case "end" :
      
      							variables.result &= variables.crlf;
 								variables.result &= '<div class="jumbotron"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.tooltip    != "")    variables.result &= ' tooltip="#attributes.tooltip#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.tooltip    != "")    variables.result &= ' tooltip="#encodeForHTMLAttribute(attributes.tooltip)#"';
 	if(attributes.tight)			variables.result &= ' style="margin : 0; padding-top : 0; padding-right : 0"';
 								variables.result &= '>';
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+								
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+							
+
 								variables.result &= '</div><!-- /.jumbotron -->';
 								variables.result &= variables.crlf;
 											
diff --git a/bootstrap/label.cfm b/bootstrap/label.cfm
index d3b1615..ad347b7 100644
--- a/bootstrap/label.cfm
+++ b/bootstrap/label.cfm
@@ -15,33 +15,63 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.binding		= "";
-	param attributes.id			= "";
-	param attributes.look 	= "default";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.tooltip		= "";
-	param attributes.value		= "";
+	param attributes.binding			= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("label");
+	param attributes.look 			= "default";
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+	param attributes.value			= "";
 	
 	
-	if (structKeyExists(attributes, "text")) throw "attributes.text is an invalid option. Don't even think of using it";
+	if (attributes.keyExists("text")) 						throw "attributes.text is an invalid option. Don't even think of using it";
+	
+	
+	variables.arAttrSeries = [];
+	
+	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
+     
+     
      if (!attributes.processed) exit "exitTag";
-	break;
+     break;
      
 case "end" :     
      
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) attributes.text = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+     if(attributes.value != "")											thisTag.generatedContent = attributes.value;
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) 	thisTag.generatedContent = evaluate("caller.rc.#attributes.binding#");
      
 	
-	   							variables.result &= '<span class="label label-#lcase(attributes.look)#"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
- 	if(attributes.tooltip    != "")    variables.result &= ' title="#attributes.tooltip#"';
+	   							variables.result &= '<span class="label label-#encodeForHTMLAttribute(attributes.look.lcase())#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
+		
+	if(attributes.tooltip    != "")    variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
+ 	
 								variables.result &= '>';
-								variables.result &= attributes.value; // pass through of content
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+							
+
 								variables.result &= '</span>';
-     
+   
 
-  	thisTag.GeneratedContent = ""; // This tag does not have pass through
+	thisTag.GeneratedContent = ""; // This tag does not have pass through
      if (attributes.rendered)			writeOutput(variables.result);
      
 	break;
diff --git a/bootstrap/modal.cfm b/bootstrap/modal.cfm
index 9a4c2f8..417e3ab 100644
--- a/bootstrap/modal.cfm
+++ b/bootstrap/modal.cfm
@@ -19,15 +19,21 @@ case "start" :
 	param attributes.closable		= true;
 	if(!structKeyExists(attributes, "close-on-escape")) attributes["close-on-escape"] = true;
 	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("modal");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
 	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
 	param attributes.rendered 		= true;
 	param attributes.size			= "";
      param attributes.styleClass		= "";
+     param attributes.throwOnError		= application.Bootstrap.throwOnError;
 	param attributes.title			= "";
 	param attributes.showSubmit		= false;
 	param attributes.submitValue		= "Save Changes";
 	
 	
+	
      if (!attributes.processed) exit "exitTag";
 	break;
      
@@ -35,10 +41,10 @@ case "end" :
      
      
 	   							variables.result &= variables.crlf & '<div class="modal fade';
-	if(attributes.styleClass != "")	variables.result &= ' #attributes.styleClass#';
+	if(attributes.styleClass != "")	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';
 								variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.backdrop	!= true)	variables.result &= ' data-backdrop="#attributes.backdrop#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.backdrop	!= true)	variables.result &= ' data-backdrop="#encodeForHTMLAttribute(attributes.backdrop)#"';
 	if(!attributes["close-on-escape"])	variables.result &= ' data-keyboard="false"';
 	
 	
@@ -47,16 +53,20 @@ case "end" :
 	   							variables.result &= variables.crlf & '<div class="modal-dialog">';
 	   							variables.result &= variables.crlf & '<div class="modal-content">';
 	   							variables.result &= variables.crlf & '<div class="modal-header">';
-	if(attributes.closable)			variables.result &= variables.crlf & '<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>';   													variables.result &= '<h4 class="modal-title">#attributes.title#</h4>';
+	if(attributes.closable)			variables.result &= variables.crlf & '<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>';   													variables.result &= '<h4 class="modal-title">#encodeForHTML(attributes.title)#</h4>';
 								variables.result &= variables.crlf & '</div><!-- /.modal-header -->';
 
 								variables.result &= variables.crlf & '<div class="modal-body">';
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+							
+								
 								variables.result &= variables.crlf & '</div><!-- /.modal-body -->';	
 
 								variables.result &= variables.crlf & '<div class="modal-footer">';
 								variables.result &= variables.crlf & '<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>';
-	if(attributes.showSubmit)		variables.result &= variables.crlf & '<button type="submit" class="btn btn-primary">#xmlFormat(attributes.submitValue)#</button>';
+	if(attributes.showSubmit)		variables.result &= variables.crlf & '<button type="submit" class="btn btn-primary">#encodeForHTML(attributes.submitValue)#</button>';
 								variables.result &= variables.crlf & '</div><!-- /.modal-footer -->';
 								variables.result &= variables.crlf & '</div><!-- /.modal-content -->';
 								variables.result &= variables.crlf & '</div><!-- /.modal-dialog -->';
diff --git a/bootstrap/navBar.cfm b/bootstrap/navBar.cfm
index 2d74364..dc54b87 100644
--- a/bootstrap/navBar.cfm
+++ b/bootstrap/navBar.cfm
@@ -15,45 +15,55 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.brand		= "";
-	param attributes.brandHref	= "";
-	param attributes.fixed		= "";
-	param attributes.inverse		= false;
-	param attributes.processed 	= true;
-     param attributes.rendered 	= true;
-	param attributes.static		= false;
+	param attributes.brand			= "";
+	param attributes.brandHref		= "";
+	param attributes.fixed			= "";
+	param attributes.key			= "";
+	param attributes.inverse			= false;
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("navbar");
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.placeholder		= [];
+     param attributes.rendered 		= true;
+	param attributes.static			= false;
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
 	
 	if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :     
      
-     if (!attributes.inverse)		variables.result &= '<nav class="navbar navbar-default';
-     if (attributes.inverse)		variables.result &= '<nav class="navbar navbar-inverse';
-	if (attributes.fixed != "")	variables.result &= ' navbar-fixed-#attributes.fixed#';     
-     						variables.result &= ' ">';
-							variables.result &= crlf & '<div class="container-fluid">';
-     						variables.result &= crlf & '<div class="navbar-header">';
+     if (!attributes.inverse)			variables.result &= '<nav class="navbar navbar-default';
+     if (attributes.inverse)			variables.result &= '<nav class="navbar navbar-inverse';
+	if (attributes.fixed != "")		variables.result &= ' navbar-fixed-#encodeForHTMLAttribute(attributes.fixed)#';     
+     							variables.result &= ' ">';
+								variables.result &= crlf & '<div class="container-fluid">';
+     							variables.result &= crlf & '<div class="navbar-header">';
      						
-							variables.result &= '<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" aria-expanded="false">';
-							variables.result &= crlf & '<span class="sr-only">Toggle navigation</span>';
-     						variables.result &= crlf & '<span class="icon-bar"></span>';
-     						variables.result &= crlf & '<span class="icon-bar"></span>';
-     						variables.result &= crlf & '<span class="icon-bar"></span>';
-     						variables.result &= crlf & '</button>';
+								variables.result &= '<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" aria-expanded="false">';
+								variables.result &= crlf & '<span class="sr-only">Toggle navigation</span>';
+     							variables.result &= crlf & '<span class="icon-bar"></span>';
+     							variables.result &= crlf & '<span class="icon-bar"></span>';
+								variables.result &= crlf & '<span class="icon-bar"></span>';
+     							variables.result &= crlf & '</button>';
 
-	if (attributes.brand != "" && attributes.brandHref == "")	variables.result &= '<a class="navbar-brand" href="##">#attributes.Brand#</a>';						
-	if (attributes.brand != "" && attributes.brandHref != "")	variables.result &= '<a class="navbar-brand" href="#attributes.brandHref#">#attributes.Brand#</a>';						
+	if (attributes.brand != "" && attributes.brandHref == "")	variables.result &= '<a class="navbar-brand" href="##">#encodeForHTMLAttribute(attributes.Brand)#</a>';						
+	if (attributes.brand != "" && attributes.brandHref != "")	variables.result &= '<a class="navbar-brand" href="#encodeForHTMLAttribute(attributes.brandHref)#">#encodeForHTML(attributes.Brand)#</a>';						
 
-							variables.result &= '</div><!-- /.navbar-header -->';	// end of Brand and Hamburger area
+								variables.result &= '</div><!-- /.navbar-header -->';	// end of Brand and Hamburger area
 							
 	// Collect the nav links, forms, and other content for toggling 
-							variables.result &= '<div class="collapse navbar-collapse">';
-							variables.result &= thisTag.GeneratedContent;
-							variables.result &= variables.crlf & '</div><!-- /.navbar-collapse -->';
-							variables.result &= variables.crlf & '</div><!-- /.container-fluid -->';
-							variables.result &= '</nav>
-							';
+								variables.result &= '<div class="collapse navbar-collapse">';
+							
+							
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+						
+							
+							
+								variables.result &= variables.crlf & '</div><!-- /.navbar-collapse -->';
+								variables.result &= variables.crlf & '</div><!-- /.container-fluid -->';
+								variables.result &= '</nav>';
 							
      
       thisTag.GeneratedContent = "";
diff --git a/bootstrap/navBarLinks.cfm b/bootstrap/navBarLinks.cfm
index 9531f9f..934b5f8 100644
--- a/bootstrap/navBarLinks.cfm
+++ b/bootstrap/navBarLinks.cfm
@@ -14,33 +14,45 @@ case "start" :
 
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
-  
-	param attributes.id			= "";
-	param attributes.processed 	= true;
-	param attributes.pull		= "";
-	param attributes.rendered 	= true;
-	param attributes.tooltip		= "";
+
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("navbarlinks");
+	//param attributes.key			= "";
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.pull			= "";
+	//param attributes.placeholder		= [];
+	param attributes.rendered 		= true;
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+	
 	
 	if (!attributes.processed) exit "exitTag";
 	break;
-     
-case "end" :     
-     
-    								variables.result &= '<ul class="nav navbar-nav';
-   	if(attributes.pull != "")		variables.result &= ' navbar-#attributes.pull#';					
-     	   						variables.result &= '"';
-	if (attributes.tooltip    != "")   variables.result &= ' title="#attributes.tooltip#"';
-		   						variables.result &= '>';
-        							
-     	   						variables.result &= variables.crlf & thisTag.GeneratedContent;
-     	   							
-       	   						variables.result &= variables.crlf & '</ul><!-- /.nav -->';
-     
-     thisTag.GeneratedContent = "";
-     if (attributes.rendered)			writeOutput(variables.result);
-     
+
+case "end" :
+
+								variables.result &= '<ul class="nav navbar-nav';
+	if (attributes.pull != "")		variables.result &= ' navbar-#encodeForHTMLAttribute(attributes.pull)#';
+								variables.result &= '"';
+	if (attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if (attributes.tooltip	!= "")	variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if (attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if (attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
+								variables.result &= '>';
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+								
+
+								variables.result &= variables.crlf & '</ul><!-- /.nav -->';
+
+								thisTag.GeneratedContent = "";
+	if (attributes.rendered)			writeOutput(variables.result);
+
 	break;
 	}
-     
- 
+
+
 </cfscript>
\ No newline at end of file
diff --git a/bootstrap/navLink.cfm b/bootstrap/navLink.cfm
index a692d7f..33e6bb7 100644
--- a/bootstrap/navLink.cfm
+++ b/bootstrap/navLink.cfm
@@ -17,18 +17,23 @@ case "start" :
 	variables.crlf =  chr(13) & chr(10);
   
 	param attributes.active		= false;
-	param attributes.binding		= "";
-	param attributes.disabled	= false;
-	param attributes.fragment	= false;
-	param attributes.icon		= "";
-	param attributes.iconAlign	= "left";
-	param attributes.id			= "";
-	param attributes.header		= "";
-	param attributes.href		= "";
-	param attributes.library		= "default"; //for icons
-	param attributes.processed	= true;
-	param attributes.rendered 	= true;
-	param attributes.value		= "";
+	param attributes.binding			= "";
+	param attributes.disabled		= false;
+	param attributes.fragment		= false;
+	param attributes.icon			= "";
+	param attributes.iconAlign		= "left";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("navLink");
+	param attributes.header			= "";
+	param attributes.href			= "";
+	param attributes.key			= "";
+	param attributes.library			= "default"; //for icons
+	param attributes.processed		= true;
+	param attributes.placeholder		= [];
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.value			= "";
 	
 	
 	// Patch this
@@ -45,19 +50,21 @@ case "start" :
 			} // end if	
 		}	// end for
      
+     
+     
      if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :
 
-	if(attributes.value != "")											thisTag.generatedContent = xmlFormat(attributes.value);
-	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) 	thisTag.generatedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+	if(attributes.value != "")											thisTag.generatedContent = attributes.value;
+	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) 	thisTag.generatedContent = evaluate("caller.rc.#attributes.binding#");
 
      
      if (thisTag.generatedContent == "" && attributes.header == "")
      								variables.result &= '<li role="separator" class="divider"></li>';
      
-     if (attributes.header != "")			variables.result &= '<li class="dropdown-header">#attributes.header#</li>';
+     if (attributes.header != "")			variables.result &= '<li class="dropdown-header">#encodeForHTML(attributes.header)#</li>';
      
  	if (thisTag.generatedContent != "")				{
      											variables.result &= '<li';
@@ -65,18 +72,23 @@ case "end" :
      	if(attributes.disabled)						variables.result &= ' class="disabled"';						  			
 												variables.result &= '>';
 	
-												variables.result &= '<a href="#attributes.href#';
-		if(attributes.fragment != false)				variables.result &= '###attributes.fragment#';
+												variables.result &= '<a href="#encodeForHTMLAttribute(attributes.href)#';
+		if(attributes.fragment != false)				variables.result &= '###encodeForURL(attributes.fragment)#';
 												variables.result &= '"';
-		if(attributes.id		!= "")				variables.result &= ' id="#attributes.id#"';
+		if(attributes.id		!= "")				variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 		
-		for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
+		for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
 		
 												variables.result &= '>';
 		if(attributes.icon != "" && attributes.iconAlign == "left")		{
 												variables.result &= '<i class="#application.Bootstrap.IconLibrary[attributes.library]##attributes.icon#"></i> ';
-												}		
-																	variables.result &= thisTag.generatedContent; // pass through of content
+												}
+												
+	if (!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if ( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+											
+												
+														
 		if(attributes.icon != "" && attributes.iconAlign == "right")	{
 												variables.result &= '<i class="#application.Bootstrap.IconLibrary[attributes.library]##attributes.icon#"></i> ';
 												}
diff --git a/bootstrap/outputScript.cfm b/bootstrap/outputScript.cfm
index c73ca0b..4d5e7ee 100644
--- a/bootstrap/outputScript.cfm
+++ b/bootstrap/outputScript.cfm
@@ -14,6 +14,15 @@ case "start" :
 
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
+	
+	
+	variables.parentTag = getBaseTagList().listGetAt(2).lcase();
+	variables.validTag = ["cf_head"];
+	
+	if(!variables.validTag.contains(variables.parentTag) )	{
+		throw "This tag must be in #variables.validTag.toList()#. It appears to be #variables.parentTag#";
+		}
+	
   
 	param attributes.library		= "default";
 	param attributes.name		= "";		// if name is blank, the library better have complete target
@@ -28,8 +37,11 @@ case "end" :
      							variables.result &= crlf;
 	   							variables.result &= '<script ';
 	   							variables.result &= ' src="' & application.Bootstrap.ScriptLibrary[attributes.library] & attributes.name & '"';
-								variables.result &= ' type="#attributes.type#"';              
+								variables.result &= ' type="#encodeForHTMLAttribute(attributes.type)#"';              
 								variables.result &= '>';
+								
+								variables.result &= thisTag.GeneratedContent.trim();
+								
 								variables.result &= '</script>';
 
      
diff --git a/bootstrap/outputStylesheet.cfm b/bootstrap/outputStylesheet.cfm
index 12dd69a..ca3b47f 100644
--- a/bootstrap/outputStylesheet.cfm
+++ b/bootstrap/outputStylesheet.cfm
@@ -14,6 +14,14 @@ case "start" :
 
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
+	
+	
+	variables.parentTag = getBaseTagList().listGetAt(2).lcase();
+	variables.validTag = ["cf_head"];
+	
+	if(!variables.validTag.contains(variables.parentTag) )	{
+		throw "This tag must be in #variables.validTag.toList()#. It appears to be #variables.parentTag#";
+		}
   
 	param attributes.library		= "default";
 	param attributes.media		= "";
@@ -33,6 +41,9 @@ case "end" :
 	if(attributes.media		!= "")	variables.result &= ' media="#attributes.media#"';
 								variables.result &= ' rel="#attributes.rel#"';              
 								variables.result &= '>';
+								
+								variables.result &= thisTag.GeneratedContent.trim();
+								
 								variables.result &= '</link>';
 
      
diff --git a/bootstrap/outputText.cfm b/bootstrap/outputText.cfm
index 72cf848..80a22a5 100644
--- a/bootstrap/outputText.cfm
+++ b/bootstrap/outputText.cfm
@@ -1,4 +1,4 @@
-<!---@ Description: Support for outputText --->
+<!---@ Description: Support for outputText. The wraps content in span. This is similar to http://www.jsftoolbox.com/documentation/help/12-TagReference/html/h_outputText.html --->
 
 
 
@@ -15,14 +15,20 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.binding		= "";
-     param attributes.id			= "";
-     param attributes.processed	= true;
-	param attributes.rendered 	= true;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-     param attributes.tooltip		= "";
+	param attributes.binding			= "";
+     param attributes.id				= "";
+     param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("outputText");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+     param attributes.processed		= true;
+     param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+     param attributes.tooltip			= "";
+     param attributes.tooltipPosition	= "bottom";
      
      
      
@@ -40,30 +46,32 @@ case "start" :
 			} // end if	
 		}	// end for
 		
-     
-
 
      if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
 	
 								variables.result &= variables.crlf;
 	if(variables.myClass == "")		variables.result &= '<span';
-	if(variables.myClass != "")		variables.result &= '<span class="#variables.myClass#"';							
+	if(variables.myClass != "")		variables.result &= '<span class="#encodeForHTMLAttribute(variables.myClass)#"';							
 				
 		   							
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 	
-	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
 	
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';           
 								variables.result &= '>';
-							
-								variables.result &= trim(thisTag.GeneratedContent); // pass through of content
-	
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+
 								variables.result &= '</span>';
 								variables.result &= variables.crlf;
 								
diff --git a/bootstrap/p.cfm b/bootstrap/p.cfm
index 62c24cc..c73a63a 100644
--- a/bootstrap/p.cfm
+++ b/bootstrap/p.cfm
@@ -6,60 +6,84 @@
 <cfscript>
 if (!thisTag.HasEndTag) 
 	abort "An end tag is required for b:p."; 
-	
-	
 
-switch (thisTag.ExecutionMode)     {
+
+
+switch (thisTag.ExecutionMode)	{
 case "start" :
 
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
-  
-	param attributes.binding		= "";
-     param attributes.id			= "";
-     param attributes.lead		= false;
-     param attributes.processed	= true;
-	param attributes.rendered 	= true;
-	param attributes.static		= false;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-     param attributes.tooltip		= "";
-     
-
-     variables.myClass = "";
-     if(attributes.lead)				variables.result &= 'lead ';
-	if(attributes.static)			variables.result &= 'form-control-static ';						
-	if(attributes.text		!= "")	variables.myClass &= 'text-#attributes.text# ';		
-	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';		
-
-
-     if (!attributes.processed) exit "exitTag";
+
+	param attributes.binding			= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("p");
+	param attributes.key			= "";
+	param attributes.lead			= false;
+	param attributes.placeholder		= [];
+	param attributes.processed		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.static			= false;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+
+
+	variables.myClass = "";
+	if(attributes.lead == "lead")		variables.lead = true;
+	if(attributes.lead)				variables.result &= 'lead ';
+	if(attributes.static)			variables.result &= 'form-control-static ';
+	if(attributes.text		!= "")	variables.myClass &= 'text-#attributes.text# ';
+	if(attributes.styleClass	!= "")	variables.myClass &= '#attributes.styleClass# ';
+
+	variables.arAttrSeries = [];
+	
+	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
+
+
+	if (!attributes.processed) exit "exitTag";
 	break;
-     
+
 case "end" :
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
-	
+	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
+
 								variables.result &= variables.crlf;
-	if(variables.myClass == "")		variables.result &= '<p';
-	if(variables.myClass != "")		variables.result &= '<p class="#variables.myClass#"';							
-				
-		   							
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(variables.myClass	== "")	variables.result &= '<p';
+	if(variables.myClass	!= "")	variables.result &= '<p class = "#encodeForHTMLAttribute(variables.myClass)#"';
+
+
+	if(attributes.id		!= "")	variables.result &= ' id = "#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';	
+	
+	if(attributes.style		!= "")	variables.result &= ' style = "#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip	!= "")	variables.result &=	' title = "#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
 								variables.result &= '>';
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
 							
-								variables.result &= trim(thisTag.GeneratedContent); // pass through of content
-	
+
 								variables.result &= '</p>';
 								variables.result &= variables.crlf;
-								
-     
-     
-     thisTag.GeneratedContent = "";
-     if (attributes.rendered)			writeOutput(variables.result);
-     
+
+
+
+	thisTag.GeneratedContent = "";
+	if (attributes.rendered)			writeOutput(variables.result);
+
 	break;
 	}
- </cfscript>
\ No newline at end of file
+</cfscript>
\ No newline at end of file
diff --git a/bootstrap/panel.cfm b/bootstrap/panel.cfm
index 92c6a33..3b02af8 100644
--- a/bootstrap/panel.cfm
+++ b/bootstrap/panel.cfm
@@ -15,58 +15,72 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.collapsed	= false;
-	param attributes.collapsible	= true;
-	param attributes.contentClass	= "";
-	param attributes.contentStyle	= "";
-	param attributes.footer		= "";
-     param attributes.footerClass	= "";
-     param attributes.footerStyle	= "";
-	param attributes.id			= "";
-	param attributes.look		= "default";
-	param attributes.processed	= true;
-	param attributes.rendered 	= true;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.title		= "";
-     param attributes.titleClass	= "";
-     param attributes.titleStyle	= "";
-     param attributes.tooltip		= "";
+	param attributes.collapsed		= false;
+	param attributes.collapsible		= true;
+	param attributes.contentClass		= "";
+	param attributes.contentStyle		= "";
+	param attributes.footer			= "";
+     param attributes.footerClass		= "";
+     param attributes.footerStyle		= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("panel");
+	param attributes.look			= "default";
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.title			= "";
+     param attributes.titleClass		= "";
+     param attributes.titleStyle		= "";
+    	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+     param attributes.tooltip			= "";
+     param attributes.tooltipPosition	= "bottom";
+     
      
      if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :     
      
-	   							variables.result &= '<div class="panel panel-#lcase(attributes.look)#';
-	if(attributes.styleClass != "") 	variables.result &= ' #attribites.styleClass#';						
+	   							variables.result &= '<div class="panel panel-#encodeForHTMLAttribute(attributes.look.lcase())#';
+	if (attributes.styleClass != "") 	variables.result &= ' #encodeForHTMLAttribute(attribites.styleClass)#';						
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")    variables.result &= ' tooltip="#attributes.tooltip#"';
+	if (attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if (attributes.style	!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if (attributes.tooltip   != "")    variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if (attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if (attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
 	   							variables.result &= '>';
 	   							
 	   							
 	if (attributes.title != "") 		variables.result &= '<div class="panel-heading';
-	if (attributes.title != "" && attributes.titleClass != "") 	variables.result &= attributes.titleClass;
+	if (attributes.title != "" && attributes.titleClass != "") 	variables.result &= encodeForHTMLAttribute(attributes.titleClass);
 	if (attributes.title != "")		variables.result &= '"'; // end class
-	if (attributes.title != "" && attributes.titleStyle != "")	variables.result &= ' style="#attributes.titleStyle#"';
-	if (attributes.title != "")		variables.result &= '>#attributes.title#</div>';  							
+	if (attributes.title != "" && attributes.titleStyle != "")	variables.result &= ' style="#encodeForCSS(attributes.titleStyle)#"';
+	if (attributes.title != "")		variables.result &= '>#encodeForHTML(attributes.title)#</div>';  							
 	   							
 								variables.result &= '<div class="panel-body'; 
-	if(attributes.contentClass	!= "")	variables.result &= ' #attributes.contentClass#';		
+	if(attributes.contentClass	!= "")	variables.result &= ' #encodeForHTMLAttribute(attributes.contentClass)#';		
 	   							variables.result &= '"';
 	
-	if(attributes.contentStyle		!= "")	variables.result &= ' style="#attributes.contentStyle#"';                 
+	if(attributes.contentStyle		!= "")	variables.result &= ' style="#encodeForCSS(attributes.contentStyle)#"';                 
 								variables.result &= '>';
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+							
+								
+						
 								variables.result &= '</div><!-- /.end panel body -->';
 
 	if (attributes.footer != "") 		variables.result &= '<div class="panel-footer';
-	if (attributes.footer != "" && attributes.footerClass != "") 	variables.result &= attributes.footerClass;
+	if (attributes.footer != "" && attributes.footerClass != "") 	variables.result &= encodeForHTMLAttribute(attributes.footerClass);
 	if (attributes.footer != "")		variables.result &= '"'; // end class
-	if (attributes.footer != "" && attributes.footerStyle != "")	variables.result &= ' style="#attributes.footerStyle#"';
-	if (attributes.footer != "")		variables.result &= '>#attributes.footer#</div>';  							
+	if (attributes.footer != "" && attributes.footerStyle != "")	variables.result &= ' style="#encodeForCSS(attributes.footerStyle)#"';
+	if (attributes.footer != "")		variables.result &= '>#encodeForHTML(attributes.footer)#</div>';  							
 								
 								variables.result &= '</div><!-- /.end panel -->';
 								
diff --git a/bootstrap/poll.cfm b/bootstrap/poll.cfm
index 532be84..bffdc75 100644
--- a/bootstrap/poll.cfm
+++ b/bootstrap/poll.cfm
@@ -14,19 +14,29 @@ case "start" :
 
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
+	variables.defaultTimeframe = 5000; // in milliseconds
   
 	param attributes.action;			// required
-	param attributes.id			= "auto";
-	param attributes.interval	= 5000;		// ms
-     param attributes.processed	= true;
-     param attributes.rendered 	= true;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.timeout		= 5000;		// ms
-	param attributes.tooltip		= "";
+	param attributes.id				= "auto";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("poll");				// make sure to set to true if you want animated loading 
+	param attributes.interval		= variables.defaultTimeframe;		// ms
+     param attributes.key			= "";
+	param attributes.placeholder		= [];
+     param attributes.processed		= true;
+     param attributes.profile			= application.Bootstrap.profile;
+     param attributes.rendered 		= true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.timeout			= variables.defaultTimeframe;		// ms
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
      
      if (attributes.id == "auto")	attributes.id = "poll_" & left(createUUID(), 10);
-
+     
+     if (!isnumeric(attributes.interval)) 	attributes.interval = variables.defaultTimeframe;
+     if (!isnumeric(attributes.timeout)) 	attributes.timeout = variables.defaultTimeframe;
+     
 
      if (!attributes.processed) exit "exitTag";
 	break;
@@ -35,16 +45,23 @@ case "end" :
 	
 								variables.result &= variables.crlf;
 	if(attributes.styleClass == "")	variables.result &= '<span';
-	if(attributes.styleClass != "")	variables.result &= '<span class="#attributes.styleClass#"';							
+	if(attributes.styleClass != "")	variables.result &= '<span class="#encodeForHTMLAttribute(attributes.styleClass)#"';							
 				
 		   							
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 	
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
+	
+	             
 								variables.result &= '>';
 							
-								variables.result &= trim(thisTag.GeneratedContent); // pass through of content
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+							
 	
 								variables.result &= '</span>';
 								variables.result &= variables.crlf;
diff --git a/bootstrap/progressBar.cfm b/bootstrap/progressBar.cfm
index 2555e3e..9b3f4ad 100644
--- a/bootstrap/progressBar.cfm
+++ b/bootstrap/progressBar.cfm
@@ -15,44 +15,59 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.animated	= false;
-	param attributes.binding		= "";
-     param attributes.id			= "";
-     param attributes.look		= "";
-     param attributes.processed	= true;
-	param attributes.rendered 	= true;
-	param attributes.role 		= "progressbar";
-	param attributes.stripped	= false;	if(attributes.animated) attributes.stripped = true;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-     param attributes.tooltip		= "";
-     param attributes.width		= "";
+	param attributes.animated		= false;
+	param attributes.binding			= "";
+     param attributes.id				= "";
+     param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("progressBar");
+     param attributes.look			= "";
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+     param attributes.processed		= true;
+     param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.role 			= "progressbar";
+	param attributes.stripped		= false;	if(attributes.animated) attributes.stripped = true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+     param attributes.tooltip			= "";
+     param attributes.tooltipPosition	= "bottom";
+     param attributes.width			= "";
+     
+     
+     
+     if (attributes.keyExists("text")) 						throw "attributes.text is an invalid option. Don't even think of using it";
      
-
-
      if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :
-     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+     if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
 	
 								variables.result &= '<div class="progress">';
 								variables.result &= variables.crlf & '<div class="progress-bar';
-	if(attributes.look		!= "")	variables.result &= ' progress-bar-#lcase(attributes.look)#';
+	if(attributes.look		!= "")	variables.result &= ' progress-bar-#encodeForHTMLAttribute(attributes.look.lcase())#';
 	if(attributes.stripped)			variables.result &= ' progress-bar-striped';
 	if(attributes.animated)			variables.result &= ' active';
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';		
+	if(attributes.styleClass	!= "")	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';		
 								variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.role		!= "")	variables.result &= ' role="#attributes.role#"';
-								variables.result &= ' style="width : #attributes.width#;';
-	if(attributes.style		!= "")	variables.result &= ' #attributes.style#';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.role		!= "")	variables.result &= ' role="#encodeForHTMLAttribute(attributes.role)#"';
+								variables.result &= ' style="width : #encodeForHTMLAttribute(attributes.width)#;';
+	if(attributes.style		!= "")	variables.result &= ' #encodeForCSS(attributes.style)#';
 								variables.result &= '"';
 	
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';               
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if (attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if (attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';            
 								variables.result &= '>';
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
 							
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+							
+						
+								
 	if(thisTag.GeneratedContent	== "")	variables.result &= '&nbsp;';							
 	
 								variables.result &= variables.crlf & '</div><!-- /.progress-bar -->';
diff --git a/bootstrap/row.cfm b/bootstrap/row.cfm
index 4b268dd..325e122 100644
--- a/bootstrap/row.cfm
+++ b/bootstrap/row.cfm
@@ -15,26 +15,39 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.id			= "";
-	param attributes.processed	= true;
-	param attributes.rendered 	= true;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.tooltip		= "";
-     
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("row");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+	
+	
      if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :     
      
 	   							variables.result &= variables.crlf & '<div class="row';
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';			
+	if(attributes.styleClass	!= "")	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';			
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';                         
-	if(attributes.tooltip    != "")    variables.result &= ' title="#attributes.tooltip#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';                         
+	if(attributes.tooltip    != "")    variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
 								variables.result &= '>';
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+							
+								
 								variables.result &= variables.crlf & '</div><!-- /.row -->';
 								variables.result &= variables.crlf;
 								variables.result &= variables.crlf;
diff --git a/bootstrap/selectBooleanCheckbox.cfm b/bootstrap/selectBooleanCheckbox.cfm
index e8be752..49bc8de 100644
--- a/bootstrap/selectBooleanCheckbox.cfm
+++ b/bootstrap/selectBooleanCheckbox.cfm
@@ -15,23 +15,34 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.circle		= false;		// make it look like a radio
-	param attributes.checked		= false;
-	param attributes.disabled	= false;
-	param attributes.id			= "";
-	param attributes.inline		= false;
-	param attributes.look		= "";
-	param attributes.name		= "";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.tabIndex	= "";
-	param attributes.title		= "";
-	param attributes.tooltip		= "";
+	param attributes.circle			= false;		// make it look like a radio
+	param attributes.checked			= false;
+	param attributes.disabled		= false;
+	param attributes.id				= "";
+	param attributes.inline			= false;
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("selectBooleanCheckbox");
+	param attributes.look			= "";
+	param attributes.name			= "";
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.tabIndex		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.title			= "";
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
 	
 	if (attributes.id == "auto")	attributes.id = "checkbox_" & left(createUUID(), 10);
 	
 	// Patch this
 	if(attributes.disabled == "disabled")	attributes.disabled = true;
+	
+	
+	if (!application.Bootstrap.validLook.contains(attributes.look))	throw "This is an invalid look option";
+	if (!isnumeric(attributes.tabIndex))	attributes.tabIndex = "";
+	
      
      if (!attributes.processed) exit "exitTag";
 	break;
@@ -40,29 +51,34 @@ case "end" :
 		
 								variables.result &= '<div class="checkbox';
 	if(attributes.circle)			variables.result &= ' checkbox-circle';						
-	if(attributes.look    	!= "")    variables.result &= ' checkbox-#lcase(attributes.look)#';
+	if(attributes.look    	!= "")    variables.result &= ' checkbox-#encodeForHTMLAttribute(attributes.look.lcase())#';
 	if(attributes.inline)			variables.result &= ' checkbox-inline';
 	   							variables.result &= '"';
 
-	if(attributes.tooltip    != "")    variables.result &= ' tooltip="#attributes.tooltip#"';
+	if(attributes.tooltip    != "")    variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
 								variables.result &= '>';
 								
 								
 	
 								variables.result &= '<input type="checkbox"';
-	if(attributes.name		!= "")	variables.result &= ' name="#attributes.name#"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
+	if(attributes.name		!= "")	variables.result &= ' name="#encodeForHTMLAttribute(attributes.name)#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 	if(attributes.checked)			variables.result &= ' checked="checked"';
 	if(attributes.disabled)			variables.result &= ' disabled="disabled"';
-	if(attributes.tabindex	!= "")	variables.result &= ' tabindex="#attributes.tabindex#"';
+	if(attributes.tabindex	!= "")	variables.result &= ' tabindex="#encodeForHTMLAttribute(attributes.tabindex)#"';
 	
 								variables.result &= ' />';
 								variables.result &= '<label';
-	if(attributes.id		!= "")	variables.result &=	' for="#attributes.id#"';
+	if(attributes.id		!= "")	variables.result &=	' for="#encodeForHTMLAttribute(attributes.id)#"';
 								variables.result &= '>';
-
+								
 	
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+							
+		
 								variables.result &= '</label>';
 								
 								variables.result &= variables.crlf &  '</div>';
diff --git a/bootstrap/selectItem.cfm b/bootstrap/selectItem.cfm
index 414e89d..e9d6606 100644
--- a/bootstrap/selectItem.cfm
+++ b/bootstrap/selectItem.cfm
@@ -24,10 +24,10 @@ case "start" :
 	param attributes.rendered 	= true;
 	param attributes.selected	= false;
 	param attributes.tooltip		= "";
+	param attributes.tooltipPosition	= "bottom";
 	param attributes.value		= attributes.display; 
 	
 
-
      if (!attributes.processed) exit "exitTag";
 	break;
      
@@ -35,13 +35,15 @@ case "end" :
 	
 
 	QueryAddRow( thisTag.Parent.thisTag.qryOption);
-     QuerySetCell(thisTag.Parent.thisTag.qryOption, "disabled", 	attributes.disabled);
-     QuerySetCell(thisTag.Parent.thisTag.qryOption, "id", 		attributes.id);
-     QuerySetCell(thisTag.Parent.thisTag.qryOption, "display", 	attributes.display);
-     QuerySetCell(thisTag.Parent.thisTag.qryOption, "look", 	attributes.look);
-     QuerySetCell(thisTag.Parent.thisTag.qryOption, "value", 	attributes.value);
-     QuerySetCell(thisTag.Parent.thisTag.qryOption, "selected",	attributes.selected);
-     QuerySetCell(thisTag.Parent.thisTag.qryOption, "tooltip",	attributes.tooltip);
+     QuerySetCell(thisTag.Parent.thisTag.qryOption, "disabled",		 	attributes.disabled);
+     QuerySetCell(thisTag.Parent.thisTag.qryOption, "id", 				attributes.id);
+     QuerySetCell(thisTag.Parent.thisTag.qryOption, "display", 			attributes.display);
+     QuerySetCell(thisTag.Parent.thisTag.qryOption, "look",			 	attributes.look);
+     QuerySetCell(thisTag.Parent.thisTag.qryOption, "value",		 	attributes.value);
+     QuerySetCell(thisTag.Parent.thisTag.qryOption, "selected",			attributes.selected);
+     QuerySetCell(thisTag.Parent.thisTag.qryOption, "tooltip",			attributes.tooltip);
+     QuerySetCell(thisTag.Parent.thisTag.qryOption, "tooltipPosition",	attributes.tooltipPosition);
+     
      
 	
 		
diff --git a/bootstrap/selectManyCheckbox.cfm b/bootstrap/selectManyCheckbox.cfm
index 682d7d8..ca2cbc0 100644
--- a/bootstrap/selectManyCheckbox.cfm
+++ b/bootstrap/selectManyCheckbox.cfm
@@ -16,17 +16,22 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
 
-	thisTag.qryOption 				= QueryNew("disabled,display,group,id,look,value,selected,tooltip");
+	thisTag.qryOption 				= QueryNew("disabled,display,group,id,look,value,selected,tooltip,tooltipPosition");
 	
-	if(structKeyExists(attributes, "qryOption")) thisTag.qryOption = attributes.qryOption;
+	if(attributes.keyExists("qryOption")) thisTag.qryOption = attributes.qryOption;
 
+	param attributes.circle			= false;		// make it look like radio
 	param attributes.disabled		= false;
 	param attributes.inline			= false;
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("selectManyCheckbox");
 	param attributes.look			= "";
 	param attributes.name;
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
 	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
 	param attributes.rendered 		= true;
-	param attributes.circle			= false;		// make it look like radio
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
 	
 	// Patch this
 	if(attributes.disabled == "disabled")	attributes.disabled = true;
@@ -71,6 +76,7 @@ case "end" :
 	
 		
 														variables.result &= thisTag.qryOption.display[variables.myRow]; // pass through of content
+														
 														variables.result &= '</label>';
 									
 														variables.result &= variables.crlf & '</div><!-- /.selectManyCheckbox -->';
diff --git a/bootstrap/selectManyMenu.cfm b/bootstrap/selectManyMenu.cfm
index 3c5375c..75f4d73 100644
--- a/bootstrap/selectManyMenu.cfm
+++ b/bootstrap/selectManyMenu.cfm
@@ -14,29 +14,36 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
 	
-	thisTag.qryOption 			= QueryNew("disabled,display,group,id,look,value,selected,tooltip");
+	thisTag.qryOption 			= QueryNew("disabled,display,group,id,look,value,selected,tooltip,tooltipPosition");
   
-	if(structKeyExists(attributes, "qryOption")) thisTag.qryOption = attributes.qryOption;
+	if(attributes.keyExists("qryOption")) thisTag.qryOption = attributes.qryOption;
   
-	param attributes.disabled	= false;
-	param attributes.fieldSize	= "";
-	param attributes.help		= "";
-	param attributes.id			= "";
-	param attributes.name;				// required field
-	param attributes.onBlur		= "";
-	param attributes.onClick		= "";
-	param attributes.onChange	= "";
-	param attributes.processed 	= true;
-	param attributes.readonly 	= false;
-	param attributes.rendered 	= true;
-	param attributes.required	= false;
-	param attributes.span		= "";
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.tooltip		= "";
+	param attributes.disabled		= false;
+	param attributes.fieldSize		= "";
+	param attributes.help			= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("selectManyMenu");
+	param attributes.name;					// required field
+	param attributes.onBlur			= "";
+	param attributes.onClick			= "";
+	param attributes.onChange		= "";
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.readonly	 	= false;
+	param attributes.rendered	 	= true;
+	param attributes.required		= false;
+	param attributes.span			= "";
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
 	
 	// Patch this
-	if(attributes.disabled == "disabled")	attributes.disabled = true;	
+	if(attributes.disabled == "disabled")	attributes.disabled = true;
+	
 	
      if (!attributes.processed) exit "exitTag";
 	break;
@@ -46,15 +53,19 @@ case "end" :
 
 	if(attributes.span		!= "")	variables.result &= '<div class="col-md-#attributes.span#">' & variables.crlf;
 								variables.result &= '<select multiple="multiple" class="form-control';
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';
-	if(attributes.fieldSize	!= "")	variables.result &= ' input-#attributes.fieldSize#';
+	if(attributes.styleClass	!= "")	variables.result &= ' #encodeforHTMLAttribute(attributes.styleClass)#';
+	if(attributes.fieldSize	!= "")	variables.result &= ' input-#encodeForHTMLAttribute(attributes.fieldSize)#';
 								variables.result &= '"';
 	if(attributes.disabled)			variables.result &= ' disabled="disabled"';													
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 	if(attributes.readonly)			variables.result &= ' readonly="readonly"';
 	if(attributes.required)			variables.result &= ' required="required"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
+	
 	if(attributes.onBlur	!= "")	variables.result &= ' onBlur="#attributes.onBlur#"';
 	if(attributes.onClick	!= "")	variables.result &= ' onClick="#attributes.onClick#"';
 	if(attributes.onChange	!= "")	variables.result &= ' onChange="#attributes.onChange#"';
@@ -72,8 +83,8 @@ case "end" :
      					
 	
 								variables.result &= '</select>';
-	if(attributes.help		!= "")	variables.result &= '<span class="help-block">#attributes.help#</span>';						
-     if(attributes.span		!= "")	variables.result &= variables.crlf & '</div><!-- /.col-md-#attributes.span# -->';
+	if(attributes.help		!= "")	variables.result &= '<span class="help-block">#encodeForHTML(attributes.help)#</span>';						
+     if(attributes.span		!= "")	variables.result &= variables.crlf & '</div><!-- /.col-md-#encodeForHTMLAttribute(attributes.span)# -->';
 
      thisTag.GeneratedContent = "";
      if (attributes.rendered)			writeOutput(variables.result);
diff --git a/bootstrap/selectOneMenu.cfm b/bootstrap/selectOneMenu.cfm
index 1e1d25c..cba41a7 100644
--- a/bootstrap/selectOneMenu.cfm
+++ b/bootstrap/selectOneMenu.cfm
@@ -16,24 +16,29 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
 	
-	thisTag.qryOption 			= QueryNew("disabled,display,group,id,look,value,selected,tooltip");
+	thisTag.qryOption 			= QueryNew("disabled,display,group,id,look,value,selected,tooltip,tooltipPosition");
 	
 	if(structKeyExists(attributes, "qryOption")) thisTag.qryOption = attributes.qryOption;
   
-	param attributes.disabled	= false;
-	param attributes.fieldSize	= "";
-	param attributes.help		= "";
-	param attributes.id			= "";
-	param attributes.name;				// required field
-
-	param attributes.processed 	= true;
-	param attributes.readonly 	= false;
-	param attributes.rendered 	= true;
-	param attributes.required	= false;
-	param attributes.span		= "";	// md only. If you want finer control, use b:column
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.tooltip		= "";
+	param attributes.disabled		= false;
+	param attributes.fieldSize		= "";
+	param attributes.help			= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("selectOneMenu");
+	param attributes.name;					// required field
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.readonly 		= false;
+	param attributes.rendered 		= true;
+	param attributes.required		= false;
+	param attributes.span			= "";	// md only. If you want finer control, use b:column
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
 
 	// Patch this
 	if(attributes.disabled == "disabled")	attributes.disabled = true;
@@ -49,6 +54,8 @@ case "start" :
 			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
 			} // end if	
 		}	// end for
+		
+	
 
      if (!attributes.processed) exit "exitTag";
 	break;
@@ -56,43 +63,48 @@ case "start" :
 case "end" :     
 	
 
-	if(attributes.span		!= "")	variables.result &= '<div class="col-md-#attributes.span#">' & variables.crlf;
-								variables.result &= '<select class="form-control';
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';
-	if(attributes.fieldSize	!= "")	variables.result &= ' input-#attributes.fieldSize#';
-								variables.result &= '"';
-	if(attributes.disabled)			variables.result &= ' disabled="disabled"';													
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
+	if(attributes.span		!= "")		variables.result &= '<div class="col-md-#attributes.span#">' & variables.crlf;
+									variables.result &= '<select class="form-control';
+	if(attributes.styleClass	!= "")		variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';
+	if(attributes.fieldSize	!= "")		variables.result &= ' input-#attributes.fieldSize#';
+									variables.result &= '"';
+	if(attributes.disabled)				variables.result &= ' disabled="disabled"';													
+	if(attributes.id		!= "")		variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 	
-	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#encodeForHTMLAttributes(variables.myAttr.value)#"';
 	
-	if(attributes.readonly)			variables.result &= ' readonly="readonly"';
-	if(attributes.required)			variables.result &= ' required="required"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';
+	if(attributes.readonly)				variables.result &= ' readonly="readonly"';
+	if(attributes.required)				variables.result &= ' required="required"';
+	if(attributes.style		!= "")		variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")		variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")		variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")		variables.result &= ' data-toggle="tooltip"';
 
 	
-								variables.result &= ' >';
+									variables.result &= ' >';
 								
 	for(variables.myRow = 1; variables.myRow <= thisTag.qryOption.recordcount; variables.myRow++)	{							
-								variables.result &= '<option';
-								variables.result &= ' value="#thisTag.qryOption.value[variables.myRow]#"';
+									variables.result &= '<option';
+									variables.result &= ' value="#thisTag.qryOption.value[variables.myRow]#"';
 		if(thisTag.qryOption.selected[variables.myRow])	variables.result &= ' selected="selected"';
-								variables.result &= ' >';
-								variables.result &= thisTag.qryOption.display[variables.myRow];
-								variables.result &= '</option>';
+									variables.result &= ' >';
+									variables.result &= thisTag.qryOption.display[variables.myRow];
+									variables.result &= '</option>';
 		} // end for						
-     							
+    
+    
+    	if(!attributes.isSafeHTML)			variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)			variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
 
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+		
 	
-								variables.result &= variables.crlf & '</select>';
-	if(attributes.help		!= "")	variables.result &= variables.crlf & '<span class="help-block">#attributes.help#</span>';						
-     if(attributes.span		!= "")	variables.result &= variables.crlf & '</div><!-- /.col-md-#attributes.span# -->';
+									variables.result &= variables.crlf & '</select>';
+	if(attributes.help		!= "")		variables.result &= variables.crlf & '<span class="help-block">#encodeForHTML(attributes.help)#</span>';						
+     if(attributes.span		!= "")		variables.result &= variables.crlf & '</div><!-- /.col-md-#attributes.span# -->';
 	
 
      thisTag.GeneratedContent = "";
-     if (attributes.rendered)			writeOutput(variables.result);
+     if (attributes.rendered)				writeOutput(variables.result);
      
 	break;
 	}
diff --git a/bootstrap/selectOneRadio.cfm b/bootstrap/selectOneRadio.cfm
index 82d421b..e6fb860 100644
--- a/bootstrap/selectOneRadio.cfm
+++ b/bootstrap/selectOneRadio.cfm
@@ -16,20 +16,28 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
 
-	thisTag.qryOption 				= QueryNew("disabled,display,group,id,look,value,selected,tooltip");
+	thisTag.qryOption 				= QueryNew("disabled,display,group,id,look,value,selected,tooltip,tooltipPosition");
 	
 	if(structKeyExists(attributes, "qryOption")) thisTag.qryOption = attributes.qryOption;
 
 	param attributes.disabled		= false;
 	param attributes.inline			= false;
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("selectOneRadio");
 	param attributes.look			= "";
 	param attributes.name;
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
 	param attributes.processed 		= true;
+	param attributes.profile			= application.Bootstrap.profile;
 	param attributes.rendered 		= true;
 	param attributes.square			= false;		// make it look like check
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
 	
 	// Patch this
 	if(attributes.disabled == "disabled")	attributes.disabled = true;
+	
+	
+	if (!application.Bootstrap.validLook.contains(attributes.look))	throw "This is an invalid look option";
 
 	if (!attributes.processed) exit "exitTag";
 	break;
@@ -47,30 +55,33 @@ case "end" :
 		variables.preClass = attributes.square ? "checkbox" : "radio";
 		
 		if(variables.myLook == "" && attributes.square)			variables.result &= '<div class="checkbox checkbox';
-		else												variables.result &= '<div class="#variables.preClass#';
+		else												variables.result &= '<div class="#encodeForHTMLAttribute(variables.preClass)#';
 		
-		if(variables.myLook							!= "")	variables.result &= ' #variables.preClass#-#lcase(variables.myLook)#';
+		if(variables.myLook							!= "")	variables.result &= ' #variables.preClass#-#variables.myLook.lcase()#';
 		if(attributes.inline)								variables.result &= ' #variables.preClass#-inline';
 														variables.result &= '"';
 	
-		if(thisTag.qryOption.tooltip[variables.myRow]	!= "")	variables.result &= ' tooltip="#thisTag.qryOption.tooltip[variables.myRow]#"';
+		if(thisTag.qryOption.tooltip[variables.myRow]	!= "")	variables.result &= ' title="#encodeForHTMLAttribute(thisTag.qryOption.tooltip[variables.myRow])#"';
 														variables.result &= '>';
 
 
 
 														variables.result &= '<input type="radio"';
-		if(attributes.name							!= "")	variables.result &= ' name="#attributes.name#"';
-		if(thisTag.qryOption.id[variables.myRow]		!= "")	variables.result &= ' id="#thisTag.qryOption.id[variables.myRow]#"';
+		if(attributes.name							!= "")	variables.result &= ' name="#encodeForHTMLAttribute(attributes.name)#"';
+		if(thisTag.qryOption.id[variables.myRow]		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(thisTag.qryOption.id[variables.myRow])#"';
 		if(thisTag.qryOption.selected[variables.myRow])			variables.result &= ' checked="checked"';
 		if(attributes.disabled)								variables.result &= ' disabled="disabled"';
-														variables.result &= ' value="#thisTag.qryOption.value[variables.myRow]#"';	
+														variables.result &= ' value="#encodeForHTMLAttribute(thisTag.qryOption.value[variables.myRow])#"';	
 														variables.result &= ' />';
 														variables.result &= variables.crlf &'<label';
-		if(thisTag.qryOption.id[variables.myRow]		!= "")	variables.result &=	' for="#thisTag.qryOption.id[variables.myRow]#"';
+		if(thisTag.qryOption.id[variables.myRow]		!= "")	variables.result &=	' for="#encodeForHTMLAttribute(thisTag.qryOption.id[variables.myRow])#"';
 														variables.result &= '>';
 	
 		
-														variables.result &= thisTag.qryOption.display[variables.myRow]; // pass through of content
+		if(!attributes.isSafeHTML)							variables.result &= getSafeHTML(thisTag.qryOption.display[variables.myRow].trim(), attributes.profile, attributes.throwOnError); // pass through of content
+		if( attributes.isSafeHTML)							variables.result &= thisTag.qryOption.display[variables.myRow].trim(); // warning content must already be clean								
+
+		
 														variables.result &= '</label>';
 									
 														variables.result &= variables.crlf & '</div><!-- /.radio -->';
diff --git a/bootstrap/tab.cfm b/bootstrap/tab.cfm
index 5a00fca..3adede5 100644
--- a/bootstrap/tab.cfm
+++ b/bootstrap/tab.cfm
@@ -22,14 +22,21 @@ case "start" :
 		throw "This tag must be in #ArrayToList(variables.validTag)#. It appears to be #variables.parentTag#";
 		}
   
-	param attributes.disabled	= false;
+	param attributes.disabled		= false;
 	param attributes.id;					// Tab must have id
-	param attributes.processed	= true;
-	param attributes.rendered	= true;
-	param attributes.role 		= "tab";
-	param attributes.style		= "";
-     param attributes.title		= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("tab");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered		= true;
+	param attributes.role 			= "tab";
+	param attributes.style			= "";
+     param attributes.title			= "";
+     param attributes.throwOnError		= application.Bootstrap.throwOnError;
+     
 	if (!structKeyExists(attributes, "data-url")) attributes["data-url"]	= "";
+	
      
      if (!attributes.processed) exit "exitTag";
 	if (!attributes.rendered) exit "exitTag";	// this is a known bug
diff --git a/bootstrap/tabView.cfm b/bootstrap/tabView.cfm
index c8cc85f..390c175 100644
--- a/bootstrap/tabView.cfm
+++ b/bootstrap/tabView.cfm
@@ -21,12 +21,17 @@ case "start" :
 	variables.currentTab = 1;
 	variables.needsJS	= false;
   
-	param attributes.activeIndex	= 1;
-	param attributes.processed	= true;
-	param attributes.rendered 	= true;
-	param attributes.role 		= "tabpanel";
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
+	param attributes.activeIndex		= 1;
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("tabView");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.role 			= "tabpanel";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
 	
 	
 	if (!attributes.processed) exit "exitTag";
@@ -36,11 +41,11 @@ case "end" :
 
 	
 								variables.result &= variables.crlf & '<div class="tab-panel';
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';
+	if(attributes.styleClass	!= "")	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';
 								variables.result &= '"';								
-	if(attributes.role		!= "")	variables.result &= ' role="#attributes.role#"';
+	if(attributes.role		!= "")	variables.result &= ' role="#encodeForHTMLAttribute(attributes.role)#"';
 	
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
 								variables.result &= '>';
 								variables.result &= variables.crlf & '<ul class="nav nav-tabs" role="tablist">';
 	// generate tabs
@@ -53,23 +58,27 @@ case "end" :
 									variables.result &= '<a';
 			if (!variables.tab.disabled)	variables.result &= ' href="###variables.tab.id#"';
 			if (!variables.tab.disabled)	variables.result &= ' aria-controls="#variables.tab.id#"';
-			if (!variables.tab.disabled)	variables.result &= ' role="#variables.tab.id#"';
+			if (!variables.tab.disabled)	variables.result &= ' role="#encodeForHTMLAttribute(variables.tab.id)#"';
 			if (!variables.tab.disabled)	variables.result &= ' data-toggle="tab"';
 			if (!variables.tab.disabled && variables.tab.dataUrl != "")	{
 									variables.needsJS = true;
 									variables.result &= ' data-url="' & variables.tab.dataUrl & '"';
 									}
-									variables.result &= ' >#variables.tab.title#</a>';
+									variables.result &= ' >#encodeForHTML(variables.tab.title)#</a>';
 									variables.result &= '</li>';
 			variables.currentTab++;
 			} // end if title exists
 		} // end for
 		
 		if (trim(thisTag.generatedContent) != "")	{
-								variables.result &= variables.crlf & '<li role="presentation" class="dropdown"><!-- Content passthrough -->';
-								variables.result &= thisTag.generatedContent;
-								variables.result &= '</li>';
-								}	
+									variables.result &= variables.crlf & '<li role="presentation" class="dropdown"><!-- Content passthrough -->';
+								
+			if(!attributes.isSafeHTML)	variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+			if( attributes.isSafeHTML)	variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+						
+									variables.result &= '</li>';
+									}	
+						
 						
 								variables.result &= variables.crlf & '</ul>';
 
@@ -84,8 +93,10 @@ case "end" :
 		if (attributes.activeIndex == variables.currentTab)	variables.result &= ' class="tab-pane active"';
 		if (attributes.activeIndex != variables.currentTab)	variables.result &= ' class="tab-pane"';
 							
-								variables.result &= ' id="#variables.tab.id#">';
-								variables.result &= variables.tab.generatedContent;	
+								variables.result &= ' id="#encodeForHTMLAttribute(variables.tab.id)#">';
+								
+								variables.result &= getSafeHTML(variables.tab.generatedContent);	
+	
 								variables.result &= variables.crlf & '</section>';
 		variables.currentTab++;			
 		}	// end for
diff --git a/bootstrap/table.cfm b/bootstrap/table.cfm
index c799b88..74fc5ac 100644
--- a/bootstrap/table.cfm
+++ b/bootstrap/table.cfm
@@ -15,17 +15,25 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
 
-	param attributes.bordered	= false;
-     param attributes.condensed	= true;
-     param attributes.hover		= false;
-     param attributes.id			= "";
-     param attributes.processed	= true;
-	param attributes.rendered 	= true; // removes content not actuall td
-	param attributes.responsive	= true;
-	param attributes.striped		= true;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-     param attributes.tooltip		= "";
+	param attributes.bordered		= false;
+     param attributes.condensed		= true;
+     param attributes.hover			= false;
+     param attributes.id				= "";
+     param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("table"); // this is set to true because the content may be very large and td and th should have cleaned it
+    	//	param attributes.key			= "";	//	content not directly generated, do not put td,th in language files
+	//	param attributes.placeholder		= [];	//	see key
+  
+     param attributes.processed		= true;
+     param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true; // removes content not actuall td
+	param attributes.responsive		= true;
+	param attributes.striped			= true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+     param attributes.tooltip			= "";
+     param attributes.tooltipPosition	= "bottom";
+     
 
 	if (!attributes.processed) exit "exitTag";
 	break;
@@ -33,21 +41,30 @@ case "start" :
 case "end" :     
           
           
-     if(attributes.responsive) 		variables.result &= '<div class="table.responsive">';    
+     if(attributes.responsive) 		variables.result &= '<div class="table-responsive">';  
+     							variables.result &= variables.crlf;  
 	   							variables.result &= '<table class="table';
 	if(attributes.bordered)			variables.result &= ' table-bordered';
 	if(attributes.condensed)			variables.result &= ' table-condensed';
 	if(attributes.hover)			variables.result &= ' table-hover';
 	if(attributes.striped)			variables.result &= ' table-striped';
 				
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';		
+	if(attributes.styleClass	!= "")	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';		
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-	if(attributes.tooltip    != "")	variables.result &=	' title="#attributes.tooltip#"';						
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+	if(attributes.tooltip    != "")	variables.result &=	' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")				variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")				variables.result &= ' data-toggle="tooltip"';						
 	               
 								variables.result &= '>';
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+								
+	
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+		
+							
 								variables.result &= '</table>';
      if(attributes.responsive) 		variables.result &= '</div>';    
 	
diff --git a/bootstrap/td.cfm b/bootstrap/td.cfm
index ca03b12..70815a8 100644
--- a/bootstrap/td.cfm
+++ b/bootstrap/td.cfm
@@ -15,16 +15,22 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
 
-	param attributes.binding		= "";
-	param attributes.hidden		= "";
-	param attributes.id			= "";
-	param attributes.look		= "";
-	param attributes.processed	= true; // unknown how to support
-	param attributes.rendered 	= true; // removes content not actual td
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-	param attributes.tooltip		= "";
+	param attributes.binding			= "";
+	param attributes.hidden			= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("td");
+	param attributes.look			= "";
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed		= true; // unknown how to support
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true; // removes content not actual td
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
 
 
 	if(!ArrayContains(['','active','success','info','warning','danger'],attributes.look)) throw "tr tag has invalid contextual class option";
@@ -62,17 +68,26 @@ case "end" :
 
 
 	if(variables.myClass	== "")				variables.result &= '<td';
-	if(variables.myClass	!= "")				variables.result &= '<td class="#variables.myClass#"';
-	if(attributes.id		!= "")				variables.result &= ' id="#attributes.id#"';
+	if(variables.myClass	!= "")				variables.result &= '<td class="#encodeForHTMLAttribute(variables.myClass)#"';
+	if(attributes.id		!= "")				variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 
-	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
 
 
-	if(attributes.style		!= "")				variables.result &= ' style="#attributes.style#"';
+	if(attributes.style		!= "")				variables.result &= ' style="#encodeForCSS(attributes.style)#"';
 											variables.result &= '>';
-	if(attributes.tooltip	!= "")				variables.result &= '<span title="#attributes.tooltip#">';
-	if (attributes.rendered && attributes.processed)
-											variables.result &= thisTag.GeneratedContent; // pass through of content
+	
+	if(attributes.tooltip    != "")				variables.result &=	'<span title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")				variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")				variables.result &= ' data-toggle="tooltip"';
+	if(attributes.tooltip    != "")				variables.result &=	'>';
+	
+	
+	if(attributes.rendered && !attributes.isSafeHTML)	variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if(attributes.rendered &&  attributes.isSafeHTML)	variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
+		
+											
 	if(attributes.tooltip	!= "")				variables.result &= '</span>';
 											variables.result &= '</td>';
 											variables.result &= variables.crlf;
diff --git a/bootstrap/th.cfm b/bootstrap/th.cfm
index 53416b5..2dedfd1 100644
--- a/bootstrap/th.cfm
+++ b/bootstrap/th.cfm
@@ -15,15 +15,21 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
 
-	param attributes.binding		= "";
-	param attributes.hidden		= "";
-	param attributes.id			= "";
-	param attributes.processed	= true; // unknown how to support
-	param attributes.rendered 	= true; // removes content not actual th
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.text		= "";
-	param attributes.tooltip		= ""; // It is attached to a span so that table layout does not get destroyed
+	param attributes.binding			= "";
+	param attributes.hidden			= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("th");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed		= true; // unknown how to support
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true; // removes content not actual th
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.text			= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= ""; // It is attached to a span so that table layout does not get destroyed
+	param attributes.tooltipPosition	= "bottom";
 
 
 	variables.myClass = "";
@@ -48,25 +54,35 @@ case "start" :
 
 
 	// if (!attributes.processed) exit "exitTag";
+	
+	
 	break;
 
 case "end" :
 
-	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = xmlFormat(evaluate("caller.rc.#attributes.binding#"));
+	if(attributes.binding != "" && isDefined("caller.rc.#attributes.binding#")) thisTag.GeneratedContent = evaluate("caller.rc.#attributes.binding#");
 
-	if(variables.myClass 	== "")	variables.result &= '<th';
-	if(variables.myClass 	!= "")	variables.result &= '<th class="#variables.myClass#"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
+	if(variables.myClass 	== "")				variables.result &= '<th';
+	if(variables.myClass 	!= "")				variables.result &= '<th class="#encodeForHTMLAttribute(variables.myClass)#"';
+	if(attributes.id		!= "")				variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 
-	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
 
 
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';
-								variables.result &= '>';
-	if(attributes.tooltip    != "")	variables.result &=	'<span title="#attributes.tooltip#">';
-	if(attributes.rendered)			variables.result &= thisTag.GeneratedContent; // pass through of content
-	if(attributes.tooltip    != "")	variables.result &=	 '</span>';
-								variables.result &= '</th>';
+	if(attributes.style		!= "")				variables.result &= ' style="#encodeForCSS(attributes.style)#"';
+											variables.result &= '>';
+	if(attributes.tooltip    != "")				variables.result &=	'<span title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")				variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")				variables.result &= ' data-toggle="tooltip"';
+	if(attributes.tooltip    != "")				variables.result &=	'>';
+	
+	
+	if(attributes.rendered && !attributes.isSafeHTML)	variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if(attributes.rendered &&  attributes.isSafeHTML)	variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+	
+	
+	if(attributes.tooltip    != "")				variables.result &=	'</span>';
+											variables.result &= '</th>';
 
 
 	thisTag.GeneratedContent = "";
diff --git a/bootstrap/tr.cfm b/bootstrap/tr.cfm
index aea8c74..4ba48b3 100644
--- a/bootstrap/tr.cfm
+++ b/bootstrap/tr.cfm
@@ -15,12 +15,17 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.id			= "";
-	param attributes.look		= "";
-	param attributes.processed	= true;
-	param attributes.rendered 	= true;
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("tr");
+	param attributes.look			= "";
+	//	param attributes.key			= "";	//	content not directly generated, do not put td,th in language files
+	//	param attributes.placeholder		= [];	//	see key
+	param attributes.processed		= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
 	
 	if(!ArrayContains(['','active','success','info','warning','danger'],attributes.look)) throw "tr tag has invalid contextual class option";
 	
@@ -38,23 +43,28 @@ case "start" :
 			} // end if	
 		}	// end for
 
-	
-	
+
+
 	if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :
 
 	if(variables.myClass 	== "")			variables.result &= '<tr';
-	if(variables.myClass 	!= "")			variables.result &= '<tr class="#variables.myClass#"';
-	if(attributes.id		!= "")			variables.result &= ' id="#attributes.id#"';
+	if(variables.myClass 	!= "")			variables.result &= '<tr class="#encodeForHTMLAttribute(variables.myClass)#"';
+	if(attributes.id		!= "")			variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
 	
-	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#variables.myAttr.value#"';
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #lcase(variables.myAttr.key)#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
 	
-	if(attributes.style		!= "")			variables.result &= ' style="#attributes.style#"';                 
+	if(attributes.style		!= "")			variables.result &= ' style="#encodeForCSS(attributes.style)#"';                 
 										variables.result &= '>';
 										variables.result &= variables.crlf;
-										variables.result &= thisTag.GeneratedContent; // pass through of content
+
+										
+	if(!attributes.isSafeHTML)				variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)				variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean										
+										
+										
 										variables.result &= variables.crlf;
 										variables.result &= '</tr>';
 										variables.result &= variables.crlf;
diff --git a/bootstrap/well.cfm b/bootstrap/well.cfm
index 6201e54..7dfc638 100644
--- a/bootstrap/well.cfm
+++ b/bootstrap/well.cfm
@@ -15,28 +15,54 @@ case "start" :
 	variables.result = "";
 	variables.crlf =  chr(13) & chr(10);
   
-	param attributes.id			= "";
-	param attributes.processed 	= true;
-	param attributes.rendered 	= true;
-	param attributes.size		= "";
-	param attributes.style		= "";
-	param attributes.styleClass	= "";
-	param attributes.tooltip		= "";
-     
+	param attributes.id				= "";
+	param attributes.isSafeHTML		= application.Bootstrap.isSafeHTML.contains("well");
+	param attributes.key			= "";
+	param attributes.placeholder		= [];
+	param attributes.processed	 	= true;
+	param attributes.profile			= application.Bootstrap.profile;
+	param attributes.rendered 		= true;
+	param attributes.size			= "";
+	param attributes.style			= "";
+	param attributes.styleClass		= "";
+	param attributes.throwOnError		= application.Bootstrap.throwOnError;
+	param attributes.tooltip			= "";
+	param attributes.tooltipPosition	= "bottom";
+	
+	
+	variables.arAttrSeries = [];
+	
+	
+	// We will be passing through HTML5 data-, Mouse Events, and Angular JS
+	for(variables.myKey in attributes)	{
+		if (left(variables.myKey, 5) == "data-" || left(variables.myKey, 2) == "on" || left(variables.myKey, 3) == "ng-")	{
+			ArrayAppend(arAttrSeries, {key = variables.myKey, value = attributes[variables.myKey] });
+			} // end if	
+		}	// end for
+
+	
 	if (!attributes.processed) exit "exitTag";
 	break;
      
 case "end" :     
      							variables.result &= crlf;
 	   							variables.result &= '<div class="well';
-	if(attributes.size		!= "")	variables.result &= ' well-#attributes.size#';		
-	if(attributes.styleClass	!= "")	variables.result &= ' #attributes.styleClass#';		
+	if(attributes.size		!= "")	variables.result &= ' well-#encodeForHTMLAttribute(attributes.size)#';		
+	if(attributes.styleClass	!= "")	variables.result &= ' #encodeForHTMLAttribute(attributes.styleClass)#';		
 	   							variables.result &= '"';
-	if(attributes.id		!= "")	variables.result &= ' id="#attributes.id#"';
-	if(attributes.style		!= "")	variables.result &= ' style="#attributes.style#"';                 
-	if(attributes.tooltip    != "")    variables.result &= ' tooltip="#attributes.tooltip#"';
+	if(attributes.id		!= "")	variables.result &= ' id="#encodeForHTMLAttribute(attributes.id)#"';
+	
+	for(variables.myAttr in variables.arAttrSeries)	variables.result &= ' #variables.myAttr.key.lcase()#="#encodeForHTMLAttribute(variables.myAttr.value)#"';
+	
+	if(attributes.style		!= "")	variables.result &= ' style="#encodeForCSS(attributes.style)#"';                 
+	if(attributes.tooltip    != "")    variables.result &= ' title="#encodeForHTMLAttribute(attributes.tooltip)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-placement="#encodeForHTMLAttribute(attributes.tooltipPosition)#"';
+	if(attributes.tooltip	!= "")	variables.result &= ' data-toggle="tooltip"';
 								variables.result &= '>';
-								variables.result &= thisTag.GeneratedContent; // pass through of content
+								
+	if(!attributes.isSafeHTML)		variables.result &= getSafeHTML(thisTag.GeneratedContent.trim(), attributes.profile, attributes.throwOnError); // pass through of content
+	if( attributes.isSafeHTML)		variables.result &= thisTag.GeneratedContent.trim(); // warning content must already be clean								
+
 								variables.result &= '</div><!-- /.well -->';
 								variables.result &= crlf;	
      
diff --git a/index.cfm b/index.cfm
index a87d784..e2cb8b0 100644
--- a/index.cfm
+++ b/index.cfm
@@ -9,9 +9,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 	
-<head>
-	<cfinclude template="layouts/head.cfm">
-</head>
+
+<cfinclude template="layouts/head.cfm">
 
 
 <body>
diff --git a/layouts/footer.cfm b/layouts/footer.cfm
index bfd3066..5014504 100644
--- a/layouts/footer.cfm
+++ b/layouts/footer.cfm
@@ -15,4 +15,3 @@
 	</small>	
 </p>
 
-<b:outputScript name="application.js" />
\ No newline at end of file
diff --git a/layouts/head.cfm b/layouts/head.cfm
index 945f6fb..af5b821 100644
--- a/layouts/head.cfm
+++ b/layouts/head.cfm
@@ -1,17 +1,19 @@
 <cfimport prefix="b" taglib="../bootstrap">
 
 
-<title>BS-4-CF - Bootstrap tags for ColdFusion</title>
+<b:head>
+
+<title>Bootstrap for ColdFusion</title>
 
 <meta name="author" content="James Mohler" />
-<meta name="description" content="BS-4-CF, a powerful tag libary that takes the best from Bootstrap for next-gen Front-end Enterprise Applications fast and easy supporting HTML5." />
+<meta name="description" content="Bootstrap tags for ColdFusion, a powerful tag libary that takes the best from Bootstrap for next-gen Front-end Enterprise Applications fast and easy supporting HTML5." />
 <meta name="KEYWORDS" content="ColdFusion, bootstrap, framework, java, enterprise, server, faces, jquery, usability, next-gen, web, html5, easy, modern, well-designed, website, state-of-the-art" />
 <meta name="robots" content="index, follow" />
         
 
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-<cfoutput>
+
 <cfswitch expression="#session.theme#">
 	<cfcase value="default">
 		<b:outputStylesheet />
@@ -20,16 +22,19 @@
 		<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.5/#lcase(session.theme)#/bootstrap.min.css" rel="stylesheet">
+		<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/<cfoutput>#lcase(session.theme)#</cfoutput>/bootstrap.min.css" rel="stylesheet">
 	</cfdefaultcase>	
 </cfswitch>
-</cfoutput>
+
 
 <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/css/select2.min.css" rel="stylesheet" />
 <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet">
 <link href="https://cdnjs.cloudflare.com/ajax/libs/awesome-bootstrap-checkbox/0.3.4/awesome-bootstrap-checkbox.css" rel="stylesheet">
 <link href="https://cdn.datatables.net/1.10.8/css/dataTables.bootstrap.min.css" rel="stylesheet">
 
+<!--- jQuery UI support --->
+<link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.css" rel="stylesheet">
+
 
 <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
 
@@ -48,11 +53,12 @@
 <script src="https://cdn.datatables.net/1.10.8/js/jquery.dataTables.min.js"></script>
 <script src="https://cdn.datatables.net/1.10.8/js/dataTables.bootstrap.min.js"></script>
 
+<b:outputScript library="local" name="application.js" />
 
 
 <b:outputStyleSheet name="application.css" processed="#IIF(url.view EQ 'image', 1, 0)#" />
 
-<b:outputStyleSheet>
+<style type="text/css">
 h1,h2	{
 padding-top: 50px;	
 	
@@ -70,5 +76,8 @@ padding-top: 50px;
 	border:1px solid ##ddd;
 	border:1px solid rgba(86,61,124,.2)
 }
-</b:outputStyleSheet>
+</style>
+
+	
 	
+</b:head>
diff --git a/layouts/menu.cfm b/layouts/menu.cfm
index 3ba83e8..6285b8f 100644
--- a/layouts/menu.cfm
+++ b/layouts/menu.cfm
@@ -3,12 +3,13 @@
 
 
 
-<b:navBar brand="BS-4-CF" brandHref="index.cfm" fixed="top">
+<b:navBar brand="Bootstrap for ColdFusion" brandHref="index.cfm" fixed="top">
 	<b:navbarLinks>
 	
 		<b:dropMenu value="Getting Started">
 			<b:navLink value="Introduction" href="?view=getting_started" active="#IIF(url.view EQ 'getting_started', 1, 0)#" />
-			<b:navLink value="Stylesheets & JavaScript" href="?view=ssjs" />
+			<b:navLink value="Smart tags & common features" href="?view=common" />
+			<b:navLink value="Head, JS, & CSS tags" href="?view=head" />
 			<b:navLink />
 			<b:navLink header="Bootstrap 4"/>
 			<b:navLink value="Alpha Release" href="?view=theme&theme=4alpha" />	
@@ -53,7 +54,7 @@
 			<b:navLink />
 			<b:navLink header="By Bootswatch"/>
 			<cfloop index="rc.i" list="Cerulean,Cosmo,Cyborg,Darkly,Flatly,Journal,Lumen,Paper,Readable,Sandstone,Simplex,Slate,Spacelab,Superhero,United,Yeti">
-				<b:navLink href="?view=theme&amp;theme=#rc.i#" binding="i" disabled="#IIF(session.theme EQ rc.i , 1, 0)#" />
+				<b:navLink href="?view=theme&theme=#rc.i#" binding="i" disabled="#IIF(session.theme EQ rc.i , 1, 0)#" />
 			</cfloop>		
 		</b:dropMenu>
 		
diff --git a/views/alert.cfm b/views/alert.cfm
index 6fad2eb..4e57c79 100644
--- a/views/alert.cfm
+++ b/views/alert.cfm
@@ -25,7 +25,7 @@
 
 
 
-<b:panel look="info" title="Attributes of &lt;b:alert&gt;">
+<b:panel look="info" title="Attributes of <b:alert>">
 
 	<b:table>
 	<thead>
@@ -33,6 +33,7 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -41,42 +42,67 @@
 			<td>closable</td>
 			<td>false</td>
 			<td>Does this include a close X?</td>
+			<td>No</td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>true</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>look</td>
 			<td>warning</td>
 			<td>This uses the look because it is assumed that this is message after an action has happened.</td>
+			<td>Must be in valid value list defined in <code>application.cfc</code></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
 		<tr>
-			<td>style</td>
-			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
-			<td>styleClass</td>
+			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
 			<td>Pass though of title</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 	</tbody>
 	</b:table>
diff --git a/views/awesomecheckbox.cfm b/views/awesomecheckbox.cfm
index 04d82cd..e555048 100644
--- a/views/awesomecheckbox.cfm
+++ b/views/awesomecheckbox.cfm
@@ -33,11 +33,13 @@
 <ol>
 	<li>They have done a very good job making checkboxes and radio buttons look great</li>
 	<li>By abstracting checkboxes and radio buttons, it will be easy to swap in new libraries when that day comes</li>
-
 </ol>
 
 
-<b:panel look="info" title="Attributes of &lt;b:well&gt;">
+<p><b>Note:</b> Not all Awesome Bootstrap Checkboxes look awesome on all themes. Verify before using</p>
+
+
+<b:panel look="info" title="Attributes of <b:checkbox>">
 
 	<b:table>
 	<thead>
@@ -45,84 +47,131 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td>Yes.</td>
+		</tr>
+	
 		<tr>
 			<td>circle</td>
 			<td>false</td>
 			<td>Show a circle instead of square</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>checked</td>
 			<td>false</td>
 			<td>Pass through of HTML <code>checked="checked"</code>.</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>disabled</td>
 			<td>false</td>
 			<td>Pass through of HTML <code>disabled="disabled"</code>.</td>
+			<td>Must evaluate to boolean</td>
 		</tr>		
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>inline</td>
 			<td>(none)</td>
-			<td>Should all these checkboxes be in a row?.</td>
+			<td>Should all these checkboxes be in a row?</td>
+			<td>Must evaluate to boolean</td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>look</td>
 			<td>(none)</td>
 			<td>It will still look slightly larger than a normal checkbox.</td>
+			<td>Must be one of: <cfoutput>#application.Bootstrap.validLook.toList()#</cfoutput></td>
 		</tr>	
 		<tr>
 			<td>name</td>
 			<td>(none)</td>
 			<td>Pass through of HTML <code>name=</code>.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>size</td>
 			<td>(none)</td>
 			<td>How much padding should this well have</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tabIndex</td>
 			<td>(none)</td>
 			<td>Pass though of tabindex</td>
+			<td><code>isnumeric()</code></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>title</td>
 			<td>(none)</td>
 			<td>Content next to checkbox. If it is blank, perhaps the content is nearby</td>
+			<td><code>encodeForHTML()</code></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of <code>title=</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -147,20 +196,20 @@
 		<td></td>
      
 		<td>missing</td>
-		<td>Standard HTML checkbox</td>
+		<td>Standard HTML checkbox. Many themes will make the label bold</td>
 	</tr>
 	
    <tr>
-       <td><b:selectBooleanCheckbox checked="true" name="myc" id="auto">Checkbox</b:selectBooleanCheckbox></td>
-       <td><b:selectBooleanCheckbox circle="true" id="auto" checked="true">Checkbox</b:selectBooleanCheckbox></td>
+       <td><b:selectBooleanCheckbox checked="true" name="myc" id="auto" tooltip="Hello, World!">Checkbox with tooltip</b:selectBooleanCheckbox></td>
+       <td><b:selectBooleanCheckbox circle="true" id="auto" checked="true" tooltip="Hello, World!">Checkbox with tooltip</b:selectBooleanCheckbox></td>
      
        <td>missing</td>
        <td>Standard gray button with gradient. This tends to be larger.</td>
    </tr>
 
    <tr>
-       <td><b:selectBooleanCheckbox	look="primary" 			id="auto" checked="true">Checkbox</b:selectBooleanCheckbox></td>
-       <td><b:selectBooleanCheckbox	look="primary" circle="true" name="myc" checked="true"id="auto">Checkbox</b:selectBooleanCheckbox></td>
+       <td><b:selectBooleanCheckbox	look="primary" 			id="auto" checked="true" tooltip="Hello, World!">Checkbox with tooltip</b:selectBooleanCheckbox></td>
+       <td><b:selectBooleanCheckbox	look="primary" circle="true" name="myc" checked="true"id="auto" tooltip="Hello, World!">Checkbox with tooltip</b:selectBooleanCheckbox></td>
        <td><code>look="primary"</code></td>
        <td>Provides extra visual weight and identifies the primary action in a set of buttons</td>
    </tr>
diff --git a/views/buttonGroups.cfm b/views/buttonGroups.cfm
index 932d9d8..47af1fc 100644
--- a/views/buttonGroups.cfm
+++ b/views/buttonGroups.cfm
@@ -20,7 +20,7 @@
 
 <h3>&lt;b:buttonToolbar&gt;</h3>
 
-<b:panel look="info" title="Attributes of &lt;b:buttonToolbar&gt;">
+<b:panel look="info" title="Attributes of <b:buttonToolbar>">
 
 	<b:table>
 	<thead>
@@ -28,6 +28,7 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -35,29 +36,45 @@
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>size</td>
 			<td>(none)</td>
 			<td>reserved for future use</td>
+			<td>N/A</td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
 
 	</tbody>
 	</b:table>
@@ -67,7 +84,7 @@
 
 <h3>&lt;b:buttonGroup&gt;</h3>
 
-<b:panel look="info" title="Attributes of &lt;b:buttonGroup&gt;">
+<b:panel look="info" title="Attributes of <b:buttonGroup>">
 
 	<b:table>
 	<thead>
@@ -75,6 +92,7 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -82,28 +100,32 @@
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>justified</td>
 			<td>false</td>
 			<td>Stretch buttons over the width of the container.</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>orientation</td>
 			<td>horizontal</td>
 			<td>As opposed to Vertical.</td>
+			<td>Must be their not set, horizontal, or vertical</td>
 		</tr>
-		
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>size</td>
@@ -111,17 +133,23 @@
 			<td>How much padding should this well have</td>
 		</tr>
 		<tr>
-			<td>toggle</td>
+			<td>throwOnError</td>
 			<td>false</td>
-			<td>This is going to contain radio or checkbox that thank list items</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
-
 	</tbody>
 	</b:table>
 </b:panel>
diff --git a/views/buttons.cfm b/views/buttons.cfm
index 86d8c04..cc1d573 100644
--- a/views/buttons.cfm
+++ b/views/buttons.cfm
@@ -13,7 +13,7 @@
 <h2>Introduction</h2>
 
 
-<b:panel look="info" title="Attributes of &lt;b:button&gt;, &lt;b:commandButton&gt;, &amp;  &lt;b:commandLink&gt;">
+<b:panel look="info" title="Attributes of <b:button>, <b:commandButton>, & <b:commandLink>">
 
 	<b:table>
 	<thead>
@@ -21,80 +21,101 @@
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td>Yes</td>
+		</tr>
 		<tr>
 			<td>ajax</td>
 			<td>(none)</td>
 			<td>Reserved for future use</td>
+			<td>N/A</td>
 		</tr>
 		
 		<tr>
 			<td>binding</td>
 			<td>(none)</td>
 			<td>Try to find the value of this tag in the <code>rc.*</code> scope. See note below</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>data-*</td>
 			<td>(none)</td>
-			<td>Pass through of HTML5 <code>data-*=</code> attributes.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>disabled</td>
 			<td>false</td>
 			<td>Pass through of HTML <code>disabled="disabled"</code>.</td>
+			<td>Must evaluate to boolean, disabled is treated as true</td>
 		</tr>
 		<tr>
 			<td>dismiss</td>
 			<td>false</td>
 			<td>Sets <code> data-dismiss=</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>dropdown</td>
 			<td>false</td>
 			<td>For <code>b:button</code>, this activates a dropdown menu</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>icon</td>
 			<td>(none)</td>
 			<td>Adds Glyphicon</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>iconAlign</td>
 			<td>(none)</td>
 			<td>Aligns icon</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>lang</td>
 			<td>(none)</td>
 			<td>Pass through of HTML <code>lang=</code></td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>library</td>
 			<td>default</td>
 			<td>Which icon library should be used? This is set via: <code>application.Bootstrap.IconLibrary[attributes.library]</code>. This site uses Glyphicons</td>
+			<td>Must be valid library</td>
 		</tr>
 		<tr>
 			<td>look</td>
 			<td>default</td>
-			<td>Valid value for buttons are "default", "primary", "success", "info", "warning", "danger", "link".</td>
+			<td>Must be one of: <cfoutput>#application.Bootstrap.validLook.toList()#</cfoutput></td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>ng-*</td>
 			<td>(none)</td>
-			<td>Pass through of all AngularJS attributes</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>on*</td>
 			<td>(none)</td>
-			<td>Pass through of all Mouse/Pointer events.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>outline</td>
@@ -102,51 +123,73 @@
 			<td>This will create a button with a thin outline. 
 				When you hover over it, it will fill in <b:label look="Info" value="BS4" />
 			</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>role</td>
 			<td>button</td>
 			<td>Pass through of HTML <code>role=</code></td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>size</td>
 			<td>(none)</td>
 			<td>How big</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of <code>title=</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltipPosition</td>
 			<td>bottom</td>
-			<td>Pass though of <code>data-placement=</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>value</td>
 			<td>(none)</td>
 			<td>Content to be displayed. Tag also support <code>thisTag.GeneratedContent</code> See note below</td>
+			<td><code>encodeForHTML()</code></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -155,7 +198,7 @@
 
 
 
-<b:panel look="info" title="Attributes of &lt;b:commandLink&gt; only">
+<b:panel look="info" title="Attributes of <b:commandLink> only">
 
 	<b:table>
 	<thead>
@@ -163,6 +206,7 @@
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -172,11 +216,13 @@
 			<td>For <code>b:commandLink</code> to creates an absolute link. 
 				To use this tag, you must set <code>application.Bootstrap.actionRoot</code>.
 			</td>
+			<td><b:label look="danger">No</b:label></td>
 		</tr>
 		<tr>
 			<td>href</td>
 			<td>(none)</td>
 			<td>For <code>b:commandLink</code> to creates a link to action. This is a pass through of HTML <code>href=</code>.</td>
+			<td><b:label look="danger">No</b:label></td>
 		</tr>
 		<tr>
 			<td>look</td>
@@ -184,11 +230,13 @@
 			<td>Valid value for buttons are "default", "primary", "success", "info", "warning", "danger", "link". 
 				If "Link" is chosen, then all the button classes are removed. <!-- I will let you figure out why --></code>
 			</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>target</td>
 			<td>(none)</td>
 			<td>Pass though of <code>target=</code> for <code>&lt;b:commandLink&gt;</code></td>
+			<td><code>encodeForURL()</code></td>
 		</tr>
 	</tbody>
 	</b:table>
diff --git a/views/common.cfm b/views/common.cfm
new file mode 100644
index 0000000..f77aa91
--- /dev/null
+++ b/views/common.cfm
@@ -0,0 +1,326 @@
+<cfimport prefix="b" taglib="../bootstrap">
+
+
+
+<b:row>
+	<b:column span="12">	
+		<b:h1 pageheader="true">Smarter tags</b:h1>
+
+	</b:column>	
+</b:row>
+
+
+
+
+<p>All tags share a rich set of common features</p>
+
+
+<b:panel look="info" title="Attributes for all <b:poll>">
+
+	<b:table>
+	<thead>
+		<tr>
+			<th>Attribute</th>
+			<th>Default value</th>
+			<th>Description</th>
+			<th>Sanitized</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td>Pass through of content</td>
+			<td><b:label look="danger">No</b:label>  Content is assumed to be clean</td>
+		</tr>
+		<tr>
+			<td>data-*</td>
+			<td>(none)</td>
+			<td>Pass through of HTML5 <code>data-*=</code> attributes.</td>
+			<td>
+				Keys: <b:label look="danger">No</b:label> 	
+				<br />	
+				Values <code>encodeForHTMLAttribute()</code>
+			</td>
+		</tr>
+		<tr>
+			<td>id</td>
+			<td>auto</td>
+			<td>Pass through of HTML id.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>IF exists in<code>application.Bootstrap.isSafeHTML</code></td>
+			<td>Controls how content is rendered. Content is assumed to be clean, but it can be cleaned if necessary.
+				By setting this to false, all content will be cleaned via <code>getSafeHTML()</code></td>
+			<td>Must evaluate to boolean</td>
+		</tr>
+		<tr>
+			<td>key</td>
+			<td>(none)</td>
+			<td>Reserved for future use. Eventually it will lookup strings in an i18n language file. Also see placeholder</td>
+			<td>N/A</td>
+		</tr>
+		<tr>
+			<td>ng-*</td>
+			<td>(none)</td>
+			<td>Pass through of all AngularJS attributes</td>
+			<td class="text-nowrap">
+				Keys: <b:label look="danger">No</b:label> 	
+				<br />	
+				Values <code>encodeForHTMLAttribute()</code>
+			</td>
+		</tr>
+		<tr>
+			<td>on*</td>
+			<td>(none)</td>
+			<td>Pass through of all Mouse/Pointer events.</td>
+			<td>
+				Keys: <b:label look="danger">No</b:label> 	
+				<br />	
+				Values <code>encodeForHTMLAttribute()</code>
+			</td>
+		</tr>
+		<tr>
+			<td>placeholder</td>
+			<td>(none)</td>
+			<td>Reserved for future use. Eventually it will be used for substitution points in i18n language files. 
+				Data must come in as either single simple value, or as an array. Simple value will be converted to an array.  Also see key</td>
+			<td><code>encodeForHTML()</code> for each element in the array.</td>
+		</tr>		
+		<tr>
+			<td>processed</td>
+			<td>true</td>
+			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td>Must evaluate to boolean</td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td><code>application.Bootstrap.profile</code></td>
+			<td>Application specific profile for Antisamy cleanup. If this is set to blank, then server setting will be used.
+				Pass through attribute on <code>getSafeHTML(inString, <b>profile</b>, throwOnError)</code></td>
+			<td>Must evaluate to boolean</td>
+		</tr>	
+		<tr>
+			<td>rendered</td>
+			<td>true</td>
+			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td>Must evaluate to boolean</td>
+		</tr>
+
+		<tr>
+			<td>style</td>
+			<td>(none)</td>
+			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><code>encodeForCSS()</code></td>
+		</tr>
+		<tr>
+			<td>styleClass</td>
+			<td>(none)</td>
+			<td>Pass though of CSS class.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
+		</tr>
+		<tr>
+			<td>tooltip</td>
+			<td>(none)</td>
+			<td>Pass though of title</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td>Pass though of <code>data-placement=</code></td>
+			<td><code>encodeForHTMLAttribute()</code></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td><code>application.Bootstrap.throwOnError</code></td>
+			<td>Pass through attribute on <code>getSafeHTML(inString, profile, <b>throwOnError</b>)</code></td>
+			<td>Must evaluate to boolean</td>
+		</tr>
+	</tbody>
+	</b:table>
+</b:panel>
+
+
+
+
+<h2>generatedContent</h2>
+
+
+<b:blockquote isSafeHTML="true">
+One of the cooler new features in the next version of ColdFusion is <code>getSafeHTML()</code>. I had seen this mentioned a few times already but it never really clicked in my brain what it was doing. getSafeHTML makes use of the AntiSamy project. It takes user-generated content and replaces unsafe HTML. What is safe and what isn’t? It is totally up to you. The functionality is driven by an XML file (a very complex XML file) that lets you get as granular as you want. Want to support the bold tag but not italics? Fine. Want to support colors for CSS but only some? You can do that.
+
+	<footer><a href="http://www.raymondcamden.com/2014/04/09/getSafeHTML-and-ColdFusion-11">Raymond Camden</a></footer>
+</b:blockquote>	
+
+
+<p>Any tag with inner content has the isSafeHTML attribute. <i>Bootstrap for ColdFusion</i> will then pass the generatedContent through <code>getSafeHTML()</code></p>
+
+
+<p><b>Also See</b> <a href="http://stackoverflow.com/tags/sanitization/info">http://stackoverflow.com/tags/sanitization/info</a></p>	
+	
+<b:table>
+<thead>
+	<tr>
+		<th>True by default (Not Sanitized)</th>
+		<th>False by default (Sanitized)</th>
+		<th>Does not use generatedContent</th>
+		<th>Cannot be filtered</th>
+	</tr>
+</thead>
+<tbody>
+	<tr>
+		<td>
+			<code>
+			b:column<br />
+			b:container<br />
+			b:fieldset<br />
+			b:formGroup<br />
+			b:jumbotron<br />
+			b:modal<br />
+			b:panel<br />
+			b:row<br />
+			b:tab<br />
+			b:table<br />
+			b:tabView<br />
+			b:tr<br />
+			b:well
+			</code>	
+		</td>
+		<td>
+			<code>b:alert<br />
+			b:badge<br />
+			b:blockquote<br />
+			b:button<br />
+			b:buttonGroup<br />
+			b:buttonToolbar<br />
+			b:commandButton<br />
+			b:commandLink<br />
+			b:dropButton<br />
+			b:dropMenu<br />
+			b:h1<br />
+			b:h2<br />
+			b:h3<br />
+			b:h4<br />
+			b:h5<br />
+			b:h6<br />
+			b:label<br />
+			b:navBar<br />
+			b:navBarLinks<br />
+			b:navLink<br />
+			b:navBar<br />
+			b:outputText<br />
+			b:p<br />
+			b:poll<br />
+			b:progressbar<br />
+			b:selectBooleanCheckbox<br />
+			b:selectManyCheckbox<br />
+			b:selectManyMenu<br />
+			b:selectOneMenu<br />
+			b:selectOneRadio<br />
+			b:td<br />
+			b:th
+			</code>
+		</td>
+		<td>
+			<code>b:graphicImage<br />
+			b:icon<br />
+			b:include<br />
+			</code>
+		</td>
+		<td>
+			<code>b:outputScript<br />
+			b:outputStyleSheet<br />
+			b:selectItem<br />
+			b:selectItems<br />
+			</code>
+		</td>	
+	</tr>	
+</tbody>
+</b:table>
+
+<p>Adobe ColdFusion 11 has a default string length of 5000. This can be particularly low in many instances</p>				
+	
+	
+<h5>References</h5>	
+
+
+<h2>data-*</h2>
+
+<p>HTML5 data-* attributes</p>
+
+
+<h2>id</h2>
+
+<p>If attributes exists and is not blank, it is passed through <code>encodeForHTMLAttribute()</code>.</p>
+
+<h2>isSafeHTML, profile, throwOnError</h2>
+
+<p><b>isSafeHTML</b> overrides the default behavior generatedContent behavior. See chart above to determine if this is true or false by default</p>
+
+<p><b>profile</b> checks the profile that <code>getSafeHTML()</code> will be validating against. ColdFusion 11 ships with a medium strength profile that is used server wide.
+	
+ColdFusion 11 does an application wide setting. This functionality adds that capability.	
+</p>
+	
+	
+<p><b>throwOnError</b> 
+
+If there is unwanted content, this will throw an error. Otherwise it could return an empty string.
+This option is not expected to be used much, but it is a native feature of getSafeHTML()
+	
+See <a href="https://helpx.adobe.com/coldfusion/cfml-reference/coldfusion-functions/functions-e-g/getsafehtml.html">Link</a> for more details
+
+</p>		
+	
+
+<h2>on*</h2>
+
+<p>Mouse events</p>
+
+<h2>ng-*</h2>
+
+<p>AngularJS attributes</p>
+
+
+<h2>processed</h2>
+
+<p>This like a <code>&lt;cfif&gt;</code> If processed is false, none of the inner tags or content is ran. This is the recommended approach</p>
+
+
+<h2>rendered</h2>
+
+<p>This is like <code>&lt;cfsilent&gt;</code>. All of the inner calculations are still ran. This is a lot like how jsf works and some developers may be more at ease with this approach.</p>
+
+
+<h2>style</h2>
+
+<p>This is a passthrough of the style attribute and uses <code>encodeForCSS()</code>. Bootstrap provides a rich set of classes.
+	It is recommended that developers used the Bootstrap classes rather doing inline styling.
+</p>	
+
+<h2>styleClass</h2>
+
+<p>This is the generic class passthough. It uses <code>encodeForHTMLAttribute()</code> It is recommend that semantic attributes be used instead.</p>
+
+<h5>References</h5>
+
+
+<b:h2>tooltip & tooltipPosition</b:h2>
+
+<p>Tooltip & tooltip Position create three attributes</p>
+
+
+<pre>
+title = ""     			&lt;!-- traditional tool tip tag. If the Bootstrap tooltip fails, then this will revert to standard tooltip --&gt;
+data-placement = "bottom"	&lt;!-- location of rich tooltip --&gt;
+data-toggle = "tooltip"		&lt;!-- this is the hook used by jQuery to apply the tooltip --&gt;
+	
+</pre>	
+
+
+
+		
+		
\ No newline at end of file
diff --git a/views/dropdowns.cfm b/views/dropdowns.cfm
index a2c8fc7..366d604 100644
--- a/views/dropdowns.cfm
+++ b/views/dropdowns.cfm
@@ -18,7 +18,7 @@
 <p>Pulldown menus. They can either be stand alone, or as part of a tab control</p>
 
 
-<b:panel look="info" title="Attributes of &lt;b:dropdown&gt;">
+<b:panel look="info" title="Attributes of <b:dropbutton">
 
 	<b:table>
 	<thead>
@@ -26,6 +26,7 @@
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -34,27 +35,32 @@
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>. </td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>look</td>
 			<td>default</td>
 			<td>This does a passthrough to <code>btn-</code>. If <code>look="tab"</code> then no button classes are applied. This is so that to will look proper in a tab.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>	
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>role</td>
 			<td>role</td>
 			<td>Pass though of HMTL <code>role=</code></div></td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 
 	</tbody>
diff --git a/views/forms.cfm b/views/forms.cfm
index 4bcd30b..1543290 100644
--- a/views/forms.cfm
+++ b/views/forms.cfm
@@ -15,13 +15,13 @@
 
 <b:h2>Introduction</b:h2>
 
-<p>BS-4-CF puts only a few wrappers around form elements. The reason is simple. There are simply too many form libraries out there to try to support. Hence. only the basics are included.</p>
+<p>Bootstrap for ColdFusion puts only a few wrappers around form elements. The reason is simple. There are simply too many form libraries out there to try to support. Hence. only the basics are included.</p>
 
 
 
 <b:h2>b:formGroup<a id="formgroup"></a></b:h2>
 
-<b:panel look="info" title="Attributes of &lt;b:selectItem&gt;">
+<b:panel look="info" title="Attributes of <b:formgroup>">
 
 	<b:table>
 	<thead>
@@ -29,47 +29,89 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td><b:label look="danger">No</b:label> this is often more than the default value as set in antisamy. Make sure that the inner content is clean. Having said all that, it is preferable to use the &lt;b:td&gt; and &lt;b:th&gt; inside of this tag</td>
+		</tr>
+
 		<tr>
 			<td>disabled</td>
 			<td>false</td>
 			<td>Pass through of HTML disabled</td>
+			<td>Must evaluate to boolean. "disabled is treated as true</td>
 		</tr>
 		<tr>
 			<td>display</td>
 			<td>(none)</td>
 			<td>Reserved for future use</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
-			<td>selected</td>
-			<td>false</td>
-			<td>Is this selected on <code>&lt;option&gt;</code> or checked on <code>&lt;input type="radio"&gt;</code></td>
+			<td>style</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>styleClass</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Used on selectOneRadio</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -168,7 +210,7 @@
 		<br />
 		<code>&lt;cfselect&gt;</code>
 	</b:td>
-	<b:td>The # is required for the BS-4-CF version. It is not present in the original. You still need to wrap this in either selectOneMenu or SelectMultiMenu</b:td>
+	<b:td>The # is required for the Bootstrap for ColdFusion version. It is not present in the original. You still need to wrap this in either selectOneMenu or SelectMultiMenu</b:td>
 </b:tr>
 <b:tr>
 	<b:td><code>&lt;b:selectOneMenu&gt;</code></b:td>
diff --git a/views/getting_started.cfm b/views/getting_started.cfm
index b48c729..134705b 100644
--- a/views/getting_started.cfm
+++ b/views/getting_started.cfm
@@ -20,7 +20,7 @@
 
 <p>This library promotes a relaxed style of writing Bootstrap / ColdFusion code. The code becomes much more intuitive and self describing, and therefore easier to maintain.</p>
 
-<b:h3>Without BS-4-CF</b:h3>
+<b:h3>Without Bootstrap for ColdFusion</b:h3>
 <pre>
 &lt;cfif showme&gt;	
      &lt;button type="button" class="btn btn-default"&gt;&lt;i class="glyphicon glyphicon-floppy-disk&gt;&lt;/i&gt;&lt;cfoutput&gt;#rc.savelabel#&lt;cfoutput&gt;&lt;/button&gt;
@@ -29,7 +29,7 @@
 </pre>	
 
 
-<b:h3>With BS-4-CF</b:h3>
+<b:h3>With Bootstrap for ColdFusion</b:h3>
 
 
 <pre>
@@ -77,22 +77,27 @@
 <pre>
 function onApplicationStart()	{
 	application.Bootstrap = {
+				
+		// Antisamy options
+		isSafeHTML		= ["buttongroup","buttontoolbar","column","container","dropmenu","fieldset","formgroup","head",
+							"jumbotron","modal","navbar","navbarlinks","navlink","panel","row","table","tabview","tr","well"],	// these tags to not run through getSafeHTML		
+		profile			= "",	// blank means use system default
+		throwOnError		= false,	// Default behavior for getSafeHTML()
+		
 	
 		actionRoot 		= cgi.script_name,
-		IconLibrary		= {},
-		ImageLibrary		= {},	
-		StyleSheetLibrary	= {},	
-		ScriptLibrary	= {}	
+		validLook			= ["", "link", "default", "primary", "success", "info", "warning", "danger"], // There does not guarantee they are valid	
+		
+		iconLibrary		= {"default" = "glyphicon glyphicon-", "awesome" = "fa fa-", "jquery-ui" = "ui-icon ui-icon-"}, 		// be sure to include ending dashes
+		imageLibrary		= {"default" = replace(cgi.script_name, "/index.cfm", "") & "/assets/"},							// used by b:graphicImage
+		styleSheetLibrary	= {"default" = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css"},				// used by b:outputStyleSheet
+		scriptLibrary		= {"default" = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js", local="assets/"}	// used by b:outputScript
 		};
+	
 		
-	application.Bootstrap.IconLibrary["default"]			= "glyphicon glyphicon-";		// be sure to include ending dash
-	application.Bootstrap.IconLibrary["awesome"]			= "fa fa-";
-	application.Bootstrap.ImageLibrary["default"]		= replace(cgi.script_name, "/index.cfm", "") & "/assets/";		// used by b:graphicImage
-	application.Bootstrap.StyleSheetLibrary["default"] 	= replace(cgi.script_name, "/index.cfm", "") & "/assets/";		// used by b:outputStyleSheet
-	application.Bootstrap.ScriptLibrary["default"]		= replace(cgi.script_name, "/index.cfm", "") & "/assets/";		// used by b:outputScript
-			
 		
 	} // end onApplicationStart
+
 </pre>	
 
 
@@ -148,16 +153,16 @@ function onApplicationStart()	{
 <a id="bind"></a>
 <b:h3>Using Binding</b:h3>
 
-<p>BS-4-CF was written with frameworks such as FW/1 by Sean Corfield in mind. All of the variables that are outputted should be in the <code>rc</code> scope. We can take advantage of that and make our code much simple. Consider the following</p>
+<p>Bootstrap for ColdFusion was written with frameworks such as FW/1 by Sean Corfield in mind. All of the variables that are outputted should be in the <code>rc</code> scope. We can take advantage of that and make our code much simple. Consider the following</p>
 
 
-<b:h3>Without BS-4-CF</b:h3>
+<b:h3>Without Bootstrap for ColdFusion</b:h3>
 <pre>
 &lt;button type="button" class="btn btn-default"&gt;&lt;cfoutput&gt;#rc.savelabel#&lt;cfoutput&gt;&lt;/button&gt;	
 </pre>	
 
 
-<b:h3>With BS-4-CF</b:h3>
+<b:h3>With Bootstrap for ColdFusion</b:h3>
 <pre>
 &lt;b:button binding="savelabel" /&gt;	
 </pre>
@@ -170,7 +175,7 @@ function onApplicationStart()	{
 <p><code>&lt;cfif&gt;</code> is used to conditionally show blocks of code. <code>&lt;cfif&gt;</code> can span dozens if not hundreds of lines of code. Bootstrap uses lots and lots of <code>&lt;div&gt;</code> tags. You can find yourself at the end of a large block code with nothing but <code>&lt;/cfif&gt;</code> and <code>&lt;/div&gt;</code>. One small mistake can mean wasting hours finding that stray tag.</p>	
 
 
-<b:h3>Without BS-4-CF</b:h3>
+<b:h3>Without Bootstrap for ColdFusion</b:h3>
 
 <pre>
 &lt;cfif showme&gt;
@@ -185,7 +190,7 @@ function onApplicationStart()	{
 </pre>
 
 
-<b:h3>With BS-4-CF</b:h3>
+<b:h3>With Bootstrap for ColdFusion</b:h3>
 
 
 <pre>
@@ -264,7 +269,7 @@ rc.savelabel = "Save this data";
 </cfscript>
 
 
-<b:h3>Without BS-4-CF</b:h3>
+<b:h3>Without Bootstrap for ColdFusion</b:h3>
 <pre>
 &lt;cfif showme&gt;	
      &lt;button type="button" class="btn btn-default"&gt;&lt;i class="glyphicon glyphicon-floppy-disk&gt;&lt;/i&gt;&lt;cfoutput&gt;#rc.savelabel#&lt;cfoutput&gt;&lt;/button&gt;
@@ -273,7 +278,7 @@ rc.savelabel = "Save this data";
 </pre>	
 
 
-<b:h3>With BS-4-CF</b:h3>
+<b:h3>With Bootstrap for ColdFusion</b:h3>
 
 
 <pre>
diff --git a/views/grid.cfm b/views/grid.cfm
index fcc7812..bddc6a0 100644
--- a/views/grid.cfm
+++ b/views/grid.cfm
@@ -27,10 +27,10 @@
 	<footer>Quote from <cite>Bootstrap documentation</cite></footer>
 </b:blockquote>
 
-<p>This rule is not enforced within BS-4-CF</p>
+<p>This rule is not enforced within Bootstrap for ColdFusion</p>
 
 
-<b:panel look="info" title="Attributes of &lt;b:container&gt;">
+<b:panel look="info" title="Attributes of <b:container>">
 
 	<b:table>
 	<thead>
@@ -38,44 +38,82 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td>Pass through of content</td>
+			<td><b:label look="danger">No</b:label> this is often longer than antisamy limits. Make sure that the inner content is clean</td>
+		</tr>
 		<tr>
 			<td>fluid</td>
 			<td>true</td>
 			<td>Is this a fluid container?</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -88,7 +126,7 @@
 
 
 
-<b:panel look="info" title="Attributes of &lt;b:row&gt;">
+<b:panel look="info" title="Attributes of <b:row>">
 
 	<b:table>
 	<thead>
@@ -96,40 +134,77 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td><b:label look="danger">No</b:label> this is often longer than antisamy limits. Make sure that the inner content is clean</td>
+		</tr>
 
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -139,7 +214,7 @@
 <h3>b:column</h3>
 
 
-<b:panel look="info" title="Attributes of &lt;b:column&gt;">
+<b:panel look="info" title="Attributes of <b:column>">
 
 	<b:table>
 	<thead>
@@ -147,93 +222,139 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
 		
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td><b:label look="danger">No</b:label></td>
+		</tr>
+		
 		<tr>
 			<td>colxs</td>
 			<td>(none)</td>
 			<td>Span for extra small screens. Use <code>span=</code> if possible</td>
+			<td><code>isnumeric()</code></td>
 		</tr>
 		<tr>
 			<td>colsm</td>
 			<td>(none)</td>
 			<td>Span for small screens. Use <code>span=</code> if possible</td>
+			<td><code>isnumeric()</code></td>
 		</tr>
 		<tr>
 			<td>colmd</td>
 			<td>(none)</td>
 			<td>Span for medium screens. Use <code>span=</code> if possible</td>
+			<td><code>isnumeric()</code></td>
 		</tr>
 		<tr>
-			<td>col-lg</td>
+			<td>collg</td>
 			<td>(none)</td>
 			<td>This is now set by default. This has to be manually set if needed.</td>
+			<td><code>isnumeric()</code></td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id. For selectOneRadio, set this the "auto" so that an id can be created for form and label.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>offset</td>
 			<td>(none)</td>
 			<td>By default, no offset will be done. When provided, this will define the offset for all screen sizes.</td>
+			<td><code>isnumeric()</code></td>
 		</tr>
 		<tr>
-			<td>offset-xs</td>
+			<td>offsetxs</td>
 			<td>(none)</td>
 			<td>Offset for extra small screens</td>
+			<td><code>isnumeric()</code></td>
 		</tr>
 		<tr>
-			<td>offset-sm</td>
+			<td>offsetsm</td>
 			<td>(none)</td>
 			<td>Offset for small screens</td>
+			<td><code>isnumeric()</code></td>
 		</tr>
 		<tr>
-			<td>offset-md</td>
+			<td>offsetmd</td>
 			<td>(none)</td>
 			<td>Offset for medium screens</td>
+			<td><code>isnumeric()</code></td>
 		</tr>
 		<tr>
-			<td>offset-lg</td>
+			<td>offsetlg</td>
 			<td>0</td>
 			<td>This is skipped where there is an offset of 0.</td>
+			<td><code>isnumeric()</code></td>
 		</tr>
 		
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>span</td>
 			<td>(none)</td>
 			<td>How many columns should this content span?  When provided, this will define the span for all screen sizes.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
-
-		
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
diff --git a/views/ssjs.cfm b/views/head.cfm
similarity index 56%
rename from views/ssjs.cfm
rename to views/head.cfm
index 6c1a081..787f695 100644
--- a/views/ssjs.cfm
+++ b/views/head.cfm
@@ -36,7 +36,7 @@
 </pre>
 
 
-<p>Inside of <code>&lt;Head&gt;</code> of the generated content. In FW/1 this is the layout file</p>
+<p>Inside of <code>&lt;b:head&gt;</code> of the generated content. In FW/1 this is the layout file</p>
 
 
 <pre>
@@ -53,14 +53,72 @@
 
 <!--- And Bob's your uncle --->
 
-<h3>Also note</h3>
 
-<p>Icons and libraries are setup in a similar way</p>
+<h2>Head Tag</h2>
+
+<p>The primary purpose of this tag is the be the container for <code>b:outputStylesheet</code> and <code>b:outputScript</code>.
+	It is possible to set processed or render to false. These were included for completeness</p>
+
+
+<b:panel look="info" title="Attributes of <b:head>">
+
+	<b:table>
+	<thead>
+		<tr>
+			<th>Attribute</th>
+			<b:th text="nowrap">Default value</b:th>
+			<th>Description</th>
+			<th>Sanitized</th>
+		</tr>	
+	</thead>
+	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td>Pass through of content</td>
+			<td><b:label look="danger">No</b:label> Default Antisamy wouldn't work anyway</td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>processed</td>
+			<td>true</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>rendered</td>
+			<td>true</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+	</tbody>
+	</b:table>
+</b:panel>
 
 
 <h2>Stylesheets</h2>
 
-<b:panel look="info" title="Attributes of &lt;b:outputStyleSheet&gt;">
+<p>These must be inside of b:head.</p>
+
+
+<b:panel look="info" title="Attributes of <b:outputStyleSheet>">
 
 	<b:table>
 	<thead>
@@ -68,6 +126,7 @@
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	<tbody>
@@ -75,34 +134,39 @@
 			<td>library</td>
 			<td>(none)</td>
 			<td>Defaults to <code>application.Bootstrap.StyleSheetLibrary.default</code></td>
+			<td>N/A</td>
 		</tr>
 		
 		<tr>
 			<td>media</td>
 			<td>all</td>
 			<td>Pass through of <code>media=</code> attribute</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		
 		<tr>
 			<td>name</td>
 			<td>Required</td>
 			<td>This is a relative path, the library is prepended. If name is blank, then library better have complete target</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
-		
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rel</td>
 			<td>stylesheet</td>
 			<td>Pass through of <code>rel=</code> attribute</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -118,9 +182,11 @@
 
 <h3>Javascript</h3>
 
+<p>These must be inside of b:head.</p>
+
 <p>This is used for local Javascript libraries</p>
 
-<b:panel look="info" title="Attributes of &lt;b:outputScript&gt;">
+<b:panel look="info" title="Attributes of <b:outputScript>">
 
 	<b:table>
 	<thead>
@@ -128,6 +194,7 @@
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	<tbody>
@@ -135,6 +202,7 @@
 			<td>library</td>
 			<td>(none)</td>
 			<td>Defaults to <code>application.Bootstrap.ScriptLibrary.default</code>.</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>name</td>
@@ -143,16 +211,19 @@
 				This is slightly different from JSF.
 				If no name set, then the content between the start and end tags is rendered in style tags. Provided that processed and rendered are true.
 			</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
diff --git a/views/helper.cfm b/views/helper.cfm
index 25cada2..45657ab 100644
--- a/views/helper.cfm
+++ b/views/helper.cfm
@@ -27,7 +27,7 @@
 </b:blockquote>
 
 
-<b:panel look="info" title="Tags with &lt;b:text&gt; attribute">
+<b:panel look="info" title="Tags with <b:text> attribute">
 
 	<b:table>
 	<thead>
diff --git a/views/home.cfm b/views/home.cfm
index a7e86dd..5c96c11 100644
--- a/views/home.cfm
+++ b/views/home.cfm
@@ -3,9 +3,9 @@
  
  
 <b:jumbotron>
-	<b:h1>BS-4-CF</b:h1>
-     <p>Bootstrap tags for Adobe ColdFusion</p>
-     <p><b:commandLink action="?view=getting_started" look="primary" size="lg">Learn more</b:commandLink></p>
+	<b:h1>Bootstrap for ColdFusion</b:h1>
+     <p>Making development safe and quick</p>
+     <p><b:commandLink action="?view=getting_started" look="primary" size="lg">Get Started</b:commandLink></p>
 </b:jumbotron>
 
 
@@ -19,13 +19,15 @@
 
 	<b:column span="4">
             <h3><b:icon library="awesome" name="github" /> Open Source</h3>
-            <p>BS-4-CF is released under the MIT License and maintained on <a target="_blank" href="https://github.com/jmohler1970">GitHub</a>.</p>
+            <p>Bootstrap for ColdFusion is released under the MIT License and maintained on <a target="_blank" href="https://github.com/jmohler1970">GitHub</a>.</p>
 	</b:column>     
           
           
 	<b:column span="4">
             <h3><b:icon library="awesome" name="wrench" /> Themes</h3>
             <p>Use the standard Bootstrap theme or Bootswatch Themes. This site show the various Bootswatch themes in action</p>
+            
+            <b:p><b:commandLink href="?view=theme" value="Learn More" look="primary" /></b:p>
 	</b:column>
 </b:row>
 
@@ -37,14 +39,18 @@
 		  
 	
 	<b:column span="4">
-          <h3><b:icon library="awesome" name="cloud" /> Rendered</h3>
-          <p>This <q>Rendered</q> option is like <code>&lt;cfif&gt;</code> but much smarter because it is a part of what is controlling as opposed to being a container.</p>
+          <h3><b:icon library="awesome" name="cloud" /> Smarter tags</h3>
+          <p>This <q>Rendered</q> option is like wrapping your code in a <code>&lt;cfif&gt;</code>. It is much smarter because it is a part of the tags as opposed to wrapping the content.</p>
+          
+          <b:p><b:commandLink href="?view=common" value="Learn More" look="primary" /></b:p>
 	</b:column>    
 		  
 
 	<b:column span="4">
           <h3><b:icon library="awesome" name="cogs" /> Modular</h3>
-          <p>Each tag is in a single file. Update the tags to support the functionality you need for your site</p>
+          <p>Each tag is in a single file. Update the tags to support the functionality you need for your site. tag attributes are sanitized to protect your site from common injection attacks</p>
+          
+          <b:p><b:commandLink href="?view=esapi" value="Learn More" look="primary" /></b:p>
 	</b:column>          
 
 </b:row>
\ No newline at end of file
diff --git a/views/icons.cfm b/views/icons.cfm
index 4f4c289..6abc689 100644
--- a/views/icons.cfm
+++ b/views/icons.cfm
@@ -10,7 +10,7 @@
 <b:row>
 	<b:column span="12">	
 
-		<b:h1 pageHeader="true">Glyphicon Examples</b:h1>
+		<b:h1 pageHeader="true">Icon Examples</b:h1>
 		<p>b:icon</p>
 	</b:column>	
 </b:row>
@@ -18,11 +18,11 @@
 
 <h2>Introduction</h2>
 
-<p>Brings in the power of Glyphicons and Font Awesome. This tag should not have sub tags</p>
+<p>Brings in the power of Glyphicons, Font Awesome, and <small>jQuery-UI</small>. This tag should not have sub tags</p>
 
 <p>If possible, use the icons that are a part of one of the button tags</p>
 
-<b:panel look="info" title="Attributes of &lt;b:icon&gt;">
+<b:panel look="info" title="Attributes of <b:icon>">
 
 	<b:table>
 	<thead>
@@ -30,6 +30,7 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -38,90 +39,123 @@
 			<td>addon</td>
 			<td>(none)</td>
 			<td>Is this a part of an input.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>binding</td>
 			<td>(none)</td>
 			<td>Variable that controls what icon to show</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>data-*</td>
 			<td>(none)</td>
-			<td>Pass through of HTML5 <code>data-*=</code> attributes.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>flip</td>
 			<td>(none)</td>
-			<td>For <code>&lt;b:iconAwesome&gt;, the icon can be flipped horizontally or vertically. H, V, and blank are valid values</td>
+			<td>For <code>library="awesome"</code>, the icon can be flipped horizontally or vertically. H, V, and blank are valid values</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>library</td>
 			<td>default</td>
-			<td>Which icon library should be used? This is set via: <code>application.Bootstrap.IconLibrary[attributes.library]</code>. This site uses Glyphicons</td>
+			<td>Which icon library should be used? This is set via: <code>application.Bootstrap.IconLibrary[attributes.library]</code>. This site uses Glyphicons by default</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>look</td>
 			<td>(none)</td>
 			<td>What colors should this have.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>ng-*</td>
 			<td>(none)</td>
-			<td>Pass through of all AngularJS attributes</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>on*</td>
 			<td>(none)</td>
-			<td>Pass through of all Mouse/Pointer events.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rotate</td>
 			<td>(none)</td>
-			<td>For <code>&lt;b:iconAwesome&gt;, the icon can be rotated left or right. L, R, and blank are valid values</td>
+			<td>For <code>library="awesome"</code>, the icon can be rotated left or right. L, R, and blank are valid values</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 
 		<tr>
 			<td>size</td>
 			<td>(none)</td>
 			<td>This uses Font Awesome to do the sizing</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>spin</td>
 			<td>(none)</td>
 			<td>This uses Font Awesome to do spinning</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
-
 	</tbody>
 	</b:table>
 </b:panel>
@@ -205,3 +239,37 @@
 
 </b:table>
 
+
+
+<h2>Example with &lt;b:icon&gt; using jQuery UI</h2>
+
+<p>It is recommended that only one library be used per application. The <code>library=""</code> is used for overrides. jQuery UI uses bitmaps not font (vectors). 
+	For this reason it has a hard time resizing or changing colors. It is NOT recommend that his library be used. This sample is included for completeness only</p>
+
+<b:table>
+<thead>
+<tr>
+	<th>Name</th>
+	<th>Default look</th>
+	<th><code>lstyleClass="ui-state-highlight"</code></th>
+	<th><code>styleClass="ui-state-error"</code></th>
+	<th><code>spin="true"</code></th>
+</tr>
+</thead>	
+
+<tbody>
+<cfloop list="tag,note,bookmark,print,image,flag,arrowthickstop-1-s,arrowthickstop-1-n,mail-closed,arrowrefresh-1-w,trash,check" index="rc.i">
+	<tr>
+		<td><cfoutput>#rc.i#</cfoutput></td>
+		<td><b:icon library="jquery-ui" binding="i" /></td>
+		<td><b:icon library="jquery-ui" binding="i" styleClass="ui-state-highlight"/></td>
+		<td><b:icon library="jquery-ui" binding="i" styleClass="ui-state-error"	/></td>
+		<td><b:icon library="jquery-ui" binding="i" spin="true"	/></td>
+	</tr>
+</cfloop>
+</tbody>
+
+</b:table>
+
+
+
diff --git a/views/image.cfm b/views/image.cfm
index e3b624d..95f267d 100644
--- a/views/image.cfm
+++ b/views/image.cfm
@@ -25,7 +25,7 @@
 <p><code>&lt;b:graphicImage&gt;</code> is oriented towards supporting image libraries. This allows the application to globally set look and feel.</p>
 
 
-<b:panel look="info" title="Attributes of &lt;b:graphicImage&gt;">
+<b:panel look="info" title="Attributes of <b:graphicImage>">
 
 	<b:table>
 	<thead>
@@ -33,90 +33,112 @@
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	<tbody>
 		<tr>
 			<td>alt</td>
 			<td>(none)</td>
-			<td>Passthough of alt</code>.
-			</td>
+			<td>Passthough of <code>alt</code>.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>binding</td>
 			<td>(none)</td>
 			<td>Try to find the value of this tag in the <code>rc.*</code> scope. If found then use its value, else use the content between the tags.</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>data-*</td>
 			<td>(none)</td>
-			<td>Pass through of HTML5 <code>data-*=</code> attributes.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>height</td>
 			<td>(none)</td>
 			<td>Creates the height part of style</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>library</td>
 			<td>(none)</td>
 			<td>Defaults to <code>application.Bootstrap.ImageLibrary.default</code></td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>name</td>
 			<td>(none)</td>
 			<td>This is a relative path, the library is prepended. If this is not set, perhaps you are doing a binding with AngularJS.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>ng-*</td>
 			<td>(none)</td>
-			<td>Pass through of all AngularJS attributes</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>on*</td>
 			<td>(none)</td>
-			<td>Pass through of all Mouse/Pointer events.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>shape</td>
 			<td>(none)</td>
 			<td>Such as rounded, circle, thumbnail</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
-
 		<tr>
-			<td>style</td>
+			<td>titleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td>CSS class for title</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
-			<td>styleClass</td>
+			<td>titleStyle</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td>CSS style for title</td>
+			<td><code>encodeForCSS()</code></td>
 		</tr>
+
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>width</td>
 			<td>(none)</td>
 			<td>Creates the width part of style</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 	</tbody>
 	</b:table>
diff --git a/views/include.cfm b/views/include.cfm
index 2937c26..f941ae8 100644
--- a/views/include.cfm
+++ b/views/include.cfm
@@ -15,7 +15,7 @@
 
 <p>This is a passthrough of <code>&lt;cfinclude&gt;</code>. It also has the conditional processing of processed and rendered</p>
 
-<b:panel look="info" title="Attributes of &lt;b:include&gt;">
+<b:panel look="info" title="Attributes of <b:include>">
 
 	<b:table>
 	<thead>
@@ -23,6 +23,7 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -30,17 +31,20 @@
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>template</td>
 			<td>(required)</td>
 			<td>Pass through of <code>template=</code> attribute. If a relative path is used, it is from the install directory of this tag. It is recommended absolute paths be used</td>
+			<td><b:label look="danger">No</b:label>  Value is assumed to be clean</td>
 		</tr>
 	</tbody>
 	</b:table>
diff --git a/views/jumbotron.cfm b/views/jumbotron.cfm
index 0c8fe2a..78c1d7e 100644
--- a/views/jumbotron.cfm
+++ b/views/jumbotron.cfm
@@ -15,7 +15,7 @@
 
 
 
-<b:panel look="info" title="Attributes of &lt;b:jumbotron&gt;">
+<b:panel look="info" title="Attributes of <b:jumbotron>">
 
 	<b:table>
 	<thead>
@@ -23,34 +23,64 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td><b:label look="danger">No</b:label> Make sure that the inner content is clean</td></td>
+		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tight</td>
 			<td>false</td>
 			<td>Quickly set <code>margin : 0; padding-top : 0; padding-right : 0</code></td>
+			<td>No</td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
diff --git a/views/label.cfm b/views/label.cfm
index f6fc2c1..483f965 100644
--- a/views/label.cfm
+++ b/views/label.cfm
@@ -18,7 +18,7 @@
 <b:h2>Introduction</b:h2>
 
 
-<b:panel look="info" title="Attributes of &lt;b:badge&gt; &amp; &lt;b:label&gt;">
+<b:panel look="info" title="Attributes of <b:badge> & <b:label>">
 
 	<b:table>
 	<thead>
@@ -26,61 +26,119 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td>Yes</td>
+		</tr>
 		<tr>
 			<td>binding</td>
 			<td>(none)</td>
 			<td>Finds data in <code>rc.*</code> scope</td>
+			<td>N/A</td>
+		</tr>
+		<tr>
+			<td>data-*</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>true</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>look</td>
-			<td>warning for b:badge<br />
-				default for b:label</td>
+			<b:td text="nowrap">warning for b:badge<br />
+				default for b:label</b:td>
 			<td>This is forces to lower case. ColdFusion is case insensitive and this allows that pattern to continue</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
+		</tr>
+		<tr>
+			<td>ng-*</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>on*</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>text</td>
 			<td>Required to not exist</td>
 			<td>BootsFaces has this wrong. b:banner and b:label are very similar and should both be powered by value. One of the reasons why this is wrong, is <code>text=</code> is used for context colors. See helpers for more details </td>
+			<td>N/A</td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>value</td>
 			<td>(none)</td>
 			<td>The content of what should be shown. If value is blank, this will still be rendered. This can be useful for Javascript to dynamically updating content.</td>
+			<td><code>getSafeHTML()</code></td>
 		</tr>
 
 
@@ -92,7 +150,7 @@
 
 
 
-<h2>Example</h2>
+<h2>Examples</h2>
 
 <!--- Lets load up a query --->
 <cfscript>
@@ -128,17 +186,27 @@ rc.qryData.AddRow([
 
 
 <h3>Inside of headers</h3>
+<p>This also uses isSafeHTML attribute</p>
 
 
+<b:h1 isSafeHTML="true">Example heading <b:label value="New" /></b:h1>
+<b:h2 isSafeHTML="true">Example heading <b:label value="New" /></b:h2>
+<b:h3 isSafeHTML="true">Example heading <b:label value="New" /></b:h3>
+<b:h4 isSafeHTML="true">Example heading <b:label value="New" /></b:h4>
+<b:h5 isSafeHTML="true">Example heading <b:label value="New" /></b:h5>
+<b:h6 isSafeHTML="true">Example heading <b:label value="New" /></b:h6>
 
-<b:h1>Example heading <b:label value="New" /></b:h1>
-<b:h2>Example heading <b:label value="New" /></b:h2>
-<b:h3>Example heading <b:label value="New" /></b:h3>
-<b:h4>Example heading <b:label value="New" /></b:h4>
-<b:h5>Example heading <b:label value="New" /></b:h5>
-<b:h6>Example heading <b:label value="New" /></b:h6>
 
 
 
+<h3>Inside of headers</h3>
+<p>Using plain header tags</p>
+
+<h1>Example heading <b:label value="New" /></h1>
+<h2>Example heading <b:label value="New" /></h2>
+<h3>Example heading <b:label value="New" /></h3>
+<h4>Example heading <b:label value="New" /></h4>
+<h5>Example heading <b:label value="New" /></h5>
+<h6>Example heading <b:label value="New" /></h6>
 
 
diff --git a/views/modal.cfm b/views/modal.cfm
index cfb1688..19b2dc2 100644
--- a/views/modal.cfm
+++ b/views/modal.cfm
@@ -16,7 +16,7 @@
 <b:h2>Introduction</b:h2>
 
 
-<b:panel look="info" title="Attributes of &lt;b:modal&gt;">
+<b:panel look="info" title="Attributes of <b:modal>">
 
 	<b:table>
 	<thead>
@@ -24,59 +24,90 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td>Pass through of content. this is the initial message before the content is AJAX'ed in</td>
+			<td><b:label look="danger">No</b:label>  Content is assumed to be clean</td>
+		</tr>
 		<tr>
 			<td>backdrop</td>
 			<td>true</td>
-			<td>By default, you can close a modal dialog by clicking somewhere outside the modal. Set <code>backdrop="false"</code> to disable this feature. .</td>
+			<td>By default, you can close a modal dialog by clicking somewhere outside the modal. Set <code>backdrop="false"</code> to disable this feature.</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>closable</td>
 			<td>true</td>
 			<td>Can modal be closed. Creates close button on Title bar</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>close-on-escape</td>
 			<td>true</td>
 			<td>By default, users can close modal dialogs by hitting the <kbd>ESC</kbd> key. Set <code>close-on-escape="false"</code> to disable this feature. </td>
+			<td>Must evaluate to boolean</td>
 		</tr>
-		
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
+		<tr>
+			<td>look</td>
+			<td>default</td>
+			<td>Look and feel of header and edge</td>
+			<td>Must be on valid value</td>
+		</tr>		
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>size</td>
 			<td>(none)</td>
 			<td>How much padding should this well have</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
-
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>title</td>
 			<td>(none)</td>
 			<td>Bold Title displayed in Modal's header.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 
-
 	</tbody>
 	</b:table>
 </b:panel>
diff --git a/views/nav.cfm b/views/nav.cfm
index c1a375d..45f5392 100644
--- a/views/nav.cfm
+++ b/views/nav.cfm
@@ -19,7 +19,7 @@
 
 
 
-<b:panel look="info" title="Attributes of &lt;b:dropMenu&gt;">
+<b:panel look="info" title="Attributes of <b:dropMenu>">
 
 	<b:table>
 	<thead>
@@ -27,6 +27,7 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -35,26 +36,31 @@
 			<td>active</td>
 			<td>false</td>
 			<td>Should active class get added?</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>value</td>
 			<td>(none)</td>
 			<td>What is shown</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 
 
@@ -63,7 +69,7 @@
 </b:panel>
 
 
-<b:panel look="info" title="Attributes of &lt;b:navLink&gt;">
+<b:panel look="info" title="Attributes of <b:navLink>">
 
 	<b:table>
 	<thead>
@@ -71,6 +77,7 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -79,81 +86,97 @@
 			<td>active</td>
 			<td>false</td>
 			<td>Should active class get added?</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>binding</td>
 			<td>(none)</td>
 			<td>Try to find the value of this tag in the <code>rc.*</code> scope. See note below</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>data-*</td>
 			<td>(none)</td>
-			<td>Pass through of HTML5 <code>data-*=</code> attributes.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>disabled</td>
 			<td>false</td>
 			<td>Pass through of <code>disabled="disabled"</code>. If disabled is passed, then it will be treated at true</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>fragment</td>
 			<td>(none)</td>
 			<td>Pass through of Anchor. Some links are anchor only</td>
+			<td><code>encodeForURL</code></td>
 		</tr>
 		<tr>
 			<td>icon</td>
 			<td>(none)</td>
 			<td>Adds Glyphicon</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>iconAlign</td>
 			<td>(none)</td>
 			<td>Aligns icon</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>		
 		<tr>
 			<td>header</td>
 			<td>(none)</td>
 			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>href</td>
 			<td>(none)</td>
 			<td>Pass through of HTML <code>href=</code>.</td>
+			<td><b:label look="danger">No</b:label></td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>library</td>
 			<td>default</td>
 			<td>Which icon library should be used? This is set via: <code>application.Bootstrap.IconLibrary[attributes.library]</code>. This site uses Glyphicons</td>
+			<td>Must be valid library</td>
 		</tr>
 		<tr>
 			<td>ng-*</td>
 			<td>(none)</td>
-			<td>Pass through of all AngularJS attributes</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>on*</td>
 			<td>(none)</td>
-			<td>Pass through of all Mouse/Pointer events.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>value</td>
 			<td>(none)</td>
 			<td>What is shown</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 
 
@@ -166,7 +189,7 @@
 
 <h3>Basic</h3>
 
-<b:navBar brand="BS-4-CF" brandHref="##">
+<b:navBar brand="Bootstrap for ColdFusion" brandHref="##">
     <b:navbarLinks>
         <b:navLink value="Home" href="##" />
         <b:navLink value="Link" href="##" />
@@ -208,7 +231,7 @@
 
 
 
-<b:navBar brand="BS-4-CF" brandHref="##" inverse="true">
+<b:navBar brand="Bootstrap for ColdFusion" brandHref="##" inverse="true">
     <b:navbarLinks>
         <b:navLink value="Home"	href="##" active="true" />
         <b:navLink value="Link" 	href="##" />
@@ -228,7 +251,7 @@
 
 <p>This also has a right aligned menu</p>
 
-<b:navBar brand="BS-4-CF" brandHref="##">
+<b:navBar brand="Bootstrap for ColdFusion" brandHref="##">
 
     <!-- Collect the nav links, forms, and other content for toggling -->
    <b:navbarLinks>
diff --git a/views/panel.cfm b/views/panel.cfm
index 5896902..eef953f 100644
--- a/views/panel.cfm
+++ b/views/panel.cfm
@@ -1,6 +1,5 @@
 
 <cfimport prefix="b" taglib="../bootstrap">
-<cfimport taglib="../bootstrap">
 
 
 
@@ -28,7 +27,7 @@
 
 
 
-<b:panel look="info" title="Attributes for &lt;b:panel&gt;">
+<b:panel look="info" title="Attributes for <b:panel>">
 
 	<b:table>
 	<thead>
@@ -36,86 +35,132 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td><b:label look="danger">No</b:label> this is often more than the default value as set in antisamy. Make sure that the inner content is clean. Having said all that, it is preferable to use the &lt;b:td&gt; and &lt;b:th&gt; inside of this tag</td>
+		</tr>
 		<tr>
 			<td>binding</td>
 			<td>(none)</td>
 			<td>Try to find the value of this tag in the <code>rc.*</code> scope. If found then use its value, else use the content between the tags.</td>
+			<td><b:label look="danger">No</b:label> </td>
 		</tr>
 		<tr>
 			<td>collapsed</td>
 			<td>false</td>
 			<td>Is it collapsed</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>collapsible</td>
 			<td>false</td>
 			<td>can it be collapsed</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>contentClass</td>
 			<td>(none)</td>
 			<td>CSS class for body</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>contentStyle</td>
 			<td>(none)</td>
 			<td>CSS style for body</td>
+			<td><code>encodeForCSS()</code></td>
 		</tr>
 		
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>look</td>
 			<td>default</td>
 			<td>Look and feel of header and edge</td>
+			<td>Must be on valid value</td>
 		</tr>		
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>title</td>
 			<td>(none)</td>
 			<td>Heading for panel</td>
+			<td><code>encodeForHTML()</code></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
 		<tr>
 			<td>titleClass</td>
 			<td>(none)</td>
 			<td>CSS class for title</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>titleStyle</td>
 			<td>(none)</td>
 			<td>CSS style for title</td>
+			<td><code>encodeForCSS()</code></td>
 		</tr>
+
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -133,10 +178,10 @@
 
 
 
-<well>
-    <h3>Well Header</h3>
+<b:well>
+    <b:h3>Well Header</b:h3>
     Well content.
-</well>
+</b:well>
 
 
 <h5>Markup:</h5>
@@ -151,58 +196,94 @@
 <p>&nbsp;</p>
 
 
-<panel look="info" title="Attributes of &lt;b:well&gt;">
+<b:panel look="info" title="Attributes of <b:well>">
 
-	<table>
+	<b:table>
 	<thead>
 		<tr>
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td>Pass through of content</td>
+			<td><b:label look="danger">No</b:label>  this is often more than the default value as set in antisamy. Make sure that the inner content is clean</td>
+		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>size</td>
 			<td>(none)</td>
 			<td>How much padding should this well have</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
-
 	</tbody>
-	</table>
-</panel>
+	</b:table>
+</b:panel>
 
 
 
@@ -210,16 +291,16 @@
 <h3>Examples</h3>
 
 
-<row>
-	<column span="4">
-		<well size="sm">Look, I'm in a small well!</well>
-	</column>
+<b:row>
+	<b:column span="4">
+		<b:well size="sm">Look, I'm in a small well!</b:well>
+	</b:column>
 
-	<column span="4">
-		<well size="lg">Look, I'm in a large well!</well>
-	</column>
+	<b:column span="4">
+		<b:well size="lg">Look, I'm in a large well!</b:well>
+	</b:column>
 	
-	<column span="4">
-		<well><well>Look, I'm in a well in a well!</well></well>
-	</column>
-</row>	
+	<b:column span="4">
+		<b:well><b:well>Look, I'm in a well in a well!</b:well></b:well>
+	</b:column>
+</b:row>	
diff --git a/views/poll.cfm b/views/poll.cfm
index 865a38e..66885fc 100644
--- a/views/poll.cfm
+++ b/views/poll.cfm
@@ -5,8 +5,8 @@
 <b:row>
 	<b:column span="12">	
 
-		<b:h1 pageheader="true">Poll Examples</b:h1>
-		<p>b:poll</p>
+		<b:h1 pageheader="true">b:poll Examples</b:h1>
+		
 	</b:column>	
 </b:row>
 
@@ -17,7 +17,7 @@
 <p>Content in the action is checked periodically and then displayed on the screen.</p>
 
 
-<b:panel look="info" title="Attributes for all &lt;b:poll&gt;">
+<b:panel look="info" title="Attributes for all <b:poll>">
 
 	<b:table>
 	<thead>
@@ -25,54 +25,97 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
-		</tr>	
+			<th>Sanitized</th>
+		</tr>
 	</thead>
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td>Pass through of content. this is the initial message before the content is AJAX'ed in</td>
+			<td><b:label look="danger">No</b:label>  Content is assumed to be clean</td>
+		</tr>
 		<tr>
 			<td>action</td>
 			<td>required</td>
 			<td>Source for content. Expecting text</td>
+			<td><b:label look="danger">No</b:label>  this attributes is assumed to be clean</td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>auto</td>
 			<td>Pass through of HTML id.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
+		<tr>
+			<td>interval</td>
+			<td>5000</td>
+			<td>How long until content is reloaded in milliseconds</td>
+			<td><code>isnumeric()</code> must be true</td>
+		</tr>
+		
+		<tr>
+			<td>isSafeHTML</td>
+			<td>true</td>
+			<td>Controls how content is rendered. Content is assumed to be clean, but it can be cleaned if necessary.
+				By setting this to false, all content will be cleaned via <code>getSafeHTML()</code></td>
+			<td>Must evaluate to boolean</td>
+		</tr>
+		
 		<tr>
 			<td>processed</td>
 			<td>true</td>
 			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
-			<td>interval</td>
-			<td>5000ms</td>
-			<td>How long until content is reloaded</td>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
 			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
 			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><code>encodeForCSS()</code></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
 			<td>Pass though of CSS class.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>timeout</td>
-			<td>5000ms</td>
-			<td>How long until request is given up</td>
+			<td>5000</td>
+			<td>How long until request is given up in milliseconds</td>
+			<td><code>isnumeric()</code> must be true</td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
 			<td>Pass though of title</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -84,8 +127,8 @@
 
 <h3>Minimal Config</h3>
 
-<b:p><b>The time is now:</b> <b:poll action="ajax/poll.cfm">Loading...</b:poll></b:p>
 
+<b:p><b>The time is now:</b> <b:poll action="ajax/poll.cfm"><b:icon library="awesome" name="cogs" spin="true" /></b:poll></b:p>
 
-<b:alert><b>The time is now:</b> <b:poll action="ajax/poll.cfm">Loading...</b:poll></b:alert>
+<b:alert isSafeHTML="true"><b>The time is now:</b> <b:poll action="ajax/poll.cfm" tooltip="Hi have a title with some scary characters <>">Loading...</b:poll></b:alert>
 
diff --git a/views/progress.cfm b/views/progress.cfm
index 364239a..a01e420 100644
--- a/views/progress.cfm
+++ b/views/progress.cfm
@@ -15,6 +15,34 @@
 <h2>Introduction</h2>
 
 
+<b:panel look="info" title="Attributes of <b:progressbar>">
+
+	<b:table>
+	<thead>
+		<tr>
+			<th>Attribute</th>
+			<th>Default value</th>
+			<th>Description</th>
+			<th>Sanitized</th>
+		</tr>	
+	</thead>
+	
+	<tbody>
+		<tr>
+			<td>processed</td>
+			<td>true</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>rendered</td>
+			<td>true</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+	</tbody>
+	</b:table>
+</b:panel>
 
 
 
diff --git a/views/select.cfm b/views/select.cfm
index 31ec100..0b49697 100644
--- a/views/select.cfm
+++ b/views/select.cfm
@@ -33,7 +33,7 @@
 
 <p>This loads data one part at a time</p>
 
-<b:panel look="info" title="Attributes of &lt;b:selectItem&gt;">
+<b:panel look="info" title="Attributes of <b:selectItem>">
 
 	<b:table>
 	<thead>
@@ -41,6 +41,7 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -49,48 +50,63 @@
 			<td>disabled</td>
 			<td>false</td>
 			<td>Pass through of HTML disabled</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>display</td>
 			<td>(none)</td>
 			<td>Pass through of content</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id. </td>
+			<td>Pass through of HTML id.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 
 		<tr>
 			<td>look</td>
 			<td>(none)</td>
 			<td>For selectOneRadio, this will control the look and feel. This is done through Awesome Bootstrap Checkboxes</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 
 		<tr>
 			<td>processed</td>
 			<td>true</td>
 			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
 			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>selected</td>
 			<td>false</td>
 			<td>Is this selected on <code>&lt;option&gt;</code> or checked on <code>&lt;input type="radio"&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
 			<td>Used on selectOneRadio</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td>Pass though of <code>data-placement=</code></td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>value</td>
 			<td>(none)</td>
 			<td>Pass through of value</td>
+			<td><code>encodeForHTML()</code></td>
 		</tr>
 
 	</tbody>
@@ -102,7 +118,7 @@
 
 <p>This converts data from a query</p>
 
-<b:panel look="info" title="Attributes of &lt;b:selectItem&gt;">
+<b:panel look="info" title="Attributes of <b:selectItem>">
 
 	<b:table>
 	<thead>
@@ -110,6 +126,7 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -118,62 +135,74 @@
 			<td>binding</td>
 			<td>required</td>
 			<td>Which database recordset column should be used for value</td>
+			<td>N/A</td>
 		</tr>
 		
 		<tr>
 			<td>disabled</td>
 			<td>false</td>
 			<td>Pass through of HTML disabled</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>displayBinding</td>
 			<td>required</td>
 			<td>Which database recordset column should be for the display</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>group</td>
 			<td>(none)</td>
 			<td>Reserved for future use. This will be used to group <code>cfoutput</code>s</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>auto</td>
 			<td>Pass through of HTML id. For selectOneRadio, set this the "auto" so that an id can be created for <code>for</code> and <code>label</code>.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>look</td>
 			<td>(none)</td>
 			<td>For selectOneRadio, this will control the look and feel. This is done through Awesome Bootstrap Checkboxes</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
 			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>query</td>
 			<td>required</td>
 			<td>This the recordset that will be processed</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
 			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>selected</td>
 			<td>false</td>
 			<td>Is this selected on <code>&lt;option&gt;</code> or checked on <code>&lt;input type="radio"&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>selectedValue</td>
 			<td>(none)</td>
 			<td>This can be either a single value or an array. If the binding value matches this, then selected is set to true</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>tooltipBinding</td>
 			<td>(none)</td>
 			<td>Used on selectOneRadio</td>
+			<td>N/A</td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -206,7 +235,7 @@ rc.qryData.AddRow([
 
 disabled,display,group,id,look,value,selected,tooltip
 
-<b:panel title="Columns of &lt;attributes.qryOption&gt;">
+<b:panel title="Columns of <attributes.qryOption>">
 
 	<b:table>
 	<thead>
@@ -214,6 +243,7 @@ disabled,display,group,id,look,value,selected,tooltip
 			<th>Column</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -222,62 +252,74 @@ disabled,display,group,id,look,value,selected,tooltip
 			<td>binding</td>
 			<td>required</td>
 			<td>Which database recordset column should be used for value</td>
+			<td>N/A</td>
 		</tr>
 		
 		<tr>
 			<td>disabled</td>
 			<td>false</td>
 			<td>Pass through of HTML disabled</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>displayBinding</td>
 			<td>required</td>
 			<td>Which database recordset column should be for the display</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>group</td>
 			<td>(none)</td>
 			<td>Reserved for future use. This will be used to group <code>cfoutput</code>s</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>auto</td>
 			<td>Pass through of HTML id. For selectOneRadio, set this the "auto" so that an id can be created for <code>for</code> and <code>label</code>.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>look</td>
 			<td>(none)</td>
 			<td>For selectOneRadio, this will control the look and feel. This is done through Awesome Bootstrap Checkboxes</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
 			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>query</td>
 			<td>required</td>
 			<td>This the recordset that will be processed</td>
+			<td>N/A</td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
 			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>selected</td>
 			<td>false</td>
 			<td>Is this selected on <code>&lt;option&gt;</code> or checked on <code>&lt;input type="radio"&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>selectedValue</td>
 			<td>(none)</td>
 			<td>This can be either a single value or an array. If the binding value matches this, then selected is set to true</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>tooltipBinding</td>
 			<td>(none)</td>
 			<td>Used on selectOneRadio</td>
+			<td>N/A</td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -304,7 +346,7 @@ disabled,display,group,id,look,value,selected,tooltip
 <p>&nbsp;</p>
 <h3>b:selectManyCheckbox</h3>
 
-<b:panel look="info" title="Attributes of &lt;b:selectManyCheckbox&gt;">
+<b:panel look="info" title="Attributes of <b:selectManyCheckbox>">
 
 	<b:table>
 	<thead>
@@ -312,6 +354,7 @@ disabled,display,group,id,look,value,selected,tooltip
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -320,31 +363,37 @@ disabled,display,group,id,look,value,selected,tooltip
 			<td>circle</td>
 			<td>false</td>
 			<td>Make checkbox look round like a radio</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>disabled</td>
 			<td>false</td>
 			<td>Pass through of HTML disabled. If the string "disabled" is passed in, it will be treated as true.</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>inline</td>
 			<td>false</td>
 			<td>Show all radio buttons on the same row</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>name</td>
 			<td>required</td>
 			<td>All the check boxes get the same name</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
 			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
 			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 
 
@@ -367,7 +416,7 @@ disabled,display,group,id,look,value,selected,tooltip
 <p>The <code>b:selectManyMenu</code> is not expected to be used directly. Most browsers render this in a way that is way too difficult to use.
 	It is expected that a tool like select2 <a href="https://select2.github.io/" target="_blank">https://select2.github.io/</a></p>
 
-<b:panel look="info" title="Attributes of &lt;b:selectManyCheckbox&gt;">
+<b:panel look="info" title="Attributes of <b:selectManyCheckbox>">
 
 	<b:table>
 	<thead>
@@ -375,6 +424,7 @@ disabled,display,group,id,look,value,selected,tooltip
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -384,47 +434,56 @@ disabled,display,group,id,look,value,selected,tooltip
 			<td>disabled</td>
 			<td>false</td>
 			<td>Pass through of HTML disabled. If the string "disabled" is passed in, it will be treated as true.</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>fieldsize</td>
 			<td>(none)</td>
 			<td>How much of form control does this span</td>
+			<td><code>isNumeric()</code></td>
 		</tr>
 		<tr>
 			<td>help</td>
 			<td>(none)</td>
 			<td>Bootstrap help text below control</td>
+			<td><code>encodeForHTML()</code></td>
 		</tr>
 		
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
 			<td>Pass through of HTML id.</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>name</td>
 			<td>required</td>
 			<td>All the check boxes get the same name</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>ng-*</td>
 			<td>(none)</td>
 			<td>Pass through of all AngularJS attributes</td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>on*</td>
 			<td>(none)</td>
 			<td>Pass through of all Mouse/Pointer events.</td>
+			<td><b:label look="danger">No</b:label></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
 			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
 			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>span</td>
@@ -435,16 +494,19 @@ disabled,display,group,id,look,value,selected,tooltip
 			<td>style</td>
 			<td>(none)</td>
 			<td>how many Bootstrap columns does this take</td>
+			<td><code>encodeForCSS()</code></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
 			<td>Pass though of <code>class=</code></td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
 			<td>Pass though of <code>title=</code></td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		
 	</tbody>
@@ -488,7 +550,7 @@ disabled,display,group,id,look,value,selected,tooltip
 	
 <p>You can also create content between the tags and that will also be apart of the select one menu.	
 
-<b:panel look="info" title="Attributes of &lt;b:selectOneRadio&gt;">
+<b:panel look="info" title="Attributes of <b:selectOneRadio>">
 	<b:table>
 	<thead>
 		<tr>
@@ -603,7 +665,7 @@ disabled,display,group,id,look,value,selected,tooltip
 <p>&nbsp;</p>
 <h3>b:selectOneRadio</h3>
 
-<b:panel look="info" title="Attributes of &lt;b:selectOneRadio&gt;">
+<b:panel look="info" title="Attributes of <b:selectOneRadio>">
 
 	<b:table>
 	<thead>
diff --git a/views/tab.cfm b/views/tab.cfm
index 1c74638..dceee44 100644
--- a/views/tab.cfm
+++ b/views/tab.cfm
@@ -21,7 +21,7 @@
 <p>This is the container for all the tabs</p>
 
 
-<b:panel look="info" title="Attributes of &lt;b:tabView&gt;">
+<b:panel look="info" title="Attributes of <b:tabView>">
 
 	<b:table>
 	<thead>
@@ -29,6 +29,7 @@
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
@@ -37,36 +38,43 @@
 			<td>activeIndex</td>
 			<td>1</td>
 			<td>Which tab should have focus. </td>
+			<td><code>isnumeric()</code> must be true</td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML <code>id=</code>. </td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>role</td>
 			<td>tabpanel</td>
 			<td>Pass though of HMTL <code>role=</code></div></td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. This is applied to the outer <code>&lt;div&gt;</code></div></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -76,7 +84,7 @@
 <p>This is the content for each individual container</p>
 
 
-<b:panel look="info" title="Attributes of &lt;b:tab&gt;">
+<b:panel look="info" title="Attributes of <b:tab>">
 
 	<b:table>
 	<thead>
@@ -84,53 +92,67 @@
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td>Pass through of content. this is the initial message before the content is AJAX'ed in</td>
+			<td><b:label look="danger">No</b:label>  Content is assumed to be clean</td>
+		</tr>
 		<tr>
 			<td>data-url</td>
 			<td>(none)</td>
 			<td>Pass through of HTML <code>data-url=</code>. This is expected to be used with AJAX</td>
+			<td><b:label look="danger">No</b:label>  Content is assumed to be clean</td>
 		</tr>
 		<tr>
 			<td>disabled</td>
 			<td>false</td>
 			<td>Pass through of HTML <code>disabled=</code></td>
+			<td>Must evaluate to boolean</td>
 		</tr>
-
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
-
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>role</td>
 			<td>tab</td>
 			<td>Pass through of HTML <code>role=</code></td>
+			<td><code>encodeForHTMLAttribute()</code></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 
 		<tr>
 			<td>title</td>
 			<td>(none)</td>
-			<td>Content on tab</td>
+			<td>Content on tab. This is not a tooltip</td>
+			<td><code>encodeForHTML()</code></td>
 		</tr>
+		
 	</tbody>
 	</b:table>
 </b:panel>
diff --git a/views/tables.cfm b/views/tables.cfm
index 87a6ca8..da03bc6 100644
--- a/views/tables.cfm
+++ b/views/tables.cfm
@@ -40,7 +40,7 @@ rc.qryData.AddRow([
 
 <h2>b:table</h2>
 
-<b:panel look="info" title="Attributes of &lt;b:table&gt;">
+<b:panel look="info" title="Attributes of <b:table>">
 
 	<b:table>
 	<thead>
@@ -48,65 +48,106 @@ rc.qryData.AddRow([
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td><b:label look="danger">No</b:label> this is often more than the default value as set in antisamy. Make sure that the inner content is clean</td>
+		</tr>
 		<tr>
 			<td>bordered</td>
 			<td>true</td>
 			<td>tables will have borders</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>condensed</td>
 			<td>true</td>
 			<td>The table will have slightly smaller cell padding</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>hover</td>
 			<td>false</td>
 			<td>Hover effect when mouse is over table</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
-
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>responsive</td>
 			<td>true</td>
 			<td>Make tables scroll horizontally on small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>stripped</td>
 			<td>true</td>
 			<td>Rows will alternate light and dark backgrounds</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -116,7 +157,7 @@ rc.qryData.AddRow([
 <h2>b:tr</h2>
 	
 	
-<b:panel look="info" title="Attributes of &lt;b:tr&gt;">
+<b:panel look="info" title="Attributes of <b:tr>">
 
 	<b:table>
 	<thead>
@@ -124,60 +165,100 @@ rc.qryData.AddRow([
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
-
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td><b:label look="danger">No</b:label> this is often more than the default value as set in antisamy. Make sure that the inner content is clean. Having said all that, it is preferable to use the &lt;b:td&gt; and &lt;b:th&gt; inside of this tag</td>
+		</tr>
 		<tr>
 			<td>data-*</td>
 			<td>(none)</td>
-			<td>Pass through of HTML5 <code>data-*=</code> attributes.</td>
+			<td class="text-nowrap"><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>look</td>
 			<td>(none)</td>
 			<td>This for contextual classes</td>
+			<td>Data must belong to the valid value list set in <code>application.cfc<code></td>
 		</tr>
 		<tr>
 			<td>ng-*</td>
 			<td>(none)</td>
-			<td>Pass through of all AngularJS attributes</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>on*</td>
 			<td>(none)</td>
-			<td>Pass through of all Mouse/Pointer events.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -186,7 +267,7 @@ rc.qryData.AddRow([
 
 <h2>b:th &amp; b:td</h2>
 
-<b:panel look="info" title="Attributes of &lt;b:td&gt; &amp;  &lt;b:th&gt;">
+<b:panel look="info" title="Attributes of <b:td> & <b:th>">
 
 	<b:table>
 	<thead>
@@ -194,76 +275,122 @@ rc.qryData.AddRow([
 			<th>Attribute</th>
 			<b:th text="nowrap">Default value</b:th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td>Yes</td>
+		</tr>
 		<tr>
 			<td>binding</td>
 			<td>(none)</td>
 			<td>Reserved for future use</td>
+			<td>N/A</td>
+		</tr>
+		<tr>
+			<td>data-*</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
+		
 		<tr>
 			<td>hidden</td>
 			<td>(none)</td>
-			<td>Should this cell be hidden when the screen is small. Unlike Bootstrap hidden, if connect is hidden when sm then xs is hidden too.
-				Likewise, if hidden on md, then sm and xs are hidden too. If the default Bootstrap behavior is desire, then use <code>styleClass=</code> instead.
+			<td>Should this cell be hidden when the screen is small. Unlike Bootstrap hidden, if hidden when sm then xs is hidden too.
+				Likewise, if hidden on md, then sm and xs are hidden too. If the default Bootstrap behavior is desired, then use <code>styleClass=</code> instead.
 			</td>
+			<td><b:label look="danger">No</b:label></td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
-			<td>data-*</td>
-			<td>(none)</td>
-			<td>Pass through of HTML5 <code>data-*=</code> attributes.</td>
+			<td>isSafeHTML</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>look</td>
 			<td>(none)</td>
 			<td>This for contextual classes</td>
+			<td>Data must belong to the valid value list set in <code>application.cfc<code></td>
 		</tr>
 		<tr>
 			<td>ng-*</td>
 			<td>(none)</td>
-			<td>Pass through of all AngularJS attributes</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>on*</td>
 			<td>(none)</td>
-			<td>Pass through of all Mouse/Pointer events.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This is like a <code>&lt;cfif&gt;</code>, but only for content between tags. <b>Warning:</b> This will also process tags in between the start and end tags.</td>
+			<td><a href="?view=common">See Common Features</a> <b>Warning:</b> This will also process tags in between the start and end tags.</td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code>, but only for content between the tags</td>
+			<td><a href="?view=common">See Common Features</a> but only for content between the tags</td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>text</td>
 			<td>(none)</td>
 			<td>This is text content classes. This takes care off alignment and wrapping.</td>
+			<td><b:label look="danger">No</b:label></td>
+		</tr>
+
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
@@ -288,12 +415,12 @@ rc.qryData.AddRow([
 <tbody>
 <cfoutput query="rc.qryData">
 	<b:tr rendered="#IIF(Delete, 0, 1)#">
-		<b:td><b:badge value="#ID#" /></b:td>
-		<b:td data-sort="#ID#"><b:icon name="#icon#" /></b:td>
+		<b:td isSafeHTML="true"><b:badge value="#ID#" /></b:td>
+		<b:td isSafeHTML="true" data-sort="#ID#"><b:icon name="#icon#" /></b:td>
 		<b:td>#Album#</b:td>
 		<b:td>#Message#</b:td>
 		<b:td>#Score#</b:td>
-		<b:td><b:commandLink action="###ID#" size="xs" look="primary">View #id#</b:commandLink></b:td>
+		<b:td isSafeHTML="true"><b:commandLink action="###ID#" size="xs" look="primary">View #id#</b:commandLink></b:td>
 	</b:tr>
 </cfoutput>	
 </tbody>
@@ -318,12 +445,12 @@ rc.qryData.AddRow([
 <tbody>
 <cfoutput query="rc.qryData">
 	<b:tr rendered="#IIF(Delete, 0, 1)#">
-		<b:td hidden="md"><b:badge value="#ID#" /></b:td>
-		<b:td hidden="sm" data-sort="#ID#"><b:icon name="#icon#" /></b:td>
+		<b:td hidden="md" isSafeHTML="true"><b:badge value="#ID#" /></b:td>
+		<b:td hidden="sm" isSafeHTML="true" data-sort="#ID#"><b:icon name="#icon#" /></b:td>
 		<b:td hidden="xs">#Album#</b:td>
 		<b:td>#Message#</b:td>
 		<b:td>#Score#</b:td>
-		<b:td><b:commandLink action="###ID#" size="xs" look="primary">View #id#</b:commandLink></b:td>
+		<b:td isSafeHTML="true"><b:commandLink action="###ID#" size="xs" look="primary">View #id#</b:commandLink></b:td>
 	</b:tr>
 </cfoutput>	
 </tbody>
@@ -358,12 +485,12 @@ DataTables is a plug-in for the jQuery Javascript library. It is a highly flexib
 <tbody>
 <cfoutput query="rc.qryData">
 	<b:tr rendered="#IIF(Delete, 0, 1)#">
-		<b:td><b:badge value="#ID#" /></b:td>
-		<b:td data-sort="#ID#"><b:icon name="#icon#" /></b:td>
+		<b:td isSafeHTML="true"><b:badge value="#ID#" /></b:td>
+		<b:td isSafeHTML="true" data-sort="#ID#"><b:icon name="#icon#" /></b:td>
 		<b:td>#Album#</b:td>
 		<b:td>#Message#</b:td>
 		<b:td>#Score#</b:td>
-		<b:td><b:commandLink action="###ID#" size="xs" look="primary">View #id#</b:commandLink></b:td>
+		<b:td isSafeHTML="true"><b:commandLink action="###ID#" size="xs" look="primary">View #id#</b:commandLink></b:td>
 	</b:tr>
 </cfoutput>	
 </tbody>
diff --git a/views/theme/button.cfm b/views/theme/button.cfm
index 4d78274..3d89b60 100644
--- a/views/theme/button.cfm
+++ b/views/theme/button.cfm
@@ -27,7 +27,7 @@
             </p>
 
             <p>
-	         <b:commandLink href="##">Default</b:commandLink>
+	         <b:commandLink href="##" disabled="true">Default</b:commandLink>
               <b:commandLink href="##" disabled="true" look="primary">Primary</b:commandLink>
               <b:commandLink href="##" disabled="true" look="success">Success</b:commandLink>
               <b:commandLink href="##" disabled="true" look="info">Info</b:commandLink>
diff --git a/views/typography.cfm b/views/typography.cfm
index 788bdd1..aa495cb 100644
--- a/views/typography.cfm
+++ b/views/typography.cfm
@@ -24,81 +24,135 @@
 			<th>Attribute</th>
 			<th>Default value</th>
 			<th>Description</th>
+			<th>Sanitized</th>
 		</tr>	
 	</thead>
 	
 	<tbody>
+		<tr>
+			<td>generatedContent</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td>Yes</td>
+		</tr>
 		<tr>
 			<td>binding</td>
 			<td>(none)</td>
 			<td>Try to find the value of this tag in the <code>rc.*</code> scope. If found then use its value, else use the content between the tags.</td>
+			<td>See generatedContent</td>
+		</tr>
+		<tr>
+			<td>data-*</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>id</td>
 			<td>(none)</td>
-			<td>Pass through of HTML id.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>isSafeHTML</td>
+			<td>true</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>pageHeader</td>
 			<td>false</td>
 			<td>For <code>&lt;b:h1&gt;</code> only. This wraps content in div with page header. 
-				<b:label look="Info" value="BS4" /> This is expected to be removed in Bootstrap 4. BS-4-CF will continue to generate this class, but it may have no effect.
+				<b:label look="Info" value="BS4" /> This is expected to be removed in Bootstrap 4. Bootstrap for ColdFusion will continue to generate this class, but it may have no effect.
 			</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>lead</td>
 			<td>false</td>
 			<td>This is for <code>&lt;b:p&gt;</code> only. Adds lead class.</td>
-		</tr>		
+			<td>Must evaluate to boolean. Lead is treated as true</td>
+		</tr>
+		<tr>
+			<td>ng-*</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>on*</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
 		<tr>
 			<td>processed</td>
 			<td>true</td>
-			<td>This like a <code>&lt;cfif&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>profile</td>
+			<td>(none)</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>rendered</td>
 			<td>true</td>
-			<td>This is like <code>&lt;cfsilent&gt;</code></td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>reverse</td>
 			<td>false</td>
 			<td>This is for <code>&lt;b:blockquote&gt;</code> only. This puts the <code>&lt;blockquote&gt;</code> bar on the opposite of its normal position.</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>static</td>
 			<td>false</td>
 			<td>This is for <code>&lt;b:p&gt;</code> only. This is for static class for use inside of forms. 
 				See <b:commandLink action="?view=forms" look="link">Forms</b:commandLink> for more examples.</td>
+			<td>Must evaluate to boolean</td>
 		</tr>
 		<tr>
 			<td>style</td>
 			<td>(none)</td>
-			<td>Pass though of CSS style. Use Bootstrap classes instead if possible</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>styleClass</td>
 			<td>(none)</td>
-			<td>Pass though of CSS class.</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>throwOnError</td>
+			<td>false</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>tooltip</td>
 			<td>(none)</td>
-			<td>Pass though of title</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>tooltipPosition</td>
+			<td>bottom</td>
+			<td><a href="?view=common">See Common Features</a></td>
+			<td></td>
 		</tr>
 	</tbody>
 	</b:table>
 </b:panel>
 
 
-<cfset rc = { heading = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed pretium magna in sem pharetra, gravida tristique nulla ultricies. Suspendisse ornare nulla quis tempus dictum. Random <b> tag. It should be escaped. In at ipsum ut sapien efficitur dictum sed a nibh. Nunc convallis at ligula sed porta. Cras convallis turpis sed eleifend fringilla." }>
-
-
-
-<h3>About &lt;b:outputText&gt;</h3>
-
+<cfset rc = { heading = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed pretium magna in sem pharetra, gravida tristique nulla ultricies. Suspendisse ornare nulla quis tempus dictum. Random <b> tag. It should be escaped. In at ipsum ut sapien efficitur dictum sed a nibh. Nunc convallis at ligula sed porta. <> ' Cras convallis turpis sed eleifend fringilla." }>
 
-<p><code>&lt;b:outputText&gt;</code> is not a block element like all the rest. It wraps its content in a <code>&lt;span&gt;</code>. You may find that this tag is overkill in many circumstances. This tag has been included for completeness, but its use is discouraged. Many of the other tags are have closer semantic meaning.</p>
 
 
 
@@ -109,7 +163,7 @@
 
 
 <b:h1 pageHeader="true">I am a page header. Lorem ipsum dolor sit amet, consectetur adipiscing elit. <small>Sed pretium magna in sem pharetra.</small></b:h1>
-<b:h1>I am h1. Lorem ipsum dolor sit amet, consectetur adipiscing elit. <small>Sed pretium magna in sem pharetra.</small></b:h1>
+<b:h1 onmouseover="alert('Hi, mom!')">I am h1. Lorem ipsum dolor sit amet, consectetur adipiscing elit. <small>Sed pretium magna in sem pharetra.</small></b:h1>
 <b:h2>I am h2. Lorem ipsum dolor sit amet, consectetur adipiscing elit. <small>Sed pretium magna in sem pharetra.</small></b:h2>
 <b:h3>I am h3. Lorem ipsum dolor sit amet, consectetur adipiscing elit. <small>Sed pretium magna in sem pharetra.</small></b:h3>
 <b:h4>I am h4. Lorem ipsum dolor sit amet, consectetur adipiscing elit. <small>Sed pretium magna in sem pharetra.</small></b:h4>