diff --git a/e107_core/templates/contact_template.php b/e107_core/templates/contact_template.php
index ba0a30cc0..bd2cb2dde 100644
--- a/e107_core/templates/contact_template.php
+++ b/e107_core/templates/contact_template.php
@@ -29,16 +29,16 @@ $CONTACT_TEMPLATE['info'] = "
 
 $CONTACT_TEMPLATE['menu'] =  '
 	<div class="contactMenuForm">
-		<div class="control-group">
+		<div class="control-group form-group">
 			<label >Name</label>
    			 {CONTACT_NAME}
 		 </div>
 		 
-		<div class="control-group">
+		<div class="control-group form-group">
 			<label class="control-label" for="contactEmail">Email</label>
 				{CONTACT_EMAIL}
 		</div>
-		<div class="control-group">
+		<div class="control-group form-group">
 			<label>Comments</label>
 			{CONTACT_BODY=rows=5&cols=30}							
 		</div>
diff --git a/e107_plugins/admin_menu/admin_menu.php b/e107_plugins/admin_menu/admin_menu.php
index 1c84418c4..05614b057 100644
--- a/e107_plugins/admin_menu/admin_menu.php
+++ b/e107_plugins/admin_menu/admin_menu.php
@@ -28,7 +28,7 @@ if (ADMIN == TRUE)
     $array_functions = $nav->adminLinks();
 
 	$amtext = "<div class='text-center' style='text-align:center'>
-	<select name='activate' onchange='urljump(this.options[selectedIndex].value)' class='tbox'>
+	<select name='activate' onchange='urljump(this.options[selectedIndex].value)' class='tbox form-control'>
 	<option>".LAN_SELECT."</option>\n";
 	foreach ($array_functions as $link_value)
 	{
diff --git a/e107_plugins/chatbox_menu/chatbox_menu.php b/e107_plugins/chatbox_menu/chatbox_menu.php
index 41175f712..cc79a50e3 100644
--- a/e107_plugins/chatbox_menu/chatbox_menu.php
+++ b/e107_plugins/chatbox_menu/chatbox_menu.php
@@ -223,7 +223,7 @@ else
 	{
 		$texta =  (e_QUERY ? "\n<form id='chatbox' method='post' action='".e_SELF."?".e_QUERY."'>" : "\n<form id='chatbox' method='post' action='".e_SELF."'>");
 	}
-	$texta .= "<div class='control-group' id='chatbox-input-block'>";
+	$texta .= "<div class='control-group form-group' id='chatbox-input-block'>";
 
 	if(($pref['anon_post'] == "1" && USER == FALSE))
 	{
@@ -240,7 +240,7 @@ else
 		$oc = "";
 	}
 	$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>
+	<textarea placeholder=\"".LAN_CHATBOX_100."\" required class='tbox chatbox form-control 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 btn-default button' type='submit' id='chat_submit' name='chat_submit' value='".CHATBOX_L4."' {$oc}/>
 	";
diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php
index 9f0d0e7bb..13ba66cc9 100644
--- a/e107_plugins/poll/poll_class.php
+++ b/e107_plugins/poll/poll_class.php
@@ -496,7 +496,7 @@ class poll
 				}
 				
 				
-				$SUBMITBUTTON = "<input class='button btn' type='submit' name='pollvote' value='".POLLAN_30."' />";
+				$SUBMITBUTTON = "<input class='button btn btn-primary' type='submit' name='pollvote' value='".POLLAN_30."' />";
 				if (('preview' == $type || $preview == TRUE) && strpos(e_SELF, "viewtopic") === FALSE)
 				{
 					$SUBMITBUTTON = "<input class='button btn e-tip' type='button' name='null' title='Disabled' value='".POLLAN_30."' />";
diff --git a/e107_plugins/poll/templates/poll_template.php b/e107_plugins/poll/templates/poll_template.php
index 85c8f593a..f0e049243 100644
--- a/e107_plugins/poll/templates/poll_template.php
+++ b/e107_plugins/poll/templates/poll_template.php
@@ -189,20 +189,18 @@ $POLL_TEMPLATE = array();
 $POLL_TEMPLATE['form']['start'] = "
 <div class='clearfix'>
 	<div>
-		<div class='control-group'>
-			<ul class='nav nav-list'>
-				<li class='nav-header'>
-					Poll: {QUESTION}
-				</li>
+		<div class='form-group control-group'>
+			Poll: {QUESTION}
+			
 ";
 
 $POLL_TEMPLATE['form']['item'] = "
-			<li>
+			<div class='radio'>
 				{ANSWER} 
-			</li>";
+			</div>";
 
 $POLL_TEMPLATE['form']['end'] = "
-			</ul>
+			
 		</div>
 		<div class='control-group'>
 			 <div class='controls text-center'>
diff --git a/e107_plugins/user/userlanguage_menu.php b/e107_plugins/user/userlanguage_menu.php
index 8e93c3893..d5a9e24db 100644
--- a/e107_plugins/user/userlanguage_menu.php
+++ b/e107_plugins/user/userlanguage_menu.php
@@ -27,7 +27,7 @@ if(varset($pref['multilanguage_subdomain']))
 	$action = (e_QUERY) ? e_SELF.'?'.e_QUERY : e_SELF;
 	$text = '
 		<div style="text-align:center">
-			<select class="tbox" name="lang_select" style="width:95%" onchange="location.href=this.options[selectedIndex].value">';
+			<select class="tbox form-control" name="lang_select" style="width:95%" onchange="location.href=this.options[selectedIndex].value">';
 	foreach($languageList as $languageFolder)
 	{
 		$selected = ($languageFolder == e_LANGUAGE) ? ' selected="selected"' : '';
@@ -46,7 +46,7 @@ else
 	$text = '
 	<form method="post" action="'.$action.'">
 		<div class="center">
-			<select name="sitelanguage" class="tbox">';
+			<select name="sitelanguage" class="tbox form-control">';
 	foreach($languageList as $languageFolder)
 	{
 		$selected = ($languageFolder == e_LANGUAGE) ? ' selected="selected"' : '';