diff --git a/addons/naver_search/naver_search.addon.php b/addons/naver_search/naver_search.addon.php
index b986f4039..b2bf6f511 100644
--- a/addons/naver_search/naver_search.addon.php
+++ b/addons/naver_search/naver_search.addon.php
@@ -1,5 +1,5 @@
 <?php
-    if(!__ZB5__) exit();
+    if(!__ZBXE__) exit();
 
     /**
     * @file naver_search_addon.addon.php
diff --git a/addons/rainbow_link/rainbow_link.addon.php b/addons/rainbow_link/rainbow_link.addon.php
index 61cc57db8..5677de9f9 100644
--- a/addons/rainbow_link/rainbow_link.addon.php
+++ b/addons/rainbow_link/rainbow_link.addon.php
@@ -1,5 +1,5 @@
 <?php
-    if(!__ZB5__) exit();
+    if(!__ZBXE__) exit();
 
     /**
     * @file spamfilter.addon.php
diff --git a/addons/spamfilter/spamfilter.addon.php b/addons/spamfilter/spamfilter.addon.php
index c9d96578c..71903e8aa 100644
--- a/addons/spamfilter/spamfilter.addon.php
+++ b/addons/spamfilter/spamfilter.addon.php
@@ -1,5 +1,5 @@
 <?php
-    if(!__ZB5__) exit();
+    if(!__ZBXE__) exit();
 
     /**
     * @file spamfilter.addon.php
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index c14446801..329ff47b3 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -97,7 +97,7 @@
             $buff = preg_replace_callback('!<div plugin=([^<]*?)<\/div>!is', array($this, '_compilePluginCode'), $buff);
 
             // 파일에 쓰기 전에 직접 호출되는 것을 방지
-            $buff = sprintf('%s%s%s','<?php if(!__ZB5__) exit();?>',"\n",$buff);
+            $buff = sprintf('%s%s%s','<?php if(!__ZBXE__) exit();?>',"\n",$buff);
 
             // 컴파일된 코드를 파일에 저장
             FileHandler::writeFile($compiled_tpl_file, $buff);
diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php
index d736014e6..7b326f184 100644
--- a/classes/xml/XmlQueryParser.class.php
+++ b/classes/xml/XmlQueryParser.class.php
@@ -58,7 +58,7 @@
             // 캐쉬 내용 작성
             $buff = 
             sprintf(
-            '<?php if(!__ZB5__) exit();'."\n".
+            '<?php if(!__ZBXE__) exit();'."\n".
             '$pass_quotes = array();'."\n".
             '$id = \'%s\';'."\n".
             '$action = \'%s\';'."\n".
diff --git a/common/js/common.js b/common/js/common.js
index 183ead53e..11e1ff269 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -141,7 +141,7 @@ function zbxe_folder_close(id) {
 }
 
 
-// 에디터에서 사용하는 내용 여닫는 코드 (고정, zb5 beta 호환용)
+// 에디터에서 사용하는 내용 여닫는 코드 (고정, zb5beta beta 호환용)
 function svc_folder_open(id) {
     var open_text_obj = xGetElementById("_folder_open_"+id);
     var close_text_obj = xGetElementById("_folder_close_"+id);
diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php
index 9a8f52c9a..4ca714b7c 100644
--- a/common/lang/ko.lang.php
+++ b/common/lang/ko.lang.php
@@ -133,7 +133,7 @@
     $lang->filter->isnull = '%s의 값을 입력해주세요';
     $lang->filter->outofrange = '%s의 글자 길이를 맞추어 주세요.';
     $lang->filter->equalto = '%s의 값이 잘못 되었습니다.';
-    $lang->filter->invalid_email = '%s의 형식이 잘못되었습니다. (예: zb5@zeroboard.com)';
+    $lang->filter->invalid_email = '%s의 형식이 잘못되었습니다. (예: zbxe@zeroboard.com)';
     $lang->filter->invalid_user_id = $lang->filter->invalid_userid = "%s의 형식이 잘못되었습니다.\\n영문,숫자와 _로 만드실 수 있으며 제일 앞은 영문이어야 합니다";
     $lang->filter->invalid_homepage = '%s의 형식이 잘못되었습니다. (예: http://www.zeroboard.com)';
     $lang->filter->invalid_korean = '%s의 형식이 잘못되었습니다. 한글로만 입력해주셔야 합니다';
diff --git a/config/config.inc.php b/config/config.inc.php
index d8b39b636..10bf68a29 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -8,7 +8,7 @@
     /**
      * @brief 기본적인 상수 선언,  웹에서 직접 호출되는 것을 막기 위해 체크하는 상수 선언
      **/
