bootstrap3-css-changes-form-group

45 files changed, 143 insertions, 143 deletions

diff --git a/templates/action_logs.tpl b/templates/action_logs.tpl
index c411561..ccfd567 100644
--- a/templates/action_logs.tpl
+++ b/templates/action_logs.tpl
@@ -9,7 +9,7 @@
 		{form}
 			{legend legend="Liberty Action Logs"}
 				{foreach from=$logSettings key=item item=output}
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							{if $output.type == 'input'}
@@ -22,7 +22,7 @@
 					</div>
 				{/foreach}
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Delete Logs" for="log_prune"}
 					{forminput}
 						<select name="log_prune" id="log_prune">
@@ -37,7 +37,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group submit">
+				<div class="form-group submit">
 					<input type="submit" class="btn btn-default" name="apply_settings" value="{tr}Apply Settings{/tr}" />
 				</div>
 			{/legend}
diff --git a/templates/add_structure_content.tpl b/templates/add_structure_content.tpl
index dba93f0..db90560 100644
--- a/templates/add_structure_content.tpl
+++ b/templates/add_structure_content.tpl
@@ -39,7 +39,7 @@ function submitStructure(pForm,pContentId,pMode) {
 		<input type="hidden" name="tab" value="content" />
 
 		{if $subtree}
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="After page" for="after_ref_id"}
 				{forminput}
 					<select name="after_ref_id" id="after_ref_id">
