diff --git a/e107_admin/header.php b/e107_admin/header.php
index 4b705759e..5e4eb4889 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -500,7 +500,7 @@ echo getAlert();
   function getModal($caption = '', $type='')
     {
 
-        if(deftrue('BOOTSTRAP') === 3)  // see bootstrap3/admin_template.php
+        if(deftrue('BOOTSTRAP'))  // see bootstrap3/admin_template.php
         {
             return '';
         }
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index b17b3f965..ec4b2391a 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2141,7 +2141,7 @@ class e_form
 	        });
 	    ');
 
-		if(deftrue('BOOTSTRAP') == 3)
+		if(deftrue('BOOTSTRAP'))
 		{
 			$options['class'] .= ' form-control';
 		}
@@ -3495,7 +3495,7 @@ var_dump($select_options);*/
 		
 		$opt = array();
 		
-		$homeicon = (deftrue('BOOTSTRAP') === 4) ? 'fa-home' : 'icon-home.glyph'; 
+		$homeicon = (deftrue('FONTAWESOME')) ? 'fa-home' : 'icon-home.glyph';
 		$homeIcon = e107::getParser()->toGlyph($homeicon,false);
 		
 		
@@ -6173,11 +6173,15 @@ var_dump($select_options);*/
 
 			case 'userclass':
 			case 'userclasses':
+
+
 				$uc_options = vartrue($parms['classlist'], 'public,guest,nobody,member,admin,main,classes'); // defaults to 'public,guest,nobody,member,classes' (userclass handler)
 				unset($parms['classlist']);
 
+
 			//	$method = ($attributes['type'] == 'userclass') ? 'uc_select' : 'uc_select';
 				if(vartrue($attributes['type']) == 'userclasses'){ $parms['multiple'] = true; }
+
 				$ret =   vartrue($parms['pre']).$this->uc_select($key, $value, $uc_options, vartrue($parms, array())). vartrue($parms['post']);
 			break;
 
diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index 0ce3b3a9d..6ec40e72a 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -395,7 +395,7 @@
 
 								$url = e_REQUEST_SELF . "?id=" . $this->postInfo['post_id'] . "&dl=" . $key;
 
-								$saveicon = (deftrue('BOOTSTRAP') === 4) ? 'fa-save' : 'icon-save.glyph'; 
+								$saveicon = (deftrue('FONTAWESOME')) ? 'fa-save' : 'icon-save.glyph';
                 				$saveicon = e107::getParser()->toGlyph($saveicon,false);
 								
 								if(defset("BOOTSTRAP"))
diff --git a/e107_plugins/rss_menu/rss_menu.php b/e107_plugins/rss_menu/rss_menu.php
index 29aebefd2..bdaa4b31b 100644
--- a/e107_plugins/rss_menu/rss_menu.php
+++ b/e107_plugins/rss_menu/rss_menu.php
@@ -54,7 +54,7 @@
 		$arr = array('rss_topicid'=> $topic, 'rss_url'=>$type);
 
 
-		if(deftrue('BOOTSTRAP') === 3) // v2.x
+		if(deftrue('BOOTSTRAP')) // v2.x
 		{
 			$text = "
 			<div>
diff --git a/e107_plugins/rss_menu/rss_shortcodes.php b/e107_plugins/rss_menu/rss_shortcodes.php
index 1b3339c97..bfb05b81b 100644
--- a/e107_plugins/rss_menu/rss_shortcodes.php
+++ b/e107_plugins/rss_menu/rss_shortcodes.php
@@ -56,7 +56,7 @@ class rss_menu_shortcodes extends e_shortcode
 		$url4 = e107::url('rss_menu','atom', $row);
 
 
-		if(deftrue('BOOTSTRAP') === 3) // v2.x
+		if(deftrue('BOOTSTRAP')) // v2.x
 		{
 			$text = "
 			<div>