bootstrap3-css-changes-form-group

32 files changed, 158 insertions, 158 deletions

diff --git a/templates/install_admin_inc.tpl b/templates/install_admin_inc.tpl
index 699a647..78f0bdc 100644
--- a/templates/install_admin_inc.tpl
+++ b/templates/install_admin_inc.tpl
@@ -4,7 +4,7 @@
 {form class="form-horizontal" legend="Please enter administrator information"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
-	<div class="control-group">
+	<div class="form-group">
 		{formfeedback error=$errors.real_name}
 		{formlabel label="Full Name" for="real_name"}
 		{forminput}
@@ -13,7 +13,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formfeedback error=$errors.login}
 		{formlabel label="Admin login" for="login"}
 		{forminput}
@@ -22,7 +22,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formfeedback error=$errors.password}
 		{formlabel label="Password" for="password"}
 		{forminput}
@@ -31,7 +31,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Re-enter password" for="pass_confirm"}
 		{forminput}
 			<input type="password" name="pass_confirm" id="pass_confirm" maxlength="32" value="{$smarty.session.password}" />
@@ -39,7 +39,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formfeedback error=$errors.email}
 		{formlabel label="Email" for="email"}
 		{forminput}
@@ -48,7 +48,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<label class="checkbox">
 				<input type="checkbox" name="testemail" id="testemail" value="y" checked="checked" />
@@ -58,7 +58,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" name="admin_submit" value="Submit Admin Information" />
 		{/forminput}
diff --git a/templates/install_admin_inc_done.tpl b/templates/install_admin_inc_done.tpl
index 9073e3c..e9da3f0 100644
--- a/templates/install_admin_inc_done.tpl
+++ b/templates/install_admin_inc_done.tpl
@@ -23,28 +23,28 @@
 		</div>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Admin name"}
 		{forminput}
 			{$real_name}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Admin login"}
 		{forminput}
 			{$login}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Password"}
 		{forminput}
 			{$pass_disp}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Email"}
 		{forminput}
 			{$email}
@@ -52,7 +52,7 @@
 	</div>
 
 	{if $mail}
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Email transport"}
 			{forminput}
 				{if $mail.warning}
@@ -65,7 +65,7 @@
 		</div>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" value="Continue install process" />
 		{/forminput}
diff --git a/templates/install_beta1_beta2.tpl b/templates/install_beta1_beta2.tpl
index a5f51d0..ad140a4 100644
--- a/templates/install_beta1_beta2.tpl
+++ b/templates/install_beta1_beta2.tpl
@@ -5,12 +5,12 @@
 	{legend legend="Upgrade from Beta 1 to Beta 2"}
 		<input type="hidden" name="step" value="{$next_step}" />
 
-		<p class="control-group">To upgrade CLYDE Beta 1 to CLYDE Beta 2, you need to upgrade your languages package.<br />We know we said we wouldn't make any rash schema changes, but we thought that since languages weren't working anyway, nobody could possibly loose data. We hope that this does not cause too great of a problem and we appologise for messing with the schema.<p>
+		<p class="form-group">To upgrade CLYDE Beta 1 to CLYDE Beta 2, you need to upgrade your languages package.<br />We know we said we wouldn't make any rash schema changes, but we thought that since languages weren't working anyway, nobody could possibly loose data. We hope that this does not cause too great of a problem and we appologise for messing with the schema.<p>
 
 		{foreach from=$schema key=package item=item}
 			{if $item.tables || $item.defaults}
 				{if $package eq 'languages'}
-					<div class="control-group">
+					<div class="form-group">
 						<div class="formlabel">
 							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$item.name}</label>
 						</div>
@@ -26,14 +26,14 @@
 		{/foreach}
 	{/legend}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 			{formhelp note="Display SQL statements."}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			Please press this button only once<br />
 		{/forminput}
diff --git a/templates/install_beta1_beta2_done.tpl b/templates/install_beta1_beta2_done.tpl
index 0f46f14..9f60698 100644
--- a/templates/install_beta1_beta2_done.tpl
+++ b/templates/install_beta1_beta2_done.tpl
@@ -4,13 +4,13 @@
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	{if $failedcommands}
-		<div class="control-group">
+		<div class="form-group">
 			<h3>The following database operations failed</h3>
 			<textarea rows="20" cols="50">{section loop=$failedcommands name=ix}{$failedcommands[ix]}{/section}</textarea>
 			<h4>Some errors occured. Your site may not be ready to run. You can revisit the previous page to rerun the installation.</h4>
 		</div>
 	{else}
-		<div class="control-group">
+		<div class="form-group">
 			<ul class="result">
 				<li class="success">
 					All Database operations completed succesfully
@@ -18,7 +18,7 @@
 			</ul>
 		</div>
 
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Packages that were installed"}
 			{forminput}
 				<ul>
@@ -30,7 +30,7 @@
 		</div>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" value="Continue install process" />
 		{/forminput}