@@ -55,7 +55,7 @@ function submitStructure(pForm,pContentId,pMode) {
 		{minifind}
 
 		{* disable until it can be sorted }
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Search" for="lib-content"}
 			{forminput}
 				<input autocomplete="off" id="contact_name" name="contact[name]" size="30" type="text" value="" />
@@ -66,7 +66,7 @@ function submitStructure(pForm,pContentId,pMode) {
 		</div>
 		{ *}
 
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Content type" for="content_type_guid"}
 			{forminput}
 				{html_options onchange="submit();" options=$contentTypes name=content_type_guid selected=$contentSelect}
@@ -124,7 +124,7 @@ function submitStructure(pForm,pContentId,pMode) {
 			{/forminput}
 		</div>
 
-		<div class="control-group submit">
+		<div class="form-group submit">
 			<input type="submit" class="btn btn-default" onclick="submitStructure(this.form);return false;" name="create" value="{tr}Add Content{/tr}" />
 			<input type="submit" class="btn btn-default" name="done" value="{tr}Done{/tr}" />
 		</div>
diff --git a/templates/admin_comments.tpl b/templates/admin_comments.tpl
index 10fabd0..04008d5 100644
--- a/templates/admin_comments.tpl
+++ b/templates/admin_comments.tpl
@@ -12,7 +12,7 @@
 			{jstab title="Comment Display"}
 			{legend legend="Display Settings"}
 			{foreach from=$commentSettings key=item item=output}
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -21,7 +21,7 @@
 				</div>
 			{/foreach}
 			
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Editable Time Period" for="comments_edit_minutes"}
 				{forminput}
 					<input type="text" name="comments_edit_minutes" value="{$gBitSystem->getConfig('comments_edit_minutes', 60)}" />
@@ -29,7 +29,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Comments per Page" for="comments_per_page"}
 				{forminput}
 					<select name="comments_per_page" id="comments_per_page">
@@ -44,7 +44,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Default Sort Mode" for="comments_default_ordering"}
 				{forminput}
 					<select name="comments_default_ordering" id="comments_default_ordering">
@@ -56,7 +56,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Comments default display mode" for="comments_default_display_mode"}
 				{forminput}
 					<select name="comments_default_display_mode" id="comments_default_display_mode">
@@ -66,7 +66,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Default post textarea lines number" for="comments_default_post_lines"}
 				{forminput}
 					<select name="comments_default_post_lines" id="comments_default_post_lines">
@@ -82,7 +82,7 @@
 			{/jstab}
 		{/jstabs}
 
-		<div class="control-group submit">
+		<div class="form-group submit">
 			<input type="submit" class="btn btn-default" name="change_prefs" value="{tr}Change preferences{/tr}" />
 		</div>
 	{/form}
diff --git a/templates/admin_liberty.tpl b/templates/admin_liberty.tpl
index 0958aca..55b0fe3 100644
--- a/templates/admin_liberty.tpl
+++ b/templates/admin_liberty.tpl
@@ -3,7 +3,7 @@
 	{jstabs}
 		{jstab title="General Settings"}
 			{legend legend="Liberty Cache"}
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Liberty Cache" for="liberty_cache"}
 					{forminput}
 						{html_options name=liberty_cache id=liberty_cache values=$cacheTimes options=$cacheTimes selected=$gBitSystem->getConfig('liberty_cache')}
@@ -13,7 +13,7 @@
 			{/legend}
 
 			{legend legend="Attachments"}
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Auto-Display Attachment Thumbnails" for="liberty_auto_display_attachment_thumbs"}
 					{forminput}
 						{html_options options=$imageSizes name="liberty_auto_display_attachment_thumbs" id="liberty_auto_display_attachment_thumbs" selected=$gBitSystem->getConfig('liberty_auto_display_attachment_thumbs')}
@@ -21,7 +21,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Liberty Attachment Style" for="liberty_attachment_style"}
 					{forminput}
 						{html_radios options=$attachmentStyleOptions values=$attachmentStyleOptions id=liberty_attachment_style name=liberty_attachment_style checked=$gBitSystem->getConfig('liberty_attachment_style', 'standard') separator="<br />"}
@@ -30,7 +30,7 @@
 				</div>
 
 				{foreach from=$attachmentOptions key=item item=output}
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -42,7 +42,7 @@
 
 			{legend legend="Miscellaneous"}
 				{foreach from=$formLibertyFeatures key=item item=output}
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -52,7 +52,7 @@
 				{/foreach}
 
 				{foreach from=$formLibertyTextareaFeatures key=item item=output}
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							<input type="text" name="{$item}" value="{$gBitSystem->getConfig($item, $output.default)}" />
@@ -64,7 +64,7 @@
 
 			{legend legend="Spam and Captcha Settings"}
 				{foreach from=$formCaptcha key=item item=output}
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -77,7 +77,7 @@
 					</div>
 				{/foreach}
 				{foreach from=$formCaptchaTextareaFeatures key=item item=output}
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							<input type="text" name="{$item}" value="{$gBitSystem->getConfig($item, $output.default)}" />
@@ -94,7 +94,7 @@
 			{legend legend="Image Processing System"}
 				<input type="hidden" name="page" value="{$page}" />
 				{foreach from=$imageProcessors key=item item=output}
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							<label>
@@ -115,7 +115,7 @@
 				{/foreach}
 
 				{foreach from=$formImageFeatures key=item item=output}
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -124,7 +124,7 @@
 					</div>
 				{/foreach}
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Image Compression" for="liberty_thumbnail_quality"}
 					{forminput}
 						{html_options values=$imageCompression options=$imageCompression id=liberty_thumbnail_quality name=liberty_thumbnail_quality selected=$gBitSystem->getConfig('liberty_thumbnail_quality')|default:85}
@@ -132,7 +132,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Thumbnail Format" for="thumbformat"}
 					{forminput}
 						{html_options values=$thumbFormats options=$thumbFormats id=thumbformat name=liberty_thumbnail_format selected=$gBitSystem->getConfig('liberty_thumbnail_format')}
@@ -140,7 +140,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Thumbnail Size" for="liberty_thumbnail_size"}
 					{forminput}
 						{html_options options=$imageSizes name="liberty_thumbnail_size" id="liberty_thumbnail_size" selected=$gBitSystem->getConfig('liberty_thumbnail_size')|default:medium}
@@ -151,7 +151,7 @@
 		{/jstab}
 	{/jstabs}
 
-	<div class="control-group submit">
+	<div class="form-group submit">
 		<input type="submit" class="btn btn-default" name="change_prefs" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
diff --git a/templates/admin_plugins.tpl b/templates/admin_plugins.tpl
index 66852f8..6d96462 100644
--- a/templates/admin_plugins.tpl
+++ b/templates/admin_plugins.tpl
@@ -82,7 +82,7 @@
 
 							{if $plugin_type eq 'format'}
 								{formfeedback warning="{tr}This will change the way any wiki page that contains HTML will be displayed. We recommend turning on HTMLPurifier if either of these is on.{/tr}"}
-								<div class="control-group">
+								<div class="form-group">
 									{formlabel label="Allow HTML" for="allow_html"}
 									{forminput}
 										<input type="checkbox" name="content_allow_html" id="allow_html" value="y" {if $gBitSystem->isFeatureActive('content_allow_html')}checked="checked"{/if} />
@@ -90,7 +90,7 @@
 										{formhelp note="Allow the use of HTML in tikiwiki format content."}
 									{/forminput}
 								</div>
-								<div class="control-group">
+								<div class="form-group">
 									{formlabel label="Force Allow HTML" for="force_allow_html"}
 									{forminput}
 										<input type="checkbox" name="content_force_allow_html" id="force_allow_html" value="y" {if $gBitSystem->isFeatureActive('content_force_allow_html')}checked="checked"{/if} />
@@ -104,11 +104,11 @@
 				{/foreach}
 			{/jstabs}
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				<input type="submit" class="btn btn-default" name="pluginsave" value="{tr}Save Plugin Settings{/tr}" />
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Reset all plugin settings" for=""}
 				{forminput}
 					<input type="submit" class="btn btn-default" name="reset_all_plugins" value="{tr}Reset Plugins{/tr}" />
diff --git a/templates/attachhelp.tpl b/templates/attachhelp.tpl
index 9ff6992..3d66f24 100644
--- a/templates/attachhelp.tpl
+++ b/templates/attachhelp.tpl
@@ -7,7 +7,7 @@
 	{/capture}
 
 	{if $legend}
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Attachment" for="attachhelp"}
 			{forminput}
 				{$smarty.capture.input}
diff --git a/templates/attachment_browser.tpl b/templates/attachment_browser.tpl
index 1a15b4c..90c2a9a 100644
--- a/templates/attachment_browser.tpl
+++ b/templates/attachment_browser.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Attach Existing File(s)" for="existing_attachment_id_input"}
 	{forminput}
 		<input type="text" name="existing_attachment_id[]" id="existing_attachment_id_input" size="20"/>
diff --git a/templates/attachments.tpl b/templates/attachments.tpl
index 7e6f4cf..7c0ca83 100644
--- a/templates/attachments.tpl
+++ b/templates/attachments.tpl
@@ -9,7 +9,7 @@
 			{form legend="Attachment Filter"}
 				{formfeedback hash=$feedback}
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="User" for=""}
 					{forminput}
 					<input type="text" name="login" value="{$smarty.request.login}" />
diff --git a/templates/comments.tpl b/templates/comments.tpl
index a579fe3..a9d8dbf 100644
--- a/templates/comments.tpl
+++ b/templates/comments.tpl
@@ -15,7 +15,7 @@
 		{include file="bitpackage:liberty/comments_display_option_bar.tpl"}
 
 		{if $comments_ajax && $gBitUser->hasPermission( 'p_liberty_post_comments' )}
-			<div class="control-group">
+			<div class="form-group">
 				<input type="submit" class="btn btn-default" name="post_comment_request" value="{tr}Add Comment{/tr}" onclick="LibertyComment.attachForm('comment_{$gContent->mContentId}', '{$gContent->mContentId}', {if $gContent->mContentId}{$gContent->mContentId}{elseif $commentsParentId}{$commentsParentId}{else}null{/if})"/>
 			</div>
 		{/if}
diff --git a/templates/comments_post_inc.tpl b/templates/comments_post_inc.tpl
index 148a546..feaa70d 100644
--- a/templates/comments_post_inc.tpl
+++ b/templates/comments_post_inc.tpl
@@ -24,7 +24,7 @@
 					<input type="hidden" name="no_js_preview" value="y" />
 				{/if}
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Title" for="comments-title"}
 					{forminput}
 						<input type="text" size="50" name="comment_title" id="comments-title" value="{$postComment.title|escape:html}" />
@@ -33,7 +33,7 @@
 				</div>
 
 				{if !$gBitUser->isRegistered()}
-					<div class="control-group" id="post-login">
+					<div class="form-group" id="post-login">
 						{formlabel label="Login" for="login-email"}
 						{forminput}
 							<div style="display:inline-block;padding-right:20px;">
@@ -46,7 +46,7 @@
 							<div class="formhelp">{tr}If you are already registered with <strong>{$gBitSystem->mConfig.site_title|default:"this site"}</strong> please enter your login details above.{/tr}</div>
 						{/forminput}
 					</div>
-					<div class="control-group" style="display:none" id="post-anon">
+					<div class="form-group" style="display:none" id="post-anon">
 						{formlabel label="Your Name" for="comments-name"}
 						{forminput}
 							<input type="text" size="50" name="comment_name" id="comments-name" value="{$postComment.anon_name|escape:html}" />
@@ -54,7 +54,7 @@
 						{/forminput}
 					</div>
 					{captcha variant="row" id="post-captcha" style="display:none"}
-					<div class="control-group">
+					<div class="form-group">
 						{forminput}
 							<input type="checkbox" name="anon_post" id="anon-post" value="y" onchange="BitBase.toggleElementDisplay('post-login','block');BitBase.toggleElementDisplay('post-anon','block');BitBase.toggleElementDisplay('post-captcha','block');" /> {tr}Anonymous Post{/tr}
 							{formhelp note=""}
@@ -75,14 +75,14 @@
 					{/if}
 				{/if}
 
-				<div class="control-group submit">
+				<div class="form-group submit">
 					<input type="submit" class="btn btn-default" name="post_comment_preview" value="{tr}Preview{/tr}" {if $comments_ajax}onclick="LibertyComment.previewComment(); return false;"{/if}/>&nbsp;
 					<input type="submit" class="btn btn-default" name="post_comment_submit" value="{tr}Post{/tr}" {if $comments_ajax}onclick="LibertyComment.postComment(); return false;"{/if}/>&nbsp;
 					<input type="submit" class="btn btn-default" name="post_comment_cancel" value="{tr}Cancel{/tr}" {if $comments_ajax}onclick="LibertyComment.cancelComment(true); return false;"{/if}/>
 				</div>
 			{/legend}
 		{elseif $gBitUser->hasPermission( 'p_liberty_post_comments' )}
-			<div class="control-group">
+			<div class="form-group">
 				<input type="submit" class="btn btn-default" name="post_comment_request" value="{tr}Add Comment{/tr}" />
 			</div>
 		{/if}
diff --git a/templates/content_permissions_inc.tpl b/templates/content_permissions_inc.tpl
index f498b72..60ef488 100644
--- a/templates/content_permissions_inc.tpl
+++ b/templates/content_permissions_inc.tpl
@@ -38,7 +38,7 @@
 		<input type="hidden" name="content_id" value="{$gContent->mContentId}" />
 		<input type="hidden" name="action" value="assign" />
 
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Assign this Permission" for="perm"}
 			{forminput}
 				<select name="perm" id="perm">
@@ -50,7 +50,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="To this Group" for="group_id"}
 			{forminput}
 				<select name="group_id" id="group_id">
@@ -62,7 +62,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group submit">
+		<div class="form-group submit">
 			<input type="submit" class="btn btn-default" name="back" value="{tr}Go back to content{/tr}" />
 			<input type="submit" class="btn btn-default" name="assign" value="{tr}Assign Permission{/tr}" />
 		</div>
diff --git a/templates/content_role_permissions_inc.tpl b/templates/content_role_permissions_inc.tpl
index 792342c..aca5a68 100644
--- a/templates/content_role_permissions_inc.tpl
+++ b/templates/content_role_permissions_inc.tpl
@@ -38,7 +38,7 @@
 		<input type="hidden" name="content_id" value="{$gContent->mContentId}" />
 		<input type="hidden" name="action" value="assign" />
 
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Assign this Permission" for="perm"}
 			{forminput}
 				<select name="perm" id="perm">
@@ -50,7 +50,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="To this Group" for="role_id"}
 			{forminput}
 				<select name="role_id" id="role_id">
