diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 95b5b8776..ef96466d0 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1120,6 +1120,14 @@ class Context
 			self::$_instance->security_check = 'DENY ALL';
 			self::$_instance->security_check_detail = 'ERR_UNSAFE_ENV';
 		}
+
+		if (PHP_VERSION_ID < 80000)
+		{
+			libxml_disable_entity_loader(true);
+		}
+		libxml_set_external_entity_loader(function($a, $b, $c) {
+			return null;
+		});
 	}
 
 	/**
@@ -1261,10 +1269,6 @@ class Context
 					$GLOBALS['HTTP_RAW_POST_DATA'] = '';
 					return;
 				}
-				if (PHP_VERSION_ID < 80000)
-				{
-					libxml_disable_entity_loader(true);
-				}
 				$params = Rhymix\Framework\Parsers\XMLRPCParser::parse($GLOBALS['HTTP_RAW_POST_DATA']) ?: [];
 			}
 			elseif($request_method === 'JSON')
@@ -1339,7 +1343,7 @@ class Context
 					unset($_FILES[$key]);
 					continue;
 				}
-				$val['name'] = str_replace('&amp;', '&', escape($val['name'], false));
+				$val['name'] = Rhymix\Framework\Filters\FilenameFilter::clean($val['name']);
 				self::set($key, $val, true);
 				self::set('is_uploaded', true);
 				self::$_instance->is_uploaded = true;
@@ -1365,7 +1369,7 @@ class Context
 						break;
 					}
 					$file = array();
-					$file['name'] = str_replace('&amp;', '&', escape($val['name'][$i], false));
+					$file['name'] = Rhymix\Framework\Filters\FilenameFilter::clean($val['name'][$i]);
 					$file['type'] = $val['type'][$i];
 					$file['tmp_name'] = $val['tmp_name'][$i];
 					$file['error'] = $val['error'][$i];
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 1d2fd8194..be853571b 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -257,7 +257,7 @@ class DisplayHandler extends Handler
 					case 'HTML':
 						$json_options = defined('JSON_PRETTY_PRINT') ? (JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) : 0;
 						$panel_script = sprintf('<script src="%s%s?t=%d"></script>', RX_BASEURL, 'common/js/debug.js', filemtime(RX_BASEDIR . 'common/js/debug.js'));
-						$panel_script .= "\n<script>\nvar rhymix_debug_content = " . json_encode($data, $json_options) . ";\n</script>";
+						$panel_script .= "\n<script>\nRhymix.currentDebugData = " . json_encode($data, $json_options) . ";\n</script>";
 						$body_end_position = strrpos($output, '</body>') ?: strlen($output);
 						$output = substr($output, 0, $body_end_position) . "\n$panel_script\n" . substr($output, $body_end_position);
 						break;
diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index c235289bf..f77996e99 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -249,7 +249,7 @@ class ModuleObject extends BaseObject
 	 */
 	public function setPrivileges()
 	{
-		if(!$this->user->isAdmin())
+		if (!$this->user->isAdmin())
 		{
 			// Get privileges(granted) information for target module by <permission check> of module.xml
 			if(($permission = $this->xml_info->action->{$this->act}->permission) && $permission->check_var)
@@ -278,33 +278,28 @@ class ModuleObject extends BaseObject
 				foreach($check_module_srl as $target_srl)
 				{
 					// Get privileges(granted) information of current user for target module
-					if(($grant = ModuleModel::getInstance()->getPrivilegesBySrl($target_srl, $permission->check_type)) === false)
+					$check_grant = ModuleModel::getPrivilegesBySrl($target_srl, $permission->check_type);
+					if ($check_grant === false)
 					{
 						return false;
 					}
 
 					// Check permission
-					if(!$this->checkPermission($grant, $this->user))
+					if(!$this->checkPermission($check_grant, $this->user, $failed_requirement))
 					{
-						$this->stop($this->user->isMember() ? 'msg_not_permitted_act' : 'msg_not_logged');
+						$this->stop($this->_generatePermissionError($failed_requirement));
 						return false;
 					}
 				}
 			}
 		}
 
-		// If no privileges(granted) information, check permission by privileges(granted) information for current module
-		if(!isset($grant))
+		// Check permission based on the grant information for the current module.
+		$grant = ModuleModel::getInstance()->getGrant($this->module_info, $this->user, $this->xml_info);
+		if(!$this->checkPermission($grant, $this->user, $failed_requirement))
 		{
-			// Get privileges(granted) information of current user for current module
-			$grant = ModuleModel::getInstance()->getGrant($this->module_info, $this->user, $this->xml_info);
-
-			// Check permission
-			if(!$this->checkPermission($grant, $this->user))
-			{
-				$this->stop($this->user->isMember() ? 'msg_not_permitted_act' : 'msg_not_logged');
-				return false;
-			}
+			$this->stop($this->_generatePermissionError($failed_requirement));
+			return false;
 		}
 
 		// If member action, grant access for log-in, sign-up, member pages
@@ -313,7 +308,7 @@ class ModuleObject extends BaseObject
 			$grant->access = true;
 		}
 
-		// Set privileges(granted) variables
+		// Set aliases to grant object
 		$this->grant = $grant;
 		Context::set('grant', $grant);
 
@@ -325,9 +320,10 @@ class ModuleObject extends BaseObject
 	 *
 	 * @param object $grant privileges(granted) information of user
 	 * @param object $member_info member information
+	 * @param string|array &$failed_requirement
 	 * @return bool
 	 */
-	public function checkPermission($grant = null, $member_info = null)
+	public function checkPermission($grant = null, $member_info = null, &$failed_requirement = '')
 	{
 		// Get logged-in member information
 		if(!$member_info)
@@ -356,21 +352,50 @@ class ModuleObject extends BaseObject
 			$permission = 'root';
 		}
 
-		// If permission is not or 'guest', Pass
-		if(empty($permission) || $permission == 'guest')
+		// If there is no permission or eveyone is allowed, pass
+		if (empty($permission) || $permission === 'guest' || $permission === 'everyone')
 		{
 			return true;
 		}
-		// If permission is 'member', check logged-in
-		else if($permission == 'member')
+
+		// If permission is 'member', the user must be logged in
+		if ($permission === 'member')
 		{
-			if($member_info->member_srl)
+			if ($member_info->member_srl)
 			{
 				return true;
 			}
+			else
+			{
+				$failed_requirement = 'member';
+				return false;
+			}
 		}
+
+		// If permission is 'not_member', the user must be logged out
+		if ($permission === 'not_member' || $permission === 'not-member')
+		{
+			if (!$member_info->member_srl || $grant->manager)
+			{
+				return true;
+			}
+			else
+			{
+				$failed_requirement = 'not_member';
+				return false;
+			}
+		}
+
+		// If permission is 'root', false
+		// Because an administrator who have root privilege(granted) was passed already
+		if ($permission == 'root')
+		{
+			$failed_requirement = 'root';
+			return false;
+		}
+
 		// If permission is 'manager', check 'is user have manager privilege(granted)'
-		else if(preg_match('/^(manager(?::(.+))?|([a-z0-9\_]+)-managers)$/', $permission, $type))
+		if (preg_match('/^(manager(?::(.+))?|([a-z0-9\_]+)-managers)$/', $permission, $type))
 		{
 			// If permission is manager(:scope), check manager privilege and scope
 			if ($grant->manager)
@@ -404,32 +429,71 @@ class ModuleObject extends BaseObject
 					return true;
 				}
 			}
-		}
-		// If permission is 'root', false
-		// Because an administrator who have root privilege(granted) was passed already
-		else if($permission == 'root')
-		{
+
+			$failed_requirement = 'manager';
 			return false;
 		}
-		// If grant name, check the privilege(granted) of the user
-		else if($grant_names = explode(',', $permission))
-		{
-			$privilege_list = array_keys((array) $this->xml_info->grant);
 
-			foreach($grant_names as $name)
+		// Check grant name
+		// If multiple names are given, all of them must pass.
+		elseif ($grant_names = array_map('trim', explode(',', $permission)))
+		{
+			foreach ($grant_names as $name)
 			{
-				if(!in_array($name, $privilege_list) || !$grant->$name)
+				if (!isset($grant->{$name}))
 				{
 					return false;
 				}
+				if (!$grant->{$name})
+				{
+					$failed_requirement = $grant->whocan($name);
+					return false;
+				}
 			}
-
 			return true;
 		}
 
 		return false;
 	}
 
+	/**
+	 * Generate an error message for a failed permission.
+	 *
+	 * @param mixed $failed_requirement
+	 * @return string
+	 */
+	protected function _generatePermissionError($failed_requirement)
+	{
+		if ($failed_requirement === 'member' || !$this->user->isMember())
+		{
+			return 'msg_not_logged';
+		}
+		elseif ($failed_requirement === 'not_member')
+		{
+			return 'msg_required_not_logged';
+		}
+		elseif ($failed_requirement === 'manager' || $failed_requirement === 'root')
+		{
+			return 'msg_administrator_only';
+		}
+		elseif (is_array($failed_requirement) && count($failed_requirement))
+		{
+			if (class_exists('PointModel'))
+			{
+				$min_level = PointModel::getMinimumLevelForGroup($failed_requirement);
+				if ($min_level)
+				{
+					return sprintf(lang('member.msg_required_minimum_level'), $min_level);
+				}
+			}
+			return 'member.msg_required_specific_group';
+		}
+		else
+		{
+			return 'msg_not_permitted_act';
+		}
+	}
+
 	/**
 	 * Stop processing this module instance.
 	 *
diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php
index 531872b92..b8f563648 100644
--- a/classes/validator/Validator.class.php
+++ b/classes/validator/Validator.class.php
@@ -30,31 +30,25 @@ class Validator
 	 * rule list
 	 * @var array
 	 */
-	var $_rules;
+	var $_rules = [];
 
 	/**
 	 * filter list
 	 * @var array
 	 */
-	var $_filters;
+	var $_filters = [];
 
 	/**
 	 * custom message list
 	 * @var array
 	 */
-	var $_message;
+	var $_message = [];
 
 	/**
 	 * custom field name list
 	 * @var array
 	 */
-	var $_fieldNames;
-
-	/**
-	 * Can usable status for multibyte string function
-	 * @var boolean
-	 */
-	var $_has_mb_func;
+	var $_fieldNames = [];
 
 	/**
 	 * validator version
@@ -75,12 +69,10 @@ class Validator
 	 */
 	function __construct($xml_path = '')
 	{
-		$this->_rules = array();
-		$this->_filters = array();
-		$this->_xml_ruleset = NULL;
-
-		if($xml_path)
+		if ($xml_path)
+		{
 			$this->load($xml_path);
+		}
 
 		// predefined rules
 		$this->addRule(array(
@@ -93,8 +85,7 @@ class Validator
 			'float' => '/^\d+(\.\d+)?$/'
 		));
 
-		$this->_has_mb_func = is_callable('mb_strlen');
-		$this->setCacheDir(RX_BASEDIR . 'files/cache');
+		$this->_cache_dir = RX_BASEDIR . 'files/cache';
 	}
 
 	/**
@@ -114,112 +105,26 @@ class Validator
 	 */
 	function load($xml_path)
 	{
-		$this->_xml_ruleset = NULL;
-		if(!is_readable($xml_path))
+		if (!file_exists($xml_path) || !is_file($xml_path) || !is_readable($xml_path))
 		{
-			return FALSE;
+			return false;
 		}
 
-		$parser = new XeXmlParser();
-		$xml = $parser->loadXmlFile($xml_path);
-		if(!isset($xml->ruleset) || !isset($xml->ruleset->fields) || !isset($xml->ruleset->fields->field))
+		$output = Rhymix\Framework\Parsers\RulesetParser::loadXML($xml_path);
+		if (!$output)
 		{
-			return FALSE;
+			return false;
 		}
 
-		$rules = array();
-		$messages = array();
-
-		// custom rules
-		if(isset($xml->ruleset->customrules) && isset($xml->ruleset->customrules->rule))
+		if ($output->rules)
 		{
-			$customrules = $xml->ruleset->customrules->rule;
-			if(!is_array($customrules))
-			{
-				$customrules = array($customrules);
-			}
-
-			foreach($customrules as $rule)
-			{
-				if(!isset($rule->attrs) || !isset($rule->attrs->name))
-				{
-					continue;
-				}
-
-				$message = $rule->message ? $rule->message->body : NULL;
-				$rule = (array) $rule->attrs;
-				$rule['message'] = $message;
-				$name = $rule['name'];
-				unset($rule['name']);
-
-				$rules[$name] = $rule;
-				if(isset($message))
-				{
-					$messages['invalid_' . $name] = $message;
-				}
-			}
-			if(count($rules))
-			{
-				$this->addRule($rules);
-			}
+			$this->addRule($output->rules);
 		}
-
-		// filters
-		$fields = $xml->ruleset->fields->field;
-		if(!is_array($fields))
-		{
-			$fields = array($fields);
-		}
-
-		$filters = array();
-		$fieldsNames = array();
-		foreach($fields as $field)
-		{
-			$name = '';
-			$filter = array();
-
-			if(!isset($field->attrs) || !isset($field->attrs->name))
-			{
-				continue;
-			}
-
-			$title = $field->title ? $field->title->body : NULL;
-			$filter = (array) $field->attrs;
-			$filter['title'] = $title;
-
-			$name = $filter['name'];
-			if(isset($title))
-			{
-				$fieldsNames[$name] = $title;
-			}
-
-			unset($filter['name']);
-
-			// conditional statement
-			if(isset($field->if))
-			{
-				$if = $field->if;
-				if(!is_array($if))
-				{
-					$if = array($if);
-				}
-				foreach($if as $idx => $cond)
-				{
-					$if[$idx] = (array) $cond->attrs;
-				}
-				$filter['if'] = $if;
-			}
-
-			$filters[$name] = $filter;
-		}
-
-		$this->_xml_ruleset = $xml->ruleset;
-		$this->_filters = $filters;
-		$this->_message = $messages;
-		$this->_fieldNames = $fieldsNames;
+		$this->_filters = $output->filters;
+		$this->_message = $output->messages;
+		$this->_fieldNames = $output->fieldsNames;
 		$this->_xml_path = $xml_path;
-
-		return TRUE;
+		return true;
 	}
 
 	/**
@@ -389,7 +294,7 @@ class Validator
 				$strbytes = strlen($value);
 				if(!$is_min_b || !$is_max_b)
 				{
-					$strlength = $this->_has_mb_func ? mb_strlen($value, 'utf-8') : $this->mbStrLen($value);
+					$strlength = mb_strlen($value, 'UTF-8');
 				}
 
 				if(($min && $min > ($is_min_b ? $strbytes : $strlength)) || ($max && $max < ($is_max_b ? $strbytes : $strlength)))
@@ -630,21 +535,6 @@ class Validator
 		return TRUE;
 	}
 
-	/**
-	 * if not supported 'mb_strlen' function, this method can use.
-	 * @param string $str
-	 * @return int
-	 */
-	function mbStrLen($str)
-	{
-		$arr = count_chars($str);
-		for($i = 0x80; $i < 0xc0; $i++)
-		{
-			unset($arr[$i]);
-		}
-		return array_sum($arr);
-	}
-
 	/**
 	 * Returns compiled javascript file path. The path begins from XE root directory.
 	 * @return string Compiled JavaScript file path
diff --git a/classes/xml/XmlParser.class.php b/classes/xml/XmlParser.class.php
index d08bdfd75..b4f65f102 100644
--- a/classes/xml/XmlParser.class.php
+++ b/classes/xml/XmlParser.class.php
@@ -1,240 +1,46 @@
 <?php
 
 /**
- * Xml_Node_ class
- * Element node or attribute node.
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/xml
- * @version 0.1
- */
-#[AllowDynamicProperties]
-class Xml_Node_
-{
-
-	/** In PHP5 this will silence E_STRICT warnings
-	 * for undeclared properties.
-	 * No effect in PHP4
-	 */
-	function __get($name)
-	{
-		return NULL;
-	}
-
-}
-
-/**
- * XmlParser class
- * Class parsing a given xmlrpc request and creating a data object
- * @remarks <pre>{
- * This class may drops unsupported xml lanuage attributes when multiple language attributes are given.
- * For example, if 'xml:lang='ko, en, ch, jp..' is given in a xml file, only ko will be left ignoring all other language
- * attributes when kor is only supported language. It seems to work fine now but we did not scrutinze any potential side effects,
- * }</pre>
+ * XML Parser class from XE
  *
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/xml
- * @version 0.1
+ * Renamed because of conflict with built-in XMLParser class in PHP 8+
+ *
+ * @deprecated
  */
 class XeXmlParser
 {
-
 	/**
-	 * Xml parser
-	 * @var resource
+	 * Load an XML file.
+	 *
+	 * @deprecated
+	 * @param string $filename
+	 * @return ?object
 	 */
-	var $oParser = NULL;
-
-	/**
-	 * Input xml
-	 * @var string
-	 */
-	var $input = NULL;
-
-	/**
-	 * Output object in array
-	 * @var array
-	 */
-	var $output = array();
-
-	/**
-	 * The default language type
-	 * @var string
-	 */
-	var $lang = "en";
-
-	/**
-	 * Load a xml file specified by a filename and parse it to Return the resultant data object
-	 * @param string $filename a file path of file
-	 * @return object|null Returns a data object containing data extracted from a xml file or NULL if a specified file does not exist
-	 */
-	function loadXmlFile($filename)
+	public static function loadXmlFile($filename): ?object
 	{
-		if(!file_exists($filename))
+		$filename = strval($filename);
+		if (file_exists($filename))
 		{
-			return;
-		}
-		$buff = FileHandler::readFile($filename);
-
-		$oXmlParser = new self();
-		return $oXmlParser->parse($buff);
-	}
-
-	/**
-	 * Parse xml data to extract values from it and construct data object
-	 * @param string $input a data buffer containing xml data
-	 * @param mixed $arg1 ???
-	 * @param mixed $arg2 ???
-	 * @return object|null Returns a resultant data object or NULL in case of error
-	 */
-	function parse($input = '', $arg1 = NULL, $arg2 = NULL)
-	{
-		// Save the compile starting time for debugging
-		$start = microtime(true);
-
-		$this->lang = Context::getLangType();
-
-		$this->input = $input ? $input : $GLOBALS['HTTP_RAW_POST_DATA'];
-		$this->input = str_replace(array('', '
'), array('', ''), $this->input);
-
-		// extracts a supported language
-		preg_match_all("/xml:lang=\"([^\"].+)\"/i", $this->input, $matches);
-
-		// extracts the supported lanuage when xml:lang is used
-		if(count($matches[1]) && $supported_lang = array_unique($matches[1]))
-		{
-			$tmpLangList = array_flip($supported_lang);
-			// if lang of the first log-in user doesn't exist, apply en by default if exists. Otherwise apply the first lang.
-			if(!isset($tmpLangList[$this->lang]))
-			{
-				if(isset($tmpLangList['en']))
-				{
-					$this->lang = 'en';
-				}
-				else
-				{
-					$this->lang = array_shift($supported_lang);
-				}
-			}
-			// uncheck the language if no specific language is set.
+			return Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($filename);
 		}
 		else
 		{
-			$this->lang = '';
-		}
-
-		$this->oParser = xml_parser_create('UTF-8');
-
-		//xml_set_object($this->oParser, $this);
-		xml_set_element_handler($this->oParser, [$this, "_tagOpen"], [$this, "_tagClosed"]);
-		xml_set_character_data_handler($this->oParser, [$this, "_tagBody"]);
-
-		xml_parse($this->oParser, $this->input);
-		xml_parser_free($this->oParser);
-
-		if(!count($this->output))
-		{
-			return;
-		}
-
-		$output = array_shift($this->output);
-		// Save compile starting time for debugging
-		if (!isset($GLOBALS['__xmlparse_elapsed__']))
-		{
-			$GLOBALS['__xmlparse_elapsed__'] = 0;
-		}
-		$GLOBALS['__xmlparse_elapsed__'] += microtime(true) - $start;
-
-		return $output;
-	}
-
-	/**
-	 * Start element handler.
-	 * @param resource $parse an instance of parser
-	 * @param string $node_name a name of node
-	 * @param array $attrs attributes to be set
-	 * @return array
-	 */
-	function _tagOpen($parser, $node_name, $attrs)
-	{
-		$obj = new Xml_Node_();
-		$obj->node_name = strtolower($node_name);
-		$obj->attrs = $this->_arrToAttrsObj($attrs);
-
-		$this->output[] = $obj;
-	}
-
-	/**
-	 * Character data handler
-	 * Variable in the last element of this->output
-	 * @param resource $parse an instance of parser
-	 * @param string $body a data to be added
-	 * @return void
-	 */
-	function _tagBody($parser, $body)
-	{
-		//if(!trim($body)) return;
-		$this->output[count($this->output) - 1]->body .= $body;
-	}
-
-	/**
-	 * End element handler
-	 * @param resource $parse an instance of parser
-	 * @param string $node_name name of xml node
-	 * @return void
-	 */
-	function _tagClosed($parser, $node_name)
-	{
-		$node_name = strtolower($node_name);
-		$cur_obj = array_pop($this->output);
-		$parent_obj = &$this->output[count($this->output) - 1];
-		if($this->lang && $cur_obj->attrs->{'xml:lang'} && $cur_obj->attrs->{'xml:lang'} != $this->lang)
-		{
-			return;
-		}
-		if($this->lang && ($parent_obj->{$node_name}->attrs->{'xml:lang'} ?? null) && $parent_obj->{$node_name}->attrs->{'xml:lang'} != $this->lang)
-		{
-			return;
-		}
-
-		if(isset($parent_obj->{$node_name}))
-		{
-			$tmp_obj = $parent_obj->{$node_name};
-			if(is_array($tmp_obj))
-			{
-				$parent_obj->{$node_name}[] = $cur_obj;
-			}
-			else
-			{
-				$parent_obj->{$node_name} = array($tmp_obj, $cur_obj);
-			}
-		}
-		else
-		{
-			if(!is_object($parent_obj))
-			{
-				$parent_obj = (object) $parent_obj;
-			}
-
-			$parent_obj->{$node_name} = $cur_obj;
+			return null;
 		}
 	}
 
 	/**
-	 * Method to transfer values in an array to a data object
-	 * @param array $arr data array
-	 * @return Xml_Node_ object
+	 * Load an XML string.
+	 *
+	 * @deprecated
+	 * @param string $$input
+	 * @return ?object
 	 */
-	function _arrToAttrsObj($arr)
+	function parse($input = ''): ?object
 	{
-		$output = new Xml_Node_();
-		foreach($arr as $key => $val)
-		{
-			$key = strtolower($key);
-			$output->{$key} = $val;
-		}
-		return $output;
+		$input = strval($input !== '' ? $input : $GLOBALS['HTTP_RAW_POST_DATA']);
+		return Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($input);
 	}
-
 }
 
 /**
diff --git a/common/css/rhymix.scss b/common/css/rhymix.scss
index d116b5b92..91c3e140d 100644
--- a/common/css/rhymix.scss
+++ b/common/css/rhymix.scss
@@ -10,6 +10,10 @@ article, aside, details, figcaption, figure, footer, header, hgroup, nav, sectio
 }
 body {
 	position: relative;
+	&.rx_modal_open {
+		overflow: hidden;
+		position: fixed;
+	}
 }
 a img {
 	border: 0;
diff --git a/common/framework/DB.php b/common/framework/DB.php
index c58d727b9..f01339d36 100644
--- a/common/framework/DB.php
+++ b/common/framework/DB.php
@@ -782,11 +782,11 @@ class DB
 		$table = Parsers\DBTableParser::loadXML($filename, $content);
 		if (!$table)
 		{
-			return $this->setError(-1, 'Table creation failed.');
+			return $this->setError(-1, 'Failed to load table schema file');
 		}
 		if ($table->deleted)
 		{
-			return new Helpers\DBResultHelper;
+			return new Helpers\DBResultHelper(-1, 'Table is marked as deleted');
 		}
 
 		// Generate the CREATE TABLE query and execute it.
diff --git a/common/framework/Password.php b/common/framework/Password.php
index 96282d624..3182557fb 100644
--- a/common/framework/Password.php
+++ b/common/framework/Password.php
@@ -128,12 +128,12 @@ class Password
 			$algorithm = $config->password_hashing_algorithm ?? '';
 			if (strval($algorithm) === '')
 			{
-				$algorithm = 'md5';
+				$algorithm = self::getBestSupportedAlgorithm();
 			}
 		}
 		else
 		{
-			$algorithm = 'md5';
+			$algorithm = self::getBestSupportedAlgorithm();
 		}
 		return $algorithm;
 	}
diff --git a/common/framework/Queue.php b/common/framework/Queue.php
index ec58a6aeb..1e33c1adb 100644
--- a/common/framework/Queue.php
+++ b/common/framework/Queue.php
@@ -11,6 +11,14 @@ class Queue
 	 * Static properties.
 	 */
 	protected static $_drivers = [];
+	protected static $_signal = 0;
+
+	/**
+	 * Priority constants.
+	 */
+	public const PRIORITY_HIGH = 'high';
+	public const PRIORITY_NORMAL = 'normal';
+	public const PRIORITY_LOW = 'low';
 
 	/**
 	 * Add a custom Queue driver.
@@ -120,9 +128,10 @@ class Queue
 	 * @param string $handler
 	 * @param ?object $args
 	 * @param ?object $options
+	 * @param ?string $priority
 	 * @return int
 	 */
-	public static function addTask(string $handler, ?object $args = null, ?object $options = null): int
+	public static function addTask(string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
 	{
 		$driver_name = config('queue.driver');
 		if (!$driver_name)
@@ -136,7 +145,7 @@ class Queue
 			throw new Exceptions\FeatureDisabled('Queue not configured');
 		}
 
-		return $driver->addTask($handler, $args, $options);
+		return $driver->addTask($handler, $args, $options, $priority);
 	}
 
 	/**
@@ -149,9 +158,10 @@ class Queue
 	 * @param string $handler
 	 * @param ?object $args
 	 * @param ?object $options
+	 * @param ?string $priority
 	 * @return int
 	 */
-	public static function addTaskAt(int $time, string $handler, ?object $args = null, ?object $options = null): int
+	public static function addTaskAt(int $time, string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
 	{
 		if (!config('queue.enabled'))
 		{
@@ -160,7 +170,7 @@ class Queue
 
 		// This feature always uses the DB driver.
 		$driver = self::getDbDriver();
-		return $driver->addTaskAt($time, $handler, $args, $options);
+		return $driver->addTaskAt($time, $handler, $args, $options, $priority);
 	}
 
 	/**
@@ -337,6 +347,11 @@ class Queue
 			foreach ($tasks as $task)
 			{
 				self::_executeTask($task);
+
+				if (self::signalReceived())
+				{
+					return;
+				}
 			}
 		}
 		if ($index === 1 || $count < 2)
@@ -347,6 +362,11 @@ class Queue
 			{
 				$db_driver->updateLastRunTimestamp($task);
 				self::_executeTask($task);
+
+				if (self::signalReceived())
+				{
+					return;
+				}
 			}
 		}
 
@@ -359,6 +379,11 @@ class Queue
 			if ($task)
 			{
 				self::_executeTask($task);
+
+				if (self::signalReceived())
+				{
+					return;
+				}
 			}
 
 			// If the timeout is imminent, break the loop.
@@ -374,6 +399,12 @@ class Queue
 			{
 				usleep(intval((1 - $loop_elapsed_time) * 1000000));
 			}
+
+			// Check for a signal again after the sleep.
+			if (self::signalReceived())
+			{
+				break;
+			}
 		}
 	}
 
@@ -479,4 +510,26 @@ class Queue
 			]));
 		}
 	}
+
+	/**
+	 * Signal handler.
+	 *
+	 * @param int $signal
+	 * @param mixed $siginfo
+	 * @return void
+	 */
+	public static function signalHandler(int $signal, $siginfo): void
+	{
+		self::$_signal = $signal;
+	}
+
+	/**
+	 * Has a signal been received?
+	 *
+	 * @return int
+	 */
+	public static function signalReceived(): int
+	{
+		return self::$_signal;
+	}
 }
diff --git a/common/framework/drivers/QueueInterface.php b/common/framework/drivers/QueueInterface.php
index ebcbafacb..242ef2812 100644
--- a/common/framework/drivers/QueueInterface.php
+++ b/common/framework/drivers/QueueInterface.php
@@ -57,9 +57,10 @@ interface QueueInterface
 	 * @param string $handler
 	 * @param ?object $args
 	 * @param ?object $options
+	 * @param ?string $priority
 	 * @return int
 	 */
-	public function addTask(string $handler, ?object $args = null, ?object $options = null): int;
+	public function addTask(string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int;
 
 	/**
 	 * Get the next task from the queue.
diff --git a/common/framework/drivers/queue/db.php b/common/framework/drivers/queue/db.php
index 68632704d..c6ced5583 100644
--- a/common/framework/drivers/queue/db.php
+++ b/common/framework/drivers/queue/db.php
@@ -89,14 +89,43 @@ class DB implements QueueInterface
 	 * @param string $handler
 	 * @param ?object $args
 	 * @param ?object $options
+	 * @param ?string $priority
 	 * @return int
 	 */
-	public function addTask(string $handler, ?object $args = null, ?object $options = null): int
+	public function addTask(string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
 	{
 		$oDB = RFDB::getInstance();
-		$stmt = $oDB->prepare('INSERT INTO task_queue (handler, args, options, regdate) VALUES (?, ?, ?, ?)');
-		$result = $stmt->execute([$handler, serialize($args), serialize($options), date('Y-m-d H:i:s')]);
-		return $result ? $oDB->getInsertID() : 0;
+
+		if ($priority === \Rhymix\Framework\Queue::PRIORITY_HIGH)
+		{
+			$stmt = $oDB->query('SELECT MIN(id) AS min_id FROM task_queue');
+			$min_id = intval($stmt->fetchColumn());
+			$stmt->closeCursor();
+			$id = $min_id ? ($min_id - rand(1, 10)) : null;
+		}
+		else
+		{
+			$min_id = null;
+			$id = null;
+		}
+
+		$stmt = $oDB->prepare('INSERT INTO task_queue (id, handler, args, options, regdate) VALUES (?, ?, ?, ?, ?)');
+		$result = $stmt->execute([
+			$id,
+			$handler,
+			serialize($args),
+			serialize($options),
+			date('Y-m-d H:i:s'),
+		]);
+
+		if ($result)
+		{
+			return $id ?? $oDB->getInsertID();
+		}
+		else
+		{
+			return 0;
+		}
 	}
 
 	/**
@@ -106,10 +135,20 @@ class DB implements QueueInterface
 	 * @param string $handler
 	 * @param ?object $args
 	 * @param ?object $options
+	 * @param ?string $priority
 	 * @return int
 	 */
-	public function addTaskAt(int $time, string $handler, ?object $args = null, ?object $options = null): int
+	public function addTaskAt(int $time, string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
 	{
+		if ($priority === \Rhymix\Framework\Queue::PRIORITY_HIGH)
+		{
+			$time = $time - 1;
+		}
+		elseif ($priority === \Rhymix\Framework\Queue::PRIORITY_LOW)
+		{
+			$time = $time + 1;
+		}
+
 		$oDB = RFDB::getInstance();
 		$task_srl = getNextSequence();
 		$stmt = $oDB->prepare(trim(<<<END
@@ -117,6 +156,7 @@ class DB implements QueueInterface
 			(task_srl, task_type, first_run, handler, args, options, regdate)
 			VALUES (?, ?, ?, ?, ?, ?, ?)
 		END));
+
 		$result = $stmt->execute([
 			$task_srl,
 			'once',
@@ -126,6 +166,7 @@ class DB implements QueueInterface
 			serialize($options),
 			date('Y-m-d H:i:s'),
 		]);
+
 		return $result ? $task_srl : 0;
 	}
 
diff --git a/common/framework/drivers/queue/dummy.php b/common/framework/drivers/queue/dummy.php
index 76d39dc63..156f00673 100644
--- a/common/framework/drivers/queue/dummy.php
+++ b/common/framework/drivers/queue/dummy.php
@@ -92,9 +92,10 @@ class Dummy implements QueueInterface
 	 * @param string $handler
 	 * @param ?object $args
 	 * @param ?object $options
+	 * @param ?string $priority
 	 * @return int
 	 */
-	public function addTask(string $handler, ?object $args = null, ?object $options = null): int
+	public function addTask(string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
 	{
 		$this->_dummy_queue = (object)[
 			'handler' => $handler,
diff --git a/common/framework/drivers/queue/redis.php b/common/framework/drivers/queue/redis.php
index cd4b8256e..963dc845f 100644
--- a/common/framework/drivers/queue/redis.php
+++ b/common/framework/drivers/queue/redis.php
@@ -133,9 +133,10 @@ class Redis implements QueueInterface
 	 * @param string $handler
 	 * @param ?object $args
 	 * @param ?object $options
+	 * @param ?string $priority
 	 * @return int
 	 */
-	public function addTask(string $handler, ?object $args = null, ?object $options = null): int
+	public function addTask(string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
 	{
 		$value = serialize((object)[
 			'handler' => $handler,
@@ -145,7 +146,14 @@ class Redis implements QueueInterface
 
 		if ($this->_conn)
 		{
-			$result = $this->_conn->rPush($this->_key, $value);
+			if ($priority === \Rhymix\Framework\Queue::PRIORITY_HIGH)
+			{
+				$result = $this->_conn->lPush($this->_key, $value);
+			}
+			else
+			{
+				$result = $this->_conn->rPush($this->_key, $value);
+			}
 			return intval($result);
 		}
 		else
diff --git a/common/framework/filters/FilenameFilter.php b/common/framework/filters/FilenameFilter.php
index 602b73354..83e1e2845 100644
--- a/common/framework/filters/FilenameFilter.php
+++ b/common/framework/filters/FilenameFilter.php
@@ -34,6 +34,9 @@ class FilenameFilter
 		$filename = preg_replace('/__+/', '_', $filename);
 		$filename = preg_replace('/\.\.+/', '.', $filename);
 
+		// Remove potentially misleading double extensions.
+		$filename = preg_replace('/\.(?:php[\d|s]?|txt|pdf|zip|com|exe|bat|msi|scr|jsp|aspx?|docx?|xlsx?|pptx?|hwpx?)\s?(\.[a-z0-9]+)$/', '$1', $filename);
+
 		// Change .php files to .phps to make them non-executable.
 		if (strtolower(substr($filename, strlen($filename) - 4)) === '.php')
 		{
diff --git a/common/framework/parsers/AddonInfoParser.php b/common/framework/parsers/AddonInfoParser.php
new file mode 100644
index 000000000..7598ed141
--- /dev/null
+++ b/common/framework/parsers/AddonInfoParser.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Rhymix\Framework\Parsers;
+
+/**
+ * Addon (info.xml) parser class for XE compatibility.
+ */
+class AddonInfoParser extends BaseParser
+{
+	/**
+	 * Load an XML file.
+	 *
+	 * @param string $filename
+	 * @param string $addon_name
+	 * @param string $lang
+	 * @return ?object
+	 */
+	public static function loadXML(string $filename, string $addon_name, string $lang = ''): ?object
+	{
+		// Load the XML file.
+		$xml = simplexml_load_string(file_get_contents($filename));
+		if ($xml === false)
+		{
+			return null;
+		}
+
+		// Get the current language.
+		$lang = $lang ?: (\Context::getLangType() ?: 'en');
+
+		// Initialize the addon definition.
+		$info = new \stdClass;
+		$info->addon_name = $addon_name;
+
+		// Get the XML schema version.
+		$version = strval($xml['version']) ?: '0.1';
+
+		// Parse version 0.2
+		if ($version === '0.2')
+		{
+			$info->title = self::_getChildrenByLang($xml, 'title', $lang);
+			$info->description = self::_getChildrenByLang($xml, 'description', $lang);
+			$info->version = trim($xml->version);
+			$info->date = ($xml->date === 'RX_CORE') ? '' : date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
+			$info->homepage = trim($xml->link);
+			$info->license = trim($xml->license);
+			$info->license_link = trim($xml->license['link'] ?? '');
+			$info->author = array();
+
+			foreach ($xml->author as $author)
+			{
+				$author_info = new \stdClass;
+				$author_info->name = self::_getChildrenByLang($author, 'name', $lang);
+				$author_info->email_address = trim($author['email_address'] ?? '');
+				$author_info->homepage = trim($author['link'] ?? '');
+				$info->author[] = $author_info;
+			}
+		}
+
+		// Parse version 0.1
+		else
+		{
+			$info->title = self::_getChildrenByLang($xml, 'title', $lang);
+			$info->description = self::_getChildrenByLang($xml->author, 'description', $lang);
+			$info->version = trim($xml['version'] ?? '');
+			$info->date = date('Ymd', strtotime($xml->author['date'] . 'T12:00:00Z'));
+			$info->homepage = trim($xml->link);
+			$info->license = trim($xml->license);
+			$info->license_link = trim($xml->license['link'] ?? '');
+			$info->author = array();
+
+			$author_info = new \stdClass;
+			$author_info->name = self::_getChildrenByLang($xml->author, 'name', $lang);
+			$author_info->email_address = trim($xml->author['email_address']);
+			$author_info->homepage = trim($xml->author['link'] ?? '');
+			$info->author[] = $author_info;
+		}
+
+		// Get extra_vars.
+		if ($xml->extra_vars)
+		{
+			$info->extra_vars = get_object_vars(self::_getExtraVars($xml->extra_vars, $lang, 'addon'));
+		}
+		else
+		{
+			$info->extra_vars = [];
+		}
+
+		// Prepare additional fields that will be filled in later.
+		$info->is_enabled = (object)['pc' => false, 'mobile' => false];
+		$info->xe_run_method = 'run_selected';
+		$info->mid_list = [];
+
+		// Return the complete result.
+		return $info;
+	}
+}
diff --git a/common/framework/parsers/BaseParser.php b/common/framework/parsers/BaseParser.php
index 1677aa67b..37fbcb0bb 100644
--- a/common/framework/parsers/BaseParser.php
+++ b/common/framework/parsers/BaseParser.php
@@ -10,7 +10,7 @@ abstract class BaseParser
 	/**
 	 * Get all attributes of an element as an associative array.
 	 *
-	 * @param SimpleXMLElement $element
+	 * @param \SimpleXMLElement $element
 	 * @param bool $normalize
 	 * @return array
 	 */
@@ -31,7 +31,7 @@ abstract class BaseParser
 	/**
 	 * Get the string value of an XML attribute after normalizing its name.
 	 *
-	 * @param SimpleXMLElement $element
+	 * @param \SimpleXMLElement $element
 	 * @param string $name
 	 * @return string
 	 */
@@ -55,7 +55,7 @@ abstract class BaseParser
 	 * A value that is identical to the name of the attribute will be treated as true.
 	 * Other values will be passed to toBool() for evaluation.
 	 *
-	 * @param SimpleXMLElement $element
+	 * @param \SimpleXMLElement $element
 	 * @param string $name
 	 * @return bool
 	 */
@@ -77,7 +77,7 @@ abstract class BaseParser
 	/**
 	 * Get the contents of child elements that match a language.
 	 *
-	 * @param SimpleXMLElement $parent
+	 * @param \SimpleXMLElement $parent
 	 * @param string $tag_name
 	 * @param string $lang
 	 * @return string
@@ -107,46 +107,113 @@ abstract class BaseParser
 	/**
 	 * Parse extra_vars.
 	 *
-	 * @param SimpleXMLElement $extra_vars
+	 * @param \SimpleXMLElement $extra_vars
 	 * @param string $lang
+	 * @param string $type
 	 * @return object
 	 */
-	protected static function _getExtraVars(\SimpleXMLElement $extra_vars, string $lang): \stdClass
+	protected static function _getExtraVars(\SimpleXMLElement $extra_vars, string $lang, string $type = ''): \stdClass
 	{
 		$result = new \stdClass;
+
+		// Recurse into groups.
 		$group_name = $extra_vars->getName() === 'group' ? self::_getChildrenByLang($extra_vars, 'title', $lang) : null;
 		foreach ($extra_vars->group ?: [] as $group)
 		{
-			$group_result = self::_getExtraVars($group, $lang);
+			$group_result = self::_getExtraVars($group, $lang, $type);
 			foreach ($group_result as $key => $val)
 			{
 				$result->{$key} = $val;
 			}
 		}
+
+		// Parse each variable in the group.
 		foreach ($extra_vars->var ?: [] as $var)
 		{
 			$item = new \stdClass;
 			$item->group = $group_name;
-			$item->name = trim($var['name']);
-			$item->type = trim($var['type']) ?: 'text';
+
+			// id and name
+			if ($type === 'widget' || $type === 'widgetstyle')
+			{
+				$item->id = trim($var['id'] ?? '') ?: trim($var->id);
+				if (!$item->id)
+				{
+					$item->id = trim($var['name'] ?? '');
+				}
+				$item->name = self::_getChildrenByLang($var, 'name', $lang);
+				if (!$item->name)
+				{
+					$item->name = self::_getChildrenByLang($var, 'title', $lang);
+				}
+			}
+			else
+			{
+				$item->name = trim($var['name'] ?? '');
+			}
+
+			// type
+			$item->type = trim($var['type'] ?? '');
+			if (!$item->type)
+			{
+				$item->type = trim($var->type) ?: 'text';
+			}
+			if ($item->type === 'filebox' && isset($var->type))
+			{
+				$item->filter = trim($var->type['filter'] ?? '');
+				$item->allow_multiple = trim($var->type['allow_multiple'] ?? '');
+			}
+
+			// Other common attributes
 			$item->title = self::_getChildrenByLang($var, 'title', $lang);
 			$item->description = str_replace('\\n', "\n", self::_getChildrenByLang($var, 'description', $lang));
-			$item->default = trim($var['default']) ?: null;
+			$item->default = trim($var['default'] ?? '') ?: null;
+			if (!isset($item->default))
+			{
+				$item->default = self::_getChildrenByLang($var, 'default', $lang);
+			}
 			$item->value = null;
+
+			// Options
 			if ($var->options)
 			{
 				$item->options = array();
 				foreach ($var->options as $option)
 				{
-					$option_item = new \stdClass;
-					$option_item->title = self::_getChildrenByLang($option, 'title', $lang);
-					$option_item->value = trim($option['value']);
-					$item->options[$option_item->value] = $option_item;
+					if ($type === 'widget' || $type === 'widgetstyle')
+					{
+						$value = trim($option->value ?? '');
+						$item->options[$value] = self::_getChildrenByLang($option, 'name', $lang);
+						if ($option['default'] === 'true')
+						{
+							$item->default_options[$value] = true;
+						}
+						if ($option['init'] === 'true')
+						{
+							$item->init_options[$value] = true;
+						}
+					}
+					else
+					{
+						$option_item = new \stdClass;
+						$option_item->title = self::_getChildrenByLang($option, 'title', $lang);
+						$option_item->value = trim($option['value'] ?? '') ?: trim($option->value ?? '');
+						$item->options[$option_item->value] = $option_item;
+					}
 				}
 			}
 
-			$result->{$item->name} = $item;
+			// Add to list of variables
+			if ($type === 'widget' || $type === 'widgetstyle')
+			{
+				$result->{$item->id} = $item;
+			}
+			else
+			{
+				$result->{$item->name} = $item;
+			}
 		}
+
 		return $result;
 	}
 }
diff --git a/common/framework/parsers/DBQueryParser.php b/common/framework/parsers/DBQueryParser.php
index bac0940ad..674648682 100644
--- a/common/framework/parsers/DBQueryParser.php
+++ b/common/framework/parsers/DBQueryParser.php
@@ -31,7 +31,7 @@ class DBQueryParser extends BaseParser
 	/**
 	 * Parse a query.
 	 *
-	 * @param SimpleXMLElement $xml
+	 * @param \SimpleXMLElement $xml
 	 * @param string $name
 	 * @return object
 	 */
@@ -248,7 +248,7 @@ class DBQueryParser extends BaseParser
 	/**
 	 * Parse conditions.
 	 *
-	 * @param SimpleXMLElement $parent
+	 * @param \SimpleXMLElement $parent
 	 * @return array
 	 */
 	protected static function _parseConditions(\SimpleXMLElement $parent): array
diff --git a/common/framework/parsers/DBTableParser.php b/common/framework/parsers/DBTableParser.php
index 8ba82b924..cbd50ea55 100644
--- a/common/framework/parsers/DBTableParser.php
+++ b/common/framework/parsers/DBTableParser.php
@@ -33,7 +33,7 @@ class DBTableParser extends BaseParser
 	 * @param string $content
 	 * @return ?object
 	 */
-	public static function loadXML(string $filename = '', string $content = ''): object
+	public static function loadXML(string $filename = '', string $content = ''): ?object
 	{
 		// Load the XML content.
 		if ($content)
@@ -61,10 +61,10 @@ class DBTableParser extends BaseParser
 			$table->name = strval($xml['name']);
 		}
 
-		$deleted = strval($xml['deleted']);
-		if ($deleted !== '')
+		$is_deleted = strval($xml['deleted']);
+		if ($is_deleted !== '')
 		{
-			$table->deleted = toBool($deleted);
+			$table->is_deleted = toBool($is_deleted);
 		}
 
 		// Load columns.
diff --git a/common/framework/parsers/EditorComponentParser.php b/common/framework/parsers/EditorComponentParser.php
index a50036ab6..53ea89118 100644
--- a/common/framework/parsers/EditorComponentParser.php
+++ b/common/framework/parsers/EditorComponentParser.php
@@ -31,29 +31,58 @@ class EditorComponentParser extends BaseParser
 		$info = new \stdClass;
 		$info->component_name = $component_name;
 
-		// Get basic information.
-		$info->title = self::_getChildrenByLang($xml, 'title', $lang);
-		$info->description = self::_getChildrenByLang($xml, 'description', $lang);
-		$info->version = trim($xml->version ?? '');
-		$info->date = date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
-		$info->homepage = trim($xml->homepage ?? '');
-		$info->license = trim($xml->license ?? '');
-		$info->license_link = trim($xml->license['link'] ?? '');
-		$info->author = array();
+		// Get the XML schema version.
+		$version = strval($xml['version']) ?: '0.1';
 
-		foreach ($xml->author as $author)
+		// Parse version 0.2
+		if ($version === '0.2')
 		{
+			$info->title = self::_getChildrenByLang($xml, 'title', $lang);
+			$info->description = self::_getChildrenByLang($xml, 'description', $lang);
+			$info->version = trim($xml->version ?? '');
+			$info->date = date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
+			$info->homepage = trim($xml->link);
+			$info->license = trim($xml->license ?? '');
+			$info->license_link = trim($xml->license['link'] ?? '');
+			$info->author = array();
+
+			foreach ($xml->author as $author)
+			{
+				$author_info = new \stdClass;
+				$author_info->name = self::_getChildrenByLang($author, 'name', $lang);
+				$author_info->email_address = trim($author['email_address'] ?? '');
+				$author_info->homepage = trim($author['link'] ?? '');
+				$info->author[] = $author_info;
+			}
+		}
+
+		// Parse version 0.1
+		else
+		{
+			$info->title = self::_getChildrenByLang($xml, 'title', $lang);
+			$info->description = self::_getChildrenByLang($xml->author, 'description', $lang);
+			$info->version = trim($xml['version'] ?? '');
+			$info->date = date('Ymd', strtotime($xml->author['date'] . 'T12:00:00Z'));
+			$info->homepage = trim($xml->link) ?: trim($xml->homepage);
+			$info->license = trim($xml->license);
+			$info->license_link = trim($xml->license['link'] ?? '');
+			$info->author = array();
+
 			$author_info = new \stdClass;
-			$author_info->name = self::_getChildrenByLang($author, 'name', $lang);
-			$author_info->email_address = trim($author['email_address'] ?? '');
-			$author_info->homepage = trim($author['link'] ?? '');
+			$author_info->name = self::_getChildrenByLang($xml->author, 'name', $lang);
+			$author_info->email_address = trim($xml->author['email_address']);
+			$author_info->homepage = trim($xml->author['link'] ?? '');
 			$info->author[] = $author_info;
 		}
 
 		// Get extra_vars.
 		if ($xml->extra_vars)
 		{
-			$info->extra_vars = self::_getExtraVars($xml->extra_vars, $lang);
+			$info->extra_vars = self::_getExtraVars($xml->extra_vars, $lang, 'editor_component');
+		}
+		else
+		{
+			$info->extra_vars = new \stdClass;
 		}
 
 		// Return the complete result.
diff --git a/common/framework/parsers/RulesetParser.php b/common/framework/parsers/RulesetParser.php
new file mode 100644
index 000000000..5fc631524
--- /dev/null
+++ b/common/framework/parsers/RulesetParser.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Rhymix\Framework\Parsers;
+
+/**
+ * Ruleset XML parser class for XE compatibility.
+ */
+class RulesetParser extends BaseParser
+{
+	/**
+	 * Load an XML file.
+	 *
+	 * @param string $filename
+	 * @param string $lang
+	 * @return ?object
+	 */
+	public static function loadXML(string $filename, string $lang = ''): ?object
+	{
+		// Load the XML file.
+		$xml = simplexml_load_string(file_get_contents($filename));
+		if ($xml === false)
+		{
+			return null;
+		}
+
+		// Get the current language.
+		$lang = $lang ?: (\Context::getLangType() ?: 'en');
+
+		// Initialize the result object.
+		$info = new \stdClass;
+		$info->rules = [];
+		$info->messages = [];
+		$info->filters = [];
+		$info->fieldsNames = [];
+
+		// Parse custom rules.
+		if ($xml->customrules && $xml->customrules->rule)
+		{
+			foreach ($xml->customrules->rule as $rule)
+			{
+				$def = [];
+				foreach ($rule->attributes() as $key => $val)
+				{
+					$def[trim($key)] = trim($val);
+				}
+				$def['message'] = self::_getChildrenByLang($rule, 'message', $lang) ?: null;
+				unset($def['name']);
+
+				$rule_name = trim($rule['name']);
+				$info->rules[$rule_name] = $def;
+
+				if ($def['message'])
+				{
+					$info->messages['invalid_' . $rule_name] = $def['message'];
+				}
+			}
+		}
+
+		// Parse field filters.
+		if ($xml->fields && $xml->fields->field)
+		{
+			foreach ($xml->fields->field as $field)
+			{
+				$def = [];
+				foreach ($field->attributes() as $key => $val)
+				{
+					$def[trim($key)] = trim($val);
+				}
+				$def['title'] = self::_getChildrenByLang($field, 'title', $lang) ?: null;
+				unset($def['name']);
+
+				if ($field->if)
+				{
+					foreach ($field->if as $if)
+					{
+						$condition = [];
+						foreach ($if->attributes() as $key => $val)
+						{
+							$condition[trim($key)] = trim($val);
+						}
+						$def['if'][] = $condition;
+					}
+				}
+
+				$filter_name = trim($field['name']);
+				$info->filters[$filter_name] = $def;
+
+				if ($def['title'])
+				{
+					$info->fieldsNames[$filter_name] = $def['title'];
+				}
+			}
+		}
+
+		return $info;
+	}
+}
diff --git a/common/framework/parsers/WidgetInfoParser.php b/common/framework/parsers/WidgetInfoParser.php
new file mode 100644
index 000000000..6e89979d7
--- /dev/null
+++ b/common/framework/parsers/WidgetInfoParser.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Rhymix\Framework\Parsers;
+
+/**
+ * Widget (info.xml) parser class for XE compatibility.
+ */
+class WidgetInfoParser extends BaseParser
+{
+	/**
+	 * Load an XML file.
+	 *
+	 * @param string $filename
+	 * @param string $widget_name
+	 * @param string $lang
+	 * @return ?object
+	 */
+	public static function loadXML(string $filename, string $widget_name, string $lang = ''): ?object
+	{
+		// Load the XML file.
+		$xml = simplexml_load_string(file_get_contents($filename));
+		if ($xml === false)
+		{
+			return null;
+		}
+
+		// Get the current language.
+		$lang = $lang ?: (\Context::getLangType() ?: 'en');
+
+		// Initialize the widget definition.
+		$info = new \stdClass;
+		$info->widget = $widget_name;
+		$info->path = sprintf('./widgets/%s/', $widget_name);
+
+		// Get the XML schema version.
+		$version = strval($xml['version']) ?: '0.1';
+
+		// Parse version 0.2
+		if ($version === '0.2')
+		{
+			$info->title = self::_getChildrenByLang($xml, 'title', $lang);
+			$info->description = self::_getChildrenByLang($xml, 'description', $lang);
+			$info->version = trim($xml->version);
+			$info->date = ($xml->date === 'RX_CORE') ? '' : date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
+			$info->homepage = trim($xml->link);
+			$info->license = trim($xml->license);
+			$info->license_link = trim($xml->license['link'] ?? '');
+			$info->author = array();
+
+			foreach ($xml->author as $author)
+			{
+				$author_info = new \stdClass;
+				$author_info->name = self::_getChildrenByLang($author, 'name', $lang);
+				$author_info->email_address = trim($author['email_address'] ?? '');
+				$author_info->homepage = trim($author['link'] ?? '');
+				$info->author[] = $author_info;
+			}
+		}
+
+		// Parse version 0.1
+		else
+		{
+			$info->title = self::_getChildrenByLang($xml, 'title', $lang);
+			$info->description = self::_getChildrenByLang($xml->author, 'description', $lang);
+			$info->version = trim($xml['version'] ?? '');
+			$info->date = date('Ymd', strtotime($xml->author['date'] . 'T12:00:00Z'));
+			$info->homepage = trim($xml->link);
+			$info->license = trim($xml->license);
+			$info->license_link = trim($xml->license['link'] ?? '');
+			$info->author = array();
+
+			$author_info = new \stdClass;
+			$author_info->name = self::_getChildrenByLang($xml->author, 'name', $lang);
+			$author_info->email_address = trim($xml->author['email_address']);
+			$author_info->homepage = trim($xml->author['link'] ?? '');
+			$info->author[] = $author_info;
+		}
+
+		// Get extra_vars.
+		if ($xml->extra_vars)
+		{
+			$info->extra_var = self::_getExtraVars($xml->extra_vars, $lang, 'widget');
+		}
+		else
+		{
+			$info->extra_var = new \stdClass;
+		}
+
+		// Prepare additional fields that will be filled in later.
+		$info->widget_srl = null;
+		$info->widget_title = null;
+
+		// Return the complete result.
+		return $info;
+	}
+}
diff --git a/common/framework/parsers/WidgetStyleInfoParser.php b/common/framework/parsers/WidgetStyleInfoParser.php
new file mode 100644
index 000000000..f7ae4307d
--- /dev/null
+++ b/common/framework/parsers/WidgetStyleInfoParser.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Rhymix\Framework\Parsers;
+
+/**
+ * Widget Style (info.xml) parser class for XE compatibility.
+ */
+class WidgetStyleInfoParser extends BaseParser
+{
+	/**
+	 * Load an XML file.
+	 *
+	 * @param string $filename
+	 * @param string $widgetstyle_name
+	 * @param string $lang
+	 * @return ?object
+	 */
+	public static function loadXML(string $filename, string $widgetstyle_name, string $lang = ''): ?object
+	{
+		// Load the XML file.
+		$xml = simplexml_load_string(file_get_contents($filename));
+		if ($xml === false)
+		{
+			return null;
+		}
+
+		// Get the current language.
+		$lang = $lang ?: (\Context::getLangType() ?: 'en');
+
+		// Initialize the widget definition.
+		$info = new \stdClass;
+		$info->widgetStyle = $widgetstyle_name;
+		$info->path = sprintf('./widgetstyles/%s/', $widgetstyle_name);
+
+		// Parse common fields.
+		$info->title = self::_getChildrenByLang($xml, 'title', $lang);
+		$info->description = self::_getChildrenByLang($xml, 'description', $lang);
+		$info->version = trim($xml->version);
+		$info->date = ($xml->date === 'RX_CORE') ? '' : date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
+		$info->homepage = trim($xml->link);
+		$info->license = trim($xml->license);
+		$info->license_link = trim($xml->license['link'] ?? '');
+
+		// Parse the preview image.
+		$preview_filename = trim($xml->preview ?? 'preview.jpg');
+		$preview_path = sprintf('%s%s', $info->path, $preview_filename);
+		if (file_exists($preview_path))
+		{
+			$info->preview = $preview_path;
+		}
+		else
+		{
+			$info->preview = null;
+		}
+
+		// Parse the author list.
+		$info->author = array();
+		foreach ($xml->author as $author)
+		{
+			$author_info = new \stdClass;
+			$author_info->name = self::_getChildrenByLang($author, 'name', $lang);
+			$author_info->email_address = trim($author['email_address'] ?? '');
+			$author_info->homepage = trim($author['link'] ?? '');
+			$info->author[] = $author_info;
+		}
+
+		// Get extra_vars.
+		if ($xml->extra_vars)
+		{
+			$info->extra_var = self::_getExtraVars($xml->extra_vars, $lang, 'widget');
+		}
+		else
+		{
+			$info->extra_var = new \stdClass;
+		}
+
+		// Count extra vars.
+		$info->extra_var_count = count(get_object_vars($info->extra_var));
+
+		// Return the complete result.
+		return $info;
+	}
+}
diff --git a/common/framework/parsers/XEXMLParser.php b/common/framework/parsers/XEXMLParser.php
new file mode 100644
index 000000000..2f944a995
--- /dev/null
+++ b/common/framework/parsers/XEXMLParser.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace Rhymix\Framework\Parsers;
+
+/**
+ * Generic XML parser that produces output identical to XE's XML parser.
+ */
+#[\AllowDynamicProperties]
+class XEXMLParser
+{
+	/**
+	 * Load an XML file.
+	 *
+	 * @param string $filename
+	 * @param string $lang
+	 * @return ?self
+	 */
+	public static function loadXMLFile(string $filename, string $lang = ''): ?self
+	{
+		$content = file_get_contents($filename);
+		return self::loadXMLString($content, $lang);
+	}
+
+	/**
+	 * Load an XML file.
+	 *
+	 * @param string $filename
+	 * @param string $lang
+	 * @return ?self
+	 */
+	public static function loadXMLString(string $content, string $lang = ''): ?self
+	{
+		// Apply transformations identical to XE's XML parser.
+		$content = str_replace([chr(1), chr(2)], ['', ''], $content);
+		$xml = simplexml_load_string($content);
+		if ($xml === false)
+		{
+			return null;
+		}
+
+		// Get the current language.
+		$lang = $lang ?: (\Context::getLangType() ?: 'en');
+
+		// Create the result object.
+		$result = new self;
+		$root_name = $xml->getName();
+		$result->$root_name = self::_recursiveConvert($xml, $lang);
+		return $result;
+	}
+
+	/**
+	 * Convert an XML node recursively.
+	 *
+	 * @param \SimpleXMLElement $element
+	 * @param string $lang
+	 * @return self
+	 */
+	protected static function _recursiveConvert(\SimpleXMLElement $element, string $lang): self
+	{
+		// Create the basic structure of the node.
+		$node = new self;
+		$node->node_name = $element->getName();
+		$node->attrs = new self;
+		$node->body = trim($element->__toString());
+
+		// Add attributes.
+		$attrs = $element->attributes();
+		foreach ($attrs as $key => $val)
+		{
+			$node->attrs->{$key} = trim($val);
+		}
+		$attrs = $element->attributes('xml', true);
+		foreach ($attrs as $key => $val)
+		{
+			$node->attrs->{"xml:$key"} = trim($val);
+		}
+
+		// Recursively process child elements.
+		foreach ($element->children() as $child)
+		{
+			// Skip children that do not match the language.
+			$attrs = $child->attributes('xml', true);
+			if (isset($attrs['lang']) && strval($attrs['lang']) !== $lang)
+			{
+				continue;
+			}
+
+			$child_name = $child->getName();
+			$child_node = self::_recursiveConvert($child, $lang);
+			if (!isset($node->$child_name))
+			{
+				$node->$child_name = $child_node;
+			}
+			elseif (is_array($node->$child_name))
+			{
+				$node->$child_name[] = $child_node;
+			}
+			else
+			{
+				$node->$child_name = [$node->$child_name, $child_node];
+			}
+		}
+
+		return $node;
+	}
+
+	/**
+	 * Hack to prevent undefined property errors.
+	 *
+	 * @param string $name
+	 */
+	public function __get($name)
+	{
+		return isset($this->$name) ? $this->$name : null;
+	}
+}
diff --git a/common/framework/parsers/dbtable/Table.php b/common/framework/parsers/dbtable/Table.php
index 67d1e5ca1..de5e73b43 100644
--- a/common/framework/parsers/dbtable/Table.php
+++ b/common/framework/parsers/dbtable/Table.php
@@ -12,7 +12,7 @@ class Table
 	public $indexes = array();
 	public $primary_key = array();
 	public $constraints = array();
-	public $deleted = false;
+	public $is_deleted = false;
 
 	/**
 	 * Generate the CREATE TABLE query for this table.
diff --git a/common/js/common.js b/common/js/common.js
index 1558437b9..ee59e72d3 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -1,350 +1,842 @@
 /**
- * @file common.js
- * @author NAVER (developers@xpressengine.com)
- * @brief 몇가지 유용한 & 기본적으로 자주 사용되는 자바스크립트 함수들 모음
- **/
+ * Common JavaScript library for Rhymix, based on XpressEngine 1.x
+ */
 
-(function($) {
+/**
+ * =============
+ * Rhymix object
+ * =============
+ */
 
-	/* OS check */
-	var UA = navigator.userAgent.toLowerCase();
-	$.os = {
-		Linux: /linux/.test(UA),
-		Unix: /x11/.test(UA),
-		Mac: /mac/.test(UA),
-		Windows: /win/.test(UA)
-	};
-	$.os.name = ($.os.Windows) ? 'Windows' :
-		($.os.Linux) ? 'Linux' :
-		($.os.Unix) ? 'Unix' :
-		($.os.Mac) ? 'Mac' : '';
+const Rhymix = {
+	addedDocument: [],
+	langCodes: {},
+	loadedPopupMenus: [],
+	openWindowList: {},
+	currentDebugData: null,
+	pendingDebugData: [],
+	showAjaxErrors: ['ALL'],
+	unloading: false,
+	modal: {},
+	state: {}
+};
 
-	/* Intercept getScript error due to broken minified script URL */
-	$(document).ajaxError(function(event, jqxhr, settings, thrownError) {
-		if(settings.dataType === "script" && (jqxhr.status >= 400 || (jqxhr.responseText && jqxhr.responseText.length < 40))) {
-			var match = /^(.+)\.min\.(css|js)($|\?)/.exec(settings.url);
-			if(match) {
-				$.getScript(match[1] + "." + match[2], settings.success);
-			}
-		}
-	});
+/**
+ * Check if the current device is a mobile device.
+ *
+ * @return bool
+ */
+Rhymix.isMobile = function() {
+	return String(navigator.userAgent).match(/mobile/i);
+};
 
-	/**
-	 * @brief Check if two URLs belong to the same origin
-	 */
-	window.isSameOrigin = function(url1, url2) {
-		if(!url1 || !url2) {
-			return false;
-		}
-		if (url1.match(/^\.?\/[^\/]*/) || url2.match(/^\.?\/[^\/]*/)) {
-			return true;
-		}
-		if (url1.match(/^(https?:)?\/\/[^\/]*[^a-z0-9\/.:_-]/i) || url2.match(/^(https?:)?\/\/[^\/]*[^a-z0-9\/.:_-]/i)) {
-			return false;
-		}
+/**
+ * Get the current color scheme
+ *
+ * @return string
+ */
+Rhymix.getColorScheme = function() {
+	if ($('body').hasClass('color_scheme_dark')) {
+		return 'dark';
+	} else {
+		return 'light';
+	}
+};
 
-		try {
-			url1 = window.XE.URI(url1).normalizePort().normalizeHostname().normalizePathname().origin();
-			url2 = window.XE.URI(url2).normalizePort().normalizeHostname().normalizePathname().origin();
-			return (url1 === url2) ? true : false;
-		} catch (err) {
-			return false;
-		}
-	};
+/**
+ * Set the color scheme
+ *
+ * @param string color_scheme
+ * @return void
+ */
+Rhymix.setColorScheme = function(color_scheme) {
+	if (color_scheme === 'dark' || color_scheme === 'light') {
+		$('body').addClass('color_scheme_' + color_scheme).removeClass('color_scheme_' + (color_scheme === 'dark' ? 'light' : 'dark'));
+		this.cookie.set('rx_color_scheme', color_scheme, { path: this.URI(default_url).pathname(), expires: 365 });
+	} else {
+		this.cookie.remove('rx_color_scheme', { path: this.URI(default_url).pathname() });
+		color_scheme = (window.matchMedia && window.matchMedia('(prefers-color-scheme:dark)').matches) ? 'dark' : 'light';
+		$('body').addClass('color_scheme_' + color_scheme).removeClass('color_scheme_' + (color_scheme === 'dark' ? 'light' : 'dark'));
+	}
+};
 
-	/**
-	 * Get CSRF token for the document
-	 */
-	window.getCSRFToken = function() {
-		return $("meta[name='csrf-token']").attr("content");
-	};
-
-	/**
-	 * Set CSRF token for the document
-	 */
-	window.setCSRFToken = function(token) {
-		$("meta[name='csrf-token']").attr("content", token);
-	};
-
-	/* Intercept jQuery AJAX calls to add CSRF headers */
-	$.ajaxPrefilter(function(options) {
-		if (!isSameOrigin(location.href, options.url)) return;
-		var token = getCSRFToken();
-		if (token) {
-			if (!options.headers) options.headers = {};
-			options.headers["X-CSRF-Token"] = token;
-		}
-	});
-
-	/* Add CSRF token to dynamically loaded forms */
-	$.fn.addCSRFTokenToForm = function() {
-		var token = getCSRFToken();
-		if (token) {
-			return $(this).each(function() {
-				if ($(this).data("csrf-token-checked") === "Y") return;
-				if ($(this).attr("action") && !isSameOrigin(location.href, $(this).attr("action"))) {
-					return $(this).data("csrf-token-checked", "Y");
-				}
-				$("<input />").attr({ type: "hidden", name: "_rx_csrf_token", value: token }).appendTo($(this));
-				return $(this).data("csrf-token-checked", "Y");
-			});
+/**
+ * Automatically detect the color scheme
+ *
+ * @return void
+ */
+Rhymix.detectColorScheme = function() {
+	// Return if a color scheme is already selected.
+	const body_element = $('body');
+	if(body_element.hasClass('color_scheme_light') || body_element.hasClass('color_scheme_dark')) {
+		return;
+	}
+	// Detect the cookie.
+	let color_scheme = this.cookie.get('rx_color_scheme');
+	// Detect the device color scheme.
+	let match_media = window.matchMedia ? window.matchMedia('(prefers-color-scheme:dark)') : null;
+	if (color_scheme !== 'light' && color_scheme !== 'dark') {
+		color_scheme = (match_media && match_media.matches) ? 'dark' : 'light';
+	}
+	// Set the body class according to the detected color scheme.
+	body_element.addClass('color_scheme_' + color_scheme);
+	// Add an event listener to detect changes to the device color scheme.
+	match_media && match_media.addListener && match_media.addListener(function(e) {
+		if (e.matches) {
+			body_element.removeClass('color_scheme_light').addClass('color_scheme_dark');
 		} else {
-			return $(this);
+			body_element.removeClass('color_scheme_dark').addClass('color_scheme_light');
 		}
+	});
+};
+
+/**
+ * Get the language
+ *
+ * @return string
+ */
+Rhymix.getLangType = function() {
+	return window.current_lang;
+};
+
+/**
+ * Set the language
+ *
+ * @param string lang_type
+ * @return void
+ */
+Rhymix.setLangType = function(lang_type) {
+	const baseurl = this.getBaseUrl();
+	if (baseurl !== '/') {
+		this.cookie.remove('lang_type', { path: '/' });
+	}
+	this.cookie.set('lang_type', lang_type, { path: baseurl, expires: 365 });
+};
+
+/**
+ * Get CSRF token for this document
+ *
+ * @return string|null
+ */
+Rhymix.getCSRFToken = function() {
+	return $("meta[name='csrf-token']").attr("content");
+};
+
+/**
+ * Set CSRF token for this document
+ *
+ * @param string token
+ * @return void
+ */
+Rhymix.setCSRFToken = function(token) {
+	$("meta[name='csrf-token']").attr("content", token);
+};
+
+/**
+ * Get the current rewrite level
+ *
+ * @return int
+ */
+Rhymix.getRewriteLevel = function() {
+	return window.rewrite_level;
+};
+
+/**
+ * Get the base URL relative to the current origin
+ *
+ * @return string
+ */
+Rhymix.getBaseUrl = function() {
+	if (!this.state.baseUrl) {
+		this.state.baseUrl = this.URI(default_url).pathname();
+	}
+	return this.state.baseUrl;
+};
+
+/**
+ * Get the full default URL
+ *
+ * @return string
+ */
+Rhymix.getDefaultUrl = function() {
+	return window.default_url;
+};
+
+/**
+ * Get the current page's long URL
+ *
+ * @return string
+ */
+Rhymix.getCurrentUrl = function() {
+	return window.current_url;
+};
+
+/**
+ * Get the current page prefix (mid)
+ *
+ * @return string
+ */
+Rhymix.getCurrentUrlPrefix = function() {
+	return window.current_mid;
+};
+
+/**
+ * Check if a URL is identical to the current page URL except for the hash
+ *
+ * @param string url
+ * @return bool
+ */
+Rhymix.isCurrentUrl = function(url) {
+	const absolute_url = window.location.href;
+	const relative_url = window.location.pathname + window.location.search;
+	return url === absolute_url || url === relative_url ||
+		url.indexOf(absolute_url.replace(/#.+$/, "") + "#") === 0 ||
+		url.indexOf(relative_url.replace(/#.+$/, "") + "#") === 0;
+};
+
+/**
+ * Check if two URLs belong to the same origin
+ *
+ * @param string url1
+ * @param string url2
+ * @return bool
+ */
+Rhymix.isSameOrigin = function(url1, url2) {
+	if(!url1 || !url2) {
+		return false;
+	}
+	if (url1.match(/^\.?\/[^\/]*/) || url2.match(/^\.?\/[^\/]*/)) {
+		return true;
+	}
+	if (url1.match(/^(https?:)?\/\/[^\/]*[^a-z0-9\/.:_-]/i) || url2.match(/^(https?:)?\/\/[^\/]*[^a-z0-9\/.:_-]/i)) {
+		return false;
+	}
+	try {
+		url1 = this.URI(url1).normalizePort().normalizeHostname().normalizePathname().origin();
+		url2 = this.URI(url2).normalizePort().normalizeHostname().normalizePathname().origin();
+		return (url1 === url2) ? true : false;
+	} catch (err) {
+		return false;
+	}
+}
+
+/**
+ * Check if a URL belongs to the same host as the current page
+ *
+ * Note that this function does not check the protocol.
+ * It is therefore a weaker check than isSameOrigin().
+ *
+ * @param string url
+ * @return bool
+ */
+Rhymix.isSameHost = function(url) {
+	if (typeof url !== 'string') {
+		return false;
+	}
+	if (url.match(/^\.?\/[^\/]/)) {
+		return true;
+	}
+	if (url.match(/^\w+:[^\/]*$/) || url.match(/^(https?:)?\/\/[^\/]*[^a-z0-9\/.:_-]/i)) {
+		return false;
+	}
+	if (!this.state.partialOrigin) {
+		let uri = this.URI(window.request_uri).normalizePort().normalizeHostname().normalizePathname();
+		this.state.partialOrigin = uri.hostname() + uri.directory();
+	}
+	try {
+		let target_url = this.URI(url).normalizePort().normalizeHostname().normalizePathname();
+		if (target_url.is('urn')) {
+			return false;
+		}
+		if (!target_url.hostname()) {
+			target_url = target_url.absoluteTo(window.request_uri);
+		}
+		target_url = target_url.hostname() + target_url.directory();
+		return target_url.indexOf(this.state.partialOrigin) === 0;
+	} catch(err) {
+		return false;
+	}
+};
+
+/**
+ * Redirect to a URL, but reload instead if the target is the same as the current page
+ *
+ * @param string url
+ * @return void
+ */
+Rhymix.redirectToUrl = function(url) {
+	if (this.isCurrentUrl(url)) {
+		window.location.href = url;
+		window.location.reload();
+	} else {
+		window.location.href = url;
+	}
+};
+
+/**
+ * Open a new window and focus it
+ *
+ * @param string url
+ * @param string target
+ * @param string features
+ */
+Rhymix.openWindow = function(url, target, features) {
+
+	// Fill default values
+	if (typeof target === 'undefined') {
+		target = '_blank';
+	}
+	if (typeof features === 'undefined') {
+		features = '';
+	}
+
+	// Close any existing window with the same target name
+	try {
+		if (target !== '_blank' && this.openWindowList[target]) {
+			this.openWindowList[target].close();
+			delete this.openWindowList[target];
+		}
+	} catch(e) {}
+
+	// Open using Blankshield if the target is a different site
+	if (!this.isSameHost(url)) {
+		window.blankshield.open(url, target, features);
+	} else {
+		const win = window.open(url, target, features);
+		win.focus();
+		if (target !== '_blank') {
+			this.openWindowList[target] = win;
+		}
+	}
+};
+
+/**
+ * Open a popup with standard features, for backward compatibility
+ *
+ * @param string url
+ * @param string target
+ * @return void
+ */
+Rhymix.openPopup = function(url, target) {
+	const features = 'width=800,height=600,toolbars=no,scrollbars=yes,resizable=yes';
+	this.openWindow(url, target, features);
+};
+
+/**
+ * Save background scroll position
+ *
+ * @param bool pushState
+ * @return void
+ */
+Rhymix.modal.saveBackgroundPosition = function(modal_id, pushState) {
+	const body = $(document.body);
+	if (!body.data('rx_scroll_position')) {
+		body.data('rx_scroll_position', {
+			left: $(window).scrollLeft(),
+			top: $(window).scrollTop()
+		});
+	}
+	body.addClass('rx_modal_open');
+	if (pushState) {
+		history.pushState({ modal: modal_id }, '', location.href);
+	}
+};
+
+/**
+ * Open an HTML element as a modal
+ *
+ * @param string id
+ * @return void
+ */
+Rhymix.modal.open = function(id) {
+	this.saveBackgroundPosition(id, true);
+	$('#' + id).addClass('active');
+};
+
+/**
+ * Open an iframe as a modal
+ *
+ * @param string url
+ * @param string target
+ * @return void
+ */
+Rhymix.modal.openIframe = function(url, target) {
+	const iframe = document.createElement('iframe');
+	const iframe_sequence = String(Date.now()) + Math.round(Math.random() * 1000000);
+	const iframe_id = '_rx_iframe_' + iframe_sequence;
+	iframe.setAttribute('id', iframe_id);
+	iframe.setAttribute('class', 'rx_modal');
+	iframe.setAttribute('name', target || ('_rx_iframe_' + iframe_sequence))
+	iframe.setAttribute('src', url + '&iframe_sequence=' + iframe_sequence);
+	iframe.setAttribute('width', '100%');
+	iframe.setAttribute('height', '100%');
+	iframe.setAttribute('style', 'position:fixed; top:0; left:0; width:100%; height:100%; border:0; z-index:999999999; background-color: #fff; overflow-y:auto');
+	this.saveBackgroundPosition(iframe_id, true);
+	$(document.body).append(iframe);
+};
+
+/**
+ * Close currently open modal
+ *
+ * @param string id
+ * @return void
+ */
+Rhymix.modal.close = function(id) {
+	history.back();
+	/*
+	if (typeof id === 'string') {
+		$('#' + id).remove();
+	} else {
+		$('.rx_modal').remove();
+	}
+	*/
+};
+
+/**
+ * Make an AJAX request
+ *
+ * @param string action
+ * @param object params
+ * @param function success
+ * @param function error
+ * @return void
+ */
+Rhymix.ajax = function(action, params, success, error) {
+
+	// Extract action info
+	if (!action) {
+		if (params instanceof FormData) {
+			action = (params.get('module') || params.get('mid')) + '.' + params.get('act');
+			if (action === '.') {
+				action = null;
+			}
+		} else {
+			action = null;
+		}
+	} else {
+		action = action.split('.');
+		params = params || {};
+		params.module = action[0];
+		params.act = action[1];
+		action = action.join('.');
+	}
+
+	// Add action to URL if the current rewrite level supports it
+	let url = this.URI(window.request_uri).pathname();
+	/*
+	if (this.getRewriteLevel() >= 2 && action !== null) {
+		url = url + action.replace('.', '/');
+	} else {
+		url = url + 'index.php';
+	}
+	*/
+
+	// Add a CSRF token.
+	const headers = {};
+	if (action !== null) {
+		headers['X-CSRF-Token'] = getCSRFToken();
 	};
 
-	window.rhymix_alert_close = function() {
-		if($('#rhymix_alert').is(':hidden')) {
+	// Send the AJAX request
+	try {
+		const args = {
+			type: 'POST',
+			dataType: 'json',
+			url: url,
+			data: params,
+			processData: (action !== null && !(params instanceof FormData)),
+			headers : headers,
+			success : function(data, textStatus, xhr) {
+				Rhymix.ajaxSuccessHandler(xhr, textStatus, action, data, params, success, error);
+			},
+			error : function(xhr, textStatus, errorThrown) {
+				Rhymix.ajaxErrorHandler(xhr, textStatus, action, url, params, success, error);
+			}
+		};
+		if (params instanceof FormData) {
+			args.contentType = false;
+		}
+		$.ajax(args);
+	} catch(e) {
+		alert(e);
+	}
+};
+
+/**
+ * Default success handler for AJAX requests
+ *
+ * @param object xhr
+ * @param string textStatus
+ * @param string action
+ * @param object data
+ * @param object params
+ * @param function success
+ * @param function errror
+ * @return void
+ */
+Rhymix.ajaxSuccessHandler = function(xhr, textStatus, action, data, params, success, error) {
+
+	// Add debug information.
+	if (data._rx_debug) {
+		data._rx_debug.page_title = "AJAX : " + action;
+		if (this.addDebugData) {
+			this.addDebugData(data._rx_debug);
+		} else {
+			this.pendingDebugData.push(data._rx_debug);
+		}
+	}
+
+	// If the response contains a Rhymix error code, display the error message.
+	if (typeof data.error !== 'undefined' && data.error != 0) {
+
+		// If an error callback is defined, call it. Abort if it returns false.
+		if ($.isFunction(error) && error(data, xhr) === false) {
 			return;
 		}
-		$('#rhymix_alert').fadeOut(500, function() {
-			$(this).empty();
-		});
-	};
 
-	/**
-	 * @brief display alert
-	 */
-	window.rhymix_alert = function(message, redirect_url, delay) {
-		if(!delay) {
-			delay = 2500;
+		// If an error message was supplied, display it.
+		if (data.message) {
+			let msg = data.message.replace(/\\n/g, "\n");
+			if (data.errorDetail) {
+				msg += "\n\n" + data.errorDetail;
+			}
+			alert(msg);
+			return;
 		}
-		if(!redirect_url) {
-			$('#rhymix_alert').text(message).show();
-			setTimeout(rhymix_alert_close, delay);
-		}
-		else if(isSameOrigin(location.href, redirect_url)) {
-			Cookies.set('rhymix_alert_message', message, { expires: 1 / 1440, path: '/' });
-			Cookies.set('rhymix_alert_delay', delay, { expires: 1 / 1440, path: '/' });
-		}
-		else {
-			alert(message);
-		}
-	};
 
-	$(document).ready(function() {
-		if(Cookies.get('rhymix_alert_message')) {
-			rhymix_alert(Cookies.get('rhymix_alert_message'), null, Cookies.get('rhymix_alert_delay'));
-			Cookies.remove('rhymix_alert_message', { path: '/' });
-			Cookies.remove('rhymix_alert_delay', { path: '/' });
+		// Rhymix should never return an error code without a message, but if someone does, we handle it here.
+		let msg = 'AJAX error: ' + (action || 'form submission') + "\n\n" + xhr.responseText;
+		if (msg.length > 1000) {
+			msg = msg.substring(0, 1000) + '...';
 		}
-		$('#rhymix_alert').click(rhymix_alert_close);
-	});
+		console.error(msg.trim().replace(/\n+/g, "\n"));
+		if (this.showAjaxErrors.indexOf('ALL') >= 0 || this.showAjaxErrors.indexOf(xhr.status) >= 0) {
+			alert(msg.trim());
+		}
+		return;
+	}
 
-	/* Array for pending debug data */
-	window.rhymix_debug_pending_data = [];
+	// If a success callback was defined, call it.
+	if ($.isFunction(success)) {
+		success(data, xhr);
+		return;
+	}
 
-	/**
-	 * @brief XE 공용 유틸리티 함수
-	 * @namespace XE
-	 */
-	window.XE = {
-		loaded_popup_menus : [],
-		addedDocument : [],
-		cookie : window.Cookies,
-		URI : window.URI,
-		URITemplate : window.URITemplate,
-		SecondLevelDomains : window.SecondLevelDomains,
-		IPv6 : window.IPv6,
-		baseurl : null,
+	// If the response contains a redirect URL, follow the redirect.
+	if (data.redirect_url) {
+		this.redirectToUrl(data.redirect_url.replace(/&amp;/g, '&'));
+		return;
+	}
+};
 
-		/**
-		 * @brief 특정 name을 가진 체크박스들의 checked 속성 변경
-		 * @param [itemName='cart',][options={}]
-		 */
-		checkboxToggleAll : function(itemName) {
-			if(!is_def(itemName)) itemName='cart';
-			var obj;
-			var options = {
-				wrap : null,
-				checked : 'toggle',
-				doClick : false
+/**
+ * Default error handler for AJAX requests
+ *
+ * @param object xhr
+ * @param string textStatus
+ * @param string action
+ * @param string url
+ * @param object params
+ * @param function success
+ * @param function errror
+ * @return void
+ */
+Rhymix.ajaxErrorHandler = function(xhr, textStatus, action, url, params, success, error) {
+
+	// If the user is navigating away, don't do anything.
+	if (xhr.status == 0 && this.unloading) {
+		return;
+	}
+
+	// If the response contains valid JSON, call the success callback instead.
+	if (xhr.status >= 400 && xhr.responseText) {
+		let data;
+		try {
+			data = JSON.parse(xhr.responseText);
+		} catch (e) { }
+		if (data && typeof data.error !== 'undefined') {
+			this.ajaxSuccessHandler(xhr, textStatus, action, data, params, success, error);
+			return;
+		}
+	}
+
+	// If an error callback is defined, call it. Abort if it returns false.
+	if ($.isFunction(error)) {
+		let fakedata = { error: -3, message: textStatus };
+		if (error(fakedata, xhr) === false) {
+			return;
+		}
+	}
+
+	// Otherwise, generate a simple error message.
+	let error_info, msg;
+	if (xhr.status == 0) {
+		error_info = 'Connection failed: ' + url + "\n\n" + (xhr.responseText || '');
+	} else {
+		error_info = 'Response code: ' + xhr.status + "\n\n" + (xhr.responseText || '');
+	}
+	msg = 'AJAX error: ' + (action || 'form submission') + "\n\n" + error_info;
+	if (msg.length > 1000) {
+		msg = msg.substring(0, 1000) + '...';
+	}
+
+	// Print the error message.
+	console.error(msg.trim().replace(/\n+/g, "\n"));
+	if (this.showAjaxErrors.indexOf('ALL') >= 0 || this.showAjaxErrors.indexOf(xhr.status) >= 0) {
+		alert(msg.trim());
+	}
+};
+
+/**
+ * Submit a form using AJAX instead of navigating away
+ *
+ * @param HTMLElement form
+ * @param function success
+ * @param function error
+ * @return void
+ */
+Rhymix.ajaxForm = function(form, success, error) {
+	const $form = $(form);
+	// Get success and error callback functions.
+	if (typeof success === 'undefined') {
+		success = $form.data('callbackSuccess');
+		if (success && $.isFunction(success)) {
+			// no-op
+		} else if (success && window[success] && $.isFunction(window[success])) {
+			success = window[success];
+		} else {
+			success = function(data) {
+				if (data.message && data.message !== 'success') {
+					alert(data.message);
+				}
+				if (data.redirect_url) {
+					Rhymix.redirectToUrl(data.redirect_url.replace(/&amp;/g, '&'));
+				}
 			};
-
-			switch(arguments.length) {
-				case 1:
-					if(typeof(arguments[0]) == "string") {
-						itemName = arguments[0];
-					} else {
-						$.extend(options, arguments[0] || {});
-						itemName = 'cart';
-					}
-					break;
-				case 2:
-					itemName = arguments[0];
-					$.extend(options, arguments[1] || {});
-			}
-
-			if(options.doClick === true) options.checked = null;
-			if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap;
-
-			if(options.wrap) {
-				obj = $(options.wrap).find('input[name="'+itemName+'"]:checkbox');
-			} else {
-				obj = $('input[name="'+itemName+'"]:checkbox');
-			}
-
-			if(options.checked == 'toggle') {
-				obj.each(function() {
-					$(this).attr('checked', ($(this).attr('checked')) ? false : true);
-				});
-			} else {
-				if(options.doClick === true) {
-					obj.click();
-				} else {
-					obj.attr('checked', options.checked);
-				}
-			}
-		},
-
-		/**
-		 * @brief 문서/회원 등 팝업 메뉴 출력
-		 */
-		displayPopupMenu : function(ret_obj, response_tags, params) {
-			var target_srl = params.target_srl;
-			var menu_id = params.menu_id;
-			var menus = ret_obj.menus;
-			var html = "";
-			var isMobile = navigator.userAgent.match(/mobile/i);
-
-			if(this.loaded_popup_menus[menu_id]) {
-				html = this.loaded_popup_menus[menu_id];
-
-			} else {
-				if(menus) {
-					var item = menus.item || menus;
-					if(typeof(item.length)=='undefined' || item.length<1) item = new Array(item);
-					if(item.length) {
-						for(var i=0;i<item.length;i++) {
-							var url = item[i].url;
-							var str = item[i].str;
-							var classname = item[i]['class'];
-							var icon = item[i].icon;
-							var target = item[i].target;
-
-							// Convert self to _self #2154
-							if (target === 'self') {
-								target = '_self';
-							}
-
-							var actmatch = url.match(/\bact=(\w+)/) || url.match(/\b((?:disp|proc)\w+)/);
-							var act = actmatch ? actmatch[1] : null;
-							var classText = 'class="' + (classname ? classname : (act ? (act + ' ') : ''));
-							var styleText = "";
-							var click_str = "";
-							var matches = [];
-							/* if(icon) styleText = " style=\"background-image:url('"+icon+"')\" "; */
-							if (target === 'popup') {
-								if (isMobile) {
-									click_str = 'onclick="openFullScreenIframe(this.href, \''+target+'\'); return false;"';
-								} else {
-									click_str = 'onclick="popopen(this.href, \''+target+'\'); return false;"';
-								}
-								classText += 'popup ';
-							} else if (target === 'javascript') {
-								click_str = 'onclick="'+url+'; return false; "';
-								classText += 'javascript ';
-								url = '#';
-							} else if (target.match(/^_(self|blank|parent|top)$/)) {
-								click_str = 'target="' + target + '"';
-								classText += 'frame_' + target + ' ';
-							} else if (matches = target.match(/^i?frame:([a-zA-Z0-9_]+)$/)) {
-								click_str = 'target="' + matches[1] + '"';
-								classText += 'frame_' + matches[1] + ' ';
-							} else {
-								click_str = 'target="_blank"';
-							}
-							classText = classText.trim() + '" ';
-
-							html += '<li '+classText+styleText+'><a href="'+url+'" '+click_str+'>'+str+'</a></li> ';
-						}
-					}
-				}
-				this.loaded_popup_menus[menu_id] =  html;
-			}
-
-			/* 레이어 출력 */
-			if(html) {
-				var area = $('#popup_menu_area').html('<ul>'+html+'</ul>');
-				var areaOffset = {top:params.page_y, left:params.page_x};
-
-				if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop())
-					areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop();
-				if(area.outerWidth()+areaOffset.left > $(window).width()+$(window).scrollLeft())
-					areaOffset.left = $(window).width() - area.outerWidth() + $(window).scrollLeft();
-
-				area.css({ top:areaOffset.top, left:areaOffset.left }).show().focus();
-			}
-		},
-
-		/* 동일 사이트 내 주소인지 판단 (프로토콜 제외) */
-		isSameHost: function(url) {
-			if (typeof url !== "string") {
-				return false;
-			}
-			if (url.match(/^\.?\/[^\/]/)) {
-				return true;
-			}
-			if (url.match(/^\w+:[^\/]*$/) || url.match(/^(https?:)?\/\/[^\/]*[^a-z0-9\/.:_-]/i)) {
-				return false;
-			}
-
-			if (!window.XE.baseurl) {
-				window.XE.baseurl = window.XE.URI(window.request_uri).normalizePort().normalizeHostname().normalizePathname();
-				window.XE.baseurl = window.XE.baseurl.hostname() + window.XE.baseurl.directory();
-			}
-
-			try {
-				var target_url = window.XE.URI(url).normalizePort().normalizeHostname().normalizePathname();
-				if (target_url.is("urn")) {
-					return false;
-				}
-				if (!target_url.hostname()) {
-					target_url = target_url.absoluteTo(window.request_uri);
-				}
-				target_url = target_url.hostname() + target_url.directory();
-				return target_url.indexOf(window.XE.baseurl) === 0;
-			}
-			catch(err) {
-				return false;
-			}
-		},
-
-		/* Format file size */
-		filesizeFormat: function(size) {
-			if (size < 2) return size + 'Byte';
-			if (size < 1024) return size + 'Bytes';
-			if (size < 1048576) return (size / 1024).toFixed(1) + 'KB';
-			if (size < 1073741824) return (size / 1048576).toFixed(2) + 'MB';
-			if (size < 1099511627776) return (size / 1073741824).toFixed(2) + 'GB';
-			return (size / 1099511627776).toFixed(2) + 'TB';
 		}
+	}
+	if (typeof error === 'undefined') {
+		error = $form.data('callbackError');
+		if (error && $.isFunction(error)) {
+			// no-op
+		} else if (error && window[error] && $.isFunction(window[error])) {
+			error = window[error];
+		} else {
+			error = null;
+		}
+	}
+	this.ajax(null, new FormData($form[0]), success, error);
+};
+
+/**
+ * Toggle all checkboxes that have the same name
+ *
+ * This is a legacy function. Do not write new code that relies on it.
+ *
+ * @param string name
+ * @return void
+ */
+Rhymix.checkboxToggleAll = function(name) {
+	if (!window[name]) {
+		name='cart';
+	}
+	let options = {
+		wrap : null,
+		checked : 'toggle',
+		doClick : false
 	};
 
+	if (arguments.length == 1) {
+		if(typeof(arguments[0]) == 'string') {
+			name = arguments[0];
+		} else {
+			$.extend(options, arguments[0] || {});
+			name = 'cart';
+		}
+	} else {
+		name = arguments[0];
+		$.extend(options, arguments[1] || {});
+	}
+
+	if (options.doClick === true) {
+		options.checked = null;
+	}
+	if (typeof options.wrap  === 'string') {
+		options.wrap = '#' + options.wrap;
+	}
+
+	let obj;
+	if (options.wrap) {
+		obj = $(options.wrap).find('input[name="'+name+'"]:checkbox');
+	} else {
+		obj = $('input[name="'+name+'"]:checkbox');
+	}
+
+	if (options.checked === 'toggle') {
+		obj.each(function() {
+			$(this).prop('checked', $(this).prop('checked') ? false : true);
+		});
+	} else {
+		if(options.doClick === true) {
+			obj.click();
+		} else {
+			obj.prop('checked', options.checked);
+		}
+	}
+};
+
+/**
+ * Display a popup menu for members, documents, etc.
+ *
+ * @param object ret_obj
+ * @param object response_tags
+ * @param object params
+ * @return void
+ */
+Rhymix.displayPopupMenu = function(ret_obj, response_tags, params) {
+	const menu_id = params.menu_id;
+	const menus = ret_obj.menus;
+	let html = "";
+
+	if (this.loadedPopupMenus[menu_id]) {
+		html = this.loadedPopupMenus[menu_id];
+	} else {
+		if (menus) {
+			let item = menus.item || menus;
+			if (typeof item.length === 'undefined' || item.length < 1) {
+				item = new Array(item);
+			}
+			if (item.length) {
+				for (let i = 0; i < item.length; i++) {
+					var url = item[i].url;
+					var str = item[i].str;
+					var classname = item[i]['class'];
+					var icon = item[i].icon;
+					var target = item[i].target;
+
+					// Convert self to _self #2154
+					if (target === 'self') {
+						target = '_self';
+					}
+
+					var actmatch = url.match(/\bact=(\w+)/) || url.match(/\b((?:disp|proc)\w+)/);
+					var act = actmatch ? actmatch[1] : null;
+					var classText = 'class="' + (classname ? classname : (act ? (act + ' ') : ''));
+					var styleText = "";
+					var click_str = "";
+					var matches = [];
+					if (target === 'popup') {
+						if (this.isMobile()) {
+							click_str = 'onclick="openModalIframe(this.href, \''+target+'\'); return false;"';
+						} else {
+							click_str = 'onclick="popopen(this.href, \''+target+'\'); return false;"';
+						}
+						classText += 'popup ';
+					} else if (target === 'javascript') {
+						click_str = 'onclick="'+url+'; return false; "';
+						classText += 'javascript ';
+						url = '#';
+					} else if (target.match(/^_(self|blank|parent|top)$/)) {
+						click_str = 'target="' + target + '"';
+						classText += 'frame_' + target + ' ';
+					} else if (matches = target.match(/^i?frame:([a-zA-Z0-9_]+)$/)) {
+						click_str = 'target="' + matches[1] + '"';
+						classText += 'frame_' + matches[1] + ' ';
+					} else {
+						click_str = 'target="_blank"';
+					}
+					classText = classText.trim() + '" ';
+
+					html += '<li '+classText+styleText+'><a href="'+url+'" '+click_str+'>'+str+'</a></li> ';
+				}
+			}
+		}
+		this.loadedPopupMenus[menu_id] =  html;
+	}
+
+	/* 레이어 출력 */
+	if (html) {
+		const area = $('#popup_menu_area').html('<ul>'+html+'</ul>');
+		const areaOffset = {top:params.page_y, left:params.page_x};
+		if (area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop()) {
+			areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop();
+		}
+		if (area.outerWidth()+areaOffset.left > $(window).width()+$(window).scrollLeft()) {
+			areaOffset.left = $(window).width() - area.outerWidth() + $(window).scrollLeft();
+		}
+		area.css({ top:areaOffset.top, left:areaOffset.left }).show().focus();
+	}
+};
+
+/**
+ * Format file size
+ *
+ * @param int size
+ * @return string
+ */
+Rhymix.filesizeFormat = function(size) {
+	if (size < 2) {
+		return size + 'Byte';
+	}
+	if (size < 1024) {
+		return size + 'Bytes';
+	}
+	if (size < 1048576) {
+		return (size / 1024).toFixed(1) + 'KB';
+	}
+	if (size < 1073741824) {
+		return (size / 1048576).toFixed(2) + 'MB';
+	}
+	if (size < 1099511627776) {
+		return (size / 1073741824).toFixed(2) + 'GB';
+	}
+	return (size / 1099511627776).toFixed(2) + 'TB';
+};
+
+/**
+ * Get or set a lang code
+ *
+ * @param string key
+ * @param string val
+ * @return string|void
+ */
+Rhymix.lang = function(key, val) {
+	if (typeof val === 'undefined')	{
+		return this.langCodes[key] || key;
+	} else {
+		return this.langCodes[key] = val;
+	}
+};
+
+// Add aliases to loaded libraries
+Rhymix.cookie = window.Cookies;
+Rhymix.URI = window.URI;
+Rhymix.URITemplate = window.URITemplate;
+Rhymix.SecondLevelDomains = window.SecondLevelDomains;
+Rhymix.IPv6 = window.IPv6;
+
+// Alias to XE for backward compatibility
+const XE = Rhymix;
+
+/**
+ * ============================
+ * Document ready event handler
+ * ============================
+ */
+
+$(function() {
+
 	/**
-	 * Shim for Modernizr if it is not loaded
+	 * Inject CSRF token to all POST forms
 	 */
-	window.Modernizr = {
-		audio: true,
-		video: true,
-		canvas: true,
-		history: true,
-		postmessage: true,
-		geolocation: ('geolocation' in navigator),
-		touch: ('ontouchstart' in window) || (navigator.maxTouchPoints > 0),
-		webgl: !!window.WebGLRenderingContext
-	};
-
-})(jQuery);
-
-/* jQuery(document).ready() */
-jQuery(function($) {
-
-	/* CSRF token */
-	$("form[method]").filter(function() { return String($(this).attr("method")).toUpperCase() == "POST"; }).addCSRFTokenToForm();
-	$(document).on("submit", "form[method='post']", $.fn.addCSRFTokenToForm);
-	$(document).on("focus", "input,select,textarea", function() {
-		$(this).parents("form[method]").filter(function() { return String($(this).attr("method")).toUpperCase() == "POST"; }).addCSRFTokenToForm();
+	$('form[method]').filter(function() {
+		return String($(this).attr('method')).toUpperCase() == 'POST';
+	}).addCSRFTokenToForm();
+	$(document).on('submit', 'form[method=post]', $.fn.addCSRFTokenToForm);
+	$(document).on('focus', 'input,select,textarea', function() {
+		$(this).parents('form[method]').filter(function() {
+			return String($(this).attr('method')).toUpperCase() == 'POST';
+		}).addCSRFTokenToForm();
 	});
 
 	/**
@@ -354,45 +846,45 @@ jQuery(function($) {
 	 * This is not required in most modern browsers.
 	 * https://caniuse.com/mdn-html_elements_a_implicit_noopener
 	 */
-	var noopenerRequired = (function() {
-		var isChromeBased = navigator.userAgent.match(/Chrome\/([0-9]+)/);
+	const noopenerRequired = (function() {
+		const isChromeBased = navigator.userAgent.match(/Chrome\/([0-9]+)/);
 		if (isChromeBased && parseInt(isChromeBased[1], 10) >= 72) {
 			return false;
 		}
-		var isAppleWebKit = navigator.userAgent.match(/AppleWebKit\/([0-9]+)/);
+		const isAppleWebKit = navigator.userAgent.match(/AppleWebKit\/([0-9]+)/);
 		if (isAppleWebKit && parseInt(isAppleWebKit[1], 10) >= 605) {
 			return false;
 		}
-		var isFirefox = navigator.userAgent.match(/Firefox\/([0-9]+)/);
+		const isFirefox = navigator.userAgent.match(/Firefox\/([0-9]+)/);
 		if (isFirefox && parseInt(isFirefox[1], 10) >= 79) {
 			return false;
 		}
 		return true;
 	})();
 	$('a[target]').each(function() {
-		var $this = $(this);
-		var href = String($this.attr('href')).trim();
-		var target = String($this.attr('target')).trim();
+		const $this = $(this);
+		const href = String($this.attr('href')).trim();
+		const target = String($this.attr('target')).trim();
 		if (!href || !target || target === '_top' || target === '_self' || target === '_parent') {
 			return;
 		}
-		if (!window.XE.isSameHost(href)) {
-			var rel = $this.attr('rel');
+		if (!Rhymix.isSameHost(href)) {
+			let rel = $this.attr('rel');
 			rel = (typeof rel === 'undefined') ? '' : String(rel);
 			if (!rel.match(/\bnoopener\b/)) {
 				$this.attr('rel', $.trim(rel + ' noopener'));
 			}
 		}
 	});
-	$('body').on('click', 'a[target]', function(event) {
-		var $this = $(this);
-		var href = String($this.attr('href')).trim();
-		var target = String($this.attr('target')).trim();
+	$(document).on('click', 'a[target]', function(event) {
+		const $this = $(this);
+		const href = String($this.attr('href')).trim();
+		const target = String($this.attr('target')).trim();
 		if (!href || !target || target === '_top' || target === '_self' || target === '_parent') {
 			return;
 		}
-		if (!window.XE.isSameHost(href)) {
-			var rel = $this.attr('rel');
+		if (!Rhymix.isSameHost(href)) {
+			let rel = $this.attr('rel');
 			rel = (typeof rel === 'undefined') ? '' : String(rel);
 			if (!rel.match(/\bnoopener\b/)) {
 				$this.attr('rel', $.trim(rel + ' noopener'));
@@ -404,271 +896,831 @@ jQuery(function($) {
 		}
 	});
 
-	/* Editor preview replacement */
-	$(".editable_preview").addClass("rhymix_content xe_content").attr("tabindex", 0);
-	$(".editable_preview").on("click", function() {
-		var input = $(this).siblings(".editable_preview_content");
+	/**
+	 * Enforce max filesize on file uploaeds
+	 */
+	$(document).on('change', 'input[type=file]', function() {
+		const max_filesize = $(this).data('max-filesize');
+		if (!max_filesize) {
+			return;
+		}
+		const files = $(this).get(0).files;
+		if (!files || !files[0]) {
+			return;
+		}
+		if (files[0].size > max_filesize) {
+			this.value = '';
+			const error = String($(this).data('max-filesize-error'));
+			alert(error.replace('%s', Rhymix.filesizeFormat(max_filesize)));
+		}
+	});
+
+	/**
+	 * Intercept form submission and handle them with AJAX
+	 */
+	$(document).on('submit', 'form.rx_ajax', function(event) {
+		if (!$(this).attr('target')) {
+			event.preventDefault();
+			Rhymix.ajaxForm(this);
+		}
+	});
+
+	/**
+	 * Prevent repeated click on submit button
+	 */
+	$(document).on('click', 'input[type="submit"],button[type="submit"]', function(e) {
+		const timeout = 3000;
+		setTimeout(function() {
+			$(this).prop('disabled', true);
+		}, 100);
+		setTimeout(function() {
+			$(this).prop('disabled', false);
+		}, timeout);
+	});
+
+	/**
+	 * Display a popup menu for members, documents, etc.
+	 */
+	$(document).on('click', function(e) {
+		var $area = $('#popup_menu_area');
+		if (!$area.length) {
+			$area = $('<div id="popup_menu_area" tabindex="0" style="display:none;" />').appendTo(document.body);
+		}
+
+		// 이전에 호출되었을지 모르는 팝업메뉴 숨김
+		$area.hide();
+
+		var $target = $(e.target).filter('a,div,span');
+		if (!$target.length) {
+			$target = $(e.target).closest('a,div,span');
+		}
+		if (!$target.length) {
+			return;
+		}
+
+		// 객체의 className값을 구함
+		var cls = $target.attr('class'), match;
+		if (cls) {
+			match = cls.match(new RegExp('(?:^| )((document|comment|member)_([1-9][0-9]*))(?: |$)',''));
+		}
+		if (!match) {
+			return;
+		}
+
+		// mobile에서 touchstart에 의한 동작 시 pageX, pageY 위치를 구함
+		if (e.pageX === undefined || e.pageY === undefined)
+		{
+			let touch = e.originalEvent.touches[0];
+			if (touch !== undefined || !touch) {
+				touch = e.originalEvent.changedTouches[0];
+			}
+			e.pageX = touch.pageX;
+			e.pageY = touch.pageY;
+		}
+
+		var module = match[2];
+		var action = 'get' + ucfirst(module) + 'Menu';
+		var target_srl = match[3];
+		var params = {
+			mid        : current_mid,
+			cur_mid    : current_mid,
+			menu_id    : match[1],
+			target_srl : target_srl,
+			cur_act    : current_url.getQuery('act'),
+			page_x     : e.pageX,
+			page_y     : e.pageY
+		};
+		var response_tags = ['error', 'message', 'menus'];
+
+		// prevent default action
+		e.preventDefault();
+		e.stopPropagation();
+
+		if (window[Rhymix.loadedPopupMenus[params.menu_id]]) {
+			return Rhymix.displayPopupMenu(params, response_tags, params);
+		}
+
+		show_waiting_message = false;
+		exec_json(module + '.' + action, params, function(data) {
+			Rhymix.displayPopupMenu(data, response_tags, params);
+			show_waiting_message = true;
+		});
+	});
+
+	/**
+	 * Create popup windows automatically for _xe_popup links
+	 */
+	$(document).on('click', 'a._xe_popup', function(e) {
+		var $this = $(this);
+		var name = $this.attr('name');
+		var href = $this.attr('href');
+		if (!name) {
+			name = '_xe_popup_' + Math.floor(Math.random() * 1000);
+		}
+		e.preventDefault();
+		winopen(href, name, 'left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');
+	});
+
+	/**
+	 * Editor preview replacement
+	 */
+	const editable_previews = $('.editable_preview');
+	editable_previews.addClass('rhymix_content xe_content').attr('tabindex', 0);
+	editable_previews.on('click', function() {
+		let input = $(this).siblings('.editable_preview_content');
 		if (input.size()) {
-			$(this).off("click").off("focus").hide();
+			$(this).off('click').off('focus').hide();
 			input = input.first();
-			if (input.attr("type") !== "hidden") {
+			if (input.attr('type') !== 'hidden') {
 				input.hide();
 			}
-			var iframe = $('<iframe class="editable_preview_iframe"></iframe>');
-			iframe.attr("src", current_url.setQuery("module", "editor").setQuery("act", "dispEditorFrame").setQuery("parent_input_id", input.attr("id")).replace(/^https?:/, ''));
+			let iframe = $('<iframe class="editable_preview_iframe"></iframe>');
+			iframe.attr('src', current_url.setQuery('module', 'editor').setQuery('act', 'dispEditorFrame').setQuery('parent_input_id', input.attr('id')).replace(/^https?:/, ''));
 			iframe.insertAfter(input);
 		}
 	});
-	$(".editable_preview").on("focus", function() {
-		$(this).triggerHandler("click");
+	editable_previews.on('focus', function() {
+		$(this).triggerHandler('click');
 	});
 
-	/* select - option의 disabled=disabled 속성을 IE에서도 체크하기 위한 함수 */
-	if(navigator.userAgent.match(/MSIE/)) {
-		$('select').each(function(i, sels) {
-			var disabled_exists = false;
-			var first_enable = [];
-
-			for(var j=0; j < sels.options.length; j++) {
-				if(sels.options[j].disabled) {
-					sels.options[j].style.color = '#CCCCCC';
-					disabled_exists = true;
-				}else{
-					first_enable[i] = (first_enable[i] > -1) ? first_enable[i] : j;
-				}
-			}
-
-			if(!disabled_exists) return;
-
-			sels.oldonchange = sels.onchange;
-			sels.onchange = function() {
-				if(this.options[this.selectedIndex].disabled) {
-
-					this.selectedIndex = first_enable[i];
-					/*
-					if(this.options.length<=1) this.selectedIndex = -1;
-					else if(this.selectedIndex < this.options.length - 1) this.selectedIndex++;
-					else this.selectedIndex--;
-					*/
-
-				} else {
-					if(this.oldonchange) this.oldonchange();
-				}
-			};
-
-			if(sels.selectedIndex >= 0 && sels.options[ sels.selectedIndex ].disabled) sels.onchange();
-
+	/**
+	 * Datepicker default settings
+	 */
+	if ($.datepicker) {
+		$.datepicker.setDefaults({
+			dateFormat : 'yy-mm-dd'
 		});
 	}
 
-	/* enforce max filesize on file uploaeds */
-	$(document).on('change', 'input[type=file]', function() {
-		var max_filesize = $(this).data('max-filesize');
-		if (!max_filesize) return;
-		var files = $(this).get(0).files;
-		if (!files || !files[0]) return;
-		if (files[0].size > max_filesize) {
-			var max_filesize_error = String($(this).data('max-filesize-error'));
-			max_filesize_error = max_filesize_error.replace('%s', XE.filesizeFormat(max_filesize));
-			this.value = '';
-			alert(max_filesize_error);
-		}
-	});
+	/**
+	 * Display any pending alert messages
+	 */
+	if(Cookies.get('rhymix_alert_message')) {
+		rhymix_alert(Cookies.get('rhymix_alert_message'), null, Cookies.get('rhymix_alert_delay'));
+		Cookies.remove('rhymix_alert_message', { path: '/' });
+		Cookies.remove('rhymix_alert_delay', { path: '/' });
+	}
+	$('#rhymix_alert').on('click', rhymix_alert_close);
 
-	jQuery('input[type="submit"],button[type="submit"]').click(function(ev){
-		var $el = jQuery(ev.currentTarget);
-
-		setTimeout(function(){
-			return function(){
-				$el.attr('disabled', 'disabled');
-			};
-		}(), 0);
-
-		setTimeout(function(){
-			return function(){
-				$el.removeAttr('disabled');
-			};
-		}(), 3000);
-	});
 });
 
-(function($) { // String extension methods
+/**
+ * ====================
+ * Other event handlers
+ * ====================
+ */
 
-	/**
-	 * @brief location.href에서 특정 key의 값을 return
-	 **/
-	String.prototype.getQuery = function(key) {
-		var queries = window.XE.URI(this).search(true);
-		var result = queries[key];
-		if(typeof result === 'undefined') {
-			return '';
-		} else {
-			return result;
+// Intercept getScript error due to broken minified script URLs
+$(document).ajaxError(function(event, jqxhr, settings, thrownError) {
+	if(settings.dataType === "script" && (jqxhr.status >= 400 || (jqxhr.responseText && jqxhr.responseText.length < 40))) {
+		const match = /^(.+)\.min\.(css|js)($|\?)/.exec(settings.url);
+		if(match) {
+			$.getScript(match[1] + "." + match[2], settings.success);
 		}
-	};
+	}
+});
 
-	/**
-	 * @brief location.href에서 특정 key의 값을 return
-	 **/
-	String.prototype.setQuery = function(key, val) {
-		var uri = window.XE.URI(this);
-		if(typeof key !== 'undefined') {
-			if(typeof val === "undefined" || val === '' || val === null) {
-				uri.removeSearch(key);
+// General handler for page unload events
+window.addEventListener('beforeunload', function() {
+	Rhymix.unloading = true;
+});
+
+// General handler for popstate events
+window.addEventListener('popstate', function(event) {
+	// Close modal if it is open
+	if ($(document.body).hasClass('rx_modal_open')) {
+		const body = $(document.body).removeClass('rx_modal_open');
+		const scroll_position = body.data('rx_scroll_position');
+		if (scroll_position) {
+			$(window).scrollLeft(scroll_position.left);
+			$(window).scrollTop(scroll_position.top);
+			body.removeData('rx_scroll_position');
+		}
+		$('.rx_modal').each(function() {
+			if (this.nodeName === 'IFRAME') {
+				$(this).remove();
 			} else {
-				uri.setSearch(key, String(val));
+				$(this).removeClass('active');
 			}
-		}
-		return normailzeUri(uri).toString();
-	};
+		});
+	}
+});
 
-	/**
-	 * @brief string prototype으로 escape 함수 추가
-	 **/
-	String.prototype.escape = function(double_escape) {
-		var map = { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#039;' };
-		var revmap = { '&amp;amp;': '&amp;', '&amp;lt;': '&lt;', '&amp;gt;': '&gt;', '&amp;quot;': '&quot;', "&amp;#039;": '&#039;' };
-		var result = String(this).replace(/[&<>"']/g, function(m) { return map[m]; });
-		if (double_escape === false) {
-			return result.replace(/&amp;(amp|lt|gt|quot|#039);/g, function(m) { return revmap[m]; });
+/**
+ * =================
+ * jQuery extensions
+ * =================
+ */
+
+(function($) {
+
+	// OS check
+	const UA = navigator.userAgent.toLowerCase();
+	$.os = {
+		Windows: /win/.test(UA),
+		Android: /android/.test(UA),
+		iOS: /i(Phone|Pad)/.test(UA),
+		Linux: /linux/.test(UA),
+		Unix: /x11/.test(UA),
+		Mac: /mac/.test(UA)
+	};
+	$.os.name = ($.os.Windows) ? 'Windows' :
+		($.os.Android) ? 'Android' :
+		($.os.iOS) ? 'iOS' :
+		($.os.Linux) ? 'Linux' :
+		($.os.Unix) ? 'Unix' :
+		($.os.Mac) ? 'Mac' : '';
+
+	// Add CSRF token to AJAX calls
+	$.ajaxPrefilter(function(options) {
+		if (!Rhymix.isSameOrigin(location.href, options.url)) {
+			return;
+		}
+		const token = Rhymix.getCSRFToken();
+		if (token) {
+			if (!options.headers) {
+				options.headers = {};
+			}
+			options.headers['X-CSRF-Token'] = token;
+		}
+	});
+
+	// Add CSRF token to dynamically loaded forms
+	$.fn.addCSRFTokenToForm = function() {
+		const form = $(this);
+		const token = Rhymix.getCSRFToken();
+		if (token) {
+			return form.each(function() {
+				if (form.data('csrf-token-checked')) return;
+				if (form.attr('action') && !Rhymix.isSameOrigin(location.href, form.attr('action'))) {
+					return form.data('csrf-token-checked', true);
+				}
+				$('<input type="hidden" name="_rx_csrf_token" />').val(token).appendTo(form);
+				return form.data('csrf-token-checked', true);
+			});
 		} else {
-			return result;
+			return form;
 		}
 	};
 
-	/**
-	 * @brief string prototype으로 unescape 함수 추가
-	 **/
-	String.prototype.unescape = function() {
-		var map = { '&amp;': '&', '&lt;': '<', '&gt;': '>', '&quot;': '"', '&#039;': "'" };
-		return String(this).replace(/&(amp|lt|gt|quot|#039);/g, function(m) { return map[m]; });
-	};
-
-	/**
-	 * @brief string prototype으로 stripTags 함수 추가
-	 **/
-	String.prototype.stripTags = function() {
-		return String(this).replace(/<\/?[a-z][^>]*>/ig, "");
-	};
-
-	/**
-	 * @brief string prototype으로 trim 함수 추가
-	 **/
-	if (!String.prototype.trim) {
-		String.prototype.trim = function() {
-			return String(this).replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
-		};
-	}
-
-	/**
-	 * @brief Helper function for setQuery()
-	 *
-	 * @param uri URI
-	 * @return URI
-	 */
-	function normailzeUri(uri) {
-		var protocol = window.enforce_ssl ? 'https' : uri.protocol();
-		var port = (protocol === 'http') ? window.http_port : window.https_port;
-		var filename = uri.filename() || 'index.php';
-		var queries = uri.search(true);
-
-		if(window.XE.isSameHost(uri.toString()) && filename === 'index.php' && $.isEmptyObject(queries)) {
-			filename = '';
-		}
-
-		return uri.protocol(protocol).port(port || null).normalizePort().filename(filename);
-	}
-
 })(jQuery);
 
 /**
- * @brief xSleep(micro time)
- **/
-function xSleep(sec) {
-	sec = sec / 1000;
-	var now = new Date();
-	var sleep = new Date();
-	while( sleep.getTime() - now.getTime() < sec) {
-		sleep = new Date();
-	}
-}
+ * =================
+ * String extensions
+ * =================
+ */
 
 /**
- * @brief 주어진 인자가 하나라도 defined되어 있지 않으면 false return
- **/
-function isDef() {
-	for(var i=0; i < arguments.length; ++i) {
-		if(typeof(arguments[i]) == "undefined") return false;
-	}
-	return true;
-}
-
-/**
- * @brief 윈도우 오픈
- * 열려진 윈도우의 관리를 통해 window.focus()등을 FF에서도 비슷하게 구현함
- **/
-var winopen_list = {};
-function winopen(url, target, features) {
-	try {
-		if (target != '_blank' && winopen_list[target]) {
-			winopen_list[target].close();
-			winopen_list[target] = null;
-		}
-	} catch(e) {
-		// no-op
-	}
-
-	if (typeof target == 'undefined') target = '_blank';
-	if (typeof features == 'undefined') features = '';
-
-	if (!window.XE.isSameHost(url)) {
-		window.blankshield.open(url, target, features);
+ * Get a query parameter from a URL
+ *
+ * @param string key
+ * @return string
+ */
+String.prototype.getQuery = function(key) {
+	const queries = Rhymix.URI(this).search(true);
+	const result = queries[key];
+	if(typeof result === 'undefined') {
+		return '';
 	} else {
-		var win = window.open(url, target, features);
-		win.focus();
-		if (target != '_blank') {
-			winopen_list[target] = win;
+		return result;
+	}
+};
+
+/**
+ * Add or replace a query parameter in a URL
+ *
+ * @param string key
+ * @param string val
+ * @return string
+ */
+String.prototype.setQuery = function(key, val) {
+	const uri = Rhymix.URI(this);
+	const protocol = window.enforce_ssl ? 'https' : uri.protocol();
+	const port = (protocol === 'http') ? window.http_port : window.https_port;
+	let filename = uri.filename() || 'index.php';
+	let queries = uri.search(true);
+
+	if(typeof key !== 'undefined') {
+		if(typeof val === "undefined" || val === '' || val === null) {
+			uri.removeSearch(key);
+		} else {
+			uri.setSearch(key, String(val));
 		}
 	}
+
+	if (Rhymix.isSameHost(uri.toString()) && filename === 'index.php' && $.isEmptyObject(queries)) {
+		filename = '';
+	}
+
+	return uri.protocol(protocol).port(port || null).normalizePort().filename(filename).toString();
+};
+
+/**
+ * Escape a string for HTML output
+ *
+ * @param bool double_escape
+ * @return string
+ */
+String.prototype.escape = function(double_escape) {
+	const map = { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#039;' };
+	const revmap = { '&amp;amp;': '&amp;', '&amp;lt;': '&lt;', '&amp;gt;': '&gt;', '&amp;quot;': '&quot;', "&amp;#039;": '&#039;' };
+	const result = String(this).replace(/[&<>"']/g, function(m) { return map[m]; });
+	if (double_escape === false) {
+		return result.replace(/&amp;(amp|lt|gt|quot|#039);/g, function(m) { return revmap[m]; });
+	} else {
+		return result;
+	}
+};
+
+/**
+ * Unescape a string from HTML output
+ *
+ * @return string
+ */
+String.prototype.unescape = function() {
+	const map = { '&amp;': '&', '&lt;': '<', '&gt;': '>', '&quot;': '"', '&#039;': "'" };
+	return String(this).replace(/&(amp|lt|gt|quot|#039);/g, function(m) { return map[m]; });
+};
+
+/**
+ * Strip HTML tags from a string
+ *
+ * @return string
+ */
+String.prototype.stripTags = function() {
+	return String(this).replace(/<\/?[a-z][^>]*>/ig, "");
+};
+
+/**
+ * Trim whitespace from the beginning and end of a string
+ *
+ * @return string
+ */
+if (!String.prototype.trim) {
+	String.prototype.trim = function() {
+		return String(this).replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+	};
 }
 
 /**
- * @brief 팝업으로만 띄우기
- * common/tpl/popup_layout.html이 요청되는 XE내의 팝업일 경우에 사용
- **/
-function popopen(url, target) {
-	winopen(url, target, "width=800,height=600,scrollbars=yes,resizable=yes,toolbars=no");
+ * ==============================================================
+ * Global functions (most of these are aliases to Rhymix methods)
+ * ==============================================================
+ */
+
+/**
+ * Check if the current device is a mobile device.
+ *
+ * @return bool
+ */
+function isMobile() {
+	return Rhymix.isMobile();
 }
 
 /**
- * @brief 메일 보내기용
- **/
-function sendMailTo(to) {
-	location.href="mailto:"+to;
+ * Get the current color scheme
+ *
+ * @return string
+ */
+function getColorScheme() {
+	return Rhymix.getColorScheme();
 }
 
 /**
- * @brief url이동 (Rhymix 개선된 버전)
+ * Set the color scheme
+ *
+ * @param string color_scheme
+ * @return void
+ */
+function setColorScheme(color_scheme) {
+	return Rhymix.setColorScheme(color_scheme);
+}
+
+/**
+ * Automatically detect the color scheme
+ *
+ * @return void
+ */
+function detectColorScheme() {
+	return Rhymix.detectColorScheme();
+}
+
+/**
+ * Get the language
+ *
+ * @return string
+ */
+function getLangType() {
+	return Rhymix.getLangType();
+}
+
+/**
+ * Set the language
+ *
+ * @param string lang_type
+ * @return void
+ */
+function setLangType(lang_type) {
+	return Rhymix.setLangType(lang_type);
+}
+
+/**
+ * Get CSRF token for this document
+ *
+ * @return string|null
+ */
+function getCSRFToken() {
+	return Rhymix.getCSRFToken();
+}
+
+/**
+ * Set CSRF token for this document
+ *
+ * @param string token
+ * @return void
+ */
+function setCSRFToken(token) {
+	return Rhymix.setCSRFToken(token);
+}
+
+/**
+ * Check if a URL is identical to the current page URL except for the hash
+ *
+ * @param string url
+ * @return bool
+ */
+function isCurrentPageUrl(url) {
+	return Rhymix.isCurrentUrl(url);
+}
+
+/**
+ * Check if two URLs belong to the same origin
+ *
+ * @param string url1
+ * @param string url2
+ * @return bool
+ */
+function isSameOrigin(url1, url2) {
+	return Rhymix.isSameOrigin(url1, url2);
+}
+
+/**
+ * Redirect to a URL, but reload instead if the target is the same as the current page
+ *
+ * @param string url
+ * @return void
  */
 function redirect(url) {
-	if (isCurrentPageUrl(url)) {
-		window.location.href = url;
-		window.location.reload();
-	} else {
-		window.location.href = url;
-	}
-}
-
-function isCurrentPageUrl(url) {
-	var absolute_url = window.location.href;
-	var relative_url = window.location.pathname + window.location.search;
-	return  url === absolute_url || url.indexOf(absolute_url.replace(/#.+$/, "") + "#") === 0 ||
-			url === relative_url || url.indexOf(relative_url.replace(/#.+$/, "") + "#") === 0;
+	return Rhymix.redirectToUrl(url);
 }
 
 /**
- * @brief url이동 (open_window 값이 N 가 아니면 새창으로 띄움)
- **/
+ * Open an HTML element as a modal
+ *
+ * @param string id
+ * @return void
+ */
+function openModal(id) {
+	return Rhymix.modal.open(id);
+}
+
+/**
+ * Open an iframe as a modal
+ *
+ * @param string url
+ * @param string target
+ * @return void
+ */
+function openModalIframe(url, target) {
+	return Rhymix.modal.openIframe(url, target);
+}
+
+/**
+ * Close currently open modal
+ *
+ * @param string id
+ * @return void
+ */
+function closeModal(id) {
+	return Rhymix.modal.close(id);
+}
+
+/**
+ * Open a new window and focus it
+ *
+ * @param string url
+ * @param string target
+ * @param string features
+ */
+function winopen(url, target, features) {
+	return Rhymix.openWindow(url, target, features);
+}
+
+/**
+ * Open a popup window with standardized features
+ *
+ * @param string url
+ * @param string target
+ * @return void
+ */
+function popopen(url, target) {
+	return Rhymix.openPopup(url, target);
+}
+
+/**
+ * ===============================================
+ * Legacy functions related to document management
+ * ===============================================
+ */
+
+/**
+ * Add a document to the cart for admin action.
+ *
+ * @param object obj
+ * @return void
+ */
+function doAddDocumentCart(obj) {
+	Rhymix.addedDocument.push(obj.value);
+	setTimeout(function() {
+		exec_json('document.procDocumentAddCart', {
+			srls: Rhymix.addedDocument.join(',')
+		});
+		Rhymix.addedDocument = [];
+	}, 100);
+}
+
+/**
+ * Open a document preview
+ *
+ * @param object obj
+ * @return void
+ */
+function doDocumentPreview(obj) {
+	var fo_obj = obj;
+	while (fo_obj.nodeName != "FORM") {
+		fo_obj = fo_obj.parentNode;
+	}
+	if (fo_obj.nodeName != "FORM") {
+		return;
+	}
+
+	var editor_sequence = fo_obj.getAttribute('editor_sequence');
+	var content = editorGetContent(editor_sequence);
+	var win = window.open("", "previewDocument","toolbars=no,width=700px;height=800px,scrollbars=yes,resizable=yes");
+	var dummy_obj = $("#previewDocument");
+	if (!dummy_obj.length) {
+		$(
+			'<form id="previewDocument" target="previewDocument" method="post" action="'+request_uri+'">'+
+			'<input type="hidden" name="_rx_csrf_token" value="' + getCSRFToken() + '" />'+
+			'<input type="hidden" name="module" value="document" />'+
+			'<input type="hidden" name="act" value="dispDocumentPreview" />'+
+			'<input type="hidden" name="mid" value="' + current_mid +'" />'+
+			'<input type="hidden" name="content" />'+
+			'</form>'
+		).appendTo(document.body);
+		dummy_obj = $("#previewDocument")[0];
+	} else {
+		dummy_obj = dummy_obj[0];
+	}
+
+	if(dummy_obj) {
+		dummy_obj.content.value = content;
+		dummy_obj.submit();
+	}
+}
+
+/**
+ * Temporarily save a document
+ *
+ * @param object obj
+ * @returns
+ */
+function doDocumentSave(obj) {
+	var editor_sequence = obj.form.getAttribute('editor_sequence');
+	var prev_content = editorRelKeys[editor_sequence].content.value;
+	if (typeof(editor_sequence) !== 'undefined' && editor_sequence && typeof(editorRelKeys) !== 'undefined' && typeof(editorGetContent) === 'function') {
+		var content = editorGetContent(editor_sequence);
+		editorRelKeys[editor_sequence].content.value = content;
+	}
+
+	var params={}, data=$(obj.form).serializeArray();
+	$.each(data, function(i, field){
+		var val = $.trim(field.value);
+		if (!val) {
+			return true;
+		}
+		if (/\[\]$/.test(field.name)) {
+			field.name = field.name.replace(/\[\]$/, '');
+		}
+		if (params[field.name]) {
+			params[field.name] += '|@|'+val;
+		} else {
+			params[field.name] = field.value;
+		}
+	});
+
+	exec_json('document.procDocumentTempSave', params, function(ret_obj) {
+		$('input[name=document_srl]').eq(0).val(ret_obj.document_srl);
+		alert(ret_obj.message);
+	});
+
+	editorRelKeys[editor_sequence].content.value = prev_content;
+	return false;
+}
+
+/**
+ * Load the list of saved documents
+ */
+function doDocumentLoad(obj) {
+	var popup_url = request_uri.setQuery('module','document').setQuery('act','dispTempSavedList');
+	if (Rhymix.isMobile()) {
+		openModalIframe(popup_url);
+	} else {
+		popopen(popup_url);
+	}
+}
+
+/**
+ * Select from the list of saved documents
+ *
+ * @param int document_srl
+ * @param string module
+ * @return void
+ */
+function doDocumentSelect(document_srl, module) {
+	if (!opener) {
+		window.close();
+		return;
+	}
+	if (module === undefined) {
+		module = 'document';
+	}
+
+	// 게시글을 가져와서 등록하기
+	if (module === 'page') {
+		var url = opener.current_url;
+		url = url.setQuery('document_srl', document_srl);
+		if (url.getQuery('act') === 'dispPageAdminMobileContentModify') {
+			url = url.setQuery('act', 'dispPageAdminMobileContentModify');
+		} else {
+			url = url.setQuery('act', 'dispPageAdminContentModify');
+		}
+		opener.location.href = url;
+	} else {
+		opener.location.href = opener.current_url.setQuery('act', 'dispBoardWrite').setQuery('document_srl', document_srl);
+	}
+	window.close();
+}
+
+/**
+ * ==================================================================
+ * Deprecated functions (Please avoid using anything below this line)
+ * ==================================================================
+ */
+
+/**
+ * Get a cookie
+ *
+ * Use Rhymix.cookie.get() instead
+ *
+ * @deprecated
+ * @param string name
+ * @return string|null
+ */
+function getCookie(name) {
+	return Rhymix.cookie.get(name);
+}
+
+/**
+ * Set a cookie
+ *
+ * Use Rhymix.cookie.set() instead
+ *
+ * @deprecated
+ * @param string name
+ * @param string value
+ * @param int expires
+ * @param string path
+ * @return void
+ */
+function setCookie(name, value, expires, path) {
+	var options = {
+		path: path ? path : '/',
+		secure: cookies_ssl ? true : false
+	};
+	if (expires) {
+		options.expires = expires;
+	}
+	Rhymix.cookie.set(name, value, options);
+}
+
+/**
+ * Change the language and reload the page
+ *
+ * @deprecated
+ * @param string|object obj
+ * @return void
+ */
+function doChangeLangType(obj) {
+	var msg = "DEPRECATED : doChangeLangType() is deprecated in Rhymix.";
+	if (navigator.userAgent.match(/Firefox/)) {
+		console.error(msg);
+	} else {
+		console.warn(msg);
+	}
+
+	if (typeof(obj) == 'string') {
+		setLangType(obj);
+	} else {
+		setLangType(obj.options[obj.selectedIndex].value);
+	}
+	if (location.href.match(/[?&]l=[a-z]+/)) {
+		location.href = location.href.setQuery('l', '');
+	} else {
+		location.reload();
+	}
+}
+
+/**
+ * Make an AJAX request with a given target_srl
+ *
+ * Please use Rhymix.ajax() instead, which is much more powerful.
+ *
+ * @deprecated
+ * @param string module
+ * @param string action
+ * @param int target_rl
+ * @return void
+ */
+function doCallModuleAction(module, action, target_srl) {
+	var msg = "DEPRECATED : doCallModuleAction() is deprecated in Rhymix.";
+	if (navigator.userAgent.match(/Firefox/)) {
+		console.error(msg);
+	} else {
+		console.warn(msg);
+	}
+
+	const params = {
+		target_srl: target_srl,
+		cur_mid: current_mid,
+		mid: current_mid
+	};
+	Rhymix.ajax(module + '.' + action, params, function(data) {
+		if (data.message !== 'success') {
+			alert(data.message);
+		}
+		location.reload();
+	});
+}
+
+/**
+ * Close an alert box
+ *
+ * @deprecated
+ * @return void
+ */
+function rhymix_alert_close() {
+	if ($('#rhymix_alert').is(':hidden')) {
+		return;
+	}
+	$('#rhymix_alert').fadeOut(500, function() {
+		$(this).empty();
+	});
+};
+
+/**
+ * Display an alert box
+ *
+ * @deprecated
+ * @param string message
+ * @param string redirect_url
+ * @param int delay
+ * @return void
+ */
+function rhymix_alert(message, redirect_url, delay) {
+	if (!delay) {
+		delay = 2500;
+	}
+	if (!redirect_url) {
+		$('#rhymix_alert').text(message).show();
+		setTimeout(rhymix_alert_close, delay);
+	} else if (Rhymix.isSameOrigin(location.href, redirect_url)) {
+		Cookies.set('rhymix_alert_message', message, { expires: 1 / 1440, path: '/' });
+		Cookies.set('rhymix_alert_delay', delay, { expires: 1 / 1440, path: '/' });
+	} else {
+		alert(message);
+	}
+};
+
+/**
+ * Move to a URL
+ *
+ * @deprecated
+ * @param string url
+ * @param string open_window
+ * @return bool
+ */
 function move_url(url, open_window) {
 	if (!url) {
 		return false;
@@ -676,7 +1728,6 @@ function move_url(url, open_window) {
 	if (/^\./.test(url)) {
 		url = window.request_uri + url;
 	}
-
 	if (typeof open_window == 'undefined' || open_window == 'N') {
 		redirect(url);
 	} else {
@@ -686,34 +1737,66 @@ function move_url(url, open_window) {
 }
 
 /**
- * @brief 멀티미디어 출력용 (IE에서 플래쉬/동영상 주변에 점선 생김 방지용)
- **/
+ * Resize a popup window according to the size of its contents
+ *
+ * @deprecated
+ * @return void
+ */
+function setFixedPopupSize() {
+	var $win = $(window);
+	var $pc = $('body > .popup');
+	var $outer = $('<div>').css({visibility: 'hidden', width: 100, overflow: 'scroll'}).appendTo('body');
+	var widthWithScroll = $('<div>').css({width: '100%'}).appendTo($outer).outerWidth();
+	$outer.remove();
+	var scbw = 100 - widthWithScroll;
+	var offset = $pc.css({overflow: 'scroll'}).offset();
+
+	var w = $pc.width(10).height(10000).get(0).scrollWidth + offset.left*2;
+	if (w < 800) {
+		w = 800 + (offset.left * 2);
+	}
+
+	// window의 너비나 높이는 스크린의 너비나 높이보다 클 수 없다.
+	// 스크린의 너비나 높이와 내용의 너비나 높이를 비교해서 최소값을 이용한다.
+	w = Math.min(w, window.screen.availWidth);
+	var h = $pc.width(w - offset.left*2).height(10).get(0).scrollHeight + offset.top*2;
+	var dw = $win.width();
+	var dh = $win.height();
+
+	h = Math.min(h, window.screen.availHeight - 100);
+	window.resizeBy(w - dw, h - dh);
+	$pc.width('100%').css({
+		overflow: '',
+		height: '',
+		'box-sizing': 'border-box'
+	});
+}
+
+/**
+ * Print a thumbnail for multimedia content
+ *
+ * @deprecated
+ * @param string src
+ * @param int width
+ * @param int height
+ * @param object options
+ * @return void
+ */
 function displayMultimedia(src, width, height, options) {
-	/*jslint evil: true */
-	var html = _displayMultimedia(src, width, height, options);
-	if(html) document.writeln(html);
+	const html = _displayMultimedia(src, width, height, options);
+	if (html) {
+		document.writeln(html);
+	}
 }
 function _displayMultimedia(src, width, height, options) {
-	if(src.indexOf('files') === 0) src = request_uri + src;
-
-	var defaults = {
-		wmode : 'transparent',
-		allowScriptAccess : 'never',
-		quality : 'high',
-		flashvars : '',
-		autostart : false
-	};
-
-	var params = jQuery.extend(defaults, options || {});
-	var autostart = (params.autostart && params.autostart != 'false') ? 'true' : 'false';
-	delete(params.autostart);
-
-	var clsid = "";
-	var codebase = "";
-	var html = "";
-	var background = "black";
 	width = parseInt(width, 10);
 	height = parseInt(height, 10);
+	if (src.indexOf('files') === 0) {
+		src = request_uri + src;
+	}
+
+	var html = '';
+	var background = 'black';
 
 	if (/\.(gif|jpe?g|bmp|png|webp)$/i.test(src)){
 		html = '<img src="'+src+'" width="'+width+'" height="'+height+'" class="thumb" />';
@@ -729,332 +1812,324 @@ function _displayMultimedia(src, width, height, options) {
 }
 
 /**
- * @brief 에디터에서 사용되는 내용 여닫는 코드 (고정, zbxe용)
- **/
-function zbxe_folder_open(id) {
-	jQuery("#folder_open_"+id).hide();
-	jQuery("#folder_close_"+id).show();
-	jQuery("#folder_"+id).show();
-}
-function zbxe_folder_close(id) {
-	jQuery("#folder_open_"+id).show();
-	jQuery("#folder_close_"+id).hide();
-	jQuery("#folder_"+id).hide();
-}
-
-/**
- * 팝업창 대신 전체 화면 iframe을 띄우는 함수
+ * Convert rgb(r,g,b) to HEX
+ *
+ * @param string value
+ * @return string
  */
-function openFullScreenIframe(url, target) {
-	const iframe = document.createElement('iframe');
-	const iframe_sequence = String(Date.now()) + Math.round(Math.random() * 1000000);
-	iframe.setAttribute('id', '_rx_iframe_' + iframe_sequence);
-	iframe.setAttribute('name', target || ('_rx_iframe_' + iframe_sequence))
-	iframe.setAttribute('src', url + '&iframe_sequence=' + iframe_sequence);
-	iframe.setAttribute('width', '100%');
-	iframe.setAttribute('height', '100%');
-	iframe.setAttribute('frameborder', '0');
-	iframe.setAttribute('scrolling', 'no');
-	iframe.setAttribute('style', 'position:fixed; top:0; left:0; width:100%; height:100%; z-index:999999999; background-color: #fff; overflow-y:auto');
-	$(document.body).append(iframe);
-}
-
-/**
- * @brief 팝업의 경우 내용에 맞춰 현 윈도우의 크기를 조절해줌
- * 팝업의 내용에 맞게 크기를 늘리는 것은... 쉽게 되지는 않음.. ㅡ.ㅜ
- * popup_layout 에서 window.onload 시 자동 요청됨.
- **/
-function setFixedPopupSize() {
-	var $ = jQuery, $win = $(window), $pc = $('body>.popup'), w, h, dw, dh, offset, scbw;
-
-	var $outer = $('<div>').css({visibility: 'hidden', width: 100, overflow: 'scroll'}).appendTo('body'),
-		widthWithScroll = $('<div>').css({width: '100%'}).appendTo($outer).outerWidth();
-	$outer.remove();
-	scbw = 100 - widthWithScroll;
-
-	offset = $pc.css({overflow:'scroll'}).offset();
-
-	w = $pc.width(10).height(10000).get(0).scrollWidth + offset.left*2;
-
-	if(w < 800) w = 800 + offset.left*2;
-	// Window 의 너비나 높이는 스크린의 너비나 높이보다 클 수 없다. 스크린의 너비나 높이와 내용의 너비나 높이를 비교해서 최소값을 이용한다.
-	w = Math.min(w, window.screen.availWidth);
-
-	h = $pc.width(w - offset.left*2).height(10).get(0).scrollHeight + offset.top*2;
-
-	dw = $win.width();
-	dh = $win.height();
-
-	h = Math.min(h, window.screen.availHeight - 100);
-	window.resizeBy(w - dw, h - dh);
-
-	$pc.width('100%').css({overflow:'',height:'','box-sizing':'border-box'});
-
-}
-
-/**
- * @brief 추천/비추천,스크랩,신고기능등 특정 srl에 대한 특정 module/action을 호출하는 함수
- **/
-function doCallModuleAction(module, action, target_srl) {
-	var params = {
-		target_srl : target_srl,
-		cur_mid    : current_mid,
-		mid        : current_mid
-	};
-	exec_json(module + '.' + action, params, completeCallModuleAction);
-}
-
-function completeCallModuleAction(ret_obj, response_tags) {
-	if(ret_obj.message!='success') alert(ret_obj.message);
-	location.reload();
-}
-
-function completeMessage(ret_obj) {
-	alert(ret_obj.message);
-	location.reload();
-}
-
-
-
-/* 언어코드 (lang_type) 쿠키값 변경 */
-function doChangeLangType(obj) {
-	if(typeof(obj) == "string") {
-		setLangType(obj);
-	} else {
-		var val = obj.options[obj.selectedIndex].value;
-		setLangType(val);
-	}
-	if(location.href.match(/[?&]l=[a-z]+/)) {
-		location.href = location.href.setQuery('l', '');
-	} else {
-		location.reload();
-	}
-}
-function setLangType(lang_type) {
-	var baseurl = XE.URI(default_url).pathname();
-	if (baseurl !== '/') {
-		XE.cookie.remove('lang_type', { path: '/' });
-	}
-	XE.cookie.set('lang_type', lang_type, { path: baseurl, expires: 365 });
-}
-
-/* 색상 테마 변경 */
-function getColorScheme() {
-	if ($('body').hasClass('color_scheme_dark')) {
-		return 'dark';
-	} else {
-		return 'light';
-	}
-}
-function setColorScheme(color_scheme) {
-	if (color_scheme === 'dark' || color_scheme === 'light') {
-		$('body').addClass('color_scheme_' + color_scheme).removeClass('color_scheme_' + (color_scheme === 'dark' ? 'light' : 'dark'));
-		XE.cookie.set('rx_color_scheme', color_scheme, { path: window.XE.URI(default_url).pathname(), expires: 365 });
-	} else {
-		XE.cookie.remove('rx_color_scheme', { path: window.XE.URI(default_url).pathname() });
-		color_scheme = (window.matchMedia && window.matchMedia('(prefers-color-scheme:dark)').matches) ? 'dark' : 'light';
-		$('body').addClass('color_scheme_' + color_scheme).removeClass('color_scheme_' + (color_scheme === 'dark' ? 'light' : 'dark'));
-	}
-}
-function detectColorScheme() {
-	// Return if a color scheme is already selected.
-	var body_element = $('body');
-	if(body_element.hasClass('color_scheme_light') || body_element.hasClass('color_scheme_dark')) {
-		return;
-	}
-	// Detect the cookie.
-	var color_scheme = XE.cookie.get('rx_color_scheme');
-	// Detect the device color scheme.
-	var match_media = window.matchMedia ? window.matchMedia('(prefers-color-scheme:dark)') : null;
-	if (color_scheme !== 'light' && color_scheme !== 'dark') {
-		color_scheme = (match_media && match_media.matches) ? 'dark' : 'light';
-	}
-	// Set the body class according to the detected color scheme.
-	body_element.addClass('color_scheme_' + color_scheme);
-	// Add an event listener to detect changes to the device color scheme.
-	match_media && match_media.addListener && match_media.addListener(function(e) {
-		if (e.matches) {
-			body_element.removeClass('color_scheme_light').addClass('color_scheme_dark');
-		} else {
-			body_element.removeClass('color_scheme_dark').addClass('color_scheme_light');
-		}
-	});
-}
-
-/* 미리보기 */
-function doDocumentPreview(obj) {
-	var fo_obj = obj;
-	while(fo_obj.nodeName != "FORM") {
-		fo_obj = fo_obj.parentNode;
-	}
-	if(fo_obj.nodeName != "FORM") return;
-	var editor_sequence = fo_obj.getAttribute('editor_sequence');
-
-	var content = editorGetContent(editor_sequence);
-
-	var win = window.open("", "previewDocument","toolbars=no,width=700px;height=800px,scrollbars=yes,resizable=yes");
-
-	var dummy_obj = jQuery("#previewDocument");
-
-	if(!dummy_obj.length) {
-		jQuery(
-			'<form id="previewDocument" target="previewDocument" method="post" action="'+request_uri+'">'+
-			'<input type="hidden" name="_rx_csrf_token" value="' + getCSRFToken() + '" />'+
-			'<input type="hidden" name="module" value="document" />'+
-			'<input type="hidden" name="act" value="dispDocumentPreview" />'+
-			'<input type="hidden" name="mid" value="' + current_mid +'" />'+
-			'<input type="hidden" name="content" />'+
-			'</form>'
-		).appendTo(document.body);
-
-		dummy_obj = jQuery("#previewDocument")[0];
-	} else {
-		dummy_obj = dummy_obj[0];
-	}
-
-	if(dummy_obj) {
-		dummy_obj.content.value = content;
-		dummy_obj.submit();
-	}
-}
-
-/* 게시글 저장 */
-function doDocumentSave(obj) {
-	var editor_sequence = obj.form.getAttribute('editor_sequence');
-	var prev_content = editorRelKeys[editor_sequence].content.value;
-	if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') {
-		var content = editorGetContent(editor_sequence);
-		editorRelKeys[editor_sequence].content.value = content;
-	}
-
-	var params={}, data=jQuery(obj.form).serializeArray();
-	jQuery.each(data, function(i, field){
-		var val = jQuery.trim(field.value);
-		if(!val) return true;
-		if(/\[\]$/.test(field.name)) field.name = field.name.replace(/\[\]$/, '');
-		if(params[field.name]) params[field.name] += '|@|'+val;
-		else params[field.name] = field.value;
-	});
-
-	exec_json('document.procDocumentTempSave', params, completeDocumentSave);
-
-	editorRelKeys[editor_sequence].content.value = prev_content;
-	return false;
-}
-
-function completeDocumentSave(ret_obj) {
-	jQuery('input[name=document_srl]').eq(0).val(ret_obj.document_srl);
-	alert(ret_obj.message);
-}
-
-/* 저장된 게시글 불러오기 */
-var objForSavedDoc = null;
-function doDocumentLoad(obj) {
-	// 저장된 게시글 목록 불러오기
-	objForSavedDoc = obj.form;
-	var popup_url = request_uri.setQuery('module','document').setQuery('act','dispTempSavedList');
-	if (navigator.userAgent.match(/mobile/i)) {
-		openFullScreenIframe(popup_url);
-	} else {
-		popopen(popup_url);
-	}
-}
-
-/* 저장된 게시글의 선택 */
-function doDocumentSelect(document_srl, module) {
-	if(!opener || !opener.objForSavedDoc) {
-		window.close();
-		return;
-	}
-
-	if(module === undefined) {
-		module = 'document';
-	}
-
-	// 게시글을 가져와서 등록하기
-	switch(module) {
-		case 'page' :
-			var url = opener.current_url;
-			url = url.setQuery('document_srl', document_srl);
-
-			if(url.getQuery('act') === 'dispPageAdminMobileContentModify')
-			{
-				url = url.setQuery('act', 'dispPageAdminMobileContentModify');
-			}
-			else
-			{
-				url = url.setQuery('act', 'dispPageAdminContentModify');
-			}
-			opener.location.href = url;
-			break;
-		default :
-			opener.location.href = opener.current_url.setQuery('act', 'dispBoardWrite').setQuery('document_srl', document_srl);
-			break;
-	}
-	window.close();
-}
-
-
-/* 스킨 정보 */
-function viewSkinInfo(module, skin) {
-	popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin, 'SkinInfo');
-}
-
-
-/* 관리자가 문서를 관리하기 위해서 선택시 세션에 넣음 */
-var addedDocument = [];
-function doAddDocumentCart(obj) {
-	var srl = obj.value;
-	addedDocument[addedDocument.length] = srl;
-	setTimeout(function() { callAddDocumentCart(addedDocument.length); }, 100);
-}
-
-function callAddDocumentCart(document_length) {
-	if(addedDocument.length<1 || document_length != addedDocument.length) return;
-	exec_json('document.procDocumentAddCart', {
-		srls: addedDocument.join(',')
-	});
-	addedDocument = [];
-}
-
-/* ff의 rgb(a,b,c)를 #... 로 변경 */
 function transRGB2Hex(value) {
-	if(!value) return value;
-	if(value.indexOf('#') > -1) return value.replace(/^#/, '');
-
-	if(value.toLowerCase().indexOf('rgb') < 0) return value;
+	if (!value) {
+		return value;
+	}
+	if (value.indexOf('#') > -1) {
+		return value.replace(/^#/, '');
+	}
+	if (value.toLowerCase().indexOf('rgb') < 0) {
+		return value;
+	}
 	value = value.replace(/^rgb\(/i, '').replace(/\)$/, '');
 	value_list = value.split(',');
 
 	var hex = '';
-	for(var i = 0; i < value_list.length; i++) {
-		var color = parseInt(value_list[i], 10).toString(16);
-		if(color.length == 1) color = '0'+color;
+	for (var i = 0; i < value_list.length; i++) {
+		var color = parseInt(String(value_list[i]).trim(), 10).toString(16);
+		if (color.length == 1) {
+			color = '0' + color;
+		}
 		hex += color;
 	}
 	return hex;
 }
 
-/* 보안 로그인 모드로 전환 */
-function toggleSecuritySignIn() {
-	var href = location.href;
-	if(/https:\/\//i.test(href)) location.href = href.replace(/^https/i,'http');
-	else location.href = href.replace(/^http/i,'https');
+/**
+ * Send an email
+ *
+ * @deprecated
+ * @param string email_address
+ * @return void
+ */
+function sendMailTo(email_address) {
+	location.href = 'mailto:' + email_address;
 }
 
+/**
+ * View skin information
+ *
+ * @deprecated
+ * @param string module
+ * @param string skin
+ * @return void
+ */
+function viewSkinInfo(module, skin) {
+	const url = './?module=module&act=dispModuleSkinInfo&selected_module=' + module + '&skin=' + skin;
+	popopen(url, 'SkinInfo');
+}
+
+/**
+ * Sleep for seconds
+ *
+ * @deprecated
+ * @param float sec
+ * @return void
+ */
+function xSleep(sec) {
+	sec = sec / 1000;
+	var now = new Date();
+	var sleep = new Date();
+	while (sleep.getTime() - now.getTime() < sec) {
+		sleep = new Date();
+	}
+}
+
+/**
+ * Check if any argument is a defined variable
+ *
+ * @deprecated
+ * @param mixed arguments
+ * @return bool
+ */
+function isDef() {
+	for (let i = 0; i < arguments.length; ++i) {
+		if (typeof(arguments[i]) == 'undefined') {
+			return false;
+		}
+	}
+	return true;
+}
+
+/**
+ * Check if a variable is defined and not null
+ *
+ * This seems to be similar to isset() in PHP
+ *
+ * @deprecated
+ * @param mixed v
+ * @return bool
+ */
+function is_def(v) {
+	return typeof(v) != 'undefined' && v !== null;
+}
+
+/**
+ * Convert the first character of a string to uppercase
+ *
+ * @deprecated
+ * @param string str
+ * @return string
+ */
+function ucfirst(str) {
+	return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
+/**
+ * Get an element by ID
+ *
+ * @deprecated
+ * @param string id
+ * @return HTMLElement|null
+ */
+function get_by_id(id) {
+	return document.getElementById(id);
+}
+
+/**
+ * Get the left position of an object
+ *
+ * @deprecated
+ * @param HTMLElement obj
+ * @return int
+ */
+function GetObjLeft(obj) {
+	return $(obj).offset().left;
+}
+
+/**
+ * Get the top position of an object
+ *
+ * @deprecated
+ * @param HTMLElement obj
+ * @return int
+ */
+function GetObjTop(obj) {
+	return $(obj).offset().top;
+}
+
+/**
+ * Get the outer HTML of an object
+ *
+ * @deprecated
+ * @param HTMLElement obj
+ * @return string
+ */
+function getOuterHTML(obj) {
+	return $(obj).html().trim();
+}
+
+/**
+ * Replace the entire object with the given HTML
+ *
+ * @deprecated
+ * @param HTMLElement obj
+ * @param string html
+ * @return void
+ */
+function replaceOuterHTML(obj, html) {
+	$(obj).replaceWith(html);
+}
+
+/**
+ * Show or hide an element
+ *
+ * @deprecated
+ * @param string id
+ * @return void
+ */
+function toggleDisplay(id) {
+	$('#' + id).toggle();
+}
+
+/**
+ * Toggle between HTTP and HTTPS
+ *
+ * @deprecated
+ * @return void
+ */
+function toggleSecuritySignIn() {
+	var href = location.href;
+	if (/https:\/\//i.test(href)) {
+		location.href = href.replace(/^https/i,'http');
+	} else {
+		location.href = href.replace(/^http/i,'https');
+	}
+}
+
+/**
+ * Display a message and reload the page
+ *
+ * @deprecated
+ * @param object ret_obj
+ * @return void
+ */
+function completeMessage(ret_obj) {
+	alert(ret_obj.message);
+	location.reload();
+}
+
+/**
+ * Just reload the current page
+ *
+ * @deprecated
+ * @return void
+ */
 function reloadDocument() {
 	location.reload();
 }
 
+/**
+ * Open a calendar popup
+ *
+ * @deprecated
+ * @param string fo_id
+ * @param string day_str
+ * @param function callback_func
+ * @return void
+ */
+function open_calendar(fo_id, day_str, callback_func) {
+	console.warn('open_calendar() is a no-op in Rhymix');
+}
 
 /**
-*
-* Base64 encode / decode
-* http://www.webtoolkit.info/
-*
-**/
+ * Display a popup menu
+ *
+ * @deprecated
+ * @param object ret_obj
+ * @param object response_tags
+ * @param object params
+ * @return void
+ */
+function displayPopupMenu(ret_obj, response_tags, params) {
+	Rhymix.displayPopupMenu(ret_obj, response_tags, params);
+}
 
-var Base64 = {
+/**
+ * Create a popup menu
+ *
+ * @deprecated
+ * @return void
+ */
+function createPopupMenu() {
+	console.warn('createPopupMenu() is a no-op in Rhymix');
+}
+
+/**
+ * Check (?) a popup menu
+ *
+ * @deprecated
+ * @return void
+ */
+function chkPopupMenu() {
+	console.warn('chkPopupMenu() is a no-op in Rhymix');
+}
+
+/**
+ * These functions were used in xpresseditor
+ */
+function zbxe_folder_open(id) {
+	$("#folder_open_" + id).hide();
+	$("#folder_close_" + id).show();
+	$("#folder_" + id).show();
+}
+function zbxe_folder_close(id) {
+	$("#folder_open_" + id).show();
+	$("#folder_close_" + id).hide();
+	$("#folder_" + id).hide();
+}
+function svc_folder_open(id) {
+	$("#_folder_open_" + id).hide();
+	$("#_folder_close_" + id).show();
+	$("#_folder_" + id).show();
+}
+function svc_folder_close(id) {
+	$("#_folder_open_" + id).show();
+	$("#_folder_close_" + id).hide();
+	$("#_folder_" + id).hide();
+}
+
+/**
+ * Shims for old variable names and functions
+ */
+var loaded_popup_menus = Rhymix.loadedPopupMenus;
+var objectExtend = $.extend;
+var ssl_actions = [];
+if (typeof(resizeImageContents) == 'undefined') {
+	window.resizeImageContents = function() {};
+}
+if (typeof(activateOptionDisabled) == 'undefined') {
+	window.activateOptionDisabled = function() {};
+}
+
+/**
+ * Shim for Modernizr if it is not loaded
+ */
+if (!window.Modernizr) {
+	window.Modernizr = {
+		audio: true,
+		video: true,
+		canvas: true,
+		history: true,
+		postmessage: true,
+		geolocation: ('geolocation' in navigator),
+		touch: ('ontouchstart' in window) || (navigator.maxTouchPoints > 0),
+		webgl: !!window.WebGLRenderingContext
+	};
+}
+
+/**
+ * Shim for base64 encoding and decoding
+ *
+ * http://www.webtoolkit.info/
+ */
+const Base64 = {
 
 	// private property
 	_keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
@@ -1182,189 +2257,3 @@ var Base64 = {
 		return string;
 	}
 };
-
-
-
-
-
-
-/* ----------------------------------------------
- * DEPRECATED
- * 하위호환용으로 남겨 놓음
- * ------------------------------------------- */
-
-window.ssl_actions = [];
-
-if(typeof(resizeImageContents) == 'undefined') {
-	window.resizeImageContents = function() {};
-}
-
-if(typeof(activateOptionDisabled) == 'undefined') {
-	window.activateOptionDisabled = function() {};
-}
-
-objectExtend = jQuery.extend;
-
-/**
- * @brief 특정 Element의 display 옵션 토글
- **/
-function toggleDisplay(objId) {
-	jQuery('#'+objId).toggle();
-}
-
-/**
- * @brief 에디터에서 사용하되 내용 여닫는 코드 (zb5beta beta 호환용으로 남겨 놓음)
- **/
-function svc_folder_open(id) {
-	jQuery("#_folder_open_"+id).hide();
-	jQuery("#_folder_close_"+id).show();
-	jQuery("#_folder_"+id).show();
-}
-function svc_folder_close(id) {
-	jQuery("#_folder_open_"+id).show();
-	jQuery("#_folder_close_"+id).hide();
-	jQuery("#_folder_"+id).hide();
-}
-
-/**
- * @brief 날짜 선택 (달력 열기)
- **/
-function open_calendar(fo_id, day_str, callback_func) {
-	if(typeof(day_str)=="undefined") day_str = "";
-
-	var url = "./common/tpl/calendar.php?";
-	if(fo_id) url+="fo_id="+fo_id;
-	if(day_str) url+="&day_str="+day_str;
-	if(callback_func) url+="&callback_func="+callback_func;
-
-	popopen(url, 'Calendar');
-}
-
-var loaded_popup_menus = XE.loaded_popup_menus;
-function createPopupMenu() {}
-function chkPopupMenu() {}
-function displayPopupMenu(ret_obj, response_tags, params) {
-	XE.displayPopupMenu(ret_obj, response_tags, params);
-}
-
-function GetObjLeft(obj) {
-	return jQuery(obj).offset().left;
-}
-function GetObjTop(obj) {
-	return jQuery(obj).offset().top;
-}
-
-function replaceOuterHTML(obj, html) {
-	jQuery(obj).replaceWith(html);
-}
-
-function getOuterHTML(obj) {
-	return jQuery(obj).html().trim();
-}
-
-function setCookie(name, value, expires, path) {
-	var options = {
-		path: path ? path : "/",
-		secure: cookies_ssl ? true : false
-	};
-	if (expires) {
-		options.expires = expires;
-	}
-	XE.cookie.set(name, value, options);
-}
-
-function getCookie(name) {
-	return XE.cookie.get(name);
-}
-
-function is_def(v) {
-	return typeof(v) != 'undefined' && v !== null;
-}
-
-function ucfirst(str) {
-	return str.charAt(0).toUpperCase() + str.slice(1);
-}
-
-function get_by_id(id) {
-	return document.getElementById(id);
-}
-
-jQuery(function($){
-	// display popup menu that contains member actions and document actions
-	$(document).on('click', function(evt) {
-		var $area = $('#popup_menu_area');
-		if(!$area.length) $area = $('<div id="popup_menu_area" tabindex="0" style="display:none;" />').appendTo(document.body);
-
-		// 이전에 호출되었을지 모르는 팝업메뉴 숨김
-		$area.hide();
-
-		var $target = $(evt.target).filter('a,div,span');
-		if(!$target.length) $target = $(evt.target).closest('a,div,span');
-		if(!$target.length) return;
-
-		// 객체의 className값을 구함
-		var cls = $target.attr('class'), match;
-		if(cls) match = cls.match(new RegExp('(?:^| )((document|comment|member)_([1-9]\\d*))(?: |$)',''));
-		if(!match) return;
-
-		// mobile에서 touchstart에 의한 동작 시 pageX, pageY 위치를 구함
-		if(evt.pageX===undefined || evt.pageY===undefined)
-		{
-			var touch = evt.originalEvent.touches[0];
-			if(touch!==undefined || !touch)
-			{
-				touch = evt.originalEvent.changedTouches[0];
-			}
-			evt.pageX = touch.pageX;
-			evt.pageY = touch.pageY;
-		}
-
-		var module = match[2];
-		var action = 'get'+ucfirst(module)+'Menu';
-		var params = {
-			mid        : current_mid,
-			cur_mid    : current_mid,
-			menu_id    : match[1],
-			target_srl : match[3],
-			cur_act    : current_url.getQuery('act'),
-			page_x     : evt.pageX,
-			page_y     : evt.pageY
-		};
-		var response_tags = 'error message menus'.split(' ');
-
-		// prevent default action
-		evt.preventDefault();
-		evt.stopPropagation();
-
-		if(is_def(XE.loaded_popup_menus[params.menu_id])) {
-			return XE.displayPopupMenu(params, response_tags, params);
-		}
-
-		show_waiting_message = false;
-		exec_json(module + '.' + action, params, function(data) {
-			XE.displayPopupMenu(data, response_tags, params);
-			show_waiting_message = true;
-		});
-	});
-
-	/**
-	 * Create popup windows automatically.
-	 * Find anchors that have the '_xe_popup' class, then add popup script to them.
-	 */
-	$('body').on('click', 'a._xe_popup', function(event) {
-		var $this = $(this);
-		var name = $this.attr('name');
-		var href = $this.attr('href');
-		if (!name) name = '_xe_popup_' + Math.floor(Math.random() * 1000);
-
-		event.preventDefault();
-		winopen(href, name, 'left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');
-	});
-
-	// date picker default settings
-	if($.datepicker) {
-		$.datepicker.setDefaults({
-			dateFormat : 'yy-mm-dd'
-		});
-	}
-});
diff --git a/common/js/debug.js b/common/js/debug.js
index b6cd8ec52..9214ec41f 100644
--- a/common/js/debug.js
+++ b/common/js/debug.js
@@ -40,7 +40,7 @@ $(function() {
 	}));
 
 	// Define a function for adding debug data to the panel.
-	window.rhymix_debug_add_data = function(data, open) {
+	Rhymix.addDebugData = function(data, open) {
 
 		// Define loop variables.
 		var i, j, entry, num, cnt, backtrace, description;
@@ -238,15 +238,15 @@ $(function() {
 	};
 
 	// Add debug data from the current request.
-	if (window.rhymix_debug_content) {
-		window.rhymix_debug_content.page_title = 'MAIN PAGE';
-		rhymix_debug_add_data(window.rhymix_debug_content, true);
+	if (Rhymix.currentDebugData) {
+		Rhymix.currentDebugData.page_title = 'MAIN PAGE';
+		Rhymix.addDebugData(Rhymix.currentDebugData, true);
 	}
 
 	// Add debug data from pending AJAX requests.
-	if (window.rhymix_debug_pending_data) {
-		while (window.rhymix_debug_pending_data.length) {
-			rhymix_debug_add_data(window.rhymix_debug_pending_data.shift());
+	if (Rhymix.pendingDebugData) {
+		while (Rhymix.pendingDebugData.length) {
+			Rhymix.addDebugData(Rhymix.pendingDebugData.shift());
 		}
 	}
 });
diff --git a/common/js/js_app.js b/common/js/js_app.js
index 6851ac180..b3509949e 100644
--- a/common/js/js_app.js
+++ b/common/js/js_app.js
@@ -261,7 +261,7 @@
 	}
 
 	window.xe = $.extend(_app_base, _xe_base);
-	window.xe.lang = {}; // language repository
+	window.xe.lang = Rhymix.langCodes;
 
 	// domready event
 	$(function(){ xe.broadcast('ONREADY'); });
diff --git a/common/js/plugins/ckeditor/ckeditor/plugins/rx_paste/plugin.js b/common/js/plugins/ckeditor/ckeditor/plugins/rx_paste/plugin.js
index de53074e3..f5e95f925 100644
--- a/common/js/plugins/ckeditor/ckeditor/plugins/rx_paste/plugin.js
+++ b/common/js/plugins/ckeditor/ckeditor/plugins/rx_paste/plugin.js
@@ -102,7 +102,7 @@ CKEDITOR.plugins.add('rx_paste', {
 		 * Display an error message.
 		 */
 		const displayError = function(type, message) {
-			alert(window.xe.msg_file_upload_error + ' (Type ' + type + ")\n" + message);
+			alert(Rhymix.lang('msg_file_upload_error') + ' (Type ' + type + ")\n" + message);
 		};
 
 	}
diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js
index cb52a126c..6d7be5095 100644
--- a/common/js/plugins/jquery.fileupload/js/main.js
+++ b/common/js/plugins/jquery.fileupload/js/main.js
@@ -106,7 +106,7 @@
 					$.each(item.files, function(index, file) {
 						if(data.settings.maxFileSize > 0 && data.settings.maxFileSize < file.size) {
 							dfd.reject();
-							alert(window.xe.msg_exceeds_limit_size);
+							alert(window.xe.lang.msg_exceeds_limit_size);
 							return false;
 						}
 						dfd.resolve();
@@ -133,19 +133,19 @@
 							if (res.result.message) {
 								alert(res.result.message);
 							} else {
-								alert(window.xe.msg_file_upload_error + " (Type 1)");
+								alert(window.xe.lang.msg_file_upload_error + " (Type 1)");
 							}
 							return chunkStatus = false;
 						}
 					} else {
-						alert(window.xe.msg_file_upload_error + " (Type 2)");
+						alert(window.xe.lang.msg_file_upload_error + " (Type 2)");
 						return chunkStatus = false;
 					}
 				},
 				chunkfail: function(e, res) {
 					lastUploadTime = Date.now();
 					if (chunkStatus) {
-						alert(window.xe.msg_file_upload_error + " (Type 3)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
+						alert(window.xe.lang.msg_file_upload_error + " (Type 3)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
 						return chunkStatus = false;
 					}
 				},
@@ -162,14 +162,14 @@
 					var result = res.response().result;
 					var temp_code = '';
 					if (!result) {
-						alert(window.xe.msg_file_upload_error + " (Type 4)");
+						alert(window.xe.lang.msg_file_upload_error + " (Type 4)");
 						return false;
 					}
 					if (!jQuery.isPlainObject(result)) {
 						result = jQuery.parseJSON(result);
 					}
 					if (!result) {
-						alert(window.xe.msg_file_upload_error + " (Type 5)" + "<br>\n" + res.response().result);
+						alert(window.xe.lang.msg_file_upload_error + " (Type 5)" + "<br>\n" + res.response().result);
 						return false;
 					}
 
@@ -215,7 +215,7 @@
 						return false;
 					} else {
 						$container.data('editorStatus', null);
-						alert(window.xe.msg_file_upload_error + " (Type 6)" + "<br>\n" + res.response().result);
+						alert(window.xe.lang.msg_file_upload_error + " (Type 6)" + "<br>\n" + res.response().result);
 						return false;
 					}
 				},
@@ -229,7 +229,7 @@
 						}
 					}, 1000);
 					if (chunkStatus) {
-						alert(window.xe.msg_file_upload_error + " (Type 7)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
+						alert(window.xe.lang.msg_file_upload_error + " (Type 7)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
 						return false;
 					}
 				},
diff --git a/common/js/unittest/JSSpec/COPYING b/common/js/unittest/JSSpec/COPYING
deleted file mode 100644
index a3460b2ab..000000000
--- a/common/js/unittest/JSSpec/COPYING
+++ /dev/null
@@ -1,459 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
diff --git a/common/js/unittest/JSSpec/JSSpec.js b/common/js/unittest/JSSpec/JSSpec.js
deleted file mode 100644
index 1a337df41..000000000
--- a/common/js/unittest/JSSpec/JSSpec.js
+++ /dev/null
@@ -1,1548 +0,0 @@
-/**
- * JSSpec
- *
- * Copyright 2007 Alan Kang
- *  - mailto:jania902@gmail.com
- *  - http://jania.pe.kr
- *
- * http://jania.pe.kr/aw/moin.cgi/JSSpec
- *
- * Dependencies:
- *  - diff_match_patch.js ( http://code.google.com/p/google-diff-match-patch )
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/**
- * Namespace
- */
-
-var JSSpec = {
-	specs: [],
-	
-	EMPTY_FUNCTION: function() {},
-	
-	Browser: {
-		// By Rendering Engines
-		Trident: navigator.appName === "Microsoft Internet Explorer",
-		Webkit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
-		Gecko: navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') === -1,
-		KHTML: navigator.userAgent.indexOf('KHTML') !== -1,
-		Presto: navigator.appName === "Opera",
-		
-		// By Platforms
-		Mac: navigator.userAgent.indexOf("Macintosh") !== -1,
-		Ubuntu: navigator.userAgent.indexOf('Ubuntu') !== -1,
-		Win: navigator.userAgent.indexOf('Windows') !== -1,
-		
-		// By Browsers
-		IE: navigator.appName === "Microsoft Internet Explorer",
-		IE6: navigator.userAgent.indexOf('MSIE 6') !== -1,
-		IE7: navigator.userAgent.indexOf('MSIE 7') !== -1,
-		IE8: navigator.userAgent.indexOf('MSIE 8') !== -1,
-		
-		FF: navigator.userAgent.indexOf('Firefox') !== -1,
-		FF2: navigator.userAgent.indexOf('Firefox/2') !== -1,
-		FF3: navigator.userAgent.indexOf('Firefox/3') !== -1,
-		Safari: navigator.userAgent.indexOf('Safari') !== -1
-	}
-};
-
-
-
-/**
- * Executor
- */
-JSSpec.Executor = function(target, onSuccess, onException) {
-	this.target = target;
-	this.onSuccess = typeof onSuccess == 'function' ? onSuccess : JSSpec.EMPTY_FUNCTION;
-	this.onException = typeof onException == 'function' ? onException : JSSpec.EMPTY_FUNCTION;
-	
-	if(JSSpec.Browser.Trident) {
-		// Exception handler for Trident. It helps to collect exact line number where exception occured.
-		window.onerror = function(message, fileName, lineNumber) {
-			var self = window._curExecutor;
-			var ex = {message:message, fileName:fileName, lineNumber:lineNumber};
-
-			if(JSSpec._secondPass)  {
-				ex = self.mergeExceptions(JSSpec._assertionFailure, ex);
-				delete JSSpec._secondPass;
-				delete JSSpec._assertionFailure;
-				
-				ex.type = "failure";
-				self.onException(self, ex);
-			} else if(JSSpec._assertionFailure) {
-				JSSpec._secondPass = true;
-				self.run();
-			} else {
-				self.onException(self, ex);
-			}
-			
-			return true;
-		};
-	}
-};
-JSSpec.Executor.prototype.mergeExceptions = function(assertionFailure, normalException) {
-	var merged = {
-		message:assertionFailure.message,
-		fileName:normalException.fileName,
-		lineNumber:normalException.lineNumber
-	};
-	
-	return merged;
-};
-
-JSSpec.Executor.prototype.run = function() {
-	var self = this;
-	var target = this.target;
-	var onSuccess = this.onSuccess;
-	var onException = this.onException;
-	
-	window.setTimeout(
-		function() {
-			var result;
-			if(JSSpec.Browser.Trident) {
-				window._curExecutor = self;
-				
-				result = self.target();
-				self.onSuccess(self, result);
-			} else {
-				try {
-					result = self.target();
-					self.onSuccess(self, result);
-				} catch(ex) {
-					if(JSSpec.Browser.Webkit) ex = {message:ex.message, fileName:ex.sourceURL, lineNumber:ex.line};
-					
-					if(JSSpec._secondPass)  {
-						ex = self.mergeExceptions(JSSpec._assertionFailure, ex);
-						delete JSSpec._secondPass;
-						delete JSSpec._assertionFailure;
-						
-						ex.type = "failure";
-						self.onException(self, ex);
-					} else if(JSSpec._assertionFailure) {
-						JSSpec._secondPass = true;
-						self.run();
-					} else {
-						self.onException(self, ex);
-					}
-				}
-			}
-		},
-		0
-	);
-};
-
-
-
-/**
- * CompositeExecutor composites one or more executors and execute them sequencially.
- */
-JSSpec.CompositeExecutor = function(onSuccess, onException, continueOnException) {
-	this.queue = [];
-	this.onSuccess = typeof onSuccess == 'function' ? onSuccess : JSSpec.EMPTY_FUNCTION;
-	this.onException = typeof onException == 'function' ? onException : JSSpec.EMPTY_FUNCTION;
-	this.continueOnException = !!continueOnException;
-};
-
-JSSpec.CompositeExecutor.prototype.addFunction = function(func) {
-	this.addExecutor(new JSSpec.Executor(func));
-};
-
-JSSpec.CompositeExecutor.prototype.addExecutor = function(executor) {
-	var last = this.queue.length == 0 ? null : this.queue[this.queue.length - 1];
-	if(last) {
-		last.next = executor;
-	}
-	
-	executor.parent = this;
-	executor.onSuccessBackup = executor.onSuccess;
-	executor.onSuccess = function(result) {
-		this.onSuccessBackup(result);
-		if(this.next) {
-			this.next.run();
-		} else {
-			this.parent.onSuccess();
-		}
-	};
-	executor.onExceptionBackup = executor.onException;
-	executor.onException = function(executor, ex) {
-		this.onExceptionBackup(executor, ex);
-
-		if(this.parent.continueOnException) {
-			if(this.next) {
-				this.next.run();
-			} else {
-				this.parent.onSuccess();
-			}
-		} else {
-			this.parent.onException(executor, ex);
-		}
-	};
-
-	this.queue.push(executor);
-};
-
-JSSpec.CompositeExecutor.prototype.run = function() {
-	if(this.queue.length > 0) {
-		this.queue[0].run();
-	}
-};
-
-/**
- * Spec is a set of Examples in a specific context
- */
-JSSpec.Spec = function(context, entries) {
-	this.id = JSSpec.Spec.id++;
-	this.context = context;
-	this.url = location.href;
-	
-	this.filterEntriesByEmbeddedExpressions(entries);
-	this.extractOutSpecialEntries(entries);
-	this.examples = this.makeExamplesFromEntries(entries);
-	this.examplesMap = this.makeMapFromExamples(this.examples);
-};
-
-JSSpec.Spec.id = 0;
-JSSpec.Spec.prototype.getExamples = function() {
-	return this.examples;
-};
-
-JSSpec.Spec.prototype.hasException = function() {
-	return this.getTotalFailures() > 0 || this.getTotalErrors() > 0;
-};
-
-JSSpec.Spec.prototype.getTotalFailures = function() {
-	var examples = this.examples;
-	var failures = 0;
-	for(var i = 0; i < examples.length; i++) {
-		if(examples[i].isFailure()) failures++;
-	}
-	return failures;
-};
-
-JSSpec.Spec.prototype.getTotalErrors = function() {
-	var examples = this.examples;
-	var errors = 0;
-	for(var i = 0; i < examples.length; i++) {
-		if(examples[i].isError()) errors++;
-	}
-	return errors;
-};
-
-JSSpec.Spec.prototype.filterEntriesByEmbeddedExpressions = function(entries) {
-	var isTrue;
-	for(name in entries) if(entries.hasOwnProperty(name)) {
-		var m = name.match(/\[\[(.+)\]\]/);
-		if(m && m[1]) {
-			eval("isTrue = (" + m[1] + ")");
-			if(!isTrue) delete entries[name];
-		}
-	}
-};
-
-JSSpec.Spec.prototype.extractOutSpecialEntries = function(entries) {
-	this.beforeEach = JSSpec.EMPTY_FUNCTION;
-	this.beforeAll = JSSpec.EMPTY_FUNCTION;
-	this.afterEach = JSSpec.EMPTY_FUNCTION;
-	this.afterAll = JSSpec.EMPTY_FUNCTION;
-	
-	for(name in entries) if(entries.hasOwnProperty(name)) {
-		if(name == 'before' || name == 'before each' || name == 'before_each') {
-			this.beforeEach = entries[name];
-		} else if(name == 'before all' || name == 'before_all') {
-			this.beforeAll = entries[name];
-		} else if(name == 'after' || name == 'after each' || name == 'after_each') {
-			this.afterEach = entries[name];
-		} else if(name == 'after all' || name == 'after_all') {
-			this.afterAll = entries[name];
-		}
-	}
-	
-	delete entries['before'];
-	delete entries['before each'];
-	delete entries['before_each'];
-	delete entries['before all'];
-	delete entries['before_all'];
-	delete entries['after'];
-	delete entries['after each'];
-	delete entries['after_each'];
-	delete entries['after all'];
-	delete entries['after_all'];
-};
-
-JSSpec.Spec.prototype.makeExamplesFromEntries = function(entries) {
-	var examples = [];
-	for(name in entries) if(entries.hasOwnProperty(name)) {
-		examples.push(new JSSpec.Example(name, entries[name], this.beforeEach, this.afterEach));
-	}
-	return examples;
-};
-
-JSSpec.Spec.prototype.makeMapFromExamples = function(examples) {
-	var map = {};
-	for(var i = 0; i < examples.length; i++) {
-		var example = examples[i];
-		map[example.id] = examples[i];
-	}
-	return map;
-};
-
-JSSpec.Spec.prototype.getExampleById = function(id) {
-	return this.examplesMap[id];
-};
-
-JSSpec.Spec.prototype.getExecutor = function() {
-	var self = this;
-	var onException = function(executor, ex) {
-		self.exception = ex;
-	};
-	
-	var composite = new JSSpec.CompositeExecutor();
-	composite.addFunction(function() {JSSpec.log.onSpecStart(self);});
-	composite.addExecutor(new JSSpec.Executor(this.beforeAll, null, function(exec, ex) {
-		self.exception = ex;
-		JSSpec.log.onSpecEnd(self);
-	}));
-	
-	var exampleAndAfter = new JSSpec.CompositeExecutor(null,null,true);
-	for(var i = 0; i < this.examples.length; i++) {
-		exampleAndAfter.addExecutor(this.examples[i].getExecutor());
-	}
-	exampleAndAfter.addExecutor(new JSSpec.Executor(this.afterAll, null, onException));
-	exampleAndAfter.addFunction(function() {JSSpec.log.onSpecEnd(self);});
-	composite.addExecutor(exampleAndAfter);
-	
-	return composite;
-};
-
-/**
- * Example
- */
-JSSpec.Example = function(name, target, before, after) {
-	this.id = JSSpec.Example.id++;
-	this.name = name;
-	this.target = target;
-	this.before = before;
-	this.after = after;
-};
-
-JSSpec.Example.id = 0;
-JSSpec.Example.prototype.isFailure = function() {
-	return this.exception && this.exception.type == "failure";
-};
-
-JSSpec.Example.prototype.isError = function() {
-	return this.exception && !this.exception.type;
-};
-
-JSSpec.Example.prototype.getExecutor = function() {
-	var self = this;
-	var onException = function(executor, ex) {
-		self.exception = ex;
-	};
-	
-	var composite = new JSSpec.CompositeExecutor();
-	composite.addFunction(function() {JSSpec.log.onExampleStart(self);});
-	composite.addExecutor(new JSSpec.Executor(this.before, null, function(exec, ex) {
-		self.exception = ex;
-		JSSpec.log.onExampleEnd(self);
-	}));
-	
-	var targetAndAfter = new JSSpec.CompositeExecutor(null,null,true);
-	
-	targetAndAfter.addExecutor(new JSSpec.Executor(this.target, null, onException));
-	targetAndAfter.addExecutor(new JSSpec.Executor(this.after, null, onException));
-	targetAndAfter.addFunction(function() {JSSpec.log.onExampleEnd(self);});
-	
-	composite.addExecutor(targetAndAfter);
-	
-	return composite;
-};
-
-/**
- * Runner
- */
-JSSpec.Runner = function(specs, logger) {
-	JSSpec.log = logger;
-	
-	this.totalExamples = 0;
-	this.specs = [];
-	this.specsMap = {};
-	this.addAllSpecs(specs);
-};
-
-JSSpec.Runner.prototype.addAllSpecs = function(specs) {
-	for(var i = 0; i < specs.length; i++) {
-		this.addSpec(specs[i]);
-	}
-};
-
-JSSpec.Runner.prototype.addSpec = function(spec) {
-	this.specs.push(spec);
-	this.specsMap[spec.id] = spec;
-	this.totalExamples += spec.getExamples().length;
-};
-
-JSSpec.Runner.prototype.getSpecById = function(id) {
-	return this.specsMap[id];
-};
-
-JSSpec.Runner.prototype.getSpecByContext = function(context) {
-	for(var i = 0; i < this.specs.length; i++) {
-		if(this.specs[i].context == context) return this.specs[i];
-	}
-	return null;
-};
-
-JSSpec.Runner.prototype.getSpecs = function() {
-	return this.specs;
-};
-
-JSSpec.Runner.prototype.hasException = function() {
-	return this.getTotalFailures() > 0 || this.getTotalErrors() > 0;
-};
-
-JSSpec.Runner.prototype.getTotalFailures = function() {
-	var specs = this.specs;
-	var failures = 0;
-	for(var i = 0; i < specs.length; i++) {
-		failures += specs[i].getTotalFailures();
-	}
-	return failures;
-};
-
-JSSpec.Runner.prototype.getTotalErrors = function() {
-	var specs = this.specs;
-	var errors = 0;
-	for(var i = 0; i < specs.length; i++) {
-		errors += specs[i].getTotalErrors();
-	}
-	return errors;
-};
-
-
-JSSpec.Runner.prototype.run = function() {
-	JSSpec.log.onRunnerStart();
-	var executor = new JSSpec.CompositeExecutor(function() {JSSpec.log.onRunnerEnd()},null,true);
-	for(var i = 0; i < this.specs.length; i++) {
-		executor.addExecutor(this.specs[i].getExecutor());
-	}
-	executor.run();
-};
-
-
-JSSpec.Runner.prototype.rerun = function(context) {
-	JSSpec.runner = new JSSpec.Runner([this.getSpecByContext(context)], JSSpec.log);
-	JSSpec.runner.run();
-};
-
-/**
- * Logger
- */
-JSSpec.Logger = function() {
-	this.finishedExamples = 0;
-	this.startedAt = null;
-};
-
-JSSpec.Logger.prototype.onRunnerStart = function() {
-	this._title = document.title;
-
-	this.startedAt = new Date();
-	var container = document.getElementById('jsspec_container');
-	if(container) {
-		container.innerHTML = "";
-	} else {
-		container = document.createElement("DIV");
-		container.id = "jsspec_container";
-		document.body.appendChild(container);
-	}
-	
-	var title = document.createElement("DIV");
-	title.id = "title";
-	title.innerHTML = [
-		'<h1>JSSpec</h1>',
-		'<ul>',
-		JSSpec.options.rerun ? '<li>[<a href="?" title="rerun all specs">X</a>] ' + JSSpec.util.escapeTags(decodeURIComponent(JSSpec.options.rerun)) + '</li>' : '',
-		'	<li><span id="total_examples">' + JSSpec.runner.totalExamples + '</span> examples</li>',
-		'	<li><span id="total_failures">0</span> failures</li>',
-		'	<li><span id="total_errors">0</span> errors</li>',
-		'	<li><span id="progress">0</span>% done</li>',
-		'	<li><span id="total_elapsed">0</span> secs</li>',
-		'</ul>',
-		'<p><a href="http://jania.pe.kr/aw/moin.cgi/JSSpec">JSSpec homepage</a></p>',
-	].join("");
-	container.appendChild(title);
-
-	var list = document.createElement("DIV");
-	list.id = "list";
-	list.innerHTML = [
-		'<h2>List</h2>',
-		'<ul class="specs">',
-		function() {
-			var specs = JSSpec.runner.getSpecs();
-			var sb = [];
-			for(var i = 0; i < specs.length; i++) {
-				var spec = specs[i];
-				sb.push('<li id="spec_' + specs[i].id + '_list"><h3><a href="#spec_' + specs[i].id + '">' + JSSpec.util.escapeTags(specs[i].context) + '</a> [<a href="?rerun=' + encodeURIComponent(specs[i].context) + '">rerun</a>]</h3> </li>');
-			}
-			return sb.join("");
-		}(),
-		'</ul>'
-	].join("");
-	container.appendChild(list);
-	
-	var log = document.createElement("DIV");
-	log.id = "log";
-	log.innerHTML = [
-		'<h2>Log</h2>',
-		'<ul class="specs">',
-		function() {
-			var specs = JSSpec.runner.getSpecs();
-			var sb = [];
-			for(var i = 0; i < specs.length; i++) {
-				var spec = specs[i];
-				sb.push('	<li id="spec_' + specs[i].id + '">');
-				sb.push('		<h3>' + JSSpec.util.escapeTags(specs[i].context) + ' [<a href="?rerun=' + encodeURIComponent(specs[i].context) + '">rerun</a>]</h3>');
-				sb.push('		<ul id="spec_' + specs[i].id + '_examples" class="examples">');
-				for(var j = 0; j < spec.examples.length; j++) {
-					var example = spec.examples[j];
-					sb.push('			<li id="example_' + example.id + '">');
-					sb.push('				<h4>' + JSSpec.util.escapeTags(example.name) + '</h4>');
-					sb.push('				<pre class="examples-code"><code>'+JSSpec.util.escapeTags(example.target.toString())+'</code></pre>');
-					sb.push('			</li>');
-				}
-				sb.push('		</ul>');
-				sb.push('	</li>');
-			}
-			return sb.join("");
-		}(),
-		'</ul>'
-	].join("");
-	
-	container.appendChild(log);
-	
-	// add event handler for toggling
-	var specs = JSSpec.runner.getSpecs();
-	var sb = [];
-	for(var i = 0; i < specs.length; i++) {
-		var spec = document.getElementById("spec_" + specs[i].id);
-		var title = spec.getElementsByTagName("H3")[0];
-		title.onclick = function(e) {
-			var target = document.getElementById(this.parentNode.id + "_examples");
-			target.style.display = target.style.display == "none" ? "block" : "none";
-			return true;
-		}
-	}
-};
-
-JSSpec.Logger.prototype.onRunnerEnd = function() {
-	if(JSSpec.runner.hasException()) {
-		var times = 4;
-		var title1 = "*" + this._title;
-		var title2 = "*F" + JSSpec.runner.getTotalFailures() + " E" + JSSpec.runner.getTotalErrors() + "* " + this._title;
-	} else {
-		var times = 2;
-		var title1 = this._title;
-		var title2 = "Success";
-	}
-	this.blinkTitle(times,title1,title2);
-};
-
-JSSpec.Logger.prototype.blinkTitle = function(times, title1, title2) {
-	var times = times * 2;
-	var mode = true;
-	
-	var f = function() {
-		if(times > 0) {
-			document.title = mode ? title1 : title2;
-			mode = !mode;
-			times--;
-			window.setTimeout(f, 500);
-		} else {
-			document.title = title1;
-		}
-	};
-	
-	f();
-};
-
-JSSpec.Logger.prototype.onSpecStart = function(spec) {
-	var spec_list = document.getElementById("spec_" + spec.id + "_list");
-	var spec_log = document.getElementById("spec_" + spec.id);
-	
-	spec_list.className = "ongoing";
-	spec_log.className = "ongoing";
-};
-
-JSSpec.Logger.prototype.onSpecEnd = function(spec) {
-	var spec_list = document.getElementById("spec_" + spec.id + "_list");
-	var spec_log = document.getElementById("spec_" + spec.id);
-	var examples = document.getElementById("spec_" + spec.id + "_examples");
-	var className = spec.hasException() ? "exception" : "success";
-
-	spec_list.className = className;
-	spec_log.className = className;
-
-	if(JSSpec.options.autocollapse && !spec.hasException()) examples.style.display = "none";
-	
-	if(spec.exception) {
-		spec_log.appendChild(document.createTextNode(" - " + spec.exception.message));
-	}
-};
-
-JSSpec.Logger.prototype.onExampleStart = function(example) {
-	var li = document.getElementById("example_" + example.id);
-	li.className = "ongoing";
-};
-
-JSSpec.Logger.prototype.onExampleEnd = function(example) {
-	var li = document.getElementById("example_" + example.id);
-	li.className = example.exception ? "exception" : "success";
-	
-	if(example.exception) {
-		var div = document.createElement("DIV");
-		div.innerHTML = example.exception.message + "<p><br />" + " at " + example.exception.fileName + ", line " + example.exception.lineNumber + "</p>";
-		li.appendChild(div);
-	}
-	
-	var title = document.getElementById("title");
-	var runner = JSSpec.runner;
-	
-	title.className = runner.hasException() ? "exception" : "success";
-	
-	this.finishedExamples++;
-	document.getElementById("total_failures").innerHTML = runner.getTotalFailures();
-	document.getElementById("total_errors").innerHTML = runner.getTotalErrors();
-	var progress = parseInt(this.finishedExamples / runner.totalExamples * 100);
-	document.getElementById("progress").innerHTML = progress;
-	document.getElementById("total_elapsed").innerHTML = (new Date().getTime() - this.startedAt.getTime()) / 1000;
-	
-	document.title = progress + "%: " + this._title;
-};
-
-/**
- * IncludeMatcher
- */
-JSSpec.IncludeMatcher = function(actual, expected, condition) {
-	this.actual = actual;
-	this.expected = expected;
-	this.condition = condition;
-	this.match = false;
-	this.explaination = this.makeExplain();
-};
-
-JSSpec.IncludeMatcher.createInstance = function(actual, expected, condition) {
-	return new JSSpec.IncludeMatcher(actual, expected, condition);
-};
-
-JSSpec.IncludeMatcher.prototype.matches = function() {
-	return this.match;
-};
-
-JSSpec.IncludeMatcher.prototype.explain = function() {
-	return this.explaination;
-};
-
-JSSpec.IncludeMatcher.prototype.makeExplain = function() {
-	if(typeof this.actual.length == 'undefined') {
-		return this.makeExplainForNotArray();
-	} else {
-		return this.makeExplainForArray();
-	}
-};
-
-JSSpec.IncludeMatcher.prototype.makeExplainForNotArray = function() {
-	if(this.condition) {
-		this.match = !!this.actual[this.expected];
-	} else {
-		this.match = !this.actual[this.expected];
-	}
-	
-	var sb = [];
-	sb.push('<p>actual value:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, this.expected) + '</p>');
-	sb.push('<p>should ' + (this.condition ? '' : 'not') + ' include:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected) + '</p>');
-	return sb.join("");
-};
-
-JSSpec.IncludeMatcher.prototype.makeExplainForArray = function() {
-	var matches;
-	if(this.condition) {
-		for(var i = 0; i < this.actual.length; i++) {
-			matches = JSSpec.EqualityMatcher.createInstance(this.expected, this.actual[i]).matches();
-			if(matches) {
-				this.match = true;
-				break;
-			}
-		}
-	} else {
-		for(var i = 0; i < this.actual.length; i++) {
-			matches = JSSpec.EqualityMatcher.createInstance(this.expected, this.actual[i]).matches();
-			if(matches) {
-				this.match = false;
-				break;
-			}
-		}
-	}
-	
-	if(this.match) return "";
-	
-	var sb = [];
-	sb.push('<p>actual value:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, this.condition ? null : i) + '</p>');
-	sb.push('<p>should ' + (this.condition ? '' : 'not') + ' include:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected) + '</p>');
-	return sb.join("");
-};
-
-/**
- * PropertyLengthMatcher
- */
-JSSpec.PropertyLengthMatcher = function(num, property, o, condition) {
-	this.num = num;
-	this.o = o;
-	this.property = property;
-	if((property == 'characters' || property == 'items') && typeof o.length != 'undefined') {
-		this.property = 'length';
-	}
-	
-	this.condition = condition;
-	this.conditionMet = function(x) {
-		if(condition == 'exactly') return x.length == num;
-		if(condition == 'at least') return x.length >= num;
-		if(condition == 'at most') return x.length <= num;
-
-		throw "Unknown condition '" + condition + "'";
-	};
-	this.match = false;
-	this.explaination = this.makeExplain();
-};
-
-JSSpec.PropertyLengthMatcher.prototype.makeExplain = function() {
-	if(this.o._type == 'String' && this.property == 'length') {
-		this.match = this.conditionMet(this.o);
-		return this.match ? '' : this.makeExplainForString();
-	} else if(typeof this.o.length != 'undefined' && this.property == "length") {
-		this.match = this.conditionMet(this.o);
-		return this.match ? '' : this.makeExplainForArray();
-	} else if(typeof this.o[this.property] != 'undefined' && this.o[this.property] != null) {
-		this.match = this.conditionMet(this.o[this.property]);
-		return this.match ? '' : this.makeExplainForObject();
-	} else if(typeof this.o[this.property] == 'undefined' || this.o[this.property] == null) {
-		this.match = false;
-		return this.makeExplainForNoProperty();
-	}
-
-	this.match = true;
-};
-
-JSSpec.PropertyLengthMatcher.prototype.makeExplainForString = function() {
-	var sb = [];
-	
-	var exp = this.num == 0 ?
-		'be an <strong>empty string</strong>' :
-		'have <strong>' + this.condition + ' ' + this.num + ' characters</strong>';
-	
-	sb.push('<p>actual value has <strong>' + this.o.length + ' characters</strong>:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o) + '</p>');
-	sb.push('<p>but it should ' + exp + '.</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.PropertyLengthMatcher.prototype.makeExplainForArray = function() {
-	var sb = [];
-	
-	var exp = this.num == 0 ?
-		'be an <strong>empty array</strong>' :
-		'have <strong>' + this.condition + ' ' + this.num + ' items</strong>';
-
-	sb.push('<p>actual value has <strong>' + this.o.length + ' items</strong>:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o) + '</p>');
-	sb.push('<p>but it should ' + exp + '.</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.PropertyLengthMatcher.prototype.makeExplainForObject = function() {
-	var sb = [];
-
-	var exp = this.num == 0 ?
-		'be <strong>empty</strong>' :
-		'have <strong>' + this.condition + ' ' + this.num + ' ' + this.property + '.</strong>';
-
-	sb.push('<p>actual value has <strong>' + this.o[this.property].length + ' ' + this.property + '</strong>:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o, false, this.property) + '</p>');
-	sb.push('<p>but it should ' + exp + '.</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.PropertyLengthMatcher.prototype.makeExplainForNoProperty = function() {
-	var sb = [];
-	
-	sb.push('<p>actual value:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o) + '</p>');
-	sb.push('<p>should have <strong>' + this.condition + ' ' + this.num + ' ' + this.property + '</strong> but there\'s no such property.</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.PropertyLengthMatcher.prototype.matches = function() {
-	return this.match;
-};
-
-JSSpec.PropertyLengthMatcher.prototype.explain = function() {
-	return this.explaination;
-};
-
-JSSpec.PropertyLengthMatcher.createInstance = function(num, property, o, condition) {
-	return new JSSpec.PropertyLengthMatcher(num, property, o, condition);
-};
-
-/**
- * EqualityMatcher
- */
-JSSpec.EqualityMatcher = {};
-
-JSSpec.EqualityMatcher.createInstance = function(expected, actual) {
-	if(expected == null || actual == null) {
-		return new JSSpec.NullEqualityMatcher(expected, actual);
-	} else if(expected._type && expected._type == actual._type) {
-		if(expected._type == "String") {
-			return new JSSpec.StringEqualityMatcher(expected, actual);
-		} else if(expected._type == "Date") {
-			return new JSSpec.DateEqualityMatcher(expected, actual);
-		} else if(expected._type == "Number") {
-			return new JSSpec.NumberEqualityMatcher(expected, actual);
-		} else if(expected._type == "Array") {
-			return new JSSpec.ArrayEqualityMatcher(expected, actual);
-		} else if(expected._type == "Boolean") {
-			return new JSSpec.BooleanEqualityMatcher(expected, actual);
-		}
-	}
-	
-	return new JSSpec.ObjectEqualityMatcher(expected, actual);
-};
-
-JSSpec.EqualityMatcher.basicExplain = function(expected, actual, expectedDesc, actualDesc) {
-	var sb = [];
-	
-	sb.push(actualDesc || '<p>actual value:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(actual) + '</p>');
-	sb.push(expectedDesc || '<p>should be:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(expected) + '</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.EqualityMatcher.diffExplain = function(expected, actual) {
-	var sb = [];
-
-	sb.push('<p>diff:</p>');
-	sb.push('<p style="margin-left:2em;">');
-	
-	var dmp = new diff_match_patch();
-	var diff = dmp.diff_main(expected, actual);
-	dmp.diff_cleanupEfficiency(diff);
-	
-	sb.push(JSSpec.util.inspect(dmp.diff_prettyHtml(diff), true));
-	
-	sb.push('</p>');
-	
-	return sb.join("");
-};
-
-/**
- * BooleanEqualityMatcher
- */
-JSSpec.BooleanEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-};
-
-JSSpec.BooleanEqualityMatcher.prototype.explain = function() {
-	var sb = [];
-	
-	sb.push('<p>actual value:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual) + '</p>');
-	sb.push('<p>should be:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected) + '</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.BooleanEqualityMatcher.prototype.matches = function() {
-	return this.expected == this.actual;
-};
-
-/**
- * NullEqualityMatcher
- */
-JSSpec.NullEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-};
-
-JSSpec.NullEqualityMatcher.prototype.matches = function() {
-	return this.expected == this.actual && typeof this.expected == typeof this.actual;
-};
-
-JSSpec.NullEqualityMatcher.prototype.explain = function() {
-	return JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual);
-};
-
-JSSpec.DateEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-};
-
-JSSpec.DateEqualityMatcher.prototype.matches = function() {
-	return this.expected.getTime() == this.actual.getTime();
-};
-
-JSSpec.DateEqualityMatcher.prototype.explain = function() {
-	var sb = [];
-	
-	sb.push(JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual));
-	sb.push(JSSpec.EqualityMatcher.diffExplain(this.expected.toString(), this.actual.toString()));
-
-	return sb.join("");
-};
-
-/**
- * ObjectEqualityMatcher
- */
-JSSpec.ObjectEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-	this.match = this.expected == this.actual;
-	this.explaination = this.makeExplain();
-};
-
-JSSpec.ObjectEqualityMatcher.prototype.matches = function() {return this.match};
-
-JSSpec.ObjectEqualityMatcher.prototype.explain = function() {return this.explaination};
-
-JSSpec.ObjectEqualityMatcher.prototype.makeExplain = function() {
-	if(this.expected == this.actual) {
-		this.match = true;
-		return "";
-	}
-	
-	if(JSSpec.util.isDomNode(this.expected)) {
-		return this.makeExplainForDomNode();
-	}
-	
-	var key, expectedHasItem, actualHasItem;
-
-	for(key in this.expected) {
-		expectedHasItem = this.expected[key] != null && typeof this.expected[key] != 'undefined';
-		actualHasItem = this.actual[key] != null && typeof this.actual[key] != 'undefined';
-		if(expectedHasItem && !actualHasItem) return this.makeExplainForMissingItem(key);
-	}
-	for(key in this.actual) {
-		expectedHasItem = this.expected[key] != null && typeof this.expected[key] != 'undefined';
-		actualHasItem = this.actual[key] != null && typeof this.actual[key] != 'undefined';
-		if(actualHasItem && !expectedHasItem) return this.makeExplainForUnknownItem(key);
-	}
-	
-	for(key in this.expected) {
-		var matcher = JSSpec.EqualityMatcher.createInstance(this.expected[key], this.actual[key]);
-		if(!matcher.matches()) return this.makeExplainForItemMismatch(key);
-	}
-		
-	this.match = true;
-};
-
-JSSpec.ObjectEqualityMatcher.prototype.makeExplainForDomNode = function(key) {
-	var sb = [];
-	
-	sb.push(JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual));
-	
-	return sb.join("");
-};
-
-JSSpec.ObjectEqualityMatcher.prototype.makeExplainForMissingItem = function(key) {
-	var sb = [];
-
-	sb.push('<p>actual value has no item named <strong>' + JSSpec.util.inspect(key) + '</strong></p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, key) + '</p>');
-	sb.push('<p>but it should have the item whose value is <strong>' + JSSpec.util.inspect(this.expected[key]) + '</strong></p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, key) + '</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.ObjectEqualityMatcher.prototype.makeExplainForUnknownItem = function(key) {
-	var sb = [];
-
-	sb.push('<p>actual value has item named <strong>' + JSSpec.util.inspect(key) + '</strong></p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, key) + '</p>');
-	sb.push('<p>but there should be no such item</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, key) + '</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.ObjectEqualityMatcher.prototype.makeExplainForItemMismatch = function(key) {
-	var sb = [];
-
-	sb.push('<p>actual value has an item named <strong>' + JSSpec.util.inspect(key) + '</strong> whose value is <strong>' + JSSpec.util.inspect(this.actual[key]) + '</strong></p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, key) + '</p>');
-	sb.push('<p>but it\'s value should be <strong>' + JSSpec.util.inspect(this.expected[key]) + '</strong></p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, key) + '</p>');
-	
-	return sb.join("");
-};
-
-
-
-
-/**
- * ArrayEqualityMatcher
- */
-JSSpec.ArrayEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-	this.match = this.expected == this.actual;
-	this.explaination = this.makeExplain();
-};
-
-JSSpec.ArrayEqualityMatcher.prototype.matches = function() {return this.match};
-
-JSSpec.ArrayEqualityMatcher.prototype.explain = function() {return this.explaination};
-
-JSSpec.ArrayEqualityMatcher.prototype.makeExplain = function() {
-	if(this.expected.length != this.actual.length) return this.makeExplainForLengthMismatch();
-	
-	for(var i = 0; i < this.expected.length; i++) {
-		var matcher = JSSpec.EqualityMatcher.createInstance(this.expected[i], this.actual[i]);
-		if(!matcher.matches()) return this.makeExplainForItemMismatch(i);
-	}
-		
-	this.match = true;
-};
-
-JSSpec.ArrayEqualityMatcher.prototype.makeExplainForLengthMismatch = function() {
-	return JSSpec.EqualityMatcher.basicExplain(
-		this.expected,
-		this.actual,
-		'<p>but it should be <strong>' + this.expected.length + '</strong></p>',
-		'<p>actual value has <strong>' + this.actual.length + '</strong> items</p>'
-	);
-};
-
-JSSpec.ArrayEqualityMatcher.prototype.makeExplainForItemMismatch = function(index) {
-	var postfix = ["th", "st", "nd", "rd", "th"][Math.min((index + 1) % 10,4)];
-	
-	var sb = [];
-
-	sb.push('<p>' + (index + 1) + postfix + ' item (index ' + index + ') of actual value is <strong>' + JSSpec.util.inspect(this.actual[index]) + '</strong>:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, index) + '</p>');
-	sb.push('<p>but it should be <strong>' + JSSpec.util.inspect(this.expected[index]) + '</strong>:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, index) + '</p>');
-	
-	return sb.join("");
-};
-
-/**
- * NumberEqualityMatcher
- */
-JSSpec.NumberEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-};
-
-JSSpec.NumberEqualityMatcher.prototype.matches = function() {
-	if(this.expected == this.actual) return true;
-};
-
-JSSpec.NumberEqualityMatcher.prototype.explain = function() {
-	return JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual);
-};
-
-/**
- * StringEqualityMatcher
- */
-JSSpec.StringEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-};
-
-JSSpec.StringEqualityMatcher.prototype.matches = function() {
-	return this.expected == this.actual;
-};
-
-JSSpec.StringEqualityMatcher.prototype.explain = function() {
-	var sb = [];
-
-	sb.push(JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual));
-	sb.push(JSSpec.EqualityMatcher.diffExplain(this.expected, this.actual));	
-	return sb.join("");
-};
-
-/**
- * PatternMatcher
- */
-JSSpec.PatternMatcher = function(actual, pattern, condition) {
-	this.actual = actual;
-	this.pattern = pattern;
-	this.condition = condition;
-	this.match = false;
-	this.explaination = this.makeExplain();
-};
-
-JSSpec.PatternMatcher.createInstance = function(actual, pattern, condition) {
-	return new JSSpec.PatternMatcher(actual, pattern, condition);
-};
-
-JSSpec.PatternMatcher.prototype.makeExplain = function() {
-	var sb;
-	if(this.actual == null || this.actual._type != 'String') {
-		sb = [];
-		sb.push('<p>actual value:</p>');
-		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual) + '</p>');
-		sb.push('<p>should ' + (this.condition ? '' : 'not') + ' match with pattern:</p>');
-		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.pattern) + '</p>');
-		sb.push('<p>but pattern matching cannot be performed.</p>');
-		return sb.join("");
-	} else {
-		this.match = this.condition == !!this.actual.match(this.pattern);
-		if(this.match) return "";
-		
-		sb = [];
-		sb.push('<p>actual value:</p>');
-		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual) + '</p>');
-		sb.push('<p>should ' + (this.condition ? '' : 'not') + ' match with pattern:</p>');
-		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.pattern) + '</p>');
-		return sb.join("");
-	}
-};
-
-JSSpec.PatternMatcher.prototype.matches = function() {
-	return this.match;
-};
-
-JSSpec.PatternMatcher.prototype.explain = function() {
-	return this.explaination;
-};
-
-/**
- * Domain Specific Languages
- */
-JSSpec.DSL = {};
-
-JSSpec.DSL.forString = {
-	normalizeHtml: function() {
-		var html = this;
-		
-		// Uniformize quotation, turn tag names and attribute names into lower case
-		html = html.replace(/<(\/?)(\w+)([^>]*?)>/img, function(str, closingMark, tagName, attrs) {
-			var sortedAttrs = JSSpec.util.sortHtmlAttrs(JSSpec.util.correctHtmlAttrQuotation(attrs).toLowerCase())
-			return "<" + closingMark + tagName.toLowerCase() + sortedAttrs + ">"
-		});
-		
-		// validation self-closing tags
-		html = html.replace(/<(br|hr|img)([^>]*?)>/mg, function(str, tag, attrs) {
-			return "<" + tag + attrs + " />";
-		});
-		
-		// append semi-colon at the end of style value
-		html = html.replace(/style="(.*?)"/mg, function(str, styleStr) {
-			styleStr = JSSpec.util.sortStyleEntries(styleStr.strip()); // for Safari
-			if(styleStr.charAt(styleStr.length - 1) != ';') styleStr += ";"
-			
-			return 'style="' + styleStr + '"'
-		});
-		
-		// sort style entries
-		
-		// remove empty style attributes
-		html = html.replace(/ style=";"/mg, "");
-		
-		// remove new-lines
-		html = html.replace(/\r/mg, '');
-		html = html.replace(/\n/mg, '');
-			
-		return html;
-	}
-};
-
-
-JSSpec.DSL.describe = function(context, entries, base) {
-	if(base) {
-		for(var i = 0; i < JSSpec.specs.length; i++) {
-			if(JSSpec.specs[i].context === base) {
-				base = JSSpec.specs[i];
-				break;
-			}
-		}
-		
-		for(var i = 0; i < base.examples.length; i++) {
-			var example = base.examples[i];
-			
-			if(!entries[example.name]) entries[example.name] = example.target;
-		}
-	}
-	
-	JSSpec.specs.push(new JSSpec.Spec(context, entries));
-};
-
-JSSpec.DSL.value_of = function(target) {
-	if(JSSpec._secondPass) return {};
-	
-	var subject = new JSSpec.DSL.Subject(target);
-	return subject;
-};
-
-JSSpec.DSL.Subject = function(target) {
-	this.target = target;
-};
-
-JSSpec.DSL.Subject.prototype._type = 'Subject';
-
-JSSpec.DSL.Subject.prototype.should_fail = function(message) {
-	JSSpec._assertionFailure = {message:message};
-	throw JSSpec._assertionFailure;
-};
-
-JSSpec.DSL.Subject.prototype.should_be = function(expected) {
-	var matcher = JSSpec.EqualityMatcher.createInstance(expected, this.target);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.should_not_be = function(expected) {
-	// TODO JSSpec.EqualityMatcher should support 'condition'
-	var matcher = JSSpec.EqualityMatcher.createInstance(expected, this.target);
-	if(matcher.matches()) {
-		JSSpec._assertionFailure = {message:"'" + this.target + "' should not be '" + expected + "'"};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.should_be_empty = function() {
-	this.should_have(0, this.getType() == 'String' ? 'characters' : 'items');
-};
-
-JSSpec.DSL.Subject.prototype.should_not_be_empty = function() {
-	this.should_have_at_least(1, this.getType() == 'String' ? 'characters' : 'items');
-};
-
-JSSpec.DSL.Subject.prototype.should_be_true = function() {
-	this.should_be(true);
-};
-
-JSSpec.DSL.Subject.prototype.should_be_false = function() {
-	this.should_be(false);
-};
-
-JSSpec.DSL.Subject.prototype.should_be_null = function() {
-	this.should_be(null);
-};
-
-JSSpec.DSL.Subject.prototype.should_be_undefined = function() {
-	this.should_be(undefined);
-};
-
-JSSpec.DSL.Subject.prototype.should_not_be_null = function() {
-	this.should_not_be(null);
-};
-
-JSSpec.DSL.Subject.prototype.should_not_be_undefined = function() {
-	this.should_not_be(undefined);
-};
-
-JSSpec.DSL.Subject.prototype._should_have = function(num, property, condition) {
-	var matcher = JSSpec.PropertyLengthMatcher.createInstance(num, property, this.target, condition);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.should_have = function(num, property) {
-	this._should_have(num, property, "exactly");
-};
-
-JSSpec.DSL.Subject.prototype.should_have_exactly = function(num, property) {
-	this._should_have(num, property, "exactly");
-};
-
-JSSpec.DSL.Subject.prototype.should_have_at_least = function(num, property) {
-	this._should_have(num, property, "at least");
-};
-
-JSSpec.DSL.Subject.prototype.should_have_at_most = function(num, property) {
-	this._should_have(num, property, "at most");
-};
-
-JSSpec.DSL.Subject.prototype.should_include = function(expected) {
-	var matcher = JSSpec.IncludeMatcher.createInstance(this.target, expected, true);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.should_not_include = function(expected) {
-	var matcher = JSSpec.IncludeMatcher.createInstance(this.target, expected, false);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.should_match = function(pattern) {
-	var matcher = JSSpec.PatternMatcher.createInstance(this.target, pattern, true);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-}
-JSSpec.DSL.Subject.prototype.should_not_match = function(pattern) {
-	var matcher = JSSpec.PatternMatcher.createInstance(this.target, pattern, false);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.getType = function() {
-	if(typeof this.target == 'undefined') {
-		return 'undefined';
-	} else if(this.target == null) {
-		return 'null';
-	} else if(this.target._type) {
-		return this.target._type;
-	} else if(JSSpec.util.isDomNode(this.target)) {
-		return 'DomNode';
-	} else {
-		return 'object';
-	}
-};
-
-/**
- * Utilities
- */
-JSSpec.util = {
-	escapeTags: function(string) {
-		return string.replace(/</img, '&lt;').replace(/>/img, '&gt;');
-	},
-	escapeMetastring: function(string) {
-		return string.replace(/\r/img, '\\r').replace(/\n/img, '\\n').replace(/\&para\;\<BR\>/img, '\\n').replace(/\t/img, '\\t');
-	},
-	parseOptions: function(defaults) {
-		var options = defaults;
-		
-		var url = location.href;
-		var queryIndex = url.indexOf('?');
-		if(queryIndex == -1) return options;
-		
-		var query = url.substring(queryIndex + 1).split('#')[0];
-		var pairs = query.split('&');
-		for(var i = 0; i < pairs.length; i++) {
-			var tokens = pairs[i].split('=');
-			options[tokens[0]] = tokens[1];
-		}
-		
-		return options;
-	},
-	correctHtmlAttrQuotation: function(html) {
-		html = html.replace(/(\w+)=['"]([^'"]+)['"]/mg,function (str, name, value) {return name + '=' + '"' + value + '"';});
-		html = html.replace(/(\w+)=([^ '"]+)/mg,function (str, name, value) {return name + '=' + '"' + value + '"';});
-		html = html.replace(/'/mg, '"');
-		
-		return html;
-	},
-	sortHtmlAttrs: function(html) {
-		var attrs = [];
-		html.replace(/((\w+)="[^"]+")/mg, function(str, matched) {
-			attrs.push(matched);
-		});
-		return attrs.length == 0 ? "" : " " + attrs.sort().join(" ");
-	},
-	sortStyleEntries: function(styleText) {
-		var entries = styleText.split(/; /);
-		return entries.sort().join("; ");
-	},
-	escapeHtml: function(str) {
-		if(!this._div) {
-			this._div = document.createElement("DIV");
-			this._text = document.createTextNode('');
-			this._div.appendChild(this._text);
-		}
-		this._text.data = str;
-		return this._div.innerHTML;
-	},
-	isDomNode: function(o) {
-		// TODO: make it more stricter
-		return (typeof o.nodeName == 'string') && (typeof o.nodeType == 'number');
-	},
-	inspectDomPath: function(o) {
-		var sb = [];
-		while(o && o.nodeName != '#document' && o.parent) {
-			var siblings = o.parentNode.childNodes;
-			for(var i = 0; i < siblings.length; i++) {
-				if(siblings[i] == o) {
-					sb.push(o.nodeName + (i == 0 ? '' : '[' + i + ']'));
-					break;
-				}
-			}
-			o = o.parentNode;
-		}
-		return sb.join(" &gt; ");
-	},
-	inspectDomNode: function(o) {
-		if(o.nodeType == 1) {
-			var nodeName = o.nodeName.toLowerCase();
-			var sb = [];
-			sb.push('<span class="dom_value">');
-			sb.push("&lt;");
-			sb.push(nodeName);
-			
-			var attrs = o.attributes;
-			for(var i = 0; i < attrs.length; i++) {
-				if(
-					attrs[i].nodeValue &&
-					attrs[i].nodeName != 'contentEditable' &&
-					attrs[i].nodeName != 'style' &&
-					typeof attrs[i].nodeValue != 'function'
-				) sb.push(' <span class="dom_attr_name">' + attrs[i].nodeName.toLowerCase() + '</span>=<span class="dom_attr_value">"' + attrs[i].nodeValue + '"</span>');
-			}
-			if(o.style && o.style.cssText) {
-				sb.push(' <span class="dom_attr_name">style</span>=<span class="dom_attr_value">"' + o.style.cssText + '"</span>');
-			}
-			sb.push('&gt;');
-			sb.push(JSSpec.util.escapeHtml(o.innerHTML));
-			sb.push('&lt;/' + nodeName + '&gt;');
-			sb.push(' <span class="dom_path">(' + JSSpec.util.inspectDomPath(o) + ')</span>' );
-			sb.push('</span>');
-			return sb.join("");
-		} else if(o.nodeType == 3) {
-			return '<span class="dom_value">#text ' + o.nodeValue + '</span>';
-		} else {
-			return '<span class="dom_value">UnknownDomNode</span>';
-		}
-	},
-	inspect: function(o, dontEscape, emphasisKey) {
-		var sb, inspected;
-
-		if(typeof o == 'undefined') return '<span class="undefined_value">undefined</span>';
-		if(o == null) return '<span class="null_value">null</span>';
-		if(o._type == 'String') return '<span class="string_value">"' + (dontEscape ? JSSpec.util.escapeMetastring(o) : JSSpec.util.escapeHtml(JSSpec.util.escapeMetastring(o))) + '"</span>';
-
-		if(o._type == 'Date') {
-			return '<span class="date_value">"' + o.toString() + '"</span>';
-		}
-		
-		if(o._type == 'Number') return '<span class="number_value">' + (dontEscape ? o : JSSpec.util.escapeHtml(o)) + '</span>';
-		
-		if(o._type == 'Boolean') return '<span class="boolean_value">' + o + '</span>';
-
-		if(o._type == 'RegExp') return '<span class="regexp_value">' + JSSpec.util.escapeHtml(o.toString()) + '</span>';
-
-		if(JSSpec.util.isDomNode(o)) return JSSpec.util.inspectDomNode(o);
-
-		if(o._type == 'Array' || typeof o.length != 'undefined') {
-			sb = [];
-			for(var i = 0; i < o.length; i++) {
-				inspected = JSSpec.util.inspect(o[i]);
-				sb.push(i == emphasisKey ? ('<strong>' + inspected + '</strong>') : inspected);
-			}
-			return '<span class="array_value">[' + sb.join(', ') + ']</span>';
-		}
-		
-		// object
-		sb = [];
-		for(var key in o) {
-			if(key == 'should') continue;
-			
-			inspected = JSSpec.util.inspect(key) + ":" + JSSpec.util.inspect(o[key]);
-			sb.push(key == emphasisKey ? ('<strong>' + inspected + '</strong>') : inspected);
-		}
-		return '<span class="object_value">{' + sb.join(', ') + '}</span>';
-	}
-};
-
-describe = JSSpec.DSL.describe;
-behavior_of = JSSpec.DSL.describe;
-value_of = JSSpec.DSL.value_of;
-expect = JSSpec.DSL.value_of; // @deprecated
-
-String.prototype._type = "String";
-Number.prototype._type = "Number";
-Date.prototype._type = "Date";
-Array.prototype._type = "Array";
-Boolean.prototype._type = "Boolean";
-RegExp.prototype._type = "RegExp";
-
-var targets = [Array.prototype, Date.prototype, Number.prototype, String.prototype, Boolean.prototype, RegExp.prototype];
-
-String.prototype.normalizeHtml = JSSpec.DSL.forString.normalizeHtml;
-String.prototype.asHtml = String.prototype.normalizeHtml; //@deprecated
-String.prototype.strip = function() {return this.replace(/^\s+/, '').replace(/\s+$/, '');}
-
-
-/**
- * Main
- */
-JSSpec.defaultOptions = {
-	autorun: 1,
-	specIdBeginsWith: 0,
-	exampleIdBeginsWith: 0,
-	autocollapse: 1
-};
-JSSpec.options = JSSpec.util.parseOptions(JSSpec.defaultOptions);
-
-JSSpec.Spec.id = JSSpec.options.specIdBeginsWith;
-JSSpec.Example.id = JSSpec.options.exampleIdBeginsWith;
-
-
-
-window.onload = function() {
-	if(JSSpec.specs.length > 0) {
-		if(!JSSpec.options.inSuite) {
-			JSSpec.runner = new JSSpec.Runner(JSSpec.specs, new JSSpec.Logger());
-			if(JSSpec.options.rerun) {
-				JSSpec.runner.rerun(decodeURIComponent(JSSpec.options.rerun));
-			} else {
-				JSSpec.runner.run();
-			}
-		} else {
-			// in suite, send all specs to parent
-			var parentWindow = window.frames.parent.window;
-			for(var i = 0; i < JSSpec.specs.length; i++) {
-				parentWindow.JSSpec.specs.push(JSSpec.specs[i]);
-			}
-		}
-	} else {
-		var links = document.getElementById('list').getElementsByTagName('A');
-		var frameContainer = document.createElement('DIV');
-		frameContainer.style.display = 'none';
-		document.body.appendChild(frameContainer);
-		
-		for(var i = 0; i < links.length; i++) {
-			var frame = document.createElement('IFRAME');
-			frame.src = links[i].href + '?inSuite=0&specIdBeginsWith=' + (i * 10000) + '&exampleIdBeginsWith=' + (i * 10000);
-			frameContainer.appendChild(frame);
-		}
-	}
-}
\ No newline at end of file
diff --git a/common/js/unittest/JSSpec/demo.html b/common/js/unittest/JSSpec/demo.html
deleted file mode 100644
index e992e39bd..000000000
--- a/common/js/unittest/JSSpec/demo.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-<title>JSSpec results</title>
-<link rel="stylesheet" type="text/css" href="../css/JSSpec.css" />
-<script type="text/javascript" src="diff_match_patch.js"></script>
-<script type="text/javascript" src="JSSpec.js"></script>
-<script type="text/javascript">// <![CDATA[
-describe('Foo (base)', {
-	'before': function() {
-		target = {sayFoo: function() {return "foo";}};
-	},
-	'should say "foo"': function() {
-		value_of(target.sayFoo()).should_be("foo");
-	}
-})
-
-describe('Boo (derived)', {
-	'before': function() {
-		target = {
-			sayFoo: function() {return "foo";},
-			sayBar: function() {return "bar";}
-		};
-	},
-	'should also say "bar"': function() {
-		value_of(target.sayBar()).should_be("bar");
-	}
-}, 'Foo (base)')
-
-describe('Plus operator (just for example)', {
-	'should concatenate two strings': function() {
-		value_of("Hello " + "World").should_be("Hello World");
-	},
-	'should add two numbers': function() {
-		value_of(1 + 2).should_be(3);
-	}
-})
-
-describe('"Should match"s', {
-	'Should match': function() {
-		value_of("Hello").should_match(/ell/);
-	},
-	'Should match 1': function() {
-		value_of("Hello").should_match(/x/);
-	},
-	'Should match 2': function() {
-		value_of([1,2,3]).should_match(/x/);
-	},
-	'Should not match 1': function() {
-		value_of("Hello").should_not_match(/ell/);
-	},
-	'Should not match 2': function() {
-		value_of([1,2,3]).should_not_match(/x/);
-	}
-})
-describe('"Should include"s', {
-	'Should include': function() {
-		value_of([1,2,3]).should_include(4);
-	},
-	'Should not include': function() {
-		value_of([1,2,3]).should_not_include(2);
-	},
-	'Should include / Non-array object': function() {
-		value_of(new Date()).should_include(4);
-	},
-	'Should not include / Non-array object': function() {
-		value_of(new Date()).should_not_include('getMonth');
-	},
-	'Should include 2': function() {
-		value_of({a:1, b:2}).should_not_include('a');
-	}
-})
-
-describe('"Should have"s', {
-	'String length': function() {
-		value_of("Hello").should_have(4, "characters");
-	},
-	'Array length': function() {
-		value_of([1,2,3]).should_have(4, "items");
-	},
-	'Object\'s item length': function() {
-		value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(3, "accounts");
-	},
-	'No match': function() {
-		value_of("This is a string").should_have(5, "players");
-	},
-	'Exactly': function() {
-		value_of([1,2,3]).should_have_exactly(2, "items");
-	},
-	'At least': function() {
-		value_of([1,2,3]).should_have_at_least(4, "items");
-	},
-	'At most': function() {
-		value_of([1,2,3]).should_have_at_most(2, "items");
-	},
-	'Member': function() {
-		value_of({x: 0}).should_have_member('x'); // true
-		value_of({x: 0}).should_have_member('y'); // false
-	}
-})
-describe('"Should be empty"s', {
-	'String': function() {
-		value_of("Hello").should_be_empty();
-	},
-	'Array': function() {
-		value_of([1,2,3]).should_be_empty();
-	},
-	'Object\'s item': function() {
-		value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(0, "accounts");
-	}
-})
-
-describe('Failure messages', {
-	'Should be (String)': function() {
-		value_of("Hello World").should_be("Good-bye world");
-	},
-	'Should have (Object\s item)': function() {
-		value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(3, "accounts");
-	},
-	'Should have at least': function() {
-		value_of([1,2,3]).should_have_at_least(4, "items");
-	},
-	'Should include': function() {
-		value_of([1,2,3]).should_include(4);
-	},
-	'Should match': function() {
-		value_of("Hello").should_match(/bye/);
-	}
-})
-
-describe('"Should be"s', {
-	'String mismatch': function() {
-		value_of("Hello world").should_be("Good-bye world");
-	},
-	'Array item mismatch': function() {
-		value_of(['ab','cd','ef']).should_be(['ab','bd','ef']);
-	},
-	'Array length mismatch': function() {
-		value_of(['a',2,'4',5]).should_be([1,2,[4,5,6],6,7]);
-	},
-	'Undefined value': function() {
-		value_of("Test").should_be(undefined);
-	},
-	'Null value': function() {
-		value_of(null).should_be("Test");
-	},
-	'Boolean value 1': function() {
-		value_of(true).should_be(false);
-	},
-	'Boolean value 2': function() {
-		value_of(false).should_be_true();
-	},
-	'Boolean value 3': function() {
-		value_of(true).should_be_false();
-	},
-	'Number mismatch': function() {
-		value_of(1+2).should_be(4);
-	},
-	'Date mismatch': function() {
-		value_of(new Date(1979, 3, 27)).should_be(new Date(1976, 7, 23));
-	},
-	'Object mismatch 1': function() {
-		var actual = {a:1, b:2};
-		var expected = {a:1, b:2, d:3};
-		
-		value_of(actual).should_be(expected);
-	},
-	'Object mismatch 2': function() {
-		var actual = {a:1, b:2, c:3, d:4};
-		var expected = {a:1, b:2, c:3};
-		
-		value_of(actual).should_be(expected);
-	},
-	'Object mismatch 3': function() {
-		var actual = {a:1, b:4, c:3};
-		var expected = {a:1, b:2, c:3};
-		
-		value_of(actual).should_be(expected);
-	},
-	'null should be null': function() {
-		value_of(null).should_be(null);
-	},
-	'null should not be undefined': function() {
-		value_of(null).should_be(undefined);
-	},
-	'null should not be null': function() {
-		value_of(null).should_not_be(null);
-	},
-	'empty array 1': function() {
-		value_of([]).should_be_empty();
-		value_of([1]).should_be_empty();
-	},
-	'empty array 2': function() {
-		value_of([1]).should_not_be_empty();
-		value_of([]).should_not_be_empty();
-	}
-})
-
-describe('Equality operator', {
-	'should work for different Date instances which have same value': function() {
-		var date1 = new Date(1979, 03, 27);
-		var date2 = new Date(1979, 03, 27);
-		value_of(date1).should_be(date2);
-	}
-})
-// ]]></script>
-</head>
-<body><div style="display:none;"><p>A</p><p>B</p></div></body>
-</html>
diff --git a/common/js/unittest/JSSpec/diff_match_patch.js b/common/js/unittest/JSSpec/diff_match_patch.js
deleted file mode 100644
index 885e051dd..000000000
--- a/common/js/unittest/JSSpec/diff_match_patch.js
+++ /dev/null
@@ -1 +0,0 @@
-function diff_match_patch(){this.Diff_Timeout=1.0;this.Diff_EditCost=4;this.Diff_DualThreshold=32;this.Match_Balance=0.5;this.Match_Threshold=0.5;this.Match_MinLength=100;this.Match_MaxLength=1000;this.Patch_Margin=4;function getMaxBits(){var maxbits=0;var oldi=1;var newi=2;while(oldi!=newi){maxbits++;oldi=newi;newi=newi<<1}return maxbits}this.Match_MaxBits=getMaxBits()}var DIFF_DELETE=-1;var DIFF_INSERT=1;var DIFF_EQUAL=0;diff_match_patch.prototype.diff_main=function(text1,text2,opt_checklines){if(text1==text2){return[[DIFF_EQUAL,text1]]}if(typeof opt_checklines=='undefined'){opt_checklines=true}var checklines=opt_checklines;var commonlength=this.diff_commonPrefix(text1,text2);var commonprefix=text1.substring(0,commonlength);text1=text1.substring(commonlength);text2=text2.substring(commonlength);commonlength=this.diff_commonSuffix(text1,text2);var commonsuffix=text1.substring(text1.length-commonlength);text1=text1.substring(0,text1.length-commonlength);text2=text2.substring(0,text2.length-commonlength);var diffs=this.diff_compute(text1,text2,checklines);if(commonprefix){diffs.unshift([DIFF_EQUAL,commonprefix])}if(commonsuffix){diffs.push([DIFF_EQUAL,commonsuffix])}this.diff_cleanupMerge(diffs);return diffs};diff_match_patch.prototype.diff_compute=function(text1,text2,checklines){var diffs;if(!text1){return[[DIFF_INSERT,text2]]}if(!text2){return[[DIFF_DELETE,text1]]}var longtext=text1.length>text2.length?text1:text2;var shorttext=text1.length>text2.length?text2:text1;var i=longtext.indexOf(shorttext);if(i!=-1){diffs=[[DIFF_INSERT,longtext.substring(0,i)],[DIFF_EQUAL,shorttext],[DIFF_INSERT,longtext.substring(i+shorttext.length)]];if(text1.length>text2.length){diffs[0][0]=diffs[2][0]=DIFF_DELETE}return diffs}longtext=shorttext=null;var hm=this.diff_halfMatch(text1,text2);if(hm){var text1_a=hm[0];var text1_b=hm[1];var text2_a=hm[2];var text2_b=hm[3];var mid_common=hm[4];var diffs_a=this.diff_main(text1_a,text2_a,checklines);var diffs_b=this.diff_main(text1_b,text2_b,checklines);return diffs_a.concat([[DIFF_EQUAL,mid_common]],diffs_b)}if(checklines&&text1.length+text2.length<250){checklines=false}var linearray;if(checklines){var a=this.diff_linesToChars(text1,text2);text1=a[0];text2=a[1];linearray=a[2]}diffs=this.diff_map(text1,text2);if(!diffs){diffs=[[DIFF_DELETE,text1],[DIFF_INSERT,text2]]}if(checklines){this.diff_charsToLines(diffs,linearray);this.diff_cleanupSemantic(diffs);diffs.push([DIFF_EQUAL,'']);var pointer=0;var count_delete=0;var count_insert=0;var text_delete='';var text_insert='';while(pointer<diffs.length){if(diffs[pointer][0]==DIFF_INSERT){count_insert++;text_insert+=diffs[pointer][1]}else if(diffs[pointer][0]==DIFF_DELETE){count_delete++;text_delete+=diffs[pointer][1]}else{if(count_delete>=1&&count_insert>=1){var a=this.diff_main(text_delete,text_insert,false);diffs.splice(pointer-count_delete-count_insert,count_delete+count_insert);pointer=pointer-count_delete-count_insert;for(var j=a.length-1;j>=0;j--){diffs.splice(pointer,0,a[j])}pointer=pointer+a.length}count_insert=0;count_delete=0;text_delete='';text_insert=''}pointer++}diffs.pop()}return diffs};diff_match_patch.prototype.diff_linesToChars=function(text1,text2){var linearray=[];var linehash={};linearray.push('');function diff_linesToCharsMunge(text){var chars='';while(text){var i=text.indexOf('\n');if(i==-1){i=text.length}var line=text.substring(0,i+1);text=text.substring(i+1);if(linehash.hasOwnProperty?linehash.hasOwnProperty(line):(linehash[line]!==undefined)){chars+=String.fromCharCode(linehash[line])}else{linearray.push(line);linehash[line]=linearray.length-1;chars+=String.fromCharCode(linearray.length-1)}}return chars}var chars1=diff_linesToCharsMunge(text1);var chars2=diff_linesToCharsMunge(text2);return[chars1,chars2,linearray]};diff_match_patch.prototype.diff_charsToLines=function(diffs,linearray){for(var x=0;x<diffs.length;x++){var chars=diffs[x][1];var text=[];for(var y=0;y<chars.length;y++){text.push(linearray[chars.charCodeAt(y)])}diffs[x][1]=text.join('')}};diff_match_patch.prototype.diff_map=function(text1,text2){var ms_end=(new Date()).getTime()+this.Diff_Timeout*1000;var max_d=text1.length+text2.length-1;var doubleEnd=this.Diff_DualThreshold*2<max_d;var v_map1=[];var v_map2=[];var v1={};var v2={};v1[1]=0;v2[1]=0;var x,y;var footstep;var footsteps={};var done=false;var hasOwnProperty=!!(footsteps.hasOwnProperty);var front=(text1.length+text2.length)%2;for(var d=0;d<max_d;d++){if(this.Diff_Timeout>0&&(new Date()).getTime()>ms_end){return null}v_map1[d]={};for(var k=-d;k<=d;k+=2){if(k==-d||k!=d&&v1[k-1]<v1[k+1]){x=v1[k+1]}else{x=v1[k-1]+1}y=x-k;if(doubleEnd){footstep=x+','+y;if(front&&(hasOwnProperty?footsteps.hasOwnProperty(footstep):(footsteps[footstep]!==undefined))){done=true}if(!front){footsteps[footstep]=d}}while(!done&&x<text1.length&&y<text2.length&&text1.charAt(x)==text2.charAt(y)){x++;y++;if(doubleEnd){footstep=x+','+y;if(front&&(hasOwnProperty?footsteps.hasOwnProperty(footstep):(footsteps[footstep]!==undefined))){done=true}if(!front){footsteps[footstep]=d}}}v1[k]=x;v_map1[d][x+','+y]=true;if(x==text1.length&&y==text2.length){return this.diff_path1(v_map1,text1,text2)}else if(done){v_map2=v_map2.slice(0,footsteps[footstep]+1);var a=this.diff_path1(v_map1,text1.substring(0,x),text2.substring(0,y));return a.concat(this.diff_path2(v_map2,text1.substring(x),text2.substring(y)))}}if(doubleEnd){v_map2[d]={};for(var k=-d;k<=d;k+=2){if(k==-d||k!=d&&v2[k-1]<v2[k+1]){x=v2[k+1]}else{x=v2[k-1]+1}y=x-k;footstep=(text1.length-x)+','+(text2.length-y);if(!front&&(hasOwnProperty?footsteps.hasOwnProperty(footstep):(footsteps[footstep]!==undefined))){done=true}if(front){footsteps[footstep]=d}while(!done&&x<text1.length&&y<text2.length&&text1.charAt(text1.length-x-1)==text2.charAt(text2.length-y-1)){x++;y++;footstep=(text1.length-x)+','+(text2.length-y);if(!front&&(hasOwnProperty?footsteps.hasOwnProperty(footstep):(footsteps[footstep]!==undefined))){done=true}if(front){footsteps[footstep]=d}}v2[k]=x;v_map2[d][x+','+y]=true;if(done){v_map1=v_map1.slice(0,footsteps[footstep]+1);var a=this.diff_path1(v_map1,text1.substring(0,text1.length-x),text2.substring(0,text2.length-y));return a.concat(this.diff_path2(v_map2,text1.substring(text1.length-x),text2.substring(text2.length-y)))}}}}return null};diff_match_patch.prototype.diff_path1=function(v_map,text1,text2){var path=[];var x=text1.length;var y=text2.length;var last_op=null;for(var d=v_map.length-2;d>=0;d--){while(1){if(v_map[d].hasOwnProperty?v_map[d].hasOwnProperty((x-1)+','+y):(v_map[d][(x-1)+','+y]!==undefined)){x--;if(last_op===DIFF_DELETE){path[0][1]=text1.charAt(x)+path[0][1]}else{path.unshift([DIFF_DELETE,text1.charAt(x)])}last_op=DIFF_DELETE;break}else if(v_map[d].hasOwnProperty?v_map[d].hasOwnProperty(x+','+(y-1)):(v_map[d][x+','+(y-1)]!==undefined)){y--;if(last_op===DIFF_INSERT){path[0][1]=text2.charAt(y)+path[0][1]}else{path.unshift([DIFF_INSERT,text2.charAt(y)])}last_op=DIFF_INSERT;break}else{x--;y--;if(last_op===DIFF_EQUAL){path[0][1]=text1.charAt(x)+path[0][1]}else{path.unshift([DIFF_EQUAL,text1.charAt(x)])}last_op=DIFF_EQUAL}}}return path};diff_match_patch.prototype.diff_path2=function(v_map,text1,text2){var path=[];var x=text1.length;var y=text2.length;var last_op=null;for(var d=v_map.length-2;d>=0;d--){while(1){if(v_map[d].hasOwnProperty?v_map[d].hasOwnProperty((x-1)+','+y):(v_map[d][(x-1)+','+y]!==undefined)){x--;if(last_op===DIFF_DELETE){path[path.length-1][1]+=text1.charAt(text1.length-x-1)}else{path.push([DIFF_DELETE,text1.charAt(text1.length-x-1)])}last_op=DIFF_DELETE;break}else if(v_map[d].hasOwnProperty?v_map[d].hasOwnProperty(x+','+(y-1)):(v_map[d][x+','+(y-1)]!==undefined)){y--;if(last_op===DIFF_INSERT){path[path.length-1][1]+=text2.charAt(text2.length-y-1)}else{path.push([DIFF_INSERT,text2.charAt(text2.length-y-1)])}last_op=DIFF_INSERT;break}else{x--;y--;if(last_op===DIFF_EQUAL){path[path.length-1][1]+=text1.charAt(text1.length-x-1)}else{path.push([DIFF_EQUAL,text1.charAt(text1.length-x-1)])}last_op=DIFF_EQUAL}}}return path};diff_match_patch.prototype.diff_commonPrefix=function(text1,text2){if(!text1||!text2||text1.charCodeAt(0)!==text2.charCodeAt(0)){return 0}var pointermin=0;var pointermax=Math.min(text1.length,text2.length);var pointermid=pointermax;var pointerstart=0;while(pointermin<pointermid){if(text1.substring(pointerstart,pointermid)==text2.substring(pointerstart,pointermid)){pointermin=pointermid;pointerstart=pointermin}else{pointermax=pointermid}pointermid=Math.floor((pointermax-pointermin)/2+pointermin)}return pointermid};diff_match_patch.prototype.diff_commonSuffix=function(text1,text2){if(!text1||!text2||text1.charCodeAt(text1.length-1)!==text2.charCodeAt(text2.length-1)){return 0}var pointermin=0;var pointermax=Math.min(text1.length,text2.length);var pointermid=pointermax;var pointerend=0;while(pointermin<pointermid){if(text1.substring(text1.length-pointermid,text1.length-pointerend)==text2.substring(text2.length-pointermid,text2.length-pointerend)){pointermin=pointermid;pointerend=pointermin}else{pointermax=pointermid}pointermid=Math.floor((pointermax-pointermin)/2+pointermin)}return pointermid};diff_match_patch.prototype.diff_halfMatch=function(text1,text2){var longtext=text1.length>text2.length?text1:text2;var shorttext=text1.length>text2.length?text2:text1;if(longtext.length<10||shorttext.length<1){return null}var dmp=this;function diff_halfMatchI(longtext,shorttext,i){var seed=longtext.substring(i,i+Math.floor(longtext.length/4));var j=-1;var best_common='';var best_longtext_a,best_longtext_b,best_shorttext_a,best_shorttext_b;while((j=shorttext.indexOf(seed,j+1))!=-1){var prefixLength=dmp.diff_commonPrefix(longtext.substring(i),shorttext.substring(j));var suffixLength=dmp.diff_commonSuffix(longtext.substring(0,i),shorttext.substring(0,j));if(best_common.length<suffixLength+prefixLength){best_common=shorttext.substring(j-suffixLength,j)+shorttext.substring(j,j+prefixLength);best_longtext_a=longtext.substring(0,i-suffixLength);best_longtext_b=longtext.substring(i+prefixLength);best_shorttext_a=shorttext.substring(0,j-suffixLength);best_shorttext_b=shorttext.substring(j+prefixLength)}}if(best_common.length>=longtext.length/2){return[best_longtext_a,best_longtext_b,best_shorttext_a,best_shorttext_b,best_common]}else{return null}}var hm1=diff_halfMatchI(longtext,shorttext,Math.ceil(longtext.length/4));var hm2=diff_halfMatchI(longtext,shorttext,Math.ceil(longtext.length/2));var hm;if(!hm1&&!hm2){return null}else if(!hm2){hm=hm1}else if(!hm1){hm=hm2}else{hm=hm1[4].length>hm2[4].length?hm1:hm2}var text1_a,text1_b,text2_a,text2_b;if(text1.length>text2.length){text1_a=hm[0];text1_b=hm[1];text2_a=hm[2];text2_b=hm[3]}else{text2_a=hm[0];text2_b=hm[1];text1_a=hm[2];text1_b=hm[3]}var mid_common=hm[4];return[text1_a,text1_b,text2_a,text2_b,mid_common]};diff_match_patch.prototype.diff_cleanupSemantic=function(diffs){var changes=false;var equalities=[];var lastequality=null;var pointer=0;var length_changes1=0;var length_changes2=0;while(pointer<diffs.length){if(diffs[pointer][0]==DIFF_EQUAL){equalities.push(pointer);length_changes1=length_changes2;length_changes2=0;lastequality=diffs[pointer][1]}else{length_changes2+=diffs[pointer][1].length;if(lastequality!==null&&(lastequality.length<=length_changes1)&&(lastequality.length<=length_changes2)){diffs.splice(equalities[equalities.length-1],0,[DIFF_DELETE,lastequality]);diffs[equalities[equalities.length-1]+1][0]=DIFF_INSERT;equalities.pop();equalities.pop();pointer=equalities.length?equalities[equalities.length-1]:-1;length_changes1=0;length_changes2=0;lastequality=null;changes=true}}pointer++}if(changes){this.diff_cleanupMerge(diffs)}this.diff_cleanupSemanticLossless(diffs)};diff_match_patch.prototype.diff_cleanupSemanticLossless=function(diffs){function diff_cleanupSemanticScore(one,two,three){var whitespace=/\s/;var score=0;if(one.charAt(one.length-1).match(whitespace)||two.charAt(0).match(whitespace)){score++}if(two.charAt(two.length-1).match(whitespace)||three.charAt(0).match(whitespace)){score++}return score}var pointer=1;while(pointer<diffs.length-1){if(diffs[pointer-1][0]==DIFF_EQUAL&&diffs[pointer+1][0]==DIFF_EQUAL){var equality1=diffs[pointer-1][1];var edit=diffs[pointer][1];var equality2=diffs[pointer+1][1];var commonOffset=this.diff_commonSuffix(equality1,edit);if(commonOffset){var commonString=edit.substring(edit.length-commonOffset);equality1=equality1.substring(0,equality1.length-commonOffset);edit=commonString+edit.substring(0,edit.length-commonOffset);equality2=commonString+equality2}var bestEquality1=equality1;var bestEdit=edit;var bestEquality2=equality2;var bestScore=diff_cleanupSemanticScore(equality1,edit,equality2);while(edit.charAt(0)===equality2.charAt(0)){equality1+=edit.charAt(0);edit=edit.substring(1)+equality2.charAt(0);equality2=equality2.substring(1);var score=diff_cleanupSemanticScore(equality1,edit,equality2);if(score>=bestScore){bestScore=score;bestEquality1=equality1;bestEdit=edit;bestEquality2=equality2}}if(diffs[pointer-1][1]!=bestEquality1){diffs[pointer-1][1]=bestEquality1;diffs[pointer][1]=bestEdit;diffs[pointer+1][1]=bestEquality2}}pointer++}};diff_match_patch.prototype.diff_cleanupEfficiency=function(diffs){var changes=false;var equalities=[];var lastequality='';var pointer=0;var pre_ins=false;var pre_del=false;var post_ins=false;var post_del=false;while(pointer<diffs.length){if(diffs[pointer][0]==DIFF_EQUAL){if(diffs[pointer][1].length<this.Diff_EditCost&&(post_ins||post_del)){equalities.push(pointer);pre_ins=post_ins;pre_del=post_del;lastequality=diffs[pointer][1]}else{equalities=[];lastequality=''}post_ins=post_del=false}else{if(diffs[pointer][0]==DIFF_DELETE){post_del=true}else{post_ins=true}if(lastequality&&((pre_ins&&pre_del&&post_ins&&post_del)||((lastequality.length<this.Diff_EditCost/2)&&(pre_ins+pre_del+post_ins+post_del)==3))){diffs.splice(equalities[equalities.length-1],0,[DIFF_DELETE,lastequality]);diffs[equalities[equalities.length-1]+1][0]=DIFF_INSERT;equalities.pop();lastequality='';if(pre_ins&&pre_del){post_ins=post_del=true;equalities=[]}else{equalities.pop();pointer=equalities.length?equalities[equalities.length-1]:-1;post_ins=post_del=false}changes=true}}pointer++}if(changes){this.diff_cleanupMerge(diffs)}};diff_match_patch.prototype.diff_cleanupMerge=function(diffs){diffs.push([DIFF_EQUAL,'']);var pointer=0;var count_delete=0;var count_insert=0;var text_delete='';var text_insert='';var commonlength;while(pointer<diffs.length){if(diffs[pointer][0]==DIFF_INSERT){count_insert++;text_insert+=diffs[pointer][1];pointer++}else if(diffs[pointer][0]==DIFF_DELETE){count_delete++;text_delete+=diffs[pointer][1];pointer++}else{if(count_delete!==0||count_insert!==0){if(count_delete!==0&&count_insert!==0){commonlength=this.diff_commonPrefix(text_insert,text_delete);if(commonlength!==0){if((pointer-count_delete-count_insert)>0&&diffs[pointer-count_delete-count_insert-1][0]==DIFF_EQUAL){diffs[pointer-count_delete-count_insert-1][1]+=text_insert.substring(0,commonlength)}else{diffs.splice(0,0,[DIFF_EQUAL,text_insert.substring(0,commonlength)]);pointer++}text_insert=text_insert.substring(commonlength);text_delete=text_delete.substring(commonlength)}commonlength=this.diff_commonSuffix(text_insert,text_delete);if(commonlength!==0){diffs[pointer][1]=text_insert.substring(text_insert.length-commonlength)+diffs[pointer][1];text_insert=text_insert.substring(0,text_insert.length-commonlength);text_delete=text_delete.substring(0,text_delete.length-commonlength)}}if(count_delete===0){diffs.splice(pointer-count_delete-count_insert,count_delete+count_insert,[DIFF_INSERT,text_insert])}else if(count_insert===0){diffs.splice(pointer-count_delete-count_insert,count_delete+count_insert,[DIFF_DELETE,text_delete])}else{diffs.splice(pointer-count_delete-count_insert,count_delete+count_insert,[DIFF_DELETE,text_delete],[DIFF_INSERT,text_insert])}pointer=pointer-count_delete-count_insert+(count_delete?1:0)+(count_insert?1:0)+1}else if(pointer!==0&&diffs[pointer-1][0]==DIFF_EQUAL){diffs[pointer-1][1]+=diffs[pointer][1];diffs.splice(pointer,1)}else{pointer++}count_insert=0;count_delete=0;text_delete='';text_insert=''}}if(diffs[diffs.length-1][1]===''){diffs.pop()}var changes=false;pointer=1;while(pointer<diffs.length-1){if(diffs[pointer-1][0]==DIFF_EQUAL&&diffs[pointer+1][0]==DIFF_EQUAL){if(diffs[pointer][1].substring(diffs[pointer][1].length-diffs[pointer-1][1].length)==diffs[pointer-1][1]){diffs[pointer][1]=diffs[pointer-1][1]+diffs[pointer][1].substring(0,diffs[pointer][1].length-diffs[pointer-1][1].length);diffs[pointer+1][1]=diffs[pointer-1][1]+diffs[pointer+1][1];diffs.splice(pointer-1,1);changes=true}else if(diffs[pointer][1].substring(0,diffs[pointer+1][1].length)==diffs[pointer+1][1]){diffs[pointer-1][1]+=diffs[pointer+1][1];diffs[pointer][1]=diffs[pointer][1].substring(diffs[pointer+1][1].length)+diffs[pointer+1][1];diffs.splice(pointer+1,1);changes=true}}pointer++}if(changes){this.diff_cleanupMerge(diffs)}};diff_match_patch.prototype.diff_addIndex=function(diffs){var i=0;for(var x=0;x<diffs.length;x++){diffs[x].push(i);if(diffs[x][0]!==DIFF_DELETE){i+=diffs[x][1].length}}};diff_match_patch.prototype.diff_xIndex=function(diffs,loc){var chars1=0;var chars2=0;var last_chars1=0;var last_chars2=0;var x;for(x=0;x<diffs.length;x++){if(diffs[x][0]!==DIFF_INSERT){chars1+=diffs[x][1].length}if(diffs[x][0]!==DIFF_DELETE){chars2+=diffs[x][1].length}if(chars1>loc){break}last_chars1=chars1;last_chars2=chars2}if(diffs.length!=x&&diffs[x][0]===DIFF_DELETE){return last_chars2}return last_chars2+(loc-last_chars1)};diff_match_patch.prototype.diff_prettyHtml=function(diffs){this.diff_addIndex(diffs);var html=[];for(var x=0;x<diffs.length;x++){var m=diffs[x][0];var t=diffs[x][1];var i=diffs[x][2];t=t.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');t=t.replace(/\n/g,'&para;<BR>');if(m===DIFF_DELETE){html.push('<DEL STYLE="background:#FFE6E6;" TITLE="i=',i,'">',t,'</DEL>')}else if(m===DIFF_INSERT){html.push('<INS STYLE="background:#E6FFE6;" TITLE="i=',i,'">',t,'</INS>')}else{html.push('<SPAN TITLE="i=',i,'">',t,'</SPAN>')}}return html.join('')};diff_match_patch.prototype.diff_text1=function(diffs){var txt=[];for(var x=0;x<diffs.length;x++){if(diffs[x][0]!==DIFF_INSERT){txt.push(diffs[x][1])}}return txt.join('')};diff_match_patch.prototype.diff_text2=function(diffs){var txt=[];for(var x=0;x<diffs.length;x++){if(diffs[x][0]!==DIFF_DELETE){txt.push(diffs[x][1])}}return txt.join('')};diff_match_patch.prototype.diff_toDelta=function(diffs){var txt=[];for(var x=0;x<diffs.length;x++){switch(diffs[x][0]){case DIFF_DELETE:txt.push('-',diffs[x][1].length,'\t');break;case DIFF_EQUAL:txt.push('=',diffs[x][1].length,'\t');break;case DIFF_INSERT:txt.push('+',encodeURI(diffs[x][1]),'\t');break;default:alert('Invalid diff operation in diff_toDelta()')}}return txt.join('').replace(/%20/g,' ')};diff_match_patch.prototype.diff_fromDelta=function(text1,delta){var diffs=[];var pointer=0;var tokens=delta.split(/\t/g);for(var x=0;x<tokens.length;x++){var param=tokens[x].substring(1);switch(tokens[x].charAt(0)){case'-':case'=':var n=parseInt(param,10);if(isNaN(n)||n<0){alert('Invalid number in diff_fromDelta()')}else{var text=text1.substring(pointer,pointer+=n);if(tokens[x].charAt(0)=='='){diffs.push([DIFF_EQUAL,text])}else{diffs.push([DIFF_DELETE,text])}}break;case'+':diffs.push([DIFF_INSERT,decodeURI(param)]);break;default:if(tokens[x]){alert('Invalid diff operation in diff_fromDelta()')}}}if(pointer!=text1.length){alert('Text length mismatch in diff_fromDelta()')}return diffs};diff_match_patch.prototype.match_main=function(text,pattern,loc){loc=Math.max(0,Math.min(loc,text.length-pattern.length));if(text==pattern){return 0}else if(text.length===0){return null}else if(text.substring(loc,loc+pattern.length)==pattern){return loc}else{return this.match_bitap(text,pattern,loc)}};diff_match_patch.prototype.match_bitap=function(text,pattern,loc){if(pattern.length>this.Match_MaxBits){return alert('Pattern too long for this browser.')}var s=this.match_alphabet(pattern);var score_text_length=text.length;score_text_length=Math.max(score_text_length,this.Match_MinLength);score_text_length=Math.min(score_text_length,this.Match_MaxLength);var dmp=this;function match_bitapScore(e,x){var d=Math.abs(loc-x);return(e/pattern.length/dmp.Match_Balance)+(d/score_text_length/(1.0-dmp.Match_Balance))}var score_threshold=this.Match_Threshold;var best_loc=text.indexOf(pattern,loc);if(best_loc!=-1){score_threshold=Math.min(match_bitapScore(0,best_loc),score_threshold)}best_loc=text.lastIndexOf(pattern,loc+pattern.length);if(best_loc!=-1){score_threshold=Math.min(match_bitapScore(0,best_loc),score_threshold)}var matchmask=1<<(pattern.length-1);best_loc=null;var bin_min,bin_mid;var bin_max=Math.max(loc+loc,text.length);var last_rd;for(var d=0;d<pattern.length;d++){var rd=Array(text.length);bin_min=loc;bin_mid=bin_max;while(bin_min<bin_mid){if(match_bitapScore(d,bin_mid)<score_threshold){bin_min=bin_mid}else{bin_max=bin_mid}bin_mid=Math.floor((bin_max-bin_min)/2+bin_min)}bin_max=bin_mid;var start=Math.max(0,loc-(bin_mid-loc)-1);var finish=Math.min(text.length-1,pattern.length+bin_mid);if(text.charAt(finish)==pattern.charAt(pattern.length-1)){rd[finish]=(1<<(d+1))-1}else{rd[finish]=(1<<d)-1}for(var j=finish-1;j>=start;j--){if(d===0){rd[j]=((rd[j+1]<<1)|1)&s[text.charAt(j)]}else{rd[j]=((rd[j+1]<<1)|1)&s[text.charAt(j)]|((last_rd[j+1]<<1)|1)|((last_rd[j]<<1)|1)|last_rd[j+1]}if(rd[j]&matchmask){var score=match_bitapScore(d,j);if(score<=score_threshold){score_threshold=score;best_loc=j;if(j>loc){start=Math.max(0,loc-(j-loc))}else{break}}}}if(match_bitapScore(d+1,loc)>score_threshold){break}last_rd=rd}return best_loc};diff_match_patch.prototype.match_alphabet=function(pattern){var s=Object();for(var i=0;i<pattern.length;i++){s[pattern.charAt(i)]=0}for(var i=0;i<pattern.length;i++){s[pattern.charAt(i)]|=1<<(pattern.length-i-1)}return s};diff_match_patch.prototype.patch_addContext=function(patch,text){var pattern=text.substring(patch.start2,patch.start2+patch.length1);var padding=0;while(text.indexOf(pattern)!=text.lastIndexOf(pattern)&&pattern.length<this.Match_MaxBits-this.Patch_Margin-this.Patch_Margin){padding+=this.Patch_Margin;pattern=text.substring(patch.start2-padding,patch.start2+patch.length1+padding)}padding+=this.Patch_Margin;var prefix=text.substring(patch.start2-padding,patch.start2);if(prefix!==''){patch.diffs.unshift([DIFF_EQUAL,prefix])}var suffix=text.substring(patch.start2+patch.length1,patch.start2+patch.length1+padding);if(suffix!==''){patch.diffs.push([DIFF_EQUAL,suffix])}patch.start1-=prefix.length;patch.start2-=prefix.length;patch.length1+=prefix.length+suffix.length;patch.length2+=prefix.length+suffix.length};diff_match_patch.prototype.patch_make=function(text1,text2,opt_diffs){var diffs;if(typeof opt_diffs!='undefined'){diffs=opt_diffs}else{diffs=this.diff_main(text1,text2,true);if(diffs.length>2){this.diff_cleanupSemantic(diffs);this.diff_cleanupEfficiency(diffs)}}if(diffs.length===0){return[]}var patches=[];var patch=new patch_obj();var char_count1=0;var char_count2=0;var prepatch_text=text1;var postpatch_text=text1;for(var x=0;x<diffs.length;x++){var diff_type=diffs[x][0];var diff_text=diffs[x][1];if(patch.diffs.length===0&&diff_type!==DIFF_EQUAL){patch.start1=char_count1;patch.start2=char_count2}if(diff_type===DIFF_INSERT){patch.diffs.push(diffs[x]);patch.length2+=diff_text.length;postpatch_text=postpatch_text.substring(0,char_count2)+diff_text+postpatch_text.substring(char_count2)}else if(diff_type===DIFF_DELETE){patch.length1+=diff_text.length;patch.diffs.push(diffs[x]);postpatch_text=postpatch_text.substring(0,char_count2)+postpatch_text.substring(char_count2+diff_text.length)}else if(diff_type===DIFF_EQUAL&&diff_text.length<=2*this.Patch_Margin&&patch.diffs.length!==0&&diffs.length!=x+1){patch.diffs.push(diffs[x]);patch.length1+=diff_text.length;patch.length2+=diff_text.length}if(diff_type===DIFF_EQUAL&&diff_text.length>=2*this.Patch_Margin){if(patch.diffs.length!==0){this.patch_addContext(patch,prepatch_text);patches.push(patch);patch=new patch_obj();prepatch_text=postpatch_text}}if(diff_type!==DIFF_INSERT){char_count1+=diff_text.length}if(diff_type!==DIFF_DELETE){char_count2+=diff_text.length}}if(patch.diffs.length!==0){this.patch_addContext(patch,prepatch_text);patches.push(patch)}return patches};diff_match_patch.prototype.patch_apply=function(patches,text){this.patch_splitMax(patches);var results=[];var delta=0;for(var x=0;x<patches.length;x++){var expected_loc=patches[x].start2+delta;var text1=this.diff_text1(patches[x].diffs);var start_loc=this.match_main(text,text1,expected_loc);if(start_loc===null){results.push(false)}else{results.push(true);delta=start_loc-expected_loc;var text2=text.substring(start_loc,start_loc+text1.length);if(text1==text2){text=text.substring(0,start_loc)+this.diff_text2(patches[x].diffs)+text.substring(start_loc+text1.length)}else{var diffs=this.diff_main(text1,text2,false);this.diff_cleanupSemanticLossless(diffs);var index1=0;var index2;for(var y=0;y<patches[x].diffs.length;y++){var mod=patches[x].diffs[y];if(mod[0]!==DIFF_EQUAL){index2=this.diff_xIndex(diffs,index1)}if(mod[0]===DIFF_INSERT){text=text.substring(0,start_loc+index2)+mod[1]+text.substring(start_loc+index2)}else if(mod[0]===DIFF_DELETE){text=text.substring(0,start_loc+index2)+text.substring(start_loc+this.diff_xIndex(diffs,index1+mod[1].length))}if(mod[0]!==DIFF_DELETE){index1+=mod[1].length}}}}}return[text,results]};diff_match_patch.prototype.patch_splitMax=function(patches){for(var x=0;x<patches.length;x++){if(patches[x].length1>this.Match_MaxBits){var bigpatch=patches[x];patches.splice(x,1);var patch_size=this.Match_MaxBits;var start1=bigpatch.start1;var start2=bigpatch.start2;var precontext='';while(bigpatch.diffs.length!==0){var patch=new patch_obj();var empty=true;patch.start1=start1-precontext.length;patch.start2=start2-precontext.length;if(precontext!==''){patch.length1=patch.length2=precontext.length;patch.diffs.push([DIFF_EQUAL,precontext])}while(bigpatch.diffs.length!==0&&patch.length1<patch_size-this.Patch_Margin){var diff_type=bigpatch.diffs[0][0];var diff_text=bigpatch.diffs[0][1];if(diff_type===DIFF_INSERT){patch.length2+=diff_text.length;start2+=diff_text.length;patch.diffs.push(bigpatch.diffs.shift());empty=false}else{diff_text=diff_text.substring(0,patch_size-patch.length1-this.Patch_Margin);patch.length1+=diff_text.length;start1+=diff_text.length;if(diff_type===DIFF_EQUAL){patch.length2+=diff_text.length;start2+=diff_text.length}else{empty=false}patch.diffs.push([diff_type,diff_text]);if(diff_text==bigpatch.diffs[0][1]){bigpatch.diffs.shift()}else{bigpatch.diffs[0][1]=bigpatch.diffs[0][1].substring(diff_text.length)}}}precontext=this.diff_text2(patch.diffs);precontext=precontext.substring(precontext.length-this.Patch_Margin);var postcontext=this.diff_text1(bigpatch.diffs).substring(0,this.Patch_Margin);if(postcontext!==''){patch.length1+=postcontext.length;patch.length2+=postcontext.length;if(patch.diffs.length!==0&&patch.diffs[patch.diffs.length-1][0]===DIFF_EQUAL){patch.diffs[patch.diffs.length-1][1]+=postcontext}else{patch.diffs.push([DIFF_EQUAL,postcontext])}}if(!empty){patches.splice(x++,0,patch)}}}}};diff_match_patch.prototype.patch_toText=function(patches){var text=[];for(var x=0;x<patches.length;x++){text.push(patches[x])}return text.join('')};diff_match_patch.prototype.patch_fromText=function(textline){var patches=[];var text=textline.split('\n');while(text.length!==0){var m=text[0].match(/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/);if(!m){return alert('Invalid patch string:\n'+text[0])}var patch=new patch_obj();patches.push(patch);patch.start1=parseInt(m[1],10);if(m[2]===''){patch.start1--;patch.length1=1}else if(m[2]=='0'){patch.length1=0}else{patch.start1--;patch.length1=parseInt(m[2],10)}patch.start2=parseInt(m[3],10);if(m[4]===''){patch.start2--;patch.length2=1}else if(m[4]=='0'){patch.length2=0}else{patch.start2--;patch.length2=parseInt(m[4],10)}text.shift();while(text.length!==0){var sign=text[0].charAt(0);var line=decodeURIComponent(text[0].substring(1));if(sign=='-'){patch.diffs.push([DIFF_DELETE,line])}else if(sign=='+'){patch.diffs.push([DIFF_INSERT,line])}else if(sign==' '){patch.diffs.push([DIFF_EQUAL,line])}else if(sign=='@'){break}else if(sign===''){}else{return alert('Invalid patch mode: "'+sign+'"\n'+line)}text.shift()}}return patches};function patch_obj(){this.diffs=[];this.start1=null;this.start2=null;this.length1=0;this.length2=0}patch_obj.prototype.toString=function(){var coords1,coords2;if(this.length1===0){coords1=this.start1+',0'}else if(this.length1==1){coords1=this.start1+1}else{coords1=(this.start1+1)+','+this.length1}if(this.length2===0){coords2=this.start2+',0'}else if(this.length2==1){coords2=this.start2+1}else{coords2=(this.start2+1)+','+this.length2}var txt=['@@ -',coords1,' +',coords2,' @@\n'];for(var x=0;x<this.diffs.length;x++){switch(this.diffs[x][0]){case DIFF_DELETE:txt.push('-');break;case DIFF_EQUAL:txt.push(' ');break;case DIFF_INSERT:txt.push('+');break;default:alert('Invalid diff operation in patch_obj.toString()')}txt.push(encodeURI(this.diffs[x][1]),'\n')}return txt.join('').replace(/%20/g,' ')};
\ No newline at end of file
diff --git a/common/js/unittest/css/JSSpec.css b/common/js/unittest/css/JSSpec.css
deleted file mode 100644
index 0eac8183a..000000000
--- a/common/js/unittest/css/JSSpec.css
+++ /dev/null
@@ -1,224 +0,0 @@
-@CHARSET "UTF-8";
-
-/* --------------------
- * @Layout
- */
-
-html {
-  overflow: hidden;
-}
-
-body, #jsspec_container {
-  overflow: hidden;
-  padding: 0;
-  margin: 0;
-  width: 100%;
-  height: 100%;
-  background-color: white;
-}
-
-#title {
-  padding: 0;
-  margin: 0;
-  position: absolute;
-  top: 0px;    
-  left: 0px;
-  width: 100%;
-  height: 40px;
-  overflow: hidden;
-}
-
-#list {
-  padding: 0;
-  margin: 0;
-  position: absolute;    
-  top: 40px;
-  left: 0px;
-  bottom: 0px;
-  overflow: auto;    
-  width: 250px;    
-  _height:expression(document.body.clientHeight-40);
-}
-
-#log {
-  padding: 0;
-  margin: 0;
-  position: absolute;    
-  top: 40px;
-  left: 250px;
-  right: 0px;
-  bottom: 0px;
-  overflow: auto;
-  _height:expression(document.body.clientHeight-40);
-  _width:expression(document.body.clientWidth-250);
-}
-
-
-
-/* --------------------
- * @Decorations and colors
- */
-* {
-	padding: 0;
-	margin: 0;
-	font-family: "Lucida Grande", Helvetica, sans-serif;
-}
-
-li {
-	list-style: none;
-}
-
-/* hiding subtitles */
-h2 {
-	display: none;
-}
-
-/* title section */
-div#title {
-	padding: 0em 0.5em;
-}
-
-div#title h1 {
-	font-size: 1.5em;
-	float: left;
-}
-
-div#title ul li {
-	float: left;
-	padding: 0.5em 0em 0.5em 0.75em;
-}
-
-div#title p {
-	float:right;
-	margin-right:1em;
-	font-size: 0.75em;
-}
-
-/* spec container */
-ul.specs {
-	margin: 0.5em;
-}
-ul.specs li {
-	margin-bottom: 0.1em;
-}
-
-/* spec title */
-ul.specs li h3 {
-	font-weight: bold;
-	font-size: 0.75em;
-	padding: 0.2em 1em;
-	cursor: pointer;
-	_cursor: hand;
-}
-
-/* example container */
-ul.examples li {
-	border-style: solid;
-	border-width: 0px 0px 1px 5px;
-	margin: 0.2em 0em 0.2em 1em;
-}
-
-/* example title */
-ul.examples li h4 {
-	font-weight: normal;
-	font-size: 0.75em;
-	margin-left: 1em;
-}
-
-pre.examples-code {
-	margin: 0.5em 2em;
-    padding: 0.5em;
-    background: white;
-    border: solid 1px #CCC;
-}
-
-/* example explaination */
-ul.examples li div {
-	padding: 1em 2em;
-	font-size: 0.75em;
-}
-
-/* styles for ongoing, success, failure, error */
-div.success, div.success a {
-	color: #FFFFFF;
-	background-color: #65C400;
-}
-
-ul.specs li.success h3, ul.specs li.success h3 a {
-	color: #FFFFFF;
-	background-color: #65C400;
-}
-
-ul.examples li.success, ul.examples li.success a {
-	color: #3D7700;
-	background-color: #DBFFB4;
-	border-color: #65C400;
-}
-
-div.exception, div.exception a {
-	color: #FFFFFF;
-	background-color: #C20000;
-}
-
-ul.specs li.exception h3, ul.specs li.exception h3 a {
-	color: #FFFFFF;
-	background-color: #C20000;
-}
-
-ul.examples li.exception, ul.examples li.exception a {
-	color: #C20000;
-	background-color: #FFFBD3;
-	border-color: #C20000;
-}
-
-div.ongoing, div.ongoing a {
-	color: #000000;
-	background-color: #FFFF80;
-}
-
-ul.specs li.ongoing h3, ul.specs li.ongoing h3 a {
-	color: #000000;
-	background-color: #FFFF80;
-}
-
-ul.examples li.ongoing, ul.examples li.ongoing a {
-	color: #000000;
-	background-color: #FFFF80;
-	border-color: #DDDD00;
-}
-
-
-
-/* --------------------
- * values
- */
-.number_value, .string_value, .regexp_value, .boolean_value, .dom_value {
-	font-family: monospace;
-	color: blue;
-}
-.object_value, .array_value {
-	line-height: 2em;
-	padding: 0.1em 0.2em;
-	margin: 0.1em 0;
-}
-.date_value {
-	font-family: monospace;
-	color: olive;
-}
-.undefined_value, .null_value {
-	font-style: italic;
-	color: blue;
-}
-.dom_attr_name {
-}
-.dom_attr_value {
-	color: red;
-}
-.dom_path {
-	font-size: 0.75em;
-	color: gray;
-}
-strong {
-	font-weight: normal;
-	background-color: #FFC6C6;
-}
\ No newline at end of file
diff --git a/common/js/unittest/unittest_common.html b/common/js/unittest/unittest_common.html
deleted file mode 100644
index 1e5e56ddb..000000000
--- a/common/js/unittest/unittest_common.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-<title>JSSpec results</title>
-<link rel="stylesheet" type="text/css" href="css/JSSpec.css" />
-<script type="text/javascript" src="JSSpec/JSSpec.js"></script>
-<script type="text/javascript" src="JSSpec/diff_match_patch.js"></script>
-<script type="text/javascript" src="../jquery.js"></script>
-<script type="text/javascript" src="../common.js"></script>
-<script>
-var current_url = 'http://xpressengine.com/';
-var http_port = 80;
-var https_port = 443;
-var enforce_ssl = false;
-</script>
-<script type="text/javascript">// <![CDATA[
-describe('SetQuery', {
-    'should satisfy basic uri condition' : function() {
-        target = "http://xpressengine.com/";
-        value_of(target.setQuery("q","r")).should_be("http://xpressengine.com/index.php?q=r");
-    },
-    'should work when ssl is on' : function() {
-        target = "http://xpressengine.com/";
-        window.ssl_actions = new Array("dispLogin");
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
-    },
-    'should work when ssl is on and https_port is set (not 443)' : function() {
-        target = "http://xpressengine.com/";
-        window.https_port = 445;
-        window.ssl_actions = new Array("dispLogin");
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/index.php?act=dispLogin");
-    },
-    'should work when ssl is on and https_port is set as 443' : function() {
-        target = "http://xpressengine.com/";
-        window.https_port = 443;
-        window.ssl_actions = new Array("dispLogin");
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
-    },
-    'should replace https to http if act is not a member of ssl_actions': function() {
-        targets = "https://xpressengine.com/";
-        window.ssl_actions = new Array("dispLogin");
-        value_of(targets.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/index.php?act=dispLogin2");
-    },
-    'should remove https port' : function() {
-        targetsp = "https://xpressengine.com:443/index.php?q=r";
-        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/index.php?q=r&act=dispLogin2");
-    },
-    'should remove https port and add http port if http port is defined' : function() {
-        targetsp = "https://xpressengine.com:443/index.php?q=r";
-        window.http_port = 8080;
-        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com:8080/index.php?q=r&act=dispLogin2");
-    },
-    'should only remove https port and if http port is defined as 80' : function() {
-        targetsp = "https://xpressengine.com:443/index.php?q=r";
-        window.http_port = 80;
-        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/index.php?q=r&act=dispLogin2");
-    },
-    'should work if enforce_ssl is set' : function() {
-        target = "http://xpressengine.com/";
-        window.enforce_ssl = true;
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
-    },
-    'should work if enforce_ssl is set' : function() {
-        target = "https://xpressengine.com:4433/";
-        window.http_port = 8080;
-        window.https_port = 4433;
-        window.enforce_ssl = false;
-        value_of(target.setQuery("act","dispTest")).should_be("http://xpressengine.com:8080/index.php?act=dispTest");
-    },
-    'should work if enforce_ssl is set with 443 port' : function() {
-        target = "http://xpressengine.com/";
-        window.enforce_ssl = true;
-        window.https_port = 443;
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
-    },
-    'should work if enforce_ssl is set with none-443 port' : function() {
-        target = "http://xpressengine.com/";
-        window.enforce_ssl = true;
-        window.https_port = 445;
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/index.php?act=dispLogin");
-    }
-})
-// ]]></script>
-</head>
-<body><div style="display:none;"><p>A</p><p>B</p></div></body>
-</html>
diff --git a/common/js/unittest/unittest_validator.html b/common/js/unittest/unittest_validator.html
deleted file mode 100644
index e2f2b9d69..000000000
--- a/common/js/unittest/unittest_validator.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-<title>JSSpec results</title>
-<link rel="stylesheet" type="text/css" href="css/JSSpec.css" />
-<script type="text/javascript" src="JSSpec/JSSpec.js"></script>
-<script type="text/javascript" src="JSSpec/diff_match_patch.js"></script>
-<script type="text/javascript" src="../jquery.js"></script>
-<script type="text/javascript" src="../js_app.js"></script>
-<script type="text/javascript" src="../xml_js_filter.js"></script>
-<script type="text/javascript">// <![CDATA[
-var v, f, t, last_alert='';
-var validate, set_filter, set_value;
-describe('Validator', {
-	'before' : function() {
-		v = xe.getApp('Validator')[0];
-		f = $('#form1');
-		t = f[0].elements['text'];
-
-		validate = function(){ return v.cast('VALIDATE', [f[0]]); };
-		set_filter = function(filter_name){ f[0]._filter.value = filter_name };
-		set_value  = function(val){ t.value = val };
-
-		var silent = xe.createPlugin('silent', {
-			API_BEFORE_SHOW_ALERT : function(sender, params) { last_alert=params[1]; return false; }
-		});
-		v.registerPlugin(new silent);
-	},
-	'should be true with no filter' : function() {
-		// no filter
-		set_filter('');
-		value_of(validate()).should_be_true();
-	},
-	'should check required feild' : function() {
-		v.cast('ADD_FILTER', ['required', {
-			'text' : {required:true}
-		}]);
-		set_filter('required');
-
-		set_value('');
-		value_of(validate()).should_be_false();
-
-		set_value('1');
-		value_of(validate()).should_be_true();
-	},
-    'validate email' : function() {
-		v.cast('ADD_FILTER', ['email', {
-			'text' : {required:true, rule:'email'}
-		}]);
-		set_filter('email');
-
-		set_value('not_email');
-		value_of(validate()).should_be_false();
-
-		set_value('email@mail.com');
-		value_of(validate()).should_be_true();
-    },
-	'validate with length' : function() {
-		v.cast('ADD_FILTER', ['minlength', {
-			'text'  : {required:true, minlength:5}
-		}]);
-		v.cast('ADD_FILTER', ['maxlength', {
-			'text'  : {required:true, maxlength:10}
-		}]);
-		v.cast('ADD_FILTER', ['minmaxlength', {
-			'text'  : {required:true, minlength:5, maxlength:10}
-		}]);
-
-		set_filter('minlength');
-
-		set_value('1');
-		value_of(validate()).should_be_false();
-
-		set_value('12345');
-		value_of(validate()).should_be_true();
-
-		set_filter('maxlength');
-
-		set_value('12345678901');
-		value_of(validate()).should_be_false();
-
-		set_value('1');
-		value_of(validate()).should_be_true();
-
-		set_filter('minmaxlength');
-
-		set_value('1');
-		value_of(validate()).should_be_false();
-
-		set_value('12345678901');
-		value_of(validate()).should_be_false();
-
-		set_value('12345');
-		value_of(validate()).should_be_true();
-
-		set_value('1234567');
-		value_of(validate()).should_be_true();
-	}
-})
-// ]]></script>
-</head>
-<body>
-<form id="form1">
-	<input type="hidden" name="_filter" value="" />
-	<input type="hidden" name="text" value="" />
-</form>
-</body>
-</html>
diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js
index 340251e79..d3fbd8add 100644
--- a/common/js/xml_handler.js
+++ b/common/js/xml_handler.js
@@ -17,12 +17,6 @@
 	 */
 	window.show_leaving_warning = false;
 
-	/**
-	 * This variable becomes true when the user tries to navigate away from the page.
-	 * It should not be manually edited.
-	 */
-	var page_unloading = false;
-
 	/**
 	 * Function for compatibility with XE's exec_xml()
 	 */
@@ -66,10 +60,10 @@
 			// Add debug information.
 			if (data._rx_debug) {
 				data._rx_debug.page_title = "AJAX : " + params.module + "." + params.act;
-				if (window.rhymix_debug_add_data) {
-					window.rhymix_debug_add_data(data._rx_debug);
+				if (Rhymix.addDebugData) {
+					Rhymix.addDebugData(data._rx_debug);
 				} else {
-					window.rhymix_debug_pending_data.push(data._rx_debug);
+					Rhymix.pendingDebugData.push(data._rx_debug);
 				}
 			}
 
@@ -127,7 +121,7 @@
 			}
 
 			// If the user is navigating away, don't do anything.
-			if (xhr.status == 0 && page_unloading) {
+			if (xhr.status == 0 && Rhymix.unloading) {
 				return;
 			}
 
@@ -232,10 +226,10 @@
 			// Add debug information.
 			if (data._rx_debug) {
 				data._rx_debug.page_title = "AJAX : " + request_info;
-				if (window.rhymix_debug_add_data) {
-					window.rhymix_debug_add_data(data._rx_debug);
+				if (Rhymix.addDebugData) {
+					Rhymix.addDebugData(data._rx_debug);
 				} else {
-					window.rhymix_debug_pending_data.push(data._rx_debug);
+					Rhymix.pendingDebugData.push(data._rx_debug);
 				}
 			}
 
@@ -293,7 +287,7 @@
 		var errorHandler = function(xhr, textStatus) {
 
 			// If the user is navigating away, don't do anything.
-			if (xhr.status == 0 && page_unloading) {
+			if (xhr.status == 0 && Rhymix.unloading) {
 				return;
 			}
 
@@ -378,50 +372,11 @@
 		}
 	};
 
-	/**
-	 * Function for AJAX submission of arbitrary forms.
-	 */
-	XE.ajaxForm = function(form, callback_success, callback_error) {
-		form = $(form);
-		// Get success and error callback functions.
-		if (typeof callback_success === 'undefined') {
-			callback_success = form.data('callbackSuccess');
-			if (callback_success && window[callback_success] && $.isFunction(window[callback_success])) {
-				callback_success = window[callback_success];
-			} else {
-				callback_success = function(data) {
-					if (data.message && data.message !== 'success') {
-						rhymix_alert(data.message, data.redirect_url);
-					}
-					if (data.redirect_url) {
-						redirect(data.redirect_url);
-					}
-				};
-			}
-		}
-		if (typeof callback_error === 'undefined') {
-			callback_error = form.data('callbackError');
-			if (callback_error && window[callback_error] && $.isFunction(window[callback_error])) {
-				callback_error = window[callback_error];
-			} else {
-				callback_error = null;
-			}
-		}
-		window.exec_json('raw', new FormData(form[0]), callback_success, callback_error);
-	};
-	$(document).on('submit', 'form.rx_ajax', function(event) {
-		// Abort if the form already has a 'target' attribute.
-		if (!$(this).attr('target')) {
-			event.preventDefault();
-			XE.ajaxForm(this);
-		}
-	});
-
 	/**
 	 * Empty placeholder for beforeUnload handler.
 	 */
 	var beforeUnloadHandler = function() {
-		page_unloading = true;
+		Rhymix.unloading = true;
 		return "";
 	};
 
@@ -435,10 +390,6 @@
 			}).bind("ajaxStop cancel_confirm", function() {
 				$(window).unbind("beforeunload", beforeUnloadHandler);
 			});
-		} else {
-			$(window).on('beforeunload', function() {
-				page_unloading = true;
-			});
 		}
 	});
 
diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js
index 414c175d8..83459d213 100644
--- a/common/js/xml_js_filter.js
+++ b/common/js/xml_js_filter.js
@@ -467,13 +467,13 @@ function legacy_filter(filter_name, form, module, act, callback, responses, conf
 		};
 
 		if (!hasFile) {
-			exec_json(module + '.' + act, params, callback_wrapper);
+			Rhymix.ajax(module + '.' + act, params, callback_wrapper);
 		} else {
 			var fd = new FormData();
 			for (let key in params) {
 				fd.append(key, params[key]);
 			}
-			exec_json('raw', fd, callback_wrapper);
+			Rhymix.ajax(null, fd, callback_wrapper);
 		}
 	};
 
diff --git a/common/lang/en.php b/common/lang/en.php
index 4bc239931..561616c76 100644
--- a/common/lang/en.php
+++ b/common/lang/en.php
@@ -251,7 +251,8 @@ $lang->msg_not_founded = 'Cannot find the target.';
 $lang->msg_no_result = 'No results found.';
 $lang->msg_fail_to_request_open = 'Failed to open your request.';
 $lang->msg_invalid_format = 'Invalid Format';
-$lang->msg_not_permitted_act = 'You do not have permission to execute requested action.';
+$lang->msg_administrator_only = 'Only administrators can access this page.';
+$lang->msg_not_permitted_act = 'You do not have permission to access this page.';
 $lang->msg_module_is_not_exists = 'Cannot find the page you requested. Ask your Site Admin to check the page.';
 $lang->msg_module_is_not_standalone = 'Requested page cannot be executed independently.';
 $lang->msg_module_class_not_found = 'Cannot find class to handle the requested action.';
diff --git a/common/lang/ko.php b/common/lang/ko.php
index ab22c229c..3a5cce58b 100644
--- a/common/lang/ko.php
+++ b/common/lang/ko.php
@@ -251,6 +251,7 @@ $lang->msg_not_founded = '대상을 찾을 수 없습니다.';
 $lang->msg_no_result = '검색 결과가 없습니다.';
 $lang->msg_fail_to_request_open = '요청한 연결에 실패했습니다.';
 $lang->msg_invalid_format = '잘못된 형식입니다.';
+$lang->msg_administrator_only = '관리자만 사용할 수 있는 기능입니다.';
 $lang->msg_not_permitted_act = '요청한 기능을 실행할 수 있는 권한이 없습니다.';
 $lang->msg_module_is_not_exists = '요청한 페이지를 찾을 수 없습니다. 사이트 관리자에게 문의해 주세요.';
 $lang->msg_module_is_not_standalone = '요청한 페이지는 독립적으로 동작할 수 없습니다.';
diff --git a/common/scripts/clean_empty_dirs.php b/common/scripts/clean_empty_dirs.php
index faafdb135..3d25d89ba 100644
--- a/common/scripts/clean_empty_dirs.php
+++ b/common/scripts/clean_empty_dirs.php
@@ -1,58 +1,8 @@
 <?php
 
 /**
- * This script deletes empty directories under the 'files' directory.
- * 
- * It may be useful when your web host imposes a hard limit on the number of
- * inodes, or when your backups take too long due to the large number of
- * unused directories.
- * 
- * This script only works on Unix-like operating systems where the 'find'
- * command is available.
+ * This script is @deprecated.
+ * Please invoke: php index.php file.cleanEmptyDirs
  */
 require_once __DIR__ . '/common.php';
-
-// Initialize the exit status.
-$exit_status = 0;
-
-// Delete empty directories in the attachment directory.
-passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/attach')), $result);
-if ($result == 0)
-{
-	echo "Successfully deleted all empty directories under files/attach.\n";
-}
-else
-{
-	echo "Error while deleting empty directories under files/attach.\n";
-	$exit_status = $result;
-}
-
-// Delete empty directories in the member extra info directory.
-passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/member_extra_info')), $result);
-if ($result == 0)
-{
-	echo "Successfully deleted all empty directories under files/member_extra_info.\n";
-}
-else
-{
-	echo "Error while deleting empty directories under files/member_extra_info.\n";
-	$exit_status = $result;
-}
-
-// Delete empty directories in the thumbnails directory.
-passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/thumbnails')), $result);
-if ($result == 0)
-{
-	echo "Successfully deleted all empty directories under files/thumbnails.\n";
-}
-else
-{
-	echo "Error while deleting empty directories under files/thumbnails.\n";
-	$exit_status = $result;
-}
-
-// Set the exit status if there were any errors.
-if ($exit_status != 0)
-{
-	exit($exit_status);
-}
+require_once RX_BASEDIR . 'modules/file/scripts/cleanEmptyDirs.php';
diff --git a/common/scripts/clean_garbage_files.php b/common/scripts/clean_garbage_files.php
index 73d8a53a1..5eca1ea01 100644
--- a/common/scripts/clean_garbage_files.php
+++ b/common/scripts/clean_garbage_files.php
@@ -1,98 +1,8 @@
 <?php
 
 /**
- * This script deletes files that were not properly uploaded.
- * 
- * Files can remain in an invalid status for two reasons: 1) a user abandons
- * a document or comment after uploading files; or 2) a chunked upload is
- * aborted without the server having any opportunity to clean it up.
- * These files can obviously take up a lot of disk space. In order to prevent
- * them from accumulating too much, you should run this script at least once
- * every few days.
+ * This script is @deprecated.
+ * Please invoke: php index.php file.cleanGarbageFiles
  */
 require_once __DIR__ . '/common.php';
-
-// Delete garbage files older than this number of days.
-$days = 10;
-
-// Initialize the exit status.
-$exit_status = 0;
-
-// Initialize objects.
-$oDB = DB::getInstance();
-$oFileController = getController('file');
-
-// Find and delete files where isvalid = N.
-$args = new stdClass;
-$args->isvalid = 'N';
-$args->list_count = 50;
-$args->regdate_before = date('YmdHis', time() - ($days * 86400));
-while (true)
-{
-	$output = executeQueryArray('file.getFileList', $args);
-	if ($output->toBool())
-	{
-		if ($output->data)
-		{
-			$oDB->begin();
-			foreach ($output->data as $file_info)
-			{
-				$oFileController->deleteFile($file_info->file_srl);
-			}
-			$oDB->commit();
-			
-			if ($output->page_navigation && $output->page_navigation->total_count == count($output->data))
-			{
-				break;
-			}
-		}
-		else
-		{
-			break;
-		}
-	}
-	else
-	{
-		echo "Error while deleting garbage files older than $days days.\n";
-		echo $output->getMessage() . "\n";
-		$exit_status = 11;
-		break;
-	}
-}
-if ($exit_status == 0)
-{
-	echo "Successfully deleted all garbage files older than $days days.\n";
-}
-
-// Find and delete temporary chunks.
-$dirname = RX_BASEDIR . 'files/attach/chunks';
-$threshold = time() - ($days * 86400);
-$chunks = Rhymix\Framework\Storage::readDirectory($dirname);
-if ($chunks)
-{
-	foreach ($chunks as $chunk)
-	{
-		if (@filemtime($chunk) < $threshold)
-		{
-			$result = Rhymix\Framework\Storage::delete($chunk);
-			if (!$result)
-			{
-				$exit_status = 12;
-			}
-		}
-	}
-}
-if ($exit_status == 0)
-{
-	echo "Successfully deleted aborted file chunks older than $days days.\n";
-}
-else
-{
-	echo "Error while deleting aborted file chunks older than $days days.\n";
-}
-
-// Set the exit status if there were any errors.
-if ($exit_status != 0)
-{
-	exit($exit_status);
-}
+require_once RX_BASEDIR . 'modules/file/scripts/cleanGarbageFiles.php';
diff --git a/common/scripts/clean_message_files.php b/common/scripts/clean_message_files.php
index 2aa1dc012..d96bafbaa 100644
--- a/common/scripts/clean_message_files.php
+++ b/common/scripts/clean_message_files.php
@@ -1,63 +1,8 @@
 <?php
 
 /**
- * This script deletes old message attachments.
- * 
- * Files attached to member messages are not viewable by other users, but they
- * take up space on the server. You may want to delete them after a certain
- * number of days in order to prevent users from using messages as a sort of
- * private storage space.
+ * This script is @deprecated.
+ * Please invoke: php index.php communication.cleanMessageFiles
  */
 require_once __DIR__ . '/common.php';
-
-// Delete attachments older than this number of days.
-$days = 30;
-
-// Initialize the exit status.
-$exit_status = 0;
-
-// Initialize objects.
-$oDB = DB::getInstance();
-$oFileController = getController('file');
-
-// Find and delete files where upload_target_type = msg.
-$args = new stdClass;
-$args->upload_target_type = 'msg';
-$args->list_count = 50;
-$args->regdate_before = date('YmdHis', time() - ($days * 86400));
-while (true)
-{
-	$output = executeQueryArray('file.getFileList', $args);
-	if ($output->toBool())
-	{
-		if ($output->data)
-		{
-			$oDB->begin();
-			foreach ($output->data as $file_info)
-			{
-				$oFileController->deleteFile($file_info->file_srl);
-			}
-			$oDB->commit();
-			
-			if ($output->page_navigation && $output->page_navigation->total_count == count($output->data))
-			{
-				break;
-			}
-		}
-		else
-		{
-			break;
-		}
-	}
-	else
-	{
-		echo "Error while deleting message attachments older than $days days.\n";
-		echo $output->getMessage() . "\n";
-		$exit_status = 11;
-		break;
-	}
-}
-if ($exit_status == 0)
-{
-	echo "Successfully deleted all message attachments older than $days days.\n";
-}
+require_once RX_BASEDIR . 'modules/communication/scripts/cleanMessageFiles.php';
diff --git a/common/scripts/clean_old_logs.php b/common/scripts/clean_old_logs.php
index a99eeb7a3..842eb2480 100644
--- a/common/scripts/clean_old_logs.php
+++ b/common/scripts/clean_old_logs.php
@@ -1,66 +1,8 @@
 <?php
 
 /**
- * This script deletes old logs from the database.
- * 
- * Rhymix produces various logs that can increase the size of the database
- * unnecessarily if not cleaned. This script removes old logs.
+ * This script is @deprecated.
+ * Please invoke: php index.php module.cleanMiscLogs
  */
 require_once __DIR__ . '/common.php';
-
-// Delete logs older than this number of days.
-$days = 30;
-
-// Initialize the exit status.
-$exit_status = 0;
-
-// Delete advanced mailer mail logs.
-$args = new stdClass;
-$args->regdate = date('YmdHis', time() - ($days * 86400));
-$output = executeQuery('advanced_mailer.deleteMailLogs', $args);
-if ($output->toBool())
-{
-	echo "Successfully deleted all mail logs older than $days days.\n";
-}
-else
-{
-	echo "Error while deleting mail logs older than $days days.\n";
-	echo $output->getMessage() . "\n";
-	$exit_status = 11;
-}
-
-// Delete advanced mailer SMS logs.
-$args = new stdClass;
-$args->regdate = date('YmdHis', time() - ($days * 86400));
-$output = executeQuery('advanced_mailer.deleteSMSLogs', $args);
-if ($output->toBool())
-{
-	echo "Successfully deleted all SMS logs older than $days days.\n";
-}
-else
-{
-	echo "Error while deleting SMS logs older than $days days.\n";
-	echo $output->getMessage() . "\n";
-	$exit_status = 12;
-}
-
-// Delete spamfilter logs.
-$args = new stdClass;
-$args->regdate = date('YmdHis', time() - ($days * 86400));
-$output = executeQuery('spamfilter.deleteLog', $args);
-if ($output->toBool())
-{
-	echo "Successfully deleted all spamfilter logs older than $days days.\n";
-}
-else
-{
-	echo "Error while deleting spamfilter logs older than $days days.\n";
-	echo $output->getMessage() . "\n";
-	$exit_status = 12;
-}
-
-// Set the exit status if there were any errors.
-if ($exit_status != 0)
-{
-	exit($exit_status);
-}
+require_once RX_BASEDIR . 'modules/module/scripts/cleanMiscLogs.php';
diff --git a/common/scripts/clean_old_notifications.php b/common/scripts/clean_old_notifications.php
index 27a58efba..581fa74f6 100644
--- a/common/scripts/clean_old_notifications.php
+++ b/common/scripts/clean_old_notifications.php
@@ -1,40 +1,8 @@
 <?php
 
 /**
- * This script deletes old notifications.
- * 
- * Notifications must be dismissed as quickly as possible in order to prevent
- * the ncenterlite_notify table from becoming too large. For best performance,
- * you should run this script at least once every few days.
+ * This script is @deprecated.
+ * Please invoke: php index.php ncenterlite.cleanNotifications
  */
 require_once __DIR__ . '/common.php';
-
-// Delete notifications older than this number of days.
-$days = 30;
-
-// Initialize the exit status.
-$exit_status = 0;
-
-// Execute the query.
-$args = new stdClass;
-$args->old_date = date('YmdHis', time() - ($days * 86400));
-$output = executeQuery('ncenterlite.deleteNotifyAll', $args);
-if ($output->toBool())
-{
-	echo "Successfully deleted all notifications older than $days days.\n";
-	$delete_obj = (object)array('regdate' => time());
-	Rhymix\Framework\Cache::clearGroup('ncenterlite');
-	Rhymix\Framework\Storage::writePHPData(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify/delete_date.php', $delete_obj);
-}
-else
-{
-	echo "Error while deleting notifications older than $days days.\n";
-	echo $output->getMessage() . "\n";
-	$exit_status = 11;
-}
-
-// Set the exit status if there were any errors.
-if ($exit_status != 0)
-{
-	exit($exit_status);
-}
+require_once RX_BASEDIR . 'modules/ncenterlite/scripts/cleanNotifications.php';
diff --git a/common/scripts/clean_old_thumbnails.php b/common/scripts/clean_old_thumbnails.php
index b36868973..52a27c087 100644
--- a/common/scripts/clean_old_thumbnails.php
+++ b/common/scripts/clean_old_thumbnails.php
@@ -1,41 +1,8 @@
 <?php
 
 /**
- * This script deletes old thumbnails.
- * 
- * Thumbnails can take up a large amount of disk space and inodes if they are
- * allowed to accumulate. Since most websites only need thumbnails for recent
- * posts, it is okay to delete old thumbnails.
- * 
- * Do not run this script if you have a gallery-style module where visitors
- * regularly view old posts. This will force thumbnails to be regenerated,
- * increasing the server load and making your pages load slower.
- * 
- * This script only works on Unix-like operating systems where the 'find'
- * command is available.
+ * This script is @deprecated.
+ * Please invoke: php index.php file.cleanThumbnails
  */
 require_once __DIR__ . '/common.php';
-
-// Delete thumbnails older than this number of days.
-$days = 90;
-
-// Initialize the exit status.
-$exit_status = 0;
-
-// Delete old thumbnails.
-passthru(sprintf('find %s -type f -mtime +%d -delete', escapeshellarg(RX_BASEDIR . 'files/thumbnails'), abs($days)), $result);
-if ($result == 0)
-{
-	echo "Successfully deleted all thumbnails older than $days days.\n";
-}
-else
-{
-	echo "Error while deleting thumbnails older than $days days.\n";
-	$exit_status = $result;
-}
-
-// Set the exit status if there were any errors.
-if ($exit_status != 0)
-{
-	exit($exit_status);
-}
+require_once RX_BASEDIR . 'modules/file/scripts/cleanThumbnails.php';
diff --git a/common/scripts/cron.php b/common/scripts/cron.php
index 971f889a4..5d3ff146d 100644
--- a/common/scripts/cron.php
+++ b/common/scripts/cron.php
@@ -52,6 +52,19 @@ if (PHP_SAPI !== 'cli')
 	}
 }
 
+// Set up a signal handler.
+if (PHP_SAPI === 'cli' && function_exists('pcntl_signal'))
+{
+	if (function_exists('pcntl_async_signals'))
+	{
+		pcntl_async_signals(true);
+	}
+	foreach ([SIGINT, SIGHUP, SIGTERM, SIGQUIT, SIGUSR1, SIGUSR2] as $signal)
+	{
+		pcntl_signal($signal, [Rhymix\Framework\Queue::class, 'signalHandler']);
+	}
+}
+
 // Create multiple processes if configured.
 if (PHP_SAPI === 'cli' && $process_count > 1 && function_exists('pcntl_fork') && function_exists('pcntl_waitpid'))
 {
@@ -84,7 +97,7 @@ if (PHP_SAPI === 'cli' && $process_count > 1 && function_exists('pcntl_fork') &&
 	}
 
 	// The parent process waits for its children to finish.
-	while (count($pids))
+	while (count($pids) && !Rhymix\Framework\Queue::signalReceived())
 	{
 		$pid = pcntl_waitpid(-1, $status, \WNOHANG);
 		if ($pid)
diff --git a/common/scripts/update_all_modules.php b/common/scripts/update_all_modules.php
index 6eb203b24..969bf7569 100644
--- a/common/scripts/update_all_modules.php
+++ b/common/scripts/update_all_modules.php
@@ -1,63 +1,8 @@
 <?php
 
 /**
- * This script updates all modules.
- *
- * Running this script on the CLI is better than clicking 'update' in the
- * admin dashboard because some module updates may take a long time.
+ * This script is @deprecated.
+ * Please invoke: php index.php module.updateAllModules
  */
 require_once __DIR__ . '/common.php';
-
-Context::init();
-$oModuleModel = getModel('module');
-
-// Get the list of modules that need to be updated.
-$module_list = $oModuleModel->getModuleList();
-$need_install = array();
-$need_update = array();
-foreach($module_list as $key => $value)
-{
-	if($value->need_install)
-	{
-		$need_install[] = $value->module;
-	}
-	if($value->need_update)
-	{
-		$need_update[] = $value->module;
-	}
-}
-
-// Install all modules.
-$oInstallController = InstallController::getInstance();
-foreach ($need_install as $module)
-{
-	try
-	{
-		echo 'Installing ' . $module . '...' . PHP_EOL;
-		$oInstallController->installModule($module, './modules/' . $module);
-	}
-	catch (\Exception $e)
-	{
-		echo 'Error: ' . $e->getMessage() . PHP_EOL;
-	}
-}
-
-// Update all modules.
-foreach ($need_update as $module)
-{
-	try
-	{
-		echo 'Updating ' . $module . '...' . PHP_EOL;
-		$oInstallController->updateModule($module);
-	}
-	catch (\Exception $e)
-	{
-		echo 'Error: ' . $e->getMessage() . PHP_EOL;
-	}
-}
-
-// Set the exit status if there were any errors.
-if ($exit_status != 0)
-{
-	exit($exit_status);
-}
+require_once RX_BASEDIR . 'modules/module/scripts/updateAllModules.php';
diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html
index 2378c2672..556864c29 100644
--- a/common/tpl/popup_layout.html
+++ b/common/tpl/popup_layout.html
@@ -11,10 +11,7 @@
 		const iframe_sequence = '{{ $iframe_sequence }}';
 		window.opener = window.parent;
 		window.close = function() {
-			const iframe = parent.document.getElementById('_rx_iframe_' + iframe_sequence);
-			if (iframe) {
-				iframe.remove();
-			}
+			parent.closeModal('_rx_iframe_' + iframe_sequence);
 		};
 	</script>
 	<style>
diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index 7fc7b505b..6d4cc630f 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -197,16 +197,19 @@ class addonAdminController extends addonController
 	 */
 	function procAddonAdminSetupAddon()
 	{
-		$args = Context::getRequestVars();
-		$module = $args->module;
-		$addon_name = $args->addon_name;
-		unset($args->module);
-		unset($args->act);
-		unset($args->addon_name);
-		unset($args->body);
-		unset($args->error_return_url);
+		$vars = Context::getRequestVars();
+		$module = $vars->module;
+		$addon_name = $vars->addon_name;
+		$args = new stdClass();
 
 		$site_module_info = Context::get('site_module_info');
+		$addon_info = AddonAdminModel::getInstance()->getAddonInfoXml($addon_name, $site_module_info->site_srl, 'site');
+		foreach ($addon_info->extra_vars as $key => $val)
+		{
+			$args->{$key} = $vars->{$key} ?? '';
+		}
+		$args->xe_run_method = $vars->xe_run_method ?? '';
+		$args->mid_list = $vars->mid_list ?? [];
 
 		$output = $this->doSetup($addon_name, $args, $site_module_info->site_srl, 'site');
 		if(!$output->toBool())
@@ -234,6 +237,29 @@ class addonAdminController extends addonController
 	 */
 	function doInsert($addon, $site_srl = 0, $gtype = 'site', $isUsed = 'N', $extra_vars = null)
 	{
+		if (!is_object($extra_vars))
+		{
+			$extra_vars = new stdClass();
+		}
+		if (!isset($extra_vars->xe_run_method))
+		{
+			$extra_vars->xe_run_method = 'run_selected';
+		}
+		if (!isset($extra_vars->mid_list) || !is_array($extra_vars->mid_list))
+		{
+			$extra_vars->mid_list = [];
+		}
+
+		$xml_file = RX_BASEDIR . 'addons/' . $addon . '/conf/info.xml';
+		$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
+		foreach ($addon_info->extra_vars as $key => $val)
+		{
+			if (!isset($extra_vars->$key))
+			{
+				$extra_vars->$key = $val->default;
+			}
+		}
+
 		$args = new stdClass;
 		$args->addon = $addon;
 		if (strlen($isUsed) == 2)
diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php
index a5bacaa23..61ba824ea 100644
--- a/modules/addon/addon.admin.model.php
+++ b/modules/addon/addon.admin.model.php
@@ -162,18 +162,14 @@ class addonAdminModel extends addon
 			return;
 		}
 
-		// Read the xml file for module skin information
+		// Read the xml file for addon information
 		$xml_file = sprintf("%sconf/info.xml", FileHandler::getRealpath($addon_path));
-		if(!file_exists($xml_file))
+		if (!file_exists($xml_file))
 		{
 			return;
 		}
-
-		$oXmlParser = new XeXmlParser();
-		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
-		$xml_obj = $tmp_xml_obj->addon;
-
-		if(!$xml_obj)
+		$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
+		if (!$addon_info)
 		{
 			return;
 		}
@@ -190,224 +186,52 @@ class addonAdminModel extends addon
 			$db_args->site_srl = $site_srl;
 			$output = executeQuery('addon.getSiteAddonInfo', $db_args);
 		}
-		$extra_vals = unserialize($output->data->extra_vars);
 
-		$addon_info = new stdClass();
-		if($extra_vals->mid_list)
+		// Add run settings
+		$extra_vals = isset($output->data->extra_vars) ? unserialize($output->data->extra_vars) : new stdClass;
+		if (!empty($extra_vals->mid_list))
 		{
 			$addon_info->mid_list = $extra_vals->mid_list;
 		}
-		else
-		{
-			$addon_info->mid_list = array();
-		}
-
-		if($extra_vals->xe_run_method)
+		if (!empty($extra_vals->xe_run_method))
 		{
 			$addon_info->xe_run_method = $extra_vals->xe_run_method;
 		}
-
-		// Add information
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if (isset($output->data) && $output->data->is_used === 'Y')
 		{
-			// addon format v0.2
-			if ($xml_obj->date->body === 'RX_CORE')
+			$addon_info->is_enabled->pc = true;
+		}
+		if (isset($output->data) && $output->data->is_used_m === 'Y')
+		{
+			$addon_info->is_enabled->mobile = true;
+		}
+
+		// Add current settings
+		foreach ($addon_info->extra_vars ?? [] as $key => $val)
+		{
+			if (isset($extra_vals->{$key}))
 			{
-				$addon_info->date = '';
+				if (is_string($extra_vals->{$key}) && str_contains($extra_vals->{$key}, '|@|'))
+				{
+					$val->value = explode('|@|', $extra_vals->{$key});
+				}
+				else
+				{
+					$val->value = $extra_vals->{$key};
+				}
 			}
 			else
 			{
-				$date_obj = new stdClass();
-				sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-				$addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+				$val->value = $val->default;
 			}
-			$addon_info->addon_name = $addon;
-			$addon_info->title = $xml_obj->title->body;
-			$addon_info->description = trim($xml_obj->description->body);
-			$addon_info->version = $xml_obj->version->body;
-			$addon_info->homepage = $xml_obj->link->body;
-			$addon_info->license = $xml_obj->license->body;
-			$addon_info->license_link = $xml_obj->license->attrs->link;
 
-			if(!is_array($xml_obj->author))
+			if ($val->type === 'mid_list' && !is_array($val->value))
 			{
-				$author_list = array();
-				$author_list[] = $xml_obj->author;
-			}
-			else
-			{
-				$author_list = $xml_obj->author;
+				$val->value = isset($val->value) ? [$val->value] : [];
 			}
 
-			$addon_info->author = array();
-			foreach($author_list as $author)
-			{
-				$author_obj = new stdClass();
-				$author_obj->name = $author->name->body;
-				$author_obj->email_address = $author->attrs->email_address;
-				$author_obj->homepage = $author->attrs->link;
-				$addon_info->author[] = $author_obj;
-			}
-
-			// Expand the variable order
-			if($xml_obj->extra_vars)
-			{
-				$extra_var_groups = $xml_obj->extra_vars->group;
-				if(!$extra_var_groups)
-				{
-					$extra_var_groups = $xml_obj->extra_vars;
-				}
-				if(!is_array($extra_var_groups))
-				{
-					$extra_var_groups = array($extra_var_groups);
-				}
-
-				foreach($extra_var_groups as $group)
-				{
-					$extra_vars = $group->var;
-					if(!is_array($group->var))
-					{
-						$extra_vars = array($group->var);
-					}
-
-					foreach($extra_vars as $key => $val)
-					{
-						if(!$val)
-						{
-							continue;
-						}
-
-						$obj = new stdClass();
-						if(!$val->attrs)
-						{
-							$val->attrs = new stdClass();
-						}
-						if(!$val->attrs->type)
-						{
-							$val->attrs->type = 'text';
-						}
-
-						$obj->group = $group->title->body;
-						$obj->name = $val->attrs->name;
-						$obj->title = $val->title->body;
-						$obj->type = $val->attrs->type;
-						$obj->description = $val->description->body;
-						if($obj->name)
-						{
-							$obj->value = $extra_vals->{$obj->name};
-						}
-						if(strpos($obj->value, '|@|') != FALSE)
-						{
-							$obj->value = explode('|@|', $obj->value);
-						}
-						if($obj->type == 'mid_list' && !is_array($obj->value))
-						{
-							$obj->value = array($obj->value);
-						}
-
-						// 'Select'type obtained from the option list.
-						if($val->options && !is_array($val->options))
-						{
-							$val->options = array($val->options);
-						}
-
-						for($i = 0, $c = countobj($val->options); $i < $c; $i++)
-						{
-							$obj->options[$i] = new stdClass();
-							$obj->options[$i]->title = $val->options[$i]->title->body;
-							$obj->options[$i]->value = $val->options[$i]->attrs->value;
-						}
-
-						$addon_info->extra_vars[] = $obj;
-					}
-				}
-			}
 		}
-		else
-		{
-			// addon format 0.1
-			$addon_info = new stdClass();
-			$addon_info->addon_name = $addon;
-			$addon_info->title = $xml_obj->title->body;
-			$addon_info->description = trim($xml_obj->author->description->body);
-			$addon_info->version = $xml_obj->attrs->version;
 
-			$date_obj = new stdClass();
-			sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
-			$addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-
-			$author_obj = new stdClass();
-			$author_obj->name = $xml_obj->author->name->body;
-			$author_obj->email_address = $xml_obj->author->attrs->email_address;
-			$author_obj->homepage = $xml_obj->author->attrs->link;
-
-			$addon_info->author = array();
-			$addon_info->author[] = $author_obj;
-
-			if($xml_obj->extra_vars)
-			{
-				// Expand the variable order
-				$extra_var_groups = $xml_obj->extra_vars->group;
-				if(!$extra_var_groups)
-				{
-					$extra_var_groups = $xml_obj->extra_vars;
-				}
-				if(!is_array($extra_var_groups))
-				{
-					$extra_var_groups = array($extra_var_groups);
-				}
-				foreach($extra_var_groups as $group)
-				{
-					$extra_vars = $group->var;
-					if(!is_array($group->var))
-					{
-						$extra_vars = array($group->var);
-					}
-
-					$addon_info->extra_vars = array();
-					foreach($extra_vars as $key => $val)
-					{
-						if(!$val)
-						{
-							continue;
-						}
-
-						$obj = new stdClass();
-
-						$obj->group = $group->title->body;
-						$obj->name = $val->attrs->name;
-						$obj->title = $val->title->body;
-						$obj->type = $val->type->body ? $val->type->body : 'text';
-						$obj->description = $val->description->body;
-						if($obj->name)
-						{
-							$obj->value = $extra_vals->{$obj->name};
-						}
-						if(strpos($obj->value, '|@|') != false)
-						{
-							$obj->value = explode('|@|', $obj->value);
-						}
-						if($obj->type == 'mid_list' && !is_array($obj->value))
-						{
-							$obj->value = array($obj->value);
-						}
-						// 'Select'type obtained from the option list.
-						if($val->options && !is_array($val->options))
-						{
-							$val->options = array($val->options);
-						}
-
-						$obj->options = array();
-						foreach ($val->options ?? [] as $i => $option)
-						{
-							$obj->options[$i]->title = $option->title->body;
-							$obj->options[$i]->value = $option->value->body;
-						}
-						$addon_info->extra_vars[] = $obj;
-					}
-				}
-			}
-		}
 		return $addon_info;
 	}
 
diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php
index 95b5c3c9e..c8225c69a 100644
--- a/modules/addon/addon.controller.php
+++ b/modules/addon/addon.controller.php
@@ -111,7 +111,7 @@ class addonController extends addon
 			$buff[] = sprintf('$addon_file = RX_BASEDIR . \'addons/%s/%s.addon.php\';', $addon, $addon);
 
 			// Addon configuration
-			$buff[] = '$addon_info = unserialize(' . var_export(serialize($extra_vars), true) . ');';
+			$buff[] = '$addon_info = ' . var_export($extra_vars, true) . ';';
 
 			// Decide whether to run in this mid
 			if ($run_method === 'no_run_selected')
@@ -159,9 +159,27 @@ class addonController extends addon
 	 */
 	function doSetup($addon, $extra_vars, $site_srl = 0, $gtype = 'site')
 	{
-		if(!is_array($extra_vars->mid_list))
+		if (!is_object($extra_vars))
 		{
-			unset($extra_vars->mid_list);
+			$extra_vars = new stdClass();
+		}
+		if (!isset($extra_vars->xe_run_method))
+		{
+			$extra_vars->xe_run_method = 'run_selected';
+		}
+		if (!isset($extra_vars->mid_list) || !is_array($extra_vars->mid_list))
+		{
+			$extra_vars->mid_list = [];
+		}
+
+		$xml_file = RX_BASEDIR . 'addons/' . $addon . '/conf/info.xml';
+		$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
+		foreach ($addon_info->extra_vars as $key => $val)
+		{
+			if (!isset($extra_vars->$key) && isset($val->default))
+			{
+				$extra_vars->$key = $val->default;
+			}
 		}
 
 		$args = new stdClass();
diff --git a/modules/admin/controllers/Dashboard.php b/modules/admin/controllers/Dashboard.php
index d2b053298..365244a13 100644
--- a/modules/admin/controllers/Dashboard.php
+++ b/modules/admin/controllers/Dashboard.php
@@ -185,8 +185,7 @@ class Dashboard extends Base
 		$params["act"] = "getResourceapiLastupdate";
 		$body = \XmlGenerater::generate($params);
 		$buff = FileHandler::getRemoteResource($config->download_server, $body, 3, "POST", "application/xml");
-		$xml_lUpdate = new \XeXmlParser();
-		$lUpdateDoc = $xml_lUpdate->parse($buff);
+		$lUpdateDoc = \Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
 		$updateDate = $lUpdateDoc->response->updatedate->body;
 
 		if(!$updateDate)
diff --git a/modules/admin/controllers/maintenance/Cleanup.php b/modules/admin/controllers/maintenance/Cleanup.php
index 7e5e3e45e..d1ed217cc 100644
--- a/modules/admin/controllers/maintenance/Cleanup.php
+++ b/modules/admin/controllers/maintenance/Cleanup.php
@@ -332,6 +332,7 @@ class Cleanup extends Base
 		'modules/admin/tpl/js/config.min.js' => 'deleted',
 		'modules/admin/tpl/js/admin.min.js' => 'deleted',
 		'modules/admin/tpl/js/menu_setup.min.js' => 'deleted',
+		'modules/admin/tpl/img/bgDragable.gif' => 'deleted',
 		'modules/admin/tpl/img/faviconSample.png' => 'deleted',
 		'modules/admin/tpl/img/mobiconSample.png' => 'deleted',
 		'modules/autoinstall/ruleset/' => 'deleted:xe',
diff --git a/modules/admin/tpl/_header.html b/modules/admin/tpl/_header.html
index 5abe09c9f..729ca60e1 100644
--- a/modules/admin/tpl/_header.html
+++ b/modules/admin/tpl/_header.html
@@ -4,10 +4,10 @@
 {@ Context::addMetaTag("viewport", "width=device-width, user-scalable=yes")}
 <script>
 	var admin_menu_srl = "{$admin_menu_srl}";
-	xe.cmd_find = "{$lang->cmd_find}";
-	xe.cmd_cancel = "{$lang->cmd_cancel}";
-	xe.cmd_confirm = "{$lang->cmd_confirm}";
-	xe.msg_select_menu = "{$lang->msg_select_menu}";
+	xe.lang.cmd_find = "{$lang->cmd_find}";
+	xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
+	xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
+	xe.lang.msg_select_menu = "{$lang->msg_select_menu}";
 	xe.lang.confirm_run = "{$lang->confirm_run}";
 	xe.lang.confirm_reset_admin_menu = "{$lang->confirm_reset_admin_menu}";
 </script>
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index 8ef7ff6a5..f5da99642 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -356,11 +356,15 @@ body>.x,
 	color: #fff;
 }
 .x .x_modal-header>.close_window {
-	font-size: 20px;
+	font-size: 24px;
+	line-height: 30px;
 	font-weight: bold;
 	text-decoration: none;
 	color: #fff;
-	opacity: 0.5;
+	opacity: 0.6;
+}
+.x .x_modal-header>.close_window:hover {
+	opacity: 0.8;
 }
 .x .x_modal-body {
 	overflow-y: visible;
@@ -1690,14 +1694,16 @@ html[lang="id"] .x .g11n.active>[disabled],
 }
 .x .uDrag .dragBtn {
 	position: absolute;
-	width: 8px;
+	width: 24px;
 	height: 100%;
-	padding: 0;
+	box-sizing: content-box;
 	overflow: hidden;
-	background: url(../img/bgDragable.gif);
+	background: url(../img/bgDragable.png);
+	background-position: center top;
+	background-repeat: no-repeat;
 	top: 1px;
-	left: 0;
-	text-indent: 12px;
+	left: -8px;
+	text-indent: 20px;
 	border: 0;
 	cursor: n-resize;
 	white-space: nowrap;
diff --git a/modules/admin/tpl/img/bgDragable.gif b/modules/admin/tpl/img/bgDragable.gif
deleted file mode 100644
index 92fcd2298..000000000
Binary files a/modules/admin/tpl/img/bgDragable.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/bgDragable.png b/modules/admin/tpl/img/bgDragable.png
new file mode 100644
index 000000000..86bbdc708
Binary files /dev/null and b/modules/admin/tpl/img/bgDragable.png differ
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index f3152ef88..7881bcdf5 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -977,7 +977,7 @@ jQuery(function($){
 			tmpCount++;
 
 			// add html
-			var $btn = $('<a class="x_btn moduleTrigger">' + xe.cmd_find + '</a>');
+			var $btn = $('<a class="x_btn moduleTrigger">' + xe.lang.cmd_find + '</a>');
 			var $displayInput = $('<input type="text" readonly>');
 			$this.after($btn).after('&nbsp;').after($displayInput).hide();
 			$btn.xeModuleSearch();
@@ -1050,10 +1050,10 @@ jQuery(function($){
 	$.xeMsgBox = {
 		htOptions : {}
 	};
-	//xe.cmd_cancel = "{$lang->cmd_cancel}";
-	//xe.cmd_confirm = "{$lang->cmd_confirm}";
+	//xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
+	//xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
 	var $msgBox = $.xeMsgBox.$msgBox = $("<section />").addClass("x_modal _common x").hide().css('z-index', 9999);
-	$msgBox.html('<button type="button" class="x_close _cancel">&times;</button> <div class="x_modal-header"> <h1 class="_title"></h1> </div> <div class="x_modal-body"> <div class="_text"></div> </div> <div class="x_modal-footer"> <button type="button" class="x_btn x_pull-left _cancel">'+xe.cmd_cancel+'</button> <button type="submit" class="x_btn x_btn-inverse x_pull-right x_btn-primary _ok">'+xe.cmd_confirm+'</button> </div> ');
+	$msgBox.html('<button type="button" class="x_close _cancel">&times;</button> <div class="x_modal-header"> <h1 class="_title"></h1> </div> <div class="x_modal-body"> <div class="_text"></div> </div> <div class="x_modal-footer"> <button type="button" class="x_btn x_pull-left _cancel">'+xe.lang.cmd_cancel+'</button> <button type="submit" class="x_btn x_btn-inverse x_pull-right x_btn-primary _ok">'+xe.lang.cmd_confirm+'</button> </div> ');
 	$("body").append($msgBox);
 	$msgBox.find("._ok").click(function(){
 		$.xeMsgBox.fnOnOK();
@@ -1513,13 +1513,13 @@ jQuery(function($){
 
 		// change text
 		if(options.create_type != 'save_and_use'){
-			$g11n_create.find('.save-useit').text(xe.cmd_save);
+			$g11n_create.find('.save-useit').text(xe.lang.cmd_save);
 		}
 
 		// #lang_create confirm
 		function g11n_create_save_confirm(){
 			if($g11n_create.is(':visible') && is_create_changed){
-				if(confirm(xe.msg_confirm_save_and_use_multilingual)){
+				if(confirm(xe.lang.msg_confirm_save_and_use_multilingual)){
 					$g11n_create.find('.save-useit').trigger('click');
 				}
 			}
@@ -1531,7 +1531,7 @@ jQuery(function($){
 		function g11n_search_save_confirm(){
 			if($g11n_search.is(':visible') && $g11n_search.find('.editMode').length){
 				var $search_item = $g11n_search.find('.editMode');
-				if(confirm(xe.msg_confirm_save_and_use_multilingual)){
+				if(confirm(xe.lang.msg_confirm_save_and_use_multilingual)){
 					$search_item.find('.save').trigger('click');
 				}else{
 					$search_item.find('.cancel').trigger('click');
@@ -1701,7 +1701,7 @@ jQuery(function($){
 			if(!options.view_modify) $g11n_search.find('.modify').hide();
 			if(!options.view_delete) $g11n_search.find('.delete').hide();
 			if(options.modify_type == 'save'){
-				$g11n_search.find('.save').text(xe.cmd_save);
+				$g11n_search.find('.save').text(xe.lang.cmd_save);
 			}
 
 			// Modify click
@@ -1727,7 +1727,7 @@ jQuery(function($){
 
 			// Delete click
 			$g11n_search.find('.delete').click(function(){
-				if(!confirm(xe.confirm_delete)) return;
+				if(!confirm(xe.lang.confirm_delete)) return;
 
 				var $this = $(this);
 
@@ -1827,7 +1827,7 @@ jQuery(function($){
 			});
 
 			if(!current_lang_value){
-				alert(xe.msg_empty_multilingual);
+				alert(xe.lang.msg_empty_multilingual);
 				return false;
 			}
 
@@ -1933,8 +1933,8 @@ jQuery(function($){
 				}
 				$displayInput.attr('placeholder', $this.attr('placeholder'));
 
-				var $remover = $('<button type="button" class="x_add-on remover" title="' + xe.cmd_remove_multilingual_text + '"><i class="x_icon-remove"></i>' + xe.cmd_remove_multilingual_text + '</button>').data('lang-target', id);
-				var $setter = $('<a href="#g11n" class="x_add-on modalAnchor" title="' + xe.cmd_set_multilingual_text + '"><i class="x_icon-globe"></i>' + xe.cmd_set_multilingual_text + '</a>').data('lang-target', id);
+				var $remover = $('<button type="button" class="x_add-on remover" title="' + xe.lang.cmd_remove_multilingual_text + '"><i class="x_icon-remove"></i>' + xe.lang.cmd_remove_multilingual_text + '</button>').data('lang-target', id);
+				var $setter = $('<a href="#g11n" class="x_add-on modalAnchor" title="' + xe.lang.cmd_set_multilingual_text + '"><i class="x_icon-globe"></i>' + xe.lang.cmd_set_multilingual_text + '</a>').data('lang-target', id);
 
 				$this.parent().addClass('g11n').addClass('x_input-append');
 				$this.after($displayInput, $remover, $setter);
@@ -2377,7 +2377,7 @@ jQuery(function($){
 		$.xeMenuSelectorVar.$container = $.xeMsgBox.$msgBox;
 
 		$.xeMsgBox.confirmDialog({
-			sTitle : xe.msg_select_menu,
+			sTitle : xe.lang.msg_select_menu,
 
 			sText : '<select class="site_selector" style="width:100%;display:none"></select><div class="tree"></div>',
 
@@ -2447,7 +2447,7 @@ jQuery(function($){
 			var sDisallowedType = $this.attr('data-disallowedType');
 
 			// add html
-			var $btn = $('<a class="x_btn moduleTrigger">' + xe.cmd_find + '</a>');
+			var $btn = $('<a class="x_btn moduleTrigger">' + xe.lang.cmd_find + '</a>');
 			$btn.data('multiple', sMultiple);
 			$btn.data('allowedType', sAllowedType);
 			$btn.data('disallowedType', sDisallowedType);
diff --git a/modules/board/board.class.php b/modules/board/board.class.php
index 7b235a1ae..6f95eb781 100644
--- a/modules/board/board.class.php
+++ b/modules/board/board.class.php
@@ -20,6 +20,7 @@ class Board extends ModuleObject
 		'user_name',
 		'nick_name',
 		'user_id',
+		'regdate',
 		'tag',
 	];
 
diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml
index da65fbfaa..1e98c5fcc 100644
--- a/modules/board/conf/module.xml
+++ b/modules/board/conf/module.xml
@@ -60,11 +60,6 @@
 			<route route="$document_srl:int" priority="100" />
 			<route route="$document_srl:int/" priority="100" />
 			<route route="$document_srl:int/comment/$comment_srl:int" priority="100" />
-			<route route="$document_srl:int/page/$page:int" priority="100" />
-			<route route="category/$category:int/search/$search_target:word/$search_keyword:any" priority="60" />
-			<route route="category/$category:int/search/$search_target:word/$search_keyword:any/page/$page:int" priority="60" />
-			<route route="search/$search_target:word/$search_keyword:any" priority="50" />
-			<route route="search/$search_target:word/$search_keyword:any/page/$page:int" priority="50" />
 			<route route="category/$category:int" priority="40" />
 			<route route="category/$category:int/page/$page:int" priority="40" />
 			<route route="page/$page:int" priority="10" />
diff --git a/modules/board/tpl/js/rewrite.js b/modules/board/tpl/js/rewrite.js
index 3d9c43b0d..5de63b131 100644
--- a/modules/board/tpl/js/rewrite.js
+++ b/modules/board/tpl/js/rewrite.js
@@ -13,7 +13,7 @@
 	if (match && match[1] === window.current_mid) {
 		newpath = location.pathname.replace(/\/(comment|page)\/([0-9]+)$/, '');
 	}
-	if (location.pathname.match(/\/([0-9]+)$/) && location.search.match(/^\?category=[0-9]+$/)) {
+	if (location.pathname.match(/\/([0-9]+)$/) && location.search.match(/^\?(category|comment_srl|page)=[0-9]+$/)) {
 		newpath = newpath ? newpath : location.pathname;
 	}
 	if (newpath && location.hash && location.hash != '#') {
diff --git a/modules/comment/tpl/js/comment_admin.js b/modules/comment/tpl/js/comment_admin.js
index a40b76075..6102a9afc 100644
--- a/modules/comment/tpl/js/comment_admin.js
+++ b/modules/comment/tpl/js/comment_admin.js
@@ -1,16 +1,17 @@
 
 function doCancelDeclare() {
     var comment_srl = new Array();
-    jQuery('#fo_list input[name="cart[]"]:checked').each(function() {
-        comment_srl[comment_srl.length] = jQuery(this).val();
+    $('#fo_list input[name="cart[]"]:checked').each(function() {
+        comment_srl.push($(this).val());
     });
+    if (comment_srl.length < 1) {
+		return;
+	}
 
-    if(comment_srl.length<1) return;
-
-    var params = new Array();
-    params['comment_srl'] = comment_srl.join(',');
-
-    exec_xml('comment','procCommentAdminCancelDeclare', params, function() { location.reload(); });
+    var params = { comment_srl: comment_srl.join(',') };
+	Rhymix.ajax('comment.procCommentAdminCancelDeclare', params, function() {
+		location.reload();
+	});
 }
 
 function insertSelectedModule(id, module_srl, mid, browser_title) {
@@ -26,7 +27,7 @@ function getCommentList()
 	var commentListTable = jQuery('#commentListTable');
 	var cartList = [];
 	commentListTable.find(':checkbox[name=cart]').each(function(){
-		if(this.checked) cartList.push(this.value); 
+		if(this.checked) cartList.push(this.value);
 	});
 
     var params = new Array();
diff --git a/modules/communication/scripts/cleanMessageFiles.php b/modules/communication/scripts/cleanMessageFiles.php
new file mode 100644
index 000000000..c56ee3094
--- /dev/null
+++ b/modules/communication/scripts/cleanMessageFiles.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * This script deletes old message attachments.
+ *
+ * Files attached to member messages are not viewable by other users, but they
+ * take up space on the server. You may want to delete them after a certain
+ * number of days in order to prevent users from using messages as a sort of
+ * private storage space.
+ */
+if (!defined('RX_VERSION'))
+{
+	exit;
+}
+
+// Initialize the exit status.
+$exit_status = 0;
+
+// Delete attachments older than this number of days.
+$days = intval($args[0] ?? 0) ?: 30;
+
+// Initialize objects.
+$oDB = DB::getInstance();
+$oFileController = FileController::getInstance();
+
+// Find and delete files where upload_target_type = msg.
+while (true)
+{
+	$output = executeQueryArray('file.getFileList', [
+		'upload_target_type' => 'msg',
+		'list_count' => 50,
+		'regdate_before' => date('YmdHis', time() - ($days * 86400)),
+	]);
+
+	if ($output->toBool())
+	{
+		if ($output->data)
+		{
+			$oDB->begin();
+			foreach ($output->data as $file_info)
+			{
+				$oFileController->deleteFile($file_info->file_srl);
+			}
+			$oDB->commit();
+
+			if ($output->page_navigation && $output->page_navigation->total_count == count($output->data))
+			{
+				break;
+			}
+		}
+		else
+		{
+			break;
+		}
+	}
+	else
+	{
+		echo "Error while deleting message attachments older than $days days.\n";
+		echo $output->getMessage() . "\n";
+		$exit_status = 11;
+		break;
+	}
+}
+if ($exit_status == 0)
+{
+	echo "Successfully deleted all message attachments older than $days days.\n";
+}
diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml
index dc576e769..d12549df1 100644
--- a/modules/document/conf/module.xml
+++ b/modules/document/conf/module.xml
@@ -49,6 +49,7 @@
 		<action name="procDocumentAdminInsertExtraVar" type="controller" permission="manager:config:*" check_var="module_srl" ruleset="insertExtraVar" />
 		<action name="procDocumentAdminDeleteExtraVar" type="controller" permission="manager:config:*" check_var="module_srl" />
 		<action name="procDocumentAdminMoveExtraVar" type="controller" permission="manager:config:*" check_var="module_srl" />
+		<action name="procDocumentAdminReorderExtraVars" type="controller" permission="manager:config:*" check_var="module_srl" />
 		<action name="procDocumentAdminRecalculateCategoryCounts" type="controller" />
 	</actions>
 	<eventHandlers>
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index da9886f9d..6f8f5b7fb 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -246,29 +246,50 @@ class DocumentAdminController extends Document
 		$type = Context::get('type');
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
+		if (!$type || !$module_srl || !$var_idx)
+		{
+			throw new Rhymix\Framework\Exceptions\InvalidRequest;
+		}
 
-		if(!$type || !$module_srl || !$var_idx) throw new Rhymix\Framework\Exceptions\InvalidRequest;
+		$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
+		if (!$module_info || !$module_info->module_srl)
+		{
+			throw new Rhymix\Framework\Exceptions\TargetNotFound;
+		}
 
-		$oModuleModel = getModel('module');
-		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info->module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
+		$extra_keys = DocumentModel::getExtraKeys($module_srl);
+		if (!$extra_keys)
+		{
+			throw new Rhymix\Framework\Exceptions\TargetNotFound;
+		}
+		if (!$extra_keys[$var_idx])
+		{
+			throw new Rhymix\Framework\Exceptions\InvalidRequest;
+		}
 
-		$oDocumentModel = getModel('document');
-		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!$extra_keys[$var_idx]) throw new Rhymix\Framework\Exceptions\InvalidRequest;
-
-		if($type == 'up') $new_idx = $var_idx-1;
-		else $new_idx = $var_idx+1;
-		if($new_idx<1) throw new Rhymix\Framework\Exceptions\InvalidRequest;
+		$new_idx = ($type === 'up') ? $var_idx - 1 : $var_idx + 1;
+		if ($new_idx < 1)
+		{
+			throw new Rhymix\Framework\Exceptions\InvalidRequest;
+		}
 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->var_idx = $new_idx;
 		$output = executeQuery('document.getDocumentExtraKeys', $args);
-		if (!$output->toBool()) return $output;
-		if (!$output->data) throw new Rhymix\Framework\Exceptions\InvalidRequest;
+		if (!$output->toBool())
+		{
+			return $output;
+		}
+		if (!$output->data)
+		{
+			throw new Rhymix\Framework\Exceptions\InvalidRequest;
+		}
 		unset($args);
 
+		$oDB = DB::getInstance();
+		$oDB->begin();
+
 		// update immediately if there is no idx to change
 		if(!$extra_keys[$new_idx])
 		{
@@ -277,11 +298,19 @@ class DocumentAdminController extends Document
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
-			// replace if exists
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 		}
+		// replace if exists
 		else
 		{
 			$args = new stdClass();
@@ -289,25 +318,174 @@ class DocumentAdminController extends Document
 			$args->var_idx = $new_idx;
 			$args->new_idx = -10000;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 
 			$args->var_idx = -10000;
 			$args->new_idx = $var_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 		}
 
+		$oDB->commit();
+
+		Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
+	}
+
+	/**
+	 * Reorder extra vars of a module.
+	 */
+	public function procDocumentAdminReorderExtraVars()
+	{
+		// Validate input data.
+		$module_srl = intval(Context::get('module_srl'));
+		$order = Context::get('order');
+		if (!$module_srl || !$order || !is_array($order))
+		{
+			throw new Rhymix\Framework\Exceptions\InvalidRequest;
+		}
+		foreach ($order as $key => $val)
+		{
+			$order[$key] = $val = (object)$val;
+			if (empty($val->eid))
+			{
+				throw new Rhymix\Framework\Exceptions\InvalidRequest;
+			}
+		}
+
+		// Validate module info and existing extra keys.
+		$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
+		if (!$module_info || !$module_info->module_srl)
+		{
+			throw new Rhymix\Framework\Exceptions\TargetNotFound;
+		}
+
+		$extra_keys = DocumentModel::getExtraKeys($module_srl);
+		if (!$extra_keys)
+		{
+			throw new Rhymix\Framework\Exceptions\TargetNotFound;
+		}
+		$extra_keys = array_combine(array_map(function($item) {
+			return $item->eid;
+		}, $extra_keys), array_values($extra_keys));
+
+		// Calculate changes.
+		// We don't actually do anything with the submitted values of old/new idx.
+		// We calculate them anew with the data we have on the server.
+		$changes = [];
+		$i = 1;
+		foreach ($order as $key => $val)
+		{
+			if (!isset($extra_keys[$val->eid]))
+			{
+				continue;
+			}
+			if ($i != $extra_keys[$val->eid]->idx)
+			{
+				$changes[] = [
+					'eid' => $val->eid,
+					'old_idx' => $extra_keys[$val->eid]->idx,
+					'new_idx' => $i,
+				];
+			}
+			$i++;
+		}
+
+		// Begin transaction.
+		$oDB = DB::getInstance();
+		$oDB->begin();
+
+		// Apply changes.
+		// We need to do this twice because of the unique constraint.
+		foreach ($changes as $change)
+		{
+			$output = executeQuery('document.updateDocumentExtraKeyIdx', [
+				'module_srl' => $module_srl,
+				'eid' => $change['eid'],
+				'var_idx' => $change['old_idx'],
+				'new_idx' => $change['new_idx'] - 10000,
+			]);
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
+
+			$output = executeQuery('document.updateDocumentExtraVarIdx', [
+				'module_srl' => $module_srl,
+				'eid' => $change['eid'],
+				'var_idx' => $change['old_idx'],
+				'new_idx' => $change['new_idx'] - 10000,
+			]);
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
+		}
+		foreach ($changes as $change)
+		{
+			$output = executeQuery('document.updateDocumentExtraKeyIdx', [
+				'module_srl' => $module_srl,
+				'var_idx' => $change['new_idx'] - 10000,
+				'new_idx' => $change['new_idx'],
+			]);
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
+
+			$output = executeQuery('document.updateDocumentExtraVarIdx', [
+				'module_srl' => $module_srl,
+				'var_idx' => $change['new_idx'] - 10000,
+				'new_idx' => $change['new_idx'],
+			]);
+			if (!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
+		}
+
+		// Commit.
+		$oDB->commit();
+
+		// Clear cache.
 		Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
 	}
 
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 09b02f78f..4a26c0bf4 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1780,6 +1780,7 @@ class DocumentController extends Document
 			$output = executeQuery('document.updateDocumentExtraVar', $obj);
 		}
 
+		unset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]);
 		Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
 		return $output;
 	}
@@ -1836,6 +1837,7 @@ class DocumentController extends Document
 
 		$oDB->commit();
 
+		unset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]);
 		Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
 		return new BaseObject();
 	}
@@ -3714,6 +3716,7 @@ Content;
 		if ($type === 'all' || $type === 'extra_vars')
 		{
 			unset($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+			unset($GLOBALS['XE_EXTRA_CHK'][$document_srl]);
 			unset($GLOBALS['RX_DOCUMENT_LANG'][$document_srl]);
 		}
 	}
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index fc1e32a38..2520d0650 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -55,19 +55,16 @@ class DocumentModel extends Document
 			return;
 		}
 
-		static $checked = array();
-		static $module_extra_keys = array();
-
 		// check documents
 		$document_srls = array();
 		foreach($_document_list as $document_srl => $oDocument)
 		{
-			if(isset($checked[$document_srl]) || !($oDocument instanceof documentItem) || !$oDocument->isExists())
+			if(isset($GLOBALS['XE_EXTRA_CHK'][$document_srl]) || !($oDocument instanceof documentItem) || !$oDocument->isExists())
 			{
 				continue;
 			}
 
-			$checked[$document_srl] = true;
+			$GLOBALS['XE_EXTRA_CHK'][$document_srl] = true;
 			$document_srls[] = $document_srl;
 		}
 
@@ -102,16 +99,16 @@ class DocumentModel extends Document
 			if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
 			{
 				// get extra keys of the module
-				if(!isset($module_extra_keys[$module_srl]))
+				if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
 				{
-					$module_extra_keys[$module_srl] = self::getExtraKeys($module_srl);
+					$GLOBALS['XE_EXTRA_KEYS'][$module_srl] = self::getExtraKeys($module_srl);
 				}
 
 				// set extra variables of the document
-				if($module_extra_keys[$module_srl])
+				if(!empty($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
 				{
 					$document_extra_vars = array();
-					foreach($module_extra_keys[$module_srl] as $idx => $key)
+					foreach($GLOBALS['XE_EXTRA_KEYS'][$module_srl] as $idx => $key)
 					{
 						$document_extra_vars[$idx] = clone($key);
 
@@ -1491,11 +1488,13 @@ class DocumentModel extends Document
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-				case 'regdate' :
-				case 'last_update' :
 				case 'ipaddress' :
 					$args->{'s_' . $search_target} = str_replace(' ', '%', $search_keyword);
 					break;
+				case 'regdate' :
+				case 'last_update' :
+					$args->{'s_' . $search_target} = preg_replace('/[^\d]/', '', $search_keyword);
+					break;
 				case 'member_srl' :
 				case 'readed_count' :
 				case 'voted_count' :
diff --git a/modules/document/queries/updateDocumentExtraKeyIdx.xml b/modules/document/queries/updateDocumentExtraKeyIdx.xml
index c99ed6ee6..f0a301328 100644
--- a/modules/document/queries/updateDocumentExtraKeyIdx.xml
+++ b/modules/document/queries/updateDocumentExtraKeyIdx.xml
@@ -7,6 +7,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+		<condition operation="equal" column="var_idx" var="var_idx" filter="number" />
+        <condition operation="equal" column="eid" var="eid" />
     </conditions>
 </query>
diff --git a/modules/document/queries/updateDocumentExtraVarIdx.xml b/modules/document/queries/updateDocumentExtraVarIdx.xml
index 1620b2132..8e641dc0e 100644
--- a/modules/document/queries/updateDocumentExtraVarIdx.xml
+++ b/modules/document/queries/updateDocumentExtraVarIdx.xml
@@ -7,6 +7,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="var_idx" var="var_idx" filter="number" />
+        <condition operation="equal" column="eid" var="eid" />
     </conditions>
 </query>
diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html
index 3e2eba8f5..d7f16b059 100644
--- a/modules/document/tpl/extra_keys.html
+++ b/modules/document/tpl/extra_keys.html
@@ -110,7 +110,7 @@
 			<a class="x_btn" href="{getUrl('type','insertExtraForm','selected_var_idx','')}">{$lang->cmd_insert}</a>
 		</div>
 	</div>
-	<table class="x_table x_table-striped x_table-hover">
+	<table class="x_table x_table-striped x_table-hover sortable extra_keys" data-module-srl="{$module_srl}">
 		<thead>
 			<tr class="nowr">
 				<th>{$lang->no}</th>
@@ -123,10 +123,15 @@
 				<th>&nbsp;</th>
 			</tr>
 		</thead>
-		<tbody>
+		<tbody class="uDrag">
 			<block loop="$extra_keys => $key,$val">
-			<tr>
-				<td rowspan="2"|cond="$val->desc">{$val->idx}</td>
+			<tr data-eid="{$val->eid}" data-idx="{$val->idx}">
+				<td>
+					<div class="wrap" style="user-select:none">
+						<button type="button" class="dragBtn">Move to</button>
+						<span class="var_idx">{$val->idx}</span>
+					</div>
+				</td>
 				<td>{$val->eid}</td>
 				<td class="nowr"><strong>{$val->name}</strong></td>
 				<td class="nowr">{$lang->column_type_list[$val->type]}</td>
@@ -144,9 +149,6 @@
 					<button type="button" class="x_icon-trash" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');">{$lang->cmd_delete}</button>
 				</td>
 			</tr>
-			<tr cond="$val->desc">
-				<td colspan="7">{$val->desc}</td>
-			</tr>
 			</block>
 		</tbody>
 	</table>
diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js
index afd1d8df2..b22aa82bf 100644
--- a/modules/document/tpl/js/document_admin.js
+++ b/modules/document/tpl/js/document_admin.js
@@ -3,12 +3,10 @@
  * @brief 모든 생성된 섬네일 삭제하는 액션 호출
  **/
 function doDeleteAllThumbnail() {
-    exec_xml('document','procDocumentAdminDeleteAllThumbnail', [], completeDeleteAllThumbnail);
-}
-
-function completeDeleteAllThumbnail(ret_obj) {
-    alert(ret_obj['message']);
-    location.reload();
+    Rhymix.ajax('document.procDocumentAdminDeleteAllThumbnail', {}, function(ret_obj) {
+    	alert(ret_obj['message']);
+    	location.reload();
+	});
 }
 
 /* 선택된 글의 삭제 또는 이동 */
@@ -28,22 +26,20 @@ function completeManageDocument(ret_obj) {
     window.close();
 }
 
-
+/* 신고 취소 */
 function doCancelDeclare() {
     var document_srl = [];
-    jQuery('#fo_list input[name=cart]:checked').each(function() {
-        document_srl[document_srl.length] = jQuery(this).val();
+    $('#fo_list input[name=cart]:checked').each(function() {
+        document_srl.push($(this).val());
     });
+    if (document_srl.length < 1) {
+		return;
+	}
 
-    if(document_srl.length<1) return;
-
-    var params = {document_srl : document_srl.join(',')};
-
-    exec_xml('document','procDocumentAdminCancelDeclare', params, completeCancelDeclare);
-}
-
-function completeCancelDeclare(ret_obj) {
-    location.reload();
+    var params = { document_srl : document_srl.join(',') };
+    Rhymix.ajax('document.procDocumentAdminCancelDeclare', params, function() {
+		location.reload();
+	});
 }
 
 function completeInsertExtraVar(ret_obj) {
@@ -93,8 +89,9 @@ function moveVar(type, module_srl, var_idx) {
 		module_srl : module_srl,
 		var_idx    : var_idx
 	};
-    var response_tags = ['error','message'];
-    exec_xml('document','procDocumentAdminMoveExtraVar', params, function() { location.reload() });
+    Rhymix.ajax('document.procDocumentAdminMoveExtraVar', params, function() {
+		location.reload();
+	});
 }
 
 function completeRestoreTrash(ret_obj) {
diff --git a/modules/document/tpl/js/document_extra_keys.js b/modules/document/tpl/js/document_extra_keys.js
index 57a006239..f4404f0a2 100644
--- a/modules/document/tpl/js/document_extra_keys.js
+++ b/modules/document/tpl/js/document_extra_keys.js
@@ -1,5 +1,31 @@
 (function($) {
 	$(function() {
+
+		// Reorder extra keys
+		$('table.extra_keys.sortable').on('after-drag.st', function(e) {
+			const $table = $(this);
+			let order = [];
+			let i = 1;
+			$table.find('tbody > tr').each(function() {
+				order.push({
+					eid: $(this).data('eid'),
+					old_idx: parseInt($(this).data('idx'), 10),
+					new_idx: i++
+				});
+			});
+			Rhymix.ajax('document.procDocumentAdminReorderExtraVars', {
+				module_srl: $(this).data('moduleSrl'),
+				order: order
+			}, function() {
+				let i = 1;
+				$table.find('.var_idx').each(function() {
+					$(this).text(i);
+					i++;
+				});
+			});
+		});
+
+		// Show or hide fields depending on the type of variable
 		$('select#type').on('change', function() {
 			const selected_type = $(this).val();
 			$(this).parents('form').find('.x_control-group').each(function() {
@@ -21,5 +47,6 @@
 				}
 			});
 		}).triggerHandler('change');
+
 	});
 })(jQuery);
diff --git a/modules/editor/skins/ckeditor/file_upload.html b/modules/editor/skins/ckeditor/file_upload.html
index 4bfd9ac34..7d808c24f 100644
--- a/modules/editor/skins/ckeditor/file_upload.html
+++ b/modules/editor/skins/ckeditor/file_upload.html
@@ -58,10 +58,10 @@
 </div>
 
 <script>
-	window.xe.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
-	window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
-	window.xe.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
-	window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
-	window.xe.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
-	window.xe.msg_file_upload_error = '{$lang->msg_file_upload_error}';
+	xe.lang.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
+	xe.lang.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
+	xe.lang.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
+	xe.lang.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
+	xe.lang.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
+	xe.lang.msg_file_upload_error = '{$lang->msg_file_upload_error}';
 </script>
diff --git a/modules/editor/tpl/js/editor_common.js b/modules/editor/tpl/js/editor_common.js
index f8c6ed421..92dcaa50c 100644
--- a/modules/editor/tpl/js/editor_common.js
+++ b/modules/editor/tpl/js/editor_common.js
@@ -211,7 +211,7 @@ function openComponent(component_name, editor_sequence, manual_url) {
 	if(typeof(current_mid)!="undefined" && current_mid) popup_url += "&mid="+escape(current_mid);
 
 	if (navigator.userAgent.match(/mobile/i)) {
-		openFullScreenIframe(popup_url, 'editorComponent');
+		openModalIframe(popup_url, 'editorComponent');
 	} else {
 		popopen(popup_url, 'editorComponent');
 	}
@@ -244,7 +244,7 @@ function editorSearchComponent(evt) {
 		if(editorMode[editor_sequence]=='html') return;
 		var popup_url = request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&module_srl="+editor_sequence
 		if (navigator.userAgent.match(/mobile/i)) {
-			openFullScreenIframe(popup_url, 'GenerateCodeInPage');
+			openModalIframe(popup_url, 'GenerateCodeInPage');
 		} else {
 			popopen(popup_url, 'GenerateCodeInPage');
 		}
diff --git a/modules/editor/tpl/js/editor_module_config.js b/modules/editor/tpl/js/editor_module_config.js
index aec78d0b0..7e9052802 100644
--- a/modules/editor/tpl/js/editor_module_config.js
+++ b/modules/editor/tpl/js/editor_module_config.js
@@ -1,5 +1,7 @@
 "use strict";
 
+function getEditorSkinColorList() { }
+
 (function($) {
 	$(function() {
 		$('.editor_skin_selector').on('change', function() {
@@ -18,4 +20,4 @@
 			}
 		});
 	});
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index 5c252c20a..dccee31b7 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -1265,7 +1265,14 @@ class FileController extends File
 				$adjusted['height'] = (int)$resize_height;
 				if (!$is_animated && $adjusted['type'] === $image_info['type'] && $config->max_image_size_same_format !== 'Y')
 				{
-					$adjusted['type'] = $config->max_image_size_same_format ?: 'jpg';
+					if (in_array($config->max_image_size_same_format, ['jpg', 'png', 'webp']))
+					{
+						$adjusted['type'] = $config->max_image_size_same_format;
+					}
+					else
+					{
+						$adjusted['type'] = 'jpg';
+					}
 				}
 			}
 		}
diff --git a/modules/file/scripts/cleanEmptyDirs.php b/modules/file/scripts/cleanEmptyDirs.php
new file mode 100644
index 000000000..ced824662
--- /dev/null
+++ b/modules/file/scripts/cleanEmptyDirs.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This script deletes empty directories under the 'files' directory.
+ *
+ * It may be useful when your web host imposes a hard limit on the number of
+ * inodes, or when your backups take too long due to the large number of
+ * unused directories.
+ *
+ * This script only works on Unix-like operating systems where the 'find'
+ * command is available.
+ */
+if (!defined('RX_VERSION'))
+{
+	exit;
+}
+
+// Initialize the exit status.
+$exit_status = 0;
+
+// Delete empty directories in the attachment directory.
+passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/attach')), $result);
+if ($result == 0)
+{
+	echo "Successfully deleted all empty directories under files/attach.\n";
+}
+else
+{
+	echo "Error while deleting empty directories under files/attach.\n";
+	$exit_status = $result;
+}
+
+// Delete empty directories in the member extra info directory.
+passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/member_extra_info')), $result);
+if ($result == 0)
+{
+	echo "Successfully deleted all empty directories under files/member_extra_info.\n";
+}
+else
+{
+	echo "Error while deleting empty directories under files/member_extra_info.\n";
+	$exit_status = $result;
+}
+
+// Delete empty directories in the thumbnails directory.
+passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/thumbnails')), $result);
+if ($result == 0)
+{
+	echo "Successfully deleted all empty directories under files/thumbnails.\n";
+}
+else
+{
+	echo "Error while deleting empty directories under files/thumbnails.\n";
+	$exit_status = $result;
+}
+
+// Set the exit status if there were any errors.
+if ($exit_status != 0)
+{
+	exit($exit_status);
+}
diff --git a/modules/file/scripts/cleanGarbageFiles.php b/modules/file/scripts/cleanGarbageFiles.php
new file mode 100644
index 000000000..30f102465
--- /dev/null
+++ b/modules/file/scripts/cleanGarbageFiles.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * This script deletes files that were not properly uploaded.
+ *
+ * Files can remain in an invalid status for two reasons: 1) a user abandons
+ * a document or comment after uploading files; or 2) a chunked upload is
+ * aborted without the server having any opportunity to clean it up.
+ * These files can obviously take up a lot of disk space. In order to prevent
+ * them from accumulating too much, you should run this script at least once
+ * every few days.
+ */
+if (!defined('RX_VERSION'))
+{
+	exit;
+}
+
+// Initialize the exit status.
+$exit_status = 0;
+
+// Delete garbage files older than this number of days.
+$days = intval($args[0] ?? 0) ?: 10;
+
+// Initialize objects.
+$oDB = DB::getInstance();
+$oFileController = FileController::getInstance();
+
+// Find and delete files where isvalid = N.
+while (true)
+{
+	$output = executeQueryArray('file.getFileList', [
+		'isvalid' => 'N',
+		'list_count' => 50,
+		'regdate_before' => date('YmdHis', time() - ($days * 86400)),
+	]);
+
+	if ($output->toBool())
+	{
+		if ($output->data)
+		{
+			$oDB->begin();
+			foreach ($output->data as $file_info)
+			{
+				$oFileController->deleteFile($file_info->file_srl);
+			}
+			$oDB->commit();
+
+			if ($output->page_navigation && $output->page_navigation->total_count == count($output->data))
+			{
+				break;
+			}
+		}
+		else
+		{
+			break;
+		}
+	}
+	else
+	{
+		echo "Error while deleting garbage files older than $days days.\n";
+		echo $output->getMessage() . "\n";
+		$exit_status = 11;
+		break;
+	}
+}
+if ($exit_status == 0)
+{
+	echo "Successfully deleted all garbage files older than $days days.\n";
+}
+
+// Find and delete temporary chunks.
+$dirname = RX_BASEDIR . 'files/attach/chunks';
+$threshold = time() - ($days * 86400);
+$chunks = Rhymix\Framework\Storage::readDirectory($dirname);
+if ($chunks)
+{
+	foreach ($chunks as $chunk)
+	{
+		if (@filemtime($chunk) < $threshold)
+		{
+			$result = Rhymix\Framework\Storage::delete($chunk);
+			if (!$result)
+			{
+				$exit_status = 12;
+			}
+		}
+	}
+}
+if ($exit_status == 0)
+{
+	echo "Successfully deleted temporary file chunks older than $days days.\n";
+}
+else
+{
+	echo "Error while deleting temporary file chunks older than $days days.\n";
+}
+
+// Set the exit status if there were any errors.
+if ($exit_status != 0)
+{
+	exit($exit_status);
+}
diff --git a/modules/file/scripts/cleanThumbnails.php b/modules/file/scripts/cleanThumbnails.php
new file mode 100644
index 000000000..20cda9a32
--- /dev/null
+++ b/modules/file/scripts/cleanThumbnails.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This script deletes old thumbnails.
+ *
+ * Thumbnails can take up a large amount of disk space and inodes if they are
+ * allowed to accumulate. Since most websites only need thumbnails for recent
+ * posts, it is okay to delete old thumbnails.
+ *
+ * Do not run this script if you have a gallery-style module where visitors
+ * regularly view old posts. This will force thumbnails to be regenerated,
+ * increasing the server load and making your pages load slower.
+ *
+ * This script only works on Unix-like operating systems where the 'find'
+ * command is available.
+ */
+if (!defined('RX_VERSION'))
+{
+	exit;
+}
+
+// Initialize the exit status.
+$exit_status = 0;
+
+// Delete thumbnails older than this number of days.
+$days = intval($args[0] ?? 0) ?: 90;
+
+// Delete old thumbnails.
+passthru(sprintf('find %s -type f -mtime +%d -delete', escapeshellarg(RX_BASEDIR . 'files/thumbnails'), abs($days)), $result);
+if ($result == 0)
+{
+	echo "Successfully deleted thumbnails older than $days days.\n";
+}
+else
+{
+	echo "Error while deleting thumbnails older than $days days.\n";
+	$exit_status = $result;
+}
+
+// Set the exit status if there were any errors.
+if ($exit_status != 0)
+{
+	exit($exit_status);
+}
diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php
index 27d4e29d8..1c91c230e 100644
--- a/modules/importer/importer.admin.controller.php
+++ b/modules/importer/importer.admin.controller.php
@@ -18,11 +18,6 @@ class importerAdminController extends importer
 	 * @var int
 	 */
 	var $unit_count = 300;
-	/**
-	 * Xml parser
-	 * @var XmlParser
-	 */
-	var $oXmlParser = null;
 
 	/**
 	 * Initialization
@@ -346,8 +341,6 @@ class importerAdminController extends importer
 	function importMember($key, $cur, $index_file)
 	{
 		if(!$cur) $cur = 0;
-		// Create the xmlParser object
-		$oXmlParser = new XeXmlParser();
 		// Create objects for importing member information
 		$this->oMemberController = getController('member');
 		$this->oMemberModel = getModel('member');
@@ -368,7 +361,7 @@ class importerAdminController extends importer
 			// Find a given location
 			$target_file = trim(fgets($f, 1024));
 			// Load and parse the file
-			$xmlObj = $oXmlParser->loadXmlFile($target_file);
+			$xmlObj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($target_file);
 			FileHandler::removeFile($target_file);
 			if(!$xmlObj) continue;
 			// List Objects
@@ -539,8 +532,6 @@ class importerAdminController extends importer
 	function importMessage($key, $cur, $index_file)
 	{
 		if(!$cur) $cur = 0;
-		// Create the xmlParser object
-		$oXmlParser = new XeXmlParser();
 		// Open an index file
 		$f = fopen($index_file,"r");
 		// Pass if already read
@@ -552,7 +543,7 @@ class importerAdminController extends importer
 			// Find a location
 			$target_file = trim(fgets($f, 1024));
 			// Load and parse the file
-			$xmlObj = $oXmlParser->loadXmlFile($target_file);
+			$xmlObj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($target_file);
 			FileHandler::removeFile($target_file);
 			if(!$xmlObj) continue;
 			// List objects
@@ -638,8 +629,6 @@ class importerAdminController extends importer
 	 */
 	function importModule($key, $cur, $index_file, $module_srl)
 	{
-		// Pre-create the objects needed
-		$this->oXmlParser = new XeXmlParser();
 		// Get category information of the target module
 		$oDocumentController = getController('document');
 		$oDocumentModel = getModel('document');
@@ -651,9 +640,7 @@ class importerAdminController extends importer
 		if(file_exists($category_file))
 		{
 			$buff = FileHandler::readFile($category_file);
-
-			// Create the xmlParser object
-			$xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
+			$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($category_file);
 
 			$categories = $xmlDoc->items->category;
 			if($categories)
@@ -757,7 +744,7 @@ class importerAdminController extends importer
 				if($started) $buff[] = $str;
 			}
 
-			$xmlDoc = $this->oXmlParser->parse(implode('', $buff));
+			$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString(implode('', $buff));
 
 			$category = base64_decode($xmlDoc->post->category->body);
 			if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
@@ -901,7 +888,7 @@ class importerAdminController extends importer
 			// If </trackback>, insert to the DB
 			if(trim($str) == '</trackback>')
 			{
-				$xmlDoc = $this->oXmlParser->parse($buff);
+				$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
 
 				$obj = new stdClass;
 				$obj->trackback_srl = getNextSequence();
@@ -963,7 +950,7 @@ class importerAdminController extends importer
 			// If </comment> is, insert to the DB
 			if(trim($str) == '</comment>')
 			{
-				$xmlDoc = $this->oXmlParser->parse($buff);
+				$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
 
 				$sequence = base64_decode($xmlDoc->comment->sequence->body);
 				$sequences[$sequence] = $obj->comment_srl;
@@ -1106,7 +1093,7 @@ class importerAdminController extends importer
 			// If it ends with </attach>, handle attachements
 			if(trim($str) == '</attach>')
 			{
-				$xmlDoc = $this->oXmlParser->parse($buff.$str);
+				$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff.$str);
 
 				$file_obj->source_filename = base64_decode($xmlDoc->attach->filename->body);
 				$file_obj->download_count = base64_decode($xmlDoc->attach->download_count->body);
@@ -1250,14 +1237,13 @@ class importerAdminController extends importer
 		if(!$buff) return array();
 
 		$buff = '<extra_vars>'.$buff;
-		$oXmlParser = new XeXmlParser();
-		$xmlDoc = $this->oXmlParser->parse($buff);
+		$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
 		if(empty($xmlDoc->extra_vars->key)) return array();
 
 		$index = 1;
 		foreach($xmlDoc->extra_vars->key as $k => $v)
 		{
-			unset($vobj);
+			$vobj = new stdClass();
 			if($v->var_idx)
 			{
 				$vobj->var_idx = base64_decode($v->var_idx->body);
diff --git a/modules/importer/ttimport.class.php b/modules/importer/ttimport.class.php
index d6735e582..1e6855ae3 100644
--- a/modules/importer/ttimport.class.php
+++ b/modules/importer/ttimport.class.php
@@ -13,12 +13,6 @@
  */
 class ttimport
 {
-	/**
-	 * Xml Parse
-	 * @var XmlParser
-	 */
-	var $oXmlParser = null;
-
 	/**
 	 * Import data in module.xml format
 	 * @param int $key
@@ -33,8 +27,6 @@ class ttimport
 	 */
 	function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name=null)
 	{
-		// Pre-create the objects needed
-		$this->oXmlParser = new XeXmlParser();
 		// Get category information of the target module
 		$oDocumentController = getController('document');
 		$oDocumentModel = getModel('document');
@@ -45,8 +37,8 @@ class ttimport
 		$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
 		if(file_exists($category_file))
 		{
-			// Create the xmlParser object
-			$xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
+			$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlFile($category_file);
+
 			// List category information
 			if($xmlDoc->categories->category)
 			{
@@ -62,7 +54,7 @@ class ttimport
 
 					$obj = null;
 					$obj->title = $category;
-					$obj->module_srl = $module_srl; 
+					$obj->module_srl = $module_srl;
 					if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
 					$output = $oDocumentController->insertCategory($obj);
 
@@ -126,7 +118,7 @@ class ttimport
 				if($started) $buff .= $str;
 			}
 
-			$xmlDoc = $this->oXmlParser->parse('<post>'.$buff);
+			$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlString('<post>'.$buff);
 
 			$author_xml_id = $xmlDoc->post->author->body;
 
@@ -250,7 +242,7 @@ class ttimport
 				// Save state if not published
 				if(!in_array($xmlDoc->post->visibility->body, $status_published))
 				{
-					$obj->module_srl = $member_info->member_srl; 
+					$obj->module_srl = $member_info->member_srl;
 				}
 			}
 			// Document
@@ -288,8 +280,8 @@ class ttimport
 		$guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
 		if(file_exists($guestbook_file))
 		{
-			// Create the xmlParser object
-			$xmlDoc = $this->oXmlParser->loadXmlFile($guestbook_file);
+			$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlFile($guestbook_file);
+
 			// Handle guest book information
 			if($guestbook_module_srl && $xmlDoc->guestbook->comment)
 			{
@@ -480,7 +472,7 @@ class ttimport
 
 		$buff .= '</attachment>';
 
-		$xmlDoc = $this->oXmlParser->parse($buff);
+		$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlString($buff);
 
 		$file_obj->source_filename = $xmlDoc->attachment->label->body;
 		$file_obj->download_count = $xmlDoc->attachment->downloads->body;
@@ -516,7 +508,7 @@ class ttimport
 		{
 			$uploaded_count++;
 			$tmp_obj = null;
-			if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
+			if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename;
 			else $files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
 			$files[$name]->direct_download = $file_obj->direct_download;
 			$files[$name]->source_filename = $file_obj->source_filename;
@@ -583,7 +575,7 @@ class ttimport
 			if(preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename))
 			{
 				return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
-				// If other multimedia file but image is, 
+				// If other multimedia file but image is,
 			}
 			else
 			{
@@ -606,7 +598,7 @@ class ttimport
 		$key = $matches[1];
 		if(!$key) return $matches[0];
 
-		return 
+		return
 			'<object type="application/x-shockwave-flash" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="402">'.
 			'<param name="movie" value="http://flvs.daum.net/flvPlayer.swf?vid='.urlencode($key).'"/>'.
 			'<param name="allowScriptAccess" value="always"/>'.
diff --git a/modules/krzip/krzip.model.php b/modules/krzip/krzip.model.php
index c5749f63d..e571bdc5d 100644
--- a/modules/krzip/krzip.model.php
+++ b/modules/krzip/krzip.model.php
@@ -173,8 +173,7 @@ class krzipModel extends krzip
 			$request_config
 		);
 
-		$oXmlParser = new XeXmlParser();
-		$result = $oXmlParser->parse($buff);
+		$result = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
 		if($result->error)
 		{
 			$err_msg = trim($result->error->message->body);
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index b3f2f96ad..b8f047fec 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -572,13 +572,17 @@ class LayoutModel extends Layout
 			return $layout_info;
 		}
 		// If no cache file exists, parse the xml and then return the variable.
-		$oXmlParser = new XeXmlParser();
-		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
+		$tmp_xml_obj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($xml_file);
+		if (!$tmp_xml_obj)
+		{
+			return;
+		}
 
-		if($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
-		elseif($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
-
-		if(!$xml_obj) return;
+		$xml_obj = !empty($tmp_xml_obj->layout) ? $tmp_xml_obj->layout : $tmp_xml_obj->skin;
+		if (!$xml_obj)
+		{
+			return;
+		}
 
 		$buff = array();
 		$buff[] = '$layout_info = new stdClass;';
diff --git a/modules/layout/tpl/layout_info_view.html b/modules/layout/tpl/layout_info_view.html
index a9fbb7322..1d32aa128 100644
--- a/modules/layout/tpl/layout_info_view.html
+++ b/modules/layout/tpl/layout_info_view.html
@@ -53,10 +53,10 @@
 		<h1>{$lang->extra_vars}</h1>
 		{@$cnt = 1}
 		<block loop="$selected_layout->extra_var => $name, $var">
-			<block cond="$cnt == 1 && $var->group"><div class="x_tabbable"><ul class="x_nav x_nav-tabs"></block>
-			<block cond="$group != $var->group">
+			<block cond="$cnt == 1 && !empty($var->group)"><div class="x_tabbable"><ul class="x_nav x_nav-tabs"></block>
+			<block cond="($group ?? null) != ($var->group ?? null)">
 				<li class="x_active"|cond="$cnt == 1"><a href="#extra_var{$cnt}" data-index="{$cnt}">{$var->group}</a></li>
-				{@$group = $var->group}
+				{@$group = $var->group ?? null}
 				{@$cnt ++}
 			</block>
 		</block>
@@ -77,7 +77,7 @@
 				<label class="x_control-label" for="{$name}"|cond="$var->type!='text'&&$var->type!='textarea'" for="lang_{$name}"|cond="$var->type=='text'||$var->type=='textarea'">{$var->title}</label>
 				<div class="x_controls">
 					<div cond="$var->type == 'text'">
-						<input type="text" name="{$name}" id="{$name}" class="lang_code" value="<!--@if(strpos($var->value, "$user_lang->") !== false)-->{htmlspecialchars($var->value, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}<!--@else-->{$var->value}<!--@end-->" />
+						<input type="text" name="{$name}" id="{$name}" class="lang_code" value="<!--@if(strpos($var->value ?? '', '$user_lang->') !== false)-->{htmlspecialchars($var->value ?? '', ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}<!--@else-->{$var->value}<!--@end-->" />
 					</div>
 
 					<div cond="$var->type == 'textarea'">
@@ -118,7 +118,7 @@
 					<block cond="$var->type == 'radio'">
 						<div class="x_thumbnails">
 							<block loop="$var->options => $key, $val">
-								<div class="x_span2 <!--@if($val->thumbnail)-->x_thumbnail<!--@end-->">
+								<div class="x_span2 <!--@if(!empty($val->thumbnail))-->x_thumbnail<!--@end-->">
 									<img src="../../../{$val->thumbnail}" cond="$val->thumbnail" alt="{$val->val}" />
 									<div class="x_caption">
 										<label><input type="radio" name="{$name}" value="{$key}" checked="checked"|cond="$key == $var->value" /> {$val->val}</label>
@@ -156,8 +156,8 @@
 
 	<div class="x_clearfix btnArea">
 		<span class="etc">
-			<a cond="$layout" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout, 'type', $type)}">{$lang->cmd_list}</a>
-			<a cond="!$layout" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList', 'type', $type)}">{$lang->cmd_list}</a>
+			<a cond="!empty($layout)" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout, 'type', $type ?? null)}">{$lang->cmd_list}</a>
+			<a cond="empty($layout)" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList', 'type', $type ?? null)}">{$lang->cmd_list}</a>
 		</span>
 		<span class="x_btn-group x_pull-right">
 			<input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" onclick="doSubmitConfig()"/>
diff --git a/modules/member/lang/en.php b/modules/member/lang/en.php
index 6e2bff345..305947b29 100644
--- a/modules/member/lang/en.php
+++ b/modules/member/lang/en.php
@@ -201,6 +201,9 @@ $lang->msg_email_address_not_changeable = 'You cannot change your email address
 $lang->msg_signup_disabled = 'You are not able to sign up';
 $lang->msg_already_logged = 'You have already signed up.';
 $lang->msg_not_logged = 'Please log in.';
+$lang->msg_required_not_logged = 'This page is only available to users who are not logged in.';
+$lang->msg_required_specific_group = 'You need to belong to a certain group in order to access this page.';
+$lang->msg_required_minimum_level = 'YOu need to be level %d or higher in order to access this page.';
 $lang->msg_insert_group_name = 'Please enter the name of group.';
 $lang->msg_check_group = 'Please select the group.';
 $lang->msg_not_uploaded_profile_image = 'Profile image could not be registered.';
diff --git a/modules/member/lang/ko.php b/modules/member/lang/ko.php
index 26840358d..d49ba42ea 100644
--- a/modules/member/lang/ko.php
+++ b/modules/member/lang/ko.php
@@ -203,6 +203,9 @@ $lang->msg_email_address_not_changeable = '이메일 주소는 이 화면에서
 $lang->msg_signup_disabled = '회원 가입할 수 없습니다.';
 $lang->msg_already_logged = '이미 로그인되어 있습니다.';
 $lang->msg_not_logged = '로그인이 필요합니다.';
+$lang->msg_required_not_logged = '로그인하지 않은 상태에서만 사용할 수 있는 기능입니다.';
+$lang->msg_required_specific_group = '이 기능을 사용할 수 있는 그룹이 제한되어 있습니다.';
+$lang->msg_required_minimum_level = '이 기능을 사용하려면 레벨 %d 이상이어야 합니다.';
 $lang->msg_insert_group_name = '그룹명을 입력해 주세요.';
 $lang->msg_check_group = '그룹을 선택해 주세요.';
 $lang->msg_not_uploaded_profile_image = '프로필 이미지를 등록할 수 없습니다.';
diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html
index efb7a18cb..25fca0481 100644
--- a/modules/member/tpl/group_list.html
+++ b/modules/member/tpl/group_list.html
@@ -23,7 +23,7 @@
 		<caption>
 			<strong>{count($group_list)}{$lang->msg_groups_exist}</strong>
 			<span class="x_pull-right" style="position:relative;top:7px">
-				{$lang->use_group_image_mark}: 
+				{$lang->use_group_image_mark}:
 				<label for="yes" class="x_inline"><input type="radio" name="group_image_mark" id="yes" value="Y" checked="checked"|cond="$config->group_image_mark == 'Y'" /> {$lang->cmd_yes}</label>
 				<label for="no" class="x_inline"><input type="radio" name="group_image_mark" id="no" value="N" checked="checked"|cond="$config->group_image_mark != 'Y'" /> {$lang->cmd_no}</label>
 			</span>
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index a61286cf1..8466159de 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -680,6 +680,7 @@
 						<select id="auth${PermId}">
 							<option class="_group_all" value="0">{$lang->grant_to_all}</option>
 							<option class="_group_loggedin" value="-1">{$lang->grant_to_login_user}</option>
+							<option class="_group_not_loggedin" value="-4">{$lang->grant_to_non_login_user}</option>
 							<option class="_group_manager" value="-3">{$lang->grant_to_admin}</option>
 							<option class="_group_selected" value="-10">{$lang->grant_to_group}</option>
 						</select>
@@ -1521,12 +1522,12 @@ jQuery(function($){
 
 	$(document.body).on("click", '._menuSelector_menuTreeContainer a', function(){
 		if($(this).hasClass('_nodeType_1')){
-			$.xeMsgBox.alert(xe.msg_no_root);
+			$.xeMsgBox.alert(xe.lang.msg_no_root);
 			return;
 		}
 
 		if($(this).hasClass('_nodeType_3')){
-			$.xeMsgBox.alert(xe.msg_no_shortcut);
+			$.xeMsgBox.alert(xe.lang.msg_no_shortcut);
 			return;
 		}
 
@@ -2328,7 +2329,8 @@ jQuery(function($){
 			var htGrantStrToSelectValMap = {
 				'all': '0',
 				'member': '-1',
-				'site': '-2',
+				'site': '-1',
+				'not_member': '-4',
 				'manager': '-3',
 				'group': '-10'
 			};
@@ -2366,7 +2368,7 @@ jQuery(function($){
 				/*
 					guest : 모든 옵션 사용 가능, 항상 권한 있음.
 					member : '모든 사용자' 제외하고 사용 가능, 로그인 정보가 있을 경우 true
-					site : '모든 사용자' 제외하고 사용 가능, 가상 사이트일 경우에는 가입된 그룹 정보가 있어야 하며, 가상 사이트가 아닐 경우에는 'member'와 동일.
+					not_member : 비로그인 사용자, 로그인 정보가 *없을* 경우 true
 					manager : '관리자만','선택그룹 사용자' 옵션만 사용가능, 관리자일 경우에만 true
 					root : manager와 동일.
 				*/
@@ -2377,6 +2379,9 @@ jQuery(function($){
 					case 'member':
 						$node.find('._group_all').remove();
 					break;
+					case 'not_member':
+						$node.find('._group_all').remove();
+					break;
 					case 'site':
 						$node.find('._group_all').remove();
 					break;
diff --git a/modules/module/lang/en.php b/modules/module/lang/en.php
index d9172183d..84b82034f 100644
--- a/modules/module/lang/en.php
+++ b/modules/module/lang/en.php
@@ -46,11 +46,12 @@ $lang->header_script = 'Header Script';
 $lang->about_header_script = 'You can input the html script between &lt;header&gt; and &lt;/header&gt; by yourself. You can use &lt;script&gt;, &lt;style&gt; or &lt;meta&gt; tags.';
 $lang->grant_access = 'Access';
 $lang->grant_manager = 'Management';
-$lang->grant_to_all = 'All users';
-$lang->grant_to_login_user = 'Login users';
+$lang->grant_to_all = 'Everyone';
+$lang->grant_to_login_user = 'Logged in users';
+$lang->grant_to_non_login_user = 'Logged out users';
 $lang->grant_to_site_user = 'Registered users';
 $lang->grant_to_admin = 'Administrator only';
-$lang->grant_to_group = 'Selected group users';
+$lang->grant_to_group = 'Selected group members';
 $lang->cmd_add_shortcut = 'Add Shortcut';
 $lang->cmd_install = 'Install';
 $lang->cmd_create_db_table = 'Create DB Table';
diff --git a/modules/module/lang/ko.php b/modules/module/lang/ko.php
index 212f0a39a..512e752df 100644
--- a/modules/module/lang/ko.php
+++ b/modules/module/lang/ko.php
@@ -46,11 +46,12 @@ $lang->header_script = '헤더 스크립트';
 $lang->about_header_script = 'HTML &lt;head&gt;...&lt;/head&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다. 예) &lt;script&gt;, &lt;style&gt;, &lt;meta&gt; ';
 $lang->grant_access = '접근 권한';
 $lang->grant_manager = '관리 권한';
-$lang->grant_to_all = '모든 사용자';
+$lang->grant_to_all = '모든 방문자';
 $lang->grant_to_login_user = '로그인 사용자';
+$lang->grant_to_non_login_user = '비로그인 사용자';
 $lang->grant_to_site_user = '가입한 사용자';
 $lang->grant_to_admin = '관리자만';
-$lang->grant_to_group = '선택 그룹 사용자';
+$lang->grant_to_group = '선택 그룹 소속 회원';
 $lang->cmd_add_shortcut = '바로가기 추가';
 $lang->cmd_install = '설치';
 $lang->cmd_create_db_table = 'DB Table 생성하기';
diff --git a/modules/module/models/Permission.php b/modules/module/models/Permission.php
index 5a3daa591..4f680a164 100644
--- a/modules/module/models/Permission.php
+++ b/modules/module/models/Permission.php
@@ -7,31 +7,138 @@ class Permission
 {
 	/**
 	 * Default properties.
-	 *
-	 * Note that $is_admin is an alias to $root,
-	 * and $is_site_admin is an alias to $manager.
 	 */
 	public $access;
 	public $root;
 	public $manager;
-	public $scopes;
 
 	/**
-	 * Alias to $root, kept for backward compatibility only.
-	 *
-	 * @deprecated
+	 * Requirements for this module.
 	 */
-	public $is_admin;
+	protected $_spec = [];
 
 	/**
-	 * Alias to $manager, kept for backward compatibility only.
-	 *
-	 * @deprecated
+	 * Scopes for module managers.
 	 */
-	public $is_site_admin;
+	protected $_scopes = [];
 
 	/**
-	 * Primary method to determine whether a user is allowed to do something.
+	 * Constructor will be called from ModuleModel::getGrant().
+	 *
+	 * @param array $xml_grant_list
+	 * @param array $module_grants
+	 * @param ?object $module_info
+	 * @param ?object $member_info
+	 */
+	public function __construct(array $xml_grant_list, array $module_grants, ?object $module_info = null, ?object $member_info = null)
+	{
+		// Generate the list of default permissions.
+		$this->_spec = [
+			'access' => 'guest',
+			'root' => 'root',
+			'manager' => 'manager',
+			'is_admin' => 'root',
+			'is_site_admin' => 'root',
+		];
+		foreach ($xml_grant_list as $key => $val)
+		{
+			$this->_spec[$key] = $val->default ?? '';
+		}
+
+		// Override the defaults with user settings.
+		foreach ($module_grants as $row)
+		{
+			$key = $row->name;
+			if ($row->group_srl == 0)
+			{
+				$this->_spec[$key] = 'guest';
+				continue;
+			}
+			if ($row->group_srl == -1 || $row->group_srl == -2)
+			{
+				$this->_spec[$key] = 'member';
+				continue;
+			}
+			if ($row->group_srl == -4)
+			{
+				$this->_spec[$key] = 'not_member';
+				continue;
+			}
+			if ($row->group_srl == -3)
+			{
+				$this->_spec[$key] = 'manager';
+				continue;
+			}
+			if ($row->group_srl > 0)
+			{
+				if (!isset($this->_spec[$key]) || !is_array($this->_spec[$key]))
+				{
+					$this->_spec[$key] = [];
+				}
+				$this->_spec[$key][] = $row->group_srl;
+				continue;
+			}
+		}
+
+		// If the member is an administrator, grant all possible permissions.
+		if ($member_info && $member_info->is_admin === 'Y')
+		{
+			$this->_scopes = true;
+			foreach ($this->_spec as $key => $requirement)
+			{
+				$this->{$key} = true;
+			}
+			return;
+		}
+
+		// If the member is a module manager, fill the scope of management.
+		$manager_scopes = !empty($module_info->module_srl) ? \ModuleModel::isModuleAdmin($member_info, $module_info->module_srl) : false;
+		$member_groups = !empty($member_info->group_list) ? array_keys($member_info->group_list) : [];
+		if ($manager_scopes)
+		{
+			$this->manager = true;
+			$this->_scopes = $manager_scopes;
+		}
+
+		// Check if each permission is granted to the current user.
+		foreach ($this->_spec as $key => $requirement)
+		{
+			if ($requirement === 'guest')
+			{
+				$this->{$key} = true;
+			}
+			elseif ($requirement === 'member')
+			{
+				$this->{$key} = ($member_info && $member_info->member_srl);
+			}
+			elseif ($requirement === 'not_member')
+			{
+				$this->{$key} = !($member_info && $member_info->member_srl) || $this->manager;
+			}
+			elseif ($requirement === 'manager')
+			{
+				$this->{$key} = $this->manager ? true : false;
+			}
+			elseif ($requirement === 'root')
+			{
+				$this->{$key} = $this->root ? true : false;
+			}
+			elseif (is_array($requirement))
+			{
+				$this->{$key} = array_intersect($member_groups, $requirement) ? true : false;
+				if ($key === 'manager' && $this->{$key} === true)
+				{
+					$this->_scopes = true;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Find out whether the current user is allowed to do something.
+	 *
+	 * This is more portable than accessing object attributes directly,
+	 * and also supports manager scopes.
 	 *
 	 * @param string $scope
 	 * @return bool
@@ -43,17 +150,17 @@ class Permission
 			return boolval($this->{$scope});
 		}
 
-		if ($this->manager && $this->scopes && preg_match('/^(\w+):(.+)$/', $scope, $matches))
+		if ($this->manager && $this->_scopes && preg_match('/^(\w+):(.+)$/', $scope, $matches))
 		{
-			if ($this->scopes === true)
+			if ($this->_scopes === true)
 			{
 				return true;
 			}
-			if (is_array($this->scopes) && in_array($scope, $this->scopes))
+			if (is_array($this->_scopes) && in_array($scope, $this->_scopes))
 			{
 				return true;
 			}
-			if (is_array($this->scopes) && in_array($matches[1] . ':*', $this->scopes))
+			if (is_array($this->_scopes) && in_array($matches[1] . ':*', $this->_scopes))
 			{
 				return true;
 			}
@@ -61,4 +168,57 @@ class Permission
 
 		return false;
 	}
+
+	/**
+	 * Find out who is allowed to do something.
+	 *
+	 * This method returns 'root', 'manager', 'member', 'guest',
+	 * or an array of group_srls whose members are allowed.
+	 *
+	 * If you pass the name of a scope, the result might vary
+	 * depending on whether you are a module manager.
+	 *
+	 * @param string key
+	 * @return string|array
+	 */
+	public function whocan(string $key)
+	{
+		if (isset($this->_spec[$key]))
+		{
+			return $this->_spec[$key];
+		}
+		elseif (preg_match('/^(\w+):(\w+)$/', $key))
+		{
+			if ($this->manager)
+			{
+				return $this->can($key) ? 'manager' : 'root';
+			}
+			else
+			{
+				return 'manager';
+			}
+		}
+		else
+		{
+			return 'nobody';
+		}
+	}
+
+	/**
+	 * Magic method to provide deprecated aliases.
+	 *
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function __get(string $key)
+	{
+		if ($key === 'is_admin' || $key === 'is_site_admin')
+		{
+			return $this->root;
+		}
+		else
+		{
+			return false;
+		}
+	}
 }
diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php
index d2e80c83f..6c2c60e69 100644
--- a/modules/module/module.admin.model.php
+++ b/modules/module/module.admin.model.php
@@ -182,7 +182,8 @@ class ModuleAdminModel extends Module
 			{
 				if($val->group_srl == 0) $default_grant[$val->name] = 'all';
 				else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
-				else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
+				else if($val->group_srl == -2) $default_grant[$val->name] = 'member';
+				else if($val->group_srl == -4) $default_grant[$val->name] = 'not_member';
 				else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
 				else
 				{
@@ -260,7 +261,8 @@ class ModuleAdminModel extends Module
 			{
 				if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
 				else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
-				else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
+				else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'member';
+				else if($val->group_srl == -4) $defaultGrant->{$val->name} = 'not_member';
 				else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
 				else
 				{
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index e2a43e5d3..1d85d9b10 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -1031,8 +1031,7 @@ class ModuleModel extends Module
 		}
 
 		// Create XmlParser object
-		$oXmlParser = new XeXmlParser();
-		$_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file);
+		$_xml_obj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($skin_xml_file);
 		// Return if no skin information is
 		if(!$_xml_obj->skin) return;
 		$xml_obj = $_xml_obj->skin;
@@ -2187,7 +2186,7 @@ class ModuleModel extends Module
 	 */
 	public static function getGrant($module_info, $member_info, $xml_info = null)
 	{
-		if(empty($module_info->module))
+		if (empty($module_info->module))
 		{
 			$module_info = new stdClass;
 			$module_info->module = $module_info->module_srl = 0;
@@ -2202,148 +2201,16 @@ class ModuleModel extends Module
 			}
 		}
 
-		// Get information of module.xml
-		if(!$xml_info)
+		// Get module grant information
+		if (!$xml_info)
 		{
 			$xml_info = self::getModuleActionXml($module_info->module);
 		}
+
+		// Generate grant
 		$xml_grant_list = isset($xml_info->grant) ? (array)$xml_info->grant : array();
-
-		// Get group information of member
-		$member_group = !empty($member_info->group_list) ? array_keys($member_info->group_list) : array();
-		$is_module_admin = !empty($module_info->module_srl) ? self::isModuleAdmin($member_info, $module_info->module_srl) : false;
-
-		// Get 'privilege name' list from module.xml
-		$privilege_list = array_keys($xml_grant_list);
-
-		// Prepend default 'privilege name'
-		// manager, is_site_admin not distinguish because of compatibility.
-		array_unshift($privilege_list, 'access', 'is_admin', 'manager', 'is_site_admin', 'root');
-
-		// Unique
-		$privilege_list = array_unique($privilege_list, SORT_STRING);
-
-		// Grant first
-		$grant = new Rhymix\Modules\Module\Models\Permission;
-		foreach($privilege_list as $val)
-		{
-			// If an administrator, grant all
-			if($member_info && $member_info->is_admin == 'Y')
-			{
-				$grant->{$val} = true;
-			}
-			// If a module manager, grant all (except 'root', 'is_admin')
-			elseif ($is_module_admin && $val !== 'root' && $val !== 'is_admin')
-			{
-				$grant->{$val} = true;
-			}
-			// If module_srl doesn't exist, grant access
-			else if(empty($module_info->module_srl) && $val === 'access')
-			{
-				$grant->{$val} = true;
-			}
-			// Default : not grant
-			else
-			{
-				$grant->{$val} = false;
-			}
-		}
-
-		// If module admin, add scopes
-		if ($member_info && $member_info->is_admin == 'Y')
-		{
-			$grant->scopes = true;
-		}
-		elseif ($is_module_admin)
-		{
-			$grant->scopes = $is_module_admin;
-		}
-		else
-		{
-			$grant->scopes = [];
-		}
-
-		// If access were not granted, check more
-		if(!$grant->access)
-		{
-			$checked = array();
-
-			// Grant privileges by information that get from the DB
-			foreach(self::getModuleGrants($module_info->module_srl)->data as $val)
-			{
-				$checked[$val->name] = true;
-				if($grant->{$val->name})
-				{
-					continue;
-				}
-
-				// All user
-				if($val->group_srl == 0)
-				{
-					$grant->{$val->name} = true;
-					continue;
-				}
-
-				// Log-in member only
-				if($member_info && $member_info->member_srl)
-				{
-					if($val->group_srl == -1 || $val->group_srl == -2)
-					{
-						$grant->{$val->name} = true;
-					}
-					// Manager only
-					else if($val->group_srl == -3)
-					{
-						if($grant->manager)
-						{
-							$grant->{$val->name} = true;
-						}
-					}
-					// If a target is a group
-					else if(count($member_group) && in_array($val->group_srl, $member_group))
-					{
-						$grant->{$val->name} = true;
-						if ($val->name === 'manager' && !$grant->scopes)
-						{
-							$grant->scopes = true;
-						}
-					}
-				}
-			}
-
-			// Grant access by default
-			if(!isset($checked['access']))
-			{
-				$grant->access = true;
-			}
-
-			// Grant privileges by default information of module
-			foreach($xml_grant_list as $name => $item)
-			{
-				if(isset($checked[$name]) || $grant->{$name})
-				{
-					continue;
-				}
-
-				// All user
-				if($item->default == 'guest')
-				{
-					$grant->{$name} = true;
-
-					continue;
-				}
-
-				// Log-in member only
-				if($member_info && $member_info->member_srl)
-				{
-					if($item->default == 'member' || $item->default == 'site')
-					{
-						$grant->{$name} = true;
-					}
-				}
-			}
-		}
-
+		$module_grants = self::getModuleGrants($module_info->module_srl ?? 0)->data ?: [];
+		$grant = new Rhymix\Modules\Module\Models\Permission($xml_grant_list, $module_grants, $module_info, $member_info ?: null);
 		return $__cache = $grant;
 	}
 
diff --git a/modules/module/scripts/cleanMiscLogs.php b/modules/module/scripts/cleanMiscLogs.php
new file mode 100644
index 000000000..14c8e5f3e
--- /dev/null
+++ b/modules/module/scripts/cleanMiscLogs.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * This script deletes old logs from the database.
+ *
+ * Rhymix produces various logs that can increase the size of the database
+ * unnecessarily if not cleaned. This script removes old logs.
+ */
+if (!defined('RX_VERSION'))
+{
+	exit;
+}
+
+// Initialize the exit status.
+$exit_status = 0;
+
+// Delete logs older than this number of days.
+$days = intval($args[0] ?? 0) ?: 30;
+
+// Delete advanced mailer email logs.
+$output = executeQuery('advanced_mailer.deleteMailLogs', [
+	'regdate' => date('YmdHis', time() - ($days * 86400)),
+]);
+if ($output->toBool())
+{
+	echo "Successfully deleted all email logs older than $days days.\n";
+}
+else
+{
+	echo "Error while deleting email logs older than $days days.\n";
+	echo $output->getMessage() . "\n";
+	$exit_status = 11;
+}
+
+// Delete advanced mailer SMS logs.
+$output = executeQuery('advanced_mailer.deleteSMSLogs', [
+	'regdate' => date('YmdHis', time() - ($days * 86400)),
+]);
+if ($output->toBool())
+{
+	echo "Successfully deleted all SMS logs older than $days days.\n";
+}
+else
+{
+	echo "Error while deleting SMS logs older than $days days.\n";
+	echo $output->getMessage() . "\n";
+	$exit_status = 12;
+}
+
+// Delete advanced mailer Push logs.
+$output = executeQuery('advanced_mailer.deletePushLogs', [
+	'regdate' => date('YmdHis', time() - ($days * 86400)),
+]);
+if ($output->toBool())
+{
+	echo "Successfully deleted all Push logs older than $days days.\n";
+}
+else
+{
+	echo "Error while deleting Push logs older than $days days.\n";
+	echo $output->getMessage() . "\n";
+	$exit_status = 13;
+}
+
+// Delete spamfilter logs.
+$output = executeQuery('spamfilter.deleteLog', [
+	'regdate' => date('YmdHis', time() - ($days * 86400)),
+]);
+if ($output->toBool())
+{
+	echo "Successfully deleted all spamfilter logs older than $days days.\n";
+}
+else
+{
+	echo "Error while deleting spamfilter logs older than $days days.\n";
+	echo $output->getMessage() . "\n";
+	$exit_status = 21;
+}
+
+// Set the exit status if there were any errors.
+if ($exit_status != 0)
+{
+	exit($exit_status);
+}
diff --git a/modules/module/scripts/updateAllModules.php b/modules/module/scripts/updateAllModules.php
new file mode 100644
index 000000000..37ea4c2f6
--- /dev/null
+++ b/modules/module/scripts/updateAllModules.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * This script updates all modules.
+ *
+ * When upgrading from a very old version, it is safer to run this script
+ * on the CLI than clicking 'update' in the admin dashboard.
+ * This is because some module updates may take a long time.
+ *
+ * Note that if you use APC cache, you may need to reset the cache
+ * in the admin dashboard after running this script.
+ */
+if (!defined('RX_VERSION'))
+{
+	exit;
+}
+
+// Get the list of modules that need to be updated.
+$module_list = ModuleModel::getModuleList();
+$need_install = array();
+$need_update = array();
+foreach ($module_list as $key => $value)
+{
+	if ($value->need_install)
+	{
+		$need_install[] = $value->module;
+	}
+	if ($value->need_update)
+	{
+		$need_update[] = $value->module;
+	}
+}
+
+// Install all modules.
+$oInstallController = InstallController::getInstance();
+foreach ($need_install as $module)
+{
+	try
+	{
+		echo 'Installing ' . $module . '...' . PHP_EOL;
+		$oInstallController->installModule($module, './modules/' . $module);
+	}
+	catch (\Exception $e)
+	{
+		echo 'Error: ' . $e->getMessage() . PHP_EOL;
+	}
+}
+
+// Update all modules.
+foreach ($need_update as $module)
+{
+	try
+	{
+		echo 'Updating ' . $module . '...' . PHP_EOL;
+		$oInstallController->updateModule($module);
+	}
+	catch (\Exception $e)
+	{
+		echo 'Error: ' . $e->getMessage() . PHP_EOL;
+	}
+}
+
+// Set the exit status if there were any errors.
+if ($exit_status != 0)
+{
+	exit($exit_status);
+}
diff --git a/modules/module/tpl/include.module_grant_setup.html b/modules/module/tpl/include.module_grant_setup.html
index 0cd3eb457..42b05410b 100644
--- a/modules/module/tpl/include.module_grant_setup.html
+++ b/modules/module/tpl/include.module_grant_setup.html
@@ -13,8 +13,9 @@
 		<label class="x_control-label" for="{$grant_name}_default">{$grant_item->title}</label>
 		<div class="x_controls">
 			<select name="{$grant_name}_default" id="{$grant_name}_default" class="grant_default">
-				<option value="0" cond="$grant_item->default == 'guest'">{$lang->grant_to_all}</option>
-				<option value="-1" cond="$grant_item->default != 'manager'">{$lang->grant_to_login_user}</option>
+				<option value="0">{$lang->grant_to_all}</option>
+				<option value="-1">{$lang->grant_to_login_user}</option>
+				<option value="-4">{$lang->grant_to_non_login_user}</option>
 				<option value="-3">{$lang->grant_to_admin}</option>
 				<option value="">{$lang->grant_to_group}</option>
 			</select>
diff --git a/modules/module/tpl/module_grants.html b/modules/module/tpl/module_grants.html
index 8a148f2fd..9c6aab3ac 100644
--- a/modules/module/tpl/module_grants.html
+++ b/modules/module/tpl/module_grants.html
@@ -58,8 +58,9 @@
 				<label for="{$grant_name}_default" class="x_control-label">{$grant_item->title}</label>
 				<div class="x_controls">
 					<select name="{$grant_name}_default" id="{$grant_name}_default" class="grant_default">
-						<!--@if($grant_item->default == 'guest')--><option value="0" <!--@if($default_grant[$grant_name]=='all')-->selected="selected"<!--@end-->>{$lang->grant_to_all}</option><!--@end-->
-						<!--@if($grant_item->default != 'manager')--><option value="-1" <!--@if($default_grant[$grant_name]=='member' || $default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_login_user}</option><!--@end-->
+						<option value="0" <!--@if($default_grant[$grant_name]=='all')-->selected="selected"<!--@end-->>{$lang->grant_to_all}</option>
+						<option value="-1" <!--@if($default_grant[$grant_name]=='member' || $default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_login_user}</option>
+						<option value="-4" <!--@if($default_grant[$grant_name]=='not_member')-->selected="selected"<!--@end-->>{$lang->grant_to_non_login_user}</option>
 						<option value="-3" <!--@if($default_grant[$grant_name]=='manager')-->selected="selected"<!--@end-->>{$lang->grant_to_admin}</option>
 						<option value="" <!--@if($default_grant[$grant_name]=='group')-->selected="selected"<!--@end-->>{$lang->grant_to_group}</option>
 					</select>
diff --git a/modules/module/tpl/multilingual_v17.html b/modules/module/tpl/multilingual_v17.html
index 0fa7a68c5..23754d4d4 100644
--- a/modules/module/tpl/multilingual_v17.html
+++ b/modules/module/tpl/multilingual_v17.html
@@ -41,11 +41,11 @@
 	</div>
 </div>
 <script>
-	xe.confirm_delete = '{$lang->confirm_delete}';
-	xe.msg_confirm_save_and_use_multilingual = '{$lang->msg_confirm_save_and_use_multilingual}';
-	xe.msg_empty_multilingual = '{$lang->msg_empty_multilingual}';
-	xe.cmd_set_multilingual_text = '{$lang->cmd_set_multilingual_text}';
-	xe.cmd_remove_multilingual_text = '{$lang->cmd_remove_multilingual_text}';
-	xe.use_after_save = '{$lang->use_after_save}';
-	xe.cmd_save = '{$lang->cmd_save}';
+	xe.lang.confirm_delete = '{$lang->confirm_delete}';
+	xe.lang.msg_confirm_save_and_use_multilingual = '{$lang->msg_confirm_save_and_use_multilingual}';
+	xe.lang.msg_empty_multilingual = '{$lang->msg_empty_multilingual}';
+	xe.lang.cmd_set_multilingual_text = '{$lang->cmd_set_multilingual_text}';
+	xe.lang.cmd_remove_multilingual_text = '{$lang->cmd_remove_multilingual_text}';
+	xe.lang.use_after_save = '{$lang->use_after_save}';
+	xe.lang.cmd_save = '{$lang->cmd_save}';
 </script>
diff --git a/modules/ncenterlite/scripts/cleanNotifications.php b/modules/ncenterlite/scripts/cleanNotifications.php
new file mode 100644
index 000000000..49253175a
--- /dev/null
+++ b/modules/ncenterlite/scripts/cleanNotifications.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This script deletes old notifications.
+ *
+ * Notifications must be dismissed as quickly as possible in order to prevent
+ * the ncenterlite_notify table from becoming too large. For best performance,
+ * you should run this script at least once every few days.
+ */
+if (!defined('RX_VERSION'))
+{
+	exit;
+}
+
+// Initialize the exit status.
+$exit_status = 0;
+
+// Delete notifications older than this number of days.
+$days = intval($args[0] ?? 0) ?: 30;
+
+// Execute the query.
+$output = executeQuery('ncenterlite.deleteNotifyAll', [
+	'old_date' => date('YmdHis', time() - ($days * 86400)),
+]);
+
+if ($output->toBool())
+{
+	echo "Successfully deleted all notifications older than $days days.\n";
+	$delete_obj = (object)array('regdate' => time());
+	Rhymix\Framework\Cache::clearGroup('ncenterlite');
+	Rhymix\Framework\Storage::writePHPData(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify/delete_date.php', $delete_obj);
+}
+else
+{
+	echo "Error while deleting notifications older than $days days.\n";
+	echo $output->getMessage() . "\n";
+	$exit_status = 11;
+}
+
+// Set the exit status if there were any errors.
+if ($exit_status != 0)
+{
+	exit($exit_status);
+}
diff --git a/modules/page/page.view.php b/modules/page/page.view.php
index 064876044..cb642a041 100644
--- a/modules/page/page.view.php
+++ b/modules/page/page.view.php
@@ -188,14 +188,8 @@ class PageView extends Page
 			return;
 		}
 
-		// Kick out anyone who tries to exploit RVE-2022-2.
-		foreach (Context::getRequestVars() as $key => $val)
-		{
-			if (preg_match('/[\{\}\(\)<>\$\'"]/', $key) || preg_match('/[\{\}\(\)<>\$\'"]/', $val))
-			{
-				throw new Rhymix\Framework\Exceptions\SecurityViolation();
-			}
-		}
+		// Check parameters.
+		$this->_checkParams(Context::getRequestVars());
 
 		// External URL
 		if (preg_match('!^[a-z]+://!i', $this->path))
@@ -210,6 +204,34 @@ class PageView extends Page
 		}
 	}
 
+	/**
+	 * Check parameters for suspicious keys or values.
+	 *
+	 * This helps protect external pages from RVE-2022-2.
+	 *
+	 * @param array|object $vars
+	 * @return void
+	 */
+	protected function _checkParams($vars)
+	{
+		foreach ($vars as $key => $val)
+		{
+			if (preg_match('/[\{\}\(\)<>\$\'"]/', $key))
+			{
+				throw new Rhymix\Framework\Exceptions\SecurityViolation();
+			}
+
+			if (is_array($val) || is_object($val))
+			{
+				$this->_checkParams($val);
+			}
+			elseif (preg_match('/[\{\}\(\)<>\$\'"]/', (string)$val))
+			{
+				throw new Rhymix\Framework\Exceptions\SecurityViolation();
+			}
+		}
+	}
+
 	/**
 	 * @brief Save the file and return if a file is requested by http
 	 */
diff --git a/modules/point/point.model.php b/modules/point/point.model.php
index 1220f37a8..a9cfb5599 100644
--- a/modules/point/point.model.php
+++ b/modules/point/point.model.php
@@ -117,6 +117,39 @@ class PointModel extends Point
 		return $level - 1;
 	}
 
+	/**
+	 * Get the minimum level required to belong in group(s)
+	 *
+	 * @param int|array $group_srl
+	 * @return ?int
+	 */
+	public static function getMinimumLevelForGroup($group_srl): ?int
+	{
+		if (!is_array($group_srl))
+		{
+			$group_srl = [$group_srl];
+		}
+
+		$min_level = null;
+		$config = self::getConfig();
+		foreach ($config->point_group ?? [] as $group => $required_level)
+		{
+			if (in_array($group, $group_srl))
+			{
+				if ($min_level === null)
+				{
+					$min_level = $required_level;
+				}
+				else
+				{
+					$min_level = min($min_level, $required_level);
+				}
+			}
+		}
+
+		return $min_level;
+	}
+
 	/**
 	 * @deprecated
 	 */
diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html
index 7c17c8019..9fc0f407c 100644
--- a/modules/widget/tpl/widget_generate_code_in_page.html
+++ b/modules/widget/tpl/widget_generate_code_in_page.html
@@ -5,10 +5,10 @@
 <load target="../../admin/tpl/js/jquery.tmpl.js" />
 <load target="../../admin/tpl/js/jquery.jstree.js" />
 <script>
-	xe.cmd_find = "{$lang->cmd_find}";
-	xe.cmd_cancel = "{$lang->cmd_cancel}";
-	xe.cmd_confirm = "{$lang->cmd_confirm}";
-	xe.msg_select_menu = "{$lang->msg_select_menu}";
+	xe.lang.cmd_find = "{$lang->cmd_find}";
+	xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
+	xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
+	xe.lang.msg_select_menu = "{$lang->msg_select_menu}";
 	xe.lang.cmd_delete = '{$lang->cmd_delete}';
 
 	jQuery(document).ready(function(){
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 0ba27cf30..c19daf630 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -300,17 +300,24 @@ class WidgetController extends Widget
 	 */
 	function transWidgetBox($matches)
 	{
-		$buff = preg_replace('/<div><div>(.*)$/i','</div>',$matches[0]);
-		$oXmlParser = new XeXmlParser();
-		$xml_doc = $oXmlParser->parse($buff);
+		$buff = preg_replace('/<div><div>(.*)$/i','</div>', $matches[0]);
+		$xml = simplexml_load_string(trim($buff));
+		$args = new stdClass;
+		foreach ($xml->div ? $xml->div->attributes() : $xml->attributes() as $key => $val)
+		{
+			$args->{$key} = strval($val);
+		}
 
-		$vars = $xml_doc->div->attrs;
-		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		$widget = $args->widget ?? null;
+		if(!$widget)
+		{
+			return $matches[0];
+		}
+
+		$args->widgetbox_content = $matches[3];
 		unset($vars->widget);
 
-		$vars->widgetbox_content = $matches[3];
-		return $this->execute($widget, $vars, $this->javascript_mode);
+		return $this->execute($widget, $args, $this->javascript_mode);
 	}
 
 	/**
@@ -321,18 +328,25 @@ class WidgetController extends Widget
 	{
 		// Language in bringing
 		$lang_list = Context::get('lang_supported');
+
 		// Bringing widget cache sequence
 		preg_match_all('!<img([^\>]*)widget=([^\>]*?)\>!is', $content, $matches);
 
-		$oXmlParser = new XeXmlParser();
-
-		$cnt = count($matches[1]);
-		for($i=0;$i<$cnt;$i++)
+		foreach ($matches[0] as $buff)
 		{
-			$buff = $matches[0][$i];
-			$xml_doc = $oXmlParser->parse(trim($buff));
-			$args = $xml_doc->img->attrs;
-			$widget = $args->widget;
+			$xml = simplexml_load_string(trim($buff));
+			if ($xml === false)
+			{
+				continue;
+			}
+
+			$args = new stdClass;
+			foreach ($xml->img ? $xml->img->attributes() : $xml->attributes() as $key => $val)
+			{
+				$args->{$key} = strval($val);
+			}
+
+			$widget = $args->widget ?? null;
 			if(!$args || !$widget || empty($args->widget_cache))
 			{
 				continue;
@@ -341,12 +355,7 @@ class WidgetController extends Widget
 			$args->widget_sequence = $args->widget_sequence ?? 0;
 			$args->colorset = $args->colorset ?? null;
 
-			foreach($args as $k => $v)
-			{
-				$args->{$k} = urldecode($v);
-			}
-
-			foreach($lang_list as $lang_type => $val)
+			foreach ($lang_list as $lang_type => $val)
 			{
 				$this->getCache($widget, $args, $lang_type, true);
 			}
diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php
index cedf80bbc..a851dd5ca 100644
--- a/modules/widget/widget.model.php
+++ b/modules/widget/widget.model.php
@@ -122,148 +122,38 @@ class WidgetModel extends Widget
 	 */
 	function getWidgetInfo($widget)
 	{
-		// Get a path of the requested module. Return if not exists.
+		// Check the widget path.
+		$widget = preg_replace('/[^a-zA-Z0-9-_]/', '', $widget);
 		$widget_path = $this->getWidgetPath($widget);
-		if(!$widget_path) return;
-		// Read the xml file for module skin information
-		$xml_file = sprintf("%sconf/info.xml", $widget_path);
-		if(!file_exists($xml_file)) return;
-		// If the problem by comparing the cache file and include the return variable $widget_info
-		$cache_file = sprintf(RX_BASEDIR . 'files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
-
-		if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
+		if (!$widget_path)
+		{
+			return;
+		}
+
+		// Check the XML file.
+		$xml_file = sprintf("%sconf/info.xml", $widget_path);
+		if (!file_exists($xml_file))
+		{
+			return;
+		}
+
+		// Check the cache.
+		$xml_mtime = filemtime($xml_file);
+		$cache_key = sprintf('widget_info:%s:%d', $widget, $xml_mtime);
+		$widget_info = Rhymix\Framework\Cache::get($cache_key);
+		if ($widget_info)
 		{
-			@include($cache_file);
 			return $widget_info;
 		}
-		// If no cache file exists, parse the xml and then return the variable.
-		$oXmlParser = new XeXmlParser();
-		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
-		$xml_obj = $tmp_xml_obj->widget;
-		if(!$xml_obj) return;
 
-		$buff = '$widget_info = new stdClass;';
-
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		// Parse the XML file and store the result in the cache.
+		$widget_info = Rhymix\Framework\Parsers\WidgetInfoParser::loadXML($xml_file, $widget);
+		if (!$widget_info)
 		{
-			// Title of the widget, version
-			$buff .= sprintf('$widget_info->widget = %s;', var_export($widget, true));
-			$buff .= sprintf('$widget_info->path = %s;', var_export($widget_path, true));
-			$buff .= sprintf('$widget_info->title = %s;', var_export($xml_obj->title->body, true));
-			$buff .= sprintf('$widget_info->description = %s;', var_export($xml_obj->description->body, true));
-			$buff .= sprintf('$widget_info->version = %s;', var_export($xml_obj->version->body, true));
-			if($xml_obj->date->body === 'RX_CORE')
-			{
-				$date = '';
-			}
-			else
-			{
-				$date_obj = new stdClass;
-				sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-				$date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-			}
-			$buff .= sprintf('$widget_info->date = %s;', var_export($date, true));
-			$buff .= sprintf('$widget_info->homepage = %s;', var_export($xml_obj->link->body, true));
-			$buff .= sprintf('$widget_info->license = %s;', var_export($xml_obj->license->body, true));
-			$buff .= sprintf('$widget_info->license_link = %s;', var_export($xml_obj->license->attrs->link, true));
-			$buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
-			$buff .= sprintf('$widget_info->widget_title = $widget_title;');
-			// Author information
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-			else $author_list = $xml_obj->author;
-
-			for($i=0; $i < count($author_list); $i++)
-			{
-				$buff .= '$widget_info->author['.$i.'] = new stdClass;';
-				$buff .= sprintf('$widget_info->author['.$i.']->name = %s;', var_export($author_list[$i]->name->body, true));
-				$buff .= sprintf('$widget_info->author['.$i.']->email_address = %s;', var_export($author_list[$i]->attrs->email_address, true));
-				$buff .= sprintf('$widget_info->author['.$i.']->homepage = %s;', var_export($author_list[$i]->attrs->link, true));
-			}
-		}
-		else
-		{
-			// Title of the widget, version
-			$buff .= sprintf('$widget_info->widget = %s;', var_export($widget, true));
-			$buff .= sprintf('$widget_info->path = %s;', var_export($widget_path, true));
-			$buff .= sprintf('$widget_info->title = %s;', var_export($xml_obj->title->body, true));
-			$buff .= sprintf('$widget_info->description = %s;', var_export($xml_obj->author->description->body, true));
-			$buff .= sprintf('$widget_info->version = %s;', var_export($xml_obj->attrs->version, true));
-			$date_obj = new stdClass;
-			sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
-			$date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-			$buff .= sprintf('$widget_info->date = %s;', var_export($date, true));
-			$buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
-			$buff .= sprintf('$widget_info->widget_title = $widget_title;');
-			// Author information
-			$buff .= '$widget_info->author[0] = new stdClass;';
-			$buff .= sprintf('$widget_info->author[0]->name = %s;', var_export($xml_obj->author->name->body, true));
-			$buff .= sprintf('$widget_info->author[0]->email_address = %s;', var_export($xml_obj->author->attrs->email_address, true));
-			$buff .= sprintf('$widget_info->author[0]->homepage = %s;', var_export($xml_obj->author->attrs->link, true));
-		}
-		// Extra vars (user defined variables to use in a template)
-		$extra_var_groups = $xml_obj->extra_vars->group;
-		if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-		foreach($extra_var_groups as $group)
-		{
-			$extra_vars = $group->var;
-			if(!is_array($group->var)) $extra_vars = array($group->var);
-
-			if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
-			{
-				$extra_var_count = count($extra_vars);
-
-				$buff .= sprintf('$widget_info->extra_var_count = %d;', $extra_var_count);
-				$buff .= '$widget_info->extra_var = $widget_info->extra_var ?? new stdClass;';
-				for($i=0;$i<$extra_var_count;$i++)
-				{
-					unset($var);
-					unset($options);
-					$var = $extra_vars[$i];
-
-					$id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
-					$name = $var->name->body?$var->name->body:$var->title->body;
-					$type = $var->attrs->type?$var->attrs->type:$var->type->body;
-					$buff .= sprintf('$widget_info->extra_var->%s = new stdClass;', $id);
-					if($type =='filebox')
-					{
-						$buff .= sprintf('$widget_info->extra_var->%s->filter = %s;', $id, var_export($var->type->attrs->filter, true));
-						$buff .= sprintf('$widget_info->extra_var->%s->allow_multiple = %s;', $id, var_export($var->type->attrs->allow_multiple, true));
-					}
-
-					$buff .= sprintf('$widget_info->extra_var->%s->group = %s;', $id, var_export($group->title->body, true));
-					$buff .= sprintf('$widget_info->extra_var->%s->name = %s;', $id, var_export($name, true));
-					$buff .= sprintf('$widget_info->extra_var->%s->type = %s;', $id, var_export($type, true));
-					$buff .= sprintf('$widget_info->extra_var->%s->value = $vars->%s;', $id, $id);
-					$buff .= sprintf('$widget_info->extra_var->%s->description = %s;', $id, var_export($var->description->body, true));
-
-					$options = $var->options;
-					if(!$options) continue;
-
-					if(!is_array($options)) $options = array($options);
-					$options_count = count($options);
-					for($j=0;$j<$options_count;$j++)
-					{
-						$buff .= sprintf('$widget_info->extra_var->%s->options[%s] = %s;', $id, var_export($options[$j]->value->body, true), var_export($options[$j]->name->body, true));
-
-						if($options[$j]->attrs->default && $options[$j]->attrs->default=='true')
-						{
-							$buff .= sprintf('$widget_info->extra_var->%s->default_options[%s] = true;', $id, var_export($options[$j]->value->body, true));
-						}
-
-						if($options[$j]->attrs->init && $options[$j]->attrs->init=='true')
-						{
-							$buff .= sprintf('$widget_info->extra_var->%s->init_options[%s] = true;', $id, var_export($options[$j]->value->body, true));
-						}
-					}
-				}
-			}
+			return;
 		}
 
-		$buff = '<?php if(!defined("__XE__")) exit(); '.$buff.' ?>';
-		FileHandler::writeFile($cache_file, $buff);
-
-		if(file_exists($cache_file)) @include($cache_file);
+		Rhymix\Framework\Cache::set($cache_key, $widget_info);
 		return $widget_info;
 	}
 
@@ -273,117 +163,38 @@ class WidgetModel extends Widget
 	 */
 	function getWidgetStyleInfo($widgetStyle)
 	{
+		// Check the widget style path.
 		$widgetStyle = preg_replace('/[^a-zA-Z0-9-_]/', '', $widgetStyle);
 		$widgetStyle_path = $this->getWidgetStylePath($widgetStyle);
-		if(!$widgetStyle_path) return;
-		$xml_file = sprintf("%sskin.xml", $widgetStyle_path);
-		if(!file_exists($xml_file)) return;
-		// If the problem by comparing the cache file and include the return variable $widgetStyle_info
-		$cache_file = sprintf(RX_BASEDIR . 'files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
-
-		if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
+		if (!$widgetStyle_path)
+		{
+			return;
+		}
+
+		// Check the XML file.
+		$xml_file = $widgetStyle_path . 'skin.xml';
+		if (!file_exists($xml_file))
+		{
+			return;
+		}
+
+		// Check the cache.
+		$xml_mtime = filemtime($xml_file);
+		$cache_key = sprintf('widgetstyle_info:%s:%d', $widgetStyle, $xml_mtime);
+		$widgetStyle_info = Rhymix\Framework\Cache::get($cache_key);
+		if ($widgetStyle_info)
 		{
-			@include($cache_file);
 			return $widgetStyle_info;
 		}
-		// If no cache file exists, parse the xml and then return the variable.
-		$oXmlParser = new XeXmlParser();
-		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
-		$xml_obj = $tmp_xml_obj->widgetstyle;
-		if(!$xml_obj) return;
 
-		$buff = array();
-		$buff[] = '<?php if(!defined("__XE__")) exit();';
-		$buff[] = '$widgetStyle_info = new stdClass();';
-
-		// Title of the widget, version
-		$buff[] = sprintf('$widgetStyle_info->widgetStyle = %s;', var_export($widgetStyle, true));
-		$buff[] = sprintf('$widgetStyle_info->path = %s;', var_export($widgetStyle_path, true));
-		$buff[] = sprintf('$widgetStyle_info->title = %s;', var_export($xml_obj->title->body, true));
-		$buff[] = sprintf('$widgetStyle_info->description = %s;', var_export($xml_obj->description->body, true));
-		$buff[] = sprintf('$widgetStyle_info->version = %s;', var_export($xml_obj->version->body, true));
-		if($xml_obj->date->body === 'RX_CORE')
+		// Parse the XML file and store the result in the cache.
+		$widgetStyle_info = Rhymix\Framework\Parsers\WidgetStyleInfoParser::loadXML($xml_file, $widgetStyle);
+		if (!$widgetStyle_info)
 		{
-			$date = '';
-		}
-		else
-		{
-			$date_obj = new stdClass;
-			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-			$date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-		}
-		$buff[] = sprintf('$widgetStyle_info->date = %s;', var_export($date, true));
-		$buff[] = sprintf('$widgetStyle_info->homepage = %s;', var_export($xml_obj->link->body, true));
-		$buff[] = sprintf('$widgetStyle_info->license = %s;', var_export($xml_obj->license->body, true));
-		$buff[] = sprintf('$widgetStyle_info->license_link = %s;', var_export($xml_obj->license->attrs->link, true));
-
-		// preview
-		if(!isset($xml_obj->preview)) $xml_obj->preview = new stdClass;
-		if(!isset($xml_obj->preview->body) || !$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
-		$preview_file = sprintf("%s%s", $widgetStyle_path,$xml_obj->preview->body);
-		if(file_exists($preview_file)) $buff[] = sprintf('$widgetStyle_info->preview = %s;', var_export($preview_file, true));
-
-		// Author information
-		if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-		else $author_list = $xml_obj->author;
-
-		foreach($author_list as $idx => $author)
-		{
-			$buff[] = sprintf('$widgetStyle_info->author[%d] = new stdClass();', $idx);
-			$buff[] = sprintf('$widgetStyle_info->author[%d]->name = %s;', $idx, var_export($author->name->body, true));
-			$buff[] = sprintf('$widgetStyle_info->author[%d]->email_address = %s;', $idx, var_export($author->attrs->email_address, true));
-			$buff[] = sprintf('$widgetStyle_info->author[%d]->homepage = %s;', $idx, var_export($author->attrs->link, true));
+			return;
 		}
 
-		// Extra vars (user defined variables to use in a template)
-		$extra_var_groups = $xml_obj->extra_vars->group;
-		if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-
-		$extra_var_count = 0;
-		$buff[] = '$widgetStyle_info->extra_var = $widgetStyle_info->extra_var ?? new stdClass();';
-		foreach($extra_var_groups as $group)
-		{
-			$extra_vars = (!is_array($group->var)) ? array($group->var) : $group->var;
-
-			if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
-			{
-				foreach($extra_vars as $var)
-				{
-					$extra_var_count++;
-					$id = ($var->attrs->id) ? $var->attrs->id : $var->attrs->name;
-					$name = ($var->name->body) ? $var->name->body : $var->title->body;
-					$type = ($var->attrs->type) ? $var->attrs->type : $var->type->body;
-
-					$buff[] = sprintf('$widgetStyle_info->extra_var->%s = new stdClass();', $id);
-					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->group = %s;', $id, var_export($group->title->body, true));
-					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->name = %s;', $id, var_export($name, true));
-					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->type = %s;', $id, var_export($type, true));
-					if($type =='filebox')
-					{
-						$buff[] = sprintf('$widgetStyle_info->extra_var->%s->filter = %s;', $id, var_export($var->attrs->filter, true));
-						$buff[] = sprintf('$widgetStyle_info->extra_var->%s->allow_multiple = %s;', $id, var_export($var->attrs->allow_multiple, true));
-					}
-					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->value = $vars->%s;', $id, $id);
-					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->description = %s;', $id, var_export($var->description->body, true));
-
-					if($var->options)
-					{
-						$var_options = (!is_array($var->options)) ? array($var->options) : $var->options;
-						foreach($var_options as $option_item)
-						{
-							$buff[] = sprintf('$widgetStyle_info->extra_var->%s->options[%s] = %s;', $id, var_export($option_item->value->body, true), var_export($option_item->name->body, true));
-						}
-					}
-				}
-			}
-		}
-		$buff[] = sprintf('$widgetStyle_info->extra_var_count = %d;', $extra_var_count);
-
-		FileHandler::writeFile($cache_file, implode(PHP_EOL, $buff));
-
-		if(file_exists($cache_file)) @include($cache_file);
-
+		Rhymix\Framework\Cache::set($cache_key, $widgetStyle_info);
 		return $widgetStyle_info;
 	}
 }
diff --git a/tests/_data/xml/xecompat.xml b/tests/_data/xml/xecompat.xml
new file mode 100644
index 000000000..85d6479bf
--- /dev/null
+++ b/tests/_data/xml/xecompat.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2">
+    <title xml:lang="ko">기본 레이아웃</title>
+    <title xml:lang="en">Default Layout</title>
+    <author email_address="devops@rhymix.org" link="https://rhymix.org/">
+        <name xml:lang="ko">라이믹스</name>
+        <name xml:lang="en">Rhymix</name>
+    </author>
+	<extra_vars>
+		<var name="logo_image" type="image">
+			<title xml:lang="ko">로고 이미지</title>
+			<title xml:lang="en">Logo Image</title>
+		</var>
+		<var name="web_font" type="select">
+			<title xml:lang="ko">웹 폰트</title>
+			<title xml:lang="en">Web Font</title>
+			<options value="Noto Sans">
+				<title>Noto Sans</title>
+			</options>
+			<options value="Pretendard">
+				<title>Pretendard</title>
+			</options>
+		</var>
+	</extra_vars>
+</layout>
diff --git a/tests/_data/xmlrpc/request.xml b/tests/_data/xml/xmlrpc.xml
similarity index 100%
rename from tests/_data/xmlrpc/request.xml
rename to tests/_data/xml/xmlrpc.xml
diff --git a/tests/unit/framework/PasswordTest.php b/tests/unit/framework/PasswordTest.php
index c00c81aca..b739d888e 100644
--- a/tests/unit/framework/PasswordTest.php
+++ b/tests/unit/framework/PasswordTest.php
@@ -30,7 +30,7 @@ class PasswordTest extends \Codeception\Test\Unit
 	public function testGetDefaultAlgorithm()
 	{
 		$algo = Rhymix\Framework\Password::getDefaultAlgorithm();
-		$this->assertTrue($algo === 'argon2id' || $algo === 'bcrypt' || $algo === 'pbkdf2' || $algo === 'md5');
+		$this->assertTrue($algo === 'argon2id' || $algo === 'bcrypt' || $algo === 'pbkdf2');
 	}
 
 	public function testGetWorkFactor()
diff --git a/tests/unit/framework/filters/FilenameFilterTest.php b/tests/unit/framework/filters/FilenameFilterTest.php
index 7a613a243..f49238ad2 100644
--- a/tests/unit/framework/filters/FilenameFilterTest.php
+++ b/tests/unit/framework/filters/FilenameFilterTest.php
@@ -28,7 +28,11 @@ class FilenameFilterTest extends \Codeception\Test\Unit
 
 			// PHP extension
 			'foobar.php' => 'foobar.phps',
-			'foobar.php.jpg' => 'foobar.php.jpg',
+			'foobar.php.jpg' => 'foobar.jpg',
+
+			// Double extension
+			'Photos.docx .exe' => 'Photos.exe',
+			'Photos.png.php.jpg' => 'Photos.png.jpg',
 
 			// Overlong filenames
 			str_repeat('f', 200) . '.' . str_repeat('b', 30) => str_repeat('f', 111) . '.' . str_repeat('b', 15),
diff --git a/tests/unit/framework/parsers/XeXmlParserTest.php b/tests/unit/framework/parsers/XeXmlParserTest.php
new file mode 100644
index 000000000..c6ae8f215
--- /dev/null
+++ b/tests/unit/framework/parsers/XeXmlParserTest.php
@@ -0,0 +1,30 @@
+<?php
+
+class XeXmlParserTest extends \Codeception\Test\Unit
+{
+	public function testParse()
+	{
+		$xml = file_get_contents(\RX_BASEDIR . 'tests/_data/xml/xecompat.xml');
+		$output = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($xml, 'en');
+
+		$this->assertEquals('Default Layout', $output->layout->title->body);
+		$this->assertEquals('Rhymix', $output->layout->author->name->body);
+		$this->assertEquals('https://rhymix.org/', $output->layout->author->attrs->link);
+		$this->assertEquals('en', $output->layout->author->name->attrs->{'xml:lang'});
+
+		$this->assertEquals('logo_image', $output->layout->extra_vars->var[0]->attrs->name);
+		$this->assertEquals('web_font', $output->layout->extra_vars->var[1]->attrs->name);
+		$this->assertEquals('Noto Sans', $output->layout->extra_vars->var[1]->options[0]->attrs->value);
+		$this->assertEquals('Pretendard', $output->layout->extra_vars->var[1]->options[1]->title->body);
+
+		$output = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($xml, 'ko');
+
+		$this->assertEquals('기본 레이아웃', $output->layout->title->body);
+		$this->assertEquals('라이믹스', $output->layout->author->name->body);
+		$this->assertEquals('웹 폰트', $output->layout->extra_vars->var[1]->title->body);
+		$this->assertEquals('Noto Sans', $output->layout->extra_vars->var[1]->options[0]->attrs->value);
+
+		$this->assertInstanceOf(\Rhymix\Framework\Parsers\XEXMLParser::class, $output);
+		$this->assertNull($output->layout->attrs->foo);
+	}
+}
diff --git a/tests/unit/framework/parsers/XmlrpcParserTest.php b/tests/unit/framework/parsers/XmlrpcParserTest.php
index e6dd19c6b..3771cb497 100644
--- a/tests/unit/framework/parsers/XmlrpcParserTest.php
+++ b/tests/unit/framework/parsers/XmlrpcParserTest.php
@@ -4,7 +4,7 @@ class XmlrpcParserTest extends \Codeception\Test\Unit
 {
 	public function testParse()
 	{
-		$xml = file_get_contents(\RX_BASEDIR . 'tests/_data/xmlrpc/request.xml');
+		$xml = file_get_contents(\RX_BASEDIR . 'tests/_data/xml/xmlrpc.xml');
 		$params = Rhymix\Framework\Parsers\XMLRPCParser::parse($xml);
 		$this->assertTrue(is_array($params));
 		$this->assertEquals('board', $params['module']);