diff --git a/templates/install_bit_settings.tpl b/templates/install_bit_settings.tpl
index 03de98d..4b2af90 100644
--- a/templates/install_bit_settings.tpl
+++ b/templates/install_bit_settings.tpl
@@ -6,7 +6,7 @@
 	<p>Since Bitweaver has so many settings and features, it might be useful to set some of the key settings on this screen already, to simplify the initial stages. These settings can be found later in the administration panel.</p>
 
 	{foreach from=$formInstallToggles key=feature item=output}
-		<div class="control-group">
+		<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}
@@ -15,7 +15,7 @@
 		</div>
 	{/foreach}
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Browser Title" for="site_title"}
 		{forminput}
 			<input size="40" type="text" name="site_title" id="site_title" value="{$gBitSystem->getConfig('site_title')|escape}" />
@@ -23,7 +23,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Site Slogan" for="site_slogan"}
 		{forminput}
 			<input size="40" type="text" name="site_slogan" id="site_slogan" value="{$gBitSystem->getConfig('site_slogan')|escape}" />
@@ -31,7 +31,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Home Page" for="bit_index"}
 		{forminput}
 			<select name="bit_index" id="bit_index">
@@ -59,7 +59,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Site Style" for="site_style"}
 		{forminput}
 			<select name="site_style" id="site_style">
@@ -71,7 +71,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Language" for="language"}
 		{forminput}
 			<select name="bitlanguage" id="bitlanguage">
@@ -84,7 +84,7 @@
 	</div>
 
 	{if $processors}
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Image Processor"}
 			{forminput}
 				{foreach name=iprocs from=$processors key=val item=print}
@@ -94,7 +94,7 @@
 		</div>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" name="bit_settings" value="{tr}Set Preferences{/tr}" />
 		{/forminput}
