Merge with github master

13 files changed, 70 insertions, 70 deletions

diff --git a/templates/admin_boards.tpl b/templates/admin_boards.tpl
index ffe269d..33f72ec 100644
--- a/templates/admin_boards.tpl
+++ b/templates/admin_boards.tpl
@@ -3,7 +3,7 @@
 {*
 	{legend legend="Home Message Board"}
 		<input type="hidden" name="page" value="{$page}" />
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{formlabel label="Home BitBoards (main board)" for="homeBitBoards"}
 			{forminput}
 				<select name="homeBitBoards" id="homeBitBoards">
@@ -16,15 +16,15 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group submit">
-			<input type="submit" class="ink-button" name="homeTabSubmit" value="{tr}Change preferences{/tr}" />
+		<div class="form-group submit">
+			<input type="submit" class="btn btn-default" name="homeTabSubmit" value="{tr}Change preferences{/tr}" />
 		</div>
 	{/legend}
 *}
 	{legend legend="List Settings"}
 		<input type="hidden" name="page" value="{$page}" />
 		{foreach from=$formBitBoardsLists key=item item=output}
-			<div class="control-group column-group gutters">
+			<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}
@@ -35,14 +35,14 @@
 	{/legend}
 
 	{legend legend="Mailing List Synchronization"}
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{forminput}
 		<h2>List to Board Sync</h2>
 		<p>{tr}List to Board Sync allows a bitweaver board to mirror messages that are posted to a mailing list. A single, master email inbox entered below is used for *all* email list subscriptions. Then, configure individual boards to indicate which mailing list to which it is subscribed. The Board Sync cron script will import messages from the master email inbox.{/tr}</p>
 			{/forminput}
 		</div>
 		{foreach from=$formBitBoardsSync key=item item=output}
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label=$output.label for=$item}
 				{forminput}
 					<input type="text" name="{$item}" value="{$gBitSystem->getConfig($item)}" id={$item}" />
@@ -51,21 +51,21 @@
 			</div>
 		{/foreach}
 
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{forminput}
 		<h2>Board to List Sync</h2>
 		<p>{tr}Board to List Sync is the opposite of the above. It allows a bitweaver board to send a message to mailing list. You must complete the "List to Board Sync" configuration above for this feature to work.{/tr} {tr}Please see <a href="http://www.bitweaver.org/wiki/BoardsEmailListConfig">configuration requirements</a> prior to utilizing this feature.{/tr}</p>
 			{/forminput}
 		</div>
 
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{forminput}
 				
 			{/forminput}
 		</div>
 
 		{foreach from=$formGroupEmailList key=item item=output}
-			<div class="control-group column-group gutters">
+			<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}
@@ -74,14 +74,14 @@
 			</div>
 		{/foreach}
 
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{formlabel label="Email Host" for='boards_email_host'}
 			{forminput}
 				<input type="text" name="boards_email_host" value="{$gBitSystem->getConfig('boards_email_host',$gBitSystem->getConfig('kernel_server_name'))}" />
 				{formhelp note="Enter the host name to which all mailing lists will be hosted and addressed."}
 			{/forminput}
 		</div>
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{formlabel label="Administrator Email" for='boards_email_admin'}
 			{forminput}
 				<input type="text" name="boards_email_admin" value="{$gBitSystem->getConfig('boards_email_admin',$gBitSystem->getConfig('site_sender_email'))}" />
@@ -89,7 +89,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{formlabel label="Mailman bin Path" for='server_mailman_bin'}
 			{forminput}
 				<input type="text" name="server_mailman_bin" value="{$gBitSystem->getConfig('server_mailman_bin')|escape}" />