@@ -62,7 +62,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group submit">
+		<div class="form-group submit">
 			<input type="submit" class="btn btn-default" name="back" value="{tr}Go back to content{/tr}" />
 			<input type="submit" class="btn btn-default" name="assign" value="{tr}Assign Permission{/tr}" />
 		</div>
diff --git a/templates/edit_content_alias_inc.tpl b/templates/edit_content_alias_inc.tpl
index 3980328..689dec3 100644
--- a/templates/edit_content_alias_inc.tpl
+++ b/templates/edit_content_alias_inc.tpl
@@ -1,5 +1,5 @@
 {if $gContent->hasUserPermission('p_liberty_edit_content_alias')}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Aliases"}
 		{forminput}
 			<textarea class="width95p" name="alias_string" rows="2" cols="35">{if $smarty.post.preview}{$pageInfo.alias_string}{else}{foreach from=$gContent->getAliases() item=alias}{$alias|cat:"\r"}{/foreach}{/if}</textarea>
diff --git a/templates/edit_content_owner_inc.tpl b/templates/edit_content_owner_inc.tpl
index 9788adb..39aeaa5 100644
--- a/templates/edit_content_owner_inc.tpl
+++ b/templates/edit_content_owner_inc.tpl
@@ -1,5 +1,5 @@
 {if $gBitSystem->isFeatureActive('liberty_allow_change_owner') && $gBitUser->hasPermission('p_liberty_edit_content_owner')}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Owner"}
 		{forminput}
 			{html_options name="owner_id" options=$gBitUser->getSelectionList() selected=$gContent->getField('owner_id')|default:$gBitUser->getUserId()}
diff --git a/templates/edit_content_status_inc.tpl b/templates/edit_content_status_inc.tpl
index 0d0d939..014f04d 100644
--- a/templates/edit_content_status_inc.tpl
+++ b/templates/edit_content_status_inc.tpl
@@ -3,7 +3,7 @@
 	$gContent->getAvailableContentStatuses() &&
 	($gBitUser->hasPermission('p_liberty_edit_content_status') || $gBitUser->hasPermission('p_liberty_edit_all_status'))
 	}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Status" for="content_status_id"}
 		{forminput}
 			{html_options name="content_status_id" options=$gContent->getAvailableContentStatuses() selected=$gContent->getField('content_status_id',$smarty.const.BIT_CONTENT_DEFAULT_STATUS)}