diff --git a/templates/install_bit_settings_done.tpl b/templates/install_bit_settings_done.tpl
index 75e1291..1775e15 100644
--- a/templates/install_bit_settings_done.tpl
+++ b/templates/install_bit_settings_done.tpl
@@ -3,7 +3,7 @@
 {form class="form-horizontal" legend="Some Preliminary Settings"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
-	<div class="control-group">
+	<div class="form-group">
 		<ul class="result">
 			<li class="success">
 				All setting have been stored successfully
@@ -11,35 +11,35 @@
 		</ul>
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Browser Title"}
 		{forminput}
 			{$gBitSystem->getConfig('site_title')}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Site Slogan"}
 		{forminput}
 			{$gBitSystem->getConfig('site_slogan')}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Home Page"}
 		{forminput}
 			{$gBitSystem->getConfig('bit_index')}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Site Style"}
 		{forminput}
 			{$gBitSystem->getConfig('style')}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Language"}
 		{forminput}
 			{$siteLanguage.full_name}
@@ -47,7 +47,7 @@
 	</div>
 
 	{if $gBitSystem->isFeatureActive('image_processor')}
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Image Processor"}
 			{forminput}
 				{$gBitSystem->getConfig('image_processor')}
@@ -55,7 +55,7 @@
 		</div>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" value="Continue install process" />
 		{/forminput}
diff --git a/templates/install_checks.tpl b/templates/install_checks.tpl
index ea1bd62..b5ea5a7 100644
--- a/templates/install_checks.tpl
+++ b/templates/install_checks.tpl
@@ -9,7 +9,7 @@
 			<h2>Required Settings</h2>
 			<p class="help">The settings below are required by Bitweaver to run. If any of these settings are not met, you will have to change these before you can continue with the installation process.</p>
 
-			<div class="control-group requirements">
+			<div class="form-group requirements">
 				{formlabel label="Basic Requirements"}
 				{forminput}
 					{foreach from=$required item="check"}
@@ -27,7 +27,7 @@
 
 			{if $error}
 				<p class="alert alert-danger">Before you can continue with the installation, you must rectify the <strong>problems listed in red</strong>. After you have made the changes, you can reload the page.</p>
-				<div class="control-group">
+				<div class="form-group">
 		{forminput}
 						<input type="submit" class="btn btn-default" name="reload" value="Reload Page" />
 		{/forminput}
@@ -73,7 +73,7 @@
 			<h2>Recommended Extensions</h2>
 			<p class="help">Bitweaver takes advantage of particular PHP extensions for full functionality. If any of these extensions are not available to Bitweaver, particular features might not work and it might even render particular packages useless.</p>
 
-			<div class="control-group recommended">
+			<div class="form-group recommended">
 				{formlabel label="Thoroughly recommended extensions"}
 				{forminput}
 					{foreach from=$extensions item="check"}
@@ -98,7 +98,7 @@
 			<h2>Recommended PEAR Extensions</h2>
 			<p class="help">PEAR provides extensions to PHP, which can easily be installed and updated using the pear interface on Linux. None of the extenstions below are required, they always provide an alternative to the existing methods available. Often these alternatives are superior to the default methods.</p>
 
-			<div class="control-group recommended">
+			<div class="form-group recommended">
 				{formlabel label="Recommended PEAR Extensions"}
 				{forminput}
 					{if !$pearexts.PEAR.passed}
@@ -168,7 +168,7 @@
 				the easiest and quickest way to achieve a certain goal.
 			</p>
 
-			<div class="control-group recommended">
+			<div class="form-group recommended">
 				{formlabel label="Recommended executables"}
 				{forminput}
 					{foreach from=$executables item="check"}
@@ -205,7 +205,7 @@
 				help you work out problems that might occur.
 			</p>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Settings worth knowing about"}
 				{forminput}
 					<ul>
@@ -220,7 +220,7 @@
 	{/jstabs}
 
 	{if !$error}
-		<div class="control-group">
+		<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" name="reload" value="Reload page" /> <input type="submit" class="btn btn-primary" name="continue" value="Continue install process" />
 		{/forminput}
diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl
index 1f11037..7eb6f86 100644
--- a/templates/install_cleanup.tpl
+++ b/templates/install_cleanup.tpl
@@ -55,14 +55,14 @@
 				</p>
 			{/if}
 
-			<div class="control-group">
+			<div class="form-group">
 				{forminput}
 					<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{forminput}
 					<input type="submit" class="btn btn-default" name="create_tables" value="Try to create missing table/s" />
 				{/forminput}
@@ -158,7 +158,7 @@
 			{foreach from=$serviceList key=service_name item=packages}
 				<h3>{$service_name|capitalize}</h3>
 				{foreach from=$packages key=package item=item}
-					<div class="control-group">
+					<div class="form-group">
 						<div class="formlabel">
 							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 						</div>
@@ -179,20 +179,20 @@
 		{/if}
 
 		{if $delPerms || $insPerms || $serviceList}
-			<div class="control-group">
+			<div class="form-group">
 		{forminput}
 					<input type="submit" class="btn btn-primary" name="resolve_conflicts" value="Resolve Issues" />
 		{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{forminput}
 					<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
 		{else}
-			<div class="control-group">
+			<div class="form-group">
 				{forminput}
 					<input type="submit" class="btn btn-primary" name="skip" value="Continue install process" />
 				{/forminput}
diff --git a/templates/install_cleanup_done.tpl b/templates/install_cleanup_done.tpl
index b2a3b21..5ef3445 100644
--- a/templates/install_cleanup_done.tpl
+++ b/templates/install_cleanup_done.tpl
@@ -8,7 +8,7 @@
 	</p>
 
 	{if $fixedPermissions}
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Updated Permissions"}
 			{forminput}
 				<ul id="fixedpermlist">
@@ -23,7 +23,7 @@
 	{/if}
 
 	{if $deActivated}
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Deactivated Packages"}
 			{forminput}
 				<ul>
@@ -35,7 +35,7 @@
 		</div>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" value="Continue install process" />
 		{/forminput}
diff --git a/templates/install_database.tpl b/templates/install_database.tpl
index ca7b639..fc4c2b9 100644
--- a/templates/install_database.tpl
+++ b/templates/install_database.tpl
@@ -4,7 +4,7 @@
 	<input type="hidden" name="step" value="{$next_step}" />
 	<input type="hidden" name="gBitDbPassword_hash" value="{$gBitDbPassword_hash}" />
 
-	<div class="control-group">
+	<div class="form-group">
 		{if $warning or $error or $success}
 			{if $warning}
 				<p class="alert alert-block">
@@ -44,7 +44,7 @@
 		{/if}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Database type" for="db"}
 		{forminput}
 			{if $section eq 'Upgrade'}
@@ -65,7 +65,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Host" for="host"}
 		{forminput}
 			<input type="text" size="25" name="host" id="host" value="{if $gBitDbHost ne '' }{$gBitDbHost}{/if}" />
@@ -77,7 +77,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="User" for="user"}
 		{forminput}
 			<input type="text" size="25" name="user" id="user" value="{$gBitDbUser}" />
@@ -85,7 +85,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Password" for="pass"}
 		{forminput}
 			<input type="password" size="25" name="pass" id="pass" value="{$gBitDbPassword_input}" />
@@ -93,7 +93,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Database name" for="name"}
 		{forminput}
 			<input type="text" size="25" name="name" id="name" value="{$gBitDbName}" />
@@ -105,7 +105,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 	{if $fbpath}
 		{formhelp note="<strong>Do not use Prefix with Firebird, as the field and table names are already up to 30 characters.</strong>"}
 	{/if}
@@ -117,7 +117,7 @@
 	</div>
 
 	{if $fbpath}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Firebird installation path" for="fbpath"}
 		{forminput}
 			<input type="text" size="50" name="fbpath" id="fbpath" value="{$fbpath}" />
@@ -126,7 +126,7 @@
 	</div>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Site base URL" for="baseurl"}
 		{forminput}
 			<input type="text" size="25" name="baseurl" id="baseurl" value="{$bit_root_url}" />
@@ -135,7 +135,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 		<label class="checkbox">
 			<input type="checkbox" name="auto_bug_submit" id="auto_bug_submit"{if $auto_bug_submit} checked="checked"{/if} />Auto submit bugs
@@ -144,7 +144,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 		<label class="checkbox">
 			<input type="checkbox" name="is_live" id="is_live" />Site is live
@@ -153,7 +153,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" value="Confirm Settings" name="submit_db_info" />
 		{/forminput}
diff --git a/templates/install_database_done.tpl b/templates/install_database_done.tpl
index d6a8379..e718ace 100644
--- a/templates/install_database_done.tpl
+++ b/templates/install_database_done.tpl
@@ -13,7 +13,7 @@
 {form class="form-horizontal" legend="Your database connection information"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
-	<div class="control-group">
+	<div class="form-group">
 		<ul class="result">
 			{if $error}
 				<li class="error">
@@ -27,49 +27,49 @@
 		</ul>
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Database type"}
 		{forminput}
 			{$gBitDbType}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Host"}
 		{forminput}
 			{$gBitDbHost}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="User"}
 		{forminput}
 			{$gBitDbUser}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Password"}
 		{forminput}
 			{$gBitDbPassword_print}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Database name"}
 		{forminput}
 			{$gBitDbName}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Database prefix"}
 		{forminput}
 			{$db_prefix_bit|replace:"`":""}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Site base URL"}
 		{forminput}
 			{$bit_root_url}
@@ -77,7 +77,7 @@
 	</div>
 
 	{if isset( $has_innodb_support )}
-		<div class="control-group">
+		<div class="form-group">
 			{forminput}
 				<label class="checkbox">
 					<input type="checkbox" name="use_innodb" id="use_innodb" {if $has_innodb_support eq 'DEFAULT'}checked="checked"{/if} />Use InnoDB tables
@@ -87,7 +87,7 @@
 		</div>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" value="Continue {$section|default:"install"} process" />
 		{/forminput}
diff --git a/templates/install_database_reset.tpl b/templates/install_database_reset.tpl
index b3f6bd5..12598cf 100644
--- a/templates/install_database_reset.tpl
+++ b/templates/install_database_reset.tpl
@@ -3,24 +3,24 @@
 {form class="form-horizontal" legend="Your database connection information"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
-	<div class="control-group">
+	<div class="form-group">
 		<p>If you don't want to reset or change your installation settings, please press the continue button.</p>
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" name="continue_install" value="Continue {$section|default:"install"} process" />
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		<p>Your database information is stored in the file <kbd>{$smarty.const.BIT_ROOT_PATH}config/kernel/config_inc.php</kbd>. To reset these settings with new ones, delete the settings stored therein before you connect to a different database.</p>
 		<p class="alert alert-block">Before you hit the <strong>Reset config_inc.php file button</strong> please make sure you know what you are doing.</p>
 		<p>Hitting the <strong>Reset</strong> button will delete all contents in the <kbd>config_inc.php</kbd> file which will render your site useless until you've completed the installation process again. This is only really useful if your database access information has changed or if you plan to install Bitweaver to a different database or use a different schema or prefix.</p>
 		<p>If you want to reinstall Bitweaver into the same database as before, make sure you have deleted all Bitweaver related tables before doing so. Reinstalling into an existing database might cause unwanted effects.</p>
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" name="reset_config_inc" value="Reset config_inc.php file" onclick="return confirm( 'Are you absolutely sure you want to reset your configuration file?' );" />
 		{/forminput}
diff --git a/templates/install_datapump.tpl b/templates/install_datapump.tpl
index 49196dc..a242075 100644
--- a/templates/install_datapump.tpl
+++ b/templates/install_datapump.tpl
@@ -12,7 +12,7 @@
 	</p>
 	so? *}
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Packages that can be populated"}
 		{forminput}
 			{foreach from=$pumpList item=file key=package}
@@ -25,7 +25,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			{if $pumpList}
 				<input type="submit" class="btn btn-default" value="Populate my site" name="fSubmitDataPump" /> 
diff --git a/templates/install_datapump_done.tpl b/templates/install_datapump_done.tpl
index b0859e5..e075794 100644
--- a/templates/install_datapump_done.tpl
+++ b/templates/install_datapump_done.tpl
@@ -10,7 +10,7 @@
 
 	<input type="hidden" name="step" value="{$next_step}" />
 
-	<div class="control-group">
+	<div class="form-group">
 		<ul class="result">
 			{if $error}
 				<li class="error">
@@ -31,7 +31,7 @@
 	</div>
 
 	{foreach from=$pumpedData item=pumped key=package}
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label=$package}
 			{forminput}
 				<ul>
