Merge

25 files changed, 275 insertions, 272 deletions

diff --git a/BitSmarty.php b/BitSmarty.php
index e1db91d..3dee679 100644
--- a/BitSmarty.php
+++ b/BitSmarty.php
@@ -55,7 +55,7 @@ class BitSmarty extends SmartyBC {
 		$this->assign( 'app_name', 'bitweaver' );
 		$this->addPluginsDir( THEMES_PKG_PATH . "smartyplugins" );
 		$this->register_prefilter( "add_link_ticket" );
-		$this->error_reporting = E_ALL & ~E_NOTICE;
+		$this->error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT;
 
 		global $permCheck;
 		$permCheck = new PermissionCheck();
diff --git a/BitThemes.php b/BitThemes.php
index 760d20e..a0b4e78 100644
--- a/BitThemes.php
+++ b/BitThemes.php
@@ -57,6 +57,9 @@ class BitThemes extends BitSingleton {
 		$this->mThemeCache = new BitCache( 'themes', TRUE );
 	}
 
+	public static function isCacheableClass() {
+		return false;
+	}
 
 	// {{{ =================== Styles ====================
 	/**
@@ -457,102 +460,108 @@ class BitThemes extends BitSingleton {
 	}
 
 	function displayLayoutColumn( $pColumn ) {
-		global $gBitSmarty;
+		global $gBitSmarty, $gBitSystem;
 		if( !empty( $this->mLayout[$pColumn] ) ) {
 			for ($i = 0; $i < count( $this->mLayout[$pColumn] ); $i++) {
 				$r = &$this->mLayout[$pColumn][$i];
 				if( !empty( $r['visible'] )) {
-					// @TODO MODULE UPGRADE under new module organization this is not reliable as tpls are in sub dir in modules/ change this when upgrade is complete
-					list( $package, $template ) = explode(  '/', $r['module_rsrc'] );
-					// deal with custom modules
-					if( $package == '_custom:custom' ) {
-						global $gBitLanguage;
+					if( $pColumn == 'l' || $pColumn == 'r' ) { print '<div class="col-xs-12">'; }
+					try {
+						// @TODO MODULE UPGRADE under new module organization this is not reliable as tpls are in sub dir in modules/ change this when upgrade is complete
+						list( $package, $template ) = explode(  '/', $r['module_rsrc'] );
+						// deal with custom modules
+						if( $package == '_custom:custom' ) {
+							global $gBitLanguage;
 
-						// We're gonna run our own cache mechanism for user_modules
-						// the cache is here to avoid calls to consumming queries,
-						// each module is different for each language because of the strings
-						$cacheDir = TEMP_PKG_PATH.'modules/cache/';
-						if( !is_dir( $cacheDir )) {
-							mkdir_p( $cacheDir );
-						}
-						$cachefile = $cacheDir.'_custom.'.$gBitLanguage->mLanguage.'.'.$template.'.tpl.cache';
+							// We're gonna run our own cache mechanism for user_modules
+							// the cache is here to avoid calls to consumming queries,
+							// each module is different for each language because of the strings
+							$cacheDir = TEMP_PKG_PATH.'modules/cache/';
+							if( !is_dir( $cacheDir )) {
+								mkdir_p( $cacheDir );
+							}
+							$cachefile = $cacheDir.'_custom.'.$gBitLanguage->mLanguage.'.'.$template.'.tpl.cache';
 
-						if( !empty( $r["cache_time"] ) && file_exists( $cachefile ) && !(( $gBitSystem->getUTCTime() - filemtime( $cachefile )) > $r["cache_time"] )) {
-							$fp = fopen( $cachefile, "r" );
-							$data = fread( $fp, filesize( $cachefile ));
-							fclose( $fp );
-							$r["data"] = $data;
-						} else {
-							if( $moduleParams = $this->getCustomModule( $template )) {
-								$moduleParams = array_merge( $r, $moduleParams );
-								$gBitSmarty->assign_by_ref( 'moduleParams', $moduleParams );
-								$gBitSmarty->display( 'bitpackage:themes/custom_module.tpl' );
+							if( !empty( $r["cache_time"] ) && file_exists( $cachefile ) && !(( $gBitSystem->getUTCTime() - filemtime( $cachefile )) > $r["cache_time"] )) {
+								$fp = fopen( $cachefile, "r" );
+								$data = fread( $fp, filesize( $cachefile ));
+								fclose( $fp );
+								$r["data"] = $data;
+							} else {
+								if( $moduleParams = $this->getCustomModule( $template )) {
+									$moduleParams = array_merge( $r, $moduleParams );
+									$gBitSmarty->assign_by_ref( 'moduleParams', $moduleParams );
+									$gBitSmarty->display( 'bitpackage:themes/custom_module.tpl' );
 
-								if( !empty( $r["cache_time"] ) ) {
-									// write to chache file
-									$fp = fopen( $cachefile, "w+" );
-									fwrite( $fp, $data, strlen( $data ));
-									fclose( $fp );
+									if( !empty( $r["cache_time"] ) ) {
+										// write to chache file
+										$fp = fopen( $cachefile, "w+" );
+										fwrite( $fp, $data, strlen( $data ));
+										fclose( $fp );
+									}
+									$r["data"] = $data;
 								}
-								$r["data"] = $data;
 							}
-						}
-						unset( $data );
-					} else {
-						$explosion = explode( '/', $r['module_rsrc'] );
-						$template = array_pop( $explosion );
+							unset( $data );
+						} else {
+							$explosion = explode( '/', $r['module_rsrc'] );
+							$template = array_pop( $explosion );
 
-						// using $module_rows, $module_params and $module_title is deprecated. please use $moduleParams hash instead
-						global $module_rows, $module_params, $module_title, $gBitLanguage;
+							// using $module_rows, $module_params and $module_title is deprecated. please use $moduleParams hash instead
+							global $module_rows, $module_params, $module_title, $gBitLanguage;
 
-						$cacheDir = TEMP_PKG_PATH.'modules/cache/';
-						if( !is_dir( $cacheDir )) {
-							mkdir_p( $cacheDir );
-						}
+							$cacheDir = TEMP_PKG_PATH.'modules/cache/';
+							if( !is_dir( $cacheDir )) {
+								mkdir_p( $cacheDir );
+							}
 
-						// include tpl name and module id to uniquely identify
-						$cachefile = $cacheDir.'_module_'.$r['module_id'].'.'.$gBitLanguage->mLanguage.'.'.$template.'.cache';
+							// include tpl name and module id to uniquely identify
+							$cachefile = $cacheDir.'_module_'.$r['module_id'].'.'.$gBitLanguage->mLanguage.'.'.$template.'.cache';
 
-						// if the time is right get the cache else get it fresh
-						if( !empty( $r["cache_time"] ) && file_exists( $cachefile ) && filesize( $cachefile ) && !(( $gBitSystem->getUTCTime() - filemtime( $cachefile )) > $r["cache_time"] ) ) {
-							$fp = fopen( $cachefile, "r" );
-							$data = fread( $fp, filesize( $cachefile ));
-							fclose( $fp );
-							$r["data"] = $data;
-						} else {
-							$module_params = $r['module_params']; // backwards compatability
+							// if the time is right get the cache else get it fresh
+							if( !empty( $r["cache_time"] ) && file_exists( $cachefile ) && filesize( $cachefile ) && !(( $gBitSystem->getUTCTime() - filemtime( $cachefile )) > $r["cache_time"] ) ) {
+								$fp = fopen( $cachefile, "r" );
+								$data = fread( $fp, filesize( $cachefile ));
+								fclose( $fp );
+								$r["data"] = $data;
+							} else {
+								$module_params = $r['module_params']; // backwards compatability
 
-							if( !$r['module_rows'] ) {
-								$r['module_rows'] = 10;
-							}
+								if( !$r['module_rows'] ) {
+									$r['module_rows'] = 10;
+								}
 
-							// if there's no custom title, get one from file name
-							if( !$r['title'] = ( isset( $r['title'] ) ? tra( $r['title'] ) : NULL )) {
-								$pattern[0] = "/.*\/mod_(.*)\.tpl/";
-								$replace[0] = "$1";
-								$pattern[1] = "/_/";
-								$replace[1] = " ";
-								$r['title'] = ( !empty( $r['title'] ) ? tra( $r['title'] ) : tra( ucwords( preg_replace( $pattern, $replace, $r['module_rsrc'] ))));
-							}
+								// if there's no custom title, get one from file name
+								if( !$r['title'] = ( isset( $r['title'] ) ? tra( $r['title'] ) : NULL )) {
+									$pattern[0] = "/.*\/mod_(.*)\.tpl/";
+									$replace[0] = "$1";
+									$pattern[1] = "/_/";
+									$replace[1] = " ";
+									$r['title'] = ( !empty( $r['title'] ) ? tra( $r['title'] ) : tra( ucwords( preg_replace( $pattern, $replace, $r['module_rsrc'] ))));
+								}
 
-							// moduleParams are extracted in BitSmarty::getSiblingAttachments() and passed on the the module php file
-							$moduleParams = $r;
-							$gBitSmarty->assign_by_ref( 'moduleParams', $moduleParams );
-							// assign the custom module title
-							$gBitSmarty->assign_by_ref( 'moduleTitle', $r['title'] );
-							$gBitSmarty->display( $r['module_rsrc'] );
+								// moduleParams are extracted in BitSmarty::getSiblingAttachments() and passed on the the module php file
+								$moduleParams = $r;
+								$gBitSmarty->assign_by_ref( 'moduleParams', $moduleParams );
+								// assign the custom module title
+								$gBitSmarty->assign_by_ref( 'moduleTitle', $r['title'] );
+								$gBitSmarty->display( $r['module_rsrc'] );
 
-							if( !empty( $r["cache_time"] ) ) {
-								// write to chache file
-								$fp = fopen( $cachefile, "w+" );
-								fwrite( $fp, $data, strlen( $data ));
-								fclose( $fp );
+								if( !empty( $r["cache_time"] ) ) {
+									// write to chache file
+									$fp = fopen( $cachefile, "w+" );
+									fwrite( $fp, $data, strlen( $data ));
+									fclose( $fp );
+								}
+								$r["data"] = $data;
 							}
-							$r["data"] = $data;
-						}
 
-						unset( $moduleParams );
+							unset( $moduleParams );
+						}
+					} catch( Exception $e ) {
+						print( '<div class="alert alert-warning">'.$e->getMessage() ).'</div>';
 					}
+					if( $pColumn == 'l' || $pColumn == 'r' ) { print '</div>'; }
 				}
 			}
 		}
@@ -1487,7 +1496,7 @@ class BitThemes extends BitSingleton {
 						$jqueryUiVersion = $gBitSystem->getConfig( 'jquery_ui_version', '1.9.2' );
 						$jqueryTheme = $gBitSystem->getConfig( 'jquery_theme', 'base' );
 						if( defined( 'IS_LIVE' ) && IS_LIVE ) {
-							$jquerySrc = $protocol.'://ajax.googleapis.com/ajax/libs/jquery/'.$jqueryVersion.'/jquery.js';
+							$jquerySrc = $protocol.'://ajax.googleapis.com/ajax/libs/jquery/'.$jqueryVersion.'/jquery.min.js';
 							$this->mRawFiles['js'][] = $jquerySrc;
 							// boostrap needs to load after jquery
 							$boostrapSrc = CONFIG_PKG_PATH.'js/bootstrap.min.js';
@@ -2212,6 +2221,78 @@ class BitThemes extends BitSingleton {
 	// }}}
 }
 
+function themes_feedback_to_html( $params ) {
+
+	detoxify( $params );
+	if( !empty( $params['hash'] ) ) {
+		$hash = &$params['hash'];
+	} else {
+		// maybe params were passed in separately
+		$hash = &$params;
+	}
+	$feedback = '';
+	$i = 0;
+	$color = isset( $hash['color'] )?$hash['color']:"000000";
+	foreach( $hash as $key => $val ) {
+		if( $val ) {
+			$keys = array( 'warning', 'success', 'error', 'important', 'note' );
+			if( in_array( $key, $keys )) {
+				switch( $key ) {
+					case 'success':
+						$alertClass = 'alert alert-success';
+						break;
+					case 'warning':
+						$alertClass = 'alert alert-warning';
+						break;
+					case 'error':
+						$alertClass = 'alert alert-danger';
+						break;
+					case 'note':
+					case 'important':
+					default:
+						$alertClass = 'alert alert-info';
+						break;
+				}
+
+				if( !is_array( $val ) ) {
+					$val = array( $val );
+				}
+
+				foreach( $val as $valText ) {
+					if( is_array( $valText ) ) {
+						foreach( $valText as $text ) {
+							$feedback .= '<span class="inline-block '.$alertClass.'">'.$text.'</span>';
+						}
+					} else {
+						$feedback .= '<span class="inline-block '.$alertClass.'">'.$valText.'</span>';
+					}
+				}
+
+			} else {
+				/* unfortunately this plugin was written a little strictly and so it expects all params to be display text
+				 * to allow setting of a background color we have to exclude that param when rendering out the html
+				 * otherwise we'll render the color as text. -wjames5
+				 */ 
+				if ( $key != 'color' ) {
+					if( is_array( $val ) ) {
+						foreach( $val as $text ) {
+							$feedback .= '<span class="'.$key.'">'.$text.'</span>';
+						}
+					} else {
+						$feedback .= '<span class="'.$key.'">'.$val.'</span>';
+					}
+				}
+			}
+		}
+	}
+
+	$html = '';
+	if( !empty( $feedback ) ) {
+		$html .= $feedback;
+	}
+	return $html;
+}
+
 /**
  * load content specific theme picked by user
  *
diff --git a/admin/menus.php b/admin/menus.php
index 0aa04f8..fba8182 100644
--- a/admin/menus.php
+++ b/admin/menus.php
@@ -59,7 +59,7 @@ if( !empty( $_REQUEST['menu_js_settings'] ) ) {
 }
 
 if( !empty( $_REQUEST['update_menus'] ) ) {
-	foreach( array_keys( $gBitSystem->mAppMenu ) as $menuPackage ) {
+	foreach( array_keys( $gBitSystem->mAppMenu['bar'] ) as $menuPackage ) {
 		if( empty( $_REQUEST["menu_$menuPackage"] ) ) {
 			// the package menu is off - store it off
 			$gBitSystem->storeConfig( "menu_$menuPackage", 'n', THEMES_PKG_NAME );
diff --git a/css/base.css b/css/base.css
index 8998fa2..6f0faa5 100644
--- a/css/base.css
+++ b/css/base.css
@@ -24,6 +24,7 @@ html[dir='rtl'] .alignright	{text-align:left}
 .nopadding	{padding:0;}
 .nomargin	{margin:0;}
 .margin-auto	{margin-left:auto;margin-right:auto;}
+.overflow-hidden	{overflow:hidden;}
 
 .inline	{display:inline;}
 .inline-block	{display:inline-block;}
@@ -71,7 +72,7 @@ html[dir='rtl'] .clearright	{clear:left}
 .monospace	{font-family:monospace}
 
 .module ol,
-.module ul	{margin:0; padding:0}
+.module ul	{margin:0 0 0 -1em; padding:0}
 .module ol li	{margin:0 0 0 3em; padding:0;}
 .module ul li,
 .menu li,
@@ -84,7 +85,9 @@ html[dir='rtl'] ul.toc ul	{margin-right:1em;}
 
 .bold	{font-weight:bold;}
 
-.header	{margin-bottom:10px;}
+header.container.mainheader	{margin-top:20px;}
+section.maincontent.container-fluid	{padding-left:0;padding-right:0}
+
 .date,
 small,.small	{color:#666666; font-size:85%}
 .sitenotice	{text-align:center;font-weight:bold;padding-bottom:10px;}
diff --git a/menu_register_inc.php b/menu_register_inc.php
index da41605..12424cf 100644
--- a/menu_register_inc.php
+++ b/menu_register_inc.php
@@ -39,7 +39,7 @@ if( !empty( $adminMenu ) ) {
 function mAppMenu_sort( $a, $b ) {
 	if( @is_numeric( $a['menu_position'] ) ) {
 		return( (int)$a['menu_position'] > (int)$b['menu_position'] );
-	} else {
+	} elseif( !empty( $a['menu_title'] ) ) {
 		return( strcmp( $a['menu_title'], $b['menu_title'] ) );
 	}
 }
diff --git a/smartyplugins/block.form.php b/smartyplugins/block.form.php
index 94cef96..cadcebd 100644
--- a/smartyplugins/block.form.php
+++ b/smartyplugins/block.form.php
@@ -27,7 +27,7 @@ function smarty_block_form( $pParams, $pContent, &$gBitSmarty) {
 			$pParams['method'] = 'post';
 		}
 		$atts = '';
-		if( isset( $pParams['secure'] ) && $pParams['secure'] ) {
+		if( $gBitSystem->isLive() && isset( $pParams['secure'] ) && $pParams['secure'] ) {
 			// This is NEEDED to enforce HTTPS secure logins!
 			$url = 'https://' . $_SERVER['HTTP_HOST'];
 		} else {
diff --git a/smartyplugins/function.formfeedback.php b/smartyplugins/function.formfeedback.php
index f9e42df..ee4fab3 100644
--- a/smartyplugins/function.formfeedback.php
+++ b/smartyplugins/function.formfeedback.php
@@ -14,74 +14,7 @@
  *           - warning, error or success are defined css styles, but you can feed it anything
  */
 function smarty_function_formfeedback( $params, &$gBitSmarty ) {
-	detoxify( $params );
-	if( !empty( $params['hash'] ) ) {
-		$hash = &$params['hash'];
-	} else {
-		// maybe params were passed in separately
-		$hash = &$params;
-	}
-	$feedback = '';
-	$i = 0;
-	$color = isset( $hash['color'] )?$hash['color']:"000000";
-	foreach( $hash as $key => $val ) {
-		if( $val ) {
-			$keys = array( 'warning', 'success', 'error', 'important', 'note' );
-			if( in_array( $key, $keys )) {
-				switch( $key ) {
-					case 'success':
-						$alertClass = 'alert alert-success';
-						break;
-					case 'warning':
-						$alertClass = 'alert';
-						break;
-					case 'error':
-						$alertClass = 'alert alert-error';
-						break;
-					case 'note':
-					case 'important':
-					default:
-						$alertClass = 'alert alert-info';
-						break;
-				}
-
-				if( !is_array( $val ) ) {
-					$val = array( $val );
-				}
-
-				foreach( $val as $valText ) {
-					if( is_array( $valText ) ) {
-						foreach( $valText as $text ) {
-							$feedback .= '<span class="inline-block '.$alertClass.'">'.$text.'</span>';
-						}
-					} else {
-						$feedback .= '<span class="inline-block '.$alertClass.'">'.$valText.'</span>';
-					}
-				}
-
-			} else {
-				/* unfortunately this plugin was written a little strictly and so it expects all params to be display text
-				 * to allow setting of a background color we have to exclude that param when rendering out the html
-				 * otherwise we'll render the color as text. -wjames5
-				 */ 
-				if ( $key != 'color' ) {
-					if( is_array( $val ) ) {
-						foreach( $val as $text ) {
-							$feedback .= '<span class="'.$key.'">'.$text.'</span>';
-						}
-					} else {
-						$feedback .= '<span class="'.$key.'">'.$val.'</span>';
-					}
-				}
-			}
-		}
-	}
-
-	$html = '';
-	if( !empty( $feedback ) ) {
-		$html .= $feedback;
-	}
-	return $html;
+	return themes_feedback_to_html( $params );
 }
 
 ?>