diff --git a/templates/edit_format.tpl b/templates/edit_format.tpl
index 40581fd..99b2152 100644
--- a/templates/edit_format.tpl
+++ b/templates/edit_format.tpl
@@ -7,7 +7,7 @@
 {/if}
 
 {if $translationsList}
-	<div class="control-group">
+	<div class="form-group">
 		{formfeedback error=$errors.format}
 		{formlabel label="Language" for="lang_code"}
 		{forminput}
@@ -37,7 +37,7 @@
 	{/if}
 {/foreach}
 {if $numformat > 1 || $format_options}
-	<div class="control-group">
+	<div class="form-group">
 		{formfeedback error=$errors.format}
 		{formlabel label="Content Format"}
 		{foreach name=formatPlugins from=$gLibertySystem->mPlugins item=plugin key=guid}
@@ -93,7 +93,7 @@
 {else}
 	{* if there was one format in the liberty plugins hash then use it and display a label so user knows what format is being used, otherwise use default and hide it*}
 	{if $numformat eq 1}
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Content Format"}
 			{forminput}
 				<label>
diff --git a/templates/edit_primary_attachment_inc.tpl b/templates/edit_primary_attachment_inc.tpl
index cd10ba2..3e7e577 100644
--- a/templates/edit_primary_attachment_inc.tpl
+++ b/templates/edit_primary_attachment_inc.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="control-group">
+<div class="form-group">
 	{formlabel label=$label|default:"Primary Attachment" for="primary_attachment_id"}
 	{forminput}
 		<input type="text" name="primary_attachment_id" id="primary_attachment_id" />
@@ -9,7 +9,7 @@
 
 {assign var=primary_attachment_id value=$gContent->getField('primary_attachment_id')}
 {if !empty($primary_attachment_id)}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Current Attachment" for=""}
 		{forminput}
 			{assign var=storage value=$gContent->mStorage[$primary_attachment_id]}
@@ -24,7 +24,7 @@
 {if $gBitUser->hasPermission('p_liberty_attach_attachments') and !$no_plugins}
 	{foreach from=$gLibertySystem->mPlugins item=plugin key=guid}
 		{if $plugin.is_active eq 'y' and $plugin.primary_edit_field and $plugin.plugin_type eq 'storage'}
-			<div class="control-group">
+			<div class="form-group">
 				{assign var=label value="Upload $label"}
 				{formlabel label=$label|default:"Upload new Attachment" for=""}
 				{forminput}
diff --git a/templates/edit_storage.tpl b/templates/edit_storage.tpl
index 9b352a4..d2745a6 100644
--- a/templates/edit_storage.tpl
+++ b/templates/edit_storage.tpl
@@ -24,7 +24,7 @@
 			{foreach from=$gLibertySystem->mPlugins item=plugin key=guid}
 				{* $no_plugins is set by the including template *}
 				{if $plugin.is_active eq 'y' and $plugin.edit_field and $plugin.plugin_type eq 'storage' and !$no_plugins}
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label=$plugin.edit_label}
 						{forminput}
 							{eval var=$plugin.edit_field}
@@ -42,7 +42,7 @@
 			{foreach from=$gLibertySystem->mPlugins item=plugin key=guid}
 				{* $no_plugins is set by the including template *}
 				{if $plugin.is_active eq 'y' and $plugin.edit_field and $plugin.plugin_type eq 'storage' and !$no_plugins}
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label=$plugin.edit_label}
 						{forminput}
 							{eval var=$plugin.edit_field_new}
diff --git a/templates/edit_storage_list.tpl b/templates/edit_storage_list.tpl
index 0880483..f8cb488 100644
--- a/templates/edit_storage_list.tpl
+++ b/templates/edit_storage_list.tpl
@@ -4,7 +4,7 @@
 	<div id="edit_storage_list{if !$uploadTab}_tab{/if}{if $form_id}_{$form_id}{/if}">
 {/if}
 {if $gContent->mStorage}
-	<div class="control-group">
+	<div class="form-group">
 		<table class="table data" summary="List of attached files">
 			<tr>
 				<th scope="col" class="width29p" title="{tr}Thumbnail{/tr}">{tr}Thumbnail{/tr}</th>
diff --git a/templates/edit_structure.tpl b/templates/edit_structure.tpl
index db55e9a..8e7521a 100644
--- a/templates/edit_structure.tpl
+++ b/templates/edit_structure.tpl
@@ -8,7 +8,7 @@
 
 {if $gBitThemes->isAjaxLib('mochikit')}
 
-	<div class="control-group">
+	<div class="form-group">
 		<div class="formlabel">
 			{$gContent->getContentTypeName()} {tr}Structure{/tr}
 			<br/>
diff --git a/templates/edit_structure_alias.tpl b/templates/edit_structure_alias.tpl
index e1b34db..e7b67e3 100644
--- a/templates/edit_structure_alias.tpl
+++ b/templates/edit_structure_alias.tpl
@@ -4,7 +4,7 @@
 		<input type="hidden" name="structure_id" value="{$structureInfo.structure_id}" />
 		<input type="hidden" name="tab" value="alias" />
 
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Page Alias" for="pageAlias"}
 			{forminput}
 				<input type="text" name="pageAlias" id="pageAlias" value="{$structureInfo.page_alias}" size="30" maxlength="240"/>
@@ -12,7 +12,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group submit">
+		<div class="form-group submit">
 			<input type="submit" class="btn btn-default" name="create" value="{tr}Update{/tr}"/>
 		</div>
 	{/form}
diff --git a/templates/edit_structure_content.tpl b/templates/edit_structure_content.tpl
index 0ff2907..c5deee3 100644
--- a/templates/edit_structure_content.tpl
+++ b/templates/edit_structure_content.tpl
@@ -10,7 +10,7 @@
 		<input type="hidden" name="tab" value="content" />
 
 		{if $subpages}
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="After page" for="after_ref_id"}
 				{forminput}
 					<select name="after_ref_id" id="after_ref_id">
@@ -23,7 +23,7 @@
 			</div>
 		{/if}
 
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Content" for="lib-content"}
 			{forminput}
 				{html_options onchange="submit();" options=$contentTypes name=content_type_guid selected=$contentSelect}