@@ -99,21 +99,21 @@
 				{/if}
 			{/forminput}
 		</div>
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{formlabel label="Mailman Command Path" for='mailman_cmd'}
 			{forminput}
 				<input type="text" name="server_mailman_cmd" value="{$gBitSystem->getConfig('server_mailman_cmd', '/usr/lib/mailman/mail/mailman')|escape}" />
 				{formhelp note="Path to mailman binary, typically: /usr/lib/mailman/mail/mailman"}
 			{/forminput}
 		</div>
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{formlabel label="Newaliases command" for='server_newaliases_cmd'}
 			{forminput}
 				<input type="text" name="server_newaliases_cmd" value="{$gBitSystem->getConfig('server_newaliases_cmd', '/usr/bin/newaliases')|escape}" />
 				{formhelp note="Path to the command to tell the mail server to reload the aliases file. For sendmail typically: /usr/bin/newaliases"}
 			{/forminput}
 		</div>
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{formlabel label="MTA Aliases Map" for='server_aliases_file'}
 			{forminput}
 				<input type="text" name="server_aliases_file" value="{$gBitSystem->getConfig('server_aliases_file', '/etc/aliases')|escape}" />
@@ -121,8 +121,8 @@
 			{/forminput}
 		</div>
 	{/legend}
-	<div class="control-group submit">
-		<input type="submit" class="ink-button" name="listTabSubmit" value="{tr}Change preferences{/tr}" />
+	<div class="form-group submit">
+		<input type="submit" class="btn btn-default" name="listTabSubmit" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
 {/strip}
diff --git a/templates/board_assign.tpl b/templates/board_assign.tpl
index b7d31e6..cacd5f1 100644
--- a/templates/board_assign.tpl
+++ b/templates/board_assign.tpl
@@ -7,7 +7,7 @@
 	<div class="body">
 		{if $data.umap}
 			{form legend="Assign Content"}
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Add Content" for="assign"}
 					{forminput}
 						<select id="assign" name="assign[]" multiple="multiple" size="12">
@@ -23,7 +23,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Assign to Board" for="to_board_id"}
 					{forminput}
 						<select name="to_board_id" id="to_board_id">
@@ -35,8 +35,8 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group submit">
-					<input type="submit" class="ink-button" value="{tr}Assign Content to Board{/tr}" name="action" />
+				<div class="form-group submit">
+					<input type="submit" class="btn btn-default" value="{tr}Assign Content to Board{/tr}" name="action" />
 				</div>
 			{/form}
 		{else}
@@ -84,8 +84,8 @@
 						{/foreach}
 					</table>
 
-					<div class="control-group submit">
-						<input type="submit" class="ink-button" value="{tr}Remove{/tr}" name="action" />
+					<div class="form-group submit">
+						<input type="submit" class="btn btn-default" value="{tr}Remove{/tr}" name="action" />
 					</div>
 				{/form}
 			{/if}
diff --git a/templates/board_edit.tpl b/templates/board_edit.tpl
index 8fc6a94..e4d97d4 100644
--- a/templates/board_edit.tpl
+++ b/templates/board_edit.tpl
@@ -45,7 +45,7 @@
 					{legend legend=$leg}
 						<input type="hidden" name="bitboard[board_id]" value="{$gContent->mInfo.board_id}" />
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Title" for="title"}
 							{forminput}
 								<input type="text" size="50" maxlength="200" name="bitboard[title]" id="title" value="{$gContent->getTitle()|escape}" />
