diff --git a/e107_core/shortcodes/single/nextprev.php b/e107_core/shortcodes/single/nextprev.php
index 0427f551b..f7be74665 100644
--- a/e107_core/shortcodes/single/nextprev.php
+++ b/e107_core/shortcodes/single/nextprev.php
@@ -115,6 +115,13 @@ function nextprev_shortcode($parm = '')
 			$tprefix = 'dropdown';
 			//$parm['amount'] = 'all';
 		}
+		
+		if($tprefix == 'default' && deftrue('BOOTSTRAP'))
+		{
+			$tprefix = 'bootstrap';	
+		}
+		
+		
 		$tprefix .= '_';
 
 		if($parm['amount'] === 'all')
diff --git a/e107_core/templates/nextprev_template.php b/e107_core/templates/nextprev_template.php
index d7417ac28..b6e5d6d21 100644
--- a/e107_core/templates/nextprev_template.php
+++ b/e107_core/templates/nextprev_template.php
@@ -10,6 +10,9 @@
  * Shortcodes are lowercase (simple parser)
  */
 
+ 
+ // XXX LEGACY DEFAULT. 
+ 
 $NEXTPREV_TEMPLATE['default_start'] = '
 <!-- Start of Next/Prev -->
 <div class="btn-group nextprev ">
@@ -36,8 +39,55 @@ $NEXTPREV_TEMPLATE['default_items_end'] = '';
 //$NEXTPREV_TEMPLATE['default_separator'] = '<span class="nextprev-sep"><!-- --></span>';
 $NEXTPREV_TEMPLATE['default_separator'] = '&nbsp;';
 
+
+/*  ****************** Default when Bootstrap is enabled ************** */
+
+$NEXTPREV_TEMPLATE['bootstrap_start']			= "<!-- Start of Next/Prev -->\n<div class='pagination'>\n<ul>";
+$NEXTPREV_TEMPLATE['bootstrap_end'] 			= "</ul></div><!-- End of Next/Prev -->";
+$NEXTPREV_TEMPLATE['bootstrap_nav_caption'] 	= ''; 
+
+$NEXTPREV_TEMPLATE['bootstrap_nav_first'] 		= '<li><a class="first" href="{url}" title="{url_label}">{label}</a></li>';
+$NEXTPREV_TEMPLATE['bootstrap_nav_prev'] 		= '<li><a class="prev" href="{url}" title="{url_label}">{label}</a></li>';
+$NEXTPREV_TEMPLATE['bootstrap_nav_last'] 		= '<li><a class="last" href="{url}" title="{url_label}">{label}</a></li>';
+$NEXTPREV_TEMPLATE['bootstrap_nav_next'] 		= '<li><a class="next" href="{url}" title="{url_label}">{label}</a></li>';
+
+$NEXTPREV_TEMPLATE['bootstrap_items_start'] 	= '';
+$NEXTPREV_TEMPLATE['bootstrap_item'] 			= '<li><a href="{url}" title="{url_label}">{label}</a></li>';
+$NEXTPREV_TEMPLATE['bootstrap_item_current'] 	= '<li class="active disabled"><a  href="#" onclick="return false;" title="{url_label}">{label}</a></li>';
+$NEXTPREV_TEMPLATE['bootstrap_items_end'] 		= '';
+
+$NEXTPREV_TEMPLATE['bootstrap_separator'] 		= '';
+
+
 /*  ************************************************************ */
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // Basic template - as used in admin theme-manager - find themes. 
 //XXX FIXME - use $NEXTPREV_TEMPLATE['basic']['start'] format.??
 
diff --git a/e107_core/templates/signup_template.php b/e107_core/templates/signup_template.php
index 2be315671..088ddc8f5 100755
--- a/e107_core/templates/signup_template.php
+++ b/e107_core/templates/signup_template.php
@@ -167,7 +167,7 @@ $sc_style['SIGNUP_EMAIL_CONFIRM']['post'] = "
 </tr>";
 
 $sc_style['SIGNUP_XUP']['pre'] = "<div class='center' style='display:block;padding:10px'>";