@@ -40,7 +40,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group submit">
+		<div class="form-group submit">
 			<input type="submit" class="btn btn-default" name="create" value="{tr}Add Content{/tr}" />
 		</div>
 	{/form}
diff --git a/templates/edit_structure_inc.tpl b/templates/edit_structure_inc.tpl
index 734c1b0..fc8169c 100644
--- a/templates/edit_structure_inc.tpl
+++ b/templates/edit_structure_inc.tpl
@@ -39,7 +39,7 @@
 	<input type="hidden" name="structure_string" id="structure_string" value="" />
 	<input type="hidden" name="structure_id" value="{$gStructure->mInfo.structure_id}" />
 	<input type="hidden" name="root_structure_id" value="{$gStructure->mInfo.root_structure_id}" />
-	<div class="control-group submit">
+	<div class="form-group submit">
 		<noscript>
 			<p class="warning">{tr}The Structure organisation system only works with javascript turned on{/tr}</p>
 		</noscript>
diff --git a/templates/edit_textarea.tpl b/templates/edit_textarea.tpl
index 882f8a1..120997c 100644
--- a/templates/edit_textarea.tpl
+++ b/templates/edit_textarea.tpl
@@ -11,7 +11,7 @@
 		{include file="bitpackage:quicktags/quicktags_full.tpl"}
 	{/if}
 {/strip}
-	<div class="control-group rt-edit">
+	<div class="form-group rt-edit">
 		{formlabel label=$textarea_label for=$textarea_id}
 		{forminput}
 			{formfeedback error=$textarea_error}
diff --git a/templates/mime/application/view.tpl b/templates/mime/application/view.tpl
index 8af40d0..84a1844 100644
--- a/templates/mime/application/view.tpl
+++ b/templates/mime/application/view.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="control-group aligncenter">
+<div class="form-group aligncenter">
 	{assign var=size value=$smarty.request.size|default:icon}
 	<a href="{$attachment.source_url|escape}">
 		<img title="" alt="" src="{$attachment.thumbnail_url.$size}" />
diff --git a/templates/mime/audio/admin.tpl b/templates/mime/audio/admin.tpl
index 786ccfe..4d903c2 100644
--- a/templates/mime/audio/admin.tpl
+++ b/templates/mime/audio/admin.tpl
@@ -17,7 +17,7 @@
 			{formfeedback hash=$feedback}
 			<p class="formhelp">{tr}You can spcify the path to either ffmpeg or mplayer and lame. If you have all applications installed, we will first try to convert audio files using ffmpeg and if that didn't work, we'll use mplayer and lame.{/tr}</p>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Path to ffmpeg" for="ffmpeg_path"}
 				{forminput}
 					<input type='text' name="ffmpeg_path" id="ffmpeg_path" size="40" value="{$gBitSystem->getConfig('ffmpeg_path')|escape|default:$ffmpeg_path}" />