diff --git a/smartyplugins/function.html_select_date.php b/smartyplugins/function.html_select_date.php
index fc0609d..d501c4a 100644
--- a/smartyplugins/function.html_select_date.php
+++ b/smartyplugins/function.html_select_date.php
@@ -33,6 +33,8 @@
 function smarty_function_html_select_date($params, &$pSmarty)
 {
     global $gBitSystem;
+    $pSmarty->loadPlugin( 'smarty_shared_make_timestamp' );
+    $pSmarty->loadPlugin( 'smarty_modifier_html_options' );
     /* Default values. */
     $prefix          = "Date_";
     $start_year      = strftime("%Y");
diff --git a/smartyplugins/function.html_select_time.php b/smartyplugins/function.html_select_time.php
index 616d233..e9da551 100644
--- a/smartyplugins/function.html_select_time.php
+++ b/smartyplugins/function.html_select_time.php
@@ -21,6 +21,8 @@
 function smarty_function_html_select_time($params, &$gBitSmarty)
 {
     global $gBitSystem;
+    $gBitSmarty->loadPlugin( 'smarty_shared_make_timestamp' );
+    $gBitSmarty->loadPlugin( 'smarty_shared_html_options' );
     /* Default values. */
     $prefix             = "Time_";
     $time               = time();
diff --git a/smartyplugins/modifier.bit_date_format.php b/smartyplugins/modifier.bit_date_format.php
index 79b6a8f..c996aba 100644
--- a/smartyplugins/modifier.bit_date_format.php
+++ b/smartyplugins/modifier.bit_date_format.php
@@ -9,7 +9,7 @@
  * required setup
  */
 global $gBitSmarty;
-$gBitSmarty->loadPlugin('smarty_modifier_make_timestamp');
+$gBitSmarty->loadPlugin('smarty_shared_make_timestamp');
 
 /**
  * Smarty plugin
diff --git a/smartyplugins/modifier.cal_date_format.php b/smartyplugins/modifier.cal_date_format.php
index ecb4f82..851573e 100644
--- a/smartyplugins/modifier.cal_date_format.php
+++ b/smartyplugins/modifier.cal_date_format.php
@@ -9,7 +9,7 @@
  * required setup
  */
 global $gBitSmarty;
-$gBitSmarty->loadPlugin('smarty_modifier_make_timestamp');
+$gBitSmarty->loadPlugin('smarty_shared_make_timestamp');
 
 /**
  * Smarty plugin
diff --git a/templates/admin_columns.tpl b/templates/admin_columns.tpl
index b583ae9..e7ab5ce 100644
--- a/templates/admin_columns.tpl
+++ b/templates/admin_columns.tpl
@@ -12,7 +12,7 @@
 			</p>
 
 			{legend legend="Theme Layout"}
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Header Layout"}
 					{forminput}
 					<select name="layout-header">
@@ -21,16 +21,16 @@
 					</select>
 					{/forminput}
 				</div>
-				<div class="control-group column-group gutters">
-					{formlabel label="Body Layout"}
+				<div class="form-group">
+					{formlabel label="Main Content Section Layout"}
 					{forminput}
-					<select name="layout-body">
+					<select name="layout-maincontent">
 						<option value="">{tr}Fixed Width{/tr}</option>
-						<option value="-fluid" {if $gBitSystem->getConfig('layout-body')}selected="selected"{/if}>{tr}Fluid Full Width{/tr}</option>
+						<option value="-fluid" {if $gBitSystem->getConfig('layout-maincontent')}selected="selected"{/if}>{tr}Fluid Full Width{/tr}</option>
 					</select>
 					{/forminput}
 				</div>
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Footer Layout"}
 					{forminput}
 					<select name="layout-footer">
@@ -48,7 +48,7 @@
 			{legend legend="Visible Columns and Areas"}
 				{formhelp warning="If checked, the column is visible."}
 				{foreach from=$activeColumns key=feature item=output}
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label=$output.label for=$feature}
 						{forminput}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -169,9 +169,9 @@
 		
 	{/jstabs}
 	
-	<div class="control-group submit">
-		<input type="submit" class="ink-button" name="reset_columns" value="{tr}Reset column settings{/tr}" />
-		<input type="submit" class="ink-button" name="column_control" value="{tr}Save settings{/tr}" />
+	<div class="form-group submit">
+		<input type="submit" class="btn btn-default" name="reset_columns" value="{tr}Reset column settings{/tr}" />
+		<input type="submit" class="btn btn-default" name="column_control" value="{tr}Save settings{/tr}" />
 	</div>
 
 {/form}
diff --git a/templates/admin_custom_modules.tpl b/templates/admin_custom_modules.tpl
index ed8f947..2ced930 100644
--- a/templates/admin_custom_modules.tpl
+++ b/templates/admin_custom_modules.tpl
@@ -13,7 +13,7 @@
 	{formfeedback hash=$feedback}
 	<input type="hidden" name="page" value="{$page}" />
 
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Name" for="name"}
 		{forminput}
 			<input type="text" name="name" id="name" value="{$module.name|escape}" />
@@ -21,7 +21,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Title" for="title"}
 		{forminput}
 			<input type="text" name="title" id="title" value="{$module.title|escape}" />
@@ -29,7 +29,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Data" for="usermoduledata"}
 		{forminput}
 			<textarea id="usermoduledata" name="data" rows="10" cols="50">{$module.data|escape}</textarea>
@@ -37,9 +37,9 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group submit">
-		<input type="submit" class="ink-button" name="preview" value="{tr}Preview{/tr}" />
-		<input type="submit" class="ink-button" name="save" value="{tr}Save{/tr}" />
+	<div class="form-group submit">
+		<input type="submit" class="btn btn-default" name="preview" value="{tr}Preview{/tr}" />
+		<input type="submit" class="btn btn-default" name="save" value="{tr}Save{/tr}" />
 	</div>
 {/form}
 
diff --git a/templates/admin_layout.tpl b/templates/admin_layout.tpl
index 660a38e..04cb72c 100644
--- a/templates/admin_layout.tpl
+++ b/templates/admin_layout.tpl
@@ -3,7 +3,7 @@
 
 		{form legend="Create Layout for Packages and Sections" method="get"}
 			<input type="hidden" name="page" value="{$page}" />
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Customized layout" for="module_package"}
 				{forminput}
 					<select name="module_package" id="module_package" onchange="this.form.submit();">
@@ -26,7 +26,7 @@
 			</div>
 
 			{if $cloneLayouts and $module_package != kernel}
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Copy existing layout" for="clone_layout"}
 					{forminput}
 						<ul>
@@ -42,14 +42,14 @@
 			{/if}
 
 			<noscript>
-				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="fSubmitCustomize" value="{tr}Customize{/tr}" />
+				<div class="form-group submit">
+					<input type="submit" class="btn btn-default" name="fSubmitCustomize" value="{tr}Customize{/tr}" />
 				</div>
 			</noscript>
 		{/form}
 <div class="row">
-	<div class="large-100">
-		<table class="large-100">
+	<div class="col-md-7">
+		<table class="width100p">
 			<caption>{tr}Current Layout of '{if !$module_package || $module_package=='kernel'}Site Default{else}{$module_package|capitalize}{/if}'{/tr}</caption>
 			<tr>
 				{foreach from=$layoutAreas item=area key=colkey}
@@ -60,7 +60,7 @@
 						<tr>
 							<td class="{cycle values="even,odd"} aligntop" colspan="3">
 					{else}
-						<td class="{cycle values="even,odd"} large-33 aligntop">
+						<td class="{cycle values="even,odd"} width33p aligntop">
 					{/if}
 
 						<table class="table data width100p">
@@ -75,7 +75,7 @@
 								</tr>
 							{sectionelse}
 								<tr>
-									<td colspan="3" class="content-center">
+									<td colspan="3" class="aligncenter">
 										{if $colkey eq 'center'}{tr}Default{/tr}{else}{tr}None{/tr}{/if}
 									</td>
 								</tr>
@@ -91,13 +91,13 @@
 			</tr>
 		</table>
 	</div>
-	<div class="span5">
+	<div class="col-md-5">
 {jstabs}
 	{jstab title="Modules"}
 		{form action=$smarty.server.SCRIPT_NAME legend="Assign modules to areas"}
 			<input type="hidden" name="page" value="{$page}" />
 			<input type="hidden" name="module_package" value="{$module_package}" />
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Package"}
 				{forminput}
 					<span class="highlight">{tr}{if !$module_package || $module_package eq 'kernel'}Site Default{else}{$module_package|capitalize}{/if}{/tr}</span>
@@ -108,7 +108,7 @@
 			{if $fEdit && $fAssign.name}
 				<input type="hidden" name="assign_name" value="{$fAssign.name}" />
 			{else}
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Module" for="module_rsrc"}
 					{forminput}
 						{*html_options name="fAssign[module_rsrc]" id="module_rsrc" options=$allModules selected=$fAssign.name *}
@@ -126,7 +126,7 @@
 				</div>
 			{/if}
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Position" for="layout_area"}
 				{forminput}
 					<select name="fAssign[layout_area]" id="layout_area">
@@ -143,7 +143,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Title" for="title"}
 				{forminput}
 					<input type="text" size="48" name="fAssign[title]" id="title" value="{$fAssign.title|escape}" />
@@ -151,7 +151,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Order" for="pos"}
 				{forminput}
 					<select name="fAssign[pos]" id="pos">
@@ -163,7 +163,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Cache Time" for="cache_time"}
 				{forminput}
 					<input type="text" size="5" name="fAssign[cache_time]" id="cache_time" value="{$fAssign.cache_time|escape}" /> seconds
@@ -171,7 +171,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Rows" for="module_rows"}
 				{forminput}
 					<input type="text" size="5" name="fAssign[module_rows]" id="module_rows" value="{$fAssign.module_rows|escape}" />
@@ -179,7 +179,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Parameters" for="params"}
 				{forminput}
 					<input type="text" size="48" name="fAssign[params]" id="params" value="{$fAssign.params|escape}" />
@@ -206,7 +206,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{if $roles }
 					{formlabel label="Roles" for="roles"}
 					{forminput}
@@ -230,16 +230,15 @@
 				{/if}
 			</div>
 
-			<div class="control-group column-group gutters">
-				{formlabel label="Add to all Layouts" for="add_to_all"}
-				{forminput}
-					<input type="checkbox" value="y" id="add_to_all" name="fAssign[add_to_all]" />
+			<div class="form-group">
+				<label class="checkbox">
+					<input type="checkbox" value="y" id="add_to_all" name="fAssign[add_to_all]" />Add to all Layouts
 					{formhelp note="If you check this, the module will be added to all custom layouts."}
-				{/forminput}
+				</label>
 			</div>
 
-			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="ColumnTabSubmit" value="{tr}Assign{/tr}" />
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="ColumnTabSubmit" value="{tr}Assign{/tr}" />
 			</div>
 		{/form}
 	{/jstab}
@@ -250,7 +249,7 @@
 			<input type="hidden" name="module_package" value="{$module_package}" />
 			<input type="hidden" name="fAssign[layout_area]" value="c" />
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Package"}
 				{forminput}
 					<span class="highlight">{tr}{if !$module_package || $module_package eq 'kernel'}Site Default{else}{$module_package|capitalize}{/if}{/tr}</span>
@@ -258,7 +257,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Center Piece" for="module"}
 				{forminput}
 					{if $fEdit && $fAssign.name}
@@ -279,14 +278,14 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Position"}
 				{forminput}
 					{tr}Center{/tr}
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Order" for="c_ord"}
 				{forminput}
 					<select name="fAssign[pos]" id="c_ord">
@@ -298,7 +297,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Cache Time" for="c_cache_time"}
 				{forminput}
 					<input type="text" name="fAssign[cache_time]" id="c_cache_time" size="5" value="{$fAssign.cache_time|escape}" /> seconds
@@ -306,7 +305,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Rows" for="c_rows"}
 				{forminput}
 					<input type="text" size="5" name="fAssign[module_rows]" id="c_rows" value="{$fAssign.module_rows|escape}" />
@@ -314,7 +313,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Parameters" for="c_params"}
 				{forminput}
 					<input type="text" size="48" name="fAssign[params]" id="c_params" value="{$fAssign.params|escape}" />
@@ -322,7 +321,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{if $roles }
 					{formlabel label="Roles" for="c_roles"}
 					{forminput}
@@ -346,8 +345,8 @@
 				{/if}
 			</div>
 
-			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="CenterTabSubmit" value="{tr}Assign{/tr}" />
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="CenterTabSubmit" value="{tr}Assign{/tr}" />
 			</div>
 		{/form}
 	{/jstab}
diff --git a/templates/admin_layout_inc.tpl b/templates/admin_layout_inc.tpl
index eff984e..9c9c88a 100644
--- a/templates/admin_layout_inc.tpl
+++ b/templates/admin_layout_inc.tpl
@@ -1,7 +1,7 @@
 {jstab title="Actions"}
 	{legend legend="Layout help"}
 		{if $page eq "layout_overview"}
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Adjust display" for=""}
 				{forminput}
 					{if !$smarty.request.nocollapse}
@@ -12,7 +12,7 @@
 					{formhelp note="Toggle the state of <em>all modules</em> (expanded/collapsed). This reloads the page without saving changes made prior."}
 				{/forminput}
 			</div>
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Adjust modules" for=""}
 				{forminput}
 					<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;fixpos=1">{booticon iname="icon-circle-arrow-right"   iforce=icon_text iexplain="Adjust module postitions"}</a>
@@ -20,7 +20,7 @@
 				{/forminput}
 			</div>
 		{else}
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Module Positions" for=""}
 				{forminput}
 					{smartlink ititle="Adjust module positions" page=$page fixpos=1 module_package=$module_package}
@@ -28,7 +28,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Layout Details" for=""}
 				{forminput}
 					{smartlink ititle="Configure Layout Details" page=layout_overview}
diff --git a/templates/admin_layout_overview.tpl b/templates/admin_layout_overview.tpl
index 9274429..463eff5 100644
--- a/templates/admin_layout_overview.tpl
+++ b/templates/admin_layout_overview.tpl
@@ -7,34 +7,17 @@
 	<input type="hidden" name="page" value="{$page}" />
 	<input type="hidden" name="nocollapse" value="{$smarty.request.nocollapse}" />
 
-	{foreach name=PkgLayouts from=$layouts item=layout key=module_package}
-		{if $smarty.foreach.PkgLayouts.total >= $tablimit}
-			<dl>
-				<dt>{$smarty.foreach.PkgLayouts.iteration}</dt>
-				{if !$module_package || $module_package == 'kernel'}
-					<dd>{tr}Default{/tr}</dd>
-				{else}
-					<dd>{$module_package|capitalize}</dd>
-				{/if}
-			</dl>
-		{/if}
-	{/foreach}
-
 	{jstabs}
 		{foreach name=PkgLayouts from=$layouts item=layout key=module_package}
 
-			{* if there are too many tabs, we only display numbers *}
-			{if $smarty.foreach.PkgLayouts.total lt $tablimit}
-				{if !$module_package || $module_package == 'kernel'}
-					{assign var=TabTitle value="Default"}
-				{else}
-					{assign var=TabTitle value=$module_package|capitalize}
-				{/if}
+			{if !$module_package || $module_package == 'kernel'}
+				{assign var=tabTitle value="Default"|tra}
 			{else}
-				{assign var=TabTitle value="&nbsp;"|cat:$smarty.foreach.PkgLayouts.iteration|cat:"&nbsp;"}
+				{assign var=tabTitle value=$module_package|capitalize}
 			{/if}
 
-			{jstab title=$TabTitle}
+
+			{jstab title=$tabTitle}
 
 				<div class="floaticon">
 					{smartlink ititle="Edit this Layout" booticon="icon-edit" page=layout module_package=$module_package}
@@ -42,10 +25,10 @@
 				</div>
 
 				<h1 id="{$module_package}">
-					{tr}Current Layout of {if $TabTitle == 'Default'}Site Default{else}{$TabTitle}{/if}{/tr}
+					{tr}Current Layout{/tr} <strong>{$tabTitle}</strong>
 				</h1>
 
-				<table class="large-100">
+				<table class="width100p">
 					<tr>
 						{cycle values="even,odd" print=0}
 						{foreach from=$layoutAreas item=area key=colkey}
@@ -56,7 +39,7 @@
 								<tr>
 									<td class="{cycle} aligntop" colspan="3">
 							{else}
-								<td class="{cycle} large-33 aligntop">
+								<td class="{cycle} width33p aligntop">
 							{/if}
 
 								<table class="table data width100p">
@@ -75,7 +58,7 @@
 										</tr>
 									{sectionelse}
 										<tr>
-											<td colspan="3" class="content-center">
+											<td colspan="3" class="aligncenter">
 												{if $colkey eq 'center'}{tr}Default{/tr}{else}{tr}None{/tr}{/if}
 											</td>
 										</tr>
@@ -98,7 +81,7 @@
 	{/jstabs}
 
 	<div class="submit">
-		<input type="submit" class="ink-button" name="update_modules" value="{tr}Apply module settings{/tr}" />
+		<input type="submit" class="btn btn-default" name="update_modules" value="{tr}Apply module settings{/tr}" />
 	</div>
 {/form}
 
diff --git a/templates/admin_modules.tpl b/templates/admin_modules.tpl
index 410d555..c15f7aa 100644
--- a/templates/admin_modules.tpl
+++ b/templates/admin_modules.tpl
@@ -2,7 +2,7 @@
 {form legend="Global Module Settings"}
 	<input type="hidden" name="page" value="{$page}" />
 	{foreach from=$formModuleFeatures key=feature item=output}
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{formlabel label=$output.label for=$feature}
 			{forminput}
 				{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -11,7 +11,7 @@
 		</div>
 	{/foreach}
 
-	<div class="control-group submit">
-		<input type="submit" class="ink-button" name="module_settings" value="{tr}Change preferences{/tr}" />
+	<div class="form-group submit">
+		<input type="submit" class="btn btn-default" name="module_settings" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
diff --git a/templates/admin_themes.tpl b/templates/admin_themes.tpl
index 9612ebf..cfd982d 100644
--- a/templates/admin_themes.tpl
+++ b/templates/admin_themes.tpl
@@ -2,7 +2,7 @@
 {strip}
 {form legend="Theme Settings"}
 	<input type="hidden" name="page" value="{$page}" />
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Display action links as" for="site_biticon_display_style"}
 		{forminput}
 			{html_options name="site_biticon_display_style" id="site_biticon_display_style" options=$biticon_display_options selected=$gBitSystem->getConfig('site_biticon_display_style')}
@@ -10,7 +10,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Default Icon Style" for="default_icon_style"}
 		{forminput}
 			{html_options name="default_icon_style" id="default_icon_style" options=$iconStyles selected=$gBitSystem->getConfig('default_icon_style')}
@@ -18,7 +18,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Default Icon Size" for="site_icon_size"}
 		{forminput}
 			{html_options name="site_icon_size" id="site_icon_size" options=$biticon_sizes selected=$gBitSystem->getConfig('site_icon_size')}
@@ -26,7 +26,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Use IE js fix" for="themes_use_msie_js_fix"}
 		{forminput}
 			{html_options name="themes_use_msie_js_fix" id="themes_use_msie_js_fix" options=$ieFixOptions selected=$gBitSystem->getConfig('themes_use_msie_js_fix')}
@@ -35,7 +35,7 @@
 	</div>
 
 	{foreach from=$themeSettings key=feature item=output}
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{formlabel label=$output.label for=$feature}
 			{forminput}
 				{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -44,8 +44,8 @@
 		</div>
 	{/foreach}
 
-	<div class="control-group submit">
-		<input type="submit" class="ink-button" name="change_prefs" value="{tr}Apply Settings{/tr}" />
+	<div class="form-group submit">
+		<input type="submit" class="btn btn-default" name="change_prefs" value="{tr}Apply Settings{/tr}" />
 	</div>
 {/form}
 {/strip}
diff --git a/templates/admin_themes_menus.tpl b/templates/admin_themes_menus.tpl
index 54cbf33..d00fc88 100644
--- a/templates/admin_themes_menus.tpl
+++ b/templates/admin_themes_menus.tpl
@@ -11,7 +11,7 @@
 		
 			{form legend="Menu Settings"}
 				{foreach from=$formMenuSettings key=feature item=output}
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label=$output.label for=$feature}
 						{forminput}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -20,7 +20,7 @@
 					</div>
 				{/foreach}
         	
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Menu Title" for="site_menu_title"}
 					{forminput}
 						<input size="40" type="text" name="site_menu_title" id="site_menu_title" value="{$gBitSystem->getConfig('site_menu_title')|escape}" />
@@ -28,8 +28,8 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="menu_settings" value="{tr}Change preferences{/tr}" />
+				<div class="form-group submit">
+					<input type="submit" class="btn btn-default" name="menu_settings" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/form}
 		{/jstab}
@@ -38,7 +38,7 @@
 			{if $gBitSystem->isFeatureActive( 'site_top_bar_dropdown' )}
 				{form legend="Menu Javascript Settings"}
 					{foreach from=$formMenuJsSettings key=feature item=output}
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label=$output.label for=$feature}
 							{forminput}
 								{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -46,8 +46,8 @@
 							{/forminput}
 						</div>
 					{/foreach}
-					<div class="control-group submit">
-						<input type="submit" class="ink-button" name="menu_js_settings" value="{tr}Change preferences{/tr}" />
+					<div class="form-group submit">
+						<input type="submit" class="btn btn-default" name="menu_js_settings" value="{tr}Change preferences{/tr}" />
 					</div>
 				{/form}
 			{else}
@@ -72,14 +72,14 @@
 					<tfoot>
 						<tr>
 							<td colspan="3">
-								<div class="control-group submit">
-									<input type="submit" class="ink-button" name="update_menus" value="{tr}Update Menus{/tr}" />
+								<div class="form-group submit">
+									<input type="submit" class="btn btn-default" name="update_menus" value="{tr}Update Menus{/tr}" />
 								</div>
 							</td>
 						</tr>
 					</tfoot>
 					<tbody>
-						{foreach from=$gBitSystem->mAppMenu key=pkgName item=menu}
+						{foreach from=$gBitSystem->mAppMenu.bar key=pkgName item=menu}
 							{forminput}
 								<tr>
 									<td title="{tr}Visible?{/tr}">
diff --git a/templates/edit_css.tpl b/templates/edit_css.tpl
index 2d23037..6b03913 100644
--- a/templates/edit_css.tpl
+++ b/templates/edit_css.tpl
@@ -28,12 +28,12 @@ return false;
 	</div>
 	<div style="">
 		<span>  
-			<input type="submit" class="ink-button" name="fSaveCSS" value="Save"> 
-			<input type="submit" class="ink-button" name="fCancelCSS" value="Cancel">
+			<input type="submit" class="btn btn-default" name="fSaveCSS" value="Save"> 
+			<input type="submit" class="btn btn-default" name="fCancelCSS" value="Cancel">
 		</span>
 		<span style="float: right">
 			
-				<input type="submit" class="ink-button" name="fResetCSS" value="Reset CSS" onclick="return confirmform('Are you sure you want to reset your CSS back to the defaults? Any changes you have made will be lost.');">
+				<input type="submit" class="btn btn-default" name="fResetCSS" value="Reset CSS" onclick="return confirmform('Are you sure you want to reset your CSS back to the defaults? Any changes you have made will be lost.');">
 				to the
 				<select name="resetStyle">
 				{section name=ix loop=$styles}
@@ -76,7 +76,7 @@ return false;
 <form enctype="multipart/form-data" method="post" action="{$smarty.const.THEMES_PKG_URL}edit_css.php"
 <input type="hidden" name="MAX_FILE_SIZE" value="1024000">
 Upload Image: <input type="file" name="fImgUpload"> <br /> <br/>
-<input type="submit" class="ink-button" value="Upload Image" name="fUpload">
+<input type="submit" class="btn btn-default" value="Upload Image" name="fUpload">
 </form>
 </div>
 
diff --git a/templates/module_config_inc.tpl b/templates/module_config_inc.tpl
index 803cb99..b7dcc73 100644
--- a/templates/module_config_inc.tpl
+++ b/templates/module_config_inc.tpl
@@ -16,7 +16,7 @@
 {/capture}
 
 {strip}
-<h3>
+<strong>
 	{if !$smarty.request.nocollapse && !$condensed && $gBitThemes->isJavascriptEnabled()}<a href="javascript:BitBase.flipWithSign('id-{$modInfo.module_id}');"><span id="flipperid-{$modInfo.module_id}" class="monospace">[+]</span> {/if}
 		{$modInfo.name}
 		<input type="hidden" name="modules[{$modInfo.module_id}][layout_area]" value="{$area}" />
@@ -24,7 +24,7 @@
 	{if !$smarty.request.nocollapse && !$condensed && $gBitThemes->isJavascriptEnabled()}</a>{/if}
 	<br />
 	{$smarty.capture.shared}
-</h3>
+</strong>
 
 {if !$condensed}
 	{if !$smarty.request.nocollapse && $gBitThemes->isJavascriptEnabled()}<div id="id-{$modInfo.module_id}" style="display:none;">{/if}
diff --git a/templates/module_config_role_inc.tpl b/templates/module_config_role_inc.tpl
index 8db0515..e3d485d 100644
--- a/templates/module_config_role_inc.tpl
+++ b/templates/module_config_role_inc.tpl
@@ -18,7 +18,7 @@
 {/capture}
 
 {strip}
-<h3>
+<strong>
 	{if !$smarty.request.nocollapse && !$condensed && $gBitThemes->isJavascriptEnabled()}<a href="javascript:BitBase.flipWithSign('id-{$modInfo.module_id}');"><span id="flipperid-{$modInfo.module_id}" class="monospace">[+]</span> {/if}
 		{$modInfo.name}
 		<input type="hidden" name="modules[{$modInfo.module_id}][layout_area]" value="{$area}" />
@@ -26,7 +26,7 @@
 	{if !$smarty.request.nocollapse && !$condensed && $gBitThemes->isJavascriptEnabled()}</a>{/if}
 	<br />
 	{$smarty.capture.shared}
-</h3>
+</strong>
 
 {if !$condensed}
 	{if !$smarty.request.nocollapse && $gBitThemes->isJavascriptEnabled()}<div id="id-{$modInfo.module_id}" style="display:none;">{/if}
diff --git a/templates/theme_control.tpl b/templates/theme_control.tpl
index 53b6539..8a7db31 100644
--- a/templates/theme_control.tpl
+++ b/templates/theme_control.tpl
@@ -41,7 +41,7 @@
     </select>
   </td>
   <td>
-    <input type="submit" class="ink-button" name="assigcat" value="{tr}assign{/tr}" />
+    <input type="submit" class="btn btn-default" name="assigcat" value="{tr}assign{/tr}" />
   </td>
 </tr>
 </table>
@@ -54,7 +54,7 @@
    <td>
      <input type="text" name="find" value="{$find|escape}" />
    </td><td>
-     <input type="submit" class="ink-button" value="{tr}find{/tr}" name="search" />
+     <input type="submit" class="btn btn-default" value="{tr}find{/tr}" name="search" />
      <input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
    </td>
 </tr>
@@ -79,7 +79,7 @@
 {sectionelse}
 <tr class="norecords"><td colspan="3">{tr}No records found{/tr}</td></tr>
 {/section}
-<tr><td colspan="3"><input type="submit" class="ink-button" name="delete" value="{tr}Delete{/tr}" /></td></tr>
+<tr><td colspan="3"><input type="submit" class="btn btn-default" name="delete" value="{tr}Delete{/tr}" /></td></tr>
 </table>
 </form>
 
diff --git a/templates/theme_control_objects.tpl b/templates/theme_control_objects.tpl
index ce85911..105fceb 100644
--- a/templates/theme_control_objects.tpl
+++ b/templates/theme_control_objects.tpl
@@ -15,7 +15,7 @@
 </div>
 
 <form id="objform" action="{$smarty.const.THEMES_PKG_URL}theme_control_objects.php" method="post">
-<!--<input type="submit" class="ink-button" name="settype" value="{tr}set{/tr}" />-->
+<!--<input type="submit" class="btn btn-default" name="settype" value="{tr}set{/tr}" />-->
 <table class="panel">
 <tr>
   <th>{tr}Section{/tr}</th>
@@ -52,7 +52,7 @@
     </select>
   </td>
   <td>
-    <input type="submit" class="ink-button" name="assign" value="{tr}assign{/tr}" />
+    <input type="submit" class="btn btn-default" name="assign" value="{tr}assign{/tr}" />
   </td>
 </tr>
 </table>
@@ -64,7 +64,7 @@
    <td>
    <form method="get" action="{$smarty.const.THEMES_PKG_URL}theme_control_objects.php">
      <input type="text" name="find" value="{$find|escape}" />
-     <input type="submit" class="ink-button" value="{tr}find{/tr}" name="search" />
+     <input type="submit" class="btn btn-default" value="{tr}find{/tr}" name="search" />
      <input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
    </form>
    </td>
@@ -94,7 +94,7 @@
 {sectionelse}
 <tr class="norecords"><td colspan="3">{tr}No records found{/tr}</td></tr>
 {/section}
-<tr><td colspan="3"><input type="submit" class="ink-button" name="delete" value="{tr}Delete{/tr}" /></td></tr>
+<tr><td colspan="3"><input type="submit" class="btn btn-default" name="delete" value="{tr}Delete{/tr}" /></td></tr>
 </table>
 </form>
 
diff --git a/templates/theme_control_sections.tpl b/templates/theme_control_sections.tpl
index 5569257..dbf1e8d 100644
--- a/templates/theme_control_sections.tpl
+++ b/templates/theme_control_sections.tpl
@@ -41,7 +41,7 @@
     </select>
   </td>
   <td>
-    <input type="submit" class="ink-button" name="assign" value="{tr}assign{/tr}" />
+    <input type="submit" class="btn btn-default" name="assign" value="{tr}assign{/tr}" />
   </td>
 </tr>
 </table>
@@ -67,7 +67,7 @@
 {sectionelse}
 <tr class="norecords"><td colspan="3">{tr}No records found{/tr}</td></tr>
 {/section}
-<tr><td colspan="3"><input type="submit" class="ink-button" name="delete" value="{tr}Delete{/tr}" /></td></tr>
+<tr><td colspan="3"><input type="submit" class="btn btn-default" name="delete" value="{tr}Delete{/tr}" /></td></tr>
 </table>
 </form>