@@ -43,7 +43,7 @@
 		</div>
 	{/foreach}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" value="Continue install process" />
 		{/forminput}
diff --git a/templates/install_final_done.tpl b/templates/install_final_done.tpl
index 1398678..812d479 100644
--- a/templates/install_final_done.tpl
+++ b/templates/install_final_done.tpl
@@ -45,7 +45,7 @@
 	<p class="help">Finally, we thank you again for using Bitweaver.</p>
 	<br />
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" value="Enter your Bitweaver site" />
 		{/forminput}
diff --git a/templates/install_login.tpl b/templates/install_login.tpl
index 9984dc6..7026bff 100644
--- a/templates/install_login.tpl
+++ b/templates/install_login.tpl
@@ -3,7 +3,7 @@
 <h1>{$title|default:"You must be logged in as an administrator to run the installer."}</h1>
 
 {form class="form-horizontal" name="login" legend="Please sign in to continue"}
-	<div class="control-group">
+	<div class="form-group">
 		{formfeedback error="$error"}
 		{formlabel label="Username or Email" for="user"}
 		{forminput}
@@ -12,14 +12,14 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Password" for="pass"}
 		{forminput}
 			<input type="password" name="pass" id="pass" size="25" />
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" name="signin" value="{tr}Log in to {$gBitSystem->getConfig('site_title')|default:"this site"}{/tr}" />
 		{/forminput}
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index fd32f33..d534883 100644
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -41,7 +41,7 @@
 
 					<p class="alert alert-block">Be conscientious about installing packages. The more packages you activate, the more computer power you will need. It is easy to install packages at a later date, so we advise initially installing just the packages you need.</p>
 