@@ -25,7 +25,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="MP3 Library" for="ffmpeg_mp3_lib"}
 				{forminput}
 					{html_options
@@ -38,7 +38,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Path to mplayer" for="mplayer_path"}
 				{forminput}
 					<input type='text' name="mplayer_path" id="mplayer_path" size="40" value="{$gBitSystem->getConfig('mplayer_path')|escape|default:$mplayer_path}" />
@@ -46,7 +46,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Path to lame" for="lame_path"}
 				{forminput}
 					<input type='text' name="lame_path" id="lame_path" size="40" value="{$gBitSystem->getConfig('lame_path')|escape|default:$lame_path}" />
@@ -54,7 +54,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Lame options" for="mime_audio_lame_options"}
 				{forminput}
 					<input type='text' name="mime_audio_lame_options" id="mime_audio_lame_options" size="40" value="{$gBitSystem->getConfig('mime_audio_lame_options')|escape|default:$lame_options}" />
@@ -62,7 +62,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Audio sample rate" for="mime_audio_samplerate"}
 				{forminput}
 					{html_options
@@ -75,7 +75,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Audio bitrate" for="mime_audio_bitrate"}
 				{forminput}
 					{html_options
@@ -88,7 +88,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Force encode" for="mime_audio_force_encode"}
 				{forminput}
 					<input type='checkbox' name="mime_audio_force_encode" id="mime_audio_force_encode" value="y" {if $gBitSystem->isFeatureActive('mime_audio_force_encode')}checked="checked"{/if} />
@@ -96,7 +96,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Foreground Colour" for="mime_audio_frontcolor"}
 				{forminput}
 					<input type='text' name="mime_audio_frontcolor" id="mime_audio_frontcolor" size="10" value="{$gBitSystem->getConfig('mime_audio_frontcolor')|default:"FFFFFF"}" />
@@ -104,7 +104,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Background Colour" for="mime_audio_backcolor"}
 				{forminput}
 					<input type='text' name="mime_audio_backcolor" id="mime_audio_backcolor" size="10" value="{$gBitSystem->getConfig('mime_audio_backcolor')|default:"000000"}" />
@@ -112,7 +112,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				<input type="submit" name="plugin_settings" value="{tr}Save Plugin Settings{/tr}" />
 			</div>
 		{/form}
diff --git a/templates/mime/audio/edit.tpl b/templates/mime/audio/edit.tpl
index 0d18da5..2df08b5 100644
--- a/templates/mime/audio/edit.tpl
+++ b/templates/mime/audio/edit.tpl
@@ -1,33 +1,33 @@
 {strip}
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Title" for="title"}
 	{forminput}
 		<input type="text" size="35" id="audio_title" name="plugin[{$attachment.attachment_id}][mimeaudio][meta][title]" value="{$attachment.meta.title}" />
 	{/forminput}
 </div>
 
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Album" for="audio_album"}
 	{forminput}
 		<input type="text" size="35" id="audio_album" name="plugin[{$attachment.attachment_id}][mimeaudio][meta][album]" value="{$attachment.meta.album}" />
 	{/forminput}
 </div>
 
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Artist" for="audio_artist"}
 	{forminput}
 		<input type="text" size="35" id="audio_artist" name="plugin[{$attachment.attachment_id}][mimeaudio][meta][artist]" value="{$attachment.meta.artist}" />
 	{/forminput}
 </div>
 
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Year" for="audio_year"}
 	{forminput}
 		<input type="text" size="35" id="audio_year" name="plugin[{$attachment.attachment_id}][mimeaudio][meta][year]" value="{$attachment.meta.year}" />
 	{/forminput}
 </div>
 
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Genre" for="audio_genre"}
 	{forminput}
 		<input type="text" size="35" id="audio_genre" name="plugin[{$attachment.attachment_id}][mimeaudio][meta][genre]" value="{$attachment.meta.genre}" />
@@ -35,7 +35,7 @@
 </div>
 
 {if $attachment.source_file}
-	<div class="control-group">
+	<div class="form-group">
 		<label class="checkbox">
 			<input type="checkbox" id="remove_original" name="plugin[{$attachment.attachment_id}][mimeaudio][remove_original]" value="y" />Remove Original
 			{formhelp note="This will permanently remove the original file from the server. This will still allow you to listen to the audio file but not download it."}
diff --git a/templates/mime/audio/view.tpl b/templates/mime/audio/view.tpl
index 90d8e0d..30c6ce3 100644
--- a/templates/mime/audio/view.tpl
+++ b/templates/mime/audio/view.tpl
@@ -1,12 +1,12 @@
 {strip}
 {if $attachment.media_url}
-	<div class="control-group aligncenter">
+	<div class="form-group aligncenter">
 		{include file="bitpackage:liberty/mime/audio/player.tpl"}
 	</div>
 {/if}
 
 {if $attachment.meta.title}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Title" for=""}
 		{forminput}
 			{$attachment.meta.title}
@@ -15,7 +15,7 @@
 {/if}
 
 {if $attachment.meta.album}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Album" for=""}
 		{forminput}
 			{$attachment.meta.album}
@@ -24,7 +24,7 @@
 {/if}
 
 {if $attachment.meta.artist}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Artist" for=""}
 		{forminput}
 			{$attachment.meta.artist}
@@ -33,7 +33,7 @@
 {/if}
 
 {if $attachment.meta.year}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Year" for=""}
 		{forminput}
 			{$attachment.meta.year}
@@ -42,7 +42,7 @@
 {/if}
 
 {if $attachment.meta.playtimestring}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Duration" for=""}
 		{forminput}
 			{$attachment.meta.playtimestring}
@@ -51,7 +51,7 @@
 {/if}
 
 {if $attachment.meta.genre}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Genre" for=""}
 		{forminput}
 			{$attachment.meta.genre}
diff --git a/templates/mime/default/upload.tpl b/templates/mime/default/upload.tpl
index 061220f..54e70eb 100644
--- a/templates/mime/default/upload.tpl
+++ b/templates/mime/default/upload.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if $gBitUser->hasPermission('p_liberty_attach_attachments') }
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Upload File(s)"}
 		{forminput}
 			{if $gBitSystem->getConfig("liberty_attachment_style") == "multiple"}
diff --git a/templates/mime/default/view.tpl b/templates/mime/default/view.tpl
index 0fa79c8..330c9ac 100644
--- a/templates/mime/default/view.tpl
+++ b/templates/mime/default/view.tpl
@@ -1,5 +1,5 @@
 {if $attachment}{strip}
-<div class="control-group aligncenter">
+<div class="form-group aligncenter">
 	{assign var=size value=$smarty.request.size|default:medium}
 	{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
 		{if $attachment.original}
diff --git a/templates/mime/flash/view.tpl b/templates/mime/flash/view.tpl
index d107e3d..586ede8 100644
--- a/templates/mime/flash/view.tpl
+++ b/templates/mime/flash/view.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="control-group aligncenter">
+<div class="form-group aligncenter">
 	{* this should really get a max h or w and base size on the bounding box *}
 	{assign var=height value=$attachment.preferences.height}
 	{assign var=width value=$attachment.preferences.width}
@@ -22,4 +22,4 @@
 	{/foreach}
 </div>
 {/strip}
-{include file="bitpackage:liberty/mime_meta_inc.tpl"}
\ No newline at end of file
+{include file="bitpackage:liberty/mime_meta_inc.tpl"}
diff --git a/templates/mime/image/admin.tpl b/templates/mime/image/admin.tpl
index b16090c..ffeabcd 100644
--- a/templates/mime/image/admin.tpl
+++ b/templates/mime/image/admin.tpl
@@ -11,7 +11,7 @@
 				{if $feature == 'mime_image_panoramas' && $image_processor_warning}
 					{formfeedback warning="This feature is only available when using the magickwand image processor."}
 				{/if}
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label=`$output.label` for=$feature}
 					{forminput}
 						{if $output.type == 'checkbox'}
@@ -28,7 +28,7 @@
 				</div>
 			{/foreach}
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Panorama Size" for="mime_image_panorama_width"}
 				{forminput}
 					{html_options values=$panWidth options=$panWidth name="mime_image_panorama_width" id="mime_image_panorama_width" selected=$gBitSystem->getConfig('mime_image_panorama_width')|default:3000} {tr}pixels{/tr}
@@ -36,7 +36,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				<input type="submit" name="settings_store" value="{tr}Change preferences{/tr}" />
 			</div>
 		{/form}
diff --git a/templates/mime/image/edit.tpl b/templates/mime/image/edit.tpl
index 366cd10..557bdca 100644
--- a/templates/mime/image/edit.tpl
+++ b/templates/mime/image/edit.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if $gBitSystem->isFeatureActive( 'mime_image_panoramas' )}
-	<div class="control-group">
+	<div class="form-group">
 		<label class="checkbox">
 			<input type="checkbox" value="y" name="plugin[{$attachment.attachment_id}][mimeimage][preference][is_panorama]" id="panorama" {if $attachment.thumbnail_url.panorama}checked="checked"{/if} />Panorama Image
 			{formhelp note="If this image is a 360&deg; panoramic image with equirectangular projection, check this box. This works best for images with a 360&deg; by 180&deg; field of view (FOV)"}
diff --git a/templates/mime/pbase/upload.tpl b/templates/mime/pbase/upload.tpl
index d3886f3..25358eb 100644
--- a/templates/mime/pbase/upload.tpl
+++ b/templates/mime/pbase/upload.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if $gBitUser->hasPermission('p_liberty_attach_attachments') }
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="PBase image ID"}
 		{forminput}
 			<input type="input" name="mimeplugin[{$smarty.const.PLUGIN_MIME_GUID_PBASE}][pbase_id]" size="10" />