@@ -64,8 +64,8 @@
 			{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_tab_tpl"}
 		{/jstabs}
 
-		<div class="control-group submit">
-			<input type="submit" class="btn btn-primary" name="save_bitboard" value="{tr}Save{/tr}" /> <input type="submit" class="ink-button" name="preview" value="{tr}Preview{/tr}" />
+		<div class="form-group submit">
+			<input type="submit" class="btn btn-primary" name="save_bitboard" value="{tr}Save{/tr}" /> <input type="submit" class="btn btn-default" name="preview" value="{tr}Preview{/tr}" />
 		</div>
 	</div><!-- end .body -->
 </div><!-- end .boards -->
diff --git a/templates/boards_edit_mini_inc.tpl b/templates/boards_edit_mini_inc.tpl
index ed16625..6392b27 100644
--- a/templates/boards_edit_mini_inc.tpl
+++ b/templates/boards_edit_mini_inc.tpl
@@ -1,6 +1,6 @@
 {if $gBitUser->hasPermission('p_boards_link_content') && $gContent->mContentTypeGuid != $smarty.const.BITBOARD_CONTENT_TYPE_GUID}
 {* {$gContent->mContentTypeGuid} *}
-<div class="control-group column-group gutters">
+<div class="form-group">
 	{formlabel label="Linked Board"}
 	{forminput}
 		{if $boardList}
diff --git a/templates/boards_rss_form.tpl b/templates/boards_rss_form.tpl
index c31fc3d..4601f51 100644
--- a/templates/boards_rss_form.tpl
+++ b/templates/boards_rss_form.tpl
@@ -23,7 +23,7 @@
 					<hr />
 				{/if}
 
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Feed Format" for="format"}
 					{forminput}
 						{html_options name=format id=format values=$feedFormat options=$feedFormat selected=$feedlink.format}
@@ -31,7 +31,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Feed" for="pkg"}
 					{forminput}
 						{if $gContent->isValid()}{tr}{$gContent->getField('title')} Feed{/tr}{else}{tr}Recent Discussions{/tr}{/if}
@@ -39,8 +39,8 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="get_feed" value="Get Feed" />
+				<div class="form-group submit">
+					<input type="submit" class="btn btn-default" name="get_feed" value="Get Feed" />
 				</div>
 			{/legend}
 		{/form}
diff --git a/templates/comment_post.tpl b/templates/comment_post.tpl
index 6d0c201..072fb61 100644
--- a/templates/comment_post.tpl
+++ b/templates/comment_post.tpl
@@ -22,7 +22,7 @@
 					<input type="hidden" name="post_comment_reply_id" value="{$post_comment_reply_id}" />
 				    <input type="hidden" name="post_comment_id" value="{$post_comment_id}" />
 
-					<div class="control-group column-group gutters">
+					<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}" />
@@ -35,10 +35,10 @@
 					{/capture}
 					{textarea noformat=1 label="Comment" id="commentpost" name="comment_data" rows="6" edit=$postComment.data}
 
-					<div class="control-group submit">
-						<input type="submit" class="ink-button" name="post_comment_preview" value="{tr}Preview{/tr}"/>&nbsp;
-						<input type="submit" class="ink-button" name="post_comment_submit" value="{tr}Post{/tr}"/>&nbsp;
-						<input type="submit" class="ink-button" name="post_comment_cancel" value="{tr}Cancel{/tr}"/>
+					<div class="form-group submit">
+						<input type="submit" class="btn btn-default" name="post_comment_preview" value="{tr}Preview{/tr}"/>&nbsp;
+						<input type="submit" class="btn btn-default" name="post_comment_submit" value="{tr}Post{/tr}"/>&nbsp;
+						<input type="submit" class="btn btn-default" name="post_comment_cancel" value="{tr}Cancel{/tr}"/>
 					</div>
 				{/legend}
 			{/if}
diff --git a/templates/legend_inc.tpl b/templates/legend_inc.tpl
index debe9b2..be1d11a 100644
--- a/templates/legend_inc.tpl
+++ b/templates/legend_inc.tpl
@@ -1,7 +1,7 @@
 {strip}
 {if $topicicons}
 <div class="alert alert-info">
-<ul class="inline unstyled">
+<ul class="list-inline list-unstyled">
 		<li>{booticon iname="icon-lock" ipackage="icons" ipath=large iexplain="Thread Closed" iforce="icon"} {tr}Thread Closed{/tr}</li>
 		<li>{booticon iname="icon-exclamation-sign" ipackage="icons" ipath=large iexplain="Sticky" iforce="icon"} {tr}Sticky{/tr}</li>
 		<li>{booticon iname="icon-asterisk" ipackage="icons" ipath=large iexplain="New Posts" iforce="icon"} {tr}New Posts{/tr}</li>