-					<div class="control-group">
+					<div class="form-group">
 						{forminput}
 							<script type="text/javascript">/* <![CDATA[ */
 								document.write("<label><input name=\"switcher\" id=\"switcher\" type=\"checkbox\" checked onclick=\"BitBase.switchCheckboxes(this.form.id,'packages[]','switcher')\" /> Batch (de)select all Packages and Services on this page</label>");
@@ -51,7 +51,7 @@
 
 					{foreach from=$schema key=package item=item}
 						{if !$item.installed and !$item.required}
-							<div class="control-group">
+							<div class="form-group">
 								<label class="control-label" for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 								{forminput}
 									<label class="checkbox"><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> <strong>{$package|capitalize}</strong></label>
@@ -85,14 +85,14 @@
 						</code><br />
 					</p>
 				{/if}
-				<div class="control-group">
+				<div class="form-group">
 					{forminput}
 						<label class="checkbox"><input type="checkbox" name="debug" value="true" /> Debug mode</label>
 						{formhelp note="Display SQL statements."}
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{forminput}
 						<div class="alert alert-warning">
 							<strong>Please press the install button only once.</strong>
@@ -108,11 +108,11 @@
 			{jstab title="Uninstall/Reinstall"}
 					<input type="hidden" name="step" value="{$next_step}" />
 
-					<div class="control-group">
+					<div class="form-group">
 						<p class="alert alert-block">These packages are already installed on your system. If you select any of these checkboxes, all the data associated with it will be erased (depending on options below).</p>
 					</div>
 
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label="selected packages:"}
 						{forminput}
 							<label><input type="radio" name="method" value="reinstall" checked="checked" /> Reinstall</label>
@@ -122,7 +122,7 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label=""}
 						{forminput}
 							<label class="checkbox"><input type="checkbox" name="remove_actions[]" value="tables" checked="checked" />&nbsp;Delete database tables</label>
@@ -139,7 +139,7 @@
 					{foreach from=$schema key=package item=item}
 						{if $item.tables || $item.defaults}
 							{if $item.installed and !$item.required}
-								<div class="control-group">
+								<div class="form-group">
 									<label class="control-label">
 										<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 									</label>
@@ -154,7 +154,7 @@
 						{/if}
 					{/foreach}
 
-					<div class="control-group">
+					<div class="form-group">
 						{forminput}
 							<input type="submit" class="btn btn-default" name="submit_packages" value="Uninstall/Reinstall Packages" onclick="return confirm( 'Are you sure you want to uninstall/reinstall the selected packages?' );" />
 						{/forminput}
@@ -165,7 +165,7 @@
 						<p> Depending on the number of packages and the hardware, this process might take up to a few minutes.</p>
 					</div>
 
-					<div class="control-group">
+					<div class="form-group">
 						{forminput}
 							<label class="checkbox"><input type="checkbox" name="debug" value="true" /> Debug mode</label>
 							{formhelp note="Display SQL statements."}
@@ -177,14 +177,14 @@
 		{jstab title="Required"}
 			{legend legend="Packages and services required by Bitweaver"}
 				{if !$first_install}
-					<div class="control-group">
+					<div class="form-group">
 						<p class="alert alert-block">To reset the entire system, first create a new database (or empty the existing database manually).</p>
 					</div>
 				{/if}
 
 				{foreach from=$schema key=package item=item}
 					{if $item.required}
-						<div class="control-group">
+						<div class="form-group">
 							<label class="control-label">
 								{biticon ipackage=$package iname="pkg_$package" iexplain=$package}
 							</label>
@@ -203,7 +203,7 @@
 
 	{if !$first_install}
 			<input type="hidden" name="step" value="{$next_step}" />