diff --git a/templates/mime/pdf/admin.tpl b/templates/mime/pdf/admin.tpl
index f4748ea..ec7e5fe 100644
--- a/templates/mime/pdf/admin.tpl
+++ b/templates/mime/pdf/admin.tpl
@@ -18,7 +18,7 @@
 			{formfeedback hash=$feedback}
 
 			{foreach from=$pdfSettings key=feature item=output}
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label=`$output.label` for=$feature}
 					{forminput}
 						{if $output.type == 'checkbox'}
@@ -31,7 +31,7 @@
 				</div>
 			{/foreach}
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				<input type="submit" name="settings_store" value="{tr}Change preferences{/tr}" />
 			</div>
 		{/form}
diff --git a/templates/mime/pdf/view.tpl b/templates/mime/pdf/view.tpl
index 464a6f2..db2b9c2 100644
--- a/templates/mime/pdf/view.tpl
+++ b/templates/mime/pdf/view.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if $attachment.media_url}
-	<div class="control-group aligncenter">
+	<div class="form-group aligncenter">
 		<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" width="800" height="600" id="viewer" align="middle">
 			<param name="allowScriptAccess" value="sameDomain" />
 			<param name="movie" value="{$attachment.media_url}" />
diff --git a/templates/mime/video/admin.tpl b/templates/mime/video/admin.tpl
index 7196f17..a1874c2 100644
--- a/templates/mime/video/admin.tpl
+++ b/templates/mime/video/admin.tpl
@@ -25,7 +25,7 @@
 			{/if}
 
 			{formfeedback hash=$feedback}
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Path to ffmpeg" for="ffmpeg_path"}
 				{forminput}
 					<input type='text' name="ffmpeg_path" id="ffmpeg_path" size="40" value="{$gBitSystem->getConfig('ffmpeg_path')|escape|default:$ffmpeg_path}" />
