diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index c9b8f8a70..0a48a99ca 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -97,7 +97,7 @@ class admin_shortcodes
 		if (!ADMIN) { return ''; }
 		return "
 		<div style='text-align: center'>
-		<input class='btn button' type='button' onclick=\"javascript: window.open('".e_ADMIN_ABS."credits.php', 'myWindow', 'status = 1, height = 400, width = 300, resizable = 0')\" value='".LAN_CREDITS."' />
+		<input class='btn btn-default button' type='button' onclick=\"javascript: window.open('".e_ADMIN_ABS."credits.php', 'myWindow', 'status = 1, height = 400, width = 300, resizable = 0')\" value='".LAN_CREDITS."' />
 		</div>";
 	}
 
@@ -310,7 +310,7 @@ class admin_shortcodes
 		{
 			$text .= $sql->mySQLlanguage;
 			$text .= " (".$slng->convert($sql->mySQLlanguage).")
-			: <span class='btn button' style='cursor: pointer;' onclick='expandit(\"lan_tables\");'><a style='text-decoration:none' title='' href=\"javascript:void(0);\" >&nbsp;&nbsp;".count($aff)." ".UTHEME_MENU_L3."&nbsp;&nbsp;</a></span><br />
+			: <span class='btn btn-default button' style='cursor: pointer;' onclick='expandit(\"lan_tables\");'><a style='text-decoration:none' title='' href=\"javascript:void(0);\" >&nbsp;&nbsp;".count($aff)." ".UTHEME_MENU_L3."&nbsp;&nbsp;</a></span><br />
 			<span style='display:none' id='lan_tables'>
 			";
 			$text .= implode('<br />', $aff);
diff --git a/e107_core/shortcodes/batch/contact_shortcodes.php b/e107_core/shortcodes/batch/contact_shortcodes.php
index 9b4266087..94f96990f 100644
--- a/e107_core/shortcodes/batch/contact_shortcodes.php
+++ b/e107_core/shortcodes/batch/contact_shortcodes.php
@@ -126,7 +126,7 @@ class contact_shortcodes extends e_shortcode
 	
 	function sc_contact_submit_button($parm='')
 	{
-		return "<input type='submit' name='send-contactus' value=\"".LANCONTACT_08."\" class='btn button' />";	
+		return "<input type='submit' name='send-contactus' value=\"".LANCONTACT_08."\" class='btn btn-primary button' />";	
 	}
 
 }
diff --git a/e107_core/shortcodes/batch/signup_shortcodes.php b/e107_core/shortcodes/batch/signup_shortcodes.php
index 5099f5061..623c6be40 100755
--- a/e107_core/shortcodes/batch/signup_shortcodes.php
+++ b/e107_core/shortcodes/batch/signup_shortcodes.php
@@ -35,7 +35,7 @@ class signup_shortcodes extends e_shortcode
 		<input type='radio' name='coppa' value='0' checked='checked' /> ".LAN_NO."
 		<input type='radio' name='coppa' value='1' /> ".LAN_YES."<br />
 		<br />
-		<input class='btn button' type='submit' name='newver' value=\"".LAN_CONTINUE."\" />
+		<input class='btn btn-primary button' type='submit' name='newver' value=\"".LAN_CONTINUE."\" />
 		</div></form>
 		";
 		}
diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php
index e5412cdd7..54c7bf7b7 100644
--- a/e107_core/shortcodes/batch/user_shortcodes.php
+++ b/e107_core/shortcodes/batch/user_shortcodes.php
@@ -582,7 +582,7 @@ class user_shortcodes extends e_shortcode
 		{
 			return "
 			<form method='post' action='".e_SELF."?".e_QUERY."'>
-			<input class='btn button' type='submit' name='delp' value='".LAN_USER_43."' />
+			<input class='btn btn-default button' type='submit' name='delp' value='".LAN_USER_43."' />
 			</form>
 			";
 		}
@@ -731,7 +731,7 @@ class user_shortcodes extends e_shortcode
 	
 	function sc_user_form_submit($parm) 
 	{
-		return "<input class='btn button' type='submit' name='submit' value='".LAN_USER_47."' />";
+		return "<input class='btn btn-default button' type='submit' name='submit' value='".LAN_USER_47."' />";
 	}
 
 