-$sc_style['SIGNUP_XUP']['post'] = "<h2 class='divider'><span>OR</span></h2></div>";
+$sc_style['SIGNUP_XUP']['post'] = "<h2 class='signup-divider'><span>OR</span></h2></div>";
 
 if(!defined($COPPA_TEMPLATE))
 {
diff --git a/e107_plugins/forum/templates/forum_viewtopic_template.php b/e107_plugins/forum/templates/forum_viewtopic_template.php
index 89161b27d..b90a72738 100644
--- a/e107_plugins/forum/templates/forum_viewtopic_template.php
+++ b/e107_plugins/forum/templates/forum_viewtopic_template.php
@@ -370,7 +370,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
 									<li class='divider'></li>";
 
 $FORUM_VIEWTOPIC_TEMPLATE['end'] = "</ul>
-<div class='row clearfix'>
+<div class='row-fluid clearfix'>
 		<div class='span3 pull-left'>{GOTOPAGES}</div>
 		<div class='span6 center'>{QUICKREPLY}</div>
 		<div class='span3 pull-right right '>{BUTTONSX}</div>
diff --git a/e107_themes/bootstrap/templates/news/news_template.php b/e107_themes/bootstrap/templates/news/news_template.php
index 7d5905723..e78cbb160 100644
--- a/e107_themes/bootstrap/templates/news/news_template.php
+++ b/e107_themes/bootstrap/templates/news/news_template.php
@@ -15,6 +15,7 @@ $SC_WRAPPER['ADMINOPTIONS'] = "<small>{---}</small>";
 $NEWS_TEMPLATE['default']['item'] = '
 	{SETIMAGE: w=600}
 	<div class="view-item">
+	<div class="page-header">
 		<h2>{NEWSTITLELINK}</h2>
 		<div class="post-meta">
 			<small><i class="icon-calendar"></i>{NEWSDATE}</small>
@@ -26,7 +27,7 @@ $NEWS_TEMPLATE['default']['item'] = '
 			{PDFICON}
 			{ADMINOPTIONS}
 		</div>
-
+	</div>
 		<div class="body">
 			{NEWSIMAGE}
 			{NEWSBODY}
@@ -67,6 +68,7 @@ $NEWS_TEMPLATE['list']['item'] = '
 $NEWS_TEMPLATE['view']['item'] = '
 {SETIMAGE: w=800}
 	<div class="view-item">
+	<div class="page-header">
 		<h2>{NEWSTITLE}</h2>
 		<div class="post-meta">
 			<small><i class="icon-calendar"></i>{NEWSDATE}</small>
@@ -78,7 +80,7 @@ $NEWS_TEMPLATE['view']['item'] = '
 			{PDFICON}
 			{ADMINOPTIONS}
 		</div>
-
+	</div>
 		<div class="body">
 			{NEWSIMAGE}
 			{NEWSBODY}
diff --git a/e107_web/css/e107.css b/e107_web/css/e107.css
index a555faa95..d5ab31bdb 100644
--- a/e107_web/css/e107.css
+++ b/e107_web/css/e107.css
@@ -198,8 +198,8 @@ div.e-comment-edit-save								{ margin-top:8px; padding: 5px }
      background: red;
 }
  */   
-.divider 											{ border-bottom: 1px solid silver;  font-size: 18px;  margin-bottom: 30px;  position: relative;  text-align: center; }
-.divider span 										{ padding: 0 15px; position: relative; top: 10px; }
+.signup-divider											{ border-bottom: 1px solid silver;  font-size: 18px;  margin-bottom: 30px;  position: relative;  text-align: center; }
+.signup-divider span 										{ padding: 0 15px; position: relative; top: 10px; }
 
 /* Used to hide elements when JavaScript is enabled:  old e_css.php */
 /*