-			<div class="control-group">
+			<div class="form-group">
 				{forminput}
 					<input type="submit" class="btn btn-default" name="cancel" value="Skip this stage" />
 				{/forminput}
diff --git a/templates/install_packages_done.tpl b/templates/install_packages_done.tpl
index 64048df..8779434 100644
--- a/templates/install_packages_done.tpl
+++ b/templates/install_packages_done.tpl
@@ -45,7 +45,7 @@
 		{/if}
 
 		{if $packageList.uninstall}
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Packages that were uninstalled"}
 				{forminput}
 					<ul>
@@ -60,7 +60,7 @@
 		{/if}
 
 		{if $packageList.reinstall}
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Packages that were reinstalled"}
 				{forminput}
 					<ul>
@@ -75,7 +75,7 @@
 		{/if}
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" value="Continue install process" />
 		{/forminput}
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index 07fbbee..cd5ae3a 100644
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -152,14 +152,14 @@
 				{/if}
 			{/if}
 
-			<div class="control-group">
+			<div class="form-group">
 				{forminput}
 					<label class="checkbox"><input type="checkbox" name="debug" value="true" /> Debug mode</label>
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{forminput}
 					<input type="submit" class="btn btn-primary" name="upgrade_packages" value="Upgrade Packages" />
 				{/forminput}
@@ -171,7 +171,7 @@
 		{legend legend="Already Installed Packages"}
 			{foreach from=$schema key=package item=item}
 				{if $item.installed}
-					<div class="control-group">
+					<div class="form-group">
 						<div class="formlabel">
 							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 						</div>
diff --git a/templates/install_upgrade_done.tpl b/templates/install_upgrade_done.tpl
index 5faffb9..5016c22 100644
--- a/templates/install_upgrade_done.tpl
+++ b/templates/install_upgrade_done.tpl
@@ -17,7 +17,7 @@
 		{/foreach}
 	</dl>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" name="continue" value="Continue Install Process" />
 		{/forminput}
diff --git a/templates/install_version.tpl b/templates/install_version.tpl
index c617f5c..b59d9a6 100644
--- a/templates/install_version.tpl
+++ b/templates/install_version.tpl
@@ -71,27 +71,27 @@
 				{/foreach}
 			</table>
 
-			<div class="control-group">
+			<div class="form-group">
 				{forminput}
 					<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{forminput}
 					<input type="submit" class="btn btn-default" name="fix_version_210beta" value="Fix Permissions" />
 				{/forminput}
 			</div>
 		{else}
 			{if $upToDate}
-				<div class="control-group">
+				<div class="form-group">
 		{forminput}
 						<input type="submit" class="btn btn-primary" name="skip" value="Continue install process" />
 		{/forminput}
 				</div>
 			{else}
-				<div class="control-group">
+				<div class="form-group">
 		{forminput}
 						<input type="submit" class="btn btn-default" name="update_version" value="Update version and continue" />
 		{/forminput}
diff --git a/templates/install_version_done.tpl b/templates/install_version_done.tpl
index e8ae9d6..262b6d0 100644
--- a/templates/install_version_done.tpl
+++ b/templates/install_version_done.tpl
@@ -13,7 +13,7 @@
 		</p>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-primary" value="Continue install process" />
 		{/forminput}
diff --git a/templates/install_welcome.tpl b/templates/install_welcome.tpl
index ba0d361..915465f 100644
--- a/templates/install_welcome.tpl
+++ b/templates/install_welcome.tpl
@@ -11,7 +11,7 @@
 
 		{form class="" id="install_welcome"}
 
-		<div class="control-group">
+		<div class="form-group">
 			{forminput}
 				{if $gBitUser->isAdmin()}
 					<a class="btn btn-default" href="{$smart.const.INSTALL_PKG_URL}?step=4">Upgrade</a> <a class="btn" href="{$smart.const.INSTALL_PKG_URL}?step=3">Install Packages</a>
diff --git a/templates/migrate_database.tpl b/templates/migrate_database.tpl
index bc15e7b..a3df19a 100644
--- a/templates/migrate_database.tpl
+++ b/templates/migrate_database.tpl
@@ -6,7 +6,7 @@
 	{jstabs}
 		{jstab title="Source Database"}
 			{legend legend="Source Database Information"}
-				<div class="control-group">
+				<div class="form-group">
 					{if $error_src}
 						<ul class="result">
 							<li class="error">
@@ -28,7 +28,7 @@
 					{/if}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Source database type" for="db_src"}
 					{forminput}
 						{if $dbservers}
@@ -41,7 +41,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Source host" for="host_src"}
 					{forminput}
 						<input type="text" size="25" name="host_src" id="host_src" value="{if $host_src ne '' }{$host_src}{/if}" />
@@ -53,7 +53,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Source user" for="user_src"}
 					{forminput}
 						<input type="text" size="25" name="user_src" id="user_src" value="{$user_src}" />
@@ -61,7 +61,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Source Password" for="pass_src"}
 					{forminput}
 						<input type="password" size="25" name="pass_src" id="pass_src" value="{$pass_src}" />
