bootstrap major purging

52 files changed, 150 insertions, 215 deletions

diff --git a/style/images/bg_body.png b/css/images/bg_body.png
index 0113235..0113235 100644
--- a/style/images/bg_body.png
+++ b/css/images/bg_body.png
diff --git a/style/images/bg_content.png b/css/images/bg_content.png
index 7799e29..7799e29 100644
--- a/style/images/bg_content.png
+++ b/css/images/bg_content.png
diff --git a/style/images/bg_header.png b/css/images/bg_header.png
index 6afed6a..6afed6a 100644
--- a/style/images/bg_header.png
+++ b/css/images/bg_header.png
diff --git a/style/images/bg_header_logo-trans.png b/css/images/bg_header_logo-trans.png
index f0f8477..f0f8477 100644
--- a/style/images/bg_header_logo-trans.png
+++ b/css/images/bg_header_logo-trans.png
diff --git a/style/images/bitweaver_logo-trans.png b/css/images/bitweaver_logo-trans.png
index 4029bff..4029bff 100644
--- a/style/images/bitweaver_logo-trans.png
+++ b/css/images/bitweaver_logo-trans.png
diff --git a/style/images/danger-trans.png b/css/images/danger-trans.png
index 9b5d608..9b5d608 100644
--- a/style/images/danger-trans.png
+++ b/css/images/danger-trans.png
diff --git a/style/images/dialog-error-trans.png b/css/images/dialog-error-trans.png
index 3bbbb4a..3bbbb4a 100644
--- a/style/images/dialog-error-trans.png
+++ b/css/images/dialog-error-trans.png
diff --git a/style/images/dialog-ok-trans.png b/css/images/dialog-ok-trans.png
index 3a6e9e1..3a6e9e1 100644
--- a/style/images/dialog-ok-trans.png
+++ b/css/images/dialog-ok-trans.png
diff --git a/style/images/dialog-warning-trans.png b/css/images/dialog-warning-trans.png
index a9e4ff3..a9e4ff3 100644
--- a/style/images/dialog-warning-trans.png
+++ b/css/images/dialog-warning-trans.png
diff --git a/style/images/external.gif b/css/images/external.gif
index 899654e..899654e 100644
--- a/style/images/external.gif
+++ b/css/images/external.gif
diff --git a/style/images/favicon.ico b/css/images/favicon.ico
index f84fe26..f84fe26 100644
--- a/style/images/favicon.ico
+++ b/css/images/favicon.ico
diff --git a/style/images/go-down-trans.png b/css/images/go-down-trans.png
index 3dd7fcc..3dd7fcc 100644
--- a/style/images/go-down-trans.png
+++ b/css/images/go-down-trans.png
diff --git a/style/images/media-playback-start-trans.png b/css/images/media-playback-start-trans.png
index a7de0fe..a7de0fe 100644
--- a/style/images/media-playback-start-trans.png
+++ b/css/images/media-playback-start-trans.png
diff --git a/style/images/software-update-available-trans.png b/css/images/software-update-available-trans.png
index ab8d494..ab8d494 100644
--- a/style/images/software-update-available-trans.png
+++ b/css/images/software-update-available-trans.png
diff --git a/style/images/start-here-trans.png b/css/images/start-here-trans.png
index bd516a5..bd516a5 100644
--- a/style/images/start-here-trans.png
+++ b/css/images/start-here-trans.png
diff --git a/style/images/tab_shade.png b/css/images/tab_shade.png
index 2495206..2495206 100644
--- a/style/images/tab_shade.png
+++ b/css/images/tab_shade.png
diff --git a/style/install.css b/css/install.css
index e386d57..f5662b3 100644
--- a/style/install.css
+++ b/css/install.css
@@ -25,10 +25,8 @@ a#bitweaver_logo em	{display:none}
 #footer a:hover	{color:#00f;border-bottom:1px solid #ddd;text-decoration:none}
 
 /* navigation, progress */