@@ -33,7 +33,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Video codec" for="mime_video_video_codec"}
 				{forminput}
 					{html_options
@@ -51,7 +51,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Force encode" for="mime_video_force_encode"}
 				{forminput}
 					<input type='checkbox' name="mime_video_force_encode" id="mime_video_force_encode" value="y" {if $gBitSystem->isFeatureActive('mime_video_force_encode')}checked="checked"{/if} />
@@ -59,7 +59,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Path to MP4Box" for="mp4box_path"}
 				{forminput}
 					<input type='text' name="mp4box_path" id="mp4box_path" size="40" value="{$gBitSystem->getConfig('mp4box_path')|escape|default:$mp4box_path}" />
@@ -67,7 +67,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Video bitrate" for="mime_video_video_bitrate"}
 				{forminput}
 					{html_options
@@ -80,7 +80,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Video width" for="mime_video_width"}
 				{forminput}
 					{html_options
@@ -93,7 +93,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Audio sample rate" for="mime_video_audio_samplerate"}
 				{forminput}
 					{html_options
@@ -106,7 +106,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Audio bitrate" for="mime_video_audio_bitrate"}
 				{forminput}
 					{html_options
@@ -119,7 +119,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Default displayed size" for="mime_video_default_size"}
 				{forminput}
 					{html_options
@@ -132,7 +132,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Foreground Colour" for="mime_video_frontcolor"}
 				{forminput}
 					<input type='text' name="mime_video_frontcolor" id="mime_video_frontcolor" size="10" value="{$gBitSystem->getConfig('mime_video_frontcolor')|default:"FFFFFF"}" />
@@ -140,7 +140,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Background Colour" for="mime_video_backcolor"}
 				{forminput}
 					<input type='text' name="mime_video_backcolor" id="mime_video_backcolor" size="10" value="{$gBitSystem->getConfig('mime_video_backcolor')|default:"000000"}" />
@@ -152,7 +152,7 @@
 				{booticon iname="icon-warning-sign"   iexplain="Warning"} {tr}ffmpeg has a habit of changing the API when releasing new versions. Due to the demand for new features and the tendency to use cutting edge versions of ffmpeg it is very difficult to keep track of these API changes.{/tr}
 			</p>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="MP3 Library" for="ffmpeg_mp3_lib"}
 				{forminput}
 					{html_options
@@ -165,7 +165,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Motion estimation parameter" for="ffmpeg_me_method"}
 				{forminput}
 					{html_options
@@ -178,7 +178,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				<input type="submit" name="plugin_settings" value="{tr}Save Plugin Settings{/tr}" />
 			</div>
 		{/form}
diff --git a/templates/mime/video/edit.tpl b/templates/mime/video/edit.tpl
index fa6d081..44eb818 100644
--- a/templates/mime/video/edit.tpl
+++ b/templates/mime/video/edit.tpl
@@ -6,7 +6,7 @@
 {assign var=cin1  value=1.85}
 {assign var=cin2  value=2.39}
 
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Set Aspect Ratio" for="aspect"}
 	{forminput}
 		<select name="plugin[{$attachment.attachment_id}][mimevideo][meta][aspect]" id="aspect">
diff --git a/templates/mime/video/view.tpl b/templates/mime/video/view.tpl
index 661187a..dd75c3e 100644
--- a/templates/mime/video/view.tpl
+++ b/templates/mime/video/view.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if $attachment.media_url}
-	<div class="control-group aligncenter">
+	<div class="form-group aligncenter">
 		{include file="bitpackage:liberty/mime/video/player.tpl"}
 	</div>
 
@@ -12,7 +12,7 @@
 		{/foreach}
 	</div>
 {elseif $attachment.status.processing}
-	<div class="control-group aligncenter">
+	<div class="form-group aligncenter">
 		<a href="{$attachment.download_url}">
 			{assign var=size value=$gBitSystem->getConfig('treasury_item_view_thumb')}
 			<img src="{$attachment.thumbnail_url.$size}{$refresh}" alt="{$gContent->getTitle()}" title="{$gContent->getTitle()}" />
@@ -21,7 +21,7 @@
 	</div>
 	{formfeedback warning="{tr}The video is being processed. please try to reload in a couple of minutes.{/tr}"}
 {elseif $attachment.status.error}
-	<div class="control-group aligncenter">
+	<div class="form-group aligncenter">
 		<a href="{$attachment.download_url}">
 			{assign var=size value=$gBitSystem->getConfig('treasury_item_view_thumb')}
 			<img src="{$attachment.thumbnail_url.$size}{$refresh}" alt="{$gContent->getTitle()}" title="{$gContent->getTitle()}" />
@@ -32,7 +32,7 @@
 {/if}
 
 {if $attachment.meta.duration}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Duration" for=""}
 		{forminput}
 			{$attachment.meta.duration|display_duration}
diff --git a/templates/mime_meta_inc.tpl b/templates/mime_meta_inc.tpl
index 2d6ef91..2bb3235 100644
--- a/templates/mime_meta_inc.tpl
+++ b/templates/mime_meta_inc.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Uploaded by" for=""}
 	{forminput}
 		{displayname user_id=$attachment.user_id}
@@ -7,14 +7,14 @@
 </div>
 
 {if $display && $attachment.display_url}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="View" for=""}
 		{forminput}
 			<a href="{$attachment.display_url}">{$attachment.file_name}</a>
 		{/forminput}
 	</div>
 {elseif $attachment.download_url}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Download" for=""}
 		{forminput}
 			<a href="{$attachment.download_url}">{$attachment.file_name}</a> <small>({$attachment.mime_type} &bull; {$attachment.file_size|display_bytes})</small>
@@ -22,14 +22,14 @@
 	</div>
 {/if}
 
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Downloads" for=""}
 	{forminput}
 		{$attachment.downloads|default:"{tr}none{/tr}"}
 	{/forminput}
 </div>
 
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Last Modified" for=""}
 	{forminput}
 		{$attachment.last_modified|bit_long_datetime}
@@ -37,7 +37,7 @@
 </div>
 
 {if $gContent->mInfo.hits}
-	<div class="control-group">
+	<div class="form-group">
 		{formlabel label="Hits" for=""}
 		{forminput}
 			{$gContent->mInfo.hits}
diff --git a/templates/mime_view.tpl b/templates/mime_view.tpl
index 31ebd27..7bcf038 100644
--- a/templates/mime_view.tpl
+++ b/templates/mime_view.tpl
@@ -14,7 +14,7 @@
 				{formfeedback hash=$feedback}
 				{include file=$edit_template preferences=$attachment.preferences}
 
-				<div class="control-group submit">
+				<div class="form-group submit">
 					<input type="hidden" name="attachment_id" value="{$smarty.request.attachment_id}" />
 					<input type="submit" class="btn btn-default" name="plugin_submit" value="{tr}Update File{/tr}" />
 				</div>
@@ -22,14 +22,14 @@
 		{/if}
 
 		{legend legend="Content this attachment belongs to"}
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Title"}
 				{forminput}
 					<a href="{$gContent->getDisplayUrl()}">{$gContent->getTitle()}</a>
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Content Type"}
 				{forminput}
 					{$gContent->getContentTypeName()}
diff --git a/templates/plugins/data_code_admin.tpl b/templates/plugins/data_code_admin.tpl
index 809c971..5c4ace7 100644
--- a/templates/plugins/data_code_admin.tpl
+++ b/templates/plugins/data_code_admin.tpl
@@ -7,7 +7,7 @@
 	<div class="body">
 		{form legend="Code specific settings"}
 			{formfeedback hash=$feedback}
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Default Source" for="liberty_plugin_code_default_source"}
 				{forminput}
 					{html_options
@@ -20,7 +20,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				<input type="submit" name="plugin_settings" value="{tr}Save Plugin Settings{/tr}" />
 			</div>
 		{/form}
diff --git a/templates/plugins/filter_htmlpurifier_admin.tpl b/templates/plugins/filter_htmlpurifier_admin.tpl
index a90f06b..620fdc4 100644
--- a/templates/plugins/filter_htmlpurifier_admin.tpl
+++ b/templates/plugins/filter_htmlpurifier_admin.tpl
@@ -7,7 +7,7 @@
 		{form legend="HTMLPurifier Features"}
 			{formfeedback error=$errorMsg}
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Blacklisted HTML tags" for="blacklisted_html_tags"}
 				{formfeedback warning=$errors.blacklist}
 				{forminput}
@@ -17,7 +17,7 @@
 			</div>
 
 			{foreach from=$htmlPurifier key=item item=output}
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label=`$output.label` for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item, $output.default) labels=false id=$item}
@@ -26,7 +26,7 @@
 				</div>
 			{/foreach}
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				<input type="submit" name="apply" value="{tr}Save Plugin Settings{/tr}" />
 			</div>
 		{/form}
diff --git a/templates/plugins/filter_simplepurifier_admin.tpl b/templates/plugins/filter_simplepurifier_admin.tpl
index ec691b2..b8b0a35 100644
--- a/templates/plugins/filter_simplepurifier_admin.tpl
+++ b/templates/plugins/filter_simplepurifier_admin.tpl
@@ -7,7 +7,7 @@
 		{form legend="Simple HTML Purifier Features"}
 			{formfeedback error=$errorMsg}
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Approved HTML tags" for="approved_html_tags"}
 				{formfeedback warning=$errors.approved}
 				{forminput}
@@ -16,7 +16,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				<input type="submit" name="apply" value="{tr}Save Plugin Settings{/tr}" />
 			</div>
 		{/form}
diff --git a/templates/rankings.tpl b/templates/rankings.tpl
index 3c0eea9..b0f65fc 100644
--- a/templates/rankings.tpl
+++ b/templates/rankings.tpl
@@ -6,7 +6,7 @@
 
 	<div class="body">
 		{form legend="Ranking Settings"}
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Select Attribute" for="sort_mode"}
 				{forminput}
 					<select name="sort_mode" id="sort_mode">
@@ -17,7 +17,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Number of items" for="max_records"}
 				{forminput}
 					<select name="max_records" id="max_records">
@@ -29,7 +29,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				<input type="submit" class="btn btn-default" name="rank_settings" value="{tr}Apply settings{/tr}" />
 			</div>
 		{/form}