@@ -69,7 +69,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Source database name" for="name_src"}
 					{forminput}
 						<input type="text" size="25" name="name_src" id="name_src" value="{$name_src}" />
@@ -87,7 +87,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 				{ if ( $fbpath ) }
 					{formhelp note="<strong>Do not use prefix with Firebird, as the field and table names are already up to 30 characters.</strong>"}
 				{/if}
@@ -103,7 +103,7 @@
 				</div>
 
 				{ if ( $fbpath ) }
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Firebird Installation Path" for="fbpath"}
 					{forminput}
 						<input type="text" size="50" name="fbpath" id="fbpath" value="{$fbpath}" />
@@ -118,7 +118,7 @@
 
 		{jstab title="Destination Database"}
 			{legend legend="Destination Database Information"}
-				<div class="control-group">
+				<div class="form-group">
 					{if $error_dst}
 						<li class="error">
 							Database connection could not be established.
@@ -139,7 +139,7 @@
 					{/if}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Destination Database type" for="db_dst"}
 					{forminput}
 						{if $dbservers}
@@ -152,7 +152,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Destination Host" for="host_dst"}
 					{forminput}
 						<input type="text" size="25" name="host_dst" id="host_dst" value="{if $gBitDbHost ne '' }{$gBitDbHost}{/if}" />
@@ -164,7 +164,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Destination user" for="user_dst"}
 					{forminput}
 						<input type="text" size="25" name="user_dst" id="user_dst" value="{$gBitDbUser}" />
@@ -172,7 +172,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Destination password" for="pass_dst"}
 					{forminput}
 						<input type="password" size="25" name="pass_dst" id="pass_dst" value="{$gBitDbPassword_input}" />
@@ -180,7 +180,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Destination database name" for="name_dst"}
 					{forminput}
 						<input type="text" size="25" name="name_dst" id="name_dst" value="{$gBitDbName}" />
@@ -198,7 +198,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 				{ if ( $fbpath ) }
 					{formhelp note="<strong>Do not use prefix with Firebird, as the field and table names are already up to 30 characters.</strong>"}
 				{/if}
@@ -214,7 +214,7 @@
 				</div>
 
 				{ if ( $fbpath ) }
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Firebird installation path" for="fbpath"}
 					{forminput}
 						<input type="text" size="50" name="fbpath" id="fbpath" value="{$fbpath}" />
@@ -225,7 +225,7 @@
 				</div>
 				{/if}
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Site Base URL" for="baseurl"}
 					{forminput}
 						<input type="text" size="25" name="baseurl" id="baseurl" value="{$bit_root_url}" />
@@ -233,7 +233,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					<label class="checkbox">
 						<input type="checkbox" name="auto_bug_submit" id="auto_bug_submit"{if $auto_bug_submit} checked="checked"{/if} />Automatically submit bugs
 						{formhelp note="Checking this box will automatically submit fatal database errors to the Bitweaver team. If you are running a live site, we recommend you check this box, as it will also avoid horrible error messages from appearing in such cases."}
@@ -244,7 +244,7 @@
 
 		{jstab title="Options"}
 			{legend legend="Migration options"}
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Tables to be skipped" for="skip_tables"}
 					{forminput}
 						<select name="skip_tables[]" id="skip_tables" multiple="multiple" size="10">
@@ -262,28 +262,28 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					<label class="checkbox">
 						<input type="checkbox" name="empty_tables" id="empty_tables"{if $empty_tables} checked="checked"{/if} />DROP tables
 						{formhelp note="Checking this box DROP's tables before new data is migrated"}
 					</label>
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					<label class="checkbox">
 						<input type="checkbox" name="convert_blobs" id="convert_blobs"{if $convert_blobs} checked="checked"{/if} />Convert Blobs
 						{formhelp note="Checking this box converts blobs from a MySQL type blob to a PgSQL encoded blob."}
 					</label>
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{forminput}
 						<label class="checkbox"><input type="checkbox" name="debug" id="debug"{if $debug} checked="checked"{/if} /> Debug mode</label>
 						{formhelp note="Display SQL statements."}
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					<label class="checkbox">
 						<input type="checkbox" name="stop_on_errors" id="stop_on_errors"{if $stop_on_errors} checked="checked"{/if} />Stop on Errors
 						{formhelp note="Checking this box will cause the script to stop on the first error."}
@@ -293,7 +293,7 @@
 		{/jstab}
 	{/jstabs}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" value="Execute Migration" name="fSubmitDatabase" />
 		{/forminput}