-#navigation	{clear:both;margin:0 auto;max-width:785px}
-div.progressbar	{padding:0 4px 5px 4px;font-weight:bold;background:#ffe339}
 div.progressbar em	{font-style:normal;display:block;width:123px;float:left;padding-left:1em}
-div.progressbar div.bar	{background:#fdf9ea;margin-left:133px}
+div.progressbar div.bar	{margin-left:133px}
 div.progressbar div.progress	{background:#e0ffb0;text-align:center;border:1px solid white}
 div.progressbar div.progress100	{background:#8de817}
 div.progressbar div.progress0	{background:#fdf9ea;width:3em !important}
@@ -108,26 +106,8 @@ legend	{background:transparent;padding:1em 1em 1em 0}
 .odd	{background:#f4f4f3;color:#000}
 .even	{color:#000}
 
-.forminput	{margin-left:26%}
-.forminput p	{margin:0.5em 0}
-.formhelp	{color:#666;font-size:11px;cursor:help;line-height:16px}
-.submit	{text-align:center;margin:10px 0 2em 0}
 
 
-
-
-/* feedback */
-.error,
-.warning,
-.success,
-.note,
-.help	{padding:0.5em;background:transparent url(images/favicon.ico) no-repeat 8px 10px;border:3px double #fff;text-indent:24px;list-style-type:none}
-
-.error	{background-color:#ffdddd;background-image:url(images/dialog-error-trans.png);border:1px solid #900;margin:1em}
-.warning	{background-color:#ffe1c3;background-image:url(images/dialog-warning-trans.png)}
-.success	{background-color:#e0ffb0;background-image:url(images/dialog-ok-trans.png)}
-.help	{background-color:#e7e7e6}
-
 .danger	{padding:0.5em;background:#ffdddd url(images/danger-trans.png) no-repeat 16px center;border:3px solid #a00;padding:1em 1em 1em 160px;min-height:100px}
 
 .formfeedback ul	{padding:0;margin:0}
@@ -146,13 +126,6 @@ dd	{padding:0;margin:-1.3em 0 0.5em 32%}
 
 
 
-/* navigation and status */
-#navigation ul, #navigation li	{padding:0;margin:0;list-style:none}
-#navigation li,
-#navigation ul.result li	{border-bottom:1px solid #e7e7e6;padding:3px 0 3px 7px}
-#navigation ul.result li li	{border:0;list-style:circle}
-
-
 
 
 /* tabs */
@@ -206,14 +179,6 @@ table#requirements tr.success	{background-color:transparent}
 ul#fixedpermlist,ul#fixedpermlist li	{list-style-type:none}
 
 
-/* trash */
-div.progressbar	{-moz-border-radius:0 0 .75em .75em;-webkit-border-radius:0 0 .75em .75em;border-radius:0 0 .75em .75em}
-div.progressbar div.bar	{-moz-border-radius:0 0 .6em 0;-webkit-border-radius:0 0 .6em 0;border-radius:0 0 0.6em 0}
-div.progressbar div.progress100	{-moz-border-radius:0 0 .5em 0;-webkit-border-radius:0 0 .5em 0;border-radius:0 0 0.5em 0}
-#stepmenu	{-moz-border-radius:.4em .4em 0 0;-webkit-border-radius:.4em .4em 0 0;border-radius:.4em .4em 0 0}
-#install_welcome div.row.submit strong,
-.danger	{-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em}
-
 
 
 
diff --git a/install_inc.php b/install_inc.php
index 74acd9f..74e1cf2 100644
--- a/install_inc.php
+++ b/install_inc.php
@@ -17,8 +17,8 @@ function set_menu( $pInstallFiles, $pStep ) {
 
 	// here we set up the menu
 	for( $done = 0; $done < $pStep; $done++ ) {
-		$pInstallFiles[$done]['state'] = 'success';
-		$pInstallFiles[$done]['icon'] = 'dialog-ok';
+		$pInstallFiles[$done]['state'] = 'complete';
+		$pInstallFiles[$done]['icon'] = 'icon-ok';
 	}
 
 	// if the page is done, we can display the menu item as done and increase the progress bar
@@ -29,8 +29,8 @@ function set_menu( $pInstallFiles, $pStep ) {
 		$pInstallFiles[$pStep]['state'] = 'warning';
 		$pInstallFiles[$pStep]['icon'] = 'dialog-warning';
 	} elseif( $app == "_done" ) {
-		$pInstallFiles[$pStep]['state'] = 'success';
-		$pInstallFiles[$pStep]['icon'] = 'dialog-ok';
+		$pInstallFiles[$pStep]['state'] = 'complete';
+		$pInstallFiles[$pStep]['icon'] = 'icon-ok';
 		$done++;
 	} else {
 		$pInstallFiles[$pStep]['state'] = 'current';
@@ -40,8 +40,8 @@ function set_menu( $pInstallFiles, $pStep ) {
 	foreach( $pInstallFiles as $key => $menu_step ) {
 		if( !isset( $menu_step['state'] ) ) {
 			if( !empty( $gBitDbType ) && $gBitUser->isAdmin() && !$_SESSION['first_install'] ) {
-				$pInstallFiles[$key]['state'] = 'success';
-				$pInstallFiles[$key]['icon'] = 'dialog-ok';
+				$pInstallFiles[$key]['state'] = 'complete';
+				$pInstallFiles[$key]['icon'] = 'icon-ok';
 			} else {
 				$pInstallFiles[$key]['state'] = 'uncompleted';
 				$pInstallFiles[$key]['icon'] = 'spacer';
diff --git a/templates/install.tpl b/templates/install.tpl
index b683dd3..afabd15 100644
--- a/templates/install.tpl
+++ b/templates/install.tpl
@@ -8,7 +8,8 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<style type="text/css">
 		{* hidden from 4.x browsers: *}
-		@import "{$smarty.const.INSTALL_PKG_URL}style/install.css";
+		@import "{$smarty.const.CONFIG_PKG_URL}themes/bootstrap/bootstrap.css";
+		@import "{$smarty.const.INSTALL_PKG_URL}css/install.css";
 	</style>
 	<title>Install Bitweaver - {$browserTitle}</title>
 	<link rel="shortcut icon" href="{$smarty.const.INSTALL_PKG_URL}favicon.ico" type="image/x-icon" />
@@ -20,7 +21,8 @@
 		var bitIconDir = "{$smarty.const.LIBERTY_PKG_URL}icons/";
 		var bitRootUrl = "{$smarty.const.BIT_ROOT_URL}";
 	/* ]]> */</script>
-	<script type="text/javascript" src="{$smarty.const.BIT_ROOT_URL}util/javascript/libs/tabpane.js"></script>
+	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="{$smarty.const.CONFIG_PKG_URL}themes/bootstrap/js/bootstrap.js"></script>
 	<script type="text/javascript" src="{$smarty.const.BIT_ROOT_URL}util/javascript/bitweaver.js"></script>
 	{* if $gBrowserInfo.browser eq 'ie'}
 		<!--[if lt IE 7]>
@@ -29,80 +31,48 @@
 	{/if *}
 </head>
 <body id="step{$smarty.request.step}">
-	<div id="container">
-		<div id="header">
-			{*
-			<a href="http://www.bitweaver.org/" title="bitweaver.org" id="bitweaver_logo">
-				<em>bitweaver.org</em>
-			</a>
-			*}
-			<h1 id="title">
-				<strong>Bitweaver {$gBitSystem->getBitVersion()}</strong>
-				&nbsp;
-				<em>{$section|default:"Install"}</em>
-			</h1>
-			<div class="bittop">
-				<ul id="stepmenu">
+	<header class="container">
+		<div class="navbar">
+			<div  style="margin:10px;overflow:visible;">
+				<div class="brand">Install Bitweaver {$gBitSystem->getBitVersion()} </div>
+				<nav class="pull-right width60p" style="padding:10px 20px 0 0;">
+				<div class="pull-right">
+					<a href="http://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc"><i class="icon-question-sign"></i> Help</a>
+				</div>
+					<div class="progressbar">
+						<em>{$section|default:"Install"} Progress</em>
+						<div class="bar">
+							<div class="progress progress{$progress}" style="width:{$progress|default:0}%;"><strong>{$progress}%</strong></div>
+						</div>
+						<span class="clear"><!-- --></span>
+					</div>
+				</nav>
+			</div>
+			<div class="navbar-inner">
+				<ul class="nav">
 					{foreach from=$menu_steps item=step key=key}
-						<li class="{$step.state}">
-							{if $step.state ne 'uncompleted'}
-								<a href="{$menu_path|default:$smarty.const.INSTALL_PKG_URL}{$menu_file|default:"install.php"}?step={$key}">
-							{/if}
-							{$step.name}
-							{if $step.state ne 'uncompleted'}
-								</a>
-							{/if}
+						<li class="{if $smarty.request.step == $key}active{/if}">
+							<a href="{$menu_path|default:$smarty.const.INSTALL_PKG_URL}{$menu_file|default:"install.php"}?step={$key}" {if $step.state eq 'uncompleted'}onclick="return false;"{/if}>
+							{if $step.icon}<i class="{$step.icon}"></i> {/if} {$step.name}
+							</a>
 						</li>
 					{/foreach}
 				</ul>
 			</div>
 		</div>
+	</header>
 
-		<div id="wrapper">
-			<div id="content">
-				{include file=$install_file}
-			</div>
-		</div>
-
-		<div id="navigation">
-			<div class="progressbar">
-				<em>{$section|default:"Install"} Progress</em>
-				<div class="bar">
-					<div class="progress progress{$progress}" style="width:{$progress|default:0}%;"><strong>{$progress}%</strong></div>
-				</div>
-				<span class="clear"><!-- --></span>
-			</div>
-		</div>
-
-		<div id="extra">
-			<ul>
-				<li class="help">
-					<a class="external" href="http://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc">{$section|default:"Install"} Help</a>
-				</li>
-				<li class="help">
-					<a href="{$smarty.const.INSTALL_PKG_URL}{$menu_file|default:"install.php"}?step=0">Start over</a>
-				</li>
-				{if $section}
-					<li class="help">
-						<a href="{$smarty.const.INSTALL_PKG_URL}install.php?step=2">Return to Installer</a>
-					</li>
-				{/if}
-				<li class="warning" title="Please don't use your browser's back button during this install process.">
-					Please don't use the browser back button
-				</li>
-			</ul>
-		</div>
-
-		<div id="footer">
-			<p>
-				<a href="http://bitweaver.org">
-					Bitweaver.&nbsp;&nbsp;It's the one
-					<br />
-					www.bitweaver.org
-				</a>
-			</p>
-		</div>
+	<div class="container">
+		<section class="row maincontent">
+			{include file=$install_file}
+		<section>
 	</div>
+
+	<footer class="container aligncenter">
+		<a href="http://bitweaver.org">
+			www.bitweaver.org
+		</a>
+	</footer>
 </body>
 </html>
 {/strip}
diff --git a/templates/install_admin_inc.tpl b/templates/install_admin_inc.tpl
index 8d1c46b..f3cdc27 100644
--- a/templates/install_admin_inc.tpl
+++ b/templates/install_admin_inc.tpl
@@ -1,7 +1,7 @@
 <h1>Administrator Setup</h1>
 
 {strip}
-{form legend="Please enter administrator information"}
+{form class="form-horizontal" legend="Please enter administrator information"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<div class="control-group">
@@ -57,7 +57,7 @@
 	</div>
 
 	<div class="control-group submit">
-		<input type="submit" name="admin_submit" value="Submit Admin Information" />
+		<input type="submit" class="btn" name="admin_submit" value="Submit Admin Information" />
 	</div>
 {/form}
 {/strip}
diff --git a/templates/install_admin_inc_done.tpl b/templates/install_admin_inc_done.tpl
index 3a4886c..82319cd 100644
--- a/templates/install_admin_inc_done.tpl
+++ b/templates/install_admin_inc_done.tpl
@@ -2,7 +2,7 @@
 
 <h1>Administrator Information</h1>
 
-{form legend="Administrator Information"}
+{form class="form-horizontal" legend="Administrator Information"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<div class="control-group">
@@ -67,7 +67,7 @@
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" value="Continue install process" />
+		<input type="submit" class="btn" value="Continue install process" />
 	</div>
 {/form}
 
diff --git a/templates/install_beta1_beta2.tpl b/templates/install_beta1_beta2.tpl
index 689d0bb..f19a551 100644
--- a/templates/install_beta1_beta2.tpl
+++ b/templates/install_beta1_beta2.tpl
@@ -31,7 +31,7 @@
 		Depending on the number of packages and the hardware,<br />
 		this process might take up to a few minutes.<br /><br />
 		<input type="hidden" name="resetdb" value="{$resetdb}" />
-		<input type="submit" name="fSubmitDbCreate" value="Install Packages" />
+		<input type="submit" class="btn" name="fSubmitDbCreate" value="Install Packages" />
 	</div>
 
 	<div class="control-group">
diff --git a/templates/install_beta1_beta2_done.tpl b/templates/install_beta1_beta2_done.tpl
index 499a425..cfba23a 100644
--- a/templates/install_beta1_beta2_done.tpl
+++ b/templates/install_beta1_beta2_done.tpl
@@ -1,6 +1,6 @@
 <h1>Upgrade from Beta 1 to Beta 2</h1>
 
-{form legend="Installed Packages"}
+{form class="form-horizontal" legend="Installed Packages"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	{if $failedcommands}
@@ -31,6 +31,6 @@
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" value="Continue install process" />
+		<input type="submit" class="btn" value="Continue install process" />
 	</div>
 {/form}
diff --git a/templates/install_bit_settings.tpl b/templates/install_bit_settings.tpl
index 9bf37cd..0fc660d 100644
--- a/templates/install_bit_settings.tpl
+++ b/templates/install_bit_settings.tpl
@@ -1,6 +1,6 @@
 <h1>Bitweaver Settings</h1>
 
-{form legend="Some Preliminary Settings"}
+{form class="form-horizontal" legend="Some Preliminary Settings"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<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>
@@ -95,6 +95,6 @@
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" name="bit_settings" value="{tr}Set Preferences{/tr}" />
+		<input type="submit" class="btn" name="bit_settings" value="{tr}Set Preferences{/tr}" />
 	</div>
 {/form}
diff --git a/templates/install_bit_settings_done.tpl b/templates/install_bit_settings_done.tpl
index 9492efb..22d5a6b 100644
--- a/templates/install_bit_settings_done.tpl
+++ b/templates/install_bit_settings_done.tpl
@@ -1,6 +1,6 @@
 <h1>Bitweaver Settings</h1>
 
-{form legend="Some Preliminary Settings"}
+{form class="form-horizontal" legend="Some Preliminary Settings"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<div class="control-group">
@@ -56,6 +56,6 @@
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" value="Continue install process" />
+		<input type="submit" class="btn" value="Continue install process" />
 	</div>
 {/form}
diff --git a/templates/install_checks.tpl b/templates/install_checks.tpl
index c389611..8cb2bf3 100644
--- a/templates/install_checks.tpl
+++ b/templates/install_checks.tpl
@@ -1,6 +1,6 @@
 <h1>Server Settings Check</h1>
 
-{form legend="Server settings" class=checks}
+{form class="form-horizontal" legend="Server settings" class=checks}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	{jstabs tab=0}
@@ -14,7 +14,7 @@
 				{forminput}
 					{foreach from=$required item="check"}
 						{if $check.passed}
-							<p class="success">{$check.note}</p>
+							<p class="alert alert-success">{$check.note}</p>
 						{else}
 							<p class="error">{$check.note}</p>
 						{/if}
@@ -28,10 +28,10 @@
 			{if $error}
 				<p class="error">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 submit">
-					<input type="submit" name="reload" value="Reload Page" />
+					<input type="submit" class="btn" name="reload" value="Reload Page" />
 				</div>
 			{else}
-				<p class="success">Your system meets all the requirements. You are ready to install Bitweaver.</p>
+				<p class="alert alert-success">Your system meets all the requirements. You are ready to install Bitweaver.</p>
 			{/if}
 
 
@@ -68,7 +68,7 @@
 			{if $rec_warning}
 				<p class="warning">Not all the recommended setting have been met. However, your site might still work without problems. Please keep these settings in mind if you run into problems.</p>
 			{else}
-				<p class="success">All recommended settings have been met.</p>
+				<p class="alert alert-success">All recommended settings have been met.</p>
 			{/if}
 
 		{/jstab}
@@ -82,7 +82,7 @@
 				{forminput}
 					{foreach from=$extensions item="check"}
 						{if $check.passed}
-							<p class="success">{$check.note}</p>
+							<p class="alert alert-success">{$check.note}</p>
 						{else}
 							{assign var=extwarning value=1}
 							<p class="warning">{$check.note}</p>
@@ -94,7 +94,7 @@
 			{if $extwarning}
 				<p class="warning">Before you continue, we suggest that you try and install the mentioned extensions. If you can not do so, please bear in mind that these extensions can be installed at any time and might enhance your Bitweaver experience.</p>
 			{else}
-				<p class="success">All recommended extensions are installed.</p>
+				<p class="alert alert-success">All recommended extensions are installed.</p>
 			{/if}
 
 
@@ -119,7 +119,7 @@
 					{else}
 						{foreach from=$pearexts item="check"}
 							{if $check.passed}
-								<p class="success">{$check.note}</p>
+								<p class="alert alert-success">{$check.note}</p>
 							{else}
 								{assign var=pearextswarning value=1}
 								<p class="warning">{$check.note}</p>
@@ -157,7 +157,7 @@
 						<kbd>{$smarty.const.UTIL_PKG_PATH}pear/</kbd></li>
 				</ul>
 			{else}
-				<p class="success">
+				<p class="alert alert-success">
 					All recommended pear extensions are installed.
 				</p>
 			{/if}
@@ -177,7 +177,7 @@
 				{forminput}
 					{foreach from=$executables item="check"}
 						{if $check.passed}
-							<p class="success">{$check.note}</p>
+							<p class="alert alert-success">{$check.note}</p>
 						{else}
 							{assign var=executableswarning value=1}
 							<p class="warning">{$check.note}</p>
@@ -194,7 +194,7 @@
 					cannot be processed after uploading them.
 				</p>
 			{else}
-				<p class="success">
+				<p class="alert alert-success">
 					All recommended executables are installed.
 				</p>
 			{/if}
@@ -225,9 +225,9 @@
 
 	{if !$error}
 		<div class="control-group submit">
-			<input type="submit" name="reload" value="Reload page" />
+			<input type="submit" class="btn" name="reload" value="Reload page" />
 			&nbsp;
-			<input type="submit" name="continue" value="Continue install process" />
+			<input type="submit" class="btn" name="continue" value="Continue install process" />
 		</div>
 	{/if}
 
diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl
index 1acb134..b31f763 100644
--- a/templates/install_cleanup.tpl
+++ b/templates/install_cleanup.tpl
@@ -1,6 +1,6 @@
 <h1>Bitweaver integrity check</h1>
 
-{form id="integrity_check"}
+{form class="form-horizontal" id="integrity_check"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	{legend legend="Database Integrity Check"}
@@ -56,7 +56,7 @@
 			{/if}
 
 			<div class="control-group submit">
-				<input type="submit" name="create_tables" value="Try to create missing table/s" />
+				<input type="submit" class="btn" name="create_tables" value="Try to create missing table/s" />
 			</div>
 
 			<div class="control-group">
@@ -66,7 +66,7 @@
 				{/forminput}
 			</div>
 		{else}
-			<p class="success">
+			<p class="alert alert-success">
 				Database integrity has been confirmed by scanning all available
 				tables in your database and comparing them to the ones that
 				should be present.
@@ -130,7 +130,7 @@
 				{/if}
 			</table>
 		{else}
-			<p class="success">
+			<p class="alert alert-success">
 				The permissioning system in your installation is up to date and
 				does not require any adjustments. Even though this is true, we
 				recommend you visit the {smartlink ititle="Permission
@@ -177,14 +177,14 @@
 				<div class="clear"></div>
 			{/foreach}
 		{else}
-			<p class="success">
+			<p class="alert alert-success">
 				None of the packages you have installed are causing any problems.
 			</p>
 		{/if}
 
 		{if $delPerms || $insPerms || $serviceList}
 			<div class="control-group submit">
-				<input type="submit" name="resolve_conflicts" value="Resolve Issues" />
+				<input type="submit" class="btn" name="resolve_conflicts" value="Resolve Issues" />
 			</div>
 
 			<div class="control-group">
@@ -195,7 +195,7 @@
 			</div>
 		{else}
 			<div class="control-group submit">
-				<input type="submit" name="skip" value="Continue install process" />
+				<input type="submit" class="btn" name="skip" value="Continue install process" />
 			</div>
 		{/if}
 	{/legend}
diff --git a/templates/install_cleanup_done.tpl b/templates/install_cleanup_done.tpl
index 8436525..6b70a9c 100644
--- a/templates/install_cleanup_done.tpl
+++ b/templates/install_cleanup_done.tpl
@@ -1,9 +1,9 @@
 <h1>Resolved Conflicts</h1>
 
-{form legend="Resolved Conflicts"}
+{form class="form-horizontal" legend="Resolved Conflicts"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
-	<p class="success">
+	<p class="alert alert-success">
 		Bitweaver was successfully updated
 	</p>
 
@@ -39,6 +39,6 @@
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" value="Continue install process" />
+		<input type="submit" class="btn" value="Continue install process" />
 	</div>
 {/form}
\ No newline at end of file
diff --git a/templates/install_database.tpl b/templates/install_database.tpl
index 2a4c926..2f9c645 100644
--- a/templates/install_database.tpl
+++ b/templates/install_database.tpl
@@ -1,6 +1,6 @@
 <h1>Database Connection</h1>
 
-{form legend="Please enter your database connection information"}
+{form class="form-horizontal" legend="Please enter your database connection information"}
 	<input type="hidden" name="step" value="{$next_step}" />
 	<input type="hidden" name="gBitDbPassword_hash" value="{$gBitDbPassword_hash}" />
 
@@ -167,6 +167,6 @@
 	<div class="control-group submit">
 		<input type="hidden" name="dbcase" value="{$gBitDbCaseSensitivity}" />
 		<input type="hidden" name="resetdb" value="{$resetdb}" />
-		<input type="submit" value="Confirm Settings" name="submit_db_info" />
+		<input type="submit" class="btn" value="Confirm Settings" name="submit_db_info" />
 	</div>
 {/form}
diff --git a/templates/install_database_done.tpl b/templates/install_database_done.tpl
index 56c22da..1225c87 100644
--- a/templates/install_database_done.tpl
+++ b/templates/install_database_done.tpl
@@ -1,6 +1,6 @@
 <h1>Database Connection Information</h1>
 
-{form legend="Your database connection information"}
+{form class="form-horizontal" legend="Your database connection information"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<div class="control-group">
@@ -67,7 +67,7 @@
 	</div>
 
 	<div class="control-group">
-		<p class="success">
+		<p class="alert alert-success">
 			This information was stored in the file:<br />
 			<strong>{$smarty.const.CONFIG_PKG_PATH}kernel/config_inc.php</strong>
 		</p>
@@ -92,6 +92,6 @@
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" value="Continue {$section|default:"install"} process" />
+		<input type="submit" class="btn" value="Continue {$section|default:"install"} process" />
 	</div>
 {/form}
diff --git a/templates/install_database_reset.tpl b/templates/install_database_reset.tpl
index a69bddd..05d835f 100644
--- a/templates/install_database_reset.tpl
+++ b/templates/install_database_reset.tpl
@@ -1,6 +1,6 @@
 <h1>Database Connection Information</h1>
 
-{form legend="Your database connection information"}
+{form class="form-horizontal" legend="Your database connection information"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<div class="control-group">
@@ -8,7 +8,7 @@
 	</div>
 
 	<div class="control-group submit">
-		<input type="submit" name="continue_install" value="Continue {$section|default:"install"} process" />
+		<input type="submit" class="btn" name="continue_install" value="Continue {$section|default:"install"} process" />
 	</div>
 
 	<div class="control-group">
@@ -19,6 +19,6 @@
 	</div>
 
 	<div class="control-group submit">
-		<input type="submit" name="reset_config_inc" value="Reset config_inc.php file" onclick="return confirm( 'Are you absolutely sure you want to reset your configuration file?' );" />
+		<input type="submit" class="btn" name="reset_config_inc" value="Reset config_inc.php file" onclick="return confirm( 'Are you absolutely sure you want to reset your configuration file?' );" />
 	</div>
 {/form}
diff --git a/templates/install_datapump.tpl b/templates/install_datapump.tpl
index 60b2c18..0b3301e 100644
--- a/templates/install_datapump.tpl
+++ b/templates/install_datapump.tpl
@@ -1,6 +1,6 @@
 <h1>Sample Data</h1>
 
-{form legend="Populating the database with useful information"}
+{form class="form-horizontal" legend="Populating the database with useful information"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<p>
@@ -29,8 +29,8 @@
 
 	<div class="control-group submit">
 		{if $pumpList}
-			<input type="submit" value="Populate my site" name="fSubmitDataPump" /> 
+			<input type="submit" class="btn" value="Populate my site" name="fSubmitDataPump" /> 
 		{/if}
-		<input type="submit" value="Skip" name="skip" />
+		<input type="submit" class="btn" value="Skip" name="skip" />
 	</div>
 {/form}
diff --git a/templates/install_datapump_done.tpl b/templates/install_datapump_done.tpl
index 61c4f86..caf7064 100644
--- a/templates/install_datapump_done.tpl
+++ b/templates/install_datapump_done.tpl
@@ -6,7 +6,7 @@
 	{assign var="formlegend" value="Your Database has been Populated"}	
 {/if}
 	
-	{form legend=$formlegend}
+	{form class="form-horizontal" legend=$formlegend}
 
 	<input type="hidden" name="step" value="{$next_step}" />
 
@@ -44,6 +44,6 @@
 	{/foreach}
 
 	<div class="control-group submit">
-		<input type="submit" value="Continue install process" />
+		<input type="submit" class="btn" value="Continue install process" />
 	</div>
 {/form}
diff --git a/templates/install_final_done.tpl b/templates/install_final_done.tpl
index 5edb351..dd49785 100644
--- a/templates/install_final_done.tpl
+++ b/templates/install_final_done.tpl
@@ -1,7 +1,7 @@
 <h1>Installation Complete</h1>
 
-{form action="`$smarty.const.BIT_ROOT_URL`index.php" legend="Installation has been completed sucessfully"}
-	<p class="success">
+{form class="form-horizontal" action="`$smarty.const.BIT_ROOT_URL`index.php" legend="Installation has been completed sucessfully"}
+	<p class="alert alert-success">
 		Your system is ready for use now.
 	</p>
 	<p>Bitweaver offers helpnotes throughout. Should you require more help, you can always contact Bitweaver's developers by any of the means mentioned below. To find out more about existing packages and how to install them, visit <a class="external" href="http://www.bitweaver.org/wiki/index.php?page=bitweaverFeatures">Bitweaver Features</a>.</p>
@@ -48,6 +48,6 @@
 	<br />
 
 	<div class="control-group submit">
-		<input type="submit" size="20" value="Enter your Bitweaver site" />
+		<input type="submit" class="btn" size="20" value="Enter your Bitweaver site" />
 	</div>
 {/form}
diff --git a/templates/install_login.tpl b/templates/install_login.tpl
index 13c344b..544c0a1 100644
--- a/templates/install_login.tpl
+++ b/templates/install_login.tpl
@@ -2,7 +2,7 @@
 
 <h1>{$title|default:"You must be logged in as an administrator to run the installer."}</h1>
 
-{form name="login" legend="Please sign in to continue" secure=$gBitSystem->isFeatureActive("site_https_login_required")}
+{form class="form-horizontal" name="login" legend="Please sign in to continue" secure=$gBitSystem->isFeatureActive("site_https_login_required")}
 	<div class="row">
 		{formfeedback error="$error"}
 		{formlabel label="Username or Email" for="user"}
@@ -19,8 +19,8 @@
 		{/forminput}
 	</div>
 
-	<div class="row submit">
-		<input type="submit" name="login" value="{tr}Log in to {$gBitSystem->getConfig('site_title')|default:"this site"}{/tr}" />
+	<div class="control-group submit">
+		<input type="submit" class="btn" name="login" value="{tr}Log in to {$gBitSystem->getConfig('site_title')|default:"this site"}{/tr}" />
 		{if $gBitSystem->isFeatureActive('site_https_login_required') || $smarty.server.HTTPS=='on'}
 			{biticon iname="emblem-readonly" ipackage="icons" iexplain="Secure Login"}
 		{/if}
diff --git a/templates/install_options.tpl b/templates/install_options.tpl
index 8ad526f..1ce2e15 100644
--- a/templates/install_options.tpl
+++ b/templates/install_options.tpl
@@ -1,26 +1,26 @@
 <h1>Install Options</h1>
 
-{form legend="Install or upgrade Bitweaver" style="text-align:center"}
+{form class="form-horizontal" legend="Install or upgrade Bitweaver" style="text-align:center"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<br />
 
-	<input type="submit" name="continue_install" value="Install Bitweaver" />
+	<input type="submit" class="btn" name="continue_install" value="Install Bitweaver" />
 	<p>Select this option if this is your first installation of Bitweaver.</p>
 	
 	<hr />
 	
-	<input type="submit" name="upgrade_r1" value="Upgrade from R1" />
+	<input type="submit" class="btn" name="upgrade_r1" value="Upgrade from R1" />
 	<p>Select this option, if you have an existing Bitweaver version 1 installed and would like to upgrade to version 2.</p>
 
 	<hr />
 
-	<input type="submit" name="upgrade" value="Upgrade database" />
+	<input type="submit" class="btn" name="upgrade" value="Upgrade database" />
 	<p>Select this option, if you want to upgrade from Bitweaver versions prior to 1, or from other applications such as Tikiwiki. You will be brought back to the installer once the upgrade process has been completed.</p>
 
 	<hr />
 
-	<input type="submit" name="migrate" value="Migrate database" />
+	<input type="submit" class="btn" name="migrate" value="Migrate database" />
 	<p>Select this option, if you wish to migrate from one database source to another, such as from MySQL to PostgreSQL. You will be brought back to the installer once the upgrade process has been completed. <strong>This feature is currently not working. It was working once and needs some attention since it hasn't been updated in a while. If you know some PHP, please help us out if you are interested in this feature.</strong><p>
 
 {/form}
\ No newline at end of file
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index 161652d..5098033 100644
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -18,7 +18,7 @@
 	{formfeedback warning=$warning}
 	{jstabs tab=0}
 		{jstab title="Install Packages"}
-			{form id="package_select" id="package_select"}
+			{form class="form-horizontal" id="package_select" id="package_select"}
 				<input type="hidden" name="step" value="{$next_step}" />
 				<input type="hidden" name="method" value="install" />
 
@@ -95,7 +95,7 @@
 					Depending on the number of packages and the hardware,<br />
 					this process might take up to a few minutes.<br /><br />
 					<input type="hidden" name="resetdb" value="{$resetdb}" />
-					<input type="submit" name="submit_packages" value="Install Packages" />
+					<input type="submit" class="btn" name="submit_packages" value="Install Packages" />
 				</div>
 
 				<div class="control-group">
@@ -110,7 +110,7 @@
 
 		{if !$first_install}
 			{jstab title="Uninstall/Reinstall"}
-				{form legend="Already Installed Packages"}
+				{form class="form-horizontal" legend="Already Installed Packages"}
 					<input type="hidden" name="step" value="{$next_step}" />
 
 					<div class="control-group">
@@ -163,7 +163,7 @@
 						Please press this button only once.<br />
 						Depending on the number of packages and the hardware,<br />
 						this process might take up to a few minutes.<br /><br />
-						<input type="submit" name="submit_packages" value="Uninstall/Reinstall Packages" onclick="return confirm( 'Are you sure you want to uninstall/reinstall the selected packages?' );" />
+						<input type="submit" class="btn" name="submit_packages" value="Uninstall/Reinstall Packages" onclick="return confirm( 'Are you sure you want to uninstall/reinstall the selected packages?' );" />
 					</div>
 
 					<div class="control-group">
@@ -207,7 +207,7 @@
 		{form}
 			<input type="hidden" name="step" value="{$next_step}" />
 			<div class="control-group submit">
-				&nbsp;&nbsp;<input type="submit" name="cancel" value="Skip this stage" />
+				&nbsp;&nbsp;<input type="submit" class="btn" name="cancel" value="Skip this stage" />
 			</div>
 		{/form}
 	{/if}
diff --git a/templates/install_packages_done.tpl b/templates/install_packages_done.tpl
index cd37292..bdb7227 100644
--- a/templates/install_packages_done.tpl
+++ b/templates/install_packages_done.tpl
@@ -1,6 +1,6 @@
 <h1>Package Installation</h1>
 
-{form legend="Installed Packages"}
+{form class="form-horizontal" legend="Installed Packages"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	{if $failedcommands or $error}
@@ -98,6 +98,6 @@
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" value="Continue install process" />
+		<input type="submit" class="btn" value="Continue install process" />
 	</div>
 {/form}
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index 41e72d4..3dabd76 100644
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -2,7 +2,7 @@
 
 {jstabs tab=0}
 	{jstab title="Available Upgrades"}
-		{form id="package_select" legend="Packages that will be upgraded" id="package_select"}
+		{form class="form-horizontal" id="package_select" legend="Packages that will be upgraded" id="package_select"}
 			<input type="hidden" name="step" value="{$next_step}" />
 
 			{if $packageUpgrades}
@@ -39,12 +39,12 @@
 					<p class="danger">The upgrade process was halted due to the SQL problems listed above. Please contact the bitweaver team to fix this issue.</p>
 				{/if}
 			{elseif !$success}
-				<p class="success">Seems all installed packages are up to date!</p>
+				<p class="alert alert-success">Seems all installed packages are up to date!</p>
 			{/if}
 
 			{if $success}
 				<h2>Post Install Notes</h2>
-				<p class="success">Some packages were successfully updated which might have important post upgrade notes.</p>
+				<p class="alert alert-success">Some packages were successfully updated which might have important post upgrade notes.</p>
 				<dl>
 					{foreach from=$success item=upgrade key=package}
 						{foreach from=$upgrade item=data key=version}
@@ -148,12 +148,12 @@
 				{/if}
 
 				{if !$min_dep && !$max_dep && !$missing}
-					<p class="success">All package requirements have been met. You can proceed with the installation process.</p>
+					<p class="alert alert-success">All package requirements have been met. You can proceed with the installation process.</p>
 				{/if}
 			{/if}
 
 			<div class="control-group submit">
-				<input type="submit" name="upgrade_packages" value="Upgrade Packages" />
+				<input type="submit" class="btn" name="upgrade_packages" value="Upgrade Packages" />
 			</div>
 
 			<div class="control-group">
diff --git a/templates/install_upgrade_done.tpl b/templates/install_upgrade_done.tpl
index 448f22c..3b63cd1 100644
--- a/templates/install_upgrade_done.tpl
+++ b/templates/install_upgrade_done.tpl
@@ -1,7 +1,7 @@
 <h1>Upgrade Packages</h1>
 
-{form id="package_select" legend="Upgraded Packages" id="package_select"}
-	<p class="success">The following packages were successfully upgraded</p>
+{form class="form-horizontal" id="package_select" legend="Upgraded Packages" id="package_select"}
+	<p class="alert alert-success">The following packages were successfully upgraded</p>
 	<input type="hidden" name="step" value="{$next_step}" />
 	<dl>
 		{foreach from=$success item=upgrade key=package}
@@ -18,6 +18,6 @@
 	</dl>
 
 	<div class="control-group submit">
-		<input type="submit" name="continue" value="Continue Install Process" />
+		<input type="submit" class="btn" name="continue" value="Continue Install Process" />
 	</div>
 {/form}
diff --git a/templates/install_version.tpl b/templates/install_version.tpl
index efafa62..bb9a640 100644
--- a/templates/install_version.tpl
+++ b/templates/install_version.tpl
@@ -1,12 +1,12 @@
 <h1>Bitweaver version update</h1>
 
-{form id="integrity_check"}
+{form class="form-horizontal" id="integrity_check"}
 	<input type="hidden" name="step" value="{$next_step}" />
 	<input type="hidden" name="update_version" value="true" />
 
 	{legend legend="Update bitweaver version"}
 		{if $upToDate}
-			<p class="success">
+			<p class="alert alert-success">
 				Your version of bitweaver is already up to date.
 			</p>
 		{else}
@@ -72,7 +72,7 @@
 			</table>
 
 			<div class="control-group submit">
-				<input type="submit" name="fix_version_210beta" value="Fix Permissions" />
+				<input type="submit" class="btn" name="fix_version_210beta" value="Fix Permissions" />
 			</div>
 
 			<div class="control-group">
@@ -84,11 +84,11 @@
 		{else}
 			{if $upToDate}
 				<div class="control-group submit">
-					<input type="submit" name="skip" value="Continue install process" />
+					<input type="submit" class="btn" name="skip" value="Continue install process" />
 				</div>
 			{else}
 				<div class="control-group submit">
-					<input type="submit" name="update_version" value="Update version and continue" />
+					<input type="submit" class="btn" name="update_version" value="Update version and continue" />
 				</div>
 			{/if}
 		{/if}
diff --git a/templates/install_version_done.tpl b/templates/install_version_done.tpl
index 24d78c0..f15b110 100644
--- a/templates/install_version_done.tpl
+++ b/templates/install_version_done.tpl
@@ -1,19 +1,19 @@
 <h1>Bitweaver version update</h1>
 
-{form legend="Bitweaver version update"}
+{form class="form-horizontal" legend="Bitweaver version update"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
-	<p class="success">
+	<p class="alert alert-success">
 		Your version of bitweaver is now up to date and you can enter your site again.
 	</p>
 
 	{if $version_210beta}
-		<p class="success">
+		<p class="alert alert-success">
 			You have successfully modified the permissions of bitweaver.
 		</p>
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" value="Continue install process" />
+		<input type="submit" class="btn" value="Continue install process" />
 	</div>
 {/form}
diff --git a/templates/install_welcome.tpl b/templates/install_welcome.tpl
index eace620..7d70e2e 100644
--- a/templates/install_welcome.tpl
+++ b/templates/install_welcome.tpl
@@ -1,7 +1,7 @@
 {strip}
 <h1>Welcome to the Bitweaver Installer</h1>
 
-{form id="install_welcome"}
+{form class="form-horizontal" id="install_welcome"}
 	{legend legend=""}
 		<input type="hidden" name="step" value="{$next_step}" />
 
@@ -12,7 +12,7 @@
 		<p>Thank you for choosing Bitweaver. This web content management system offers an unparalleled consonance of simplicity, performance, and flexibility. For questions, comments, and support, please visit <a class="external" href="http://www.bitweaver.org">bitweaver.org</a>.  Help is available via <a class="external" href="http://www.bitweaver.org/">the forum</a> and via <a title="#bitweaver IRC Channel on freenode.net" class="external" href="http://www.bitweaver.org/wiki/Live+Support">#bitweaver chat</a>. Click to begin the install process:</p>
 
 		<div class="control-group submit">
-			<input type="submit" name="install" value="Begin the install process" />
+			<input type="submit" class="btn" name="install" value="Begin the install process" />
 			<p><strong>This installer will guide you through the installation or upgrade.</strong></p>
 		</div>
 
diff --git a/templates/migrate_database.tpl b/templates/migrate_database.tpl
index ccc68de..a76026e 100644
--- a/templates/migrate_database.tpl
+++ b/templates/migrate_database.tpl
@@ -256,7 +256,7 @@
 						{/foreach}
 						</select>
 						<br />
-						<input type="submit" value="Update Tables List" name="fUpdateTables" />
+						<input type="submit" class="btn" value="Update Tables List" name="fUpdateTables" />
 						{formhelp note="Please select all talbes that are not supposed to be migrated at all. You can pick some tables
 							here, if you prefer to migrate specific tables separately at a later timepoint. Use Ctrl+click to select
 							more than one, or Ctrl+A to select all tables."}
@@ -298,6 +298,6 @@
 	{/jstabs}
 
 	<div class="control-group submit">
-		<input type="submit" value="Execute Migration" name="fSubmitDatabase" />
+		<input type="submit" class="btn" value="Execute Migration" name="fSubmitDatabase" />
 	</div>
 {/form}
diff --git a/templates/migrate_database_done.tpl b/templates/migrate_database_done.tpl
index 10335ae..9738d60 100644
--- a/templates/migrate_database_done.tpl
+++ b/templates/migrate_database_done.tpl
@@ -1,6 +1,6 @@
 <h1>Upgrade Process Completed</h1>
 
-{form legend="Select what you want to do next"}
+{form class="form-horizontal" legend="Select what you want to do next"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<div class="control-group">
@@ -19,6 +19,6 @@
 	</div>
 
 	<div class="control-group submit">
-		<input type="submit" value="Continue process" />
+		<input type="submit" class="btn" value="Continue process" />
 	</div>
 {/form}
diff --git a/templates/migrate_final_done.tpl b/templates/migrate_final_done.tpl
index 5dee8e1..8283865 100644
--- a/templates/migrate_final_done.tpl
+++ b/templates/migrate_final_done.tpl
@@ -1,15 +1,15 @@
 <h1>Upgrade Process Completed</h1>
-{form legend="Select what you want to do next"}
+{form class="form-horizontal" 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 submit">
 		<input type="hidden" name="step" value="{$next_step}" />
-		<input type="submit" name="continue_install" value="Return to Installer" />
+		<input type="submit" class="btn" name="continue_install" value="Return to Installer" />
 	</div>
 
 	<hr />
 
 	<p>Enter your Bitweaver site now to see if the migrate process was successful.</p>
 	<div class="control-group submit">
-		<input type="submit" name="enter_bitweaver" value="Enter site" />
+		<input type="submit" class="btn" name="enter_bitweaver" value="Enter site" />
 	</div>
 {/form}
diff --git a/templates/migrate_welcome.tpl b/templates/migrate_welcome.tpl
index 331c73f..f807e8f 100644
--- a/templates/migrate_welcome.tpl
+++ b/templates/migrate_welcome.tpl
@@ -1,6 +1,6 @@
 <h1>Bitweaver migrate tool</h1>
 
-{form legend="Begin the migrate process"}
+{form class="form-horizontal" legend="Begin the migrate process"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<p>Welcome to the new and improved Bitweaver migrate process. Our migrate scripts are currently still in development and we cannot take any reponsibility for any loss of data that occurs due to the use of these scripts. Having said this, we are doing our best to make this migrate process as reliable and complete as we possibly can. Due to this, we urge you to follow the instructions here carefully before you proceed. We have done our best to make sure all situations are handled. However, your install might have the one case we haven't run into yet. Initial steps before beginning the actual migrate stages:</p>
@@ -14,6 +14,6 @@
 	<strong>{formfeedback warning=$dbWarning}</strong>
 
 	<div class="control-group submit">
-		<input type="submit" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the migrate process!"}" />
+		<input type="submit" class="btn" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the migrate process!"}" />
 	</div>
 {/form}
diff --git a/templates/upgrade_final_done.tpl b/templates/upgrade_final_done.tpl
index d65d4b1..024b18a 100644
--- a/templates/upgrade_final_done.tpl
+++ b/templates/upgrade_final_done.tpl
@@ -1,5 +1,5 @@
 <h1>Upgrade Process Completed</h1>
-{form legend="Select what you want to do next"}
+{form class="form-horizontal" legend="Select what you want to do next"}
 	<p>
 		Go back to the installer to <strong>install additional
 			packages</strong> that have become available by upgrading. It will
@@ -9,7 +9,7 @@
 	</p>
 	<div class="control-group submit">
 		<input type="hidden" name="step" value="{$next_step}" />
-		<input type="submit" name="continue_install" value="Install more packages" />
+		<input type="submit" class="btn" name="continue_install" value="Install more packages" />
 	</div>
 
 	<hr />
@@ -22,7 +22,7 @@
 		inform you of the health of your install.
 	</p>
 	<div class="control-group submit">
-		<input type="submit" name="resolve_conflicts" value="Resolve Conflicts" />
+		<input type="submit" class="btn" name="resolve_conflicts" value="Resolve Conflicts" />
 	</div>
 
 	<hr />
@@ -33,6 +33,6 @@
 		resolve potential issues and insert missing permissions and settings.
 	</p>
 	<div class="control-group submit">
-		<input type="submit" name="enter_bitweaver" value="Enter Bitweaver" />
+		<input type="submit" class="btn" name="enter_bitweaver" value="Enter Bitweaver" />
 	</div>
 {/form}
diff --git a/templates/upgrade_packages.tpl b/templates/upgrade_packages.tpl
index 476d46e..1abf9ba 100644
--- a/templates/upgrade_packages.tpl
+++ b/templates/upgrade_packages.tpl
@@ -1,6 +1,6 @@
 <h3>Upgrading {$upgradeFrom} to {$gBitSystem->getBitVersion()}</h3>
 
-{form legend="Begin the upgrade process"}
+{form class="form-horizontal" legend="Begin the upgrade process"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<div class="control-group">
@@ -37,7 +37,7 @@
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" name="upgrade" value="Upgrade Packages" />
+		<input type="submit" class="btn" name="upgrade" value="Upgrade Packages" />
 	</div>
 
 	<div class="control-group">
diff --git a/templates/upgrade_packages_done.tpl b/templates/upgrade_packages_done.tpl
index ed0d80d..9a0e073 100644
--- a/templates/upgrade_packages_done.tpl
+++ b/templates/upgrade_packages_done.tpl
@@ -1,6 +1,6 @@
 <h1>Package Upgrade</h1>
 
-{form legend="Installed Packages"}
+{form class="form-horizontal" legend="Installed Packages"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	{if $failedcommands}
@@ -31,6 +31,6 @@
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" value="Continue upgrade process" />
+		<input type="submit" class="btn" value="Continue upgrade process" />
 	</div>
 {/form}
diff --git a/templates/upgrade_ready.tpl b/templates/upgrade_ready.tpl
index 60de638..4d9fa4a 100644
--- a/templates/upgrade_ready.tpl
+++ b/templates/upgrade_ready.tpl
@@ -1,4 +1,4 @@
-{form legend="Begin the upgrade process"}
+{form class="form-horizontal" legend="Begin the upgrade process"}
 	<h3>Upgrading {$upgradeFrom} to {$gBitSystem->getBitVersion()}</h3>
 
 	<p>The following packages will be updated: </p>
@@ -29,6 +29,6 @@
 	</div>
 
 	<div class="control-group submit">
-		<input type="submit" name="upgrade" value="Upgrade Packages" />
+		<input type="submit" class="btn" name="upgrade" value="Upgrade Packages" />
 	</div>
 {/form}
diff --git a/templates/upgrade_welcome.tpl b/templates/upgrade_welcome.tpl
index 898b9b1..b3ab734 100644
--- a/templates/upgrade_welcome.tpl
+++ b/templates/upgrade_welcome.tpl
@@ -1,6 +1,6 @@
 <h1>Bitweaver upgrade tool</h1>
 
-{form legend="Begin the upgrade process"}
+{form class="form-horizontal" legend="Begin the upgrade process"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<p>
@@ -57,6 +57,6 @@
 	{/if}
 
 	<div class="control-group submit">
-		<input type="submit" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the upgrade process!"}" />
+		<input type="submit" class="btn" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the upgrade process!"}" />
 	</div>
 {/form}