diff --git a/e107_core/shortcodes/single/custom.php b/e107_core/shortcodes/single/custom.php
index 3bf1203a0..49ccb542c 100644
--- a/e107_core/shortcodes/single/custom.php
+++ b/e107_core/shortcodes/single/custom.php
@@ -27,7 +27,7 @@ function custom_shortcode($parm)
 			{
 				$ret .= "<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."'>\n<div class='loginc_div'>\n".LOGIN_MENU_L1."<input class='tbox loginc user' type='text' name='username' size='15' value='$username' maxlength='20' />&nbsp;&nbsp;\n".LOGIN_MENU_L2."<input class='tbox loginc pass' type='password' name='userpass' size='15' value='' maxlength='20' />&nbsp;&nbsp;\n";
 				$ret .= ($pref['user_tracking'] == "cookie") ? "<input type='checkbox' name='autologin' value='1' />".LOGIN_MENU_L6."&nbsp;&nbsp;\n" : "";
-				$ret .= "<input class='btn button loginc' type='submit' name='userlogin' value='".LOGIN_MENU_L28."' />";
+				$ret .= "<input class='btn btn-default button loginc' type='submit' name='userlogin' value='".LOGIN_MENU_L28."' />";
 				if($pref['user_reg'])
 				{
 					$ret .= "&nbsp;&nbsp;<a class='loginc signup' href='".e_SIGNUP."'>".LOGIN_MENU_L3."</a>";
diff --git a/e107_core/templates/search_template.php b/e107_core/templates/search_template.php
index 1b48e5678..a381bc54a 100644
--- a/e107_core/templates/search_template.php
+++ b/e107_core/templates/search_template.php
@@ -13,7 +13,7 @@ if(!isset($SEARCH_SHORTCODE))
 {
 
 	$SEARCH_SHORTCODE = "<input class='tbox search' type='text' name='q' size='20' value='' maxlength='50' />
-	<input class='btn button search' type='submit' name='s' value=\"".LAN_180."\" />";
+	<input class='btn btn-default button search' type='submit' name='s' value=\"".LAN_180."\" />";
 
 	/*  // Image Version Example
 	$SEARCH_SHORTCODE = "<input class='tbox search' type='text' name='q' size='20' value='Default Value' maxlength='50' onclick=\"this.value=''\" />
diff --git a/e107_handlers/mailout_admin_class.php b/e107_handlers/mailout_admin_class.php
index bf69fd2d7..4877f0c6e 100644
--- a/e107_handlers/mailout_admin_class.php
+++ b/e107_handlers/mailout_admin_class.php
@@ -984,7 +984,7 @@ class mailoutAdminClass extends e107MailManager
 			$text .= $frm->hidden('mail_source_id',$email_id);
 			$text .= $frm->admin_button('update_email',LAN_UPDATE);
 			//$text .= "<input type='hidden' name='mail_source_id' value='".$email_id."' />";
-			//$text .= "<input class='btn button' type='submit' name='update_email' value=\"".LAN_UPDATE."\" />";
+			//$text .= "<input  type='submit' name='update_email' value=\"".LAN_UPDATE."\" />";
 		}
 		else
 		{
@@ -1386,14 +1386,14 @@ class mailoutAdminClass extends e107MailManager
 		$text .= $frm->admin_button('email_sendnow',"Send Now");
 		$text .= $frm->admin_button('email_send',"Send Later");
 		
-		// $text .= "<input class='btn button' type='submit' name='email_send' value=\"".LAN_SEND."\" />";
+		// $text .= "<input  type='submit' name='email_send' value=\"".LAN_SEND."\" />";
 		
 		if (!$fromHold)
 		{
 			$text .= $frm->admin_button('email_hold',LAN_HOLD);
 			$text .= $frm->admin_button('email_cancel',LAN_CANCEL);
-			// $text .= "&nbsp;<input class='btn button' type='submit' name='email_hold' value=\"".LAN_HOLD."\" />";
-			// $text .= "&nbsp;<input class='btn button' type='submit' name='email_cancel' value=\"".LAN_CANCEL."\" />";
+			// $text .= "&nbsp;<input  type='submit' name='email_hold' value=\"".LAN_HOLD."\" />";
+			// $text .= "&nbsp;<input  type='submit' name='email_cancel' value=\"".LAN_CANCEL."\" />";
 		}
 		$text .= "</div>
 		</form>
diff --git a/e107_handlers/phpmailer/mailout_process.php b/e107_handlers/phpmailer/mailout_process.php
index 9fbc46c12..90a8e7494 100644
--- a/e107_handlers/phpmailer/mailout_process.php
+++ b/e107_handlers/phpmailer/mailout_process.php
@@ -51,7 +51,7 @@ if($_POST['cancel_emails'])
 
     $text = "<div style='text-align:center;width:220px'><br />".LAN_MAILOUT_66;   // Cancelled Successfully;
     $text .= "<div style='text-align:center;margin-left:auto;margin-right:auto;position:absolute;left:10px;top:110px'>
-	<br /><input type='button' class='btn button' name='close' value='Close' onclick=\"window.close()\" />
+	<br /><input type='button' class='btn btn-primary button' name='close' value='Close' onclick=\"window.close()\" />
      </div></div>";
 
     $ns -> tablerender(LAN_MAILOUT_59, $text);
@@ -244,7 +244,7 @@ $email_info = unserialize($row['gen_chardata']);		// Gives us sender_name, sende
 		echo "<div style='text-align:center;width:200px'><br />".LAN_MAILOUT_61."</div>";
 		echo "</body></html>";
         echo "<div style='text-align:center;margin-left:auto;margin-right:auto;position:absolute;left:10px;top:110px'>
-			<input type='button' class='btn button' name='close' value='Close' onclick=\"window.close()\" />
+			<input type='button' class='btn btn-default button' name='close' value='Close' onclick=\"window.close()\" />
     		 </div>";
 		exit;
 	}
@@ -407,7 +407,7 @@ $email_info = unserialize($row['gen_chardata']);		// Gives us sender_name, sende
 	}
 
 echo "<div style='text-align:center;margin-left:auto;margin-right:auto;position:absolute;left:10px;top:110px'>
-	<br /><input type='button' class='btn button' name='close' value='Close' onclick=\"window.close()\" />
+	<br /><input type='button' class='btn btn-default button' name='close' value='Close' onclick=\"window.close()\" />
      </div>";
 echo "</body></html>";
 
diff --git a/e107_handlers/user_select_class.php b/e107_handlers/user_select_class.php
index 9e365436c..e5e342c2b 100644
--- a/e107_handlers/user_select_class.php
+++ b/e107_handlers/user_select_class.php
@@ -221,7 +221,7 @@ class user_select
 			<table style='width:100%' class='fborder'>
 			<tr>
 			<td class='forumheader3' style='text-align: center'><input type='text' name='srch' class='tbox' value='".$tp -> post_toForm(varset($_POST['srch'],''))."' size='40'>
-			<input class='btn button' type='submit' name='dosrch' class='tbox' value='".US_LAN_6."' /></td>
+			<input class='btn btn-default button' type='submit' name='dosrch' class='tbox' value='".US_LAN_6."' /></td>
 			</tr>
 			</table>
 			</form>
@@ -250,7 +250,7 @@ class user_select
 			}
 			$text .= "
 			</select>
-			<input type='button' class='btn button' value='".US_LAN_1."' onClick='SelectUser()' />
+			<input type='button' class='btn btn-default button' value='".US_LAN_1."' onClick='SelectUser()' />
 			</td>
 
 			</tr>
diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php
index 09fcf60fb..7a2eca8ba 100644
--- a/e107_plugins/banner/admin_banner.php
+++ b/e107_plugins/banner/admin_banner.php
@@ -466,7 +466,7 @@ if ($action == "create")
 	/*					
 						$text .= "
 							<div class='field-spacer'>
-								<button class='btn button action' type='button' value='no-value' onclick='e107Helper.toggle(\"banner-repo\")'><span>".BNRLAN_32."</span></button> 
+								<button class=' button action' type='button' value='no-value' onclick='e107Helper.toggle(\"banner-repo\")'><span>".BNRLAN_32."</span></button> 
 							</div>
 							<div class='e-hideme' id='banner-repo'>
 	";
diff --git a/e107_plugins/chatbox_menu/chat.php b/e107_plugins/chatbox_menu/chat.php
index e7595681f..67602b262 100644
--- a/e107_plugins/chatbox_menu/chat.php
+++ b/e107_plugins/chatbox_menu/chat.php
@@ -154,7 +154,7 @@ $text = $textstart.$textstring.$textend;
 
 if(CB_MOD)
 {
-	$text = "<form method='post' action='".e_SELF."'>".$text."<input type='submit' class='btn button' name='moderate' value='".CHATBOX_L13."' /></form>";
+	$text = "<form method='post' action='".e_SELF."'>".$text."<input type='submit' class='btn btn-default button' name='moderate' value='".CHATBOX_L13."' /></form>";
 }
 
 $parms = "{$chat_total},30,{$from},".e_SELF.'?[FROM]';
diff --git a/e107_plugins/chatbox_menu/chatbox_menu.php b/e107_plugins/chatbox_menu/chatbox_menu.php
index 197e22736..41175f712 100644
--- a/e107_plugins/chatbox_menu/chatbox_menu.php
+++ b/e107_plugins/chatbox_menu/chatbox_menu.php
@@ -242,15 +242,15 @@ else
 	$texta .= "
 	<textarea placeholder=\"".LAN_CHATBOX_100."\" required class='tbox chatbox input-xlarge' id='cmessage' name='cmessage' cols='20' rows='5' style='max-width:97%; ".($cb_width ? "width:".$cb_width.";" : '')." overflow: auto' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'></textarea>
 	<br />
-	<input class='btn button' type='submit' id='chat_submit' name='chat_submit' value='".CHATBOX_L4."' {$oc}/>
+	<input class='btn btn-default button' type='submit' id='chat_submit' name='chat_submit' value='".CHATBOX_L4."' {$oc}/>
 	";
 	
-	// $texta .= "<input class='btn button' type='reset' name='reset' value='".CHATBOX_L5."' />"; // How often do we see these lately? ;-)
+	// $texta .= "<input type='reset' name='reset' value='".CHATBOX_L5."' />"; // How often do we see these lately? ;-)
 
 	if($pref['cb_emote'] && $pref['smiley_activate'])
 	{
 		$texta .= "
-		<input class='btn button' type='button' style='cursor:pointer' size='30' value='".CHATBOX_L14."' onclick=\"expandit('emote')\" />
+		<input class='btn btn-default button' type='button' style='cursor:pointer' size='30' value='".CHATBOX_L14."' onclick=\"expandit('emote')\" />
 		<div class='well' style='display:none' id='emote'>".r_emote()."</div>\n";
 	}
 
diff --git a/e107_plugins/download/admin_download.php b/e107_plugins/download/admin_download.php
index bdf9c53a2..686fd0786 100644
--- a/e107_plugins/download/admin_download.php
+++ b/e107_plugins/download/admin_download.php
@@ -667,7 +667,7 @@ if ($action == "uopt")
                </div>
             </fieldset>
             <div class='buttons-bar center'>
-               <input class='btn button' type='submit' name='generate_filetypes_xml' value='".DOWLAN_77."'/>
+               <input class='btn btn-default button' type='submit' name='generate_filetypes_xml' value='".DOWLAN_77."'/>
                </div>
         		</form>
       ";
@@ -720,7 +720,7 @@ if ($action == "uopt")
         	</div>
             </fieldset>
             <div class='buttons-bar center'>
-               <input class='btn button' type='submit' name='updateuploadoptions' value='".DOWLAN_64."'/>
+               <input class='btn btn-default button' type='submit' name='updateuploadoptions' value='".DOWLAN_64."'/>
             </div>
            </form>
       ";
diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php
index 4d77f9acb..7e664fdb2 100644
--- a/e107_plugins/forum/forum.php
+++ b/e107_plugins/forum/forum.php
@@ -127,7 +127,7 @@ $fVars->SEARCH = "
 <form method='get' class='form-inline input-append' action='".e_BASE."search.php'>
 
 <input class='tbox' type='text' name='q' size='20' value='' maxlength='50' />
-<input class='btn button' type='submit' name='s' value='".LAN_SEARCH."' />
+<input class='btn btn-default button' type='submit' name='s' value='".LAN_SEARCH."' />
 <input type='hidden' name='r' value='0' />
 <input type='hidden' name='ref' value='forum' />
 
diff --git a/e107_plugins/forum/forum_conf.php b/e107_plugins/forum/forum_conf.php
index 5d13f13e5..f466fae09 100644
--- a/e107_plugins/forum/forum_conf.php
+++ b/e107_plugins/forum/forum_conf.php
@@ -124,8 +124,8 @@ if ($action == "delete_poll")
 		".FORCONF_13."
 		<br /><br />
 		<form method='post' action='".e_SELF."?".e_QUERY."'>
-		<input class='btn button' type='submit' name='deletecancel' value='".FORCONF_14."' />
-		<input class='btn button' type='submit' name='deletepollconfirm' value='".FORCONF_15."' />
+		<input class='btn btn-default button' type='submit' name='deletecancel' value='".FORCONF_14."' />
+		<input class='btn btn-default button' type='submit' name='deletepollconfirm' value='".FORCONF_15."' />
 		</form>
 		</div>";
 	$ns->tablerender(FORCONF_16, $text);
@@ -199,7 +199,7 @@ if ($action == 'move')
 		</table>
 		<div class='center'>
 		<input class='btn btn-primary button' type='submit' name='move' value='".FORCONF_25."' />
-		<input class='btn button' type='submit' name='movecancel' value='".FORCONF_14."' />
+		<input class='btn btn-default button' type='submit' name='movecancel' value='".FORCONF_14."' />
 		</div>
 		
 		</div>
diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php
index 01566f9b4..3485dfeaf 100644
--- a/e107_plugins/forum/forum_post.php
+++ b/e107_plugins/forum/forum_post.php
@@ -554,7 +554,7 @@ function forumjump()
 	{
 		$text .= "\n<option value='".$key."'>".$val."</option>";
 	}
-	$text .= "</select> <input class='btn button' type='submit' name='fjsubmit' value='".LAN_GO."' /></p></form>";
+	$text .= "</select> <input class='btn btn-default button' type='submit' name='fjsubmit' value='".LAN_GO."' /></p></form>";
 	return $text;
 }
 
diff --git a/e107_plugins/forum/forum_uploads.php b/e107_plugins/forum/forum_uploads.php
index 33c7b395f..c69fb89af 100644
--- a/e107_plugins/forum/forum_uploads.php
+++ b/e107_plugins/forum/forum_uploads.php
@@ -101,7 +101,7 @@ if(is_array($fileList))
 			}
 			else
 			{
-				$txt .= "<td class='forumheader3'>".FRMUP_8." <input class='btn button' type='submit' name='delete[{$finfo['fname']}]' value='".FRMUP_10."' /></td>";
+				$txt .= "<td class='forumheader3'>".FRMUP_8." <input class='btn btn-default button' type='submit' name='delete[{$finfo['fname']}]' value='".FRMUP_10."' /></td>";
 			}
 			$txt .= "</tr>";
 		}
diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index f70fae663..c04606b34 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -252,7 +252,7 @@ $fVars->SEARCH = "
 	<form method='get' class='form-inline input-append' action='".e_BASE."search.php'>
 	<p>
 	<input class='tbox' type='text' name='q' size='20' value='' maxlength='50' />
-	<button class='btn button' type='submit' name='s' >".LAN_SEARCH."</button>
+	<button class='btn btn-default button' type='submit' name='s' >".LAN_SEARCH."</button>
 	<input type='hidden' name='r' value='0' />
 	<input type='hidden' name='ref' value='forum' />	
 	</p>
@@ -663,7 +663,7 @@ function forumjump()
 	{
 		$text .= "\n<option value='".$key."'>".$val."</option>";
 	}
-	$text .= "</select> <input class='btn button' type='submit' name='fjsubmit' value='".LAN_GO."' /></form>";
+	$text .= "</select> <input class='btn btn-default button' type='submit' name='fjsubmit' value='".LAN_GO."' /></form>";
 	return $text;
 }
 
diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index 584676204..665b5db54 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -388,7 +388,7 @@ if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread
 		</div>
 		</form>";
 				
-		// Preview should be reserved for the full 'Post reply' page. <input type='submit' name='fpreview' value='" . Preview . "' class='btn button' /> &nbsp;
+		// Preview should be reserved for the full 'Post reply' page. <input type='submit' name='fpreview' value='" . Preview . "' /> &nbsp;
 	}
 	else
 	{
@@ -484,7 +484,7 @@ function forumjump()
 	{
 		$text .= "\n<option value='" . $key . "'>" . $val . "</option>";
 	}
-	$text .= "</select> <input class='btn button' type='submit' name='fjsubmit' value='" . LAN_GO . "' /></p></form>";
+	$text .= "</select> <input class='btn btn-default button' type='submit' name='fjsubmit' value='" . LAN_GO . "' /></p></form>";
 	return $text;
 }
 
@@ -757,7 +757,7 @@ class e107ForumThread
 						<td style='text-align:center;'><textarea cols='40' rows='10' class='tbox' name='report_add'></textarea></td>
 					</tr>
 					<tr>
-						<td colspan='2' style='text-align:center;'><br /><input class='btn button' type='submit' name='report_thread' value='".LAN_FORUM_2029."' /></td>
+						<td colspan='2' style='text-align:center;'><br /><input class='btn btn-default button' type='submit' name='report_thread' value='".LAN_FORUM_2029."' /></td>
 					</tr>
 					</table>";
 					return e107::getRender()->tablerender(LAN_FORUM_2023, $text, array('forum_viewtopic', 'report2'), true);
diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
index b907cc359..19c62fbd7 100644
--- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
@@ -99,14 +99,14 @@ class plugin_forum_post_shortcodes extends e_shortcode
 	function sc_buttons()
 	{
 		global $action, $eaction;
-		$ret = "<input class='btn button' type='submit' name='fpreview' value='".LAN_FORUM_3005."' /> ";
+		$ret = "<input class='btn btn-default button' type='submit' name='fpreview' value='".LAN_FORUM_3005."' /> ";
 		if ($action != 'nt')
 		{
 			$ret .= ($eaction ? "<input class='btn btn-primary button' type='submit' name='update_reply' value='".LAN_FORUM_3024."' />" : "<input class='btn btn-primary button' type='submit' name='reply' value='".LAN_FORUM_2006."' />");
 		}
 		else
 		{
-			$ret .= ($eaction ? "<input class='btn button btn-primary' type='submit' name='update_thread' value='".LAN_FORUM_3023."' />" : "<input class='btn btn-primary button' type='submit' name='newthread' value='".LAN_FORUM_2005."' />");
+			$ret .= ($eaction ? "<input class='btn btn-primary button' type='submit' name='update_thread' value='".LAN_FORUM_3023."' />" : "<input class='btn btn-primary button' type='submit' name='newthread' value='".LAN_FORUM_2005."' />");
 		}
 		return $ret;
 	}
@@ -154,7 +154,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
 					<input class='tbox e-tip' title=\"".$tooltip."\" name='file_userfile[]' type='file' size='47' />
 				</span>
 				</div>
-				<input class='btn button' type='button' name='addoption' value=".LAN_FORUM_3020." onclick=\"duplicateHTML('fiupopt','fiupsection')\" />
+				<input class='btn btn-default button' type='button' name='addoption' value=".LAN_FORUM_3020." onclick=\"duplicateHTML('fiupopt','fiupsection')\" />
 			</div>
 		
 		";	
diff --git a/e107_plugins/forum/templates/forum_post_template.php b/e107_plugins/forum/templates/forum_post_template.php
index e706ceb12..988edc35a 100644
--- a/e107_plugins/forum/templates/forum_post_template.php
+++ b/e107_plugins/forum/templates/forum_post_template.php
@@ -59,7 +59,7 @@ $fileattach = "
 			<input class='tbox' name='file_userfile[]' type='file' size='47' />
 		</span>
 		</div>
-		<input class='btn button' type='button' name='addoption' value='".LAN_FORUM_3020."' onclick=\"duplicateHTML('fiupopt','fiupsection')\" />
+		<input class='btn btn-default button' type='button' name='addoption' value='".LAN_FORUM_3020."' onclick=\"duplicateHTML('fiupopt','fiupsection')\" />
 	</td>
 </tr>
 ";
diff --git a/e107_plugins/linkwords/admin_config.php b/e107_plugins/linkwords/admin_config.php
index 7837bce9d..1e5f27f1a 100644
--- a/e107_plugins/linkwords/admin_config.php
+++ b/e107_plugins/linkwords/admin_config.php
@@ -297,8 +297,8 @@ if (($action == 'words') || ($action == 'edit'))
 			<td>
 				<form action='".e_SELF."' method='post' id='myform_{$row['linkword_id']}'  onsubmit=\"return jsconfirm('".LWLAN_18." [ID: {$row['linkword_id']} ]')\">
 				<div>
-					<input class='btn button' type='button' onclick=\"document.location='".e_SELF."?edit.{$row['linkword_id']}'\" value='".LAN_EDIT."' id='edit_{$row['linkword_id']}' name='edit_linkword_id' />
-					<input class='btn button' type='submit' value='".LAN_DELETE."' id='delete_{$row['linkword_id']}' name='delete_{$row['linkword_id']}' />
+					<input class='btn btn-default button' type='button' onclick=\"document.location='".e_SELF."?edit.{$row['linkword_id']}'\" value='".LAN_EDIT."' id='edit_{$row['linkword_id']}' name='edit_linkword_id' />
+					<input class='btn btn-default button' type='submit' value='".LAN_DELETE."' id='delete_{$row['linkword_id']}' name='delete_{$row['linkword_id']}' />
 				</div>
 				</form>\n
 			</td>
diff --git a/e107_plugins/list_new/list_admin_class.php b/e107_plugins/list_new/list_admin_class.php
index 49d042652..743da2d9a 100644
--- a/e107_plugins/list_new/list_admin_class.php
+++ b/e107_plugins/list_new/list_admin_class.php
@@ -179,7 +179,7 @@ class list_admin
 		//	$this->row['FIELD_ITEM'] = $frm->iconpicker($this->parent->sections[$i]."_".$type."_icon",$this->parent->list_pref[$this->parent->sections[$i]."_".$type."_icon"]).
 		//	$this->row['FIELD_ITEM'] = $rs->form_text($this->parent->sections[$i]."_".$type."_icon", 15, $this->parent->list_pref[$this->parent->sections[$i]."_".$type."_icon"], 100)."
 			
-		//		<input class='btn button' type='button' style='cursor:pointer' size='30' value='".LIST_ADMIN_12."' onclick=\"e107Helper.toggle('div_".$this->parent->sections[$i]."_".$type."_icon'); return false;\" />
+		//		<input  type='button' style='cursor:pointer' size='30' value='".LIST_ADMIN_12."' onclick=\"e107Helper.toggle('div_".$this->parent->sections[$i]."_".$type."_icon'); return false;\" />
 		//	$this->row['FIELD_ITEM'] .= div id='div_".$this->parent->sections[$i]."_".$type."_icon' style='display:none;'>";
 				
 				
diff --git a/e107_plugins/newsletter/newsletter_menu.php b/e107_plugins/newsletter/newsletter_menu.php
index 9eade5821..3bc3ec8a4 100644
--- a/e107_plugins/newsletter/newsletter_menu.php
+++ b/e107_plugins/newsletter/newsletter_menu.php
@@ -91,13 +91,13 @@ foreach($newsletterArray as $nl)
 	if(preg_match("#".chr(1).USERID."(".chr(1)."|$)#si", $nl['newsletter_subscribers']))
 	{
 		$text .= NLLAN_48."<br /><br />
-		<input class='btn button' type='submit' name='nlUnsubscribe_".$nl['newsletter_id']."' value='".NLLAN_51."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_49)."') \" />
+		<input class='btn btn-default button' type='submit' name='nlUnsubscribe_".$nl['newsletter_id']."' value='".NLLAN_51."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_49)."') \" />
 		";
 	}
 	else
 	{
 		$text .= NLLAN_50." <b>".USEREMAIL."</b> )<br /><br />
-		<input class='btn button' type='submit' name='nlSubscribe_".$nl['newsletter_id']."' value='".NLLAN_52."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_53)."') \" />
+		<input class='btn btn-default button' type='submit' name='nlSubscribe_".$nl['newsletter_id']."' value='".NLLAN_52."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_53)."') \" />
 		";
 	}
 	$nl_count = $sql -> db_Count('newsletter', "(*)", "WHERE newsletter_parent='".$nl['newsletter_id']."' AND newsletter_flag='1'");
diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index f4b7994b7..e21a7931d 100755
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -201,7 +201,7 @@ class pm_shortcodes extends e_shortcode
 			<input class='tbox' type='file' name='file_userfile[]' size='40' />
 			</span>
 			</div>
-			<input type='button' class='btn button' value='".LAN_PM_11."' onclick=\"duplicateHTML('upline','up_container');\"  />
+			<input type='button' class='btn btn-default button' value='".LAN_PM_11."' onclick=\"duplicateHTML('upline','up_container');\"  />
 			";
 			return $ret;
 		}
@@ -481,7 +481,7 @@ class pm_shortcodes extends e_shortcode
 			// pm_id is mapped insisde the config to id key
 			$ret = "
 			<form method='post' action='".$this->url('reply', $this->var)."'>
-			<input type='checkbox' name='quote' /> ".LAN_PM_54." &nbsp;&nbsp;&nbsp<input class='btn button' type='submit' name='reply' value='".LAN_PM_55."' />
+			<input type='checkbox' name='quote' /> ".LAN_PM_54." &nbsp;&nbsp;&nbsp<input class='btn btn-default button' type='submit' name='reply' value='".LAN_PM_55."' />
 			</form>
 			";
 			return $ret;
@@ -570,7 +570,7 @@ class pm_shortcodes extends e_shortcode
 
 	public function sc_pm_delete_blocked_selected()
 	{
-		return "<input type='submit' name='pm_delete_blocked_selected' class='btn button' value='".LAN_PM_53."' />";
+		return "<input type='submit' name='pm_delete_blocked_selected' class='btn btn-default button' value='".LAN_PM_53."' />";
 	}
 	
 	/**
diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php
index 23834eb29..ff82935f7 100644
--- a/e107_plugins/poll/poll_class.php
+++ b/e107_plugins/poll/poll_class.php
@@ -714,7 +714,7 @@ class poll
 
 				$text .="
 				</div>
-				<input class='btn button' type='button' name='addoption' value='".LAN_FORUM_3032."' onclick=\"duplicateHTML('pollopt','pollsection')\" /><br />
+				<input class='btn btn-default button' type='button' name='addoption' value='".LAN_FORUM_3032."' onclick=\"duplicateHTML('pollopt','pollsection')\" /><br />
 				</td>
 			</tr>
 			<tr>
@@ -814,7 +814,7 @@ class poll
 
 		if (isset($_POST['preview']) || varset($_POST['edit']))
 		{
-			// $text .= "<input class='btn button' type='submit' name='preview' value='".POLLAN_24."' /> ";
+			// $text .= "<input  type='submit' name='preview' value='".POLLAN_24."' /> ";
 			$text .= $frm->admin_button('preview',POLLAN_24,'other');
 			
 			if (POLLACTION == 'edit')
@@ -826,19 +826,19 @@ class poll
 			else
 			{
 				$text .= $frm->admin_button('submit','no-value','submit', LAN_CREATE);
-			//	$text .= "<input class='btn button' type='submit' name='submit' value='".POLLAN_23."' /> ";
+			//	$text .= "<input type='submit' name='submit' value='".POLLAN_23."' /> ";
 			}
 		} 
 		else 
 		{
 			$text .= $frm->admin_button('preview','no-value','other',POLLAN_24);
-		//	$text .= "<input class='btn button' type='submit' name='preview' value='".POLLAN_24."' /> ";
+		//	$text .= "<input  type='submit' name='preview' value='".POLLAN_24."' /> ";
 		}
 		
 		if (defset('POLLID')) 
 		{
 			$text .= $frm->admin_button('reset','no-value','reset',POLLAN_25);
-		//	$text .= "<input class='btn button' type='submit' name='reset' value='".POLLAN_25."' /> ";
+		//	$text .= "<input  type='submit' name='reset' value='".POLLAN_25."' /> ";
 		}
 
 		$text .= "</div>
diff --git a/e107_plugins/search_menu/search_menu.php b/e107_plugins/search_menu/search_menu.php
index 10e024dca..09241565d 100644
--- a/e107_plugins/search_menu/search_menu.php
+++ b/e107_plugins/search_menu/search_menu.php
@@ -50,7 +50,7 @@ if (isset($custom_query[1]) && $custom_query[1] != '')
 } 
 else 
 {
-	$search_button = "<input class='btn button search' type='submit' name='s' value='".LAN_180."' />";
+	$search_button = "<input class='btn btn-default button search' type='submit' name='s' value='".LAN_180."' />";
 }
 
 if (isset($custom_query[5]) && $custom_query[5]) {
diff --git a/e107_plugins/tagwords/tagwords_shortcodes.php b/e107_plugins/tagwords/tagwords_shortcodes.php
index 04d1aab60..922139d92 100644
--- a/e107_plugins/tagwords/tagwords_shortcodes.php
+++ b/e107_plugins/tagwords/tagwords_shortcodes.php
@@ -59,7 +59,7 @@ class tagwords_shortcodes extends e_shortcode
 				<form id='".$id."' method='get' action='".e_PLUGIN_ABS."tagwords/tagwords.php'>
 				<div>
 				<input class='tbox' style='width:100px;' type='text'  name='q' size='35' value='".$value."' maxlength='50' />
-				<input class='btn button' type='submit' name='se' value='".LAN_TAG_SEARCH_2."' />
+				<input class='btn btn-default button' type='submit' name='se' value='".LAN_TAG_SEARCH_2."' />
 				</div>
 				</form>";
 				break;
@@ -74,7 +74,7 @@ class tagwords_shortcodes extends e_shortcode
 				<form id='".$id."' method='get' action='".e_PLUGIN_ABS."tagwords/tagwords.php'>
 				<div>
 				<input class='tbox' style='width:100px;' type='text'  name='q' size='35' value='".$value."' maxlength='50' />
-				<input class='btn button' type='submit' name='s' value='".LAN_TAG_SEARCH_2."' />
+				<input class='btn btn-default button' type='submit' name='s' value='".LAN_TAG_SEARCH_2."' />
 				</div>
 				</form>";
 				break;
@@ -86,7 +86,7 @@ class tagwords_shortcodes extends e_shortcode
 				}
 				return "
 				<input class='tbox' style='width:100px;' type='text'  name='q' size='35' value='".$value."' maxlength='50' />
-				<input class='btn button' type='submit' name='s' value='".LAN_TAG_SEARCH_2."' />";
+				<input class='btn btn-default button' type='submit' name='s' value='".LAN_TAG_SEARCH_2."' />";
 				break;
 		}
 	}
@@ -262,7 +262,7 @@ class tagwords_shortcodes extends e_shortcode
 	{
 		global $tag;
 		if(varsettrue($tag->pref['tagwords_view_sort']) || varsettrue($tag->pref['tagwords_view_style']) || varsettrue($tag->pref['tagwords_view_area']))
-			return "<input class='btn button' type='submit' name='so' value='".LAN_TAG_SEARCH_3."' />";
+			return "<input class='btn btn-default button' type='submit' name='so' value='".LAN_TAG_SEARCH_3."' />";
 		return '';
 	}
 
@@ -409,7 +409,7 @@ class tagwords_shortcodes extends e_shortcode
 
 	function sc_tag_opt_button()
 	{
-		return "<input class='btn button' type='submit' name='updatesettings' value='".LAN_UPDATE."' />";
+		return "<input class='btn btn-default button' type='submit' name='updatesettings' value='".LAN_UPDATE."' />";
 	}
 
 }
diff --git a/e107_plugins/tinymce/admin_config.php b/e107_plugins/tinymce/admin_config.php
index 92c3bd106..2790e3709 100644
--- a/e107_plugins/tinymce/admin_config.php
+++ b/e107_plugins/tinymce/admin_config.php
@@ -648,7 +648,7 @@ function edit_theme()
     </tr>
 	</table>
 	<div class='buttons-bar center'>";
-    $text .= "<input class='btn button' type='submit' name='save_settings' value='".LAN_SAVE."' />";
+    $text .= "<input class='btn btn-default button' type='submit' name='save_settings' value='".LAN_SAVE."' />";
     $text .= "
     </div>
 	</fieldset>
diff --git a/e107_plugins/user/userlanguage_menu.php b/e107_plugins/user/userlanguage_menu.php
index da99b1c48..8e93c3893 100644
--- a/e107_plugins/user/userlanguage_menu.php
+++ b/e107_plugins/user/userlanguage_menu.php
@@ -58,7 +58,7 @@ else
 			</select>
 			<br />
 			<br />
-			<button class="btn button" type="submit" name="setlanguage" value="no-value"><span>'.UTHEME_MENU_L1.'</span></button>';
+			<button class="btn btn-default button" type="submit" name="setlanguage" value="no-value"><span>'.UTHEME_MENU_L1.'</span></button>';
 	$text .= '
 		</div>
 	</form>';
diff --git a/e107_plugins/user/usertheme_menu.php b/e107_plugins/user/usertheme_menu.php
index 97fc010ea..c8bb06c72 100644
--- a/e107_plugins/user/usertheme_menu.php
+++ b/e107_plugins/user/usertheme_menu.php
@@ -43,7 +43,7 @@ if ((USER == TRUE) && check_class(varset($pref['allow_theme_select'],FALSE)))
  
 		while ($row = $sql->fetch()) 
 		{
-            $up = (substr($row['user_prefs'],0,5) == "array") ? $eArrayStorage->ReadArray($row['user_prefs']) : unserialize($row['user_prefs']);
+            $up = (substr($row['user_prefs'],0,5) == "array") ? e107::unserialize($row['user_prefs']) : unserialize($row['user_prefs']);
 
 			if (isset($themecount[$up['sitetheme']])) { $themecount[$up['sitetheme']]++; }
 		}
@@ -68,7 +68,7 @@ if ((USER == TRUE) && check_class(varset($pref['allow_theme_select'],FALSE)))
 		}
 		$text .= "</select>
 			<br /><br />
-			<input class='btn button' type='submit' name='settheme' value='".LAN_UMENU_THEME_1."' />
+			<input class='btn btn-default button' type='submit' name='settheme' value='".LAN_UMENU_THEME_1."' />
 			</div></form>";
 
 		$ns->tablerender(LAN_UMENU_THEME_2, $text, 'usertheme');
diff --git a/e107_web/js/core/all.jquery.js b/e107_web/js/core/all.jquery.js
index 7c90f49e6..cbb81dcb8 100644
--- a/e107_web/js/core/all.jquery.js
+++ b/e107_web/js/core/all.jquery.js
@@ -1122,7 +1122,7 @@ function duplicateHTML(copy,paste,baseid){
 			but.type = 'button';
 			but.innerHTML = 'x';
 			but.value = 'x';
-			but.className = 'btn button';
+			but.className = 'btn btn-default button';
 			but.onclick = function(){ this.parentNode.parentNode.removeChild(this.parentNode); };
 
 			var destination = document.getElementById(paste);
diff --git a/email.php b/email.php
index 860ae01cd..5cef2e0d9 100644
--- a/email.php
+++ b/email.php
@@ -229,7 +229,7 @@ $text .= "
 <tr style='vertical-align:top'>
 <td style='width:25%'></td>
 <td style='width:75%'>
-<input class='btn button' type='submit' name='emailsubmit' value='".LAN_EMAIL_4."' />
+<input class='btn btn-default button' type='submit' name='emailsubmit' value='".LAN_EMAIL_4."' />
 <input type='hidden' name='referer' value='".$referrer."' />
 </td>
 </tr>
diff --git a/search.php b/search.php
index a35bad803..dd3fd9d90 100644
--- a/search.php
+++ b/search.php
@@ -187,7 +187,7 @@ class search extends e_shortcode
 	{
 		 if($this->search_prefs['selector'] == 1) 
 		 {
-		 	return "<input class='btn button' type='button' name='CheckAll' value='".LAN_SEARCH_1."' onclick='checkAll(this);' />";	
+		 	return "<input class='btn btn-default button' type='button' name='CheckAll' value='".LAN_SEARCH_1."' onclick='checkAll(this);' />";	
 		 }
 	}
 
@@ -195,7 +195,7 @@ class search extends e_shortcode
 	{
 		 if($this->search_prefs['selector'] == 1) 
 		 {
-		 	return "<input class='btn button' type='button' name='UnCheckAll' value='".LAN_SEARCH_2."' onclick='uncheckAll(this); uncheckG();' />";
+		 	return "<input class='btn btn-default button' type='button' name='UnCheckAll' value='".LAN_SEARCH_2."' onclick='uncheckAll(this); uncheckG();' />";
 		 }	
 	}
 	
@@ -1111,11 +1111,11 @@ if (!$search_prefs['user_select'] && $_GET['r'] < 1) {
 /*
 if ($search_prefs['selector'] == 1) 
 {
-  $SEARCH_VARS->SEARCH_MAIN_CHECKALL = "<input class='btn button' type='button' name='CheckAll' value='".LAN_SEARCH_1."' onclick='checkAll(this);' />";
-  $SEARCH_VARS->SEARCH_MAIN_UNCHECKALL = "<input class='btn button' type='button' name='UnCheckAll' value='".LAN_SEARCH_2."' onclick='uncheckAll(this); uncheckG();' />";
+  $SEARCH_VARS->SEARCH_MAIN_CHECKALL = "<input  type='button' name='CheckAll' value='".LAN_SEARCH_1."' onclick='checkAll(this);' />";
+  $SEARCH_VARS->SEARCH_MAIN_UNCHECKALL = "<input  type='button' name='UnCheckAll' value='".LAN_SEARCH_2."' onclick='uncheckAll(this); uncheckG();' />";
 }
 */
-//$SEARCH_VARS->SEARCH_MAIN_SUBMIT = "<input type='hidden' name='r' value='0' /><input class='btn button' type='submit' name='s' value='".LAN_180."' />";
+//$SEARCH_VARS->SEARCH_MAIN_SUBMIT = "<input type='hidden' name='r' value='0' /><input type='submit' name='s' value='".LAN_180."' />";
 
 //$SEARCH_VARS->ENHANCED_ICON = "<img src='".e_IMAGE_ABS."generic/search_basic.png' style='width: 16px; height: 16px; vertical-align: top'
 //alt='".LAN_SEARCH_23."' title='".LAN_SEARCH_23."' onclick=\"expandit('en_in'); expandit('en_ex'); expandit('en_ep'); expandit('en_be')\"/>";
diff --git a/signup.php b/signup.php
index 623d97750..8d1d7d360 100644
--- a/signup.php
+++ b/signup.php
@@ -174,7 +174,7 @@ if((e_QUERY == 'resend') && !USER && ($pref['user_reg_veri'] == 1))
 
 		$text .="<tr style='vertical-align:top'>
 		<td colspan='2' style='text-align:center' class='forumheader'>";
-		$text .= "<input class='btn button' type='submit' name='submit_resend' value=\"".LAN_SIGNUP_47."\" />";  // resend activation email.
+		$text .= "<input class='btn btn-default button' type='submit' name='submit_resend' value=\"".LAN_SIGNUP_47."\" />";  // resend activation email.
 		$text .= "</td>
 		</tr>
 		</table>
diff --git a/upload.php b/upload.php
index 189fc2498..b5a05494b 100644
--- a/upload.php
+++ b/upload.php
@@ -256,7 +256,7 @@ $text .= "
 	</tr>
 
 	<tr>
-	<td style='text-align:center' colspan='2' class='forumheader'><input class='btn button' type='submit' name='upload' value='".LAN_416."' /></td>
+	<td style='text-align:center' colspan='2' class='forumheader'><input class='btn btn-default button' type='submit' name='upload' value='".LAN_416."' /></td>
 	</tr>
 	</table>
 	</form>
diff --git a/userposts.php b/userposts.php
index 2da039217..56bd57008 100644
--- a/userposts.php
+++ b/userposts.php
@@ -238,7 +238,7 @@ elseif ($action == 'forums')
 		if($vars->NEXTPREV) $vars->NEXTPREV =  str_replace('{USERPOSTS_NEXTPREV}', $vars->NEXTPREV, $USERPOSTS_TEMPLATE['np_table']);
 		$vars->USERPOSTS_FORUM_SEARCH_VALUE = htmlspecialchars($_POST['f_query'], ENT_QUOTES, CHARSET);
 		$vars->USERPOSTS_FORUM_SEARCH_FIELD = "<input class='tbox input' type='text' name='f_query' size='20' value='{$vars->USERPOSTS_FORUM_SEARCH_VALUE}' maxlength='50' />";
-		$vars->USERPOSTS_FORUM_SEARCH_BUTTON = "<input class='btn button' type='submit' name='fsearch' value='".UP_LAN_12."' />";
+		$vars->USERPOSTS_FORUM_SEARCH_BUTTON = "<input class='btn btn-default button' type='submit' name='fsearch' value='".UP_LAN_12."' />";
 		$vars->USERPOSTS_FORUM_SEARCH = "<input class='tbox' type='text' name='f_query' size='20' value='{$vars->USERPOSTS_FORUM_SEARCH_VALUE}' maxlength='50' /> <input class='btn button' type='submit' name='fsearch' value='".UP_LAN_12."' />";
 
 		// $userposts_forum_table_start = preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_FORUM_TABLE_START);