diff --git a/templates/migrate_database_done.tpl b/templates/migrate_database_done.tpl
index 832f968..d66f733 100644
--- a/templates/migrate_database_done.tpl
+++ b/templates/migrate_database_done.tpl
@@ -3,12 +3,12 @@
 {form class="form-horizontal" legend="Select what you want to do next"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Migation Results"}
 		{formfeedback hash=$results}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		<ul class="result">
 			{if $error}
 				<li class="error">
@@ -18,7 +18,7 @@
 		</ul>
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" value="Continue process" />
 		{/forminput}
diff --git a/templates/migrate_final_done.tpl b/templates/migrate_final_done.tpl
index a5bb2e9..e0179b1 100644
--- a/templates/migrate_final_done.tpl
+++ b/templates/migrate_final_done.tpl
@@ -1,7 +1,7 @@
 <h1>Upgrade Process Completed</h1>
 {form legend="Select what you want to do next"}
 	<p>Go back to the installer to install additional packages that were not part of this migrate.</p>
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="hidden" name="step" value="{$next_step}" />
 		{/forminput}
@@ -11,7 +11,7 @@
 	<hr />
 
 	<p>Enter your Bitweaver site now to see if the migrate process was successful.</p>
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" name="enter_bitweaver" value="Enter site" />
 		{/forminput}
diff --git a/templates/migrate_welcome.tpl b/templates/migrate_welcome.tpl
index 7dd77fd..0a99d3e 100644
--- a/templates/migrate_welcome.tpl
+++ b/templates/migrate_welcome.tpl
@@ -13,7 +13,7 @@
 
 	<strong>{formfeedback warning=$dbWarning}</strong>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the migrate process!"}" />
 		{/forminput}
diff --git a/templates/upgrade_final_done.tpl b/templates/upgrade_final_done.tpl
index 3a33991..e5f20de 100644
--- a/templates/upgrade_final_done.tpl
+++ b/templates/upgrade_final_done.tpl
@@ -7,7 +7,7 @@
 		additional packages, your system will automatically be analysed for
 		potential problems.
 	</p>
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="hidden" name="step" value="{$next_step}" />
 		{/forminput}
@@ -23,7 +23,7 @@
 		try to <strong>resolve conflicts</strong>. This option is recommended. It will
 		inform you of the health of your install.
 	</p>
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" name="resolve_conflicts" value="Resolve Conflicts" />
 		{/forminput}
@@ -36,7 +36,7 @@
 		Bitweaver now. You can return to the installer at any time to
 		resolve potential issues and insert missing permissions and settings.
 	</p>
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" name="enter_bitweaver" value="Enter Bitweaver" />
 		{/forminput}
diff --git a/templates/upgrade_packages.tpl b/templates/upgrade_packages.tpl
index 167259e..065e52f 100644
--- a/templates/upgrade_packages.tpl
+++ b/templates/upgrade_packages.tpl
@@ -3,7 +3,7 @@
 {form class="form-horizontal" legend="Begin the upgrade process"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Upgrade application" for="db"}
 		{forminput}
 			{if $smarty.session.upgrade_r1}
@@ -36,14 +36,14 @@
 		</ul>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 			{formhelp note="Display SQL statements."}
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" name="upgrade" value="Upgrade Packages" />
 		{/forminput}
diff --git a/templates/upgrade_packages_done.tpl b/templates/upgrade_packages_done.tpl
index af3cc85..4384350 100644
--- a/templates/upgrade_packages_done.tpl
+++ b/templates/upgrade_packages_done.tpl
@@ -4,13 +4,13 @@
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	{if $failedcommands}
-		<div class="control-group">
+		<div class="form-group">
 			<h3>The following database operations failed</h3>
 			<textarea rows="20" cols="50">{section loop=$failedcommands name=ix}{$failedcommands[ix]}{/section}</textarea>
 			<h4>Some errors occured. Your site may not be ready to run. You can revisit the previous page to rerun the installation.</h4>
 		</div>
 	{else}
-		<div class="control-group">
+		<div class="form-group">
 			<ul class="result">
 				<li class="success">
 					All Database operations completed succesfully
@@ -18,7 +18,7 @@
 			</ul>
 		</div>
 
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Packages that were upgraded"}
 			{forminput}
 				<ul>
@@ -30,7 +30,7 @@
 		</div>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" value="Continue upgrade process" />
 		{/forminput}
diff --git a/templates/upgrade_ready.tpl b/templates/upgrade_ready.tpl
index 71d982a..0eacc30 100644
--- a/templates/upgrade_ready.tpl
+++ b/templates/upgrade_ready.tpl
@@ -9,7 +9,7 @@
 		{/foreach}
 	</ol>
 
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Upgrade Application" for="db"}
 		{forminput}
 			<select name="upgrade_from">
@@ -21,14 +21,14 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 		{/forminput}
 		{formhelp note="Display SQL statements."}
 	</div>
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" name="upgrade" value="Upgrade Packages" />
 		{/forminput}
diff --git a/templates/upgrade_welcome.tpl b/templates/upgrade_welcome.tpl
index 14e3102..dd2e037 100644
--- a/templates/upgrade_welcome.tpl
+++ b/templates/upgrade_welcome.tpl
@@ -56,7 +56,7 @@
 		</p>
 	{/if}
 
-	<div class="control-group">
+	<div class="form-group">
 		{forminput}
 			<input type="submit" class="btn btn-default" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the upgrade process!"}" />
 		{/forminput}