diff --git a/templates/list_posts.tpl b/templates/list_posts.tpl
index 7a26b10..3d3cedd 100644
--- a/templates/list_posts.tpl
+++ b/templates/list_posts.tpl
@@ -53,8 +53,8 @@
 
 	<div class="body">
 		{if !$topic_locked && $board->hasPostCommentsPermission()}
-			<div class="control-group submit">
-				<a title="{tr}Post Reply{/tr}" class="ink-button" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{booticon iname="icon-comment-alt"  ipackage="icons"  iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
+			<div class="form-group submit">
+				<a title="{tr}Post Reply{/tr}" class="btn btn-default" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{booticon iname="icon-comment-alt"  ipackage="icons"  iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
 			</div>
 		{/if}
 
@@ -81,8 +81,8 @@
 		{/if}
 
 		{if !$topic_locked && $board->hasPostCommentsPermission()}
-			<div class="control-group submit">
-				<a title="{tr}Post Reply{/tr}" class="ink-button" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{booticon iname="icon-comment-alt"  ipackage="icons"  iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
+			<div class="form-group submit">
+				<a title="{tr}Post Reply{/tr}" class="btn btn-default" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{booticon iname="icon-comment-alt"  ipackage="icons"  iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
 			</div>
 		{/if}
 
diff --git a/templates/list_topics.tpl b/templates/list_topics.tpl
index ef9605d..fdbc637 100644
--- a/templates/list_topics.tpl
+++ b/templates/list_topics.tpl
@@ -50,7 +50,7 @@
 						<th style="width:5%;"> 
 							{form class="form-inline" action="`$comments_return_url`#editcomments"}
 							<input type="hidden" name="post_comment_request" value="1" />
-							<input type="submit" class="btn btn-mini btn-primary" value="{tr}New Topic{/tr}" />
+							<input type="submit" class="btn btn-xs btn-primary" value="{tr}New Topic{/tr}" />
 							{/form}
 						</th>
 						<th style="width:40%;">{tr}Title{/tr}</th>
@@ -144,7 +144,7 @@
 						{/if}
 					</select>
 
-					<noscript><div><input type="submit" class="ink-button" value="{tr}Submit{/tr}" /></div></noscript>
+					<noscript><div><input type="submit" class="btn btn-default" value="{tr}Submit{/tr}" /></div></noscript>
 				</div>
 			{/if}
 		{/form}
diff --git a/templates/mailing_list.tpl b/templates/mailing_list.tpl
index 33d7c27..29fd8bb 100644
--- a/templates/mailing_list.tpl
+++ b/templates/mailing_list.tpl
@@ -11,7 +11,7 @@
 
 {jstab title="Mailing List Information"}
 {if $board->getPreference('boards_mailing_list')}
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Address"}
 		{forminput}
 			{$board->getPreference('boards_mailing_list')}@{$gBitSystem->getConfig('boards_email_host',$gBitSystem->getConfig('kernel_server_name'))}
@@ -19,15 +19,15 @@
 	</div>
 	{form}
 	<input type="hidden" name="b" value="{$board->getField('board_id')}"/>
-	<div class="control-group column-group gutters">
+	<div class="control-group">
 		{formlabel label="Subscribe"}
 		{forminput}
 			{if mailman_findmember($board->getPreference('boards_mailing_list'),$gBitUser->getField('email'))}
 				<p>{tr}You are currently subscribed to the mailing list using the email:{/tr} {$gBitUser->getField('email')}</p>
-				<input type="submit" class="ink-button" name="unsubscribe" value="Unsubscribe" />
+				<input type="submit" class="btn btn-default" name="unsubscribe" value="Unsubscribe" />
 			{else}
 				<p>{tr}You are currently not subscribed to the mailing list.{/tr}</p>
-				<input type="submit" class="ink-button" name="subscribe" value="Subscribe" />
+				<input type="submit" class="btn btn-default" name="subscribe" value="Subscribe" />
 			{/if}
 		{/forminput}
 	</div>
@@ -63,7 +63,7 @@
 	{form}
 	<input type="hidden" name="b" value="{$board->getField('board_id')}"/>
 	{if $gBitSystem->getConfig('boards_sync_mail_server')}
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Mailing List Address" for="boardsync"}
 		{forminput}
 			<input type="text" size="50" maxlength="200" name="board_sync_list_address" id="board_sync_list_address" value="{$gContent->getPreference('board_sync_list_address')|escape}" />
@@ -71,7 +71,7 @@
 				{formfeedback warning="The Mailing List Address does not match the configured board mailing list."}
 			{/if}
 			{formhelp note="All messages posted to this email address will mirrored on the board. The 'Board Sync Inbox' email account must be subscribed to this list and receive the messages in its INBOX."}
-			<input type="submit" class="ink-button" name="save_list_address" value="Save" />
+			<input type="submit" class="btn btn-default" name="save_list_address" value="Save" />
 		{/forminput}
 	</div>
 	<div>
@@ -82,21 +82,21 @@
 		{/forminput}
 	</div>
 {if $board->getPreference('boards_mailing_list')}
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Subscribe"}
 		{forminput}
 			{if mailman_findmember($board->getPreference('boards_mailing_list'),$boardSyncInbox)}
 				<p>{$boardSyncInbox} {tr}is subscribed to{/tr} {$boardsMailingList}</p>
-				<input type="submit" class="ink-button" name="unsubscribe_boardsync" value="Unsubscribe" />
+				<input type="submit" class="btn btn-default" name="unsubscribe_boardsync" value="Unsubscribe" />
 			{else}
 				<p>{$boardSyncInbox} {tr}is currently not subscribed to the mailing list.{/tr}</p>
-				<input type="submit" class="ink-button" name="subscribe_boardsync" value="Subscribe" />
+				<input type="submit" class="btn btn-default" name="subscribe_boardsync" value="Subscribe" />
 			{/if}
 		{/forminput}
 	</div>
 {/if}
 	{else}
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Board Sync" for="boardsync"}
 		{forminput}
 		{tr}Board Sync is not available since the Board Sync master email box has not been configured.{/tr} {if !$gBitUser->isAdmin()}{tr}Check with your site administrator.{/tr}{/if}
@@ -111,18 +111,18 @@
 	{form}
 	<input type="hidden" name="b" value="{$board->getField('board_id')}"/>
 {if $board->getPreference('boards_mailing_list')}
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Address"}
 		{forminput}
 			{$board->getPreference('boards_mailing_list')}@{$gBitSystem->getConfig('boards_email_host',$gBitSystem->getConfig('kernel_server_name'))}
 		{/forminput}
 	</div>
-	<div class="control-group submit">
+	<div class="form-group submit">
 		{forminput}
-			<input type="submit" class="ink-button" name="delete_list" value="Delete List" />
+			<input type="submit" class="btn btn-default" name="delete_list" value="Delete List" />
 		{/forminput}
 	</div>
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Advanced Configuration"}
 		{forminput}
 			<a href="{$gBitSystem->getConfig('boards_mailman_uri',"`$smarty.const.BIT_ROOT_URI`mailman/")}admin/{$board->getPreference('boards_mailing_list')}">
@@ -133,23 +133,23 @@
 	{if $gBitSystem->getConfig('server_mailman_bin') && $gBitSystem->getConfig('boards_sync_user') && $gBitSystem->getConfig('boards_sync_mail_server')}
 {legend legend="Group Mailing List"}
 	<input type="hidden" name="b" value="{$board->getField('board_id')}"/>
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Mailing List Address" for='emailhost'}
 		{forminput}
 			<input type="text" name="boards_mailing_list" value="{$smarty.request.boards_mailing_list|default:$suggestedListName}" /> <strong> @ {$gBitSystem->getConfig('boards_email_host',$gBitSystem->getConfig('kernel_server_name'))} </strong>
 			{formhelp note="This is the email address for the group. It needs to be all lowercase alpha-numeric characters."}
 		{/forminput}
 	</div>
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Administrator Password" for='emailhost'}
 		{forminput}
 			<input type="text" name="boards_mailing_list_password" value="{$smarty.request.boards_mailing_list_password}" />
 			{formhelp note="This is the password used to administer the mailing list."}
 		{/forminput}
 	</div>
-	<div class="control-group submit">
+	<div class="form-group submit">
 		{forminput}
-			<input type="submit" class="ink-button" name="create_list" value="Create List" />
+			<input type="submit" class="btn btn-default" name="create_list" value="Create List" />
 		{/forminput}
 	</div>
 {/legend}
diff --git a/templates/post_display.tpl b/templates/post_display.tpl
index 923bbce..3279ef0 100644
--- a/templates/post_display.tpl
+++ b/templates/post_display.tpl
@@ -61,7 +61,7 @@
 									<textarea style="vertical-align: top;" rows="3" cols="10" name="warning_message" onclick="this.value=''; this.innerHTML=''; this.onclick=null;">
 										Enter Warning Message
 									</textarea>
-									<input type="submit" class="ink-button" value="Warn" />
+									<input type="submit" class="btn btn-default" value="Warn" />
 								{/form}
 							</div>
 						{/if}
diff --git a/templates/topic_move.tpl b/templates/topic_move.tpl
index 4b5ab7c..2d7e2ab 100644
--- a/templates/topic_move.tpl
+++ b/templates/topic_move.tpl
@@ -12,7 +12,7 @@
 			{assign var=title value=$gContent->mInfo.title|escape}
 			<input type="hidden" name="ref" value="-" />
 			<input type="hidden" name="t" value="{$smarty.request.t}" />
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="To Board" for="target"}
 				{forminput}
 					<select name="target" id="target">
@@ -26,8 +26,8 @@
 					</select>
 				{/forminput}
 			</div>
-			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="move_thread" value="{tr}Move Topic{/tr}" />
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="move_thread" value="{tr}Move Topic{/tr}" />
 			</div>
 		{/form}
 	</div><!-- end .body -->
diff --git a/templates/user_preferences_inc.tpl b/templates/user_preferences_inc.tpl
index c3caf07..ffe20a7 100644
--- a/templates/user_preferences_inc.tpl
+++ b/templates/user_preferences_inc.tpl
@@ -6,7 +6,7 @@
 		{form legend="Simple Settings"}
 			<input type="hidden" name="view_user" value="{$view_user}" />
 			{foreach from=$boardsSettings key=option item=output}
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{assign var='pref' value=$output.pref}
 					{if $userPrefs.$pref == null}
 						{assign var='value' value=$output.default}
@@ -24,8 +24,8 @@
 					{/forminput}
 				</div>
 			{/foreach}
-			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="boards[submit]" value="{tr}Change Settings{/tr}" />
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="boards[submit]" value="{tr}Change Settings{/tr}" />
 			</div>
 		{/form}
 		{/if}
@@ -34,8 +34,8 @@
 			<input type="hidden" name="view_user" value="{$view_user}" />
 			{formfeedback warning=$error}
 			{textarea gContent=$signatureContent name="bitboarduprefs[edit]" rows=4 edit=$editUser->getPreference('signature_content_data')}
-			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="preview" value="{tr}Preview{/tr}" /> <input type="submit" name="save_bitboarduprefs" value="{tr}Save{/tr}" />
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="preview" value="{tr}Preview{/tr}" /> <input type="submit" name="save_bitboarduprefs" value="{tr}Save{/tr}" />
 			</div>
 		{/form}