diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index 5346702fc..c914c3a0d 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -1138,6 +1138,13 @@ class themeHandler
 		{
 			$text .= "<li><a data-toggle='tab' href='#core-thememanager-help'>".LAN_HELP."</a></li>\n";
 		}
+
+
+		if($this->themeConfigObj && call_user_func(array(&$this->themeConfigObj, 'config')) && $mode == 1)
+		{
+			$text .= "<li><a data-toggle='tab' href='#core-thememanager-customconfig'>".LAN_CUSTOM."</a></li>\n";
+		}
+		
 		
 		$text .= "</ul>
 		<div class='tab-content'>
@@ -1381,11 +1388,12 @@ class themeHandler
 						$text .= "</table></td></tr>";
 					}
 
-		
+					/*
 					if($mode == 1)
 					{
 						$text .= $this->renderThemeConfig();
 					}
+					*/ 
 					
 					$text .= "</table>
 
@@ -1412,6 +1420,19 @@ class themeHandler
 			</div>
 			
 			 <div class='tab-pane' id='core-thememanager-help'>".$this->renderThemeHelp()."</div>
+			 
+			 <div class='tab-pane' id='core-thememanager-customconfig'>
+			 	<table class='table adminform'>
+		        	<colgroup>
+		        		<col class='col-label' />
+		        		<col class='col-control' />
+						<col class='col-control' />
+		        	</colgroup>
+	
+					".$this->renderThemeConfig()."
+
+				</table>
+			</div>
         </div>
 		\n";
 		
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 3819dadc8..889eec580 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -306,6 +306,7 @@ define("LAN_AUTHOR",	"Author");
 define("LAN_CATEGORY", "Category");
 
 define("LAN_HELP", "Help");
+define("LAN_CUSTOM", "Custom configuration");
 define("LAN_MENULAYOUT", "Menu Layout");
 define("LAN_MEDIAMANAGER", "Media Manager");