-    define('__ZB5__', true);
+    define('__ZBXE__', true);
 
     /**
      * @brief 간단하게 사용하기 위한 함수 정의한 파일 require
diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php
index 8c0c32ec6..bed874d0e 100644
--- a/modules/addon/addon.controller.php
+++ b/modules/addon/addon.controller.php
@@ -40,7 +40,7 @@
                 $buff .= sprintf(' include("./addons/%s/%s.addon.php"); ', $addon, $addon);
             }
 
-            $buff = sprintf('<?if(!__ZB5__)exit(); %s ?>', $buff);
+            $buff = sprintf('<?if(!__ZBXE__)exit(); %s ?>', $buff);
 
             FileHandler::writeFile($this->cache_file, $buff);
         }
diff --git a/modules/editor/components/html_editor/info.xml b/modules/editor/components/html_editor/info.xml
index e4b5276b2..6a9924b25 100644
--- a/modules/editor/components/html_editor/info.xml
+++ b/modules/editor/components/html_editor/info.xml
@@ -3,6 +3,6 @@
   <title xml:lang="ko">HTML 코드 수정</title>
   <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
     <name xml:lang="ko">제로</name>
-    <description xml:lang="ko">에디터에서 HTML 코드를 직접 수정하거나 추가할 수 있습니다.\n보안 문제로 인하여 가능한 관리자만 사용할 수 있도록 하세요.</description>
+    <description xml:lang="ko">에디터에서 HTML 코드를 직접 수정하거나 추가할 수 있습니다.\n보안 문제로 인하여 가능한 끄는 것이 좋습니다.</description>
   </author>
 </component>
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index 6910e72bd..9067bcc7f 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -56,7 +56,7 @@
             $xml_info->author->date = $xml_doc->component->author->attrs->date;
             $xml_info->description = str_replace('\n', "\n", $xml_doc->component->author->description->body);
 
-            $buff = '<?php if(!__ZB5__) exit(); ';
+            $buff = '<?php if(!__ZBXE__) exit(); ';
             $buff .= sprintf('$xml_info->component_name = "%s";', $component);
             $buff .= sprintf('$xml_info->version = "%s";', $xml_info->version);
             $buff .= sprintf('$xml_info->title = "%s";', $xml_info->title);
diff --git a/modules/editor/schemas/editor_component.xml b/modules/editor/schemas/editor_component.xml
new file mode 100644
index 000000000..ef27029c9
--- /dev/null
+++ b/modules/editor/schemas/editor_component.xml
@@ -0,0 +1,6 @@
+<table name="editor_components">
+  <column name="component_name" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
+  <column name="enabled" type="char" size="1" default="N" notnull="notnull" />
+  <column name="extra_vars" type="text"/>
+  <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
+</table>
diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html
index fa4da2aa9..a349ef7ea 100644
--- a/modules/editor/tpl/admin_index.html
+++ b/modules/editor/tpl/admin_index.html
@@ -16,10 +16,28 @@
   <td><a href="mailto:{$xml_info->author->email_address}">{$xml_info->author->name}</a></td>
   <td><a href="#" onclick="window.open('{$xml_info->author->link}');return false;">{$xml_info->author->link}</a></td>
   <td>{$xml_info->author->date}</td>
-  <td rowspan="2">{$lang->cmd_setup}</td>
-  <td rowspan="2">{$lang->use}</td>
-  <td rowspan="2">{$lang->cmd_move_up}</td>
-  <td rowspan="2">{$lang->cmd_move_down}</td>
+  <td rowspan="2">
+    <!--@if($xml_info->extra_vars)-->
+    <a href="#">{$lang->cmd_setup}</a>
+    <!--@end-->
+  </td>
+  <td rowspan="2">
+    <!--@if($xml_info->enable)-->
+    <a href="#">{$lang->not_use}</a>
+    <!--@else-->
+    <a href="#">{$lang->use}</a>
+    <!--@end-->
+  </td>
+  <td rowspan="2">
+    <!--@if($xml_info->enable)-->
+    <a href="#">{$lang->cmd_move_up}</a>
+    <!--@end-->
+  </td>
+  <td rowspan="2">
+    <!--@if($xml_info->enable)-->
+    <a href="#">{$lang->cmd_move_down}</a>
+    <!--@end-->
+  </td>
 </tr>
 <tr>
   <td colspan="3">{nl2br($xml_info->description)}</td>
diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index 0ed683421..eb9effee4 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -179,7 +179,7 @@
             $db_info = Context::getDbInfo();
             if(!$db_info) return;
 
-            $buff = '<?php if(!__ZB5__) exit();'."\n";
+            $buff = '<?php if(!__ZBXE__) exit();'."\n";
             foreach($db_info as $key => $val) {
                 $buff .= sprintf("\$db_info->%s = \"%s\";\n", $key, $val);
             }
diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html
index adccd4377..5aec3c660 100644
--- a/modules/install/tpl/form.mysql.html
+++ b/modules/install/tpl/form.mysql.html
@@ -35,7 +35,7 @@
   <tr>
     <td>{$lang->db_table_prefix}</td>
     <td>
-      <input type="text" name="db_table_prefix" value="zb" />
+      <input type="text" name="db_table_prefix" value="xe" />
     </td>
   </tr>
   </table>
diff --git a/modules/layout/layout.controller.php b/modules/layout/layout.controller.php
index 64f0f6d04..949059366 100644
--- a/modules/layout/layout.controller.php
+++ b/modules/layout/layout.controller.php
@@ -296,7 +296,7 @@
 
             // php 캐시 파일 생성
             $php_output = $this->getPhpCacheCode($tree[0], $tree);
-            $php_buff = sprintf('<?php if(!__ZB5__) exit(); $menu->list = array(%s); ?>', $php_output['buff']);
+            $php_buff = sprintf('<?php if(!__ZBXE__) exit(); $menu->list = array(%s); ?>', $php_output['buff']);
 
             // 파일 저장
             FileHandler::writeFile($xml_file, $xml_buff);
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index a8a6848a3..dcf979598 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -170,7 +170,7 @@
                 $buff .= sprintf('$layout_info->menu->{%s}->php_file = "./files/cache/layout/".$layout_srl."_%s.php";',$id, $id);
             }
 
-            $buff = '<?php if(!__ZB5__) exit(); '.$buff.' ?>';
+            $buff = '<?php if(!__ZBXE__) exit(); '.$buff.' ?>';
             FileHandler::writeFile($cache_file, $buff);
 
             if(file_exists($cache_file)) include $cache_file;
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 94aa9fe95..26ef088b4 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -297,7 +297,7 @@
                         }
                     }
                 }
-                $buff = sprintf('<?php if(!__ZB5__) exit();$info->default_index_act = \'%s\';$info->admin_index_act = \'%s\';%s?>', $default_index_act, $admin_index_act, $buff);
+                $buff = sprintf('<?php if(!__ZBXE__) exit();$info->default_index_act = \'%s\';$info->admin_index_act = \'%s\';%s?>', $default_index_act, $admin_index_act, $buff);
 
                 FileHandler::writeFile($cache_file, $buff);
 
@@ -324,7 +324,7 @@
 
                 $config = base64_encode($output->data->config);
 
-                $buff = sprintf('<?php if(!__ZB5__) exit(); $config = "%s"; ?>', $config);
+                $buff = sprintf('<?php if(!__ZBXE__) exit(); $config = "%s"; ?>', $config);
 
                 //FileHandler::writeFile($cache_file, $buff);
             }
diff --git a/modules/plugin/plugin.model.php b/modules/plugin/plugin.model.php
index 28f7b6d66..20f01a641 100644
--- a/modules/plugin/plugin.model.php
+++ b/modules/plugin/plugin.model.php
@@ -123,7 +123,7 @@
 
             }
 
-            $buff = '<?php if(!__ZB5__) exit(); '.$buff.' ?>';
+            $buff = '<?php if(!__ZBXE__) exit(); '.$buff.' ?>';
             FileHandler::writeFile($cache_file, $buff);
 
             if(file_exists($cache_file)) include $cache_file;